From 3f942871ae7ec9533093e2d4a1c14b213af608c4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 7 Sep 2017 21:21:24 -0600
Subject: [PATCH 0001/1013] * Update packages * Remove application/x-arj from
 mimeUtils hack - is included in mime-db now.

---
 core/mime_util.js |  1 -
 package.json      | 32 ++++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/mime_util.js b/core/mime_util.js
index bdb88a53..1e2bd32c 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -14,7 +14,6 @@ function startup(cb) {
 	//	Add in types (not yet) supported by mime-db -- and therefor, mime-types
 	//
 	const ADDITIONAL_EXT_MIMETYPES = {
-		arj				: 'application/x-arj',
 		ans				: 'text/x-ansi',
 		gz				: 'application/gzip',	//	not in mime-types 2.1.15 :(
 	};
diff --git a/package.json b/package.json
index ec508841..219a4290 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enigma-bbs",
-  "version": "0.0.7-alpha",
+  "version": "0.0.8-alpha",
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",
@@ -19,34 +19,34 @@
     "retro"
   ],
   "dependencies": {
-    "async": "^2.4.0",
+    "async": "^2.5.0",
     "binary": "0.3.x",
     "buffers": "NuSkooler/node-buffers",
-    "bunyan": "^1.8.10",
-    "farmhash": "^1.2.1",
-    "fs-extra": "^3.0.1",
+    "bunyan": "^1.8.12",
+    "exiftool": "^0.0.3",
+    "farmhash": "^2.0.1",
+    "fs-extra": "^4.0.1",
     "gaze": "^1.1.2",
+    "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
-    "hjson": "^2.4.2",
-    "iconv-lite": "^0.4.17",
-    "inquirer": "^3.0.6",
+    "hjson": "^3.1.0",
+    "iconv-lite": "^0.4.18",
+    "inquirer": "^3.2.3",
     "later": "1.2.0",
     "lodash": "^4.17.4",
-    "mime-types": "^2.1.15",
+    "mime-types": "^2.1.17",
     "minimist": "1.2.x",
     "moment": "^2.18.1",
-    "nodemailer": "^4.0.1",
+    "node-glob": "^1.2.0",
+    "nodemailer": "^4.1.0",
     "ptyw.js": "NuSkooler/ptyw.js",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^3.1.1",
+    "sqlite3": "^3.1.9",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
-    "uuid": "^3.0.1",
+    "uuid": "^3.1.0",
     "uuid-parse": "^1.0.0",
-    "ws" : "^3.0.0",
-    "graceful-fs" : "^4.1.11",
-    "exiftool" : "^0.0.3",
-    "node-glob" : "^1.2.0"
+    "ws": "^3.1.0"
   },
   "devDependencies": {},
   "engines": {

From 79e410315c83afbe6dff3199d9c4d630886e0b6f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Sep 2017 23:07:11 -0600
Subject: [PATCH 0002/1013] Remove a extra line when quoting

---
 core/fse.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index ed9d3b13..2ccc6951 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -995,14 +995,14 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		const quoteMsgView	= this.viewControllers.quoteBuilder.getView(1);
 		const msgView		= this.viewControllers.body.getView(1);
 				
-		let quoteLines 		= quoteMsgView.getData();
+		let quoteLines 		= quoteMsgView.getData().trim();
 		
-		if(quoteLines.trim().length > 0) {
+		if(quoteLines.length > 0) {
 			if(this.replyIsAnsi) {
 				const bodyMessageView = this.viewControllers.body.getView(1);
 				quoteLines += `${ansi.normal()}${bodyMessageView.getSGRFor('text')}`;
 			}
-			msgView.addText(`${quoteLines}\n`);
+			msgView.addText(`${quoteLines}\n\n`);
 		}
 		
 		quoteMsgView.setText('');

From 18461e594adf4bd1de80d538daa41df4c9947eb1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Sep 2017 23:11:01 -0600
Subject: [PATCH 0003/1013] Add --update option to fb scan

---
 core/oputil/oputil_file_base.js | 85 +++++++++++++++++++++++++--------
 core/oputil/oputil_help.js      |  1 +
 2 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 5cbe10e3..3f791267 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -34,7 +34,7 @@ exports.handleFileBaseCommand			= handleFileBaseCommand;
 
 let fileArea;	//	required during init
 
-function finalizeEntryAndPersist(fileEntry, descHandler, cb) {
+function finalizeEntryAndPersist(isUpdate, fileEntry, descHandler, cb) {
 	async.series(
 		[
 			function getDescFromHandlerIfNeeded(callback) {
@@ -53,18 +53,24 @@ function finalizeEntryAndPersist(fileEntry, descHandler, cb) {
 				return callback(null);
 			},
 			function getDescFromUserIfNeeded(callback) {
-				if(false === argv.prompt || ( fileEntry.desc && fileEntry.desc.length > 0 ) ) {
+				if(fileEntry.desc && fileEntry.desc.length > 0 ) {
 					return callback(null);
 				}
 
-				const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName;
+				const getDescFromFileName	= require('../../core/file_base_area.js').getDescFromFileName;
+				const descFromFile			= getDescFromFileName(fileEntry.fileName);
+				
+				if(false === argv.prompt) {
+					fileEntry.desc = descFromFile;
+					return callback(null);
+				}
 
 				const questions = [
 					{
 						name	: 'desc',
 						message	: `Description for ${fileEntry.fileName}:`,
 						type	: 'input',
-						default	: getDescFromFileName(fileEntry.fileName),
+						default	: descFromFile,
 					}
 				];
 
@@ -74,7 +80,7 @@ function finalizeEntryAndPersist(fileEntry, descHandler, cb) {
 				});
 			},
 			function persist(callback) {
-				fileEntry.persist( err => {
+				fileEntry.persist(isUpdate, err => {
 					return callback(err);
 				});
 			}
@@ -104,6 +110,12 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 			return !asi.storageTag || sl.storageTag === asi.storageTag;
 		});
 	});
+
+	function updateTags(fe) {
+		if(Array.isArray(options.tags)) {
+			fe.hashTags = new Set(options.tags);
+		}
+	}
 	
 	async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
 		async.waterfall(
@@ -153,27 +165,58 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 									},
 									(err, fileEntry, dupeEntries) => {
 										if(err) {
-											//	:TODO: Log me!!!
 											console.info(`Error: ${err.message}`);											
 											return nextFile(null);	//	try next anyway
-										}								
+										}
 
-										if(dupeEntries.length > 0) {
-											//	:TODO: Handle duplidates -- what to do here???
+										//
+										//	We'll update the entry if the following conditions are met:
+										//	* We have a single duplicate, and:
+										//	* --update-desc was passed or the existing entry's desc or
+										//	  longDesc are blank/empty
+										//
+										if(argv['update'] && 1 === dupeEntries.length) {
+											const FileEntry		= require('../../core/file_entry.js');
+											const existingEntry	= new FileEntry();
+
+											return existingEntry.load(dupeEntries[0].fileId, err => {
+												if(err) {
+													console.info('Dupe (cannot update)');
+													return nextFile(null);
+												}
+
+												//
+												//	Update only if tags or desc changed
+												//
+												const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
+												const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
+
+												if( tagsEq && 
+													fileEntry.desc === existingEntry.desc && 
+													fileEntry.descLong == existingEntry.descLong)
+												{
+													console.info('Dupe');
+													return nextFile(null);
+												}
+
+												console.info('Dupe (updating)');
+												updateTags(existingEntry);
+
+												finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
+													return nextFile(err);
+												});
+											});
+										} else if(dupeEntries.length > 0) {
 											console.info('Dupe');
 											return nextFile(null);
-										} else {
-											console.info('Done!');
-											if(Array.isArray(options.tags)) {
-												options.tags.forEach(tag => {
-													fileEntry.hashTags.add(tag);
-												});
-											}
-
-											finalizeEntryAndPersist(fileEntry, descHandler, err => {
-												return nextFile(err);
-											});
 										}
+										
+										console.info('Done!');
+										updateTags(fileEntry);
+										
+										finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
+											return nextFile(err);
+										});
 									}
 								);
 							});
@@ -518,7 +561,7 @@ function moveFiles() {
 
 function removeFiles() {
 	//
-	//	REMOVE SHA|FILE_ID [SHA|FILE_ID ...]
+	//	REMOVE FILENAME_WC|SHA|FILE_ID [SHA|FILE_ID ...]
 }
 
 function handleFileBaseCommand() {
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 5c20e3a5..c49200b0 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -65,6 +65,7 @@ scan args:
                                other sources such as FILE_ID.DIZ.
                                if PATH is specified, use DESCRIPT.ION at PATH instead
                                of looking in specific storage locations
+  --update                     attempt to update information for existing entries                               
 
 info args:
   --show-desc                  display short description, if any

From 1e2729186904620f9a65430c2db1bcb3e300492f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Sep 2017 23:27:28 -0600
Subject: [PATCH 0004/1013] Fix typo

---
 core/file_area_web.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_area_web.js b/core/file_area_web.js
index bac85de7..aa60974f 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -284,7 +284,7 @@ class FileAreaWebAccess {
 
 					resp.on('finish', () => {
 						//	transfer completed fully
-						this.updateDownloadStatsForUserIdAndSystemAndSystem(servedItem.userId, stats.size);
+						this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size);
 					});
 
 					const headers = {

From 42d61908024a1708360b3c56f13afbd8ab2fdcb4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Sep 2017 23:36:26 -0600
Subject: [PATCH 0005/1013] Additional logging

---
 core/servers/content/web.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 31c617e2..55fd37f2 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -148,7 +148,7 @@ exports.getModule = class WebServerModule extends ServerModule {
 
 		const routeKey = route.getRouteKey();
 		if(routeKey in this.routes) {
-			Log.warn( { route : route }, 'Cannot add route: duplicate method/path combination exists' );
+			Log.warn( { route : route, routeKey : routeKey }, 'Cannot add route: duplicate method/path combination exists' );
 			return false;
 		}
 

From 1c2926fbe91eeca49e40b7aedb794b8199bcff88 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Sep 2017 11:48:27 -0600
Subject: [PATCH 0006/1013] Roll farmhash version back - has bugs

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 219a4290..f8393142 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "farmhash": "^2.0.1",
+    "farmhash": "1.2.1",
     "fs-extra": "^4.0.1",
     "gaze": "^1.1.2",
     "graceful-fs": "^4.1.11",

From 3980c8acae3e1bbb6f0ee08460357fa0dda7e691 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Sep 2017 11:48:43 -0600
Subject: [PATCH 0007/1013] Add new file base system stats and MCI codes

---
 core/bbs.js            | 11 +++++++
 core/config.js         |  5 ++++
 core/file_base_area.js | 65 ++++++++++++++++++++++++++++++++++++++++++
 core/predefined_mci.js | 10 ++++++-
 core/string_util.js    |  4 +--
 5 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index c43d63a3..02058bce 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -234,6 +234,17 @@ function initialize(cb) {
 					}
 				);
 			},
+			function initFileAreaStats(callback) {
+				const getAreaStats = require('./file_base_area.js').getAreaStats;
+				getAreaStats( (err, stats) => {
+					if(!err) {
+						const StatLog = require('./stat_log.js');
+						StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
+					}
+
+					return callback(null);
+				});
+			},
 			function initMCI(callback) {
 				return require('./predefined_mci.js').init(callback);
 			},
diff --git a/core/config.js b/core/config.js
index 449a5c98..85632000 100644
--- a/core/config.js
+++ b/core/config.js
@@ -713,6 +713,11 @@ function getDefaultConfig() {
 					action		: '@method:core/message_area.js:trimMessageAreasScheduledEvent',
 				},
 
+				updateFileAreaStats : {
+					schedule	: 'every 1 hours',
+					action		: '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
+				},
+
 				forgotPasswordMaintenance : {
 					schedule	: 'every 24 hours',
 					action		: '@method:core/web_password_reset.js:performMaintenanceTask',
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 79b91ce8..93587aa7 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -13,6 +13,7 @@ const Log				= require('./logger.js').log;
 const resolveMimeType	= require('./mime_util.js').resolveMimeType;
 const stringFormat		= require('./string_format.js');
 const wordWrapText		= require('./word_wrap.js').wordWrapText;
+const StatLog			= require('./stat_log.js');
 
 //	deps
 const _				= require('lodash');
@@ -39,6 +40,10 @@ exports.changeFileAreaWithOptions		= changeFileAreaWithOptions;
 exports.scanFile						= scanFile;
 exports.scanFileAreaForChanges			= scanFileAreaForChanges;
 exports.getDescFromFileName				= getDescFromFileName;
+exports.getAreaStats					= getAreaStats;
+
+//	for scheduler:
+exports.updateAreaStatsScheduledEvent	= updateAreaStatsScheduledEvent;
 
 const WellKnownAreaTags					= exports.WellKnownAreaTags = {
 	Invalid				: '',
@@ -856,4 +861,64 @@ function getDescFromFileName(fileName) {
 	const name  = paths.basename(fileName, ext);
 
 	return _.upperFirst(name.replace(/[\-_.+]/g, ' ').replace(/\s+/g, ' '));
+}
+
+//
+//	Return an object of stats about an area(s)
+//
+//	{
+//		
+//		totalFiles : <totalFileCount>,
+//		totalBytes : <totalByteSize>,
+//		areas : {
+//			<areaTag> : {
+//				files : <fileCount>,
+//				bytes : <byteSize>
+//			}
+//		}
+//	}
+//
+function getAreaStats(cb) {	
+	FileDb.all(
+		`SELECT DISTINCT f.area_tag, COUNT(f.file_id) AS total_files, SUM(m.meta_value) AS total_byte_size
+		FROM file f, file_meta m
+		WHERE f.file_id = m.file_id AND m.meta_name='byte_size'
+		GROUP BY f.area_tag;`,
+		(err, statRows) => {
+			if(err) {
+				return cb(err);
+			}
+
+			if(!statRows || 0 === statRows.length) {
+				return cb(Errors.DoesNotExist('No file areas to acquire stats from'));
+			}
+
+			return cb(
+				null,
+				statRows.reduce( (stats, v) => {
+					stats.totalFiles = (stats.totalFiles || 0) + v.total_files;
+					stats.totalBytes = (stats.totalBytes || 0) + v.total_byte_size;
+
+					stats.areas = stats.areas || {};
+					
+					stats.areas[v.area_tag] = {
+						files 	: v.total_files,
+						bytes	: v.total_byte_size,
+					};
+					return stats;
+				}, {})
+			);
+		}
+	);
+}
+
+//	method exposed for event scheduler
+function updateAreaStatsScheduledEvent(args, cb) {
+	getAreaStats( (err, stats) => {		
+		if(!err) {
+			StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);	
+		}
+
+		return cb(err);
+	});
 }
\ No newline at end of file
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index afebd24c..ac8cffe7 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -201,12 +201,20 @@ const PREDEFINED_MCI_GENERATORS = {
 		const byteSize = StatLog.getSystemStatNum('ul_total_bytes');
 		return formatByteSize(byteSize, true);	//	true=withAbbr
 	},
+	TF	: function totalFilesOnSystem() {
+		const areaStats = StatLog.getSystemStat('file_base_area_stats');
+		return _.get(areaStats, 'totalFiles', 0).toString();
+	},
+	TB	: function totalBytesOnSystem() {
+		const areaStats		= StatLog.getSystemStat('file_base_area_stats');
+		const totalBytes	= parseInt(_.get(areaStats, 'totalBytes', 0));
+		return formatByteSize(totalBytes, true);	//	true=withAbbr
+	},
 
 	//	:TODO: PT - Messages posted *today* (Obv/2)
 	//		-> Include FTN/etc.
 	//	:TODO: NT - New users today (Obv/2)
 	//	:TODO: CT - Calls *today* (Obv/2)
-	//	:TODO: TF - Total files on the system (Obv/2)
 	//	:TODO: FT - Files uploaded/added *today* (Obv/2)
 	//	:TODO: DD - Files downloaded *today* (iNiQUiTY)
 	//	:TODO: TP - total message/posts on the system (Obv/2)
diff --git a/core/string_util.js b/core/string_util.js
index ed6df231..d6f5e08a 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -326,9 +326,7 @@ function formatByteSizeAbbr(byteSize) {
 	return SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
 }
 
-function formatByteSize(byteSize, withAbbr, decimals) {
-	withAbbr = withAbbr || false; 
-	decimals = decimals || 3;
+function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
 	const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
 	let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
 	if(withAbbr) {

From 9cc14b570894f4a0aa333b6e3ca27780eb5835f6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Sep 2017 12:11:55 -0600
Subject: [PATCH 0008/1013] Use nicely formatted number values for MCI stats

---
 core/predefined_mci.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index ac8cffe7..7fe921b3 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -45,11 +45,11 @@ function getUserRatio(client, propA, propB) {
 }
 
 function userStatAsString(client, statName, defaultValue) {
-	return (StatLog.getUserStat(client.user, statName) || defaultValue).toString();
+	return (StatLog.getUserStat(client.user, statName) || defaultValue).toLocaleString();
 }
 
 function sysStatAsString(statName, defaultValue) {
-	return (StatLog.getSystemStat(statName) || defaultValue).toString();
+	return (StatLog.getSystemStat(statName) || defaultValue).toLocaleString();
 }
 
 const PREDEFINED_MCI_GENERATORS = {
@@ -177,7 +177,7 @@ const PREDEFINED_MCI_GENERATORS = {
 
 	AN	: function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
 
-	TC	: function totalCalls() { return StatLog.getSystemStat('login_count').toString(); },
+	TC	: function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
 
 	RR	: function randomRumor() {
 		//	start the process of picking another random one
@@ -203,7 +203,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	},
 	TF	: function totalFilesOnSystem() {
 		const areaStats = StatLog.getSystemStat('file_base_area_stats');
-		return _.get(areaStats, 'totalFiles', 0).toString();
+		return _.get(areaStats, 'totalFiles', 0).toLocaleString();
 	},
 	TB	: function totalBytesOnSystem() {
 		const areaStats		= StatLog.getSystemStat('file_base_area_stats');

From d545c86616135142a33b7fd93fb01bc809cd079b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Sep 2017 12:34:31 -0600
Subject: [PATCH 0009/1013] Add {totalFiles} and {totalBytes} stats to area
 selection

---
 mods/file_base_area_select.js | 62 +++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/mods/file_base_area_select.js b/mods/file_base_area_select.js
index 5eef583b..ca182d6c 100644
--- a/mods/file_base_area_select.js
+++ b/mods/file_base_area_select.js
@@ -3,14 +3,12 @@
 
 //	enigma-bbs
 const MenuModule						= require('../core/menu_module.js').MenuModule;
-const Config							= require('../core/config.js').config;
 const stringFormat						= require('../core/string_format.js');
-const ViewController					= require('../core/view_controller.js').ViewController;
 const getSortedAvailableFileAreas		= require('../core/file_base_area.js').getSortedAvailableFileAreas;
+const StatLog							= require('../core/stat_log.js');
 
 //	deps
-const async			= require('async');
-const _				= require('lodash');
+const async								= require('async');
 
 exports.moduleInfo = {
 	name	: 'File Area Selector',
@@ -60,25 +58,47 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 				return cb(err);
 			}
 
-			this.prepViewController('allViews', 0, { mciMap : mciData.menu }, (err, vc) => {
-				if(err) {
+			const self = this;
+
+			async.series(
+				[
+					function mergeAreaStats(callback) {
+						const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
+
+						self.availAreas.forEach(area => {
+							const stats = areaStats.areas[area.areaTag];
+							area.totalFiles = stats ? stats.files : 0;
+							area.totalBytes	= stats ? stats.bytes : 0;
+						});
+
+						return callback(null);
+					},
+					function prepView(callback) {
+						self.prepViewController('allViews', 0, { mciMap : mciData.menu }, (err, vc) => {
+							if(err) {
+								return callback(err);
+							}
+
+							const areaListView = vc.getView(MciViewIds.areaList);
+
+							const areaListFormat = self.config.areaListFormat || '{name}';
+
+							areaListView.setItems(self.availAreas.map(a => stringFormat(areaListFormat, a) ) );
+
+							if(self.config.areaListFocusFormat) {
+								areaListView.setFocusItems(self.availAreas.map(a => stringFormat(self.config.areaListFocusFormat, a) ) );
+							}
+
+							areaListView.redraw();
+
+							return callback(null);
+						});
+					}
+				],
+				err => {
 					return cb(err);
 				}
-
-				const areaListView = vc.getView(MciViewIds.areaList);
-
-				const areaListFormat = this.config.areaListFormat || '{name}';
-
-				areaListView.setItems(this.availAreas.map(a => stringFormat(areaListFormat, a) ) );
-
-				if(this.config.areaListFocusFormat) {
-					areaListView.setFocusItems(this.availAreas.map(a => stringFormat(this.config.areaListFocusFormat, a) ) );
-				}
-
-				areaListView.redraw();
-
-				return cb(null);
-			});
+			);
 		});
 	}
 };

From 9d093905619c7cd6ec10255b943409399eb1b5d5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Sep 2017 13:59:23 -0600
Subject: [PATCH 0010/1013] Add countWithAbbr and countAbbr format specifiers

---
 core/string_format.js | 18 ++++++++++++------
 core/string_util.js   | 29 +++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/core/string_format.js b/core/string_format.js
index dd1ece78..297d92b2 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -2,12 +2,15 @@
 'use strict';
 
 const EnigError				= require('./enig_error.js').EnigError;
-const pad					= require('./string_util.js').pad;
-const stylizeString			= require('./string_util.js').stylizeString;
-const renderStringLength	= require('./string_util.js').renderStringLength;
-const renderSubstr			= require('./string_util.js').renderSubstr;
-const formatByteSize		= require('./string_util.js').formatByteSize;
-const formatByteSizeAbbr	= require('./string_util.js').formatByteSizeAbbr;		
+
+const {
+	pad,
+	stylizeString, 
+	renderStringLength,
+	renderSubstr,
+	formatByteSize, formatByteSizeAbbr,
+	formatCount, formatCountAbbr,
+}							= require('./string_util.js');
 
 //	deps
 const _				= require('lodash');
@@ -273,6 +276,9 @@ const transformers = {
 	sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
 	sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
 	sizeAbbr			: (n) => formatByteSizeAbbr(n),
+	countWithAbbr		: (n) => formatCount(n, true, 0),
+	countWithoutAbbr	: (n) => formatCount(n, false, 0),
+	countAbbr			: (n) => formatCountAbbr(n),
 };
 
 function transformValue(transformerName, value) {
diff --git a/core/string_util.js b/core/string_util.js
index d6f5e08a..08987058 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -23,6 +23,8 @@ exports.renderSubstr				= renderSubstr;
 exports.renderStringLength			= renderStringLength;
 exports.formatByteSizeAbbr			= formatByteSizeAbbr;
 exports.formatByteSize				= formatByteSize;
+exports.formatCountAbbr				= formatCountAbbr;
+exports.formatCount					= formatCount;
 exports.cleanControlCodes			= cleanControlCodes;
 exports.isAnsi						= isAnsi;
 exports.isAnsiLine					= isAnsiLine;
@@ -316,21 +318,40 @@ function renderStringLength(s) {
 	return len;
 }
 
-const SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:) 
+const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:) 
 
 function formatByteSizeAbbr(byteSize) {
 	if(0 === byteSize) {
-		return SIZE_ABBRS[0];	//	B
+		return BYTE_SIZE_ABBRS[0];	//	B
 	}
 	
-	return SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
+	return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
 }
 
 function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
 	const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
 	let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
 	if(withAbbr) {
-		result += ` ${SIZE_ABBRS[i]}`; 
+		result += ` ${BYTE_SIZE_ABBRS[i]}`; 
+	}
+	return result;
+}
+
+const COUNT_ABBRS = [ '', 'K', 'M', 'B', 'T', 'P', 'E', 'Z', 'Y' ];
+
+function formatCountAbbr(count) {
+	if(count < 1000) {
+		return '';
+	}
+
+	return COUNT_ABBRS[Math.floor(Math.log(count) / Math.log(1000))];
+}
+
+function formatCount(count, withAbbr = false, decimals = 2) {
+	const i		= 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
+	let result	= parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
+	if(withAbbr) {
+		result += `${COUNT_ABBRS[i]}`; 
 	}
 	return result;
 }

From a91ae779be65ad30bea76edfd61aac63a22ac939 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 10 Sep 2017 20:51:30 -0600
Subject: [PATCH 0011/1013] Add skipAcsCheck option to getAvailableFileAReas()

---
 core/file_base_area.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 93587aa7..ed34607d 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -65,6 +65,10 @@ function getAvailableFileAreas(client, options) {
 			return true;
 		}
 
+		if(options.skipAcsCheck) {
+			return false;	//	no ACS checks (below)
+		}
+
 		if(options.writeAcs && !client.acs.hasFileAreaWrite(areaInfo)) {
 			return true;	//	omit
 		}
@@ -900,7 +904,7 @@ function getAreaStats(cb) {
 					stats.totalBytes = (stats.totalBytes || 0) + v.total_byte_size;
 
 					stats.areas = stats.areas || {};
-					
+
 					stats.areas[v.area_tag] = {
 						files 	: v.total_files,
 						bytes	: v.total_byte_size,

From 861055d93502ebdd1429627bba7230ee25f9aad3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 10 Sep 2017 20:51:43 -0600
Subject: [PATCH 0012/1013] Add some new ASCII output options to AnsiPrep

---
 core/ansi_prep.js  | 16 ++++++++++++----
 core/file_entry.js |  4 ++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/ansi_prep.js b/core/ansi_prep.js
index 29bd5ee4..45b93d32 100644
--- a/core/ansi_prep.js
+++ b/core/ansi_prep.js
@@ -23,6 +23,8 @@ module.exports = function ansiPrep(input, options, cb) {
 	options.rows				= options.rows || options.termHeight	|| 'auto';
 	options.startCol			= options.startCol || 1;
 	options.exportMode			= options.exportMode || false;
+	options.fillLines			= _.get(options, 'fillLines', true);
+	options.indent				= options.indent || 0;
 
 	//	in auto we start out at 25 rows, but can always expand for more
 	const canvas = Array.from( { length : 'auto' === options.rows ? 25 : options.rows }, () => Array.from( { length : options.cols}, () => new Object() ) );
@@ -111,15 +113,18 @@ module.exports = function ansiPrep(input, options, cb) {
 			const lastCol = getLastPopulatedColumn(row) + 1;
 
 			let i;
-			line = '';
+			line = options.indent ? 
+				output.length > 0 ? ' '.repeat(options.indent) : '' :
+				'';
+				
 			for(i = 0; i < lastCol; ++i) {
 				const col = row[i];
 
-				sgr = 0 === i ? 
+				sgr = !options.asciiMode && 0 === i ? 
 					col.initialSgr ? ANSI.getSGRFromGraphicRendition(col.initialSgr) : '' :
 					'';
 				
-				if(col.sgr) {
+				if(!options.asciiMode && col.sgr) {
 					sgr += ANSI.getSGRFromGraphicRendition(col.sgr);
 				}
 
@@ -129,7 +134,10 @@ module.exports = function ansiPrep(input, options, cb) {
 			output += line;
 
 			if(i < row.length) {
-				output += `${ANSI.blackBG()}${row.slice(i).map( () => ' ').join('')}`;//${lastSgr}`;
+				output += `${options.asciiMode ? '' : ANSI.blackBG()}`;
+				if(options.fillLines) {
+					output += `${row.slice(i).map( () => ' ').join('')}`;//${lastSgr}`;
+				}
 			}
 
 			if(options.startCol + i < options.termWidth || options.forceLineTerm) {
diff --git a/core/file_entry.js b/core/file_entry.js
index b88d41a0..02912c35 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -520,6 +520,10 @@ module.exports = class FileEntry {
 
 		sql += `${sqlWhere} ${sqlOrderBy};`;
 
+		if(_.isNumber(filter.limit)) {
+			sql += `LIMIT ${filter.limit}`;
+		}
+
 		const matchingFileIds = [];
 		fileDb.each(sql, (err, fileId) => {
 			if(fileId) {

From 50bac9585723f461856b320056c141a2b870b8ea Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 Sep 2017 21:01:35 -0600
Subject: [PATCH 0013/1013] * Fix ANSI description display during upload *
 Major improvements to upload: Allow user to properly edit descriptions even
 if provided by .diz/system/etc.

---
 core/multi_line_edit_text_view.js | 28 +++++++++++++-----
 core/string_util.js               |  4 +++
 mods/upload.js                    | 48 ++++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 9d46e8a1..55e84080 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -1068,9 +1068,9 @@ MultiLineEditTextView.prototype.setFocus = function(focused) {
 	MultiLineEditTextView.super_.prototype.setFocus.call(this, focused);
 };
 
-MultiLineEditTextView.prototype.setText = function(text) {
+MultiLineEditTextView.prototype.setText = function(text, options = { scrollMode : 'default' } ) {
 	this.textLines = [ ];
-	this.addText(text);
+	this.addText(text, options);
 	/*this.insertRawText(text);
 
 	if(this.isEditMode()) {
@@ -1085,13 +1085,27 @@ MultiLineEditTextView.prototype.setAnsi = function(ansi, options = { prepped : f
 	return this.setAnsiWithOptions(ansi, options, cb);
 };
 
-MultiLineEditTextView.prototype.addText = function(text) {
+MultiLineEditTextView.prototype.addText = function(text, options = { scrollMode : 'default' }) {
 	this.insertRawText(text);
 
-	if(this.isEditMode() || this.autoScroll) {
-		this.cursorEndOfDocument();
-	} else {
-		this.cursorStartOfDocument();
+	switch(options.scrollMode) {
+		case 'default' :
+			if(this.isEditMode() || this.autoScroll) {
+				this.cursorEndOfDocument();
+			} else {
+				this.cursorStartOfDocument();
+			}
+			break;
+
+		case 'top' :
+		case 'start' :
+			this.cursorStartOfDocument();
+			break;
+
+		case 'end' :
+		case 'bottom' :
+			this.cursorEndOfDocument();
+			break;
 	}
 };
 
diff --git a/core/string_util.js b/core/string_util.js
index 08987058..238aeeee 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -623,6 +623,10 @@ function isFormattedLine(line) {
 }
 
 function isAnsi(input) {
+	if(!input || 0 === input.length) {
+		return false;
+	}
+	
 	//
 	//	* ANSI found - limited, just colors
 	//	* Full ANSI art
diff --git a/mods/upload.js b/mods/upload.js
index 5c5fd5b2..30c84c48 100644
--- a/mods/upload.js
+++ b/mods/upload.js
@@ -15,6 +15,7 @@ const pathWithTerminatingSeparator		= require('../core/file_util.js').pathWithTe
 const Log								= require('../core/logger.js').log;
 const Errors							= require('../core/enig_error.js').Errors;
 const FileEntry							= require('../core/file_entry.js');
+const isAnsi							= require('../core/string_util.js').isAnsi;
 
 //	deps
 const async								= require('async');
@@ -421,9 +422,8 @@ exports.getModule = class UploadModule extends MenuModule {
 					return nextEntry(err);
 				}
 
-				//	if the file entry did *not* have a desc, take the user desc
-				if(!this.fileEntryHasDetectedDesc(newEntry)) {
-					newEntry.desc = newValues.shortDesc.trim();
+				if(!newEntry.descIsAnsi) {
+					newEntry.desc = _.trimEnd(newValues.shortDesc);
 				}
 
 				if(newValues.estYear.length > 0) {
@@ -659,14 +659,16 @@ exports.getModule = class UploadModule extends MenuModule {
 	displayFileDetailsPageForUploadEntry(fileEntry, cb) {
 		const self = this;
 		
-		async.series(
+		async.waterfall(
 			[
 				function prepArtAndViewController(callback) {
 					return self.prepViewControllerWithArt(
 						'fileDetails', 
 						FormIds.fileDetails,
 						{ clearScreen : true, trailingLF : false }, 
-						callback
+						err => {
+							return callback(err);
+						}
 					);
 				},
 				function populateViews(callback) {
@@ -679,18 +681,32 @@ exports.getModule = class UploadModule extends MenuModule {
 					tagsView.setText( Array.from(fileEntry.hashTags).join(',') );	//	:TODO: optional 'hashTagsSep' like file list/browse
 					yearView.setText(fileEntry.meta.est_release_year || '');
 
-					if(self.fileEntryHasDetectedDesc(fileEntry)) {
-						descView.setPropertyValue('mode', 'preview');
-						descView.setText(fileEntry.desc);						
-						descView.acceptsFocus = false;
-						self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.tags);						
-					} else {
-						descView.setPropertyValue('mode', 'edit');
-						descView.setText(getDescFromFileName(fileEntry.fileName));	//	try to come up with something good as a default
-						descView.acceptsFocus = true;
-						self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.desc);
-					}
+					if(isAnsi(fileEntry.desc)) {
+						fileEntry.descIsAnsi = true;
 
+						return descView.setAnsi(
+							fileEntry.desc,
+							{
+								prepped			: false,
+								forceLineTerm	: true,
+							},
+							() => {
+								return callback(null, descView, 'preview', MciViewIds.fileDetails.tags);
+							}
+						);
+					} else {
+						const hasDesc = self.fileEntryHasDetectedDesc(fileEntry);
+						descView.setText(
+							hasDesc ? fileEntry.desc : getDescFromFileName(fileEntry.fileName),
+							{ scrollMode : 'top' }	//	override scroll mode; we want to be @ top
+						);
+						return callback(null, descView, 'edit', hasDesc ? MciViewIds.fileDetails.tags : MciViewIds.fileDetails.desc);
+					}
+				},
+				function finalizeViews(descView, descViewMode, focusId, callback) {
+					descView.setPropertyValue('mode', descViewMode);
+					descView.acceptsFocus	= 'preview' === descViewMode ? false : true;
+					self.viewControllers.fileDetails.switchFocus(focusId);
 					return callback(null);
 				}
 			],

From 68247d87e81a23efd800b728f4d1c5329fb3dfb3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 Sep 2017 20:54:35 -0600
Subject: [PATCH 0014/1013] Add filename order by option for search

---
 core/file_base_filter.js | 1 +
 mods/menu.hjson          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index fadd41fd..a7185316 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -24,6 +24,7 @@ module.exports = class FileBaseFilters {
 			'user_rating',
 			'est_release_year',
 			'byte_size',
+			'file_name',
 		];			
 	}
 
diff --git a/mods/menu.hjson b/mods/menu.hjson
index d1822cfc..dbe99d85 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -2762,6 +2762,7 @@
 								"rating",
 								"estimated year",
 								"size",
+								"filename",
 							]
 							argName: sortByIndex
 						}

From 1e250f06d9391c60a6ab7d06946c535acb5fedcb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Sep 2017 17:13:11 -0600
Subject: [PATCH 0015/1013] * Fix major issue with SQLite transactions + aync
 code causing collisions

---
 core/database.js   | 12 +++++--
 core/file_entry.js | 55 +++++++++++++++++--------------
 core/message.js    | 57 +++++++++++++++-----------------
 core/user.js       | 82 ++++++++++++++++------------------------------
 core/user_group.js | 13 +++++---
 mods/bbs_list.js   |  9 +++--
 mods/onelinerz.js  |  9 +++--
 package.json       |  1 +
 8 files changed, 116 insertions(+), 122 deletions(-)

diff --git a/core/database.js b/core/database.js
index d4fb4795..a6286279 100644
--- a/core/database.js
+++ b/core/database.js
@@ -6,6 +6,7 @@ const conf			= require('./config.js');
 
 //	deps
 const sqlite3		= require('sqlite3');
+const sqlite3Trans	= require('sqlite3-transactions');
 const paths			= require('path');
 const async			= require('async');
 const _				= require('lodash');
@@ -13,14 +14,19 @@ const assert		= require('assert');
 const moment		= require('moment');
 
 //	database handles
-let dbs = {};
+const dbs = {};
 
+exports.getTransactionDatabase		= getTransactionDatabase;
 exports.getModDatabasePath			= getModDatabasePath;
 exports.getISOTimestampString		= getISOTimestampString;
 exports.initializeDatabases			= initializeDatabases;
 
 exports.dbs							= dbs;
 
+function getTransactionDatabase(db) {
+	return new sqlite3Trans.TransactionDatabase(db);
+}
+
 function getDatabasePath(name) {
 	return paths.join(conf.config.paths.db, `${name}.sqlite3`);
 }
@@ -55,7 +61,7 @@ function getISOTimestampString(ts) {
 
 function initializeDatabases(cb) {
 	async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
-		dbs[dbName] = new sqlite3.Database(getDatabasePath(dbName), err => {
+		dbs[dbName] = new sqlite3Trans.TransactionDatabase(new sqlite3.Database(getDatabasePath(dbName), err => {
 			if(err) {
 				return cb(err);
 			}
@@ -65,7 +71,7 @@ function initializeDatabases(cb) {
 					return next(null);
 				});
 			});
-		});
+		}));
 	}, err => {
 		return cb(err);
 	});
diff --git a/core/file_entry.js b/core/file_entry.js
index 02912c35..3a5b3df2 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -110,9 +110,8 @@ module.exports = class FileEntry {
 		}
 
 		const self = this;
-		let inTransaction = false;
 
-		async.series(
+		async.waterfall(
 			[
 				function check(callback) {
 					if(isUpdate && !self.fileId) {
@@ -121,22 +120,20 @@ module.exports = class FileEntry {
 					return callback(null);
 				},
 				function startTrans(callback) {
-					return fileDb.run('BEGIN;', callback);
+					return fileDb.beginTransaction(callback);
 				},
-				function storeEntry(callback) {
-					inTransaction = true;
-
+				function storeEntry(trans, callback) {
 					if(isUpdate) {
-						fileDb.run(
+						trans.run(
 							`REPLACE INTO file (file_id, area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
 							VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
 							[ self.fileId, self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
 							err => {
-								return callback(err);
+								return callback(err, trans);
 							}
 						);
 					} else {
-						fileDb.run(
+						trans.run(
 							`REPLACE INTO file (area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
 							VALUES(?, ?, ?, ?, ?, ?, ?);`,
 							[ self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
@@ -144,34 +141,34 @@ module.exports = class FileEntry {
 								if(!err) {
 									self.fileId = this.lastID;
 								}
-								return callback(err);
+								return callback(err, trans);
 							}
 						);
 					}
 				},
-				function storeMeta(callback) {
+				function storeMeta(trans, callback) {
 					async.each(Object.keys(self.meta), (n, next) => {
 						const v = self.meta[n];
-						return FileEntry.persistMetaValue(self.fileId, n, v, next);
+						return FileEntry.persistMetaValue(self.fileId, n, v, trans, next);
 					}, 
 					err => {
-						return callback(err);
+						return callback(err, trans);
 					});
 				},
-				function storeHashTags(callback) {
+				function storeHashTags(trans, callback) {
 					const hashTagsArray = Array.from(self.hashTags);
 					async.each(hashTagsArray, (hashTag, next) => {
-						return FileEntry.persistHashTag(self.fileId, hashTag, next);
+						return FileEntry.persistHashTag(self.fileId, hashTag, trans, next);
 					},
 					err => {
-						return callback(err);
+						return callback(err, trans);
 					});					
 				}
 			],
-			err => {
+			(err, trans) => {
 				//	:TODO: Log orig err
-				if(inTransaction) {
-					fileDb.run(err ? 'ROLLBACK;' : 'COMMIT;', err => {
+				if(trans) {
+					trans[err ? 'rollback' : 'commit'](err => {
 						return cb(err);
 					});
 				} else {
@@ -207,8 +204,13 @@ module.exports = class FileEntry {
 		);
 	}
 
-	static persistMetaValue(fileId, name, value, cb) {
-		return fileDb.run(
+	static persistMetaValue(fileId, name, value, transOrDb, cb) {
+		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+			cb = transOrDb;
+			transOrDb = fileDb;
+		}
+
+		return transOrDb.run(
 			`REPLACE INTO file_meta (file_id, meta_name, meta_value)
 			VALUES (?, ?, ?);`,
 			[ fileId, name, value ],
@@ -249,15 +251,20 @@ module.exports = class FileEntry {
 		);
 	}
 
-	static persistHashTag(fileId, hashTag, cb) {
-		fileDb.serialize( () => {
+	static persistHashTag(fileId, hashTag, transOrDb, cb) {
+		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+			cb = transOrDb;
+			transOrDb = fileDb;
+		}
+
+		transOrDb.serialize( () => {
 			fileDb.run(
 				`INSERT OR IGNORE INTO hash_tag (hash_tag)
 				VALUES (?);`, 
 				[ hashTag ]
 			);
 
-			fileDb.run(
+			transOrDb.run(
 				`REPLACE INTO file_hash_tag (hash_tag_id, file_id)
 				VALUES (
 					(SELECT hash_tag_id
diff --git a/core/message.js b/core/message.js
index 710444ce..a251ef50 100644
--- a/core/message.js
+++ b/core/message.js
@@ -321,8 +321,13 @@ Message.prototype.load = function(options, cb) {
 	);
 };
 
-Message.prototype.persistMetaValue = function(category, name, value, cb) {
-	const metaStmt = msgDb.prepare(
+Message.prototype.persistMetaValue = function(category, name, value, transOrDb, cb) {
+	if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+		cb = transOrDb;
+		transOrDb = msgDb;
+	}
+
+	const metaStmt = transOrDb.prepare(
 		`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
 		VALUES (?, ?, ?, ?);`);
 		
@@ -341,18 +346,6 @@ Message.prototype.persistMetaValue = function(category, name, value, cb) {
 	});
 };
 
-Message.startTransaction = function(cb) {
-	msgDb.run('BEGIN;', err => {
-		cb(err);
-	});
-};
-
-Message.endTransaction = function(hadError, cb) {
-	msgDb.run(hadError ? 'ROLLBACK;' : 'COMMIT;', err => {
-		cb(err);
-	});	
-};
-
 Message.prototype.persist = function(cb) {
 
 	if(!this.isValid()) {
@@ -361,14 +354,12 @@ Message.prototype.persist = function(cb) {
 
 	const self = this;
 	
-	async.series(
+	async.waterfall(
 		[
 			function beginTransaction(callback) {
-				Message.startTransaction(err => {
-					return callback(err);
-				});
+				return msgDb.beginTransaction(callback);
 			},
-			function storeMessage(callback) {
+			function storeMessage(trans, callback) {
 				//	generate a UUID for this message if required (general case)
 				const msgTimestamp = moment();
 				if(!self.uuid) {
@@ -379,7 +370,7 @@ Message.prototype.persist = function(cb) {
 						self.message);
 				}
 
-				msgDb.run(
+				trans.run(
 					`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
 					VALUES (?, ?, ?, ?, ?, ?, ?, ?);`, 
 					[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
@@ -388,13 +379,13 @@ Message.prototype.persist = function(cb) {
 							self.messageId = this.lastID;
 						}
 
-						return callback(err);
+						return callback(err, trans);
 					}
 				);
 			},
-			function storeMeta(callback) {
+			function storeMeta(trans, callback) {
 				if(!self.meta) {
-					return callback(null);
+					return callback(null, trans);
 				}
 				/*
 					Example of self.meta:
@@ -410,7 +401,7 @@ Message.prototype.persist = function(cb) {
 				*/
 				async.each(Object.keys(self.meta), (category, nextCat) => {
 					async.each(Object.keys(self.meta[category]), (name, nextName) => {
-						self.persistMetaValue(category, name, self.meta[category][name], err => {
+						self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
 							nextName(err);
 						});
 					}, err => {
@@ -418,18 +409,22 @@ Message.prototype.persist = function(cb) {
 					});
 						
 				}, err => {
-					callback(err);
+					callback(err, trans);
 				});					
 			},
-			function storeHashTags(callback) {
+			function storeHashTags(trans, callback) {
 				//	:TODO: hash tag support
-				return callback(null);
+				return callback(null, trans);
 			}
 		],
-		err => {
-			Message.endTransaction(err, transErr => {
-				return cb(err ? err : transErr, self.messageId);
-			});
+		(err, trans) => {
+			if(trans) {
+				trans[err ? 'rollback' : 'commit'](transErr => {
+					return cb(err ? err : transErr, self.messageId);
+				});
+			} else {
+				return cb(err);
+			}
 		}
 	);
 };
diff --git a/core/user.js b/core/user.js
index 15e5a844..fb125f6b 100644
--- a/core/user.js
+++ b/core/user.js
@@ -189,15 +189,13 @@ module.exports = class User {
 		//	:TODO: set various defaults, e.g. default activation status, etc.
 		self.properties.account_status = Config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
 
-		async.series(
+		async.waterfall(
 			[
 				function beginTransaction(callback) {
-					userDb.run('BEGIN;', err => {
-						return callback(err);
-					});
+					return userDb.beginTransaction(callback);
 				},
-				function createUserRec(callback) {
-					userDb.run(
+				function createUserRec(trans, callback) {
+					trans.run(
 						`INSERT INTO user (user_name)
 						VALUES (?);`,
 						[ self.username ],
@@ -213,11 +211,11 @@ module.exports = class User {
 								self.properties.account_status = User.AccountStatus.active;
 							}
 							
-							return callback(null);
+							return callback(null, trans);
 						}
 					);
 				},
-				function genAuthCredentials(callback) {
+				function genAuthCredentials(trans, callback) {
 					User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
 						if(err) {
 							return callback(err);
@@ -225,85 +223,56 @@ module.exports = class User {
 						
 						self.properties.pw_pbkdf2_salt	= info.salt;
 						self.properties.pw_pbkdf2_dk	= info.dk;
-						return callback(null);
+						return callback(null, trans);
 					});
 				},
-				function setInitialGroupMembership(callback) {
+				function setInitialGroupMembership(trans, callback) {
 					self.groups = Config.users.defaultGroups;
 
 					if(User.RootUserID === self.userId) {	//	root/SysOp?
 						self.groups.push('sysops');
 					}
 
-					return callback(null);
+					return callback(null, trans);
 				},
-				function saveAll(callback) {
-					self.persist(false, err => {
-						return callback(err);
+				function saveAll(trans, callback) {
+					self.persistWithTransaction(trans, err => {
+						return callback(err, trans);
 					});
 				}
 			],
-			err => {
-				if(err) {
-					const originalError = err;
-					userDb.run('ROLLBACK;', err => {
-						assert(!err);
-						return cb(originalError);
+			(err, trans) => {
+				if(trans) {
+					trans[err ? 'rollback' : 'commit'](transErr => {
+						return cb(err ? err : transErr);
 					});
 				} else {
-					userDb.run('COMMIT;', err => {
-						return cb(err);
-					});
+					return cb(err);
 				}
 			}
 		);
 	}
 
-	persist(useTransaction, cb) {
+	persistWithTransaction(trans, cb) {
 		assert(this.userId > 0);
 
 		const self = this;
 
 		async.series(
 			[
-				function beginTransaction(callback) {
-					if(useTransaction) {
-						userDb.run('BEGIN;', err => {
-							return callback(err);
-						});
-					} else {
-						return callback(null);
-					}
-				},
 				function saveProps(callback) {
-					self.persistProperties(self.properties, err => {
+					self.persistProperties(self.properties, trans, err => {
 						return callback(err);
 					});
 				},
 				function saveGroups(callback) {
-					userGroup.addUserToGroups(self.userId, self.groups, err => {
+					userGroup.addUserToGroups(self.userId, self.groups, trans, err => {
 						return callback(err);
 					});
 				}
 			],
 			err => {
-				if(err) {
-					if(useTransaction) {
-						userDb.run('ROLLBACK;', err => {
-							return cb(err);
-						});
-					} else {
-						return cb(err);
-					}
-				} else {
-					if(useTransaction) {
-						userDb.run('COMMIT;', err => {
-							return cb(err);
-						});
-					} else {
-						return cb(null);
-					}
-				}
+				return cb(err);
 			}
 		);
 	}
@@ -340,13 +309,18 @@ module.exports = class User {
 		);
 	}
 
-	persistProperties(properties, cb) {
+	persistProperties(properties, transOrDb, cb) {
+		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+			cb = transOrDb;
+			transOrDb = userDb;
+		}
+
 		const self = this;
 
 		//	update live props
 		_.merge(this.properties, properties);
 
-		const stmt = userDb.prepare(
+		const stmt = transOrDb.prepare(
 			`REPLACE INTO user_property (user_id, prop_name, prop_value)
 			VALUES (?, ?, ?);`
 		);
diff --git a/core/user_group.js b/core/user_group.js
index 2fcaacf3..3903f2c3 100644
--- a/core/user_group.js
+++ b/core/user_group.js
@@ -33,8 +33,13 @@ function getGroupsForUser(userId, cb) {
 	});
 }
 
-function addUserToGroup(userId, groupName, cb) {
-	userDb.run(
+function addUserToGroup(userId, groupName, transOrDb, cb) {
+	if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+		cb = transOrDb;
+		transOrDb = userDb;
+	}
+
+	transOrDb.run(
 		'REPLACE INTO user_group_member (group_name, user_id) ' +
 		'VALUES(?, ?);',
 		[ groupName, userId ],
@@ -44,10 +49,10 @@ function addUserToGroup(userId, groupName, cb) {
 	);
 }
 
-function addUserToGroups(userId, groups, cb) {
+function addUserToGroups(userId, groups, transOrDb, cb) {
 
 	async.each(groups, function item(groupName, next) {
-		addUserToGroup(userId, groupName, next);
+		addUserToGroup(userId, groupName, transOrDb, next);
 	}, function complete(err) {
 		cb(err);
 	});
diff --git a/mods/bbs_list.js b/mods/bbs_list.js
index e24beba6..07af017c 100644
--- a/mods/bbs_list.js
+++ b/mods/bbs_list.js
@@ -3,7 +3,10 @@
 
 //	ENiGMA½
 const MenuModule			= require('../core/menu_module.js').MenuModule;
-const getModDatabasePath	= require('../core/database.js').getModDatabasePath;
+const { 
+	getModDatabasePath,
+	getTransactionDatabase
+}							= require('../core/database.js').getModDatabasePath;
 const ViewController		= require('../core/view_controller.js').ViewController;
 const ansi					= require('../core/ansi_term.js');
 const theme					= require('../core/theme.js');
@@ -392,10 +395,10 @@ exports.getModule = class BBSListModule extends MenuModule {
 		async.series(
 			[
 				function openDatabase(callback) {
-					self.database = new sqlite3.Database(
+					self.database = getTransactionDatabase(new sqlite3.Database(
 						getModDatabasePath(moduleInfo),
 						callback
-					);
+					));
 				},
 				function createTables(callback) {
 					self.database.serialize( () => {
diff --git a/mods/onelinerz.js b/mods/onelinerz.js
index 335c25ce..49ecd3db 100644
--- a/mods/onelinerz.js
+++ b/mods/onelinerz.js
@@ -3,7 +3,10 @@
 
 //	ENiGMA½
 const MenuModule			= require('../core/menu_module.js').MenuModule;
-const getModDatabasePath	= require('../core/database.js').getModDatabasePath;
+const { 
+	getModDatabasePath,
+	getTransactionDatabase
+}							= require('../core/database.js').getModDatabasePath;
 const ViewController		= require('../core/view_controller.js').ViewController;
 const theme					= require('../core/theme.js');
 const ansi					= require('../core/ansi_term.js');
@@ -263,12 +266,12 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 		async.series(
 			[
 				function openDatabase(callback) {
-					self.db = new sqlite3.Database(
+					self.db = getTransactionDatabase(new sqlite3.Database(
 						getModDatabasePath(exports.moduleInfo), 
 						err => {
 							return callback(err);
 						}
-					);
+					));
 				},
 				function createTables(callback) {
 					self.db.run(
diff --git a/package.json b/package.json
index f8393142..cdd1ab3a 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "ptyw.js": "NuSkooler/ptyw.js",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.9",
+    "sqlite3-transactions": "^0.0.5",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",

From 59826930e4026bdc679bdb0c4a025cc9c089145c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Sep 2017 17:24:26 -0600
Subject: [PATCH 0016/1013] Fix requires

---
 mods/bbs_list.js  | 4 +++-
 mods/onelinerz.js | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mods/bbs_list.js b/mods/bbs_list.js
index 07af017c..ec964a36 100644
--- a/mods/bbs_list.js
+++ b/mods/bbs_list.js
@@ -3,10 +3,12 @@
 
 //	ENiGMA½
 const MenuModule			= require('../core/menu_module.js').MenuModule;
+
 const { 
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../core/database.js').getModDatabasePath;
+}							= require('../core/database.js');
+
 const ViewController		= require('../core/view_controller.js').ViewController;
 const ansi					= require('../core/ansi_term.js');
 const theme					= require('../core/theme.js');
diff --git a/mods/onelinerz.js b/mods/onelinerz.js
index 49ecd3db..065c0a30 100644
--- a/mods/onelinerz.js
+++ b/mods/onelinerz.js
@@ -3,10 +3,12 @@
 
 //	ENiGMA½
 const MenuModule			= require('../core/menu_module.js').MenuModule;
-const { 
+
+const {
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../core/database.js').getModDatabasePath;
+}							= require('../core/database.js');
+
 const ViewController		= require('../core/view_controller.js').ViewController;
 const theme					= require('../core/theme.js');
 const ansi					= require('../core/ansi_term.js');

From 985a14629a76169a3223c3676d46bec5c18cc4d7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Sep 2017 20:16:42 -0600
Subject: [PATCH 0017/1013] Fix document output to better work with reality

---
 util/exiftool2desc.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/exiftool2desc.js b/util/exiftool2desc.js
index 210c800d..4b3b350f 100755
--- a/util/exiftool2desc.js
+++ b/util/exiftool2desc.js
@@ -43,12 +43,12 @@ function documentFile(metadata) {
 		return;
 	}
 
-	let desc = `${metadata.author||'Unknown Author'} - ${metadata.title||'Unknown'}`;
-	const created = moment(metadata.createdate);
-	if(created.isValid()) {
-		desc += ` (${created.format('YYYY')})`;
+	let result = metadata.author || '';
+	if(result) {
+		result += ' - ';
 	}
-	return desc;
+	result += metadata.title || 'Unknown Title';
+	return result;
 }
 
 function imageFile(metadata) {

From 5f9b3eb90d43f4b190cf5d9eea16bc8561450ba3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Sep 2017 21:05:38 -0600
Subject: [PATCH 0018/1013] Switch to sqltie-trans, a more updated transaction
 handling module

---
 README.md        | 2 +-
 core/database.js | 6 +++---
 docs/mods.md     | 9 +++++++++
 package.json     | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 docs/mods.md

diff --git a/README.md b/README.md
index 39ee0561..3795dd30 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
 ## Features Available Now
  * Multi platform: Anywhere [Node.js](https://nodejs.org/) runs likely works (known to work under Linux, FreeBSD, OpenBSD, OS X and Windows)
  * Unlimited multi node support (for all those BBS "callers"!)
- * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based mods
+ * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based [mods](docs/mods.md)
  * [MCI support](docs/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
diff --git a/core/database.js b/core/database.js
index a6286279..41aa7a41 100644
--- a/core/database.js
+++ b/core/database.js
@@ -6,7 +6,7 @@ const conf			= require('./config.js');
 
 //	deps
 const sqlite3		= require('sqlite3');
-const sqlite3Trans	= require('sqlite3-transactions');
+const sqlite3Trans	= require('sqlite3-trans');
 const paths			= require('path');
 const async			= require('async');
 const _				= require('lodash');
@@ -24,7 +24,7 @@ exports.initializeDatabases			= initializeDatabases;
 exports.dbs							= dbs;
 
 function getTransactionDatabase(db) {
-	return new sqlite3Trans.TransactionDatabase(db);
+	return sqlite3Trans.wrap(db);
 }
 
 function getDatabasePath(name) {
@@ -61,7 +61,7 @@ function getISOTimestampString(ts) {
 
 function initializeDatabases(cb) {
 	async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
-		dbs[dbName] = new sqlite3Trans.TransactionDatabase(new sqlite3.Database(getDatabasePath(dbName), err => {
+		dbs[dbName] = sqlite3Trans.wrap(new sqlite3.Database(getDatabasePath(dbName), err => {
 			if(err) {
 				return cb(err);
 			}
diff --git a/docs/mods.md b/docs/mods.md
new file mode 100644
index 00000000..3abc7e2f
--- /dev/null
+++ b/docs/mods.md
@@ -0,0 +1,9 @@
+# Mods
+
+
+## Existing Mods
+* **Married Bob Fetch Event**: An event for fetching the latest Married Bob ANSI's for display on you board. ACiDic release [ACD-MB4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MB4E.ZIP). Can also be [found on GitHub](https://github.com/NuSkooler/enigma-bbs-married_bob_evt)
+* **Latest Files Announcement**: An event for posting the latest file arrivals of your board to message areas such as FTN style networks. ACiDic release [ACD-LFA1.ZIP](https://l33t.codes/outgoing/ACD/ACD-LFA1.ZIP) Also [found on GitHub](https://github.com/NuSkooler/enigma-bbs-latest_files_announce_evt) 
+* **Message Post Event**: An event for posting messages/ads to networks. ACiDic release [ACD-MP4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MP4E.ZIP)
+
+See also [ACiDic BBS Mods by Myself](https://l33t.codes/acidic-mods-by-myself/)
\ No newline at end of file
diff --git a/package.json b/package.json
index cdd1ab3a..249a56c2 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "ptyw.js": "NuSkooler/ptyw.js",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.9",
-    "sqlite3-transactions": "^0.0.5",
+    "sqlite3-trans" : "^1.1.0",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",

From 7837a2a7bdd4db82a9c38e15a1c1c23aa760d860 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Sep 2017 21:11:17 -0600
Subject: [PATCH 0019/1013] Update sqlite3-trans version again

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 249a56c2..ef9da900 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "ptyw.js": "NuSkooler/ptyw.js",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.9",
-    "sqlite3-trans" : "^1.1.0",
+    "sqlite3-trans" : "^1.2.0",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",

From b0260049ba39b55050562017722e455d80d150dc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 Sep 2017 21:23:30 -0600
Subject: [PATCH 0020/1013] Add VTX hyperlink support for URLs

---
 core/ansi_term.js      | 13 ++++++++++++-
 core/client.js         |  7 ++++++-
 core/config.js         |  5 ++++-
 core/string_format.js  |  2 ++
 mods/file_area_list.js |  4 ++--
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/core/ansi_term.js b/core/ansi_term.js
index 8b4094f1..504a1709 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -56,7 +56,7 @@ exports.getSyncTERMFontFromAlias	= getSyncTERMFontFromAlias;
 exports.setSyncTermFontWithAlias	= setSyncTermFontWithAlias;
 exports.setCursorStyle				= setCursorStyle;
 exports.setEmulatedBaudRate			= setEmulatedBaudRate;
-
+exports.getVtxHyperlink		= getVtxHyperlink;
 
 //
 //	See also
@@ -485,3 +485,14 @@ function setEmulatedBaudRate(rate) {
 	}[rate] || 0;
 	return 0 === speed ? exports.emulationSpeed() : exports.emulationSpeed(1, speed);
 }
+
+function getVtxHyperlink(client, url, text) {
+	if(!client.terminalSupports('vtx_hyperlink')) {
+		return '';
+	}
+
+	text = text || url;
+
+	url = url.split('').map(c => c.charCodeAt(0)).join(';');
+	return `${ESC_CSI}1;${text.length};1;1;${url}\\`;
+}
\ No newline at end of file
diff --git a/core/client.js b/core/client.js
index 4501396d..71d7a9ad 100644
--- a/core/client.js
+++ b/core/client.js
@@ -493,10 +493,15 @@ Client.prototype.defaultHandlerMissingMod = function(err) {
 };
 
 Client.prototype.terminalSupports = function(query) {
+	const termClient = this.term.termClient;
+
 	switch(query) {
 		case 'vtx_audio' :
 			//	https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
-			return this.termClient === 'vtx';
+			return 'vtx' === termClient;
+
+		case 'vtx_hyperlink' :
+			return termClient === 'vtx';
 		
 		default : 
 			return false;
diff --git a/core/config.js b/core/config.js
index 85632000..75be7795 100644
--- a/core/config.js
+++ b/core/config.js
@@ -158,7 +158,10 @@ function getDefaultConfig() {
 			newUserNames		: [ 'new', 'apply' ],			//	Names reserved for applying
 
 			//	:TODO: Mystic uses TRASHCAN.DAT for this -- is there a reason to support something like that?
-			badUserNames		: [ 'sysop', 'admin', 'administrator', 'root', 'all' ],
+			badUserNames		: [ 
+				'sysop', 'admin', 'administrator', 'root', 'all',
+				'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
+			],
 		},
 
 		//	:TODO: better name for "defaults"... which is redundant here!
diff --git a/core/string_format.js b/core/string_format.js
index 297d92b2..7fb7109a 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -271,8 +271,10 @@ const transformers = {
 	styleMixed			: (s) => stylizeString(s, 'mixed'),
 	styleL33t			: (s) => stylizeString(s, 'l33t'),
 
+	//	:TODO:
 	//	toMegs(), toKilobytes(), ... 
 	//	toList(), toCommaList(), 
+	
 	sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
 	sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
 	sizeAbbr			: (n) => formatByteSizeAbbr(n),
diff --git a/mods/file_area_list.js b/mods/file_area_list.js
index 076d2a98..21b5557d 100644
--- a/mods/file_area_list.js
+++ b/mods/file_area_list.js
@@ -274,7 +274,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			} else {
 				const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-				entryInfo.webDlLink		= serveItem.url;
+				entryInfo.webDlLink		= ansi.getVtxHyperlink(this.client, serveItem.url) + serveItem.url;
 				entryInfo.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
 			}
 
@@ -497,7 +497,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 							const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-							self.currentFileEntry.entryInfo.webDlLink 	= url;
+							self.currentFileEntry.entryInfo.webDlLink 	= ansi.getVtxHyperlink(self.client, url) + url;
 							self.currentFileEntry.entryInfo.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
 
 							return callback(null);

From 1ad5b125f5bd54607757c183135de8c2aad21b37 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Sep 2017 23:03:21 -0600
Subject: [PATCH 0021/1013] oputil fb rm|remove|del|delete functionality

---
 core/file_entry.js              |  36 +++++-
 core/oputil/oputil_file_base.js | 190 +++++++++++++++++++++++---------
 core/oputil/oputil_help.js      |  14 ++-
 3 files changed, 178 insertions(+), 62 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 3a5b3df2..f5286dd3 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -11,6 +11,7 @@ const async					= require('async');
 const _						= require('lodash');
 const paths					= require('path');
 const fse					= require('fs-extra');
+const { unlink }			= require('graceful-fs');
 
 const FILE_TABLE_MEMBERS	= [ 
 	'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
@@ -541,6 +542,40 @@ module.exports = class FileEntry {
 		});
 	}
 
+	static removeEntry(srcFileEntry, options, cb) {
+		if(!_.isFunction(cb) && _.isFunction(options)) {
+			cb = options;
+			options = {};
+		}
+
+		async.series(
+			[
+				function removeFromDatabase(callback) {
+					fileDb.run(
+						`DELETE FROM file
+						WHERE file_id = ?;`,
+						[ srcFileEntry.fileId ],
+						err => {
+							return callback(err);
+						}
+					);
+				},
+				function optionallyRemovePhysicalFile(callback) {
+					if(true !== options.removePhysFile) {
+						return callback(null);
+					}
+
+					unlink(srcFileEntry.filePath, err => {
+						return callback(err);
+					});
+				}
+			],
+			err => {
+				return cb(err);
+			}
+		);
+	}
+
 	static moveEntry(srcFileEntry, destAreaTag, destStorageTag, destFileName, cb) {
 		if(!cb && _.isFunction(destFileName)) {
 			cb = destFileName;
@@ -550,7 +585,6 @@ module.exports = class FileEntry {
 		const srcPath	= srcFileEntry.filePath;
 		const dstDir	= FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
 		
-		
 		if(!dstDir) {
 			return cb(Errors.Invalid('Invalid storage tag'));
 		}
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 3f791267..d9ad9366 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -438,6 +438,62 @@ function scanFileAreas() {
 	);
 }
 
+function expandFileTargets(targets, cb) {
+	let entries = [];
+
+	//	Each entry may be PATH|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
+	const FileEntry = require('../../core/file_entry.js');
+
+	async.eachSeries(targets, (areaAndStorage, next) => {
+		const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
+
+		if(areaInfo) {
+			//	AREA_TAG[@STORAGE_TAG] - all files in area@tag
+			const findFilter = {
+				areaTag : areaAndStorage.areaTag,
+			};
+
+			if(areaAndStorage.storageTag) {
+				findFilter.storageTag = areaAndStorage.storageTag;
+			}
+
+			FileEntry.findFiles(findFilter, (err, fileIds) => {
+				if(err) {
+					return next(err);
+				}
+
+				async.each(fileIds, (fileId, nextFileId) => {
+					const fileEntry = new FileEntry();
+					fileEntry.load(fileId, err => {
+						if(!err) {
+							entries.push(fileEntry);
+						}
+						return nextFileId(err);
+					});
+				},
+				err => {
+					return next(err);
+				});
+			});
+
+		} else {
+			//	FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
+			//	:TODO: FULL_PATH -> entries
+			getFileEntries(areaAndStorage.pattern, (err, fileEntries) => {
+				if(err) {
+					return next(err);
+				}
+
+				entries = entries.concat(fileEntries);
+				return next(null);
+			});
+		}
+	},
+	err => {
+		return cb(err, entries);
+	});
+}
+
 function moveFiles() {
 	//
 	//	oputil fb move SRC [SRC2 ...] DST
@@ -450,8 +506,9 @@ function moveFiles() {
 	}
 
 	const moveArgs = argv._.slice(2);
-	let src = getAreaAndStorage(moveArgs.slice(0, -1));
-	let dst = getAreaAndStorage(moveArgs.slice(-1))[0];
+	const src = getAreaAndStorage(moveArgs.slice(0, -1));
+	const dst = getAreaAndStorage(moveArgs.slice(-1))[0];
+
 	let FileEntry;
 
 	async.waterfall(
@@ -465,8 +522,6 @@ function moveFiles() {
 				});
 			},
 			function validateAndExpandSourceAndDest(callback) {
-				let srcEntries = [];
-
 				const areaInfo = fileArea.getFileAreaByTag(dst.areaTag);
 				if(areaInfo) {
 					dst.areaInfo = areaInfo;
@@ -474,57 +529,9 @@ function moveFiles() {
 					return callback(Errors.DoesNotExist('Invalid or unknown destination area'));
 				}
 
-				//	Each SRC may be PATH|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
 				FileEntry = require('../../core/file_entry.js');
 
-				async.eachSeries(src, (areaAndStorage, next) => {					
-					const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
-
-					if(areaInfo) {
-						//	AREA_TAG[@STORAGE_TAG] - all files in area@tag
-						src.areaInfo = areaInfo;
-
-						const findFilter = {
-							areaTag : areaAndStorage.areaTag,
-						};
-
-						if(areaAndStorage.storageTag) {
-							findFilter.storageTag = areaAndStorage.storageTag;
-						}
-
-						FileEntry.findFiles(findFilter, (err, fileIds) => {
-							if(err) {
-								return next(err);
-							}
-
-							async.each(fileIds, (fileId, nextFileId) => {
-								const fileEntry = new FileEntry();
-								fileEntry.load(fileId, err => {
-									if(!err) {
-										srcEntries.push(fileEntry);
-									}
-									return nextFileId(err);
-								});
-							}, 
-							err => {
-								return next(err);
-							});
-						});
-
-					} else {
-						//	FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
-						//	:TODO: FULL_PATH -> entries
-						getFileEntries(areaAndStorage.pattern, (err, entries) => {
-							if(err) {
-								return next(err);
-							}
-
-							srcEntries = srcEntries.concat(entries);
-							return next(null);
-						});
-					}
-				},
-				err => {
+				expandFileTargets(src, (err, srcEntries) => {
 					return callback(err, srcEntries);
 				});
 			},
@@ -555,13 +562,80 @@ function moveFiles() {
 					return callback(err);
 				});
 			}
-		]
+		],
+		err => {
+			if(err) {
+				process.exitCode = ExitCodes.ERROR;
+				console.error(err.message);
+			}
+		}
 	);
 }
 
 function removeFiles() {
 	//
-	//	REMOVE FILENAME_WC|SHA|FILE_ID [SHA|FILE_ID ...]
+	//	oputil fb rm|remove|del|delete SRC [SRC2 ...]
+	//
+	//	SRC: FILENAME_WC|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
+	//
+	//	AREA_TAG[@STORAGE_TAG] remove all entries matching
+	//	supplied area/storage tags
+	//
+	//	--phys-file removes backing physical file(s)
+	//
+	if(argv._.length < 3) {
+		return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
+	}
+
+	const removePhysFile = argv['phys-file'];
+
+	const src =  getAreaAndStorage(argv._.slice(2));
+
+	async.waterfall(
+		[
+			function init(callback) {
+				return initConfigAndDatabases( err => {
+					if(!err) {
+						fileArea = require('../../core/file_base_area.js');
+					}
+					return callback(err);
+				});
+			},
+			function expandSources(callback) {
+				expandFileTargets(src, (err, srcEntries) => {
+					return callback(err, srcEntries);
+				});
+			},
+			function removeEntries(srcEntries, callback) {
+				const FileEntry = require('../../core/file_entry.js');
+
+				const extraOutput = removePhysFile ? ' (including physical file)' : '';
+
+				async.eachSeries(srcEntries, (entry, nextEntry) => {
+
+					process.stdout.write(`Removing ${entry.filePath}${extraOutput}... `);
+
+					FileEntry.removeEntry(entry, { removePhysFile }, err => {
+						if(err) {
+							console.info(`Failed: ${err.message}`);
+						} else {
+							console.info('Done');
+						}
+
+						return nextEntry(err);
+					});
+				}, err => {
+					return callback(err);
+				});
+			}
+		],
+		err => {
+			if(err) {
+				process.exitCode = ExitCodes.ERROR;
+				console.error(err.message);
+			}
+		}
+	);
 }
 
 function handleFileBaseCommand() {
@@ -582,7 +656,13 @@ function handleFileBaseCommand() {
 	return ({
 		info	: displayFileAreaInfo,
 		scan	: scanFileAreas,
+
+		mv		: moveFiles,
 		move	: moveFiles,
+
+		rm		: removeFiles,
 		remove	: removeFiles,
+		del		: removeFiles,
+		delete	: removeFiles,
 	}[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index c49200b0..1a2b42bf 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -45,7 +45,7 @@ import-areas args:
   --type TYPE              specifies area import type. valid options are "bbs" and "na"
 `,
 	FileBase :
-`usage: oputil.js fb <action> [<args>] <AREA_TAG|SHA|FILE_ID[@STORAGE_TAG] ...> [<args>]
+`usage: oputil.js fb <action> [<args>]
 
 actions:
   scan AREA_TAG[@STORAGE_TAG]  scan specified area
@@ -53,14 +53,16 @@ actions:
   info AREA_TAG|SHA|FILE_ID    display information about areas and/or files
                                SHA may be a full or partial SHA-256
 
-  move SRC [SRC...]] DST       move entry(s) from SRC to DST
-                               * SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
-                               * DST: AREA_TAG[@STORAGE_TAG]
+  mv SRC [SRC...] DST          move entry(s) from SRC to DST
+                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+                               DST: AREA_TAG[@STORAGE_TAG]
 
-  remove SHA|FILE_ID           removes a entry from the system
+  rm SRC [SRC...]              remove entry(s) from the system matching SRC
+                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
 
 scan args:
   --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
+
   --desc-file [PATH]           prefer file descriptions from DESCRIPT.ION file over
                                other sources such as FILE_ID.DIZ.
                                if PATH is specified, use DESCRIPT.ION at PATH instead
@@ -71,7 +73,7 @@ info args:
   --show-desc                  display short description, if any
 
 remove args:
-  --delete                     also remove underlying physical file
+  --phys-file                  also remove underlying physical file
 `,
   FileOpsInfo :
 `

From 48c6edc5b39b478c0c2366c9eb2625f6ac3bc99e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Sep 2017 23:17:16 -0600
Subject: [PATCH 0022/1013] Rename VTX Hyperlink stuff

---
 core/ansi_term.js      | 8 ++++----
 core/client.js         | 2 +-
 mods/file_area_list.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/ansi_term.js b/core/ansi_term.js
index 504a1709..7eb10ec2 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -56,7 +56,7 @@ exports.getSyncTERMFontFromAlias	= getSyncTERMFontFromAlias;
 exports.setSyncTermFontWithAlias	= setSyncTermFontWithAlias;
 exports.setCursorStyle				= setCursorStyle;
 exports.setEmulatedBaudRate			= setEmulatedBaudRate;
-exports.getVtxHyperlink		= getVtxHyperlink;
+exports.vtxHyperlink		= vtxHyperlink;
 
 //
 //	See also
@@ -486,13 +486,13 @@ function setEmulatedBaudRate(rate) {
 	return 0 === speed ? exports.emulationSpeed() : exports.emulationSpeed(1, speed);
 }
 
-function getVtxHyperlink(client, url, text) {
+function vtxHyperlink(client, url, len) {
 	if(!client.terminalSupports('vtx_hyperlink')) {
 		return '';
 	}
 
-	text = text || url;
+	len = len || url.length;
 
 	url = url.split('').map(c => c.charCodeAt(0)).join(';');
-	return `${ESC_CSI}1;${text.length};1;1;${url}\\`;
+	return `${ESC_CSI}1;${len};1;1;${url}\\`;
 }
\ No newline at end of file
diff --git a/core/client.js b/core/client.js
index 71d7a9ad..08776bf4 100644
--- a/core/client.js
+++ b/core/client.js
@@ -501,7 +501,7 @@ Client.prototype.terminalSupports = function(query) {
 			return 'vtx' === termClient;
 
 		case 'vtx_hyperlink' :
-			return termClient === 'vtx';
+			return 'vtx' === termClient;
 		
 		default : 
 			return false;
diff --git a/mods/file_area_list.js b/mods/file_area_list.js
index 21b5557d..64a663cb 100644
--- a/mods/file_area_list.js
+++ b/mods/file_area_list.js
@@ -274,7 +274,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			} else {
 				const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-				entryInfo.webDlLink		= ansi.getVtxHyperlink(this.client, serveItem.url) + serveItem.url;
+				entryInfo.webDlLink		= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
 				entryInfo.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
 			}
 
@@ -497,7 +497,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 							const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-							self.currentFileEntry.entryInfo.webDlLink 	= ansi.getVtxHyperlink(self.client, url) + url;
+							self.currentFileEntry.entryInfo.webDlLink 	= ansi.vtxHyperlink(self.client, url) + url;
 							self.currentFileEntry.entryInfo.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
 
 							return callback(null);

From 68da131b1b13749b5fc6caf90e19b4c6b21f8754 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Sep 2017 09:58:43 -0600
Subject: [PATCH 0023/1013] Fix waterfall error

---
 core/theme.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/theme.js b/core/theme.js
index c5b90233..0796b8ab 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -580,7 +580,11 @@ function displayThemedPrompt(name, client, options, cb) {
 					client,
 					dispOptions,
 					(err, artInfo) => {
-						return callback(err, promptConfig, artInfo);
+						if(err) {
+							return callback(err);
+						}
+
+						return callback(null, promptConfig, artInfo);
 					}
 				);
 			},

From d5334270c497090a5561e5c152017e6e8cbf903f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Sep 2017 09:58:57 -0600
Subject: [PATCH 0024/1013] Update default menu.hjson - fix parse error

---
 mods/menu.hjson | 82 +++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 51 deletions(-)

diff --git a/mods/menu.hjson b/mods/menu.hjson
index d1822cfc..15a59cb8 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -598,7 +598,17 @@
 		fullLoginSequenceOnelinerz: {
 			desc: Viewing Onelinerz
 			module: onelinerz
-			next: fullLoginSequenceNewScanConfirm
+			next: [
+				{
+					//	calls >= 2
+					acs: NC2
+					next: fullLoginSequenceNewScanConfirm
+				}
+				{
+					// new users - skip new scan
+					next: fullLoginSequenceUserStats
+				}
+			]
 			options: {
 				cls: true
 			}
@@ -1006,28 +1016,33 @@
 				}
 			]
 		}
+
 		mainMenuLastCallers: {
 			desc: Last Callers
 			module: last_callers
 			art: LASTCALL
 			options: { pause: true }
 		}
+
 		mainMenuWhosOnline: {
 			desc: Who's Online
 			module: whos_online
 			art: WHOSON
 			options: { pause: true }
 		}
+
 		mainMenuUserStats: {
 			desc: User Stats
 			art: STATUS
 			options: { pause: true }
 		}
+
 		mainMenuSystemStats: {
 			desc: System Stats
 			art: SYSSTAT
 			options: { pause: true }
 		}
+
 		mainMenuUserList: {
 			desc: User Listing
 			module: user_list
@@ -1615,15 +1630,11 @@
 					action: @systemMethod:prevMenu
 				}
 				{
-					value: { command: "1" }
+					value: { command: "PW" }
 					action: @menu:doorPimpWars
 				}
 				{
-					value: { command: "2" }
-					action: @menu:doorLORD
-				}
-				{
-					value: { command: "4" }
+					value: { command: "TW" }
 					action: @menu:doorTradeWars2002BBSLink
 				}
 				{
@@ -1635,19 +1646,22 @@
 					action: @menu:doorParty
 				}
 				{
-					value: { command: "HL" }
-					action: @menu:telnetBridgeHappyLand
+					value: { command: "AGENT" }
+					action: @menu:telnetBridgeAgency
 				}
 			]
 		}
 
+		//
+		//	Example using the abracadabra module for a retro DOS door
+		//
 		doorPimpWars: {
 			desc: Playing PimpWars
 			module: abracadabra
 			config: {
 				name: PimpWars
 				dropFileType: DORINFO
-				cmd: /home/nuskooler/DOS/scripts/pimpwars.sh
+				cmd: /home/enigma/DOS/scripts/pimpwars.sh
 				args: [
 					"{node}",
 					"{dropFile}",
@@ -1659,37 +1673,6 @@
 			}
 		}
 
-		doorDarkLands: {
-			desc: Playing Dark Lands
-			module: abracadabra
-			config: {
-				name: DARKLANDS
-				dropFileType: DOOR
-				cmd: /home/nuskooler/dev/enigma-bbs/doors/darklands/start.sh
-				args: [
-					"{node}",
-					"{dropFile}",
-					"{srvPort}",
-				],
-				nodeMax: 1
-				tooManyArt: DOORMANY
-				io: socket
-			}
-		}
-
-		doorLORD: {
-			desc: Playing L.O.R.D.
-			module: abracadabra
-			config: {
-				name: LORD
-				dropFileType: DOOR
-				cmd: /usr/bin/dosemu
-				args: [
-					"-quiet", "-f", "/home/nuskooler/DOS/X/LORD/dosemu.conf", "X:\\LORD\\START.BAT {node}"
-				]
-			}
-		}
-
 		//
 		//	TradeWars 2000 example via BBSLink
 		//
@@ -1706,6 +1689,7 @@
 			}
 		}
 
+		//	DoorParty! support. You'll need to registger to obtain credentials
 		doorParty: {
 			desc: Using DoorParty!
 			module: @systemModule:door_party
@@ -1716,14 +1700,11 @@
 			}
 		}
 
-		telnetBridgeHappyLand: {
+		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
 			module: telnet_bridge
 			config: {
-				host: andrew.homeunix.org
-				port: 2023
-				//host: agency.bbs.geek.nz
-				//port: 23
+				host: agency.bbs.geek.nz
 			}
 		}
 
@@ -2069,12 +2050,11 @@
 				}
 
 				3: {
-					HM: {
-						mci: {
-							HM1: {
-								items: [ "save", "discard", "quote", "help" ]
-							}
+					mci: {
+						HM1: {
+							items: [ "save", "discard", "quote", "help" ]
 						}
+					}
 
 					submit: {
 						*: [

From 47551b18034c872f349b281756c9715c71a37e75 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Sep 2017 11:15:26 -0600
Subject: [PATCH 0025/1013] Add isNixTerm(), use includes vs indexOf on array
 search

---
 core/client_term.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/client_term.js b/core/client_term.js
index 9992f9f3..b313841e 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -110,6 +110,17 @@ ClientTerminal.prototype.disconnect = function() {
 	this.output = null;
 };
 
+ClientTerminal.prototype.isNixTerm = function() {
+	//
+	//	Standard *nix type terminals
+	//
+	if(this.termType.startsWith('xterm')) {
+		return true;
+	}
+
+	return [ 'xterm', 'linux', 'screen', 'dumb', 'rxvt', 'konsole', 'gnome', 'x11 terminal emulator' ].includes(this.termType);
+};
+
 ClientTerminal.prototype.isANSI = function() {
 	//
 	//	ANSI terminals should be encoded to CP437
@@ -142,7 +153,7 @@ ClientTerminal.prototype.isANSI = function() {
 	//	linux:
 	//		* JuiceSSH (note: TERM=linux also)
 	//
-	return [ 'ansi', 'pcansi', 'pc-ansi', 'ansi-bbs', 'qansi', 'scoansi', 'syncterm' ].indexOf(this.termType) > -1;
+	return [ 'ansi', 'pcansi', 'pc-ansi', 'ansi-bbs', 'qansi', 'scoansi', 'syncterm' ].includes(this.termType);
 };
 
 //	:TODO: probably need to update these to convert IAC (0xff) -> IACIAC (escape it)

From e37409e9b5e350901564bfa74ca6980b09691f24 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Sep 2017 11:15:38 -0600
Subject: [PATCH 0026/1013] * Separate out DEL vs backspace when possible for
 ANSI-BBS terminals. *nix terminals don't send us what we need, but deal with
 it. * Handle delete in MultiLineTextEditView. More to come soon!

---
 core/client.js                    | 16 +++++++++++-
 core/multi_line_edit_text_view.js | 41 ++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/core/client.js b/core/client.js
index 08776bf4..424748a6 100644
--- a/core/client.js
+++ b/core/client.js
@@ -306,7 +306,21 @@ function Client(input, output) {
 				key.name = 'line feed';
 			} else if('\t' === s) {
 				key.name = 'tab';
-			} else if ('\b' === s || '\x7f' === s || '\x1b\x7f' === s || '\x1b\b' === s) {
+			} else if('\x7f' === s) {
+				//
+				//	Backspace vs delete is a crazy thing, especially in *nix.
+				//	- ANSI-BBS uses 0x7f for DEL
+				//	- xterm et. al clients send 0x7f for backspace... ugg.
+				//
+				//	See http://www.hypexr.org/linux_ruboff.php
+				//	And a great discussion @ https://lists.debian.org/debian-i18n/1998/04/msg00015.html
+				//
+				if(self.term.isNixTerm()) {
+					key.name	= 'backspace';
+				} else {
+					key.name	= 'delete';
+				}
+			} else if ('\b' === s || '\x1b\x7f' === s || '\x1b\b' === s) {
 				//	backspace, CTRL-H
 				key.name	= 'backspace';
 				key.meta	= ('\x1b' === s.charAt(0));
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 55e84080..68d8b3d6 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -67,7 +67,7 @@ const SPECIAL_KEY_MAP_DEFAULT = {
 	'line feed'		: [ 'return' ],
 	exit			: [ 'esc' ],
 	backspace		: [ 'backspace' ],
-	delete			: [ 'del' ],
+	delete			: [ 'delete' ],
 	tab				: [ 'tab' ],
 	up				: [ 'up arrow' ],
 	down			: [ 'down arrow' ],
@@ -354,21 +354,14 @@ function MultiLineEditTextView(options) {
 	};
 
 	this.removeCharactersFromText = function(index, col, operation, count) {
-		if('right' === operation) {
+		if('delete' === operation) {
 			self.textLines[index].text =
-				self.textLines[index].text.slice(col, count) +
+				self.textLines[index].text.slice(0, col) +
 				self.textLines[index].text.slice(col + count);
 
-			self.cursorPos.col -= count;
-
 			self.updateTextWordWrap(index);
 			self.redrawRows(self.cursorPos.row, self.dimens.height);
-
-			if(0 === self.textLines[index].text) {
-
-			} else {
-				self.redrawRows(self.cursorPos.row, self.dimens.height);
-			}
+			self.moveClientCursorToCursorPos();
 		} else if ('backspace' === operation) {
 			//	:TODO: method for splicing text
 			self.textLines[index].text =
@@ -868,11 +861,25 @@ function MultiLineEditTextView(options) {
 	};
 
 	this.keyPressDelete = function() {
-		self.removeCharactersFromText(
-			self.getTextLinesIndex(),
-			self.cursorPos.col,
-			'right',
-			1);
+		const lineIndex = self.getTextLinesIndex();
+
+		if(0 === self.cursorPos.col && 0 === self.textLines[lineIndex].text.length && self.textLines.length > 0) {
+			//
+			//	Start of line and nothing left. Just delete the line
+			//
+			self.removeCharactersFromText(
+				lineIndex,
+				0,
+				'delete line'
+			);
+		} else {
+			self.removeCharactersFromText(
+				lineIndex,
+				self.cursorPos.col,
+				'delete',
+				1
+			);
+		}
 
 		self.emitEditPosition();
 	};
@@ -1143,7 +1150,7 @@ const HANDLED_SPECIAL_KEYS = [
 	'line feed',
 	'insert',
 	'tab',
-	'backspace', 'del',
+	'backspace', 'delete',
 	'delete line',
 ];
 

From 88049a3c7ac47217b38b6bfa9889c049eadf7f9a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Sep 2017 11:35:12 -0600
Subject: [PATCH 0027/1013] Prefer FILE_ID.ANS > FILE_ID.DIZ

---
 core/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 75be7795..da210a75 100644
--- a/core/config.js
+++ b/core/config.js
@@ -653,8 +653,9 @@ function getDefaultConfig() {
 			fileNamePatterns: {
 				//	These are NOT case sensitive
 				//	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
+				//	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
 				desc		: [ 
-					'^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'
+					'^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'
 				],
 
 				//	common README filename - https://en.wikipedia.org/wiki/README

From 37c78209a8a78b6b11bb66b6adcd0a3be46b550e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:39:07 -0600
Subject: [PATCH 0028/1013] Fix up system internal file areas

---
 core/config.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/config.js b/core/config.js
index da210a75..549b44a2 100644
--- a/core/config.js
+++ b/core/config.js
@@ -689,14 +689,21 @@ function getDefaultConfig() {
 			//	Non-absolute paths are relative to |areaStoragePrefix|.
 			// 
 			storageTags : {
-				sys_msg_attach	: 'msg_attach',
+				sys_msg_attach		: 'sys_msg_attach',
+				sys_temp_download	: 'sys_temp_download',
 			},
 
 			areas: {
 				system_message_attachment : {
-					name		: 'Message attachments',
+					name		: 'System Message Attachments',
 					desc		: 'File attachments to messages',
-					storageTags	: 'sys_msg_attach',	//	may be string or array of strings
+					storageTags	: [ 'sys_msg_attach' ],
+				},
+
+				system_temporary_download : {
+					name		: 'System Temporary Downloads',
+					desc		: 'Temporary downloadables',
+					storageTags	: [ 'sys_temp_download' ],
 				}
 			}
 		},

From f105c25e17622360db297876f7f91b687cd2113c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:39:23 -0600
Subject: [PATCH 0029/1013] Add file_web_serve_batch table

---
 core/database.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/database.js b/core/database.js
index 41aa7a41..14b3bf95 100644
--- a/core/database.js
+++ b/core/database.js
@@ -374,6 +374,15 @@ const DB_INIT_TABLE = {
 			);`
 		);
 
+		dbs.file.run(
+			`CREATE TABLE IF NOT EXISTS file_web_serve_batch (
+				hash_id		VARCHAR NOT NULL,
+				file_id		INTEGER NOT NULL,
+
+				UNIQUE(hash_id, file_id)
+			);`
+		);
+
 		return cb(null);
 	}
 };
\ No newline at end of file

From 59da1a2461cdc4a2a17692799fc00d5db5b103b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:40:30 -0600
Subject: [PATCH 0030/1013] * Add getAvailableFileAreaTags() * Properly check
 area tags for system internal

---
 core/file_base_area.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index ed34607d..1d1062a9 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -28,6 +28,7 @@ const moment		= require('moment');
 
 exports.isInternalArea					= isInternalArea;
 exports.getAvailableFileAreas			= getAvailableFileAreas;
+exports.getAvailableFileAreaTags		= getAvailableFileAreaTags;
 exports.getSortedAvailableFileAreas		= getSortedAvailableFileAreas;
 exports.isValidStorageTag				= isValidStorageTag;
 exports.getAreaStorageDirectoryByTag	= getAreaStorageDirectoryByTag;
@@ -48,10 +49,11 @@ exports.updateAreaStatsScheduledEvent	= updateAreaStatsScheduledEvent;
 const WellKnownAreaTags					= exports.WellKnownAreaTags = {
 	Invalid				: '',
 	MessageAreaAttach	: 'system_message_attachment',
+	TempDownloads		: 'system_temporary_download',
 };
 
 function isInternalArea(areaTag) {
-	return areaTag === WellKnownAreaTags.MessageAreaAttach;
+	return [ WellKnownAreaTags.MessageAreaAttach, WellKnownAreaTags.TempDownloads ].includes(areaTag);
 }
 
 function getAvailableFileAreas(client, options) {
@@ -77,6 +79,10 @@ function getAvailableFileAreas(client, options) {
 	});
 }
 
+function getAvailableFileAreaTags(client, options) {
+	return _.map(getAvailableFileAreas(client, options), area => area.areaTag);
+}
+
 function getSortedAvailableFileAreas(client, options) {
 	const areas = _.map(getAvailableFileAreas(client, options), v => v);
 	sortAreasOrConfs(areas);

From 0f9e545b7bf62e516e32fc78e4ca8d069517b44e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:41:41 -0600
Subject: [PATCH 0031/1013] Allow filter on 1:n area tags in findFiles(). Add
 ability to calc sha256 if not already set (use sparingly!)

---
 core/file_entry.js | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index f5286dd3..84c6559f 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -11,7 +11,8 @@ const async					= require('async');
 const _						= require('lodash');
 const paths					= require('path');
 const fse					= require('fs-extra');
-const { unlink }			= require('graceful-fs');
+const { unlink, readFile }	= require('graceful-fs');
+const crypto				= require('crypto');
 
 const FILE_TABLE_MEMBERS	= [ 
 	'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
@@ -120,6 +121,26 @@ module.exports = class FileEntry {
 					}
 					return callback(null);
 				},
+				function calcSha256IfNeeded(callback) {
+					if(self.fileSha256) {
+						return callback(null);
+					}
+
+					if(isUpdate) {
+						return callback(Errors.MissingParam('fileSha256 property must be set for updates!'));
+					}
+
+					readFile(self.filePath, (err, data) => {
+						if(err) {
+							return callback(err);
+						}
+
+						const sha256 = crypto.createHash('sha256');
+						sha256.update(data);
+						self.fileSha256 = sha256.digest('hex');
+						return callback(null);
+					});
+				},
 				function startTrans(callback) {
 					return fileDb.beginTransaction(callback);
 				},
@@ -169,8 +190,8 @@ module.exports = class FileEntry {
 			(err, trans) => {
 				//	:TODO: Log orig err
 				if(trans) {
-					trans[err ? 'rollback' : 'commit'](err => {
-						return cb(err);
+					trans[err ? 'rollback' : 'commit'](transErr => {
+						return cb(transErr ? transErr : err);
 					});
 				} else {
 					return cb(err);
@@ -459,7 +480,12 @@ module.exports = class FileEntry {
 		}
 
 		if(filter.areaTag && filter.areaTag.length > 0) {
-			appendWhereClause(`f.area_tag = "${filter.areaTag}"`);
+			if(Array.isArray(filter.areaTag)) {
+				const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
+				appendWhereClause(`f.area_tag IN(${areaList})`);
+			} else {
+				appendWhereClause(`f.area_tag = "${filter.areaTag}"`);
+			}
 		}
 
 		if(filter.metaPairs && filter.metaPairs.length > 0) {

From 8479091d330aa21b934cec37ad1ce4766b491842 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:42:53 -0600
Subject: [PATCH 0032/1013] Filter out system areas

---
 mods/file_area_list.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/file_area_list.js b/mods/file_area_list.js
index 64a663cb..4937eb49 100644
--- a/mods/file_area_list.js
+++ b/mods/file_area_list.js
@@ -675,7 +675,13 @@ exports.getModule = class FileAreaList extends MenuModule {
 	loadFileIds(force, cb) {
 		if(force || (_.isUndefined(this.fileList) || _.isUndefined(this.fileListPosition))) {
 			this.fileListPosition	= 0;
-			FileEntry.findFiles(this.filterCriteria, (err, fileIds) => {
+
+			const filterCriteria = Object.assign({}, this.filterCriteria);
+			if(!filterCriteria.areaTag) {
+				filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(this.client);
+			}
+
+			FileEntry.findFiles(filterCriteria, (err, fileIds) => {
 				this.fileList = fileIds;
 				return cb(err);
 			});

From e555a28160ca2e0cb87c8ee754963e06c6e698c3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:43:22 -0600
Subject: [PATCH 0033/1013] Filter out system areas

---
 core/new_scan.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/new_scan.js b/core/new_scan.js
index 3c3f1371..a75a5b2d 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -2,13 +2,14 @@
 'use strict';
 
 //	ENiGMA½
-const msgArea			= require('./message_area.js');
-const MenuModule		= require('./menu_module.js').MenuModule;
-const ViewController	= require('./view_controller.js').ViewController;
-const stringFormat		= require('./string_format.js');
-const FileEntry			= require('./file_entry.js');
-const FileBaseFilters	= require('./file_base_filter.js');
-const Errors			= require('./enig_error.js').Errors;
+const msgArea						= require('./message_area.js');
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const stringFormat					= require('./string_format.js');
+const FileEntry						= require('./file_entry.js');
+const FileBaseFilters				= require('./file_base_filter.js');
+const Errors						= require('./enig_error.js').Errors;
+const { getAvailableFileAreaTags }	= require('./file_base_area.js');
 
 //	deps
 const _					= require('lodash');
@@ -166,8 +167,13 @@ exports.getModule = class NewScanModule extends MenuModule {
 
 	newScanFileBase(cb) {
 		//	:TODO: add in steps
+		const filterCriteria = {
+			newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
+			areaTag			: getAvailableFileAreaTags(this.client),
+		};
+
 		FileEntry.findFiles(
-			{ newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user) },
+			filterCriteria,
 			(err, fileIds) => {
 				if(err || 0 === fileIds.length) {
 					return cb(err ? err : Errors.DoesNotExist('No more new files'));

From dc2b3031fd95df19ea9a44090afad11ed7d3c395 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 Sep 2017 10:44:15 -0600
Subject: [PATCH 0034/1013] * Change how hashids are generated for web file
 area: include a 'type' * Add support for web *batch* downloads via streaming
 zip file creation * Add new web download manager and batch mode display * Add
 extra info to 'standard' downloads mod/menu

---
 core/file_area_web.js                  | 336 ++++++++++++++++++-------
 mods/file_base_download_manager.js     |  38 ++-
 mods/file_base_web_download_manager.js | 287 +++++++++++++++++++++
 package.json                           |   3 +-
 4 files changed, 560 insertions(+), 104 deletions(-)
 create mode 100644 mods/file_base_web_download_manager.js

diff --git a/core/file_area_web.js b/core/file_area_web.js
index aa60974f..a8d095d6 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -22,14 +22,7 @@ const paths			= require('path');
 const async			= require('async');
 const fs			= require('graceful-fs');
 const mimeTypes		= require('mime-types');
-const _				= require('lodash');
-
-	/*
-		:TODO:
-		* Load temp download URLs @ startup & set expire timers via scheduler.
-		* At creation, set expire timer via scheduler
-		* 
-	*/
+const yazl			= require('yazl');
 
 function notEnabledError() {
 	return Errors.General('Web server is not enabled', ErrNotEnabled);
@@ -59,7 +52,7 @@ class FileAreaWebAccess {
 						const routeAdded = self.webServer.instance.addRoute({
 							method	: 'GET',
 							path	: Config.fileBase.web.routePath,
-							handler	: self.routeWebRequestForFile.bind(self),
+							handler	: self.routeWebRequest.bind(self),
 						});
 						return callback(routeAdded ? null : Errors.General('Failed adding route'));
 					} else {
@@ -81,6 +74,13 @@ class FileAreaWebAccess {
 		return this.webServer.instance.isEnabled();
 	}
 
+	static getHashIdTypes() {
+		return {
+			SingleFile		: 0,
+			BatchArchive	: 1,
+		};
+	}
+
 	load(cb) {
 		//
 		//	Load entries, register expiration timers
@@ -141,12 +141,14 @@ class FileAreaWebAccess {
 			WHERE hash_id = ?`,
 			[ hashId ],
 			(err, result) => {
-				if(err) {
-					return cb(err);
+				if(err || !result) {
+					return cb(err ? err : Errors.DoesNotExist('Invalid or missing hash ID'));
 				}
 
 				const decoded = this.hashids.decode(hashId);
-				if(!result || 2 !== decoded.length) {
+
+				//	decode() should provide an array of [ userId, hashIdType, id, ... ]
+				if(!Array.isArray(decoded) || decoded.length < 3) {
 					return cb(Errors.Invalid('Invalid or unknown hash ID'));
 				}
 
@@ -155,7 +157,8 @@ class FileAreaWebAccess {
 					{
 						hashId			: hashId,
 						userId			: decoded[0],
-						fileId			: decoded[1],
+						hashIdType		: decoded[1],
+						fileIds			: decoded.slice(2),
 						expireTimestamp	: moment(result.expire_timestamp),
 					}
 				);
@@ -163,46 +166,26 @@ class FileAreaWebAccess {
 		);
 	}
 
-	getHashId(client, fileEntry) {
-		//
-		//	Hashid is a unique combination of userId & fileId
-		//
-		return this.hashids.encode(client.user.userId, fileEntry.fileId);
+	getSingleFileHashId(client, fileEntry) {
+		return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().SingleFile, [ fileEntry.fileId ] );
 	}
 
-	buildTempDownloadLink(client, fileEntry, hashId) {		
-		hashId = hashId || this.getHashId(client, fileEntry);
+	getBatchArchiveHashId(client, batchId) {
+		return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().BatchArchive, batchId);
+	}
+
+	getHashId(client, hashIdType, identifier) {
+		return this.hashids.encode(client.user.userId, hashIdType, identifier);
+	}
+
+	buildSingleFileTempDownloadLink(client, fileEntry, hashId) {
+		hashId = hashId || this.getSingleFileHashId(client, fileEntry);
 
 		return this.webServer.instance.buildUrl(`${Config.fileBase.web.path}${hashId}`);
-		/*
-			
-		//
-		//	Create a URL such as
-		//	https://l33t.codes:44512/f/qFdxyZr
-		//
-		//	Prefer HTTPS over HTTP. Be explicit about the port
-		//	only if non-standard.
-		//		
-		let schema;
-		let port;
-		if(_.isString(Config.contentServers.web.overrideUrlPrefix)) {
-			return `${Config.contentServers.web.overrideUrlPrefix}${Config.fileBase.web.path}${hashId}`;
-		} else {
-			if(Config.contentServers.web.https.enabled) {
-				schema	= 'https://';
-				port	=  (443 === Config.contentServers.web.https.port) ?
-					'' :
-					`:${Config.contentServers.web.https.port}`;
-			} else {
-				schema	= 'http://';
-				port	= (80 === Config.contentServers.web.http.port) ?
-					'' :
-					`:${Config.contentServers.web.http.port}`;
-			}
-			
-			return `${schema}${Config.contentServers.web.domain}${port}${Config.fileBase.web.path}${hashId}`;
-		}
-		*/
+	}
+
+	buildBatchArchiveTempDownloadLink(client, hashId) {
+		return this.webServer.instance.buildUrl(`${Config.fileBase.web.path}${hashId}`);
 	}
 
 	getExistingTempDownloadServeItem(client, fileEntry, cb) {
@@ -210,49 +193,95 @@ class FileAreaWebAccess {
 			return cb(notEnabledError());
 		}	
 
-		const hashId = this.getHashId(client, fileEntry);
+		const hashId = this.getSingleFileHashId(client, fileEntry);
 		this.loadServedHashId(hashId, (err, servedItem) => {
 			if(err) {
 				return cb(err);
 			}
 
-			servedItem.url = this.buildTempDownloadLink(client, fileEntry); 
+			servedItem.url = this.buildSingleFileTempDownloadLink(client, fileEntry); 
 
 			return cb(null, servedItem);
 		});		
 	}
 
+	_addOrUpdateHashIdRecord(dbOrTrans, hashId, expireTime, cb) {
+		//	add/update rec with hash id and (latest) timestamp
+		dbOrTrans.run(
+			`REPLACE INTO file_web_serve (hash_id, expire_timestamp)
+			VALUES (?, ?);`,
+			[ hashId, getISOTimestampString(expireTime) ],
+			err => {
+				if(err) {
+					return cb(err);
+				}
+
+				this.scheduleExpire(hashId, expireTime);
+				
+				return cb(null);
+			}
+		);
+	}
+
 	createAndServeTempDownload(client, fileEntry, options, cb) {
 		if(!this.isEnabled()) {
 			return cb(notEnabledError());
 		}
 
-		const hashId		= this.getHashId(client, fileEntry);
-		const url			= this.buildTempDownloadLink(client, fileEntry, hashId);		
+		const hashId		= this.getSingleFileHashId(client, fileEntry);
+		const url			= this.buildSingleFileTempDownloadLink(client, fileEntry, hashId);
 		options.expireTime	= options.expireTime || moment().add(2, 'days');
 
-		//	add/update rec with hash id and (latest) timestamp
-		FileDb.run(
-			`REPLACE INTO file_web_serve (hash_id, expire_timestamp)
-			VALUES (?, ?);`,
-			[ hashId, getISOTimestampString(options.expireTime) ],
-			err => {
+		this._addOrUpdateHashIdRecord(FileDb, hashId, options.expireTime, err => {
+			return cb(err, url);
+		});
+	}
+
+	createAndServeTempBatchDownload(client, fileEntries, options, cb) {
+		if(!this.isEnabled()) {
+			return cb(notEnabledError());
+		}
+
+		const batchId		= moment().utc().unix();
+		const hashId		= this.getBatchArchiveHashId(client, batchId);
+		const url			= this.buildBatchArchiveTempDownloadLink(client, hashId);
+		options.expireTime	= options.expireTime || moment().add(2, 'days');
+
+		FileDb.beginTransaction( (err, trans) => {
+			if(err) {
+				return cb(err);
+			}
+
+			this._addOrUpdateHashIdRecord(trans, hashId, options.expireTime, err => {
 				if(err) {
-					return cb(err);
+					return trans.rollback( () => {
+						return cb(err);
+					});
 				}
 
-				this.scheduleExpire(hashId, options.expireTime);
-				
-				return cb(null, url);
-			}
-		);
+				async.eachSeries(fileEntries, (entry, nextEntry) => {
+					trans.run(
+						`INSERT INTO file_web_serve_batch (hash_id, file_id)
+						VALUES (?, ?);`,
+						[ hashId, entry.fileId ],
+						err => {
+							return nextEntry(err);
+						}
+					);
+				}, err => {
+					trans[err ? 'rollback' : 'commit']( () => {
+						return cb(err, url);
+					});
+				});
+			});
+		});
 	}
 
 	fileNotFound(resp) {
 		return this.webServer.instance.fileNotFound(resp);
 	}
 
-	routeWebRequestForFile(req, resp) {
+	routeWebRequest(req, resp) {
 		const hashId = paths.basename(req.url);
 
 		this.loadServedHashId(hashId, (err, servedItem) => {
@@ -261,44 +290,157 @@ class FileAreaWebAccess {
 				return this.fileNotFound(resp);
 			}
 
-			const fileEntry = new FileEntry();
-			fileEntry.load(servedItem.fileId, err => {
+			const hashIdTypes = FileAreaWebAccess.getHashIdTypes();
+			switch(servedItem.hashIdType) {
+				case hashIdTypes.SingleFile :
+					return this.routeWebRequestForSingleFile(servedItem, req, resp);
+
+				case hashIdTypes.BatchArchive :
+					return this.routeWebRequestForBatchArchive(servedItem, req, resp);
+
+				default :
+					return this.fileNotFound(resp);
+			}
+		});
+	}
+
+	routeWebRequestForSingleFile(servedItem, req, resp) {
+		const fileEntry = new FileEntry();
+
+		servedItem.fileId = servedItem.fileIds[0];
+
+		fileEntry.load(servedItem.fileId, err => {
+			if(err) {
+				return this.fileNotFound(resp);
+			}
+
+			const filePath = fileEntry.filePath;
+			if(!filePath) {
+				return this.fileNotFound(resp);
+			}
+
+			fs.stat(filePath, (err, stats) => {
 				if(err) {
 					return this.fileNotFound(resp);
 				}
 
-				const filePath = fileEntry.filePath;
-				if(!filePath) {
+				resp.on('close', () => {
+					//	connection closed *before* the response was fully sent
+					//	:TODO: Log and such
+				});
+
+				resp.on('finish', () => {
+					//	transfer completed fully
+					this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size);
+				});
+
+				const headers = {
+					'Content-Type'			: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
+					'Content-Length'		: stats.size,
+					'Content-Disposition'	: `attachment; filename="${fileEntry.fileName}"`,
+				};
+
+				const readStream = fs.createReadStream(filePath);
+				resp.writeHead(200, headers);
+				return readStream.pipe(resp);
+			});
+		});
+	}
+
+	routeWebRequestForBatchArchive(servedItem, req, resp) {
+		//
+		//	We are going to build an on-the-fly zip file stream of 1:n
+		//	files in the batch.
+		//
+		//	First, collect all file IDs
+		//
+		const self = this;
+
+		async.waterfall(
+			[
+				function fetchFileIds(callback) {
+					FileDb.all(
+						`SELECT file_id
+						FROM file_web_serve_batch
+						WHERE hash_id = ?;`,
+						[ servedItem.hashId ],
+						(err, fileIdRows) => {
+							if(err || !Array.isArray(fileIdRows) || 0 === fileIdRows.length) {
+								return callback(Errors.DoesNotExist('Could not get file IDs for batch'));
+							}
+
+							return callback(null, fileIdRows.map(r => r.file_id));
+						}
+					);
+				},
+				function loadFileEntries(fileIds, callback) {
+					const filePaths = [];
+					async.eachSeries(fileIds, (fileId, nextFileId) => {
+						const fileEntry = new FileEntry();
+						fileEntry.load(fileId, err => {
+							if(!err) {
+								filePaths.push(fileEntry.filePath);
+							}
+							return nextFileId(err);
+						});
+					}, err => {
+						if(err) {
+							return callback(Errors.DoesNotExist('Coudl not load file IDs for batch'));
+						}
+
+						return callback(null, filePaths);
+					});
+				},
+				function createAndServeStream(filePaths, callback) {
+					const zipFile = new yazl.ZipFile();
+
+					filePaths.forEach(fp => {
+						zipFile.addFile(
+							fp,					//	path to physical file
+							paths.basename(fp),	//	filename/path *stored in archive*
+							{
+								compress : false,	//	:TODO: do this smartly - if ext is in set = false, else true via isArchive() or such... mimeDB has this for us.
+							}
+						);
+					});
+
+					zipFile.end( finalZipSize => {
+						if(-1 === finalZipSize) {
+							return callback(Errors.UnexpectedState('Unable to acquire final zip size'));
+						}
+
+						resp.on('close', () => {
+							//	connection closed *before* the response was fully sent
+							//	:TODO: Log and such
+						});
+
+						resp.on('finish', () => {
+							//	transfer completed fully
+							self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize);
+						});
+
+						const batchFileName = `batch_${servedItem.hashId}.zip`;
+
+						const headers = {
+							'Content-Type'			: mimeTypes.contentType(batchFileName) || mimeTypes.contentType('.bin'),
+							'Content-Length'		: finalZipSize,
+							'Content-Disposition'	: `attachment; filename="${batchFileName}"`,
+						};
+
+						resp.writeHead(200, headers);
+						return zipFile.outputStream.pipe(resp);
+					});
+				}
+			],
+			err => {
+				if(err) {
+					//	:TODO: Log me!
 					return this.fileNotFound(resp);
 				}
 
-				fs.stat(filePath, (err, stats) => {
-					if(err) {
-						return this.fileNotFound(resp);
-					}
-
-					resp.on('close', () => {
-						//	connection closed *before* the response was fully sent
-						//	:TODO: Log and such
-					});
-
-					resp.on('finish', () => {
-						//	transfer completed fully
-						this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size);
-					});
-
-					const headers = {
-						'Content-Type'			: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
-						'Content-Length'		: stats.size,
-						'Content-Disposition'	: `attachment; filename="${fileEntry.fileName}"`, 
-					};
-
-					const readStream = fs.createReadStream(filePath);
-					resp.writeHead(200, headers);
-					return readStream.pipe(resp);
-				});
-			});									
-		});
+				//	...otherwise, we would have called resp() already.
+			}
+		);
 	}
 
 	updateDownloadStatsForUserIdAndSystem(userId, dlBytes, cb) {
diff --git a/mods/file_base_download_manager.js b/mods/file_base_download_manager.js
index 812a2422..382a7305 100644
--- a/mods/file_base_download_manager.js
+++ b/mods/file_base_download_manager.js
@@ -9,10 +9,12 @@ const theme					= require('../core/theme.js');
 const ansi					= require('../core/ansi_term.js');
 const Errors				= require('../core/enig_error.js').Errors;
 const stringFormat			= require('../core/string_format.js');
+const FileAreaWeb			= require('../core/file_area_web.js');
 
 //	deps
 const async					= require('async');
 const _						= require('lodash');
+const moment				= require('moment');
 
 exports.moduleInfo = {
 	name		: 'File Base Download Queue Manager',
@@ -22,17 +24,15 @@ exports.moduleInfo = {
 
 const FormIds = {
 	queueManager	: 0,
-	details			: 1,
 };
 
 const MciViewIds = {
 	queueManager : {
-		queue	: 1,
-		navMenu	: 2,
-	},
-	details : {
+		queue				: 1,
+		navMenu				: 2,
 
-	}
+		customRangeStart	: 10,
+	},
 };
 
 exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
@@ -126,6 +126,26 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 		return cb(null);
 	}
 
+	displayWebDownloadLinkForFileEntry(fileEntry) {
+		FileAreaWeb.getExistingTempDownloadServeItem(this.client, fileEntry, (err, serveItem) => {
+			if(serveItem && serveItem.url) {
+				const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+
+				fileEntry.webDlLink 	= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
+				fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+			} else {
+				fileEntry.webDlLink		= '';
+				fileEntry.webDlExpire	= '';
+			}
+
+			this.updateCustomViewTextsWithFilter(
+				'queueManager',
+				MciViewIds.queueManager.customRangeStart, fileEntry,
+				{ filter : [ '{webDlLink}', '{webDlExpire}' ] }
+			);
+		});
+	}
+
 	updateDownloadQueueView(cb) {
 		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
 		if(!queueView) {
@@ -138,7 +158,13 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 		queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
 		queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
 
+		queueView.on('index update', idx => {
+			const fileEntry = this.dlQueue.items[idx];
+			this.displayWebDownloadLinkForFileEntry(fileEntry);
+		});
+
 		queueView.redraw();
+		this.displayWebDownloadLinkForFileEntry(this.dlQueue.items[0]);
 
 		return cb(null);
 	}
diff --git a/mods/file_base_web_download_manager.js b/mods/file_base_web_download_manager.js
new file mode 100644
index 00000000..d171cfdb
--- /dev/null
+++ b/mods/file_base_web_download_manager.js
@@ -0,0 +1,287 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const MenuModule			= require('../core/menu_module.js').MenuModule;
+const ViewController		= require('../core/view_controller.js').ViewController;
+const DownloadQueue			= require('../core/download_queue.js');
+const theme					= require('../core/theme.js');
+const ansi					= require('../core/ansi_term.js');
+const Errors				= require('../core/enig_error.js').Errors;
+const stringFormat			= require('../core/string_format.js');
+const FileAreaWeb			= require('../core/file_area_web.js');
+const ErrNotEnabled			= require('../core/enig_error.js').ErrorReasons.NotEnabled;
+const Config				= require('../core/config.js').config;
+
+//	deps
+const async					= require('async');
+const _						= require('lodash');
+const moment				= require('moment');
+
+exports.moduleInfo = {
+	name		: 'File Base Download Web Queue Manager',
+	desc		: 'Module for interacting with web backed download queue/batch',
+	author		: 'NuSkooler',
+};
+
+const FormIds = {
+	queueManager	: 0
+};
+
+const MciViewIds = {
+	queueManager : {
+		queue				: 1,
+		navMenu				: 2,
+		
+		customRangeStart	: 10,
+	}
+};
+
+exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
+	
+	constructor(options) {
+		super(options);
+
+		this.dlQueue = new DownloadQueue(this.client);
+
+		this.menuMethods = {
+			removeItem : (formData, extraArgs, cb) => {
+				const selectedItem = this.dlQueue.items[formData.value.queueItem];
+				if(!selectedItem) {
+					return cb(null);
+				}
+
+				this.dlQueue.removeItems(selectedItem.fileId);
+
+				//	:TODO: broken: does not redraw menu properly - needs fixed!
+				return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
+			},
+			clearQueue : (formData, extraArgs, cb) => {
+				this.dlQueue.clear();
+								
+				//	:TODO: broken: does not redraw menu properly - needs fixed!
+				return this.removeItemsFromDownloadQueueView('all', cb);
+			},
+			getBatchLink : (formData, extraArgs, cb) => {
+				return this.generateAndDisplayBatchLink(cb);
+			}
+		};
+	}
+
+	initSequence() {
+		if(0 === this.dlQueue.items.length) {
+			return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
+		}
+
+		const self = this;
+
+		async.series(
+			[
+				function beforeArt(callback) {
+					return self.beforeArt(callback);
+				},
+				function display(callback) {
+					return self.displayQueueManagerPage(false, callback);
+				}
+			],
+			() => {
+				return self.finishedLoading();
+			}
+		);
+	}
+
+	removeItemsFromDownloadQueueView(itemIndex, cb) {
+		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+		if(!queueView) {
+			return cb(Errors.DoesNotExist('Queue view does not exist'));
+		}
+
+		if('all' === itemIndex) {
+			queueView.setItems([]);
+			queueView.setFocusItems([]);
+		} else {
+			queueView.removeItem(itemIndex);
+		}
+
+		queueView.redraw();
+		return cb(null);
+	}
+
+	displayFileInfoForFileEntry(fileEntry) {
+		this.updateCustomViewTextsWithFilter(
+			'queueManager', 
+			MciViewIds.queueManager.customRangeStart, fileEntry,
+			{ filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }	//	:TODO: Others....
+		);
+	}
+
+	updateDownloadQueueView(cb) {
+		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+		if(!queueView) {
+			return cb(Errors.DoesNotExist('Queue view does not exist'));
+		}
+
+		const queueListFormat		= this.menuConfig.config.queueListFormat || '{webDlLink}';
+		const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
+
+		queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
+		queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
+
+		queueView.on('index update', idx => {
+			const fileEntry = this.dlQueue.items[idx];
+			this.displayFileInfoForFileEntry(fileEntry);
+		});
+
+		queueView.redraw();
+		this.displayFileInfoForFileEntry(this.dlQueue.items[0]);
+
+		return cb(null);
+	}
+
+	generateAndDisplayBatchLink(cb) {
+		const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
+
+		FileAreaWeb.createAndServeTempBatchDownload(
+			this.client, 
+			this.dlQueue.items,
+			{
+				expireTime : expireTime
+			},
+			(err, webBatchDlLink) => {
+				//	:TODO: handle not enabled -> display such
+				if(err) {
+					return cb(err);
+				}
+
+				const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+
+				const formatObj = {
+					webBatchDlLink		: ansi.vtxHyperlink(this.client, webBatchDlLink) + webBatchDlLink,
+					webBatchDlExpire	: expireTime.format(webDlExpireTimeFormat),
+				};
+
+				this.updateCustomViewTextsWithFilter(
+					'queueManager',
+					MciViewIds.queueManager.customRangeStart, 
+					formatObj,
+					{ filter : Object.keys(formatObj).map(k => '{' + k + '}' ) }
+				);
+
+				return cb(null);
+			}
+		);
+	}
+
+	displayQueueManagerPage(clearScreen, cb) {
+		const self = this;
+
+		async.series(
+			[
+				function prepArtAndViewController(callback) {
+					return self.displayArtAndPrepViewController('queueManager', { clearScreen : clearScreen }, callback);
+				},
+				function prepareQueueDownloadLinks(callback) {
+					const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+
+					async.each(self.dlQueue.items, (fileEntry, nextFileEntry) => {
+						FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
+							if(err) {
+								if(ErrNotEnabled === err.reasonCode) {
+									return nextFileEntry(err);	//	we should have caught this prior	
+								}
+
+								const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
+								
+								FileAreaWeb.createAndServeTempDownload(
+									self.client, 
+									fileEntry,
+									{ expireTime : expireTime },
+									(err, url) => {
+										if(err) {
+											return nextFileEntry(err);
+										}
+
+										fileEntry.webDlLinkRaw	= url;
+										fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;										
+										fileEntry.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
+
+										return nextFileEntry(null);
+									}
+								);
+							} else {								
+								fileEntry.webDlLinkRaw	= serveItem.url;
+								fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
+								fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+								return nextFileEntry(null);
+							}
+						});
+					}, err => {
+						return callback(err);
+					});
+				},
+				function populateViews(callback) {
+					return self.updateDownloadQueueView(callback);
+				}
+			],
+			err => {
+				if(cb) {
+					return cb(err);
+				}
+			}
+		);
+	}
+
+	displayArtAndPrepViewController(name, options, cb) {
+		const self		= this;
+		const config	= this.menuConfig.config;
+
+		async.waterfall(
+			[
+				function readyAndDisplayArt(callback) {
+					if(options.clearScreen) {
+						self.client.term.rawWrite(ansi.resetScreen());
+					}
+
+					theme.displayThemedAsset(
+						config.art[name],
+						self.client,
+						{ font : self.menuConfig.font, trailingLF : false },
+						(err, artData) => {
+							return callback(err, artData);
+						}
+					);
+				},
+				function prepeareViewController(artData, callback) {
+					if(_.isUndefined(self.viewControllers[name])) {
+						const vcOpts = {
+							client		: self.client,
+							formId		: FormIds[name],
+						};
+
+						if(!_.isUndefined(options.noInput)) {
+							vcOpts.noInput = options.noInput;
+						}
+
+						const vc = self.addViewController(name, new ViewController(vcOpts));
+
+						const loadOpts = {
+							callingMenu		: self,
+							mciMap			: artData.mciMap,
+							formId			: FormIds[name],
+						};
+
+						return vc.loadFromMenuConfig(loadOpts, callback);
+					}
+					
+					self.viewControllers[name].setFocus(true);
+					return callback(null);
+										
+				},
+			],
+			err => {
+				return cb(err);
+			}
+		);
+	}
+};
+	
\ No newline at end of file
diff --git a/package.json b/package.json
index ef9da900..224fda84 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,8 @@
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",
     "uuid-parse": "^1.0.0",
-    "ws": "^3.1.0"
+    "ws": "^3.1.0",
+    "yazl" : "^2.4.2"
   },
   "devDependencies": {},
   "engines": {

From 38b9bf2c30687ac239c18efd914c567a1791189f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 28 Sep 2017 21:34:46 -0600
Subject: [PATCH 0035/1013] Fix typo in persistHashTag()

---
 core/file_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 84c6559f..32903315 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -280,7 +280,7 @@ module.exports = class FileEntry {
 		}
 
 		transOrDb.serialize( () => {
-			fileDb.run(
+			transOrDb.run(
 				`INSERT OR IGNORE INTO hash_tag (hash_tag)
 				VALUES (?);`, 
 				[ hashTag ]

From e84920e508ab9c382b005cf5c8a7c06555b8c04d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 28 Sep 2017 21:34:58 -0600
Subject: [PATCH 0036/1013] Add web d/l manager to menu.hjson

---
 mods/menu.hjson | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/mods/menu.hjson b/mods/menu.hjson
index 08202ca6..0dffdcbb 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -2934,6 +2934,64 @@
 			}
 		}
 
+		fileBaseWebDownloadManager: {
+			desc: Web D/L Manager
+			module: file_base_web_download_manager
+			config: {
+				art: {
+					queueManager: FWDLMGR
+					batchList: BATDLINF
+				}
+				emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
+			}
+			form: {
+				0: {
+					mci: {
+						VM1: {
+							argName: queueItem
+						}
+						HM2: {
+							focus: true
+							items: [ "get batch link", "quit", "help" ]
+							argName: navSelect
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { navSelect: 0 }
+								action: @method:getBatchLink
+							}
+							{
+								value: { navSelect: 1 }
+								action: @systemMethod:prevMenu
+							}
+						]
+					}
+
+					actionKeys: [
+						{
+							keys: [ "b", "shift + b" ]
+							action: @method:getBatchLink
+						}
+						{
+							keys: [ "delete", "r", "shift + r" ]
+							action: @method:removeItem
+						}
+						{
+							keys: [ "c", "shift + c" ]
+							action: @method:clearQueue
+						}
+						{
+							keys: [ "escape", "q", "shift + q" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
 		fileBaseDownloadManagerEmptyQueue: {
 			desc: Empty Download Queue
 			art: FEMPTYQ

From efee0eafdee6950aaf0ea6a501671ec11d821ba2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <NuSkooler@gmail.com>
Date: Fri, 29 Sep 2017 16:30:05 -0600
Subject: [PATCH 0037/1013] Minor document updates

---
 docs/menu_system.md  | 32 +++++++++++++++++++++-----------
 docs/modding.md      | 12 ++++++++++++
 docs/msg_networks.md | 17 ++++++++++++-----
 3 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 docs/modding.md

diff --git a/docs/menu_system.md b/docs/menu_system.md
index 1dea637c..026ef648 100644
--- a/docs/menu_system.md
+++ b/docs/menu_system.md
@@ -1,17 +1,26 @@
 # Menu System
-ENiGMA½'s menu system is highly flexible and moddable. The possibilities are almost endless! By modifying your `menu.hjson` you will be able to create a custom look and feel unique to your board.
+ENiGMA½'s menu system is highly flexible and moddable. The possibilities are almost endless!
+
+This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson` (or whatever you reference in `config.hjson` using the `menuFile` property — see below). By modifying your `menu.hjson` you will be able to create a custom experience unique to your board.
 
 The default `menu.hjson` file lives within the `mods` directory. It is **highly recommended** to specify another file by setting the `menuFile` property in your `config.hjson` file:
 ```hjson
 general: {
   /* Can also specify a full path */
-  menuFile: mybbs.hjson
+  menuFile: yourboardname.hjson
 }
 ```
-(You can start by copying the default `menu.hjson` to `mybbs.hjson`)
+
+You can start by copying the default `mods/menu.hjson` to `yourboardname.hjson`.
 
 ## The Basics
-Like all configuration within ENiGMA½, menu configuration is done via a HJSON file. This file is located in the `mods` directory: `mods/menu.hjson`.
+Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
+
+Entries in `menu.hjson` are objects defining a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
+* Classical Main, Messages, and File menus
+* Art file display
+* Module driven menus such as door launchers
+
 
 Each entry in `menu.hjson` defines an object that represents a menu. These objects live within the `menus` parent object. Each object's *key* is a menu name you can reference within other menus in the system. 
 
@@ -26,9 +35,9 @@ telnetConnected: {
 }
 ```
 
-The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the server's config).
+The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config).
 
-An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>` in the current theme location, then in the common `mods/art` directory where `<n>` represents a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. You can be explicit here if desired, by specifying a file extension.
+An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
 
 The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
 
@@ -47,20 +56,21 @@ matrix: {
             submit: true
             focus:  true            
             items: [ "login", "apply", "log off" ]
+            argName: matrixSubmit
           }
         }
         submit: {
           *: [
               {
-                  value: { 1: 0 }
+                  value: { matrixSubmit: 0 }
                   action: @menu:login
               }
               {
-                  value: { 1: 1 },
+                  value: { matrixSubmit: 1 },
                   action: @menu:newUserApplication
               }
               {
-                  value: { 1: 2 },
+                  value: { matrixSubmit: 2 },
                   action: @menu:logoff
               }
           ]
@@ -71,6 +81,6 @@ matrix: {
 }
 ```
 
-In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` (*VerticalMenuView*) MCI entry. `VM1` is then setup to `submit` and start focused via `focus: true` as well as have some menu entries ("login", "apply", ...) defined.
+In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` (*VerticalMenuView*) MCI entry. `VM1` is then setup to `submit` and start focused via `focus: true` as well as have some menu entries ("login", "apply", ...) defined. We provide an `argName` for this action as `matrixSubmit`.
 
-The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`). Upon submit, the first match will be executed. For example, if the user selects "login", the first entry with a value of `{ 1: 0 }` or view ID 1, value 0 will match causing `action` of `@menu:login` to be executed (go to `login` menu).
\ No newline at end of file
+The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`). Upon submit, the first match will be executed. For example, if the user selects "login", the first entry with a value of `{ matrixSubmit: 0 }` will match causing `action` of `@menu:login` to be executed (go to `login` menu).
diff --git a/docs/modding.md b/docs/modding.md
new file mode 100644
index 00000000..5dcf5a29
--- /dev/null
+++ b/docs/modding.md
@@ -0,0 +1,12 @@
+# Modding
+
+## General Configuraiton
+See [Configuration](config.md)
+
+## Menus
+See [Menu System](menu_system.md)
+
+## Theming
+Take a look at how the default `luciano_blocktronics` theme found under `mods/themes` works!
+
+TODO document me!
\ No newline at end of file
diff --git a/docs/msg_networks.md b/docs/msg_networks.md
index ca0afe17..1bb46c8c 100644
--- a/docs/msg_networks.md
+++ b/docs/msg_networks.md
@@ -6,7 +6,7 @@ Message networks are configured in `messageNetworks` section of `config.hjson`.
   * `originLine` (optional): Overrwrite the default origin line for networks that support it. For example: `originLine: Xibalba - xibalba.l33t.codes:44510`
 
 ## FidoNet Technology Network (FTN)
-FTN networks are configured under the `messageNetworks::ftn` section of `config.hjson`.
+FTN networks are configured under the `messageNetworks.ftn` section of `config.hjson`.
 
 ### Networks
 The `networks` section contains a sub section for network(s) you wish you join your board with. Each entry's key name can be referenced elsewhere in `config.hjson` for FTN oriented configurations.
@@ -30,7 +30,7 @@ The `networks` section contains a sub section for network(s) you wish you join y
 ```
   
 ### Areas
-The `areas` section describes a mapping of local **area tags** found in your `messageConferences` to a message network (from `networks` described previously), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages.
+The `areas` section describes a mapping of local **area tags** found in your `messageConferences` to a message network (from `networks` described previously), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages (In fact you can import AREAS.BBS using `oputil.js`!)
 
 When importing, messages will be placed in the local area that matches key under `areas`.
 
@@ -57,11 +57,11 @@ When importing, messages will be placed in the local area that matches key under
 ```
 
 ### BSO Import / Export
-The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss & scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers::ftn_bso`.
+The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss & scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
 
 **Members**:
   * `defaultZone` (required): Sets the default BSO outbound zone
-  * `defaultNetwork` (optional): Sets the default network name from `messageNetworks::ftn::networks`. **Required if more than one network is defined**.
+  * `defaultNetwork` (optional): Sets the default network name from `messageNetworks.ftn.networks`. **Required if more than one network is defined**.
   * `paths` (optional): Override default paths set by the system. This section may contain `outbound`, `inbound`, and `secInbound`.
   * `packetTargetByteSize` (optional): Overrides the system *target* packet (.pkt) size of 512000 bytes (512k)
   * `bundleTargetByteSize` (optional): Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M)
@@ -85,7 +85,7 @@ A node entry starts with a FTN style address (up to 5D) **as a key** in `config.
   scannerTossers: {
     ftn_bso: {
       nodes: {
-        "46:*: {
+        "46:*": {
           packetType: 2+
           packetPassword: mypass
           encoding: cp437
@@ -97,6 +97,13 @@ A node entry starts with a FTN style address (up to 5D) **as a key** in `config.
 }
 ```
 
+#### TIC Support
+ENiGMA½ supports TIC files. This is handled by mapping TIC areas to local file areas.
+
+Under a given node (described above) TIC configuration may be supplied.
+
+TODO
+
 #### Scheduling
 Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.
 

From b6e628014a5fbdc53a7dfe31e36a8f57cc139900 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <NuSkooler@gmail.com>
Date: Fri, 29 Sep 2017 16:45:59 -0600
Subject: [PATCH 0038/1013] More doc updates

---
 docs/config.md  | 26 +++++++++++++++-----------
 docs/modding.md |  5 ++++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index ca760676..ff653e37 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -6,11 +6,16 @@ The main system configuration file, `config.hjson` both overrides defaults and p
 
 **Windows note**: **~** resolves to *C:\Users\YOURLOGINNAME\* on modern Windows installations, e.g. `C:\Users\NuSkooler\.config\enigma-bbs\config.hjson`
 
-### oputil.js
-Please see `oputil.js config` for configuration generation options.
+### Creating a Configuration
+Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
+```
+./oputil.js config new
+```
 
-### Example: System Name
-`core/config.js` provides the default system name as follows:
+You will be asked a series of questions to create an initial configuration.
+
+### Overriding Defaults
+The file `core/config.js` provides various defaults to the system that you can override via `config.hjson`. For example, the default system name is defined as follows:
 ```javascript
 general : {
   boardName : 'Another Fine ENiGMA½ System'
@@ -26,17 +31,14 @@ general: {
 
 (Note the very slightly different syntax. **You can use standard JSON if you wish**)
 
+While not everything that is available in your `config.hjson` file can be found defaulted in `core/config.js`, a lot is. [Poke around and see what you can find](https://github.com/NuSkooler/enigma-bbs/blob/master/core/config.js)!
+
 ### Specific Areas of Interest
-* [Menu System](menu_system.md)
 * [Message Conferences](msg_conf_area.md)
 * [Message Networks](msg_networks.md)
 * [File Base](file_base.md)
 * [File Archives & Archivers](archives.md)
-* [Doors](doors.md)
-* [MCI Codes](mci.md)
 * [Web Server](web_server.md)
-...and other stuff [in the /docs directory](./)
-
 
 ### A Sample Configuration
 Below is a **sample** `config.hjson` illustrating various (but certainly not all!) elements that can be configured / tweaked.
@@ -125,5 +127,7 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 }
 ```
 
-## Menus
-See [the menu system docs](menu_system.md)
\ No newline at end of file
+## See Also
+* [Modding](modding.md)
+* [Doors](doors.md)
+* [MCI Codes](mci.md)
diff --git a/docs/modding.md b/docs/modding.md
index 5dcf5a29..9449a91e 100644
--- a/docs/modding.md
+++ b/docs/modding.md
@@ -9,4 +9,7 @@ See [Menu System](menu_system.md)
 ## Theming
 Take a look at how the default `luciano_blocktronics` theme found under `mods/themes` works!
 
-TODO document me!
\ No newline at end of file
+TODO document me!
+
+## Add-On Modules
+See [Mods](mods.md)
\ No newline at end of file

From 8b7cf1f2100f1c297a09f67b16767e494df66beb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 Sep 2017 19:43:22 -0600
Subject: [PATCH 0039/1013] Add extra logging around TIC processing

---
 core/scanner_tossers/ftn_bso.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 039caac7..65009333 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1289,6 +1289,7 @@ function FTNMessageScanTossModule() {
 
 					return ticFileInfo.validate(config, (err, localInfo) => {
 						if(err) {
+							Log.trace( { reason : err.message }, 'Validation failure');
 							return callback(err);
 						}
 
@@ -1349,10 +1350,17 @@ function FTNMessageScanTossModule() {
 							localInfo.existingFileId = fileIds[0];
 
 							//	fetch old filename - we may need to remove it if replacing with a new name
-							FileEntry.loadBasicEntry(localInfo.existingFileId, {}, (cb, info) => {
-								localInfo.oldFileName 	= info.fileName;
-								localInfo.oldStorageTag	= info.storageTag;
-								return callback(null, localInfo);
+							FileEntry.loadBasicEntry(localInfo.existingFileId, {}, (err, info) => {
+								if(info) {
+									Log.trace(
+										{ fileId : localInfo.existingFileId, oldFileName : info.fileName, oldStorageTag : info.storageTag },
+										'Existing TIC file target to be replaced'
+									);
+
+									localInfo.oldFileName 	= info.fileName;
+									localInfo.oldStorageTag	= info.storageTag;
+								}
+								return callback(null, localInfo);	//	continue even if we couldn't find an old match
 							});
 						} else if(fileIds.legnth > 1) {
 							return callback(Errors.General(`More than one existing entry for TIC in ${localInfo.areaTag} ([${fileIds.join(', ')}])`));
@@ -1397,6 +1405,10 @@ function FTNMessageScanTossModule() {
 						ticFileInfo.filePath,
 						scanOpts,
 						(err, fileEntry) => {
+							if(err) {
+								Log.trace( { reason : err.message }, 'Scanning failed');
+							}
+
 							localInfo.fileEntry = fileEntry;
 							return callback(err, localInfo);
 						}
@@ -1441,6 +1453,7 @@ function FTNMessageScanTossModule() {
 
 					self.copyTicAttachment(ticFileInfo.filePath, dst, isUpdate, (err, finalPath) => {
 						if(err) {
+							Log.info( { reason : err.message }, 'Failed to copy TIC attachment');
 							return callback(err);
 						}
 
@@ -1474,7 +1487,7 @@ function FTNMessageScanTossModule() {
 			],
 			(err, localInfo) => {
 				if(err) {
-					Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.path }, 'Failed import/update TIC record' );
+					Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed import/update TIC record' );
 				} else {
 					Log.debug(
 						{ tic : ticFileInfo.path, file : ticFileInfo.filePath, area : localInfo.areaTag },

From 5cbbd76411ccfd4d7cef20a194f8595eaaedb8a0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 Sep 2017 12:34:10 -0600
Subject: [PATCH 0040/1013] Updates to oputil when --update with desc/descLong

---
 core/oputil/oputil_file_base.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index d9ad9366..0c4c6065 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -172,10 +172,10 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 										//
 										//	We'll update the entry if the following conditions are met:
 										//	* We have a single duplicate, and:
-										//	* --update-desc was passed or the existing entry's desc or
+										//	* --update was passed or the existing entry's desc or
 										//	  longDesc are blank/empty
 										//
-										if(argv['update'] && 1 === dupeEntries.length) {
+										if(argv.update && 1 === dupeEntries.length) {
 											const FileEntry		= require('../../core/file_entry.js');
 											const existingEntry	= new FileEntry();
 
@@ -200,6 +200,8 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 												}
 
 												console.info('Dupe (updating)');
+												existingEntry.desc 		= fileEntry.desc;
+												existingEntry.descLong	= fileEntry.descLong;
 												updateTags(existingEntry);
 
 												finalizeEntryAndPersist(true, existingEntry, descHandler, err => {

From 1ad7ce848a962d4b6cdd897dbd6b7d4e36f94a42 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 Sep 2017 15:37:46 -0600
Subject: [PATCH 0041/1013] Upgrade farmhash to v2.0.4+

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 224fda84..f23ece19 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "farmhash": "1.2.1",
+    "farmhash": "^2.0.4",
     "fs-extra": "^4.0.1",
     "gaze": "^1.1.2",
     "graceful-fs": "^4.1.11",

From af52ed6153327dd9a82a4bd639e066aa75fb2442 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 1 Oct 2017 11:07:49 -0600
Subject: [PATCH 0042/1013] Better handling of TIC import descriptions * Add
 descPriority config option (default='diz') * Really prefer diz/ldesc over
 *generated* descriptions e.g. from filename or info extractors

---
 core/config.js                  |  1 +
 core/file_base_area.js          | 12 ++++++++----
 core/scanner_tossers/ftn_bso.js | 26 +++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/core/config.js b/core/config.js
index 549b44a2..e33648b9 100644
--- a/core/config.js
+++ b/core/config.js
@@ -639,6 +639,7 @@ function getDefaultConfig() {
 					secureInOnly	: true,				//	only bring in from secure inbound (|secInbound| path, password protected)
 					uploadBy		: 'ENiGMA TIC',		//	default upload by username (override @ network)
 					allowReplace	: false,			//	use "Replaces" TIC field
+					descPriority	: 'diz',			//	May be diz=.DIZ/etc., or tic=from TIC Ldesc
 				}
 			}
 		},
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 1d1062a9..f3845cc1 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -356,7 +356,8 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 							//	Assume FILE_ID.DIZ, NFO files, etc. are CP437. 
 							//
 							//	:TODO: This isn't really always the case - how to handle this? We could do a quick detection...
-							fileEntry[descType] = iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
+							fileEntry[descType]			= iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
+							fileEntry[`${descType}Src`]	= 'descFile';
 							return next(null);
 						});
 					});
@@ -404,7 +405,8 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
 			function processSingleExtractedFile(extractedFile, callback) {
 				populateFileEntryInfoFromFile(fileEntry, extractedFile, err => {
 					if(!fileEntry.desc) {
-						fileEntry.desc = getDescFromFileName(filePath);
+						fileEntry.desc		= getDescFromFileName(filePath);
+						fileEntry.descSrc	= 'fileName';
 					}
 					return callback(err);
 				});
@@ -529,7 +531,8 @@ function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
 						stdout = (wordWrapText( stdout, { width : 45 } ).wrapped || []).join('\n');
 					}
 
-					fileEntry[key] = stdout;
+					fileEntry[key]			= stdout;
+					fileEntry[`${key}Src`]	= 'infoTool';
 				}
 			}
 
@@ -551,7 +554,8 @@ function populateFileEntryNonArchive(fileEntry, filePath, stepInfo, iterator, cb
 			function getDescriptions(callback) {
 				populateFileEntryInfoFromFile(fileEntry, filePath, err => {
 					if(!fileEntry.desc) {
-						fileEntry.desc = getDescFromFileName(filePath);
+						fileEntry.desc		= getDescFromFileName(filePath);
+						fileEntry.descSrc	= 'fileName';
 					}
 					return callback(err);
 				});
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 65009333..7e6e924b 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1321,7 +1321,7 @@ function FTNMessageScanTossModule() {
 					//	Lastly, we will only replace if the item is in the same/specified area
 					//	and that come from the same origin as a previous entry.
 					//
-					const allowReplace	= _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ] ) || Config.scannerTossers.ftn_bso.tic.allowReplace;
+					const allowReplace	= _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config.scannerTossers.ftn_bso.tic.allowReplace);
 					const replaces		= ticFileInfo.getAsString('Replaces');
 
 					if(!allowReplace || !replaces) {
@@ -1377,7 +1377,7 @@ function FTNMessageScanTossModule() {
 							short_file_name		: ticFileInfo.getAsString('File').toUpperCase(),	//	upper to ensure no case issues later; this should be a DOS 8.3 name
 							tic_origin			: ticFileInfo.getAsString('Origin'),
 							tic_desc			: ticFileInfo.getAsString('Desc'),
-							upload_by_username	: _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ]) || Config.scannerTossers.ftn_bso.tic.uploadBy,
+							upload_by_username	: _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config.scannerTossers.ftn_bso.tic.uploadBy),
 						}
 					};
 
@@ -1432,9 +1432,25 @@ function FTNMessageScanTossModule() {
 					localInfo.fileEntry.areaTag		= localInfo.areaTag;
 					localInfo.fileEntry.fileName	= ticFileInfo.longFileName;
 
-					//	we default to .DIZ/etc. desc, but use from TIC if needed
-					if(!localInfo.fileEntry.desc || 0 === localInfo.fileEntry.desc.length) {
-						localInfo.fileEntry.desc = ticFileInfo.getAsString('Ldesc') || ticFileInfo.getAsString('Desc') || getDescFromFileName(ticFileInfo.filePath);
+					//
+					//	We may now have two descriptions: from .DIZ/etc. or the TIC itself.
+					//	Determine which one to use using |descPriority| and availability.
+					//
+					//	We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
+					//
+					const descPriority = _.get(
+						Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
+						Config.scannerTossers.ftn_bso.tic.descPriority
+					);
+
+					if('tic' === descPriority) {
+						const origDesc = localInfo.fileEntry.desc;
+						localInfo.fileEntry.desc = ticFileInfo.getAsString('Ldesc') || origDesc || getDescFromFileName(ticFileInfo.filePath);
+					} else {
+						//	see if we got desc from .DIZ/etc.
+						const fromDescFile = 'descFile' === localInfo.fileEntry.descSrc;
+						localInfo.fileEntry.desc = fromDescFile ? localInfo.fileEntry.desc : ticFileInfo.getAsString('Ldesc');
+						localInfo.fileEntry.desc = localInfo.fileEntry.desc || getDescFromFileName(ticFileInfo.filePath);
 					}
 
 					const areaStorageDir = getAreaStorageDirectoryByTag(storageTag);

From 067bb9e884db00d2462ef4b22e52edbf61422441 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 2 Oct 2017 21:06:53 -0600
Subject: [PATCH 0043/1013] * Switch to sane over gaze for file watching: Gaze
 was not triggering on file additions * Remove watching of config files for
 now -- doesn't work anyway. Will revisit later.

---
 core/config_cache.js            | 12 ++++++------
 core/event_scheduler.js         | 28 +++++++++++++++++++---------
 core/scanner_tossers/ftn_bso.js | 18 +++++++++++++-----
 package.json                    |  9 +++++----
 4 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/core/config_cache.js b/core/config_cache.js
index 9df08316..8b57e125 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -6,7 +6,6 @@ var Log					= require('./logger.js').log;
 
 var paths				= require('path');
 var fs					= require('graceful-fs');
-var Gaze				= require('gaze').Gaze;
 var events				= require('events');
 var util				= require('util');
 var assert				= require('assert');
@@ -18,7 +17,7 @@ function ConfigCache() {
 
 	var self 	= this;
 	this.cache	= {};	//	filePath -> HJSON
-	this.gaze	= new Gaze();
+	//this.gaze	= new Gaze();
 
 	this.reCacheConfigFromFile = function(filePath, cb) {
 		fs.readFile(filePath, { encoding : 'utf-8' }, function fileRead(err, data) {
@@ -32,7 +31,7 @@ function ConfigCache() {
 		});
 	};
 
-
+/*
 	this.gaze.on('error', function gazeErr(err) {
 
 	});
@@ -50,6 +49,7 @@ function ConfigCache() {
 			}
 		});
 	});
+	*/
 
 }
 
@@ -58,13 +58,13 @@ util.inherits(ConfigCache, events.EventEmitter);
 ConfigCache.prototype.getConfigWithOptions = function(options, cb) {
 	assert(_.isString(options.filePath));
 
-	var self		= this;
+//	var self		= this;
 	var isCached	= (options.filePath in this.cache);
 
 	if(options.forceReCache || !isCached) {
 		this.reCacheConfigFromFile(options.filePath, function fileCached(err, config) {
 			if(!err && !isCached) {
-				self.gaze.add(options.filePath);
+				//self.gaze.add(options.filePath);
 			}
 			cb(err, config, true);
 		});
@@ -82,4 +82,4 @@ ConfigCache.prototype.getModConfig = function(fileName, cb) {
 	this.getConfig(paths.join(Config.paths.mods, fileName), cb);
 };
 
-module.exports = exports = new ConfigCache();
\ No newline at end of file
+module.exports = exports = new ConfigCache();
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index a1c2f6ef..27c68b37 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -10,8 +10,9 @@ const _						= require('lodash');
 const later					= require('later');
 const path					= require('path');
 const pty					= require('ptyw.js');
-const gaze					= require('gaze');
+const sane					= require('sane');
 const moment				= require('moment');
+const paths					= require('path');
 
 exports.getModule				= EventSchedulerModule;
 exports.EventSchedulerModule	= EventSchedulerModule;	//	allow for loadAndStart
@@ -209,13 +210,13 @@ EventSchedulerModule.prototype.startup = function(cb) {
 				Log.warn( { eventName : schedEvent.name }, 'Invalid scheduled event entry');
 				return;
 			}
-			
+
 			Log.debug(
 				{ 
 					eventName	: schedEvent.name,
 					schedule	: this.moduleConfig.events[schedEvent.name].schedule,
 					action		: schedEvent.action,
-					next		: moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a')
+					next		: schedEvent.schedule.sched ? moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
 				},
 				'Scheduled event loaded'
 			);
@@ -226,12 +227,21 @@ EventSchedulerModule.prototype.startup = function(cb) {
 				}, schedEvent.schedule.sched));
 			}
 
-			if(schedEvent.schedule.watchFile) {				
-				gaze(schedEvent.schedule.watchFile, (err, watcher) => {
-					//	:TODO: should track watched files & stop watching @ shutdown
-					watcher.on('all', (watchEvent, watchedPath) => {
-						if(schedEvent.schedule.watchFile === watchedPath) {
-							self.performAction(schedEvent, `Watch file: ${watchedPath}`);
+			if(schedEvent.schedule.watchFile) {
+				const watcher = sane(
+					paths.dirname(schedEvent.schedule.watchFile),
+					{
+						glob : `**/${paths.basename(schedEvent.schedule.watchFile)}`
+					}
+				);
+
+				//	:TODO: should track watched files & stop watching @ shutdown?
+
+				[ 'change', 'add', 'delete' ].forEach(event => {
+					watcher.on(event, (fileName, fileRoot) => {
+						const eventPath = paths.join(fileRoot, fileName);
+						if(schedEvent.schedule.watchFile === eventPath) {
+							self.performAction(schedEvent, `Watch file: ${eventPath}`);
 						}
 					});
 				});
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 039caac7..598667e8 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -30,7 +30,7 @@ const fs					= require('graceful-fs');
 const later					= require('later');
 const temptmp				= require('temptmp').createTrackedSession('ftn_bso');
 const assert				= require('assert');
-const gaze					= require('gaze');
+const sane					= require('sane');
 const fse					= require('fs-extra');
 const iconv					= require('iconv-lite');
 const uuidV4				= require('uuid/v4');
@@ -1654,10 +1654,18 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 				}
 				
 				if(_.isString(importSchedule.watchFile)) {
-					gaze(importSchedule.watchFile, (err, watcher) => {
-						watcher.on('all', (event, watchedPath) => {
-							if(importSchedule.watchFile === watchedPath) {
-								tryImportNow(`Performing import/toss due to @watch: ${watchedPath} (${event})`);	
+					const watcher = sane(
+						paths.dirname(importSchedule.watchFile),
+						{
+							glob : `**/${paths.basename(importSchedule.watchFile)}`
+						}
+					);
+
+					[ 'change', 'add', 'delete' ].forEach(event => {
+						watcher.on(event, (fileName, fileRoot) => {
+							const eventPath = paths.join(fileRoot, fileName);
+							if(paths.join(fileRoot, fileName) === importSchedule.watchFile) {
+								tryImportNow(`Performing import/toss due to @watch: ${eventPath} (${event})`);
 							}
 						});
 					});
diff --git a/package.json b/package.json
index ec508841..5017536e 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,11 @@
     "binary": "0.3.x",
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.10",
+    "exiftool": "^0.0.3",
     "farmhash": "^1.2.1",
     "fs-extra": "^3.0.1",
     "gaze": "^1.1.2",
+    "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
     "hjson": "^2.4.2",
     "iconv-lite": "^0.4.17",
@@ -35,18 +37,17 @@
     "mime-types": "^2.1.15",
     "minimist": "1.2.x",
     "moment": "^2.18.1",
+    "node-glob": "^1.2.0",
     "nodemailer": "^4.0.1",
     "ptyw.js": "NuSkooler/ptyw.js",
+    "sane": "^2.2.0",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.1",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
     "uuid": "^3.0.1",
     "uuid-parse": "^1.0.0",
-    "ws" : "^3.0.0",
-    "graceful-fs" : "^4.1.11",
-    "exiftool" : "^0.0.3",
-    "node-glob" : "^1.2.0"
+    "ws": "^3.0.0"
   },
   "devDependencies": {},
   "engines": {

From 8ead65c1ff1b6fae353d69f0f06b7333c86d48ac Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 2 Oct 2017 21:10:52 -0600
Subject: [PATCH 0044/1013] Remvoe gaze package

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 5017536e..e00d9211 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "exiftool": "^0.0.3",
     "farmhash": "^1.2.1",
     "fs-extra": "^3.0.1",
-    "gaze": "^1.1.2",
     "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
     "hjson": "^2.4.2",

From 7150631fb76667acead1776a2ebcd2b380f18527 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 2 Oct 2017 21:11:22 -0600
Subject: [PATCH 0045/1013] Remvoe gaze package

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 5017536e..e00d9211 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "exiftool": "^0.0.3",
     "farmhash": "^1.2.1",
     "fs-extra": "^3.0.1",
-    "gaze": "^1.1.2",
     "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
     "hjson": "^2.4.2",

From 0bef268276a15fe8be12dfbdd577e5cd10bd1cb4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 2 Oct 2017 21:28:32 -0600
Subject: [PATCH 0046/1013] Issue #122: If watch file exists at startup, kick
 off task/schedule

---
 core/event_scheduler.js         |  7 +++++++
 core/scanner_tossers/ftn_bso.js | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 27c68b37..8b3d3239 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -13,6 +13,7 @@ const pty					= require('ptyw.js');
 const sane					= require('sane');
 const moment				= require('moment');
 const paths					= require('path');
+const fse					= require('fs-extra');
 
 exports.getModule				= EventSchedulerModule;
 exports.EventSchedulerModule	= EventSchedulerModule;	//	allow for loadAndStart
@@ -245,6 +246,12 @@ EventSchedulerModule.prototype.startup = function(cb) {
 						}
 					});
 				});
+
+				fse.exists(schedEvent.schedule.watchFile, exists => {
+					if(exists) {
+						self.performAction(schedEvent, `Watch file: ${schedEvent.schedule.watchFile}`);
+					}
+				});
 			}
 		});
 	}
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 598667e8..57ff0525 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1669,6 +1669,16 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 							}
 						});
 					});
+
+					//
+					//	If the watch file already exists, kick off now
+					//	https://github.com/NuSkooler/enigma-bbs/issues/122
+					//
+					fse.exists(importSchedule.watchFile, exists => {
+						if(exists) {
+							tryImportNow(`Performing import/toss due to @watch: ${importSchedule.watchFile} (initial exists)`);
+						}
+					});
 				}
 			}
 		}

From efd1ea28df5ef0f11428b3d2e3b9591d188c7e44 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Fri, 27 Oct 2017 16:54:02 +0200
Subject: [PATCH 0047/1013] Support npm start

Fill-in the missing pieces in the package.json file. From now on `npm start` just works like all other nodejs apps.
---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index e00d9211..e1589314 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,10 @@
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",
+  "main": "./core/bbs",
+  "scripts": {
+    "start": "node main"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/NuSkooler/enigma-bbs.git"

From 4092ecd2b23dc4180a48feebb66a6c4461d10111 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Fri, 27 Oct 2017 17:12:45 +0200
Subject: [PATCH 0048/1013] Show it's possible to change the telnet default
 port

In my case the default port (8888) was already in use. However, it was very hard to know (more guessing) the port change in possible via telnet: { port: xxxx }.
---
 docs/index.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 1147c578..9fbb0cee 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -77,9 +77,12 @@ Below is an _example_ configuration. It is recommended that you at least **start
 
 	loginServers: {
 		ssh: {
-	    	privateKeyPass: YOUR_PK_PASS
-	    	enabled: true /* set to false to disable the SSH server */
-	    }
+	    		privateKeyPass: YOUR_PK_PASS
+	    		enabled: true /* set to false to disable the SSH server */
+	    	}
+		telnet: {                                                                                                                                                                                              
+			port: 8888                                                                                                                                                                                         
+    		}                                                                                                                                                                                                      
 	}
 
 	messageConferences: {
@@ -87,15 +90,14 @@ Below is an _example_ configuration. It is recommended that you at least **start
 			name: Local
 			desc: Local Discussions
 			default: true
-
-		    areas: {
-		    	local_music: {
+			areas: {
+		    		local_music: {
 					name: Music Discussion
 					desc: Music, bands, etc.
 					default: true
+	        		}
 	        	}
-	        }
-	    }
+	    	}
 	}
 }
 ```

From 0f9e9c75ed9747100f7219631a700dadf1efd33f Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Fri, 27 Oct 2017 17:59:45 +0200
Subject: [PATCH 0049/1013] Just add a link to the webchat

For people who don't have a IRC client installed.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39ee0561..d7053333 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ See [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues) for more
 ## Support
 * Use [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues)
 * **Discussion on a ENiGMA BBS!** (see Boards below)
-* IRC: **#enigma-bbs** on **chat.freenode.net**
+* IRC: **#enigma-bbs** on **chat.freenode.net** ([webchat](https://webchat.freenode.net/?channels=enigma-bbs))
 * Discussion on [fsxNet](http://bbs.geek.nz/#fsxNet) available on many boards
 * Email: bryan -at- l33t.codes
 * [Facebook ENiGMA½ group](https://www.facebook.com/groups/enigmabbs/)

From 051ef274281f169f2620eafb4a3d6e60cdce4a20 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Fri, 27 Oct 2017 21:43:10 +0200
Subject: [PATCH 0050/1013] Update package.json

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e1589314..fb04a0f4 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,8 @@
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",
-  "main": "./core/bbs",
   "scripts": {
-    "start": "node main"
+    "start": "node main.js"
   },
   "repository": {
     "type": "git",

From 5672fa144b43e24ffdd0834797a1629232490551 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Sun, 29 Oct 2017 02:15:53 +0100
Subject: [PATCH 0051/1013] Add some extra begginers info

I found this by digging into the code itself, since again oputil doesn't provide anything useful yet.
---
 docs/index.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/index.md b/docs/index.md
index 9fbb0cee..ae30690c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -107,6 +107,11 @@ Below is an _example_ configuration. It is recommended that you at least **start
 ./main.js
 ```
 
+
+*Note #1:* The first user who register/apply (user ID = 1) will be automatically be added to the sysop group. And thus becomes SysOp.
+
+*Note #2:* All data is stored by default in Sqlite3 database files within the `db` sub folder, including user data, messages, system logs and file meta data.
+
 ## Monitoring Logs
 Logs are produced by Bunyan which outputs each entry as a JSON object. To tail logs in a colorized and pretty pretty format, issue the following command:
     

From acc14483930e9561176ad3138c9b629d1e3d1fc5 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Sun, 29 Oct 2017 02:17:53 +0100
Subject: [PATCH 0052/1013] Update index.md

Typo
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index ae30690c..73b45739 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -108,7 +108,7 @@ Below is an _example_ configuration. It is recommended that you at least **start
 ```
 
 
-*Note #1:* The first user who register/apply (user ID = 1) will be automatically be added to the sysop group. And thus becomes SysOp.
+*Note #1:* The first user who register/apply (user ID = 1) will be automatically be added to the `sysops` group. And thus becomes SysOp.
 
 *Note #2:* All data is stored by default in Sqlite3 database files within the `db` sub folder, including user data, messages, system logs and file meta data.
 

From ecc6562b7975b0eda60a9736883ff4583a717880 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:47:23 +0000
Subject: [PATCH 0053/1013] Add VTXClient docs

---
 docs/images/vtxclient.png | Bin 0 -> 130515 bytes
 docs/vtx_web_client.md    |  87 ++++++++++++++++++++++++++++++++++++++
 misc/vtx/vtx.html         |  27 ++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 docs/images/vtxclient.png
 create mode 100644 docs/vtx_web_client.md
 create mode 100644 misc/vtx/vtx.html

diff --git a/docs/images/vtxclient.png b/docs/images/vtxclient.png
new file mode 100644
index 0000000000000000000000000000000000000000..99261ced646d1a1caf710aaca694d42ca47ce815
GIT binary patch
literal 130515
zcmagF1yEewwk?di2Db(h5}e@f1PBn^-Q9z`y9EhufnbfhHtsILT^s1&?th<Gb^oe&
z&Ufxxt+i|S+Om4hImVb{MJXvrW1^9w!N9;^%6$Ez0t1800s{kQih=~)qO;2V8Tx@_
zA}9R?=IvjPd{9X;bPKA}S8W#<7<9aUy<lN7vx%V_kzHlvC6Tw$C@|>wF69{tU|^_V
zWWI>0d1n6wEhp<Q{w%pW0Zn<9WW(T4@g@{}t)){|(^gSWD*%@3-%P7JwDYgv-ga$!
zh&+iLHpe@)th?V2oLYIb>*^n8A}goRm3@)T77b2M%<vH01w1>Qg1*wcqk;)WK&|}z
z9xv+inULkW-y{h8-ng<dFpvr*_&=V#eqT1v;1I-c{_{!Gg8!cz5w<%&^c4L^H_(pn
zC{S4t|Dm6jv#(C{|9E8SV7Y(TALmryogUhMo@ubtX5yC0Kb&XiQ#?Z2KkQGn=JDSy
z!8Gvg!Jo+a^C6=Wk{&`S!ti0aMmDeWPJa|0t-?QiX)#3SQDVk4H2A&y&u5_E+J)Yt
z*#aXB13&=;_fh{-C;!v`T6Mw``&GBA9x0;E4CsB47|DM>F!VS6m1}7veqHGQaODVM
zKa^|#%SoTgL6~rY-#eq#@G_Yn`o|&H;0SVU3E{wyBZPs78hHZ=UFB*YpMtKq7jy0a
zRYCB<AvmS5&E6nm?HFz0LBHrLekv`c`1i8i0#0KgNG}hDE}Ni@RgeR-k&smh>gYST
zyMxTlqen#P)($;>t5{UJx!F)+FnI$&4ZTPCGdBF)1!#Z0F;gVQ=Pq?}7S4dgg!9t^
z-TuWMF_q=ONh=O{rQ-Ri@Me2n{lD%8LYh>NVPoH;xd79DyPzI7QbfTSh%<xCG8_h)
zVz-SXI;YqSLKt=`yC-m~ET=%{H70;W5dEy}fOvol9|xZ<4DQc_4J?x4&62-8IsshO
z_obCx*@PS)wVCPEcyHrc^svwH_owIU&8wauhz^w%t5C=(*^XHB$cI_Md}O2?vTvln
zIN}tH-XcstIZipAkw;{!=Fg@4y{Gq15K%ab8lv9_NLcncn~ewGj|Mm_t}!nf86gq>
zoNf~mJjFYU`|{Cl@I!nFt#(T=#{l2;cY2Zb%=WBaVu@@T8s~5gq(VX1bL#v*jbzNB
z)9Vhh@T4cYz~bWX%##ekDpoDrSl9Lbj`Wc`kxV0zuHATaS<y|~E`Ex4K0-S*Acwfq
z@OhnP`#x8;55C*NeZpiz>z|kXz(M~p3quWg1X;Rynw##|Cz$==4{hV-GR18PyEzeV
zJ1qZ_o7yhh>fUCCm%B|Em@bvu`pzjKD&mpqRB@%domf;ou~qobywr>$rUaXAuJ8PO
z+y6MNbhe<DW($<#8jwcZe~7;Ho%p-Xw?9N6KQ~*YQ_$;%+!=IJt-bJ0uu}Q=D(b^g
z?CYG6cL|4g3A=Z~?XZG{8ST5I%1}?@i{!T>@V5XyaMkxbm>Hwth4Sjl^MI=%!Ds1!
z{^fuxN8YFEH?CyE4oOvck!Cxy#xFy46yC){(gWEzqq@S<u&qZ|U(V<|UH-QFs^#vF
z@BC$F>Wp*g)vwT9v^Yxn6t61PhpVfrOCuA^hGfe;$yd<`u_QK)EI={Ephj3}G7kvI
zW6e-%MT&Ux<tT;G&iuY}&$h$c%Qv*om}Z@Yn5Rif7&uYM%+1YR26<FPPLoNh(HhT4
zi>cz!z8C-3pO&5Bzr+oHkRHZ$L8SE0gTy9tegH>3VKu&n8$}w{u(;6}a=5Is3cXIH
zm2!i1v^<9nq5^&PYy%o;zM7JEDI9)P(RqBB3sXg*l~6r*!S^OeLAlULg}Ke$GRQk)
znx7a(k@UJR)1M$Yz!FacyQQ`SWMj?JoMLHv9K-CsIja$2=olkU;LTy;$v_<-NGn8w
zN0|`G%?ZQ?Qc_jY&jr6<mrzIZ8>yKG?1qX&l?(R39<wZvM9P2Zs11rUb-%llG4M@H
zetXWtd)w+_eZ9zPp!5s8!@9St_EHiJv_zgd|N4sJm+Vr-KQ?f{o?Dm;iB#`j<T2dO
zTJ0J!1r2F6AZ|J4eB@Q?!P{m7N>_Z4HJm{hsvL}IgBfLP2%b6kAt;yHW4U!aUrtwq
zLX9Kd?GvDnQ<5TX8>eFP!fT3AI1`CG&6zsj8tc*|Fq2q)H`neETJ=84be2Y&E50D*
zy}Zio?_XsUw;B)+#kJ!hTWW_n&NXIb{8|tw&LekAr2Xcpp!G8c_BSW`LX&}i4C<$g
zBlO$_=@A@#h28G@F4ls@Rkm2ka3s-m(UH69bn#Ki>AcZVyXm~~N}t{n%a`GQj7DU|
z&ecZwR$&f+Lv*UD;?u>?Moq1S@PqXzN{29$-4o=J6WDP3t-r7zC(_V6XD9wfO;ngx
z|MKEIwsZ3CmGtl0_5ncM#frQXu8<X8{?=^tR)lmm;Ft96m)Lo(O2<-2bTLa=c~YB0
z&Ck9x(LnjexX*sgFvpXN%M4WP>Hd_q7*ENlpt%x~SSimUs`!k7O!qs6&UC!YQ^C9e
zE)UmT6Us@-1KYxCHdc6l?h_7xVp&HYrMJU7758z%YKP9jyQVJb3cSg25rkA*-*rAt
zq&N-SLaXj>JJx6<&MJ!)1#3_d>h`A_H&gk>g>|hZI%C$uL~|1Pxf(5|bcGTv+l!4&
zCqsagZQMfUj8(rAFHO8@((i#*LVZoOrXGQtjEedK$m`#mr{C6fr&x$zlS2Kg6FfeS
z0y-7XUY_*eg8~~<m+hpqH`>~7HE3jdop}Fx|0Y<E>SWC`&dW(wuKo8ke(p8XSbt%a
zdjT@dveV#-DG+6pe>cSAm#IN|Ce&o_JULtHy?zm{lCMUTG_wyQ)HZ#kMUH#tea+4D
z;H+M|*+kQZUJ18lBkk8XSQ1YMcb0#Fb%wUm)|<|!OpZ%S|6&*OgW+qBdc6DQPL}OZ
zTX-<{bUd@eHWd;jAL)L^M3s^zqCLcU!ML(-*#TP;Ppp(;f1gy-Z*-&FJT2cPzR8~6
z-D75w&HF|j!0#4ascB$w_xUyHg|bVmU1VT!U2A;`0kN@MMt$^*^36}mBINGi%(-a2
zP{*A$e81WBg8MV3!Orp?AAlnP@BI`VX>Sm2*SgRiY|IQvpJ%crch}@q2$3i7j>a)|
zbL*}3JYZKdXfaXj2eRqc*_0lmVJl7(;XId{V|8d`>sFx;V>@Uvv{A<Al$XGlG}9ie
zH679#2bVs?0v#3?A2)DCZNHIokj78z)OU3yG!j;Ft*)-p$jpZAD&SSMkLJmXHyta1
z<{AZJ7aqIC&cuv+Ehpje^hQgy{u!Y>-8k`!7HnN`?g)gyzO?mdOXEv^@xb{`PQK}d
z19~2fmC8cd3GF2o1~LfKp|PlA&IkFSt@kP$l%CVVIe#uLW8OgSI0N8Kr!R??msWBA
zIpZaCR8zAgTYHbQB8n1WSpB{wP}dV!&y`F$iPBoqoPi^Fk5gkG=CVZ*3ZuiAMDt!v
z$$;M4a*XuMBu7H?-rFzxF2ya*1q;+F^LoGAPex{U{n(!%DDHM35sf`%GL<)=`H^>(
z;@Uv(%G^n71r1D*K&v>7#Z2iC(7mbf8t*}5StE)PJxrEMDm-vz|HeYQs>&L)A(aR4
zdq;pLE_covjcoT(AX}F5!1a65+|h@QmW%hgN8Ck>&KoKZ?_y2}@4_F+r5L{@%~E2>
zBvr}P0vSf@^b$h#;{ri=*)EV8Vk&vn0$vMV;sPzDFhVfCaHxRJ91XjfwUouX;2F>P
zb%6~rJN9qng((Hrq{nRr$Z2l+$>t<|#*|ru4Na1gNQF=yva4!i`K!!2dsoBM&GCd>
zhJ0>H>e|PzPSDcFC#$XMVnbDZ-aalaZa1B2Y+5Io1~sH7u*seTD?G(qUUl{9mE=~t
z{r?pn`>czIZTbomw}0|ld}haY{(`@`8gQwQ9LhV9j*Z;0+4Ot{p1N8nFft+F!%PhS
z6v!+H#R9BKG`f5nX}qfin8bx_%3lI%#MG{d-#mNvrVjqT9mN{K<4AmsR9ijSZ}A7=
zI+vo#=ijSKUML{a|Hh`h2CVe<vo%!)+5Rez!jQ@A(Ngx++aYWc0C;pxYQRR{_{T<{
zf{UwKe2?C1=W;Bqm^|gZssbMSM9eOd^PFxJ-%=Pi--J(RCFu@u{s^@m#5<_j?aM_M
z2O{Mv=79rvUqsklTsCxlVbI=VBu;udpR2zfE>XJNyp-#;eh(Yk85$Osn%et=)qy66
zpSQO^Gxoe|`j%dOV|eiJ*DHy4`((%db$;kAnldinD+wVl<_|r?Jh-s;@}}M)fUK;n
zaj*-EUQ10U;iB849~ux?0Ay%tYFb)Z(Fs36tg=y}UfXyqJJkXiOh)Yrm}yIO{Qc&z
z>b|~CB5vg2k@n!*xnYZE#GkX1ZE9(WT*)Or_oJBJI<qQ486VN-$>%Q@p3?DTbt_zO
z!QvRNzez;piT$M@?UYMq@h@xAD!tZTGxmpmF362Hl)(hk$b6l16>3}L8#>((_L*oP
zyLdu;(rZsU9b40Xgd&%Ji?qEViYPS{L%u$yF(q@cKssf*B;Hm_Fl!?91Ut)pcf{mH
zeYvJrIRl?+T8c2tdTt;LU5(_TGl>YCOs4T_IF3#%n-$(Kw@?=VLF4Z!(#!SGV?FT~
z=NK}dZi++>UOR+qP7tl>WA)y(p}f(YN<{d=f|WfLToHV#D8BV9XM|4ueM|r338pj%
z4^EG#PSrMSmQ;xsOdkz*CRC<!XgYKlaOSi3xkL2gDv#soVJiLYSbyckYZ3R>T8qW~
z#D>saYzE)%mdDG=Gimea4GU!H!?c6?kUwNfrg&b7*EM2gI=uImrPQT6*AhObTk?>6
z_Kd2XHEZiFsFrO~vTkhY9J>((I7wzE0uy<azaToQJ31G2Mp}?OhV|`3Z-xag`Hy1M
z`sLWRsss#136ym}y7TzK!6&cW&GYnPYiM?aunZNJLNZ6p#50Sn?9<x_7Z-R4J<ux}
zQ_M#e76{46$Y4CrE;gW{cgl>tN2eW&dGS}HisxB-)xh?T-Jt~2*jARMwaraK_sA-h
zVSz7|Hm)h=QEcJ<U5csZ5UfAN)}=rj{axdR1!B{srKPRCkz@#IA)N_(hSK6q+hBXC
z(tWn4QLr2d0pmZ@Pwb|87+Gf~h5O1%`CMhvRZil{nX%Jq#W1*(;y8?5n(Z|8flVIF
zfcEAgY4z5>dNEY4?avR>LKBnBF$ri=pUw7U6z~Y{ad4$kWyw<5^+nB?E_TCxap&SW
z)D)HTtS`_bn0ub)A#R8MqK?x2B^V)^E={i^KMvF1V=y&UId8m^L@gDi%2$(Uz|hMQ
zujQ@J&uMaPUC62SyK8XL_bf^|?N#aaQPf`?a}bhn<TZ1;q$w1n_1i%$Fdd?j(SE+9
zSldv~wr$5-Kk<V}=`=AWY*9^pHk%w=K<b)*W6mAVGvjF;HFD`jr|lfQh%>!br+jHD
z;9FFRV*vOc8^5krKYLu?JziH|A9c+QoeJEp`prtK+<R~B-c4SPjjZ|_ZCW<3>$=zK
z2fVeyIO8W5p?Yn^eaM-x(6V)0ig6}*EVdpsV*NjNzWbaiW&o~|YwjqefG)m+Yqe>B
zZwNZf+Nmo0eB7Q^S&AK<<*`#b?ZTQ}n`gl{=1V&21iKfWLfj7)6ouNU&d>K3kYgPt
z!W8r6uwd!<dC-Kdg4SY-4o~Hc_n%W=;SxGD!WcyPxiuwIe97x4KW-kL<>h5<A22yJ
zLUe)F;=Saf-V@VWS_bl`mX!Y{1Kb(4qeRAT|Ki;qVA{nuLXmbiT&I_HTMwm{xi7W8
z$8K-$(AVhD<YrnSt?bVDaI9)X6u(oL`O5S$9<P872~OMbD+;V7GnyofE5?y3E?Hsr
zy|(;=oWw(MALz{Jpa=fb4`DL4d#NwC-@n~@iu=mqnIw1s!rrr^GC=WNbkzG#PigH6
z-84lkq=c0COC#Ua>{_lG4HKe;YJ~NrvpS7W#8K4LqZ*lG2D1P5qatlS0giSP*j{70
zOwOL(P`Q?oS6yk_`gF2&;-lTT<~0TmyD00fp1GB$en`?Mq|b4-QAdA38u`JgfFhYs
z!ZqFuR;&JL=kJm{x9OX{oM15?zzaTpWr;EAd2S^k+a#TN0}0QuZjTOWI@k7D$t%6K
z>1b37PPuSPku})2pS}u^7f^K2M)Xk&2nfVVeeectU_we7i|uvAQBurX4bBSbqJw$k
zNidM;5N}$JSpL{oSkLKX>$B#3JG^_si0E@$hi2NGoSYlsr1C4qf03IZw!ZE2w#OWo
zaSM*(WK`&N4sz#X-lItP5uLe6%<=cyN!4OVTnQQ?_ZH5e*fN8s@=EMi$!xyOrJS7D
zOBK$vNu3E@J!Bubj{35dSW}dyM;=UD9eiG}TrY8h($9aFg@jcF6Bh*MAr~fHQ_ht~
z@F%}mngz@Wh9@M9L=ZNZ<^0>U&MoIq(@2L}Ft5)`$*$V=VY>-}j(y|Ee7;4>BneA>
zOlSB=oDl7{SXs(BYE@t_-(XIKJ$==X#(XOn%7-Ib7B~v`*z(D5@<%pjy4o&<C*?H1
z&gl$M;UI43^zRVZ;*u!w;H(8Tu#Nc9;Vo9j(+%o|N1@3PTvL|Yj@Oy>O6r2nu+JX0
z&=+=cR+Y?rf-6eU<POLKCC|jWGEQeL{DU8T(Va?sG=9ct-~_}LD@ayz{EF{tmt)qk
z*siN-;Fe=GJ*v3%53Bst+%;K~zemg~qtF`an82=w=hL$;({V5v5p(yYflN{;jSO8h
zoGr5sgsk_fuV?@E`_$mPL6Q@5_IO?F#Dx6+kpKeL%e;t-@F)2i7N9wKm4?{9O=@8k
z<qU-FNlAQmhDVF4or)`||1AZ~2aVy7L?E)j=Qy@&Z;+c)D=CF-r8zWrudnN`6!$Pr
z(GDmW-!Qw{2m9ab&OU6_RGACsab!(I?t1!7-FORi+(ByFB5d{CblrcQHj>gNqb84p
z7F(YiP<U-LKJ}~P3)=$Hw^XDCqW@8cTnqV2H50BG@u8E86qhd|A`8j7IfgBqCZ2D#
zsY5&U*%1oJZcP+$1&yfs?-fg@h_JfO?`x%-!v!f!LW)3kzp5h>Jhp-2zvTZQYM|}p
zgqNa}ZeOa6Wr`~;l@+erI#<FX>PQFb#@n6f;Ka$%ZQ7P@ST8@X<33zq=u5Xa=Yv)X
zG;_2(YHwlN%JSBm-K;FfX@}6%)n`a0HXzBMThfG%>v!PS{jT57_of|=D3cr7%)c1v
z%m7HRIo7VeR}g@2H~*M_$JEX*M1g9%`j>HTn4_qa=jGT-GZ}Zm-Ti<It{vrZPyT~A
zo{g=WMZ*$n@<HU_&Q8K=u20c3$2v-0^?uBtJBTe8F~-u`nw|#|;F-epgMxG+uDW_6
zm~TNR+l9x^uY8xTQfB8j<ab97WcB9ReY;eJT*N<{X-r8rkwuyrJ3;~q&X~sBXsvU>
z7!eZCS>~NEi32A;=d?dcaO>`Yy0N(cIuIOVT^Bp&90NLyIsSrt%l%CFtwa?m1XdaU
zS7T>6>1va?Ab=xBA#IUK)GC3ux&$#*`;h4T>TL4=6_mHy{#Z4cPH<=ss#?qL2!%S$
zC1&P@s-T%;fGhXGyKEwivi`MnEo$nX;vO4D4%MCcRKzQc%va5_;(yCN^L%^tRk%zs
zK3`Aq6nIbS3LEQ^T3nX?(qQ)LE%DMMec}^)hLy0`g09rH%sxSIO0We%!*la_2h6u(
z5hxbPRDJF!eyRDm!5$hWKF@r!PY8cbzwo+Mx>WOg0~EM%w_YW*$Kanj^4le|i@VEs
zeSvVM-8#0Xo>pfP_Z6-tT>cp;8A<Z>iwBm{Ss*?U-DaFlmd2o=)wIVminIr7=7P|D
zFch$e?c=`ksB-5nZ~dXneoxZBN5;pX(f`SUanpox(_%4x=9iFK%=`HFNe0-a<K7Jr
z<qsyBcV?Nz&{TIRXeeOIEU64thKMCn&HJ4@{GXwz6$-uz=p4Kpb#0YpXU^_WW8lEg
zwAE$sD0^NCxnO+B+6|(AQQ&as#D+p*AkZzYZ~F(71-W^Aa($AIA2QwHEnbAMWi;id
zdW<rkG6r(W9Ni%kQy8lqZV1<OY~!OTc5NaXacAL*Yk4SdSjQ!gAXIYoZ9BD2uE$kg
zK(4~4&HeX%WwkZ$Ug}Q`T0Xl#4x#k;-)j}vbksEj(t?R4f;q+6@dYfrZCR%DVaRAk
z$K)dPa<6@!dCdoimeJvQjryLYEg=EVn)&z>1F6diL<n&6%bB1z52>>vVy@8F#qMj)
z4S`JUzMa|N2W-ZJ00(DE+oS>ZhCiayEq;<u8X@KIztGZ|hvSR-3lR)`juUily9||H
zfCGlsUjYhEPp};Y!i)LyLc=T?ALP=E*Lsv|%j0|0?>2$(7hA(BVDid^L(Y#rM<1<p
zfeFIJ>p5!+!&;J5DyU=@$tQ=zQ#qdTv<kvvslOpZOt*x3d@et)9CN|PKAQB!h~8Cf
zrV<wlVy=Qa$I_Z4LUlb>wqMx45z|O0ylq&=&Y1PZTFh=$d*&)Bp8woHf3EY6XzltY
z<7UK6&M&)AsFLHtgZW+4_J=tMG}SI5rrEEuXH7Uw;z}wnUS!e0K!iwhT>iNEUAghG
zvNtV4lzEudwO#N2PN3vBirY%2g8QAv?YMOla`Zu|+fHBg7h{J^D;jBJ>Q2o#2P*`m
zEbB?0o}Ruae@O*1MF-<Bz2ZqNAhlu5`BzJ47JpF=HH`lt{FQu&7YqgNFc7YeEK<!y
zllfXNCkjp5<tAo%{ddP`+pm}Zo5Twc1qW_<vMb(C4k8H*;$X$Cbm+I?Rz|~lmH_Xk
zo}Qljd?%}cNg0@dgAwheB-mnedRFPLFK`0Q4eeN6N}QApv2W{eT<4{`SVaT_PndIE
zKzhUGrTSbYx?W5$mlDEX<ak8PPE?F8$cUj+i(Js<dg|o~X)_TkH>;1I!i}*!XJqN*
z@~P+X>7sDWGa+1%`PD()E@m5UdpT|{b?A-fT;Z*^-AbyRPuBHOi43Jr%Hy---+463
zXJ#8`ntr=<Q(x0_(ysakp{97py4u#-Dp;fEnb4R3kHiPV3FR~T$125l@7`0Y;(wIa
zce&})=gwQ(sRaWNsiHB5D21A^dW+8#S|8KeJGfs7Lwx(Oy+yVxUuk`pvb9-4k=te}
zoXM+0RtitMLZ}^5&F$>$^oY{=z)%F$WWV^tUe$)a%WJ_&%9b~kF$IPQkvk4Pl9rx|
zZ?e;({`jqLWK{q~L-wohhS=oiD%wdjDN@R-q)aiqa+7IB>U3Ms)nf|s>Ckp~KSi5{
z7vjd4h-ok2I0&O@l~w7w3g;E3yw_Ry?#Wrzs9#r^@~Fl&33iEPlQt-yuhlTFvtK=Z
zWAsfFemkA@%kcVNIa6*-!~2W%$fd<_iKet)^Es#XWhn(1L4M$SFYU|bIr;zrfJ<jt
z1_ClQ5&^C<-f4>k{OFcD*~*G37|T$s2KDcPnxw=-T~OzcdhR1p>P|J;N`j!V16BVQ
zppffE<nTOay{OONwp_P_&%jO<!*Mf{`yy^;I)<D}=db1Zbg@uFD-%S8p!TuGX0+e}
z^eGJ=J%%uY@b81fJ9O`v2t$FrUvT;3spBuGaXLh5EG?;i)7$uD?OhDX2;ZYL2ZY^p
zMoQ1`;7f4q4Q$By*1yRcj2RZLv5Yixd^4-k*X;fhK2wJKiN_3t;WMC|OTQe;lQFM4
zNEw?U$fGSHMkeq0r%xkw;3r~z-jw#USI>pqP?S1`AMs3y=54Fd=Q>MT(PpGU;*L8W
z&>L2GD##!~a4M?6Y8|nK)LCbdOUHJlN&n2tI#%05`S!^V2yELoNJH*3MUg(B@%B0+
zs~nk)-FAvpK|2$g<O2dtxU+tx=y)VsXb;}ra@()M={N5(FjYY^K_H>gx_+O8JAf%h
zNDmC9puFjYK_UF&t(K6JUmP5SSyKC*<b}6ARuzTQI^?y13ouX8evI$1nhFHcMWdOo
zI$(B*<^^~_%+xCWy?DK53ipF<Lc`3HU-3bwx*5P&cDlt|zIE_@^-^Q*JV39lKkqC7
zHPrmlZ7b9x?$bAN_no#H)_xoeAlf~H(yK&Fj=*sYmdBv+=8b+y%B;S)r`o#fc0vyF
zGYxB21AcY$bZ{PW@SJEf_HUaWorElY(Zt>`5Tfh<cmaftI&`=pm3?{YrA7@>^kE=h
z5|0~(i&~2DNh}-IZk_hibY03JA94Id!CT^szLJ`=4#ZQ!D-#JL#+5CBzRjJY>yJ_n
zp`_v+c!fK*5H4QftvyG<FV7R{ukLx!!A*Pn%YOD&ZAsk8(a*w^Cfqjsyz?Bc%6SzI
z^0?J{HVb<CRXD?}d%+zr{RR(+qul@UJ?V}81@`Gg5k-$ItsM<i^||@!iD8&5P6`7l
z<YpIix6V6Tto?>M&51eL>Soo728LG1&Nr&12LbbJp7yS1#|#vHFG|rgvcq*L2Gz~N
zB@3Cw)=Qh4v@&gMEz@xo>rf(#oLnx%3p-l3H(MkJQEo2hl1ciFZk`<7X0Wj;osZ9Z
z=ER($EQznb3cj+SJ}D_<i{HIz1DFwrYN|^rr>d#T6_X!NzKVpNlbrvrQJM)XD46=G
zgPZ)qEVYN7yloD*7KR#uJ9ayaY1c5Dw}&wVR&ynFOup}-X<OEG*^zW*I;UCAmmI-u
zl?(ZhKM!ubxkwf5*n{b|pqBuR3zH5R(wdUjz~Y*4qdFbehaA=n8yvpn?8N+}w$3Je
zvVtu7FkSgjx2s}3!LX<uw{Bmh_seq^^Y1HQW)kZ`(}2qBfTTdR1O@q)MNKwn;ZRW8
zl0?|Gq{EuId)__aP4Ge3yz4j5Asaa+$q7a^q=lTE5(msCMYh8<xQ9du*JL9TIbtX4
zQ&zNGc`;eoAkJ)hc3?7gFCuTXX)7ZiJ)`eQjDjFY?WvKGuQG<-y61$v*;Ca+7fl=|
z1v%}WhZuU9j`J_AFD<ngr&wneV<5p3#tbCxdT3U_{c*6nROX8sV35TBXy@RNWWLN#
zE~xbegw!y}?eGo~*JG(jpjcJbF0csT#XxTF1X~oLfDO7QJ3!G|E)07+_0C0~$BLjz
zU~{5{hzsC0K42oIKHsgpo7v@=7u5{u92aEmDT<9I_-B^|@)#_6jA^GZ`F94Hb0^JT
z`_VxQ7_%v=GQGBixRmo;mcVF_nBaQ#frmEZZIjV0Z3M;rd~ws>lX>zP#K_Z{x#{ey
zrF?2D6#}J4g`pNwaqH=#f$|y*hKa-k2}$B(#l~9=SRne2_?;<H3UlAb#^<@yGu4h4
z?iikcXc7$K+?RA?lxrStDtYBW(Zkya3|TSqKA>uXZUt;+l;Qc~-!s;p8VdWXm2)oc
zct@Op8Sl>{bSEZQjzUdM4Kb<S&An4XWpYvK!8Z86w8LYzSA_O%$p<#m4zDt4WKsB)
zfJx;i>XTgHmNkQ7jE{6-3+pZ#V%y5ptH&NPNvy;e!&lF3r{jG-Iso5Eu_PK;E#$az
z=h6s1;%J*nwhfAwRJ0<3!7snH2aQ;}p@VUal{=>+r=1FE(-b>qzz=2F%Tg#|B18{7
z^+moV#iag0gDR7xq)xEGy`__lrY|PFR#J&sT0kZ9E|!f(=DQgW1O#+$)SyOyqU9=v
z=(_wyST)%%E<~mUUFix^1OJX|dqJN9v2d8%pUBszEJ)hcPP!(BWNUFH1q-=Kl0!8g
z{bbKF1cn?|zyGrKY-aH4s^C@q!<1c&`Z@<9Y<yg}d0N*$fu+O})bzVO`l98o2Q(kr
zPwX;04Oup58Lzmv{bLk(d^4Qumuh8e`=Uh&*9km#1D)oA_<*+WRhheNHY{ol&&_TT
zHrKoe@JKqYcp*z7%~N~5Dc`GquiKv|i#}nedS-8tDjp(BVJ8r01M(+sZfuJp-D0Eh
zKe6NE`~LAC-oy{+%i34;toDl#5;=v_?BzcfU}(^bW1Xyv_3!Ee6nZ=5Xc$H;IyQFg
zKmPpuwxJs@Wso4<nLI6w(13Q01phde*w~FJwgJqAYQ9t8-_~tdIM~9))}+OA^y=#C
zto}Dn`p^Vbi9dIQ@XS02TR78GuQh%_UDMd;W;8W9RXjM)1^pfV02~oH-Bl6RBY^XN
zXZ-t0P6JIH!a2^r9PYK>ad3tk<JTHvkSX^|;m>e{UyCj|3&1L3?G3t81j^~5#8&Qq
z(=G^nDc%p+Iu~};m(NqGFM4V|{y>=)6b-Xqiy8WewKyPf&6*#c$-8*ZFl}&-^Y<5+
z|J1DGWI`|h=^(_=k{=nqNS)RK1-1)=$4_}Dntp%P5if^d()Squ;`X*}jJbjNWWIdq
z#qS(2MLWN9;dx7<$|#pJ4}}o+obwGP-d=;R*ihbRA|+6J9~Hrut}m}c`|S^YK=0L(
z2Vi$Q4bZvWIi2yzi!O+-C1bZ_KkK>FH)Jtpk#DtQs%jHbB{0J;sJCtyk<f_N4^`m2
z$^Ra+*{@bf=KwaITpDRDsuw@VyxZY5h$t-IssjQ)wBulh|Jr!6<%@zZB(Q#$c;~(6
z<-aGK5CO5u3~#HdE{E4jFsy`lgYxz!2CKyv=}E=&fwp?;JI@oRBUQR}_N2iozpZ6+
zp`+=&S1V#4_b+cq5tH0;-S0BnwszgkyQwyx*X4(g2T*g3xmv~l7`gs$qnMD^B%Nn7
zi&wLq5-j^Z-_K&fRCB>i$i+{CgzDR;Yz5U>37_TliLcrOa01TbYdYRKrfFiI5E>r$
zW~$J%rqm^a*bny&Z<KyX2coj7JJB;ydXPct1Z((EFH~_y%7}eNjH@{js#%?wE3|Uo
zP8T~@hg2#J#@Ros>Uj9*u`JH}BwXqL#lzRvEMV_%XdwEm)cM5n;^>DCQ^_^yqo+QT
zEg<c4#Lj<DHh2tBH$+HROU5wWVfqx^rd7Da*m8drga20B{TlZ{m848IN<DT+RaKRS
zNGYLL^L5KM+w-Cyb5R!?<A{Ua-Hv{e`Tj0BU<#X1#0X&XPWC<KL|y6@1(QT?A4O96
z4GQ)2+1+B#eso(E6xl<G84#%Rr2Zq71{E6ijW|hhKZjh0^z1|F+nK!AkNMZMb<I0}
zZ6O93lgAf;c50>cl>e;H`_P(G4ZTVil%N7S=!6NKK9MG&M0rZ!mrA06;4C65D*ws<
zBVS!jJG~SR0zuXB7w`U4<(m!rxN<j!u_P#96ramS<?RE%w%&R{sXFq}KT&n!@@WNY
zI3&q|rAAISqecD=9ku5H&v6U<THGP>1k?DBs6)HyLv^tcNeG2EiG@O%75vL+P{Wjt
zL7u|HgUO^~45H;|W@=<gF$AmQBWyV7++t`i9)qHlkpD7bnlMpfXa0<C?k$s=$mP9U
z5bMnvlR1j(l)8lE^^bzL^~ep!FJE5LkL~3i@M2c4pa~1%(_DIPPa2vC2=wu^?UV6*
zW!Wq~4{tchH5;}_ET1zuw7Q}nh&=eaN&qHpJ$12`{Dcgvqt2cE7r#gR<2cFRdHr{1
z4|{feMnTDicpc|^F@G^Us$PIWHI&0E<P^5=35;3k@QWBpve+Kv`1&@<**&d9vp0yF
zGIBrpFco<>qc^_$`QtdHSKEO}ej7BT<Fm&*ryi-X2(5Emx50p_Y>(TdY(ZGKnzp5B
zcVLET!HzuhIZg=9wbNpe3zjYOhKF_I8TUEOY`EYUR3`sz{TQ{L${6px2F$wJ+Q@D8
z7OBjwUx}%MB-uGvk-7NNp!uF_f$7FFFFe0>Z5nzQ04k0gZ1nV-AABcGl&70=)8_-o
zaXPL3AGkq(%o;BAbWs(&<Px6{5|$rj#iql?8ZMn2OIsgXausW38?);i+dA-d3<s|9
zZoFdOSN-DDq^GOBZET7NeX@xQ08c%*sWCwaGLNK`iL}6KKePU<l?|sN`6~YHt=Y6d
zHRxDKP6_k*kEw`L=%~p_+)zEKIMRi+{Ov?!j|U!7^=~>19ouNI?y(2?EnNC8+l<1O
z4qRnJ*QJq@dAr6>*FIlfgc%^lP25rO6dzXBXoS6z_C{#gva;w*tI$KmQMU9v5`7O}
zF#yP=yi!H<R`TZnbT#m#^79VSAIhA8xFG~MgH52YG(HAAXuvc}@$$y9bMn^dX=R{X
z^n^Z%n>tPv#`nCTsVEYyI0SXbfN!wu?U?4p)GtLPB_@eCDr$#?l+91#tc?80R1W6*
z&$+^(l*_?!SV^sT2Kl7D@N<XxFsSfRzifAsk4_A_v#NAFM2Ic05`vre>B3^cMshFT
zn)L}-cLCk~aRdDwR9k`(v)-ZmB%kbd?(t_MQ`#+VgXxE!P=MPDwy?wejTgR5lB=Qf
zH$3u%?^HBh7k;N5g-nd%PEbjPd}uK)1O!!F{0ZnZp>B<!NYR%4m%Dv;LyP}47glFn
zv9U4dc60Iymy)3or7x$ZA;G_|bX;*h0uA|04FGqBpnO~;=Q8;rn9*&5SE~ay7%70P
zkrxqd7V4YQe9DKrX-$23YY{aMzn+PF&IsMWBUzS`%G5aQ3Dw?E*>biN`X*}VfrZF-
z7{Rs7h)WibJ{!;?oeK6mLrJh|db1tSB4BdY4X?f#$(x*(<#<sZ*;y}OJkj8iCZ#Ot
zpAu1g+==N|6qNaXNi#Eu^husgI~;)VRq6xO&Jowcw0LP0Nr+$3#zbHgE&(NX3^Gm&
zI~C>^2U$$7$DeC`p7P&g+#c8h17XO#hk0hx9*z%U1iv3EdxKsdvw`Y|8G{WL6y03*
zeJucv<qRbe{rZRAPqcabGD)=f^}*%fsye^#S#hRhFzLC}0h}dkKqa)twy9~1)*V_1
zZVTiQh1ZsTEQx7sp=XCdO`v6Sucx-Ee9P(PYTHj78!1w@j4apZ92}C9MvYL>h%XuB
zhBfU;p2!VRt~A#M@O@Xem4_B0y+M%PG2IhgubSiwqaQ1rnD(n1I6%Of4~M*JHe+qm
z*ms9V;a(&Cd=|Or0;=c&$Y3YH;7Sqb?8dC|WSFWhlXf9RyaK5{BRX<90q{bL)&K4d
z&tuf@Z5-Xwfl~$Z63_}l3C70}@896<)ACWBsy|$3M2KDKQxDs&y`Q6_u^HsVL*`w@
zM0xqC_>#7w6bEBFH)zdr_jbb{ePfnG|CY0XEZJu(Q#i-itV0383`C{B3%n_M1<*vW
z$GWLSPn8p_>K5N4ZOW4Pn~Ns>PNx&sj%@z*7CrbG?$eyzvwPli6vn(wrd+)B)<L1x
zPpKPrD0h>|^ACRBPdoCvDK|?HlB%npLrg7C%pPN<({b0U5-+^TWLb2Z=O%(lLa4(4
z3+;!YtDSWzUKCO)cU>_)7wEB^%BQl4ejBHML75twx?Ft;=s!A%SQZA!Z;UM@%*9b>
z6!+W5a+5-s(7Uz@+9Ubwd2a-0m%SXaHl(oOzD+55-6?MFA32K13lB%_pyXI3<%C)Z
z^x6@J$KV#)geqs=I-M7C`jhBEC6|u7#kg4gI0hkLyR%;;JoSO{X(_nsbTh;lYWoJ0
z+pnsmeq7K|YJ<pP0U%70$|~xZQen2#e=q$NlF|jIj&8gc5zETA&YW01Sy=_2{eh6o
z0y?YJR8g&>B`ZN;1if=lqSReG5mZT(Xd`BG?fev->I>l2rGky!synF5s#eP==OY5V
zRmQs~#QzmPy^yv~-((B@EO{P@!V}~nH)zhInno1f;3%{8=LcK`=(qMx9k@(3U_y&q
z5x2e_Av!4iv?h<A&F|N6bN(!4(DIiJr#-1iDTk_La*oI(lfPt2<z3RvtEfevD+H1%
zVS&mb4I+tOjC;>p0U<quZE~D2{F*cgq)q+--GjCgNz(6k#A2;Y4@6kb(f;6awZo(n
z|I0>}wP|)g^-2;VP5G<25n5R2S9Tq%Y9d%@wKe_fXT-(Oq>CDc9@GZ3+Vn|y=z3{x
zaD0L5YHl_F7cTsP!y*m`R38|E+d-Q<t09i2O_&3H=sV9VH?cYr!edGrg$)Jvx`Phm
zUT*OvxjxZpZ};YxVpy=j=zqIJ4k%xz41e7D*ooB22NWu1_aA=6vzPpWJrE0JrnDal
z^2>U+A2B9<*1mU*LKRhtAc&7`>!)T?dEb(X!90NA0dVzuqlbmZo3wtUBQv@!ET)*T
z6T&<QLkS1}#lXFfSm%B(Ue0v<5xtGA)=j@YeTqIhct6Lh--`=De*C1Pgp0IIK?U+P
z^$m7=%OIy&*Hjswi7>|Di=DcA4}&k8aJ8`Mo%#Phrr!L>*Kr5SG+^5o;gTmmB$-)6
z@-gS13w)D=h>jEBXFKlQiRIwC(O_pMqphZ)Uck0m1)H{L0w<8j%06t2>BW(z6i~_;
zh=p+G46P9#H-)?AH}=E|S{&B4#ds-^l7}KL#Y{U092+$L%~$iZY{%i?btU|jKw`sF
z$czbcg%_Ho8Nz$+-60FmpRmU_j;Ek~JK3~2Uq7q6IQ($U-Td{E+@-YqQlnxa6$b?&
zSS23=m-)7j13$pV+W&^}*)Bc+tjU_=3LzTDwFMpy_Sxjd<sR5xFm|N+#enO<B>Nv+
z4HK_TSH>_k@7ynZau4FdAN3@3T%U9m#^_^w6|Tj<JgUvQsoBKk2#jLO9UCsBGln0F
z58OW!+jE^16g{ZRU0KKp#*s8gAlU@=xSIN4>$}Kz!>a2;b@4?XR-4L^x>%^Bx_ciE
z`f!G5zv`|ZH+E4HGZ5ScJnz9{9cw(Zxh>C(igaFT<j|8lXf^H{6*y_>aOj#l4Zw0e
zD<qpN4@!^R&#i90$;Hxg%z*loCdZ&T0OD6p3c6EMAF$&#WzX1IC6qke02>BQl~47J
zlxqF^x||k8D<f6u=L4hRMd=R;w@+ruUr>S;_&&+^{jA%Y7zq{G+yqO<AfBZ%C)Vi~
z7i`B5_5x@EM+iou(yiujOcZs~T80xv1VUjZwSzA`6^Xv;oX3@b_G-XX;{+?^w!4h*
z({#`3iZ7`{(*@#U9VB>|<8>~7O!VdOeZJY0Mw5&}9Pm%RCgx09O{zDz)eDy*AKpY!
z`o(TEcTF75YcBJ8CDF*A@!F}%x{;*cA)KWdYw@%#8nk`&dw6#<<&R{Lyi|v-k137J
zKs}94uj`#vomqXczSk~DA~F!aT&#@ge_9JBn*;>_M6MdZ%p*`}FeKz!piEjtsL7l5
z{PwTaS~SxB;5*d2;qkU7glSCI-Q1AuWPCnyz^6(p&XHJr`|;GVE~B`sj`lOoIkLR_
zFE5CknE*52X_clVlA@y2?EP2^USt$3BrBNpL-e@L<I&O45A16a*dhs|72<9l>TYi8
z7B_dMsfR#CNhwcgqv@UNx}e8S1vqu`DxUQTFZ)U@j2ymnNM9HP8Qw4j)W!NN;!YwR
zXdIx5#P>rIHJS%h^vn_^1^v@ZRyxh;0dA(IAyB1Nr|dLy;!~xDt*z5Z4GOhVapVdP
zoTRedK;CVW1+GQm<ve^<Mu?4_5hJGe;zQ5P6_*E=p0JJ7?tT9LWYCzMZ~Nc6^>O=&
z-)m!b-QIqEN_ER8JF_kV5O4q4iZTB8?$E<1SSEKc+;!MHKWC>0$w>~3j{Ij63aCQR
z$=Eg7*lSkEJ1Ccn8RsN56UBwYZr6YH^2_Nm)ZY(rNW*>-S{VD<FE-F)Vmzde_|Rc_
z`W?M1ML895zb2n4!YrfD9Ba7LS8`vFfWY_zdy8S+MS>r{$Pq_}s`5G`^Cv=G%fDv*
zwjZ+?;ln8rq8SqhHpkQ7GMiyV^P_{rx}a~{HB?hs_>yAWd2DZkOtq@LeZ6S8$D{fk
zU$5j0O<woYG6eiGGcrhg91Z{$+VQGG{eyMC8N!#giX;bC{*IuDhr(!wVVVdPDAY52
zA2HnHA?=#feOS!~D$KAfSf@eo*Mm3id|a!q=|*8gzKd2bf>oTOs<As2xbu{`7#waL
zFAG;icGep`THj9nSY8c3yIkxbrdlZAYBIE7ITN>DZV+rZz6HNooI^Tv3=Y2W${Fmb
zO++I$cl&Zj(0(|b<$fP%3RzBqx>5GLCXePy?(_qmiVOmpSBusi9ECJzOK%t4qm<0m
z=B>7z!GSlsNC=Rgu}2}@sk;iGvc5Af*eeG}Rvv9oJq7&_E>w&O23${TpadCI4;>#f
ztUDwS&$&pi_l&W}Ib`y&!KXz>|4jbR=Ch%P)U8|3;cM%hXeiv+AH%`XPux0p;#}T7
zf_#GMKkINc7su@}M$M=WL;8bjnBJ~ne=Y@am`Kp2dUA)5BYYrG2@BP{hjq+}Wr#1v
z=%e^j?6ok%(tQaaO9U|8^)5<(=$mp-$krV9DET4_u>*qlN%Z&D_jyy+*`wA5mn|B<
z8Q%Y5q8ke)X6RPN_p4hbIWWvC3@990U}_m({?;^CGGgeTv5>(rK0Yy1`oZl^?B|XL
za)@xBdsa&)lKE0m6+0E}6p~`8C9xX(0+6dJmGVlvMM6wQnE+os;q@_aV*<9%X1In_
zMNOzPHz0YeQm!R^X6&hB(I>&9O=P$4CpO>PvR9QsyX@8X<byIo$!a4n^RV&(^(w=+
z(8l)i3Wur-f;V;l{Xf-C7OxnU7BOKqK?9=}dKTI?2BzkdK@1_mU)jj(YG<g&*h%9C
zo4}g!NcefVz`CI39wX7_RdYYT9Cx3PZ6hOibvK`7xm8T}$v==aW(IdlJtvB}6+7-I
zHis9AZa&K=ef7dNAl98=wfLYD@$z3+tCHmk%c<P;#@I=|N57bh6IcEeYL&!f%a8kC
zt~I5>_ymlhIN~VO|MN!9msl5Um}R&X!0VBkMnq)IFI~O3n-hV3ACRVbzabS-9uh2w
z{$*$>aAkWNEL5LnF-#ba-zVlBZ%&mW!Ql7-MLTudWYURm`sw1we%Bh6gND++(!M8J
zR!x&+II=iWpF2$jq3dUSPDP#!K9P{D2q0QN!#mTTCRQH?@}+H?de+L(D?T6CeT*`x
zU#eTyUYmUvcP%)W6QZeD0Jui`W#;0Nywd~U`|_j~(qkp@^c&8hKWmNL*Q9GPr1Iy7
zlHa2hfNlv_-th7I?lxW8@L}1;-YF!J{g88ENp3TtrdI8>EtR)-;1@6M6|%LZmLBXF
z%I~|cw1RuEloxC~mk=gbuoon(xz*_a?y45h;w$cFhGQaGQZIw@(JL1(c)|s8_Y}eZ
zG|MNQ3wGtF(9qP>*4H<8skgi+S?<|UgqUh!tHtkvHV^8U3g_#<kqb|}!n<{Vet!$I
zcw&xTr>{PK6oFx3VN>(Y6dzZQT%i`;d}6{M`+*`x<@iGbQ6w#DY8Bc4+19T1;7T~A
zV&b4n5GOBH3VU8|+#GJ7o-05-?KzlL*WPQ`9|_UPa)k-qc{GFa+{QaNCD;V=iLdF#
zL}Lk*ip2`PD)W9f+@9jfcza|5zm|Lj=Kx-85!Km##|ktnv%BKBq<b}v^e!G~-8Yh0
zbgldz=Aq|-ni&y)Vf4eWiK-(;_XKK`o80bT__JW@y(`PxCRruJINK~)bWp`dyt=yb
z0kp)bOKPXuHLO+`fTZr$JxDfM#O6<QnC$kkHA<FJYO_Tvkm={}<%cGF_<RVhN@cxk
z$JRa5AoFejjXP9r8A-`3x2gz8$Glh8fJq{9)?Mo|sE2l&KTAC;9dSWxH^eFIjrV@@
zVd2>Ey!^$`e2Lk*{}abNMyCyHMR<E!YgGb@xpGZgo2+&!)NDOF`>wveKEV%b*MK<B
zy0xik@bQr!0)b#4A>QyB|2%2Vt)x&>Z-T^*W!5n@Pf*3N#phb`H5oRRZ%r4PGz<9n
zTe2}7y7CM9-s6DDOBC}yO}UuFR#a8hb#(m8^1bhrJ~&;DdR!g9AkRT-v8AG1`~4r<
zRMZ$%IlIAiykiq-M>-haeB=oNdA2I-+pMm>(x%fMd#{E$oVkaQ_pgyd-gC*#h+!Vp
zCMNU~FO{nAV4wX!`N1sFcZB09JVH!LD*@vSNql@be5=X+13dO}w&}q<Vae;N<U!}!
z?+akzDg-y$nDomf_m7n2@iAlNAB_wah8Z6X&&x0h+0)7y@p&9)TYb`6(+n*f9O5m?
zB~M?f;O%c>+lZL~jjImzz7Rsjvrf6Yu2;?8I0!4b(M3CQg{ojbl6*Ku&d1Dm6I^sg
zYvz1a48&&e8aoV>1K1B<H|QEW5>B|}6$9Lhqqe?oyDTyOiMG(S6wKAm&27?*=)A~T
z%b)W4$po2FNkWBx;kBgbe=0Xh<<n_ESw3fb+NO3<GtY~Q<2Ki3C&y|=g4eBFSok~e
zf?>2`w;&1?ertl-kg)+ZwY5DK9&@>h8C=7BqR&SfY87$5!ZurV!W+APoBl4GO|dd8
z=qZH2hSdFDg+RxsgG;wz#tO&O%-lR|f8YFZo#hv~PN>5^ZDAKbQc0=S{~z@J75;W2
zhXXsJ^=?VJ*6qG`&21Brkv*5L?pi3<0m84#?8NFUeek;AHZRAs9cSEfrz?la@7Lz+
zCV%kgaFWWC#u09CotrC=r?MjO><&+P0t*UOPHH1tKZyL?wWPQX>g*%JBs`c@nq*-m
z$08;~?1Oq%yi@vq3E9-`Tjx0LSUxw+PvYlJ{f`%bFTX7yZ)cQ%d&3(&;F0sEOSZ5_
z{6HAur4+mfH!neXG%;LALH^=NU1!taN=aVb!)g1q|M{Ep>!EZ_Teg(NoiMKlu`3X(
zd52lJO87vhLu#1+=7ZvLe&2~_%+FUe>^1m}m^0@P$PX`aYbhP1kBM;=L+uw7sk>-z
zpeKF7Ty2YV<5YQmMY^y)_@L<5d`0b4e94}b6;fz2F?V)Oe0X@M1b-HeBK`n%eL`-a
zLCna_?WaPC1P|t*x;7$j>6+?Lo-hN0yT~8q+TD7NJOUE#R7&9Rfkm2>Y0fgf2f3*k
zG^;6C;*HL(hz+V?ZwO8Ocf^?EOT=KM;UqkEuD(~l{UhPYuPP#mQBsDMKU0lcqMASW
zGO@s9s#&W-LHYdMJZm@1((p)lyprdr!S7?NNQh84wk%Q}CdnG$-4lU&X(=#gHIP9=
zEhM@phx#Pon7xJT_k)Up|4QP7rCB{+)sYof7H1ZRS{#~%pj^r1H2-S<RIykYgE&DH
zOjcH?qT}4#c7hfq2Hn|u;oXX@onFUR7k|K}-4FAl<uLP+npN|fHd#mWu(&Lq<qq$k
z+dmmoG=+ONTO|l2NO6VQ+?8M%=h4nI-o_`62_bgV6|%<{_5Snw#*O18+o~p|o(Xp?
zIqTu08miTw-_bF&j9FHg+aK(ZqchD`w$+r>eIX+oqv{t$Nvw;-c=QYJqs~!?Xl>=w
zfle9@Vvk9^3QL}F9Ac~pXhpwmodvoa3F^3-J|n`JwcEx}>EqRU!KEJP565Y0a#MPI
z5vE2kQ5V`R)p9XYQdf_TUEk{oLDp5SJ#o(}ptJsCsFnWX^|)n?)5Qddg@AyO_CK3P
zT@F0E5zCn8hcPY8pf`J$<OucOIqE-zcD0uD^$w`=ZW<<=tXk2T?l~|{u@4)OT^&7+
z{J4#rJVe1ZX|E@+AwCj%A}Z!h3_v6`Ow#2a+fDYIR``g0J`((Q5w8B+foQ&fb1+#0
zOOuwTPkgJUMTVbOZtGb6xIwn@?K4K@6|+uB<~@n@fy_mL#=#Hu&_;q@k!Sd<#j2T?
zQG(R2OM+*jPSM@4tG%l$-ZOjF%0<(Ar;PKX618SWyiLEf`x)t)nV^CKnS58bSjbFc
z2)XC5->EYtJ2q#tWJx&Cr2g2szO9F$+&5i+TdWao8G~;iz9})ec0{UaFre%;H^U~}
z>wu1A=j+t!-pGDE|1c_>=`>{K<OXKAE;cL-@!;SfJtwDV-Uez+*0z9;ykVL!sFsGJ
z^tq#06CDoZz4783B1PQ*=xx6hoV>Yli!Rv8ht4)9-o0h%fzvf?#pYGZ>9eAjveIFy
zD^6(fYg#DCA=5G|7fP}IuOLR7hjyqzuxLWFMHhup&pCD+xho3`MAPu^nDlwOLWW6M
z7hT3qS^v5mua*TrYG5?YLeG=WK(@CW_@f9G8K8e!@v10A+JCvnh9eNvlLPCF*G7qL
zJ<;qe$LGJ1JjFQ-7WDtL+jEz?oUzl|IEgYZoApf8MYYi-{V+KdS?_|O%UmZ|g7(o_
z38!5MIQgk+?vt)R3J5C{<-R1IQHYoX%SoG5t%6)_Ilj&efkF5{f|T>fjKWjg%qdmu
z|0C}`+?rgrcwst9RgoalQBfg)fQAkV0v5_fDM30B5D2|@5ELXdMcSshrAtfby@x1O
zdZ<AVA|x~+ArQ(J&pF$p`=0Oq19u*HnD>FaGqYyZ-&!+#d~kpeG+3xQF51{rI`x)1
zTd75o$}o9&lgogTNF=zerl%4-C2><Jwhk3Q&Dn`}wGnG)a1AP2A7VPJ+FJtmKJG-Y
zbG$h7jSz6%hX`kC;2M!-`0y9&6FYQ!KI_!0>)37<Gf`0^-M`yLq8Zf(Dnp+`+t)wC
znwc-6z!wBvLuyVPQ68$&_~M}3<Ri9qF}_Ohoy&3Rc7OPLJopfh7{_a)a#5)?>_foe
zae?z~dd{bu26G?bT-P_WiWt7Kyh?9L7OisUv%C^s=B1TRogv?VP-}M2VmdXbo=fe|
z*7aA54ZR$1M=w51G^&@+R5AJnXu|YP%_Rj+@)4l!h9ULwHm*eQX?P+f1i4>zF@8~R
z&rqd~pw#o{7x-lsMxT0rIunLu^5Huj!?WyV#~-R&W8`=%8ygRbM)1sah7*P27=AuO
zN2+n6g7R47pDwZk^;adO`AGe(*48G}4hp|Gn6n*b2Lgd8y0;pC(?wUJK`CO^`msk4
zZ6)_bl(`D~Q`S?S{f3{nii66jO<+b0^W%Md9wwPlrT3leTW+At!Ze9_>!4?LpNlZC
zsBrs`D)lPfumn>=bBzGUXSQs7sfAr-%&c)S+hOZ`;I;K$T8Sv=%PC+@9K%9J;($!f
zohqM=qP2z&JjusbtWRYQkEo7gkeMRw*G?{xgX$f6_<X7V6QOY2<J_KaEo_i^^5AFG
zvS{+I2rU1zHLRD@gjLz6f&)p3U_*dFU*uc8pKJS9XXEvch*n18s`JJ2pPu%tf#L$A
zDv5fhQ1?#Cl~f(w{ja|_AMepv#SNPO3@ef(iwR2F3_T(D4@f2&uAT(F<@p&)McYTd
zw^{!0$7`FIsMJm!jz}Jz!;t6qNb8tmXHb)JyS@<z*zV`V|J|V(9e9=QF7H4&gz)nP
z1=G~Fl>2}<F{B<@Qd1jQ(a!$K?H7#FBJloyc$|;pex2eO8X>grtu{iL>vmlzxvqb3
z<t>3`9KosclXh3n{07oE`*Ma2)c5aXD%G7hld>@Te8(%U$CpA$QK9#wz7_5<6wPj@
zn*2`9_;xQ(8#^=I>6>Ohm(oz|gO2U11YYkelTSIE-#p?EJ(>*Fsk%jL5+La!-3$EP
zkjReLFG+;`I}o*zzTW3yY6cw;IP4JEN)6pl?Z0U!s54ah0dno#&sbIW{BLl?%!X*#
zaO}fP<#}@1M{t<x@ser*W^-q5GbA-6^d6O(c4+3?qr{(L{-YDfHuo>H7R-RiX5$(4
z0{^7;*RRBNX~D`{GnFCoSkm-lYfnvyF%F?aNo4g&S2CF~Sid2v|3-ric`wtGQI!|J
zuA(@{)gL>^cf3|{9P{A=X~VY-<{Mvm;l?#a1Gx_$+-Eg7|Bk!6PcL-${}%Sm3N<jb
z+nI$NtQH1g6*1P%&T*TR&f%w=!_%P$g`tkHyyZ24t1ha)%$d^7R+k;fOyf>fp*7Zv
z8W{2VRVX6l7l`XKhsT>ID(nKYSB+k`kzj4_#vQi>j=S0lZ^_6I=QEXPH$~k3`A!*%
z^7v(Q_H$JaE=?Gxy!tE8a(916^~7^xa&q7IWCKIXJ$l&B^3xz`^HX9XkICO8GeX|V
z);3G@?gyqK!JZh(3{GAkks7W01FrEcb(yi!eZQlHI=6njVx-{9e_=$Ox*Y>U-H6vX
zR;FY8&~Ys0Xb!WS<vSk^Y)QR;z3Qhl|En{5GfChV&9U;%g9u@GO2r*<2f26hMW9H!
z9fDcwFE~7j`5XT@C3TkKhW42kb_xHNL+f0PuV@Kwn6X7MJ`gGWr^L|}@c7Qs%K=4x
zQzl~y>~icTt-%dnzq2&+Sh~>sljWm^(i~^qxo-cI#J{<L0?GV$=zsKl)qc2Q|B$tx
zLie9eL$1%Sit6Xmgnrjazq8I)-RKNE-Tv6V`x!6)FXNB7{OOJ|r~0|cf6xAp|A|@r
zdpBlJyN~w&A1du1!+(vR){)t$XBPZry8jmT-{kx^2~J8<6#5^E{C6J6%$(J4`qhH`
zO=rqL|2ts+w?@6%{UfOFS<a*6HvTc{e;*Yce-(~j-hAyBKjSw|L3!AStan(U2z+L>
zL;XLr_b-oH>jm5tzWS-~e$wSPef_(<e9AiWZv~J9Vm1Efus@$Siso)E#Wzt5(m%HG
zuU}>LA6(VIu~?AKA+z+mH2!1wPkc2QcK<IiHFy0kcXxmSRD0C=KR#qeK&pBsH90rp
z*=w%hIB~9{iJaoF&O2YW$LZFiW|y)UJ?bd6iF5G~3jxeQOFoJ*T8eMy{uKK^$qn%_
z&=&szD*f1`t8cl&>%v45silr^qhfhnt9xu)R3zXLupr{f!YwO)#dubH(%RsXslW~!
zoUPOfW%}Q()mHu+n$lW`{>&6fA1yvoCnwxpovCOynE>ZMg`^uxp51OpAJa8G!-E#o
z;{HqElyWpZ=$q7i+myg&oVwX1Rx^>wFgfP_0!V9>>bJXFcXHU-`fP8@j2B0xL2`tv
zPMHWkJ%hW0Oq<V$<4d^V6I)r`dO?VeJj!r`4kXM%E2M{WqVbQM@>>5i3Q~(yI`bfU
z9a1hPU@bwAuPU}si<BnF2ajPt{?1N(#XmGsd;SkkD!zT0&Eh+$LS0F#(H{>iXYX;j
zCXm#$xe&!48cMVFV8hRht$A_5Frn?#HVX(|v$D{NvWy^c!&9a|Uw&&ssqc(ql?xPn
zxS`Z-93~qs%gZtv$kT5AZq;gPY4Ykb)q-((D{8O@{M$D38Ll@@@*kC3=@F-^;hYBi
zn-_xp-?>fLqpDTH!mH#k65Tm8li@RLnRP?nI#9rhKV#}hjeY#^t%Yn9Ch`J&ss?3f
z{IGb)pL?+coby-#yhq|WQvs1tpS-#N{;whX*IJdiboCKx(OBAqxuRAUv-W_*ruJY#
zn<`uBciO7P;HcHnO@gtqS-_@}n`oJ*P=j=f+QA+_fEL_Vm%Yp}0;-al6fo6Q3Y9C>
zX*nH~u0Qi9wQeEC6m05{TPv;e_IBznHH+eA23jf(?e6U`#gH34jQ{vh;Ydys+h-FX
zZjF7!fg2JU5TpxOt?4Oh#U1mg2w+VGn(P8XU-ETHAF14Hi{R^u&g#12V}|pr*H)F4
zqkwJUTwxVdT;Ww<|0sy6B#nSoMCyNa$s*!kI8Mi>PkiC9Vd2ARwDtw|*=RS#GcSqu
z?Kbi_QX5NCG4C4)o<|US$&4kk>P%GZ;)xoZ)F$CZPXem3<X%%t?Nvkb>!A}qv#zmc
z8ynZ%5@w;X=3YDiH?8F_^Zuc8FMXM9MNQC4NQKVDN<Yi{WHH=!;ZC)m6@f9((**7}
zQDzc<c96c48@l2VPgrlcjgCZjWJ@)?F-z5F*}3sV+fjSQ4gIpxN~%f+YV<w<fXgiO
z^tRuparonAXVz`f1(;3Q(CYZ@dKj{w-}q=eSeNrumH{K-)(4izJJT2_O+v$LhxuG~
z)o=xep~|na+kl<_FBq(~;9)NnUU4Vr?6oj4wvB)wD`?_~$z?0s5(M`xw#9ftmap6V
zl4XamfG5zx_1iXWbV+*@xY;6k9ybyw#@I2_V5x<i(2t}LL5~YzqT9y?P&x+Ye(Tj?
z<V$E{bmxW^Owv)fdqD!V_&}1{(qksqW|NACO+`NxepPm<RI-(2`xdldp*bQ2CHpw5
zoJy8AXl2_8?a32$d-9H|Ij!&+M2J!V>_wTqx)IwJ$phK|%u4ltf^k{y3pZhu^gEnc
zO`DvI30x(q$n_k+ZeJaL7)Ck=V)pum52&WuW&?dJQNcc~7lAL}cRpXoGoQ!Z9*R>b
z(SDNt-`M4cU#j>6ZtdPtPqxTF$2B&!7p}TWw5(-}=y~t~0bBZ()TbTNYn01fXJ26x
zm@=}wIWye%Xh5E&FKQ-j@$!B=+JqOT(du2+5pN}}&n~zY8Z+Y_Hnlqj%yqWj^Wegf
z>r~F{d_7L*ld!T3np$re)uiLM(O<?QE)W!^Ya=v@F<lJ)$lW9ew*Sfka(5>Rz0Jo9
zY53cuMssxkNV}Y;xC&?Mr8_kRgPtR$RH!zTkq4klvpVG{ViB4K#)j7h^L^B5b<+Aq
z2TLrqUrHIaiN{S@OhqP}xSW)CFFtUk9VjY7A2kBA1SDxwFJ-a;oB~+MUf{bhn-=<Q
zQ4pyueK7abFrR+<!*^U??xgh>q2-K>oulg>@7p*gsRO^KoR(Yh&<h>xw;Bo!mhUXS
z{VZ?i6!gn|vETgKSx?*#Q|#vdK6hczYWSJGl^8#V<`99I(d}#ovUUZyxc+W=XMSzo
zT84E{;L$$YOqq2R|NDs9C9IHyHRi2qsX`fi$^yqWadb`CweCRi1#)X3Am~!rrjVN}
z%?w6&a)(5oV6SA_&9MpIVUzHKWd|n@X(3hU<|FL+D<-L$X|dv!aFy0!lQGK+xI>CW
zJF3NNt@DB&ewa^azou}D*K=Q5^L3evR{DKZ(89Kcqj3~s?k^PkD9DiuRjYU%<*X`!
z8P?sYHcOv=`ieEtU}z!Dc<>-F0r_%;5Ps2A0&<?iysph&KV|y5C~<WbcBYLgh}Lhs
zL;J(1rh>~}7BWmVvi|u%BFn0hLa##BZV`I=#n?ull&pBLZv4QxGBP%HcqcDvb@s#1
z>c?%%$35oDcu#ZMropk`$M<r&)}+~a^*EQNcS-comJF>7&8t>}OMKlrP*5o9j+7AL
z7vKNt)xFs!2i;6XN&@`qpQ(rob+R2UELS&2#dzCU!^F^W9~H{i1^r4nm(c@DuKYi!
z-IBm+_NF(0p=78|u33Q<9arLn26mvvSGgAqfp$=#G8`XJ*X0ejO;v^qgzvAV1!wz5
zAK_TTfr3!`kv3L*8rucr6aegH^J0KTA=bGGftiz#m|1F6x)GJ!_9EFk4EbJVz!+MI
zm~>e#nOkxLA4ynwn+`qqf^%+8_e_u6nHf#$HFm|-OQ7{cF&6Qjv?VB`fB`FlT=yD0
z$07k{sd7!lx$RX=mC<*?@fg`4N3v^oO*Nu2y6X$)!pthhzg8<9fG!>PMSNRsC;EsH
zC$Q~bPxRDY60X2v%YzB_iU|a9Wz8HeoKv5*85va}ev4ezc5omKt67@bJ$|mQYOwc8
z&oj=!I%lpmhLxyTyXPFg9{eTGEbynuUH?i!<Fdb9s|R#z;2Z9%sA>0&%O<NudI(5Z
zZ3oEQ286q99b5u?rJ(H2T1?xU#P<e+j8=f)>PcacARa|re>W3NaXH=xv3swD@1K&S
z>vVvowAY+|=A^YAuOJHQVi*Ek>SySr=?;KP!v2WVe_Qm>Hl3L+0oipc+&c1(;I5F*
z<NXO?uhGE0Cn=AMkIr^5s&T+>XX?z9rOtHQ)k<hRW9$TW?^g>9oRV2>Ay~c9TX&^j
zly<m{3nTaf<oG)BJqwb1vA$yt0^nEh^n+CSkp-jaI->wrnQ_nLgSZ0`*Yq_nIUj!U
zLWQzPS@xU4H)*UH7M1ZPfn{E?x>A3RuTo?oq#O|b`98s8GkV%jrZfF^+C%4}@-|IJ
zV-r!!v({J6fCK>!s!t$f#f<6Vhrwxjgw(==5;BpgNgwlS>&BUs$5}6fH&AMV&9MX8
zmfGuHLGmLFf9!=ytVbmzCYW;x19qlPN7i_)%a?jS(MK@4Cc#z@pFu1;w-nblsoidM
z9vKYrLej5_i%t}V_?})|^<tX{)|JV^dhdU@jn<xwA%oj|%+|xKIPCPSY2B)Z%Ohlp
zH=$G!a*b>O&;@6T1E-@|btAC24WsQ`6i2YO7Fbqf-Ud!g-g?wFO!@rw0WQyZH_53$
zdNSgz%JeN!`<qMBn$g9sy(2#4VgW~pOmvfjs*e~(TM$^V)O5qApG%Mp(Qzp1oU3Br
z`jI%)Zfd#lV0~8xA26?4uygNc6!RmHYVf24mfZD9!}@Mm!B*-Z=4bLSTpxm`7aQJ-
z;M6i2ioTwy5m<xBSm6BZO`!xzSZ<RlN6zhd8&QzpIlp9zZttw1J^?w`J+R%rJ!Hc2
z^y$s$KQ0@mHb@!SU104u7_?#Zm8e_YZjmxpfMI(tuv(10&gKT4A%qr6WBJ=|8Wqa8
zoDZ+3%k1)j2i(nK8$AdBpSQ-Cb}wr>#`=zcUM3W`J#M#UwA>*Xj~vfO+Vj6saM&n%
zZ<7&no;~Pv{nrI;g*pH{ql%AFY&G*bB0eN-x`(BEr`WkVQ{yu$JR`?<)ZYuWWPCxx
zTctdR+h>O)4m|J_srmG<eHo!ZwHUkrS-8ZQQ?P7t&(_2XzOW5*2;OlBPDh2(ZPP*%
zpY2e1mCaAQ21}0@*{}tk3s6e&<R+mzbP_P#E}A*CE4<Z8A@Rd;+tLJMg4LFpsOP;S
zO-7!Z`yWkMzS=3c*pD<Qr1pN7feKpnbToMJix()QdAdz6N#^ZMtUJyvxvB?of#u(W
zR5GSX@|xRY_Pm*T&Xw`z>vE)zORjl7s?0!nSdzs9l&^$y?gj@gz0<_8a9|9@7S70~
zLL{*Z&EH2A&7wjw_ehpeBmgl#y*9#U%@=2qd^C2#is0EBFxX?}552gUZm{Cb$gXq@
z=+0;tU-&DqG3|T5m?-hxMs)<mO_5YTG_2ig@;<70d^A4k=^JaCU0sBJ8R4H0dYv%k
ziT1W0T(Vr)nXC*vvq^J8SIVn?<lmnEUHncEs~?|S1`)#Fw8Hvmf1){9_wss_r%xQk
zZj7QEFhl^)2{+|h6s(f=5q01-%&I|(f<jyQsIku&hA&zcE_bB6W~rNx8@~Q7z5Ke#
z+R2{|JQ9Rg1nrYMqL{)n71Xj}IG4R|dnO60Iq}Ocyn<5SWay!S4m16)j9a?)I|n=T
zba=b!&vRa1e){}?_BTh816Lq_^do1H{Vaqbi01HA#(rhwT<Jd3mgy>X;?jH|JxShY
z^njme)+Yh_Mx<);Ke_ojl|DDR*Ig9)Qcu;n>bN#YJ9JYz=8RYDB3snzUf(LAh@e7M
zUTDkX&_ZZjGqEPrdRPTR`IPZ9-*G{$x^1zncG+DFw|#OWG&+x2NT*6>0s#6vO${Kw
z?m(yVg1sXuo<#ZNOt~N>Bb2MvSyxHx^<Hb|6Cu#ELn+XxYgkPci<3HMF6dYqAay9b
zMFXl2Ioovlka~+5pZS3iA)xW1=1Wci#vTqzwO$X&q+h71J~Br2uE0Tc*&#W4%L=K)
zy&Lrr>+B9k_J~HgHb?_E-i~-=kZp@^W{-WpE3Ijq$*ZVk+0Bq;@qnCUO;&_uaqNvW
zt{uNmt<|@t?cp?H^e(lPY0-tCzTWh45xB|+1rfwcT|eyYXFxY0ytSJ<;0!24#u;}!
zRcK2yA>mo7li3yDM_(Fj=b(rkk(Q)VwL8yawg=Pev_{?1v-J}opSzQxpZCqJRLOha
zOmxx|9D1O6a715P5qw&)b`wI&xcDs{Io&&j0#?Omg&tkHKJ2BhmB<EH_&~0DjJ~xp
zz9cqXeiPx;IfIt>2Z)uR;&+@&LmOXE0z1u|Lf%{_D`v%<w(f5VRbd*eq4YR`ka%;$
zuRK+M*8<ECM_e`v)^Cjl=t7Pb#S~LYDkPnXp*-lC;tfyX39a$Tv;d!jsp@iB#Lz1?
zT!aPW{Ak<Yx1CkFECT^C2lKq(69u0Q{2?@eliX}>S%KDX9jMN_8VoxBchE-X_MAaN
z&+GgwEpU44B7jeh1L(7L32(ZQdZ{^W9*5w$+4bzTx#~+2n-A^Eo$7B$>uF7&Q_HXp
zVP!H}=i8<h?9-D7(rKSu2bm{kmajL`jf;c2Zp3VR#0sl<Mq7%^@xlPf;LQxi#<TN!
zWWWXF^YLY;g5{BCc3Z_j?{sxhOCFvxE}F2184)B;{L0MC+4)ld-?Yu5Q5`6;n>}nV
z7dc5la5H;n^;{jpC;%icc3l&$P7AB`8QU<?LMi~?>>+Q<<;2@c*8JrHzc65mzP&qF
zuT1p7B6iWNQ;KIL7&}c@>&Nx8Jj30t*L)h_bM~nFK5i*k^j_nuH=H}75Vb}H^)Y3v
z7Z5+F(w;e0tOMvcXk+ksOhi_<u|HN^ci%dgp_(pcvxA!;vG9;*N=B6l1j)JxBxr)R
zbxHqyY*wm74LLv%rxy9RW6=V)qm&1!eueB*xiEuCJjiV9_ojme=eA@Km(F*OBM8m~
z$6m=tT7@ccrVj`6m!x6=$Z7r=%$>D|8@HRY)~YwIsy`7ZHh+Ck0Pxufmgp2KJ{qs$
z#a+PNS>wQtQnF&wu5_^FplCv<YJ!^#!Fy>kL9W)drf;;>dn6>bE|sEu@Iqr%?`_yu
z)Etf3N4GC*`r@XNWy8j+XWb_;c^b(0P~z0R^;T|c<ufY?ZtRkG<MV+*jNHqEK7^#J
zS*)7^fydiy)h<$x_6q|D;!WR_GL9V{#J$rC#um0`6c0Jvh<R%sz4d7AQjGH3ij0G8
z799I@$D#?v9kS#hvjp)p9kX>^8_6<Q3E<&gWd;tHf8r7hi3y&vbJ5}%3VU3f@NNB?
z<?Hy(m3W0T9hda=$yIhlcwcgL>)e`aVaD6z+rJt5?nVk?%3`J>tM5i@Pr2U%UvR<z
z*dwf0&klk|b?^lPhQKw+yyaP;lp)CLgbM1mWgrdl>X{Q`sFBVWO{qkJPR2LEgCVWY
z8VNbb#V!fzwy!{y()l_TuqWVTj{^#KI&2}dj;oHjSA3Bo>r*apL^NL6YK(C8Z-(qb
zTN`!NKa9?RmF$L0>Cks@)$!Q_xAhUcE(UmEz$bFXyf6dy-q5y(Ti?>AO~hSxgj`*(
zYNKShK7P%_^|d<|k<pnSF*%Ajl#I0jEb;f5p@v%{2co$X-kEmUrJA{KNkTUHR1?;G
zav<Bau;Q!<*|+Su=F6)}Z6C1^dE?Rj;XME!DQ~B_9D57euHp-z-KW<aF1A(B<jn0@
z-X<uQ_lw)>w^vjt`?$@SRuh;ewD4CI2yioI*jmuQl4RWaW&tH+GxCVINji#FX;N9a
z;!uzn@v`pOY=EXcUyiv=1ec*>QiO7fd;zgJob`JxpVyw>(S?9R4~0TYl&~v~cn-mR
z-<(l^S1rT90DnB^z}WV6Te842pc%vJ&=A^ja98Bru?VFgRW?--_Bfb&F_jc#fM)?M
z_`aPavA`Z5og+@+n^CeO`%-i+^030zm#kJ1WefT^Sn<$&w{W-RE?`O_hq$N1=<0tM
z+M|*|c*HaPFr8;`(L@seDAf0{r7WEh>YzL8$nfBGv_@@tp%c;szq86UN7UkuRgHhw
z5~Yx}M}nat3=)+`3c>6=_`N8%+23;vY@e=+8u5yA`dr!<^6{hqBk+OsO1#Dbti6fX
zT)oUbdi*Sc8al=(miw?xwbvHS`r+e-0s5E?o<Y=mf~gNY@10ePm@3|cNM%>-?4zZl
zkfp)QiVVJR9)Ct#0PH5NQhCHkNm<fn{R9ZIO3ydGJdk~v^~}0^u(#r>Rn=nvyf)Fg
zr5I&**~034aL|SB>bZd6rkZWhmW_N{W<0Na%(KRT8O0&Ow5p>&{2(-pRb{=~8dY}O
z^O<yP7p1>-I(L4kJr}p3zgax<REk*F*fMGPY)UW78^N<pcxN9du=zrtoB+kJr}n<r
z6F^0w)<Wxue+X2x5MSANY{xDRq@qJud2K8i8lucE2`8My8gPsT&Y<m^<!kq3n9<&K
zt*!hMlZvPcYVXkR^~a?atuO*C3(+>dJiv{#X8t={VDny1>ZB<IuWyI?G6ARlRCRWc
zQH>e)#|*dAlh+J}i`ORBZuFhIpn*JwRD-*73ctUgE#Kq^jk?G@i4}{rOK`qh&kq#E
z!*SK^43|RB|HXBxEe1IOLh~~-_#|yYBl8VXj;ZSu8MlR3x$`(am&cDN<BHHCfXDlS
z;I~D3GvBmGa%WV!?825;Tbhs!>nk9dFI`^!#=g~YI(WOH8Lf16xL->kx=I=~IoXko
zt4E*+Wt!mm{C>T_*)`BHx0`Kg5P!!0kxBKl$s;0C891_IBpB39L3xs`+*{{@Q~b|}
zt9=jn&=wGk;^b7^U_kqaTmmb7@ylrD0QNL0wSy=lg1SA?3$}AFA3#CV3Nx2DbE;ci
z;MY)%tY?Lo0k=#P1v>KgCNOKg!X!j(ASdiuY2BR<<Yjfoq?nkwwwZhDuACWhiu0Qj
zr>ROf3|8*P#>}nuj!p32Zti?~7iovq9%6xk2YLn**tV>zonF}Q?mJdYc0`?3VIp$x
zoSz}1!;p`w5~SI4gI5~K(FaYi;7_(~-k<e0TjG&D343Rqz|~H!3BlcV2mOiGN2?_7
z1Ad2>tC5*9zoeKbU2R!PcHlcYw?Dp11D~;(UiIvwte}NWV5vhmvV6W>xK@P#*z-=a
z-Hv^4)3(0Qh*IqqHezpVO{E~fmhL$TG3Gim9}(d__WDCOHW$CcI-wBiKsEuF^UOv$
z@((GHqJY|AYOqVL$7c$7f9FuP9YdX?d%H>D!5%QzMi~U#H0G@zvseQUmRF(sSa@!f
zjRc~WR%Riy@(H2JS*DT*W$E%)th(!1u*!AOS}AJhC3k&<m_tLt;W2rUH_aUYsh1HY
zx_n4AB?EVEY9S>Gk8SIRoNp?HQ0%;9T+Lt7e06L9lwYDW*`ScsRX<4_>elM<hd*p=
za5Q8LtIe>zK9+4iNAyFTt9QTWOex_d`&JcWf?w<R+s|1D-wjKU2e*-dnLkYFpWxC}
z*+=_pPA0TGba;6(OJ&1SOJD<AD}JF8)%IN3xNaU3HzwdUA`iwR`t@RB%HWdM@O8)E
z$9g2U_Ei=`rhDR)iD&<j&&-gfV59CqboiCedI;?PdaNmw#vY!5%AxY@*m$6FNfiGQ
z&EVr1@WiCc<{75ry$u$As`^isk{RRh6Sf&l23mH5nb^a-#jxen?n))Vuh~IwmE{$W
z+#1~8|2T0#5~to--TPQHu;Rd%;31BetH^6hh4hu#IAcw+?bVdTq)RJGhO!PYBA~F-
zKKxJ7gsXWuxSiZ%A1?H*>xv(q!;~Le9gPJA#61@1YuK%mh~nD29?upP{Kb}n;F`?d
z;wCOfT+wtdPH0+L_Y%kN462vLeRW9Z2k{_=3{Hk#|4d-Ur&2J>eKV~N^MtJvy60WO
zoTyxzjzzwQRupO4!inC9i8;Cx$xizv7%08-4yRaNgm#}~kEGPSJ)@P>tX&)l`hdL?
zc?VuUS%vn@VhEh=(T<d*v8G;(0vq5j*OcVC4M~emSj!sXz@xGHK&;@Co2y5=^DNO2
z)Z}Xyv`VL8hmE|arc@`vgHZKAc29q$D>f$BXv0JUnF7{c>)QH8!ESqQt0d?nx^6#H
zr`W*@c*-9{n{#DXtFQw#{DjU7T2~e8<}WjJycY^Yx8LRd>(s<yl^6f`Oxei(w$$ef
zGYrKW0{oBuZ6h5c_a2!BzF0qUNnWdf1>1cS=&13L45lRE_pocHuuZY$*OziE58BtC
z=_A4suD0>wd-XU$ho%s%9Ay?jU+YVPccA!ARZNUHV#v*R|IpiswLYVqIdJvTKPm)d
zZU22fXUO}!8K&b;l%&mBQ!HF{?5xpQ9zSNbc>;+O-$SxaMp_Stdjsu<mQ=gn*Rxfs
z3~g&6H5rGOWZ^vV>I=^!D1n$X|EEBPrjC=G@SKG4quknUg)JS%w#{wKJu-RdhSYG7
z)^fJ30hB(|{ycjsLOErp6%`u8dedn2@Ipe@4x^X)$h$$6-qIql22xke0KdFDpPGpj
z%IUF@H*Gg$?Bj2XVWoT9-cCt}a^4*|cwPlYGcD3XjrN-#Q?{_-uLw&1j%C|h6VbLr
zNX-WsgxbjsN{fm5oWvVQa$PWg+>2OhVw-jUyhqXv*t}EWzf`V0xe?H_Y_Vtj&s2WY
zMu9x*>JOiBau+@oP&eB45Pe%qhq>v~cP3DxOuNeyJ^&{uq5#HfHH)(O=F{V;dx?+Y
zG)942T4TMb6#Y3$c1qfBLEn+|`66iNdls$RPG!>D1ib1JvRQY%_ooTtjIfv(9zBno
zhFX!O+*S$Iy3r0D5X&Nx4)mq1*gg|(MwKcg)?86IP?2j;YVP%ytI2F`e11Ylc(`7~
z($QCDv}Z{L1Qisc`b{O34tS1o7-=K#GOLA6RZ`tC_GMQK8`IwwSB*F9hwRL1b+FQY
zL7mBHub|p-54>!|HVbnT0%tBv3#HgbYe*jFv?~t3N2MUrh9XKOZ*c1)Y64FkUIN%o
zoQ~9phCvg)^4U}+4$@X=kp#iJ*g?X8x>8n()7>BDGz`sfY)dmUUgblPA`n$wn1I$Z
zdNtU(J|ZJLv5;JfGN&A~H#ESzYa&6<k>*;^GZ1AOhlT^@>p6Fy6%uR%ffxp&ZT!9z
zV@ymI9oI-rVM6fsN|3^e$%i)Sn$(@}&&cu!l%bsllE0txOojDOv9rcUig_ELTnBvG
zfnpSYFS1bd`ccRb-iK9Tk_ZUmS)|H9`d*j6fc&%do7M2r2}k!#6gY*cX*h%#cEXdu
zuK4jlDd{YyX_JtHU3L{1{_sqw{P^nUxc8k8pd!oH8J!bOpj!JLuCI&Q7=jo{-V|^_
z03y50^oId3ii^{9h}TihZ^|^&m6peCBd%uj98VfIKct0H#G#KsadRpzZQBdA(jTtH
z6YFAGZ`wgzD#%TznqLrJQPv9NQVtQ%GUY;Co1jm~ft*J+ZUCi8EJWUwID<m6Gov2v
zJZGSru{CXKD&NhcYtk)I;!3+D9nIl#lws&7KWCu8L+mp>w7<l!r9OLRl$^t71xn6g
zNSV6nx(_EAu+I!lfYHO&$rrcSd`3fJcs3AQQd_cUop#CZ`v=a{uGZd%L+JLdtX<gz
zR<96xk}TR2BMj*9qbI4tGdvdE8WP4g&$$Kk2Lg${VaSW@@Ey%lh%5#o%Uw#D$=Rqu
zs*Lo5$571;F2tRM7rT4uyMY|!LpM&Gp4fS6C007TCsH1`{FgkjjvL72$JeA=ZY6UO
znKZRt<@qwW{HK=h{>$x0sW?5?sf;rfG$*G?9+6xl9{f%FO3{F2u$ofB9DGe@A%spu
zOtjW#?@}pa=Q+T705{B%S#ix@xzi~e{wMJg4KoD+h^zu@+X{TUOVSWLq+4YC#OFIF
zP!pJ<kKpu?X^jSa*>iN<t8!?thDT#yV7+=?ai;PpWIuzTiVY9lbIAFf^ed^>GG1LO
zeg9HN{PqS=)ieAylL=Sa^NHG`54pfGfLpEU(|+3PD$Kcl!wiX9Tj8H0(KIerM^9VK
z|1iMk)iXVGAhA5tA_30~7KV77PKyIv;vGdaC&uqT5%d}fgpK(uJ)ZC+MygOMiO9ax
z8K+4SK1Y7ngBctOz9+992D8H8mdNr?End#CV9UxGQ1k*#hq_mueO`gjAH47SN6&E1
zuthqdu@Rt|icw`Nl`I*J4{dX6j*kX|e}e+Co&U)xyM3a^Yc4XgwPu;|ahl4(YStjK
zl^EI$?c3?T3PVpdkQ3!zfA}4$L#eQ^b}^U0T`&iXiCl|1xz(Kj505eCJ#<Pq(TTR~
zap^U8-}2=TWo=rezb2Z}6&E8Oev2_D;LriMxJM66arq{`B8RfeF!Kd)`!e#R&C@lm
zrbQu~4cIaTGztf)ROAy_W4wtbKb68n->s4DEKh*5xd4Vq4hID7DiB{hx0u${c7_1b
zXaRh{{GIh%3(O8p6qzyOLV(fZUcpUa`HY#~TaO%#%e)4m3QfoJovqKd&yf1>OfE$+
z0%3Z=_TA;%O$3V1q@2cMb>z9RP>QnbdH)#ucz<4(;tr#^s9fZlEXpA{o(Jd$B?xD~
z_WY%Zr(S&BchV2w9V&fFtojHEb5)D`SQNztRw7ObKMdBL(G@fE@DJF$F}|9YN&d|t
zzB;Yrxwt~fDV%@B3VnxlUNF5~+b1naYl(8f&rdCHE^g0Kg*<09tA&G=Rf&5Ph-eGe
zeiF?Z))L7olBv@dbSg;lsEO%rDMbFhA2igGYA_FjW2=6_`aK)9X6H`1E2;f@DW7Ez
zL)fKUwz}5h0QL;2-D@<UszqA-p`U!R6I+I1b>u*2^V{C-fB?OFGo|)z`@1o#Nc500
zUaod3u;RdGS~6j7S2-yJ^9krPN+<!F&iomdTDwo>1Q`-;++H@&O|1<UX~^ogMr~)T
zVj3-&@IjQ)fm;Yq$n~<4SL6G<O`BvEfG5cipT>HDFG*p3OBg_lNBG=Is@;C{WK%A#
zdQP%nxzQn5=%_i{BI~MQze-xy+Lpn=e$YX%eTHu_)bgG!E?>G#%F)!j$;k?}q!y6y
z5Eppe*}jg@njB);v$lEXiEDy>-~k;j)q-1WN6Dx{GSAz*lfkg0I@|h*Yl@j{3%?Cv
zZB!+P-;`3jP<g^Rp~+Ors;XTvr(%$WdM}QXgv*ukWj(Z=`}F9EiWSx?*@Cuo2z-gP
zH`>_?aZsE)h}$6;9MruS|H6$=3klb^G)uJmP?&>DZ-~EnNwS64XQR%_w0orqEgwv+
zXv~|t<9`|#*i%uH=iMBwQJwQ(X1#E|76F?7;+8;2H|RM~040TFqXrYQ#*T(%;R+?V
zg3j{$>?3Vm=JSCU#$LB?7C5)O?N!a`wFq5ZV1;7lwKt0sCKHDVNC>L3Rg(=BVu2jQ
zD7Bp2Z@zo*o^B#XJRjpLoj|xxtvC^kPxFC8X8FZTm1RiKgW$8cOBVj!0l1+q?8w0k
z8sE>Bqsos%U!q+L-+2rUHLw)G9k2GSwon}Gj$Rs`prdd1IWPUpoKif2;%oI^*TVaD
zD5w6_m@`g~w!g1egP$7ZRXmW0e_zg4Ifv)QYgtL>+BofTcMDj{wv=nt^PZ9?vL0^-
zY*@*}Gk{~iI0_!}W*C0wSYSM>!UEX*CQ`)8m(urKBX?X@A=ty;F*ME#C>w#K16@FN
zB|8M0Jh6n7I*&zM6ndg$R~uCcrR!wqo<YYgd7cGCAde;TA*+|V;mR~VcBQ}?v0ROg
zsYM@|N-lAcnur0KkVodW4lEzaxt?nvL!Qrp=gZhYm%gsHgx{pviXH5jZm5paynuXQ
zLGKcmT+tfCGJ@zI4OIUi#-({AgMJz0$V2e7ft{kv2Dk!Qe^-vRaFkpc4kFx6*Ta>}
z7-rW7s%DuEAPB6Fc|N#`Vpr3W20MVsn>U8&N8EQ}?H)}aMnj;XQ4XQx)fV|&v|$~D
zC${EOqkv=tvV{oeSz2<wW<$$vjR(5~>)Vv}*CD7|n9o|UM2@1N`BT+zw$n6n=6Ob?
zM7fa*<#aIL=2xuGvtT~TA22w05nd_zO6<7umz_z^M|@+nRuVNOVFU3Y0;FeJ8Ksmx
z=>TVxK2mN%cy85`Ki&6?@CqrFSwq<iN!ZXngq^i}Q^MFB6ltfRdBve!fe(`wKjRnZ
zzB-%pqOAT)fIR6?o^=8>&k`A^Sk9^8$f)7SBUQ8gX4w9vy}RyYFnA7oMqHFA(rsI7
zNh#+t6;LcJL4c0yeL}&u{5IHSM?td}V0NOUMjCtMz8BDbBoL>9*s%QWwP6gwZo1)T
z1#GY(vgWie1A#d_Gn%nJtSvFf&W+Nxw6&qaB^+wHj|95sJ$(;#%|;*5WL_tVZyY}z
z$>5{oKfC=bO8@PlIwgI{brC{7+jD?#q*O_P?~xHz{Yf4hztwSP$^FZhd#KTIg$u!R
zZ_vaHQv#;L`WfJ<nxwp#VL4{RncN$DjdQ&w)m-R-@AyQ@%`54YV}mYX1G)!qA}ah3
zX}TNu2(!rd6YWMfHpN5M`9V#KDG}MK4bHL!M|?IiQt+lp{vH>iLap$(?})t##2bRu
z$Y&EebK4`yczw!=GlAt2IJX@;Z>b;5rNq8p&fYyE?(0Pd_53=ifdDFm8vq8*tBh^>
zqB8xJ0mSqAtJ$>6&ROppZn=IljV6Q<pFVpppmBJJf(t?C0Fd~DOXbNYReN^IZ?3GS
z&o9|+AhhhhW*eFW8X6lDdN)=Q)mh~;@|a(RUA~<tILG3Ze{%U7<2@>BY8tw@$n@7Q
z7yiJzR8BFMG!n1uiAzH)m1YObxG?tqx_%mWdltFBY!F&+8yKm$0~B+D?R>tY5qobB
z?$vzvrY#-!Xr?VCdjlU&<(>1htKo67z3!deVMN+*otiOX0MG&_dyV5Kix9_41V@w@
zAp?H@8!>D~O))KN`H^@<%$)VNrg_~m;FXY>VSI}x#v6LOH9_Yl(Q#7oi&PQz4-@}3
zb49Iv73&icf>nvdu0(P9Xd0Nz=aK8v>=Ra-aNYKb+l*)B`s4&*Nr$-Hrz>t5kj;}Z
zFR;7!s^y+pmxvnfNb_CgH@k#PeB_+b&<p2{v!m8)iczm@D;{pWau|w`E|$~p!-~}0
zcgD#6p<{Lc9jpq8dou5PgBk1G9{@UNC4hqe5YTrSY`SG6GREM1y5;Obd}_Y-`w4R9
ztLfHHeUB`vpDBt#dgHOd3NHe~vvYiD1OHkmMm4wu&d=sb-nY>DG^5>f@TTlZ=(wlP
z`Mw2COkFkRjj=c}-jds?DLW~DNMb*=c`)Y@;Yxn|gY1o4E;UX|Mr3)yYbCv=v@82w
zmvsXVpR}5<dcJWrwn<hZwmeCX%Flwm`lZEPNir<GY4!kJ_x2c&@zk$ub1w<~p{nl4
zx1@DQfBb!=2Ki4eh@pJxbSJPYBx0(hh4MXqOWpQLZJdcv2;1SUWLs0aAVZPUGw8Lf
z@9i9=9IUi<QHFC5;33TnM5@Np&tfIiO(Ei}Cso=cubjuN*y8RLpp6^Y*(wPiaZSKr
zdq!cgl@T${fo~Gv$vc;F5^>G4>!dAedEwkuSJR`l1F6)*O<P;D-8Nar<!c=3$VcuK
zp3wD<cn<Q2#oz}F351)<yGcgfd_>3~DE7TPX@O2+asW+VzP7nqC2e=j7W7?^{`fs>
zrR6q4yevo7hF~DV3W-ZTT`w(fCc=VSKbCWL8twBKA&n=)rJR-%$^11c0cmmg0@u-Q
zks#QTrd?gKk8<0dSk>kGZ~p$md`4@V^@`Re%=K@%KC)dhth+&P$~n;i#jF{{YsqVU
zbQ?6eu;6|9<%}o*>OIV~Mfrc9k*X1gNy>|6{D;oAl>g@-_VGlPcqSz6yGB1+S6Zz8
zyBi|a-!8*g1iA*j&<hkHz9%;lRE+qWCuceZQB;Uwh~nV1!O>G?%LDRY%fTod)!OCe
zjA2MY1a@XU34R+`{zyxCd{`E&nBG!pb4BEr28x8fy#?Y(g*esun@zCUy^v?$4@5IP
zd_EN%uACPzGj(+sx+AwJze0QHev_x7f>f}+;9hY_`p^jR!kM9-=auS<LlHOnswcRy
zUL|U!(_4m@kD0!U5CN^Foi8(Pg;^}5x2(gH^|bNTCJ1l4Q@z5V!_sWYH9f5a!lWtW
zW3Q~XHsTz|FO5e{qy+3hs*X3gHqWpDF*15wgVCd^pmn9?LX1b4@>+<CHciC~Y|a#2
zSvU>o+Y3{rlIV~TYkptpSX`><Ao$;%_<KvnZ&DUm88a7k1o+Of1+fy^ti2J}e#DZ>
z;c(jYv>)2DpO#Bn=|LWAKflW#wz@2BhEP@Vt=fYf{w=$gnfE&SX5UxFWQ83v!A}8M
zty`mi5t3iJaW{Ev;|99(q3J~HzQj$47!4$>+;y_sv5m({<lNN+zxexBJ$5TLGt=F-
zD{>>ssLa`u*Bv=B>dn~Ud;{-&z>Cdv`%VjI-K4hqMN9dynwNF&s4$j>m)an^|7T+u
zc*-fpTH!*A4L<>pxNCbW!^>zg+o8HA=Sj>9p(>s3l+I>24+W7vK`q2+(^*g-pCJz}
zm+shO>bs4A$2n;_>o>m9Y?&|Q(5fQatnYJT`ASPe84eTLPv{OM(R6luyD+i;gPu2`
z7c*WxG(m23H70U}x6x!jmCL#Jy0_Cyrt5)lnOZhuZMawaw(!^MRvaXSE*s(C&bmp_
z6qbRz3hevBZXD0-tG+sqEzY`6YzK2}J$k7t%qRNZ_U~GNGS&|7|33oL|C_+2Hhb2}
zAGse+_fd!N4giQ#58AD2OZYwtSYw`<DJ}TPBudhTvK*#%l-esMUS$NYoZ7!wJN=zZ
zZ5P~RFD5}7#P>=E-}J_w8+*Y@^xVnyuP4;?Y}$0_S1CyZIp1cLC+!d0)xz4My9q+Q
zTvGqDAzs_%LOFQ`8>vRFKjR>sA~Bh+PUgVR)-xPlsNc<mm{WyB>ojZhuXus+PlnVg
zs7_7;nqcU)-lq08>JZjy>q#6d>xn-%iF!)~G&LpHBK+`gX8lQS*4!RDWPYg)yA`f|
zGi(ZKgz!W&eQJEMO8XIu7!POUbG`VT6F-x7BGlz5OyTSas=mw%AthiXqg0vZb=zZB
zqIe&>^r5YA3-vxf=&z|=xm4V<{TlNJd3}jFHc9PWiIO(|X&55_NAYQStGz73`WjI2
zAqf_)?!))@Z~yfZ;|S{g_qOx5OB2_7HN#-9Neo|k@U=J0UmTwDI~4@568p2v;mB{`
zUJ%FkQ0gGYXY{0~dn~jPo=-_-Hdq8_(us6?=*3rDLb3?M6g?WH_-+TN+V`mT8Gft>
zA4dpZh2|p7*DF@1(frSY&i+RskZUVbg}1%&SK3Ys(tm6<@8;Ed6!sPG)bE_j@lN*c
zq|h&_OoUkWV^<U@!ahR1W-Uf7K-ETH5XKWc({DYsb<vJCkg-Z$+|dSvs33u`h*z~k
zhlQ={^-fGx0Y?d8Io6;i=LL~1&jl{<AqXC2I*Bk$wM}*!zPSb1y0q|cfnx#oxZ(Md
z)48T&6TGzrhpBDi(H?c^JKuW~-mNi6Twa#LQY87|(qHnW!2?$EGu;R6I#zsvuX6+K
z@{?Kzn7}S6QnCj*9B9%X^YLOc4E^!JjD1rh_AVs7m6`nLxI3c;+c12*C42T%WvY8Y
z1oFdSH6p}{S$CJormOE!PuF*uVdIp}zWu(|{Ghpul6%k@18>!}iu>`E4-_-IHkJzz
zyg&j&idMqsdf}g3bf0$QU*?E-25<B-G~-@I;takvX5Cs$#y9LCH^0b;k2B^I3m3<A
z^<%1x`hd(Y73U}nHbV>aw5cz%u@|Jo_tYia#}et|8`$<xDwR+0q<aZMCrn_f?5Fi9
z{f@E|HkkW)h95VnVC`7-w~|MtjN10~nfHu^h88*A_}8&+=z}LAZj2sWfqw+fe!mr_
zDV`H09%572b+Ns<u8txT-%giGn&{>Qq91&#5fZIJ*G1eqcRc{(PoMVb#uB9WCg@ZA
z=1dqbJjC~ES3$y@DLT^jBV76Jq|Zg*<*Loh4v|DVY3(Z`c~#dF1U>;i(wC}!d-{y5
ztj?2BZMJhP=qX)7X7Ew<lISW;%^$NZP0rVbzVWw{oGwasMfIg3KJ~`2;9ga~oH}x~
zSz5j^j*_b)hp-!OOxnDhJh!Uc4*)@u#|gnr>VMe%rV0=$KLz5sGo#=6fzI8ib|oUr
z#+u2E^BF@u*DG92Fc;0?{maLw#1pzeIMF)H<+6(v`wWBO%15^+NDxi;y+e+Vl<GUZ
zFi&bD;ccO>k_f}1PkRH2vWVnzC+g#C=PWz;pG-OjObS+5v*(7&-`yV>x)|b|F<knB
z<M^F&`_s!7FM>Ghzs`6EV=70!T8A~gu8&o|w&Bmx__}@>)wL9q`TdKn&<9mgZDn*>
z%>JFQJ>hMoukuheh;sX*%k$3<xrsJ+?N9XrLGwT>vCs;-dfr#5f|i{JpLB1S5?Mc-
zt~n1iJB3c0?1WBn1s$e!R-fyCb9nlz#)1_5>;=V)-uw9FoIYv^{|uFc7P<2@)khZj
zrFWef(XZ^hEsdU@gW|Izg4jG`(QNPy$P^REN0ntu@Z9LxzCFN}Q5bW`$;ejY5A*km
z@5AX&x<x%bmD9Cc{V|~ofx|X~xS&x~k278aR!F^}wFntXolhJamaF{gf2Mg}E$r33
zAX@SundUR=_|XnufACZLkLBvxzcjq*5BnJRazg6iU{m{J=!nC6BH4zMEJ0iVj)lm=
zf+xS<!rxg?@1Ng2+j>CTGhg7z6bL@xSje#vQ%Qk?4*?`GJhid8`2sC)aFeW3MbRUQ
zZCme|RBo41i=}b8FvIRM2S!hJLp{0RX4g1gi=UY9$77Ar>ckM{=Jt(D#SguvS4QfL
zsrx?R+DpKeh9aTQPxyfBdT*TGc!70ng2_$j3kOUfhMQr5Xz(E?C>{t&N#Z*>IuBa)
zKV9V(%2<yN-Lw`PbEVE9V{jA6OYg$s8Y-wT^cE<K@;|#5tDesd&35rJXInwW7ywb<
zNBVDq1}(a5LQlh-yL)0e7eHHqcom1FF4HPdi#CP5{dk&&o)A66$x<^G1vV$sxs@%>
zHiV$FC0P3Y_|{z$@wNh+y_};bb?hdZt54Ugy;I=mge}#BmycM1Lp;}Nf7+-KnIE1`
zsZc_@O5`C|`(D_K=9$(iMy386Irp&e<Wn+f8s8oW2Q%#RQxN>gDSR~pAGw>t^A<x}
z%JwH=%G!rFyM{PcAAjIHb3}Hb$+0C_a;#oW4DF^|{OjQ?8zm?k-+7L>;H8*h`$fdA
zWB+_w@8=KZrgSM)CaX2@@vG+e(7^+R?w%-b#H;6RpSBEz2Oxkq;zOg!cc1JY=gVBS
z1@Pzrnkxe7GsYBh1~v$Q+UG9Z_32++gq^LIw79CqHumeMdqf`A$^b=1QWIUR#12=a
zwMnfz=x&R?omQF4QgWv=h(t02$a?Dgg;EG)h+#|PW#FLC)@GPp)h7Oq1V?+uJW=2d
zC24Z8{`HqD6}jI>#%owEkLY|%P$mwEc`|0)JW}X-ylL6m)6<a;HTt$}k&kj|nq=?^
z{k#?Ae`;TB;ZlF)N%GxBHE-A2<S%N%Ee=Sl;R<KUE%}*Ke`0$?L1!)M+AO=<auuH1
z^80{Z->XWKQQM`Qh!Y7;`=z1J!1X77==h7@PeEzFGf?v6Ava1&80;R(Qk$`F-8|Qn
z7z!&hJJ6y&Hn|*vV(T(raKFJ*eFvo?ZDxevKr_XKo?B>(>E=PpN~DG-&<61jh}PB(
zZ3m>;&X(Of6#D9m;FOax071kTHW$#KV*8FQr@j!rnY0&}c<kr#XFgF$V7)3nt6S$x
zTQ`*x`b;dN(4-siC{%*-)e5VL#H6&im85&k2_`aK&uU~5!#3DU+gCoS(uTY=fn%Qm
z7A+wqz)i-g<6Uzor<<h;<*ZM;=4A=_rg#Fvl|<r!-yg!zSMj#6`>)bl%)spE>iJ)7
z+DINW_qmX_wa_H8Ai93K7%3T;`S6g&ZfKeqnBxsa5=v2<w*8HD_s6vknZ9o#4B@6j
z*F8B*IRoU=vNk#J$Y@)u8l#k!Uaq2^&-i6#bROO(Og49lcE~yyJXrxb8z{7NX~D+|
zj}MPZ9?)9ErCm9u_c29=gtrKe@>fc;i^0&!TLg*@s=^GkGj^yL4)b+N{~ABX3G&$5
zXCTt+-^RaVY*(c^dDG&&yn?vjB`IZEIeECbgU+K=*|_gtA%;26dQ%5(9X^KU_g%K5
z-}78ZMbpjhEW*Q)IQ0{M_Np?TtG2+pkoe_K^8E}I*KAUPG1R8?5mUk|qv8d-;(s6l
z&GIT?c$=g(WVT$U$!eavar?oZYKO&Pde1?F4QGHr)fr3WMR$scZMB31e`5vK!T9!g
zj!!}(bTZ@KUqsi;QXQYE(sSN*_GBmVO|+8Nr*aA-39Ob7!p*prG&(?&XBv-2d(V2A
zI<M=iUI38|^u_;N-@JG~lh1I1{EJY%i`gcp+VE{{p3isgMU0<1fozT4dKK(M<XcF9
z4?R{w0y6}%tQ-Cgk>BL~HT-X{<P?;%>Jr(vJ&6VTW-4C;-!T{P(%XIq9nq4-l5@E#
zzlr^j2|SQ!d3*m{7lcz0R@PG=Zqgi_c26vE(~84O;As_mA5pq195r)4&r*H9lmA&;
zYWQ8I*aAbm1(Y@L2Iiw(#@@NFl=N9rl?iFxue6+YorV47g2Kf#%AKmO-%o07tv6b<
zDf`*cYhP?tVLS|c7Q&a`ze=B7r;n3;j>^ArL#zdl=v<m4tdB6qKh({09;(rdbC0eK
zm?-_?Ew7Keq$YkfX;QM)wGM!-YK_+fWqgY+yPN=?k+dB&pjXAowH38KRq4vak~p9=
zKwBQM6rs?UI@)|FBM;^b5=9RhNGpz0Zh|Dr>8V?^i)@W1b}z$$R5ICneQAo_v~BSe
zA-jt1UYd{^dL4$EIv{eZqHY?7Vu&huUY|CEd;9iuI~OIG9o}TGEk4LxN^zCR;5<=E
zwhcvy%ypLDuVb8zr?M$K(i|!o@g+99I>MWDXalFevOl(9ea`okll&2vTV3a2IjIUt
z*)GCoH0uSuUh>LHK9;v~5$^CTQVDtM-Wake^Re<KVzYjJE5w8IyU1~zCC24KPvz0H
zR_VCwE-6`>Y}d5ri~iLD<4uv8CJ-6-|Bt=*3~RDkzr|4$RGNZ-bVZ8vYLIRhL_jH_
z1Zg2i34|iODheV3BGQ|Jf=CUK&^rMkKokTL0)!rcK&S~2%8C1T_TKNi|NES;|1XCR
zVV+zUWb(|+ntQE#-SbG5U@up`2}>)E!DWT%auUCkItDz)C2dzSzc>=y!7!eUrK4zU
znRW0ZKwQ#v<?HyQK%os?rbF&EH^q{Aj!LrA#4+KMzfm1T!e!F2{=DP5XB5xHa{Xh7
zS@%DBDWcm0F1EyLpEvqgWsW~K$#mGlkf=2}@U`z4s7-lgTj{0t5BH!9d=j>+xdh1w
z)exYUGoA<zgSc+NpK!d+^KF!%DEdj$gQ-<}j^R;T`+aNdr=HS0wP2b@a7Ms!(rw55
z%*rv=%6TP7Bt(j<@L;{9`@PCQbw}mYt{PDtx7A!eub!b@m}6~JeiE^=%KAa>1y>hL
zxz$X}=vMCMs@m~&4MH36y~j!Vp>ym8B<42fXEn$76*(hbSOo*LnF20*_ir}0t?z~G
z>*8o7%h&(~wEBIKEcof_&zEA+4meh?%dPmNon~TK9nui<5u+Vr<TIHd0y~a4Y+T)b
zG*k1cVvw>z(X{OXzLp!=P#1*DhQQDEdG0{ISAfGpiV1Aw%elfTF%);2T&YN2d3+R?
zB_1=Gm^Qxh;wy|i<0;s-8nbbBVfZ5U1`wY2uzK-#7$tiYBx42!Z_QRWVJ5pI>eUVc
z6*e?Povj}45!EZ~j*GPv>E}{G)s$3b%hXq4CR5r|nB&=-v{yWon_X$gg!lZP%@R18
zPK_Lwcpl%wHK`+^9WG98JM<W4rxzOw3{}n}{=JD|Yo5nfY5oz;?%(^xzNWsW;XHw>
zV4^D%EgjII%$=H9MH)7w$h1$zv{Qop@YK$e^v4qb=M}2VlmeVv<(@fj$n|Z3DP?C}
z+8{%(CUmUbXa2Hmz$8j|?|gOTas(Fw*DxE=>~e?nZ1zrRI0jte<_ym!bdB8&dN{g$
zl-S(={wSOabf-F@j5F}}QN($Cdr5k{Q>&xuA|$gzA_DEMR1&^V!$vKsD{MYbd%~1;
zA(u-3GXf)lDDy$<nr5uTzMzGYJBm+MLfjt|o=b{IJUr6ge^zTZi#TmxI!WI3n+Lxy
zo+j!NA(@oC-^6T+&pll-573TU$vyC-j8B$V!Esd4&^*sj)(B*Yqk;Lu8uX=E2IY>d
zx*h8~r^kkmJ9}s(q7bnt5B@lCEJ0(W9NoJlMQENQ2&Q7h4<R!Jvk+PJoF<zR%g3^g
zyI$FX7Xa0jmbRUak1Uui9Ta(%L6+m?<n;y?Y^_h?(4qx%83Um*Ms7)|Hf#08{L~q*
zmlFY<T$Xk<t&3D{wo;L6WMX190aCgeC%)o6*7rt)s%74gv#qN#0z{)d9>(80h9>iv
zd-BSxGL6`kIU;wc@I%LObH}GbJEwW@J!5%X&4zV}SHhOrd1mKY&}MbD_lG0Wl(xUP
z*>8s&D_Leaq;4Fyr}$DEWgim_zlJw16Up{rhv2?0KW_HzF;6S2Ak<MdJ&<K-m9bnM
z_N8g@bXZibi<`u2&xZy?g0R<`!?5;(rV0*uz3J4d6k6H~)TeRD)cO-~WZ7ZAl=_LT
zrLA)#Fp*&in}0^Gi=Z#`Em`nB=%a%(D4l!xHlU;s{kEtw;%R^n<evY@5KDM^zr-@}
zZAAP*0qstTf;R;SCo0=)){2ortP@qn^*<f)Zd4d~d3eyJ7c`%+_@Dr`_fyubcLGuN
zQd#CC^2Lgf=01qa$ddA2^C*|A5F$gnCrBVYe$+NKLn*0HYrrB>CYMUA<bK4~mtUHr
zmxVp^F4yj!-lq-!16F57^<+I3df+AYRz;Q5HQo&}eFNh8unZtO5;~M#w#w}f`q6LC
z(L07K#XG~fS%{IYFcHXh=X;Tg=~0jbgON#E;O@YU<~Q0Onn*;CAR4x-l&yxdc(&nc
z7$Lg5Vj7<L6&21M@~T@2JzA1;*`&-lW6RfOYv)el;$6|JO3SF^uK8NlzJUPcqycbA
zfc!C{_JCZXIWu;kGNaG7?g7vl(^K`BYq?ues}PdnQ8F^w+d(|&z4sN$S}^*vu^aZ4
zrzORj_IP7IYr`glBBX<v5c<lE4a`7Gmrv0KK21>IIhU5`<w(Kl{WDcHFP-JW1GpA>
z=871vk?%(<&_Q%e{T;OkV&Z5y<70`8ijNP_%0oLDZyeS!24%E;Bjnt!2Q7oMs>5rd
z4A15|v*r`gvLhl-xfU<YiNjPhCu6j`fIHkQ6CIS<<Xi>fdXE^4h?tbWJd#M>Ij{@z
zF0y<yY7wsHet<p?zzwefnqHMzLSAjSorNltV9Q|^t0yJ22Y%A3k=+VGA|Tt}SHQL<
zBLM@>>4wgBHbDN0ogj{o76JEd_}gg{(Z{ViL5eGo$@|U)&GE)Ydw!~yjDrsb0<9Lb
z!WJq+;%t?(ezCC&o1T$@(NaS*)_lJ`168l|8mKSx=?xQQM9)^mi$EHNdP|B~)3n2h
z`@!^nJ<J$~g=C#J8&E{xR+9?%gKG`~+qxT-rL^3DlYf!qE_eTHcdZg`ZWnKz*V~tO
zR<kH|)cgr8I8LbqUu~8ANvi10>Y9ae)0!9}g#T#uj}y@?Y-=~fbh?D~t{R<<GM{o)
z3@J~$*pgT_C+Js#)j<E0UFkhjP;$(+Vi>{|DBh}>bZwTVb9^K*XflpIjSE~THjsw9
zkt|6&5_2N<B_ExSpTMj`NNk4~#?swp?Fxe62co(<W8)j#b=&w(nOtTeOi$wFbt?8#
zrvu4qbieTg!n5JTE~M{fndgm~*f8+6cjV_<{8z-X`nP!PA6d-uyW7tV`3c$%wuUDH
zakN(=Q!<gyar2We_fIxgVbJdy38&WjY*p<!x?l_yCj-Sfd9^4U&%F9Jp5eF_^ypeW
zz~<E2U9rhl38uK=x%*;9!9sUz8?O><p_BObhNK;70H4+}+<GH@vTN@Z1QTVZX$$vw
zGnpXIK-4O%0CQpGVD}7?YESK&(rLnHYujOT&AC{}b0?<Sse{#JYz?QuernUCXYeGE
zp(LsH_^$U#;DmJ!CV02}_6+3vXj3S@t@IS(<vs(V_pm)NAah$ukEb!5z_yl}_=u}|
zhdxek+@2qZ5j{>IWE&IWAJOkRJK)j!$+cEmr9<3scxlW;RNoy0zXEb%;-M8*ciSDr
z;%pK8Zu2f?y+$ePSN-s6YE1?q=O$}r(lzoy8yyIJwK)}nS&@pGV=+mAc-laRHAPJc
zzc|_`(h^-J;W4sDqP2QVeXQBsm^l{SIOkFSK#U8@N>6DBO|jXJEdOp6fpH^1BGHZf
zC-7)#<Q#zskXm*EajM@8Z01S}%+rpwa?9KFK03Y-Zc@6aiEUZ|tm#J*?#(djc5n8E
z3U3Isay)ZyTa_!^Z$#5!l{oo?S2Egc8FAS>@1W3*%tr8>@SWuWc+(RQHtpdMeXO<~
zUF^C04P&y8-JCb^An+_W`pC4F>DeqTOPa2PyBxgVSh^Wm)5OL!B~q!h<XTE13smo1
zZR|^KMcGp?T3l+GSHiOTCkC<52G-@K2Hwus{w18iDp{fK7ZeMT+B#yeQLhEUT3|D<
z5ipmr2$+MV=ECA9-G`glxnIW5bh}6oYLu1{b`Bh)7M07e>?tjL`uwm$Ws0xbwaotC
zU%tc}-VJ|M=91AiIj(?&L#~d3uvtg;-dK%x^?VVcU*CXxaxZ`NOB7WT`(mo$kSd&V
za=9oyXK9p#jAc7KnqTx7qFQx8-z(U!IJYI@T7@mcUd*Ehe0v|)0CU!s?eO3R<=-TG
z4&k^J=TRI|1k9P$7<Lk&2FkDE(~d2K@9mb01e}RmH|=}9p`vRc#Y_@vi8StVIOy@y
zy_=Q1E!mT3A-r@~cj0))aABq;X|i);-4ObDo}LDXvlI@0Z3uvQ)u!vTZ+M|<B6ydL
zU%y=CmIe`w_q7hZ7w!EnR00sQw3ReXJoeT?eTqld65O&qmGTgHWYfMRz5@r@mRAiP
zJrhA_{T9A+C)DJ56S+LtlEjph){{6qF&lsi-ov@!j%Aa-nUS7~*oSRgg$gpEg({n8
zwM(0{9LX01?`q4&1nfAAoG&gdG|pFMO5we7pT=fJwVV${RD1ANuG{yZYoe<sD&XPN
zN~(jQY<R^qS3dTdQsO-3v1|hB`KDA#%6fR1QBI0h%WvWpb|%R>U4HSDWt;9*$=to8
zwCr)2aER=c)F#v*O<Wqixsh)RpNTiyZce+O6+u^l_t}S=26zCJ@PvuDiT19wNuBvP
zTcqQ5$mxcf%=VUo70CVt0Zah40kitZs$YH=Fi+qYk5~?>imE17z-=OI51U*(Osxi2
z?MG?cDgDbg=0l!W7r2%hNffV|qy14ER{xAH^v6v9hwy-_XncoxW>)CoGRL+_Vb5bV
zD*LqCdvAO1ZvKfW{DE*4><R3HXyzX1SS~{Z$G%52t;a`>b*fQ@@35<aJ_ktrh2s~_
zgHV!O2&?yxJAjOLq}@B@ol#fgtjat-choFOILG@7BksBnQ#>4as(F*G5+^!@-}qJG
zwkBWfD^VWSVy9OEgia$2!{7BcBc55U_V4(S#0JIt5|BMVp$ewT%g7jP2fW^#q(M1L
zPG-&1l;NNSS1YG6JCCX~ruJ?4rzGQr09ClRo;ME1D?C&>`fu-Xf)0M^%&q4hH{j#Z
z2BNF69Lh&ye5ss^?um9i)sBeT7ZHTz^Z1)vT204odYzAI77xZGywo~ioQut5^d$`Z
zB~DNwNJoK@97s3Ag3?<hB3B`nhAG>maLDAqTIX^AoTud~nX9D}_ymG!8I%O<`Bcr0
zQpB>hiLZ(1taK0CjWG0yLo=p?AC#E*tCcZZ0gbwm6F_(kr)#x;lVtyTwG*%iL0UDY
ziyc(C(t}(-8@iM@(h{1{m#{7by;(XbiPX*$d4dqrU2VE<^ob3MB0rgQHYt;59I?y!
zM1}_2QF&6r06kD~^qKYa{sBQ~wpI6DR8j1=+gGDK19yABQo1hn4t7dpc{(8uZPs;^
z0<(4XKM@>da2l3bI=$QeTH!6NW4i{iTPF~gv{!T}cMwgbjt0%+?Go}e?j8{>v`%?{
zk%mmY#83i(LHGNb(bv+&%l;zX@)?g^U57$aV1vs6ZM3L6Fp(bL-<K#R!%a3g{HjIs
ziPF7o|3*2RF4-Pa<&q)w#2XHaZ<SUYXUT?`mim(<(>{rM6)|vY0c*?l^2Em8W6il{
zcfMvl=Z?^q69=1s0{3~jf2Yd;KL3;WuX?R5v3vrdo!L&xT8Om$LK?K*`KtH?G<nL_
zX;-ue#*KgD4BzIOYUwIHw0+%q&y4FHnj*b--M36Ab{RYOo99i6IW%WmF$<2;3&kx{
z8|`3{nPp>01kQdWG^VE-sM^pk!a&#@KcHC)O)!LCn9@uNjPLdLQfUoV)oh%b*L*+{
zNSCvG<Gf5gLt$vL?ArcP+ULoP;Lv<fnqSlA9y%oLk3-w&+J0F9$^P~#V@9AS+Jx7N
zxE6*#)x4~^h#8#;(BXUnXPz~VloXEI&)%80ANh1F<N~%0AnbH#$b>+LF(T>&m`bqj
zxkb9|B%frWD~sLw@^;qV619?eh3DgAXiB$0u7!3*fjB0Lu1Dw+15N2kjU2nLC~_<n
z!(mV*ly3|TZ0HO37{YeW*I6gPLTu%NGdOzbG(wK#a467L8p2Y7uMK~NyG_nsYwTx8
z{#n{Zqc47mY~8NXT>PyIB}90c3!s~~lG`rrIj-9%#IEMF4Z9cpUO5SX_=d~3QEi)F
zJ*~7~R@|nSv$*$@kC$2RXWFLXC2JFcX{XG1N;-R&f_gFdH=R5bPSd6q>n@2>pkl~w
zik{7OGlH63b-M+r%P`5|Y-l}z?;`!w{7L%R;02}8szkTEBW+a$24}7*8c|h4tWc?;
zyH&uJ7;Re&t$s%NC*^SWu3bw5Prp$FCkR!OmUB4FK)y3WOZS7ZG*~R&o{>yH2;4w=
zVK*Q!72kBO9*C|jpQ)%bcL*Lo<={B>sj91KdNhtW7l!F!#_*XM#Z}*euw+$+q!i5g
zs&Qg&gpV#){kn(8cONLZi~J>qz14FUchwgvLHAa=O+<KtlYLQLlk6J*^a6N(EtgF9
z8+zOakji%4H8L<we>rCSEaHvfRJp^5bxY@Dbj#840Xzz5edrDqpStFLE@Vd|%J3nN
z!JW$NOvcG>;V(K{E7U3@IX4FxRl@PZ@6?vjn*OVO8ora5pI(!jRqsP{k5?VN-*`di
zWB&Lyz&=sbd6)8AeLmumbr(?ny7@x#6^9X*WwViFxxRtQ?Ac}n+t>81FR~sXB;hOQ
zsGS?{VP;Rcca)Gb$|m#NmLeg^z4`0(%);JA2{vlMHPHELD0^0R&<jJC9AvO<Gh4Ik
z<FQsp<)r|zre<BL$!sJ+KV@Y93F9(m@?+JYEHH)a5Y&9zPXUo&cpUPz`An%%KG}lQ
zE4gpUizSRv#ng8AvPhPlOJVu`jV4G}-GC2O>`iatlPnG-O|4LqsIIyy>w}A+?N^3p
z!$uP=$nG_8TD@j9Sg=N6vam{DE;+y8(3<Ef{b+kaW#@L-3Y9DU<i7O6?W)NL2Erk;
zrTi$_Z*4^c9AviYH|0fDpSLZ}eFAxq!EB4lIiK(pRq*jDX{@bWZO=Fs##eJcyVw6?
z*Kq>r)^YQ!w126)l;JPB5}}13E4lg2Q@Iww-y@zGZrBVolsVFOI?=4AS=UZ=?|L9y
zsl!IJDZvVL$XJ=&FTJjC=|~#@U&}8KVB09#2|z~6sxkHZ)6>yV?qzD^Ca!d=GVO+o
z{fG-p3_-NkoeJE<$v!GlDybLh%cm=7=SdFuAt)e|u8_UL$$Cl*3L<?Nu#hAwi7h1z
z`(_mH5h_|Z;w=0N>oB{aRf4@IIGGRq0Tu61NVXblda1p|VcQHqo|)sGdfxq10AyGh
zZ<X$OO@<Jwao;8Z9o;Vt5JNn9Ov#pA@9^E=sZ4jEy$FN017Q*K9`1$y>{{|GPRMGy
zD?_&gJM096%XD86$z?XKgo$HD9UnG(AhUy<wKZ7}h9BYBDQAz|E6|)Y&X$Jas?%DF
zLB0S36z#39Lk;((+*#u$d5ng<q=O8W<#qsKf~C(<rUi4XjFpYR9$F=l^*C@tr@;bE
zD}NbZ-u*eN@A)QVitU3{oJceIfXnutT88#o>gXd}`E=d6sf--hC+nB$Ne-8i%I#&=
zB^yI6w3ytn0oP#=1kgC-TTNuy?Z-|v^B$cNPR$hmTy0>~?*M!?oo0xst6uScYYyG@
zUwc&MzYJB+%GnZ!Hp+U`FK>e+n3reoW!R9NERCFXZOI5zQ8}>8L<IxUjTkl=W~7ib
z5VShkUHW)=cEr?v0v&+W33*@YxGWneARA^hgm-ft`c+=AxQ@1k<^8hURlPZbI&8T4
zm(*<^?ut7d6=K?fF7I&?l*qNKQye!TyV%aj-Ut%(thXn9O>)t>twg0c^QCmdDcL#Q
zV~6JvX4zX|pzy|F27FRroSUON-YV!~C1a_2Ng70=^{Faoz>2g&sk5g)29tfa2+R0$
zo}or`-S>L{-2Civcq3aM`?r9;3%7N<A1H>@>XSYWf~OA8E_7YAN^thAd1W}&$k`YD
z?FJ;NMtEw)g$Ja)KW(`ZcnmbW;~bfH7h$fMXgC68LJ(i)T2#<AYG=&whboV8pOLLl
z*PUl^-0leALKD_WOx`~A$!2;E2<IsbIz6U!(}o?)9YTGxR3>0A#Yt3*Ym|biC~;N<
zt{Q;_V0RreK8<exYWe%wgNAUyiX~V>f~NqYRM;sarbjx}KDA5X#vx;~>msgQ;-b$~
zC-9fHbO}~1%Ia3C@B2;p;PREq2$4U-$hA=be$Syx7N7E%x+%xxLHf8B#o%y#w$G|k
zcm!C%9Ecd<Nclred-3fQ2A_RLvF0wdGDo^sbV*FGhu`OdRXfySR9mg^qJllR^#v7`
z9Nxrry~9^-Z=Jzki!x!IhnNYY1bt6iC%2FID1&8&7mNahnp}7Wio0Gn1z=<Dkivi0
z6FB-EWF(*5f}C!OjSoV!t(psO=cw%+41?0mp%HnTr*=H9HRkL->e@MU*IX9lKOd57
z4rM{`YWG;;*FrLzNO_kjjzhs^lh26<+YGusfS)xmSC-QP?i?X`L-Ef2p+74E3SkWi
zHHi!7_DGK^Uwb$xxEO{UDNlQN@hscz$<dODVL^N!_mycE_8$9#s5}PLtnfyMUhjWf
zJK%6|)$5eIc8SmI7$caRo}d=i0mz#Rp8(N!hOoEZqSLoQyV1j?N2{XFN4xw0eG`~{
z8;<%cVjdz5^f6X+FEW=7!LKy?+M$3zo37@Fop(n^SC29%zPA-HA`ZZ(bmzd>W!=><
zY0dhAEB0lp<}J;>;VTxAEi)+WPxh>O%Y*&iqwsSfYe3a!hUZ&eYP-<n8p?hir~Fu^
zSqd5LkabUn$IM^%5~fPs3S#`c90Az3*|vBza}3H{a&$-6xCZ%nSHg`JdEw1F&XGc$
z4(OQ*dym4o74cH`Ctpasyp`$xYv!qzIq$&}9kOT04jyjXzseW3hFc}xvh#Zw7ztJD
zE?OjhB}^KhD=ByrVQ0plt~|1e?wor-AYV>p;mWq*GV>_6^MKkweK)fCCH#uZmtEu4
zzCZ<4hOaVzZEmszjwW7>oiOg(LHeZ(Bc3==CpyL!w2u(6!&J>fn#4$Vb5x6JyIR@8
z<>7<A8^mj0D&87dhzC$<_aHr+Ke~J4q?m<jZuwz+v9#<L)iv_YC-Eg7yzr0@_gGg6
zOdTJX{K-es3u4|v2rJvxy|}AiBix~m>n^781h%7RQOhR(Vq?MOUCuK;zo9Sh#+Th_
zKD{5(*X$~vGy+fYZeao<a5vay8WFATe6~iP1k$yaS<fnW-d?gV5ljmskZ5;h!J0T(
zDg2>Cn`-4-2jvVQFrNCjXYEUcES(;u^@(l?QWPt5rf-O9w@sSC8~{F9J<uAu{E^Hj
zFNp}U?iMy92`Vw21AX*o4AjjsTzcRALH$IKmo=0H1fgWH8gngbAjc{_i>mb@Fl283
zo-bzzEut+kKr$)!W^<I`3%Q_NCMcwzaf(aVHi}Mg@+1a52<*DBp6bY!k3Os;C}B=d
zp-b`|P;SuJRBBC`+|;A!Vkbb;e2A|htc44^gyZW2mM!A@gGm9(FK*ZWrVW4rZ)IY?
zDSc4pNH&LF&PtiR^<5;y>VCqk`YyKSat>719cyRB+}x)K(!95JVVr8SEbOIag%Zy5
zU=V>=8awY=+J3kK7kQ5ga!upFdfdz6bWNH7|5ogTJS;7hmS3rv<W)=f{$(3(M+bWK
zy6CWoy%9cJvXQ8q18_smKamCU4rzIe8AgK;%Be*G&*%hbuj!XE;O@(FFj!HK?Kg9%
z3jI!LlO~bh79CN+EJsMXJME2Ows!AY2125N7KOPK@vP|qd}x#>AtaB>ZMVkzg&@Ck
z3HB|?c8iJfZnhCtv+CFU+uK&30*l|6F)m7F{^e+nRi_(){>^;+o&SgVTy~dJla&Q0
zbF%fdlbiG!Pwxshn>a)g!%puEG3dVOq<)cL(QG5Rs9#!k<hUTrwDYY(_UKA$1eZ+6
z$ZYm(M7Qu$PdfF!7u%-loV=|NsY}-EmYX`_Zyygl$BHQ_LN;D)er+{o7*x*f{*4`(
zU%@@q;X)}TFw>n61!ebUOuySXa50I~nJQz`$*CL$DNe=|$U<<WLILhj2POQR*y<~{
zpU}%Lkmf*l>^%|cV}})!gG1V&!wZTs-DtW;^`%~RH))&4K5f{V3xwMBg_UG6N^dIC
z1N`x8%)1^WNNjLIP37UzWirR$=>dT+5;VeTMGN}i1~+i`E31h7&*)BXYl_6eOygB1
z7!bBC9?*P>7_o^?)4~%hni4cVR=sYDt2pF)SIa8kPKWdut82zIe@&h6@eYZ7B>Oe`
z<Q&P&;eEL9W@0FtxfwqSd#^)s5DWi}zcEa7>SLm6<|a>!H5*4_{y08!E`3RSWUnwL
z?Jv;^5viHXUkboa7S_0JgIdyhTk9BLyB8FDJWH_M&16o0vdV8-wqtT|`mzvxjEnX5
z&&}y}Nyujjw*cn4u?7$k=D^?=wV@(bsMr7YVdqE*KqS-u_%4_}$U8F!oio^|h-^X0
znlKlGT3eXH6AYbhH@jN+agKCMUO%!=^gYsqa^LB!I=V)zjV)W%Owb<Tp|q|=bU1=^
zySuxuO@1k{^azVC`w_wmN&@|Am-RzacjUo5a9(%{vxp-Pyd-pJLmn)H$=!h$xwW|4
z6BISbw1hpGD+<<Zxw=2LD}$}Kbw|I*vJ>Gw-^dIwO^)#Klh7)Ewq=2?M~_K+!uIM~
z6I9x1S&`9e87Qw#QjtN6^(gxY53o^-?I?+<1d!UztJtu-F~efnWH&pPI`#RezHRkT
z8SF<pi%=zKO$T*ZStykZvsi+pJU-szZXx3A<?XlC<F-T8;Qj!;J5bUXn)8||t|^uK
zS6jsBCPB_Y2DgBnm;_m}$_L}_?T9FY3pTOWaCW1oL+a+0hMOKf)-Em6?b<u)X(nJC
z6(Zx4KQDhU*D>|xD~aJT&$fW;gq%Y?{3p;Zp8r!pP*u;*u<V%pq=c{efwLO*oU_8!
z@0;?+6ICRu0ySlq70|j)J1Z<Y-8Z1!v->PlL`M3pMZ9;=Owx&Ne5UQx^uFKr+q8Eq
zwkwU(l?Opjh9P(l6f^whM|9R3PVOsrq}<LdsuGx7-!uZ3aQP2h`vZLfDzcw?!vpZ>
zn$hMQCm_aS-=UTm*jehB=ZI_>>XChiW;q55Z;D##riV+&&MD!!magU;zn@ke;L76<
zAc!$-eb(d1b{O-{82%9k|C7fHPot2aEweq+lpUx*;M@NC#@Mnz(1)dEWLSf1qOZn`
zx+q2T`p`0%1$0aR4i6De(rE><3In<sotMYg1l@N0QNRt^rGn{$E-iq!1qokc9GIX7
zQP9oPL%(fV+wpjUU~FRB1yJ&D&?09I9RY878+CY0ArQ?kwI`tF#4{-?L3Ii2&an}A
z+QcDXq6_NW2Hhxf3p47j$ujuFN5&f?j0Nvd@=G1p0oO7vi4BH*&&o~Cfg*=$E=I%~
zK3w%{Y~Tw|(i^Sh{`eF9j?<O90h7_$wOK$>k8(muQ`{-Y*N=OifVuH&RrLELOiys#
z|8#F4*J}%NOZLX$iN7x<zJFNm=k-8nHWtQ^D?XCx+=Bqhj~3=C70!^4P$2|)oN3|s
z_^ZxW+La!Tsg2~@2)?WnI?TW*s|ZgauLL=Jx%BOIcQa&*=CSfSGu&jlnGyZuLKGd*
zn$Azz-JUt&+!Ml5>(@C8A+-f^q;q&(<y3H>cnS3>?>GzE=<3jI@9{3kPAc5o7IyL?
zkb+86%4&_*v(a8q&-_VpiD1}2LC;hF4oaZIDp4uWHXFhnqMUlX^v(?9cLlIaPn@Cs
zh7Odgc2P;YS6%)%nUQ=lkO00qjX%(7?Vik&xc1&0+6m;BJCVK~t`@wTdx9=Rr38*C
z$sva#Ug7SC3-uZ86%seSF^_=l;kvC2@Tz#&aq3No?%~;xV^be?9!Ku$tT9!d|G*nt
zlYrBq2=MY;Ji6e^U&}*xi_uTmW=3#Ml=N>^u7ibY|L})-+VRHK11GMm-{D$LD=t`U
z9KE!p6L>#dq19N_n<wOF5q69aN3Ug1(;3uJ$5D`bfVlvihvA;`+-RiTp1*O}1D&|^
zkupcS)1<1`VUg9FF;5hkzCE`JBDB&87qDRy+mh(H%0-JB@ILnUv7`fI%;$dq<0pBf
zi5u=nc>mrz+fN!;JP{>d6N~ecV_+kF#0aKrFF(P~&7YxMgtZ7h?vhO;hBjDyk==Aw
zDnY%#9ZYP_mYG_SS0c6HOQuo1H*4o36dL;jtuO#3T0I&oom_R(?_|~moj2ClDBNcF
zo72##2bK|=;z-Vr?CNLpSTa1jKDy#pyW@s5;F5W>ZVhUBMl-hTV#6DpbW1EseeX~p
zeS1C)`)PCOgS?)`Lm6!Epnj>mJUGmlp6l5(u1tAh=XhX7j0E55Tip{~1FSLjEvP)K
zM&0oTJ)ut30b6-1b=Lg$LG5M-)^MKYS=~gApou7xPRD?gS){!7y%EWsuZUa1MbD}$
zte{#!LhhGG*UT#{_v40_c`Y@qW_PJN5Wy=1rLa+Sb^I`qatV!%Xspxj4VkQ2v>$DG
zQ)W$zJXkKYz<Z7*`Z30JzsZ~BCQu;I8JFP*WN}wp)$^wcCrdeGD1>=Q@2%w{K=E9^
z7Ld8Zo@;5-avuq&$H4wAzR6K?VR3h8$47v++qxm)xh1U}@Zc6A9=4~0*E+H-!cnQO
z=4Twp$6i;F5i3V_FtDj5VdsQEjYb&cD{(A*Uc3CY!R_7fg9j@CzO8<x<de%V^sYd)
zk1AZJ#8Q)2b3yp>!H4Vr!syaJMNpSL<Rm2|fL5)Z5Esco?(Y^@58U<z5Z{Knb9`!^
zZ-Qap5=<roHBVh9AI<k>(qr7U;*4nrW%p*o{Wg#2w|d3??Aa%wDXk~Yy2(DmtqB2`
z=qQXI@ahJeOW+2cAev-Hy6GqPJEdmOJ$#MT(9}fnY>sCHr@*&eqtZx=xM5hNCf}st
zCxN%TTJoBF@?wJq*fX8-&YuH*sIP?)RcxrU9$=2TxawuozOSo*%A}7Wuawc!lsTwO
zM!dTKXl2hc+Pw#=j-LC4VnsJk+*tXN(!a3zl^T1@vUlxT5}+~ReqQYyE&A5`ARbUs
zsF3@RpTMBHefuUP$E|wQ6{QfAWwo{Ar}B-{wH+LMAp}<0944JLyd(3Lp7~Xm`D5tF
z%$o&x5x~LN9Xe~6-&RWL&kUj$j_F7}{Z0W|uIbQE(wU7O-IV|YWmn;%<sFb81C&5B
zQKh>0aF0Zl#w0y*P@X9%&Q!F2cxnHcUH5CMID>kGuOLZ1&UWE6)W$>IU1bNuntfH^
zlR4CNh$Vff-9257WKr!MaT>vVsFlI(6~yPzq7$N$6dtF3CX@p)kyu<ck$1xL8fa?;
z;5Pb`K%P;zl3)ef<#cRze+eH!t@`Q|xeWy#`oTkr7o7lo+R&SD-O)_pk{cuBR4Q{G
zSO!aMlHFEXI_@=$f9l0Fd|<}{YSQNDgQV*_qYtG3(W&8vK=@yz*`n|NuotLrjQG&s
z?E*wu6+G?~R>m;qFc|zS<rT5#c$w%3ujY<Tq}v(GWa}>U@vPG~Jif@$=QtOhEILqp
z^((-AO)+OuzfSRWf?mgNY?L{2on5(QL%s?%zs;)1-ETq?YIfzuQ&!|p1WIu>gii`P
z8}D4pWOJpS9KI*hYNHC8u!2HH*b;}M(-eYOHGYy#qurwJM#j2~1h6!dA1Dg+({~Me
zjRqw^x1l4dSM6BidHYM5D2UaHqCnr79gn`$a%{85-5EbpLzF^Ld36CUz|&Di3iup%
zr}>MZaryya#U<5yw9*`cIA)vBiB2CTAV<kSu~o~=6%AYTGWZz6KPR@64-;?L7fy8$
z(`hG(HiSnu^#-)fDic>$vWa8#tgmk@!CK6AbEk>40#@O)sO;%8?_;lcPksj*J@aEj
zFoF$~0We3ezbQKbI^`vvd9cZjd`BwIo4qsK9p|ixU24J~Ll#(x*=-}&az}SFiS(3k
z{jA5wxy^5*<VLCmS9<k!fu2pL1h<7E3#s5e?D$3ybnp}QEuit>ZsLKz*d+e)k?qs{
zn{qLe48g|+?$H-v$+4Qo1Apo@+fIqI#K_Z_7JaCRs3V{@u>jXDAGDv~w#j$N*rCK#
z;e=jNAooT<V`$c7IQo+*X8FqQdhhG7{b0!^LyV*Us9fR=4$w)8YP!&Gu8Pev#<8b4
z&*DEC(`7SEi%=;hWAm`?*RETnIV=hiieDecx(h;o4Zs&Y{OG0$qhS$NP=gk`fpAnI
z(R?d7Yi(t+b&rCC@rDvS<$xIA+)2c(+_tVRUtwC24nW?45NcDNqb8W&M;8|k&R|b@
z{UrMi(A3MB5i^7>oubKvDiMX?rWECSm<c%y(U6oiM_*6{ovPsEDoAPVZ}6lTK&oK@
zj0wSpStj;6R>w>bp$sC-wPfhS?W`u<u;1GullXf>;3Ey^&E`3<Phzi+&TiQ4x`6Rh
z{vtouLxWD!SZ~5vnB8eAlii*{Ho(Rl4%5lMn7aRzcryQkTZp+nFcTIvwjX(AQOUeV
ztxU1bYx9*myS(JU@o@Cuf(1NAj|Iy}G%y><G{w55RXzU{SCRXv>dJCp(CZWuk8^j;
zG+xO0x{G~Dc=_nS)#dJHLkPwK*>77;uc%vHc1RY*SFbRac|ak?AF6D$?m=4c>%Oq5
zlFR$Sy;0vcJ^&oo_xM4NsSF_f>K7<QkpgJaS7FJ@3n_atsU^#YRFgCz0)+|CRx=Mp
z)!?-5swd>j`}d=w5fAchKUNJj{T}sC`5Nw>`ei1VJ<ele<@Ln6sVp*a-=-~sg6<z2
zk>A-Z3Z>n%^i11Xv4>~2OEduXsn2@dI27!x)ctWs*{wc0CRU)-Y&l3)>sTjJBm|v^
zyY_+9QLcQ9cFJ8P4L%;i?QSr%v!q6<uYp^p>NxV-^+%(?Nxl9%2}fbvElS#sIAo(u
z+Lyg@lK?i^dm=snO1rplBAmPPCwfcSzs%nIO0ojmAJxFebs!OuP@UvQAPSFElsT%0
zW$%=M53t!H4O^O{^rKAhUa6ykXza0+949H5>t(jD-jLynO(`I+@s}~1*pAI#o66&x
zc`TL$A2`KS0(oCIVgL>7YAY9!)F3~^K_sNnGs+V2d+s?Qu6zwgmhBr=md|-grbe+I
z4g71da?%DgpTtL9+sgj(jvnwW{CsZy17Q&$N^a(oxwc)`-mrn~$h#toeT+%-!IIj;
zVHlifM+^+}X?Ns3AS;0DZ1?KrdGgfu8&N#SPCqVp7B1Fso8OL9$t>*lM609PBE;<x
zPBzW*Djd*sYgk0iG``#2%r7){0&Lsb^=xC%44o+cuY$f~U{!B*p8rAR`q(W#<kHk}
zX9(q5M%d%%u$95w?s_a^dkWOw)zBZ`)aB%FH$VMY!Gg!lo};852Q_IJP<93(llunb
zgz{yz=~;dh#}B=fZ77#Nu0JJaeS$T|+G=f+k_P#)4bPm0aV-Xz0Xzar^Sh-3Gm2B{
zre(zu1~T5o-CwnS=z8uVpBbx!X841~hQa)9^CkGVsp+YE{X3ltQVRzXb9BEf);an|
zS~6;|7LM_|t!s<-y{uirgkUFq>WGgwux$}P;<rtWnz0zWIl8=o>wwY4?TyEzOA#Hu
zmq&cQ*rvWy5K{1^_>y+2wK1H*X4uSb$T`G|au6$0Yk>5VVk$SV?f)%Bnx$v<J?z{D
z4^qQjBFhi5r9tR|=2*PL{Y>p?8+vVyr&Zh86TIoU3v=|xcgb7xu8Y3U)9O~jjKZpe
z8~hWxl+cZ=yWmjA>Jj2?SWCS1E@es5VE2B69ncZd=S&x)gaOl!#&-3|0i$ba&#G|k
z0PRA#mW08YQ5sFzGbLMgUPcBJY&KFW^nG4D$-zB}p1kRS=Cn{Ohr2VBW6dr31i*y#
z`*vwQSJ_ju$Gwras>jx9Ax7yrTh^iz?LhuCTJ~Uqgxlz|QCJ46LYViW?@}p#lps<R
z8rK>eoyh5W1|+0C?@`$NIM$#JBjw>BCjw0hwHbLvKQrHD{|CPN1hOi)YJ|tfZg*@F
znB4vOebBjvQCbKLw5@f8Ryfu?JL3G88uEec_$s<IYVv2t2X_G)J0`p-Vwu{b`j{j|
ze4``PS~yVcc&7^z2AO$h4}@!fWi~|h!a;a7vUejf<#SY7Ar3}JuDmhY?M6@!K6X=;
zrTTPemCSVoYdb+jKW*T4OkPOJ?iFN<-$*NIIa)iM1}6o*rCgzxw@6}Nbw(PBz7K2o
zNm>ZrdC_%j)IS{#pY>DyzO%hQHewXmILSx773HL!nF40EGo*j%SSxX4<P_`oR+W&S
zgTyTnvRECyt$B2`t5m-zAD0KnrdtA(NI5rX-@}_^ss-~EfWP*#B~m=Vt|E0jEd$5u
z{Ku68ikoBT76Lw9`nc=F4u7dezmf{dK-Z8tQ_P9B5S_&X&q96+8s^;d_$Y`n!Ya;}
zkGZYuhkq&5i#a8^qwl_u2idm?t`IKH5#0RvKqp_g<py$5Lx!gW6xMw?^W?f&S$J`^
zZ=(>mz{1n(y9t{9Pf8=Cc5Q$*(PQdsN6?U?G$W}BPUK9L4J>x}1l<8&o>H*_Um{B)
zMqyb6@loCJ#sBuNrDKJmPC|Vb3StfP-*r8BOqzZKKPSg!H+?ck!2#Bg7W3{WChLHT
z(KzC#A-~>(G>mo4m`pCU9SN_UuG5haG7?8-NK=<~M{g+!F{dESB$$_0Tq<;m){pl-
z^zr!YKfsg{Hdp!OL9I3|SHXODY31@tn~~}K%jfjnwTd)sylTFHFoD02hb)RP8+dN1
z6uY5OtDBYUA?G~yE<#G*phW9*C5;=xL(G7c7#XzHmn{s4M9}3h)s^}uPN_=#Pqp~#
z*mx;}C!v$|+|!CE$OWrdZZFX+P54CVDDRLr+=yGVRw&0m&lFSAb+!v)vzPry+V|+%
z_fzv-ij|MHU$K7prxzfWpqK(n?^S+q@RzcIbgUAVo++G6PGCEQ0iN0MvHW))=RaC-
z*f{~nON4ynzp~VSZTuh4SfDSOt`~n63u?Ynu7mq8$5i~isp$deJ@e!-!#}_NU;nw-
z-)Q*1mCAp#;!pokSYD$YK+%7ZsQ)ci|D)wU27S*>KWyNiWbSXDQuX@(+${mFKSj#i
zX&p#bi@)So|K22h!(EZd_B-~sKL7J0{-&J&N4EeHe}r@y`4|tr^1n>pzc;b2h)2L{
z%g6QpTjzVEfq(DIU#_4J{){cqh8?eL^B;rx?@RcQb3v)s$jP_=we#ksfA7m*uCVEU
zswPWo1(A^2ztEolXcqO~wVEzv`7dXR(C<&l|7Er*ITVz_t-RHtXs`dn=^gZ$Wt0_P
z)o#W6FOL4td;X8_@;5g2AKe1C)5#fP#s`}^{TJo?KW0`A;Qvkdzf7mUH2>d(|Bw0f
z@5}$+Cwx(l-dRyNUxpjg@2ek29iQL6f7*ojo%sFZjaP;epl5e0wn>3ME`OGfo%BN4
zGnAgYY+5!_zVj13XIq%nO%DEVi;W%q4=ICB;4Rt*OF}#RIa@?P9-w`-TPCgWTEMn4
zvBI`6&H62<uc|FAfV?)%n>T0>qicIvwXRXIW7plnvNrr>5B(hM*)n9!&R&}~k4RZn
z^O$hv1=i<HPiL7bnl}M#60Tbk>5wSN<q|E+@ZJJugVM4$quc*&bqb~a1Uvmnn9P>n
zJ@vo{xpRaI86pD`PGBetx!4=fajDnVvUo^Cu%@=Qb_7k6XxO3#t1l`+&sUYb{B%X0
zAy!DwNtF7E`m73CmTL2Bsh056Sd{W+?$O1FD|LQnJmWL@E_-k}WVj68Jrnob@@!A`
zMT67(@9mT9oz4~SZ*Teysd~SbH>$n~f7q@3+U%Qn@ke-{O8dnQJ296V_cO&|<KZ2O
zSL(#agHz0+T8&>FKjykNi20qF0FpJ4{$(W>py#K@wo)9GYv-#kb}o)(;gO!`pqeMO
zq*5-+$NS~|I(;k9JHD|BWW|**#}l#aR{2Td8vYs`#$cz^cg?#$!hc<ePJlFglet5>
zAKUjUkH6(Yn`r!Lp3}`~p}(?L5H6X~9=N9fKyfO_Z0qfXw!|1(OL10a;YW9kYU}tE
z>zL@|>7vsHN#|tcsZqwR`wUNS6`6cBsX$s)@NYfgx~9`k<>cAi2~#uv=xSN0|M}a^
z>cRZmYwcmmchBlSBcmQjDnv+JIe+Hm&5sZN_3O29p7FxehH2vKtE^nzQiD){%hger
zT7Ku^$knmmnT+kN4|q>lJ+HADY`JiG^R%eqS=Yl7zYD2%>P#ShzR5=JIX6GvM}7Zp
zD5PMcER0#qVY74+RyLTd6-k9W{QBOKFeWi9cCe{56nZ1GaUW6WY9f_pweqxfr1%nR
zeBY0^b+LVZHu-jbEU=zAS<(0E=&An8*X;H(t39Xc<;#Fk{qc``@9tTz_|CmMp)Y#!
zQ974Amk%M*{s#ZfC-42q(Xoc7sbCY?+S2kGm$C{SweZvGU`#=Tj)Zl>cRRSP4i9g%
z&XXpoiS<*&xfi<Oo5nUR3m-sy`l;HJKj+-jB=2;&@F<=M{f6N32T*H+X4%JH$0<I&
zEpax8X)f=VPSDtjayrJ+Zo>JAd*Vj5dH%Ia1_<<Fc%;W+le*!kl3biKqOCe-`TQ%p
zTI0e~&t*Rb09vz7&h5qwbIiXtHB$foywI@Y-F=e2Uc1HjP^tID$M6EAl}U#X-^6jv
zC&F^4H_m4~JI`~~v|!k!($_Z;U(=TLl2tey(}q)u+I=IoP^SSM`fTmF5i`LaVi$VX
z%|+~^(=_VU_$^C`&(1kO-<*jYOuC=QT1T4>BP@8AX<TNkG(#fZKg!=Xd6>eZHd^ux
zFj|*x^mh00%&C3U+Gp@oEqj@NmS#ZnoQN*rlA52-&_xXEZRdxgfyHRn94(dKIc&S`
ziq11378)X)`l(M|JZg75_pl74YAvUs33`7<X0CX^XXjP&;jSs{9Pnw}xbhDccI2aW
z)z{}YPKNVrMjY<(Hq$7RA$IQM!PA#|eD%Mvo+^0j<NMOcJ#Lr+xT+%hQ|vNfc9nxU
za55t4a~ySYp#`VUc>6XdQ4jxN*v)&HB4mBC%}e9PsNbg_Z($E(<i%Z6-}atIds{xn
zPmMSWIb?0!WgG~(tm?6=zmn{l%O$B)2pNKw`4A~`Oq+b+{6Ciyu5aqp0*)qaB*g2!
z$L3$auv`H?wJu{97!B~wkrq{{y|$mwfiQi3@!}g%u|3IZqm=(Pc&4jiwTbFs<Ye{Q
z{a@ZTF)1nB8Y_V9;GEe>otW->*~VRBO0W9t3!JOG5BLLsnot<@kvt&q;mD~TD={T~
zK^+UvVoN7q-(<}^!W6pYNb_)SN|;6^uTQO>lVv`Io}!FKOf4%MJ;T?)xB!CBwZyfV
z2+J*%WtoN3mVn^m)~+t58dzxCYBhd*?8`IoId@Jp@~7Vc-MIghan$>ZnY1cD8z&p5
zp{P%k*3~N?lR!*$A9d$HfiHP*Wn}af8N4_<7ewi;pFA&h0zLokbHsfz^t+GyOKr40
zZG>%X1z?rG{^jWHY%-S#n<`Xw@nH?;8^>op?k8((KM%XXAAvfq@LbD#qrf2_aZk+k
zJ|{+fYd~Fq4LgqiY`gLU3b2H8Dw`IKc}`=%%`%ghZLB}-4&Oa&Hm;JrrRNQq*O%(4
zB30RV`^|@c(UUqClyFvr7Vt{P@Y7i_@4iJGA1{&1vlLkCnl*m7#Gwk*pwFzs8kW_`
zgQRIkBhF*(!GwO`zmV&H;}|*VANck9dT3Hy0sTSbUDItkPl||7IU+u&37-9=q^x#5
z{S~C^nxz*&(Cc7Kj^YpFD&mvb=05ZCcwEq{ojXGHg{IOxzrSV4&ZZyj4MnU^G&N{x
zUF)KP`(!U+R4L>YMEc7IUB3J$<ADei%IS>*>-Rf{TiDCRqcTv{`(_}vzUS!OJBe5N
zELmS)8|G|ki`<3Y6^yCKu2D6#l3mc!8owtWlg+lbRRlgOVRE7N_FVnl!p-+GYCxBA
ze?`@-X)mJ+LbqKs%p+k#%c0rQD?I$h_S&UGSy6*&m!rt2j$6uXZzWD8zsr3mz+dkU
z&bo8P=w<xfXI*YF1u^$TI;}%Q<dZr1P!GCIjS>^3>LI<((Tc1-Le2=O;rplgQrCzG
zj{JU$>8%IKB&xdB_>;L)dr`+s^gg|BsY|%HR#*GmG43Q*Vs<_KN&@|9DsvQlxwI3{
zF!o*phaXX@YkX|?Iv?%a_-0&}_c#^R7g}3eJGD0T_K{!ocfWcfQI<!?D)ZSd-7f%{
zqHLdDssDT#?_Sbz*2#!M8*5t+RI$GPEE)|-hP<11eAcq2_w+jUqUy|3{r8_=h|cb<
zJ{hkK%6e}3B&-%?uLGGzorpWZ_%_<8*u)_KmKd>1K8kv7={4AL(UR!_QTP;#fWExA
zDeU#idnLmdfd+y1c*9Q~%D*vd&gbrOYP%v5jLJsrLl8Z^d(t;j6@`P(pAiS*4KoGY
zFPw}S8qyikzrO!E2q7DH|MT5qGZb7_V)h)BLe^caxDy*`M(nxZGFX@&Lkjbb$)W>o
zrCyKnGd<I@yP%xQXvHgOuc0s)0uh$18tqDDAkgLot>!S_aKBhiwVX(8Q?`CiIUF6M
z`P4I|g5iVEs)mrLDx}!E<3-kmK=-Jp*A6c^%=GJ|1CGj!RIZMdl#JJU#{qBr5ZL<p
zl+Ccw%8aD&xY*3u!y~zAg{c-$#7o>7h<34FTU<$wruVgQ$ci`;FTlE>QiwiTBzZu8
zRFKGrp{HEkiszJ>4VxQ~dW@z+SJLj2R#yf+J>L~+bn71S-kj5$BL^S-S5z~qD|sp{
z4O}15A7Uj?V{hs6-#ULsp-~=f(pVQmritm_Y&+2nFRu7iY}PA#Af>0smOMOc4z#e4
zsy*4h9_d+OaQ1|PtXhI7Q`E5`|D-Xun7fEJ3WX<eP*`6%$S3DLCxNQ2L)o47%DZUr
zos-Q}p{mAO0z=p@)qQ=r3w)%Xcb4--r|6}hmxhmBQc@Li)pr}_2Z2EQc@ak}MMXs~
zrZ>;kiJY-YRpL)bmks0Ti6d@Nqu+B%i6KyL7M1OXC-ZIO5eURB#cR)L0fYc9Zjmb+
z;Bfwy%d+S~8`YiyaecZ)W8puc;|$6)RGB#~&-%m+!gHEg?1{Fj>$@i!%GS+W2&+sb
z!L7Q8BYAF_j>OB)?|AW{?itCqF+3O&)8|Yu7FO1b=xm$5)mTSuN8Wz)y{G4#xu&?1
zD*b+W;D3(|ffYWtZaUA!rC*HKe|ynzkC!MoEXSkYXAcM~`+|j3&h6}^$8BCZDd((}
zcgZ&>DChh4w`n5DX?a(La_%=7y%QtpVu`<}FA<54^*B$!0uu67A%HC3(9j2seLW_>
z6X|>ar>OtEYL2Lfv$HAs=x{-!-gV}}$p^Q(ufHwQu#)cCl=&TV0<WyZ7W2IPV;pM|
z#OY=;-Y?If9rE4l2XSrf*yiD7c?ocNh>BZ^#G^nyDbSVFv-%HGTdafzf54$EXyu<*
zv$Td32j81HUF?K~OxO;=*|>(h>F+)-Ocqs~n-`qto5P{ev<n4}h7+CNgdR+^C4E2(
zW)MGFe6xMpkw2AwA=4n&^|#f==0%-N95LVV0G0g3@^RXQ=y->$+Eo2qSEu6W2YxTk
zi}Xz%4r#kw;4g$YoXWaJj~*NCD5C(svm^8T7?Y<4MK-b~Qfgi+oZ^=+32m(xB?pYy
zNvY(YFGQ%{i@EpU9?R`=l}w|a4YY#Hewp9CDpUPuyHy8R?Y%4iiAMiGsPUqi{|!m<
z$JhDNoKLGLOcT?8oqrs$`$T4#UsJQ;+nMJ<f`dYo#qGN;nTa2t&1%@Rgy&Qou5qu7
zNOWgl0;rt^vwLFv_LU}OKFbS+V`x9YhQ2AsyQ=CTU;FjnIh=cZNQ0M*EZN}49K!;b
zpI{^C!!BlUA-?-!qa?htg1^Mt<7Gv2tx<?OW0CbG-gk;`q%PU111+X)(D}9%-Ya9(
zMfr}~EpYY;<P{BW!G@b1J#UdcCQh9nJF{N?p5CbLMLZQMzE!U8bhzc03VBpEBE@Ur
zQm;M)X?0P0vRLGFGvbN6jhgBi)bTR^m?nXmz^QF3CY>_>IFMSin6ck$#~$3B#8sD9
zYKfCy5}tdQx|Q3f#9^H?6u-X>&(p8G*#C~$HSaeD#qs!8Kd2sWhxgJ+$>;BDL+LJ3
zr+7}EFnA$hXE~X58|7wlZ%9^_^HccZ=O0NMi_4S#W~Cr$lM<x&${F$Fjn^FOx7HUf
z)$MF=gfGQN%@Vs%zf@nRD8EdRE;o1Jo71yXW{E=AFy_gTGrnLCLwm(6e`pIhTAh>O
z7Amst`uaY%@1927_jkWj4u<2=-aMIe=H6d3Jsn;5WQeo4W#vxad8^cy%kQsn1HF`!
zopi*LcLn;BJb1sPwHBu;y*}yWS;gves#QA81qNH2&(SsUa<8rHK00VQ;*Hv!%h5)w
zKCnSMezu+6i(fXrgUXDi|Gck|H|F0n=(bAMNL@6Md2TMHMA2SAtTpL2{9nSt>{WVL
zXr>kK%6}~(%C+$O!?SlU>A$mS?m79p-l*6t|Do)MWewNVbMm)*)@KlbQYRjrKi92f
zav$1VXi{u%HPS#DF;HU732qwL{$G53byVBkw(Um?w6u6}cQ0Nf#oZ|`MT!&Lozmj&
z?oKK0?(XhZTml3S&ij4m-23F7b6)<)7=(-@+t!|I&bjtpgD{!&KRv)wCd{BMS{*6s
zC4CVrf<^P-&192A;lPY>DQA?tovmdxoXcQyukNR9O6EeNO!?G0AQLSXZfWWoyJk?R
zLoSbiQp-sSq%7pMFBjG?7piJ@ammhx2N#T{APPj0xbS`^t|Ss@_F_CI{=h6s6GtC+
z4qtJiWcPda=+n*3jV9IkZr5%FkSv<dsxK|C8a1f((%}YUhzUpL;Qk`O2%+I6zTp)(
zV#^9Vi)}RiOLwM<C<sV0vY?#wpN=$lF_q{BF(Y!XrgR9~4h+o^_GY5Loka(=aYV9s
zbbyIu3NTB`5G_xvK_?%7ONh}q^tVgC7>WS*1Y-07SO{6PNT=A|$T}<nvQWuDE!QT5
z_f}?Fl5sIVP@)wpok*V*BJk~COxU!8t|wcwtg?FEpsq%|Y0>SXAQU)7(W*LMRdds$
zDEMp1w**;po+P%JspOt@{2(*hB>i~J_Qwa2^6kpz=3&7X#{{1E+IO$=RE1c0c0v>y
zM`ONc)fi+2t#O#nP`Bg0{=$T#1*tXvG!LF#Fvo^3M$HQt$jc)ckW9KPB1D{X2r)Iv
zP&e|6Nd5V>gv>gut1tcm7Aa+>JI#}?UN&V_I%8u~S!cLC%OLkU%fP39>F~#Ij44h1
zzXwIzCbpOLvuEeAjSyA`Xlt1jc~vH4@17tH(t@>0z~~|qT|kv8HqgZ`%eh9>c94rp
zWR)idJN6Chf$|6ncKFVn-&9$rSu_pVSO)d?6WFx*(h#?54YoE+<XtjHM0}bDt(4BH
zYgMuM?B6{+y%{wNg0|fKzYM^;fGw0eV^n6r>tBo9_JOA8@B*~7lE}e$o{r-!`?v4W
z=-C~}CLH!IdE4}&a@aO^O2Zm7qa_aCLk6X_m`t4}SQa+~g;EjY&L1_l^?V%Gz536W
z@P!lGT~v=DAQY4Zdsbu=L7i!0)LRJ5r!Vc}#?s=;N2MwjheXJ<jjP=-^)%iEANgBK
zLwIqOq8*FU*^-@k5aosuhB#Hsi>iAwJW7axxn`tn-dulK{8=dZ+YER1K6@Rj8ASTQ
z8h^15jR;BVUDQ`9UMy6p$-#V{50)@{)njv>KbxBZYtIOI=fN$4>(r<SjMq3~97GF!
z>>q{N@73Joi<HYJ4{HydwBv^nN0<znbgIup-q|P=7^-|Nj{WPLol@})Q+JYN2q;pt
zO}l8#W>Q;M+?5HF9w|w7i;i;qb!q935=+%#>fwS{doq6AP8Z!5dbA8U@&oK2f6p;w
zxP0J%VQgYDzMGo*Q8e&JCeLtpw@ax_ub^%@XHAPbk+&W9!>ug42vM0>m0rPoF?s;K
zn0zZ0g^uaOXi#7dp=P3Zo1RIXQg6hoe3Mv-SYJy65NbBL!%vAoAiAk7*UtFgIfQVd
z1pDsnd%gg%Q}Z3)gy;^a5FEY3>yNR69|)YejZ>hWHan?litj#8du4P%B*%$7*2yj}
zQ}Aj`9chfcs|x?BXySx7u-qW^3ta-ZekIukF6NNvvsr%NPk1LMWL-c(VW<P0j5&vf
zA%M8LC<?QefZ*^ufgwRTq#(1(?s$ZI)yE_fc_vrAWaiLGQ}=|-A%inqGmzXMF&9Ir
zEIGLjQz1vHu;&}kpFe-#9(<l6#okS>uW=kTNc34qIqBx6AVvc7px*wNUEK9&rX2no
zxND0H?K+t{<^E5Y#+ly^`rlm2ss9@$MMa^>_2j>E3x*r#4Aa!b1WZCmn%B)zQt~-o
zn=2xSO8R~WG*GqFRNsTE?}gM&LzIzYxoqNI0o>uJ*5rPPXj&}v;x(+_;n{icssFh_
ztgpR%#yTt`!*aFx8b1vJ32)<F@1`7cGc)p;18!Y&NP)C0@DSfLc|zgVnYx4fdsFk5
zZ7}N{+Z!)Y7Hn-*EX%%mzYzO8Pe7#uZt`21CeHk*`^`nxh8J5L!yv9UHOb<^qrFg4
z4w9$?`M?7nfIm6r)O8VT>D!BdSXt{7sal{%P6V6cr;M&2Eqik@xHvhG=2IycSq<zh
z*YO{zce_-6W6g4~XCv3%!@Ib<c$XNV#C&$mt$&H;1KXIi*U}-n=+TFABrAp_^44nw
zj)C-TZL6zVdXn@XV|*U6UdF%knBXvHK`LyttgLM>qh8K7w5)BX=(}9ePVHYd;b!cG
zFr`DMB{gY)EqcM#My0G)Q~zX=Sg+L%`S1BnFI5w7QPzLokJI*K%gZZJ_?hI7yyzBB
z&(I~U<q1Qc;hOJA|2@siqvDI-=M@yrg*_J7sRQ(xUqrBo4EF#b=&Qc>P+6LOb-hQ#
zp@iS@#*5(AI=(@)pJ{eTvK>BaYB+jR*L*)omXAxCdu=a>k(Iz>)bxGqA#YQ$Q6g{|
zucgk$Q}~3fb#;B6u%l5zA4Rvm6I=B`_1J`1A9HMQ>H9aZs6%JT#wJPABdL}AIZZPo
z>!cO#g{3xUzt0<9eJ^(~+q<Z<uR9dfp+*vM7|o~33|!{xtNB&!q3(Lwo?MUaI${cV
z0my-(IC|aMyEG^2X%<Bxg`ZbjJjFl_XFtf0CuvkJMt9~-{XS={nUVyRmV0oj&jXY&
zro7=YO{&4P#iz+cBc>7m+g(TF6@+<^$@8ZEbHGWOCyz@2w4-IBtIcyXFZzoqkYdhh
zDi`*dr4i1me~k|{@-U<1BwzRNx~Vw@)<>aM;66fl9iCNO+vkQR`zO@*Ed7=^VB69d
zb4-7fRD~wZY&FPPrRROO*;3G1`hQp?4JWFqrCWYo_Ew;hlG!6?PL#qp`Zb#<;0%E=
z_D+!*PPv(0PI=@WGF-9(D%`tmI<1oclYMuEO#RF`$o(#%ykJ7iFw7~i0*tl#YUT51
zfMU9T5_tNaMHecxXy+dG-APQT_Z#b<gDDIcRFEu$%H}lYi1miQkn-i?+qp+jS=mPg
zL|pUcaTZrfas+!K4qV4TQ#mX>2}O%k3B16o2X7qd@T|Vz(fotiGj*mb-w_~VFK`Hv
z$P+G5Ho!sjpK6H;ldlO63wysj=6K@*{nm(+V37c1pvx!knLR#8WxnVX>liwlg;{=H
zIB-(u^>*qyJfxRIi^BW37rZJK$7ORmwW_nfCzEg;LCnR)l>!5aJvnxt?LVg$N|&u|
zEd%$2tTw`R8-jRuZ>QKE9v=LK0|!TGJNkYr>Q;*xd8&NTDtX*{P6OVpZU$NYlpjw-
zLgL`?BJie&HryL6CXI~AYG=e|r6a^N&)prbqsGsuh$sujBOtJMu!*7dTP0o~r5M=%
zt;+Syyq$w0B2enN8j?T0?*0a^bIJmajUL@Iu97$l<5}kk#gCE<zbBF4qmjsNLajUc
zo`PER-(CQ8UB{*-y*}pVTJ4WO1dinJO=9X}8aeaMT6d2MLYuIw<}F4|$>I1lp*d;<
zFsAck{PXkki%U%sK!`hwQDn`+WX93#kCy?95Dl;pCsD~uZ6Ra^C(Ebx+Fu#ldfk9*
z1!xtWy*AzmiHg4MGOYS$Z~qfFC_gaJQe#PHgZkP#AH5<y$)Vt}@o7c%w_1N50ssl}
z@+d`OVh(;Zh6l{|V3d`isLzAqWlVGyygNK^2r2xjLMcqyDI1Wx>BMF@o#bgFjcB%!
zYUs#NS+?z;3T4gA!tCyje(C-{ssw;g&J8Yxh;)AcT9n<#qd{m8LccwRZsd8My>>-|
zr6?3BmVaoLh&4@jov<JE99;eLn5&pt7_9SSHnT*OY;Zbx%6Pcz8BSuVFAWjCJ!q2C
z-_7}9U0szaHPQeNueslftI+fIH9)LDy^bqD3@$t=XIVb?A9|L;?eKrFX6fMG!cDPn
z-`<jE{1#?ne<k==j9>gj0<Ac3nU$00K3>49X9^&NCtnMD&yMmpJ2%Bnp5AxR_i7qY
zZwQg!s5l7CL^KE%0ud>)P^Fs5Y?1V0l0Um?+Cbg4i%U8#Ub#3JtT4E}Kf*yAWKpJo
z7s%J>ll1^YJs@5;+k6wXaJ$<WZpQKb@m#W-ucreCLtMb7%HNc4O~3dsei+-T$CQ(Z
z72op;)n{kwkgbd2FR<@y=GDh26=vq~DSzpoIAH-V-E3}Zs-=ZUPBZz+Wz}_6eeSlM
zJw3Ks3eBTQUAqnDdaQ*S_}E|Ru;_TWdNvXGZ3owSydx)C^1&Cz@_S8xT3yGpULN&F
zU2saVx>)6j2He{tb)pODf%m$S@_oY)C*lWfwJsQK1~jr$%#epsv}#FpF)P)nFfck(
z#KaXM1=_o-f25iKE{uJhH8Z1PT7$1eU?kA4u;Y8~CPq}Kd6*t{=wAj|&_aZpvk0jI
z^W*z5$)Dj~(mu@H89Uv1HnHHB92$0=57Gaf)Ur~Z@#k`SJ7ml{R&$!N64*nZU$>e|
z!)hn8o-bM4`~b$<0mZ7M*NvwSgIp=S)ge-6q1%oKu?M5=JUDLKv3X5pi&OMKP`}~K
zG@Xj$1`TzR=nYC76_PMF30k<D*~5-)MCj9yi3p}RTbm8q3e%P+2Aa=p;>+#LM7~rs
zqEwiDUhk2Uh|lB;S?18c@|=G&3owCyYCFZbhAi7`8XBLyE?qY&+nfDN;?cE+4L4&<
z=>_}tQc?pUAS)Z&i=~VSmJP%sQX>LH?acFBH-32w^JeKhz3siSGyuuuJ*Rhgd1mF5
z#|3LNK&{35xYAI#Zd{hy+9iqJMRrH?M6Ta0>N~4iWm1jqJ0@;k+}%wIy_K$6+8i(Y
zD)v?)jJFvq94n}iS(t{U6Eqg#Y_rzh=LB37%I?*!2hNt2uKLpWxYjz(h0rj5a4WDr
zZPu*QI>+X%q*_`oOyTGc-&1MMO;B4uUtCY9X&N)tY1EX?r=eHU-o2pz^m8u5+G%We
z=hl}th_j<{e3nzLCws~2?>5;VGayvub02Y>w`D;;4(#kj@IRjoRA@o09HFP83Q+2#
zj;A}{_JX&uR6S@StxMsoI_+o8N#cFlsp18*I}k$4($Wfwe6qJ9UOq_D_ruQ42})G}
z8|ZaC#?5(T86N4gbK2$Y5F^+?<19K*%``vH-B_g!<Oa#`B$8+?iVNqr%`To1pBrr0
zki1Ms5Sk7C>Q_05d&RU;Fk>~nzD~vMq@cizceNkfhn_P8&{A(M@oOeK(xLnJg)t_v
zoFVi$VXKYKes$OJ%Ju<Tu;{S!znoZs%(~#lxWj{);U=X@yI8fczDC~22xS3ZASCn&
z9LYJ>SxW>e!*La88ROB6HbYEwCcPkX8g!PLiN9Md68nLE$GHDX-O|C@G3;xD%~lcH
zrB<*tOrNKN0DsIh4#Hh-lx89!n&sz!gn>w<buoT3v_XLVu%kCeT@I<N0y6rvhUCcC
zg=TMp`6w6Q?C(tccy!p)!u4BSzyCD>{ui0?A3U!ou7Y?U!}{mua+NYQEq#46Ps=o>
z06#y`$jHb>9>I=q)ZXtKW33L_WjNfn>p*z!-)8gc`pc)Pu~k~oFqh773KBy=5V)C5
zh{MH|+O>@`*v}e1V7mu4PjxYIHglK2k__haAwsee5YY7Sxow}An!?DytZm>n|Mb<$
ziV2XTj5*Rc6`2QwT2`ap_q{rCNmDNFWgnD^^=BHf(|toPkIwb>{Yd<dyF#MAX%x;o
z1cronh38lE=BYGe5`GdjKMhiul4Jo^+2D4IM~0qd`y&f8b8tT`)8#_g(i50@q=21}
zkkIRLOatD%+s6y`aczctrdTp$C!-ANP%t_y^LnLvs5+cAe3BDo!C6?daR(2C*DM^H
zFGW9v;wRGtSOFf>AQLs|bfJSa$YV~d@~?YXNh)C6J{P81{pOs8pfrktd{w4tb57<B
zRPPC6_wjG6jeL!>?z=>Ufsx=8MMJY1Cec<3J@p-4twaNS%pTTCYeLEpJ%XkOHsJWk
znSz%gfy;l<+%x{xtYAdgC2;j7(|WoEs^xZWZiC{kgMM!$doQ0Iv*a(*ciFd&uaH;h
zC>%1vx_<ECwlb9~QpB*Ev1bW}gk~su?XCOsjQG@zX^>#cq6Yp1F9plly{z+(D~uy`
zpS6t+s7dxc?^ul#9>lYay)vo!t1zU}2^~lHkG-u=mR!)Y_{+tKAblnyR9vZQ=J24v
zs6+GCX`<OUruR~$@RC;vtK*5yTUhm2al!o(|KR~fhmYY=B~)%1F8M)*I;m3CkWH~t
z?!Ag@NM3rMgLH#y<hHw*K_C_{;~0%Xn?(6fEJUfe(3s8m;oJ9FZ(vZiECe|TqukrW
z=fb8gW6=KbEwVhs(ZgfZ=@g^rkntgLA4wJ?4jhHHl-YE;^lP!pF1Qfv1hVGhUU<6|
z95xg@_00(%|B=AR0|*A|qua+<@F-zRPBO(hg+}<Ls?<^+l7i)4m#B8u%OU!`zj6!3
zMR0S3-hsYjV0!`$7RO>cKpULC3b01<MF4hfL-|}St~fyP(vFo5`GG6Z7a2&oMdxMU
zu7y+c7XB$r-~sK1%{l4Nsf#^Qct$wb6%*TYy@f2)ccb-XY+ogEVmvxho{GKoE`Epl
z0Zc=+eI6etNsHGk+Tc073JZzTs8}m;(ICLK#L{xxRPpQ$y82HkEbPBh*bPh7Qd4tI
z4Q;D(=*3tD@$Zt4<Fu58j!|9T!qZsv@fg7=pb|?!DRO_G@|7v5h$m8%3OI;j|7dQ?
zKK)gOX<S-^jbY+DWM)&W=Sxpc`tP4GuYczmh6TJMbpAWyIP8y1-08ne_*9=Ik$rFb
zXxpP}qFQQ=YpxNhx-2il=p1Sj!N)--lQlX!<b;ynx4!=IbXA9T>Kjj1E+LJ%Ejso?
zY*mHou$7H<bz9Yd@iB*hd*@(U+clfFmMRk{U#s7+s&|%C{WI~Zc7VDiaemKFP4=6@
z+7;{JKJ0N%BW*@Tuk$<NV+;HZS*Z`i6=Wfwq<{a!qM_g@Ccu!GDp&`rFlY>N#N}&t
zR*x3-SE$-8wbhT|>U;kjlpFW_fX++iQ)k;8Z_d)<lNAygaTy<W7(8L?GZxV{vGgm2
z4+LeqFqK*|!VmXxma727ECLW=8ll(uF6p33hSm@n2LAWd=mG)?4tk8}6i}+=wl+3F
z1WsM9SSo=+*JjhN@g%Xn)I<dB8=bE*1@F=<Ev=6AL>-A0CYTSL2dGjdBE7(>$A{7{
zeco}1!Qnt`iAdwN%V6kv4wn>sM4Dlh@^>>+sw#i@@uxwcft7BNYvpU&0RrwqarK$9
zX`3kg)_z+r{j_#fV|&9$*-Aq&<<L|Q3A=oZa_hC{eX;iekT=`vO7x942SH6bH2yu?
zfworsOSA7mc&1VgU?{Ag4@sX1)hM?NdA1aNo<FSBkZUE9$7J)rD3McXrN)@hBkpZW
zeR(av;5HRHUpF#1nPo_D$ww<cGXmNPgSe%sGGO1_aA_7-pa)?131>~&`6uu{k99?1
z=`PSEjjS$y-7fLD_Z%KWd>eMU6m91ep4I<0CeG}_VbzEBtv!AlC_~{e1EyJ5Plq#d
ze0<CbJ?YUkcU>;6Z#dh-Xnww;7$lW6*-NFG5#A$UUyu@)!P>bkGP@d=5F1H1_K;|N
z<b5^I8a~pvsvl2ZAhxqLy#LMHJHzK`!KZKb{f>KNp;qnk$LDA0OD3o9<>{>q#1p@{
zT)%(!d8<89S)ggZMow~%0Ju%tmkF~sr&FKmsz5QC8u?9+>-0RgxC~N9GPisSA7{&O
z<8DL5{un;0ZZ2K!l8%9qk)OvC-Uz3(7~<Q%h6^y$(ySSF-!%>5N70U&a%@ovA9>As
z7X05HslWNsTh6~ZQXgBTDm=t%kBFN+(5`aG=@Jqwkk;vq_jsUpt_k9_7ua2i=<?tI
z1H@IXQYh#}WXYhfTtPmCK8pMP28Jeuj{Km~dUsXV{|pTGr%rn&nK_1iT-?>qp!@|$
z4Atgt(!2E@FC753gHxOU;_j>b7FB`gi$GfqdCj5kC@IEBI#$S_Q>YC>(jQk0?1vfW
zwM)n6r;QgsNDci-KY>9q<)kK<vpAjsuQ@OtfBP{0$?tWzuk0V%)fO0K+$mhn;2@_^
zG8u_v#!>WP60_o`aHlScx0$nP`$*q^IXZZR?tunZzwsRVeRp?*HH3H7C{@MvrJve$
zI&D!ZN3hsfeJNFw{v=(cnZ2Y#{x!cBd@&6wr(od1eigHS#d5#e;fk9=h^#<*w!P+g
zD=n6I)_pFTyyyTJxAbbg+9QD-FKiSewSV=iots@SxN)=yZu>5rb3*t`Nv!YwIbCvq
zZTaPqd*0RM*Ia6RD1yMt5#!znb&S+h)h{*e+GP{KZ@_n)>EPnfbvShA>8>Y0i2WJg
zBMD-`M<Y$@1Gk603#^d;fQ7taY?nYr`J9<+h%!^C?y}hQJ;Ud5!H0YT`F{TcO&$hq
z5iM0J{MdIB_rM&L@<gq#8`(|Off(bBFLqh1iXnLiO%nu#;sx4fmPUSnKW9^%9Gq*g
zbZQy#q$b{H5g2IHWMzGFw()Y8<-W*Y@UYMkZF1+CkyjEL`Y}P~@jT7vPltC~kQ)8D
z4<J7Mt?nS<(5r)}=g6nv3{)7@nj9hXPzr{dBFHq4>8AUv#?fl~B`*aBn8%k+@wR8<
zDaQBfZr9TX3+yC9PtV0U_L-Oo{TGL<CF5=;ZM}8UZbSnm3O5Tm9|w__COvv5CS5Zl
z?~IkKHHkeO;Gz)WDk*|{Dy`?Vfj_|Z>NjK5+yjS;3rySb1#aLfzNJDyTmoTN&t^A}
zVkk&dXo_llz-AOvXj$8vKbb&J2|<=f3i7W(vZvGM{jRuL^DyZd89Ij&=36#n!ynno
z6?!#6yUK_qw3B@ajO8A$|HzLix8CJC>l>R@W7x8p)C(f+4BPkAZ|2N(7HJuUBla)p
zq-Zc+hzouc|1s>W)r*UvzNuOv(VXZzj5NvT%ae>d5XJx1KleAV)!X<x5Pt5dXZoFh
z-F~-4a8icS8XyU^>h1C~$~{Nd<EU5L;k{f+zw?r4Tkfy^IGpfq&+EP$g3^<%%AiDt
zH92|qI%~>YES5@RwMS!{2Q>|n<^&>k(lujGvGeedL5GLd65GC>VYPqHT;PB-!x_>Y
z-HG<r_XpEL)w=6z!M^}(%#P2IBB#lOgO$!uQd07`E%^Mww7Aobm0B9}V$~2o5QzTr
zGj_VT1NM_~Z+FssHpJcvV~L9y_*<te*2@>Gc25{G>kGCL0J57abj^fa>qn(~<;!0+
zIy)l?Kxhq`5PV5@S~fZMq|(rYjs(Xg(}l8LzXA-D3<-9LaQ1j@*UcM<0J5iBY_x%s
zp9$W^+ki>OU3qh#M8qgl1du5hCXP_A&A{btlZNDzNkp50f+^dR1meDR^*ME0)su}l
z9K+V!$R^lx>1f9U+N(7Fr#-?p>c5<!2|tR{RDWYHkI@90uw}{}qCTX%N?uJ!Hj2G{
zx*i_cj^ExkLSCarb?iQTE59%`sduY|5>nnZdbudb^XHf6@RMf{l#gMa?W4sUJJ306
zFu}8LFF&5eNmB@083<t3EhWLBbB&KDlbe+jIT@H#Y`D0%RMN;>ckNGD4R@ZQp%Jn1
z=AiB8wuiylZzcuub2x8xw*g{JQqqj675_E=R!hfs#kwY6EE+HYpph`uZp^lu5INe}
zN!j434m;DtVYpQNI8F1J!Q&&u_PjkKH={M%X^Q+gw)O@slSqtL9iQIe-7b59Lx7zC
zrH?SN1`t}~Aek<Arz}1>n!o;_NNOeqfKxlX$2S~-+*lfUg+`N^cTuoY-`{BhG2E<%
zc7fVHd|#edfS+=Z12GQiz3uaKdt1~mP0=?qF0Ar|wnyhD4L*B2N=aQquPfyoL@8y-
zLJ&NTF?Q*ZF!S%a+jbbB;1%|&vR9FRU0hxK(AAUZ>rd%lz2pJ$b=M=hT~g!vZCcKq
z*8`zztkXp|nkI3O8BIChmMrt(KQIwr*Z#N5R6Ej7rQ~c(!)M?GVBG<|H$36k`Fw9e
zvgKLZo%faC*%W6+Muu*<3w}>k@-4~s)K=3(a{vXm&H5IErF?36_1gj9WAmDpYpwaE
z2|k#$_|*Qq7Zo3d^7t$&mI)w^whi9q&|jKkv-WGRzJC3@+SD}8_l}px`)c~X2e3`2
zC6-El64~$MM3?I~Vv`B0-e^{-^a>|kGpZ%Ta+cwvv5i5WBh7j^-S~IW2ddO^rDFBQ
zc27TtV(~G#kPdnLhszB<#0iPM8$@qTUC|E&?x<ia3~>yt%&MlT_Q$dA+(0#lyA1#a
z$qIUwM>2+m&UMzx|E^;ov|PYoM943Qd;Tk~>Sbl`kzcY8WD~P?Vtwl6lD6V%b9rD8
zRWpNezs+Kr?Poy1;}SD={mI34BNv1}1636I>}IgBE~#o&tYhNZ(k1u|>Bz>_AtAmF
z&W)dh4I!Vf7jieCH-)4XWe>U5)0UT))zsM&b7a~H;M;rIE2Ns6Cu0!@ndS|xNAOpx
z(uPb_p*+>y3^ib5f7L6lnqPu5Fc32W&_gWi|8FcaLPOPBom0nf8ake12^VZ@mi0^$
z#}9fjrmLhVqZPk@RiOOzW7T7e0$vY`o#Z3ljTxEn4sYf@8y+$bKfg(hO;uBq^nSkR
zi<d~Hl(5dcZkg)R;^H@JYm^?=gPZ0n4}O{%dT9!~jVZj+S%{UDO=a~onI;tx5fLj9
z>W0#Z?cbznU`V8pMaLp7C&~<K<r)QG-f%QYP&Nv<JPf9ik=pX-o3LLSdD+p|*QeCX
zPqq)VPMaMT548b~pSTxjfvuy9OhRGc*@?xKr|`-85Xvq<G1z)c=ZQS$8|vzUQz+|}
zDHAQK32n9a)2iLE;{3*iIygNLmkVA@49LMnPx(oWsT^}YlEE*p;<3g&=Mo2aoeir7
zuOSO5fpEn+Y{Yj-Fu8k2<0>$orozuu>#e>`+fbLW>hMjwPS}P|lnGYxy3O>VQzOZ-
z!*a);Ew52S68)}U?a7;VgHuzKzjwJZ98%ia_*?0EVTOA(=+^jxBqbvoW1r;SXiQ9@
z?@-X<+LnQB<#N7cui4bJw8+*hQADzAm<xbF9t;*BY2`;UGFc9%o^0i^Nv)I0s;ZwP
zk(yK(g*gWJ;&N?Lb?QC#I><e4X5RD(GEU3H%O|MnO;VVzoBBNZ$mXevQQ5hLm$3>I
zOQiua-9L88Ng4!+4MX0U^MMUJ6CYiJsF{>?^FEWr((wMx=BR6F6$?h*kzD@idR<tv
zl+dv0%qkyeSTK4TLFjdNM~aameVRcDU88P0*z$yOA?p5Lmj8dq|2luO>)(%*ssapS
zBCb)yGG`ze!s%a17U;M&(3^e^I=%CMt3u0tRis1bAW=iF<<RfON{yT3Y^)>#JB}B8
zIutysUvc7^XLF7d$q}lR8@e2U$n;?r7{=HgI^I@JC{>Jfor@;^oPhMB>WQmb<$TFK
zz`{pGylQ@ZdIH@R-+aR+$r2h$96oRm_>=sTKYR`nJc0TBE>vroYtABN-XbHyazS%l
z(Vd59_h5>gn!lF`8=%rm^L~z+?MzF!S~1KKjP)~&d^>Lm3mt<ar`n!Mro4<+aLkaN
zGfbf&A|YZ=2^UTdFOqE~{VrBR>}16W{t2$0wyKgcd~^>Vbi5$q)E!`z*BK$75uT8f
zB4K&X+T)hy72u`jM%Jm3E1S=?*jHuzG`}z}-9sXMOwNu%P7QEjIomum3SHf?uVQza
z*xUfjB8W#8ASQFS(>!E6Ja}2jiTgV3H>K1}xJ*;`DvIW4qGH5hf<#}YGe&Ww5q9u`
zdM7)5v-olbjuyKy{-IQtiO(mLmH8?;Tylq4s_z2BH~bQP&Gq6{e|!r8iI}&EXa6*6
z!_mp<N5Y$=4H-;yN%EP)=%9gtgI$VbM2ZP87sP)i`Yo#*$^i2hyJ0FV1?Xe?dG~fJ
zw->EaRWox)b^PfaZ$bhHVZhY74CPZC{Q2#lX`y$oB?GD0X{A2A5)?M;H0Koyqu#ko
z*qAXuXHAQkdQX5EEx0DB9ciOY1?~qpJv21MyUiddde=_fQRC4s%{5l~#NpWzXZ0gz
zvGNZP@;QryZYz;L)Prbews8LeeiQ!_e*Zn?>MRn{xNVgg=7kp*55rZ1MrScnLI#m#
z;CBk2(=TU|<GK*qv(63<h(sTCB(Z3bgFeicaFu)|T)o>uO-ozAzcFh}ku<g7<eCR;
z5QD46>kmLFQ3W%vjg|E!TzBC_>F@<rm_)u;L-T`I(Suiw>GPSFpaHY#*r@iv6_`?S
z3VWpGDrNI^rw&yHRV)LjN@}ysOP$8>^&+7V{HxEAJiG#iTxsXEScRBD?{O>aOqv2!
zO2`=D%1iC+w+Tq~4!)e!E=d{T;HV#FDGVaEP-(M;n<3wG1U}*4*+I>$|40wbS!&$w
zz_RiZdNze$&P8DjlcfDI{?`n$VT7d>Hq}dIm5uGg{dJ6-5M5PfEpTJ0RcVaum!_Q|
zm8xY|bQ&SNtVn$_ku0*ell|!8NUwVO-V-{hCoZ<$!o}H##$64<hffC&vF0pk|LI=F
zv}p@fLHZJ4?7E-4bk5%o_I09;xTh!?!M!`aU?+Wgc4gAlq0LO-sa6<RIL;)h+7P5x
z%vsaf$_smMwca?M5M?`Q!Nitk?8NB1@_FU4(mU$;Fy1`1qn_(}En2%^>`e)ZIv2~d
z&S`ah_0aM#HI9gAOG{_zAg=&HwX-W4t^CxhJ%CmdX-=-DlKl{`6y=4f`(+2;@BGI)
zI4k0s(MqSOd%57f7m+;v4dt*7`fsFRXDK;p%!K1rK|?RQG}VM1?U%v5X>-%_@U<uJ
ze4v|aWb<aWy6Z-+1XCNr^uy_hemYS7j_<9({KUI6e#+J3_D*}t1Fmecpsl+1K4IkX
zv_`Pf{Sai${bnHtJ@Db{8=_N~eHe0sc20X^XMdlpPSZWyTBvE>;6W*16!z{ty}?-e
zmV_+tSUi$2!rka`N6B2vUklw@C@E#q{j=lNdv(CvLMtiuyYrX+DP;kceXN5A=vy8!
zU|I-SHVgx11v`NldPa1vQe-b(5|8puk1i0_V$mLU+~K;reC!;mJPjh=Lp1Jy#O?h2
zjis20LfuTKJp<5UV+XgOU!(SxYRpzTyZ3d9w_Eq1h|^cguJ&yV5gti14+4@sa6N8;
z^N0iI;8}~><}jwxkB*1kpYGe}b5gVU-)wtwLc%x+brXLFK3ffsucP{H;+6G9Eek>J
zCY6opF*REnySBC%2q79V=k#%W)aukT_QOuGRqfM;*3Jp@GD&@XpLDeH8ZL=pH?YA;
zRmP9=8Z4JZQ7q?ELEOoE_+c4p`M+3~q0?#dJOo$xsJR>iN<?O2alkY*bd6DW4B`7E
zn2M{q`7K^HB3MT#kS1i#&mIPPxjiLpZ*dKxcx|M&!Go_};?%<E<>8LB3({$I37}$_
z8s5E7#x5cNJ{B)RA|L#-V$N}<?cPSJWNLTW!ta_f&Firbs-@d3#mRVZOVFX7BbYWR
zm@@e}<B##-l2u}Ar>mB>)>eNIY0f)oFM?{v${^1_zJJOl9ul=oQ%wHl>85(LFtpBN
zTV}=|$WMMJU>W$nNsC7<U}P-_V;~MStNb;ZGG=P51ri*(_TS<$^{kiw5;??brPDS#
ze8FB<Dc>hImFcHZ5mOKdROmRm?SHnhwT&S_xD~8X33Uf`&LvR$suNe}^*I0b|DHe>
z3iMnPt7?gw*usFdR4zL$Uex4Kyqo&j47|6<+x&Q*=^VQEH}$Z^l@-bfM^?n%G)tJ7
z^t%w~ofGK9J#?*5^h+5#NkmGdvg+ZN*X4R`_p@WW$fAh^TUx?g0@(|nO*mV@(U|}3
z1t5qq!-qjPigr!W?`Ls8*M24@aF+fuk6(mT^F-|NB#>a21ma-Gz;TbMsjlv}ij70z
zGtT@8K}YQ3<KGquq6?)%L#2QJ6TPy%eVj^>HzQmr0B~?sRac8>B8B7zGfnN#-?l5}
zDHSbQu@e`F2|{v`k|521#ADbnvV0FRsDT?*iEl0++1sPpX3AlL_xwDNEO%zt8<86f
z_&q!*43bCjuHHlqtH~(kTVx_SX|pzEb{B{rg}rC`_;E^CQxZG&cV>(%o|uY9(FcV{
ziSSJ``&Zv;_pWy04|$9@gU>Exoz#=SOdqS;+ar~joiS9T2C1oHwhpo<SP#hy9z&o!
zK%3PU)aliR&d=Fmg6Tuk>#jc`KH(P)P>Rv-6$vu}bf|-!osiy?`3Cjd*Ek^JYB3HD
z4$M4FE!_gWins#&wrBt81S#@ECML4CWS}nMtLS?x+chi`;f{svv|~asFB#Q6&O{vW
zEKYIY$D`b*gS1e0i-Qa~e5{_V0{H}GOm&geF`6|S*Gv!CpC58~!@2n@C+x&URQzbT
z@_2zxExLdY5S$u&{Xi#4;hznBXM=Wl>|6dc)(m-G9-bYAxk+uk+~!F`uzQG$WlCsf
zlmP`YKq{Ni@CY=Iz`nZP?cIFb()!6JNGep#WaQ~dh;hHuJ!!!_Wl{Hwi&$G?qC)ou
zFA7s)8{_zdeJJj3QKv$wR-3cPNI9=qoq&mn>07vgt80`F-c}<3TDNgW;v<c*B!#Xx
zK4%t8nfJEKX*M?sm(3t<D;dA)NPaxt#TNCyAu^`UU$dF9VODCXAErwwlFvl`aItXv
zPCYe$w2-5^RJx?D7uep0W}19duj2DIe^l6hA6Xw~1E+3f?}hy~8+87=*=6cs0e#}R
zbX(ax*-TW*GC;5sLRFww27c}+J_oI3fz)*TlwB_XE}ESN5%~e(QR{hcn&qq3zdZQ$
zp=15K519-%>unz+UnX7xut@NtqT`j{#>3b8v7K^gMbfBIpEDIPv9A{CY#;2z>v8Uu
zkhTxNEE?If864s%rPQQT6Z4gjhN7!gFUPuz7Ijj6TU>2tHaY@asQMkz`z7B+g${mE
z&V{G@$U5Am!G@5kN`IjfXGXA3>kW32E|h(Kfck8Yq;13$rBX5HsG8ro+~+aLUQ8vE
z#->?qtQ76-;Z1b$jPrdw^sCp16yklAr#s1v9rs0wj`f#vc0w<sS-v)#w9&Bg6g2BB
z>L4E4aJsor0<VXn_AcFUm}w;0lucT-y2EqOwH<MypflPmm6M*FIF3-f7`|wUZF?%b
z?X$k`zM;;WJZf=NJzk^K0x|bMb<~H4mi!*?GhKfux!u%omkNfo7VC)0g`6KoMVWjY
zPvIbz&%-{w{<GZ&KHQ%{ojnU|O-jZRaYd<gGUs*fv->lL$!Xjj84rz0z2aSuM!8WH
z7-JMSvBZc)l<hBX+~&~n;Tvrb@`zR)WOR0V#T8N+rhol#5;4d;-Ttjg#b9U&VcyPb
z8I<{<QHI{AmXBOK9InHNsTNB^Ev-XV&8CznVByy)g(vrphTG@Q_&8UlitxLv(80l4
z3MGW|QZo5>ugZoBIZWLpUfg;GUv56-NbS>t5U`qZ29c|izkF+~X^VjPH!4Vp8^<eu
z!IO{iV-U`#++q?p_&%>bag;ZW6+ZB~{qB2b*~vp=-Mbw9fdp&|1qpI8`uEfM=?{`1
z!_;1?W_Zf3Q5E{4BJaSd@XrnP=jqX@Dqr5xjq;t=s2aqwAp~k=Uc#1qF6$nMQ7Y1l
zI&ge*fAFacT8XIcm=~nT(^^rx;t{W<Jd{B<c{cMb>FB>Gf7uCSQVX^k<%~!vp#P2a
z?R(~_HpKU-hf<+PrM<~HOh$9S71C%Sqr4;Lt`Lj0lTx^c^>!lQ8wrd7chFEIz6k3F
z<?GXpwOwfYs|ioe=LBA!zIat^F*N;d9!sJex>{2{5=ThTS1){@5py0&V&a^F?C2ji
ztlF5dzWd71TCJ~by&`5I1%Z;8`?HqLxzeaKKGtmB4i2MEm^H2g10@=4<-PH!CPS;-
z)Bg6DO2!1?d^33V$<PmIE_X-sXn$IGZq4~g)0EX>f5$S->=btkZflc`J8sPg_&ls^
zEG`Ma?^0Y~1htWDFTv+c;E?{y=K7Bf*M(%Mr4(kmec`Q$omPkxw+&y57Ns0HuISQ+
z{$X9EA}2K7DON>Hg|A5BfZH5Ij~^(V8C`^!$7hi*b?229M<q(b0?xWQ%bH568S?ky
za(~=tSlw?@60;ZKWR&(%Ml*PHUn3GG7y9FuStEzXel@cqbc+>0!$2W%j#Wf}>4Bnp
z_-9wt)a3b~L%NhMbGh&xdDpi=S@BHT<fWPwJ?X!K_*hbQ%+ASSb#=v4U$9aegXwY)
zS?>Ge?8`aDl-?=Mi{1)0OMp4G^r8zs3`_f->xxl#I$GfEV*W;oW1^l%kZ_M$hPn%s
zf1;A^r%Qpc{FFT4wi8ci4wtT_Q0CRjRSLNLMG`g4f%+?+Dsph<VCni3+L0xvR%T2A
zqSM7A&+wLhaD%bU!26pt<!A|v87dJ)9li#MKXc$<f1U2qQ7NPAyn73zw=gC50ET37
zgc|TO(F2wgUA!q@im!rnrjq_g(ubcijx>kc8+SGtoh364HFqIj;G|0jRYZT$Ok5>p
zMTW%LkJDvh-lDu}P{{5d4Gq^y5xl^C3foSlnWkQH{I2on`%%zjtq<GA%B9JE8?lDM
z$QH^q5cE29^ZD@#l4p54o08+5lsK%Vqf@Y^y%PtqH2$4UDvyU|6sy@*pFAEG%a^uE
zg&_C(j6Xcp?5}9)C{1j|aB4F`%8OR2aec4wTk5p;YODlNbPjOCl(Qdlc|4+B?vI}g
z{tYSvCeD7ul4_MYG$Nc0@O@+|d{Gp@;u2JRZ+UHnZ^Vih{@qRFiyu(tE5S}G_Pq%`
zmWn(C>oVx-aOuVJngd)$f05ogib3=GMCB95yP;NHeTk?olTcQCUW_KzC~oCFm0r&R
z<%D=~5zK^micH&hB**fjhf2lK*AMT8@*?_i)rw_?=_t7RN*+cmrvu*O-tNSeFfp-k
zEH;m{dBTFt5U?`@t76`mi%KXc?HzPQudVSXw&4Ew1QZUyy!^d55{54BoZn0Gohu93
zpY~TUjSS9o<(&&HvCR+v&&N^OQQK0Z*M>@;Hqh*fDEvI(q>5_-iKKWw1ryKAqlZFG
zFfxIg`q4qd7|F8PDCBVCQklE#Jy7dcU(@rvE}(^(hduFBp&VL0h<~Nn<o>|rdb(<2
zYa7KGvhiz7BBkN<jja)1<tY0IQ_cT;s%{usH)-Q0OoDp;*8H#ki^_6wF`q9Dka7&E
z+|MBCp(`iuK0b6R-c{J?f-+DS%Dp@5&}{7PwqAX0SuxfMoZi!!8~b-34!q{+e8XH6
znqa%~7vn!3B{htp6oA5t8OX%MT-jJDRG{pBWXnHcWMUG4CUE-$vQY5>9&Tl21z;5?
zNw4TbA2sUN|7VW@e;+M**ed8Ot5*Fp<~-pnwzV{1fU_!>vIX%!3}DD$2N#X{1<dDb
z4G#?=>HA!MGO-zy7_cHejp?Vy!wu)*cK(;X_^&4DWwecW*m5yj|96Lce{baq{n52<
z{SK)Kh+WHhH}UT13G4?jUV@vu)0NMc8yHH14f<&RrhEVX$m22AG=_g2_W#qUBkZg7
z^v2p^!;k;zC;fBW9?EK5wV-1mvXVc%+=$fqcu+0>{nGhAakzv0h8fbvYY#TLE+2_O
z%_OBj`Xwt&PA;A&n?&K~`uqurvBZ&yoVp#l75pypZ87;^K$ozJsV{}k3XU(N5k7&y
zJgPZ43L`}6S9i{6-(wjA@P3*@p4&{n{l`_;Fsyit){zaJ%Ia#5=KO8+Tjui8XSy3B
zU1ihm{`Q19PYQafa_Ba%ns&J?`M#xjp6>Lb5J{W$hqBUjOZW01i0WB7gY!8L;wAF5
z=2Fu?I_W55&a=iI46KHm@*2}TX;=G%&Wf2UY?*h!K172M^oIZ9d}npZD#Zl){=IMX
zjYE=lfjG4ldaN>@eCay{MTvBxn~ml%z(f{NCl61emXeqMEw+EOA8@3`JAn8#tSwSZ
zcu?oGBRq=ai`v5d6zQg$pfqenw3MbZSPAK*X}~B{FQ7k^i?*%jS4|eq9aEf>^gZ(c
zd=Clwn1iavcdL3}73oE)m8gNrs6i*x>e_JKFggU|V$=O+fua^aN3$A}#5NW=5XqQA
zP~Q!E#tpl?z7d~vA*W;z|LNL_xXJ#A=|3mSciq3oXQ|N%{vc?;;M#AyvX#`z+8zG{
zfJ=WZzd2E&%#HrS^D2)o+`)cYAdk}&OY+x+)xz5+hLb(a_rf7JM3IuBG~4iM=~-OA
zxV5cnTktlhKLiTf%J4DTt9mdWd+Ls&c@vD$ob0hDCH;0%*N~DM%I3}+eCayh`MVdF
z(hMTB<76gtbBp9I<AwP=3ob-DWb*2TB7(&j1JA?xw#()kmX0ddo!EYklnx%k3U`XT
zrfgXX`6mk0E2<U`r@>`*&P|bDE7%o`+8+m8(}^P1n{E9Kq*~T;l%Um9F2&5X_!1oT
zP*Mlj4eFB?wCthWM9^$Hh7&^URiW^U2KZV7%nZVZbt*>_=|AqXgw8lPIES@~O_S&6
zN1q}A==OAv<N2Ak_wa0W@v)tK0u3BQqSqGswPI`dU2HS~27M~Bd<;_Tuinwflmy-a
zrKktxw*)6R5d{e07jDbiS4GF0;4`nr0iK8n;~IOaYxTHJ+b?^D?e+4xX3q;4%wrx&
zHsX{bS<?xMb>d0P;8OH+`W~u#rM2%CvVe?Vtld+rj*k5@dhLx9R>%wX2_m~fT9NlE
z3WTU;-ED{^_5L<yR|qM*%X5iomu+hnYFj2JJZ29!>qtdIqD1Neg&81dp<rx2Iwi2e
zp`?5P#ftbc6Az0hPpK&9{o;f;;oxYRSJ+i;Z_oZFin#Z>i-Phl@>7pUu$bs;7FSK#
zP%^?TyW*!Sq=e7FPS^h|7)IJ5J<-U{Ay#8<sqW){V-@&B!EP|fhSemri`hZMCS!y+
zg_Sq1$j|iPto5gvlfap)TzAi}gp?8q45F_lz~mz2JPLahe1UavEVg*t0Mofz-_YPw
z{)~3ND}*y6etRnV*~(#W-?D?oQnjR3BeC&u3I#M~LPh?OrKe2o7YlQxvujjO51fgB
z05{jye}KFjNR8{=&J(b5?*t$-iUNI>v%g$Fzx|Lc8$^IHoB&jjV&V4|!InUawCin(
z$^zbsYxYF`IDA*j3Poc@q(1$-HV8%PyB+P1ZyLTgD(1>eb{JA;<?Zg8JYU_ZF`UrE
zFx;-_cNp64!^bvQFG19xwF6eMGvEkwP*UUbT@l_ypKG8hLqdaf=3K?Ey1GwX>J@*m
zMO_r5@HaL@+C=zVK-M;1XGm%sM(7iC^-zvM(~5~dxU<X41TWh&BmO5eL4G7YFVG77
zE7R!qPjSg(rgG5rf`#PD)ri|~Kmm!)Vs@g~YD)|32H8^txcLP64Tc7nZRPEhI5RWT
z7x1T)aFy<}9qTl+Yh?HKfr2r4oMlG0yXc3Y2V_?tLh#IRwJ{F?n;gZBtK#iJKeVyd
zEyBhXL+N~J9n=Yv?6qB)-1uQpN5HuDt|SdttKI3Rhcg_sYfmdz)>M4lD%QSoV|yo4
zB;rl}kddIXZjx*g^TkrfBSv0pQMtI!@C8=kc6f_^K{(81+_(tpuCv_QYv`H4^eOzt
zmd!(<)!!gsY)sz9s<xQL<xA$J>epc%2QQv)jj-3}r(EEhEAjkoDI8qfCZLj|?^><f
z<?`>@zS86~=<36tvkZ2;jza@;Clv>lnLWG476Hdd*}PPa%{vLaxRuK;S~-|p5&)fX
z_T*!R41MvqY=krdtb(0$ov@`z$g)V9gf)hSy16Isvg06id=pv3r>P;FmuFaq{r)(y
z%NnJ?-R=AGavd{!ccc%EvlgG-o`a96PrwZ;K!qMQsAPm^?w!xe%ED^1J88-&4>va}
zG}s><XwmK|JE^{Qe$#3}-D;n!rIg5TQwhUaFHvuG_B7*zLyWI)9^@KMV>=)f_Fvm-
z0nacY&}o~rS!d@#9orqx+gYp4ciaw03j%k+FL(R0@WN;HW3|;D<j%{)0x!p|Otl(X
z$g<D(*GXcoHZfw<_v!L1Yc@$G+%|UGH4}I!6weUB=a3{cByE)E3!g_QQ1F-^Z@VJ*
zPn?r9|Btm$6x!wuW3DDp<}Iz6)H2O!llub>75PBR>-QYLJ``=}A>+edI2d}@zN0d%
z0xIG}{0R3tGT#4ZP)w|Hf?K8}-mS6pPv!k=6jrzLUX)kJuXHV5ZP32enT9ddr88jL
z<CDu}^=wCHoDhdY*^d-Mwhui|wiBO{?=piR@A`Z2XNIuKKH;5D?>0q>QeR2aBJ^xV
zGmWfU$hDOBo_p2Kzoq=;Pu`vs-O-n<E~8S&`+;9%tGdPK2a;DIxZ8;jgxjvPhak>n
z!pdU;>+G_erS~_OgvL<C5L1rRU;0y>c?(UEqNa@HI+|>xnVJ;SB~XY@L5OQw^vT%*
zwGvrV<OVN$?@tMh+xKU{A8TfHjf{#TF@2xfyobF=%c#id-I&?0ke(1D;WwM#4!G-(
zpp9@yQN8m+Cy40m<VX=BpFF@l(3h0zCWA-rG04)w;)iv(r`p+7hD9nOMIP0*gfZ17
z*{4VAB=v%YeL#CxZiB`|aZ!qc7h5U2^jO-s@!B6~>8lt*%n*M6r6?KyN(M=SclP(k
zbeCXs=Ha)dz%d1}BB0#(Y+|JT%`0O$y+o`yBp}M>5!`@3;cDvt!sH^jt$R0Y9!s^k
z<CL^+K1dgWhuR-?!ia5wQ`ONhVin6ufV|O&w#fsZBk5}JGavvvwGMSoD2@hy#*gwQ
zl+uYFN$QJowl30gUkn_GfHh@IDtAZe*cKW%8k%mvX9P<5vU51nCxEzs;U*l6j#+?J
zzC8}rXAe=o*XjG?ZkkCtX~C^^T0R42A=m9O=h<>&6-s!OM<fyh@I2eR@Os#i>VShD
zsI&4%zZ97;SYz_Mlxv2o^YCLDYV?NStgOI*!s~3IJpW#7>>HTt36bs6=N{xsTxYKd
zaT!tdM6|u6Xr{=?{ZZ2n<*sY5NYp5v#m}ZbK5tSK?cR_lNW`_W8f!g@Kv@5YSk?vq
ziCDa{RQgU&PQQ7fHK=duzYH*t>byip)Ju|Yew#GnxlR4raJq#{shmegP4-xnWR@;z
zy~~3tJ2K*R9wcaQPfjKpcMyBXLmi14y?b2N@RLzzeu3pe@a54g96FU28L}N~u0EZX
zo;}6lgF+vzoIRluO8NTFWa&bq$2EgL3GFq;#&=Ix-Cbj^aN2@d4J)Rd{V1<_hiiuP
zPY6io;SXq`!n<4WxkF{R`Y*WPq?W*KP-&U%S(4AgMkDOn$IjN3uwYI$3C1AD^Gd@_
zr`ai`;}P=Gc}oHV>c++#F67vg+YLcG3m7vZTRZ}UB_%o?&u~5F{imnrE3gRKWT?i0
z3rMG_RhpSRL?#k72zh<m{Vc;o`HSuB-SOqb*&4`4a7mcn`TOyMS_&DmWhs+$laooD
zbZTXXYxf@~2`g_{1nag`Vq(%=53bK1An-I+P3=Lxa^Kz0qa7cU06N>OxSVs&*hK(}
zK(jr*8py5BKYtW|lqQ>6+3glpr_t`G;LA$Z&<D}P)VmPj31ME$G9uN@$6#uup=`mt
z2FJLvrwsktC2U`bym7NE??C7rufV-)xboosY{Qq-xHy43)`4QR+wBXA1;NK?Q}3A2
zOb4EWsh6XyM>`0YIATufsQ$WVWLCX)n9kB_{xX=2(a|(cG`F#nrO?=1nX}nROGk6R
zCdwAQK5eJl4tB%*b%-P{jxFGCw)|CfsgSuSXBvBWk*Y5a?mR-4j`rq7(1I4gB*%0=
zuhaXib&Nbe3(&@qOSqG@HhF8u<RfW$$U%)m^&>M^m@EA1(#XelnX_IFqr7eoN$tb}
z9K1SDGOSNYPih)`0HtCx-&;A4wOtaA6Tpf9u927+0OjQ<7uU2m4+Bykr`ZPpastOZ
z4eC+c5N}TEYHup~-1^R6VA6+jPRY^Yx8*CAk2rqtv$gn0JqpnpVR3HJdAOo{zU|XD
zpT`YRggSce3w(y1vf|U^hZOFb-bN54xP&n#B{g~-B5EXBdO1UA1g+Kzn3UtcKb#mY
zRgC0sSJgIlc0BD)+>U{0B`Irh^3VAYZkRIJQWS=&x7xld7%e^Y*%39%>OS8V`2f;t
zH;cqhvvKlhaNg_TTs~Z`_muYOKNJNXqgkFWDu|*GiHNU4@{lWn>8IpOKd_Q$zbEwj
zM{3t$ZwjPGZT1Pj^QAB&qoS79*9*5RRK6ZmHa1F?se7LFL&BuN;uQ<~X}0YKt?1vp
zl00Fj_FfJmN?7SZz05L<KxNPE!^TVG*Amu`>@F@Yc*uyCD&`k`BUmEnw{X`UC>>fx
z>@s+08#S#piZT0lsutK5b6nE-gF*j`rmu{P>WkJ^1PN*BQef!r2I=nZZls%`ySt>M
zb3nSgyGx|ok?wxa|K9ih&Nn^`Gw1Am_FB(+q9(0k#!0UNJ5Q%L81xhG0L%RKN7c*s
z3Jr*g?vWCrC@_IwC1J~&WIoupz#n$9W^Ax#CrB|Lwc|A9Cs5vln<%X@R3E~V(XZ?7
z2Dpn4iXGmm{la-UImAP|v$E-Q#h`1^AF%}X5SeZ+id^iPS!cS+bk$CS(zTNvZbs=O
zW|H{Gf=!7ZT9wUoG!#%<sNTc*$K`5$QQJvPL*GFU4+j_Mt3ZLZLT(TSOFb)<23+)~
zO4to>muFfG3;5;+C?i^Lwg_W`<}mQ~O-Ot<ou<Z2ayhTf{NLm_m!WPrxb584qCci~
zDROfd494m}@n33^YxK)!Y#xD{Mx|!?OI7l;U^;E_(Tz6|3OrB|N@Au06Ary^jL25;
z#e;599X*;z6v$3Qv(OtJ9`3IkKl<KFOXU*8c>gK!$_4&-|Cm*Sft@$?8wnv^2QmbV
z#$HxKHe8<<noTPg2_O>b;Ecpl2g=d9-HC1{|C8SYdC%LQaF#S?exLWFZO*Q}#;wnr
zKGq}7HhBKR&rU)NR-y3v=w%ZjCikNw^Z881`tjxcCin_vvY3(5arO7_oxOWl^^R_r
zZuFq9=jF=)jqW?;Zi@4>^Hn6^xOK7mr(@tS&tCx$Q3H^X?%O@utq)apj3id;&k48@
z*yJH*d=`QsWChEHw@Z8-Xu3h3PUlmFMkSywrcI^QL8zk_7q}?@v28U1@TZ3DOwLds
z8^qSdM`(}Wmz(8ygTDX10^nmsHtkg&uITVh7+s~Zp-jCJs2sIZ_QV6deoc)=2LW4q
zMo?V2BedP`f9t2^!v7%SPDSAY6mx@L-R;pd6bdXR*1jkdaMnraVI&o<GsWKdw$}=Z
z4`<!4RJt7S;PlR2@~~hU3F$vBGarYnZf~0({O3s&@KlVr`T5Oxr4bD3ritMz8hKMS
zl7AYI$I39*yUZSb6xBXJ9yUGQXop8r8Jx1%)x2^7yd`3F+NC+HjK(7NuuUluVE#fl
zQ)ND<^c(#xh<<(^nBW`XXZks71+aj}ehM9wEt5|=qcdsdl2bI=#DXFL%Lv^j506Z7
z7MY&PqFjN`Y+EA_<M4`))hs`9au}kHF$_4&eiRd(<^e;HZP~}7L%xL{*tD^{b(qYA
zR0EX0t$1n_+CP4Ict(_k$<2otci%1f?n<YXU{H0E=<43lfU>iRK8thaTzi>yoqfK4
z5C7C2BgxVU)OP+48Gg&!Sn{hvyaler1^lMm1W6X0lNVV=eNNV#S?qsN3RY7Jg9Y#W
z@8RJ)RUdaT@NgTVzZOrZP)Y}#fu$*|k`&`I#V-mkktsswuDyNj*E<G<-d?%79xr`F
zRFHauc?RF_zQkCcY?UKSGOhi4B=y^J`Q_8&NyI{QJL46X*8RLW2Mjrl94yiFdCjDS
z8|Fl$r7@}0g5IT;mR%zI@n-$<cO3x50jvQYe(vH4Qc!V<5>ihK5%H;uWu>?qvyfA3
zedpxG#e2Xb@z0TDw`hCFk>rh1i5dG}7dpXWR}g-f&5Fp5G5QsUO|b|jF7?fdAPoqh
z3!R#T8_bDPT@YT7GC5i|XR+%r1bzLv40ZAbho5!51a52)mq^RSdG&>ld9_oE8zWn%
zBnw(qhMTV2aax>hB@EyVjXqOU@cTTl&vtIGyge+__!Wj-3!vUA;>DG~w(%!-cSIvE
z=j&9ee&;9;Lzyf3>N9%lqIcehe%zMgHTv?T`=`Bra`LRp6l>CNuRSP*Rh}B|T9Hal
z0%M&wW+$S6`k>qk<*))m@6(SQ3`MFdFauO)M3Wn*Ec2^J%5uZ?8J=x#M$dfkKwG_v
zzj{1M<Ns3gR-|FA?D5GxJ{~VF9B)6sX|v7O%CV^Dju;>j-!+}q`+!G&Zi+%-%n$Oc
zkMeH4xa0ER|AVnu$K{BlGyjhZK=0%8Pyc_q5?yJ3bP7ORZ&AB`5Nx~r^;$^=I4QY1
z-x!X6-ihp+dr8y?72#Q?R0C`D>aJl*+IKbyG<uvfp&Gy6moS86x+i<*)%bgB=th>l
z3i6eXRA+PN+RT~pFI`NJn=c@5T{bYSSm|+Vb$-BvYBKGPA$i!JF!TKOrpVGvOK-Vo
zpLR4)T?G~5ePNN^Z9Zi>V}&v@Tt1xn!T&bpj&R&cRp|x5HGteOHn+nI^F=a(D_7@~
z^y)*N%?w!_mO}39k%w~198(GPH0dmbSN^-ZV&9I%zvu0WOsdvgH2Ts+smS4@<AXnU
zF+;E!s~|aRYPH5%rmbuHW2xh2eJg6UhZ&ISs`KseFJv*(X4&1&a^27>4clK`b$thm
zbe!t{2+iW4^HqG{$JJ8sE0e!iMu4A##MylYyKLU0VKFwqq}gO}ntQl||MIG^wZjuO
zI0$DCb`AD_z2b{f*;V}s!or*haQ7RENrJ^IdfxZ0VqkK48A1VCv`or?tG+9d6tM{l
zjFVfk<r)K#5W%rPVTZA$PT!=Bz4YbCM&5PzaJ_T{$*&=>q<**U67`d*lkx=XaID4|
zF{-F&VKE^;_a2s+bqb<lK#};dl2s6coxVr)4sftc<rFBIX9db~B=7WYyN$asf$+=5
z7Et(by}rCfaTB9#M4&bPCVss!eCx{-Y?HEd%hct&YxS{AU!~8NQtjzD=lFXAlxxdc
z-Oib>bR|*ZvUOEPD`&<f<T8?7mz}-sJp}4`fC{<(S637rot0boz3W}^SfvJ`UDZOX
z`wi`~gP!HnE9p~vsbxkXtO)l4Ew*!EVw{*%U~RdHzp5N-{BdKdd9{8!z?m?Mv}ksI
zHW>bC-i?xG4$v$D66LH$La1dAsqi=ZEH!cm`(#oF2hAA`J4T9aHED>sSI$U_Elp?s
z2dA&gV*yb0znZGKmNCPo3JMBZ|L&}680U}a9Z!C9)b%ok2XA~zEo~%~S0y^wEF7T-
zcpGy^B0cww|B1OZN-N=`)*xGj<e4Dzw~BT=sU_yiTB+}W^8HSd3ct+YqRuI+j0yj=
zPkEgm3cl$9jZ<C%wB_Cyd%9c&mqa<UFgjaBs1uon!Wa)Ap7icdj>`=n(=D&M>9?&@
z2tFQ>Qx>L>@%1`oYtmk6U;5_tRPK(^s_#yA_y4fOVoLBDxdYn>qTgd-#yHbB3oBt^
zRcwh%IMKl6;ws(2Cey=R{Y&v?ssQ-l#gnpsIy=X=w@I~cVFE9)LXCUI{vzdmc0QY8
z+`YI@{q9;6d>DRjA6v4U{0Sh-<pv$9X;&{=GcxQf+O{a9LfU=g;y((}7E&V>kUdJv
zbr%W570n+z-uzV;J91&g-)^gMuwff|=EnXVtoFT2w?9?=Sp+?mCzN*Mx6YQa&d+e`
zy`Y(4Z0wj@1esp;>5-c?#k@mq)Hx5t{&$)h-=5TBBu%g)8EM!qM4VoJb$q@4GRc<j
zd|+BYo5w?$tDbwPjP}=RngTbBKbY*p6yBu>0$?9JK0a=@zP`J+2YZu^m2F9nwd{1>
zPaCLN8m34(`24gKS~LNtkg1YU->rGrN|LJ!fIAC=9UW4W^AR}sOdTUH$9NYrg6g~g
zV$)ZC5{eGHy?d#`UQ0Xj`D)DfnRkzuF^=o*I4mWl8Z=8GPH9l_l1oVn8@Ia!hh5Rf
zJgU02np(3At%5XZ{dK?a&70pP4ekvXHDldW0*_(JSPy!#i$tXWydyyedmm;-0%Sbq
zFfW0;A%mZB5cmscOOLGN-Opnx7X_86{L`8IT2y!Gwg9qzMDN;i+Y5i~qngA<pZxS9
zcqb+&^n)c={$MlI??bbkj;(@%;%L`Pnzvh^yGy41pfR9h+yrp2pWT-H9l<j}?(Ku2
zXw`MKT^GMkJXIhT(T$DjfHR9#qYmB&0CD`&>JmO{g^boc`;=DPNGY!x^*rh}0M(uL
zsg~VZwr(W}#fo3z@v<?Hm3zvKKU;J%4~=rqz{ZzJEjz5*w{0XyXZ${Apl!k{ebJGA
zCoRbvVjOYib=6SY6%K8adKk|k6vx=~e-lvFPO#*8<k@xHdV)=T2S!tu8PnT2gbVc+
zI2I)yCUyJ})MKi#$K>k&P_pMG=(m5-2BJ1R<8|6FWHi`PHZwU*b`S>c_0wx6_`rP6
z2Y7ykyVJ`UXv@Z4Hd`F@*2KqK-tTi&2c_ANULH>m4Z`(?DasZc&G%<tx@e+t4XEJl
zzo9>F`TP_Z6WQ5Ef{bZ)g=53$O&9)EAD!8Ih%SY{6Uh6yV+uwq)EnE`#=9`NJFHRt
zJ#mQJ(8up7aa(dAKniP&ju|F6<Z>vOizkME)$zzT1(ts?dqyNh?^q#t%G?(+XZQl$
zx#;ZW(enQvHqi^`^@g3^tHxXmeqrP;K9|Ef8OM*tNm*(Nj6S0faP1}XRdMW$)xfjy
zylveoH|8eVc^{Iol4LrJBFz{-Ie<@84P+PdBku(I_B>0k0Ev=qn35s}v?cZUK+UGi
z?&BJ}y!w%8v0F$Q+m=7v80cXixz($7xkGySUyP{X#L1i*OD4uk4McfAZnseb-yvgu
zo@D+Qfx)0!zL;IgQqUDkyVs1p2%zQCA$k7N<7E2%(M2-*4fpDvyFCHc?;AxGx~Dn}
zO4~?;y0mew!Db%od(YefG|>(l?0p0^#PS7%ZE{u)e{_$JS#U6t5t92n6(LpN?<}en
zNgx?OLS*FNk;N))uu%g`{e5IE#v0S*Y~y>~#a8OeLLzG58OBG!{KGB8_vT^D6oH5H
z{}x(2tv`2b6w_}VZH3Gx?_NP;j^Qu9hEUSUUP=#*ULa~?3bloCGU3b%$z$`yk$+Sy
ziV~NCVfu<p2Wt<PxNlZ2OdIOG#Gw?wD=$>qrTBbWT6?~CmMe#y^{IdK0z;X7P%859
z!P7Xjr!rqAFgcvNEu_H{>ViMl`w1pU2W7ha>-mMu2ijpQxJX)>%bkg<hyKfsv5qc@
z_LfkxX%K6y|E%DZ)xvi9RU&k1S1*i|guvR_Rl6XnezmmtE0c`HJbt@RJ5Y71rtQ;}
z+@rU|$sRqaRg!X$(tuiY5=)|BP#y>8hT5G4OGAXeEhbV+8qHx9I;$D{ypE2?Fy6wr
z7v$J1bnQ|7!LD9pJ<&UR@u@f}RjRM25Hn<fAFW*0HLW0;NWJ24&C*ZsfFE3Bs#MeA
z&OY&l3_dXY@E*3h$Ag&KB_y}TYihwyF%Cl!|1$;VvKs;nu3|_;!Mox-?c75i*hYfj
z?S#Dpw0~zrwax7>(Kifgs5;~$%9q>UuDR9ix`nouCUud+`<DeJ5b{S!2F5o|Nx~)J
zQ_Q2ly@IS`=;Cbl>ur&S3R-I&QpXeZC{o5#3x}mtl5&cE**G}lKz(s+Hn4Qdxj1_s
zS?eicJ(2mHB%bP;>a&e8VJhJgFDWas)dJx{1vU}lkW|pGzQ32W+G!V)T!wRmsGB1h
zfB`iEIB)ycu)aVs^N+P=`{|d`1g4zJi^h^D-^sg=il%XA=wX6^XIt&41rr!;8N&_U
zy%~OE9cS%~smwihBH-dt6-Sk;3AYd^QUYqRida2h!$ac4?t9z_*0zw_%?J(#QXO+f
zxhdtzks$sT-A?TL<28!@m|qkfJ{&)Vq|&k?lR!FSorKeW<_Uxe@Ei)b2!!+|Zruyo
z<0avX=2}eWBp*@;&Lj(7S2eEIAH*N7{A*`4E{;0W5N?kEzmg>=?XRB3PxNza%^y+|
z!7pDq2BGJ3cqMhDJ}vUg9-)N&>1-D-a8^)=lTJP=_PvyJ$<3JdGCumO0R~I%d=iz5
zV~jR52p5=jP;76O9DyekBI$w_B6)Nr-qAH~Y9IJ6J0X7fviYe@N;+|<NGI>%6_@Re
zKMo4-nTlSD8RSmG8jSOvb@2*it9~O-Xy0QFqosP_lL$M3_TCY$9q#tz?jYia821sC
z(BAMOu)AKD@a<mbdy(!m%b566j$F)n6#}Bo;Tp9>Ab1qXHPbjnEX%THf1IBxit?Yp
zeaY?X?ECrA`$WUezibS{PGzuy#^@?HdNMR56TxUE=k!-U|Cbbf81}!k2Y*=_j2Ij<
z>7ZRH&Kf&_JvCGqa%7e@KO69BC!)>Y&cEqYwp3ZA*U_WmkpmoMafV8~{|N&A*?nOl
z5aTv~6uFg_#Qf;S$z*UiBoX~<@uwrKc2)0vLnl!w0qdwLz~cRn-rjQ8uR8v@TDE?E
z52#&%VOiA@T!>&j+2O{z0P3C3UVkUs+Om$8k&|g^>M7iRB=~436rk_nCPzf$)&MPp
z#6rXhH0S&Vk|h_0=rvTc(G9$3Y+=&phcafF%?m%z0kHy2Gx-|d$q~z=GqkY(-6^cD
z3hp>|OLAtE##V4as~8Q<%#X>qIDhLs9DRiBQ!v^M*i{))JYExok^_w6uD1i!VadY0
z;%o4n;5LFr`tqt)dtd54LAp>!FQA6_)#jWS8*3|90|9t4Ddep;{Xnn$r*Ay^q2LMs
z1_I0RcM<hV6^FK-;h@73jf*rtU0F09Ox~}>ugC-~1v07lG(VJyoLpBdeV_?N&6CuT
zey%8rGDOq+m#MOPZRhVBWwJ_=F)Neiu%$#`Y7~^>cnDBiI(`20|MIJiZ>yvOU(Vvv
zyK878$ef;@IQ!fQhClgUE_5_}xff1Nbx;08h}+_L472Iy63tHMnCgApkQ9Bw2_=O7
zhaJ!FVrXlaL|ulCyM)L>=C;S2V^d{uFS0lQ79If|t#{OgK(>w47MG)WXq@4e8XX`A
zaXQ=ZEt$uY47lb`OKZ2Q(l1dqG}{-JyDKqmIz64|!&i+%oBHGTNmf6N5s(JDCXT09
zUp+Lc%SirWX`k4aUB*Wxvl08Vv3gLcyE(0BiG7)FdQMet@&w4m)zBwp7#U&N({ajO
zbztp@g(D1+@rzmRZar2z{Rb{)9R=NGdgq+eiw99~_$sS7h=KH-4cCd;-hijOTjgZY
zhJarLbM}k?W8AV{m(-2}-8g`j*xt`0zW4MlW-bF0<#D*&L>v$Oqr65MSK<XqwhnfU
z!Ju0O-aas-kg%RG?jF8<5%s1ry}mxu#9xjfcY=veEsoY}bBv8m3s<d~P%JF|nJT+B
zo|uX*5`V$Geec-gcn04TkDBWp`-`A%#bCd0NS%=(40dwp+11Fzk8>Jm`|TWvG4nR^
z@{~S*Y$#eZ*xC{K26S8!9*H`Q^89qO^W+Lt<OtxlXxoL#PxQ+HJz3M{k=p=u9r$F4
zQGVYC6U*3*(YNUhpQceKJ;Ws{ee<-tuHOaQRz->I*_j+?PiKc-7RBqcQK(j%i|YCt
zC3me~D&AwlBA|bznT&B1+8FD=z`osx82PMgv256_@-fpc*Iqh*8OY$^NGx)=ct+=m
z^T%Ypdg9eq8nGDT|C?5J$Gca7U7$2j|Cu#ItS%yBDPe#;>8J5z^|7La9<l>V(+1&*
zwM`&Age0f%!-5Hk^o-+4hMWne44Dk$huS{(T_ZWh);7Xlb@JeJt^=N&(ON^uEbmI;
zf=$A>n&Sz=pzbyzpPdzv%t8e*iF*_lAqORNF}}d0(KStiQ}*d7z`G{6VlM&)aaA|4
z;;R*HAk!}$ysD4WnRXiVF(-8Unzo!)#Q#)BmPgFTu*}g6rGD+AtKO|vf4{zfo1a7?
zKi_DN72*dB6^~6-TIoSZ)!2oDy!oJ{u`|v&`E^ULr<nRz4vVesgRFfdp0Pp7Se<kO
z9`QD{9%NsQPs!USSflzXCk<t;I%-k!V6=|K0ROiGx*_O({6URc#rfV|NWWw}I=kE9
z{AfAaZK|Q@;Oj${q3fR!D;}9pUZ1-c@n?&0m{`;8;LB{#7B@*9$l22~AZfawhM01f
z<MeM_u{Ap7_B09950&;doOhjh1|@nk+qJwwSFBD7OC~~uV9-$2YQgjQnx$|%=&D{Y
z_xl^|$}y0WuuG-rb-zWkuhuiSFw6cO_uX3zyC0$&eVrI@dj1-3kpXmWEIPtERSBoH
zi)gN!<m@?u`}rp;^?`HB54Ydp@K~1|4QeE#`a6^?BD`=;Q8TzJaZ{}XD4E}vJrypa
zI>9W8#R~=6XSJHj%F$k~%f{`st5tTiHd3|PRI0Qao3<7CgS;9?E__*zzFx!NHZLAU
z%?j)vu>wDCNEB~ri3EH*q783}ZoR3vyM4vJBL11Q<bS%w^ga0scNVvaDHg(AqEUH%
ze{4!bSCmkrszNpe@5}hnSH$qE!bZ(hv09V}sbsrbkKfsQYz~l$I|z0MD=LMQn9xo?
zYkb>?t8~LK_PozPW{G;Qf@q0VjhCT8g@jajmJ4-lmWOMX574kchDi2JlAURLB1O9d
zg?3k)(`)t>#dgk*NaNcmSog`CIYlwYTij#z7+2dk`yXO@Ph1bjhxxu#t1!$%iBw0_
zt<8kxDm_K|Y>b_K*o-+mCFlb{vU_zDI<daF|J2>@s!KTR=s<|(GBkPLVEIs6J2RO(
za=Mlj%*Bgyr<LrM${Vuw>akU1;#M*on=_m^2$JN}j~h@|YHX+<=<P9`ZlA+yy7^x!
z2Py#-b<S*=`x<a2S*f-2|4l7Bb8||L=saZ^mQ=i07KM>EGPcW%TaG!y;f{W7H_cc3
z;mj)zHHshdi;vL=(h|Pa2uYI4PEy(@3S>ej{QR*V5jR+uhz@k_LG8ehMXC=l@bAjf
zblF{C>@n+`<WIxcaM*HoE#hoS<!hD6BhBf_w;n6sLOBSY)puU(1Z7)iemV(B6v@J6
zgZfsytI{cTid1cuM%C%e*eF1x@~DJ-i1<vnfMex#tnApPlHDQ;I6b<4E#1kA7NT6X
zeB|a~OFfw#fbYre)Ig_5BPxzED-gcw-amO0@!%S~=RF_-Lxy!l0m!GrZ;&5!upt?n
z>p-@OHkx9jS)@+0JP<*aP??Ct`6uS={?4I$sJ6f(Zg&+N=kAhcaF^jtDJ)f~m9Gde
zo>ju+OiUz6H4EQ+1V6w-WIJmVl2lVzk!}p`%)g`*BWu$$hBfP<I;_$|@~~vPtfp`D
z!c;1SA<L9mjO2&}T5LE&X~ot`kOsr0#O%q0GS;rFU;2FX4tY)jU8W5g-Pgoy6*AQt
z`EI`?YwFvP4vO@@>e9^rIjily3s4l&2BK8|Q5&^nun<gS#%P{p<BEYATyu9VvX*)U
zkDcE$qz>1b%-wZCQf3p1kspV8bJra?NLbga46@+gmTZf^xc%Q%0~IVV5gId84`Mdr
z%u>#j1N`6`6UdWCXUe$BmZ3*oqIex%iuy@K#1;z5)Ty$7lkBWD@eBh^1U|}k{99Ol
zdq&$`vXdthC~JJKtnuM`UeUA7aFE=>Jd<98SbR)rqKKwBE2Q9Cr_GKQDRldo@Oxx|
z6lG4n4#XLJzh(Z*`kqAkT2gM^v=iIdqv|rJpqK+lQ}KCv`sao=VumGEJTgw!po-<J
zUZ(}335^#1qI$P2)YA$pjILys>D($ufvp5}8_^h}cE-U-jUq@IJ3O-2Oo`$`7b@%~
zfk7-+i*hcPYhK&GZ;{T|64NlNTcw{Y2}#%_J)wkB0OXfJJ%3vRF=0^N^t=^2H?NJ7
z1G{_a1*<hJb|$ceDJYZNJ*o}pL_@xLLf_GhV`j>QS=5gP4=Y-IIY|~nstgT0q6c36
zG=-#y1R@10Db5kA?9wt8Ec4Qp)A%{<N5O(H7vn|j^5mM3^ZQv-L9a(NSVklHOnhB3
zX|crmg|Y9nI>B|dg9v}thxYl3bRd`Qn=f$^5Lq7VpE%Ck(j(s1JMCxj!(OC6O6KgA
zX66X8Za(TSI}wG`U)c9OyraSK$mjtap52J&8<b$)I!~;1ekhdo&xaF}fFDzou$W!r
z_w^)Q!I<j#f6C_VPm^b5icEtqyhp(-hvQ7$AS94;PylsgJ4?ar&t-uF<z}%qJu~h#
z2CP>1fdc`lreoJ15{12hH|>cAp}IUNV2y+^kSkG4lr$)Er>C-<-p-U1e3u6?Y<L3x
zt1+Eo@w(WQdBPwv8Lc`*zDg?P2?eyR+e8>X@P`Zm2Do|NkfGNNQpLLpb~JCj__O<i
zN?@4JG31-BiWTb0D+<xrJt`AEJPMF&6~i3&RETN+XL?WKuv0r4CC8ZFJ{)!+rNUZ9
zBc>)sDlZPfpktL)rAimrRqHT0WjssN>aM;^nzW$dfMyd3Z6^<R7pGhTud@s9NQRHF
zx!*Vo6Ci0c%>>*UQjHxu6S^myjQ;nA=Ak-;y}|vG{C?LwlYdZ&IoGRJL7XB<1$rYY
zc1yzQza|qJyoaQmFG@{=dOjFyZVZ|v0>5=Od6?**kXa{tZOL->x<T-dg2g}N5S;Qd
zQY)Giy^rdnY$S{s8fvF$F4^1#i!0=j_L=(KKbGYvMN3sB)j2rV^z&}{&pLCeaqlPW
zp8_`d1%7(Xh)SJt797ko=wM;evD%PIwk{Ou*%>X)0q5z3ck5cqb6}?)qh#gk?r}dV
zn$R0o9_;*ihGKJ>u@rT53X~(Nl|Z`cSL^uc?}hugQO^e*HZ`+M;PDm0Gm!Yc;%CYv
zawlX=H^CC(CLxHY0TorKNT3~O^fgX)Jv9=b1y%4iC-J+bf%JE#fAW6)EyA!jqE43*
zg>oI+udfhLDZ7;RfMjtoh&OveG;4o4PcsHfRz)1WeG&s5C*5`rvHOdV|5nFUR*t13
z@j<=UB`HVf`s4A9_wzii;T9s|(2zOHvhp*mVSrA%e65nClnU}ER*5YZ1ICrA6HU9K
z6s!kuF0i?%sJ?qs4QB)nub&{R^HBULIVSls$NQ&L8*2Plurj}=zEW0;$-e=aEfaZB
z2St7HSK+&Uc1I#h&91rAPprx_=t)@CCSoQ#+};k?)zne#OpIdhVI##7&`kpGh;@Pe
zpQ8Y;uD)u|i5KP+FZ0HHefUYpi*?jQ8)r~2%#KsGaKlJ{li`|oBP&Nw8Z$Dv`H8VR
z48Zn5!n?wB@f!5NA_8XaQbA$=AQ5JWn^*Yp64|-A1!1~=q-1~SRH(7a*2%*Jrp;RQ
zOny*~`Ue<kVu@ji=c_RS7C$|^2AN<;5KzvB3Kcl$EiEBG-+eNIeV>vdQ>ngvfBacN
z&?kz%XttU0^>^?Ll`f+)Ehjbh--()f1f8g@gQ(2rS9>|E5Y2=1=`Zdpd^{HRcK9d<
zdiop6Df$FY0t?`{l%%x>44a6g>DeDKQl+_9#c$cgEbrZSwICYBzy$J_A$ithQjyuE
z7rqXXi85u1xDvK~^(iyO8I>`+z_exk#j1UCOI&n;nN{;zO3G$F_LW#tM3>vIN%X<^
z$o>EiV+wI)kRknyAph3(XemEHWepOrwEhbUivyL6TGCyQ>6?g?sWOrx9j<76>3u_u
zrXIh1!PD43KZ@u~Hf25DIh}#BA*N@X&XU6Wpjj`pVS#YjuJIu_J^RoHOfewl&d0~+
znuG{A&1V*1vWi1HTejVKht35k$C73?eYZgfFxCw6jXK3^f_uu%AxYCFp@O)j{}s)P
zzB!h4_}-lYx%`hYn?k4CAPn0zvq)hg8MP}f=bN!=6l}&sz_llxH?G$AAx~UbOctOO
zW8b3Q@*L$T)wnqwaAn`tAcBmWGuz)H;351rEb+%aRp~hA2U?HmI2XBpm1)yf)}SYx
zvE$ZQ+V7R~mHtf9Ih%WAe67#;{6LnK8heGh7W6LEB(Ps0F<DV4|86US8GW^iz9Ti5
z>6A0Ba-VY5HIrUotY23|d(WQPvXS}gs<CW+D?Jd&2rr5DaQ#!EC_-+Du4^<qG3kt3
zuxyrx_vZ$5$EW=%9{0szd);`8iHwFqyi4gn@8WB}jk^f#DObiR2aGD7*cZlDoBeiA
zA?zgDy$mSf-^TYq<?hH=u=JgctLeIC_`W*6fLaaecKapg{QAOS)JnWT%Cf{kO6~(@
zD7b0DK>Y*9pzu+mbe<EfUSYiabB`$cH+2q~V$2+c*nX<`{}vms!E85)3qvc=Bb@DJ
zNI)c8SHAr^ge3#Jxkp{4-6Z4IDqH$58<OOJC1_WEHOVtKiFHW{>K5zTCo<xW8fqkj
zvWfVAYgv5Ypt4ZLQZ`F;ZXMX3CGEV$c+g8t+97{Fj;~_)ta|6~8hgUwlN6DrQLaHp
z^o6*-yO~dlxGG#P_N=AlWZs^5rp&#(gnXbODq~h^lt;wSNKZKu`}j3DWc?@OczZ_8
z{4o%fLW4_KG!IippEzl5&FK*y%N7}le=iml(&dCfndNby*<Q-a@AYSQ+cGbq2uqL8
zgme8XFG(F)Vr5Es>KdpvsJr@WPKmUAbt~c2MilZJ^_TrZa7z58vR~YD`fAIwkMLm9
z0LUrg_#XL8;`!n2Ia8-NvgDxFH{O*pm^vZ>wx*L#mdr+m6jfkpjo~2OkR{Ka`*&WQ
z71oIQ_yi>z(KuNgjOR2f!yeK<H$IT`$iqJNG~?8%BDrJ&HP&K=Uh98BD+zR_cv)W{
z&D7_a@)k$BS*vD|P75U~Rf$rV(fcsVjqcQpembuf^>DWHX6)IsP-HLX1sHLQE`1jt
zwgY=^;r{h}sGO;XzZlu;BJ?i2Op69$a>N+ii?U{&cmBX8f)QcvoQb(^6E-zVT5d-m
zuRg;LC$0Pyd8N7;3<Zz7c9<<O)%srs*tL#0cNP1ynFw-|W5NBQ{<g{MX&>>J#v9)k
zvF4X|^4rWW%kr(41wLLuYoa+OoXsMbZ7EHf9sw^b*u0HeS&IJk{;g5&^K`4IxoA+(
z|8W7XmnWJCNiunLXq)*KdAJWB?E`QnL5UIHqP!JKR?21tSIE;DR3T|j8tM%XDI<4?
zefk8)b^w8b1Sss<w*%%6)2k#jR{|BO1E`Cr)BiTe60|x;o>)A67KGqB5~r`a2H8GM
zTx3iha;E_yfkKtU2qG~lGPQbD84hm)uDlPcCo&1<L0<vy;+P9Z2`sO(*gwhQnRb-&
zmFkk?W|<0>dK<SqLhVCtWGN#cOgQIMOo&8$@C)GRm06r$uT$-Q_dtP8iI{lE(n9<z
z+kRy;>*tqd8m_-~#L<)9vC!XV9C7hfs!L6S=N1zi8!U=wy4=bmo;-)Q76afWiGFbp
zBINn6QDRa>9(TQG`6h#Q1a#+k$fqqQcbT`uBJV{o8r0(KN(Q8BWD1u_5nx!YW7TAa
z(#;E~&A?nkf7;|ET&m2|;j1Uj8jV=;I)g^)<vvZ5)MZ1o<HxhBG*hzN)F{TCS%z<d
zi3Lvur#B@B3uq@OZHGMAIFkv%m}D5RSk9TOIW|9TUrAbJB4vu@AR0p%mWV`zLg)UC
zPAJ-Bc}$mENAHVG0{3l(nqO4yhsimcBF~1<$IU46)EGrO*GSW8NReooN*>xepW5|)
zPXhU}sVDA}C&wI?T+3Qr;fH=)(`BvnKEsmNZSX1Ma69(tnO%dCWI@ap_1eyV8IKjI
zCYp8msrs5=IwnId%=%Q8A0C;er7$zAj*@9`${Mm<f5QVyB149B6lqE3aBYxlqNH;9
zcQq)mszR<rwQBnWKA%JQ8;&_aBQ5-s52&E$VGs_t88{L?sCvx)LKF`aODog((Lf+j
z=Nxdla(@cFp^Lt>cRDwUSK}3bE15o?#4hYb9!8WF$H_;q5tMEGvvYJFVxwdBc8*SW
zt<B*2%<UH$kpvs*s#CaVr&PYYO7L--iK(@vrI(f8(H&t@3hP~{!C}ClakO(`+$nDj
z@Em=xTw2x4&d$-N@9rPRYk2rNEm#c6TXdyH&7$B)gq}m3TZQx0fE>s|Yl7U*7!vJo
zd<3!Dc5XV5_nlLuXm?Oh(um%squcD^<ql5ox>0!VDaqPXEw?7Uvi%Ybkj*9WX{veI
zp{lU4+Qr?kcXe{{G#Yb!Gc^x(&?Z*FC-3FO6!z!xdjB;)C*4)*<BEM#%Psc!1A))%
z&gW@yHPwtTSxU$b96n&@SU>rZ!!5GHEHVc>4%*d-;#EEA+&C0R-V_H6poiGq3Sd=e
zQq>rPOUy9fV%hPldPE(G|E>6I`_<g%2z?v0=Y$e($SEhNu-4KiiUA>NUtw9Lu{xGp
zNRePFXxVZne}x4<y<W0`%Rxg<a$$uS06XQac+Nga!^N{J_Q&Ygh@JQ;uZjwc7M8@f
zQ&)dPwSS*-&U_{;OkYpp{mnWI>O5TKun<FxL*4;~w~Vifc^6i~=q*yxml|(>Mcr~w
zYIPVL>Embgm@{Iu88n6XVhv%i2|vEy@E%_Vh?pjACO!**TWBI(dWJk;LoJQoN$B=i
za!;Kst^A#R<nT(4O7-Il3$7&>!Yd9_9Qq<w=hS;Ds=Nej0fJb{!oi?elbx{bQ~v?P
zwHutxRx?5Uo$si%1?cl0+EZLH63u$wDa8zZrKu4|3S<N|w|{9DxU@)q{l=I_4k`YY
z6tN574so?^cqpaxAKh*h;?S`|2f_V6g)Dg5Kv;0}n}aL7uzr^shOePhci%PE0_N-4
zVAYG&Dw31tM*@Wf4Y#hQg)DhC>oOc1moaN=2U)JaFsYJ(#PgNtYnRtVG2y1B6<XV$
zf4rK75PKp-29cFMOcwgKg+EzUNHnTgq-3HGA~_w2BFBAayEsLNL3}w5QM_TuxfP7V
zM*jo@(I8xQ;t}v2np|YSmj5<tu~NPHZ#-PO=V8?)docirqPXoPX_ScuzOuLL;PDLr
zV%k{>VI>AqM|qgnyhTde#?{*dlhroKO)1uB(>H-ePrs>?YW|$J&!@&*ei2OX*JZS~
zcg#uPPNFU%^A3m4247-fmTAb^QEI20JsA6KG3V%35r;$D`2@Y%wznfgx9kyuB6J$V
z&W7~#bLt5wsauiD?ZPI#Zz_jNm|X4Aji9_s&C@L>@#X3|{6`uqe1d(^<R!Zl!M%8<
zf-8gR#sSc<7LEI*dr>0~sb(Dpr~55DSZ+SP-JOnUaNF<Hz;}^kiL+6_%Rta~Mk0YC
zE<Vm_;+?7O=ZBw!lwpT;+B$N>E+V_64>oXg=LzPKGOZ&v?dCU=Y$<^6qZ-b8xc<6V
zn~SclMW+*6oO<koj={sO@UmiNxAf6HRA2XTF3og4Js<kS@w8(#wuakVr8<JSmycP*
z5_$&uENfL4`j#G+r4@5_jn)eUcFlyjzAi)ee+lI_`%!%(%oo(sWF*YajuL?47_g?Z
zZw~DyHpa&Qc2o9;CDTmcwTb$Hh_0uJp)M4r<j~p2W!#fnQq=`(F=W+57!S}VVks++
z>|ZwMepiVS>Gq$j@*nehBj7s+esW6o!G&KiyyBPOcYq)CsArrt-9X@5<)ZRdd)4*3
ztI8UD23(>qjAfc@>`_Sb$H;4SXJ>G+{z(GU^_f#BoYnn~oV!=k$h;>4j$ARP63F)O
ze>P$w$P;6ZlE+F$Q^y;0eb{Y?cep8YMw60MT1>uSiD$&c`|=sp>8U`nfjCqz=anL@
zN@jfs@a*t56qHP&17OGRex1DAMBDfcZ#eMe<3r5a%Ab531Kkd&9M{$36GN33!BELW
ze$b2DEgWv=T(v7)Lyca=5sHlHGxR5VEPMLDi+SDO;(-Z}{N05_i6@}%WKbg^7AAme
z2WET8pCw2b(v3T^cX>Y*Y%O|RJ;0nSy`L(G@60gPq0EIQPGTRq@h#l7$t`{Q7>rn8
z*5#4u-bVcT^md;oW%A?XC|l@t)rdC-Q<8N6De<526G<6su?VrUnjb$(PdpgB4zi(W
z7oX@97-$&sY%l^h4`9HOCFP}bf4z2+%L7*jfl61-TruWof`t3T9mlQMDSZ4N+L&O9
zUMX*$MAfQN77fTECr)tKu4@YexKl<g^^u%Y?Q{w~z#(b0MwuAVuQZ9}reT6<=E)lR
zA)tKV{DHbj?T~7wd&o%^p1nF`2kkN3IMuiad|7pllp!cqNgP%rDIEEb=JLU})1ofJ
z*OEzNX2X~%uJ=w9W?3Bl=h}(N$a04KlHDm|hCEe9pd!&|MA-lwVqV7WHc5^``XA{`
z3x&Q&m}*H;95!OuNcZ|)|2Ky>kv6@71>dgcahmZ}WUfeqgXufiIj1nY@_?$5ug@X8
zm|umzC30L=gn(qkq#K^LEgOPG^7{_+z(JqG|7)uXk1SU|i)9ve`o`r69#r`U<A#7D
z?>BsT4H=z1T_?``-{97h`sNnA{Cs=OSSgSP(tU>_KY)~X=N0{?cf<9Yswd}GE^jnT
zH)BNu4t+fB`!;f=>U9czJV$<W;-i+(<5Hgb>@gvL<>rgD5Tr_7vWbXmZ-|gLdzm4c
zkFFpXDIo}&9~$=4(YC1Trg0-XGXwmxuJK0_MwVl>K=9O|aj9JUq6ppItcsWYlWJ37
zoCE%Se*CUCtg#%A;nwJ`WZ5o#$#$}egCW^vA7}^-20TrM>I^iH-tbQV++JNHF=3Ad
z(uHLSx>r}Ts~QOj?D_8B2j=aK69tnBixnqaNrzhNbTR^&wkBN?jH;x>Yrr6@wq)1P
zTrU|rRRc1xtC)K}`1X8;UaB?G^yfF{{AdOQ+L4XRPY==+ohlkNr(1wBOjy5hz?!sX
zl=!;#eCfLXkhAn(pC|stlYD`|hh+Hs69w+9Qn|-k%9wgw{10vjrXP{B-<l=A4rUl)
z*DfX^;<4Nh$@n}YJN+i|7J@%N33=m)F~Tu<dL`=R8&q;tobCqYd9csVHo=o)bJ~n3
zM8p0NheaFt*K@SDo^_L{=Jdk><>w9aAERf#Lc1SMgwEGC!NNuH54V4V22FawO@obv
z%Lfp-Ho4AJ$;lGw8`YW^+aP*X+va-!8-6%sdWDbbJ^+Z&#som|24m=HjkXq|wcUH6
zih9eJqJy#k{<s{6x6TlOlBE@(*E+KOD(d$Z?!R|zkXqh#;O;!^$=cg!l4A5S#y@ZK
zPn9NhMTq~KN6xZRtqrAoP3QDs_XES*W;a*?P~l}oujc?P8%%~dL{OmI(bbl)T;c42
zaj8^EhNU@S%*U(rmEN!CwXR>($CYbB8wgRH7g>u>!bUwKt98vV9W+mwepeScg8|fL
z(@(*-rr+@OIc9bpbM=#9zhXt5oJ=BsmBdhe26K67`x#)WLK;^$g$fd-SGZg`<3^2`
zeT%1FKz&a7V!h&tfWQn*dcWRoiL=@zvK!yj2er$V)C7Rim8D9Ru^u4b%k;`Gj;R!-
zv7M{rf+v4(Y<Jv2fx}NmP*!G)Y<;)$gnDH=)slC9^rMeoXaC{GZmQu=6Wd1G_*{OI
zPR_()BDhh~uFV##BrNHwpJBSloBasx(ZkTxo1x1mzg%eS$G3Ad|DGTES0{^ur_3{o
znaP_4(WZf*sEC3Hk=mZwUchsXQ5}UcnkVcK6UchbV%R%wK+9C*(qenbv3^b}(=vI#
z8NE`y3@iMt*nl(-@-sqPWjoA)aq9l>Kc1$OcXKs3cMWX}f-nDERGe{4og=rkiWU~8
ztK)%k?5SWnBQ5kW6w6t=Z5=h%0O-pmjhOpW#RiUEE;Z>jxqtf);C8>oc-P4Kv+n$X
zvSm)qk`c#eC}GlIL#d<2oN8iqCbkh-stMV;bUOylAEZM7s$hYnVAeLUG41rSQuq%p
zcTi31y^bX#tWuCjPeh^sN`AfpIkK2VGRouLk4DpN3BfMoq-nS!v&a_%G+|Z54}sBF
zz3>m017sjfF~&6Ox{c~`jkN}yb>bmIb;n5UDHH&i-f-?Qt2e7NsMTHrrcseBgHg}v
zw^-VRYm67ba=zd3f93*aSUXkm=0_8ys@b3r?og0b2)z7QF)M(`6q^vQMQLpa_Uli4
z`va-H7Y?!X;a2!z(>Ycs8PDRDSAJAG*PKxude{;HYgS1xC~*ThS*X*G`5s|>L{!W{
zBIqsG+F(u#m%XXC-Nxv2S&?@nDHv#+Bsc{$WeKy+y+(q@g$_<c@m22{y<?Ms_lKh4
z^A+Q3C*N=*G37j>@z(?~q^=_+TMjA9`G%|~SHAaAHJ{P_55p-imA7_Q(4`Z`554aH
z!|)_?0BY995@VyR_fm|<paN~0B$dW)`wjw0t+>$Lkango>Z!rOzQ~({?ELiOzMb+z
zNUO~a(iD(cn|~Kso6m7?Z+Swy_B@Bzk5P*@TxXTrx5WbLPNP;74GX9=Pu9gD0Ww?B
zN2a)J=jYD|%D)grkDAul(QcVP#Dm(5TbU7waECb~zh`>O=j&7#(2msvZM@d9Ox);6
zsZb}4Z1=vmAsx1{W+j@aMft#Xe(I|mDZ==bDb@3Q4`Y2-v_UP<LG@7YuPW!K5A&>%
zNg*b+6NN9dZ};Jw^8iw5&%OJ28Mo>ggB|WUaOXQip(aYO&RHx26c&_|LxSZ!TPB|4
zC$4gMgWN#7{%FRAPa?E>)4ggoIisDwM%iXd4q~jpRDq_B7IBD4gQ0q}RhpjX*NAWT
zOm8vt7I?R%_to`$o=G8~#Gr^VV*y3ZWMFbPZLmD-h8b2H%SQZG;U>0cqD{%ONuD)6
zdwlCTGsb3EbEJ5RPC*=UM71hwl1T07NF12bUTBn^%`frmuquWj?fdp`jNGh*IFuB<
zu&Tou`;+;TQ&o+%qB`s9Q~Qf&SUzNTkKf*m7Fz|>+A^V(v4HYqmb5Fu(T&55H76N~
zv*uQKLy##2s!k&4*@tWR{7Ic*$DXC%{X1o{zFmU!#Cj@PNu2q^zY~F?c{>$g&Z>sQ
zZ9ibeJ*=z!X1pXL^jGlzUj~c5VuOAu-H}>pgYs`-GOdFb`BFeexRbw*Xa13x&^PV9
zOD|M3v`jHxkLXpV+&lnA?^L#|uLIJaw+7)(?l8khp_4zp1#zdW+HJ%_?tRj!qW}v0
zjrSw~0pcc|ac=yf_|RJdOgp;_#4B-?)Kf+B1Gd}IAN`^K{1XP0L(ZOB;_7v!(9dq1
zfX?uz59+E-q+Q!Ya3O!{7%F1Bo4bd@yP`(+8}Hz6L7APsR~_pjW%v5LYbR;ecIZ+t
zglpa&LrEbIc2jS!^Lb^<ZLZO*)74A>@4$&D4~<xXLK>8_1k5{;4^=-le?ac{yNebg
z3wl=vQl-bHNt3C1tF!3T!SH|AUks!$pSX|iJKyI{t*;YjO<FY9K6du8BL{O6nI3&C
zpjKhjq)v;XmO(OkC09xplG*`Lo_|0#^+4Da-#Uoi`pvQi3{%J@pUwlq(nO?Be#PgO
z1e!mqU*buS#+_`nk_e;!s}K+1R#>s)jF^IfsC{GD^Su7go@jeCnW~CDc<uOJb2OQL
z9I$HyGFqr{qU9uH85x06u2d`SrcSXt;VXhRJuXm?5Hy|=eoq@WClLe#T1;{T5&NfR
zIm*xAP5(gyEb*46Nh|)H%gdx|DmVb+Mf)OX2IYy7bQrRgP>$K<mMc{SJPxJlfe~lE
z(PuneSa|?%7sH&#8mDP`OdB=pGpp<4{7|=9Pa(a7I{e#)B|{MqfUHclf3vQUB{kgI
z?hgl|lt9uZta<a@$Mt#)PU{I@OxPL5P54RXr)0|p|JdHD(1hC8jBjiR0%O6&%e4A=
zRUiRE_`X6w=zP_V>(8G*Gc;preBX5@anMNkziqZ1-A%UZtTIq*j$!j}?l$?4J93LH
zqeP_Mee|_p#Yc@t1!QGX1tTV1TaSMqUn`HF0zuM_0zfF1Od;oCOJ<=Kt&^)~NSC`-
zjREoWG883w6n5E5PF{9i#un?7IF`0B0$kVG;HMxdh=Hj?jbxWbu}+Q(V>%)yXWaKL
z6OUT0gzOv^!-)&ux75pdx11Yqz%;XH0olAYq{LdN90&{@sFRzTQfPhrtLO=WB}0%#
z8jd=~qTs)qy#I|$CXE?Y@HG;%qGayG9Ux;IVVQ#ybC|Y4K$9VX1MF{Z3bw4Ohug|e
zT@Uk^fOmhq!5ulQ@K*h_;GyFiMqP6s1tt2o#QLH=dWzLy1ig|hjzdc>@XJ2WhE4O#
z%TPzu-1w`rV5=EFfid3~L3lqy`tgFz?);Uii>)J?Vim;hSzyFnXqP4?WVCzm$qOh)
z5MKnB&>p7!;VwSpjhcxz85RKBuNk7mU=BE{enoI1I_!eHco$G3+0ce2L<~5^oIQzM
z_|Hi{Q^^#o9PDi)0-rkV(t5lJxGMlzBUmgEeEvrD>&z|0GmKK#f3X3x(aD3L2iGeN
zep@W@mAHQAR<lk6|LOF2$EpNjN@EA_7=Za8jVoO`Uo>ysRQ+MJM)!92A_Q`X{zyhf
zyB|zIqb{tB1(=Z(i{!Ze8A9fF-Q2%k<(Tg7G;@cT;%_#Jiz^?ww_gKYwkmDmWHykv
zt5J!qjMe3eUr24zs>ezY?|vtTi}dg8?DO$%^H7Ns(e48YAhGzL&?a2WBq@n+gWvZr
zB4%To4ZXHkP=nWWc_ra{PG#VJv{$mL)MF{!+h~6Z3Lv8a76_mhIc)Zo@F>(A+61PQ
zfE6g<@;j(^2<)L%I~nwk2}K46zKuFgYu&{Ol}V#1N3Ogvn$gXV#?ndXAKxdBh6uf!
z3Ds)rfNDh)evPV+1G9bitJ}BdJYirY86F-E=vdj+&0Dpcy}Tl;9T5A`Z+xb`bB9e@
zw{~`5XbLaN)`8Tex@@RkRd_}()WwwO1obljDqM5}Fj>*(4~79sm`85%sCS?3p3*a2
z1l0<-`>ynW9kqLbrzmwE3h<apP7CjC34HW{D%XY~-dr2l<dj$Vwl1=mbTyBo#yykr
zz&Z#zd;*cxTnn!?;l~@?kBS2?2P!HmysoFh@2m(g!2LD!d!R_~@AZAfn$t;Co9X?W
zw2qtZkht!~HoWJ|gH!+X%9?{2*2@_GXZQ)q(cJvOc@Zgd0=4t|w1Zz`%YF@o6Vc}f
z!7yXyOa&=2I1{+{xa8*<-?`YKK1Ba&MwaJ*@$sr1j(n$3!#N$04hrPfz7G|7@8dE&
zI5@~Sgajkib@jcU8i;@n>n9C%jsinu3TL-Qlh*}ClNYx%$9E+k{&!N-ZTNqXfNwsV
ze3r2PH%@&r$ic`ssjRQ4j%>2DZA;qgdiyA9C@2yp@@rSaVH;}nU<x6J$u6(ZC+v2E
znpSS1;X6#%d9lSgtBNq&@J#_+stn!az|CQoops|^k0N93kA<TtN;nuQ<!B;<UC-UQ
z<KCTH75*P=qAu*BtdIP!+Q9iwq_k-%6BgD#p|*YZ>hvq9`2QR|xI|=1S(Z4j9$=Xe
z5DJ0ZZQ-rDSrmJC(WdJDBm21gH|~-<{Wj)n7Wymz5kJ0CmGE%EiN>$~@=X6c<8JHd
z;v%Y}U#n-Qb^J)UiSiuKzQ(7b5=JdG<A_-3*v#Vb_D5$EPP7auD>alp(khca(Dn?o
z+kfhpe#a~xl{eq-gV3oaJKzRht^VNSurU2E;)e(^0pZN>5Ydd)T8w48V)M|R*SJ*+
z^Pc5P6s-nFDwuQHxt^4t&yqFwPqWj;ngKd2fM0zKCKPiRKXJS-q^|C9!B-69=Sxjs
zvrdbqh@!`U+qONzoBzW~6z>Gb%>NXuRO<vI#!_usuO-LRJ!S$&0+_-K*9vz0*Ot?n
zu_G@VH)<seY}=j<IrV@$cXlq5AhxD<#6-hn5e4bf;>H2H88Mcsxp}#rK;q3yM@C$~
z6+h)W*5iFX<=Q}m`D57mxlOC-3t!-O6_kk3lSdNdA8v=w)^Js0BqNZeeRpzk>;LXQ
zFgQr_XmK^<QAj<oLZG*)SLnd-Z*V=HAD0au$cW6#%A&)mT#P?3Z`5+~a#GNloTDvk
zIj!_8XO@oWj{sWS)ngaAep9xt{<?qb%ZZyljAX{`>&`B2p|;^#=CKdpz(dcFyNqVs
zW0@c^!E_1)z1*Cf*|W_$1Bl0=)JDDHr=SRsRMoPr-TdL>b<8&4*a(xhe8@FScDbFU
z`dM1lP}E5F&NR-P;QC2Z&c6C+6P3m7D%R_Q2vA-1Xe)dhvtSlT2So-Rnd{0Xg>WNf
zC`iiXa7<56Whj(5<V>GYeiqUGoxkcI5GB78LXE5qIp9~6V`OB)k00i4x{B&tLDQbF
zxOUN0YrvyBKj(M2Q{P0JyAg=rcb-b$^y}|qoxRj1S|&9d!6aCcy<YjGSG4OTXX%0y
z7T2||LcO>0o5lpX$opgBfL`vyI=jJBw=$mbk*>XcHNrLWdzQ!B$&A4-Q%^w^zYLD5
zmOtqUeZ|@yeEsX_8O#zri*g0|F15U@r)NlBLEC2Q<i_)DQ)?t&`dg5q99BexNK_Ce
zFyAO|`Vk?5q>W?c)(%?`z>(EO1l1GTs;ud<Fx7=6f%S{QJaIG&O!$gOTUVw$DPt8%
zwCao@zv$@*?oo4gviuD5)`ik(wVMRoeyVeUsi|D2`EK(@owL&|`GGtEPW+~LF1!Mq
zOS1+tOq%Q)WQH8dtf?KHwe&N}f1JwV%3@eadF)?alFC-j;(5}{*>dC%eYKdHs1rl0
z2^VbL__-`N4PI@!j-0#pE_aA9;e3Bva^{(4-A*g)rhgmsGd%RhnID9yt*LE1$qS8&
z-OZ^1bLAR6qH-;B*=dX~=hibsx6d-9YoEgcQ&utMZ<vxb&+-3{rmv2Q>W#YoiF6NL
z(%mI3IdlmE(%qpTEhP;D3|&$Z(jna-IrI?Hk|QPE4d3;BzjyH;i#6Q2_dd^a&ffd%
z4UR>B8NX=Rb3P;BF>mW3+|v{{?|&<TtG_SyeqI=W>FC~D)Ef}=*F53PHyTvV8?Rk}
zv@sE<*fYPM4sL|8kwPxhK6X7phF4<kQUw7l(76`a@Mu#<lHSuJy$E4cNCJNyr*POH
zbK|#d$N;hMDHDLepyjHG%dOYxqya}qAKbX^8$HtZafF2fei`E?oEqQ9U6Kr9RPXb(
zQ6?twleP6(OTx|{@A=%WcUatkU3*bv&gi*@619agXEa6?b1`VyLbekJQkekXcB{e}
zzFt*lV}pbfK%Gv<0m#0q)q>9qA9?L|SBnUt52OHmIdvVJb;-N*x;GT1jF9hMV=3HX
zBl$~~7EaS~6bXVM%lz~g+In~pt?jfF%r(zyf7#Q|$Nl2zbLjnpN94*g<v>NX6`u)r
zYe&am^h0{UNx-u8Cz^B@A=O+n5o2Rheu_BLtn2P`29N4{kR@|migNu51*7uKNDE~+
zUD|hd0kR)%E`Y$eH3M;vOTY2KG|pTo$2^Ps=?eBZY*z75z-nGU+uG5lpi-jGqwW#V
zxsP=niEkDQipX&lCky#%*)Eu=cJzbFu9=N|1=a|@(dze+=)sl%Rsyi*qzq|BXTQeO
zV+k?=GSQU*3b(VfRz}>@kQKVBnVk}G>&uncDu+$99@XytCT#BNY7F_4H_uh>-uN(}
z$y)dNX)jU|<QLw$*md=LP;hVUO6yz{GC+}LvmV6Lbl12)<Ss#SPF|kPEI30G1_>yO
zAuyh|k!X`k)Uos%u&lkSUhQgDAYs869f&<Y-w~;x;&=yhmq-%%%!RY&J{9*mv|T(~
zWb*@m@4|;@#Cqu6w;d7e$mZP{$$8-bq5W~-R6!&xI``f(DYas=@+&9N;y;^I!vcQ=
z{Ljy$-PEI9+A}|8deFyGeGK%1FIBZnP(sI9)WZU>z|og-e0hS3t>$)b`4?PO(}$Ng
zFrFujDU;LjMFD(oQnz_Wpil{tWEV<a3sCq!EdU@O-Sbdp6YW)?mWoakpeSq?&F3jV
z<?|xgTwyR@3y1pVkJ_Gl7^+_Z+BY)dd)bmQimgv^h)}sO4+xl~wLR;3eE%%`2oO04
zh8uk76J9g!s+H6+D1JLMbJQd%=@Vw7P#H;Dss2)e(h?*;#Y%j3aC}*MDTZDedz?n|
z+s;~4UNS3x#c`$3Qh>}Te(^HW%1cl_U;lRiD0?(T*$HbdG)8!tq384!K62YifS5eF
zzzJZ4WSqSgLVI{N{~@tL_rwJKWn$MKz6|xrfb^e)QAnpu1cRh6HdcJhrEvMUux3u&
zy5s2{F^;>GS(FLJ^<qLpt-dx=#EfIkd(%C+>bSKUZv*9ir`M~7Ums++Au?})lQv)f
z+x#-(=7vsRKqxI(XvT*SRVl%mJyi@3H~wvmXxd<!^O2~<IxXrThr^#w@}CcdRuF}F
zKqea!ZM6L!cB5f3kig^o22C8ZrIkAP$K4Ofn>RWKeUU7cRr9CNwIJaNz#7LBHy%3K
zjEk6p*o)hA83dyzRVHZc*b9G^f<PX-I*rBDOIC`n*LPX+Edvr)*yc~a&QcykD~Ig(
zGBN@ccv;F<)~Bz_!%-i3G=fsy)Mxl5fWY07?)z7Oiprv8p-GV-LTb9C2QL7Kg--*0
zi&&n|-51PyK+rsWF&yHfQoB8SmV9>e>-`WIiwILF94~>XS57KkyF8tx+tDfwg#Z$G
zAj*yUO<=FBjR2wXw8LTCm3A4?t!1=E2@FuxZF!Bm3RyJr%b=S{vXtnybq0LyeEByO
z6T-Q&W^wrx&^A?h9?A10T{gKuX9(}^zc$`vM3o6VTw#r1y)fWWqc`Zs3BXTDhdX>7
z9PT3wJYPJX)b{N?O!?`JfjEf^5YzbSF2`RExcI)LS1vLHiitNeG-iZYlOLLIftQ<H
ze&oliobz-$GsG=0n$np8Z?7V`hbevp50F4mas$sW?mGz`_cEUBqc}(H9dNY1a2~vE
za>V3H&Nr@h`{W<SBHg9~;8Z&wTKt(-7$Za?o?)wgLa;>Zy|0?PN>vF+(#(unj1}d6
z<;5j_wnsI~QcW~-S4S5)4q6Zb!{Rw|!=p%KnL6~hU;b0Y=ZRB5)Vf}yzu)muxIxs>
zzGdGwST%-Squ5%dUv-5CNb0@Y6O3s@HOk8JKV5$zE6bG3oj7?eaUbc+S8UdhXq9;b
zRi=#|s*Cud5Q1*@^>}1r`>e9My53-PJ^JKv29^%bkvhM()Go}SF#UUNClG_~e&oG6
z9eH+3aDBWYr)Do0834sK@>mK`u!Ea12;;LA@h;xosX}6i=Y)l{x|OUdXK(hepVu4K
zT3JJf@@GEGkmI2n2md5BTMmChdfBQyz4&lOXJjT-lu<*6Ar}86F8|QyP1P{rdU&&$
zORQelrJV;?AK+Iv_&Os7<~~HwhzZMg^*M{tK^RC#Mv9VAeho+zRBvK{LVFG@CEt3+
zeeRsddp@({6j;Am^giZ9*lN|fkNK%&5t0cVyCebY+ulIs^U$<o&fmZM0QpBlj`IYi
zY615~4*Wc};&?yeyb>f$#g2WMk<a)2^?{ja@!GuCyV3<LslxB2+?+q!+U}-G7gWBF
zbU*Fq!9l+69nF=FyU{n66Q^J$#$<cLqyfk9dozETuC^~WC<h<%@Y`x)9b{zn1lh5$
zBwC(PUb-ugDec|~Z8O2MbaXMpB>+*Nif^W#`%qCUd?91ApXc$fZ2r%?CH9bNkRrcb
z$s?t~^XGic=6O58h73<+NX+ZMS^GurP(HP84pckS<<s?3G?ANo;oaO9(qukecJt!k
znP`6cXcb!XycN%yNffa`4}mM&vrBI5yKBg@<c-$VHOb13Y7NExKr3;kIq32Vsv|4h
zr%)YL{k^<oDacEnci6dc{RY;5Aa)$PH6SvGw=EvUq+DQVQj}x}o+k1KDagH)A~1~!
zJ`Qrr8~Dq<7^^}Reopq7iU8|T;B?*2f1FIk)}nR4&{24=dr|Z>LWLDwq`{wR?a<nz
z?Lu6VVa}U#V!yNJbQsJE;0{|VsZ~{IVKXFFfW)OJ{P|4yzqLZCUHE8=g8%c>zAo|w
z7~)vgzr8Ic0Pk_P)X-?7`OV^fOJx@D_?qL=FD03;J@VcsS6IsLE~&vn<XN9TS;OtQ
zCxDYdI#r;-i-u3Ac&D~mjXl+-YU-P@nWg!}!kV}*gVanNU)&cW+)eR^zv?yDOv-e?
zt!b@=W@}82$NHT4T>rfcWFFs~p51?R^o;I)*wZXs6lBQ}lJb8}p^d6>j^{nWKqNRe
z4leyA9ny%)v^s^uq)cxZ)B#gQlq0DY_>YhHk?i+vPfKLj3>nZJ7*fZmcg@_s|NWsb
z@L051&u^x1+sYHvc5B8#dtnOfnbxhfV`rOU;lI&?es2z6)oV^G7|L4Z8|T;7dAR^`
znJiX}-L{F%Y5wb@mAqr_AgnW?L^Un$`2~HpM1f+eCXGxrPO`-slM+X<MYZ6;GyYLZ
zC*(Tm_SgRRT59hXfLNN_E6pI;_X1Q3%)o$sSb7c4CVB|1Y$8~X5~pqpMXj&IQ|Mdc
z^)Bf%*WrYhU3>k?;*oRu^3mH`?>qU|Icg#z611IKOr39wR!iMI7G&{}qhxf6RA$+4
zjdOXiYr<pwY2sj3SJ&5NJRjeV@7!K3e=M!!1YC1>JqO2@{2CNqBF)ft<QTQg?0h>X
z<!iDbl;<liPtqpVk?(A==Fj}m+^i@Urs9x^hDSZg>ev92GYpkH-2S5B2Nr4E78ehs
zGcnh77gZ<(6;l3WvEwJFh(ooopLS~A*(o)C*L93&<<=sii=i(srW;Lf#{p(Xh)@g?
zLCC?h*sjizyy&2s05tD5j8<qULZshKLQ&C?qP&1smA{8;Y@mQONr`#t5;=r*(-)xO
z=}<pD&v9TgY);BS<?v0HP-HUV&vpJjjGCf9tXC<O)1teYUYIB=q%(P_D-xl67)C)l
ze?^h1f?_i7&}gVuG7oEEt5XxpQP9<Op6PXiFQ2~BvcpHdsXZC=bm#O839FXloY4By
zCAD_w8Vz7Lc>W=@v`{M|U72~p((({SWpKfl^0M;>`b=7MUM{DnfydWO(FD<8BwgJX
zk(R*za3=;OCO{=%Q<DJE%hRW`y<<-WOqLSS<#q7~M(rr!=Ky4;gDOWd|9*Jq6DJoB
zpUZKt5Bk_t$LOdk00UI46g22F<Y@exhVjd76*QB{whDeXEb%poj-|c7T$UD#lZQJ`
z3Rd!-NFFfm!0+zw6|HuEk~_(o_ZEAVQUWjK{8h%2s-#;%goUD`%XDH2&E&;KU&&xi
zi9!g={InqB&r}l;6;&85UR(;BP31~UPdCVe?!_v$T&bqioLP3*FDb^SH#>-B0&z$`
zmmp)>8iidQV^511I~M%q1#c^LhDguCEIgdt&e~Iy7#H+8>f72vs`r3EWKKkil(UX9
zF&0oM{EY)$ex_`v;qO3U^d$>N4vru4zb@lcjp{vKj;Vmi(kDu%W#7iseFx^sf}Ipe
z-8E=2cMa2=+rUD}^7zQs$_iSNL{X3Xy7<Us5iu(gg;H53Krfqa@J;KNzOj*wuT`8i
zeS85UYpROiUr!++VG;2?&}SszL8#Bj5CJAGl~q;r;trJ}jQA*<N)bvnd>plJxeJ}d
zk{I*L*^?Lp>UOB&2M-R85>!Y^N!fvzDXqhX#6LSXtD_=JsVYFUl?ss(fLy{syHd&J
z?7MByD31*uek}R1pWQyIM9eD8@?D0^scQ5PdI%@OXx>p~(0CG4rZs<bvBMWRvI(pB
zTQ`A^b5m3nuLzJg<o!$cDIlDov?p0lHb-9x!fw&LhOG%?a*w~9Kl(m+>GEKOm}`_r
z?YPwy@7uRUutxn(L(6W~MJh^1Fmab=<UcP_X=x1pVaH-jRt8$uv{X$oMSnd4WMHx>
zQ;D{pK#K~2)-#GA=S~Fp#4b%L*bqdGz3f}rk}r1PHN#rYkw=O6%AW0IyRX}=Xdy;h
zj?h}bHJ<BSsnFjWH!u-uk+xXKKD`qEo({!w)9oqjSj44?dwP|Ty~%TFvpeKDUZHc?
z@OAuG4PcC@)i{k6UnzQYXpiyEXUy7pbBQkh`iLLcjp{kv-a_$0r!r;`?_}`|tKJny
zh)Nl4J+!T{vwI1)QxV@IZSYg!ib^an@M?pTL|`W%IjZTs%iFx}$GBvT$h$L&@+5ku
ze#UnWD*gDwr7B2vth~IoYA%HE#|sy3Or(PUiutyR8sP@}2Z)g<8Cq0XjVvyxVF_9N
zC||;{m7m*0ETf}!%76C{@<spEY%~xl)0OQ5Ge2HeSEtb;Vj{hQw#dO>ZtA<PjN}HO
zsE-^o6Kct}74nSA84)la!Ji&EG5eAz>`lvu=3nbM_Tkt5gN1x(_xEZrR59GbQ=%6e
zmSey5X;_${NMbA0cReri87CccEsRh<k#z`kvz}r2y!y_9$%j~s4egVYRbIbn8TSzC
z#i^d)@c?G#F<`LBBAaw20&;BBs1RvR@cVC;Sqn|>4uMbv@9woysp2}ey?0wiu`*c)
zl$jU>v>7$^10Lv<r`H@%B^Jj7>T3{@6jMmOR~uyR?7@cxpkR5)FOm8zlV<R3CMXf1
z_eOmv84a|IXC-oIT3$$dvj$jcFLBWKdUA?AO16uipBFL9y<8TOPQjPYP`5icJS2!D
zc&xV?L=20vt94E1nE`Og3qX-5F5cJp(u3;mvB!S`Bu((5=sZZ?d35vOAY<WR1D}t-
zI99Pwb=1=&rVnA&9|leNb($T;iW!CS0-qL=XoF!uvhYU4{P-Yc>r$7%5Y;mC3z>-~
z5DI}#%R$iUk*Gr#nWXYf38PmU9ET#SES&&0hHd}(gYQHOiZYH~X~QJG=OY^e(!G;+
z;9BpL?`HV=HvYTjaz8K^99&*2(esUPx@VNfo2i@9iCegiHhpCzgI?>p)u|6vZJ!xn
z8g#cRcuOm&j;xg}e8#bb+520FB2Gm7kay4H!@#_k;j5?H_#ks~+zCriUKDGr64SdD
zjsNO^GGwrpD)3>$&v1N36AIC_iS}TZVa|iqnRMOncwe+J#FmA=G0tBqWndEQ<^5*N
zJ;g5u9y}P_FQ0Wjy_sUrVTu<200<{sO|A<^ZyF0MQIL!4F(M=V+}G^MG6a%EAf{RF
zmddo)NZ3}rSGj$A-y%1}vZ-=5d~s{4Gr8pkn!dVF!8$H{)$O1qB(LN4d;$+b9mJ6>
z9w2MouXGM7nnW<Seg6Jr$<UxXDi|th(B==HAsq2**BOZ+I@7IljB*jTo-sgO3M;dk
zI`Wvhy2fA%_9}@yZbu)JQi^5@zIh;qctR0gUH8=V<TDrc*PlP$)$OY5I0p&d?e4s~
zKohwl)DeyTGat<u{1Z=!i4feSz8lOs4oCNTl_m4B_jG~~6*1*>D_`)_Tx1i7WEV-<
zZHQc`RwRNcC3&27&~DrVQm7~v&D?Knk>I&6w)K~Tk0ue2LyynMPxr4JPTA%wgo7a{
zFXnTaPqDh!4!zu5(pkesp{;<`O&=z3fH+I7G2=2V9g;w4PI~jqA|S8g6}rps+OdiK
zRxZ0(djWUG=iMkJ0#S$N4D~_e;8ES~9po;!2mjX1E;<P1Rb-EO6l>H@^&Rk~DrN^f
zvYlpwX~EbER#)(O)RilAcq0fdRqpQzJqh`;VLvtl)6_~~7|R?rsJI+n+MUy?4V_AL
zh+B-+J11hw2ISPt2#jh(huccrH_Px_G@rtrC_sTx@b=Hm1$LhxM#q;5OF*8vho^Wz
zL&aaGw)xglj1q)_bjl;qbmZ*aB)*&j6l<-A&6R88F{5w*Gw-z(<xU=sl@%I&tm2~A
z?e(-0JH$}%i+>Bc{aaBpRIGZ@Mi|wL)eloIu(aEbT|dB9AFs=vFMFLftfylCi2??l
ze85mxuM6-PikFhu`coP@o7GhxE3R`eTdHrO1pq3)-v4#3T!rz|-@)K}nkg~+f!?M1
zFDzdql@V1q?K^XAMG-|G=ShmK$uMu~GuxGvd}9N|esg+`&U)zyGs^xTW0paF|Kci>
zF2B2s9khEv_+4JZxRpZ}hs*gY3D$tTf?fML4O)#+1nakQOx01Gr^B_UobG3-m$?UI
z=RC|c(LU}b>AaX_vuXM@Mfz?o*lQanKa|%oloI6_rNz=MTx@cHp2ArO0@RR<245K*
z5yFYDyIFLcnNuwt+!7ndaf%7Ewhd^!7dm#^y9L?xEG10|hLJ0roH&8Z5{omRd-4KK
zdSt#+oGUkj1ZBn<!M~&by0>7?X^F!Z=lhZ#Q2fLMaGXk+M<Puvr2Hw04EBDT6dy3Y
zQ&sh(c6PyMBd~kKg_MI7`S@4S@-010N*dl4uj+3Fc1j0H{ApPMCza4<A7dmi)!lNM
z1zr+wkCilDqr=aub%8X$ckIM~jjilEfeSG!ub`XbTiaHrKP4&z0B;A(d6Hh!0MzNs
z+zZk+;4-2tgZ-KNI{mVM_T+IQj3#KowvruOuJ&D96s}3nBw}BFrx6rL%uWKB0I1hD
zH3d#-uCV?*F+nn8ypY$<Ku+R4MoYx34YMKBcl+XyiEQEH&?<v(HIB`wTvR(P{cieK
zIqJ-uWL01~VCT!leR|mZJg6D;*u6K-%v#<%ea0W|Ozgc-B!1vNy)RvqG|G9BF6Df3
zk|jmYd~v%Vbx2703Q(yLT0+7x_xG>$$5edi{jYCIRQGS?-qs#3Z|~`(eRfH_kPRMl
z?mg9tk@=_~(oXL}L_k>omb<<yFg|2cpizzbSkexE;w0esrIsK_20vlkc5&%*6t%|N
zBrz#TzY%+D(~Dta?mobhIb8G{NQ$FB>2QL9KGqvl5BTsiXK}d(?NisXBk-pk;_dTr
zlwwGLTh3HwnH%V>Le{y~w#lqj3qVY9ja*L%xS2qm+SB#gbC!k^cpU@X2nQ05gmo!T
zajC9HY4p&2lrizm8{wHcQ3TwL#8FOsjdxLPD&G8mZb~1uY#!LPY74&5j;5&CG&NBt
z^cD$_^PO{o-4xb4v)%ob*HH#}aZQSoF>H4&+Ns?*X}iy;Xdn>vJ&IYC%-P0SES-ZB
zYcvA_TCt#2Bk(}i`1U<$+Zpnzr2*~D)5Aydxq0fkwuEmK+=*Q2t}A5lH$ctou~8x~
zV<*TvC5K^#Y(@|z7cP>bj75@2ZzW0+%(9*V+F-JJ4$!Klp<2G<?(qpJuop~An>;t@
z4;wV+MeKfy7T^UWi@)|gkJf^IGJMP$c8wzKxY#Ku`lbp3TyF32jtEiszb-L;_2QMK
zN#EV{eU}kdr^Kpy(-m(;IaDnQ8+!IX^4HWk;OR2$q|>Qn9kq5hn46m~)1@fl^}RS4
z&L*QnPcMmM0wZCDKgh2TIysjl4as5fKvpS<?^Ua>rI3m5n}CfsS}94TOlPBK4!Cwu
z1p%a(5Vo0m2+BTAGcv3;8w;v3MU#KGZAUVA90>_n(>EpYAgM@=5tV(P6{{#zhn0)p
z&8HX!3EOWM@rrT@ZziEJw!LT4s@+qI82B!Bt*3$=%Z4^?6%k5~zU?%>g3PX$%J`PZ
zQMECqF<9yY0|q_1@$J0~RZNjbPU9@GqZ0=>cnqP~ZeJ(yydJSjN@?_ed#zpj?<*rz
z?S~Jh#(@)O0r88@z>PE)q)0Ml1&A{PGqXZM_z&4U*;?t{9v}^@aB5fYhyfjt8?9el
z5DidHQC$qBkq#9>tOc+*cZm60v7Ppv&`Z%z1#pYGLMG7)j9N>?A0?ThdQ}<C0o!Hw
zhGi-aK}Fg-4W;&3<};?d6^zbs<YCKPk1}aVBbj*t>$LRKFftZgavXJuorjrK&2KvV
z%C#L|3WgS%#y!Lanhu<HO4u>?v=epsqj!8WiUD_YahQYY$MR;EETED*I^rH~QRp(X
zwX%9S56w_FCh}G)8u?Rh^H-H}C~0hOj}4B82MkxVU)BHKvt`2EM6qOp(m|~@?Yj_B
zqb-Rv`K-AN><E#r8;&UYI(mjddYTc3oE=bSZXPWy`i}cgVpaw%B9OcrR4s_9=C%_<
z_;KMs>uGY#TcrQyZr@Ks1K#Mk6Tx>H-sc&J!Gt!0L{{%+ML*@ToJ%l)=(;-ikzat_
zpfP_ss1fH<JZCY88#{+;vs#|q)bo3}jKUL5xW?(h4HEIbYA=d5C+?1&U>le$80Kti
zoZ0P7&EdK9YUI0UQqx=3w^e$Xx7^X-5L)yMa)Hk))Z_Kcix)@({&4`}wz*0FxR?@_
zwzUyjv$#;2IJ&baCBE^eRK59)Lc?dW{CFN&s*!WjdB$oJmig2jc)*u5RR#$C*W$u*
z_HCo-el0b!2^bINj*k$z*29SqP9HwZ^8|ih&Zts4@_;r+>N5v42>JTRrqJ}ER>`FY
zm$Ns|sUp6?W3th*T|Wo!#I$JheHehfhMNxtQ*0(-F=N(Bn$*cmRS0ct^i=En)8MI6
zzi2JwMyI_fwV*iqU75svS0%!j`<jCKnfZ0rI9Xf-<D~?KIz!%QqLTle<b$#YwNzII
zA>E)9Or<$XPJ*TD6M#~>ZYC`DGogp9{SGn2M<z1J{8$R2JE?hk!+<SEHQMX#0+`zZ
z6W%)76|80bq7%lgKRLQHVCpkPvyS<nt(<#>{~pWdpmr&(V<0CFv-n+!Krspu0NDj_
zZ3gd$ZR>%Cm_JLz17?>pN?g~<**6t+>H|p4jI-JNauqM?7y9csmkx2QVExcu)jVOS
zwXB&eUJ15cbLij`*WRT*8oo5Xd|2~M4(Vy$2`0tUtk=zNB7yilvq8;M`B&qJKch3z
z0JE+l6_eZ=mHd%k4T{K!5{9Xktf1DPQ)t}nSTSRRku(`Ius@zakC1l`3A!Xvc?Rc=
zHhr~-;E2}rd9W6kYT!M!vg^NARl~b&#`Dt1$j+n;PEJfYK$rF!aXZ1CJ48jgKgj4o
z{3f-xo{PB<BeW-FC1)pW?u7mjsG6c_p$vDOxC(GOpF3pHvSbYseN*EN(}3Xc@A3qT
zf{Pws)x@H|Dw!McA+M&|{LZ&Lep@T0$w6ms#H^@@c2kcW{NJN#9xFB-33oLmj$$mT
zK(1o@Ly^MnqTu%dc8*J&5v-VBXJX}Pv{}PRldlVYGGI%pXN^Ks*fR@eoi{}3Iydm=
z&wYrGZ|H8zlGMa9ZH2M`xBllpHwW0GxyMl*M{m%o6`PkgJ_g-O>G#<jz48Aq>F3`O
zcEkpDk7`JH!ibF)ad>Foo4XS611f6X42>2{KKDq-V?(LF7LglgWHN%G*y<%$-JX}<
zO&8wOmJ&SvRI$m$)&Fxuh7$e=(qkZ=a)=Us_13$G$^4n)^NU4ydV?b0>49r1`sxWy
zFe9d%VU<8`*^7ME$q!AZZ{kIWFp9Di2mVGQ*D<>LxJoy_v34FiL3%c{TEam>4gD9v
zX#WYaI5zm>0IOj;a(gEdlxE}p$s>fFIhr9_qXrEiInbhH$NG5}Ru<*e>|+&yCgH#3
zb6U(juXbmtAO$KF?5}n{UGZO}A4vX{J3`n%C)Lx_BUxW2FYCIvxM*YNhc=HJjRblX
zDIF&LpCvi{t-2AXnE?+l3={P5NW;l<Ic%$f?4~A^C3j)0HUo%_^6WjuE>PbTuxO$O
z1W(5B*`d}I0MohA)*+u-!DIsmM~CP0-OqS_?J$wFc<SyBQrL+><!e`kGBe;ryIB+<
zu_dI}`YDLhJL%^X*mXSP_<CxV=ndCq<zjDbwmaBD$!Aq}b;op*m$AvYEeE$<96sqL
z@<I4?<-D1}EvnoOB%c`?`ckZlPQWVm&n<Wp2A7j+mbVDA$vilcU;$<6P>lMxg;hHN
zs0xSzahkH~(SLM=yFDiF8{gKAp;O5?Y(GqtsYW3ab@NoBc#xONONAXRhf(llN4%XZ
zIG#nC?maUm6LW+cN3F_!<$%>CXz*9@H>`{<@sG{%{g7uvty&9w{@v?^)j(P86OltN
z;NE}toa=KhxXyAfnBU1>Lt@t>vI5J?B!iLZm@!}Wt{*xec(?!DL`}vkW0GWQ2bWm^
zx(e4<F@-ZTSl!)#Tm9;)P>6UBMyU5(9`t;0p_>Z;wwF(bUjz}V4MM}es*J;PQoso|
z7uHCyPd6L)$0Bd`@WC|<2ME@maY%+axbQql7AT{a_x0lHvXwQ(Lh$v(4h|SF8kZE-
zamEi*g8>63*BR<+1R=l_mI4?|`}t5GLh67*hoogKL4AI(C-EdA`hhQ#9C_oxDie-D
zOc}{1Dft)}$+EoMU)S$Y61O9U4u0PhNgD;W0N49Q&^y{M2pYNg!&z{dkT<pgbrTf`
z%nd{>+QFMJY=U!g0<Nx_Fk&V3)=iwCEmcBy#&2r_$v~S^ADVoh4%oo_z@M@L@PD*%
zq8`2_=R9DM;RA)>FrtQXYpfGK9+X1N`h5NuYX4VYd^GCLB2CW|V824C>+ybtYz`!q
zhUE@q-(rtAe4fE*Jwr;4mM06wmv0V%bdHfAzi2{C?p+O!NQVDK8VIKkH%{IA)ptM*
zYRFm;I39WUhuxPh%uhp*fJu6l#=*fssy<;im!vYrk8%YBx99ba5ig^N`1erGGWl-}
zQPRz!<l=wL+Yy@6+goQy0L4O_$TRf;ClL;B@Awe7sP?srr)kKBBuds7TGARV$)>XV
z8Dc2}o3@NA)QIsakz2>u%@5sQQsWF|J>Vr@Z0QrKwju-te={~5e8qk>Q(*Z{JUDOZ
z|Fi&QM5%`1jh8t5W%MDl44G;tLfDhA1xDrXIz#nsOVS!FnNXM9tt&SMEa3~Oj#z#A
zWVO1EhNvWs{2^s(snvm3uibh_wJIUi38Py;L_1<t0Y~6uL2@;(+XuvGEz{zrb1*$k
zPigj>;f$$GP4Y7~Godm`I>~Ucs=k8s@d^2OAez7lIsy-_nZ}6u9qBTaSVuHmKmx$U
zH@<=_$hs5t2p9>5MWJr{F<kTp1!Y%n8<Ay+Knh5i&Jl5O>QTC%RDKrPX_Ao<Itz6C
zFRq3B)-zS5QNhYLw1C9b=d;??%@-~6&G1vj>lt3`AI>pqLa;|3YHbbl6w(T{H)w0b
zu7~!4%pb}41Z-K$2bb=cwYfCgQg$lmi}g#-X5R<Vvb1|JGg!;#K9|N`d^J-q(gp}x
z_m6z{!&<epbTLRVjqJm+xND>t&{xG(p&T>i<tl}%>ph`7!=u!Mqat|>$bxT_JN17O
zTPmalJIUYV0tgm*5|}@yz_7yY<Nk}!B0UUXy+1L0Egkw+kE_gG$T?TLad+(w&y=wB
z7D;-(IE5TAcZ}#cD{=aXLdl;ICWX0J-q>jRjpTgG_j(i(58LrXb;J^+oP9q9<J@&N
zAKFANTwg^3dhDuca|gG$!{euYuODr|bcwGHdkkrSxAlaGXy(1ouzR)cU=0DW-v?DY
z{$KkQM2-Kw&RM_h;Z9Br-!YtzVF)vmVi(Gpm||to5?}*bC;RSUd;2bdDoze-exCaP
zZ+=_xfGEZa9Tldzx%WFebn%>@T1_5m<93ke|0XwwLjo-7UE+V9v+{7hHE~$?Ln;Q*
zwlX}O%)Uo&8}xqm2}Ah2pL3^6x3Td=F;KBI0+qnATHL<47<X0&02Yh_asyo__gGjq
z6qm0_2tWYE$oNjV_a`0Z+J!(;WugWqX@=?O318fQ>WMtAcX@>DUV%B%{F(W+B2pys
z8h<4MJNjJBLxOH=CCZC|=^K3$1Dk+D>Lda4YuD%AYxK?Wd`q(h$RcM&1x|kv)FoWP
z@ADU83X#D}sBR0_@=gdOHKRR4jl1ttXE1vSe&q|PqM3|f@e*6(?VwA>E!p6>%h#V$
z`P0Y~)NHpEeWJP#7TW%YuKTx#Y&EU%v+F&4|G2IpT*wO9y}lRB;<BwLFQ82t-?kT|
z;N;=q%Z&w)u$F2+C$dxzv2kFP3|pV|l7zh|c9{OqyturKI9Ug(y8ql_iyexz9san7
zZRC8=5?<Ku7K~8DN7mjWYIP<t$hFe*>!ePzF)>b7V>U20q|X{QUFhY_F4Sx{0b-tj
z9GoH`N6C*GAo+%^-_AA{{u?XPCDJbYMKxPoJ}=9F86wS{W##4unyCYfh|bTsYS?5l
zcp!inynxZo)pf|@?i8KfAPLZpr$Cr=)B$Uw+U90hp`sLEP7Ryd*tmVBIc@HK%z?$z
zxO;g;xGd)t<r(V@V#V&($n%^OxySNF6^Ovx0}K3!<P$x_)alGxegd+46V7{e&f0=8
zm<)5W!u+MvniW~ZKbdqgh6Ncw1D5J=?6w6S?zmC`P~R7X*iaGx+se)~aMa9u<{aEo
z0Yh4S8|Zy46byH@1oDZN`O>xe))M3bWVqWy<M9dmV%T>t)%pN8D9muAR{tlY`}=&%
z-Y<I|BOYQ*5PCs%aoB^2<Z*NoSS*z}Qw^Xx(p>n+uz5D4c(H+hx#%2me9sDz&3{Xq
zqhWTR8L$S+7<ZjW%m)T2ENgEjT5khvzA~5CmBhjrHbsixa!%S;0=fhUqcY&3W0is0
zb<9T{M;@mDOo4!v8S_R9_b9%W7dV`+r04E$wyr)nkDDc8TL~$~P1q_Wfy?w6lZTB(
zi&3<|vpUxDGDPwrygzFXV@w9xs^3-VmFZTbs4!jhFT?5zSONXMhkB^UV3RX;U&ajW
zdVv&a3<|(pg!aJV)4kasmUoYmRbG^Ry!hZ?V@b`zDRT#h=u;nw>jCJw@<Vz7E1<6j
z6av7QQWOm`KnqMcHUjP-c`JVX_JV(gXIQAHUs;e1R?W^^OXM#)1MlHZi-qoY?W!M5
zZ7O0pZK?c04x&wc*8Dx5COUv%i#_m{#FbG(0qdW0U&ojjK?)p#;p@H^qmWOa`_El)
zYq1_T=K|JVL3QjtS_u6GI0PW(Jr3^zpPPVg3Gnv1xDPOf|0CfV8US?x^MGYEFE$VZ
z8Vh@G<?OO-YdePCcPr8Q<A*f+<vkTkGZXxhOp`fdo65F&PpnJ_Q@QKm{<C}{FeJoC
zpj^OeDI}1g#=K*H1%D4k09oR0CTPlOs~j2=)&fJ2ko~q;g~Ax27A}Jw#lkQdA3jsl
z$CX`;?pW+Ta|w!#d&#;20Mx3^Zbx}R5RJU2hN_(O<5gB*cYMHboAw*C_r(I4=bl?G
zQp5kBV!JL~8;6bpEz5nc5Fe*Tmfgb*BL1SBA?Y&-lOQ?8yIiS&iK(e!%F-WMfHdh7
z%AB6?0tPNwRwodql9K?~Po(H1@#2fTc~dAwz47_UX!PG%dBVirw6bqWQE#Shv`PX{
zX<0ysTW^1@L(ZiXCSbN9`EI5|dZ20I4m<J<)$`0ZODljt9XvPIfZ}1qNurIvyIXl0
z@GNuAy^K@Gg==I&HCI`M31r0%nc?r&qmclg3DcTLD>LZn=R`davGy=>nRS}1HZ2+M
zkCJ53!SgqH@A2uu20eHow|HT8C4z7bbd%$yOHx&OK64|Xm7}Q6P8Un}v#9`WUER7&
z!7UZg{Ppe8J&lMXkaOk<(wcHRi9U_SkORr?b&j;K={Qp<ETr9105sd4rBOG%PUW!$
z*^DUl-mOsRUf8L9*p6r(GBG9HH&)E9V|Ra#e&@|e@s;A4y)G@ZGV3HYKD@+O8=s6P
zz-B<I1+TSw{Ag7&m{a@JY-X&wHd{`9foZ#DlbFfV?aK8p3eVoRjF<t)23`DBoa6BA
zeGfyCLII67E)A$AcQw{#mfQfuGM08&Bp2q&`)7AOL8C;TOaZ)k2{W&eT8}&qG<S0Y
zOB(fFzVvv*7j#P$Nt2z2XgN4Ml3}gacj5heok&CsI-PDP_z%KvxgaFo-hQFL@GmDS
zK9V$`YWe7F#rv5t&qNy2mKI_UxzhWe4hYhdK`!BUMKt4@smDKtog9{y5!4g#vTM$r
zYOEUGvq}w+WDN&|!}J<N)5qSTlA_YCcHmPgx<%*Qf14^znkt*W<ydAk8GJ|oP19a1
zJZQJQ$apy$F(!wYDYUe!=et)#U9__~;Qi^n!#bo-6pavuHE<3Og{ajm+Zg#n{-}$J
zNLUJGje|NJrSS)%%GLN2t(h0`joug9BZCZ5GRK)E)&fHorEIQu@kf8)qa?_`fSr?L
zD^k6pp4w}OmVKVH;_l0E^=Cdo#7k*W#w*#ABjIJc#h1XFfy>S9#*al@SM0<~4>*1u
zlWmOU<NzG{&UUBXdF9gJ8>GV|iybU-1*iTf-c0ywbi}n`O617^DS%I>!r2>afH+2^
zNzNf(X}>atLj|0Ek$-)5-z}@d3A*@f0uXfK3R~EToOHC`N=GgcQOmLexMl^G;)m45
zqMcrkogxadla1$|i}$xg1_aRsUy|#YR}F@qhA~z&?2fMSaM7)!wW~(#Md<RKV%IiH
z)@<5cfcFt4w)kD(=ZlQ8!?zV&2tUb8|J>x6cTgks!DPPNoiXoCv!u1*J@V+|z;8O`
z78)i*CW=XaoYvNMA|P>=yv3-Rc@jNBCI{c?XBM#yB-h^fDjO;zE9+)X*h&Q5W!KN(
z`n4;PH9hiQJ;lDQ<*DBHGJH6{KQ0qWi)M^w#ZIt!u@AWdR3cjVdkxFjepV4x0Z>g1
zGfEoaf7Oz>s8hl73B$kuJJ3PS6N3$I2bK{#O>h)okMa8aX#{WSnp2NbBzbl8{E$bP
z1N|E-{Rezk5C4!YzwBJET`!}LDOpP8e?F1RDucZ^QIG!QD4qQ;IrUFT1pPmP>J@Pe
zE!`lW8ySH-sMSBXF_nwa?#u5Fn^IS9ROuolW)&5{js?syoaH_52W|M#qbcOoT7mFQ
zjMFD=9A`0|D4m>F?n6!|BY3m%iknm1l1uds^puJLAx34wklpZml~@I4#YmTwNd^)+
z5|o0sjL;x*k1_Q^OL;B2{Bl5mF}3jfTLMjPp-G-4Aprp$Jz*rK_QeO}3|bZYx-r?Z
z{ztUyVOtXX$qd13a!LVN*)V-seBGjx#{|pc7|5(O`J42ur^kE$%dKXjb6vxBX26kQ
zxzRURw<2})VJGN8d<j9+w}Cy1p74-<O&`tw9pF7UIGk6O86|$RU@}<tH(%X{k01rz
z+?lccaZE`DiNhkDX=pxqP4_hxUOT#*sMhLFm+|n_8=GyH&;Yx@3r8vwtWJg~{_p;f
zyEFdFRIxN-a|2w*^&mkFjy!mMQ&$ho^9`3g*LurL!CQ`ZRk%@dnbywh7{EZR7Apva
zzg%h%^X1)O*wjzPlQ7}C9`$@n1}*6%z#|vwdQR9ioa{|{{tWfhq1xL5JenEdI7l2Q
zihig>0J!F&%_Zw;`9X#(ZlQPcgM>0*#l$4RwDRA}3*XwNrRVu+!XdhijHw-C>1Kh$
zk5Yl^LME2?w{$Zb_;63t_Udevy3?%yA!<olsI{TpODHwWgIP|Y=~gCy74ox5t$^3s
z%`Nf!SCz&(S!Fa&%@T2Ps|g8-^q7V^`obYLpck{g<_npx)#}>k&C*yHk+jZlh+?-}
zAf$?z@ePXUz4a_-%->@NG6o*@g@cOge#A;iTHU*Te0qIyOZD%?Fj1XmbreiXXVa^o
zl>l<ke#OVC`opb6$m^QA27q46DHXdloW7uX`U5T*E;bPlEo7Ta5`<x(k)X>2m||}(
zg!NSTB#;54=9Z;g-1RB*34~&&no{POu$p`+UG?uehU=p|&qKo3>1^}q8A~L9tqpAy
z_qMWBHjLzZ9Ok8Lj%;gKng%F>e(;xE!+k#(y)KNtgf-pCxw@*hrD<e{e^q)Q!XnCM
znUR34Nl0iYUG)z;6QkD7?hkoh2g?Y_7a&<q`cW}941Z9z2>l64L35ltZLAzVm|$3t
zGDb8kOy#4{#>uy6#LcdSYj7Lp!+)?-HqsdTMZuuwJwJkBqPRf{-vO&0e)}siecLa5
zp2{z3i@(`SSAP8P>3Eg2lABRdlwAnjQet_~^A(Z2MPn`Gi-z-+$X=5}9BR$?s@Za9
z00IEUh8gpB$f%^4FkcpkAjv3bd5(Oi-wUU&r9Tfi$v9mIWU$2t1C{KscHu<d$LH|W
zJLd1b^x~lcYBRJ^NYk0v0K`6cMi8!o5_SvC(gbn95|yZs``y6Yc~$|JlG|fe9uy~i
zGq43{KyY0^-a~Z^M4hExFm3)8P&_g0Qammq_wn+nM}mn=p@s~DSZ|62LQR9Bj>P~F
zL>?J_PKFE1*b)r+4_F(cqx-v#&~50Ta`X5kKOiIS9KCs6X!&Lh)<C5aj+#2izx5f%
zWRxHhv!`fyQV^X!i29u>CI%b5HWL-StR~~hz&xzM^}JMHS$n7`sj^y7iRjaxPc{*9
zF+Hb3UQ`4aw6p*nru}eq=jRsNKR76cb;*QeCQX3n8p%Qye7$t1jznZ4H(u;}vQCG0
z^qhF90zqiRl<^I?y(v)oS?|oKRaCoVUfa|w>k!=u#%?EgX$7$g4||f3l1WR{!JwPl
zuC>}F9N2KW_Fpd5N5<&IpW#h-oe5M_VfruYN0T2-I;`S(V|^$Gm#&Q;CQI~;z-Ghi
zT%=0Y)5rvB3UmICps^ig<+KFwD^Q#@k;MR=3{_X!+D;VYlHoZU_gigOUC1{j^sgbu
zk_Cr2Jb&>(ItC?8En|64Tav0-PS&GLU&pEIGf^yVM)+{@DB1P;-2%q;Qk<{ouvBA)
zJ|&4vFHkn~6|P&Vsn)3&5-;eR?Ero$cI;a=5doods|?PgpU3mo1lfg7j6;5wH0jG3
z4Zp3Z{**w3A-@Y}){h9{%cEC~f`ml{Zc(`zxm+0J1EPlsH`pa>8bCQ20O<L{1;b43
z8#Bu6dm@9x;i5DD(*e1si%T)A(U^m5Dn9CXH>&3XW8L@4EHVCW#~fXcmYLEdqWhk=
zdy#h7Xs8+UauaKSZuNiJy1Rd^@Rj%Z=9z}OLDTr~9>%On4shl;FWU-I2vFg|PiaP~
zQgc*_OLfY1*og;kk!;uca7-<YtPP5F*tLd8qoVoLlc(&%_5;NlVs_d@pyvcuj9dxu
ztw}+gfn<zmkWTa@;c3u*9#b|4I+F7;Gd2>DXW)^MP`bS4E^?PDnPOCkY#8!X`#Dx0
zI?V0lLG+9(N8=qQiSl=CK<G*Hg_RY(HkK@=<9+cloB9kZ(b+FbPoV!z+nCw&SXf-_
z!F*||=73>RV$A)nOpi5{1pN_I`^-<Hl?0gDrKo%t-R^JNyS&#=^WG|AjiOI=3=ev~
ze*TtGlhn(Y2qze#FYF3->ZUPe$!95@E#Jk+*)Sh+7V0}UP9cq44EhGvD$?f!%#3R}
zV-`Ii2oa@ho+C+Fzz*DBGQQY>Gvy4>0#>$M1NvpDw~Phk!JI(!h6U|7JhJ{imNRrm
z5zS|U&i0R+QQi$OIlcqPuoczR=tUKiZTQIr)#a|7=|N!KUU$ntjIRi)bQcS8Aq%oZ
zHRduM_R7l2Z$1p0fuv^0@@h#MBy8!VO5bPBY04zE%XE?qtA_sm#hi6aUHp~5@}a)H
zJ(3trs-3&9FVgJnFz6|qHDPgClsUWU$ENwy=Gn_X_mXxcc8r*!LfxO0Z1Ob<wP-=(
z_=FVk-rn|+FOh<}+D}o6`E$k+G)PVqga-e3b_2Q2Zr<Jw&Mw*&g8C*VJx4T2zn2Hx
z)jH0bbcw>PxfKIiCjgCY7go+j!pe$CTj-PG{GN?U$;_{PUBK@^gkmBwqYDn}RcD#O
zNOp-C_=|Zh)K!!XuP<}@#^EgWX1%OiQLz3;4t`W36S>LE@OQ$ny0F*S=%MN7HOD}`
zl$!)kYwf;#t=cMheH_%I)jqtZoPIKpem`dRi#uhsvZhAMbZDcE`p_%u@i9PxWgA7>
zQG}|lzP|5lTFi{IrnadGN`9j@C}hWCQfV%WAC7+45m3K~4fLg3kS7-dl1Q}3U+f%V
zW;O3Pi4u|ku`oyxGp7?H*JT}*I*Ap~rtXEs@`T{uENFcpHU4@@>FMX?HK?tjKwmJk
z$4h~`_VeR}t-!zB?$1>rNg5li)KF`yOp@>rS?1*Y)lva+qiiZqB`hRI<^kD&Xn>$3
zh`#RQS&i^tvkMBMVafqcYH*{W{L__D$MLhWpG1d#J9>z8qagw)oviB&6hg@X#z!!#
zDyGAfwkA0mxz#cAafQ&@K;{I+)C5I22`rRVY+3_13vm>UEgJ?{bYOHIDA%hDf!_kG
zE8=vQijLAX>vXT;6IJ9)G9gJCiGf*XybI910}OwUZ??aH{$>RuCVjYn?&pBa##vo2
z4d~6j+4G2xHAwy#nhvnPi2U%)xDSWaZ`Mj?9ZwG)5Jiz|4~gTKX#VHp!a6fZPk3t^
zO-3zOvp0vLX*bQavedYW2S*2Ivxb>lah_>uX|9JpM^aaEV*+^daohcPGR%oYiAiGG
zy9mgs|53-5;$;90%niK{-DJjqHFYSb#w_F~1HA%)t}OUuEoTkuyEa=INxIL;B-4q!
z#slAx^V!lJ&URpRN5>cdM>sh-nO_1T?t|k)D++42QXoWUSVzVGG_q#MZgh9w0H~T@
zMIxi!Bd^9z#wRdh80Z4ZDzFEVrt}ZB!07Pw{WifYJDsIbWSOXHrT!45=9%xajzEaq
zN37!Z74DIq7g_swY(nL~raAQU<3T{LnZ4frGVHB1K8m$Ga~V_OcSb{eP>T@sTHL@n
zFpP5sNH&Qw^hALfl<0HTD)(;$Cd&k&?ns&tfwgz|E`SS;mQ5?Oar^vv5O`XU9aE=Q
zmwr<|61Lvn3IMD;n=0m1Q31%A4BOcxmOIF1AOPOMtZ!;+8({Sco(cQ(&kp<pn?_*%
zhvt}18P<;*0V;76d*BxXlz@2~)vL)f)G!%9br)3^o2^zb#O6;5UT&l0X)Xf(yqxMs
z>(iHkR05;xCVQN_gCnYO@66nI8C_t;`oOOruu#dBS{rO+F#Qt!ZkVXiFfJ00<}6+6
z4Xrk#7c`zMo)hUgrEKwWAoubg8=P}=v7C(jVAg%1{yU73R^pjARsV~=H2uwib0Cq$
zA}$hr5^ZhweM-r)xS$ai)pEE#ZPlnXmT$Rg4Ch?hux%asDb=&60Cto-K{Qc05yFR>
zj?b-M{Fo_GBcGijm^5K@mq>+)gq>LBJOAaDSlkwSv<GC>^{1wkr0xBpP+uSxkAz}u
zS5jWCh88E+kA@at9WiA6az)CE=Ii5s1=gZZpO#5-HO^y2qF*(5pHD*&0n(;2Ul1yG
zA-n+rbLpv{Q;loC&?<+?ggLe6HE_*_Y1ICZu4+@N(w0tO8k}L9ImMoL)9R0+ji7~~
z_hqQG_8M9x8rMd#j%Gx>mWpJ0cwY3YVG*yEfFCDs-x)P`)P&Gw9Z=8Ahzm>~Db@1l
z&-N*ue?vdadQ$9kAT~TaQd3&yTlq@2Jo$wd+hQbZ|5!ap<1bykG(P8lC<(l}4}tWP
z_WnNSe})m$*%IBce1FKY2o*65zFH*xClN2AOdiji@vBZ`*)qT>Yhc!f-87YRT&YmG
zw&4NAw`tCD27h0qXmIivM`<(6cGkwtGqvi_X~0`i?X-O%BRx%KHd3WZqjQ!K$`1%B
z7c%C?uvIHKIC*O7n%V|0t6t9u2@ii7EkujIeJlxD&uTZDqQo6Kdr<y-XiMC!$Dr}f
zuu90i{=AZFy#7bs*xfesd{d3Uawfx9+}6v>`QLYcg%r^gtuuQX_gX!zbFx3zD_6Yk
zvzD;<CABqmge!i3pPlWYjJS~XTy<_TFf*W?(DuT+S`6rbdq@Nv3jGn|c2Ygpq4b1m
zYA*VAsMah$Yb{x4^sB*SKm{Lu+X>?A;zh<Pz6)_sqR>DG5a4Kx&?rU?NYjg(Mt1ic
z-z3I9@Vmc<Br!3g&L2M1)-}jhY!EVI^bKb)PMkcl3skYADor2A1}yy%HE@JH+gqU`
z=%qA{>O{JSuIAXQCa{GfIqP{U8A`M*iUmeTMkpvLv&Nd7kd<YFc+JIdfsc5Nx5?S}
zN3=f2psBg0wzf^FbCFTaaxj$7Eqi?-B{sX?+FH35bF~p;W#h|}y%O1Ak+MRGmW_pP
zX83oerK&T(N&~g*@3Eo4Yn8I$8mkD}<ZFx&oN#p=u20~N&P0B}T(85fn?@>DSy@xx
zRXe;rD3q0z1>A1nYh2Svtb6A@1-E-2@soRY<22@o`#>X)4a>(-Tew$}soUedeIHJ!
zA2$+cV@+FeM15t+SPp2YKl!+VyM<}L;{L3e{M%q)U~1*$l!f=fxz_U$l`<=9tif*B
zU8$F^(EP6Rg20Ll3Zr_J!@G;)rZ#r4iG-!9$~nPP+XlQG<GMmkO|BKhP+aH@f<_8)
zRRtH3kfc{3{DE6#o3%B7yAOOA50|C7M)NWg*|oBJ%=@x+G3wlXt?QfuwPvBroJ=&V
z4UZvLemYpb=|}$MOq(VH08p)OZ-#I5&`rg=J`J5^b2cL<Cp<pN-Las_2k{l_=L-wN
z=kEBk=BwQi+v-h1&H6?rCA!zjYJ)!fOzL&V2MnWJZUE@zp?2+)r%aSAj*E33!#T$D
zqp9xa$Q^~ze06=x4=~YyL`P6$(9=rE?^f@4nV_iggXD|pF?<+X;YP;O9^K<<6l-+Z
z-Rte`?L}iF+w-N@dO)^svzSk=ro<}(FbH9;LiJrg3$aCB#uuinmPQ7+qwlWsMY6D{
z6~9nU(yo{@F!^c|;Fskz{}G6|#+lQb%QzO~`{^UbqzV~cN>8nSoyMwGdMCOPn8)*R
z&DPs4{?zqs#VKM8*pJ5B;DVT~e$SGjJsBJ3O1wve0O<5pyGF>s)Y#U=H#f6Yw1Ck<
zFatlFucuToh~HK)bA3Hw2iKY}`t?rUbtFSXC`dVFvefq%g?i;nx0DWT%1`GFWU9>X
zpz)e}*D>cI@2l!s8ph71*(vuae|I$X{5~U4PIG%c681m6O_yj1%3A%QnM863^L)ep
z0gAZ4nPsouuW$I#e>Z}p>f}^eSp|&x4a{u|%?s(33T0iOzWfk$`8v=4j7=QxcqT7)
zDAuOB{^!UU`;1$B&g07~yzWlP0Lppeg)n8J;Qe(`N$;cITTd%B3vVPCV{@hEblG*q
zs>CX?D2?0QLaXAq^z`(~d_@b*N6ZE3u`T`Kc5Yqc51aH=nYhZ?GPvhC%pCjs{wMW$
zwOzFXzYnOO>SU3i>f?8(F+awIaFh?OYqA~;Q(Fg6=H`VKelO6+6vy_R#HH!xhF?Sg
z7ZdMubHWFUgjt`ad~P4^-Q?%sr~o#+A59{#-VuJMeIOqF<EMao)U18g_0J9BuY`n~
zfRpyS$vMVM#+0?}S8E-P*S22=e5EwrRSuhFbgL9j9P~=;S5Q_~x$v$zByI8LYLLaV
zeCboG$Lvx}VU+hM!un0ApG>+o|LPK0A;rREyg3mq&{5;|p0g!(qxl;5fPJy$<#~P6
z?C(p?1S}X9_=(@iKbRH)`FZ-r#+FtA$=`3u>m*8+_etkhGxIm~r|SX(YI+sN@nZi^
z3vjn220RQ0xEHWwhV6UpMgAXq-yPLdx9$7cKm@@G(naZD=smzEs2HjgDbl-i0Ym7h
zROyD^MY?p6P6$Pap+zZD0z_&glt3r}LV4SB&Ufy)=ic-Fd;h&P7(1JcJ$Ck*>o@C~
zdrqqBOyiS3;12|NB^G&m<wfIEijyuTF{dtLE8N^98f#vKs-@c7ecxHyjnOwNa5TxV
zctw0_Y>{s5<Q7+ya?{Z0hq0w8{_uzVD%MoEO89y>4Fl5et0VF>ta@WQA4{|qH+}RW
znx-o;bm4A1eL_YoU*TN3I$~&g{w%9YmKnCacW^bU!rfh5Mwy{mRrE5_8~J2Q@TEME
z;U-+uUjNX=A%Z`adFK)L+%2R<(WLuAixRI?PY}kX!Ba*D;-x=JVFu7Dt28mUZQ3}Y
zAbVS&S}ZTk0?yjSUp&6<?G@PNJ7Iq<0)S?nL|sKyh3EDmmFc)g4fL30+dIafO%Ni<
z8)XZx0IRhs<@n?PQ<83M$jHgz)6#o{u;sOmS_QUs-2{U#XliEL6W1oY*N(t4?txEo
zLrm?O?Im-rp_p?Q#1ux}ODHF-QqCv+QW+=xSPZlN(m8uq+u!^Hf4*U*gt82V)Fs>x
zu!M*Er+R4I(137fA;t(sBw_Lb`?{$U(lv`^rF*K!(=&4HgMe~q_0UYIJYCr$WuPL;
z)pjHMVv{rDcQxl}6><CDiR4x2GM>@c5@+RRf2MI>f-R1DPwj!VX65`(!@w8jH6S4&
zAu|yo8KE8y@k0_P!ki1@7yNo;lWzuD%QAcV2C5*Hy9!f_!kL%TQjLv;tE2$v0wqPF
zO)Fo#c=?4h<W#Nwh{QNkp!nhQe&LhyNe3s-x9ht%9hjKDdT9_}c08Btt))qMl;e+h
zTmSG&SWI4sZ5Q`k;W+T-MslasV@c+pW6m!f98FBkL&P7sx_U?;KSvRtzU{hrUF+>&
zmJ50J830sifH^DN+`naHbhBv4GK<p{%W7{04tOhSUQ1k(TP|~Cz!c*tHyuo&sfI?A
z6SE&?1bb`I@B3vhZk9g<kMn6<Znu4o8Ty0>%1K#zN~q^G0b9#v+`vCtP0V6LeeoT;
z#A=Fl1=Lkj(}O`+I`7qy+uV(Qy0AJo!n(9)W-w9dXPY=M9~M@B1jkI$xd<T4fHqDy
zwXzO=mr^8W_+xx>s=fDciuZ>xy${Fc3TH5;65F@}i`jl<luONy>4t&{_3}5zy@pq}
zd|_$SWKMB5Ahy}AgV9-9TwDykv~iZ`gKRX*xS4k8rfEcl7<0i^l(59-DfYtvW}q7J
zXkm6Zzl&5%<Wl)Kpq!c?l_0*_%=}r|ci1aGxGWq)dxkG1R#%oMuE0jBUxPH?M4xLU
zpi=r&CcThmLGn&E3t^0z(V6)zEd#^e1QuI@Wwjc)fjV~gZ(sQ4E@kq})Y|2kS0jei
zb>Qg>7AaR|hmx6RUt%3za4Oqf(W?ECXhJTsPhrux#arn4pa*7R{LISQIxazpRBErv
z!O2NF$iaSjXD=Hy>ufHarIngy)YN{=B_reD1d}($6&MaS=N`Oly92h+j1UtL5?T#B
znq$maddRX}XE4p%-~V)3klDcO1K3tP9%2)n=&2jkBd#EW8lLA}PiTzt>PP!_RAPwN
zBCQ^wjMr$lvrW?^K`P%KdVU$0KU*i!|5=6!lAZmHrM><5l`x`TbnSZKmPY^2l_#}8
zF>_5m<~hBru}&(n)M<kkB*Ff{>_fB2Zi_T(+*)m2tJ+I{I(!(N54*9c<-+nVeWzsi
zy>1=(UBSUAVW;^kIZDerJ7Gy1G!Tc5_S<cjdYs{p5cf+YFxi~m@@qiO!I0eCX)dg7
zaG7qrL7JKGY6&I4uJ`D@^kU0RL%{vDuvp&ue!uq3ftqvDh*jSU$zIREWd{diV{=~U
z?MwHhx1Wpk?1M6hHWGQ@?Tm6>1IK5JW0!vT9+jMK<~1k9<r`YNyM+(#W({DfYJO~a
zW=gSWYxj7FVQC&8UXG<*;Qn$ev|a?`4R-))Wiz5iKPttnx(JK7*<4G@WcI>;R~=Tc
zyxNnxA{*rH52STXhMP#s$TWMd+Zrwl8kpWAfNm}5mP2LRJOIQ)>{bSbw&x-_y=|Kz
zj(%6GCvUsS?+0g@DBpz&zlKD0(KJJ8c(2DNB>WN<sgXl=bWO{<Io4fVVUFC<?gczN
z{r(8wT#ce<`D2;Z-rlWiBOKPb;yHzd89Z^eaBl0WXZD`KuT$(3S|)jWZ3H=TfvPwx
z1BYT1gg!l|;^JHZYDXJouzjSEf6?2_%!>fn+S}ggqXj_QY+3g$(xJ;|E*T7ST%;yv
z&!S)W<j|#64GC8fk^2Z0cfrNp5^Gc;NV6`vI~0__$zg*+;Un_ZN5Vq8&v}{V&zLP9
z_6l;|JEaMI(f87<V&Axe6#(B$zPmo0oOO+`uP;LKWaH5}Y^ZxGVeS<}bqAf7QyZk8
zOPd-5QX`!`KPm;6cMcV(J_?O$@oWlq%Nk_x5Fa-wCN!=XT=VjX^Dh~kK01$ctC3zH
z?e8ZZZ;16;fCK0I%~DOZby^GG_6I_fhK9i!F69Qt(x7_cPUmyyizN}AC+wf7aZgrq
zNv_YEW3#_M*G%0Q_DMB)X1TOXEwhE-Ex7;q9;=OzQd~1Vy_9x56&pMFXQvE#MLWhr
zSt$olTfIp%YHEDKW7ffb?^5EVs@z~-<8)#KGVtGW;^pL6#M$|LeKdihnhwR`M5(Q5
z-pj04GQxDP!C5q_Wq!WP_&HuKTv1)q+@#*)BC$Yq3&*p|HauYsj*SXXXiDIC0baZR
zyaR3dY{)uUG$Ud(khAfby?D-*M>tLeeOpM$)%bb?A*Cw(wfJ-N3_48>-)xE{y4MKT
zCIoqRHy1#NmGo+kX-9Fvc2l!0#mq`Z)A5Ge)rnZO*paK>CH+qPkkYE|<rNKzdjTbd
z0S|8t8@Z`M*gS_7xG+J^W6XvPGA5H|s6&oU?(nu=XIdLR$1B=EneVxuo9Uj_YGx6)
zds|*n|9Db8W(<fUKflmv11tXlNsY&Bo6}T4=WG*YhwKMyFdbl5dhX;n(pNWOno;);
z2M5RI;0509<5sp@4rQ7dN<&r3wy=#j$2$jsN}nuYg*&$rYE2Hi+=No(x9g;;%#lM=
zac<5j%q;cv{ex@^0d~2n1xo#0M=b751EQB?*>-^5$Gy@H)>Y`<-Bq*G1I+U=e5v8o
z=X5<M>E{FW8BTdWYji{i*R_&}OGUG#b)Vb5{OF|?9;!}?i<jkiiF<BRw3YmxRU-Cm
zME9#zEN5*yqGPWQT55#8R&p_%8Hxr+wms`4X97JQj+!DVJ&q5IrGL1KDz|nKDiW|2
z`lxw|*0Mv)cJT6I?ED|LYqY8@GOU*w)6yo)kZ1ylG0Xd=;5zT<$BN1WNy2uzE-S30
zPc;3SiK>n7%GNX5`&YdEUxpc#e|wg03$=f{9>+7~{;JZ~u3aOwsZgviRMAH#{^F<f
z@BHWcHYcl8>&EQt?c=h>m4O22TIG|4^Nafy=SVCP?kdmqKUuv|%NZPW3G}rMA0k{E
z^Px>+adA<q3x2fGdY;!F91YPowdhy#ZAW#@-=W=h`5YV^$KME6lK=T5jr@3?^z4LZ
zH_JZp(N*1Ba0h`p?|#<`jF=??Vx<@1`S{wI;w}}%Znx3*hW0RgdL$sdk=yA77HPtm
zjxwbc)9$%fJDy@3fb6Sn_@rW66<T?iKH6Ofx~$-k$-~A#J>9w;HFx_?%rqbVSiN#+
zZSCy1G}FY%FV(4-ZOM-kqaQ(Tu%t&NgTchG<DBdBn^9o)<BkAFRXFbhPj$rdyc|7H
zwT<WMlc1G`1<2O0UXMqe6wb=p@9la|GvBz}U?7P*`vAR_h+<&4Eo;xF9Wz$@qi6f$
z04x)*;%av57}8gTN1UOh<DHd8Tc*1<yVDkF!Qu{?4?I2-kzWTzhPJm*%8tQ4MN!Yb
zIa`6#GWPD|>|Jw^)lkm<xdHwVAl~xrxViq@YTV|BGwx%K!EPD5yDsSi-SG_Qz_d2P
zi1R>F?-dy52r<`-c%s<l6j4u~s~>ySJ0`}g)hB6vkij^+{HHWwG$(u7u=J@TjSlA=
z+nU%#J|_S6E!$S0yR@F)?5UM^u8$+t$D1F=q-ER<jZ5+12^<fR{32>{VqzK3Ss`Bc
z`A^$mMx0a4Cq3Kd6;T-uxKU8cjF^eDsMDA4b6kMjaUZN}_s<!$G_$>;&D?W!@#e?i
zta|3O4ZAN33#xnc^b<Jc&N$l_UTm2Bv0Q5?G&G?~q_(N{QQcVKGtW%~Z(VTTKo=Wj
z=6bB6jkq?*j4C|}?K`kB3wnwKyfVR6T3R#9^lrnLC*zK`55kswC-7U{=ZY7SS3bvN
zwKvN<OPW>)*P9?3dWL^c)k$ddNFh0sC@zxnZj6lQ0zJ~YozjHkA8V4jTq2sa<Kp6=
z?tw>Qz;&Z8>?}VzeV^nwd69=yKfK@+i8fBpTPUy${4(4n?=2xT@bo&1@${pc7?;Fe
z`T|$YWjQmXXU<^Ue6W9h>itUfpkl3ZDZpf5^a=b5w36qiPuI5Ou#vyZck$fb9{oxa
zjdy>HtGgR%OKm%riYs`!+W_n=;YO&ZFF~ocBp~Ov3Q%lh9WlmS`m!7aIX`-!bl8D5
z^+M|o?_D;G&|W#d!3!83Gv@F=W$|A2yr7=OiRn*`NR&tLHfwJrS#Awzlp^-9KOAkR
zQq$TEz}SC@<0kSUmPYhu0>4b*)xx)-thv|DpAm?N3ETAF`E|9R^Hi&H7zFx2cp8g`
zvvRrwI!`9*Ui+R0_?b5I-*Q<Kg)rV!p<D~x%P){>W37W`QUV+-P4rIli9GaUFFQo(
zX+p2qw(+6J;y{vSUdV|Y1O49fdjoT=TCU4;=lKBbs*Sq)W(6C<X$|H`;!Tj1W7&M~
z9v!Jt6)L3!NnZ%#qbqoITT8Te;d_DFgBjG5@;?#LNlXmd<>*(s*TkdV@Xd`6OD=89
z1hDP24nR}OeDBFy7-*(zqUik3B<aRFu0M=<cZ^Vsu>RB0;jNE%ZakCNpdQutWNT$B
z$*9c_KU4axS<bVu?@k~CvZ^_Q&+Q5VHV4{ebTF!;knY2)El~$>Y-ynYCW2}T$mb!R
zo^WoOUIsKzVB>vM%;W5N)91Y2G`!532`d+_KhpKhZ)0a?-vah4GKU7P3ElJct-)-d
zfs}MzFiU{k!d4Wv(L(}qo&K;ylUG^T;FDMcut}wjQl+OTQXLzKY~$yC{-ivV?FCAB
zpWrQPaKMXf&-Zg6Z@*k{y$P5Oh$joZ7-bv#fSAc4@$KzxVPWB#0Ix6ToYplZr7oE1
zz*8G>91oN$j$M;5k5Y`#eG=i_zQ0n2T_>UW^1ii&B<u}?wJq+(uwRUqV^7EpG+lWZ
zruzWMp?iL1Yx6{@F6EZ#E`&X*;Eo;Jh%K+~<4niw?Ci~z9es`;bfZGIaNR7({bI*a
z`&*H*1&MXNaxC%bvq+3JvY#nOVYFQ0bGo>cK!L2CxO&uC)$aIwiypVp%^4~aFGCPl
zcT*`=lui!JHj)+Z>4Ez&Utj90#prC}xnQ}~VGvD(KQNEb{Zk}el$pnFl6;Qqk?xn3
zl_-(+{Wk^o^QI4XTJ;a9DY2nOwAU$;KW+_+&TlQK0mk68lkrE1dq+Okac=W^1)22e
zb`V{v?sTh609_a@iFljeb?;+se5UAAe6E}BZe`0impzfW`(avC{SI$I7@EH~?he1I
z7~W5piDCGR0-st_-Wc#;u7+T<z{Bt?NuTFS*WG6hqgxX==K>z)I!-6@%bb_KtHGAJ
zE7!1G&UV?K?ebv{p_Wt3!X&eZj#{<7MQZ+J!&Y#eG0s2IzrH(`74A>}8bVVNvC_0(
zwRoE@{rvSI)^8HF(TNodoL=8n^?(|2<wHN^pi|m^6679!9TRnwM}OsujC~_erX@#w
zb{k_Yd&{dj@SsEtmp_({@+JUehFp*E?C=GmHK2RNzIms$zbtE2Z=`?7iNM91>)!Z2
zXj7aQ)H|NQ@vQ>$y%d^WT@08c=~;ZJRka?NvD%232_ZWR<p_bNTU7URo@`RP_SnKa
z($K#ScJ~Hla5XT0m5^_Im*^tVTzO$7)4{%Z1Wi_qTVl$%*0Gg}ayH;Q07?wF?PC3<
z5n(?#zRr7r7DKse0G~}F1(?IR=RRY3=#=pLolN_cycXsALo5yI-SNzPVxiCb?2>QT
zXWHYO<bhY#UWgXSuy0T1RF@vQeGFcOQ0m&%+ygb2=TM5hkT3l4>Dt%2MDyL-wW<LO
zAK>$@lYRP5t|>N7<8Cz916yp{38(uBJu)LY2~i*R!?6!^zo5}kx@=yQ&LB2tU+tWD
zrg#4I8LKxKCM6R5rMbUqiJci`5G(8dt}Esca{P-GT+%riLoJpnD)ZnqPqu?>=K+*m
z^W5(octsA~T_SvkVd!`!>vp_Ni%G%@|Ev);#**KlF5ADC-PRY&%82)-{wiemHiii*
zw+5rBw8np*YsMc7dzNwsQOzZDYk%El$|Lh7(R2>c^Qoy4#wY_%uf-B=0;`*3qS!y0
zczRqpe}5|uXLRvC7%0=usW@MQD;UczFv+vc&r~URG{5-ewY@xgb73QC75^gh9e!!o
zGFO5l&hJV{_xJk=3QLG5gg;XmlX8c4!h&VFK2z~wn!NG!$1~OWhMk5%*=_19OiQF4
zzf<85%fKx;z_CxyG3oMVmE5K&kX?K!ZZko9v3N2Z=oT$$4UTUPIaLC(+8*u?lTPkc
zKh527A_)!#c1dag0fJ6$dwFf^DOCDeKuNkRB#IK$9`9b)=sn;iQ8Mg4S5L4ipBU)A
zti$|>YvHr3PC}$u{TlX!=^+;ig_`)z1>;nH<9`7o(C%&2AEBw$C#eywblpKmCGGUe
zP;XJ4OPzZ)Y|c$0NsNWQ8Ajw-=%yG<-2)i=W6J!60tY4Q?B3Y<O|;zYJhrP!H{)dn
z^|W<jyqb}%p@7TMe;DVbY9&6;FQSYVJ-HgczbhvzdprFoHF`XFxCAp~YBK+%KO#)p
z_R58x{tTwJTFsF#H23^!HF5LTuUC)iRqF$pd3V{ad3_q?$z~MM*a>y|ju~t`4iwK2
zm7+PGO|C}zZ{{5J=xSeEGMHBaLM4Mk$YQ?{AW`23&aRyh32w1R!e+@I^dCXKNNR|_
z?MDQVZ?R8@J_~O%^z%YmYEWys_3~c=xUCN5ugmtk(X?IiH|J^FGV6T9>5}X?Oug$@
z*|)zUfzWQWILpB#)NANHj*tEx;DI#7v1lVAq%5{7(RLl&F)>>|rE=450d$IQ3Lt~1
zDdwqJa%0-8jk*Q<xkco~cE{{TnkXkvWZna1FRj2dK#{o1|9lUNhT&ZTs}B~B_I9K~
zMA5e|KK9=3(nynyms4bC3i9`$2E?ZvH1i;=qwsvOZzmWC1{F6oGCw%;w0d`O(u|;D
zCGnx-nx<Y`=|$YhBtFlRyc%gBw9bdw)GP4~cD$D6ENzv^LsyJpz@G^JSPrxPI<x^&
zD>yTj!MN*8jVV)Z{t@G)dhNa_1kI<`)2yK7yZ6rP#-r?Fb09FNF+WRRhJOLH_eEN2
zs*Dd|-ds_+=m|1%m>*ueA#_GKdCNIEF-=()=I^B<`qs1S%!nlK-N@<4=_@<}CaG{O
z-b99u!_l{2&Azfl;}n;?@HP~722?CH7yV6#K-H_KBdC0pR281AD|P}9_q?_40BwI0
zcw!Mv!Tmpe;1@3(NYF1``xTS&G_{v4k6w=D@(c3EChf}=k!i6sT6%#jykssi&KY43
zQD;fGg?;t?LOcx2k{F+R+R9fotyYc0zXTT&I2W3MxQk{w?|EJx8H?uio^5ch=88^<
z!7=D264D*_)~#1kt0u#=IPGSPlm*-(xtK1}_ILA-0{_16x_Jl+?gep9<_VynSekcp
zKj+KJ=#bVDLp(SaoE|9CeKp&hkq7S6uTj&k0XO|L$`yAn#ns>4M6oe00Tn2LP^<Uv
zaPJYPE7449nogx1JFpX9oDJoAE2TNy#9z+&?MH>yq%t^cLm-KpSL^jOMR#g(Z9up#
zhu)Lz#pxUugAa$dIGZR3)t}+=R|TxhI{cg5b4Dfw`3ks9XFyr3<IMDj+!<UKRj5X2
zLIX*|N^T;u%h}DcmnM{B-;eiT%jcf-uu$`Hz!#T+J<VGh;L9|80*VU0)+b)nT~_L{
zZ<&!lVLFZFqL8mtG&5UK=g8^mMUb4RuXYc3yX}TFQ1cRwnq9InU%P(3-JWL2iGCez
z*(PeEIDD(^<%2GLdn=?R)sN!yyvtidAWBI|BBhXKajxd^>CM#zCr9yaUr8JA#a{|n
z4FsEZFSVOSPM6peKj6J9xuU=DXlL59n}t%i##bWNOq?4PG-#vx(PS{V6JYy*oszQy
z=PpcpU{^2~vpRU##2p);_$ip!j4VGq*UNXMkmi2s(NCr0ihgemczE{Colo}}7UX~%
zjHxF@T(>ogoM0KAfPXpg#+<?AQd7F4T)|z3?sD4FxrI!2G$wFcJ+jL9S;#f7shF=+
zL9#n#hM7&;yAW1}x*Zj_ql!xAq#NZK@btBv8@Td?fXfbo%o*osQYAkX3XHn$t1s-E
zWN4S%-B7-jBqyr<;R6C(GD{zyP&=dlMwm;6!&=;0B&w!_uc`i0t|`g^6fDg<FwEz-
zg1w6HP8heEiOC~dE=}Y@o6&FU5@jFLwCH-e8Sa+(#_{3DYS<!&_Ey13xneX0kOz#K
z==k`}X~A}*Y$I=6w=aG3mS{$3R&12p-n3W=ZuOeBZJRG3*dAl5XmF%@5_*fKQ<j&G
zPFwtrB4ucYcBuZf0M@RN(&f1TmO<b7#NXD@usppb(l6fiJq*I}de^B*EZ(yH{;J&4
zIRggNQhjzky)-6IVI#Lbf72DbiTGgI0?o8|v&AOf!IB_+1{a(6Ih1p?Ew4ymlK)=+
zd(=w8wBx+wUDmjjI8@V+K)Y#)Ir{y4lDwSLStq-)34x659i?`}N&kEpH;Xtyhq-O%
znNkr>foIKpO?F<=7RZ6uMe5XhMXlZ#x4xfwE%W@^!7;gQVbJYSa-k;GxleO{c%5P?
zjnQfr_fB$H6Fy$PSeJZTE4R<m>%?zr*-lqQWNlc1eRy|d-lE2^vnW~$WFdZMKo4FQ
zpuf7H1kG(|=F;TLKHnopv=3TE-C`(C64=@ii`Oq$d2rqlcMoCZUk16g)B51J)Yq?K
zUUw_2$)I$J>m9lsp(KmXPQ%9Djz+`x!^c^}HAG%|>=v7e1MEXBvOZEhMeUt+ll<;j
zY4ZK)B3MEnEn20YO<u?r4*y6qH1m5OEh*M2`_(#P=h=yQGH%i@M4S%vl0l4ZCyJU$
zz!9H8$xvl$$@Ud+uRl9>sd@LSUP+To&9Xw!<_egPm-j8G1!qJIHGzvqQRw__4=pa;
zWN^L-E{Tu=rF`}^nO|{ybl^P{r)<bx1o<NR_G@ucTD+W2u7}yr%(**3Q{C_jT-~C9
zPB@I&MeTsZ1W@p0uTF7MUTe|lue=NM7TuK#l*`X7Jk41%lO-F{2a0l)Pp5-?25W#g
z%N8WwlU*h08Wr;`hSPg{GIGFZ?lO0%8u(JALLWHJ<Mb#~^ZBwpe@0_^+H_00B)1fe
z)BLM@U1uAjaQ+q+jI(^PDm7HD;f!c<*N=7v=z(pEaN`5dv(hNfvwD1du(`-ECk=5`
z_=Aq*(W16QvZVl`1gN6M;yt=r63f7m$SVe6Tv!yC5F7-5X)yz1=<SMq9~0%yyrq4c
z6k7SF@<~XK=iR#^2{K`yjx6exJ_++>QgLgaJhO-9YJ70o`g1TmExg|UCTzPq>!?TM
zG_xrDGX2K!yO6^fKDw?yTmoxSoews-2m3D%Crf?`v;MPuW_}^>^o{HryBbXA%GEHB
z79Gb2)>P8>D4+d^hdYgKzpzTSX0o*Pdo2`Es%zJ8u6G3ZPa}Mp3!ScZZD8GS57>(y
zSVt#0+UErydv*_c>m|K=z^v=uVTiVb#_nG=gR{I@L#>a9xT!ily2iBd4c04FLVAV|
zzk|4l4_HC?pIpm&7k<@Pe-VQYdBG~uyLDbUm^b8rwkrTRu*BhM{27^6&y@A3a5)=i
zqI!e1rh(0Sm>6aq%-Ng0-HYZPit;wy+a^7HZS)vpENT+1Q>!8a^>d#7Y9YIPW4xqO
zp;_rzTVe3p@b}UI?~~baY+aRZC1d$P-zSuz(;U31Ew%iM052stY6_of=`IRUcl8r@
zF9a<X>+OXzHHMOBOlTp_Q6nDM{mI%foaae2Q83k3c*G_!2z_hMne35RJe1V%eIO?7
z$bt`(9wjNWR3BKcDdJZWbn1s68#S(BPT}-NI$wr3Kehq(aO6fBeS%)3Oi%h1!vjxG
zv@k)S*^+JHyPueyShjZj4ue)gC!!>!xOx2u!KX78oL?1#kSq&I0Uobl`AX@95uyRk
zSk5ixaKQh~o-UUQkG@Id@jKZtb;!l1wS=14lf=0PC=m;?vO_S5RJ`Nq_956QMtNB5
zG?5fw*?(f<fOi0PcFwF`Ny8a@ZVsB0u38;_E?G7f^QY+jE23=l{WU%FZkwvTGmTOX
zr?-L*wTj6EN{CF*VO*>W5iNT#y%YT9=s5Y{dy7VH+A;B|w4XAF4wvNGCf-im#)q8H
zO1oR|ZJSkW`N;=TR+~ZtLKb0`!6(lS<W|$t>cN(MCakA4TXq!)75ob9elC8|EZ*gW
zd^3j}!UpP=$jF<&<;lFy74+oT=pxq_hNV7DGeLuj?CB*aj^?K6>UTx<Z=4CUSx3hP
z=75!!%XU>;A|9wO<LRsWOBizjwf({@Z5EOsqI4Q-Bb8wPS1v#+%mc`w(Yf+~I93ZJ
ze*(k&5nf)d-XUqS`9cLT(Gm2+f3(cTj9hP4{oPk2UJIyM^Utw?@=nVTlJG1`<nr=L
z8&_lpUTVxP(N!)&dNYs}(Kwy4u~lfQ5%6lO!}C_L08}I!earczwE(Q)w4hLb))A>&
z>SV3@1WwS5S&`*}M0;F&mW41v@dEvk0CB*aQ~RQ+QO#9P55pyMGuHxgAnzXdvd{(e
zTk!m2Gz%@yl1pht<^gJ4;sS{{We#)F{r0Eo33P}NF+?!Y+;No;GdIW8*xuHo8Sw7s
z;(1%klPYaCRCYGobq?lu1`1FU_Uc33EjL;6Al~F6S6EZuEn6TRd~WMIAXyx7K`tpc
ztzdS*2_o*j4+G3xF5nPV(j<Nz*wYo_gZa(8VEc~nPBVoORW?F*%dT6`kne^lKP8V<
zR__z~TXhI`y}7*k3BNMj^pk2DDd`&<?4LpoPuq`kcFT~Ff6dm!Jh{-$<XNtZevQ%r
zY-psKpl9y=_Z9j3(Oe9c(Ja1d36AtoWs_U-GX9GO|KqbcFR^u?i70>W@6Y<T2mbpZ
z|4Hrdc;o**jK2Jq<<b3QH|DC}JoLYgX{=8gGuhnn&wsh=Z-QLpx*=%zPhkA}$wqWj
z|3Hd~=Ry0u?v$keGy<?2;tTDobpPYlVJba9n}Gi?%&-2Yix3FcXy5d|Pwe-%9$0gS
zX;{vgzd!3=%Lx3^lhXeSA%*5a5=IU^OOysWqko^%KmXrwYweGvR7u?am%IKQCcp9V
zp9bvVwEc2lMN=Ryb?!e;4&esN@Wer>{>QCV@@;-+82s;}Dynthcg_J3D{l5b(DBz7
z&5i3IiH+8wSO0+Ye^H$u5G(&_OyBebSiWwa6l5ClpC?Cdn6d8-8fX3=x4sx2{h!yr
z_0ER4x4ofRyGQ?v|2(<bhW`)lf5Z9z2lro~{_FGqHMoCs?h$0<kIX+=(*;h~Q%(o-
zOYNznUf+<tz}w+`U}}2u<KF3n<Mhumw@>)RPN5OgbDGUae38ugy;r{kPCt&mV*GZ-
z;k9~3gV9My^?-}svZFCaw@UM142k;1#kJfzOQwnU{P-ZNqs)U4cEP1!{44n<_sruy
z#Ct~{)-RoMo@L-C9GkF3i)R+_Cq2u^wLDqZO*S<vPJ1#sUV22n_Ao1;;b^Eq?o5k_
zTxz&i>w8U)t?ZqlDK`e$<%4yGX#dJ{))|dsB;VXh+&1Cpp?lf~MKA+$+H$o_c~_k1
zcR-%ZyOpk&Y+E<5%`j+rcJ0Y%<A393&$rEh22=*paW2!YQq^7Z$+1x>b?=n8#k6K}
zkD5^>wE2P$^}fDU&l`b}Z2_Rss$DU^K0^~jA>*A;2nHQP-Jl|tPc|y@9)d8`&~IM+
zW%~GXZ<_<NB%Q;BHL4n#m%^i$i!bfDUIPgx$eantv(Y2s85=C&%CD4-C;S|c$@cz;
zY2vM0h#vXsH|A#>UfI)1P>r0yzR!NuaD`QqO8VT!8HznZF)P<aG&p0Hx<e(yqFl3@
z{tII<)%Dlx`kD_mo^@EA+*mu?bCLA&;NhRhf&LZR_)2XtbdJd{)&Z1Nh~baOAVEa7
z&HPb&_^kI7Zj!kC`am3EUxN(%Xf`ygP(5V19PA=WEi&P8)A&=3;a+F>Cx#Zr>`x52
zS~lAE*jNYXC;Wa+2`w*ynUbNBzTN9O|5O_Pa<ZZKTRCPl?XX3o&oI>hn!T!Y8{9@e
z!P+76`Z80hV%sfO_1d#SFSzzLy`mvKf<IeD7v`Sw^QKe%Su(wMt|mlXjF~hMj`Q`6
zym8%1^|oiHKSsn+qt<I<G`t}a#=aIpBYdumHqYO;u_L~3N3#}8N+DFLipd>%Gr9Zv
zvOcurKGzG<RBWr604n?v-mK2m^YcnvxBA(Y9oa~=$8;m9v6<GKftc5!Bp4zi$0yQE
z+Z@UCI_F81a8Nf?N&m-pjAC0}=uELOyPT&r$-siwK4Y09m%%5(Mk<f2>F;LM6P^HW
zvwUS<WL!JtZT$p5X;p>rYN^G^hEd1qQr9_#YFeL$ii9jsMH=NRzajWUf$0qiwk3yh
z=-Y#*tiSwIOs?gE8Eh_;Bs(pRz@@Ge&rHmD_X&dfc}SbQRyqQ_RE_3MD|7dBHTT!g
z<h5G$xheM1On7m+Pg)qh;$ezcY}3gtD=3a^yts#Xr7YCHQ{h%<p9NkGO<oy$9YLGL
zF$?a|pyE7B4a)ZQHECujS(A`rAUayf^!vQ{*=5T>{5&0L*?|5SX%wK-%lns<`Pa{8
z*v8l9&t@5K`}1x{0S&uPukBk3sJJ?G5ML|nRU}RqU5s=7Bhu!Y%iBAF%Q83ec^CwE
zb5GiiC{zy@l+K?#DV7o-JH1cm0aI&;O~P24Xe-X0vh2%r43dz?YCkyzc;k9SAVl!A
z_$l)2iDUHBH_)G}q$Z?bLcpK3pTtXy-DHe7u$~9_!hr?LCz^0KWhfo_6;fn7EjKB$
zZGem*$<DrfuATP5UHOlb)DP{B{Du`L*B|=fM7FQ$Cwr&Nr#A|ywDMvKWpu>8?<psT
z*!+C;LF<Ua_pw<1E&VX>^(UV*kcFk=QS<wpx?z3CtKuQp8}`1^_hElb=kueIyyNfj
zZ@c#^Bg6-R%ka?l%dfFNv0e;*!OfgXDYHrs6#;@|k<zR6HJ>XNKF2y*J7Nq)a_dp*
z%{qO7vY0h|1)K7R=P{=(FB|*C+l)3A!n{;6?gXx#eTY;v<(U@TuCa9YW|TjuP`-DL
zGc}}Iufh(HcrM6+68&Oah<3(*nJ>T3(xL#j<RFRWCiZiUjcCaI+H0#~n=Z6@%mYdj
z*P|i%-x#e`x4jw^&r&gRunv6I6e+j}ZE=a-taZ6@oh#3DLL!}}r%%>`E96I4hZV=0
z<K#PS&z<L7Lgmh|>S=y%Q~xcdsMhlSK=LOn;8+LPYXWXuH&ms#8Bf&7&=fO9P<cP7
zjouVSycaGP5#W7SQ)9X8xBsTiD&Izw^Obpi`jNc9D%7ID`1`*1Posv5c#2C6nZMn%
z*~Qx6$I>KsP5r~?<1`bXo(C=l#rRaelPmi*!sQ`<P%iWo5`nIXoniL=azB$PvS(Up
zkB}V;;)olrc{Zdi7-KKh$OWumzhuqkYXOytJ<t<8^Mt^X^JCg|(!`x;Nc*=g2NMsR
z+501}=%;T>IuvO`MANOex@eFWP7cc4^4j8T&UiO$e)?q^z_^j+fl9mdtzq+B=aE#;
zrIC<7+)bKHmpz{CHBK<*o8RmCI70K{dCZgAs}skc7=q3BWb~yaBJZ4E`y`-(>AjJZ
zW@)@XYPF$T!MocJ##2f7GyDh6A^$yyw4}pputp6!ii;$}td!pyJMDIaW7_Tr<9Ev3
z+?p$Cd$@l{4CP<sc}Cu>dVO52k=FcBcIxxdO!=}LdDEfeB-%#GalXp~@gd$fZl^)9
zE#%Bz$e9x%tMTyDpL0QH_7ZI_%+{e+^}?{Rh&!&o>QLX`Uu-?B{$o5mfMXU}kp9_w
zE`ZBQ(P}dMG6NA=a52aK4>n}Jyd@RIr~@DmE7Kmh4fpyu!sf%)V)lZfP-wDE7v_Q&
zlNm!b&0h6u<hhd+T2%%j{lvNGvHE=4Nx79C4vUV1ITOX`Z*`nan-UDfushs@>Q~CJ
zxwIuBUC*VT`)BQ+lw1rtVzRjUtVyjl(|aU5WaZ|Z3AMd{i3o(D?`A3J=xrpqoHVhK
zj8&>W8k)A5lx8Dhx9l(M(=wd^lxnoMIQb)Rp(~BUf+)AL1c+*VCPu}!F>yrD`_-;F
zIlqkEP3eB08uL`#z3PjR(*fGKxW+B@e^EdGJl&{l?PnAG@!M>#ex-4hL<;$E(R=D#
z@Z~^tvA5DeFp~h=rW;&xr}ugY-2x9~hXAQt{m6rhfxhSbMBcem)`$DpKV~OfXhA)K
z-2nNZnfhT|$Cq&t-9a}4qZ6w`w8V6=`Ns7JAy2}l6lrx2Rd4BrRUe1hq_}BcW!d$3
zb$a%B`=d<9`~c1;VO4HVDw>W>qdkn;oou3&7*kGt1bDBU#@l#FQ@iVi{n?J`!Ol-&
zMYwumsPW-EjQ`Ek4Sw_6`7u&5a80tgQ|cU(n0u~<;q~c*tCu7ML-6hMO4m%o^pC05
zl=U=+gPdX#3#v_v%LKY2PF~wc**ROItZdpZyZFD`5$veAr_vMOG5aC?Glk3;Y$@Ld
zMyj8Phcc%vkxe^lAC?ZC$YK4h@UQaDXf#~hK1j4#TIggg^&ao4=zPiFMVQUMm~_Z_
zd0ECPK>#^-aEbDqb%5pJ*Y659=4?;BGiH;G7-j;N0k-U`zQ>kv=OuCGlj_MpR|~*D
zL%M-N!^Xdmw-K>6B;vb!Dj$Mr_Jn?hP`B4U{55&QHS5kxf=!0S;TtgZ4eJ+3(TBc<
zkv4aB?w|tB2ioL20+MX|2JY77dtlM@R;$xoo36bkS2B|T(l+!Uq_16+>JW2a{#=wS
zph87VJ|+ndtWhMT|5pbaVf5Q6;{{a*mQL75r?{L}(w-tBnRGQ>*>%G*180H^X6|q=
zQ3nDwLHh%a#VdUuKE{M}!c=>H^ntOo#WHGFQ@1Sxd{6K8Jiv^1d=0<OAR;2|w{&!1
zakX!cswcXm?n&(_UJh$`aEfgm;nny^8CpR0t>sXi`C!6AbKd6N6~=1~@6xsy<KLz?
ziix=AYR7gjc>1n=pSWwvVM}uteYQ69=}tRr*U-<OBinn$OA9vgbPP%yT-=T;{X^+v
zUzUu7$7<)wc6G92(h;7UTt9wXQrPx`qb=^PePaNI3`Khf9pW_l@_7AjqaDpjOhJct
zo5lKkB&xS|m5w?2mKgM5YaHuvBZ~YKRA}78fue^hQ^JjHm5{lY7Pyg`q#PgIaFu1=
zBFdaJ<rXi4Wj?e^J95Z7VS<=wk*wj4EsF|4?D-0X8$a8oc}|B*l)baOl@b@<f&6Nb
zVuE`)3T+-t@N6PHzq-IDPlrSeIr*%yx3i+dz2u>XLRetG>?&YOl!2PM!6A7kS!H*F
zk-74MdoxPM6pcN{>$b6Cy|?~xs4e;=mJppY(6zKkQ72R(tBW_96y7ZwZw#el?A<~L
zkH4v|BQb@bYwL^YKTLuMM32CtASfg_wMBJ%X4GYNy<>Gl+e;Q|u(mNu2D83xO|`S9
zMYV~blge5zi15k52NSXoBSU-#{AgtHY%5<97`~{ZN5r<4-PI%RoKzO&60v0quPq;w
z;<#~I$8>CvARQy(@Bydhv0@g_u6M&!;6hMy;^N3CSz!;^eg^{Q{{1%$m&^$7M<+zz
zD~plkOp)i<E+{<GAap?{dtHRLODBeBvDJ}ur!oS0g(upb3p@hYreaH=@CAfEb@3fn
z_qaanY<uQny`Eb7kdObys3K<s9Uq)DGK#C+*KQ5AkEsrDE477&q_q68{|GXR?LE$!
zJk+hVbgK3gfO;MfHN339Zq5{fGa9a#!PO$^)ZktxyeO<JP(^jGEnA)BAHYfESz7XG
zJLd6gQglIicn)Q;-wb&1bu(qOwgsPL=87|#YG%_RjlkJB3D2h!KJDtZTG~D85&!4H
z084~@6W5FuHq#C^SexSx$zI$7tsKhp?&geM$X<^XGGErMW#IKI(r6zq36X_z?Tm1@
zHu`CK$O!rv5wtP54fyG3$*I5I5br?=ciu}#gQxk%mpvF7M%f8TPp&SCms0#bR-11c
zG&5N`5vk8a8iJxbTQ`-Y<D(HCGvu6Ka0ZGzX-@&dp-!?&n;tJY?H_$ejzhHqmrrhi
zJ_qas62AVR)<>acaT{36+4*c41;M?^Jr*@RCRq#=vNA%{>C-4vP~%*K%N)u(!%pcH
zsf#28Q~wKmV!aco1Et36fdP6<E_)^MQ)X_K_V4)WyVtdk71OAvLM*jsE;Kf%RyPWv
zZ6U#T(ZrJYsF|deSM@T`cfKX7dZ-kjH!IPLP&Fomm0ivqz0j#xc30b|(XUNm<t5?l
zoQ|H_aXVbzd6&AZm0G88!=f!P64jdSKZ|@!Vp#XJ)It~mOpIhFj=IH*QMxJlqqto;
ziVI&5g=K0h*ZK5h6{?IanN6ZhAuY9L*jq-%b^ne(c%g`Hl1WqcQR&1;nXMi}vizIv
z!NS1Q!+`yUZI*tp;GPN`rr~A(wMIceS?BopZ8^5BSO#dRFqt@~qDNl@vY0V~Ghi{f
zn&yE4HKXr7DfnTklNXb?x-oh%$@Y{*1Uwtpdn_wvx9_L7R}5N1n8TB>va<v3(t<w6
z<Q#VKBT<36p5XxXPx5w6d;$sejtj#r3p1_;YljP$RU<69?WLe|+Y0LzRoqKuqdi}e
zScm);N+-<Mp?Pj74Lv2xCSml+o@=(IId>icCj>bVMZ1*o?JOtG;ox5Gk-4F(J*CF~
z3PxMgPhv8E=eZzmG?7<sf`{*L$1#cIQ3iYQvA~9?LqdT3s&tS-(EPP-?f?LaGV#&t
zt&7j|PMis6w~`<mZsR{!%V?u8d~)A-fWGS`NnW0j8wc$mzxL|8hK{z6l?m|1Mo(pq
z)sa(eg;_^Pybrp%!Lu!6#@)bm1)i@Hl5bv~!fm+<kEHA*6vbB}QWq;h&EMi-t-7^!
z;|O@Nep#zK=Px*lvI9s$EaU`?E(6KoN-SNJTLB&-V_gDy&<7wBQ*uiXJl~uW0Qb6s
z=37-VrC?o-I$OLCME{KeP30v74Ha-}ou*Ew=Hdiu5B<T}?KO|fYhSh)xDPDg4Dhxr
z`L36igs&6ChHBd~+7hJe>2#SPiHO@?b8$`Kc7(U(EE1<el#>@%_J{y_lMyv<ZL5mo
zBaZQ--zzDAG;FCMdlG!7VEQn3cUK>FM_UWWyOFT^>iSW!fdH><yz4^H<Xgx8f}Q6-
zV26Pp@k6JVd$_tIA#zDA6Q6R%jRA>Jl60g|R-g?inj8m!5B|0WQ&PT)0v^R1pIglc
z6W{b92a?dvbu);?b05iFGVAPmKyWj+2OTqg;l^@+5V{s_Hrso=|MKf*K_S~?^T$U`
zt{yvU1MSZZ*48NT+y|EHhl7uLs(Ads=s9@XcsnuXQO{63>>hfx%+^7Kj=BAvymq|?
zNwds01k;c=BP-aTL0aGrY1jZ#7~PWfQ0F+c*=c{TM^WLCIJD709T1FnWPGj=zc}Ll
z9db2)K@Ope_J+_y(e+9}kiM<a@X9f_wqEgsXapbB^;b;LA!YS6TLKbXKj_i|)XJ;^
z9W?2jCKU!|w-gZ7)7I8UI9;kKf$+4}MLkQk4||YVO|N+nZX03l1zg7p@#9B#j@A})
z?yM-!&bxpoN=^+GX2ZFeS{IMqrg0fTKv&sGvN^;{5*oWYrgRL0lO7N@di%{u<aNr1
zoq=mWpqDgyt13PtNK~Mj+fM*J2l6Y?IW?h7?iScsI+IE3+{g|1aQt{>KpY=shoRAX
zGAB?;&__p)LubY>;C;ER8KxNI9MUov5G?fX5|Yt1S)a}H_o@dP!L!xP2e8-^Kha(5
zY-g7;+7u@J5ZuyhfFLul1E@OT`9uPCe69Mf8HAKHx_TVPtyAy4UpdNfjOOOsAT`sK
zDI5>+_}zw@tsk$mHB1$a=6oa<2hTfVzJXhF<-2x8^l+FF2!|{F^VkBr1__DXvd}&T
zgVWcK%l06IAY^ij?6b^jq(}gE{J5Ed`S3So42VR_dEUAgatA;o8@_{8Zk@EnZ;5k{
z^+3g-QdhiGs-MByTkg|uL&U5y1x*od6YR1SfD50ZQO}QRNnZ8lp{qOssu2s21H6Ms
z>S9KIJfSUlJz)irQJK29%hg>~2+nGG<<rh>1V{%Z7V#r3y<CVnKUl9p#^1*QCNJpY
zfch<KH}Md;)I~HmXC<Xwf&HdJ9c@v3#<4YJk}oOy-f1x1Mz3zI5aeWCnz;TeaZa<&
z1)@%A*MRulgLabM!n0j4-|AbB<Sae@O$z*r8deV|uq48XWT@tnI-v{O3~Fxg`5W5_
zK@3|KYn6@}^q8C(cn(TH2Q@k&K{5D7PXpKSv8&mq3%ts$smUW{cm0rKJR-XQYRBP6
zZtzATNzrlzzO%ylxUV0w#|=~}37#!E9rs_6K4vk`3$`Sv{E}E_KK!h6+K2_?|2C_7
zkQ`v#y=(clUwL_)sIAsh)d+wRJ&Kb%G+jr`v~Ely02K|Jg0=%{n!MtOq^&b02h}Yo
zrpt@_{u)tENp6H6iKA=I<pmYkF#oGD=+@Z_7Hlxxq4`Cxkg-@lnq$NRy}vv+dbQZn
zeA;RKIX<cF-D3CXOdLgz36%Gk^aP$FmxC(eMrxD%;he>@p*aLE!s9X6)ar&70-3<)
zCuz#6<qt+<^wcgBwGa`JdTKcvlP3ZmAM3e^JO@q`{7UPKfxD34?86E+h}SNN&D*w)
zLh>O5O(wCDmuhb@3;kv9nLig-0P!gc?!6=oRYj_Q61Qto7U0uodLN&<xSyEsI`=n}
zg>w^=7u8fFLIIYBN^W$*!IGoza$QVik*0Ccia{}X<{IWZ6eox_9kT_b@3^eMmAI!U
zQWWnKRFA-wB&~rUGIqX_0_9~31~S_$s0g}hzNM|v3rz?f6LxWMs{E(j9Y%~_U4cz?
zS|J^?l18779@7Wq*%vu75&#HG;9k6FOCG<%QP1i+M;LIKhyD1}HX!}Tsf)E--6w@R
zWwd>Gb#`PxBcNdIR|{-lDRv%pp99)+yiEkquenrlv&0ncw8n$kJv!#ShK0(a_{SDI
zdA0vyu!~7wW%d4t4&Z`z{xnN7`!y0G0u5ViOgd@=9lX~GsZ@NQ<rlXOXkT|5n2W*M
z?p__9vV($?R05EZt&4x=ojlhYY9wL@q-F+6Cw7$sTFMI^SZemojhe$6S>#&STYr=&
z=Otf<SU^au=A<XB#ivqGE&_o!0VcLf4rx9T`Qs0^3dn=|2C&(r#c)t_wRtEK5IFa8
zw;g_?F{Z3lU8lOPGB(=WBacT8aC~b2K@LY32#8niI}c`WC4^5vrx0Xzk_Kv?Pzr^u
z%1saeGqiOv!=W59tK;R&ivNVv$lX}op9ev&?jqdU8&QA}*{A`KILqA2iRN_L{$Hq4
zdvz*Ztw-Boj-;UrF%O#<Yq!v5e|iu)YVJ+sKH!FW7ERCJ5}G_b*E-yOxOdo^G@aE#
zOInnU4`@|~C+LObE#~gEkogYQN68011p1b`GTK&!$&^vC{OTeQJZCz8TmTZ!bAXy|
zYA5p^1QP;+717mtxa}nc+1cIEoJeICRCDg45F}UzT0u}JNP#mJr?i5Dd7!UJPY9HD
z)&+BshViy6^4eoUo!=I1d$mrGk7M4us-Tp;v8CSanIenU{`C+AxWA=3{J3l(6EJ*(
zD9!}O7g7omReLd0N%ATO!1_iy0Q#LD+PG(^R6s6?FE|P1w$woIRu>1;YcCGvB6ryz
zn`fWgr%dG>vQ-p;qGsb9HU43+N>2SlLQ7CSk9rmXhMN;1zAXjbCOLW)UZT%*(;eED
zGKaG)&x(r<Di{?@F*hv({GE3W=7cxhv+!x<QL#+mGDKBcE8t-`{C0ZuVJ;jH5<*YS
zx;;G^P)7XaOFs(aDGiUL>IUPZXPzr-^dXBu{D6C<oRd7+wHUB|qLiClq8~!WJFXvF
zwDfE_aK>hsYxIds9m|@)nIh?MntkUWxf)&{xg8_ujAYn6d@w{U^Co#yxc<6SgE;WJ
zF6(B}Q-*-W;aYDpX~nA66Pzxu4c)8zZCgNzFe3s#)_mPB!yG@dS~d2)uni9A1D!_9
z($-!q&Kc}7<ybS_8Gv0YotP=3jY~*gd{Kueiz(-9p!o1rx6W=jp#p%CF|yFltKAR|
zVe|nO9Mbp+0ijP>oP(lTN7ojgpiV%CnEz%Ovo`<JP4j0xl$Qq_w4M~T*2NcjC(67_
zWPMn6&Kewu7{FWJ*D6C77hWqJW8fqoIFZ}0rQDVknUkERpBKf~Dt`zxu|7LgHM&*n
z5`-86e4^WiQ(M6)@?ASm2*x9n!yOFo5<?Q3HoMC+pu_auOE@g4ZFcNxO%`*dA1^up
zatQMKq;vXM?}Q)iQBMx|SbbM_B)EYHR}5meKC~cc*Wz2`m$zLYege?O>0OZAk6A2(
z9;_cR!-IT|VwKL;aKfkgT=pU5=4p`b8=;6*MJKs^I1SP|NN%!3IV)MH%;V5G?Pbtm
z5X4UuN?y10L9h6<6`ss~gJHK?MsZ^YY7mPx_(IU(E>h;D{mgE_ZFHxP7IAeXL`VQr
zw9y+-6@;4|?fF^0esU5xQ{OU1nHlGy25gMSBm=l(>ta^WVQ5)_u}DcgZ%}3R-IpG)
zwiKVXl5ut-Acg|-PHOkS%9)F0dvfZ8`N<9L@hR_?VI>L5ROk+lvUBR)y_yUBRAO@I
zy4=2V+L5*;>Y}CV_<@-b>W76+-^u91j)0cMW2Ixul6bjXb`PJNJP1hzK4b1xTD|Z*
zPs=<p@Uuqy_mU8iU09NZHtA7X+w3f=YELfYLyiWVw94(#u-Z24ae_eyts@W<C4f7U
zwg5S4S9HlzoXzE?ZULTb)~9im<eauP)3x<igynDU?s15NLB%q*ew5vqPhTxUDQ~fe
zTZh|^7kXnkWBS(RW<Kcml|Ko0I-5sz3w3z>8jd}T^iYrucT`9N;zt#<!G~5Mv!!F}
z3EZP7{w`n)mq4`ZiKb3?pLWC#)3Vk%cj?R>!@=IV_ObX~JqjLhgw9|Z$*I$~99u=8
z!p>=naih4K`(|)zc(PAL{piE@s_QJ3#UL<ZEO5b6hkre9hIc5aoLvLa4mc@2L2}T}
zgSUX*b6F3J9KF!3w9BD9dUDWx8KsaUPuN=+b;MJex7NV9{+Gw6whZ-{N|EqGwj7B0
ztpNVr7Ui54in|n)yf`;1_MS<fNy}*C=kXw86$c>m=%r3??=~M>5D-o9MJCvb0njdo
z(sVpbcGnO5V<=>A?Zm<T80_&mqz%2Atv(ZU02rMI?r@J{3zX8Xf6hQ$?I5|(0u{O*
za@u+swW?pe4tQN@lqrmvHhWQv%&t5x%YTNUXtvyTHQuvwa?KAyAzv>We<5_L2CYRT
z=uFA2s~@xF_Q$!@XH*r=MgnoWJ^ww&NdjX$-#<)^Oanl>9u5CiUTOMFprN$IG}Q<M
zL@u%AMcr_FwZ@F@kCJ#-b5=rB|KxmUJN%_;M9L_;sX1JabkH=oLBFP=r(Fn2Y#WPj
z447F>-D^=LZ1iZ9El7_?4B{Hg0q0DFo_SVl2Hl{H&V}!+2d%kRD|{a3hsdS0M0tPW
z4pFcJ)R)J23t4P5WN>%%T`4|-&c!Xq>pS^qI&sbjh?a$<+rc0{jRCVI$3wkvx^>5-
zmOoz-7*PsRc1`KY3D_;46g!<(kGj=QhJ*<m7nB<?DoQlGprv;;$&KS$0dbSNLXe@)
zE~gKP>wyr%NV<>|`H#Lj0X`!erY7VdN36@sMmY-sXf^>5U}<GBZsrQJIZ7DT^<VdL
zM^?)g0&$w`JuQx3Ym@~jQ>(>@jlPxzb0KKqTE=Bm>#$PVDc>&aT~)H3eW`7{V_tv$
z3~mx%$}QKp!BSCtqBMczM`Om1nYVP|3#++tgWwQUQrlEjC*uF?ZRGDQz_EzvAAjcg
z%D(=S?%Xzi%j3D8pXydFPT${C-)D?89&saf8@O+%|Fq-al6O7U*HzPJoh{q&_T{A5
zT3L3h+maPKz4gAn)PH{L{X^~2)Xn+-fBnqPIeKl<oV!QP$GzWPcE1hSU$ed6cU}GF
z?Yk1;R=0J_w|cMp@^byMzTnvG>kodI-Fv_2-Omfl<Incq*N(jP`|kW*4Lj6Ne*IQ^
zy(oEM;ajoeyRYrbH!VGA87nJatx)<f*Z<XvE5MdGu*ll<Zr7as-Pg0$?mf2BdWU@Z
zr#&&RU!S;Le7k1e`zNLCS6Y7nujMV<wz;x=`uXE4)lPm@Ssh!nG4^-w`a<2W`XX~~
zKQf+qrS)%eY*FRipL6$~E&kwYwxn*E{fpNekEU*s-7tHH{Oh+>zj@>`&wuu^e*XFG
zzFNuuGU><-qTM-eN3$xWijsAnygB%0(i#;_U{c>Q`~S+f5!Zu{`^4q^zq@?j{nsns
zf3JG=d+w!bzgLGoPrcH*PVZ~&v~TBc%7>IkdB!&Eo+Eud>(%xA<-6usZ7VI)pCmp1
z;KHANWeaPU?tOO3tbhBoT@m|kroSqi>ur1d>vdOXW8=%xd?W7ZZanvnoU)3JJoNeY
z%I~vF-*4Bs`15T`?D^iiHLvgImrw8CuJgWJ$L!9NUuQoX@AzlALwfyg;rGcug#O+<
zf?RqQZvjTNZOC7*OJ~bi)^2&b0m+}>(zUiT=S*q09q?#0Sbx+Ab(j%o+Q!ZsGiIOZ
zJDqyF?KHCCK(lV_$sN@`8g#%A7)>_F!vUjNX0*5%Eh^zTVzinVtzjXx<Y+Yk&lICA
ztI<~FXp0(UNyBJwVzeU$?uU+66Qk7xWT;}aCpC~gso(WGSaxq{D_ZxE0SG)@{an^L
HB{Ts5g_#)|

literal 0
HcmV?d00001

diff --git a/docs/vtx_web_client.md b/docs/vtx_web_client.md
new file mode 100644
index 00000000..99c45f93
--- /dev/null
+++ b/docs/vtx_web_client.md
@@ -0,0 +1,87 @@
+# VTX Web Client
+ENiGMA supports the VTX websocket client for connecting to your BBS from a web page. Example usage can be found at 
+[Xibalba](https://l33t.codes/vtx/xibalba.html) and [fORCE9](https://bbs.force9.org/vtx/force9.html).
+
+## Before You Start
+
+There are a few things out of scope of this document:
+
+ - You'll need a web server for hosting the files - this can be anywhere, but it obviously makes sense to host it 
+ somewhere with a hostname relevant to your BBS!
+
+ - It's not required, but you should use SSL certificates to secure your website, and for supplying to ENiGMA to 
+ secure the websocket connections. [Let's Encrypt](https://letsencrypt.org/) provide a free well-respected service.
+ 
+ - How you make the websocket service available on the internet is up to you, but it'll likely by forwarding ports on 
+ your router to the box hosting ENiGMA. Use the same method you did for forwarding the telnet port. 
+ 
+## Setup
+
+1. Enable the websocket in ENiGMA, by adding `webSocket` configuration to the `loginServers` block (create it if you
+don't already have it defined). 
+
+    ````hjson
+    loginServers: {
+            webSocket : {
+                    port: 8810
+                    enabled: true
+                    securePort: 8811
+                    certPem: /path/to/https_cert.pem
+                    keyPem: /path/to/https_cert_key.pem
+            }
+    }
+    ````
+
+2. Restart ENiGMA and check the logs to ensure the websocket service starts successfully, you'll see something like the 
+following:
+
+    ````
+    [2017-10-29T12:13:30.668Z]  INFO: ENiGMA½ BBS/30978 on force9: Listening for connections (server="WebSocket (insecure)", port=8810)
+    [2017-10-29T12:13:30.669Z]  INFO: ENiGMA½ BBS/30978 on force9: Listening for connections (server="WebSocket (secure)", port=8811)
+    ````
+                
+3. Download the [VTX_ClientServer](https://github.com/codewar65/VTX_ClientServer/archive/master.zip) to your
+webserver, and unpack it to a temporary directory. 
+
+4. Download the example [VTX client HTML file](/misc/vtx/vtx.html) and save it to your webserver root.
+
+5. Create an `assets/vtx` directory within your webserver root, so you have a structure like the following:
+
+    ````text
+    ├── assets
+    │   └── vtx
+    └── vtx.html
+    ````
+
+6. From the VTX_ClientServer package unpacked earlier, copy the contents of the `www` directory into `assets/vtx` directory.
+
+7. Create a vtxdata.js file, and save it to `assets/vtx`:
+
+    ````javascript
+    var vtxdata = {
+        sysName: "Your Awesome BBS",
+        wsConnect: "wss://your-hostname.here:8811" 
+        term: "ansi-bbs",
+        codePage: "CP437",
+        fontName: "UVGA16",
+        fontSize: "24px",
+        crtCols: 80,
+        crtRows: 25,
+        crtHistory: 500,
+        xScale: 1,
+        initStr: "",
+        defPageAttr: 0x1010,
+        defCrsrAttr: 0x0207,
+        defCellAttr: 0x0007,
+        telnet: 1,
+        autoConnect: 0
+    };
+    ````
+
+8. Update `sysName` and `wsConnect` accordingly. Use `wss://` if you set up the websocket service with SSL, `ws://` 
+otherwise.
+    
+9. If you navigate to http://your-hostname.here/vtx.html, you should see a splash screen like the following:
+    ![VTXClient](images/vtxclient.png "VTXClient")
+
+ 
\ No newline at end of file
diff --git a/misc/vtx/vtx.html b/misc/vtx/vtx.html
new file mode 100644
index 00000000..156246ed
--- /dev/null
+++ b/misc/vtx/vtx.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <script type='text/javascript' src='https://cdn.jsdelivr.net/pako/1.0.3/pako.min.js'></script>
+    <script type='text/javascript' src='assets/vtx/vtxdata.js'></script>
+    <script type='text/javascript' src='assets/vtx/vtxclient.js'></script>
+    <style>
+        .bg {
+            background-color: #000
+        }
+        .vtxClient {
+            text-align: center;
+            margin: 0 auto;
+            display: inline-block;
+            padding: 32px;
+        }
+    </style>
+</head>
+<body class="bg">
+<div style="text-align:center">
+    <div id="vtxclient" class="vtxClient">
+        <!-- VTX client will appear in here -->
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

From 0ea36e4574dada7e46c2e6ad1a9984a11426f760 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:48:17 +0000
Subject: [PATCH 0054/1013] Updated Raspberry Pi docs

---
 docs/rpi.md | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/docs/rpi.md b/docs/rpi.md
index 4794bbcf..f474e959 100644
--- a/docs/rpi.md
+++ b/docs/rpi.md
@@ -3,39 +3,32 @@
 ENiGMA½ can run under your Linux / RPi installation! The following instructions should help get you started.
 
 ## Tested RPi Models
-###Model A
-Works, but fairly slow (Node itself is not the fastest on this device). May work better overlocked, etc.
+### Model A
+Works, but fairly slow when browsing message areas (Node itself is not the fastest on this device). May work better overlocked, etc.
 
-###v2 Model B
-Works well with default rasbian, follow the normal quickstart install procedure, except for installing nodejs. To install nodejs do the following: 
-    
-    curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
-    sudo apt-get install -y nodejs
+### v2 Model B
+Works well with Raspbian!
 
 Keep in mind, compiling the dependencies with `npm install` will take some time and appear to hang. Just be patient.
 
-##Example Configuration: RPi Model A + Minibian
+## Example Configuration: RPi Model A + Raspbian Stretch Lite
 
 ### Basic Instructions
 
-1. Download and `dd` the Minibian .img file from https://minibianpi.wordpress.com/ to a SDCARD. Cards >= 16GB recommended.
-2. After booting Minibian, expand your file system. See http://elinux.org/RPi_Resize_Flash_Partitions#Manually_resizing_the_SD_card_on_Raspberry_Pi for information.
-3. Update & upgrade: `apt-get update && apt-get upgrade`
-4. It is recommended that you install `sudo` and create an admin user: `apt-get install sudo`, `adduser <yourname>`, `adduser <yourname> sudo` (reboot & login as the user your just created)
-5. We want to build dependencies with a updated version of GCC. The following works to install GCC 4.9 on Minibian "wheezy":
-a. Update */etc/apt/sources.list* replacing all "wheezy" with "jessie"
-b. `sudo apt-get update`
-c. `sudo apt-get install gcc-4.9 g++-4.9`
-d. Update */etc/apt/sources.list* reverting all "jessie" back to "wheezy"
-e. `sudo apt-get update`
-f. Update alternatives: `sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9`
-6. Install dependencies: `sudo apt-get install make python libicu-dev libssl-dev git`
-7. Install the latest Node.js from here: http://node-arm.herokuapp.com/ (**only download the .dep and dpkg install it!**)
-8. The RPi A has very low memory, we'll need a swap file: 
-a. `sudo dd if=/dev/zero of=tmpswap bs=1024 count=1M`
-b. `sudo mkswap tmpswap`
-c. `sudo swapon tmpswap`
-9. Clone enigma-bbs.git
-10. Install dependencies. Here we will force GCC 4.9 for compilation: `CC=gcc-4.9 npm install`
-11. Follow generic setup for creating a config.hjson, etc. and you should be ready to go!
 
+1. Download [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/). Follow the instructions
+on the [Raspbian site](https://www.raspberrypi.org/documentation/installation/installing-images/README.md) regarding how
+to get it written to an SD card.
+
+2. Run `sudo raspi-config`, then:
+    1. Set your timezone (option 4, option I2)
+    2. Enable SSH (option 5, option P2)
+    3. Expand the filesystem to use the entire SD card (option 7, option A1)
+
+3. Update & upgrade all packages: `apt-get update && apt-get upgrade`
+    
+4. Install required packages: `sudo apt install lrzsz p7zip-full`
+
+5. Follow the [Quickstart](docs/index.md) instructions to install ENiGMA½.
+
+6. Profit!

From 6c4745ee22ddd3a0b78e31a4db433021c9bb2290 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:49:08 +0000
Subject: [PATCH 0055/1013] Typo fixes

---
 docs/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 1147c578..48fdc090 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -24,7 +24,7 @@ For Windows environments or if you simply like to do things manually, read on...
   
  
 ### New to Node
-If you're new to Node.js and/or do not care about Node itself and just want to get ENiGMA½ running these steps should get you going on most \*nix type enviornments (Please consider the `install.sh` approach unless you really want to manually install!):
+If you're new to Node.js and/or do not care about Node itself and just want to get ENiGMA½ running these steps should get you going on most \*nix type environments (Please consider the `install.sh` approach unless you really want to manually install!):
 
 ```bash
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
@@ -64,7 +64,7 @@ The main system configuration is handled via `~/.config/enigma-bbs/config.hjson`
 ./oputil.js config new
 ```
 
-(You wil be asked a series of basic questions)
+(You will be asked a series of basic questions)
 
 #### Example Starting Configuration
 Below is an _example_ configuration. It is recommended that you at least **start with a generated configuration using oputil.js described above**.

From 7f18f3d6140b8a6253cec45cd59469329c937527 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:50:25 +0000
Subject: [PATCH 0056/1013] Add note about LetsEncrypt to webserver docs

---
 docs/web_server.md | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/web_server.md b/docs/web_server.md
index 8c341191..1f87cd80 100644
--- a/docs/web_server.md
+++ b/docs/web_server.md
@@ -1,8 +1,10 @@
 # Web Server
-ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the [File Bases](file_base.md) registers routes for file downloads, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
+ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the 
+[File Bases](file_base.md) registers routes for file downloads, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
 
 ## Configuration
-By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in the `contentServers::web` section of `config.hjson`:
+By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in 
+the `contentServers::web` section of `config.hjson`:
 
 ```hjson
 contentServers: {
@@ -16,12 +18,17 @@ contentServers: {
 }
 ```
 
-This will configure HTTP for port 8080 (override with `port`). To additionally enable HTTPS, you will need a PEM encoded SSL certificate and private key. Once obtained, simply enable the HTTPS server:
+This will configure HTTP for port 8080 (override with `port`). To additionally enable HTTPS, you will need a 
+PEM encoded SSL certificate and private key. [LetsEncrypt](https://letsencrypt.org/) supply free trusted 
+certificates that work perfectly with ENiGMA½.
+
+Once obtained, simply enable the HTTPS server:
+
 ```hjson
 contentServers: {
 	web: {
 		domain: bbs.yourdomain.com
-		//	set 'overrideUrlPrefix' if for example, you use a transparent proxy in front of ENiGMA and need to be explicit about URLs the system hands out
+		// set 'overrideUrlPrefix' if for example, you use a transparent proxy in front of ENiGMA and need to be explicit about URLs the system hands out
 		overrideUrlPrefix: https://bbs.yourdomain.com
 		https: {
 			enabled: true
@@ -37,4 +44,5 @@ contentServers: {
 Static files live relative to the `contentServers::web::staticRoot` path which defaults to `enigma-bbs/www`. 
 
 ### Custom Error Pages
-Customized error pages can be created for [HTTP error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error) by providing a `<error_code>.html` file in the *static routes* area. For example: `404.html`.
+Customized error pages can be created for [HTTP error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error) 
+by providing a `<error_code>.html` file in the *static routes* area. For example: `404.html`.

From d26117e428bbf810f654831d827f0e72886e7619 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:51:04 +0000
Subject: [PATCH 0057/1013] Typo fix in file base docs

---
 docs/file_base.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/file_base.md b/docs/file_base.md
index bfd802b9..893a93de 100644
--- a/docs/file_base.md
+++ b/docs/file_base.md
@@ -1,7 +1,7 @@
 # File Bases
 Starting with version 0.0.4-alpha, ENiGMA½ has support for File Bases! Documentation below covers setup of file area(s), but first some information on what to expect:
 
-## A Different Appoach
+## A Different Approach
 ENiGMA½ has strayed away from the old familure setup here and instead takes a more modern approach:
 * [Gazelle](https://whatcd.github.io/Gazelle/) inspired system for searching & browsing files
 * No File Conferences (just areas!)

From 40ba4f5075c326d1978c502d96735671e3f0b2e4 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:51:56 +0000
Subject: [PATCH 0058/1013] Add TIC packet info to msg_networks docs

---
 docs/msg_networks.md | 69 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/docs/msg_networks.md b/docs/msg_networks.md
index 1bb46c8c..11fa9202 100644
--- a/docs/msg_networks.md
+++ b/docs/msg_networks.md
@@ -100,9 +100,74 @@ A node entry starts with a FTN style address (up to 5D) **as a key** in `config.
 #### TIC Support
 ENiGMA½ supports TIC files. This is handled by mapping TIC areas to local file areas.
 
-Under a given node (described above) TIC configuration may be supplied.
+Under a given node (like the one configured above), TIC configuration may be supplied:
+
+```hjson
+{
+  scannerTossers: {
+    ftn_bso: {
+      nodes: {
+        "46:*": {
+          packetType: 2+
+          packetPassword: mypass
+          encoding: cp437
+          archiveType: zip
+          tic: {
+            password: TESTY-TEST
+            uploadBy: Agoranet TIC
+            allowReplace: true
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+You then need to configure the mapping between TIC areas you want to carry, and the file 
+base area for them to be tossed to. Start by creating a storage tag and file base, if you haven't 
+already:
+
+````hjson
+fileBase: {
+    areaStoragePrefix: /home/bbs/file_areas/
+    
+    storageTags: {
+        msg_network: "msg_network"
+    }
+    
+    areas: {
+        msgNetworks: {
+            name: Message Networks
+            desc: Message networks news & info
+            storageTags: [
+                "msg_network"
+            ]
+        }
+    }
+}
+
+````
+and then create the mapping between the TIC area and the file area created:
+
+````hjson
+ticAreas: {
+    agn_node: {
+        areaTag: msgNetworks
+        hashTags: agoranet,nodelist
+        storageTag: msg_network
+    }
+    
+    agn_info: {
+        areaTag: msgNetworks
+        hashTags: agoranet,infopack
+        storageTag: msg_network
+    }
+}
+
+````
+Multiple TIC areas can be mapped to a single file base area. 
 
-TODO
 
 #### Scheduling
 Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.

From 40e269fa8dea5d06f8e04e0b97c729eb8080f667 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Oct 2017 12:52:31 +0000
Subject: [PATCH 0059/1013] Fix alt text on ENiGMA logo image

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3795dd30..0773f3fe 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ENiGMA½ BBS Software
 
-![alt text](docs/images/enigma-bbs.png "ENiGMA½ BBS")
+![ENiGMA½ BBS](docs/images/enigma-bbs.png "ENiGMA½ BBS")
 
 ENiGMA½ is a modern BBS software with a nostalgic flair!
 

From c38acebafbf1030a10391eeda548a484114b5cb8 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Sun, 29 Oct 2017 20:18:40 +0100
Subject: [PATCH 0060/1013] Update index.md

Moved the section + improve text.
---
 docs/index.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 73b45739..548d08ee 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -107,10 +107,14 @@ Below is an _example_ configuration. It is recommended that you at least **start
 ./main.js
 ```
 
+Read the Points of Interest below for more info.
 
-*Note #1:* The first user who register/apply (user ID = 1) will be automatically be added to the `sysops` group. And thus becomes SysOp.
-
-*Note #2:* All data is stored by default in Sqlite3 database files within the `db` sub folder, including user data, messages, system logs and file meta data.
+## Points of Interest
+* **The first user you create via register/applying (user ID = 1) will be automatically be added to the `sysops` group. And thus becomes SysOp.** (aka root)
+* Default port for Telnet is 8888 and for SSH 8889
+  * Note that on *nix systems port such as telnet/23 are privileged (e.g. require root). See [this SO article](http://stackoverflow.com/questions/16573668/best-practices-when-running-node-js-with-port-80-ubuntu-linode) for some tips on using these ports on your system if desired.
+* All data is stored by default in Sqlite3 database files, within the `db` sub folder. Including user data, messages, system logs and file meta data.
+* You may want to tail the logfile with Bunyan. See Monitoring Logs below.
 
 ## Monitoring Logs
 Logs are produced by Bunyan which outputs each entry as a JSON object. To tail logs in a colorized and pretty pretty format, issue the following command:
@@ -119,12 +123,6 @@ Logs are produced by Bunyan which outputs each entry as a JSON object. To tail l
 
 ENiGMA½ does not produce much to standard out. See below for tailing the log file to see what's going on.
 
-## Points of Interest
-* Default ports are 8888 (Telnet) and 8889 (SSH)
-  * Note that on *nix systems port such as telnet/23 are privileged (e.g. require root). See [this SO article](http://stackoverflow.com/questions/16573668/best-practices-when-running-node-js-with-port-80-ubuntu-linode) for some tips on using these ports on your system if desired.
-* **The first user you create via applying is the SysOp** (aka root)
-* You may want to tail the logfile with Bunyan. See Monitoring Logs above.
-
 # Advanced Installation
 If you've become convinced you would like a "production" BBS running ENiGMA½ a more advanced installation may be in order. 
 

From 7b167b20778fbfc5cc4b51ba5d4e64f3e4735a7b Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Sun, 29 Oct 2017 20:39:12 +0100
Subject: [PATCH 0061/1013] Add missing menuFile hjson spec

Add missing config hjson file item
---
 docs/config.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/config.md b/docs/config.md
index ca760676..b0ce2e6e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -48,6 +48,7 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 {
 	general: {
 		boardName: A Sample BBS
+		menuFile: your_bbs.hjson # copy of menu.hjson file (and adapt to your needs)
 	}
 
 	defaults: {
@@ -126,4 +127,4 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 ```
 
 ## Menus
-See [the menu system docs](menu_system.md)
\ No newline at end of file
+See [the menu system docs](menu_system.md)

From 64a8d9fc4106ba0108a262c6ded5d2c430e29712 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Sun, 29 Oct 2017 20:43:31 +0100
Subject: [PATCH 0062/1013] Update index.md

Add link to docs
---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 548d08ee..b57fac84 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -107,7 +107,7 @@ Below is an _example_ configuration. It is recommended that you at least **start
 ./main.js
 ```
 
-Read the Points of Interest below for more info.
+Read the Points of Interest below for more info. Also check-out all the other documentation files in the [docs](.) directory.
 
 ## Points of Interest
 * **The first user you create via register/applying (user ID = 1) will be automatically be added to the `sysops` group. And thus becomes SysOp.** (aka root)

From e55b4aa50b99627ebb9f373014f56df2615e36a3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Oct 2017 20:03:33 -0600
Subject: [PATCH 0063/1013] Return event in unknownOption()

---
 core/servers/login/telnet.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 4377f029..06961800 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -88,6 +88,7 @@ const SB_COMMANDS = {
 //
 //	Resources
 //		* http://mars.netanya.ac.il/~unesco/cdrom/booklet/HTML/NETWORKING/node300.html
+//		* http://www.networksorcery.com/enp/protocol/telnet.htm
 //
 const OPTIONS = {
 	TRANSMIT_BINARY			: 0,	// http://tools.ietf.org/html/rfc856
@@ -186,6 +187,8 @@ const OPTION_NAMES = Object.keys(OPTIONS).reduce(function(names, name) {
 
 function unknownOption(bufs, i, event) {
 	Log.warn( { bufs : bufs, i : i, event : event }, 'Unknown Telnet option');
+	event.buf = bufs.splice(0, i).toBuffer();
+	return event;
 }
 
 const OPTION_IMPLS = {};

From 2efc522d680feaf95fba0327d0d9857b54f438c5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Oct 2017 20:03:49 -0600
Subject: [PATCH 0064/1013] Mask out passwordConfirm

---
 core/logger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/logger.js b/core/logger.js
index 3b0b47e2..f90aec41 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -62,7 +62,7 @@ module.exports = class Log {
 			//	Use a regexp -- we don't know how nested fields we want to seek and destroy may be
 			//
 			return JSON.parse(
-				JSON.stringify(obj).replace(/"(password|key|authCode)"\s?:\s?"([^"]+)"/, (match, valueName) => {
+				JSON.stringify(obj).replace(/"(password|passwordConfirm|key|authCode)"\s?:\s?"([^"]+)"/, (match, valueName) => {
 					return `"${valueName}":"********"`;
 				})
 			);

From 4b0ef8543291df80712e7e0c7d66ebbc57fa1224 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Oct 2017 20:04:10 -0600
Subject: [PATCH 0065/1013] Allow index.html in root

---
 core/servers/content/web.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 55fd37f2..92aa05c3 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -158,6 +158,11 @@ exports.getModule = class WebServerModule extends ServerModule {
 
 	routeRequest(req, resp) {
 		const route = _.find(this.routes, r => r.matchesRequest(req) );
+
+		if(!route && '/' === req.url) {
+			return this.routeIndex(req, resp);
+		}
+
 		return route ? route.handler(req, resp) : this.accessDenied(resp);
 	}
 
@@ -196,9 +201,20 @@ exports.getModule = class WebServerModule extends ServerModule {
 		return this.respondWithError(resp, 404, 'File not found.', 'File Not Found');
 	}
 
+	routeIndex(req, resp) {
+		const filePath = paths.join(Config.contentServers.web.staticRoot, 'index.html');
+
+		return this.returnStaticPage(filePath, resp);
+	}
+
 	routeStaticFile(req, resp) {
 		const fileName = req.url.substr(req.url.indexOf('/', 1));
 		const filePath = paths.join(Config.contentServers.web.staticRoot, fileName);
+
+		return this.returnStaticPage(filePath, resp);
+	}
+
+	returnStaticPage(filePath, resp) {
 		const self = this;
 
 		fs.stat(filePath, (err, stats) => {

From a5f72a345ceeae3496206ea3aa3f467806fca363 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Oct 2017 21:02:36 -0600
Subject: [PATCH 0066/1013] Fix Content-Type

---
 core/servers/content/web.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 92aa05c3..8a9903b4 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -223,7 +223,7 @@ exports.getModule = class WebServerModule extends ServerModule {
 			}
 
 			const headers = {
-				'Content-Type'		: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
+				'Content-Type'		: mimeTypes.contentType(paths.basename(filePath)) || mimeTypes.contentType('.bin'),
 				'Content-Length'	: stats.size,
 			};
 

From 4e9b72366c80660d7682eb15722988be46927515 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Mon, 30 Oct 2017 22:31:39 +0100
Subject: [PATCH 0067/1013] Update config.md

---
 docs/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/config.md b/docs/config.md
index b0ce2e6e..1839978e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -48,7 +48,7 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 {
 	general: {
 		boardName: A Sample BBS
-		menuFile: your_bbs.hjson # copy of menu.hjson file (and adapt to your needs)
+		menuFile: your_bbs.hjson //copy of menu.hjson file (and adapt to your needs)
 	}
 
 	defaults: {

From 8ff3d013bd98a02489866da8d104444545e62dd4 Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <webmaster@web-share.nl>
Date: Mon, 30 Oct 2017 23:26:55 +0100
Subject: [PATCH 0068/1013] I made a shame of myself

I made a shame of myself, lets improve it even further.
---
 docs/config.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index 1839978e..fba48119 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -48,14 +48,14 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 {
 	general: {
 		boardName: A Sample BBS
-		menuFile: your_bbs.hjson //copy of menu.hjson file (and adapt to your needs)
+		menuFile: "your_bbs.hjson" // copy of menu.hjson file (and adapt to your needs)
 	}
 
 	defaults: {
-		theme: super-fancy-theme
+		theme: "super-fancy-theme" // default-assigned theme (for new users) 
 	}
 
-	preLoginTheme: luciano_blocktronics
+	preLoginTheme: "luciano_blocktronics" // theme used before a user logs in (matrix, NUA, etc.)
 
 	messageConferences: {
 		local_general: {

From d5059525102cffa1783e827c561fc24a1c520b41 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Thu, 2 Nov 2017 00:41:20 +0000
Subject: [PATCH 0069/1013] CombatNet support!

---
 README.md         |   2 +-
 core/combatnet.js | 115 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/doors.md     |  16 +++++++
 mods/menu.hjson   |  16 ++++++-
 package.json      |   1 +
 5 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 core/combatnet.js

diff --git a/README.md b/README.md
index 83fb50ea..93752343 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Renegade style pipe color codes
  * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
  * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption
- * [Door support](docs/doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), and [Exodus](https://oddnetwork.org/exodus/) support!
+ * [Door support](docs/doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging
  * [Message networks](docs/msg_networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
  * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/web_server.md). Legacy X/Y/Z modem also supported!
diff --git a/core/combatnet.js b/core/combatnet.js
new file mode 100644
index 00000000..6cde9c7b
--- /dev/null
+++ b/core/combatnet.js
@@ -0,0 +1,115 @@
+/* jslint node: true */
+'use strict';
+
+//	enigma-bbs
+const MenuModule	= require('../core/menu_module.js').MenuModule;
+const resetScreen	= require('../core/ansi_term.js').resetScreen;
+
+//	deps
+const async			= require('async');
+const _				= require('lodash');
+const RLogin        = require('rlogin');
+
+exports.moduleInfo = {
+	name	: 'CombatNet',
+	desc	: 'CombatNet Access Module',
+	author	: 'Dave Stephens',
+};
+
+exports.getModule = class CombatNetModule extends MenuModule {
+	constructor(options) {
+		super(options);
+
+		//	establish defaults
+		this.config				= options.menuConfig.config;
+		this.config.host		= this.config.host || 'bbs.combatnet.us';
+		this.config.rloginPort	= this.config.rloginPort || 4513;
+	}
+	
+	initSequence() {
+		const self = this;
+		
+		async.series(
+			[
+				function validateConfig(callback) {
+					if(!_.isString(self.config.password)) {
+						return callback(new Error('Config requires "password"!'));
+					}
+					if(!_.isString(self.config.bbsTag)) {
+						return callback(new Error('Config requires "bbsTag"!'));
+					}
+					return callback(null);
+				},
+				function establishRloginConnection(callback) {
+					self.client.term.write(resetScreen());
+					self.client.term.write('Connecting to CombatNet, please wait...\n');
+
+					const restorePipeToNormal = function() {
+                        self.client.term.output.removeListener('data', sendToRloginBuffer);
+					};
+
+                    const rlogin = new RLogin(
+                        {	'clientUsername' : self.config.password,
+                            'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
+                            'host' : self.config.host,
+                            'port' : self.config.rloginPort,
+                            'terminalType' : self.client.term.termClient,
+                            'terminalSpeed' : 57600
+                        }
+                    );
+
+                    // If there was an error ...
+                    rlogin.on('error', err => {
+                    	self.client.log.info(`CombatNet rlogin client error: ${err.message}`);
+                    	restorePipeToNormal();
+                        callback(err);
+                    });
+
+                    // If we've been disconnected ...
+                    rlogin.on('disconnect', () => {
+                        self.client.log.info(`Disconnected from CombatNet`);
+                    	restorePipeToNormal();
+                    	callback(null);
+                    });
+
+                    function sendToRloginBuffer(buffer) {
+                        rlogin.send(buffer);
+                    };
+
+                    rlogin.on("connect",
+                        /*	The 'connect' event handler will be supplied with one argument,
+                            a boolean indicating whether or not the connection was established. */
+
+                        function(state) {
+                            if(state) {
+                                self.client.log.info('Connected to CombatNet');
+                                self.client.term.output.on('data', sendToRloginBuffer);
+
+                            } else {
+                                return callback(new Error('Failed to establish establish CombatNet connection'));
+                            }
+                        }
+                    );
+
+                    // If data (a Buffer) has been received from the server ...
+                    rlogin.on("data", (data) => {
+                            self.client.term.rawWrite(data);
+                    });
+
+                    // connect...
+                    rlogin.connect();
+
+					//	note: no explicit callback() until we're finished!
+				}
+			],
+			err => {
+				if(err) {
+					self.client.log.warn( { error : err.message }, 'CombatNet error');
+				}
+				
+				//	if the client is still here, go to previous
+				self.prevMenu();
+			}
+		);
+	}	
+};
diff --git a/docs/doors.md b/docs/doors.md
index 702d75d9..0ca55c23 100644
--- a/docs/doors.md
+++ b/docs/doors.md
@@ -194,6 +194,22 @@ doorParty: {
 
 Fill in `username`, `password`, and `bbsTag` with credentials provided to you and you should be in business!
 
+## The CombatNet Module
+The `combatnet` module provides native support for [CombatNet](http://combatnet.us/). Add the following to your menu config:
+
+````hjson
+combatNet: {
+    desc: Using CombatNet
+    module: @systemModule:combatnet
+    config: {
+        bbsTag: CBNxxx
+        password: XXXXXXXXX
+    }
+}
+````
+Update `bbsTag` (in the format CBNxxx) and `password` with the details provided when you register, then
+you should be ready to rock!
+
 # Resources
 
 ### DOSBox
diff --git a/mods/menu.hjson b/mods/menu.hjson
index 0dffdcbb..b445ec85 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -1646,6 +1646,10 @@
 					action: @menu:doorParty
 				}
 				{
+                    value: { command: "CN" }
+                    action: @menu:combatNet
+                }
+				{
 					value: { command: "AGENT" }
 					action: @menu:telnetBridgeAgency
 				}
@@ -1689,7 +1693,7 @@
 			}
 		}
 
-		//	DoorParty! support. You'll need to registger to obtain credentials
+		//	DoorParty! support. You'll need to register to obtain credentials
 		doorParty: {
 			desc: Using DoorParty!
 			module: @systemModule:door_party
@@ -1700,6 +1704,16 @@
 			}
 		}
 
+        //	CombatNet support. You'll need to register at http://combatnet.us/ to obtain credentials
+        combatNet: {
+            desc: Using CombatNet
+            module: @systemModule:combatnet
+            config: {
+                bbsTag: CBNxxx
+                password: XXXXXXXXX
+            }
+        }
+
 		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
 			module: telnet_bridge
diff --git a/package.json b/package.json
index 232e1dca..29bd16da 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "node-glob": "^1.2.0",
     "nodemailer": "^4.1.0",
     "ptyw.js": "NuSkooler/ptyw.js",
+    "rlogin": "^1.0.0",
     "sane": "^2.2.0",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.9",

From 6d31589c8b8871a96f9c1026e3a232a23175a9fa Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 12 Nov 2017 18:55:57 -0700
Subject: [PATCH 0070/1013] Add PCB/WildCat!, WWIV, Renegade, etc. color code
 support to file descriptions

---
 core/color_codes.js    | 158 +++++++++++++++++++++++++++++++++++++++++
 mods/file_area_list.js |  47 +++++++-----
 2 files changed, 187 insertions(+), 18 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index 4dc8da99..7e71bd1c 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -11,11 +11,13 @@ exports.enigmaToAnsi		= enigmaToAnsi;
 exports.stripPipeCodes		= exports.stripEnigmaCodes		= stripEnigmaCodes;
 exports.pipeStrLen			= exports.enigmaStrLen			= enigmaStrLen;
 exports.pipeToAnsi			= exports.renegadeToAnsi		= renegadeToAnsi;
+exports.controlCodesToAnsi	= controlCodesToAnsi;
 
 //	:TODO: Not really happy with the module name of "color_codes". Would like something better
 
 
 
+
 //	Also add:
 //	* fromCelerity(): |<case sensitive letter>
 //	* fromPCBoard(): (@X<bg><fg>)
@@ -148,3 +150,159 @@ function renegadeToAnsi(s, client) {
 
 	return (0 === result.length ? s : result + s.substr(lastIndex));	
 }
+
+//
+//	Converts various control codes popular in BBS packages
+//	to ANSI escape sequences. Additionaly supports ENiGMA style
+//	MCI codes.
+//
+//	Supported control code formats:
+//	* Renegade	: |##
+//	* PCBoard	: @X## where the first number/char is FG color, and second is BG
+//	* WildCat!	: @##@ the same as PCBoard without the X prefix, but with a @ suffix
+//	* WWIV		: ^#
+//
+//	TODO: Add Synchronet and Celerity format support
+//
+//	Resources:
+//	* http://wiki.synchro.net/custom:colors
+//
+function controlCodesToAnsi(s, client) {
+	const RE = /(\|([A-Z0-9]{2})|\|)|(\@X([0-9A-F]{2}))|(\@([0-9A-F]{2})\@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
+
+	let m;
+	let result		= '';
+	let lastIndex	= 0;
+	let v;
+	let fg;
+	let bg;
+
+	while((m = RE.exec(s))) {
+		switch(m[0].charAt(0)) {
+			case '|' :
+				//	Renegade or ENiGMA MCI
+				v = parseInt(m[2], 10);
+
+				if(isNaN(v)) {
+					v = getPredefinedMCIValue(client, m[2]) || m[0];	//	value itself or literal
+				}
+
+				if(_.isString(v)) {
+					result += s.substr(lastIndex, m.index - lastIndex) + v;
+				} else {
+					v = ansi.sgr({
+						0	: [ 'reset', 'black' ],
+						1	: [ 'reset', 'blue' ],
+						2	: [ 'reset', 'green' ],
+						3	: [ 'reset', 'cyan' ],
+						4	: [ 'reset', 'red' ],
+						5	: [ 'reset', 'magenta' ],
+						6	: [ 'reset', 'yellow' ],
+						7	: [ 'reset', 'white' ],
+
+						8	: [ 'bold', 'black' ],
+						9	: [ 'bold', 'blue' ],
+						10	: [ 'bold', 'green' ],
+						11	: [ 'bold', 'cyan' ],
+						12	: [ 'bold', 'red' ],
+						13	: [ 'bold', 'magenta' ],
+						14	: [ 'bold', 'yellow' ],
+						15	: [ 'bold', 'white' ],
+
+						16	: [ 'blackBG' ],
+						17 	: [ 'blueBG' ],
+						18	: [ 'greenBG' ],
+						19	: [ 'cyanBG' ],
+						20	: [ 'redBG' ],
+						21	: [ 'magentaBG' ],
+						22	: [ 'yellowBG' ],
+						23	: [ 'whiteBG' ],
+					}[v] || 'normal');
+
+					result += s.substr(lastIndex, m.index - lastIndex) + v;
+				}
+				break;
+
+			case '@' :
+				//	PCBoard @X## or Wildcat! @##@
+				if('@' === m[0].substr(-1)) {
+					//	Wildcat!
+					v = m[6];
+				} else {
+					v = m[4];
+				}
+
+				fg = {
+					0	: [ 'reset', 'black' ],
+					1	: [ 'reset', 'blue' ],
+					2	: [ 'reset', 'green' ],
+					3	: [ 'reset', 'cyan' ],
+					4	: [ 'reset', 'red' ],
+					5	: [ 'reset', 'magenta' ],
+					6	: [ 'reset', 'yellow' ],
+					7	: [ 'reset', 'white' ],
+
+					8	: [ 'blink', 'black' ],
+					9	: [ 'blink', 'blue' ],
+					A	: [ 'blink', 'green' ],
+					B	: [ 'blink', 'cyan' ],
+					C	: [ 'blink', 'red' ],
+					D	: [ 'blink', 'magenta' ],
+					E	: [ 'blink', 'yellow' ],
+					F	: [ 'blink', 'white' ],
+				}[v.charAt(0)] || ['normal'];
+
+				bg = {
+					0	: [ 'blackBG' ],
+					1 	: [ 'blueBG' ],
+					2	: [ 'greenBG' ],
+					3	: [ 'cyanBG' ],
+					4	: [ 'redBG' ],
+					5	: [ 'magentaBG' ],
+					6	: [ 'yellowBG' ],
+					7	: [ 'whiteBG' ],
+
+					8	: [ 'bold', 'blackBG' ],
+					9	: [ 'bold', 'blueBG' ],
+					A	: [ 'bold', 'greenBG' ],
+					B	: [ 'bold', 'cyanBG' ],
+					C	: [ 'bold', 'redBG' ],
+					D	: [ 'bold', 'magentaBG' ],
+					E	: [ 'bold', 'yellowBG' ],
+					F	: [ 'bold', 'whiteBG' ],
+				}[v.charAt(1)] || [ 'normal' ];
+
+				v = ansi.sgr(fg.concat(bg));
+				result += s.substr(lastIndex, m.index - lastIndex) + v;
+				break;
+
+			case '\x03' :
+				v = parseInt(m[8], 10);
+
+				if(isNaN(v)) {
+					v += m[0];
+				} else {
+					v = ansi.sgr({
+						0	: [ 'reset', 'black' ],
+						1	: [ 'bold', 'cyan' ],
+						2	: [ 'bold', 'yellow' ],
+						3	: [ 'reset', 'magenta' ],
+						4	: [ 'bold', 'white', 'blueBG' ],
+						5	: [ 'reset', 'green' ],
+						6	: [ 'bold', 'blink', 'red' ],
+						7	: [ 'bold', 'blue' ],
+						8	: [ 'reset', 'blue' ],
+						9	: [ 'reset', 'cyan' ],
+					}[v] || 'normal');
+				}
+
+				result += s.substr(lastIndex, m.index - lastIndex) + v;
+
+				break;
+		}
+
+		lastIndex = RE.lastIndex;
+	}
+
+	return (0 === result.length ? s : result + s.substr(lastIndex));
+}
\ No newline at end of file
diff --git a/mods/file_area_list.js b/mods/file_area_list.js
index 4937eb49..0c24f9f8 100644
--- a/mods/file_area_list.js
+++ b/mods/file_area_list.js
@@ -2,22 +2,23 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule		= require('../core/menu_module.js').MenuModule;
-const ViewController	= require('../core/view_controller.js').ViewController;
-const ansi				= require('../core/ansi_term.js');
-const theme				= require('../core/theme.js');
-const FileEntry			= require('../core/file_entry.js');
-const stringFormat		= require('../core/string_format.js');
-const FileArea			= require('../core/file_base_area.js');
-const Errors			= require('../core/enig_error.js').Errors;
-const ErrNotEnabled		= require('../core/enig_error.js').ErrorReasons.NotEnabled;
-const ArchiveUtil		= require('../core/archive_util.js');
-const Config			= require('../core/config.js').config;
-const DownloadQueue		= require('../core/download_queue.js');
-const FileAreaWeb		= require('../core/file_area_web.js');
-const FileBaseFilters	= require('../core/file_base_filter.js');
-const resolveMimeType	= require('../core/mime_util.js').resolveMimeType;
-const isAnsi			= require('../core/string_util.js').isAnsi;
+const MenuModule			= require('../core/menu_module.js').MenuModule;
+const ViewController		= require('../core/view_controller.js').ViewController;
+const ansi					= require('../core/ansi_term.js');
+const theme					= require('../core/theme.js');
+const FileEntry				= require('../core/file_entry.js');
+const stringFormat			= require('../core/string_format.js');
+const FileArea				= require('../core/file_base_area.js');
+const Errors				= require('../core/enig_error.js').Errors;
+const ErrNotEnabled			= require('../core/enig_error.js').ErrorReasons.NotEnabled;
+const ArchiveUtil			= require('../core/archive_util.js');
+const Config				= require('../core/config.js').config;
+const DownloadQueue			= require('../core/download_queue.js');
+const FileAreaWeb			= require('../core/file_area_web.js');
+const FileBaseFilters		= require('../core/file_base_filter.js');
+const resolveMimeType		= require('../core/mime_util.js').resolveMimeType;
+const isAnsi				= require('../core/string_util.js').isAnsi;
+const controlCodesToAnsi	= require('../core/color_codes.js').controlCodesToAnsi;
 
 //	deps
 const async				= require('async');
@@ -385,9 +386,19 @@ exports.getModule = class FileAreaList extends MenuModule {
 					if(_.isString(self.currentFileEntry.desc)) {
 						const descView = self.viewControllers.browse.getView(MciViewIds.browse.desc);
 						if(descView) {
-							if(isAnsi(self.currentFileEntry.desc)) {
+							//
+							//	For descriptions we want to support as many color code systems
+							//	as we can for coverage of what is found in the while (e.g. Renegade
+							//	pipes, PCB @X##, etc.)
+							//
+							//	MLTEV doesn't support all of this, so convert. If we produced ANSI
+							//	esc sequences, we'll proceed with specialization, else just treat
+							//	it as text.
+							//
+							const desc = controlCodesToAnsi(self.currentFileEntry.desc);
+							if(desc.length != self.currentFileEntry.desc.length || isAnsi(desc)) {
 								descView.setAnsi(
-									self.currentFileEntry.desc,
+									desc,
 									{
 										prepped			: false,
 										forceLineTerm	: true

From f0b9cd102d2d20af1ee2610bead548688d91e34f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 18 Nov 2017 14:09:17 -0700
Subject: [PATCH 0071/1013] Fix some year est issues & add ability for oputil
 fb scan --update to pick up years

---
 core/config.js                  | 11 ++++++++---
 core/oputil/oputil_file_base.js | 14 +++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core/config.js b/core/config.js
index e33648b9..367143b6 100644
--- a/core/config.js
+++ b/core/config.js
@@ -670,12 +670,17 @@ function getDefaultConfig() {
 				//	Patterns should produce the year in the first submatch.
 				//	The extracted year may be YY or YYYY
 				//
-				'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
-				"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
+				'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',	//	yyyy-mm-dd, yyyy/mm/dd, ...
+				'\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1-2][0-9][0-9]{2}))\\b',	//	mm/dd/yyyy, mm.dd.yyyy, ...
+				'\\b((?:[1789][0-9]))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',			//	yy-mm-dd, yy-mm-dd, ...
+				'\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',			//	mm-dd-yy, mm/dd/yy, ...
+				//'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
+				//"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
 				'\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',				
 				'\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',	//	November 29th, 1997
-				'\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- do this before 19xx 20xx such that this has priority
+				'\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
 				'\\b((?:19|20)[0-9]{2})\\b',	//	simple 19xx or 20xx with word boundaries
+				'\\b\'([17-9][0-9])\\b',		//	'95, '17, ...
 				//	:TODO: DD/MMM/YY, DD/MMMM/YY, DD/MMM/YYYY, etc.
 			],
 
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 0c4c6065..835db5b9 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -172,8 +172,8 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 										//
 										//	We'll update the entry if the following conditions are met:
 										//	* We have a single duplicate, and:
-										//	* --update was passed or the existing entry's desc or
-										//	  longDesc are blank/empty
+										//	* --update was passed or the existing entry's desc,
+										//	  longDesc, or yearEst are blank/empty
 										//
 										if(argv.update && 1 === dupeEntries.length) {
 											const FileEntry		= require('../../core/file_entry.js');
@@ -193,15 +193,19 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 
 												if( tagsEq && 
 													fileEntry.desc === existingEntry.desc && 
-													fileEntry.descLong == existingEntry.descLong)
+													fileEntry.descLong == existingEntry.descLong &&
+													fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
 												{
 													console.info('Dupe');
 													return nextFile(null);
 												}
 
 												console.info('Dupe (updating)');
-												existingEntry.desc 		= fileEntry.desc;
-												existingEntry.descLong	= fileEntry.descLong;
+
+												//	don't allow overwrite of values if new version is blank
+												existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
+												existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
+												existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year || existingEntry.meta.est_release_year;
 												updateTags(existingEntry);
 
 												finalizeEntryAndPersist(true, existingEntry, descHandler, err => {

From 02cd8c26c72c72f69f1e94954eeb205df6b38929 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 18 Nov 2017 14:14:19 -0700
Subject: [PATCH 0072/1013] Minor fix

---
 core/oputil/oputil_file_base.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 835db5b9..a00f0889 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -173,7 +173,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 										//	We'll update the entry if the following conditions are met:
 										//	* We have a single duplicate, and:
 										//	* --update was passed or the existing entry's desc,
-										//	  longDesc, or yearEst are blank/empty
+										//	  longDesc, or est_release_year meta are blank/empty
 										//
 										if(argv.update && 1 === dupeEntries.length) {
 											const FileEntry		= require('../../core/file_entry.js');
@@ -205,7 +205,11 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 												//	don't allow overwrite of values if new version is blank
 												existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
 												existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
-												existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year || existingEntry.meta.est_release_year;
+
+												if(fileEntry.meta.est_release_year) {
+													existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
+												}
+
 												updateTags(existingEntry);
 
 												finalizeEntryAndPersist(true, existingEntry, descHandler, err => {

From 617f0ef07ecadbd47b4c3b71f2526132a369774a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 18 Nov 2017 16:15:50 -0700
Subject: [PATCH 0073/1013] Add extended pipe color codes (24-31) ala Mystic
 et. al.

---
 core/color_codes.js | 100 +++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 58 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index 7e71bd1c..2e368aa3 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -87,6 +87,46 @@ function enigmaStrLen(s) {
 	return stripEnigmaCodes(s).length;
 }
 
+function ansiSgrFromRenegadeColorCode(cc) {
+	return ansi.sgr({
+		0	: [ 'reset', 'black' ],
+		1	: [ 'reset', 'blue' ],
+		2	: [ 'reset', 'green' ],
+		3	: [ 'reset', 'cyan' ],
+		4	: [ 'reset', 'red' ],
+		5	: [ 'reset', 'magenta' ],
+		6	: [ 'reset', 'yellow' ],
+		7	: [ 'reset', 'white' ],
+
+		8	: [ 'bold', 'black' ],
+		9	: [ 'bold', 'blue' ],
+		10	: [ 'bold', 'green' ],
+		11	: [ 'bold', 'cyan' ],
+		12	: [ 'bold', 'red' ],
+		13	: [ 'bold', 'magenta' ],
+		14	: [ 'bold', 'yellow' ],
+		15	: [ 'bold', 'white' ],
+
+		16	: [ 'blackBG' ],
+		17 	: [ 'blueBG' ],
+		18	: [ 'greenBG' ],
+		19	: [ 'cyanBG' ],
+		20	: [ 'redBG' ],
+		21	: [ 'magentaBG' ],
+		22	: [ 'yellowBG' ],
+		23	: [ 'whiteBG' ],
+
+		24	: [ 'bold', 'blackBG' ],
+		25	: [ 'bold', 'blueBG' ],
+		26	: [ 'bold', 'greenBG' ],
+		27	: [ 'bold', 'cyanBG' ],
+		28	: [ 'bold', 'redBG' ],
+		29	: [ 'bold', 'magentaBG' ],
+		30	: [ 'bold', 'yellowBG' ],
+		31	: [ 'bold', 'whiteBG' ],
+	}[cc] || 'normal');
+}
+
 function renegadeToAnsi(s, client) {
 	if(-1 == s.indexOf('|')) {
 		return s;	//	no pipe codes present
@@ -113,35 +153,7 @@ function renegadeToAnsi(s, client) {
 		if(_.isString(val)) {
 			result += s.substr(lastIndex, m.index - lastIndex) + val;
 		} else {
-			var attr = ansi.sgr({
-				0	: [ 'reset', 'black' ],
-				1	: [ 'reset', 'blue' ],
-				2	: [ 'reset', 'green' ],
-				3	: [ 'reset', 'cyan' ],
-				4	: [ 'reset', 'red' ],
-				5	: [ 'reset', 'magenta' ],
-				6	: [ 'reset', 'yellow' ],
-				7	: [ 'reset', 'white' ],
-
-				8	: [ 'bold', 'black' ],
-				9	: [ 'bold', 'blue' ],
-				10	: [ 'bold', 'green' ],
-				11	: [ 'bold', 'cyan' ],
-				12	: [ 'bold', 'red' ],
-				13	: [ 'bold', 'magenta' ],
-				14	: [ 'bold', 'yellow' ],
-				15	: [ 'bold', 'white' ],
-
-				16	: [ 'blackBG' ],
-				17 	: [ 'blueBG' ],
-				18	: [ 'greenBG' ],
-				19	: [ 'cyanBG' ],
-				20	: [ 'redBG' ],
-				21	: [ 'magentaBG' ],
-				22	: [ 'yellowBG' ],
-				23	: [ 'whiteBG' ],
-			}[val] || 'normal');
-
+			const attr = ansiSgrFromRenegadeColorCode(val);
 			result += s.substr(lastIndex, m.index - lastIndex) + attr;
 		}
 
@@ -190,35 +202,7 @@ function controlCodesToAnsi(s, client) {
 				if(_.isString(v)) {
 					result += s.substr(lastIndex, m.index - lastIndex) + v;
 				} else {
-					v = ansi.sgr({
-						0	: [ 'reset', 'black' ],
-						1	: [ 'reset', 'blue' ],
-						2	: [ 'reset', 'green' ],
-						3	: [ 'reset', 'cyan' ],
-						4	: [ 'reset', 'red' ],
-						5	: [ 'reset', 'magenta' ],
-						6	: [ 'reset', 'yellow' ],
-						7	: [ 'reset', 'white' ],
-
-						8	: [ 'bold', 'black' ],
-						9	: [ 'bold', 'blue' ],
-						10	: [ 'bold', 'green' ],
-						11	: [ 'bold', 'cyan' ],
-						12	: [ 'bold', 'red' ],
-						13	: [ 'bold', 'magenta' ],
-						14	: [ 'bold', 'yellow' ],
-						15	: [ 'bold', 'white' ],
-
-						16	: [ 'blackBG' ],
-						17 	: [ 'blueBG' ],
-						18	: [ 'greenBG' ],
-						19	: [ 'cyanBG' ],
-						20	: [ 'redBG' ],
-						21	: [ 'magentaBG' ],
-						22	: [ 'yellowBG' ],
-						23	: [ 'whiteBG' ],
-					}[v] || 'normal');
-
+					v = ansiSgrFromRenegadeColorCode(v);
 					result += s.substr(lastIndex, m.index - lastIndex) + v;
 				}
 				break;

From 57d46dd57ea3f5d5675eac85f548b8358b811328 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Wed, 22 Nov 2017 23:27:33 +0000
Subject: [PATCH 0074/1013] Mega rejig!

---
 {mods/art => art/general}/CONNECT1.ANS        | Bin
 {mods/art => art/general}/DOORMANY.ANS        | Bin
 {mods/art => art/general}/GNSPMPT.ANS         | Bin
 {mods/art => art/general}/LOGPMPT.ANS         | Bin
 {mods/art => art/general}/NEWSCAN.ANS         | Bin
 {mods/art => art/general}/NEWUSER1.ANS        | Bin
 {mods/art => art/general}/ONEADD.ANS          | Bin
 {mods/art => art/general}/ONELINER.ANS        | Bin
 {mods/art => art/general}/PRELOGAD.ANS        | Bin
 {mods/art => art/general}/WELCOME1.ANS        |   0
 {mods/art => art/general}/WELCOME2.ANS        | Bin
 .../general}/demo_edit_text_view.ans          | Bin
 .../general}/demo_edit_text_view1.ans         | Bin
 .../general}/demo_fse_local_user.ans          | Bin
 .../general}/demo_fse_netmail_body.ans        | Bin
 .../general}/demo_fse_netmail_footer_edit.ans | Bin
 .../demo_fse_netmail_footer_edit_menu.ans     | Bin
 .../general}/demo_fse_netmail_header.ans      | Bin
 .../general}/demo_fse_netmail_help.ans        | Bin
 .../general}/demo_horizontal_menu_view1.ans   | Bin
 .../general}/demo_mask_edit_text_view1.ans    | Bin
 .../demo_multi_line_edit_text_view1.ans       | Bin
 .../art => art/general}/demo_selection_vm.ans | Bin
 .../general}/demo_spin_and_toggle.ans         | Bin
 .../general}/demo_vertical_menu_view1.ans     | Bin
 {mods/art => art/general}/erc.ans             | Bin
 {mods/art => art/general}/menu_prompt.ans     | Bin
 .../general}/msg_area_footer_view.ans         | Bin
 {mods/art => art/general}/msg_area_list.ans   | Bin
 .../general}/msg_area_post_header.ans         | Bin
 .../general}/msg_area_view_header.ans         | Bin
 {mods/art => art/general}/test.ans            |   0
 .../themes/luciano_blocktronics/BBSADD.ANS    | Bin
 .../themes/luciano_blocktronics/BBSLIST.ANS   | Bin
 .../themes/luciano_blocktronics/CCHANGE.ANS   | Bin
 .../themes/luciano_blocktronics/CHANGE.ANS    | Bin
 .../themes/luciano_blocktronics/CONFSCR.ANS   | Bin
 .../themes/luciano_blocktronics/DONE.ANS      | Bin
 .../themes/luciano_blocktronics/DOORMNU.ANS   | Bin
 .../themes/luciano_blocktronics/FAREASEL.ANS  | Bin
 .../themes/luciano_blocktronics/FBHELP.ANS    | Bin
 .../themes/luciano_blocktronics/FBNORES.ANS   | Bin
 .../themes/luciano_blocktronics/FBRWSE.ANS    | Bin
 .../themes/luciano_blocktronics/FDETAIL.ANS   | Bin
 .../themes/luciano_blocktronics/FDETGEN.ANS   | Bin
 .../themes/luciano_blocktronics/FDETLST.ANS   | Bin
 .../themes/luciano_blocktronics/FDETNFO.ANS   | Bin
 .../themes/luciano_blocktronics/FDLMGR.ANS    | Bin
 .../themes/luciano_blocktronics/FEMPTYQ.ANS   | Bin
 .../themes/luciano_blocktronics/FFILEDT.ANS   | Bin
 .../themes/luciano_blocktronics/FILPMPT.ANS   | Bin
 .../themes/luciano_blocktronics/FMENU.ANS     | Bin
 .../themes/luciano_blocktronics/FNEWBRWSE.ANS | Bin
 .../themes/luciano_blocktronics/FORGOTPW.ANS  | Bin
 .../luciano_blocktronics/FORGOTPWSENT.ANS     | Bin
 .../themes/luciano_blocktronics/FPROSEL.ANS   | Bin
 .../themes/luciano_blocktronics/FSEARCH.ANS   | Bin
 .../themes/luciano_blocktronics/IDLELOG.ANS   | Bin
 .../themes/luciano_blocktronics/LASTCALL.ANS  | Bin
 .../themes/luciano_blocktronics/LETTER.ANS    | Bin
 .../themes/luciano_blocktronics/MAILMNU.ANS   | Bin
 .../themes/luciano_blocktronics/MATRIX.ANS    | Bin
 .../themes/luciano_blocktronics/MMENU.ANS     | Bin
 .../themes/luciano_blocktronics/MNUPRMT.ANS   | Bin
 .../themes/luciano_blocktronics/MSGBODY.ANS   | Bin
 .../themes/luciano_blocktronics/MSGEFTR.ANS   | Bin
 .../themes/luciano_blocktronics/MSGEHDR.ANS   | Bin
 .../themes/luciano_blocktronics/MSGEHLP.ANS   | Bin
 .../themes/luciano_blocktronics/MSGEMFT.ANS   | Bin
 .../themes/luciano_blocktronics/MSGLIST.ANS   | Bin
 .../themes/luciano_blocktronics/MSGMNU.ANS    | Bin
 .../themes/luciano_blocktronics/MSGPMPT.ANS   | Bin
 .../themes/luciano_blocktronics/MSGQUOT.ANS   | Bin
 .../themes/luciano_blocktronics/MSGVFTR.ANS   | Bin
 .../themes/luciano_blocktronics/MSGVHDR.ANS   | Bin
 .../themes/luciano_blocktronics/MSGVHLP.ANS   | Bin
 .../themes/luciano_blocktronics/NEWMSGS.ANS   | Bin
 .../themes/luciano_blocktronics/NUA.ANS       | Bin
 .../themes/luciano_blocktronics/ONEADD.ANS    | Bin
 .../themes/luciano_blocktronics/ONELINER.ANS  | Bin
 .../themes/luciano_blocktronics/PAUSE.ANS     | Bin
 .../themes/luciano_blocktronics/RATEFILE.ANS  | Bin
 .../themes/luciano_blocktronics/RUMORADD.ANS  | Bin
 .../themes/luciano_blocktronics/RUMORS.ANS    | Bin
 .../themes/luciano_blocktronics/STATUS.ANS    | Bin
 .../themes/luciano_blocktronics/SYSSTAT.ANS   | Bin
 .../themes/luciano_blocktronics/TBRIDGE.ANS   | Bin
 .../themes/luciano_blocktronics/TOONODE.ANS   | Bin
 .../themes/luciano_blocktronics/ULCHECK.ANS   | Bin
 .../themes/luciano_blocktronics/ULDETAIL.ANS  | Bin
 .../themes/luciano_blocktronics/ULDUPES.ANS   | Bin
 .../themes/luciano_blocktronics/ULNOAREA.ANS  | Bin
 .../themes/luciano_blocktronics/ULOPTS.ANS    | Bin
 .../themes/luciano_blocktronics/USERLOG.ANS   | Bin
 .../themes/luciano_blocktronics/USERLST.ANS   | Bin
 .../themes/luciano_blocktronics/WHOSON.ANS    | Bin
 .../themes/luciano_blocktronics/theme.hjson   |   0
 {mods => config}/menu.hjson                   |   0
 {mods => config}/prompt.hjson                 |   0
 core/config.js                                |  15 ++++----
 core/config_util.js                           |   9 +++--
 core/module_util.js                           |   1 +
 core/oputil/oputil_common.js                  |   2 +-
 mods/{ => system}/abracadabra.js              |  10 +++---
 mods/{ => system}/bbs_link.js                 |   6 ++--
 mods/{ => system}/bbs_list.js                 |  14 ++++----
 mods/{ => system}/erc_client.js               |   4 +--
 mods/{ => system}/file_area_filter_edit.js    |  10 +++---
 mods/{ => system}/file_area_list.js           |  34 +++++++++---------
 mods/{ => system}/file_base_area_select.js    |   8 ++---
 .../file_base_download_manager.js             |  16 ++++-----
 mods/{ => system}/file_base_search.js         |   8 ++---
 .../file_base_web_download_manager.js         |  20 +++++------
 .../file_transfer_protocol_select.js          |   8 ++---
 mods/{ => system}/last_callers.js             |  10 +++---
 mods/{ => system}/msg_area_list.js            |  12 +++----
 mods/{ => system}/msg_area_post_fse.js        |   4 +--
 mods/{ => system}/msg_area_reply_fse.js       |   2 +-
 mods/{ => system}/msg_area_view_fse.js        |   4 +--
 mods/{ => system}/msg_conf_list.js            |  12 +++----
 mods/{ => system}/msg_list.js                 |  10 +++---
 mods/{ => system}/nua.js                      |  12 +++----
 mods/{ => system}/onelinerz.js                |  12 +++----
 mods/{ => system}/rumorz.js                   |  14 ++++----
 mods/{ => system}/telnet_bridge.js            |   6 ++--
 mods/{ => system}/upload.js                   |  28 +++++++--------
 mods/{ => system}/user_list.js                |   8 ++---
 mods/{ => system}/whos_online.js              |   8 ++---
 mods/user/.keep                               |   0
 129 files changed, 153 insertions(+), 154 deletions(-)
 rename {mods/art => art/general}/CONNECT1.ANS (100%)
 rename {mods/art => art/general}/DOORMANY.ANS (100%)
 rename {mods/art => art/general}/GNSPMPT.ANS (100%)
 rename {mods/art => art/general}/LOGPMPT.ANS (100%)
 rename {mods/art => art/general}/NEWSCAN.ANS (100%)
 rename {mods/art => art/general}/NEWUSER1.ANS (100%)
 rename {mods/art => art/general}/ONEADD.ANS (100%)
 rename {mods/art => art/general}/ONELINER.ANS (100%)
 rename {mods/art => art/general}/PRELOGAD.ANS (100%)
 rename {mods/art => art/general}/WELCOME1.ANS (100%)
 rename {mods/art => art/general}/WELCOME2.ANS (100%)
 rename {mods/art => art/general}/demo_edit_text_view.ans (100%)
 rename {mods/art => art/general}/demo_edit_text_view1.ans (100%)
 rename {mods/art => art/general}/demo_fse_local_user.ans (100%)
 rename {mods/art => art/general}/demo_fse_netmail_body.ans (100%)
 rename {mods/art => art/general}/demo_fse_netmail_footer_edit.ans (100%)
 rename {mods/art => art/general}/demo_fse_netmail_footer_edit_menu.ans (100%)
 rename {mods/art => art/general}/demo_fse_netmail_header.ans (100%)
 rename {mods/art => art/general}/demo_fse_netmail_help.ans (100%)
 rename {mods/art => art/general}/demo_horizontal_menu_view1.ans (100%)
 rename {mods/art => art/general}/demo_mask_edit_text_view1.ans (100%)
 rename {mods/art => art/general}/demo_multi_line_edit_text_view1.ans (100%)
 rename {mods/art => art/general}/demo_selection_vm.ans (100%)
 rename {mods/art => art/general}/demo_spin_and_toggle.ans (100%)
 rename {mods/art => art/general}/demo_vertical_menu_view1.ans (100%)
 rename {mods/art => art/general}/erc.ans (100%)
 rename {mods/art => art/general}/menu_prompt.ans (100%)
 rename {mods/art => art/general}/msg_area_footer_view.ans (100%)
 rename {mods/art => art/general}/msg_area_list.ans (100%)
 rename {mods/art => art/general}/msg_area_post_header.ans (100%)
 rename {mods/art => art/general}/msg_area_view_header.ans (100%)
 rename {mods/art => art/general}/test.ans (100%)
 rename {mods => art}/themes/luciano_blocktronics/BBSADD.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/BBSLIST.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/CCHANGE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/CHANGE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/CONFSCR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/DONE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/DOORMNU.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FAREASEL.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FBHELP.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FBNORES.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FBRWSE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FDETAIL.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FDETGEN.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FDETLST.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FDETNFO.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FDLMGR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FEMPTYQ.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FFILEDT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FILPMPT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FMENU.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FNEWBRWSE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FORGOTPW.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FORGOTPWSENT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FPROSEL.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/FSEARCH.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/IDLELOG.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/LASTCALL.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/LETTER.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MAILMNU.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MATRIX.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MMENU.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MNUPRMT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGBODY.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGEFTR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGEHDR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGEHLP.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGEMFT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGLIST.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGMNU.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGPMPT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGQUOT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGVFTR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGVHDR.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/MSGVHLP.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/NEWMSGS.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/NUA.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ONEADD.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ONELINER.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/PAUSE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/RATEFILE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/RUMORADD.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/RUMORS.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/STATUS.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/SYSSTAT.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/TBRIDGE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/TOONODE.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ULCHECK.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ULDETAIL.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ULDUPES.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ULNOAREA.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/ULOPTS.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/USERLOG.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/USERLST.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/WHOSON.ANS (100%)
 rename {mods => art}/themes/luciano_blocktronics/theme.hjson (100%)
 rename {mods => config}/menu.hjson (100%)
 rename {mods => config}/prompt.hjson (100%)
 rename mods/{ => system}/abracadabra.js (94%)
 rename mods/{ => system}/bbs_link.js (96%)
 rename mods/{ => system}/bbs_list.js (96%)
 rename mods/{ => system}/erc_client.js (97%)
 rename mods/{ => system}/file_area_filter_edit.js (95%)
 rename mods/{ => system}/file_area_list.js (94%)
 rename mods/{ => system}/file_base_area_select.js (88%)
 rename mods/{ => system}/file_base_download_manager.js (92%)
 rename mods/{ => system}/file_base_search.js (89%)
 rename mods/{ => system}/file_base_web_download_manager.js (91%)
 rename mods/{ => system}/file_transfer_protocol_select.js (93%)
 rename mods/{ => system}/last_callers.js (92%)
 rename mods/{ => system}/msg_area_list.js (91%)
 rename mods/{ => system}/msg_area_post_fse.js (90%)
 rename mods/{ => system}/msg_area_reply_fse.js (81%)
 rename mods/{ => system}/msg_area_view_fse.js (95%)
 rename mods/{ => system}/msg_conf_list.js (89%)
 rename mods/{ => system}/msg_list.js (95%)
 rename mods/{ => system}/nua.js (91%)
 rename mods/{ => system}/onelinerz.js (95%)
 rename mods/{ => system}/rumorz.js (92%)
 rename mods/{ => system}/telnet_bridge.js (94%)
 rename mods/{ => system}/upload.js (94%)
 rename mods/{ => system}/user_list.js (91%)
 rename mods/{ => system}/whos_online.js (87%)
 create mode 100644 mods/user/.keep

diff --git a/mods/art/CONNECT1.ANS b/art/general/CONNECT1.ANS
similarity index 100%
rename from mods/art/CONNECT1.ANS
rename to art/general/CONNECT1.ANS
diff --git a/mods/art/DOORMANY.ANS b/art/general/DOORMANY.ANS
similarity index 100%
rename from mods/art/DOORMANY.ANS
rename to art/general/DOORMANY.ANS
diff --git a/mods/art/GNSPMPT.ANS b/art/general/GNSPMPT.ANS
similarity index 100%
rename from mods/art/GNSPMPT.ANS
rename to art/general/GNSPMPT.ANS
diff --git a/mods/art/LOGPMPT.ANS b/art/general/LOGPMPT.ANS
similarity index 100%
rename from mods/art/LOGPMPT.ANS
rename to art/general/LOGPMPT.ANS
diff --git a/mods/art/NEWSCAN.ANS b/art/general/NEWSCAN.ANS
similarity index 100%
rename from mods/art/NEWSCAN.ANS
rename to art/general/NEWSCAN.ANS
diff --git a/mods/art/NEWUSER1.ANS b/art/general/NEWUSER1.ANS
similarity index 100%
rename from mods/art/NEWUSER1.ANS
rename to art/general/NEWUSER1.ANS
diff --git a/mods/art/ONEADD.ANS b/art/general/ONEADD.ANS
similarity index 100%
rename from mods/art/ONEADD.ANS
rename to art/general/ONEADD.ANS
diff --git a/mods/art/ONELINER.ANS b/art/general/ONELINER.ANS
similarity index 100%
rename from mods/art/ONELINER.ANS
rename to art/general/ONELINER.ANS
diff --git a/mods/art/PRELOGAD.ANS b/art/general/PRELOGAD.ANS
similarity index 100%
rename from mods/art/PRELOGAD.ANS
rename to art/general/PRELOGAD.ANS
diff --git a/mods/art/WELCOME1.ANS b/art/general/WELCOME1.ANS
similarity index 100%
rename from mods/art/WELCOME1.ANS
rename to art/general/WELCOME1.ANS
diff --git a/mods/art/WELCOME2.ANS b/art/general/WELCOME2.ANS
similarity index 100%
rename from mods/art/WELCOME2.ANS
rename to art/general/WELCOME2.ANS
diff --git a/mods/art/demo_edit_text_view.ans b/art/general/demo_edit_text_view.ans
similarity index 100%
rename from mods/art/demo_edit_text_view.ans
rename to art/general/demo_edit_text_view.ans
diff --git a/mods/art/demo_edit_text_view1.ans b/art/general/demo_edit_text_view1.ans
similarity index 100%
rename from mods/art/demo_edit_text_view1.ans
rename to art/general/demo_edit_text_view1.ans
diff --git a/mods/art/demo_fse_local_user.ans b/art/general/demo_fse_local_user.ans
similarity index 100%
rename from mods/art/demo_fse_local_user.ans
rename to art/general/demo_fse_local_user.ans
diff --git a/mods/art/demo_fse_netmail_body.ans b/art/general/demo_fse_netmail_body.ans
similarity index 100%
rename from mods/art/demo_fse_netmail_body.ans
rename to art/general/demo_fse_netmail_body.ans
diff --git a/mods/art/demo_fse_netmail_footer_edit.ans b/art/general/demo_fse_netmail_footer_edit.ans
similarity index 100%
rename from mods/art/demo_fse_netmail_footer_edit.ans
rename to art/general/demo_fse_netmail_footer_edit.ans
diff --git a/mods/art/demo_fse_netmail_footer_edit_menu.ans b/art/general/demo_fse_netmail_footer_edit_menu.ans
similarity index 100%
rename from mods/art/demo_fse_netmail_footer_edit_menu.ans
rename to art/general/demo_fse_netmail_footer_edit_menu.ans
diff --git a/mods/art/demo_fse_netmail_header.ans b/art/general/demo_fse_netmail_header.ans
similarity index 100%
rename from mods/art/demo_fse_netmail_header.ans
rename to art/general/demo_fse_netmail_header.ans
diff --git a/mods/art/demo_fse_netmail_help.ans b/art/general/demo_fse_netmail_help.ans
similarity index 100%
rename from mods/art/demo_fse_netmail_help.ans
rename to art/general/demo_fse_netmail_help.ans
diff --git a/mods/art/demo_horizontal_menu_view1.ans b/art/general/demo_horizontal_menu_view1.ans
similarity index 100%
rename from mods/art/demo_horizontal_menu_view1.ans
rename to art/general/demo_horizontal_menu_view1.ans
diff --git a/mods/art/demo_mask_edit_text_view1.ans b/art/general/demo_mask_edit_text_view1.ans
similarity index 100%
rename from mods/art/demo_mask_edit_text_view1.ans
rename to art/general/demo_mask_edit_text_view1.ans
diff --git a/mods/art/demo_multi_line_edit_text_view1.ans b/art/general/demo_multi_line_edit_text_view1.ans
similarity index 100%
rename from mods/art/demo_multi_line_edit_text_view1.ans
rename to art/general/demo_multi_line_edit_text_view1.ans
diff --git a/mods/art/demo_selection_vm.ans b/art/general/demo_selection_vm.ans
similarity index 100%
rename from mods/art/demo_selection_vm.ans
rename to art/general/demo_selection_vm.ans
diff --git a/mods/art/demo_spin_and_toggle.ans b/art/general/demo_spin_and_toggle.ans
similarity index 100%
rename from mods/art/demo_spin_and_toggle.ans
rename to art/general/demo_spin_and_toggle.ans
diff --git a/mods/art/demo_vertical_menu_view1.ans b/art/general/demo_vertical_menu_view1.ans
similarity index 100%
rename from mods/art/demo_vertical_menu_view1.ans
rename to art/general/demo_vertical_menu_view1.ans
diff --git a/mods/art/erc.ans b/art/general/erc.ans
similarity index 100%
rename from mods/art/erc.ans
rename to art/general/erc.ans
diff --git a/mods/art/menu_prompt.ans b/art/general/menu_prompt.ans
similarity index 100%
rename from mods/art/menu_prompt.ans
rename to art/general/menu_prompt.ans
diff --git a/mods/art/msg_area_footer_view.ans b/art/general/msg_area_footer_view.ans
similarity index 100%
rename from mods/art/msg_area_footer_view.ans
rename to art/general/msg_area_footer_view.ans
diff --git a/mods/art/msg_area_list.ans b/art/general/msg_area_list.ans
similarity index 100%
rename from mods/art/msg_area_list.ans
rename to art/general/msg_area_list.ans
diff --git a/mods/art/msg_area_post_header.ans b/art/general/msg_area_post_header.ans
similarity index 100%
rename from mods/art/msg_area_post_header.ans
rename to art/general/msg_area_post_header.ans
diff --git a/mods/art/msg_area_view_header.ans b/art/general/msg_area_view_header.ans
similarity index 100%
rename from mods/art/msg_area_view_header.ans
rename to art/general/msg_area_view_header.ans
diff --git a/mods/art/test.ans b/art/general/test.ans
similarity index 100%
rename from mods/art/test.ans
rename to art/general/test.ans
diff --git a/mods/themes/luciano_blocktronics/BBSADD.ANS b/art/themes/luciano_blocktronics/BBSADD.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/BBSADD.ANS
rename to art/themes/luciano_blocktronics/BBSADD.ANS
diff --git a/mods/themes/luciano_blocktronics/BBSLIST.ANS b/art/themes/luciano_blocktronics/BBSLIST.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/BBSLIST.ANS
rename to art/themes/luciano_blocktronics/BBSLIST.ANS
diff --git a/mods/themes/luciano_blocktronics/CCHANGE.ANS b/art/themes/luciano_blocktronics/CCHANGE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/CCHANGE.ANS
rename to art/themes/luciano_blocktronics/CCHANGE.ANS
diff --git a/mods/themes/luciano_blocktronics/CHANGE.ANS b/art/themes/luciano_blocktronics/CHANGE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/CHANGE.ANS
rename to art/themes/luciano_blocktronics/CHANGE.ANS
diff --git a/mods/themes/luciano_blocktronics/CONFSCR.ANS b/art/themes/luciano_blocktronics/CONFSCR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/CONFSCR.ANS
rename to art/themes/luciano_blocktronics/CONFSCR.ANS
diff --git a/mods/themes/luciano_blocktronics/DONE.ANS b/art/themes/luciano_blocktronics/DONE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/DONE.ANS
rename to art/themes/luciano_blocktronics/DONE.ANS
diff --git a/mods/themes/luciano_blocktronics/DOORMNU.ANS b/art/themes/luciano_blocktronics/DOORMNU.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/DOORMNU.ANS
rename to art/themes/luciano_blocktronics/DOORMNU.ANS
diff --git a/mods/themes/luciano_blocktronics/FAREASEL.ANS b/art/themes/luciano_blocktronics/FAREASEL.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FAREASEL.ANS
rename to art/themes/luciano_blocktronics/FAREASEL.ANS
diff --git a/mods/themes/luciano_blocktronics/FBHELP.ANS b/art/themes/luciano_blocktronics/FBHELP.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FBHELP.ANS
rename to art/themes/luciano_blocktronics/FBHELP.ANS
diff --git a/mods/themes/luciano_blocktronics/FBNORES.ANS b/art/themes/luciano_blocktronics/FBNORES.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FBNORES.ANS
rename to art/themes/luciano_blocktronics/FBNORES.ANS
diff --git a/mods/themes/luciano_blocktronics/FBRWSE.ANS b/art/themes/luciano_blocktronics/FBRWSE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FBRWSE.ANS
rename to art/themes/luciano_blocktronics/FBRWSE.ANS
diff --git a/mods/themes/luciano_blocktronics/FDETAIL.ANS b/art/themes/luciano_blocktronics/FDETAIL.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FDETAIL.ANS
rename to art/themes/luciano_blocktronics/FDETAIL.ANS
diff --git a/mods/themes/luciano_blocktronics/FDETGEN.ANS b/art/themes/luciano_blocktronics/FDETGEN.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FDETGEN.ANS
rename to art/themes/luciano_blocktronics/FDETGEN.ANS
diff --git a/mods/themes/luciano_blocktronics/FDETLST.ANS b/art/themes/luciano_blocktronics/FDETLST.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FDETLST.ANS
rename to art/themes/luciano_blocktronics/FDETLST.ANS
diff --git a/mods/themes/luciano_blocktronics/FDETNFO.ANS b/art/themes/luciano_blocktronics/FDETNFO.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FDETNFO.ANS
rename to art/themes/luciano_blocktronics/FDETNFO.ANS
diff --git a/mods/themes/luciano_blocktronics/FDLMGR.ANS b/art/themes/luciano_blocktronics/FDLMGR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FDLMGR.ANS
rename to art/themes/luciano_blocktronics/FDLMGR.ANS
diff --git a/mods/themes/luciano_blocktronics/FEMPTYQ.ANS b/art/themes/luciano_blocktronics/FEMPTYQ.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FEMPTYQ.ANS
rename to art/themes/luciano_blocktronics/FEMPTYQ.ANS
diff --git a/mods/themes/luciano_blocktronics/FFILEDT.ANS b/art/themes/luciano_blocktronics/FFILEDT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FFILEDT.ANS
rename to art/themes/luciano_blocktronics/FFILEDT.ANS
diff --git a/mods/themes/luciano_blocktronics/FILPMPT.ANS b/art/themes/luciano_blocktronics/FILPMPT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FILPMPT.ANS
rename to art/themes/luciano_blocktronics/FILPMPT.ANS
diff --git a/mods/themes/luciano_blocktronics/FMENU.ANS b/art/themes/luciano_blocktronics/FMENU.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FMENU.ANS
rename to art/themes/luciano_blocktronics/FMENU.ANS
diff --git a/mods/themes/luciano_blocktronics/FNEWBRWSE.ANS b/art/themes/luciano_blocktronics/FNEWBRWSE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FNEWBRWSE.ANS
rename to art/themes/luciano_blocktronics/FNEWBRWSE.ANS
diff --git a/mods/themes/luciano_blocktronics/FORGOTPW.ANS b/art/themes/luciano_blocktronics/FORGOTPW.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FORGOTPW.ANS
rename to art/themes/luciano_blocktronics/FORGOTPW.ANS
diff --git a/mods/themes/luciano_blocktronics/FORGOTPWSENT.ANS b/art/themes/luciano_blocktronics/FORGOTPWSENT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FORGOTPWSENT.ANS
rename to art/themes/luciano_blocktronics/FORGOTPWSENT.ANS
diff --git a/mods/themes/luciano_blocktronics/FPROSEL.ANS b/art/themes/luciano_blocktronics/FPROSEL.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FPROSEL.ANS
rename to art/themes/luciano_blocktronics/FPROSEL.ANS
diff --git a/mods/themes/luciano_blocktronics/FSEARCH.ANS b/art/themes/luciano_blocktronics/FSEARCH.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/FSEARCH.ANS
rename to art/themes/luciano_blocktronics/FSEARCH.ANS
diff --git a/mods/themes/luciano_blocktronics/IDLELOG.ANS b/art/themes/luciano_blocktronics/IDLELOG.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/IDLELOG.ANS
rename to art/themes/luciano_blocktronics/IDLELOG.ANS
diff --git a/mods/themes/luciano_blocktronics/LASTCALL.ANS b/art/themes/luciano_blocktronics/LASTCALL.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/LASTCALL.ANS
rename to art/themes/luciano_blocktronics/LASTCALL.ANS
diff --git a/mods/themes/luciano_blocktronics/LETTER.ANS b/art/themes/luciano_blocktronics/LETTER.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/LETTER.ANS
rename to art/themes/luciano_blocktronics/LETTER.ANS
diff --git a/mods/themes/luciano_blocktronics/MAILMNU.ANS b/art/themes/luciano_blocktronics/MAILMNU.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MAILMNU.ANS
rename to art/themes/luciano_blocktronics/MAILMNU.ANS
diff --git a/mods/themes/luciano_blocktronics/MATRIX.ANS b/art/themes/luciano_blocktronics/MATRIX.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MATRIX.ANS
rename to art/themes/luciano_blocktronics/MATRIX.ANS
diff --git a/mods/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MMENU.ANS
rename to art/themes/luciano_blocktronics/MMENU.ANS
diff --git a/mods/themes/luciano_blocktronics/MNUPRMT.ANS b/art/themes/luciano_blocktronics/MNUPRMT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MNUPRMT.ANS
rename to art/themes/luciano_blocktronics/MNUPRMT.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGBODY.ANS b/art/themes/luciano_blocktronics/MSGBODY.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGBODY.ANS
rename to art/themes/luciano_blocktronics/MSGBODY.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGEFTR.ANS b/art/themes/luciano_blocktronics/MSGEFTR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGEFTR.ANS
rename to art/themes/luciano_blocktronics/MSGEFTR.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGEHDR.ANS b/art/themes/luciano_blocktronics/MSGEHDR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGEHDR.ANS
rename to art/themes/luciano_blocktronics/MSGEHDR.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGEHLP.ANS b/art/themes/luciano_blocktronics/MSGEHLP.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGEHLP.ANS
rename to art/themes/luciano_blocktronics/MSGEHLP.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGEMFT.ANS b/art/themes/luciano_blocktronics/MSGEMFT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGEMFT.ANS
rename to art/themes/luciano_blocktronics/MSGEMFT.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGLIST.ANS b/art/themes/luciano_blocktronics/MSGLIST.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGLIST.ANS
rename to art/themes/luciano_blocktronics/MSGLIST.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGMNU.ANS
rename to art/themes/luciano_blocktronics/MSGMNU.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGPMPT.ANS b/art/themes/luciano_blocktronics/MSGPMPT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGPMPT.ANS
rename to art/themes/luciano_blocktronics/MSGPMPT.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGQUOT.ANS b/art/themes/luciano_blocktronics/MSGQUOT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGQUOT.ANS
rename to art/themes/luciano_blocktronics/MSGQUOT.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGVFTR.ANS b/art/themes/luciano_blocktronics/MSGVFTR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGVFTR.ANS
rename to art/themes/luciano_blocktronics/MSGVFTR.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGVHDR.ANS b/art/themes/luciano_blocktronics/MSGVHDR.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGVHDR.ANS
rename to art/themes/luciano_blocktronics/MSGVHDR.ANS
diff --git a/mods/themes/luciano_blocktronics/MSGVHLP.ANS b/art/themes/luciano_blocktronics/MSGVHLP.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/MSGVHLP.ANS
rename to art/themes/luciano_blocktronics/MSGVHLP.ANS
diff --git a/mods/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/NEWMSGS.ANS
rename to art/themes/luciano_blocktronics/NEWMSGS.ANS
diff --git a/mods/themes/luciano_blocktronics/NUA.ANS b/art/themes/luciano_blocktronics/NUA.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/NUA.ANS
rename to art/themes/luciano_blocktronics/NUA.ANS
diff --git a/mods/themes/luciano_blocktronics/ONEADD.ANS b/art/themes/luciano_blocktronics/ONEADD.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ONEADD.ANS
rename to art/themes/luciano_blocktronics/ONEADD.ANS
diff --git a/mods/themes/luciano_blocktronics/ONELINER.ANS b/art/themes/luciano_blocktronics/ONELINER.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ONELINER.ANS
rename to art/themes/luciano_blocktronics/ONELINER.ANS
diff --git a/mods/themes/luciano_blocktronics/PAUSE.ANS b/art/themes/luciano_blocktronics/PAUSE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/PAUSE.ANS
rename to art/themes/luciano_blocktronics/PAUSE.ANS
diff --git a/mods/themes/luciano_blocktronics/RATEFILE.ANS b/art/themes/luciano_blocktronics/RATEFILE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/RATEFILE.ANS
rename to art/themes/luciano_blocktronics/RATEFILE.ANS
diff --git a/mods/themes/luciano_blocktronics/RUMORADD.ANS b/art/themes/luciano_blocktronics/RUMORADD.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/RUMORADD.ANS
rename to art/themes/luciano_blocktronics/RUMORADD.ANS
diff --git a/mods/themes/luciano_blocktronics/RUMORS.ANS b/art/themes/luciano_blocktronics/RUMORS.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/RUMORS.ANS
rename to art/themes/luciano_blocktronics/RUMORS.ANS
diff --git a/mods/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/STATUS.ANS
rename to art/themes/luciano_blocktronics/STATUS.ANS
diff --git a/mods/themes/luciano_blocktronics/SYSSTAT.ANS b/art/themes/luciano_blocktronics/SYSSTAT.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/SYSSTAT.ANS
rename to art/themes/luciano_blocktronics/SYSSTAT.ANS
diff --git a/mods/themes/luciano_blocktronics/TBRIDGE.ANS b/art/themes/luciano_blocktronics/TBRIDGE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/TBRIDGE.ANS
rename to art/themes/luciano_blocktronics/TBRIDGE.ANS
diff --git a/mods/themes/luciano_blocktronics/TOONODE.ANS b/art/themes/luciano_blocktronics/TOONODE.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/TOONODE.ANS
rename to art/themes/luciano_blocktronics/TOONODE.ANS
diff --git a/mods/themes/luciano_blocktronics/ULCHECK.ANS b/art/themes/luciano_blocktronics/ULCHECK.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ULCHECK.ANS
rename to art/themes/luciano_blocktronics/ULCHECK.ANS
diff --git a/mods/themes/luciano_blocktronics/ULDETAIL.ANS b/art/themes/luciano_blocktronics/ULDETAIL.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ULDETAIL.ANS
rename to art/themes/luciano_blocktronics/ULDETAIL.ANS
diff --git a/mods/themes/luciano_blocktronics/ULDUPES.ANS b/art/themes/luciano_blocktronics/ULDUPES.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ULDUPES.ANS
rename to art/themes/luciano_blocktronics/ULDUPES.ANS
diff --git a/mods/themes/luciano_blocktronics/ULNOAREA.ANS b/art/themes/luciano_blocktronics/ULNOAREA.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ULNOAREA.ANS
rename to art/themes/luciano_blocktronics/ULNOAREA.ANS
diff --git a/mods/themes/luciano_blocktronics/ULOPTS.ANS b/art/themes/luciano_blocktronics/ULOPTS.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/ULOPTS.ANS
rename to art/themes/luciano_blocktronics/ULOPTS.ANS
diff --git a/mods/themes/luciano_blocktronics/USERLOG.ANS b/art/themes/luciano_blocktronics/USERLOG.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/USERLOG.ANS
rename to art/themes/luciano_blocktronics/USERLOG.ANS
diff --git a/mods/themes/luciano_blocktronics/USERLST.ANS b/art/themes/luciano_blocktronics/USERLST.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/USERLST.ANS
rename to art/themes/luciano_blocktronics/USERLST.ANS
diff --git a/mods/themes/luciano_blocktronics/WHOSON.ANS b/art/themes/luciano_blocktronics/WHOSON.ANS
similarity index 100%
rename from mods/themes/luciano_blocktronics/WHOSON.ANS
rename to art/themes/luciano_blocktronics/WHOSON.ANS
diff --git a/mods/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
similarity index 100%
rename from mods/themes/luciano_blocktronics/theme.hjson
rename to art/themes/luciano_blocktronics/theme.hjson
diff --git a/mods/menu.hjson b/config/menu.hjson
similarity index 100%
rename from mods/menu.hjson
rename to config/menu.hjson
diff --git a/mods/prompt.hjson b/config/prompt.hjson
similarity index 100%
rename from mods/prompt.hjson
rename to config/prompt.hjson
diff --git a/core/config.js b/core/config.js
index 367143b6..fa7d346c 100644
--- a/core/config.js
+++ b/core/config.js
@@ -111,11 +111,8 @@ function init(configPath, options, cb) {
 }
 
 function getDefaultPath() {
-	const base = miscUtil.resolvePath('~/');
-	if(base) {
-		//	e.g. /home/users/joeuser/.config/enigma-bbs/config.hjson
-		return paths.join(base, '.config', 'enigma-bbs', 'config.hjson');
-	}
+	//	e.g. /enigma-bbs-install-path/config/config.hjson
+	return './config/config.hjson';
 }
 
 function getDefaultConfig() {
@@ -193,15 +190,17 @@ function getDefaultConfig() {
 		},	
 
 		paths		: {
-			mods				: paths.join(__dirname, './../mods/'),
+			config				: paths.join(__dirname, './../config/'),
+			mods				: paths.join(__dirname, './../mods/system'),
+			userMods			: paths.join(__dirname, './../mods/user'),
 			loginServers		: paths.join(__dirname, './servers/login/'),
 			contentServers		: paths.join(__dirname, './servers/content/'),
 
 			scannerTossers		: paths.join(__dirname, './scanner_tossers/'),
 			mailers				: paths.join(__dirname, './mailers/')		,
 
-			art					: paths.join(__dirname, './../mods/art/'),
-			themes				: paths.join(__dirname, './../mods/themes/'),
+			art					: paths.join(__dirname, './../art/general/'),
+			themes				: paths.join(__dirname, './../art/themes/'),
 			logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
 			db					: paths.join(__dirname, './../db/'),
 			modsDb				: paths.join(__dirname, './../db/mods/'),				
diff --git a/core/config_util.js b/core/config_util.js
index f078f758..3ed7b98c 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -1,16 +1,15 @@
 /* jslint node: true */
 'use strict';
-
-var configCache			= require('./config_cache.js');
-
-var paths				= require('path');
+const Config	= require('./config.js').config;
+const configCache			= require('./config_cache.js');
+const paths				= require('path');
 
 exports.getFullConfig	= getFullConfig;
 
 function getFullConfig(filePath, cb) {
 	//	|filePath| is assumed to be in 'mods' if it's only a file name
 	if('.' === paths.dirname(filePath)) {
-		filePath = paths.join(__dirname, '../mods', filePath);
+		filePath = paths.join(Config.paths.config, filePath);
 	}
 
 	configCache.getConfig(filePath, function loaded(err, configJson) {
diff --git a/core/module_util.js b/core/module_util.js
index 67e87306..b730d0ca 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -102,6 +102,7 @@ function loadModulesForCategory(category, iterator, complete) {
 function getModulePaths() {
 	return [
 		Config.paths.mods,
+		Config.paths.userMods,
 		Config.paths.loginServers,
 		Config.paths.contentServers,
 		Config.paths.scannerTossers,
diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index 21e1a6d0..14edd518 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -45,7 +45,7 @@ function printUsageAndSetExitCode(errMsg, exitCode) {
 }
 
 function getDefaultConfigPath() {
-	return resolvePath('~/.config/enigma-bbs/config.hjson');
+    return './config/config.hjson';
 }
 
 function getConfigPath() {
diff --git a/mods/abracadabra.js b/mods/system/abracadabra.js
similarity index 94%
rename from mods/abracadabra.js
rename to mods/system/abracadabra.js
index a84d2c63..595f84d4 100644
--- a/mods/abracadabra.js
+++ b/mods/system/abracadabra.js
@@ -1,11 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../core/menu_module.js').MenuModule;
-const DropFile			= require('../core/dropfile.js').DropFile;
-const door				= require('../core/door.js');
-const theme				= require('../core/theme.js');
-const ansi				= require('../core/ansi_term.js');
+const MenuModule		= require('../../core/menu_module.js').MenuModule;
+const DropFile			= require('../../core/dropfile.js').DropFile;
+const door				= require('../../core/door.js');
+const theme				= require('../../core/theme.js');
+const ansi				= require('../../core/ansi_term.js');
 
 const async				= require('async');
 const assert			= require('assert');
diff --git a/mods/bbs_link.js b/mods/system/bbs_link.js
similarity index 96%
rename from mods/bbs_link.js
rename to mods/system/bbs_link.js
index 0cf0a5db..1d5492df 100644
--- a/mods/bbs_link.js
+++ b/mods/system/bbs_link.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../core/menu_module.js').MenuModule;
-const resetScreen	= require('../core/ansi_term.js').resetScreen;
+const MenuModule	= require('../../core/menu_module.js').MenuModule;
+const resetScreen	= require('../../core/ansi_term.js').resetScreen;
 
 const async			= require('async');
 const _				= require('lodash');
@@ -10,7 +10,7 @@ const http			= require('http');
 const net			= require('net');
 const crypto		= require('crypto');
 
-const packageJson 	= require('../package.json');
+const packageJson 	= require('../../package.json');
 
 /*
 	Expected configuration block:
diff --git a/mods/bbs_list.js b/mods/system/bbs_list.js
similarity index 96%
rename from mods/bbs_list.js
rename to mods/system/bbs_list.js
index ec964a36..8ae94c6c 100644
--- a/mods/bbs_list.js
+++ b/mods/system/bbs_list.js
@@ -2,18 +2,18 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
 
 const { 
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../core/database.js');
+}							= require('../../core/database.js');
 
-const ViewController		= require('../core/view_controller.js').ViewController;
-const ansi					= require('../core/ansi_term.js');
-const theme					= require('../core/theme.js');
-const User					= require('../core/user.js');
-const stringFormat			= require('../core/string_format.js');
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const ansi					= require('../../core/ansi_term.js');
+const theme					= require('../../core/theme.js');
+const User					= require('../../core/user.js');
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const async 				= require('async');
diff --git a/mods/erc_client.js b/mods/system/erc_client.js
similarity index 97%
rename from mods/erc_client.js
rename to mods/system/erc_client.js
index 02b42ad5..cdc71521 100644
--- a/mods/erc_client.js
+++ b/mods/system/erc_client.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../core/menu_module.js').MenuModule;
-const stringFormat	= require('../core/string_format.js');
+const MenuModule	= require('../../core/menu_module.js').MenuModule;
+const stringFormat	= require('../../core/string_format.js');
 
 //	deps
 const async			= require('async');
diff --git a/mods/file_area_filter_edit.js b/mods/system/file_area_filter_edit.js
similarity index 95%
rename from mods/file_area_filter_edit.js
rename to mods/system/file_area_filter_edit.js
index cb3322f9..0ff8b37d 100644
--- a/mods/file_area_filter_edit.js
+++ b/mods/system/file_area_filter_edit.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../core/menu_module.js').MenuModule;
-const ViewController				= require('../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../core/file_base_filter.js');
-const stringFormat					= require('../core/string_format.js');
+const MenuModule					= require('../../core/menu_module.js').MenuModule;
+const ViewController				= require('../../core/view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('../../core/file_base_filter.js');
+const stringFormat					= require('../../core/string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/file_area_list.js b/mods/system/file_area_list.js
similarity index 94%
rename from mods/file_area_list.js
rename to mods/system/file_area_list.js
index 0c24f9f8..5359e48e 100644
--- a/mods/file_area_list.js
+++ b/mods/system/file_area_list.js
@@ -2,23 +2,23 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const ansi					= require('../core/ansi_term.js');
-const theme					= require('../core/theme.js');
-const FileEntry				= require('../core/file_entry.js');
-const stringFormat			= require('../core/string_format.js');
-const FileArea				= require('../core/file_base_area.js');
-const Errors				= require('../core/enig_error.js').Errors;
-const ErrNotEnabled			= require('../core/enig_error.js').ErrorReasons.NotEnabled;
-const ArchiveUtil			= require('../core/archive_util.js');
-const Config				= require('../core/config.js').config;
-const DownloadQueue			= require('../core/download_queue.js');
-const FileAreaWeb			= require('../core/file_area_web.js');
-const FileBaseFilters		= require('../core/file_base_filter.js');
-const resolveMimeType		= require('../core/mime_util.js').resolveMimeType;
-const isAnsi				= require('../core/string_util.js').isAnsi;
-const controlCodesToAnsi	= require('../core/color_codes.js').controlCodesToAnsi;
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const ansi					= require('../../core/ansi_term.js');
+const theme					= require('../../core/theme.js');
+const FileEntry				= require('../../core/file_entry.js');
+const stringFormat			= require('../../core/string_format.js');
+const FileArea				= require('../../core/file_base_area.js');
+const Errors				= require('../../core/enig_error.js').Errors;
+const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
+const ArchiveUtil			= require('../../core/archive_util.js');
+const Config				= require('../../core/config.js').config;
+const DownloadQueue			= require('../../core/download_queue.js');
+const FileAreaWeb			= require('../../core/file_area_web.js');
+const FileBaseFilters		= require('../../core/file_base_filter.js');
+const resolveMimeType		= require('../../core/mime_util.js').resolveMimeType;
+const isAnsi				= require('../../core/string_util.js').isAnsi;
+const controlCodesToAnsi	= require('../../core/color_codes.js').controlCodesToAnsi;
 
 //	deps
 const async				= require('async');
diff --git a/mods/file_base_area_select.js b/mods/system/file_base_area_select.js
similarity index 88%
rename from mods/file_base_area_select.js
rename to mods/system/file_base_area_select.js
index ca182d6c..38b7eba7 100644
--- a/mods/file_base_area_select.js
+++ b/mods/system/file_base_area_select.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../core/menu_module.js').MenuModule;
-const stringFormat						= require('../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../core/file_base_area.js').getSortedAvailableFileAreas;
-const StatLog							= require('../core/stat_log.js');
+const MenuModule						= require('../../core/menu_module.js').MenuModule;
+const stringFormat						= require('../../core/string_format.js');
+const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
+const StatLog							= require('../../core/stat_log.js');
 
 //	deps
 const async								= require('async');
diff --git a/mods/file_base_download_manager.js b/mods/system/file_base_download_manager.js
similarity index 92%
rename from mods/file_base_download_manager.js
rename to mods/system/file_base_download_manager.js
index 382a7305..15a892f1 100644
--- a/mods/file_base_download_manager.js
+++ b/mods/system/file_base_download_manager.js
@@ -2,14 +2,14 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../core/download_queue.js');
-const theme					= require('../core/theme.js');
-const ansi					= require('../core/ansi_term.js');
-const Errors				= require('../core/enig_error.js').Errors;
-const stringFormat			= require('../core/string_format.js');
-const FileAreaWeb			= require('../core/file_area_web.js');
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const DownloadQueue			= require('../../core/download_queue.js');
+const theme					= require('../../core/theme.js');
+const ansi					= require('../../core/ansi_term.js');
+const Errors				= require('../../core/enig_error.js').Errors;
+const stringFormat			= require('../../core/string_format.js');
+const FileAreaWeb			= require('../../core/file_area_web.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/file_base_search.js b/mods/system/file_base_search.js
similarity index 89%
rename from mods/file_base_search.js
rename to mods/system/file_base_search.js
index e984e1a4..d3ebd1db 100644
--- a/mods/file_base_search.js
+++ b/mods/system/file_base_search.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../core/menu_module.js').MenuModule;
-const ViewController				= require('../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../core/file_base_filter.js');
+const MenuModule					= require('../../core/menu_module.js').MenuModule;
+const ViewController				= require('../../core/view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('../../core/file_base_filter.js');
 
 //	deps
 const async							= require('async');
diff --git a/mods/file_base_web_download_manager.js b/mods/system/file_base_web_download_manager.js
similarity index 91%
rename from mods/file_base_web_download_manager.js
rename to mods/system/file_base_web_download_manager.js
index d171cfdb..9acad951 100644
--- a/mods/file_base_web_download_manager.js
+++ b/mods/system/file_base_web_download_manager.js
@@ -2,16 +2,16 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../core/download_queue.js');
-const theme					= require('../core/theme.js');
-const ansi					= require('../core/ansi_term.js');
-const Errors				= require('../core/enig_error.js').Errors;
-const stringFormat			= require('../core/string_format.js');
-const FileAreaWeb			= require('../core/file_area_web.js');
-const ErrNotEnabled			= require('../core/enig_error.js').ErrorReasons.NotEnabled;
-const Config				= require('../core/config.js').config;
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const DownloadQueue			= require('../../core/download_queue.js');
+const theme					= require('../../core/theme.js');
+const ansi					= require('../../core/ansi_term.js');
+const Errors				= require('../../core/enig_error.js').Errors;
+const stringFormat			= require('../../core/string_format.js');
+const FileAreaWeb			= require('../../core/file_area_web.js');
+const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
+const Config				= require('../../core/config.js').config;
 
 //	deps
 const async					= require('async');
diff --git a/mods/file_transfer_protocol_select.js b/mods/system/file_transfer_protocol_select.js
similarity index 93%
rename from mods/file_transfer_protocol_select.js
rename to mods/system/file_transfer_protocol_select.js
index 6efa5a93..c731dff2 100644
--- a/mods/file_transfer_protocol_select.js
+++ b/mods/system/file_transfer_protocol_select.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule		= require('../core/menu_module.js').MenuModule;
-const Config			= require('../core/config.js').config;
-const stringFormat		= require('../core/string_format.js');
-const ViewController	= require('../core/view_controller.js').ViewController;
+const MenuModule		= require('../../core/menu_module.js').MenuModule;
+const Config			= require('../../core/config.js').config;
+const stringFormat		= require('../../core/string_format.js');
+const ViewController	= require('../../core/view_controller.js').ViewController;
 
 //	deps
 const async			= require('async');
diff --git a/mods/last_callers.js b/mods/system/last_callers.js
similarity index 92%
rename from mods/last_callers.js
rename to mods/system/last_callers.js
index afb429d8..85d4bef0 100644
--- a/mods/last_callers.js
+++ b/mods/system/last_callers.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule		= require('../core/menu_module.js').MenuModule;
-const ViewController	= require('../core/view_controller.js').ViewController;
-const StatLog			= require('../core/stat_log.js');
-const User				= require('../core/user.js');
-const stringFormat		= require('../core/string_format.js');
+const MenuModule		= require('../../core/menu_module.js').MenuModule;
+const ViewController	= require('../../core/view_controller.js').ViewController;
+const StatLog			= require('../../core/stat_log.js');
+const User				= require('../../core/user.js');
+const stringFormat		= require('../../core/string_format.js');
 
 //	deps
 const moment			= require('moment');
diff --git a/mods/msg_area_list.js b/mods/system/msg_area_list.js
similarity index 91%
rename from mods/msg_area_list.js
rename to mods/system/msg_area_list.js
index a6a0df4c..51b18953 100644
--- a/mods/msg_area_list.js
+++ b/mods/system/msg_area_list.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const messageArea			= require('../core/message_area.js');
-const displayThemeArt		= require('../core/theme.js').displayThemeArt;
-const resetScreen			= require('../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../core/string_format.js');
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const messageArea			= require('../../core/message_area.js');
+const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
+const resetScreen			= require('../../core/ansi_term.js').resetScreen;
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/msg_area_post_fse.js b/mods/system/msg_area_post_fse.js
similarity index 90%
rename from mods/msg_area_post_fse.js
rename to mods/system/msg_area_post_fse.js
index 21b5d068..a0671f85 100644
--- a/mods/msg_area_post_fse.js
+++ b/mods/system/msg_area_post_fse.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const FullScreenEditorModule	= require('../core/fse.js').FullScreenEditorModule;
-const persistMessage			= require('../core/message_area.js').persistMessage; 
+const FullScreenEditorModule	= require('../../core/fse.js').FullScreenEditorModule;
+const persistMessage			= require('../../core/message_area.js').persistMessage;
 
 const _							= require('lodash');
 const async					 	= require('async');
diff --git a/mods/msg_area_reply_fse.js b/mods/system/msg_area_reply_fse.js
similarity index 81%
rename from mods/msg_area_reply_fse.js
rename to mods/system/msg_area_reply_fse.js
index d1cb5faa..497c8de7 100644
--- a/mods/msg_area_reply_fse.js
+++ b/mods/system/msg_area_reply_fse.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-var FullScreenEditorModule		= require('../core/fse.js').FullScreenEditorModule;
+var FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
 
 exports.getModule				= AreaReplyFSEModule;
 
diff --git a/mods/msg_area_view_fse.js b/mods/system/msg_area_view_fse.js
similarity index 95%
rename from mods/msg_area_view_fse.js
rename to mods/system/msg_area_view_fse.js
index de4657f1..7cb5a1b8 100644
--- a/mods/msg_area_view_fse.js
+++ b/mods/system/msg_area_view_fse.js
@@ -2,8 +2,8 @@
 'use strict';
 
 //	ENiGMA½
-const FullScreenEditorModule		= require('../core/fse.js').FullScreenEditorModule;
-const Message						= require('../core/message.js');
+const FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
+const Message						= require('../../core/message.js');
 
 //	deps
 const _							= require('lodash');
diff --git a/mods/msg_conf_list.js b/mods/system/msg_conf_list.js
similarity index 89%
rename from mods/msg_conf_list.js
rename to mods/system/msg_conf_list.js
index 91c24de4..06e9d59b 100644
--- a/mods/msg_conf_list.js
+++ b/mods/system/msg_conf_list.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const messageArea			= require('../core/message_area.js');
-const displayThemeArt		= require('../core/theme.js').displayThemeArt;
-const resetScreen			= require('../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../core/string_format.js');
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const messageArea			= require('../../core/message_area.js');
+const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
+const resetScreen			= require('../../core/ansi_term.js').resetScreen;
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/msg_list.js b/mods/system/msg_list.js
similarity index 95%
rename from mods/msg_list.js
rename to mods/system/msg_list.js
index bc80e27b..28d1b609 100644
--- a/mods/msg_list.js
+++ b/mods/system/msg_list.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../core/menu_module.js').MenuModule;
-const ViewController				= require('../core/view_controller.js').ViewController;
-const messageArea					= require('../core/message_area.js');
-const stringFormat					= require('../core/string_format.js');
-const MessageAreaConfTempSwitcher	= require('../core/mod_mixins.js').MessageAreaConfTempSwitcher;
+const MenuModule					= require('../../core/menu_module.js').MenuModule;
+const ViewController				= require('../../core/view_controller.js').ViewController;
+const messageArea					= require('../../core/message_area.js');
+const stringFormat					= require('../../core/string_format.js');
+const MessageAreaConfTempSwitcher	= require('../../core/mod_mixins.js').MessageAreaConfTempSwitcher;
 
 //	deps
 const async				= require('async');
diff --git a/mods/nua.js b/mods/system/nua.js
similarity index 91%
rename from mods/nua.js
rename to mods/system/nua.js
index 878e0581..7b4611d6 100644
--- a/mods/nua.js
+++ b/mods/system/nua.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule	= require('../core/menu_module.js').MenuModule;
-const User			= require('../core/user.js');
-const theme			= require('../core/theme.js');
-const login			= require('../core/system_menu_method.js').login;
-const Config		= require('../core/config.js').config;
-const messageArea	= require('../core/message_area.js');
+const MenuModule	= require('../../core/menu_module.js').MenuModule;
+const User			= require('../../core/user.js');
+const theme			= require('../../core/theme.js');
+const login			= require('../../core/system_menu_method.js').login;
+const Config		= require('../../core/config.js').config;
+const messageArea	= require('../../core/message_area.js');
 
 exports.moduleInfo = {
 	name	: 'NUA',
diff --git a/mods/onelinerz.js b/mods/system/onelinerz.js
similarity index 95%
rename from mods/onelinerz.js
rename to mods/system/onelinerz.js
index 065c0a30..416124c6 100644
--- a/mods/onelinerz.js
+++ b/mods/system/onelinerz.js
@@ -2,17 +2,17 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
 
 const {
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../core/database.js');
+}							= require('../../core/database.js');
 
-const ViewController		= require('../core/view_controller.js').ViewController;
-const theme					= require('../core/theme.js');
-const ansi					= require('../core/ansi_term.js');
-const stringFormat			= require('../core/string_format.js');
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const theme					= require('../../core/theme.js');
+const ansi					= require('../../core/ansi_term.js');
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const sqlite3				= require('sqlite3');
diff --git a/mods/rumorz.js b/mods/system/rumorz.js
similarity index 92%
rename from mods/rumorz.js
rename to mods/system/rumorz.js
index 20aace03..e85271dc 100644
--- a/mods/rumorz.js
+++ b/mods/system/rumorz.js
@@ -2,13 +2,13 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const theme					= require('../core/theme.js');
-const resetScreen			= require('../core/ansi_term.js').resetScreen;
-const StatLog				= require('../core/stat_log.js');
-const renderStringLength	= require('../core/string_util.js').renderStringLength;
-const stringFormat			= require('../core/string_format.js');
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const theme					= require('../../core/theme.js');
+const resetScreen			= require('../../core/ansi_term.js').resetScreen;
+const StatLog				= require('../../core/stat_log.js');
+const renderStringLength	= require('../../core/string_util.js').renderStringLength;
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/telnet_bridge.js b/mods/system/telnet_bridge.js
similarity index 94%
rename from mods/telnet_bridge.js
rename to mods/system/telnet_bridge.js
index 1dbb1ae9..42c73217 100644
--- a/mods/telnet_bridge.js
+++ b/mods/system/telnet_bridge.js
@@ -2,9 +2,9 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule				= require('../core/menu_module.js').MenuModule;
-const resetScreen				= require('../core/ansi_term.js').resetScreen;
-const setSyncTermFontWithAlias	= require('../core/ansi_term.js').setSyncTermFontWithAlias;
+const MenuModule				= require('../../core/menu_module.js').MenuModule;
+const resetScreen				= require('../../core/ansi_term.js').resetScreen;
+const setSyncTermFontWithAlias	= require('../../core/ansi_term.js').setSyncTermFontWithAlias;
 
 //	deps
 const async			= require('async');
diff --git a/mods/upload.js b/mods/system/upload.js
similarity index 94%
rename from mods/upload.js
rename to mods/system/upload.js
index 30c84c48..8e545452 100644
--- a/mods/upload.js
+++ b/mods/system/upload.js
@@ -2,20 +2,20 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../core/menu_module.js').MenuModule;
-const stringFormat						= require('../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../core/file_base_area.js').getSortedAvailableFileAreas;
-const getAreaDefaultStorageDirectory	= require('../core/file_base_area.js').getAreaDefaultStorageDirectory;
-const scanFile							= require('../core/file_base_area.js').scanFile;
-const getFileAreaByTag					= require('../core/file_base_area.js').getFileAreaByTag;
-const getDescFromFileName				= require('../core/file_base_area.js').getDescFromFileName;
-const ansiGoto							= require('../core/ansi_term.js').goto;
-const moveFileWithCollisionHandling		= require('../core/file_util.js').moveFileWithCollisionHandling;
-const pathWithTerminatingSeparator		= require('../core/file_util.js').pathWithTerminatingSeparator;
-const Log								= require('../core/logger.js').log;
-const Errors							= require('../core/enig_error.js').Errors;
-const FileEntry							= require('../core/file_entry.js');
-const isAnsi							= require('../core/string_util.js').isAnsi;
+const MenuModule						= require('../../core/menu_module.js').MenuModule;
+const stringFormat						= require('../../core/string_format.js');
+const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
+const getAreaDefaultStorageDirectory	= require('../../core/file_base_area.js').getAreaDefaultStorageDirectory;
+const scanFile							= require('../../core/file_base_area.js').scanFile;
+const getFileAreaByTag					= require('../../core/file_base_area.js').getFileAreaByTag;
+const getDescFromFileName				= require('../../core/file_base_area.js').getDescFromFileName;
+const ansiGoto							= require('../../core/ansi_term.js').goto;
+const moveFileWithCollisionHandling		= require('../../core/file_util.js').moveFileWithCollisionHandling;
+const pathWithTerminatingSeparator		= require('../../core/file_util.js').pathWithTerminatingSeparator;
+const Log								= require('../../core/logger.js').log;
+const Errors							= require('../../core/enig_error.js').Errors;
+const FileEntry							= require('../../core/file_entry.js');
+const isAnsi							= require('../../core/string_util.js').isAnsi;
 
 //	deps
 const async								= require('async');
diff --git a/mods/user_list.js b/mods/system/user_list.js
similarity index 91%
rename from mods/user_list.js
rename to mods/system/user_list.js
index b2a88e79..7b85b331 100644
--- a/mods/user_list.js
+++ b/mods/system/user_list.js
@@ -1,10 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../core/menu_module.js').MenuModule;
-const User				= require('../core/user.js');
-const ViewController	= require('../core/view_controller.js').ViewController;
-const stringFormat		= require('../core/string_format.js');
+const MenuModule		= require('../../core/menu_module.js').MenuModule;
+const User				= require('../../core/user.js');
+const ViewController	= require('../../core/view_controller.js').ViewController;
+const stringFormat		= require('../../core/string_format.js');
 
 const moment			= require('moment');
 const async				= require('async');
diff --git a/mods/whos_online.js b/mods/system/whos_online.js
similarity index 87%
rename from mods/whos_online.js
rename to mods/system/whos_online.js
index a0a87829..cec3bb4b 100644
--- a/mods/whos_online.js
+++ b/mods/system/whos_online.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const ViewController		= require('../core/view_controller.js').ViewController;
-const getActiveNodeList		= require('../core/client_connections.js').getActiveNodeList;
-const stringFormat			= require('../core/string_format.js');
+const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const ViewController		= require('../../core/view_controller.js').ViewController;
+const getActiveNodeList		= require('../../core/client_connections.js').getActiveNodeList;
+const stringFormat			= require('../../core/string_format.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/user/.keep b/mods/user/.keep
new file mode 100644
index 00000000..e69de29b

From 618ecc07142ad580a865148fd5b0a4364872eae1 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 24 Nov 2017 23:23:15 +0000
Subject: [PATCH 0075/1013] Move modules in mods into /core

---
 config/menu.hjson                             | 70 +++++++++----------
 {mods/system => core}/abracadabra.js          | 10 +--
 {mods/system => core}/bbs_link.js             |  6 +-
 {mods/system => core}/bbs_list.js             | 14 ++--
 {mods/system => core}/erc_client.js           |  4 +-
 .../system => core}/file_area_filter_edit.js  | 10 +--
 {mods/system => core}/file_area_list.js       | 34 ++++-----
 .../system => core}/file_base_area_select.js  |  8 +--
 .../file_base_download_manager.js             | 16 ++---
 {mods/system => core}/file_base_search.js     |  8 +--
 .../file_base_web_download_manager.js         | 20 +++---
 .../file_transfer_protocol_select.js          |  8 +--
 {mods/system => core}/last_callers.js         | 10 +--
 core/module_util.js                           |  1 -
 {mods/system => core}/msg_area_list.js        | 12 ++--
 {mods/system => core}/msg_area_post_fse.js    |  4 +-
 {mods/system => core}/msg_area_reply_fse.js   |  2 +-
 {mods/system => core}/msg_area_view_fse.js    |  4 +-
 {mods/system => core}/msg_conf_list.js        | 12 ++--
 {mods/system => core}/msg_list.js             | 10 +--
 {mods/system => core}/nua.js                  | 12 ++--
 {mods/system => core}/onelinerz.js            | 12 ++--
 {mods/system => core}/rumorz.js               | 14 ++--
 {mods/system => core}/telnet_bridge.js        |  6 +-
 {mods/system => core}/upload.js               | 28 ++++----
 {mods/system => core}/user_list.js            |  8 +--
 {mods/system => core}/whos_online.js          |  8 +--
 mods/{user => }/.keep                         |  0
 28 files changed, 175 insertions(+), 176 deletions(-)
 rename {mods/system => core}/abracadabra.js (94%)
 rename {mods/system => core}/bbs_link.js (96%)
 rename {mods/system => core}/bbs_list.js (96%)
 rename {mods/system => core}/erc_client.js (97%)
 rename {mods/system => core}/file_area_filter_edit.js (95%)
 rename {mods/system => core}/file_area_list.js (94%)
 rename {mods/system => core}/file_base_area_select.js (88%)
 rename {mods/system => core}/file_base_download_manager.js (92%)
 rename {mods/system => core}/file_base_search.js (89%)
 rename {mods/system => core}/file_base_web_download_manager.js (91%)
 rename {mods/system => core}/file_transfer_protocol_select.js (93%)
 rename {mods/system => core}/last_callers.js (92%)
 rename {mods/system => core}/msg_area_list.js (91%)
 rename {mods/system => core}/msg_area_post_fse.js (90%)
 rename {mods/system => core}/msg_area_reply_fse.js (81%)
 rename {mods/system => core}/msg_area_view_fse.js (95%)
 rename {mods/system => core}/msg_conf_list.js (89%)
 rename {mods/system => core}/msg_list.js (95%)
 rename {mods/system => core}/nua.js (91%)
 rename {mods/system => core}/onelinerz.js (95%)
 rename {mods/system => core}/rumorz.js (92%)
 rename {mods/system => core}/telnet_bridge.js (94%)
 rename {mods/system => core}/upload.js (94%)
 rename {mods/system => core}/user_list.js (91%)
 rename {mods/system => core}/whos_online.js (87%)
 rename mods/{user => }/.keep (100%)

diff --git a/config/menu.hjson b/config/menu.hjson
index b445ec85..ce5e8a38 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -220,7 +220,7 @@
 		}
 
 		newUserApplication: {
-			module: nua
+			module: @systemModule:nua
 			art: NUA
 			options: {
 				menuFlags: [ "noHistory" ]
@@ -341,7 +341,7 @@
 		//	Canceling this form logs off vs falling back to matrix
 		//
 		newUserApplicationSsh: {
-			module: nua
+			module: @systemModule:nua
 			art: NUA
 			fallback: logoff
 			options: {
@@ -445,7 +445,7 @@
 
 		newUserFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			next: [
 				{
 					acs: AS2
@@ -579,7 +579,7 @@
 
 		fullLoginSequenceLastCallers: {
 			desc: Last Callers
-			module: last_callers
+			module: @systemModule:last_callers
 			art: LASTCALL
 			options: {
 				pause: true
@@ -589,7 +589,7 @@
 		}
 		fullLoginSequenceWhosOnline: {
 			desc: Who's Online
-			module: whos_online
+			module: @systemModule:whos_online
 			art: WHOSON
 			options: { pause: true }
 			next: fullLoginSequenceOnelinerz
@@ -597,7 +597,7 @@
 
 		fullLoginSequenceOnelinerz: {
 			desc: Viewing Onelinerz
-			module: onelinerz
+			module: @systemModule:onelinerz
 			next: [
 				{
 					//	calls >= 2
@@ -732,7 +732,7 @@
 
 		newScanMessageList: {
 			desc: New Messages
-			module: msg_list
+			module: @systemModule:msg_list
 			art: NEWMSGS
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -772,7 +772,7 @@
 		}
 
 		newScanFileBaseList: {
-			module: file_area_list
+			module: @systemModule:file_area_list
 			desc: New Files
 			config: {
 				art: {
@@ -1019,14 +1019,14 @@
 
 		mainMenuLastCallers: {
 			desc: Last Callers
-			module: last_callers
+			module: @systemModule:last_callers
 			art: LASTCALL
 			options: { pause: true }
 		}
 
 		mainMenuWhosOnline: {
 			desc: Who's Online
-			module: whos_online
+			module: @systemModule:whos_online
 			art: WHOSON
 			options: { pause: true }
 		}
@@ -1045,7 +1045,7 @@
 
 		mainMenuUserList: {
 			desc: User Listing
-			module: user_list
+			module: @systemModule:user_list
 			art: USERLST
 			form: {
 				0: {
@@ -1166,7 +1166,7 @@
 
 		mainMenuFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -1286,7 +1286,7 @@
 
 		mainMenuOnelinerz: {
 			desc: Viewing Onelinerz
-			module: onelinerz
+			module: @systemModule:onelinerz
 			options: {
 				cls: true
 			}
@@ -1372,7 +1372,7 @@
 
 		mainMenuRumorz: {
 			desc: Rumorz
-			module: rumorz
+			module: @systemModule:rumorz
 			options: {
 				cls: true
 			}
@@ -1458,7 +1458,7 @@
 
 		ercClient: {
 			art: erc
-			module: erc_client
+			module: @systemModule:erc_client
 			config: {
 				host: localhost
         		port: 5001
@@ -1510,7 +1510,7 @@
 
 		bbsList: {
 			desc: Viewing BBS List
-			module: bbs_list
+			module: @systemModule:bbs_list
 			options: {
 				cls: true
 			}
@@ -1661,7 +1661,7 @@
 		//
 		doorPimpWars: {
 			desc: Playing PimpWars
-			module: abracadabra
+			module: @systemModule:abracadabra
 			config: {
 				name: PimpWars
 				dropFileType: DORINFO
@@ -1684,7 +1684,7 @@
 		//
 		doorTradeWars2002BBSLink: {
 			desc: Playing TW 2002 (BBSLink)
-			module: bbs_link
+			module: @systemModule:bbs_link
 			config: {
 				sysCode: XXXXXXXX
 				authCode: XXXXXXXX
@@ -1716,7 +1716,7 @@
 
 		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
-			module: telnet_bridge
+			module: @systemModule:telnet_bridge
 			config: {
 				host: agency.bbs.geek.nz
 			}
@@ -1779,7 +1779,7 @@
 
 		messageAreaChangeCurrentConference: {
 			art: CCHANGE
-			module: msg_conf_list
+			module: @systemModule:msg_conf_list
 			form: {
 				0: {
 					mci: {
@@ -1810,7 +1810,7 @@
 		messageAreaChangeCurrentArea: {
 			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
-			module: msg_area_list
+			module: @systemModule:msg_area_list
 			form: {
 				0: {
 					mci: {
@@ -1839,7 +1839,7 @@
 		}
 
 		messageAreaMessageList: {
-			module: msg_list
+			module: @systemModule:msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -1875,7 +1875,7 @@
 		}
 
 		messageAreaViewPost:  {
-			module: msg_area_view_fse
+			module: @systemModule:msg_area_view_fse
 			config: {
 				art: {
 					header:		MSGVHDR
@@ -1991,7 +1991,7 @@
 		}
 
 		messageAreaReplyPost: {
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2150,7 +2150,7 @@
 		//	:TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
 		messageAreaNewPost: {
 			desc: Posting message,
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2306,7 +2306,7 @@
 
 		mailMenuCreateMessage: {
 			desc: Mailing Someone
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2423,7 +2423,7 @@
 		}
 
 		mailMenuInbox: {
-			module: msg_list
+			module: @systemModule:msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -2501,7 +2501,7 @@
 		}
 
 		fileBaseListEntries: {
-			module: file_area_list
+			module: @systemModule:file_area_list
 			desc: Browsing Files
 			config: {
 				art: {
@@ -2669,7 +2669,7 @@
 
 		fileBaseBrowseByAreaSelect: {
 			desc: Browsing File Areas
-			module: file_base_area_select
+			module: @systemModule:file_base_area_select
 			art: FAREASEL
 			form: {
 				0: {
@@ -2725,7 +2725,7 @@
 		}
 
 		fileBaseSearch: {
-			module: file_base_search
+			module: @systemModule:file_base_search
 			desc: Searching Files
 			art: FSEARCH
 			form: {
@@ -2799,7 +2799,7 @@
 
 		fileAreaFilterEditor: {
 			desc: File Filter Editor
-			module: file_area_filter_edit
+			module: @systemModule:file_area_filter_edit
 			art: FFILEDT
 			form: {
 				0: {
@@ -2889,7 +2889,7 @@
 
 		fileBaseDownloadManager: {
 			desc: Download Manager
-			module: file_base_download_manager
+			module: @systemModule:file_base_download_manager
 			config: {
 				art: {
 					queueManager: FDLMGR
@@ -2950,7 +2950,7 @@
 
 		fileBaseWebDownloadManager: {
 			desc: Web D/L Manager
-			module: file_base_web_download_manager
+			module: @systemModule:file_base_web_download_manager
 			config: {
 				art: {
 					queueManager: FWDLMGR
@@ -3017,7 +3017,7 @@
 
 		fileTransferProtocolSelection: {
 			desc: Protocol selection
-			module: file_transfer_protocol_select
+			module: @systemModule:file_transfer_protocol_select
 			art: FPROSEL
 			form: {
 				0: {
@@ -3049,7 +3049,7 @@
 
 		fileBaseUploadFiles: {
 			desc: Uploading
-			module: upload
+			module: @systemModule:upload
 			config: {
 				art: {
 					options: ULOPTS
diff --git a/mods/system/abracadabra.js b/core/abracadabra.js
similarity index 94%
rename from mods/system/abracadabra.js
rename to core/abracadabra.js
index 595f84d4..85d1e205 100644
--- a/mods/system/abracadabra.js
+++ b/core/abracadabra.js
@@ -1,11 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const DropFile			= require('../../core/dropfile.js').DropFile;
-const door				= require('../../core/door.js');
-const theme				= require('../../core/theme.js');
-const ansi				= require('../../core/ansi_term.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const DropFile			= require('./dropfile.js').DropFile;
+const door				= require('./door.js');
+const theme				= require('./theme.js');
+const ansi				= require('./ansi_term.js');
 
 const async				= require('async');
 const assert			= require('assert');
diff --git a/mods/system/bbs_link.js b/core/bbs_link.js
similarity index 96%
rename from mods/system/bbs_link.js
rename to core/bbs_link.js
index 1d5492df..be341115 100644
--- a/mods/system/bbs_link.js
+++ b/core/bbs_link.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const resetScreen	= require('../../core/ansi_term.js').resetScreen;
+const MenuModule	= require('./menu_module.js').MenuModule;
+const resetScreen	= require('./ansi_term.js').resetScreen;
 
 const async			= require('async');
 const _				= require('lodash');
@@ -10,7 +10,7 @@ const http			= require('http');
 const net			= require('net');
 const crypto		= require('crypto');
 
-const packageJson 	= require('../../package.json');
+const packageJson 	= require('../package.json');
 
 /*
 	Expected configuration block:
diff --git a/mods/system/bbs_list.js b/core/bbs_list.js
similarity index 96%
rename from mods/system/bbs_list.js
rename to core/bbs_list.js
index 8ae94c6c..33a7ff59 100644
--- a/mods/system/bbs_list.js
+++ b/core/bbs_list.js
@@ -2,18 +2,18 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const MenuModule			= require('./menu_module.js').MenuModule;
 
 const { 
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../../core/database.js');
+}							= require('./database.js');
 
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const ansi					= require('../../core/ansi_term.js');
-const theme					= require('../../core/theme.js');
-const User					= require('../../core/user.js');
-const stringFormat			= require('../../core/string_format.js');
+const ViewController		= require('./view_controller.js').ViewController;
+const ansi					= require('./ansi_term.js');
+const theme					= require('./theme.js');
+const User					= require('./user.js');
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async 				= require('async');
diff --git a/mods/system/erc_client.js b/core/erc_client.js
similarity index 97%
rename from mods/system/erc_client.js
rename to core/erc_client.js
index cdc71521..4fb549f6 100644
--- a/mods/system/erc_client.js
+++ b/core/erc_client.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const stringFormat	= require('../../core/string_format.js');
+const MenuModule	= require('./menu_module.js').MenuModule;
+const stringFormat	= require('./string_format.js');
 
 //	deps
 const async			= require('async');
diff --git a/mods/system/file_area_filter_edit.js b/core/file_area_filter_edit.js
similarity index 95%
rename from mods/system/file_area_filter_edit.js
rename to core/file_area_filter_edit.js
index 0ff8b37d..4a53096c 100644
--- a/mods/system/file_area_filter_edit.js
+++ b/core/file_area_filter_edit.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../../core/file_base_filter.js');
-const stringFormat					= require('../../core/string_format.js');
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('./file_base_filter.js');
+const stringFormat					= require('./string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/system/file_area_list.js b/core/file_area_list.js
similarity index 94%
rename from mods/system/file_area_list.js
rename to core/file_area_list.js
index 5359e48e..3bcfd7c2 100644
--- a/mods/system/file_area_list.js
+++ b/core/file_area_list.js
@@ -2,23 +2,23 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const ansi					= require('../../core/ansi_term.js');
-const theme					= require('../../core/theme.js');
-const FileEntry				= require('../../core/file_entry.js');
-const stringFormat			= require('../../core/string_format.js');
-const FileArea				= require('../../core/file_base_area.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
-const ArchiveUtil			= require('../../core/archive_util.js');
-const Config				= require('../../core/config.js').config;
-const DownloadQueue			= require('../../core/download_queue.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
-const FileBaseFilters		= require('../../core/file_base_filter.js');
-const resolveMimeType		= require('../../core/mime_util.js').resolveMimeType;
-const isAnsi				= require('../../core/string_util.js').isAnsi;
-const controlCodesToAnsi	= require('../../core/color_codes.js').controlCodesToAnsi;
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const ansi					= require('./ansi_term.js');
+const theme					= require('./theme.js');
+const FileEntry				= require('./file_entry.js');
+const stringFormat			= require('./string_format.js');
+const FileArea				= require('./file_base_area.js');
+const Errors				= require('./enig_error.js').Errors;
+const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
+const ArchiveUtil			= require('./archive_util.js');
+const Config				= require('./config.js').config;
+const DownloadQueue			= require('./download_queue.js');
+const FileAreaWeb			= require('./file_area_web.js');
+const FileBaseFilters		= require('./file_base_filter.js');
+const resolveMimeType		= require('./mime_util.js').resolveMimeType;
+const isAnsi				= require('./string_util.js').isAnsi;
+const controlCodesToAnsi	= require('./color_codes.js').controlCodesToAnsi;
 
 //	deps
 const async				= require('async');
diff --git a/mods/system/file_base_area_select.js b/core/file_base_area_select.js
similarity index 88%
rename from mods/system/file_base_area_select.js
rename to core/file_base_area_select.js
index 38b7eba7..8abb668e 100644
--- a/mods/system/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../../core/menu_module.js').MenuModule;
-const stringFormat						= require('../../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const StatLog							= require('../../core/stat_log.js');
+const MenuModule						= require('./menu_module.js').MenuModule;
+const stringFormat						= require('./string_format.js');
+const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
+const StatLog							= require('./stat_log.js');
 
 //	deps
 const async								= require('async');
diff --git a/mods/system/file_base_download_manager.js b/core/file_base_download_manager.js
similarity index 92%
rename from mods/system/file_base_download_manager.js
rename to core/file_base_download_manager.js
index 15a892f1..7444af56 100644
--- a/mods/system/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -2,14 +2,14 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../../core/download_queue.js');
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const stringFormat			= require('../../core/string_format.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const DownloadQueue			= require('./download_queue.js');
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const Errors				= require('./enig_error.js').Errors;
+const stringFormat			= require('./string_format.js');
+const FileAreaWeb			= require('./file_area_web.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/system/file_base_search.js b/core/file_base_search.js
similarity index 89%
rename from mods/system/file_base_search.js
rename to core/file_base_search.js
index d3ebd1db..adb618d0 100644
--- a/mods/system/file_base_search.js
+++ b/core/file_base_search.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../../core/file_base_filter.js');
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('./file_base_filter.js');
 
 //	deps
 const async							= require('async');
diff --git a/mods/system/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
similarity index 91%
rename from mods/system/file_base_web_download_manager.js
rename to core/file_base_web_download_manager.js
index 9acad951..dea7c5a8 100644
--- a/mods/system/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -2,16 +2,16 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../../core/download_queue.js');
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const stringFormat			= require('../../core/string_format.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
-const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
-const Config				= require('../../core/config.js').config;
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const DownloadQueue			= require('./download_queue.js');
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const Errors				= require('./enig_error.js').Errors;
+const stringFormat			= require('./string_format.js');
+const FileAreaWeb			= require('./file_area_web.js');
+const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
+const Config				= require('./config.js').config;
 
 //	deps
 const async					= require('async');
diff --git a/mods/system/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
similarity index 93%
rename from mods/system/file_transfer_protocol_select.js
rename to core/file_transfer_protocol_select.js
index c731dff2..f1b3dbed 100644
--- a/mods/system/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const Config			= require('../../core/config.js').config;
-const stringFormat		= require('../../core/string_format.js');
-const ViewController	= require('../../core/view_controller.js').ViewController;
+const MenuModule		= require('./menu_module.js').MenuModule;
+const Config			= require('./config.js').config;
+const stringFormat		= require('./string_format.js');
+const ViewController	= require('./view_controller.js').ViewController;
 
 //	deps
 const async			= require('async');
diff --git a/mods/system/last_callers.js b/core/last_callers.js
similarity index 92%
rename from mods/system/last_callers.js
rename to core/last_callers.js
index 85d4bef0..3a889468 100644
--- a/mods/system/last_callers.js
+++ b/core/last_callers.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const ViewController	= require('../../core/view_controller.js').ViewController;
-const StatLog			= require('../../core/stat_log.js');
-const User				= require('../../core/user.js');
-const stringFormat		= require('../../core/string_format.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const ViewController	= require('./view_controller.js').ViewController;
+const StatLog			= require('./stat_log.js');
+const User				= require('./user.js');
+const stringFormat		= require('./string_format.js');
 
 //	deps
 const moment			= require('moment');
diff --git a/core/module_util.js b/core/module_util.js
index b730d0ca..67e87306 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -102,7 +102,6 @@ function loadModulesForCategory(category, iterator, complete) {
 function getModulePaths() {
 	return [
 		Config.paths.mods,
-		Config.paths.userMods,
 		Config.paths.loginServers,
 		Config.paths.contentServers,
 		Config.paths.scannerTossers,
diff --git a/mods/system/msg_area_list.js b/core/msg_area_list.js
similarity index 91%
rename from mods/system/msg_area_list.js
rename to core/msg_area_list.js
index 51b18953..eaedbef8 100644
--- a/mods/system/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const messageArea			= require('../../core/message_area.js');
-const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const messageArea			= require('./message_area.js');
+const displayThemeArt		= require('./theme.js').displayThemeArt;
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/system/msg_area_post_fse.js b/core/msg_area_post_fse.js
similarity index 90%
rename from mods/system/msg_area_post_fse.js
rename to core/msg_area_post_fse.js
index a0671f85..c13f39a6 100644
--- a/mods/system/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const FullScreenEditorModule	= require('../../core/fse.js').FullScreenEditorModule;
-const persistMessage			= require('../../core/message_area.js').persistMessage;
+const FullScreenEditorModule	= require('./fse.js').FullScreenEditorModule;
+const persistMessage			= require('./message_area.js').persistMessage;
 
 const _							= require('lodash');
 const async					 	= require('async');
diff --git a/mods/system/msg_area_reply_fse.js b/core/msg_area_reply_fse.js
similarity index 81%
rename from mods/system/msg_area_reply_fse.js
rename to core/msg_area_reply_fse.js
index 497c8de7..24ee5377 100644
--- a/mods/system/msg_area_reply_fse.js
+++ b/core/msg_area_reply_fse.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-var FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
+var FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
 
 exports.getModule				= AreaReplyFSEModule;
 
diff --git a/mods/system/msg_area_view_fse.js b/core/msg_area_view_fse.js
similarity index 95%
rename from mods/system/msg_area_view_fse.js
rename to core/msg_area_view_fse.js
index 7cb5a1b8..02915f79 100644
--- a/mods/system/msg_area_view_fse.js
+++ b/core/msg_area_view_fse.js
@@ -2,8 +2,8 @@
 'use strict';
 
 //	ENiGMA½
-const FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
-const Message						= require('../../core/message.js');
+const FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
+const Message						= require('./message.js');
 
 //	deps
 const _							= require('lodash');
diff --git a/mods/system/msg_conf_list.js b/core/msg_conf_list.js
similarity index 89%
rename from mods/system/msg_conf_list.js
rename to core/msg_conf_list.js
index 06e9d59b..6f42cf36 100644
--- a/mods/system/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const messageArea			= require('../../core/message_area.js');
-const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const messageArea			= require('./message_area.js');
+const displayThemeArt		= require('./theme.js').displayThemeArt;
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async				= require('async');
diff --git a/mods/system/msg_list.js b/core/msg_list.js
similarity index 95%
rename from mods/system/msg_list.js
rename to core/msg_list.js
index 28d1b609..e5a69e80 100644
--- a/mods/system/msg_list.js
+++ b/core/msg_list.js
@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const messageArea					= require('../../core/message_area.js');
-const stringFormat					= require('../../core/string_format.js');
-const MessageAreaConfTempSwitcher	= require('../../core/mod_mixins.js').MessageAreaConfTempSwitcher;
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const messageArea					= require('./message_area.js');
+const stringFormat					= require('./string_format.js');
+const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 
 //	deps
 const async				= require('async');
diff --git a/mods/system/nua.js b/core/nua.js
similarity index 91%
rename from mods/system/nua.js
rename to core/nua.js
index 7b4611d6..7939e739 100644
--- a/mods/system/nua.js
+++ b/core/nua.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const User			= require('../../core/user.js');
-const theme			= require('../../core/theme.js');
-const login			= require('../../core/system_menu_method.js').login;
-const Config		= require('../../core/config.js').config;
-const messageArea	= require('../../core/message_area.js');
+const MenuModule	= require('./menu_module.js').MenuModule;
+const User			= require('./user.js');
+const theme			= require('./theme.js');
+const login			= require('./system_menu_method.js').login;
+const Config		= require('./config.js').config;
+const messageArea	= require('./message_area.js');
 
 exports.moduleInfo = {
 	name	: 'NUA',
diff --git a/mods/system/onelinerz.js b/core/onelinerz.js
similarity index 95%
rename from mods/system/onelinerz.js
rename to core/onelinerz.js
index 416124c6..9e89addf 100644
--- a/mods/system/onelinerz.js
+++ b/core/onelinerz.js
@@ -2,17 +2,17 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const MenuModule			= require('./menu_module.js').MenuModule;
 
 const {
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../../core/database.js');
+}							= require('./database.js');
 
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const stringFormat			= require('../../core/string_format.js');
+const ViewController		= require('./view_controller.js').ViewController;
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const sqlite3				= require('sqlite3');
diff --git a/mods/system/rumorz.js b/core/rumorz.js
similarity index 92%
rename from mods/system/rumorz.js
rename to core/rumorz.js
index e85271dc..b83853f0 100644
--- a/mods/system/rumorz.js
+++ b/core/rumorz.js
@@ -2,13 +2,13 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const theme					= require('../../core/theme.js');
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const StatLog				= require('../../core/stat_log.js');
-const renderStringLength	= require('../../core/string_util.js').renderStringLength;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const theme					= require('./theme.js');
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const StatLog				= require('./stat_log.js');
+const renderStringLength	= require('./string_util.js').renderStringLength;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/system/telnet_bridge.js b/core/telnet_bridge.js
similarity index 94%
rename from mods/system/telnet_bridge.js
rename to core/telnet_bridge.js
index 42c73217..3232228a 100644
--- a/mods/system/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -2,9 +2,9 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule				= require('../../core/menu_module.js').MenuModule;
-const resetScreen				= require('../../core/ansi_term.js').resetScreen;
-const setSyncTermFontWithAlias	= require('../../core/ansi_term.js').setSyncTermFontWithAlias;
+const MenuModule				= require('./menu_module.js').MenuModule;
+const resetScreen				= require('./ansi_term.js').resetScreen;
+const setSyncTermFontWithAlias	= require('./ansi_term.js').setSyncTermFontWithAlias;
 
 //	deps
 const async			= require('async');
diff --git a/mods/system/upload.js b/core/upload.js
similarity index 94%
rename from mods/system/upload.js
rename to core/upload.js
index 8e545452..5a49a0ca 100644
--- a/mods/system/upload.js
+++ b/core/upload.js
@@ -2,20 +2,20 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../../core/menu_module.js').MenuModule;
-const stringFormat						= require('../../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const getAreaDefaultStorageDirectory	= require('../../core/file_base_area.js').getAreaDefaultStorageDirectory;
-const scanFile							= require('../../core/file_base_area.js').scanFile;
-const getFileAreaByTag					= require('../../core/file_base_area.js').getFileAreaByTag;
-const getDescFromFileName				= require('../../core/file_base_area.js').getDescFromFileName;
-const ansiGoto							= require('../../core/ansi_term.js').goto;
-const moveFileWithCollisionHandling		= require('../../core/file_util.js').moveFileWithCollisionHandling;
-const pathWithTerminatingSeparator		= require('../../core/file_util.js').pathWithTerminatingSeparator;
-const Log								= require('../../core/logger.js').log;
-const Errors							= require('../../core/enig_error.js').Errors;
-const FileEntry							= require('../../core/file_entry.js');
-const isAnsi							= require('../../core/string_util.js').isAnsi;
+const MenuModule						= require('./menu_module.js').MenuModule;
+const stringFormat						= require('./string_format.js');
+const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
+const getAreaDefaultStorageDirectory	= require('./file_base_area.js').getAreaDefaultStorageDirectory;
+const scanFile							= require('./file_base_area.js').scanFile;
+const getFileAreaByTag					= require('./file_base_area.js').getFileAreaByTag;
+const getDescFromFileName				= require('./file_base_area.js').getDescFromFileName;
+const ansiGoto							= require('./ansi_term.js').goto;
+const moveFileWithCollisionHandling		= require('./file_util.js').moveFileWithCollisionHandling;
+const pathWithTerminatingSeparator		= require('./file_util.js').pathWithTerminatingSeparator;
+const Log								= require('./logger.js').log;
+const Errors							= require('./enig_error.js').Errors;
+const FileEntry							= require('./file_entry.js');
+const isAnsi							= require('./string_util.js').isAnsi;
 
 //	deps
 const async								= require('async');
diff --git a/mods/system/user_list.js b/core/user_list.js
similarity index 91%
rename from mods/system/user_list.js
rename to core/user_list.js
index 7b85b331..be85c586 100644
--- a/mods/system/user_list.js
+++ b/core/user_list.js
@@ -1,10 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const User				= require('../../core/user.js');
-const ViewController	= require('../../core/view_controller.js').ViewController;
-const stringFormat		= require('../../core/string_format.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const User				= require('./user.js');
+const ViewController	= require('./view_controller.js').ViewController;
+const stringFormat		= require('./string_format.js');
 
 const moment			= require('moment');
 const async				= require('async');
diff --git a/mods/system/whos_online.js b/core/whos_online.js
similarity index 87%
rename from mods/system/whos_online.js
rename to core/whos_online.js
index cec3bb4b..6abd76ef 100644
--- a/mods/system/whos_online.js
+++ b/core/whos_online.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const getActiveNodeList		= require('../../core/client_connections.js').getActiveNodeList;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const getActiveNodeList		= require('./client_connections.js').getActiveNodeList;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async					= require('async');
diff --git a/mods/user/.keep b/mods/.keep
similarity index 100%
rename from mods/user/.keep
rename to mods/.keep

From 32557975d9a589b9365bb0e8c51d6c132acd32cb Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 24 Nov 2017 23:33:45 +0000
Subject: [PATCH 0076/1013] Update mod paths in config.js

---
 core/config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index fa7d346c..506b5c28 100644
--- a/core/config.js
+++ b/core/config.js
@@ -191,8 +191,7 @@ function getDefaultConfig() {
 
 		paths		: {
 			config				: paths.join(__dirname, './../config/'),
-			mods				: paths.join(__dirname, './../mods/system'),
-			userMods			: paths.join(__dirname, './../mods/user'),
+			mods				: paths.join(__dirname, './../mods/'),
 			loginServers		: paths.join(__dirname, './servers/login/'),
 			contentServers		: paths.join(__dirname, './servers/content/'),
 

From 521e38d7e9ad10669e095767e2a4bb97ebaca60d Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 25 Nov 2017 22:45:19 +0000
Subject: [PATCH 0077/1013] Supply config path to main.js and oputil.js, rather
 than specific config file

---
 core/bbs.js                  | 8 +++++---
 core/config.js               | 4 ++--
 core/config_util.js          | 2 +-
 core/oputil/oputil_common.js | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 02058bce..43bf7cf3 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -29,11 +29,12 @@ const ENIGMA_COPYRIGHT	= 'ENiGMA½ Copyright (c) 2014-2017 Bryan Ashby';
 const HELP =
 `${ENIGMA_COPYRIGHT}
 usage: main.js <args>
+eg   : main.js --config /enigma_install_path/config/
 
 valid args:
   --version       : display version
   --help          : displays this help
-  --config PATH   : override default config.hjson path
+  --config PATH   : override default config path
 `;
 
 function printHelpAndExit() {
@@ -56,7 +57,8 @@ function main() {
 				return callback(null, configOverridePath || conf.getDefaultPath(), _.isString(configOverridePath));
 			},
 			function initConfig(configPath, configPathSupplied, callback) {
-				conf.init(resolvePath(configPath), function configInit(err) {
+				const configFile = configPath + 'config.hjson';
+				conf.init(resolvePath(configFile), function configInit(err) {
 
 					//
 					//	If the user supplied a path and we can't read/parse it
@@ -65,7 +67,7 @@ function main() {
 					if(err) {
 						if('ENOENT' === err.code)  {
 							if(configPathSupplied) {
-								console.error('Configuration file does not exist: ' + configPath);
+								console.error('Configuration file does not exist: ' + configFile);
 							} else {
 								configPathSupplied = null;	//	make non-fatal; we'll go with defaults
 							}
diff --git a/core/config.js b/core/config.js
index 506b5c28..a33efb99 100644
--- a/core/config.js
+++ b/core/config.js
@@ -111,8 +111,8 @@ function init(configPath, options, cb) {
 }
 
 function getDefaultPath() {
-	//	e.g. /enigma-bbs-install-path/config/config.hjson
-	return './config/config.hjson';
+	//	e.g. /enigma-bbs-install-path/config/
+	return './config/';
 }
 
 function getDefaultConfig() {
diff --git a/core/config_util.js b/core/config_util.js
index 3ed7b98c..40723d9a 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -7,7 +7,7 @@ const paths				= require('path');
 exports.getFullConfig	= getFullConfig;
 
 function getFullConfig(filePath, cb) {
-	//	|filePath| is assumed to be in 'mods' if it's only a file name
+	//	|filePath| is assumed to be in the config path if it's only a file name
 	if('.' === paths.dirname(filePath)) {
 		filePath = paths.join(Config.paths.config, filePath);
 	}
diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index 14edd518..e175a166 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -45,11 +45,12 @@ function printUsageAndSetExitCode(errMsg, exitCode) {
 }
 
 function getDefaultConfigPath() {
-    return './config/config.hjson';
+    return './config/';
 }
 
 function getConfigPath() {
-	return argv.config ? argv.config : config.getDefaultPath();
+	const baseConfigPath = argv.config ? argv.config : config.getDefaultPath();
+	return baseConfigPath + 'config.hjson';
 }
 
 function initConfig(cb) {

From 3e268f4b27cb4e6f938931d1dc5a9bbfd1b43531 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 25 Nov 2017 23:08:38 +0000
Subject: [PATCH 0078/1013] Update docs to reflect config changes

---
 docs/config.md | 4 +---
 docs/index.md  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index 4e510b35..e2122f9f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -2,9 +2,7 @@
 Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just like JSON but simplified and much more resilient to human error.
 
 ## System Configuration
-The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `~/.config/enigma-bbs/config.hjson` though you can override this with the `--config` parameter when invoking `main.js`. Values found in core/config.js may be overridden by simply providing the object members you wish replace.
-
-**Windows note**: **~** resolves to *C:\Users\YOURLOGINNAME\* on modern Windows installations, e.g. `C:\Users\NuSkooler\.config\enigma-bbs\config.hjson`
+The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `/enigma-bbs-install-path/config.hjson` though you can override the `config.hjson` location with the `--config` parameter when invoking `main.js`. Values found in `core/config.js` may be overridden by simply providing the object members you wish replace.
 
 ### Creating a Configuration
 Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
diff --git a/docs/index.md b/docs/index.md
index 909ff836..99f83e32 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -55,7 +55,7 @@ openssl genrsa -des3 -out ./misc/ssh_private_key.pem 2048
 ```
 
 ### Create a Minimal Config
-The main system configuration is handled via `~/.config/enigma-bbs/config.hjson`. This is a [HJSON](http://hjson.org/) file (compiliant JSON is also OK). See [Configuration](config.md) for more information.
+The main system configuration is handled via `/enigma-bbs-install-path/config/config.hjson`. This is a [HJSON](http://hjson.org/) file (compiliant JSON is also OK). See [Configuration](config.md) for more information.
 
 #### Via oputil.js
 `oputil.js` can be utilized to generate your **initial** configuration. **This is the recommended way for all new users**:
@@ -110,7 +110,7 @@ Below is an _example_ configuration. It is recommended that you at least **start
 Read the Points of Interest below for more info. Also check-out all the other documentation files in the [docs](.) directory.
 
 ## Points of Interest
-* **The first user you create via register/applying (user ID = 1) will be automatically be added to the `sysops` group. And thus becomes SysOp.** (aka root)
+* **The first user you create via register/applying (user ID = 1) will be automatically be added to the `sysops` group, and thus becomes SysOp.** (aka root)
 * Default port for Telnet is 8888 and for SSH 8889
   * Note that on *nix systems port such as telnet/23 are privileged (e.g. require root). See [this SO article](http://stackoverflow.com/questions/16573668/best-practices-when-running-node-js-with-port-80-ubuntu-linode) for some tips on using these ports on your system if desired.
 * All data is stored by default in Sqlite3 database files, within the `db` sub folder. Including user data, messages, system logs and file meta data.

From b25b96d9dec5a46da8fa1ba2daf4b357f7e1b992 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 Nov 2017 09:09:11 +0000
Subject: [PATCH 0079/1013] * Move default cert path into config * Update docs
 to reflect changes * More doc tweaks for new structure

---
 core/config.js      | 18 +++++++++---------
 docs/config.md      |  2 +-
 docs/index.md       |  2 +-
 docs/menu_system.md |  2 +-
 docs/modding.md     |  2 +-
 docs/mods.md        |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/config.js b/core/config.js
index a33efb99..73f0fa28 100644
--- a/core/config.js
+++ b/core/config.js
@@ -124,8 +124,8 @@ function getDefaultConfig() {
 
 			loginAttempts	: 3,
 
-			menuFile		: 'menu.hjson',				//	Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./mods)
-			promptFile		: 'prompt.hjson',			//	Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./mods)
+			menuFile		: 'menu.hjson',				//	Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
+			promptFile		: 'prompt.hjson',			//	Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
 		},
 
 		//	:TODO: see notes below about 'theme' section - move this!
@@ -215,18 +215,18 @@ function getDefaultConfig() {
 			},
 			ssh : {
 				port				: 8889,
-				enabled				: false,    //  defualt to false as PK/pass in config.hjson are required
+				enabled				: false,    //  default to false as PK/pass in config.hjson are required
 
 				//
 				//	Private key in PEM format
 				//	
 				//	Generating your PK:
-				//	> openssl genrsa -des3 -out ./misc/ssh_private_key.pem 2048
+				//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
 				//
 				//	Then, set servers.ssh.privateKeyPass to the password you use above
 				//	in your config.hjson
 				//
-				privateKeyPem		: paths.join(__dirname, './../misc/ssh_private_key.pem'),
+				privateKeyPem		: paths.join(__dirname, './../config/ssh_private_key.pem'),
 				firstMenu			: 'sshConnected',
 				firstMenuNewUser	: 'sshConnectedNewUser',
 			},
@@ -234,8 +234,8 @@ function getDefaultConfig() {
 				port		: 8810,	//	ws://
 				enabled		: false,
 				securePort	: 8811,	//	wss:// - must provide certPem and keyPem
-				certPem		: paths.join(__dirname, './../misc/https_cert.pem'),
-				keyPem		: paths.join(__dirname, './../misc/https_cert_key.pem'),
+				certPem		: paths.join(__dirname, './../config/https_cert.pem'),
+				keyPem		: paths.join(__dirname, './../config/https_cert_key.pem'),
 			},
 		},
 
@@ -271,8 +271,8 @@ function getDefaultConfig() {
 				https : {
 					enabled	: false,
 					port	: 8443,
-					certPem	: paths.join(__dirname, './../misc/https_cert.pem'),
-					keyPem	: paths.join(__dirname, './../misc/https_cert_key.pem'),
+					certPem	: paths.join(__dirname, './../config/https_cert.pem'),
+					keyPem	: paths.join(__dirname, './../config/https_cert_key.pem'),
 				}
 			}
 		},
diff --git a/docs/config.md b/docs/config.md
index e2122f9f..98a6730f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -2,7 +2,7 @@
 Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just like JSON but simplified and much more resilient to human error.
 
 ## System Configuration
-The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `/enigma-bbs-install-path/config.hjson` though you can override the `config.hjson` location with the `--config` parameter when invoking `main.js`. Values found in `core/config.js` may be overridden by simply providing the object members you wish replace.
+The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `/enigma-bbs-install-path/config/config.hjson` though you can override the `config.hjson` location with the `--config` parameter when invoking `main.js`. Values found in `core/config.js` may be overridden by simply providing the object members you wish replace.
 
 ### Creating a Configuration
 Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
diff --git a/docs/index.md b/docs/index.md
index 99f83e32..2320829c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -51,7 +51,7 @@ npm install
 ## Generate a SSH Private Key
 To utilize the SSH server, a SSH Private Key will need generated. This step can be skipped if you do not wish to enable SSH access.
 ```bash
-openssl genrsa -des3 -out ./misc/ssh_private_key.pem 2048
+openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
 ```
 
 ### Create a Minimal Config
diff --git a/docs/menu_system.md b/docs/menu_system.md
index 026ef648..aef51199 100644
--- a/docs/menu_system.md
+++ b/docs/menu_system.md
@@ -3,7 +3,7 @@ ENiGMA½'s menu system is highly flexible and moddable. The possibilities are al
 
 This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson` (or whatever you reference in `config.hjson` using the `menuFile` property — see below). By modifying your `menu.hjson` you will be able to create a custom experience unique to your board.
 
-The default `menu.hjson` file lives within the `mods` directory. It is **highly recommended** to specify another file by setting the `menuFile` property in your `config.hjson` file:
+The default `menu.hjson` file lives within the `config` directory. It is **highly recommended** to specify another file by setting the `menuFile` property in your `config.hjson` file:
 ```hjson
 general: {
   /* Can also specify a full path */
diff --git a/docs/modding.md b/docs/modding.md
index 9449a91e..609729b4 100644
--- a/docs/modding.md
+++ b/docs/modding.md
@@ -7,7 +7,7 @@ See [Configuration](config.md)
 See [Menu System](menu_system.md)
 
 ## Theming
-Take a look at how the default `luciano_blocktronics` theme found under `mods/themes` works!
+Take a look at how the default `luciano_blocktronics` theme found under `art/themes` works!
 
 TODO document me!
 
diff --git a/docs/mods.md b/docs/mods.md
index 3abc7e2f..f73a3fc6 100644
--- a/docs/mods.md
+++ b/docs/mods.md
@@ -1,5 +1,5 @@
 # Mods
-
+Custom mods should be added to `/enigma-install-path/mods`.
 
 ## Existing Mods
 * **Married Bob Fetch Event**: An event for fetching the latest Married Bob ANSI's for display on you board. ACiDic release [ACD-MB4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MB4E.ZIP). Can also be [found on GitHub](https://github.com/NuSkooler/enigma-bbs-married_bob_evt)

From 10044b6749fc08fed83d89653a1acacbf792fa56 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 Nov 2017 18:26:56 +0000
Subject: [PATCH 0080/1013] Switch to xxhash to save farmhash jiggery-pokery
 when initialising Docker image

---
 core/art.js  | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/art.js b/core/art.js
index 28657fc0..19e0bafe 100644
--- a/core/art.js
+++ b/core/art.js
@@ -14,7 +14,7 @@ const paths		= require('path');
 const assert	= require('assert');
 const iconv		= require('iconv-lite');
 const _			= require('lodash');
-const farmhash	= require('farmhash');
+const xxhash	= require('xxhash');
 
 exports.getArt							= getArt;
 exports.getArtFromPath					= getArtFromPath;
@@ -288,7 +288,7 @@ function display(client, art, options, cb) {
 	}
 
 	if(!options.disableMciCache) {		
-		artHash	= farmhash.hash32(art);
+		artHash	= xxhash.hash(new Buffer(art), 0xCAFEBABE);
 
 		//	see if we have a mciMap cached for this art
 		if(client.mciCache) {
diff --git a/package.json b/package.json
index 29bd16da..566a454d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "farmhash": "^2.0.4",
     "fs-extra": "^4.0.1",
     "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
@@ -52,6 +51,7 @@
     "uuid": "^3.1.0",
     "uuid-parse": "^1.0.0",
     "ws": "^3.1.0",
+    "xxhash": "^0.2.4",
     "yazl" : "^2.4.2"
   },
   "devDependencies": {},

From 7af30ea112989531b7b1ea585fa4f4e710cc81da Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 28 Nov 2017 20:17:44 -0700
Subject: [PATCH 0081/1013] Proceed telnet login even if term type is not
 received [right away]; Allows older DOS terms to function

---
 core/servers/login/telnet.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 06961800..a6fa0deb 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -541,6 +541,13 @@ function TelnetClient(input, output) {
 		const logger = self.log || Log;
 		return logger.warn(info, `Telnet: ${msg}`);
 	};
+
+	this.readyNow = () => {
+		if(!this.didReady) {
+			this.didReady = true;
+			this.emit('ready', { firstMenu : Config.loginServers.telnet.firstMenu } );
+		}
+	};
 }
 
 util.inherits(TelnetClient, baseClient.Client);
@@ -633,10 +640,7 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
 
 		self.negotiationsComplete = true;	//	:TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
 
-		if(!self.didReady) {
-			self.didReady = true;
-			self.emit('ready', { firstMenu : Config.loginServers.telnet.firstMenu } );
-		}
+		self.readyNow();
 	} else if('new environment' === evt.option) {
 		//
 		//	Handling is as follows:
@@ -832,6 +836,18 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
 			client.banner();
 
 			this.handleNewClient(client, sock, ModuleInfo);
+
+			//
+			//	Set a timeout and attempt to proceed even if we don't know
+			//	the term type yet, which is the preferred trigger
+			//	for moving along
+			//
+			setTimeout( () => {
+				if(!client.didReady) {
+					Log.info('Proceeding after 3s without knowing term type');
+					client.readyNow();
+				}
+			}, 3000);
 		});
 
 		this.server.on('error', err => {

From 99898c83524f7684b108e083052022603eac0387 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 29 Nov 2017 12:13:03 -0700
Subject: [PATCH 0082/1013] Add VTXClient note

---
 art/general/NEWUSER1.ANS | Bin 751 -> 884 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/general/NEWUSER1.ANS b/art/general/NEWUSER1.ANS
index 70edd11e6df33bb840d6263ae879e8aa7e16f474..267c331c52c418b8f044ea9709276641b2494dcc 100644
GIT binary patch
delta 178
zcmaFQ`h{)7Q^tDFJcW{sRE4CX{PN<|A{~X2qDqDQ(h{(sbhM$hv2ku<d1`TfZmM*&
zL9PN&C^sx5!Z{~1HLnCFVr^`YtIGxANk^MHXOxr_6kF-*r)QRAlqTsV=jZAt=clBW
xCl;BR>I3!0Lo^4c7L}zIO}@|gN{yA7fq{`RfI)}>41_(Md=<jn9U(k82>`OlGRFV_

delta 25
hcmeyu_MUaaQ^v_zOiws#nHU%t83P#jCx<i30swlJ2U`FD


From 7809f9215598fb985cce860ed282274bec9d49b4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 29 Nov 2017 12:24:21 -0700
Subject: [PATCH 0083/1013] Initial 0.0.7-alpha to 0.0.8-alpha upgrade
 instructions

---
 UPGRADE.md | 151 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 86 insertions(+), 65 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 802a8092..e1a6f42f 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,65 +1,86 @@
-# Introduction
-This document covers basic upgrade notes for major ENiGMA½ version updates.
-
-
-# Before Upgrading
-* Always back up your system! 
-* At least back up the `db` directory and your `menu.hjson` (or renamed equivalent)
-
-
-# General Notes
-Upgrades often come with changes to the default `menu.hjson`. It is wise to 
-use a *different* file name for your BBS's version of this file and point to
-it via `config.hjson`. For example:
-
-```hjson
-general: {
-	menuFile: my_bbs.hjson
-}
-```
-
-After updating code, use a program such as DiffMerge to merge in updates to
-`my_bbs.hjson` from the shipping `menu.hjson`.
-
-
-# Upgrading the Code
-Upgrading from GitHub is easy:
-
-```bash
-cd /path/to/enigma-bbs
-git pull
-rm -rf npm_modules # do this any time you update Node.js itself
-npm install
-```
-
-
-# Problems
-Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
-[file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
-
-
-# 0.0.1-alpha to 0.0.4-alpha
-## Node.js 6.x+ LTS is now **required**
-You will need to upgrade Node.js to [6.x+](https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md). If using [nvm](https://github.com/creationix/nvm) (you should be!) the process will go something like this:
-```bash
-nvm install 6
-nvm alias default 6
-```
-
-### ES6
-Newly written code will use ES6 and a lot of code has started the migration process. Of note is the `MenuModule` class. If you have created a mod that inherits from `MenuModule`, you will need to upgrade your class to ES6.
-
-## Manual Database Upgrade
-A few upgrades need to be made to your SQLite databases:
-
-```bash
-rm db/file.sqltie3 # safe to delete this time as it was not used previously
-sqlite3 db/message.sqlite
-sqlite> INSERT INTO message_fts(message_fts) VALUES('rebuild');
-```
-
-## Archiver Changes
-If you have overridden or made additions to archivers in your `config.hjson` you will need to update them. See [Archive Configuration](docs/archive.md) and `core/config.js`
-
-## File Base Configuration
-As 0.0.4-alpha contains file bases, you'll want to create a suitable configuration if you wish to use the feature. See [File Base Configuration](docs/file_base.md).
+# Introduction
+This document covers basic upgrade notes for major ENiGMA½ version updates.
+
+
+# Before Upgrading
+* Always back up your system! 
+* At least back up the `db` directory and your `menu.hjson` (or renamed equivalent)
+
+
+# General Notes
+Upgrades often come with changes to the default `menu.hjson`. It is wise to 
+use a *different* file name for your BBS's version of this file and point to
+it via `config.hjson`. For example:
+
+```hjson
+general: {
+	menuFile: my_bbs.hjson
+}
+```
+
+After updating code, use a program such as DiffMerge to merge in updates to
+`my_bbs.hjson` from the shipping `menu.hjson`.
+
+
+# Upgrading the Code
+Upgrading from GitHub is easy:
+
+```bash
+cd /path/to/enigma-bbs
+git pull
+rm -rf npm_modules # do this any time you update Node.js itself
+npm install
+```
+
+
+# Problems
+Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
+[file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
+
+# 0.0.7-alpha to 0.0.8-alpha
+ENiGMA 0.0.8-alpha comes with some structure changes:
+* Configuration files are defaulted to `./config`. Related, the `--config` option now points to a configuration **directory**
+* `./mods/art` has been moved to `./art/general`
+* `./mods` is now reserved for actual user addon modules
+* Themes have been moved from `./mods/themes` to `./art/themes`
+
+With the above changes, you'll need to to at least:
+* Move your `~/.config/enigma-bbs/config.hjson` to `./config/config.hjson` or utlize the `--config` option. 
+* Move your `prompt.hjson` and `menu.hjson` (e.g. `myboardname.hjson`) to `./config`
+* Move any non-theme art files, and theme directories to their appropriate locations mentioned above
+* Move any module directories such as `message_post_evt` to `./mods/`
+
+# 0.0.6-alpha to 0.0.7-alpha
+No issues
+
+# 0.0.5-alpha to 0.0.6-alpha
+No issues
+
+# 0.0.4-alpha to 0.0.5-alpha
+No issues
+
+# 0.0.1-alpha to 0.0.4-alpha
+## Node.js 6.x+ LTS is now **required**
+You will need to upgrade Node.js to [6.x+](https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md). If using [nvm](https://github.com/creationix/nvm) (you should be!) the process will go something like this:
+```bash
+nvm install 6
+nvm alias default 6
+```
+
+### ES6
+Newly written code will use ES6 and a lot of code has started the migration process. Of note is the `MenuModule` class. If you have created a mod that inherits from `MenuModule`, you will need to upgrade your class to ES6.
+
+## Manual Database Upgrade
+A few upgrades need to be made to your SQLite databases:
+
+```bash
+rm db/file.sqltie3 # safe to delete this time as it was not used previously
+sqlite3 db/message.sqlite
+sqlite> INSERT INTO message_fts(message_fts) VALUES('rebuild');
+```
+
+## Archiver Changes
+If you have overridden or made additions to archivers in your `config.hjson` you will need to update them. See [Archive Configuration](docs/archive.md) and `core/config.js`
+
+## File Base Configuration
+As 0.0.4-alpha contains file bases, you'll want to create a suitable configuration if you wish to use the feature. See [File Base Configuration](docs/file_base.md).

From 22b09d80187b8816c8c0301fb147dbd9248ebc7a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 30 Nov 2017 11:39:01 -0700
Subject: [PATCH 0084/1013] Fix unpipe crash

---
 core/telnet_bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 3232228a..fa1754a5 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -48,7 +48,7 @@ class TelnetClientConnection extends EventEmitter {
 			this.pipeRestored = true;
 
 			//	client may have bailed
-			if(_.has(this, 'client.term.output')) {
+			if(null !== _.get(this, 'client.term.output', null)) {
 				if(this.bridgeConnection) {
 					this.client.term.output.unpipe(this.bridgeConnection);
 				}

From 1849d275f5cfd2f1cc671bab815e26f101ede6a4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 30 Nov 2017 17:15:18 -0700
Subject: [PATCH 0085/1013] Make @systemModule implicit; require @userModule
 for user modules

---
 UPGRADE.md        |  4 +++
 config/menu.hjson | 86 +++++++++++++++++++++++------------------------
 core/asset.js     | 17 +++++-----
 docs/doors.md     |  4 +--
 4 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index e1a6f42f..c7651fcd 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -44,11 +44,15 @@ ENiGMA 0.0.8-alpha comes with some structure changes:
 * `./mods` is now reserved for actual user addon modules
 * Themes have been moved from `./mods/themes` to `./art/themes`
 
+With the change to the `./mods` directory, `@systemModule` is now implied for `module` declarations in `menu.hjson`. To use a user module in `./mods` you must specify `@userModule`!
+
 With the above changes, you'll need to to at least:
 * Move your `~/.config/enigma-bbs/config.hjson` to `./config/config.hjson` or utlize the `--config` option. 
 * Move your `prompt.hjson` and `menu.hjson` (e.g. `myboardname.hjson`) to `./config`
 * Move any non-theme art files, and theme directories to their appropriate locations mentioned above
 * Move any module directories such as `message_post_evt` to `./mods/`
+* Move any certificates, pub/private keys, etc. from `./misc` to `./config`
+* Specify user modules as `@userModule:my_module_name`
 
 # 0.0.6-alpha to 0.0.7-alpha
 No issues
diff --git a/config/menu.hjson b/config/menu.hjson
index ce5e8a38..cac6e647 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -220,7 +220,7 @@
 		}
 
 		newUserApplication: {
-			module: @systemModule:nua
+			module: nua
 			art: NUA
 			options: {
 				menuFlags: [ "noHistory" ]
@@ -341,7 +341,7 @@
 		//	Canceling this form logs off vs falling back to matrix
 		//
 		newUserApplicationSsh: {
-			module: @systemModule:nua
+			module: nua
 			art: NUA
 			fallback: logoff
 			options: {
@@ -445,7 +445,7 @@
 
 		newUserFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: @systemModule:msg_area_post_fse
+			module: msg_area_post_fse
 			next: [
 				{
 					acs: AS2
@@ -579,7 +579,7 @@
 
 		fullLoginSequenceLastCallers: {
 			desc: Last Callers
-			module: @systemModule:last_callers
+			module: last_callers
 			art: LASTCALL
 			options: {
 				pause: true
@@ -589,7 +589,7 @@
 		}
 		fullLoginSequenceWhosOnline: {
 			desc: Who's Online
-			module: @systemModule:whos_online
+			module: whos_online
 			art: WHOSON
 			options: { pause: true }
 			next: fullLoginSequenceOnelinerz
@@ -597,7 +597,7 @@
 
 		fullLoginSequenceOnelinerz: {
 			desc: Viewing Onelinerz
-			module: @systemModule:onelinerz
+			module: onelinerz
 			next: [
 				{
 					//	calls >= 2
@@ -709,7 +709,7 @@
 
 		fullLoginSequenceNewScan: {
 			desc: Performing New Scan
-			module: @systemModule:new_scan
+			module: new_scan
 			art: NEWSCAN
 			next: fullLoginSequenceSysStats
 			config: {
@@ -732,7 +732,7 @@
 
 		newScanMessageList: {
 			desc: New Messages
-			module: @systemModule:msg_list
+			module: msg_list
 			art: NEWMSGS
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -772,7 +772,7 @@
 		}
 
 		newScanFileBaseList: {
-			module: @systemModule:file_area_list
+			module: file_area_list
 			desc: New Files
 			config: {
 				art: {
@@ -1019,14 +1019,14 @@
 
 		mainMenuLastCallers: {
 			desc: Last Callers
-			module: @systemModule:last_callers
+			module: last_callers
 			art: LASTCALL
 			options: { pause: true }
 		}
 
 		mainMenuWhosOnline: {
 			desc: Who's Online
-			module: @systemModule:whos_online
+			module: whos_online
 			art: WHOSON
 			options: { pause: true }
 		}
@@ -1045,7 +1045,7 @@
 
 		mainMenuUserList: {
 			desc: User Listing
-			module: @systemModule:user_list
+			module: user_list
 			art: USERLST
 			form: {
 				0: {
@@ -1066,7 +1066,7 @@
 		}
 
 		mainMenuUserConfig: {
-			module: @systemModule:user_config
+			module: user_config
 			art: CONFSCR
 			form: {
 				0: {
@@ -1157,7 +1157,7 @@
 
 		mainMenuGlobalNewScan: {
 			desc: Performing New Scan
-			module: @systemModule:new_scan
+			module: new_scan
 			art: NEWSCAN
 			config: {
 				messageListMenu: newScanMessageList
@@ -1166,7 +1166,7 @@
 
 		mainMenuFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: @systemModule:msg_area_post_fse
+			module: msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -1286,7 +1286,7 @@
 
 		mainMenuOnelinerz: {
 			desc: Viewing Onelinerz
-			module: @systemModule:onelinerz
+			module: onelinerz
 			options: {
 				cls: true
 			}
@@ -1372,7 +1372,7 @@
 
 		mainMenuRumorz: {
 			desc: Rumorz
-			module: @systemModule:rumorz
+			module: rumorz
 			options: {
 				cls: true
 			}
@@ -1458,7 +1458,7 @@
 
 		ercClient: {
 			art: erc
-			module: @systemModule:erc_client
+			module: erc_client
 			config: {
 				host: localhost
         		port: 5001
@@ -1510,7 +1510,7 @@
 
 		bbsList: {
 			desc: Viewing BBS List
-			module: @systemModule:bbs_list
+			module: bbs_list
 			options: {
 				cls: true
 			}
@@ -1661,7 +1661,7 @@
 		//
 		doorPimpWars: {
 			desc: Playing PimpWars
-			module: @systemModule:abracadabra
+			module: abracadabra
 			config: {
 				name: PimpWars
 				dropFileType: DORINFO
@@ -1684,7 +1684,7 @@
 		//
 		doorTradeWars2002BBSLink: {
 			desc: Playing TW 2002 (BBSLink)
-			module: @systemModule:bbs_link
+			module: bbs_link
 			config: {
 				sysCode: XXXXXXXX
 				authCode: XXXXXXXX
@@ -1696,7 +1696,7 @@
 		//	DoorParty! support. You'll need to register to obtain credentials
 		doorParty: {
 			desc: Using DoorParty!
-			module: @systemModule:door_party
+			module: door_party
 			config: {
 				username: XXXXXXXX
 				password: XXXXXXXX
@@ -1707,7 +1707,7 @@
         //	CombatNet support. You'll need to register at http://combatnet.us/ to obtain credentials
         combatNet: {
             desc: Using CombatNet
-            module: @systemModule:combatnet
+            module: combatnet
             config: {
                 bbsTag: CBNxxx
                 password: XXXXXXXXX
@@ -1716,7 +1716,7 @@
 
 		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
-			module: @systemModule:telnet_bridge
+			module: telnet_bridge
 			config: {
 				host: agency.bbs.geek.nz
 			}
@@ -1779,7 +1779,7 @@
 
 		messageAreaChangeCurrentConference: {
 			art: CCHANGE
-			module: @systemModule:msg_conf_list
+			module: msg_conf_list
 			form: {
 				0: {
 					mci: {
@@ -1810,7 +1810,7 @@
 		messageAreaChangeCurrentArea: {
 			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
-			module: @systemModule:msg_area_list
+			module: msg_area_list
 			form: {
 				0: {
 					mci: {
@@ -1839,7 +1839,7 @@
 		}
 
 		messageAreaMessageList: {
-			module: @systemModule:msg_list
+			module: msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -1875,7 +1875,7 @@
 		}
 
 		messageAreaViewPost:  {
-			module: @systemModule:msg_area_view_fse
+			module: msg_area_view_fse
 			config: {
 				art: {
 					header:		MSGVHDR
@@ -1991,7 +1991,7 @@
 		}
 
 		messageAreaReplyPost: {
-			module: @systemModule:msg_area_post_fse
+			module: msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2150,7 +2150,7 @@
 		//	:TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
 		messageAreaNewPost: {
 			desc: Posting message,
-			module: @systemModule:msg_area_post_fse
+			module: msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2306,7 +2306,7 @@
 
 		mailMenuCreateMessage: {
 			desc: Mailing Someone
-			module: @systemModule:msg_area_post_fse
+			module: msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2423,7 +2423,7 @@
 		}
 
 		mailMenuInbox: {
-			module: @systemModule:msg_list
+			module: msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -2501,7 +2501,7 @@
 		}
 
 		fileBaseListEntries: {
-			module: @systemModule:file_area_list
+			module: file_area_list
 			desc: Browsing Files
 			config: {
 				art: {
@@ -2669,7 +2669,7 @@
 
 		fileBaseBrowseByAreaSelect: {
 			desc: Browsing File Areas
-			module: @systemModule:file_base_area_select
+			module: file_base_area_select
 			art: FAREASEL
 			form: {
 				0: {
@@ -2725,7 +2725,7 @@
 		}
 
 		fileBaseSearch: {
-			module: @systemModule:file_base_search
+			module: file_base_search
 			desc: Searching Files
 			art: FSEARCH
 			form: {
@@ -2799,7 +2799,7 @@
 
 		fileAreaFilterEditor: {
 			desc: File Filter Editor
-			module: @systemModule:file_area_filter_edit
+			module: file_area_filter_edit
 			art: FFILEDT
 			form: {
 				0: {
@@ -2889,7 +2889,7 @@
 
 		fileBaseDownloadManager: {
 			desc: Download Manager
-			module: @systemModule:file_base_download_manager
+			module: file_base_download_manager
 			config: {
 				art: {
 					queueManager: FDLMGR
@@ -2950,7 +2950,7 @@
 
 		fileBaseWebDownloadManager: {
 			desc: Web D/L Manager
-			module: @systemModule:file_base_web_download_manager
+			module: file_base_web_download_manager
 			config: {
 				art: {
 					queueManager: FWDLMGR
@@ -3017,7 +3017,7 @@
 
 		fileTransferProtocolSelection: {
 			desc: Protocol selection
-			module: @systemModule:file_transfer_protocol_select
+			module: file_transfer_protocol_select
 			art: FPROSEL
 			form: {
 				0: {
@@ -3049,7 +3049,7 @@
 
 		fileBaseUploadFiles: {
 			desc: Uploading
-			module: @systemModule:upload
+			module: upload
 			config: {
 				art: {
 					options: ULOPTS
@@ -3187,7 +3187,7 @@
 
 		sendFilesToUser: {
 			desc: Downloading
-			module: @systemModule:file_transfer
+			module: file_transfer
 			config: {
 				//	defaults - generally use extraArgs
 				protocol: zmodem8kSexyz
@@ -3197,7 +3197,7 @@
 
 		recvFilesFromUser: {
 			desc: Uploading
-			module: @systemModule:file_transfer
+			module: file_transfer
 			config: {
 				//	defaults - generally use extraArgs
 				protocol: zmodem8kSexyz
@@ -3569,7 +3569,7 @@
 			"art" : "test.ans"
 		},
 		"demoFullScreenEditor" : {
-			"module"	: "@systemModule:fse",
+			"module"	: "fse",
 			"config"	: {
 				"editorType"	: "netMail",
 				"art"			: {
diff --git a/core/asset.js b/core/asset.js
index 0731a1b7..9f2831b7 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -21,7 +21,7 @@ const ALL_ASSETS = [
 	'art',
 	'menu',
 	'method',
-	'module',
+	'userModule',
 	'systemMethod',
 	'systemModule',
 	'prompt',
@@ -58,12 +58,12 @@ function getAssetWithShorthand(spec, defaultType) {
 		assert(_.isString(asset.type));
 
 		return asset;
-	} else {
-		return {
-			type	: defaultType,
-			asset	: spec,
-		};
 	}
+
+	return {
+		type	: defaultType,
+		asset	: spec,
+	};
 }
 
 function getArtAsset(spec) {
@@ -78,13 +78,14 @@ function getArtAsset(spec) {
 }
 
 function getModuleAsset(spec) {
-	const asset = getAssetWithShorthand(spec, 'module');
+	const asset = getAssetWithShorthand(spec, 'systemModule');
 	
 	if(!asset) {
 		return null;
 	}
 
-	assert( ['module', 'systemModule' ].indexOf(asset.type) > -1);
+	assert( ['userModule', 'systemModule' ].includes(asset.type) );
+
 	return asset;
 }
 
diff --git a/docs/doors.md b/docs/doors.md
index 0ca55c23..5f72d761 100644
--- a/docs/doors.md
+++ b/docs/doors.md
@@ -183,7 +183,7 @@ The module `door_party` provides native support for [DoorParty!](http://www.thro
 ```hjson
 doorParty: {
     desc: Using DoorParty!
-    module: @systemModule:door_party
+    module: door_party
     config: {
         username: XXXXXXXX
         password: XXXXXXXX
@@ -200,7 +200,7 @@ The `combatnet` module provides native support for [CombatNet](http://combatnet.
 ````hjson
 combatNet: {
     desc: Using CombatNet
-    module: @systemModule:combatnet
+    module: combatnet
     config: {
         bbsTag: CBNxxx
         password: XXXXXXXXX

From 7f80f4a7af7ee481141253f1a5b01921b099e4be Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Dec 2017 19:06:07 -0700
Subject: [PATCH 0086/1013] * Fix 'noHistory' flag and it's usage to be more
 natural * Add 'popParent' menu flag (works like 'noHistory' used to)

---
 config/menu.hjson             | 14 +++++---------
 core/file_base_area_select.js |  2 +-
 core/file_base_search.js      |  2 +-
 core/menu_stack.js            |  9 +++++++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index cac6e647..0f1fa168 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -215,16 +215,14 @@
 			desc: Applying
 			options: {
 				pause: true
-				cls: true				
+				cls: true
+				menuFlags: [ "noHistory" ]
 			}
 		}
 
 		newUserApplication: {
 			module: nua
 			art: NUA
-			options: {
-				menuFlags: [ "noHistory" ]
-			}
 			next: [
 				{
 					//	Initial SysOp does not send feedback to themselves
@@ -333,6 +331,7 @@
 			options: {
 				pause: true
 				cls: true
+				menuFlags: [ "noHistory" ]
 			}
 		}
 
@@ -344,9 +343,6 @@
 			module: nua
 			art: NUA
 			fallback: logoff
-			options: {
-				menuFlags: [ "noHistory" ]
-			}
 			next: newUserFeedbackToSysOpPreamble
 			form: {
 				0: {
@@ -2720,7 +2716,7 @@
 			art: FBNORES
 			options: {
 				pause: true
-				menuFlags: [ "noHistory" ]
+				menuFlags: [ "noHistory", "popParent" ]
 			}
 		}
 
@@ -3011,7 +3007,7 @@
 			art: FEMPTYQ
 			options: {
 				pause: true
-				menuFlags: [ "noHistory" ]
+				menuFlags: [ "noHistory", "popParent" ]
 			}
 		}
 
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index 8abb668e..5ec266fd 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -40,7 +40,7 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 					extraArgs	: {
 						filterCriteria	: filterCriteria,				
 					},
-					menuFlags	: [ 'noHistory' ],
+					menuFlags	: [ 'popParent' ],
 				};
 
 				return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
diff --git a/core/file_base_search.js b/core/file_base_search.js
index adb618d0..2ff27f8a 100644
--- a/core/file_base_search.js
+++ b/core/file_base_search.js
@@ -112,7 +112,7 @@ exports.getModule = class FileBaseSearch extends MenuModule {
 			extraArgs	: {
 				filterCriteria	: filterCriteria,				
 			},
-			menuFlags	: [ 'noHistory' ],
+			menuFlags	: [ 'popParent' ],
 		};
 
 		return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
diff --git a/core/menu_stack.js b/core/menu_stack.js
index f4b29460..b4bebea6 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -129,15 +129,19 @@ module.exports = class MenuStack {
 			} else {
 				self.client.log.debug( { menuName : name }, 'Goto menu module');
 
+				const menuFlags = (options && Array.isArray(options.menuFlags)) ? options.menuFlags : modInst.menuConfig.options.menuFlags;
+
 				if(currentModuleInfo) {
 					//	save stack state
 					currentModuleInfo.savedState = currentModuleInfo.instance.getSaveState();
 
 					currentModuleInfo.instance.leave();
 
-					const menuFlags = (options && Array.isArray(options.menuFlags)) ? options.menuFlags : modInst.menuConfig.options.menuFlags;
+					if(currentModuleInfo.menuFlags.includes('noHistory')) {
+						this.pop();
+					}
 
-					if(menuFlags.includes('noHistory')) {
+					if(menuFlags.includes('popParent')) {
 						this.pop().instance.leave();	//	leave & remove current
 					}
 				}
@@ -146,6 +150,7 @@ module.exports = class MenuStack {
 					name		: name,
 					instance	: modInst,
 					extraArgs	: loadOpts.extraArgs,
+					menuFlags	: menuFlags,
 				});
 
 				//	restore previous state if requested

From 1c5a00313b1d38ceb0cedfb0475f6f0e3090ecf4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 12 Dec 2017 21:32:01 -0700
Subject: [PATCH 0087/1013] Minor adjustment on tags to allow comma
 separated/etc.

---
 core/file_entry.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 32903315..6edd7ef8 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -528,8 +528,8 @@ module.exports = class FileEntry {
 		}
 		
 		if(filter.tags && filter.tags.length > 0) {
-			//	build list of quoted tags; filter.tags comes in as a space separated values
-			const tags = filter.tags.split(' ').map( tag => `"${tag}"` ).join(',');
+			//	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
+			const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${tag}"` ).join(',');
 
 			appendWhereClause(
 				`f.file_id IN (

From fc40641eebfb80a7b44504888afb75a6b4affdfa Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 31 Dec 2017 17:54:11 -0700
Subject: [PATCH 0088/1013] NetMail avail to oputil & export - WIP

---
 .eslintrc.json                     |    3 +-
 config/prompt.hjson                |   14 +
 core/config.js                     |   17 +-
 core/ftn_mail_packet.js            |   52 +-
 core/ftn_util.js                   |   15 +
 core/message.js                    |    6 +-
 core/oputil/oputil_file_base.js    |    2 +-
 core/oputil/oputil_help.js         |    8 +
 core/oputil/oputil_main.js         |   20 +-
 core/oputil/oputil_message_base.js |  150 ++++
 core/scanner_tossers/ftn_bso.js    | 1078 ++++++++++++++++++----------
 package.json                       |   16 +-
 12 files changed, 961 insertions(+), 420 deletions(-)
 create mode 100644 core/oputil/oputil_message_base.js

diff --git a/.eslintrc.json b/.eslintrc.json
index c7757f0d..5e9b45b6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -24,6 +24,7 @@
             "error",
             "always"
         ],
-        "comma-dangle": 0
+        "comma-dangle": 0,
+        "no-trailing-spaces" :"warn"
     }
 }
\ No newline at end of file
diff --git a/config/prompt.hjson b/config/prompt.hjson
index 83f01ec5..b6bf6691 100644
--- a/config/prompt.hjson
+++ b/config/prompt.hjson
@@ -72,6 +72,20 @@
 			}
 		}
 
+		loginSequenceFlavorSelect: {
+			art: LOGINSEL
+			mci: {
+				TM1: {
+					argName: promptValue
+					items: [ "yes", "no" ]
+					focus: true
+					focusItemIndex: 1
+					hotKeys: { Y: 0, N: 1 }
+					hotKeySubmit: true
+				}
+			}
+		}
+
 		loginGlobalNewScan: {
 			art: GNSPMPT
 			mci: {
diff --git a/core/config.js b/core/config.js
index 73f0fa28..34be676e 100644
--- a/core/config.js
+++ b/core/config.js
@@ -19,7 +19,7 @@ function hasMessageConferenceAndArea(config) {
 	assert(_.isObject(config.messageConferences));  //  we create one ourself!
 
 	const nonInternalConfs = Object.keys(config.messageConferences).filter(confTag => {
-		return 'system_internal' !== confTag; 
+		return 'system_internal' !== confTag;
 	});
 
 	if(0 === nonInternalConfs.length) {
@@ -53,12 +53,12 @@ function init(configPath, options, cb) {
 				if(!_.isString(configPath)) {
 					return callback(null, { } );
 				}
-				
+
 				fs.readFile(configPath, { encoding : 'utf8' }, (err, configData) => {
 					if(err) {
 						return callback(err);
 					}
-				
+
 					let configJson;
 					try {
 						configJson = hjson.parse(configData, options);
@@ -70,7 +70,7 @@ function init(configPath, options, cb) {
 				});				
 			},
 			function mergeWithDefaultConfig(configJson, callback) {
-				
+
 				const mergedConfig = _.mergeWith(
 					getDefaultConfig(), 
 					configJson, (conf1, conf2) => {
@@ -616,10 +616,11 @@ function getDefaultConfig() {
 		scannerTossers : {
 			ftn_bso : {
 				paths : {
-					outbound	: paths.join(__dirname, './../mail/ftn_out/'),
-					inbound		: paths.join(__dirname, './../mail/ftn_in/'),
-					secInbound	: paths.join(__dirname, './../mail/ftn_secin/'),
-					reject		: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
+					outbound		: paths.join(__dirname, './../mail/ftn_out/'),
+					inbound			: paths.join(__dirname, './../mail/ftn_in/'),
+					secInbound		: paths.join(__dirname, './../mail/ftn_secin/'),
+					reject			: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
+					outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
 					//	set 'retain' to a valid path to keep good pkt files
 				},
 
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 095628ea..137a2583 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -393,9 +393,19 @@ function Packet(options) {
 		};
 
 		function addKludgeLine(line) {
-			const sepIndex 	= line.indexOf(':');
-			const key		= line.substr(0, sepIndex).toUpperCase();
-			const value		= line.substr(sepIndex + 1).trim();
+			//
+			//	We have to special case INTL/TOPT/FMPT as they don't contain
+			//	a ':' name/value separator like the rest of the kludge lines... because stupdity.
+			//
+			let key = line.substr(0, 4);
+			let value;
+			if( ['INTL', 'TOPT', 'FMPT' ].includes(key)) {
+				value = line.substr(4).trim();
+			} else {
+				const sepIndex = line.indexOf(':');
+				key		= line.substr(0, sepIndex).toUpperCase();
+				value	= line.substr(sepIndex + 1).trim();
+			}
 
 			//
 			//	Allow mapped value to be either a key:value if there is only
@@ -639,7 +649,7 @@ function Packet(options) {
 		
 	this.getMessageEntryBuffer = function(message, options, cb) {
 		
-		function getAppendMeta(k, m) {
+		function getAppendMeta(k, m, sepChar=':') {
 			let append = '';
 			if(m) {
 				let a = m;
@@ -647,7 +657,7 @@ function Packet(options) {
 					a = [ a ];
 				}
 				a.forEach(v => {
-					append += `${k}: ${v}\r`;
+					append += `${k}${sepChar} ${v}\r`;
 				});
 			}
 			return append;
@@ -693,10 +703,21 @@ function Packet(options) {
 						msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
 					}
 					
+					//	:TODO: DRY with similar function in this file!
 					Object.keys(message.meta.FtnKludge).forEach(k => {
-						//	we want PATH to be last
-						if('PATH' !== k) {
-							msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
+						switch(k) {
+							case 'PATH' :
+								break;	//	skip & save for last
+
+							case 'FMPT' :
+							case 'TOPT' :
+							case 'INTL' : 
+								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');	// no sepChar
+								break;
+
+							default		: 
+								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]); 
+								break;
 						}
 					});
 
@@ -810,14 +831,14 @@ function Packet(options) {
 		//	:TODO: Put this in it's own method
 		let msgBody = '';
 
-		function appendMeta(k, m) {
+		function appendMeta(k, m, sepChar=':') {
 			if(m) {
 				let a = m;
 				if(!_.isArray(a)) {
 					a = [ a ];
 				}
 				a.forEach(v => {
-					msgBody += `${k}: ${v}\r`;
+					msgBody += `${k}${sepChar} ${v}\r`;
 				});
 			}
 		}
@@ -832,9 +853,14 @@ function Packet(options) {
 		}
 		
 		Object.keys(message.meta.FtnKludge).forEach(k => {
-			//	we want PATH to be last
-			if('PATH' !== k) {
-				appendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
+			switch(k) {
+				case 'PATH' : break;	//	skip & save for last
+
+				case 'FMPT' :
+				case 'TOPT' :
+				case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break;	//	no sepChar
+
+				default		: appendMeta(`\x01${k}`, message.meta.FtnKludge[k]); break;
 			}
 		});
 
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 4d779c4a..68ddf343 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -26,6 +26,7 @@ exports.getUTCTimeZoneOffset		= getUTCTimeZoneOffset;
 exports.getOrigin					= getOrigin;
 exports.getTearLine					= getTearLine;
 exports.getVia						= getVia;
+exports.getIntl						= getIntl;
 exports.getAbbreviatedNetNodeList	= getAbbreviatedNetNodeList;
 exports.parseAbbreviatedNetNodeList	= parseAbbreviatedNetNodeList;
 exports.getUpdatedSeenByEntries		= getUpdatedSeenByEntries;
@@ -222,6 +223,20 @@ function getVia(address) {
 	return `${addrStr} @${dateTime} ENiGMA1/2 ${version}`;
 }
 
+//
+//	Creates a INTL kludge value as per FTS-4001
+//	http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
+//
+function getIntl(toAddress, fromAddress) {
+	//
+	//	INTL differs from 'standard' kludges in that there is no ':' after "INTL"
+	//
+	//	"<SOH>"INTL "<destination address>" "<origin address><CR>"
+	//	"...These addresses shall be given on the form <zone>:<net>/<node>"
+	//
+	return `${toAddress.toString('3D')} ${fromAddress.toString('3D')}`;
+}
+
 function getAbbreviatedNetNodeList(netNodes) {
 	let abbrList = '';
 	let currNet;
diff --git a/core/message.js b/core/message.js
index a251ef50..b5b1e541 100644
--- a/core/message.js
+++ b/core/message.js
@@ -124,11 +124,13 @@ Message.FtnPropertyNames = {
 //	Note: kludges are stored with their names as-is
 
 Message.prototype.setLocalToUserId = function(userId) {
-	this.meta.System.local_to_user_id = userId;
+	this.meta.System = this.meta.System || {};
+	this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
 };
 
 Message.prototype.setLocalFromUserId = function(userId) {
-	this.meta.System.local_from_user_id = userId;
+	this.meta.System = this.meta.System || {};
+	this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
 };
 
 Message.createMessageUUID = function(areaTag, modTimestamp, subject, body) {
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index a00f0889..d6a18026 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -8,7 +8,7 @@ const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const getAreaAndStorage			= require('./oputil_common.js').getAreaAndStorage;
-const Errors					= require('../../core/enig_error.js').Errors;
+const Errors					= require('../enig_error.js').Errors;
 
 const async						= require('async');
 const fs						= require('graceful-fs');
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 1a2b42bf..b4c48267 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -84,6 +84,14 @@ general information:
   FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
   SHA                          full or partial SHA-256
   FILE_ID                      a file identifier. see file.sqlite3
+`,
+  MessageBase :
+  `usage: oputil.js mb <action> [<args>]
+
+  actions:
+  areafix CMD1 CMD2 ... ADDR  sends an AreaFix NetMail to ADDR with the supplied command(s)
+                              one or more commands may be supplied. commands that are multi
+                              part such as "%COMPRESS ZIP" should be quoted.
 `
 };
 
diff --git a/core/oputil/oputil_main.js b/core/oputil/oputil_main.js
index 83af6b5e..aa373ef2 100644
--- a/core/oputil/oputil_main.js
+++ b/core/oputil/oputil_main.js
@@ -7,6 +7,7 @@ const argv						= require('./oputil_common.js').argv;
 const printUsageAndSetExitCode	= require('./oputil_common.js').printUsageAndSetExitCode;
 const handleUserCommand			= require('./oputil_user.js').handleUserCommand;
 const handleFileBaseCommand		= require('./oputil_file_base.js').handleFileBaseCommand;
+const handleMessageBaseCommand	= require('./oputil_message_base.js').handleMessageBaseCommand;
 const handleConfigCommand		= require('./oputil_config.js').handleConfigCommand;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 
@@ -26,19 +27,10 @@ module.exports = function() {
 	}
 
 	switch(argv._[0]) {
-		case 'user' :
-			handleUserCommand();
-			break;
-			
-		case 'config' :
-			handleConfigCommand();
-			break;
-
-		case 'fb' :
-			handleFileBaseCommand();
-			break;
-
-		default:
-			return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.BAD_COMMAND);
+		case 'user'		: return handleUserCommand();		
+		case 'config'	: return handleConfigCommand();
+		case 'fb'		: return handleFileBaseCommand();
+		case 'mb'		: return handleMessageBaseCommand();
+		default			: return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.BAD_COMMAND);
 	}
 };
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
new file mode 100644
index 00000000..77a63e9f
--- /dev/null
+++ b/core/oputil/oputil_message_base.js
@@ -0,0 +1,150 @@
+/* jslint node: true */
+/* eslint-disable no-console */
+'use strict';
+
+const printUsageAndSetExitCode	= require('./oputil_common.js').printUsageAndSetExitCode;
+const ExitCodes					= require('./oputil_common.js').ExitCodes;
+const argv						= require('./oputil_common.js').argv;
+const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
+const getHelpFor				= require('./oputil_help.js').getHelpFor;
+const Address					= require('../ftn_address.js');
+const Errors					= require('../enig_error.js').Errors;
+
+//	deps
+const async						= require('async');
+
+exports.handleMessageBaseCommand	= handleMessageBaseCommand;
+
+function areaFix() {
+	//
+	//	oputil mb areafix CMD1 CMD2 ... ADDR [--password PASS]
+	//
+	if(argv._.length < 3) {
+		return printUsageAndSetExitCode(
+			getHelpFor('MessageBase'),
+			ExitCodes.ERROR
+		);
+	}
+
+	async.waterfall(
+		[
+			function init(callback) {
+				return initConfigAndDatabases(callback);
+			},
+			function validateAddress(callback) {
+				const addrArg = argv._.slice(-1)[0];
+				const ftnAddr = Address.fromString(addrArg);
+
+				if(!ftnAddr) {
+					return callback(Errors.Invalid(`"${addrArg}" is not a valid FTN address`));
+				}
+
+				//
+				//	We need to validate the address targets a system we know unless
+				//	the --force option is used
+				//
+				//	:TODO:
+				return callback(null, ftnAddr);
+			},
+			function fetchFromUser(ftnAddr, callback) {
+				//
+				//	--from USER || +op from system
+				//
+				//	If possible, we want the user ID of the supplied user as well
+				//
+				const User = require('../user.js');
+
+				if(argv.from) {
+					User.getUserIdAndName(argv.from, (err, userId, fromName) => {
+						if(err) {
+							return callback(null, ftnAddr, argv.from, 0);
+						}
+
+						//	fromName is the same as argv.from, but case may be differnet (yet correct)
+						return callback(null, ftnAddr, fromName, userId);
+					});
+				} else {
+					User.getUserName(User.RootUserID, (err, fromName) => {
+						return callback(null, ftnAddr, fromName || 'SysOp', err ? 0 : User.RootUserID);
+					});
+				}
+			},
+			function createMessage(ftnAddr, fromName, fromUserId, callback) {
+				//
+				//	Build message as commands separated by line feed
+				//
+				//	We need to remove quotes from arguments. These are required
+				//	in the case of e.g. removing an area: "-SOME_AREA" would end
+				//	up confusing minimist, therefor they must be quoted: "'-SOME_AREA'"
+				//
+				const messageBody = argv._.slice(2, -1).map(arg => {
+					return arg.replace(/["']/g, '');
+				}).join('\n') + '\n';
+
+				const Message = require('../message.js');
+
+				const message = new Message({
+					toUserName		: argv.to || 'AreaFix',
+					fromUserName	: fromName,
+					subject			: argv.password || '',
+					message			: messageBody,
+					areaTag			: Message.WellKnownAreaTags.Private,	//	mark private
+					meta			: {
+						FtnProperty : {
+							[ Message.FtnPropertyNames.FtnDestZone ]	: ftnAddr.zone,
+							[ Message.FtnPropertyNames.FtnDestNetwork ]	: ftnAddr.net,							
+							[ Message.FtnPropertyNames.FtnDestNode ]	: ftnAddr.node,
+						}
+					}
+				});
+
+				if(ftnAddr.point) {
+					message.meta.FtnProperty[Message.FtnPropertyNames.FtnDestPoint] = ftnAddr.point;
+				}
+
+				if(0 !== fromUserId) {
+					message.setLocalFromUserId(fromUserId);
+				}
+
+				return callback(null, message);
+			},
+			function persistMessage(message, callback) {
+				//
+				//	:TODO:
+				//	- Persist message in private outgoing (sysop out box)
+				//	- Make necessary changes such that the message is exported properly
+				//
+				console.log(message);
+				message.persist(err => {
+					return callback(err);
+				});
+			}
+		],
+		err => {
+			if(err) {
+				process.exitCode = ExitCodes.ERROR;
+				console.error(`${err.message}${err.reason ? ': ' + err.reason : ''}`);
+			}
+		}
+	);
+}
+
+function handleMessageBaseCommand() {
+
+	function errUsage() {
+		return printUsageAndSetExitCode(
+			getHelpFor('MessageBase'),
+			ExitCodes.ERROR
+		);
+	}
+
+	if(true === argv.help) {
+		return errUsage();
+	}
+
+	const action = argv._[1];
+
+	return({
+		areafix	: areaFix,
+	}[action] || errUsage)();
+}
\ No newline at end of file
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index f4e5091d..996dd3ef 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -43,14 +43,14 @@ exports.moduleInfo = {
 
 /*
 	:TODO:
-	* Support (approx) max bundle size 
+	* Support (approx) max bundle size
 	* Support NetMail
 		* NetMail needs explicit isNetMail()  check
 		* NetMail filename / location / etc. is still unknown - need to post on groups & get real answers
 	* Validate packet passwords!!!!
 		=> secure vs insecure landing areas
-	
-*/ 
+
+*/
 
 exports.getModule = FTNMessageScanTossModule;
 
@@ -58,32 +58,31 @@ const SCHEDULE_REGEXP	= /(?:^|or )?(@watch\:|@immediate)([^\0]+)?$/;
 
 function FTNMessageScanTossModule() {
 	MessageScanTossModule.call(this);
-	
-	let self = this;
+
+	const self = this;
 
 	this.archUtil = ArchiveUtil.getInstance();
 
 	if(_.has(Config, 'scannerTossers.ftn_bso')) {
-		this.moduleConfig = Config.scannerTossers.ftn_bso;	
+		this.moduleConfig = Config.scannerTossers.ftn_bso;
 	}
-	
+
 	this.getDefaultNetworkName = function() {
 		if(this.moduleConfig.defaultNetwork) {
 			return this.moduleConfig.defaultNetwork.toLowerCase();
 		}
-		
+
 		const networkNames = Object.keys(Config.messageNetworks.ftn.networks);
 		if(1 === networkNames.length) {
 			return networkNames[0].toLowerCase();
 		}
 	};
-	
-	
+
 	this.getDefaultZone = function(networkName) {
 		if(_.isNumber(Config.messageNetworks.ftn.networks[networkName].defaultZone)) {
 			return Config.messageNetworks.ftn.networks[networkName].defaultZone;
 		}
-		
+
 		//	non-explicit: default to local address zone
 		const networkLocalAddress = Config.messageNetworks.ftn.networks[networkName].localAddress;
 		if(networkLocalAddress) {
@@ -91,45 +90,45 @@ function FTNMessageScanTossModule() {
 			return addr.zone;
 		}
 	};
-	
+
 	/*
 	this.isDefaultDomainZone = function(networkName, address) {
-		const defaultNetworkName 	= this.getDefaultNetworkName();		 
+		const defaultNetworkName 	= this.getDefaultNetworkName();
 		return(networkName === defaultNetworkName && address.zone === this.moduleConfig.defaultZone);
 	};
 	*/
-	
+
 	this.getNetworkNameByAddress = function(remoteAddress) {
 		return _.findKey(Config.messageNetworks.ftn.networks, network => {
-			const localAddress = Address.fromString(network.localAddress);			
+			const localAddress = Address.fromString(network.localAddress);
 			return !_.isUndefined(localAddress) && localAddress.isEqual(remoteAddress);
 		});
 	};
-	
+
 	this.getNetworkNameByAddressPattern = function(remoteAddressPattern) {
 		return _.findKey(Config.messageNetworks.ftn.networks, network => {
-			const localAddress = Address.fromString(network.localAddress);			
+			const localAddress = Address.fromString(network.localAddress);
 			return !_.isUndefined(localAddress) && localAddress.isPatternMatch(remoteAddressPattern);
-		});	
+		});
 	};
-	
+
 	this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
 		ftnAreaTag = ftnAreaTag.toUpperCase();	//	always compare upper
 		return _.findKey(Config.messageNetworks.ftn.areas, areaConf => {
 			return areaConf.tag.toUpperCase() === ftnAreaTag;
 		});
 	};
-	
+
 	this.getExportType = function(nodeConfig) {
-		return _.isString(nodeConfig.exportType) ? nodeConfig.exportType.toLowerCase() : 'crash';	
+		return _.isString(nodeConfig.exportType) ? nodeConfig.exportType.toLowerCase() : 'crash';
 	};
-	
+
 	/*
 	this.getSeenByAddresses = function(messageSeenBy) {
 		if(!_.isArray(messageSeenBy)) {
 			messageSeenBy = [ messageSeenBy ];
 		}
-		
+
 		let seenByAddrs = [];
 		messageSeenBy.forEach(sb => {
 			seenByAddrs = seenByAddrs.concat(ftnUtil.parseAbbreviatedNetNodeList(sb));
@@ -137,13 +136,13 @@ function FTNMessageScanTossModule() {
 		return seenByAddrs;
 	};
 	*/
-	
+
 	this.messageHasValidMSGID = function(msg) {
-		return _.isString(msg.meta.FtnKludge.MSGID) && msg.meta.FtnKludge.MSGID.length > 0;	
+		return _.isString(msg.meta.FtnKludge.MSGID) && msg.meta.FtnKludge.MSGID.length > 0;
 	};
-	
+
 	/*
-	this.getOutgoingPacketDir = function(networkName, destAddress) {
+	this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
 		let dir = this.moduleConfig.paths.outbound;
 		if(!this.isDefaultDomainZone(networkName, destAddress)) {
 			const hexZone = `000${destAddress.zone.toString(16)}`.substr(-3);
@@ -152,31 +151,31 @@ function FTNMessageScanTossModule() {
 		return dir;
 	};
 	*/
-	
-	this.getOutgoingPacketDir = function(networkName, destAddress) {
+
+	this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
 		networkName = networkName.toLowerCase();
-		
+
 		let dir = this.moduleConfig.paths.outbound;
-		
-		const defaultNetworkName 	= this.getDefaultNetworkName();	
+
+		const defaultNetworkName 	= this.getDefaultNetworkName();
 		const defaultZone			= this.getDefaultZone(networkName);
-		
+
 		let zoneExt;
 		if(defaultZone !== destAddress.zone) {
 			zoneExt = '.' + `000${destAddress.zone.toString(16)}`.substr(-3);
 		} else {
 			zoneExt = '';
 		}
-		
+
 		if(defaultNetworkName === networkName) {
 			dir = paths.join(dir, `outbound${zoneExt}`);
 		} else {
 			dir = paths.join(dir, `${networkName}${zoneExt}`);
 		}
-		
+
 		return dir;
 	};
-	
+
 	this.getOutgoingPacketFileName = function(basePath, messageId, isTemp, fileCase) {
 		//
 		//	Generating an outgoing packet file name comes with a few issues:
@@ -189,15 +188,15 @@ function FTNMessageScanTossModule() {
 		//	There are a lot of systems in use here for the name:
 		//	*	HEX CRC16/32 of data
 		//	*	HEX UNIX timestamp
-		//	*	Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second) 
+		//	*	Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second)
 		//		See https://groups.google.com/forum/#!searchin/alt.bbs.mystic/netmail$20filename/alt.bbs.mystic/m1xLnY8i1pU/YnG2excdl6MJ
 		//	* 	SBBSEcho uses DDHHMMSS - see https://github.com/ftnapps/pkg-sbbs/blob/master/docs/fidonet.txt
 		//	*	We already have a system for 8-character serial number gernation that is
 		//		used for e.g. in FTS-0009.001 MSGIDs... let's use that!
-		// 		
+		//
 		const name		= ftnUtil.getMessageSerialNumber(messageId);
 		const ext		= (true === isTemp) ? 'pk_' : 'pkt';
-		
+
 		let fileName = `${name}.${ext}`;
 		if('upper' === fileCase) {
 			fileName = fileName.toUpperCase();
@@ -205,10 +204,10 @@ function FTNMessageScanTossModule() {
 
 		return paths.join(basePath, fileName);
 	};
-	
+
 	this.getOutgoingFlowFileExtension = function(destAddress, flowType, exportType, fileCase) {
 		let ext;
-		
+
 		switch(flowType) {
 			case 'mail'		: ext = `${exportType.toLowerCase()[0]}ut`; break;
 			case 'ref'		: ext = `${exportType.toLowerCase()[0]}lo`; break;
@@ -220,20 +219,20 @@ function FTNMessageScanTossModule() {
 		if('upper' === fileCase) {
 			ext = ext.toUpperCase();
 		}
-		
-		return ext;	
+
+		return ext;
 	};
 
 	this.getOutgoingFlowFileName = function(basePath, destAddress, flowType, exportType, fileCase) {
-		let basename;			
-		
+		let basename;
+
 		const ext = self.getOutgoingFlowFileExtension(
-			destAddress, 
-			flowType, 
-			exportType, 
+			destAddress,
+			flowType,
+			exportType,
 			fileCase
 		);
-		
+
 		if(destAddress.point) {
 
 		} else {
@@ -242,32 +241,32 @@ function FTNMessageScanTossModule() {
 			//	node. This seems to match what Mystic does
 			//
 			basename =
-				`0000${destAddress.net.toString(16)}`.substr(-4) + 
-				`0000${destAddress.node.toString(16)}`.substr(-4);			
+				`0000${destAddress.net.toString(16)}`.substr(-4) +
+				`0000${destAddress.node.toString(16)}`.substr(-4);
 		}
 
 		if('upper' === fileCase) {
 			basename = basename.toUpperCase();
 		}
-		
+
 		return paths.join(basePath, `${basename}.${ext}`);
 	};
-	
+
 	this.flowFileAppendRefs = function(filePath, fileRefs, directive, cb) {
 		const appendLines = fileRefs.reduce( (content, ref) => {
 			return content + `${directive}${ref}\n`;
 		}, '');
-		
+
 		fs.appendFile(filePath, appendLines, err => {
 			cb(err);
 		});
 	};
-	
+
 	this.getOutgoingBundleFileName = function(basePath, sourceAddress, destAddress, cb) {
 		//
 		//	Base filename is constructed as such:
-		//	*	If this |destAddress| is *not* a point address, we use NNNNnnnn where 
-		//		NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded 
+		//	*	If this |destAddress| is *not* a point address, we use NNNNnnnn where
+		//		NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded
 		//		hex of dest node - source node.
 		//	*	If |destAddress| is a point, NNNN becomes 0000 and nnnn becomes 'p' +
 		//		3 digit 0 padded hex point
@@ -279,19 +278,19 @@ function FTNMessageScanTossModule() {
 			const pointHex = `000${destAddress.point}`.substr(-3);
 			basename = `0000p${pointHex}`;
 		} else {
-			basename = 
-				`0000${Math.abs(sourceAddress.net - destAddress.net).toString(16)}`.substr(-4) + 
-				`0000${Math.abs(sourceAddress.node - destAddress.node).toString(16)}`.substr(-4);			
+			basename =
+				`0000${Math.abs(sourceAddress.net - destAddress.net).toString(16)}`.substr(-4) +
+				`0000${Math.abs(sourceAddress.node - destAddress.node).toString(16)}`.substr(-4);
 		}
-		
+
 		//
 		//	We need to now find the first entry that does not exist starting
 		//	with dd0 to ddz
 		//
-		const EXT_SUFFIXES = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');		
+		const EXT_SUFFIXES = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
 		let fileName = `${basename}.${moment().format('dd').toLowerCase()}`;
 		async.detectSeries(EXT_SUFFIXES, (suffix, callback) => {
-			const checkFileName = fileName + suffix; 			
+			const checkFileName = fileName + suffix;
 			fs.stat(paths.join(basePath, checkFileName), err => {
 				callback(null, (err && 'ENOENT' === err.code) ? true : false);
 			});
@@ -299,32 +298,40 @@ function FTNMessageScanTossModule() {
 			if(finalSuffix) {
 				return cb(null, paths.join(basePath, fileName + finalSuffix));
 			}
-			
-			return cb(new Error('Could not acquire a bundle filename!'));			
+
+			return cb(new Error('Could not acquire a bundle filename!'));
 		});
 	};
-	
+
 	this.prepareMessage = function(message, options) {
 		//
 		//	Set various FTN kludges/etc.
 		//
 		message.meta.FtnProperty = message.meta.FtnProperty || {};
 		message.meta.FtnKludge = message.meta.FtnKludge || {};
-		
-		message.meta.FtnProperty.ftn_orig_node		= options.network.localAddress.node;
-		message.meta.FtnProperty.ftn_dest_node		= options.destAddress.node;
-		message.meta.FtnProperty.ftn_orig_network	= options.network.localAddress.net;
-		message.meta.FtnProperty.ftn_dest_network	= options.destAddress.net;
-		message.meta.FtnProperty.ftn_cost			= 0;
-		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();		
 
-		//	:TODO: Need an explicit isNetMail() check
-		let ftnAttribute = 
+		//	:TODO: Only set DEST information for EchoMail - NetMail should already have it in message
+		message.meta.FtnProperty.ftn_orig_node		= options.network.localAddress.node;
+		//message.meta.FtnProperty.ftn_dest_node		= options.destAddress.node;
+		message.meta.FtnProperty.ftn_orig_network	= options.network.localAddress.net;
+		//message.meta.FtnProperty.ftn_dest_network	= options.destAddress.net;
+		message.meta.FtnProperty.ftn_cost			= 0;
+
+		//	tear line and origin can both go in EchoMail & NetMail
+		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
+		message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(options.network.localAddress);
+
+		//	:TODO: Need an explicit isNetMail() check or more generally
+		let ftnAttribute =
 			ftnMailPacket.Packet.Attribute.Local;	//	message from our system
-		
+
 		if(message.isPrivate()) {
+			//	These should be set for Private/NetMail already
+			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_node)));
+			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_network)));
+
 			ftnAttribute |= ftnMailPacket.Packet.Attribute.Private;
-			
+
 			//
 			//	NetMail messages need a FRL-1005.001 "Via" line
 			//	http://ftsc.org/docs/frl-1005.001
@@ -334,7 +341,25 @@ function FTNMessageScanTossModule() {
 			}
 			message.meta.FtnKludge.Via = message.meta.FtnKludge.Via || [];
 			message.meta.FtnKludge.Via.push(ftnUtil.getVia(options.network.localAddress));
+
+			//
+			//	We need to set INTL, and possibly FMPT and/or TOPT
+			//	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
+			//
+			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.network.localAddress, options.destAddress);
+
+			if(_.isNumber(options.network.localAddress.point) && options.network.localAddress.point > 0) {
+				message.meta.FtnKludge.FMPT = options.network.localAddress.point;
+			}
+
+			if(_.get(message, 'meta.FtnProperty.ftn_dest_point', 0) > 0) {
+				message.meta.FtnKludge.TOPT = message.meta.FtnProperty.ftn_dest_point;
+			}
 		} else {
+			//	We need to set some destination info for EchoMail
+			message.meta.FtnProperty.ftn_dest_node		= options.destAddress.node;
+			message.meta.FtnProperty.ftn_dest_network	= options.destAddress.net;
+
 			//
 			//	Set appropriate attribute flag for export type
 			//
@@ -343,52 +368,51 @@ function FTNMessageScanTossModule() {
 				case 'hold'		: ftnAttribute |= ftnMailPacket.Packet.Attribute.Hold; break;
 				//	:TODO: Others?
 			}
-			
+
 			//
 			//	EchoMail requires some additional properties & kludges
-			//		
-			message.meta.FtnProperty.ftn_origin		= ftnUtil.getOrigin(options.network.localAddress);
-			message.meta.FtnProperty.ftn_area		= Config.messageNetworks.ftn.areas[message.areaTag].tag;
-			
+			//
+			message.meta.FtnProperty.ftn_area = Config.messageNetworks.ftn.areas[message.areaTag].tag;
+
 			//
 			//	When exporting messages, we should create/update SEEN-BY
 			//	with remote address(s) we are exporting to.
 			//
-			const seenByAdditions = 
+			const seenByAdditions =
 				[ `${options.network.localAddress.net}/${options.network.localAddress.node}` ].concat(Config.messageNetworks.ftn.areas[message.areaTag].uplinks);
-			message.meta.FtnProperty.ftn_seen_by = 
+			message.meta.FtnProperty.ftn_seen_by =
 				ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
 
 			//
 			//	And create/update PATH for ourself
 			//
-			message.meta.FtnKludge.PATH = 
+			message.meta.FtnKludge.PATH =
 				ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, options.network.localAddress);
 		}
-		
+
 		message.meta.FtnProperty.ftn_attr_flags = ftnAttribute;
-		
+
 		//
 		//	Additional kludges
 		//
 		//	Check for existence of MSGID as we may already have stored it from a previous
 		//	export that failed to finish
-		//	
+		//
 		if(!message.meta.FtnKludge.MSGID) {
 			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(message, options.network.localAddress);
 		}
-			
+
 		message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();
-			
+
 		//
 		//	According to FSC-0046:
-		//	
+		//
 		//	"When a Conference Mail processor adds a TID to a message, it may not
 		//	add a PID. An existing TID should, however, be replaced. TIDs follow
 		//	the same format used for PIDs, as explained above."
 		//
-		message.meta.FtnKludge.TID = ftnUtil.getProductIdentifier(); 
-		
+		message.meta.FtnKludge.TID = ftnUtil.getProductIdentifier();
+
 		//
 		//	Determine CHRS and actual internal encoding name. If the message has an
 		//	explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
@@ -403,77 +427,77 @@ function FTNMessageScanTossModule() {
 				encoding = encFromChars;
 			}
 		}
-		
+
 		//
 		//	Ensure we ended up with something useable. If not, back to utf8!
 		//
 		if(!iconv.encodingExists(encoding)) {
 			Log.debug( { encoding : encoding }, 'Unknown encoding. Falling back to utf8');
 			encoding = 'utf8';
-		} 
-		
+		}
+
 		options.encoding = encoding;	//	save for later
 		message.meta.FtnKludge.CHRS = ftnUtil.getCharacterSetIdentifierByEncoding(encoding);
-		//	:TODO: FLAGS kludge? 		
+		//	:TODO: FLAGS kludge?
 	};
-	
+
 	this.setReplyKludgeFromReplyToMsgId = function(message, cb) {
 		//
 		//	Look up MSGID kludge for |message.replyToMsgId|, if any.
 		//	If found, we can create a REPLY kludge with the previously
 		//	discovered MSGID.
 		//
-		
+
 		if(0 === message.replyToMsgId) {
 			return cb(null);	//	nothing to do
 		}
-		
-		Message.getMetaValuesByMessageId(message.replyToMsgId, 'FtnKludge', 'MSGID', (err, msgIdVal) => {			
+
+		Message.getMetaValuesByMessageId(message.replyToMsgId, 'FtnKludge', 'MSGID', (err, msgIdVal) => {
 			if(!err) {
-				assert(_.isString(msgIdVal), 'Expected string but got ' + (typeof msgIdVal) + ' (' + msgIdVal + ')');			
+				assert(_.isString(msgIdVal), 'Expected string but got ' + (typeof msgIdVal) + ' (' + msgIdVal + ')');
 				//	got a MSGID - create a REPLY
 				message.meta.FtnKludge.REPLY = msgIdVal;
 			}
-			
+
 			cb(null);	//	this method always passes
-		});	
+		});
 	};
-	
+
 	//	check paths, Addresses, etc.
 	this.isAreaConfigValid = function(areaConfig) {
 		if(!areaConfig || !_.isString(areaConfig.tag) || !_.isString(areaConfig.network)) {
 			return false;
 		}
-		
+
 		if(_.isString(areaConfig.uplinks)) {
 			areaConfig.uplinks = areaConfig.uplinks.split(' ');
 		}
-		
+
 		return (_.isArray(areaConfig.uplinks));
 	};
-	
-	
+
+
 	this.hasValidConfiguration = function() {
 		if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config, 'messageNetworks.ftn.areas')) {
 			return false;
 		}
-		
+
 		//	:TODO: need to check more!
-		
+
 		return true;
 	};
-	
+
 	this.parseScheduleString = function(schedStr) {
 		if(!schedStr) {
 			return;	//	nothing to parse!
 		}
-		
+
 		let schedule = {};
-		
+
 		const m = SCHEDULE_REGEXP.exec(schedStr);
 		if(m) {
 			schedStr = schedStr.substr(0, m.index).trim();
-			
+
 			if('@watch:' === m[1]) {
 				schedule.watchFile = m[2];
 			} else if('@immediate' === m[1]) {
@@ -485,46 +509,112 @@ function FTNMessageScanTossModule() {
 			const sched = later.parse.text(schedStr);
 			if(-1 === sched.error) {
 				schedule.sched = sched;
-			}	
+			}
 		}
-		
+
 		//	return undefined if we couldn't parse out anything useful
 		if(!_.isEmpty(schedule)) {
 			return schedule;
-		} 
+		}
 	};
-	
+
 	this.getAreaLastScanId = function(areaTag, cb) {
-		const sql = 
+		const sql =
 			`SELECT area_tag, message_id
 			FROM message_area_last_scan
 			WHERE scan_toss = "ftn_bso" AND area_tag = ?
 			LIMIT 1;`;
-			
+
 		msgDb.get(sql, [ areaTag ], (err, row) => {
-			cb(err, row ? row.message_id : 0);
+			return cb(err, row ? row.message_id : 0);
 		});
 	};
-	
+
 	this.setAreaLastScanId = function(areaTag, lastScanId, cb) {
 		const sql =
 			`REPLACE INTO message_area_last_scan (scan_toss, area_tag, message_id)
 			VALUES ("ftn_bso", ?, ?);`;
-		
+
 		msgDb.run(sql, [ areaTag, lastScanId ], err => {
-			cb(err);
+			return cb(err);
 		});
 	};
-	
+
+	this.getNodeConfigByAddress = function(addr) {
+		addr = _.isString(addr) ? Address.fromString(addr) : addr;
+
+		//	:TODO: sort wildcard nodes{} entries by most->least explicit according to FTN hierarchy
+		return _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
+			return addr.isPatternMatch(nodeAddrWildcard);
+		});
+	};
+
+	//	:TODO: deprecate this in favor of getNodeConfigByAddress()
 	this.getNodeConfigKeyByAddress = function(uplink) {
-		//	:TODO: sort by least # of '*' & take top?
 		const nodeKey = _.filter(Object.keys(this.moduleConfig.nodes), addr => {
 			return Address.fromString(addr).isPatternMatch(uplink);
 		})[0];
 
 		return nodeKey;
 	};
-	
+
+	this.exportNetMailMessagePacket = function(message, exportOpts, cb) {
+		//
+		//	For NetMail, we always create a *single* packet per message.
+		//
+		async.series(
+			[
+				function generalPrep(callback) {
+					//	:TODO: Double check Via spec -- seems like it may be wrong
+					self.prepareMessage(message, exportOpts);
+
+					return self.setReplyKludgeFromReplyToMsgId(message, callback);
+				},
+				function createPacket(callback) {
+					const packet = new ftnMailPacket.Packet();
+
+					const packetHeader = new ftnMailPacket.PacketHeader(
+						exportOpts.network.localAddress,
+						exportOpts.destAddress,
+						exportOpts.nodeConfig.packetType
+					);
+
+					packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
+
+					//	use current message ID for filename seed
+					exportOpts.pktFileName = self.getOutgoingPacketFileName(
+						self.exportTempDir,
+						message.messageId,
+						false,	//	createTempPacket=false
+						exportOpts.fileCase
+					);
+
+					const ws = fs.createWriteStream(exportOpts.pktFileName);
+
+					packet.writeHeader(ws, packetHeader);
+
+					packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
+						if(err) {
+							return callback(err);
+						}
+
+						ws.write(msgBuf);
+
+						packet.writeTerminator(ws);
+
+						ws.end();
+						ws.once('finish', () => {
+							return callback(null);
+						});
+					});
+				}
+			],
+			err => {
+				return cb(err);
+			}
+		);
+	};
+
 	this.exportMessagesByUuid = function(messageUuids, exportOpts, cb) {
 		//
 		//	This method has a lot of madness going on:
@@ -538,7 +628,7 @@ function FTNMessageScanTossModule() {
 		let ws;
 		let remainMessageBuf;
 		let remainMessageId;
-		const createTempPacket = !_.isString(exportOpts.nodeConfig.archiveType) || 0 === exportOpts.nodeConfig.archiveType.length; 
+		const createTempPacket = !_.isString(exportOpts.nodeConfig.archiveType) || 0 === exportOpts.nodeConfig.archiveType.length;
 
 		function finalizePacket(cb) {
 			packet.writeTerminator(ws);
@@ -547,10 +637,10 @@ function FTNMessageScanTossModule() {
 				return cb(null);
 			});
 		}
-		
+
 		async.each(messageUuids, (msgUuid, nextUuid) => {
 			let message = new Message();
-			
+
 			async.series(
 				[
 					function finalizePrevious(callback) {
@@ -565,47 +655,47 @@ function FTNMessageScanTossModule() {
 							if(err) {
 								return callback(err);
 							}
-							
+
 							//	General preperation
 							self.prepareMessage(message, exportOpts);
-							
+
 							self.setReplyKludgeFromReplyToMsgId(message, err => {
 								callback(err);
 							});
 						});
 					},
-					function createNewPacket(callback) {			
-						if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {					
+					function createNewPacket(callback) {
+						if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
 							packet = new ftnMailPacket.Packet();
-							
+
 							const packetHeader = new ftnMailPacket.PacketHeader(
 								exportOpts.network.localAddress,
 								exportOpts.destAddress,
 								exportOpts.nodeConfig.packetType);
 
 							packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
-							
+
 							//	use current message ID for filename seed
 							const pktFileName = self.getOutgoingPacketFileName(
-								self.exportTempDir, 
-								message.messageId, 
+								self.exportTempDir,
+								message.messageId,
 								createTempPacket,
 								exportOpts.fileCase
 							);
 
 							exportedFiles.push(pktFileName);
-							
+
 							ws = fs.createWriteStream(pktFileName);
-							
+
 							currPacketSize = packet.writeHeader(ws, packetHeader);
-							
+
 							if(remainMessageBuf) {
 								currPacketSize += packet.writeMessageEntry(ws, remainMessageBuf);
 								remainMessageBuf = null;
-							}						
+							}
 						}
-						
-						callback(null);					
+
+						callback(null);
 					},
 					function appendMessage(callback) {
 						packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
@@ -614,16 +704,16 @@ function FTNMessageScanTossModule() {
 							}
 
 							currPacketSize	+= msgBuf.length;
-						
+
 							if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
-								remainMessageBuf	= msgBuf;	//	save for next packet	
-								remainMessageId 	= message.messageId;						
+								remainMessageBuf	= msgBuf;	//	save for next packet
+								remainMessageId 	= message.messageId;
 							} else {
 								ws.write(msgBuf);
 							}
-							
+
 							return callback(null);
-						});												
+						});
 					},
 					function storeStateFlags0Meta(callback) {
 						message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), err => {
@@ -641,9 +731,9 @@ function FTNMessageScanTossModule() {
 							});
 						} else {
 							callback(null);
-						}					
+						}
 					}
-				], 
+				],
 				err => {
 					nextUuid(err);
 				}
@@ -665,26 +755,26 @@ function FTNMessageScanTossModule() {
 							if(remainMessageBuf) {
 								//	:TODO: DRY this with the code above -- they are basically identical
 								packet = new ftnMailPacket.Packet();
-											
+
 								const packetHeader = new ftnMailPacket.PacketHeader(
 									exportOpts.network.localAddress,
 									exportOpts.destAddress,
 									exportOpts.nodeConfig.packetType);
 
 								packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
-								
+
 								//	use current message ID for filename seed
 								const pktFileName = self.getOutgoingPacketFileName(
-									self.exportTempDir, 
-									remainMessageId, 
+									self.exportTempDir,
+									remainMessageId,
 									createTempPacket,
 									exportOpts.filleCase
 								);
 
 								exportedFiles.push(pktFileName);
-								
+
 								ws = fs.createWriteStream(pktFileName);
-								
+
 								packet.writeHeader(ws, packetHeader);
 								ws.write(remainMessageBuf);
 								return finalizePacket(callback);
@@ -696,18 +786,168 @@ function FTNMessageScanTossModule() {
 					err => {
 						cb(err, exportedFiles);
 					}
-				);	
-			}			
+				);
+			}
 		});
 	};
-		
-	this.exportMessagesToUplinks = function(messageUuids, areaConfig, cb) {
+
+	this.getNetMailRoute = function(dstAddr) {
+		//
+		//	messageNetworks.ftn.netMail.routes{} full|wildcard -> full adddress lookup
+		//
+		const routes = _.get(Config, 'messageNetworks.ftn.netMail.routes');
+		if(!routes) {
+			return;
+		}
+
+		return _.find(routes, (route, addrWildcard) => {
+			return dstAddr.isPatternMatch(addrWildcard);
+		});
+
+		/*
+		const route = _.find(routes, (route, addrWildcard) => {
+			return dstAddr.isPatternMatch(addrWildcard);
+		});
+
+		if(route && route.address) {
+			return Address.fromString(route.address);
+		}
+		*/
+	};
+
+	this.getAcceptableNetMailNetworkInfoFromAddress = function(dstAddr, cb) {
+		//
+		//	Attempt to find an acceptable network configuration using the following
+		//	lookup order (most to least explicit config):
+		//
+		//	1) Routes: messageNetworks.ftn.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
+		//		- Where we send may not be where dstAddress is (it's routed!); use network found in route
+		//		  for local address
+		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
+		//		- Where we send is direct to dstAddr; use scannerTossers.ftn_bso.defaultNetwork to
+		//		  for local address
+		//	3) Nodelist DB lookup (use default config)
+		//		- Where we send is direct to dstAddr
+		//
+		//const routeAddress = this.getNetMailRouteAddress(dstAddr) || dstAddr;
+		const route = this.getNetMailRoute(dstAddr);
+
+		let routeAddress;
+		let networkName;
+		if(route) {
+			routeAddress	= Address.fromString(route.address);
+			networkName		= route.network || Config.scannerTossers.ftn_bso.defaultNetwork;
+		} else {
+			routeAddress	= dstAddr;
+			networkName		= Config.scannerTossers.ftn_bso.defaultNetwork;
+		}
+
+		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
+			return routeAddress.isPatternMatch(nodeAddrWildcard);
+		}) || {
+			packetType	: '2+',
+			encoding	: Config.scannerTossers.ftn_bso.packetMsgEncoding,
+		};
+
+		return cb(
+			config ? null : Errors.DoesNotExist(`No configuration found for ${dstAddr.toString()}`),
+			config, routeAddress, networkName
+		);
+	};
+
+	this.exportNetMailMessagesToUplinks = function(messagesOrMessageUuids, cb) {
+		//	for each message/UUID, find where to send the thing
+		async.each(messagesOrMessageUuids, (msgOrUuid, nextMessageOrUuid) => {
+
+			const exportOpts = {};
+			const message = new Message();
+
+			async.series(
+				[
+					function loadMessage(callback) {
+						if(_.isString(msgOrUuid)) {
+							message.load( { uuid : msgOrUuid }, err => {
+								return callback(err, message);
+							});
+						} else {
+							return callback(null, msgOrUuid);
+						}
+					},
+					function discoverUplink(callback) {
+						const dstAddr = new Address({
+							zone	: parseInt(message.meta.FtnProperty.ftn_dest_zone),
+							net		: parseInt(message.meta.FtnProperty.ftn_dest_network),
+							node	: parseInt(message.meta.FtnProperty.ftn_dest_node),
+							point	: parseInt(message.meta.FtnProperty.ftn_dest_point) || null,	//	point is optional
+						});
+
+						return self.getAcceptableNetMailNetworkInfoFromAddress(dstAddr, (err, config, routeAddress, networkName) => {
+							if(err) {
+								return callback(err);
+							}
+
+
+
+							exportOpts.nodeConfig	= config;
+							exportOpts.destAddress	= routeAddress;
+							exportOpts.fileCase		= config.fileCase || 'lower';
+							exportOpts.network		= Config.messageNetworks.ftn.networks[networkName];
+							exportOpts.networkName	= networkName;
+
+							if(!exportOpts.network) {
+								return callback(Errors.DoesNotExist(`No configuration found for network ${networkName}`));
+							}
+
+							return callback(null);
+						});
+					},
+					function createOutgoingDir(callback) {
+						//	ensure outgoing NetMail directory exists
+						return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
+					},
+					function exportPacket(callback) {
+						return self.exportNetMailMessagePacket(message, exportOpts, callback);
+					},
+					function moveToOutgoing(callback) {
+						const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
+						const newPath = paths.join(
+							Config.scannerTossers.ftn_bso.paths.outboundNetMail,
+							`${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
+						);
+
+						return fse.move(exportOpts.pktFileName, newPath, callback);
+					},
+					function storeStateFlags0Meta(callback) {
+						return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);
+					},
+					function storeMsgIdMeta(callback) {
+						//	Store meta as if we had imported this message -- for later reference
+						if(message.meta.FtnKludge.MSGID) {
+							return message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, callback);
+						}
+
+						return callback(null);
+					}
+				],
+				err => {
+					if(err) {
+						Log.warn( { error :err.message }, 'Error exporting message' );
+					}
+					return nextMessageOrUuid(null);
+				}
+			);
+		}, err => {
+			return cb(err);
+		});
+	};
+
+	this.exportEchoMailMessagesToUplinks = function(messageUuids, areaConfig, cb) {
 		async.each(areaConfig.uplinks, (uplink, nextUplink) => {
 			const nodeConfigKey = self.getNodeConfigKeyByAddress(uplink);
 			if(!nodeConfigKey) {
 				return nextUplink();
 			}
-			
+
 			const exportOpts = {
 				nodeConfig		: self.moduleConfig.nodes[nodeConfigKey],
 				network			: Config.messageNetworks.ftn.networks[areaConfig.network],
@@ -715,14 +955,14 @@ function FTNMessageScanTossModule() {
 				networkName		: areaConfig.network,
 				fileCase		: self.moduleConfig.nodes[nodeConfigKey].fileCase || 'lower',
 			};
-				
+
 			if(_.isString(exportOpts.network.localAddress)) {
-				exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress); 
+				exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
 			}
-			
-			const outgoingDir 	= self.getOutgoingPacketDir(exportOpts.networkName, exportOpts.destAddress);
+
+			const outgoingDir 	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
 			const exportType	= self.getExportType(exportOpts.nodeConfig);
-			
+
 			async.waterfall(
 				[
 					function createOutgoingDir(callback) {
@@ -746,17 +986,17 @@ function FTNMessageScanTossModule() {
 								if(err) {
 									return callback(err);
 								}
-								
+
 								//	adjust back to temp path
 								const tempBundlePath = paths.join(self.exportTempDir, paths.basename(bundlePath));
-								
+
 								self.archUtil.compressTo(
-									exportOpts.nodeConfig.archiveType, 
+									exportOpts.nodeConfig.archiveType,
 									tempBundlePath,
 									exportedFileNames, err => {
 										callback(err, [ tempBundlePath ] );
 									}
-								);	
+								);
 							});
 						} else {
 							callback(null, exportedFileNames);
@@ -769,18 +1009,18 @@ function FTNMessageScanTossModule() {
 								//
 								//	For a given temporary .pk_ file, we need to move it to the outoing
 								//	directory with the appropriate BSO style filename.
-								// 
+								//
 								const newExt = self.getOutgoingFlowFileExtension(
 									exportOpts.destAddress,
-									'mail', 
+									'mail',
 									exportType,
 									exportOpts.fileCase
 								);
-									
+
 								const newPath = paths.join(
-									outgoingDir, 
+									outgoingDir,
 									`${paths.basename(oldPath, ext)}${newExt}`);
-																		
+
 								fse.move(oldPath, newPath, nextFile);
 							} else {
 								const newPath = paths.join(outgoingDir, paths.basename(oldPath));
@@ -789,25 +1029,25 @@ function FTNMessageScanTossModule() {
 										Log.warn(
 											{ oldPath : oldPath, newPath : newPath, error : err.toString() },
 											'Failed moving temporary bundle file!');
-											
+
 										return nextFile();
 									}
-									
+
 									//
 									//	For bundles, we need to append to the appropriate flow file
 									//
 									const flowFilePath = self.getOutgoingFlowFileName(
-										outgoingDir, 
+										outgoingDir,
 										exportOpts.destAddress,
 										'ref',
 										exportType,
 										exportOpts.fileCase
 									);
- 
+
 									//	directive of '^' = delete file after transfer
 									self.flowFileAppendRefs(flowFilePath, [ newPath ], '^', err => {
 										if(err) {
-											Log.warn( { path : flowFilePath }, 'Failed appending flow reference record!');			
+											Log.warn( { path : flowFilePath }, 'Failed appending flow reference record!');
 										}
 										nextFile();
 									});
@@ -823,10 +1063,10 @@ function FTNMessageScanTossModule() {
 					}
 					nextUplink();
 				}
-			);			
+			);
 		}, cb);	//	complete
 	};
-	
+
 	this.setReplyToMsgIdFtnReplyKludge = function(message, cb) {
 		//
 		//	Given a FTN REPLY kludge, set |message.replyToMsgId|, if possible,
@@ -838,12 +1078,12 @@ function FTNMessageScanTossModule() {
 			//	nothing to do
 			return cb();
 		}
-		
+
 		Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => {
 			if(msgIds && msgIds.length > 0) {
 				//	expect a single match, but dupe checking is not perfect - warn otherwise
 				if(1 === msgIds.length) {
-					message.replyToMsgId = msgIds[0];	
+					message.replyToMsgId = msgIds[0];
 				} else {
 					Log.warn( { msgIds : msgIds, replyKludge :  message.meta.FtnKludge.REPLY }, 'Found 2:n MSGIDs matching REPLY kludge!');
 				}
@@ -851,14 +1091,14 @@ function FTNMessageScanTossModule() {
 			cb();
 		});
 	};
-	
+
 	this.importEchoMailToArea = function(localAreaTag, header, message, cb) {
 		async.series(
 			[
-				function validateDestinationAddress(callback) {			
-					const localNetworkPattern = `${message.meta.FtnProperty.ftn_dest_network}/${message.meta.FtnProperty.ftn_dest_node}`;					
+				function validateDestinationAddress(callback) {
+					const localNetworkPattern = `${message.meta.FtnProperty.ftn_dest_network}/${message.meta.FtnProperty.ftn_dest_node}`;
 					const localNetworkName = self.getNetworkNameByAddressPattern(localNetworkPattern);
-					
+
 					callback(_.isString(localNetworkName) ? null : new Error('Packet destination is not us'));
 				},
 				function checkForDupeMSGID(callback) {
@@ -881,7 +1121,7 @@ function FTNMessageScanTossModule() {
 				},
 				function basicSetup(callback) {
 					message.areaTag = localAreaTag;
-					
+
 					//
 					//	If we *allow* dupes (disabled by default), then just generate
 					//	a random UUID. Otherwise, don't assign the UUID just yet. It will be
@@ -891,8 +1131,8 @@ function FTNMessageScanTossModule() {
 						//	just generate a UUID & therefor always allow for dupes
 						message.uuid = uuidV4();
 					}
-					
-					callback(null);	
+
+					callback(null);
 				},
 				function setReplyToMessageId(callback) {
 					self.setReplyToMsgIdFtnReplyKludge(message, () => {
@@ -902,15 +1142,15 @@ function FTNMessageScanTossModule() {
 				function persistImport(callback) {
 					//	mark as imported
 					message.meta.System.state_flags0 = Message.StateFlags0.Imported.toString();
-					
+
 					//	save to disc
 					message.persist(err => {
-						callback(err);						
+						callback(err);
 					});
 				}
-			], 
+			],
 			err => {
-				cb(err);	
+				cb(err);
 			}
 		);
 	};
@@ -924,37 +1164,37 @@ function FTNMessageScanTossModule() {
 			message.message += `${message.meta.FtnProperty.ftn_origin}\r\n`;
 		}
 	};
-	
+
 	//
-	//	Ref. implementations on import: 
+	//	Ref. implementations on import:
 	//	*	https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/pkt.c
 	//		https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/handle.c
 	//
 	this.importMessagesFromPacketFile = function(packetPath, password, cb) {
 		let packetHeader;
-				
+
 		const packetOpts = { keepTearAndOrigin : false };	//	needed so we can calc message UUID without these; we'll add later
-		
+
 		let importStats = {
 			areaSuccess	: {},	//	areaTag->count
 			areaFail	: {},	//	areaTag->count
 			otherFail	: 0,
 		};
-        
+
 		new ftnMailPacket.Packet(packetOpts).read(packetPath, (entryType, entryData, next) => {
 			if('header' === entryType) {
 				packetHeader = entryData;
-				
+
 				const localNetworkName = self.getNetworkNameByAddress(packetHeader.destAddress);
 				if(!_.isString(localNetworkName)) {
 					const addrString = new Address(packetHeader.destAddress).toString();
 					return next(new Error(`No local configuration for packet addressed to ${addrString}`));
 				} else {
-					
-					//	:TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!					
+
+					//	:TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!
 					return next(null);
 				}
-				
+
 			} else if('message' === entryType) {
 				const message = entryData;
 				const areaTag = message.meta.FtnProperty.ftn_area;
@@ -972,37 +1212,37 @@ function FTNMessageScanTossModule() {
 							message.message);
 
 						self.appendTearAndOrigin(message);
-						
+
 						self.importEchoMailToArea(localAreaTag, packetHeader, message, err => {
 							if(err) {
 								//	bump area fail stats
 								importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
-								
+
 								if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
 									const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
 									Log.info(
-										{ area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId }, 
+										{ area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
 										'Not importing non-unique message');
-									
+
 									return next(null);
 								}
 							} else {
 								//	bump area success
 								importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
 							}
-															
+
 							return next(err);
 						});
 					} else {
 						//
 						//	No local area configured for this import
 						//
-						//	:TODO: Handle the "catch all" case, if configured 
+						//	:TODO: Handle the "catch all" case, if configured
 						Log.warn( { areaTag : areaTag }, 'No local area configured for this packet file!');
-						
+
 						//	bump generic failure
 						importStats.otherFail += 1;
-						
+
 						return next(null);
 					}
 				} else {
@@ -1027,7 +1267,7 @@ function FTNMessageScanTossModule() {
 			} else {
 				Log.info(finalStats, 'Import complete');
 			}
-			
+
 			cb(err);
 		});
 	};
@@ -1048,7 +1288,7 @@ function FTNMessageScanTossModule() {
 			if(!_.isString(self.moduleConfig.paths.retain)) {
 				return cb(null);
 			}
-			
+
 			archivePath = paths.join(self.moduleConfig.paths.retain, `good-pkt-${ts}--${fn}`);
 		} else if('good' !== status) {
 			archivePath = paths.join(self.moduleConfig.paths.reject, `${status}-${type}--${ts}-${fn}`);
@@ -1066,7 +1306,7 @@ function FTNMessageScanTossModule() {
 			return cb(null);	//	never fatal
 		});
 	};
-	
+
 	this.importPacketFilesFromDirectory = function(importDir, password, cb) {
 		async.waterfall(
 			[
@@ -1081,12 +1321,12 @@ function FTNMessageScanTossModule() {
 				function importPacketFiles(packetFiles, callback) {
 					let rejects = [];
 					async.eachSeries(packetFiles, (packetFile, nextFile) => {
-						self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => {							
+						self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => {
 							if(err) {
-								Log.debug( 
-									{ path : paths.join(importDir, packetFile), error : err.toString() }, 
+								Log.debug(
+									{ path : paths.join(importDir, packetFile), error : err.toString() },
 									'Failed to import packet file');
-								
+
 								rejects.push(packetFile);
 							}
 							nextFile();
@@ -1097,13 +1337,13 @@ function FTNMessageScanTossModule() {
 					});
 				},
 				function handleProcessedFiles(packetFiles, rejects, callback) {
-					async.each(packetFiles, (packetFile, nextFile) => {						
+					async.each(packetFiles, (packetFile, nextFile) => {
 						//	possibly archive, then remove original
 						const fullPath = paths.join(importDir, packetFile);
 						self.maybeArchiveImportFile(
-							fullPath, 
-							'pkt', 
-							rejects.includes(packetFile) ? 'reject' : 'good', 
+							fullPath,
+							'pkt',
+							rejects.includes(packetFile) ? 'reject' : 'good',
 							() => {
 								fs.unlink(fullPath, () => {
 									return nextFile(null);
@@ -1120,7 +1360,7 @@ function FTNMessageScanTossModule() {
 			}
 		);
 	};
-	
+
 	this.importFromDirectory = function(inboundType, importDir, cb) {
 		async.waterfall(
 			[
@@ -1138,7 +1378,7 @@ function FTNMessageScanTossModule() {
 							const fext = paths.extname(f);
 							return bundleRegExp.test(fext);
 						});
-						
+
 						async.map(files, (file, transform) => {
 							const fullPath = paths.join(importDir, file);
 							self.archUtil.detectType(fullPath, (err, archName) => {
@@ -1151,48 +1391,48 @@ function FTNMessageScanTossModule() {
 				},
 				function importBundles(bundleFiles, callback) {
 					let rejects = [];
-					
+
 					async.each(bundleFiles, (bundleFile, nextFile) => {
 						if(_.isUndefined(bundleFile.archName)) {
-							Log.warn( 
+							Log.warn(
 								{ fileName : bundleFile.path },
 								'Unknown bundle archive type');
-					
+
 							rejects.push(bundleFile.path);
-										
+
 							return nextFile();	//	unknown archive type
 						}
 
 						Log.debug( { bundleFile : bundleFile }, 'Processing bundle' );
-						
+
 						self.archUtil.extractTo(
 							bundleFile.path,
 							self.importTempDir,
 							bundleFile.archName,
 							err => {
-								if(err) {									
+								if(err) {
 									Log.warn(
 										{ path : bundleFile.path, error : err.message },
 										'Failed to extract bundle');
-										
+
 									rejects.push(bundleFile.path);
 								}
-								
-								nextFile();		
+
+								nextFile();
 							}
 						);
 					}, err => {
 						if(err) {
 							return callback(err);
 						}
-						
+
 						//
 						//	All extracted - import .pkt's
 						//
 						self.importPacketFilesFromDirectory(self.importTempDir, '', err => {
 							//	:TODO: handle |err|
 							callback(null, bundleFiles, rejects);
-						});					
+						});
 					});
 				},
 				function handleProcessedBundleFiles(bundleFiles, rejects, callback) {
@@ -1209,7 +1449,7 @@ function FTNMessageScanTossModule() {
 									return nextFile(null);
 								});
 							}
-						);						
+						);
 					}, err => {
 						callback(err);
 					});
@@ -1225,41 +1465,45 @@ function FTNMessageScanTossModule() {
 			}
 		);
 	};
-	
+
 	this.createTempDirectories = function(cb) {
 		temptmp.mkdir( { prefix : 'enigftnexport-' }, (err, tempDir) => {
 			if(err) {
 				return cb(err);
 			}
-			
+
 			self.exportTempDir = tempDir;
-			
+
 			temptmp.mkdir( { prefix : 'enigftnimport-' }, (err, tempDir) => {
 				self.importTempDir = tempDir;
-				
+
 				cb(err);
 			});
 		});
 	};
-	
+
 	//	Starts an export block - returns true if we can proceed
 	this.exportingStart = function() {
 		if(!this.exportRunning) {
 			this.exportRunning = true;
 			return true;
 		}
-		
+
 		return false;
 	};
 
 	//	ends an export block
-	this.exportingEnd = function() {
-		this.exportRunning = false;	
+	this.exportingEnd = function(cb) {
+		this.exportRunning = false;
+
+		if(cb) {
+			return cb(null);
+		}
 	};
 
 	this.copyTicAttachment = function(src, dst, isUpdate, cb) {
 		if(isUpdate) {
-			fse.copy(src, dst, err => {
+			fse.copy(src, dst, { overwrite : true }, err => {
 				return cb(err, dst);
 			});
 		} else {
@@ -1274,8 +1518,6 @@ function FTNMessageScanTossModule() {
 	};
 
 	this.processSingleTicFile = function(ticFileInfo, cb) {
-		const self = this;
-
 		Log.debug( { tic : ticFileInfo.path, file : ticFileInfo.getAsString('File') }, 'Processing TIC file');
 
 		async.waterfall(
@@ -1389,8 +1631,8 @@ function FTNMessageScanTossModule() {
 					//
 					//	We may have TIC auto-tagging for this node and/or specific (remote) area
 					//
-					const hashTags = 
-						localInfo.hashTags || 
+					const hashTags =
+						localInfo.hashTags ||
 						_.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );		//	catch-all*/
 
 					if(hashTags) {
@@ -1462,7 +1704,7 @@ function FTNMessageScanTossModule() {
 
 					if(isUpdate) {
 						//	we need to *update* an existing record/file
-						localInfo.fileEntry.fileId = localInfo.existingFileId;						
+						localInfo.fileEntry.fileId = localInfo.existingFileId;
 					}
 
 					const dst = paths.join(areaStorageDir, localInfo.fileEntry.fileName);
@@ -1476,13 +1718,13 @@ function FTNMessageScanTossModule() {
 						if(dst !== finalPath) {
 							localInfo.fileEntry.fileName = paths.basename(finalPath);
 						}
-						
+
 						localInfo.fileEntry.persist(isUpdate, err => {
 							return callback(err, localInfo);
 						});
-					});				
+					});
 				},
-				//	:TODO: from here, we need to re-toss files if needed, before they are removed				
+				//	:TODO: from here, we need to re-toss files if needed, before they are removed
 				function cleanupOldFile(localInfo, callback) {
 					if(!localInfo.existingFileId) {
 						return callback(null, localInfo);
@@ -1490,7 +1732,7 @@ function FTNMessageScanTossModule() {
 
 					const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
 					const oldPath 		= paths.join(oldStorageDir, localInfo.oldFileName);
-					
+
 					fs.unlink(oldPath, err => {
 						if(err) {
 							Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
@@ -1527,6 +1769,145 @@ function FTNMessageScanTossModule() {
 			return cb(err);
 		});
 	};
+
+
+	this.performEchoMailExport = function(cb) {
+		//
+		//	Select all messages with a |message_id| > |lastScanId|.
+		//	Additionally exclude messages with the System state_flags0 which will be present for
+		//	imported or already exported messages
+		//
+		//	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
+		//
+		const getNewUuidsSql =
+			`SELECT message_id, message_uuid
+			FROM message m
+			WHERE area_tag = ? AND message_id > ? AND
+				(SELECT COUNT(message_id) 
+				FROM message_meta 
+				WHERE message_id = m.message_id AND meta_category = 'System' AND meta_name = 'state_flags0') = 0
+			ORDER BY message_id;`
+			;
+
+		async.each(Object.keys(Config.messageNetworks.ftn.areas), (areaTag, nextArea) => {
+			const areaConfig = Config.messageNetworks.ftn.areas[areaTag];
+			if(!this.isAreaConfigValid(areaConfig)) {
+				return nextArea();
+			}
+
+			//
+			//	For each message that is newer than that of the last scan
+			//	we need to export to each configured associated uplink(s)
+			//
+			async.waterfall(
+				[
+					function getLastScanId(callback) {
+						self.getAreaLastScanId(areaTag, callback);
+					},
+					function getNewUuids(lastScanId, callback) {
+						msgDb.all(getNewUuidsSql, [ areaTag, lastScanId ], (err, rows) => {
+							if(err) {
+								callback(err);
+							} else {
+								if(0 === rows.length) {
+									let nothingToDoErr = new Error('Nothing to do!');
+									nothingToDoErr.noRows = true;
+									callback(nothingToDoErr);
+								} else {
+									callback(null, rows);
+								}
+							}
+						});
+					},
+					function exportToConfiguredUplinks(msgRows, callback) {
+						const uuidsOnly = msgRows.map(r => r.message_uuid);	//	convert to array of UUIDs only
+						self.exportEchoMailMessagesToUplinks(uuidsOnly, areaConfig, err => {
+							const newLastScanId = msgRows[msgRows.length - 1].message_id;
+
+							Log.info(
+								{ areaTag : areaTag, messagesExported : msgRows.length, newLastScanId : newLastScanId },
+								'Export complete');
+
+							callback(err, newLastScanId);
+						});
+					},
+					function updateLastScanId(newLastScanId, callback) {
+						self.setAreaLastScanId(areaTag, newLastScanId, callback);
+					}
+				],
+				() => {
+					return nextArea();
+				}
+			);
+		},
+		err => {
+			return cb(err);
+		});
+	};
+
+	this.performNetMailExport = function(cb) {
+		//
+		//	Select all messages with a |message_id| > |lastScanId| in the private area
+		//	that also *do not* have a local user ID meta value but *do* have a FTN dest
+		//	network meta value.
+		//
+		//	Just like EchoMail, we additionally exclude messages with the System state_flags0
+		//	which will be present for imported or already exported messages
+		//
+		//	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
+		//
+		//	:TODO: fill out the rest of the consts here
+		//	:TODO: this statement is crazy ugly
+		const getNewUuidsSql =
+			`SELECT message_id, message_uuid
+			FROM message m
+			WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
+				(SELECT COUNT(message_id)
+				FROM message_meta
+				WHERE message_id = m.message_id AND meta_category = 'System' AND 
+					(meta_name = 'state_flags0' OR meta_name='local_to_user_id')) = 0
+			AND
+				(SELECT COUNT(message_id)
+				FROM message_meta
+				WHERE message_id = m.message_id AND meta_category='FtnProperty' AND meta_name='ftn_dest_network') = 1
+			ORDER BY message_id;
+			`;
+
+		async.waterfall(
+			[
+				function getLastScanId(callback) {
+					return self.getAreaLastScanId(Message.WellKnownAreaTags.Private, callback);
+				},
+				function getNewUuids(lastScanId, callback) {
+					msgDb.all(getNewUuidsSql, [ lastScanId ], (err, rows) => {
+						if(err) {
+							return callback(err);
+						}
+
+						if(0 === rows.length) {
+							return cb(null);	//	note |cb| -- early bail out!
+						}
+
+						return callback(null, rows);
+					});
+				},
+				function exportMessages(rows, callback) {
+					const messageUuids = rows.map(r => r.message_uuid);
+					return self.exportNetMailMessagesToUplinks(messageUuids, callback);
+				}
+			],
+			err => {
+				return cb(err);
+			}
+		);
+	};
+
+	this.isNetMailMessage = function(message) {
+		return message.isPrivate() &&
+			null === _.get(message.meta, 'System.LocalToUserID', null) &&
+			null !== _.get(message.meta, 'FtnProperty.ftn_dest_network')
+			;
+	};
 }
 
 require('util').inherits(FTNMessageScanTossModule, MessageScanTossModule);
@@ -1574,19 +1955,19 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
 						if(err) {
 							//	archive rejected TIC stuff (.TIC + attach)
 							async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
-								if(!path) {	//	possibly rejected due to "File" not existing/etc.									
+								if(!path) {	//	possibly rejected due to "File" not existing/etc.
 									return nextPath(null);
 								}
 
 								self.maybeArchiveImportFile(
-									path, 
-									'tic', 
+									path,
+									'tic',
 									'reject',
 									() => {
 										return nextPath(null);
 									}
 								);
-							}, 
+							},
 							() => {
 								self.removeAssocTicFiles(ticFileInfo, () => {
 									return nextTicInfo(null);
@@ -1596,7 +1977,7 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
 							self.removeAssocTicFiles(ticFileInfo, () => {
 								return nextTicInfo(null);
 							});
-						}						
+						}
 					});
 				}, err => {
 					return callback(err);
@@ -1611,59 +1992,59 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
 
 FTNMessageScanTossModule.prototype.startup = function(cb) {
 	Log.info(`${exports.moduleInfo.name} Scanner/Tosser starting up`);
-	
+
 	let importing = false;
-	
+
 	let self = this;
-				
+
 	function tryImportNow(reasonDesc) {
 		if(!importing) {
 			importing = true;
-			
+
 			Log.info( { module : exports.moduleInfo.name }, reasonDesc);
-			
+
 			self.performImport( () => {
 				importing = false;
 			});
 		}
 	}
-	
+
 	this.createTempDirectories(err => {
 		if(err) {
 			Log.warn( { error : err.toStrong() }, 'Failed creating temporary directories!');
 			return cb(err);
 		}
-	
+
 		if(_.isObject(this.moduleConfig.schedule)) {
 			const exportSchedule = this.parseScheduleString(this.moduleConfig.schedule.export);
 			if(exportSchedule) {
 				Log.debug(
-					{ 
-						schedule	: this.moduleConfig.schedule.export,						
+					{
+						schedule	: this.moduleConfig.schedule.export,
 						schedOK		: -1 === exportSchedule.sched.error,
 						next		: moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
 						immediate	: exportSchedule.immediate ? true : false,
 					},
 					'Export schedule loaded'
 				);
-				
+
 				if(exportSchedule.sched) {
 					this.exportTimer = later.setInterval( () => {
 						if(this.exportingStart()) {
 							Log.info( { module : exports.moduleInfo.name }, 'Performing scheduled message scan/export...');
-							
+
 							this.performExport( () => {
 								this.exportingEnd();
 							});
 						}
 					}, exportSchedule.sched);
 				}
-				
+
 				if(_.isBoolean(exportSchedule.immediate)) {
 					this.exportImmediate = exportSchedule.immediate;
 				}
 			}
-			
+
 			const importSchedule = this.parseScheduleString(this.moduleConfig.schedule.import);
 			if(importSchedule) {
 				Log.debug(
@@ -1675,13 +2056,13 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 					},
 					'Import schedule loaded'
 				);
-				
-				if(importSchedule.sched) {					
+
+				if(importSchedule.sched) {
 					this.importTimer = later.setInterval( () => {
-						tryImportNow('Performing scheduled message import/toss...');						
+						tryImportNow('Performing scheduled message import/toss...');
 					}, importSchedule.sched);
 				}
-				
+
 				if(_.isString(importSchedule.watchFile)) {
 					const watcher = sane(
 						paths.dirname(importSchedule.watchFile),
@@ -1711,22 +2092,22 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 				}
 			}
 		}
-		
+
 		FTNMessageScanTossModule.super_.prototype.startup.call(this, cb);
 	});
 };
 
 FTNMessageScanTossModule.prototype.shutdown = function(cb) {
 	Log.info('FidoNet Scanner/Tosser shutting down');
-	
+
 	if(this.exportTimer) {
 		this.exportTimer.clear();
 	}
-	
+
 	if(this.importTimer) {
 		this.importTimer.clear();
 	}
-	
+
 	//
 	//	Clean up temp dir/files we created
 	//
@@ -1737,9 +2118,9 @@ FTNMessageScanTossModule.prototype.shutdown = function(cb) {
 			paths		: paths,
 			sessionId	: temptmp.sessionId,
 		};
-		
+
 		Log.trace(fullStats, 'Temporary directories cleaned up');
-			
+
 		FTNMessageScanTossModule.super_.prototype.shutdown.call(this, cb);
 	});
 
@@ -1750,9 +2131,9 @@ FTNMessageScanTossModule.prototype.performImport = function(cb) {
 	if(!this.hasValidConfiguration()) {
 		return cb(new Error('Missing or invalid configuration'));
 	}
-	
+
 	const self = this;
-	
+
 	async.each( [ 'inbound', 'secInbound' ], (inboundType, nextDir) => {
 		self.importFromDirectory(inboundType, self.moduleConfig.paths[inboundType], () => {
 			return nextDir(null);
@@ -1768,77 +2149,18 @@ FTNMessageScanTossModule.prototype.performExport = function(cb) {
 	if(!this.hasValidConfiguration()) {
 		return cb(new Error('Missing or invalid configuration'));
 	}
-	
-	//
-	//	Select all messages with a |message_id| > |lastScanId|.
-	//	Additionally exclude messages with the System state_flags0 which will be present for
-	//	imported or already exported messages
-	//
-	//	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
-	//
-	const getNewUuidsSql = 
-		`SELECT message_id, message_uuid
-		FROM message m
-		WHERE area_tag = ? AND message_id > ? AND
-			(SELECT COUNT(message_id) 
-			FROM message_meta 
-			WHERE message_id = m.message_id AND meta_category = 'System' AND meta_name = 'state_flags0') = 0
-		ORDER BY message_id;`;
-		
-	let self = this;		
-		
-	async.each(Object.keys(Config.messageNetworks.ftn.areas), (areaTag, nextArea) => {
-		const areaConfig = Config.messageNetworks.ftn.areas[areaTag];
-		if(!this.isAreaConfigValid(areaConfig)) {
-			return nextArea();
-		}
-		
-		//
-		//	For each message that is newer than that of the last scan
-		//	we need to export to each configured associated uplink(s)
-		//
-		async.waterfall(
-			[
-				function getLastScanId(callback) {
-					self.getAreaLastScanId(areaTag, callback);
-				},
-				function getNewUuids(lastScanId, callback) {
-					msgDb.all(getNewUuidsSql, [ areaTag, lastScanId ], (err, rows) => {
-						if(err) {
-							callback(err);
-						} else {
-							if(0 === rows.length) {
-								let nothingToDoErr = new Error('Nothing to do!');
-								nothingToDoErr.noRows = true;
-								callback(nothingToDoErr);
-							} else {
-								callback(null, rows);
-							}
-						}
-					});
-				},
-				function exportToConfiguredUplinks(msgRows, callback) {
-					const uuidsOnly = msgRows.map(r => r.message_uuid);	//	convert to array of UUIDs only
-					self.exportMessagesToUplinks(uuidsOnly, areaConfig, err => {
-						const newLastScanId = msgRows[msgRows.length - 1].message_id; 
-						
-						Log.info(
-							{ areaTag : areaTag, messagesExported : msgRows.length, newLastScanId : newLastScanId }, 
-							'Export complete');
-							
-						callback(err, newLastScanId);
-					});					
-				},
-				function updateLastScanId(newLastScanId, callback) {
-					self.setAreaLastScanId(areaTag, newLastScanId, callback);
-				}
-			],
-			() => {
-				return nextArea();
+
+	const self = this;
+
+	async.eachSeries( [ 'EchoMail', 'NetMail' ], (type, nextType) => {
+		self[`perform${type}Export`]( err => {
+			if(err) {
+				Log.warn( { error : err.message, type : type }, 'Error(s) during export' );
 			}
-		);
-	}, err => {
-		return cb(err);
+			return nextType(null);	//	try next, always
+		});
+	}, () => {
+		return cb(null);
 	});
 };
 
@@ -1849,27 +2171,37 @@ FTNMessageScanTossModule.prototype.record = function(message) {
 	if(true !== this.exportImmediate || !this.hasValidConfiguration()) {
 		return;
 	}
-	
-	if(message.isPrivate()) {
-		//	:TODO: support NetMail
+
+	const info = { uuid : message.uuid, subject : message.subject };
+
+	function exportLog(err) {
+		if(err) {
+			Log.warn(info, 'Failed exporting message');
+		} else {
+			Log.info(info, 'Message exported');
+		}
+	}
+
+	if(this.isNetMailMessage(message)) {
+		Object.assign(info, { type : 'NetMail' } );
+
+		if(this.exportingStart()) {
+			this.exportNetMailMessagesToUplinks( [ message.uuid ], err => {
+				this.exportingEnd( () => exportLog(err) );
+			});
+		}
 	} else if(message.areaTag) {
+		Object.assign(info, { type : 'EchoMail' } );
+
 		const areaConfig = Config.messageNetworks.ftn.areas[message.areaTag];
 		if(!this.isAreaConfigValid(areaConfig)) {
 			return;
 		}
-				
+
 		if(this.exportingStart()) {
-			this.exportMessagesToUplinks( [ message.uuid ], areaConfig, err => {
-				const info = { uuid : message.uuid, subject : message.subject };
-			
-				if(err) {
-					Log.warn(info, 'Failed exporting message');
-				} else {
-					Log.info(info, 'Message exported');
-				}
-				
-				this.exportingEnd();
+			this.exportEchoMailMessagesToUplinks( [ message.uuid ], areaConfig, err => {
+				this.exportingEnd( () => exportLog(err) );
 			});
-		}		
-	}		
+		}
+	}
 };
diff --git a/package.json b/package.json
index 566a454d..678628f1 100644
--- a/package.json
+++ b/package.json
@@ -27,32 +27,32 @@
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "^4.0.1",
+    "fs-extra": "^5.0.0",
+    "glob": "^7.1.2",
     "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
     "hjson": "^3.1.0",
     "iconv-lite": "^0.4.18",
-    "inquirer": "^3.2.3",
+    "inquirer": "^4.0.1",
     "later": "1.2.0",
     "lodash": "^4.17.4",
     "mime-types": "^2.1.17",
     "minimist": "1.2.x",
-    "moment": "^2.18.1",
-    "node-glob": "^1.2.0",
-    "nodemailer": "^4.1.0",
+    "moment": "^2.20.0",
+    "nodemailer": "^4.4.1",
     "ptyw.js": "NuSkooler/ptyw.js",
     "rlogin": "^1.0.0",
     "sane": "^2.2.0",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^3.1.9",
-    "sqlite3-trans" : "^1.2.0",
+    "sqlite3-trans": "^1.2.0",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",
     "uuid-parse": "^1.0.0",
-    "ws": "^3.1.0",
+    "ws": "^3.3.3",
     "xxhash": "^0.2.4",
-    "yazl" : "^2.4.2"
+    "yazl": "^2.4.2"
   },
   "devDependencies": {},
   "engines": {

From 11a19d899e99e4f46a1732b436a788000b11c13f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 31 Dec 2017 18:45:39 -0700
Subject: [PATCH 0089/1013] * Use per-network outbound for NetMail just like
 EchoMail * Use BSO style FLO file for NetMail * Some code cleanup

---
 core/config.js                  | 87 ++++++++++++++++-----------------
 core/scanner_tossers/ftn_bso.js | 25 ++++++++--
 2 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/core/config.js b/core/config.js
index 34be676e..f9f277a8 100644
--- a/core/config.js
+++ b/core/config.js
@@ -2,7 +2,6 @@
 'use strict';
 
 //	ENiGMA½
-const miscUtil			= require('./misc_util.js');
 
 //	deps
 const fs				= require('graceful-fs');
@@ -32,7 +31,7 @@ function hasMessageConferenceAndArea(config) {
 	_.forEach(nonInternalConfs, confTag => {
 		if(_.has(config.messageConferences[confTag], 'areas') &&
 			Object.keys(config.messageConferences[confTag].areas) > 0)
-		{            
+		{
 			result = true;
 			return false;   //  stop iteration
 		}
@@ -67,12 +66,12 @@ function init(configPath, options, cb) {
 					}
 
 					return callback(null, configJson);
-				});				
+				});
 			},
 			function mergeWithDefaultConfig(configJson, callback) {
 
 				const mergedConfig = _.mergeWith(
-					getDefaultConfig(), 
+					getDefaultConfig(),
 					configJson, (conf1, conf2) => {
 						//	Arrays should always concat
 						if(_.isArray(conf1)) {
@@ -147,15 +146,13 @@ function getDefaultConfig() {
 			webMax				: 255,
 
 			requireActivation	: false,	//	require SysOp activation? false = auto-activate
-			invalidUsernames	: [],
 
 			groups				: [ 'users', 'sysops' ],		//	built in groups
 			defaultGroups		: [ 'users' ],					//	default groups new users belong to
 
 			newUserNames		: [ 'new', 'apply' ],			//	Names reserved for applying
 
-			//	:TODO: Mystic uses TRASHCAN.DAT for this -- is there a reason to support something like that?
-			badUserNames		: [ 
+			badUserNames		: [
 				'sysop', 'admin', 'administrator', 'root', 'all',
 				'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
 			],
@@ -187,7 +184,7 @@ function getDefaultConfig() {
 
 		menus : {
 			cls		: true,	//	Clear screen before each menu by default?
-		},	
+		},
 
 		paths		: {
 			config				: paths.join(__dirname, './../config/'),
@@ -202,11 +199,11 @@ function getDefaultConfig() {
 			themes				: paths.join(__dirname, './../art/themes/'),
 			logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
 			db					: paths.join(__dirname, './../db/'),
-			modsDb				: paths.join(__dirname, './../db/mods/'),				
+			modsDb				: paths.join(__dirname, './../db/mods/'),
 			dropFiles			: paths.join(__dirname, './../dropfiles/'),	//	+ "/node<x>/
 			misc				: paths.join(__dirname, './../misc/'),
 		},
-		
+
 		loginServers : {
 			telnet : {
 				port			: 8888,
@@ -219,7 +216,7 @@ function getDefaultConfig() {
 
 				//
 				//	Private key in PEM format
-				//	
+				//
 				//	Generating your PK:
 				//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
 				//
@@ -248,7 +245,7 @@ function getDefaultConfig() {
 				resetPassword : {
 					//
 					//	The following templates have these variables available to them:
-					//	
+					//
 					//	* %BOARDNAME%		: Name of BBS
 					//	* %USERNAME%		: Username of whom to reset password
 					//	* %TOKEN%			: Reset token
@@ -263,10 +260,10 @@ function getDefaultConfig() {
 					//
 					resetPageTemplate	: paths.join(__dirname, './../www/reset_password.template.html'),
 				},
-								
+
 				http : {
 					enabled : false,
-					port	: 8080,	
+					port	: 8080,
 				},
 				https : {
 					enabled	: false,
@@ -283,10 +280,10 @@ function getDefaultConfig() {
 			},
 			Exiftool : {
 				cmd			: 'exiftool',
-				args		: [ 
+				args		: [
 					'-charset', 'utf8', '{filePath}',
 					//	exclude the following:
-					'--directory', '--filepermissions', '--exiftoolversion', '--filename', '--filesize', 
+					'--directory', '--filepermissions', '--exiftoolversion', '--filename', '--filesize',
 					'--filemodifydate', '--fileaccessdate', '--fileinodechangedate', '--createdate', '--modifydate',
 					'--metadatadate', '--xmptoolkit'
 				]
@@ -305,7 +302,7 @@ function getDefaultConfig() {
 			//
 			//
 			//	:TODO: text/x-ansi -> SAUCE extraction for .ans uploads
-			//	:TODO: textual : bool -- if text, we can view. 
+			//	:TODO: textual : bool -- if text, we can view.
 			//	:TODO: asText : { cmd, args[] } -> viewable text
 
 			//
@@ -388,7 +385,7 @@ function getDefaultConfig() {
 				sig				: '526172211a0700',
 				offset			: 0,
 				archiveHandler	: 'Rar',
-			},			
+			},
 			'application/gzip' : {
 				desc			: 'Gzip Archive',
 				sig				: '1f8b',
@@ -400,28 +397,28 @@ function getDefaultConfig() {
 				desc			: 'BZip2 Archive',
 				sig				: '425a68',
 				offset			: 0,
-				archiveHandler	: '7Zip',				
+				archiveHandler	: '7Zip',
 			},
 			'application/x-lzh-compressed' : {
 				desc			: 'LHArc Archive',
 				sig				: '2d6c68',
 				offset			: 2,
-				archiveHandler	: 'Lha',				
+				archiveHandler	: 'Lha',
 			},
 			'application/x-7z-compressed' : {
 				desc			: '7-Zip Archive',
 				sig				: '377abcaf271c',
 				offset			: 0,
-				archiveHandler	: '7Zip',					
+				archiveHandler	: '7Zip',
 			}
 
 			//	:TODO: update archives::formats to fall here
 			//	* archive handler -> archiveHandler (consider archive if archiveHandler present)
 			//	* sig, offset, ...
 			//	* mime-db -> exts lookup
-			//	* 
+			//	*
 		},
-	
+
 		archives : {
 			archivers : {
 				'7Zip' : {
@@ -514,7 +511,7 @@ function getDefaultConfig() {
 					list			: {
 						cmd			: 'tar',
 						args		: [ '-tvf', '{archivePath}' ],
-						entryMatch	: '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',						
+						entryMatch	: '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',
 					},
 					extract			: {
 						cmd			: 'tar',
@@ -523,7 +520,7 @@ function getDefaultConfig() {
 				}
 			},
 		},
-		
+
 		fileTransferProtocols : {
 			//
 			//	See http://www.synchro.net/docs/sexyz.txt for information on SEXYZ
@@ -539,7 +536,7 @@ function getDefaultConfig() {
 					recvCmd				: 'sexyz',
 					recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
 					recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
-				} 
+				}
 			},
 
 			xmodemSexyz : {
@@ -570,7 +567,7 @@ function getDefaultConfig() {
 				name		: 'ZModem 8k',
 				type		: 'external',
 				sort		: 2,
-				external	: {					
+				external	: {
 					sendCmd		: 'sz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
 					sendArgs	: [
 						//	:TODO: try -q
@@ -581,11 +578,11 @@ function getDefaultConfig() {
 						'--zmodem', '--binary', '--restricted', '--keep-uppercase', 	//	dumps to CWD which is set to {uploadDir}
 					],
 					//	:TODO: can we not just use --escape ?
-					escapeTelnet	: true,	//	set to true to escape Telnet codes such as IAC					
-				} 
+					escapeTelnet	: true,	//	set to true to escape Telnet codes such as IAC
+				}
 			}
 		},
-		
+
 		messageAreaDefaults : {
 			//
 			//	The following can be override per-area as well
@@ -594,11 +591,11 @@ function getDefaultConfig() {
 			maxAgeDays		: 0,	//	0 = unlimited
 		},
 
-		messageConferences : {		
+		messageConferences : {
 			system_internal : {
 				name 	: 'System Internal',
 				desc 	: 'Built in conference for private messages, bulletins, etc.',
-				
+
 				areas : {
 					private_mail : {
 						name	: 'Private Mail',
@@ -612,7 +609,7 @@ function getDefaultConfig() {
 				}
 			}
 		},
-		
+
 		scannerTossers : {
 			ftn_bso : {
 				paths : {
@@ -620,7 +617,7 @@ function getDefaultConfig() {
 					inbound			: paths.join(__dirname, './../mail/ftn_in/'),
 					secInbound		: paths.join(__dirname, './../mail/ftn_secin/'),
 					reject			: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
-					outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
+					//outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
 					//	set 'retain' to a valid path to keep good pkt files
 				},
 
@@ -644,7 +641,7 @@ function getDefaultConfig() {
 		},
 
 		fileBase: {
-			//	areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|: 
+			//	areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|:
 			areaStoragePrefix	: paths.join(__dirname, './../file_base/'),
 
 			maxDescFileByteSize			: 471859,	//	~1/4 MB
@@ -654,12 +651,12 @@ function getDefaultConfig() {
 				//	These are NOT case sensitive
 				//	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
 				//	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
-				desc		: [ 
+				desc		: [
 					'^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'
 				],
 
 				//	common README filename - https://en.wikipedia.org/wiki/README
-				descLong		: [ 
+				descLong		: [
 					'^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'
 				],
 			},
@@ -675,7 +672,7 @@ function getDefaultConfig() {
 				'\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',			//	mm-dd-yy, mm/dd/yy, ...
 				//'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
 				//"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
-				'\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',				
+				'\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',
 				'\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',	//	November 29th, 1997
 				'\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
 				'\\b((?:19|20)[0-9]{2})\\b',	//	simple 19xx or 20xx with word boundaries
@@ -692,7 +689,7 @@ function getDefaultConfig() {
 			//
 			//	File area storage location tag/value pairs.
 			//	Non-absolute paths are relative to |areaStoragePrefix|.
-			// 
+			//
 			storageTags : {
 				sys_msg_attach		: 'sys_msg_attach',
 				sys_temp_download	: 'sys_temp_download',
@@ -712,20 +709,20 @@ function getDefaultConfig() {
 				}
 			}
 		},
-		
+
 		eventScheduler : {
-			
+
 			events : {
 				trimMessageAreas : {
 					//	may optionally use [or ]@watch:/path/to/file
 					schedule	: 'every 24 hours',
-					
+
 					//	action:
 					//	- @method:path/to/module.js:theMethodName
 					//	  (path is relative to engima base dir)
 					//
-					//	- @execute:/path/to/something/executable.sh 
-					//	
+					//	- @execute:/path/to/something/executable.sh
+					//
 					action		: '@method:core/message_area.js:trimMessageAreasScheduledEvent',
 				},
 
@@ -739,7 +736,7 @@ function getDefaultConfig() {
 					action		: '@method:core/web_password_reset.js:performMaintenanceTask',
 					args		: [ '24 hours' ]	//	items older than this will be removed
 				}
-			}	
+			}
 		},
 
 		misc : {
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 996dd3ef..ac6ead52 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -893,6 +893,8 @@ function FTNMessageScanTossModule() {
 							exportOpts.fileCase		= config.fileCase || 'lower';
 							exportOpts.network		= Config.messageNetworks.ftn.networks[networkName];
 							exportOpts.networkName	= networkName;
+							exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
+							exportOpts.exportType	= self.getExportType(config);
 
 							if(!exportOpts.network) {
 								return callback(Errors.DoesNotExist(`No configuration found for network ${networkName}`));
@@ -902,20 +904,33 @@ function FTNMessageScanTossModule() {
 						});
 					},
 					function createOutgoingDir(callback) {
-						//	ensure outgoing NetMail directory exists
-						return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
+						//	ensure outgoing NetMail directory exists						
+						return fse.mkdirs(exportOpts.outgoingDir, callback);
+						//return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
 					},
 					function exportPacket(callback) {
 						return self.exportNetMailMessagePacket(message, exportOpts, callback);
 					},
 					function moveToOutgoing(callback) {
 						const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
-						const newPath = paths.join(
-							Config.scannerTossers.ftn_bso.paths.outboundNetMail,
+						exportOpts.exportedToPath = paths.join(
+							exportOpts.outgoingDir,
+							//Config.scannerTossers.ftn_bso.paths.outboundNetMail,
 							`${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
 						);
 
-						return fse.move(exportOpts.pktFileName, newPath, callback);
+						return fse.move(exportOpts.pktFileName, exportOpts.exportedToPath, callback);
+					},
+					function prepareFloFile(callback) {
+						const flowFilePath = self.getOutgoingFlowFileName(
+							exportOpts.outgoingDir,
+							exportOpts.destAddress,
+							'ref',
+							exportOpts.exportType,
+							exportOpts.fileCase
+						);
+
+						return self.flowFileAppendRefs(flowFilePath, [ exportOpts.exportedToPath ], '^', callback);
 					},
 					function storeStateFlags0Meta(callback) {
 						return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);

From 6d929237d22e7e9d90bc1bf7f202400d6bba746f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jan 2018 13:32:55 -0700
Subject: [PATCH 0090/1013] * Handle import of NetMail messages * Add NetMail
 aliases support (name -> localname lookup, e.g. "root" -> "NuSkooler" * Minor
 code changes / cleanup

---
 core/fse.js                     |   6 +-
 core/message_area.js            |   4 +-
 core/scanner_tossers/ftn_bso.js | 155 ++++++++++++++++++++------------
 3 files changed, 102 insertions(+), 63 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index 2ccc6951..d3262433 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -264,12 +264,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	isEditMode() {
 		return 'edit' === this.editorMode;
 	}
-	
+
 	isViewMode() {
 		return 'view' === this.editorMode;
 	}
 
-	isLocalEmail() {
+	isPrivateMail() {
 		return Message.WellKnownAreaTags.Private === this.messageAreaTag;
 	}
 
@@ -411,7 +411,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					return callback(null);
 				},
 				function populateLocalUserInfo(callback) {
-					if(self.isLocalEmail()) {
+					if(self.isPrivateMail()) {
 						self.message.setLocalFromUserId(self.client.user.userId);
 						
 						if(self.toUserId > 0) {
diff --git a/core/message_area.js b/core/message_area.js
index 484d22ec..aa893073 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -347,13 +347,13 @@ function getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, what)
 		'COUNT() AS count' : 
 		'message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count';
 
-	let sql = 
+	let sql =
 		`SELECT ${selectWhat}
 		FROM message
 		WHERE area_tag = "${areaTag}" AND message_id > ${lastMessageId}`;
 
 	if(Message.isPrivateAreaTag(areaTag)) {
-		sql += 
+		sql +=
 			` AND message_id in (
 				SELECT message_id 
 				FROM message_meta 
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index ac6ead52..354755fd 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -20,6 +20,7 @@ const getDescFromFileName				= require('../file_base_area.js').getDescFromFileNa
 const copyFileWithCollisionHandling		= require('../file_util.js').copyFileWithCollisionHandling;
 const getAreaStorageDirectoryByTag		= require('../file_base_area.js').getAreaStorageDirectoryByTag;
 const isValidStorageTag					= require('../file_base_area.js').isValidStorageTag;
+const User								= require('../user.js');
 
 //	deps
 const moment				= require('moment');
@@ -310,22 +311,17 @@ function FTNMessageScanTossModule() {
 		message.meta.FtnProperty = message.meta.FtnProperty || {};
 		message.meta.FtnKludge = message.meta.FtnKludge || {};
 
-		//	:TODO: Only set DEST information for EchoMail - NetMail should already have it in message
 		message.meta.FtnProperty.ftn_orig_node		= options.network.localAddress.node;
-		//message.meta.FtnProperty.ftn_dest_node		= options.destAddress.node;
 		message.meta.FtnProperty.ftn_orig_network	= options.network.localAddress.net;
-		//message.meta.FtnProperty.ftn_dest_network	= options.destAddress.net;
 		message.meta.FtnProperty.ftn_cost			= 0;
 
 		//	tear line and origin can both go in EchoMail & NetMail
 		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
 		message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(options.network.localAddress);
 
-		//	:TODO: Need an explicit isNetMail() check or more generally
-		let ftnAttribute =
-			ftnMailPacket.Packet.Attribute.Local;	//	message from our system
+		let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
 
-		if(message.isPrivate()) {
+		if(self.isNetMailMessage(message)) {
 			//	These should be set for Private/NetMail already
 			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_node)));
 			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_network)));
@@ -438,7 +434,6 @@ function FTNMessageScanTossModule() {
 
 		options.encoding = encoding;	//	save for later
 		message.meta.FtnKludge.CHRS = ftnUtil.getCharacterSetIdentifierByEncoding(encoding);
-		//	:TODO: FLAGS kludge?
 	};
 
 	this.setReplyKludgeFromReplyToMsgId = function(message, cb) {
@@ -565,7 +560,6 @@ function FTNMessageScanTossModule() {
 		async.series(
 			[
 				function generalPrep(callback) {
-					//	:TODO: Double check Via spec -- seems like it may be wrong
 					self.prepareMessage(message, exportOpts);
 
 					return self.setReplyKludgeFromReplyToMsgId(message, callback);
@@ -886,8 +880,6 @@ function FTNMessageScanTossModule() {
 								return callback(err);
 							}
 
-
-
 							exportOpts.nodeConfig	= config;
 							exportOpts.destAddress	= routeAddress;
 							exportOpts.fileCase		= config.fileCase || 'lower';
@@ -904,9 +896,8 @@ function FTNMessageScanTossModule() {
 						});
 					},
 					function createOutgoingDir(callback) {
-						//	ensure outgoing NetMail directory exists						
+						//	ensure outgoing NetMail directory exists
 						return fse.mkdirs(exportOpts.outgoingDir, callback);
-						//return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
 					},
 					function exportPacket(callback) {
 						return self.exportNetMailMessagePacket(message, exportOpts, callback);
@@ -915,7 +906,6 @@ function FTNMessageScanTossModule() {
 						const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
 						exportOpts.exportedToPath = paths.join(
 							exportOpts.outgoingDir,
-							//Config.scannerTossers.ftn_bso.paths.outboundNetMail,
 							`${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
 						);
 
@@ -1107,14 +1097,29 @@ function FTNMessageScanTossModule() {
 		});
 	};
 
-	this.importEchoMailToArea = function(localAreaTag, header, message, cb) {
+	this.getLocalUserNameFromAlias = function(lookup) {
+		lookup = lookup.toLowerCase();
+
+		const aliases = _.get(Config, 'messageNetworks.ftn.netMail.aliases');
+		if(!aliases) {
+			return lookup;	//	keep orig
+		}
+
+		const alias = _.find(aliases, (localName, alias) => {
+			return alias.toLowerCase() === lookup;
+		});
+
+		return alias || lookup;
+	};
+
+	this.importMailToArea = function(config, header, message, cb) {
 		async.series(
 			[
 				function validateDestinationAddress(callback) {
 					const localNetworkPattern = `${message.meta.FtnProperty.ftn_dest_network}/${message.meta.FtnProperty.ftn_dest_node}`;
 					const localNetworkName = self.getNetworkNameByAddressPattern(localNetworkPattern);
 
-					callback(_.isString(localNetworkName) ? null : new Error('Packet destination is not us'));
+					return callback(_.isString(localNetworkName) ? null : new Error('Packet destination is not us'));
 				},
 				function checkForDupeMSGID(callback) {
 					//
@@ -1135,23 +1140,49 @@ function FTNMessageScanTossModule() {
 					});
 				},
 				function basicSetup(callback) {
-					message.areaTag = localAreaTag;
+					message.areaTag = config.localAreaTag;
 
 					//
 					//	If we *allow* dupes (disabled by default), then just generate
 					//	a random UUID. Otherwise, don't assign the UUID just yet. It will be
 					//	generated at persist() time and should be consistent across import/exports
 					//
-					if(Config.messageNetworks.ftn.areas[localAreaTag].allowDupes) {
+					if(true === _.get(Config, [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
 						//	just generate a UUID & therefor always allow for dupes
 						message.uuid = uuidV4();
 					}
 
-					callback(null);
+					return callback(null);
 				},
 				function setReplyToMessageId(callback) {
 					self.setReplyToMsgIdFtnReplyKludge(message, () => {
-						callback(null);
+						return callback(null);
+					});
+				},
+				function setupPrivateMessage(callback) {
+					//
+					//	If this is a private message (e.g. NetMail) we set the local user ID
+					//
+					if(Message.WellKnownAreaTags.Private !== config.localAreaTag) {
+						return callback(null);
+					}
+
+					const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
+
+					//	:TODO: take into account aliasing, e.g. "root" -> SysOp
+					User.getUserIdAndName(lookupName, (err, localToUserId, localUserName) => {
+						if(err) {
+							return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
+						}
+
+						//	we do this after such that error cases can be preseved above
+						if(lookupName !== message.toUserName) {
+							message.toUserName = localUserName;
+						}
+
+						//	set the meta information - used elsehwere for retrieval
+						message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
+						return callback(null);
 					});
 				},
 				function persistImport(callback) {
@@ -1160,7 +1191,7 @@ function FTNMessageScanTossModule() {
 
 					//	save to disc
 					message.persist(err => {
-						callback(err);
+						return callback(err);
 					});
 				}
 			],
@@ -1214,45 +1245,15 @@ function FTNMessageScanTossModule() {
 				const message = entryData;
 				const areaTag = message.meta.FtnProperty.ftn_area;
 
+				let localAreaTag;
 				if(areaTag) {
-					//
-					//	EchoMail
-					//
-					const localAreaTag = self.getLocalAreaTagByFtnAreaTag(areaTag);
-					if(localAreaTag) {
-						message.uuid = Message.createMessageUUID(
-							localAreaTag,
-							message.modTimestamp,
-							message.subject,
-							message.message);
+					localAreaTag = self.getLocalAreaTagByFtnAreaTag(areaTag);
 
-						self.appendTearAndOrigin(message);
-
-						self.importEchoMailToArea(localAreaTag, packetHeader, message, err => {
-							if(err) {
-								//	bump area fail stats
-								importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
-
-								if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
-									const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
-									Log.info(
-										{ area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
-										'Not importing non-unique message');
-
-									return next(null);
-								}
-							} else {
-								//	bump area success
-								importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
-							}
-
-							return next(err);
-						});
-					} else {
+					if(!localAreaTag) {
 						//
 						//	No local area configured for this import
 						//
-						//	:TODO: Handle the "catch all" case, if configured
+						//	:TODO: Handle the "catch all" area bucket case if configured
 						Log.warn( { areaTag : areaTag }, 'No local area configured for this packet file!');
 
 						//	bump generic failure
@@ -1262,11 +1263,49 @@ function FTNMessageScanTossModule() {
 					}
 				} else {
 					//
-					//	NetMail
+					//	No area tag: If marked private in attributes, this is a NetMail
 					//
-					Log.warn('NetMail import not yet implemented!');
-					return next(null);
+					if(message.meta.FtnProperty.ftn_attr_flags & ftnMailPacket.Packet.Attribute.Private) {
+						localAreaTag = Message.WellKnownAreaTags.Private;
+					} else {
+						Log.warn('Non-private message without area tag');
+						importStats.otherFail += 1;
+						return next(null);
+					}
 				}
+
+				message.uuid = Message.createMessageUUID(
+					localAreaTag,
+					message.modTimestamp,
+					message.subject,
+					message.message);
+
+				self.appendTearAndOrigin(message);
+
+				const importConfig = {
+					localAreaTag	: localAreaTag,
+				};
+
+				self.importMailToArea(importConfig, packetHeader, message, err => {
+					if(err) {
+						//	bump area fail stats
+						importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
+
+						if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
+							const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
+							Log.info(
+								{ area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
+								'Not importing non-unique message');
+
+							return next(null);
+						}
+					} else {
+						//	bump area success
+						importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
+					}
+
+					return next(err);
+				});
 			}
 		}, err => {
 			//

From bbd70f2fea294f4de9102a86794c2e5e6a60e2a4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jan 2018 15:13:56 -0700
Subject: [PATCH 0091/1013] Minor log changes

---
 core/oputil/oputil_message_base.js | 10 ++++------
 core/scanner_tossers/ftn_bso.js    |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 77a63e9f..ac1d42fc 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -109,13 +109,11 @@ function areaFix() {
 				return callback(null, message);
 			},
 			function persistMessage(message, callback) {
-				//
-				//	:TODO:
-				//	- Persist message in private outgoing (sysop out box)
-				//	- Make necessary changes such that the message is exported properly
-				//
-				console.log(message);
+				//	:TODO: Persist message in private outgoing (sysop out box) (TBD: implementation)
 				message.persist(err => {
+					if(!err) {
+						console.log('AreaFix message persisted and will be exported as per configuration');
+					}
 					return callback(err);
 				});
 			}
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 354755fd..e8124f1a 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -2051,11 +2051,11 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 
 	let self = this;
 
-	function tryImportNow(reasonDesc) {
+	function tryImportNow(reasonDesc, extraInfo) {
 		if(!importing) {
 			importing = true;
 
-			Log.info( { module : exports.moduleInfo.name }, reasonDesc);
+			Log.info( Object.assign({ module : exports.moduleInfo.name }, extraInfo), reasonDesc);
 
 			self.performImport( () => {
 				importing = false;
@@ -2129,7 +2129,7 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 						watcher.on(event, (fileName, fileRoot) => {
 							const eventPath = paths.join(fileRoot, fileName);
 							if(paths.join(fileRoot, fileName) === importSchedule.watchFile) {
-								tryImportNow(`Performing import/toss due to @watch: ${eventPath} (${event})`);
+								tryImportNow('Performing import/toss due to @watch', { eventPath, event } );
 							}
 						});
 					});
@@ -2140,7 +2140,7 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
 					//
 					fse.exists(importSchedule.watchFile, exists => {
 						if(exists) {
-							tryImportNow(`Performing import/toss due to @watch: ${importSchedule.watchFile} (initial exists)`);
+							tryImportNow('Performing import/toss due to @watch', { eventPath : importSchedule.watchFile, event : 'initial exists' } );
 						}
 					});
 				}

From e7109b0f0c61f9f09915f2cb7f3b728342127ab8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jan 2018 17:50:27 -0700
Subject: [PATCH 0092/1013] Minor fix

---
 core/scanner_tossers/ftn_bso.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index e8124f1a..35cf6316 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1959,7 +1959,7 @@ function FTNMessageScanTossModule() {
 	this.isNetMailMessage = function(message) {
 		return message.isPrivate() &&
 			null === _.get(message.meta, 'System.LocalToUserID', null) &&
-			null !== _.get(message.meta, 'FtnProperty.ftn_dest_network')
+			null !== _.get(message.meta, 'FtnProperty.ftn_dest_network', null)
 			;
 	};
 }

From 84a1f70fc26ecd1be1275971a82773250f23638e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jan 2018 18:10:38 -0700
Subject: [PATCH 0093/1013] * Add some user lookup functionality * Fix INTL
 to/from order * Remove VIA kludge when initially creating a NetMail message

---
 core/scanner_tossers/ftn_bso.js |  8 ++++---
 core/user.js                    | 38 ++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 35cf6316..a72c45ff 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -332,17 +332,20 @@ function FTNMessageScanTossModule() {
 			//	NetMail messages need a FRL-1005.001 "Via" line
 			//	http://ftsc.org/docs/frl-1005.001
 			//
+			//	:TODO: 	We need to do this when FORWARDING NetMail
+			/*
 			if(_.isString(message.meta.FtnKludge.Via)) {
 				message.meta.FtnKludge.Via = [ message.meta.FtnKludge.Via ];
 			}
 			message.meta.FtnKludge.Via = message.meta.FtnKludge.Via || [];
 			message.meta.FtnKludge.Via.push(ftnUtil.getVia(options.network.localAddress));
+			*/
 
 			//
 			//	We need to set INTL, and possibly FMPT and/or TOPT
 			//	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
 			//
-			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.network.localAddress, options.destAddress);
+			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, options.network.localAddress);
 
 			if(_.isNumber(options.network.localAddress.point) && options.network.localAddress.point > 0) {
 				message.meta.FtnKludge.FMPT = options.network.localAddress.point;
@@ -1169,8 +1172,7 @@ function FTNMessageScanTossModule() {
 
 					const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
 
-					//	:TODO: take into account aliasing, e.g. "root" -> SysOp
-					User.getUserIdAndName(lookupName, (err, localToUserId, localUserName) => {
+					User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
 						if(err) {
 							return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
 						}
diff --git a/core/user.js b/core/user.js
index fb125f6b..db9245f5 100644
--- a/core/user.js
+++ b/core/user.js
@@ -414,12 +414,48 @@ module.exports = class User {
 				if(row) {
 					return cb(null, row.id, row.user_name);
 				}
-				
+
 				return cb(Errors.DoesNotExist('No matching username'));
 			}
 		);
 	}
 
+	static getUserIdAndNameByRealName(realName, cb) {
+		userDb.get(
+			`SELECT id, user_name
+			FROM user
+			WHERE id = (
+				SELECT user_id
+				FROM user_property
+				WHERE prop_name='real_name' AND prop_value=?
+			);`,
+			[ realName ],
+			(err, row) => {
+				if(err) {
+					return cb(err);
+				}
+
+				if(row) {
+					return cb(null, row.id, row.user_name);
+				}
+
+				return cb(Errors.DoesNotExist('No matching real name'));
+			}
+		);
+	}
+
+	static getUserIdAndNameByLookup(lookup, cb) {
+		User.getUserIdAndName(lookup, (err, userId, userName) => {
+			if(err) {
+				User.getUserIdAndNameByRealName(lookup, (err, userId, userName) => {
+					return cb(err, userId, userName);
+				});
+			} else {
+				return cb(null, userId, userName);
+			}
+		});
+	}
+
 	static getUserName(userId, cb) {
 		userDb.get(
 			`SELECT user_name

From b97f96ce184434eac0e9d1c139a641cef7ee2336 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jan 2018 18:43:05 -0700
Subject: [PATCH 0094/1013] * Fix Via parsing * Use LIKE for real name lookup

---
 core/ftn_mail_packet.js | 12 +++++++-----
 core/user.js            |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 137a2583..c94eb425 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -397,10 +397,10 @@ function Packet(options) {
 			//	We have to special case INTL/TOPT/FMPT as they don't contain
 			//	a ':' name/value separator like the rest of the kludge lines... because stupdity.
 			//
-			let key = line.substr(0, 4);
+			let key = line.substr(0, 4).trim();
 			let value;
-			if( ['INTL', 'TOPT', 'FMPT' ].includes(key)) {
-				value = line.substr(4).trim();
+			if( ['INTL', 'TOPT', 'FMPT', 'Via' ].includes(key)) {
+				value = line.substr(key.length).trim();
 			} else {
 				const sepIndex = line.indexOf(':');
 				key		= line.substr(0, sepIndex).toUpperCase();
@@ -709,13 +709,14 @@ function Packet(options) {
 							case 'PATH' :
 								break;	//	skip & save for last
 
+							case 'Via' :
 							case 'FMPT' :
 							case 'TOPT' :
-							case 'INTL' : 
+							case 'INTL' :
 								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');	// no sepChar
 								break;
 
-							default		: 
+							default		:
 								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]); 
 								break;
 						}
@@ -856,6 +857,7 @@ function Packet(options) {
 			switch(k) {
 				case 'PATH' : break;	//	skip & save for last
 
+				case 'Via' :
 				case 'FMPT' :
 				case 'TOPT' :
 				case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break;	//	no sepChar
diff --git a/core/user.js b/core/user.js
index db9245f5..09d26163 100644
--- a/core/user.js
+++ b/core/user.js
@@ -427,7 +427,7 @@ module.exports = class User {
 			WHERE id = (
 				SELECT user_id
 				FROM user_property
-				WHERE prop_name='real_name' AND prop_value=?
+				WHERE prop_name='real_name' AND prop_value LIKE ?
 			);`,
 			[ realName ],
 			(err, row) => {

From f967ce1ce683082994c0e47be321a5183a51f1bd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 5 Jan 2018 22:02:36 -0700
Subject: [PATCH 0095/1013] * Fix String vs Address when creating (NetMail)
 packets causing orig address info to not be recorded correctly

---
 core/ftn_mail_packet.js         | 44 ++++++++++++++++++++++-----------
 core/ftn_util.js                |  2 +-
 core/scanner_tossers/ftn_bso.js | 21 ++++++++--------
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index c94eb425..d84b4a69 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -19,15 +19,6 @@ const moment		= require('moment');
 
 exports.Packet			= Packet;
 
-/*
-	:TODO: things
-	* Test SAUCE ignore/extraction
-	* FSP-1010 for netmail (see SBBS)
-	* Syncronet apparently uses odd origin lines
-	* Origin lines starting with "#" instead of "*" ?
-
-*/
-
 const FTN_PACKET_HEADER_SIZE	= 58;	//	fixed header size
 const FTN_PACKET_HEADER_TYPE	= 2;
 const FTN_PACKET_MESSAGE_TYPE	= 2;
@@ -63,7 +54,7 @@ class PacketHeader {
 
 		this.capWord			= 0x0001;
 		this.capWordValidate	= ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);	//	swap
-		
+
 		this.prodCodeHi			= 0xfe;	//	see above
 		this.prodRevHi			= 0;		
 	}
@@ -358,9 +349,9 @@ function Packet(options) {
 		buffer.writeUInt16LE(packetHeader.origPoint, 50);
 		buffer.writeUInt16LE(packetHeader.destPoint, 52);
 		buffer.writeUInt32LE(packetHeader.prodData, 54);
-		
+
 		ws.write(buffer);
-		
+
 		return buffer.length;
 	};
 
@@ -646,9 +637,29 @@ function Packet(options) {
 				});			
 			});
 	};
-		
+
+	this.sanatizeFtnProperties = function(message) {
+		[
+			Message.FtnPropertyNames.FtnOrigNode,
+			Message.FtnPropertyNames.FtnDestNode,
+			Message.FtnPropertyNames.FtnOrigNetwork,
+			Message.FtnPropertyNames.FtnDestNetwork,
+			Message.FtnPropertyNames.FtnAttrFlags,
+			Message.FtnPropertyNames.FtnCost,
+			Message.FtnPropertyNames.FtnOrigZone,
+			Message.FtnPropertyNames.FtnDestZone,
+			Message.FtnPropertyNames.FtnOrigPoint,
+			Message.FtnPropertyNames.FtnDestPoint,
+			Message.FtnPropertyNames.FtnAttribute,
+		].forEach( propName => {
+			if(message.meta.FtnProperty[propName]) {
+				message.meta.FtnProperty[propName] = parseInt(message.meta.FtnProperty[propName]) || 0;
+			}
+		});
+	};
+
 	this.getMessageEntryBuffer = function(message, options, cb) {
-		
+
 		function getAppendMeta(k, m, sepChar=':') {
 			let append = '';
 			if(m) {
@@ -667,7 +678,10 @@ function Packet(options) {
 			[
 				function prepareHeaderAndKludges(callback) {
 					const basicHeader = new Buffer(34);
-		
+
+					//	ensure address FtnProperties are numbers
+					self.sanatizeFtnProperties(message);
+
 					basicHeader.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
 					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
 					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_node, 4);
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 68ddf343..a02d8e1c 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -189,7 +189,7 @@ function getQuotePrefix(name) {
 //
 function getOrigin(address) {
 	const origin = _.has(Config, 'messageNetworks.originLine') ? 
-		Config.messageNetworks.originLine : 
+		Config.messageNetworks.originLine :
 		Config.general.boardName;
 
 	const addrStr = new Address(address).toString('5D');
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index a72c45ff..f6072ff3 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -308,16 +308,18 @@ function FTNMessageScanTossModule() {
 		//
 		//	Set various FTN kludges/etc.
 		//
+		const localAddress = new Address(options.network.localAddress);	//	ensure we have an Address obj not a string version
+
 		message.meta.FtnProperty = message.meta.FtnProperty || {};
 		message.meta.FtnKludge = message.meta.FtnKludge || {};
 
-		message.meta.FtnProperty.ftn_orig_node		= options.network.localAddress.node;
-		message.meta.FtnProperty.ftn_orig_network	= options.network.localAddress.net;
+		message.meta.FtnProperty.ftn_orig_node		= localAddress.node;
+		message.meta.FtnProperty.ftn_orig_network	= localAddress.net;
 		message.meta.FtnProperty.ftn_cost			= 0;
 
 		//	tear line and origin can both go in EchoMail & NetMail
 		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
-		message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(options.network.localAddress);
+		message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(localAddress);
 
 		let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
 
@@ -345,10 +347,10 @@ function FTNMessageScanTossModule() {
 			//	We need to set INTL, and possibly FMPT and/or TOPT
 			//	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
 			//
-			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, options.network.localAddress);
+			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, localAddress);
 
-			if(_.isNumber(options.network.localAddress.point) && options.network.localAddress.point > 0) {
-				message.meta.FtnKludge.FMPT = options.network.localAddress.point;
+			if(_.isNumber(localAddress.point) && localAddress.point > 0) {
+				message.meta.FtnKludge.FMPT = localAddress.point;
 			}
 
 			if(_.get(message, 'meta.FtnProperty.ftn_dest_point', 0) > 0) {
@@ -378,15 +380,14 @@ function FTNMessageScanTossModule() {
 			//	with remote address(s) we are exporting to.
 			//
 			const seenByAdditions =
-				[ `${options.network.localAddress.net}/${options.network.localAddress.node}` ].concat(Config.messageNetworks.ftn.areas[message.areaTag].uplinks);
+				[ `${localAddress.net}/${localAddress.node}` ].concat(Config.messageNetworks.ftn.areas[message.areaTag].uplinks);
 			message.meta.FtnProperty.ftn_seen_by =
 				ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
 
 			//
 			//	And create/update PATH for ourself
 			//
-			message.meta.FtnKludge.PATH =
-				ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, options.network.localAddress);
+			message.meta.FtnKludge.PATH = ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, localAddress);
 		}
 
 		message.meta.FtnProperty.ftn_attr_flags = ftnAttribute;
@@ -398,7 +399,7 @@ function FTNMessageScanTossModule() {
 		//	export that failed to finish
 		//
 		if(!message.meta.FtnKludge.MSGID) {
-			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(message, options.network.localAddress);
+			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(message, localAddress);
 		}
 
 		message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();

From ab12fb5d79c8356823ea46396127ea75abf9ee6b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 5 Jan 2018 22:03:33 -0700
Subject: [PATCH 0096/1013] Lookup username and real name in various scenarios

---
 core/fse.js                        |  4 ++--
 core/message.js                    |  2 +-
 core/oputil/oputil_message_base.js |  2 +-
 core/system_view_validate.js       | 32 +++++++++++++++++++++---------
 main.js                            |  2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index d3262433..4a6c8eb1 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -413,13 +413,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				function populateLocalUserInfo(callback) {
 					if(self.isPrivateMail()) {
 						self.message.setLocalFromUserId(self.client.user.userId);
-						
+
 						if(self.toUserId > 0) {
 							self.message.setLocalToUserId(self.toUserId);
 							callback(null);
 						} else {
 							//	we need to look it up
-							User.getUserIdAndName(self.message.toUserName, function userInfo(err, toUserId) {
+							User.getUserIdAndNameByLookup(self.message.toUserName, function userInfo(err, toUserId) {
 								if(err) {
 									callback(err);
 								} else {
diff --git a/core/message.js b/core/message.js
index b5b1e541..7fb57d20 100644
--- a/core/message.js
+++ b/core/message.js
@@ -112,7 +112,7 @@ Message.FtnPropertyNames = {
 	FtnDestZone			: 'ftn_dest_zone',
 	FtnOrigPoint		: 'ftn_orig_point',
 	FtnDestPoint		: 'ftn_dest_point',
-		
+
 	FtnAttribute		: 'ftn_attribute',
 
 	FtnTearLine			: 'ftn_tear_line',		//	http://ftsc.org/docs/fts-0004.001
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index ac1d42fc..04d26435 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -55,7 +55,7 @@ function areaFix() {
 				const User = require('../user.js');
 
 				if(argv.from) {
-					User.getUserIdAndName(argv.from, (err, userId, fromName) => {
+					User.getUserIdAndNameByLookup(argv.from, (err, userId, fromName) => {
 						if(err) {
 							return callback(null, ftnAddr, argv.from, 0);
 						}
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 63c7b2bc..07bbcab2 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -9,13 +9,14 @@ const Log		= require('./logger.js').log;
 //	deps
 const fs		= require('graceful-fs');
 
-exports.validateNonEmpty		= validateNonEmpty;
-exports.validateMessageSubject	= validateMessageSubject;
-exports.validateUserNameAvail 	= validateUserNameAvail;
-exports.validateUserNameExists	= validateUserNameExists;
-exports.validateEmailAvail		= validateEmailAvail;
-exports.validateBirthdate		= validateBirthdate;
-exports.validatePasswordSpec	= validatePasswordSpec;
+exports.validateNonEmpty					= validateNonEmpty;
+exports.validateMessageSubject				= validateMessageSubject;
+exports.validateUserNameAvail 				= validateUserNameAvail;
+exports.validateUserNameExists				= validateUserNameExists;
+exports.validateUserNameOrRealNameExists	= validateUserNameOrRealNameExists;
+exports.validateEmailAvail					= validateEmailAvail;
+exports.validateBirthdate					= validateBirthdate;
+exports.validatePasswordSpec				= validatePasswordSpec;
 
 function validateNonEmpty(data, cb) {
 	return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
@@ -42,11 +43,12 @@ function validateUserNameAvail(data, cb) {
 		} else if(/^[0-9]+$/.test(data)) {
 			return cb(new Error('Username cannot be a number'));
 		} else {
-			User.getUserIdAndName(data, function userIdAndName(err) {
+			//	a new user name cannot be an existing user name or an existing real name
+			User.getUserIdAndNameByLookup(data, function userIdAndName(err) {
 				if(!err) {	//	err is null if we succeeded -- meaning this user exists already
 					return cb(new Error('Username unavailable'));
 				}
-				
+
 				return cb(null);
 			});
 		}
@@ -65,6 +67,18 @@ function validateUserNameExists(data, cb) {
 	});
 }
 
+function validateUserNameOrRealNameExists(data, cb) {
+	const invalidUserNameError = new Error('Invalid username');
+
+	if(0 === data.length) {
+		return cb(invalidUserNameError);
+	}
+
+	User.getUserIdAndNameByLookup(data, err => {
+		return cb(err ? invalidUserNameError : null);
+	});
+}
+
 function validateEmailAvail(data, cb) {
 	//
 	//	This particular method allows empty data - e.g. no email entered
diff --git a/main.js b/main.js
index 0bc7bee9..53a320f6 100755
--- a/main.js
+++ b/main.js
@@ -7,6 +7,6 @@
 	ENiGMA½ entry point
 
 	If this file does not run directly, ensure it's executable:
-	> chmod u+x main.js	
+	> chmod u+x main.js
 */
 require('./core/bbs.js').main();
\ No newline at end of file

From 99244aa2e4e7946b0cab6344493449c0d322273c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 6 Jan 2018 13:24:35 -0700
Subject: [PATCH 0097/1013] * Use Zone:Net/* for lookup before defualt local
 address when setting 'from' for NetMail

---
 core/oputil/oputil_message_base.js |  2 +-
 core/scanner_tossers/ftn_bso.js    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 04d26435..1312f2a4 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -112,7 +112,7 @@ function areaFix() {
 				//	:TODO: Persist message in private outgoing (sysop out box) (TBD: implementation)
 				message.persist(err => {
 					if(!err) {
-						console.log('AreaFix message persisted and will be exported as per configuration');
+						console.log('AreaFix message persisted and will be exported at next scheduled scan');
 					}
 					return callback(err);
 				});
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index f6072ff3..123c0b7a 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -822,8 +822,9 @@ function FTNMessageScanTossModule() {
 		//		- Where we send may not be where dstAddress is (it's routed!); use network found in route
 		//		  for local address
 		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send is direct to dstAddr; use scannerTossers.ftn_bso.defaultNetwork to
-		//		  for local address
+		//		- Where we send is direct to dstAddr;
+		//		- Attempt to match address in messageNetworks.ftn.networks{}, else
+		//		  use scannerTossers.ftn_bso.defaultNetwork to for local address
 		//	3) Nodelist DB lookup (use default config)
 		//		- Where we send is direct to dstAddr
 		//
@@ -836,8 +837,12 @@ function FTNMessageScanTossModule() {
 			routeAddress	= Address.fromString(route.address);
 			networkName		= route.network || Config.scannerTossers.ftn_bso.defaultNetwork;
 		} else {
-			routeAddress	= dstAddr;
-			networkName		= Config.scannerTossers.ftn_bso.defaultNetwork;
+			routeAddress = dstAddr;
+
+			networkName	= this.getNetworkNameByAddressPattern(`${dstAddr.zone}:${dstAddr.net}/*`);
+			if(!networkName) {
+				networkName		= Config.scannerTossers.ftn_bso.defaultNetwork;
+			}
 		}
 
 		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {

From c4c30e0c0d5b3acb7d57fae2a4b0d596413d8495 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Jan 2018 18:43:04 -0700
Subject: [PATCH 0098/1013] Add some logging

---
 core/file_area_web.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/file_area_web.js b/core/file_area_web.js
index a8d095d6..6440eb58 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -284,6 +284,8 @@ class FileAreaWebAccess {
 	routeWebRequest(req, resp) {
 		const hashId = paths.basename(req.url);
 
+		Log.debug( { hashId : hashId, url : req.url }, 'File area web request');
+
 		this.loadServedHashId(hashId, (err, servedItem) => {
 
 			if(err) {
@@ -305,6 +307,8 @@ class FileAreaWebAccess {
 	}
 
 	routeWebRequestForSingleFile(servedItem, req, resp) {
+		Log.debug( { servedItem : servedItem }, 'Single file web request');
+
 		const fileEntry = new FileEntry();
 
 		servedItem.fileId = servedItem.fileIds[0];
@@ -348,6 +352,8 @@ class FileAreaWebAccess {
 	}
 
 	routeWebRequestForBatchArchive(servedItem, req, resp) {
+		Log.debug( { servedItem : servedItem }, 'Batch file web request');
+
 		//
 		//	We are going to build an on-the-fly zip file stream of 1:n
 		//	files in the batch.
@@ -392,8 +398,14 @@ class FileAreaWebAccess {
 					});
 				},
 				function createAndServeStream(filePaths, callback) {
+					Log.trace( { filePaths : filePaths }, 'Creating zip archive for batch web request');
+
 					const zipFile = new yazl.ZipFile();
 
+					zipFile.on('error', err => {
+						Log.warn( { error : err.message }, 'Error adding file to batch web request archive');
+					});
+
 					filePaths.forEach(fp => {
 						zipFile.addFile(
 							fp,					//	path to physical file

From d225d78fa961d8839d0f8d36280815e9111a10d6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Jan 2018 19:38:36 -0700
Subject: [PATCH 0099/1013] At least for now, use FTN-compliant MSGID for
 NetMail exports

---
 core/ftn_util.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/ftn_util.js b/core/ftn_util.js
index a02d8e1c..39093fab 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -135,9 +135,20 @@ function getMessageSerialNumber(messageId) {
 //
 //	ENiGMA½: <messageId>.<areaTag>@<5dFtnAddress> <serial>
 //
-function getMessageIdentifier(message, address) {
+//	0.0.8-alpha:
+//	Made compliant with FTN spec *when exporting NetMail* due to
+//	Mystic rejecting messages with the true-unique version.
+//	Strangely, Synchronet uses the unique format and Mystic does
+//	OK with it. Will need to research further. Note also that
+//	g00r00 was kind enough to fix Mystic to allow for the Sync/Enig
+//	format, but that will only help when using newer Mystic versions.
+//
+function getMessageIdentifier(message, address, isNetMail = false) {
 	const addrStr = new Address(address).toString('5D');
-	return `${message.messageId}.${message.areaTag.toLowerCase()}@${addrStr} ${getMessageSerialNumber(message.messageId)}`;
+	return isNetMail ? 
+		`${addrStr} ${getMessageSerialNumber(message.messageId)}` :
+		`${message.messageId}.${message.areaTag.toLowerCase()}@${addrStr} ${getMessageSerialNumber(message.messageId)}`
+		;
 }
 
 //

From f939babe728318ce0dcaac4fe0868ddfbfff9c66 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Jan 2018 20:48:47 -0700
Subject: [PATCH 0100/1013] Updates and isNetmail=isPrivate

---
 core/scanner_tossers/ftn_bso.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 123c0b7a..bba0c313 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -399,7 +399,11 @@ function FTNMessageScanTossModule() {
 		//	export that failed to finish
 		//
 		if(!message.meta.FtnKludge.MSGID) {
-			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(message, localAddress);
+			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(
+				message,
+				localAddress,
+				message.isPrivate()	// true = isNetMail
+			);
 		}
 
 		message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();
@@ -819,32 +823,29 @@ function FTNMessageScanTossModule() {
 		//	lookup order (most to least explicit config):
 		//
 		//	1) Routes: messageNetworks.ftn.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send may not be where dstAddress is (it's routed!); use network found in route
-		//		  for local address
+		//		- Where we send may not be where dstAddress is (it's routed!)
 		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send is direct to dstAddr;
-		//		- Attempt to match address in messageNetworks.ftn.networks{}, else
-		//		  use scannerTossers.ftn_bso.defaultNetwork to for local address
-		//	3) Nodelist DB lookup (use default config)
 		//		- Where we send is direct to dstAddr
 		//
-		//const routeAddress = this.getNetMailRouteAddress(dstAddr) || dstAddr;
+		//	In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
+		//	falling back to Config.scannerTossers.ftn_bso.defaultNetwork
+		//
 		const route = this.getNetMailRoute(dstAddr);
 
 		let routeAddress;
 		let networkName;
 		if(route) {
 			routeAddress	= Address.fromString(route.address);
-			networkName		= route.network || Config.scannerTossers.ftn_bso.defaultNetwork;
+			networkName		= route.network;
 		} else {
 			routeAddress = dstAddr;
-
-			networkName	= this.getNetworkNameByAddressPattern(`${dstAddr.zone}:${dstAddr.net}/*`);
-			if(!networkName) {
-				networkName		= Config.scannerTossers.ftn_bso.defaultNetwork;
-			}
 		}
 
+		networkName = networkName || 
+			this.getNetworkNameByAddressPattern(`${routeAddress.zone}:${routeAddress.net}/*`) ||
+			Config.scannerTossers.ftn_bso.defaultNetwork
+			;
+
 		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
 			return routeAddress.isPatternMatch(nodeAddrWildcard);
 		}) || {

From ad60e5a7dfe28850a0df0b4e00a0f15c3860c3c8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Jan 2018 22:13:29 -0700
Subject: [PATCH 0101/1013] Split AreaFix with \r\n

---
 core/oputil/oputil_message_base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 1312f2a4..2ab93104 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -79,7 +79,7 @@ function areaFix() {
 				//
 				const messageBody = argv._.slice(2, -1).map(arg => {
 					return arg.replace(/["']/g, '');
-				}).join('\n') + '\n';
+				}).join('\r\n') + '\n';
 
 				const Message = require('../message.js');
 

From 30fd001db3d05232b4326d612a85f059eb00658e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:12:07 -0700
Subject: [PATCH 0102/1013] Fixed servedItem log

---
 core/file_area_web.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/file_area_web.js b/core/file_area_web.js
index 6440eb58..b12f4f7d 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -152,16 +152,18 @@ class FileAreaWebAccess {
 					return cb(Errors.Invalid('Invalid or unknown hash ID'));
 				}
 
-				return cb(
-					null,
-					{
-						hashId			: hashId,
-						userId			: decoded[0],
-						hashIdType		: decoded[1],
-						fileIds			: decoded.slice(2),
-						expireTimestamp	: moment(result.expire_timestamp),
-					}
-				);
+				const servedItem = {
+					hashId			: hashId,
+					userId			: decoded[0],
+					hashIdType		: decoded[1],
+					expireTimestamp	: moment(result.expire_timestamp),
+				};
+
+				if(FileAreaWebAccess.getHashIdTypes().SingleFile === servedItem.hashIdType) {
+					servedItem.fileIds = decoded.slice(2);
+				}
+
+				return cb(null, servedItem);
 			}
 		);
 	}

From a2e8fa65105b8415b6f4ee878fef24a1ac5b17f1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:16:06 -0700
Subject: [PATCH 0103/1013] Add allowOlder opt to
 setFileBaseLastViewdFileIdForUser()

---
 core/file_base_filter.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index a7185316..320d36d3 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -136,9 +136,14 @@ module.exports = class FileBaseFilters {
 		return parseInt((user.properties.user_file_base_last_viewed || 0));
 	}
 
-	static setFileBaseLastViewedFileIdForUser(user, fileId, cb) {
+	static setFileBaseLastViewedFileIdForUser(user, fileId, allowOlder, cb) {
+		if(!cb && _.isFunction(allowOlder)) {
+			cb = allowOlder;
+			allowOlder = false;
+		}
+
 		const current = FileBaseFilters.getFileBaseLastViewedFileIdByUser(user);
-		if(fileId < current) {
+		if(!allowOlder && fileId < current) {
 			if(cb) {
 				cb(null);
 			}

From 4e4ee6b8ce2efca5a5e8a906b77ea169f7456a65 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:16:37 -0700
Subject: [PATCH 0104/1013] cleanup

---
 core/file_base_search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_base_search.js b/core/file_base_search.js
index 2ff27f8a..27656123 100644
--- a/core/file_base_search.js
+++ b/core/file_base_search.js
@@ -56,7 +56,7 @@ exports.getModule = class FileBaseSearch extends MenuModule {
 					},
 					function populateAreas(callback) {
 						self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
-						
+
 						const areasView = vc.getView(MciViewIds.search.area);
 						areasView.setItems( self.availAreas.map( a => a.name ) );
 						areasView.redraw();

From fa1bffeaf847fb37ee75fa8e8943270272d46188 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:17:26 -0700
Subject: [PATCH 0105/1013] Fix limit when fetching entries, allow moment
 timestamps

---
 core/file_entry.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 6edd7ef8..8bf7a69d 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -13,10 +13,11 @@ const paths					= require('path');
 const fse					= require('fs-extra');
 const { unlink, readFile }	= require('graceful-fs');
 const crypto				= require('crypto');
+const moment				= require('moment');
 
 const FILE_TABLE_MEMBERS	= [ 
 	'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
-	'desc', 'desc_long', 'upload_timestamp' 
+	'desc', 'desc_long', 'upload_timestamp'
 ];
 
 const FILE_WELL_KNOWN_META = {
@@ -424,7 +425,11 @@ module.exports = class FileEntry {
 		let sqlWhere = '';
 		let sqlOrderBy;
 		const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
-		
+
+		if(moment.isMoment(filter.newerThanTimestamp)) {
+			filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
+		}
+
 		function getOrderByWithCast(ob) {
 			if( [ 'dl_count', 'est_release_year', 'byte_size' ].indexOf(filter.sort) > -1 ) {
 				return `ORDER BY CAST(${ob} AS INTEGER)`;
@@ -444,7 +449,7 @@ module.exports = class FileEntry {
 
 		if(filter.sort && filter.sort.length > 0) {
 			if(Object.keys(FILE_WELL_KNOWN_META).indexOf(filter.sort) > -1) {	//	sorting via a meta value?
-				sql = 
+				sql =
 					`SELECT DISTINCT f.file_id
 					FROM file f, file_meta m`;
 
@@ -461,7 +466,7 @@ module.exports = class FileEntry {
 							WHERE file_id = f.file_id)
 							AS avg_rating
 						FROM file f`;
-					
+
 					sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
 				} else {
 					sql = 
@@ -472,7 +477,7 @@ module.exports = class FileEntry {
 				}
 			}
 		} else {
-			sql = 
+			sql =
 				`SELECT DISTINCT f.file_id
 				FROM file f`;
 
@@ -552,12 +557,14 @@ module.exports = class FileEntry {
 			appendWhereClause(`f.file_id > ${filter.newerThanFileId}`);
 		}
 
-		sql += `${sqlWhere} ${sqlOrderBy};`;
+		sql += `${sqlWhere} ${sqlOrderBy}`;
 
 		if(_.isNumber(filter.limit)) {
-			sql += `LIMIT ${filter.limit}`;
+			sql += ` LIMIT ${filter.limit}`;
 		}
 
+		sql += ';';
+
 		const matchingFileIds = [];
 		fileDb.each(sql, (err, fileId) => {
 			if(fileId) {

From c5e3220c1d040e794748df92677eead85395e228 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:17:59 -0700
Subject: [PATCH 0106/1013] Add support for finding messages by date for msg
 pointers

---
 core/message_area.js | 46 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index aa893073..e81c85e1 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -2,17 +2,19 @@
 'use strict';
 
 //	ENiGMA½
-const msgDb				= require('./database.js').dbs.message;
-const Config			= require('./config.js').config;
-const Message			= require('./message.js');
-const Log				= require('./logger.js').log;
-const msgNetRecord		= require('./msg_network.js').recordMessage;
-const sortAreasOrConfs	= require('./conf_area_util.js').sortAreasOrConfs;
+const msgDb						= require('./database.js').dbs.message;
+const Config					= require('./config.js').config;
+const Message					= require('./message.js');
+const Log						= require('./logger.js').log;
+const msgNetRecord				= require('./msg_network.js').recordMessage;
+const sortAreasOrConfs			= require('./conf_area_util.js').sortAreasOrConfs;
+const { getISOTimestampString } = require('./database.js');
 
 //	deps
 const async			= require('async');
 const _				= require('lodash');
 const assert		= require('assert');
+const moment		= require('moment');
 
 exports.getAvailableMessageConferences      = getAvailableMessageConferences;
 exports.getSortedAvailMessageConferences	= getSortedAvailMessageConferences;
@@ -28,6 +30,7 @@ exports.tempChangeMessageConfAndArea		= tempChangeMessageConfAndArea;
 exports.getMessageListForArea				= getMessageListForArea;
 exports.getNewMessageCountInAreaForUser		= getNewMessageCountInAreaForUser;
 exports.getNewMessagesInAreaForUser			= getNewMessagesInAreaForUser;
+exports.getMessageIdNewerThanTimestampByArea	= getMessageIdNewerThanTimestampByArea;
 exports.getMessageAreaLastReadId			= getMessageAreaLastReadId;
 exports.updateMessageAreaLastReadId			= updateMessageAreaLastReadId;
 exports.persistMessage						= persistMessage;
@@ -482,6 +485,28 @@ function getMessageListForArea(options, areaTag, cb) {
 	);
 }
 
+function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
+	if(moment.isMoment(newerThanTimestamp)) {
+		newerThanTimestamp = getISOTimestampString(newerThanTimestamp);
+	}
+
+	msgDb.get(
+		`SELECT message_id 
+		FROM message
+		WHERE area_tag = ? AND DATETIME(modified_timestamp) > DATETIME("${newerThanTimestamp}", "+1 seconds")
+		ORDER BY modified_timestamp ASC
+		LIMIT 1;`,
+		[ areaTag ],
+		(err, row) => {
+			if(err) {
+				return cb(err);
+			}
+
+			return cb(null, row ? row.message_id : null);
+		}
+	);
+}
+
 function getMessageAreaLastReadId(userId, areaTag, cb) {
 	msgDb.get(
 		'SELECT message_id '					+
@@ -494,7 +519,12 @@ function getMessageAreaLastReadId(userId, areaTag, cb) {
 	);
 }
 
-function updateMessageAreaLastReadId(userId, areaTag, messageId, cb) {
+function updateMessageAreaLastReadId(userId, areaTag, messageId, allowOlder, cb) {
+	if(!cb && _.isFunction(allowOlder)) {
+		cb = allowOlder;
+		allowOlder = false;
+	}
+
 	//	:TODO: likely a better way to do this...
 	async.waterfall(
 		[
@@ -505,7 +535,7 @@ function updateMessageAreaLastReadId(userId, areaTag, messageId, cb) {
 				});
 			},
 			function update(lastId, callback) {
-				if(messageId > lastId) {
+				if(allowOlder || messageId > lastId) {
 					msgDb.run(
 						'REPLACE INTO user_message_area_last_read (user_id, area_tag, message_id) '	+
 						'VALUES (?, ?, ?);',

From 00deb3fe72dda04ed9cafcbbef9d468373b7cfdd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jan 2018 21:39:14 -0700
Subject: [PATCH 0107/1013] * Add concept of external flavor to import/exported
 mails, e.g. 'ftn' * Add to/from remote user meta for opaqe addrs, e.g. 'ftn'
 flavor can use FTN-style addresses * Allow replys from inbox to a NetMail

---
 core/fse.js                        | 54 ++++++++++++++++++------------
 core/message.js                    | 22 ++++++++++++
 core/new_scan.js                   |  5 +--
 core/oputil/oputil_message_base.js | 12 ++-----
 core/scanner_tossers/ftn_bso.js    | 49 +++++++++++++++++----------
 5 files changed, 93 insertions(+), 49 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index 4a6c8eb1..d84de1e9 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -411,30 +411,42 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					return callback(null);
 				},
 				function populateLocalUserInfo(callback) {
-					if(self.isPrivateMail()) {
-						self.message.setLocalFromUserId(self.client.user.userId);
-
-						if(self.toUserId > 0) {
-							self.message.setLocalToUserId(self.toUserId);
-							callback(null);
-						} else {
-							//	we need to look it up
-							User.getUserIdAndNameByLookup(self.message.toUserName, function userInfo(err, toUserId) {
-								if(err) {
-									callback(err);
-								} else {
-									self.message.setLocalToUserId(toUserId);
-									callback(null);
-								}
-							});							
-						}
-					} else {
-						callback(null);
+					if(!self.isPrivateMail()) {
+						return callback(null);
 					}
+
+					//	:TODO: shouldn't local from user ID be set for all mail?
+					self.message.setLocalFromUserId(self.client.user.userId);
+
+					if(self.toUserId > 0) {
+						self.message.setLocalToUserId(self.toUserId);
+						return callback(null);
+					}
+
+					//
+					//	If the message we're replying to is from a remote user
+					//	don't try to look up the local user ID. Instead, mark the mail
+					//	for export with the remote to address.
+					//
+					if(self.replyToMessage.isFromRemoteUser()) {
+						self.message.setRemoteToUser(self.replyToMessage.meta.System[Message.SystemMetaNames.RemoteFromUser]);
+						self.message.setExternalFlavor(self.replyToMessage.meta.System[Message.SystemMetaNames.ExternalFlavor]);
+						return callback(null);
+					}
+
+					//	we need to look it up
+					User.getUserIdAndNameByLookup(self.message.toUserName, (err, toUserId) => {
+						if(err) {
+							return callback(err);
+						}
+
+						self.message.setLocalToUserId(toUserId);
+						return callback(null);
+					});
 				}
 			],
-			function complete(err) {
-				cb(err, self.message);
+			err => {
+				return cb(err, self.message);
 			}
 		);
 	}
diff --git a/core/message.js b/core/message.js
index 7fb57d20..360b211a 100644
--- a/core/message.js
+++ b/core/message.js
@@ -76,6 +76,10 @@ function Message(options) {
 	this.isPrivate = function() {
 		return Message.isPrivateAreaTag(this.areaTag);
 	};
+
+	this.isFromRemoteUser = function() {
+		return null !== _.get(this, 'meta.System.remote_from_user', null);
+	};
 }
 
 Message.WellKnownAreaTags = {
@@ -93,6 +97,14 @@ Message.SystemMetaNames = {
 	LocalFromUserID			: 'local_from_user_id',
 	StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
 	ExplicitEncoding		: 'explicit_encoding',	//	Explicitly set encoding when exporting/etc.
+	ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.ExternalFlavors
+	RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address	
+	RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address	
+};
+
+//	Types for Message.SystemMetaNames.ExternalFlavor meta
+Message.ExternalFlavors = {
+	FTN			: 'ftn',	//	FTN style
 };
 
 Message.StateFlags0 = {
@@ -133,6 +145,16 @@ Message.prototype.setLocalFromUserId = function(userId) {
 	this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
 };
 
+Message.prototype.setRemoteToUser = function(remoteTo) {
+	this.meta.System = this.meta.System || {};
+	this.meta.System[Message.SystemMetaNames.RemoteToUser] = remoteTo;
+};
+
+Message.prototype.setExternalFlavor = function(flavor) {
+	this.meta.System = this.meta.System || {};
+	this.meta.System[Message.SystemMetaNames.ExternalFlavor] = flavor;
+};
+
 Message.createMessageUUID = function(areaTag, modTimestamp, subject, body) {
 	assert(_.isString(areaTag));
 	assert(_.isDate(modTimestamp) || moment.isMoment(modTimestamp));
diff --git a/core/new_scan.js b/core/new_scan.js
index a75a5b2d..f3e851fb 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -170,6 +170,7 @@ exports.getModule = class NewScanModule extends MenuModule {
 		const filterCriteria = {
 			newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
 			areaTag			: getAvailableFileAreaTags(this.client),
+			order			: 'ascending',	//	oldest first
 		};
 
 		FileEntry.findFiles(
@@ -179,11 +180,11 @@ exports.getModule = class NewScanModule extends MenuModule {
 					return cb(err ? err : Errors.DoesNotExist('No more new files'));
 				}
 
-				FileBaseFilters.setFileBaseLastViewedFileIdForUser( this.client.user, fileIds[0] );
+				FileBaseFilters.setFileBaseLastViewedFileIdForUser( this.client.user, fileIds[fileIds.length - 1] );
 
 				const menuOpts = {
 					extraArgs : {
-						fileList : fileIds,				
+						fileList : fileIds,
 					},
 				};
 
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 2ab93104..b1c6673e 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -90,18 +90,13 @@ function areaFix() {
 					message			: messageBody,
 					areaTag			: Message.WellKnownAreaTags.Private,	//	mark private
 					meta			: {
-						FtnProperty : {
-							[ Message.FtnPropertyNames.FtnDestZone ]	: ftnAddr.zone,
-							[ Message.FtnPropertyNames.FtnDestNetwork ]	: ftnAddr.net,							
-							[ Message.FtnPropertyNames.FtnDestNode ]	: ftnAddr.node,
+						System		: {
+							[ Message.SystemMetaNames.RemoteToUser ]	: ftnAddr.toString(),			//	where to send it
+							[ Message.SystemMetaNames.ExternalFlavor ]	: Message.ExternalFlavors.FTN,	//	on FTN-style network
 						}
 					}
 				});
 
-				if(ftnAddr.point) {
-					message.meta.FtnProperty[Message.FtnPropertyNames.FtnDestPoint] = ftnAddr.point;
-				}
-
 				if(0 !== fromUserId) {
 					message.setLocalFromUserId(fromUserId);
 				}
@@ -109,7 +104,6 @@ function areaFix() {
 				return callback(null, message);
 			},
 			function persistMessage(message, callback) {
-				//	:TODO: Persist message in private outgoing (sysop out box) (TBD: implementation)
 				message.persist(err => {
 					if(!err) {
 						console.log('AreaFix message persisted and will be exported at next scheduled scan');
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index bba0c313..c7e3edc9 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -45,12 +45,8 @@ exports.moduleInfo = {
 /*
 	:TODO:
 	* Support (approx) max bundle size
-	* Support NetMail
-		* NetMail needs explicit isNetMail()  check
-		* NetMail filename / location / etc. is still unknown - need to post on groups & get real answers
 	* Validate packet passwords!!!!
 		=> secure vs insecure landing areas
-
 */
 
 exports.getModule = FTNMessageScanTossModule;
@@ -878,12 +874,7 @@ function FTNMessageScanTossModule() {
 						}
 					},
 					function discoverUplink(callback) {
-						const dstAddr = new Address({
-							zone	: parseInt(message.meta.FtnProperty.ftn_dest_zone),
-							net		: parseInt(message.meta.FtnProperty.ftn_dest_network),
-							node	: parseInt(message.meta.FtnProperty.ftn_dest_node),
-							point	: parseInt(message.meta.FtnProperty.ftn_dest_point) || null,	//	point is optional
-						});
+						const dstAddr = new Address(message.meta.System[Message.SystemMetaNames.RemoteToUser]);
 
 						return self.getAcceptableNetMailNetworkInfoFromAddress(dstAddr, (err, config, routeAddress, networkName) => {
 							if(err) {
@@ -1152,6 +1143,9 @@ function FTNMessageScanTossModule() {
 				function basicSetup(callback) {
 					message.areaTag = config.localAreaTag;
 
+					//	indicate this was imported from FTN
+					message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.ExternalFlavors.FTN;
+
 					//
 					//	If we *allow* dupes (disabled by default), then just generate
 					//	a random UUID. Otherwise, don't assign the UUID just yet. It will be
@@ -1177,6 +1171,22 @@ function FTNMessageScanTossModule() {
 						return callback(null);
 					}
 
+					//
+					//	Create a meta value for the *remote* from user. In the case here with FTN,
+					//	their fully qualified FTN from address
+					//
+					const intlKludge = _.get(message, 'meta.FtnKludge.INTL');					
+					if(intlKludge && intlKludge.length > 0) {
+						let fromAddress = intlKludge.split(' ')[0];
+
+						const fromPointKludge = _.get(message, 'meta.FtnKludge.FMPT');
+						if(fromPointKludge) {
+							fromAddress += `.${fromPointKludge}`;
+						}
+
+						message.meta.System[Message.SystemMetaNames.RemoteFromUser] = fromAddress;
+					}
+
 					const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
 
 					User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
@@ -1911,8 +1921,7 @@ function FTNMessageScanTossModule() {
 	this.performNetMailExport = function(cb) {
 		//
 		//	Select all messages with a |message_id| > |lastScanId| in the private area
-		//	that also *do not* have a local user ID meta value but *do* have a FTN dest
-		//	network meta value.
+		//	that are schedule for export to FTN-style networks.
 		//
 		//	Just like EchoMail, we additionally exclude messages with the System state_flags0
 		//	which will be present for imported or already exported messages
@@ -1927,12 +1936,18 @@ function FTNMessageScanTossModule() {
 			WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
 				(SELECT COUNT(message_id)
 				FROM message_meta
-				WHERE message_id = m.message_id AND meta_category = 'System' AND 
-					(meta_name = 'state_flags0' OR meta_name='local_to_user_id')) = 0
+				WHERE message_id = m.message_id
+					AND meta_category = 'System'
+					AND (meta_name = 'state_flags0' OR meta_name = 'local_to_user_id')
+				) = 0
 			AND
 				(SELECT COUNT(message_id)
 				FROM message_meta
-				WHERE message_id = m.message_id AND meta_category='FtnProperty' AND meta_name='ftn_dest_network') = 1
+				WHERE message_id = m.message_id
+					AND meta_category = 'System' 
+					AND meta_name = '${Message.SystemMetaNames.ExternalFlavor}'
+					AND meta_value = '${Message.ExternalFlavors.FTN}'
+				) = 1
 			ORDER BY message_id;
 			`;
 
@@ -1967,8 +1982,8 @@ function FTNMessageScanTossModule() {
 
 	this.isNetMailMessage = function(message) {
 		return message.isPrivate() &&
-			null === _.get(message.meta, 'System.LocalToUserID', null) &&
-			null !== _.get(message.meta, 'FtnProperty.ftn_dest_network', null)
+			null === _.get(message, 'meta.System.LocalToUserID', null) &&
+			Message.ExternalFlavors.FTN === _.get(message, 'meta.System.external_flavor', null)
 			;
 	};
 }

From 27fcd40900921a421ff93d90be096379b37d44b9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 12 Jan 2018 19:06:33 -0700
Subject: [PATCH 0108/1013] Fix remote from user @ import

---
 core/scanner_tossers/ftn_bso.js | 40 +++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index c7e3edc9..8b86e850 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1113,6 +1113,32 @@ function FTNMessageScanTossModule() {
 		return alias || lookup;
 	};
 
+	this.getAddressesFromNetMailMessage = function(message) {
+		const intlKludge = _.get(message, 'meta.FtnKludge.INTL');
+
+		if(!intlKludge) {
+			return {};
+		}
+
+		let [ to, from ] = intlKludge.split(' ');
+		if(!to || !from) {
+			return {};
+		}
+
+		const fromPoint = _.get(message, 'meta.FtnKludge.FMPT');
+		const toPoint	= _.get(message, 'meta.FtnKludge.TOPT');
+
+		if(fromPoint) {
+			from += `.${fromPoint}`;
+		}
+
+		if(toPoint) {
+			to += `.${toPoint}`;
+		}
+
+		return { to : Address.fromString(to), from : Address.fromString(from) };
+	};
+
 	this.importMailToArea = function(config, header, message, cb) {
 		async.series(
 			[
@@ -1175,18 +1201,14 @@ function FTNMessageScanTossModule() {
 					//	Create a meta value for the *remote* from user. In the case here with FTN,
 					//	their fully qualified FTN from address
 					//
-					const intlKludge = _.get(message, 'meta.FtnKludge.INTL');					
-					if(intlKludge && intlKludge.length > 0) {
-						let fromAddress = intlKludge.split(' ')[0];
+					const { from } = self.getAddressesFromNetMailMessage(message);
 
-						const fromPointKludge = _.get(message, 'meta.FtnKludge.FMPT');
-						if(fromPointKludge) {
-							fromAddress += `.${fromPointKludge}`;
-						}
-
-						message.meta.System[Message.SystemMetaNames.RemoteFromUser] = fromAddress;
+					if(!from) {
+						return callback(Errors.Invalid('Cannot import FTN NetMail without valid INTL line'));
 					}
 
+					message.meta.System[Message.SystemMetaNames.RemoteFromUser] = from.toString();
+
 					const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
 
 					User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {

From 2bc8e417e4a66ba1c3a4ed557e768685d61e803b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 12 Jan 2018 23:44:22 -0700
Subject: [PATCH 0109/1013] Fix non-reply crash

---
 core/fse.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index d84de1e9..824704dc 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -342,8 +342,6 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				//	really don't like ANSI messages in UTF-8 encoding (they should!)
 				//
 				msgOpts.meta		= { System : { 'explicit_encoding' : Config.scannerTossers.ftn_bso.packetAnsiMsgEncoding || 'cp437' } };
-				//	:TODO: change to <ansi>\r\nESC[A<message>
-				//msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}${msgOpts.message}`;
 				msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
 			}
 		}
@@ -428,7 +426,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					//	don't try to look up the local user ID. Instead, mark the mail
 					//	for export with the remote to address.
 					//
-					if(self.replyToMessage.isFromRemoteUser()) {
+					if(self.replyToMessage && self.replyToMessage.isFromRemoteUser()) {
 						self.message.setRemoteToUser(self.replyToMessage.meta.System[Message.SystemMetaNames.RemoteFromUser]);
 						self.message.setExternalFlavor(self.replyToMessage.meta.System[Message.SystemMetaNames.ExternalFlavor]);
 						return callback(null);

From 08ea798d53afa4b0d16c4b22e5f7e0bd22e18783 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 13 Jan 2018 08:57:13 -0700
Subject: [PATCH 0110/1013] Rename to AddressFlavor

---
 core/mail_util.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 core/message.js   | 10 +++---
 2 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 core/mail_util.js

diff --git a/core/mail_util.js b/core/mail_util.js
new file mode 100644
index 00000000..654b1617
--- /dev/null
+++ b/core/mail_util.js
@@ -0,0 +1,81 @@
+/* jslint node: true */
+'use strict';
+
+const Address				= require('./ftn_address.js');
+const Message				= require('./message.js');
+
+exports.getAddressedToInfo	= getAddressedToInfo;
+
+const EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+/*
+	Input                              Output
+	----------------------------------------------------------------------------------------------------
+	User                               { name : 'User', flavor : 'local' }
+	Some User                          { name : 'Some User', flavor : 'local' }
+	JoeUser @ 1:103/75                 { name : 'JoeUser', flavor : 'ftn', remote : '1:103/75' }
+	Bob@1:103/705@fidonet.org          { name : 'Bob', flavor : 'ftn', remote : '1:103/705@fidonet.org' }
+	1:103/705@fidonet.org              { flavor : 'ftn', remote : '1:103/705@fidonet.org' }
+	Jane <23:4/100>                    { name : 'Jane', flavor : 'ftn', remote : '23:4/100' }
+	43:20/100.2                        { flavor : 'ftn', remote : '43:20/100.2' }
+	foo@host.com                       { name : 'foo', flavor : 'email', remote : 'foo@host.com' }
+	Bar <baz@foobar.net>               { name : 'Bar', flavor : 'email', remote : 'baz@foobar.com' }
+*/
+function getAddressedToInfo(input) {
+	input = input.trim();
+
+	const firstAtPos = input.indexOf('@');
+
+	if(firstAtPos < 0) {
+		let addr = Address.fromString(input);
+		if(Address.isValidAddress(addr)) {
+			return { flavor : Message.AddressFlavor.FTN, remote : input };
+		}
+
+		const lessThanPos = input.indexOf('<');
+		if(lessThanPos < 0) {
+			return { name : input, flavor : Message.AddressFlavor.Local };
+		}
+
+		const greaterThanPos = input.indexOf('>');
+		if(greaterThanPos < lessThanPos) {
+			return { name : input, flavor : Message.AddressFlavor.Local };
+		}
+
+		addr = Address.fromString(input.slice(lessThanPos + 1, greaterThanPos));
+		if(Address.isValidAddress(addr)) {
+			return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
+		}
+
+		return { name : input, flavor : Message.AddressFlavor.Local };
+	}
+
+	const lessThanPos		= input.indexOf('<');
+	const greaterThanPos	= input.indexOf('>');
+	if(lessThanPos > 0 && greaterThanPos > lessThanPos) {
+		const addr = input.slice(lessThanPos + 1, greaterThanPos);
+		const m = addr.match(EMAIL_REGEX);
+		if(m) {
+			return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.Email, remote : addr };
+		}
+
+		return { name : input, flavor : Message.AddressFlavor.Local };
+	}
+
+	let m = input.match(EMAIL_REGEX);
+	if(m) {
+		return { name : input.slice(0, firstAtPos), flavor : Message.AddressFlavor.Email, remote : input };
+	}
+
+	let addr = Address.fromString(input);	//	5D?
+	if(Address.isValidAddress(addr)) {
+		return { flavor : Message.AddressFlavor.FTN, remote : addr.toString() } ;
+	}
+
+	addr = Address.fromString(input.slice(firstAtPos + 1).trim());
+	if(Address.isValidAddress(addr)) {
+		return { name : input.slice(0, firstAtPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
+	}
+
+	return { name : input, flavor : Message.AddressFlavor.Local };
+}
diff --git a/core/message.js b/core/message.js
index 360b211a..5d3c8db9 100644
--- a/core/message.js
+++ b/core/message.js
@@ -97,14 +97,16 @@ Message.SystemMetaNames = {
 	LocalFromUserID			: 'local_from_user_id',
 	StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
 	ExplicitEncoding		: 'explicit_encoding',	//	Explicitly set encoding when exporting/etc.
-	ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.ExternalFlavors
-	RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address	
-	RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address	
+	ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.AddressFlavor
+	RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address
+	RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address
 };
 
 //	Types for Message.SystemMetaNames.ExternalFlavor meta
-Message.ExternalFlavors = {
+Message.AddressFlavor = {
+	Local		: 'local',	//	local / non-remote addressing
 	FTN			: 'ftn',	//	FTN style
+	Email		: 'email',
 };
 
 Message.StateFlags0 = {

From 149f8bd9f541940ca4602a872584832cf5d0b0f8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 13 Jan 2018 08:57:54 -0700
Subject: [PATCH 0111/1013] Add valid check methods

---
 core/ftn_address.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/ftn_address.js b/core/ftn_address.js
index 9edb3819..f0936e1d 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -20,6 +20,15 @@ module.exports = class Address {
 		}
 	}
 
+	static isValidAddress(addr) {
+		return addr && addr.isValid();
+	}
+
+	isValid() {
+		//	FTN address is valid if we have at least a net/node
+		return _.isNumber(this.net) && _.isNumber(this.node);
+	}
+
 	isEqual(other) {
 		if(_.isString(other)) {
 			other = Address.fromString(other);

From 9a00b3eb156b95c7cfcf78b4b0577a6f7587736a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 13 Jan 2018 08:58:28 -0700
Subject: [PATCH 0112/1013] Add validateGeneralMailAddressedTo()

---
 core/system_view_validate.js | 39 ++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 07bbcab2..e2a5b2e0 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -2,9 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const User		= require('./user.js');
-const Config	= require('./config.js').config;
-const Log		= require('./logger.js').log;
+const User						= require('./user.js');
+const Config					= require('./config.js').config;
+const Log						= require('./logger.js').log;
+const { getAddressedToInfo } 	= require('./mail_util.js');
+const Message					= require('./message.js');
 
 //	deps
 const fs		= require('graceful-fs');
@@ -14,6 +16,7 @@ exports.validateMessageSubject				= validateMessageSubject;
 exports.validateUserNameAvail 				= validateUserNameAvail;
 exports.validateUserNameExists				= validateUserNameExists;
 exports.validateUserNameOrRealNameExists	= validateUserNameOrRealNameExists;
+exports.validateGeneralMailAddressedTo		= validateGeneralMailAddressedTo;
 exports.validateEmailAvail					= validateEmailAvail;
 exports.validateBirthdate					= validateBirthdate;
 exports.validatePasswordSpec				= validatePasswordSpec;
@@ -55,30 +58,44 @@ function validateUserNameAvail(data, cb) {
 	}
 }
 
-function validateUserNameExists(data, cb) {
-	const invalidUserNameError = new Error('Invalid username');
+const invalidUserNameError = () => new Error('Invalid username');
 
+function validateUserNameExists(data, cb) {
 	if(0 === data.length) {
-		return cb(invalidUserNameError);
+		return cb(invalidUserNameError());
 	}
 
 	User.getUserIdAndName(data, (err) => {
-		return cb(err ? invalidUserNameError : null);
+		return cb(err ? invalidUserNameError() : null);
 	});
 }
 
 function validateUserNameOrRealNameExists(data, cb) {
-	const invalidUserNameError = new Error('Invalid username');
-
 	if(0 === data.length) {
-		return cb(invalidUserNameError);
+		return cb(invalidUserNameError());
 	}
 
 	User.getUserIdAndNameByLookup(data, err => {
-		return cb(err ? invalidUserNameError : null);
+		return cb(err ? invalidUserNameError() : null);
 	});
 }
 
+function validateGeneralMailAddressedTo(data, cb) {
+	//
+	//	Allow any supported addressing:
+	//	- Local username or real name
+	//	- Supported remote flavors such as FTN, email, ...
+	//
+	//	:TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
+	const addressedToInfo = getAddressedToInfo(data);
+
+	if(Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+		return cb(null);
+	}
+
+	return validateUserNameOrRealNameExists(data, cb);
+}
+
 function validateEmailAvail(data, cb) {
 	//
 	//	This particular method allows empty data - e.g. no email entered

From 84fd0ff6d21a23fb07af3ea11c233da6bc2715ba Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 13 Jan 2018 09:06:50 -0700
Subject: [PATCH 0113/1013] Add ability to send directly to a NetMail address

---
 core/fse.js                        | 13 +++++++++++++
 core/oputil/oputil_message_base.js |  2 +-
 core/scanner_tossers/ftn_bso.js    |  6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index 824704dc..51b8dc5c 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -15,6 +15,7 @@ const stringFormat					= require('./string_format.js');
 const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 const { isAnsi, cleanControlCodes, insert }	= require('./string_util.js');
 const Config						= require('./config.js').config;
+const { getAddressedToInfo } 		= require('./mail_util.js');
 
 //	deps
 const async							= require('async');
@@ -432,6 +433,18 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 						return callback(null);
 					}
 
+					//
+					//	Detect if the user is attempting to send to a remote mail type that we support
+					//
+					//	:TODO: how to plug in support without tying to various types here? isSupportedExteranlType() or such
+					const addressedToInfo = getAddressedToInfo(self.message.toUserName);
+					if(addressedToInfo.name && Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+						self.message.setRemoteToUser(addressedToInfo.remote);
+						self.message.setExternalFlavor(addressedToInfo.flavor);
+						self.message.toUserName = addressedToInfo.name;
+						return callback(null);
+					}
+
 					//	we need to look it up
 					User.getUserIdAndNameByLookup(self.message.toUserName, (err, toUserId) => {
 						if(err) {
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index b1c6673e..6e89cf73 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -92,7 +92,7 @@ function areaFix() {
 					meta			: {
 						System		: {
 							[ Message.SystemMetaNames.RemoteToUser ]	: ftnAddr.toString(),			//	where to send it
-							[ Message.SystemMetaNames.ExternalFlavor ]	: Message.ExternalFlavors.FTN,	//	on FTN-style network
+							[ Message.SystemMetaNames.ExternalFlavor ]	: Message.AddressFlavor.FTN,	//	on FTN-style network
 						}
 					}
 				});
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 8b86e850..4285884e 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1170,7 +1170,7 @@ function FTNMessageScanTossModule() {
 					message.areaTag = config.localAreaTag;
 
 					//	indicate this was imported from FTN
-					message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.ExternalFlavors.FTN;
+					message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.AddressFlavor.FTN;
 
 					//
 					//	If we *allow* dupes (disabled by default), then just generate
@@ -1968,7 +1968,7 @@ function FTNMessageScanTossModule() {
 				WHERE message_id = m.message_id
 					AND meta_category = 'System' 
 					AND meta_name = '${Message.SystemMetaNames.ExternalFlavor}'
-					AND meta_value = '${Message.ExternalFlavors.FTN}'
+					AND meta_value = '${Message.AddressFlavor.FTN}'
 				) = 1
 			ORDER BY message_id;
 			`;
@@ -2005,7 +2005,7 @@ function FTNMessageScanTossModule() {
 	this.isNetMailMessage = function(message) {
 		return message.isPrivate() &&
 			null === _.get(message, 'meta.System.LocalToUserID', null) &&
-			Message.ExternalFlavors.FTN === _.get(message, 'meta.System.external_flavor', null)
+			Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null)
 			;
 	};
 }

From 011c863547d1bc9fe320cc6ad3d84d4136b36a04 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 13 Jan 2018 09:08:17 -0700
Subject: [PATCH 0114/1013] Use validateGeneralMailAddressedTo for private mail
 box

---
 config/menu.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 0f1fa168..2225f274 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -2324,7 +2324,7 @@
 						ET2: {
 							argName: to
 							focus: true
-							validate: @systemMethod:validateUserNameExists
+							validate: @systemMethod:validateGeneralMailAddressedTo
 						}
 						ET3: {
 							argName: subject

From e7b0e4af30dfe8a709670c82bc07f03ae6c2a982 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 13:52:40 -0700
Subject: [PATCH 0115/1013] Add private exported + sent mail cleanup to
 trimMessageAreasScheduledEvent() scheduled event

---
 core/config.js                  |  5 +-
 core/fse.js                     |  2 +-
 core/message_area.js            | 87 ++++++++++++++++++++++++---------
 core/scanner_tossers/ftn_bso.js |  8 ++-
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/core/config.js b/core/config.js
index f9f277a8..62ce6032 100644
--- a/core/config.js
+++ b/core/config.js
@@ -598,8 +598,9 @@ function getDefaultConfig() {
 
 				areas : {
 					private_mail : {
-						name	: 'Private Mail',
-						desc	: 'Private user to user mail/email',
+						name					: 'Private Mail',
+						desc					: 'Private user to user mail/email',
+						maxExternalSentAgeDays	: 30,	//	max external "outbox" item age
 					},
 
 					local_bulletin : {
diff --git a/core/fse.js b/core/fse.js
index 51b8dc5c..b266a9c9 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -990,7 +990,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		this.viewControllers.body.switchFocus(1);
 
 		this.observeEditorEvents();
-	};
+	}
 
 	switchToFooter() {
 		this.viewControllers.header.setFocus(false);
diff --git a/core/message_area.js b/core/message_area.js
index e81c85e1..53dd3086 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -598,11 +598,11 @@ function trimMessageAreasScheduledEvent(args, cb) {
 				LIMIT -1 OFFSET ${areaInfo.maxMessages}
 			);`,
 			[ areaInfo.areaTag.toLowerCase() ],
-			err => {
+			function result(err) {	//	no arrow func; need this
 				if(err) {
-					Log.error( { areaInfo : areaInfo, err : err, type : 'maxMessages' }, 'Error trimming message area');
+					Log.error( { areaInfo : areaInfo, error : err.message, type : 'maxMessages' }, 'Error trimming message area');
 				} else {
-					Log.debug( { areaInfo : areaInfo, type : 'maxMessages' }, 'Area trimmed successfully');
+					Log.debug( { areaInfo : areaInfo, type : 'maxMessages', count : this.changes }, 'Area trimmed successfully');
 				}
 				return cb(err);
 			}	
@@ -618,21 +618,25 @@ function trimMessageAreasScheduledEvent(args, cb) {
 			`DELETE FROM message
 			WHERE area_tag = ? AND modified_timestamp < date('now', '-${areaInfo.maxAgeDays} days');`,
 			[ areaInfo.areaTag ],
-			err => {
+			function result(err) {	//	no arrow func; need this
 				if(err) {
-					Log.warn( { areaInfo : areaInfo, err : err, type : 'maxAgeDays' }, 'Error trimming message area');
+					Log.warn( { areaInfo : areaInfo, error : err.message, type : 'maxAgeDays' }, 'Error trimming message area');
 				} else {
-					Log.debug( { areaInfo : areaInfo, type : 'maxAgeDays' }, 'Area trimmed successfully');
+					Log.debug( { areaInfo : areaInfo, type : 'maxAgeDays', count : this.changes }, 'Area trimmed successfully');
 				}
 				return cb(err);
 			}
 		);
 	}
-	
+
 	async.waterfall(
-		[			
+		[
 			function getAreaTags(callback) {
-				let areaTags = [];
+				const areaTags = [];
+
+				//
+				//	We use SQL here vs API such that no-longer-used tags are picked up
+				//
 				msgDb.each(
 					`SELECT DISTINCT area_tag
 					FROM message;`,
@@ -640,7 +644,11 @@ function trimMessageAreasScheduledEvent(args, cb) {
 						if(err) {
 							return callback(err);
 						}
-						areaTags.push(row.area_tag);
+
+						//	We treat private mail special
+						if(!Message.isPrivateAreaTag(row.area_tag)) {
+							areaTags.push(row.area_tag);
+						}
 					},
 					err => {
 						return callback(err, areaTags);
@@ -652,30 +660,26 @@ function trimMessageAreasScheduledEvent(args, cb) {
 
 				//	determine maxMessages & maxAgeDays per area
 				areaTags.forEach(areaTag => {
-					
+
 					let maxMessages = Config.messageAreaDefaults.maxMessages;
 					let maxAgeDays	= Config.messageAreaDefaults.maxAgeDays;
-					
+
 					const area = getMessageAreaByTag(areaTag);	//	note: we don't know the conf here
 					if(area) {
-						if(area.maxMessages) {
-							maxMessages = area.maxMessages;
-						}
-						if(area.maxAgeDays) {
-							maxAgeDays = area.maxAgeDays;
-						}
+						maxMessages = area.maxMessages || maxMessages;
+						maxAgeDays	= area.maxAgeDays || maxAgeDays;
 					}
 
 					areaInfos.push( {
 						areaTag		: areaTag,
 						maxMessages	: maxMessages,
 						maxAgeDays	: maxAgeDays,
-					} );					
+					} );
 				});
 
 				return callback(null, areaInfos);
 			},
-			function trimAreas(areaInfos, callback) {
+			function trimGeneralAreas(areaInfos, callback) {
 				async.each(
 					areaInfos,
 					(areaInfo, next) => {
@@ -691,11 +695,50 @@ function trimMessageAreasScheduledEvent(args, cb) {
 					},
 					callback
 				);
-			}			
+			},
+			function trimExternalPrivateSentMail(callback) {
+				//
+				//	*External* (FTN, email, ...) outgoing is cleaned up *after export*
+				//	if it is older than the configured |maxExternalSentAgeDays| days
+				//
+				//	Outgoing externally exported private mail is:
+				//	- In the 'private_mail' area
+				//	- Marked exported (state_flags0 exported bit set)
+				//	- Marked with any external flavor (we don't mark local)
+				//
+				const maxExternalSentAgeDays = _.get(
+					Config,
+					'messageConferences.system_internal.areas.private_mail.maxExternalSentAgeDays',
+					30
+				);
+
+				msgDb.run(
+					`DELETE FROM message
+					WHERE message_id IN (
+						SELECT m.message_id
+						FROM message m
+						JOIN message_meta mms
+							ON m.message_id = mms.message_id AND
+							(mms.meta_category='System' AND mms.meta_name='${Message.SystemMetaNames.StateFlags0}' AND (mms.meta_value & ${Message.StateFlags0.Exported} = ${Message.StateFlags0.Exported}))
+						JOIN message_meta mmf
+							ON m.message_id = mmf.message_id AND
+							(mmf.meta_category='System' AND mmf.meta_name='${Message.SystemMetaNames.ExternalFlavor}')
+						WHERE m.area_tag='${Message.WellKnownAreaTags.Private}' AND	DATETIME('now') > DATETIME(m.modified_timestamp, '+${maxExternalSentAgeDays} days')
+					);`,
+					function results(err) {	//	no arrow func; need this
+						if(err) {
+							Log.warn( { error : err.message }, 'Error trimming private externally sent messages');
+						} else {
+							Log.debug( { count : this.changes }, 'Private externally sent messages trimmed successfully');
+						}
+					}
+				);
+
+				return callback(null);
+			}
 		],
 		err => {
 			return cb(err);
 		}
 	);
-	
 }
\ No newline at end of file
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 4285884e..830e9daa 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1884,7 +1884,11 @@ function FTNMessageScanTossModule() {
 			ORDER BY message_id;`
 			;
 
-		async.each(Object.keys(Config.messageNetworks.ftn.areas), (areaTag, nextArea) => {
+		//	we shouldn't, but be sure we don't try to pick up private mail here
+		const areaTags = Object.keys(Config.messageNetworks.ftn.areas)
+			.filter(areaTag => Message.WellKnownAreaTags.Private !== areaTag);
+
+		async.each(areaTags, (areaTag, nextArea) => {
 			const areaConfig = Config.messageNetworks.ftn.areas[areaTag];
 			if(!this.isAreaConfigValid(areaConfig)) {
 				return nextArea();
@@ -1948,10 +1952,10 @@ function FTNMessageScanTossModule() {
 		//	Just like EchoMail, we additionally exclude messages with the System state_flags0
 		//	which will be present for imported or already exported messages
 		//
-		//	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
 		//
 		//	:TODO: fill out the rest of the consts here
 		//	:TODO: this statement is crazy ugly
+		//	:TODO: this should really check for extenral "flavor" and not-already-exported state_flags0
 		const getNewUuidsSql =
 			`SELECT message_id, message_uuid
 			FROM message m

From ab6e097a4f3ccfe60097b68a0c87ba012f77caa0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 15:00:27 -0700
Subject: [PATCH 0116/1013] FTN packet dump util

---
 util/dump_ftn_packet.js | 53 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 util/dump_ftn_packet.js

diff --git a/util/dump_ftn_packet.js b/util/dump_ftn_packet.js
new file mode 100755
index 00000000..144d18f3
--- /dev/null
+++ b/util/dump_ftn_packet.js
@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+
+/* jslint node: true */
+/* eslint-disable no-console */
+'use strict';
+
+const { Packet } = require('../core/ftn_mail_packet.js');
+
+const argv = require('minimist')(process.argv.slice(2));
+
+function main() {
+	if(0 === argv._.length) {
+		console.error('usage: dump_ftn_packet.js PATH');
+		process.exitCode = -1;
+		return;
+	}
+
+	const packet = new Packet();
+	const packetPath = argv._[0];
+
+	packet.read(
+		packetPath,
+		(dataType, data, next) => {
+			if('header' === dataType) {
+				console.info('--- header ---');
+				console.info(`Created   : ${data.created.format('dddd, MMMM Do YYYY, h:mm:ss a')}`);
+				console.info(`Dst. Addr : ${data.destAddress.toString()}`);
+				console.info(`Src. Addr : ${data.origAddress.toString()}`);
+				console.info('--- raw header ---');
+				console.info(data);
+				console.info('--------------');
+				console.info('');
+			} else if('message' === dataType) {
+				console.info('--- message ---');
+				console.info(`To        : ${data.toUserName}`);
+				console.info(`From      : ${data.fromUserName}`);
+				console.info(`Subject   : ${data.subject}`);
+				console.info('--- raw message ---');
+				console.info(data);
+				console.info('---------------');
+			}
+
+			return next(null);
+		},
+		() => {
+			console.info('');
+			console.info('--- EOF --- ');
+			console.info('');
+		}
+	);
+}
+
+main();

From 136d21276c18f8ef5a2c4c3d8551230c78254e74 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 17:09:23 -0700
Subject: [PATCH 0117/1013] Add new scan pointers for mb/fb

---
 art/themes/luciano_blocktronics/FMENU.ANS     | Bin 3587 -> 3635 bytes
 art/themes/luciano_blocktronics/MSGMNU.ANS    | Bin 3361 -> 3510 bytes
 .../luciano_blocktronics/SETFNSDATE.ANS       | Bin 0 -> 407 bytes
 .../luciano_blocktronics/SETMNSDATE.ANS       | Bin 0 -> 512 bytes
 config/menu.hjson                             |  85 ++++++
 core/scanner_tossers/ftn_bso.js               |   7 +-
 core/set_newscan_date.js                      | 261 ++++++++++++++++++
 7 files changed, 349 insertions(+), 4 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/SETFNSDATE.ANS
 create mode 100644 art/themes/luciano_blocktronics/SETMNSDATE.ANS
 create mode 100644 core/set_newscan_date.js

diff --git a/art/themes/luciano_blocktronics/FMENU.ANS b/art/themes/luciano_blocktronics/FMENU.ANS
index a187491b8ea1d3615241ca70d469f5c0097bc40e..55879dd7e6b50547ef71dbaa3c7090cac8a5ddea 100644
GIT binary patch
delta 94
zcmZpc*(|f+E1RLEvvjm!Zh?Yyw1Ks;S#EJ^i9%j#xk7PrVxB@ler8@tYLP-pVo9oW
yw6S?EP^rP>?`)Y&CT5en*+VC%u`4qfSx)}R?l$=*yYglij+v~CCnn$HRRsXf`5%V>

delta 49
zcmdli(=4;$D;txE*<>~LOh(Je57{-C3@s*4WDlJj!67r5kHeYC%ye@h#~fD18I$?=
FQ~`Uh4jBLd

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index e27fed731dfca52ef127d946b6eb39994b54c8a0..ce6f4815645341d1f226f2de457a4156a048fe62 100644
GIT binary patch
delta 752
zcmZ9KJxc>Y5QZ@^iCzp?iJC-KG^m|>ce$u(`~WQ!D?u?;FlS82DtHH$e$;}-Ep60N
zEDVB$jac|A?%)dlfPX-6W^Q9J)v+`0`_6N-dq4V`zOJN<f=HJNE9nw18hW$FHFY#}
z(R_Fe+xk58p&$=>ZZoqW;A9ZF<<05FOu9rR12oc%JcSl>7A=O5UlAFF8Pbi`>FY;@
zQsh<WM(^DkQCLvmq5*kD!xF4fb6h5D$0=8B2f`4PbJ93Wi5$Cpymz3Qg%!CFTO1*w
z3U8?v9=W`X4QrHwtX#HYRqapAC5vaLuscU1s%?y_yMHv^9&bVq7g3Mz<U3YT>F~Jh
z&^}?#Uipw!%B~F!(&_EL{fzHsLnm!W7tcz8JH|VZs|jO}6c$kzO}%Ky^Tdp@g#?~*
zDGk`(5)(PRh=O7Sg{cb!6B<D?FErisoeiOo(uI!#n5;vtZ1%mUC_}M`m+k(sNQP+W
z4Ok)oLr8}pmXH_8CA!#;<TQChXk5~Fa_bb+aG`MaJdFjO=LJ6N$_N6+SP-aS+7t|e
eVpqxcQP^D#*greIBH#+G@@k+FSx?EIfyrOelHBG1

delta 591
zcmXw0J4?e*6vn2Hs4b|IHX>K7FK|fOG_e#!y`vy14q~TLYYH`5O~K9I(0WEebd@4L
zz}5etOCg2(CptNK&b{e&^PTT?PQHxiZ09WDa-(8(uPwb?$oodc<=x)Pyj4K7;Q9<_
z2s-#>s(Fb+ZS29aO@u9za490*^6viH#kxX@<f;^#QViKxPqR%9zcGNO)_}g&)a)XM
zgZPt9{>XOWFP`0?7M2wuet;D)+VO*W^`_RqRx~F8)dM%NJwsWDz8jS&)rC%CHY0s#
z59$1o@Qy}fzZH41)>Y7Em-Sob*Mp$y)gybVOe)_S5xw^L)uPH|*hrSZlHeszv?6Xb
zOrEaF9xk=FsgV;MMso8ue={m2@`YxqpgXFI4X>&7DJjhRA?_t%7^are^1?1TnPp)5
z9Bk=#(^13#ZSrdJqkpFqm47~tFT^sGf!P8%4u}5a4lJZs6a}w+m_FW9KLl%q;RF+5
n7>WUtY$X(oF(K%f0-y3R7!au5f{h3c7m&+b#J<vSpUM3LUG%O(

diff --git a/art/themes/luciano_blocktronics/SETFNSDATE.ANS b/art/themes/luciano_blocktronics/SETFNSDATE.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..8294a6f77500507586bd88cdb599655b6be825cb
GIT binary patch
literal 407
zcmb`By$=CF5XJ90*;eNgnMQ5)mLslOYl#HG`6#aPafQTa5dXcH+eN7|#qQ4Ryx)6K
zj%f>1)gb{<u40Pvwt4bP5%)4x2@S^+3w@ngnAt64M$cfNS2kiL|9aI^2=QJAo*-iq
z!<2+B#RIN~-35-jTj3l$7pYh7L1StqE2+F4gl8XTj{+{oj>#;Yt9)nkj8wUvvtRFf
zI^Ec$!;G)UW@QqjrgLBXByi9}aTc{quZ=}4DSxUMWfvtT^)Lv+a2`|wSJiQU3Y(Gk
H-S>O}v}aWs

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/SETMNSDATE.ANS b/art/themes/luciano_blocktronics/SETMNSDATE.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..4d3b43a314582ba6d98d9721010a2432cb717c88
GIT binary patch
literal 512
zcmb`DF;BxV5QUQsWo5(5EoH@yk*Ub!1gm051-QWADWtAcsTU*~1pk14jX2w(LJUlJ
zuyd#PzIzwucy-Pzd4UCUs$ou+_(``!U`|w0VQZ|_3j?*b2A1X#Y@?TOrB{ZLmjomX
zrh)*3VQwBM3j60_1E<iv_zob!I9}2R$C+(QqQ^J5h!Oi!0)>NrgMHr(u<k}5@drTg
z!>lzT0_ZKmVCp5sH;P84Mu{t3M?u_&B1{Ek9{l?Vo2}oiWAq=M=8jaA6w_ZwuBj&D
z{`CpB<8PC(VRMdWG4bu61X`~5yW+&^`^In{M*q_(xtMdo)kmIXd47`}W$_$e*DX9O
IbgB;b7b=f&VgLXD

literal 0
HcmV?d00001

diff --git a/config/menu.hjson b/config/menu.hjson
index 2225f274..8eaedb1e 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1766,6 +1766,10 @@
 					value: { command: "]" }
 					action: @systemMethod:nextArea
 				}
+				{
+					value: { command: "D" }
+					action: @menu:messageAreaSetNewScanDate
+				}
 				{
 					value: 1
 					action: @menu:messageArea
@@ -1803,6 +1807,47 @@
 			}
 		}
 
+		messageAreaSetNewScanDate: {
+			module: set_newscan_date
+			desc: Message Base
+			art: SETMNSDATE
+			config: {
+				target: message
+				scanDateFormat: YYYYMMDD
+			}
+			form: {
+				0: {
+					mci: {
+						ME1: {
+							focus: true
+							submit: true
+							argName: scanDate
+							maskPattern: "####/##/##"
+						}
+						SM2: {
+							argName: targetSelection
+							submit: false
+							justify: right
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { scanDate: null }
+								action: @method:scanDateSubmit
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape", "q", "shift + q" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
 		messageAreaChangeCurrentArea: {
 			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
@@ -2493,9 +2538,49 @@
 					value: { menuOption: "S" }
 					action: @menu:fileBaseSearch
 				}
+				{
+					value: { menuOption: "P" }
+					action: @menu:fileBaseSetNewScanDate
+				}
 			]
 		}
 
+		fileBaseSetNewScanDate: {
+			module: set_newscan_date
+			desc: File Base
+			art: SETFNSDATE
+			config: {
+				target: file
+				scanDateFormat: YYYYMMDD
+			}
+			form: {
+				0: {
+					mci: {
+						ME1: {
+							focus: true
+							submit: true
+							argName: scanDate
+							maskPattern: "####/##/##"
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { scanDate: null }
+								action: @method:scanDateSubmit
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape", "q", "shift + q" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
 		fileBaseListEntries: {
 			module: file_area_list
 			desc: Browsing Files
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 830e9daa..8da71d02 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -349,8 +349,8 @@ function FTNMessageScanTossModule() {
 				message.meta.FtnKludge.FMPT = localAddress.point;
 			}
 
-			if(_.get(message, 'meta.FtnProperty.ftn_dest_point', 0) > 0) {
-				message.meta.FtnKludge.TOPT = message.meta.FtnProperty.ftn_dest_point;
+			if(_.isNumber(options.destAddress.point) && options.destAddress.point > 0) {
+				message.meta.FtnKludge.TOPT = options.destAddress.point;
 			}
 		} else {
 			//	We need to set some destination info for EchoMail
@@ -1954,8 +1954,7 @@ function FTNMessageScanTossModule() {
 		//
 		//
 		//	:TODO: fill out the rest of the consts here
-		//	:TODO: this statement is crazy ugly
-		//	:TODO: this should really check for extenral "flavor" and not-already-exported state_flags0
+		//	:TODO: this statement is crazy ugly -- use JOIN / NOT EXISTS for state_flags & 0x02
 		const getNewUuidsSql =
 			`SELECT message_id, message_uuid
 			FROM message m
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
new file mode 100644
index 00000000..0e29e999
--- /dev/null
+++ b/core/set_newscan_date.js
@@ -0,0 +1,261 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const Errors						= require('./enig_error.js').Errors;
+const FileEntry						= require('./file_entry.js');
+const FileBaseFilters				= require('./file_base_filter.js');
+const { getAvailableFileAreaTags }	= require('./file_base_area.js');
+const {
+	getSortedAvailMessageConferences,
+	getSortedAvailMessageAreasByConfTag,
+	updateMessageAreaLastReadId,
+	getMessageIdNewerThanTimestampByArea
+}									= require('./message_area.js');
+const stringFormat					= require('./string_format.js');
+
+//	deps
+const async					= require('async');
+const moment				= require('moment');
+const _						= require('lodash');
+
+exports.moduleInfo = {
+	name	: 'Set New Scan Date',
+	desc	: 'Sets new scan date for applicable scans',
+	author	: 'NuSkooler',
+};
+
+const MciViewIds = {
+	main : {
+		scanDate		: 1,
+		targetSelection	: 2,
+	}
+};
+
+//	:TODO: for messages, we could insert "conf - all areas" into targets, and allow such
+
+exports.getModule = class SetNewScanDate extends MenuModule {
+	constructor(options) {
+		super(options);
+
+		const config = this.menuConfig.config;
+
+		this.target			= config.target || 'message';
+		this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';		
+
+		this.menuMethods = {
+			scanDateSubmit : (formData, extraArgs, cb) => {
+				let scanDate = _.get(formData, 'value.scanDate');
+				if(!scanDate) {
+					return cb(Errors.MissingParam('"scanDate" missing from form data'));
+				}
+
+				scanDate = moment(scanDate, this.scanDateFormat);
+				if(!scanDate.isValid()) {
+					return cb(Errors.Invalid(`"${_.get(formData, 'value.scanDate')}" is not a valid date`));
+				}
+
+				const targetSelection = _.get(formData, 'value.targetSelection');	//	may be undefined if N/A
+
+				this[`setNewScanDateFor${_.capitalize(this.target)}Base`](targetSelection, scanDate, () => {
+					return this.prevMenu(cb);
+				});
+			},
+		};
+	}
+
+	setNewScanDateForMessageBase(targetSelection, scanDate, cb) {
+		const target = this.targetSelections[targetSelection];
+		if(!target) {
+			return cb(Errors.UnexpectedState('Unable to get target in which to set new scan'));
+		}
+
+		//	selected area, or all of 'em
+		let updateAreaTags;
+		if('' === target.area.areaTag) {
+			updateAreaTags = this.targetSelections
+				.map( targetSelection => targetSelection.area.areaTag )
+				.filter( areaTag => areaTag );	//	remove the blank 'all' entry
+		} else {
+			updateAreaTags = [ target.area.areaTag ];
+		}
+
+		async.each(updateAreaTags, (areaTag, nextAreaTag) => {
+			getMessageIdNewerThanTimestampByArea(areaTag, scanDate, (err, messageId) => {
+				if(err) {
+					return nextAreaTag(err);
+				}
+
+				if(!messageId) {
+					return nextAreaTag(null);	//	nothing to do
+				}
+
+				messageId = Math.max(messageId - 1, 0);
+
+				return updateMessageAreaLastReadId(
+					this.client.user.userId,
+					areaTag,
+					messageId,
+					true,	//	allowOlder
+					nextAreaTag
+				);
+			});
+		}, err => {
+			return cb(err);
+		});
+	}
+
+	setNewScanDateForFileBase(targetSelection, scanDate, cb) {
+		//
+		//	ENiGMA doesn't currently have the concept of per-area
+		//	scan pointers for users, so we use all areas avail
+		//	to the user.
+		//
+		const filterCriteria = {
+			areaTag				: getAvailableFileAreaTags(this.client),
+			newerThanTimestamp	: scanDate,
+			limit				: 1,
+			orderBy				: 'upload_timestamp',
+			order				: 'ascending',
+		};
+
+		FileEntry.findFiles(filterCriteria, (err, fileIds) => {
+			if(err) {
+				return cb(err);
+			}
+
+			if(!fileIds || 0 === fileIds.length) {
+				//	nothing to do
+				return cb(null);
+			}
+
+			const pointerFileId = Math.max(fileIds[0] - 1, 0);
+
+			return FileBaseFilters.setFileBaseLastViewedFileIdForUser(
+				this.client.user,
+				pointerFileId,
+				true,	//	allowOlder
+				cb
+			);
+		});
+	}
+
+	loadAvailMessageBaseSelections(cb) {
+		//
+		//	Create an array of objects with conf/area information per entry,
+		//	sorted naturally or via the 'sort' member in config
+		//
+		const selections = [];
+		getSortedAvailMessageConferences(this.client).forEach(conf => {
+			getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).forEach(area => {
+				selections.push({
+					conf	: {
+						confTag : conf.confTag,
+						name	: conf.conf.name,
+						desc	: conf.conf.desc,
+					},
+					area	: {
+						areaTag	: area.areaTag,
+						name	: area.area.name,
+						desc	: area.area.desc,
+					}
+				});
+			});
+		});
+
+		selections.unshift({
+			conf : {
+				confTag	: '',
+				name	: 'All conferences',
+				desc	: 'All conferences',
+			},
+			area	: {
+				areaTag	: '',
+				name	: 'All areas',
+				desc	: 'All areas',
+			}
+		});
+
+		//	Find current conf/area & move it directly under "All"
+		const currConfTag 	= this.client.user.properties.message_conf_tag;
+		const currAreaTag	= this.client.user.properties.message_area_tag;
+		if(currConfTag && currAreaTag) {
+			const confAreaIndex = selections.findIndex( confArea => {
+				return confArea.conf.confTag === currConfTag && confArea.area.areaTag === currAreaTag;
+			});
+
+			if(confAreaIndex > -1) {
+				selections.splice(1, 0, selections.splice(confAreaIndex, 1)[0]);
+			}
+		}
+
+		this.targetSelections = selections;
+
+		return cb(null);
+	}
+
+	mciReady(mciData, cb) {
+		super.mciReady(mciData, err => {
+			if(err) {
+				return cb(err);
+			}
+
+			const self	= this;
+			const vc	= self.addViewController( 'main', new ViewController( { client : this.client } ) );
+
+			async.series(
+				[
+					function validateConfig(callback) {
+						if(![ 'message', 'file' ].includes(self.target)) {
+							return callback(Errors.Invalid(`Invalid "target" in config: ${self.target}`));
+						}
+						//	:TOD0: validate scanDateFormat
+						return callback(null);
+					},
+					function loadFromConfig(callback) {
+						return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
+					},
+					function loadAvailSelections(callback) {
+						switch(self.target) {
+							case 'message' :
+								return self.loadAvailMessageBaseSelections(callback);
+
+							default :
+								return callback(null);
+						}
+					},
+					function populateForm(callback) {
+						const today = moment();
+
+						const scanDateView = vc.getView(MciViewIds.main.scanDate);
+
+						//	:TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
+						const scanDateFormat = self.scanDateFormat.replace(/[\/\-. ]/g, '');
+						scanDateView.setText(today.format(scanDateFormat));
+
+						if('message' === self.target) {
+							const messageSelectionsFormat		= self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
+							const messageSelectionFocusFormat	= self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
+
+							const targetSelectionView = vc.getView(MciViewIds.main.targetSelection);
+
+							targetSelectionView.setItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
+							targetSelectionView.setFocusItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
+
+							targetSelectionView.setFocusItemIndex(0);
+						}
+
+						self.viewControllers.main.resetInitialFocus();
+						//vc.switchFocus(MciViewIds.main.scanDate);
+						return callback(null);
+					}
+				],
+				err => {
+					return cb(err);
+				}
+			);
+		});
+	}
+};

From 8804bcc5b26fd4cc3c306201272a5176e7fdcf35 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 19:40:40 -0700
Subject: [PATCH 0118/1013] * Luciano Blocktronics themed web download manager

---
 art/themes/luciano_blocktronics/FWDLMGR.ANS | Bin 0 -> 2410 bytes
 art/themes/luciano_blocktronics/theme.hjson |  21 ++++++++++++++++++++
 config/menu.hjson                           |   6 +++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 art/themes/luciano_blocktronics/FWDLMGR.ANS

diff --git a/art/themes/luciano_blocktronics/FWDLMGR.ANS b/art/themes/luciano_blocktronics/FWDLMGR.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..b0e7fffc2dc2b2135b582710406cce810fe22ed9
GIT binary patch
literal 2410
zcmb_eO;Zy=6a;T_^`yD%#k2bnvT9BNQfL(c6@)`hh(S`7(GtOfzl!4TWUJ<%Sa$cD
zncV<hEccKwZ{A0DzxOuurund+53Af|y=mc^W&8NXH@#`@U@x}uK_}Q+2mIyflx6(1
z?<|CD#t7XgrrF4rOG{Yy<MndcT8o#_3M>GGr#G!i_glpWE;|`-=^~tW4o>#>4n{lK
zWVAop9e-fd(EO_!u**8;LlxZxmVz;?Dsc|n5pjLFV0zRPJa;}{%)XwwnHkHR+1!u$
zFByofU;?PpC9z74qNwt~JwKil@FuW9BFf09vI?*fOiH)SvV%YK0S0?fq4I-X!KeBM
zpMur8<*P1AOI#;KJ-QhXRVfgVFeN2bk&Le*etCz<sMBb8v_2TC#47QsR-$ckbO|Ys
z_KG}exdQ2)TavtW+sGQI-gqX%ydd41NlE1W!4SIJiTF3waS}QjZBg#ry|$Rron3s%
z&gZkmXAGA0G|(y?W|aL|_5XBwb#}puS|jwF1Bn`h1qe-pL9yEshfGJD`z3}8U+}=E
z&4w`JXn^IeJ4#79oH^>MR#;jKS#qPAbYlPno7pY7f_BDx2LA=Xp`F|;l9!WAmoxY6
zC-wl;4K<?KWRbWB5b$d7z+*s3j0T<52Oh&6xd$eK%C3N92<fO1Lws~c253^#9e<h@
zLKkcSfV7O-i?3}dxIiIrf<xqCdnTu_Ql^BJ#274Qr<b8|ctPosJ57@SbTLT*5@>H)
zW@4{6G#i^06d43v_+CvSAvv6oNGe)d9MFScvV*yCOF0%x>Xh_hu>5uRpwOW|!bDBb
zD9Ka0@gc-eG?d95ri5}1f<h{T0DR-prXpeRdQ7p{mVlN<(7L^i(8MlWh6ErJ$3AEj
zrwD#&q?pL2!=waMn8cJMR%K|L5%EMpO`1#t3Zk|1HXqoC>^;ccTk`MM^Q&aXX0X!A
zP$U!(+};{t{X4YaqeTyL+}uR%IzEw~VTTeaSw|h?3s<#5Gu&_(_+~>{8R87Z8h_DO
zGFm=UPdmwEnyjEH7YLhUB?|rqb=aFVyzV^P;3ICL!MxCT$JE%+-LZPMqz%{H387R-
zKO6R+hu6O}e&gBU=;QV{&k^~*o-!}$ye!H`kJr}L*Wax@UDNaA?baka-W}N~ef|OA
Cy7z?u

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index d553ed83..19f63194 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -787,6 +787,27 @@
 				}
 			}
 
+			fileBaseWebDownloadManager: {
+				config: {
+					queueListFormat: "|00|03{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
+					focusQueueListFormat: "|00|19|15{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
+					queueManagerInfoFormat10: "|03batch|08: |03{webBatchDlLink}"
+					queueManagerInfoFormat11: "|03exp  |08: |03{webBatchDlExpire}"
+				}
+
+				0: {
+					mci: {
+						VM1: {
+							height: 8
+						}
+						HM2: {
+							width: 50
+							focusTextStyle: first lower
+						}
+					}
+				}
+			}
+
 			fileBaseUploadFiles: {
 				config: {
 					//	processing
diff --git a/config/menu.hjson b/config/menu.hjson
index 8eaedb1e..386c6f89 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -2530,6 +2530,10 @@
 					value: { menuOption: "D" }
 					action: @menu:fileBaseDownloadManager
 				}
+				{
+					value: { menuOption: "W" }
+					action: @menu:fileBaseWebDownloadManager
+				}
 				{
 					value: { menuOption: "U" }
 					action: @menu:fileBaseUploadFiles
@@ -3262,7 +3266,7 @@
 			art: ULNOAREA
 			options: {
 				pause: true
-				menuFlags: [ "noHistory" ]
+				menuFlags: [ "noHistory", "popParent" ]
 			}
 		}
 

From 28e4a5d8a298e6cee958f9725c6361f9b065d10d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 20:28:19 -0700
Subject: [PATCH 0119/1013] Add WHATSNEW.md

---
 WHATSNEW.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 WHATSNEW.md

diff --git a/WHATSNEW.md b/WHATSNEW.md
new file mode 100644
index 00000000..667c296f
--- /dev/null
+++ b/WHATSNEW.md
@@ -0,0 +1,26 @@
+# Whats New
+This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
+
+## 0.0.8-alpha
+* [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.
+* File descriptions (FILE_ID.DIZ, etc.) now support Renegade |## pipe, PCBoard, and other less common color codes found commonly in BBS era scene releases.
+* New menu stack flags: `noHistory` now works as expected, and a new addition of `popParent`. See the default `menu.hjson` for usage.
+* File structure changes making ENiGMA½ much easier to maintain and run in Docker. Thanks to RiPuk ([Dave Stephens](https://github.com/davestephens))! See [UPGRADE.md](UPGRADE.md) for details.
+* Switch to pure JS [xxhash](https://github.com/mscdex/node-xxhash) instead of farmhash. Too many issues on ARM and other less popular CPUs with farmhash ([Dave Stephens](https://github.com/davestephens))
+* Native [CombatNet](http://combatnet.us/) support! ([Dave Stephens](https://github.com/davestephens))
+* Fix various issues with legacy DOS Telnet terminals. Note that some may still have issues with extensive CPR usage by ENiGMA½ that will be addressed in a future release.
+* Added web (http://, https://) based download manager including batch downloads. Clickable links if using [VTXClient](https://github.com/codewar65/VTX_ClientServer)!
+* General VTX hyperlink support for web links
+* DEL vs Backspace key differences in FSE
+* Correly parse oddball `INTL`, `TOPT`, `FMPT`, `Via`, etc. FTN kludge lines
+* NetMail support! You can now send and receive NetMail. To send a NetMail address a external user using `Name <address>` format from your personal email menu. For example, `Foo Bar <123:123/123>`. The system also detects other formats such asa `Name @ address` (`Foo Bar@123:123/123`)
+* `oputil.js`: Added `mb areafix` command to quickly send AreaFix messages from the command line. You can manually send them from personal mail as well.
+* `oputil.js fb rm|remove|del|delete` functionality to remove file base entries
+* Users can now (re)set File and Message base pointers
+* Add `--update` option to `oputil.js fb scan`
+* Fix @watch path support for event scheduler including FTN, e.g. when looking for a `toss!.now` file produced by Binkd.
+
+...LOTS more!
+
+## Pre 0.0.8-alpha
+See GitHub
\ No newline at end of file

From 90706f87986f42a3e9faf807da3c44f3b0d9e280 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 14 Jan 2018 22:00:00 -0700
Subject: [PATCH 0120/1013] * Move to Node.js 8.x LTS * Update some packages

---
 WHATSNEW.md  | 4 ++++
 package.json | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 667c296f..594418a7 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -1,6 +1,10 @@
 # Whats New
 This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
 
+## 0.0.9-alpha
+* Development is now against Node.js 8.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
+
+
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.
 * File descriptions (FILE_ID.DIZ, etc.) now support Renegade |## pipe, PCBoard, and other less common color codes found commonly in BBS era scene releases.
diff --git a/package.json b/package.json
index 678628f1..b44cc894 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enigma-bbs",
-  "version": "0.0.8-alpha",
+  "version": "0.0.9-alpha",
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",
@@ -33,12 +33,12 @@
     "hashids": "^1.1.1",
     "hjson": "^3.1.0",
     "iconv-lite": "^0.4.18",
-    "inquirer": "^4.0.1",
+    "inquirer": "^5.0.0",
     "later": "1.2.0",
     "lodash": "^4.17.4",
     "mime-types": "^2.1.17",
     "minimist": "1.2.x",
-    "moment": "^2.20.0",
+    "moment": "^2.20.1",
     "nodemailer": "^4.4.1",
     "ptyw.js": "NuSkooler/ptyw.js",
     "rlogin": "^1.0.0",
@@ -50,7 +50,7 @@
     "temptmp": "^1.0.0",
     "uuid": "^3.1.0",
     "uuid-parse": "^1.0.0",
-    "ws": "^3.3.3",
+    "ws": "^4.0.0",
     "xxhash": "^0.2.4",
     "yazl": "^2.4.2"
   },

From a106050ba3c958b7099cc881f31b23517248e272 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 09:41:18 -0700
Subject: [PATCH 0121/1013] Fix attempts to load bad path

---
 core/events.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/events.js b/core/events.js
index 8e16a374..5febb463 100644
--- a/core/events.js
+++ b/core/events.js
@@ -48,17 +48,17 @@ module.exports = new class Events extends events.EventEmitter {
 				}
 
 				async.each(files, (moduleName, nextModule) => {
-					modulePath = paths.join(modulePath, moduleName);
+					const fullModulePath = paths.join(modulePath, moduleName);
 
 					try {
-						const mod = require(modulePath);
-						
+						const mod = require(fullModulePath);
+
 						if(_.isFunction(mod.registerEvents)) {
 							//	:TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
 							mod.registerEvents(this);
 						}
 					} catch(e) {
-
+						Log.warn( { error : e }, 'Exception during module "registerEvents"');
 					}
 
 					return nextModule(null);

From ac1433e84beda36d89044e7f889b317bf21771ad Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 12:22:11 -0700
Subject: [PATCH 0122/1013] * Code cleanup and eslint since -- remove unused
 variables, clean up RegExs, so on...

---
 core/abracadabra.js                    |  10 +-
 core/acs.js                            |   4 +-
 core/ansi_escape_parser.js             |  56 +++--
 core/ansi_prep.js                      |  22 +-
 core/ansi_term.js                      |  82 ++++----
 core/archive_util.js                   |  44 ++--
 core/art.js                            |  16 +-
 core/asset.js                          |   8 +-
 core/bbs.js                            |   2 +-
 core/bbs_link.js                       |  10 +-
 core/bbs_list.js                       |  16 +-
 core/button_view.js                    |   2 +-
 core/client.js                         |  46 ++---
 core/client_connections.js             |   2 +-
 core/client_term.js                    |  14 +-
 core/color_codes.js                    |  10 +-
 core/combatnet.js                      |  92 ++++-----
 core/conf_area_util.js                 |   2 +-
 core/config.js                         |   4 +-
 core/config_cache.js                   |   2 +-
 core/connect.js                        |   2 +-
 core/crc.js                            |   4 +-
 core/database.js                       |  12 +-
 core/door.js                           |  10 +-
 core/door_party.js                     |  42 ++--
 core/download_queue.js                 |   6 +-
 core/edit_text_view.js                 |   4 +-
 core/enig_error.js                     |   2 +-
 core/enigma_assert.js                  |   4 +-
 core/erc_client.js                     |  16 +-
 core/event_scheduler.js                |  82 ++++----
 core/exodus.js                         |   4 +-
 core/file_area_filter_edit.js          |  28 +--
 core/file_area_list.js                 |  54 ++---
 core/file_area_web.js                  |  12 +-
 core/file_base_area.js                 |  70 +++----
 core/file_base_area_select.js          |   2 +-
 core/file_base_download_manager.js     |   8 +-
 core/file_base_filter.js               |  16 +-
 core/file_base_search.js               |   2 +-
 core/file_base_web_download_manager.js |  27 ++-
 core/file_entry.js                     |  24 +--
 core/file_transfer.js                  |  40 ++--
 core/file_transfer_protocol_select.js  |   4 +-
 core/file_util.js                      |   4 +-
 core/fnv1a.js                          |  10 +-
 core/fse.js                            | 134 ++++++------
 core/ftn_address.js                    |   8 +-
 core/ftn_mail_packet.js                | 146 ++++++-------
 core/ftn_util.js                       |  62 +++---
 core/horizontal_menu_view.js           |   4 +-
 core/key_entry_view.js                 |   4 +-
 core/last_callers.js                   |  12 +-
 core/logger.js                         |   8 +-
 core/login_server_module.js            |   8 +-
 core/mail_packet.js                    |   2 +-
 core/mail_util.js                      |   2 +-
 core/mask_edit_text_view.js            |  16 +-
 core/mci_view_factory.js               |  25 ++-
 core/menu_module.js                    |  32 +--
 core/menu_stack.js                     |  10 +-
 core/menu_util.js                      |  44 ++--
 core/menu_view.js                      |  14 +-
 core/message.js                        | 112 +++++-----
 core/message_area.js                   |  98 ++++-----
 core/mime_util.js                      |   2 +-
 core/misc_util.js                      |   4 +-
 core/mod_mixins.js                     |   6 +-
 core/msg_area_list.js                  |  20 +-
 core/msg_area_post_fse.js              |   4 +-
 core/msg_area_view_fse.js              |   8 +-
 core/msg_conf_list.js                  |  18 +-
 core/msg_list.js                       |  38 ++--
 core/msg_network.js                    |   8 +-
 core/msg_scan_toss_module.js           |   6 +-
 core/multi_line_edit_text_view.js      |  29 ++-
 core/new_scan.js                       |  42 ++--
 core/nua.js                            |  16 +-
 core/onelinerz.js                      |  26 +--
 core/plugin_module.js                  |   2 +-
 core/predefined_mci.js                 |   8 +-
 core/rumorz.js                         |  18 +-
 core/sauce.js                          |   8 +-
 core/scanner_tossers/ftn_bso.js        |  25 ++-
 core/set_newscan_date.js               |   4 +-
 core/spinner_menu_view.js              |  23 +--
 core/stat_log.js                       |  18 +-
 core/stats.js                          |  30 ---
 core/status_bar_view.js                |  64 ------
 core/string_format.js                  |  30 +--
 core/string_util.js                    | 275 ++++---------------------
 core/system_menu_method.js             |  18 +-
 core/system_view_validate.js           |   8 +-
 core/telnet_bridge.js                  |  20 +-
 core/text_view.js                      |  50 ++---
 core/theme.js                          | 140 ++++++-------
 core/tic_file_info.js                  |  20 +-
 core/ticker_text_view.js               |  94 ---------
 core/toggle_menu_view.js               |  12 +-
 core/upload.js                         |  52 ++---
 core/user.js                           |  40 ++--
 core/user_config.js                    |  46 ++---
 core/user_group.js                     |  54 +++--
 core/user_list.js                      |   6 +-
 core/user_login.js                     |   8 +-
 core/uuid_util.js                      |  10 +-
 core/vertical_menu_view.js             |  16 +-
 core/view.js                           |  16 +-
 core/view_controller.js                |  70 +++----
 core/web_password_reset.js             |  19 +-
 core/whos_online.js                    |   2 +-
 core/word_wrap.js                      | 166 +++------------
 112 files changed, 1375 insertions(+), 1898 deletions(-)
 delete mode 100644 core/stats.js
 delete mode 100644 core/status_bar_view.js
 delete mode 100644 core/ticker_text_view.js

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 85d1e205..0ac17887 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -87,11 +87,11 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 			[
 				function validateNodeCount(callback) {
 					if(self.config.nodeMax > 0 &&
-						_.isNumber(activeDoorNodeInstances[self.config.name]) && 
+						_.isNumber(activeDoorNodeInstances[self.config.name]) &&
 						activeDoorNodeInstances[self.config.name] + 1 > self.config.nodeMax)
 					{
-						self.client.log.info( 
-							{ 
+						self.client.log.info(
+							{
 								name		: self.config.name,
 								activeCount : activeDoorNodeInstances[self.config.name]
 							},
@@ -118,11 +118,11 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 						} else {
 							activeDoorNodeInstances[self.config.name] = 1;
 						}
-						
+
 						callback(null);
 					}
 				},
-				function generateDropfile(callback) {					
+				function generateDropfile(callback) {
 					self.dropFile	= new DropFile(self.client, self.config.dropFileType);
 					var fullPath	= self.dropFile.fullPath;
 
diff --git a/core/acs.js b/core/acs.js
index f2e04b9f..9532ad78 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -13,7 +13,7 @@ class ACS {
 	constructor(client) {
 		this.client = client;
 	}
-	
+
 	check(acs, scope, defaultAcs) {
 		acs = acs ? acs[scope] : defaultAcs;
 		acs = acs || defaultAcs;
@@ -22,7 +22,7 @@ class ACS {
 		} catch(e) {
 			Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
 			return false;
-		}		
+		}
 	}
 
 	//
diff --git a/core/ansi_escape_parser.js b/core/ansi_escape_parser.js
index 7e777618..feb7b164 100644
--- a/core/ansi_escape_parser.js
+++ b/core/ansi_escape_parser.js
@@ -3,7 +3,9 @@
 
 const miscUtil	= require('./misc_util.js');
 const ansi		= require('./ansi_term.js');
+const Log		= require('./logger.js').log;
 
+//	deps
 const events	= require('events');
 const util		= require('util');
 const _			= require('lodash');
@@ -24,7 +26,7 @@ function ANSIEscapeParser(options) {
 	this.graphicRendition	= {};
 
 	this.parseState = {
-		re	: /(?:\x1b\x5b)([\?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,
+		re	: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
 	};
 
 	options = miscUtil.valueWithDefault(options, {
@@ -46,7 +48,7 @@ function ANSIEscapeParser(options) {
 		self.column	= Math.max(self.column, 1);
 		self.column	= Math.min(self.column, self.termWidth);	//	can't move past term width
 		self.row	= Math.max(self.row, 1);
-		
+
 		self.positionUpdated();
 	};
 
@@ -63,7 +65,7 @@ function ANSIEscapeParser(options) {
 		delete self.savedPosition;
 
 		self.positionUpdated();
-//		self.rowUpdated();
+		//		self.rowUpdated();
 	};
 
 	self.clearScreen = function() {
@@ -71,7 +73,7 @@ function ANSIEscapeParser(options) {
 		self.emit('clear screen');
 	};
 
-/*
+	/*
 	self.rowUpdated = function() {
 		self.emit('row update', self.row + self.scrollBack);
 	};*/
@@ -95,7 +97,7 @@ function ANSIEscapeParser(options) {
 					start = pos;
 
 					self.column = 1;
-					
+
 					self.positionUpdated();
 					break;
 
@@ -132,7 +134,7 @@ function ANSIEscapeParser(options) {
 		if(self.column > self.termWidth) {
 			self.column = 1;
 			self.row	+= 1;
-			
+
 			self.positionUpdated();
 		}
 
@@ -142,17 +144,9 @@ function ANSIEscapeParser(options) {
 		}
 	}
 
-	function getProcessedMCI(mci) {
-		if(self.mciReplaceChar.length > 0) {
-			return ansi.getSGRFromGraphicRendition(self.graphicRendition, true) + new Array(mci.length + 1).join(self.mciReplaceChar);
-		} else {
-			return mci;
-		}
-	}
-
 	function parseMCI(buffer) {
 		//	:TODO: move this to "constants" seciton @ top
-		var mciRe = /\%([A-Z]{2})([0-9]{1,2})?(?:\(([0-9A-Za-z,]+)\))*/g;
+		var mciRe = /%([A-Z]{2})([0-9]{1,2})?(?:\(([0-9A-Za-z,]+)\))*/g;
 		var pos = 0;
 		var match;
 		var mciCode;
@@ -186,27 +180,23 @@ function ANSIEscapeParser(options) {
 					self.graphicRenditionForErase = _.clone(self.graphicRendition);
 				}
 
-				
-				self.emit('mci', { 
-					mci		: mciCode, 
+
+				self.emit('mci', {
+					mci		: mciCode,
 					id		: id ? parseInt(id, 10) : null,
-					args	: args, 
+					args	: args,
 					SGR		: ansi.getSGRFromGraphicRendition(self.graphicRendition, true)
 				});
 
 				if(self.mciReplaceChar.length > 0) {
 					const sgrCtrl = ansi.getSGRFromGraphicRendition(self.graphicRenditionForErase);
-					
-					self.emit('control', sgrCtrl, 'm', sgrCtrl.slice(2).split(/[\;m]/).slice(0, 3));
+
+					self.emit('control', sgrCtrl, 'm', sgrCtrl.slice(2).split(/[;m]/).slice(0, 3));
 
 					literal(new Array(match[0].length + 1).join(self.mciReplaceChar));
 				} else {
 					literal(match[0]);
 				}
-
-				//literal(getProcessedMCI(match[0]));
-
-				//self.emit('chunk', getProcessedMCI(match[0]));
 			}
 
 		} while(0 !== mciRe.lastIndex);
@@ -220,7 +210,7 @@ function ANSIEscapeParser(options) {
 		self.parseState = {
 			//	ignore anything past EOF marker, if any
 			buffer	: input.split(String.fromCharCode(0x1a), 1)[0],
-			re		: /(?:\x1b\x5b)([\?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,
+			re		: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
 			stop	: false,
 		};
 	};
@@ -290,14 +280,14 @@ function ANSIEscapeParser(options) {
 						break;
 				}
 			}
-			
-			parseMCI(lastBit)
+
+			parseMCI(lastBit);
 		}
 
 		self.emit('complete');
 	};
 
-/*
+	/*
 	self.parse = function(buffer, savedRe) {
 		//	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
 		//	:TODO: move this to "constants" section @ top
@@ -382,12 +372,12 @@ function ANSIEscapeParser(options) {
 				break;
 
 			//	save position
-			case 's' : 
+			case 's' :
 				self.saveCursorPosition();
 				break;
 
 			//	restore position
-			case 'u' : 
+			case 'u' :
 				self.restoreCursorPosition();
 				break;
 
@@ -422,7 +412,7 @@ function ANSIEscapeParser(options) {
 
 							case 1 :
 							case 2 :
-							case 22 : 
+							case 22 :
 								self.graphicRendition.intensity = arg;
 								break;
 
@@ -448,7 +438,7 @@ function ANSIEscapeParser(options) {
 								break;
 
 							default :
-								console.log('Unknown attribute: ' + arg);	//	:TODO: Log properly
+								Log.trace( { attribute : arg }, 'Unknown attribute while parsing ANSI');
 								break;
 						}
 					}
diff --git a/core/ansi_prep.js b/core/ansi_prep.js
index 45b93d32..a4c894d8 100644
--- a/core/ansi_prep.js
+++ b/core/ansi_prep.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 const ANSIEscapeParser	= require('./ansi_escape_parser.js').ANSIEscapeParser;
 const ANSI				= require('./ansi_term.js');
-const { 
+const {
 	splitTextAtTerms,
 	renderStringLength
 }						= require('./string_util.js');
@@ -41,7 +41,7 @@ module.exports = function ansiPrep(input, options, cb) {
 		if(canvas[row]) {
 			return;
 		}
-		
+
 		canvas[row] = Array.from( { length : options.cols}, () => new Object() );
 	}
 
@@ -113,17 +113,17 @@ module.exports = function ansiPrep(input, options, cb) {
 			const lastCol = getLastPopulatedColumn(row) + 1;
 
 			let i;
-			line = options.indent ? 
+			line = options.indent ?
 				output.length > 0 ? ' '.repeat(options.indent) : '' :
 				'';
-				
+
 			for(i = 0; i < lastCol; ++i) {
 				const col = row[i];
 
-				sgr = !options.asciiMode && 0 === i ? 
+				sgr = !options.asciiMode && 0 === i ?
 					col.initialSgr ? ANSI.getSGRFromGraphicRendition(col.initialSgr) : '' :
 					'';
-				
+
 				if(!options.asciiMode && col.sgr) {
 					sgr += ANSI.getSGRFromGraphicRendition(col.sgr);
 				}
@@ -148,7 +148,7 @@ module.exports = function ansiPrep(input, options, cb) {
 		if(options.exportMode) {
 			//
 			//	If we're in export mode, we do some additional hackery:
-			//	
+			//
 			//	* Hard wrap ALL lines at <= 79 *characters* (not visible columns)
 			//	  if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
 			//	  represents chars to get back to the position we were previously at
@@ -157,8 +157,8 @@ module.exports = function ansiPrep(input, options, cb) {
 			//
 			//	:TODO: this would be better to do as part of the processing above, but this will do for now
 			const MAX_CHARS	= 79 - 8;	//	79 max, - 8 for max ESC seq's we may prefix a line with
-			let exportOutput = '';			
-			
+			let exportOutput = '';
+
 			let m;
 			let afterSeq;
 			let wantMore;
@@ -184,7 +184,7 @@ module.exports = function ansiPrep(input, options, cb) {
 								splitAt = m.index;
 								wantMore = false;	//	can't eat up any more
 							}
-							
+
 							break;	//	seq's beyond this point are >= MAX_CHARS
 						}
 					}
@@ -203,7 +203,7 @@ module.exports = function ansiPrep(input, options, cb) {
 					exportOutput += `${part}\r\n`;
 
 					if(fullLine.length > 0) {	//	more to go for this line?
-						exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;	
+						exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;
 					} else {
 						exportOutput += ANSI.up();
 					}
diff --git a/core/ansi_term.js b/core/ansi_term.js
index 7eb10ec2..0a1eaa41 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -3,7 +3,7 @@
 
 //
 //	ANSI Terminal Support Resources
-//	
+//
 //	ANSI-BBS
 //		* http://ansi-bbs.org/
 //
@@ -31,7 +31,7 @@
 //	For a board, we need to support the semi-standard ANSI-BBS "spec" which
 //	is bastardized mix of DOS ANSI.SYS, cterm.txt, bansi.txt and a little other.
 //	This gives us NetRunner, SyncTERM, EtherTerm, most *nix terminals, compatibilitiy
-//	with legit oldschool DOS terminals, and so on. 
+//	with legit oldschool DOS terminals, and so on.
 //
 
 //	ENiGMA½
@@ -113,7 +113,7 @@ const CONTROL = {
 	//
 	//	Support:
 	//	* SyncTERM: Works as expected
-	//	* NetRunner: 	
+	//	* NetRunner:
 	//
 	//	General Notes:
 	//	See also notes in bansi.txt and cterm.txt about the various
@@ -160,7 +160,7 @@ const SGRValues = {
 	negative		: 7,
 	hidden			: 8,
 
-	normal			: 22,	//	
+	normal			: 22,	//
 	steady			: 25,
 	positive		: 27,
 
@@ -203,7 +203,7 @@ function getBGColorValue(name) {
 //	:TODO: Create mappings for aliases... maybe make this a map to values instead
 //	:TODO: Break this up in to two parts:
 //	1) FONT_AND_CODE_PAGES (e.g. SyncTERM/cterm)
-//	2) SAUCE_FONT_MAP: Sauce name(s) -> items in FONT_AND_CODE_PAGES. 
+//	2) SAUCE_FONT_MAP: Sauce name(s) -> items in FONT_AND_CODE_PAGES.
 //	...we can then have getFontFromSAUCEName(sauceFontName)
 //	Also, create a SAUCE_ENCODING_MAP: SAUCE font name -> encodings
 
@@ -215,45 +215,45 @@ function getBGColorValue(name) {
 //
 const SYNCTERM_FONT_AND_ENCODING_TABLE = [
 	'cp437',
-	'cp1251', 
-	'koi8_r', 
-	'iso8859_2', 
-	'iso8859_4', 
-	'cp866',
-	'iso8859_9', 
-	'haik8', 
-	'iso8859_8', 
-	'koi8_u', 
-	'iso8859_15', 
+	'cp1251',
+	'koi8_r',
+	'iso8859_2',
 	'iso8859_4',
-	'koi8_r_b', 
-	'iso8859_4', 
-	'iso8859_5', 
-	'ARMSCII_8', 
+	'cp866',
+	'iso8859_9',
+	'haik8',
+	'iso8859_8',
+	'koi8_u',
 	'iso8859_15',
-	'cp850', 
-	'cp850', 
-	'cp885', 
-	'cp1251', 
-	'iso8859_7', 
-	'koi8-r_c',
-	'iso8859_4', 
-	'iso8859_1', 
-	'cp866', 
-	'cp437', 
-	'cp866', 
+	'iso8859_4',
+	'koi8_r_b',
+	'iso8859_4',
+	'iso8859_5',
+	'ARMSCII_8',
+	'iso8859_15',
+	'cp850',
+	'cp850',
 	'cp885',
-	'cp866_u', 
-	'iso8859_1', 
-	'cp1131', 
-	'c64_upper', 
+	'cp1251',
+	'iso8859_7',
+	'koi8-r_c',
+	'iso8859_4',
+	'iso8859_1',
+	'cp866',
+	'cp437',
+	'cp866',
+	'cp885',
+	'cp866_u',
+	'iso8859_1',
+	'cp1131',
+	'c64_upper',
 	'c64_lower',
-	'c128_upper', 
-	'c128_lower', 
-	'atari', 
-	'pot_noodle', 
+	'c128_upper',
+	'c128_lower',
+	'atari',
+	'pot_noodle',
 	'mo_soul',
-	'microknight_plus', 
+	'microknight_plus',
 	'topaz_plus',
 	'microknight',
 	'topaz',
@@ -289,7 +289,7 @@ const FONT_ALIAS_TO_SYNCTERM_MAP = {
 	'topaz'					: 'topaz',
 	'amiga_topaz_1'			: 'topaz',
 	'amiga_topaz_1+'		: 'topaz_plus',
-	'topazplus'				: 'topaz_plus',	
+	'topazplus'				: 'topaz_plus',
 	'topaz_plus'			: 'topaz_plus',
 	'amiga_topaz_2'			: 'topaz',
 	'amiga_topaz_2+'		: 'topaz_plus',
@@ -349,7 +349,7 @@ function setCursorStyle(cursorStyle) {
 		return `${ESC_CSI}${ps} q`;
 	}
 	return '';
-	
+
 }
 
 //	Create methods such as up(), nextLine(),...
diff --git a/core/archive_util.js b/core/archive_util.js
index 6d2644c8..00e48ed8 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -23,7 +23,7 @@ class Archiver {
 	}
 
 	ok() {
-		return this.canCompress() && this.canDecompress(); 
+		return this.canCompress() && this.canDecompress();
 	}
 
 	can(what) {
@@ -41,7 +41,7 @@ class Archiver {
 }
 
 module.exports = class ArchiveUtil {
-	
+
 	constructor() {
 		this.archivers = {};
 		this.longestSignature = 0;
@@ -93,7 +93,7 @@ module.exports = class ArchiveUtil {
 
 	getArchiver(mimeTypeOrExtension) {
 		mimeTypeOrExtension = resolveMimeType(mimeTypeOrExtension);
-		
+
 		if(!mimeTypeOrExtension) {	//	lookup returns false on failure
 			return;
 		}
@@ -103,21 +103,23 @@ module.exports = class ArchiveUtil {
 			return _.get( Config, [ 'archives', 'archivers', archiveHandler ] );
 		}
 	}
-	
+
 	haveArchiver(archType) {
 		return this.getArchiver(archType) ? true : false;
 	}
 
-	detectTypeWithBuf(buf, cb) {
-		//	:TODO: implement me!		
+	//	:TODO: implement me:
+	/*
+	detectTypeWithBuf(buf, cb) {		
 	}
+	*/
 
 	detectType(path, cb) {
 		fs.open(path, 'r', (err, fd) => {
 			if(err) {
 				return cb(err);
 			}
-			
+
 			const buf = new Buffer(this.longestSignature);
 			fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
 				if(err) {
@@ -140,7 +142,7 @@ module.exports = class ArchiveUtil {
 				});
 
 				return cb(archFormat ? null : Errors.General('Unknown type'), archFormat);
-			});			
+			});
 		});
 	}
 
@@ -153,15 +155,15 @@ module.exports = class ArchiveUtil {
 				err = Errors.ExternalProcess(`${action} failed: ${d.trim()}`);
 			}
 		});
-		
+
 		proc.once('exit', exitCode => {
 			return cb(exitCode ? Errors.ExternalProcess(`${action} failed with exit code: ${exitCode}`) : err);
-		});	
+		});
 	}
 
 	compressTo(archType, archivePath, files, cb) {
 		const archiver = this.getArchiver(archType);
-		
+
 		if(!archiver) {
 			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
 		}
@@ -189,13 +191,13 @@ module.exports = class ArchiveUtil {
 		if(!cb && _.isFunction(fileList)) {
 			cb = fileList;
 			fileList = [];
-			haveFileList = false;	
+			haveFileList = false;
 		} else {
 			haveFileList = true;
 		}
 
 		const archiver = this.getArchiver(archType);
-		
+
 		if(!archiver) {
 			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
 		}
@@ -211,7 +213,7 @@ module.exports = class ArchiveUtil {
 		const args = archiver[action].args.map( arg => {
 			return '{fileList}' === arg ? arg : stringFormat(arg, fmtObj);
 		});
-		
+
 		const fileListPos = args.indexOf('{fileList}');
 		if(fileListPos > -1) {
 			//	replace {fileList} with 0:n sep file list arguments
@@ -230,9 +232,9 @@ module.exports = class ArchiveUtil {
 
 	listEntries(archivePath, archType, cb) {
 		const archiver = this.getArchiver(archType);
-		
+
 		if(!archiver) {
-			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));			
+			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
 		}
 
 		const fmtObj = {
@@ -240,7 +242,7 @@ module.exports = class ArchiveUtil {
 		};
 
 		const args	= archiver.list.args.map( arg => stringFormat(arg, fmtObj) );
-		
+
 		let proc;
 		try {
 			proc = pty.spawn(archiver.list.cmd, args, this.getPtyOpts());
@@ -251,7 +253,7 @@ module.exports = class ArchiveUtil {
 		let output = '';
 		proc.on('data', data => {
 			//	:TODO: hack for: execvp(3) failed.: No such file or directory
-			
+
 			output += data;
 		});
 
@@ -273,16 +275,16 @@ module.exports = class ArchiveUtil {
 			}
 
 			return cb(null, entries);
-		});	
+		});
 	}
-	
+
 	getPtyOpts() {
 		return {
 			//	:TODO: cwd
 			name	: 'enigma-archiver',
 			cols	: 80,
 			rows	: 24,
-			env		: process.env,	
+			env		: process.env,
 		};
 	}
 };
diff --git a/core/art.js b/core/art.js
index 19e0bafe..546014bd 100644
--- a/core/art.js
+++ b/core/art.js
@@ -33,7 +33,7 @@ const SUPPORTED_ART_TYPES = {
 	'.pcb'	: { name : 'PCBoard',	defaultEncoding : 'cp437',	eof : 0x1a  },
 	'.bbs'	: { name : 'Wildcat',	defaultEncoding : 'cp437',	eof : 0x1a  },
 
-	'.amiga'	: { name : 'Amiga',			defaultEncoding	: 'amiga',	eof : 0x1a }, 
+	'.amiga'	: { name : 'Amiga',			defaultEncoding	: 'amiga',	eof : 0x1a },
 	'.txt'		: { name : 'Amiga Text',	defaultEncoding : 'cp437',	eof : 0x1a  },
 	//	:TODO: extentions for wwiv, renegade, celerity, syncronet, ...
 	//	:TODO: extension for atari
@@ -93,7 +93,7 @@ function getArtFromPath(path, options, cb) {
 			}
 
 			return result;
-		}	
+		}
 
 		if(options.readSauce === true) {
 			sauce.readSAUCE(data, (err, sauce) => {
@@ -164,7 +164,7 @@ function getArt(name, options, cb) {
 			const bn = paths.basename(file, fext).toLowerCase();
 			if(options.random) {
 				const suppliedBn = paths.basename(name, fext).toLowerCase();
-			
+
 				//
 				//  Random selection enabled. We'll allow for
 				//  basename1.ext, basename2.ext, ...
@@ -208,7 +208,7 @@ function getArt(name, options, cb) {
 
 			return getArtFromPath(readPath, options, cb);
 		}
-		
+
 		return cb(new Error(`No matching art for supplied criteria: ${name}`));
 	});
 }
@@ -287,7 +287,7 @@ function display(client, art, options, cb) {
 		return cb(null, mciMap, extraInfo);
 	}
 
-	if(!options.disableMciCache) {		
+	if(!options.disableMciCache) {
 		artHash	= xxhash.hash(new Buffer(art), 0xCAFEBABE);
 
 		//	see if we have a mciMap cached for this art
@@ -307,7 +307,7 @@ function display(client, art, options, cb) {
 			if(mciCprQueue.length > 0) {
 				mciMap[mciCprQueue.shift()].position = pos;
 
-				if(parseComplete && 0 === mciCprQueue.length) {					
+				if(parseComplete && 0 === mciCprQueue.length) {
 					return completed();
 				}
 			}
@@ -345,7 +345,7 @@ function display(client, art, options, cb) {
 		});
 	}
 
-	ansiParser.on('literal', literal => client.term.write(literal, false) );	
+	ansiParser.on('literal', literal => client.term.write(literal, false) );
 	ansiParser.on('control', control => client.term.rawWrite(control) );
 
 	ansiParser.on('complete', () => {
@@ -353,7 +353,7 @@ function display(client, art, options, cb) {
 
 		if(0 === mciCprQueue.length) {
 			return completed();
-		}		
+		}
 	});
 
 	let initSeq = '';
diff --git a/core/asset.js b/core/asset.js
index 9f2831b7..3f44a604 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -31,7 +31,7 @@ const ALL_ASSETS = [
 
 const ASSET_RE = new RegExp('\\@(' + ALL_ASSETS.join('|') + ')\\:([\\w\\d\\.]*)(?:\\/([\\w\\d\\_]+))*');
 
-function parseAsset(s) {	
+function parseAsset(s) {
 	const m = ASSET_RE.exec(s);
 
 	if(m) {
@@ -68,7 +68,7 @@ function getAssetWithShorthand(spec, defaultType) {
 
 function getArtAsset(spec) {
 	const asset = getAssetWithShorthand(spec, 'art');
-	
+
 	if(!asset) {
 		return null;
 	}
@@ -79,7 +79,7 @@ function getArtAsset(spec) {
 
 function getModuleAsset(spec) {
 	const asset = getAssetWithShorthand(spec, 'systemModule');
-	
+
 	if(!asset) {
 		return null;
 	}
@@ -105,7 +105,7 @@ function resolveConfigAsset(spec) {
 		return conf;
 	} else {
 		return spec;
-	}	
+	}
 }
 
 function resolveSystemStatAsset(spec) {
diff --git a/core/bbs.js b/core/bbs.js
index 43bf7cf3..c2f54802 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -182,7 +182,7 @@ function initialize(cb) {
 				return database.initializeDatabases(callback);
 			},
 			function initMimeTypes(callback) {
-				return require('./mime_util.js').startup(callback);	
+				return require('./mime_util.js').startup(callback);
 			},
 			function initStatLog(callback) {
 				return require('./stat_log.js').init(callback);
diff --git a/core/bbs_link.js b/core/bbs_link.js
index be341115..15416c2e 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -23,10 +23,10 @@ const packageJson 	= require('../package.json');
 			authCode: XXXXX
 			schemeCode: XXXX
 			door: lord
-			
+
 			//	default hoss: games.bbslink.net
 			host: games.bbslink.net
-			
+
 			//	defualt port: 23
 			port: 23
 		}
@@ -49,7 +49,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
 		this.config			= options.menuConfig.config;
 		this.config.host	= this.config.host || 'games.bbslink.net';
 		this.config.port	= this.config.port || 23;
-	}	
+	}
 
 	initSequence() {
 		let token;
@@ -141,7 +141,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
 						self.client.once('end', function clientEnd() {
 							self.client.log.info('Connection ended. Terminating BBSLink connection');
 							clientTerminated = true;
-							bridgeConnection.end();						
+							bridgeConnection.end();
 						});
 					});
 
@@ -170,7 +170,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
 			],
 			function complete(err) {
 				if(err) {
-					self.client.log.warn( { error : err.toString() }, 'BBSLink connection error');					
+					self.client.log.warn( { error : err.toString() }, 'BBSLink connection error');
 				}
 
 				if(!clientTerminated) {
diff --git a/core/bbs_list.js b/core/bbs_list.js
index 33a7ff59..5c81f478 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 const MenuModule			= require('./menu_module.js').MenuModule;
 
-const { 
+const {
 	getModDatabasePath,
 	getTransactionDatabase
 }							= require('./database.js');
@@ -39,7 +39,7 @@ const MciViewIds = {
 		SelectedBBSLoc			: 6,
 		SelectedBBSSoftware		: 7,
 		SelectedBBSNotes		: 8,
-		SelectedBBSSubmitter	: 9,		
+		SelectedBBSSubmitter	: 9,
 	},
 	add : {
 		BBSName		: 1,
@@ -49,7 +49,7 @@ const MciViewIds = {
 		Location	: 5,
 		Software	: 6,
 		Notes		: 7,
-		Error		: 8,	
+		Error		: 8,
 	}
 };
 
@@ -190,12 +190,12 @@ exports.getModule = class BBSListModule extends MenuModule {
 
 	drawSelectedEntry(entry) {
 		if(!entry) {
-			Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {						
+			Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
 				this.setViewText('view', MciViewIds.view[mciName], '');
 			});
 		} else {
 			const youSubmittedFormat = this.menuConfig.youSubmittedFormat || '{submitter} (You!)';
-			
+
 			Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
 				const t = entry[SELECTED_MCI_NAME_TO_ENTRY[mciName]];
 				if(MciViewIds.view[mciName]) {
@@ -270,7 +270,7 @@ exports.getModule = class BBSListModule extends MenuModule {
 						(err, row) => {
 							if (!err) {
 								self.entries.push({
-									id				: row.id, 
+									id				: row.id,
 									bbsName			: row.bbs_name,
 									sysOp			: row.sysop,
 									telnet			: row.telnet,
@@ -306,9 +306,9 @@ exports.getModule = class BBSListModule extends MenuModule {
 
 					entriesView.on('index update', idx => {
 						const entry = self.entries[idx];
-						
+
 						self.drawSelectedEntry(entry);
-						
+
 						if(!entry) {
 							self.selectedBBS = -1;
 						} else {
diff --git a/core/button_view.js b/core/button_view.js
index 570adc09..d5b858c7 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -22,7 +22,7 @@ ButtonView.prototype.onKeyPress = function(ch, key) {
 	if(this.isKeyMapped('accept', key.name) || ' ' === ch) {
 		this.submitData = 'accept';
 		this.emit('action', 'accept');
-		delete this.submitData;		
+		delete this.submitData;
 	} else {
 		ButtonView.super_.prototype.onKeyPress.call(this, ch, key);
 	}
diff --git a/core/client.js b/core/client.js
index 424748a6..58700c8f 100644
--- a/core/client.js
+++ b/core/client.js
@@ -52,8 +52,8 @@ exports.Client	= Client;
 //	Resources & Standards:
 //	* http://www.ansi-bbs.org/ansi-bbs-core-server.html
 //
-const RE_DSR_RESPONSE_ANYWHERE		= /(?:\u001b\[)([0-9\;]+)(R)/;
-const RE_DEV_ATTR_RESPONSE_ANYWHERE	= /(?:\u001b\[)[\=\?]([0-9a-zA-Z\;]+)(c)/;
+const RE_DSR_RESPONSE_ANYWHERE		= /(?:\u001b\[)([0-9;]+)(R)/;
+const RE_DEV_ATTR_RESPONSE_ANYWHERE	= /(?:\u001b\[)[=?]([0-9a-zA-Z;]+)(c)/;
 const RE_META_KEYCODE_ANYWHERE		= /(?:\u001b)([a-zA-Z0-9])/;
 const RE_META_KEYCODE				= new RegExp('^' + RE_META_KEYCODE_ANYWHERE.source + '$');
 const RE_FUNCTION_KEYCODE_ANYWHERE	= new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:' + [
@@ -64,19 +64,19 @@ const RE_FUNCTION_KEYCODE_ANYWHERE	= new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:'
 
 const RE_FUNCTION_KEYCODE			= new RegExp('^' + RE_FUNCTION_KEYCODE_ANYWHERE.source);
 const RE_ESC_CODE_ANYWHERE			= new RegExp( [
-	RE_FUNCTION_KEYCODE_ANYWHERE.source, 
-	RE_META_KEYCODE_ANYWHERE.source, 
+	RE_FUNCTION_KEYCODE_ANYWHERE.source,
+	RE_META_KEYCODE_ANYWHERE.source,
 	RE_DSR_RESPONSE_ANYWHERE.source,
 	RE_DEV_ATTR_RESPONSE_ANYWHERE.source,
 	/\u001b./.source
 ].join('|'));
 
 
-function Client(input, output) {
+function Client(/*input, output*/) {
 	stream.call(this);
 
 	const self	= this;
-	
+
 	this.user				= new User();
 	this.currentTheme		= { info : { name : 'N/A', description : 'None' } };
 	this.lastKeyPressMs		= Date.now();
@@ -125,9 +125,9 @@ function Client(input, output) {
 
 		if(!termClient) {
 			if(_.startsWith(deviceAttr, '67;84;101;114;109')) {
-				//	
+				//
 				//	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
-				//	
+				//
 				//	Known clients:
 				//	* SyncTERM
 				//
@@ -139,11 +139,11 @@ function Client(input, output) {
 	};
 
 	this.isMouseInput = function(data) {
-		return /\x1b\[M/.test(data) ||
-			/\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) || 
+		return /\x1b\[M/.test(data) ||							//	eslint-disable-line no-control-regex
+			/\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||	//	eslint-disable-line no-control-regex
 			/\u001b\[(\d+;\d+;\d+)M/.test(data) ||
 			/\u001b\[<(\d+;\d+;\d+)([mM])/.test(data) ||
-			/\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) || 
+			/\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) ||
 			/\u001b\[24([0135])~\[(\d+),(\d+)\]\r/.test(data) ||
 			/\u001b\[(O|I)/.test(data);
 	};
@@ -163,7 +163,7 @@ function Client(input, output) {
 			'OE' : { name : 'clear' },
 			'OF' : { name : 'end' },
 			'OH' : { name : 'home' },
-			
+
 			//	xterm/rxvt
 			'[11~'	: { name : 'f1' },
 			'[12~'	: { name : 'f2' },
@@ -290,7 +290,7 @@ function Client(input, output) {
 						if(self.cprOffset) {
 							cprArgs[0] = cprArgs[0] + self.cprOffset;
 							cprArgs[1] = cprArgs[1] + self.cprOffset;
-						}				
+						}
 						self.emit('cursor position report', cprArgs);
 					}
 				}
@@ -299,7 +299,7 @@ function Client(input, output) {
 				var termClient = self.getTermClient(parts[1]);
 				if(termClient) {
 					self.term.termClient = termClient;
-				}				
+				}
 			} else if('\r' === s) {
 				key.name = 'return';
 			} else if('\n' === s) {
@@ -347,10 +347,10 @@ function Client(input, output) {
 				key.meta	= true;
 				key.shift	= /^[A-Z]$/.test(parts[1]);
 			} else if((parts = RE_FUNCTION_KEYCODE.exec(s))) {
-				var code = 
+				var code =
 					(parts[1] || '') + (parts[2] || '') +
 					(parts[4] || '') + (parts[9] || '');
-				
+
 				var modifier = (parts[3] || parts[8] || 1) - 1;
 
 				key.ctrl	= !!(modifier & 4);
@@ -375,7 +375,7 @@ function Client(input, output) {
 				//
 				//	Adjust name for CTRL/Shift/Meta modifiers
 				//
-				key.name = 
+				key.name =
 					(key.ctrl ? 'ctrl + ' : '') +
 					(key.meta ? 'meta + ' : '') +
 					(key.shift ? 'shift + ' : '') +
@@ -446,7 +446,7 @@ Client.prototype.end = function () {
 	}
 
 	clearInterval(this.idleCheck);
-	
+
 	try {
 		//
 		//	We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
@@ -482,7 +482,7 @@ Client.prototype.isLocal = function() {
 ///////////////////////////////////////////////////////////////////////////////
 
 //	:TODO: getDefaultHandler(name) -- handlers in default_handlers.js or something
-Client.prototype.defaultHandlerMissingMod = function(err) {
+Client.prototype.defaultHandlerMissingMod = function() {
 	var self = this;
 
 	function handler(err) {
@@ -493,12 +493,12 @@ Client.prototype.defaultHandlerMissingMod = function(err) {
 		self.term.write('This has been logged for your SysOp to review.\n');
 		self.term.write('\nGoodbye!\n');
 
-		
+
 		//self.term.write(err);
 
 		//if(miscUtil.isDevelopment() && err.stack) {
 		//	self.term.write('\n' + err.stack + '\n');
-		//}		
+		//}
 
 		self.end();
 	}
@@ -516,8 +516,8 @@ Client.prototype.terminalSupports = function(query) {
 
 		case 'vtx_hyperlink' :
 			return 'vtx' === termClient;
-		
-		default : 
+
+		default :
 			return false;
 	}
 };
diff --git a/core/client_connections.js b/core/client_connections.js
index 7e74e29d..d81d0922 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -95,7 +95,7 @@ function removeClient(client) {
 				clientId		: client.session.id
 			},
 			'Client disconnected'
-			);
+		);
 
 		Events.emit('codes.l33t.enigma.system.disconnected', { client : client, connectionCount : clientConnections.length } );
 	}
diff --git a/core/client_term.js b/core/client_term.js
index b313841e..b944988d 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -15,8 +15,6 @@ exports.ClientTerminal	= ClientTerminal;
 function ClientTerminal(output) {
 	this.output		= output;
 
-	var self = this;
-
 	var outputEncoding = 'cp437';
 	assert(iconv.encodingExists(outputEncoding));
 
@@ -56,7 +54,7 @@ function ClientTerminal(output) {
 		},
 		set : function(ttype) {
 			termType = ttype.toLowerCase();
-			
+
 			if(this.isANSI()) {
 				this.outputEncoding = 'cp437';
 			} else {
@@ -137,7 +135,7 @@ ClientTerminal.prototype.isANSI = function() {
 	//
 	//	syncterm:
 	//		* SyncTERM
-	//	
+	//
 	//	xterm:
 	//		* PuTTY
 	//
@@ -168,7 +166,7 @@ ClientTerminal.prototype.rawWrite = function(s, cb) {
 			if(cb) {
 				return cb(err);
 			}
-			
+
 			if(err) {
 				Log.warn( { error : err.message }, 'Failed writing to socket');
 			}
@@ -178,18 +176,18 @@ ClientTerminal.prototype.rawWrite = function(s, cb) {
 
 ClientTerminal.prototype.pipeWrite = function(s, spec, cb) {
 	spec = spec || 'renegade';
-	
+
 	var conv = {
 		enigma		: enigmaToAnsi,
 		renegade	: renegadeToAnsi,
 	}[spec] || renegadeToAnsi;
-	
+
 	this.write(conv(s, this), null, cb);	//	null = use default for |convertLineFeeds|
 };
 
 ClientTerminal.prototype.encode = function(s, convertLineFeeds) {
 	convertLineFeeds = _.isBoolean(convertLineFeeds) ? convertLineFeeds : this.convertLF;
-	
+
 	if(convertLineFeeds && _.isString(s)) {
 		s = s.replace(/\n/g, '\r\n');
 	}
diff --git a/core/color_codes.js b/core/color_codes.js
index 2e368aa3..db9f4fe5 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -68,14 +68,14 @@ function enigmaToAnsi(s, client) {
 				attr = ansi.sgr(['normal', val - 8, 'bold']);
 			}
 
-			result += s.substr(lastIndex, m.index - lastIndex) + attr;			
+			result += s.substr(lastIndex, m.index - lastIndex) + attr;
 		}
 
 		lastIndex = re.lastIndex;
 	}
 
 	result = (0 === result.length ? s : result + s.substr(lastIndex));
-    
+
 	return result;
 }
 
@@ -145,7 +145,7 @@ function renegadeToAnsi(s, client) {
 		}
 
 		//	convert to number
-		val = parseInt(val, 10);		
+		val = parseInt(val, 10);
 		if(isNaN(val)) {
 			val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
 		}
@@ -160,7 +160,7 @@ function renegadeToAnsi(s, client) {
 		lastIndex = re.lastIndex;
 	}
 
-	return (0 === result.length ? s : result + s.substr(lastIndex));	
+	return (0 === result.length ? s : result + s.substr(lastIndex));
 }
 
 //
@@ -180,7 +180,7 @@ function renegadeToAnsi(s, client) {
 //	* http://wiki.synchro.net/custom:colors
 //
 function controlCodesToAnsi(s, client) {
-	const RE = /(\|([A-Z0-9]{2})|\|)|(\@X([0-9A-F]{2}))|(\@([0-9A-F]{2})\@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
+	const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
 
 	let m;
 	let result		= '';
diff --git a/core/combatnet.js b/core/combatnet.js
index 6cde9c7b..217e6d17 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -25,10 +25,10 @@ exports.getModule = class CombatNetModule extends MenuModule {
 		this.config.host		= this.config.host || 'bbs.combatnet.us';
 		this.config.rloginPort	= this.config.rloginPort || 4513;
 	}
-	
+
 	initSequence() {
 		const self = this;
-		
+
 		async.series(
 			[
 				function validateConfig(callback) {
@@ -45,59 +45,59 @@ exports.getModule = class CombatNetModule extends MenuModule {
 					self.client.term.write('Connecting to CombatNet, please wait...\n');
 
 					const restorePipeToNormal = function() {
-                        self.client.term.output.removeListener('data', sendToRloginBuffer);
+						self.client.term.output.removeListener('data', sendToRloginBuffer);
 					};
 
-                    const rlogin = new RLogin(
-                        {	'clientUsername' : self.config.password,
-                            'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
-                            'host' : self.config.host,
-                            'port' : self.config.rloginPort,
-                            'terminalType' : self.client.term.termClient,
-                            'terminalSpeed' : 57600
-                        }
-                    );
+					const rlogin = new RLogin(
+						{	'clientUsername' : self.config.password,
+							'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
+							'host' : self.config.host,
+							'port' : self.config.rloginPort,
+							'terminalType' : self.client.term.termClient,
+							'terminalSpeed' : 57600
+						}
+					);
 
-                    // If there was an error ...
-                    rlogin.on('error', err => {
-                    	self.client.log.info(`CombatNet rlogin client error: ${err.message}`);
-                    	restorePipeToNormal();
-                        callback(err);
-                    });
+					// If there was an error ...
+					rlogin.on('error', err => {
+						self.client.log.info(`CombatNet rlogin client error: ${err.message}`);
+						restorePipeToNormal();
+						return callback(err);
+					});
 
-                    // If we've been disconnected ...
-                    rlogin.on('disconnect', () => {
-                        self.client.log.info(`Disconnected from CombatNet`);
-                    	restorePipeToNormal();
-                    	callback(null);
-                    });
+					// If we've been disconnected ...
+					rlogin.on('disconnect', () => {
+						self.client.log.info('Disconnected from CombatNet');
+						restorePipeToNormal();
+						return callback(null);
+					});
 
-                    function sendToRloginBuffer(buffer) {
-                        rlogin.send(buffer);
-                    };
+					function sendToRloginBuffer(buffer) {
+						rlogin.send(buffer);
+					}
 
-                    rlogin.on("connect",
-                        /*	The 'connect' event handler will be supplied with one argument,
+					rlogin.on('connect',
+						/*	The 'connect' event handler will be supplied with one argument,
                             a boolean indicating whether or not the connection was established. */
 
-                        function(state) {
-                            if(state) {
-                                self.client.log.info('Connected to CombatNet');
-                                self.client.term.output.on('data', sendToRloginBuffer);
+						function(state) {
+							if(state) {
+								self.client.log.info('Connected to CombatNet');
+								self.client.term.output.on('data', sendToRloginBuffer);
 
-                            } else {
-                                return callback(new Error('Failed to establish establish CombatNet connection'));
-                            }
-                        }
-                    );
+							} else {
+								return callback(new Error('Failed to establish establish CombatNet connection'));
+							}
+						}
+					);
 
-                    // If data (a Buffer) has been received from the server ...
-                    rlogin.on("data", (data) => {
-                            self.client.term.rawWrite(data);
-                    });
+					// If data (a Buffer) has been received from the server ...
+					rlogin.on('data', (data) => {
+						self.client.term.rawWrite(data);
+					});
 
-                    // connect...
-                    rlogin.connect();
+					// connect...
+					rlogin.connect();
 
 					//	note: no explicit callback() until we're finished!
 				}
@@ -106,10 +106,10 @@ exports.getModule = class CombatNetModule extends MenuModule {
 				if(err) {
 					self.client.log.warn( { error : err.message }, 'CombatNet error');
 				}
-				
+
 				//	if the client is still here, go to previous
 				self.prevMenu();
 			}
 		);
-	}	
+	}
 };
diff --git a/core/conf_area_util.js b/core/conf_area_util.js
index 5dabfb73..6b71061b 100644
--- a/core/conf_area_util.js
+++ b/core/conf_area_util.js
@@ -10,7 +10,7 @@ exports.sortAreasOrConfs	= sortAreasOrConfs;
 //	Method for sorting message, file, etc. areas and confs
 //	If the sort key is present and is a number, sort in numerical order;
 //	Otherwise, use a locale comparison on the sort key or name as a fallback
-// 
+//
 function sortAreasOrConfs(areasOrConfs, type) {
 	let entryA;
 	let entryB;
diff --git a/core/config.js b/core/config.js
index 62ce6032..79824db5 100644
--- a/core/config.js
+++ b/core/config.js
@@ -653,12 +653,12 @@ function getDefaultConfig() {
 				//	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
 				//	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
 				desc		: [
-					'^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'
+					'^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'	//	eslint-disable-line no-useless-escape
 				],
 
 				//	common README filename - https://en.wikipedia.org/wiki/README
 				descLong		: [
-					'^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'
+					'^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'	//	eslint-disable-line no-useless-escape
 				],
 			},
 
diff --git a/core/config_cache.js b/core/config_cache.js
index 8b57e125..875e1b2e 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -58,7 +58,7 @@ util.inherits(ConfigCache, events.EventEmitter);
 ConfigCache.prototype.getConfigWithOptions = function(options, cb) {
 	assert(_.isString(options.filePath));
 
-//	var self		= this;
+	//	var self		= this;
 	var isCached	= (options.filePath in this.cache);
 
 	if(options.forceReCache || !isCached) {
diff --git a/core/connect.js b/core/connect.js
index b94fa586..aae1b8c6 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -98,7 +98,7 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 				source		: 'ANSI CPR'
 			},
 			'Window size updated'
-			);
+		);
 
 		return done(null);
 	};
diff --git a/core/crc.js b/core/crc.js
index 886dad1d..e4bd8551 100644
--- a/core/crc.js
+++ b/core/crc.js
@@ -10,7 +10,7 @@ exports.CRC32 = class CRC32 {
 	}
 
 	update(input) {
-		input = Buffer.isBuffer(input) ? input : Buffer.from(input, 'binary');		
+		input = Buffer.isBuffer(input) ? input : Buffer.from(input, 'binary');
 		return input.length > 10240 ? this.update_8(input) : this.update_4(input);
 	}
 
@@ -47,7 +47,7 @@ exports.CRC32 = class CRC32 {
 			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++] ) & 0xff ];
 		}
 	}
-	
+
 	finalize() {
 		return (this.crc ^ (-1)) >>> 0;
 	}
diff --git a/core/database.js b/core/database.js
index 14b3bf95..10331fc0 100644
--- a/core/database.js
+++ b/core/database.js
@@ -36,12 +36,12 @@ function getModDatabasePath(moduleInfo, suffix) {
 	//	Mods that use a database are stored in Config.paths.modsDb (e.g. enigma-bbs/db/mods)
 	//	We expect that moduleInfo defines packageName which will be the base of the modules
 	//	filename. An optional suffix may be supplied as well.
-	//	
-	const HOST_RE = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
+	//
+	const HOST_RE = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
 
 	assert(_.isObject(moduleInfo));
 	assert(_.isString(moduleInfo.packageName), 'moduleInfo must define "packageName"!');
-	
+
 	let full = moduleInfo.packageName;
 	if(suffix) {
 		full += `.${suffix}`;
@@ -198,7 +198,7 @@ const DB_INIT_TABLE = {
 				DELETE FROM message_fts WHERE docid=old.rowid;
 			END;`
 		);
-			
+
 		dbs.message.run(
 			`CREATE TRIGGER IF NOT EXISTS message_before_delete BEFORE DELETE ON message BEGIN
 				DELETE FROM message_fts WHERE docid=old.rowid;
@@ -256,14 +256,14 @@ const DB_INIT_TABLE = {
 				UNIQUE(user_id, area_tag)
 			);`
 		);
-		
+
 		dbs.message.run(
 			`CREATE TABLE IF NOT EXISTS message_area_last_scan (
 				scan_toss		VARCHAR NOT NULL,
 				area_tag		VARCHAR NOT NULL,
 				message_id		INTEGER NOT NULL,
 				UNIQUE(scan_toss, area_tag)
-			);`	
+			);`
 		);
 
 		return cb(null);
diff --git a/core/door.js b/core/door.js
index 5670db1e..525a7a02 100644
--- a/core/door.js
+++ b/core/door.js
@@ -20,7 +20,7 @@ function Door(client, exeInfo) {
 	this.exeInfo			= exeInfo;
 	this.exeInfo.encoding	= this.exeInfo.encoding || 'cp437';
 	this.exeInfo.encoding	= this.exeInfo.encoding.toLowerCase();
-	let restored			= false;	
+	let restored			= false;
 
 	//
 	//	Members of exeInfo:
@@ -52,7 +52,7 @@ function Door(client, exeInfo) {
 	};
 
 	this.prepareSocketIoServer = function(cb) {
-		if('socket' === self.exeInfo.io) {			
+		if('socket' === self.exeInfo.io) {
 			const sockServer =  createServer(conn => {
 
 				sockServer.getConnections( (err, count) => {
@@ -60,11 +60,11 @@ function Door(client, exeInfo) {
 					//	We expect only one connection from our DOOR/emulator/etc.
 					if(!err && count <= 1) {
 						self.client.term.output.pipe(conn);
-						
+
 						conn.on('data', self.doorDataHandler);
 
 						conn.once('end', () => {
-							return self.restoreIo(conn);									
+							return self.restoreIo(conn);
 						});
 
 						conn.once('error', err => {
@@ -117,7 +117,7 @@ Door.prototype.run = function() {
 			rows : self.client.term.termHeight,
 			//	:TODO: cwd
 			env	: self.exeInfo.env,
-		});				
+		});
 
 		if('stdio' === self.exeInfo.io) {
 			self.client.log.debug('Using stdio for door I/O');
diff --git a/core/door_party.js b/core/door_party.js
index 762f626b..a64f92c8 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -24,13 +24,13 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 		this.config				= options.menuConfig.config;
 		this.config.host		= this.config.host || 'dp.throwbackbbs.com';
 		this.config.sshPort 	= this.config.sshPort || 2022;
-		this.config.rloginPort	= this.config.rloginPort || 513;	
+		this.config.rloginPort	= this.config.rloginPort || 513;
 	}
-	
+
 	initSequence() {
 		let clientTerminated;
 		const self = this;
-		
+
 		async.series(
 			[
 				function validateConfig(callback) {
@@ -48,26 +48,26 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 				function establishSecureConnection(callback) {
 					self.client.term.write(resetScreen());
 					self.client.term.write('Connecting to DoorParty, please wait...\n');
-									
+
 					const sshClient = new SSHClient();
-					
+
 					let pipeRestored = false;
 					let pipedStream;
 					const restorePipe = function() {
 						if(pipedStream && !pipeRestored && !clientTerminated) {
-							self.client.term.output.unpipe(pipedStream);						
+							self.client.term.output.unpipe(pipedStream);
 							self.client.term.output.resume();
-						}	
-					};										
-					
+						}
+					};
+
 					sshClient.on('ready', () => {
 						//	track client termination so we can clean up early
 						self.client.once('end', () => {
 							self.client.log.info('Connection ended. Terminating DoorParty connection');
 							clientTerminated = true;
-							sshClient.end();							
+							sshClient.end();
 						});
-						
+
 						//	establish tunnel for rlogin
 						sshClient.forwardOut('127.0.0.1', self.config.sshPort, self.config.host, self.config.rloginPort, (err, stream) => {
 							if(err) {
@@ -79,17 +79,17 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 							//	DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
 							//	[XA]nuskooler
 							//
-							const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`; 
+							const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
 							stream.write(rlogin);
-							
+
 							pipedStream = stream;	//	:TODO: this is hacky...
 							self.client.term.output.pipe(stream);
-							
+
 							stream.on('data', d => {
 								//	:TODO: we should just pipe this...
 								self.client.term.rawWrite(d);
 							});
-							
+
 							stream.on('close', () => {
 								restorePipe();
 								sshClient.end();
@@ -100,32 +100,32 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 					sshClient.on('error', err => {
 						self.client.log.info(`DoorParty SSH client error: ${err.message}`);
 					});
-					
+
 					sshClient.on('close', () => {
 						restorePipe();
 						callback(null);
 					});
-										
+
 					sshClient.connect( {
 						host 		: self.config.host,
 						port		: self.config.sshPort,
 						username	: self.config.username,
 						password	: self.config.password,
 					});
-					
+
 					//	note: no explicit callback() until we're finished!
-				}		
+				}
 			],
 			err => {
 				if(err) {
 					self.client.log.warn( { error : err.message }, 'DoorParty error');
 				}
-				
+
 				//	if the client is stil here, go to previous
 				if(!clientTerminated) {
 					self.prevMenu();
 				}
 			}
 		);
-	}	
+	}
 };
diff --git a/core/download_queue.js b/core/download_queue.js
index 6bfbd47f..0f45b04d 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -59,14 +59,14 @@ module.exports = class DownloadQueue {
 	}
 
 	toProperty() { return JSON.stringify(this.client.user.downloadQueue); }
-	
+
 	loadFromProperty(prop) {
 		try {
 			this.client.user.downloadQueue = JSON.parse(prop);
 		} catch(e) {
 			this.client.user.downloadQueue = [];
 
-			this.client.log.error( { error : e.message, property : prop }, 'Failed parsing download queue property'); 			
+			this.client.log.error( { error : e.message, property : prop }, 'Failed parsing download queue property');
 		}
-	}	
+	}
 };
diff --git a/core/edit_text_view.js b/core/edit_text_view.js
index 8e55ae53..0db02638 100644
--- a/core/edit_text_view.js
+++ b/core/edit_text_view.js
@@ -16,7 +16,7 @@ function EditTextView(options) {
 	options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
 	options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
 	options.resizable		= false;
-	
+
 	TextView.call(this, options);
 
 	this.cursorPos = { row : 0, col : 0 };
@@ -44,7 +44,7 @@ EditTextView.prototype.onKeyPress = function(ch, key) {
 					}
 				}
 			}
-			
+
 			return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
 		} else if(this.isKeyMapped('clearLine', key.name)) {
 			this.text			= '';
diff --git a/core/enig_error.js b/core/enig_error.js
index 49627b9c..b0dd2335 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -14,7 +14,7 @@ class EnigError extends Error {
 		if(typeof Error.captureStackTrace === 'function') {
 			Error.captureStackTrace(this, this.constructor);
 		} else {
-			this.stack = (new Error(message)).stack; 
+			this.stack = (new Error(message)).stack;
 		}
 	}
 }
diff --git a/core/enigma_assert.js b/core/enigma_assert.js
index 2001825d..9217ea49 100644
--- a/core/enigma_assert.js
+++ b/core/enigma_assert.js
@@ -3,14 +3,14 @@
 
 //	ENiGMA½
 const Config	= require('./config.js').config;
-const Log		= require('./logger.js').log;		
+const Log		= require('./logger.js').log;
 
 //	deps
 const assert	= require('assert');
 
 module.exports = function(condition, message) {
 	if(Config.debug.assertsEnabled) {
-		assert.apply(this, arguments);	
+		assert.apply(this, arguments);
 	} else if(!(condition)) {
 		const stack = new Error().stack;
 		Log.error( { condition : condition, stack : stack }, message || 'Assertion failed' );
diff --git a/core/erc_client.js b/core/erc_client.js
index 4fb549f6..ccc70199 100644
--- a/core/erc_client.js
+++ b/core/erc_client.js
@@ -37,12 +37,12 @@ var MciViewIds = {
 function ErcClientModule(options) {
 	MenuModule.prototype.ctorShim.call(this, options);
 
-	const self			= this;  
+	const self			= this;
 	this.config			= options.menuConfig.config;
 
 	this.chatEntryFormat	= this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
-	this.systemEntryFormat	= this.config.systemEntryFormat || '[*SYSTEM*] {message}';	
-	
+	this.systemEntryFormat	= this.config.systemEntryFormat || '[*SYSTEM*] {message}';
+
 	this.finishedLoading = function() {
 		async.waterfall(
 			[
@@ -63,12 +63,12 @@ function ErcClientModule(options) {
 					};
 
 					const chatMessageView = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
-					
+
 					chatMessageView.setText('Connecting to server...');
 					chatMessageView.redraw();
-					
+
 					self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
-					
+
 					//	:TODO: Track actual client->enig connection for optional prevMenu @ final CB
 					self.chatConnection = net.createConnection(connectOpts.port, connectOpts.host);
 
@@ -98,12 +98,12 @@ function ErcClientModule(options) {
 							}
 
 							chatMessageView.addText(text);
-					
+
 							if(chatMessageView.getLineCount() > 30) {	//	:TODO: should probably be ChatDisplay.height?
 								chatMessageView.deleteLine(0);
 								chatMessageView.scrollDown();
 							}
-							
+
 							chatMessageView.redraw();
 							self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
 						}
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 8b3d3239..0366d5ba 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -24,8 +24,8 @@ exports.moduleInfo = {
 	author	: 'NuSkooler',
 };
 
-const SCHEDULE_REGEXP	= /(?:^|or )?(@watch\:)([^\0]+)?$/;
-const ACTION_REGEXP		= /\@(method|execute)\:([^\0]+)?$/;
+const SCHEDULE_REGEXP	= /(?:^|or )?(@watch:)([^\0]+)?$/;
+const ACTION_REGEXP		= /@(method|execute):([^\0]+)?$/;
 
 class ScheduledEvent {
 	constructor(events, name) {
@@ -34,32 +34,32 @@ class ScheduledEvent {
 		this.action		= this.parseActionSpec(events[name].action);
 		if(this.action) {
 			this.action.args = events[name].args || [];
-		}	
+		}
 	}
-	
+
 	get isValid() {
 		if((!this.schedule || (!this.schedule.sched && !this.schedule.watchFile)) || !this.action) {
 			return false;
 		}
-		
+
 		if('method' === this.action.type && !this.action.location) {
 			return false;
 		}
-		
-		return true; 	
+
+		return true;
 	}
-		
+
 	parseScheduleString(schedStr) {
 		if(!schedStr) {
 			return false;
 		}
-		
+
 		let schedule = {};
-		
+
 		const m = SCHEDULE_REGEXP.exec(schedStr);
 		if(m) {
 			schedStr = schedStr.substr(0, m.index).trim();
-			
+
 			if('@watch:' === m[1]) {
 				schedule.watchFile = m[2];
 			}
@@ -69,15 +69,15 @@ class ScheduledEvent {
 			const sched = later.parse.text(schedStr);
 			if(-1 === sched.error) {
 				schedule.sched = sched;
-			}	
+			}
 		}
-		
+
 		//	return undefined if we couldn't parse out anything useful
 		if(!_.isEmpty(schedule)) {
 			return schedule;
 		}
 	}
-	
+
 	parseActionSpec(actionSpec) {
 		if(actionSpec) {
 			if('@' === actionSpec[0]) {
@@ -86,7 +86,7 @@ class ScheduledEvent {
 					if(m[2].indexOf(':') > -1) {
 						const parts = m[2].split(':');
 						return {
-							type		: m[1],							
+							type		: m[1],
 							location	: parts[0],
 							what		: parts[1],
 						};
@@ -98,12 +98,12 @@ class ScheduledEvent {
 					}
 				}
 			} else {
-				return { 
+				return {
 					type	: 'execute',
 					what	: actionSpec,
 				};
-			}			
-		}	
+			}
+		}
 	}
 
 	executeAction(reason, cb) {
@@ -119,14 +119,14 @@ class ScheduledEvent {
 							{ error : err.toString(), eventName : this.name, action : this.action },
 							'Error performing scheduled event action');
 					}
-					
+
 					return cb(err);
 				});
 			} catch(e) {
 				Log.warn(
 					{ error : e.toString(), eventName : this.name, action : this.action },
 					'Failed to perform scheduled event action');
-				
+
 				return cb(e);
 			}
 		} else if('execute' === this.action.type) {
@@ -135,18 +135,18 @@ class ScheduledEvent {
 				name	: this.name,
 				cols	: 80,
 				rows	: 24,
-				env		: process.env,	
+				env		: process.env,
 			};
 
 			const proc = pty.spawn(this.action.what, this.action.args, opts);
 
-			proc.once('exit', exitCode => {				
+			proc.once('exit', exitCode => {
 				if(exitCode) {
 					Log.warn(
 						{ eventName : this.name, action : this.action, exitCode : exitCode },
 						'Bad exit code while performing scheduled event action');
 				}
-				return cb(exitCode ? new Error(`Bad exit code while performing scheduled event action: ${exitCode}`) : null); 
+				return cb(exitCode ? new Error(`Bad exit code while performing scheduled event action: ${exitCode}`) : null);
 			});
 		}
 	}
@@ -154,58 +154,58 @@ class ScheduledEvent {
 
 function EventSchedulerModule(options) {
 	PluginModule.call(this, options);
-	
+
 	if(_.has(Config, 'eventScheduler')) {
 		this.moduleConfig = Config.eventScheduler;
 	}
-	
+
 	const self = this;
 	this.runningActions = new Set();
-	
+
 	this.performAction = function(schedEvent, reason) {
 		if(self.runningActions.has(schedEvent.name)) {
 			return;	//	already running
-		} 
-		
+		}
+
 		self.runningActions.add(schedEvent.name);
 
 		schedEvent.executeAction(reason, () => {
 			self.runningActions.delete(schedEvent.name);
-		});		
+		});
 	};
 }
 
 //	convienence static method for direct load + start
 EventSchedulerModule.loadAndStart = function(cb) {
 	const loadModuleEx = require('./module_util.js').loadModuleEx;
-			
+
 	const loadOpts = {
 		name		: path.basename(__filename, '.js'),
 		path		: __dirname,
 	};
-	
+
 	loadModuleEx(loadOpts, (err, mod) => {
 		if(err) {
 			return cb(err);
 		}
-		
+
 		const modInst = new mod.getModule();
 		modInst.startup( err => {
 			return cb(err, modInst);
-		});		
+		});
 	});
 };
 
 EventSchedulerModule.prototype.startup = function(cb) {
-	
+
 	this.eventTimers	= [];
 	const self = this;
-	
+
 	if(this.moduleConfig && _.has(this.moduleConfig, 'events')) {
 		const events = Object.keys(this.moduleConfig.events).map( name => {
 			return new ScheduledEvent(this.moduleConfig.events, name);
 		});
-		
+
 		events.forEach( schedEvent => {
 			if(!schedEvent.isValid) {
 				Log.warn( { eventName : schedEvent.name }, 'Invalid scheduled event entry');
@@ -213,7 +213,7 @@ EventSchedulerModule.prototype.startup = function(cb) {
 			}
 
 			Log.debug(
-				{ 
+				{
 					eventName	: schedEvent.name,
 					schedule	: this.moduleConfig.events[schedEvent.name].schedule,
 					action		: schedEvent.action,
@@ -222,9 +222,9 @@ EventSchedulerModule.prototype.startup = function(cb) {
 				'Scheduled event loaded'
 			);
 
-			if(schedEvent.schedule.sched) {			
+			if(schedEvent.schedule.sched) {
 				this.eventTimers.push(later.setInterval( () => {
-					self.performAction(schedEvent, 'Schedule');	
+					self.performAction(schedEvent, 'Schedule');
 				}, schedEvent.schedule.sched));
 			}
 
@@ -255,7 +255,7 @@ EventSchedulerModule.prototype.startup = function(cb) {
 			}
 		});
 	}
-	
+
 	cb(null);
 };
 
@@ -263,6 +263,6 @@ EventSchedulerModule.prototype.shutdown = function(cb) {
 	if(this.eventTimers) {
 		this.eventTimers.forEach( et => et.clear() );
 	}
-		
+
 	cb(null);
 };
diff --git a/core/exodus.js b/core/exodus.js
index e77183ee..8b3c7548 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -23,7 +23,7 @@ const SSHClient		= require('ssh2').Client;
 /*
 	Configuration block:
 
-	
+
 	someDoor: {
 		module: exodus
 		config: {
@@ -61,7 +61,7 @@ exports.getModule = class ExodusModule extends MenuModule {
 		this.config						= options.menuConfig.config || {};
 		this.config.ticketHost			= this.config.ticketHost || 'oddnetwork.org';
 		this.config.ticketPort			= this.config.ticketPort || 1984,
-		this.config.ticketPath			= this.config.ticketPath || '/exodus';		
+		this.config.ticketPath			= this.config.ticketPath || '/exodus';
 		this.config.rejectUnauthorized	= _.get(this.config, 'rejectUnauthorized', true);
 		this.config.sshHost				= this.config.sshHost || this.config.ticketHost;
 		this.config.sshPort				= this.config.sshPort || 22;
diff --git a/core/file_area_filter_edit.js b/core/file_area_filter_edit.js
index 4a53096c..cc4c22c7 100644
--- a/core/file_area_filter_edit.js
+++ b/core/file_area_filter_edit.js
@@ -65,7 +65,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 			prevFilter : (formData, extraArgs, cb) => {
 				this.currentFilterIndex -= 1;
 				if(this.currentFilterIndex < 0) {
-					this.currentFilterIndex = this.filtersArray.length - 1;				
+					this.currentFilterIndex = this.filtersArray.length - 1;
 				}
 				this.loadDataForFilter(this.currentFilterIndex);
 				return cb(null);
@@ -116,21 +116,21 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 						if(newActive) {
 							filters.setActive(newActive.uuid);
 						} else {
-							//	nothing to set active to						
+							//	nothing to set active to
 							this.client.user.removeProperty('file_base_filter_active_uuid');
 						}
 					}
 
 					//	update UI
 					this.updateActiveLabel();
-					
+
 					if(this.filtersArray.length > 0) {
 						this.loadDataForFilter(this.currentFilterIndex);
 					} else {
 						this.clearForm();
 					}
 					return cb(null);
-				});				
+				});
 			},
 
 			viewValidationListener : (err, cb) => {
@@ -161,7 +161,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 			}
 		}
 	}
-	
+
 	mciReady(mciData, cb) {
 		super.mciReady(mciData, err => {
 			if(err) {
@@ -178,7 +178,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 					},
 					function populateAreas(callback) {
 						self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
-						
+
 						const areasView = vc.getView(MciViewIds.editor.area);
 						if(areasView) {
 							areasView.setItems( self.availAreas.map( a => a.name ) );
@@ -194,7 +194,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 					return cb(err);
 				}
 			);
-		});	
+		});
 	}
 
 	getCurrentFilter() {
@@ -212,7 +212,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 		const activeFilter = FileBaseFilters.getActiveFilter(this.client);
 		if(activeFilter) {
 			const activeFormat = this.menuConfig.config.activeFormat || '{name}';
-			this.setText(MciViewIds.editor.activeFilterInfo, stringFormat(activeFormat, activeFilter)); 
+			this.setText(MciViewIds.editor.activeFilterInfo, stringFormat(activeFormat, activeFilter));
 		}
 	}
 
@@ -256,7 +256,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 
 	setAreaIndexFromCurrentFilter() {
 		let index;
-		const filter = this.getCurrentFilter();	
+		const filter = this.getCurrentFilter();
 		if(filter) {
 			//	special treatment: areaTag saved as blank ("") if -ALL-
 			index = (filter.areaTag && this.availAreas.findIndex(area => filter.areaTag === area.areaTag)) || 0;
@@ -295,7 +295,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 	setFilterValuesFromFormData(filter, formData) {
 		filter.name		= formData.value.name;
 		filter.areaTag	= this.getSelectedAreaTag(formData.value.areaIndex);
-		filter.terms	= formData.value.searchTerms; 
+		filter.terms	= formData.value.searchTerms;
 		filter.tags		= formData.value.tags;
 		filter.order	= this.getOrderBy(formData.value.orderByIndex);
 		filter.sort		= this.getSortBy(formData.value.sortByIndex);
@@ -304,7 +304,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 	saveCurrentFilter(formData, cb) {
 		const filters			= new FileBaseFilters(this.client);
 		const selectedFilter	= this.filtersArray[this.currentFilterIndex];
-		
+
 		if(selectedFilter) {
 			//	*update* currently selected filter
 			this.setFilterValuesFromFormData(selectedFilter, formData);
@@ -316,11 +316,11 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 
 			//	set current to what we just saved
 			newFilter.uuid = filters.add(newFilter);
-			
+
 			//	add to our array (at current index position)
 			this.filtersArray[this.currentFilterIndex] = newFilter;
 		}
-	
+
 		return filters.persist(cb);
 	}
 
@@ -334,6 +334,6 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 			this.setAreaIndexFromCurrentFilter();
 			this.setSortByFromCurrentFilter();
 			this.setOrderByFromCurrentFilter();
-		}		
+		}
 	}
 };
diff --git a/core/file_area_list.js b/core/file_area_list.js
index 3bcfd7c2..87e794cb 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -96,7 +96,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 		}
 
 		this.menuMethods = {
-			nextFile : (formData, extraArgs, cb) => {		
+			nextFile : (formData, extraArgs, cb) => {
 				if(this.fileListPosition + 1 < this.fileList.length) {
 					this.fileListPosition += 1;
 
@@ -131,7 +131,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			toggleQueue : (formData, extraArgs, cb) => {
 				this.dlQueue.toggle(this.currentFileEntry);
 				this.updateQueueIndicator();
-				return cb(null);  
+				return cb(null);
 			},
 			showWebDownloadLink : (formData, extraArgs, cb) => {
 				return this.fetchAndDisplayWebDownloadLink(cb);
@@ -217,7 +217,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 		const hashTagsSep			= config.hashTagsSep || ', ';
 		const isQueuedIndicator		= config.isQueuedIndicator || 'Y';
 		const isNotQueuedIndicator	= config.isNotQueuedIndicator || 'N';
-		
+
 		const entryInfo = currEntry.entryInfo = {
 			fileId				: currEntry.fileId,
 			areaTag				: currEntry.areaTag,
@@ -232,7 +232,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			hashTags			: Array.from(currEntry.hashTags).join(hashTagsSep),
 			isQueued			: this.dlQueue.isQueued(currEntry) ? isQueuedIndicator : isNotQueuedIndicator,
 			webDlLink			: '',	//	:TODO: fetch web any existing web d/l link
-			webDlExpire			: '',	//	:TODO: fetch web d/l link expire time			
+			webDlExpire			: '',	//	:TODO: fetch web d/l link expire time
 		};
 
 		//
@@ -257,7 +257,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 		//	create a rating string, e.g. "**---"
 		const userRatingTicked		= config.userRatingTicked || '*';
-		const userRatingUnticked	= config.userRatingUnticked || '';					
+		const userRatingUnticked	= config.userRatingUnticked || '';
 		entryInfo.userRating		= ~~Math.round(entryInfo.userRating) || 0;	//	be safe!
 		entryInfo.userRatingString	= userRatingTicked.repeat(entryInfo.userRating);
 		if(entryInfo.userRating < 5) {
@@ -270,7 +270,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 				if(ErrNotEnabled === err.reasonCode) {
 					entryInfo.webDlExpire	= config.webDlLinkNoWebserver || 'Web server is not enabled';
 				} else {
-					entryInfo.webDlLink 	= config.webDlLinkNeedsGenerated || 'Not yet generated';					
+					entryInfo.webDlLink 	= config.webDlLinkNeedsGenerated || 'Not yet generated';
 				}
 			} else {
 				const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
@@ -339,10 +339,10 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 						return vc.loadFromMenuConfig(loadOpts, callback);
 					}
-					
+
 					self.viewControllers[name].setFocus(true);
 					return callback(null);
-										
+
 				},
 			],
 			err => {
@@ -357,7 +357,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 		async.series(
 			[
 				function fetchEntryData(callback) {
-					if(self.fileList) {						
+					if(self.fileList) {
 						return callback(null);
 					}
 					return self.loadFileIds(false, callback);	//	false=do not force
@@ -371,14 +371,14 @@ exports.getModule = class FileAreaList extends MenuModule {
 				function prepArtAndViewController(callback) {
 					return self.displayArtAndPrepViewController('browse', { clearScreen : clearScreen }, callback);
 				},
-				function loadCurrentFileInfo(callback) {				
+				function loadCurrentFileInfo(callback) {
 					self.currentFileEntry = new FileEntry();
 
 					self.currentFileEntry.load( self.fileList[ self.fileListPosition ], err => {
 						if(err) {
 							return callback(err);
 						}
-						
+
 						return self.populateCurrentEntryInfo(callback);
 					});
 				},
@@ -422,7 +422,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 					return callback(null);
 				}
 			],
-			err => {				
+			err => {
 				if(cb) {
 					return cb(err);
 				}
@@ -448,7 +448,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 				function listenNavChanges(callback) {
 					const navMenu = self.viewControllers.details.getView(MciViewIds.details.navMenu);
 					navMenu.setFocusItemIndex(0);
-					
+
 					navMenu.on('index update', index => {
 						const sectionName = {
 							0	: 'general',
@@ -481,7 +481,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			}
 		);
 	}
-	
+
 	fetchAndDisplayWebDownloadLink(cb) {
 		const self = this;
 
@@ -492,11 +492,11 @@ exports.getModule = class FileAreaList extends MenuModule {
 					if(self.currentFileEntry.webDlExpireTime < moment()) {
 						return callback(null);
 					}
-					
+
 					const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
 
 					FileAreaWeb.createAndServeTempDownload(
-						self.client, 
+						self.client,
 						self.currentFileEntry,
 						{ expireTime : expireTime },
 						(err, url) => {
@@ -517,8 +517,8 @@ exports.getModule = class FileAreaList extends MenuModule {
 				},
 				function updateActiveViews(callback) {
 					self.updateCustomViewTextsWithFilter(
-						'browse', 
-						MciViewIds.browse.customRangeStart, self.currentFileEntry.entryInfo, 
+						'browse',
+						MciViewIds.browse.customRangeStart, self.currentFileEntry.entryInfo,
 						{ filter : [ '{webDlLink}', '{webDlExpire}' ] }
 					);
 					return callback(null);
@@ -527,7 +527,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			err => {
 				return cb(err);
 			}
-		);		
+		);
 	}
 
 	updateQueueIndicator() {
@@ -535,8 +535,8 @@ exports.getModule = class FileAreaList extends MenuModule {
 		const isNotQueuedIndicator	= this.menuConfig.config.isNotQueuedIndicator || 'N';
 
 		this.currentFileEntry.entryInfo.isQueued = stringFormat(
-			this.dlQueue.isQueued(this.currentFileEntry) ? 
-				isQueuedIndicator : 
+			this.dlQueue.isQueued(this.currentFileEntry) ?
+				isQueuedIndicator :
 				isNotQueuedIndicator
 		);
 
@@ -558,7 +558,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 		if(!areaInfo) {
 			return cb(Errors.Invalid('Invalid area tag'));
 		}
-		
+
 		const filePath		= this.currentFileEntry.filePath;
 		const archiveUtil	= ArchiveUtil.getInstance();
 
@@ -574,7 +574,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 	populateFileListing() {
 		const fileListView = this.viewControllers.detailsFileList.getView(MciViewIds.detailsFileList.fileList);
-		
+
 		if(this.currentFileEntry.entryInfo.archiveType) {
 			this.cacheArchiveEntries( (err, cacheStatus) => {
 				if(err) {
@@ -586,7 +586,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 				if('re-cached' === cacheStatus) {
 					const fileListEntryFormat 		= this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';	//	:TODO: use byteSize here?
 					const focusFileListEntryFormat	= this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
-					
+
 					fileListView.setItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(fileListEntryFormat, entry) ) );
 					fileListView.setFocusItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(focusFileListEntryFormat, entry) ) );
 
@@ -594,7 +594,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 				}
 			});
 		} else {
-			fileListView.setItems( [ stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } ) ] );	
+			fileListView.setItems( [ stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } ) ] );
 		}
 	}
 
@@ -608,7 +608,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 					if(self.lastDetailsViewController) {
 						self.lastDetailsViewController.detachClientEvents();
 					}
-					return callback(null); 
+					return callback(null);
 				},
 				function prepArtAndViewController(callback) {
 
@@ -616,7 +616,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 						self.client.term.rawWrite(ansi.goto(self.detailsInfoArea.top[0], 1));
 					}
 
-					gotoTopPos();  
+					gotoTopPos();
 
 					if(clearArea) {
 						self.client.term.rawWrite(ansi.reset());
diff --git a/core/file_area_web.js b/core/file_area_web.js
index b12f4f7d..b8a630fc 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -59,7 +59,7 @@ class FileAreaWebAccess {
 						return callback(null);	//	not enabled, but no error
 					}
 				}
-			], 
+			],
 			err => {
 				return cb(err);
 			}
@@ -193,7 +193,7 @@ class FileAreaWebAccess {
 	getExistingTempDownloadServeItem(client, fileEntry, cb) {
 		if(!this.isEnabled()) {
 			return cb(notEnabledError());
-		}	
+		}
 
 		const hashId = this.getSingleFileHashId(client, fileEntry);
 		this.loadServedHashId(hashId, (err, servedItem) => {
@@ -201,10 +201,10 @@ class FileAreaWebAccess {
 				return cb(err);
 			}
 
-			servedItem.url = this.buildSingleFileTempDownloadLink(client, fileEntry); 
+			servedItem.url = this.buildSingleFileTempDownloadLink(client, fileEntry);
 
 			return cb(null, servedItem);
-		});		
+		});
 	}
 
 	_addOrUpdateHashIdRecord(dbOrTrans, hashId, expireTime, cb) {
@@ -219,7 +219,7 @@ class FileAreaWebAccess {
 				}
 
 				this.scheduleExpire(hashId, expireTime);
-				
+
 				return cb(null);
 			}
 		);
@@ -476,7 +476,7 @@ class FileAreaWebAccess {
 					StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
 					StatLog.incrementSystemStat('dl_total_count', 1);
 					StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
-					
+
 					return callback(null);
 				}
 			],
diff --git a/core/file_base_area.js b/core/file_base_area.js
index f3845cc1..6c7318d6 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -61,8 +61,8 @@ function getAvailableFileAreas(client, options) {
 
 	//	perform ACS check per conf & omit internal if desired
 	const allAreas = _.map(Config.fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
-	
-	return _.omitBy(allAreas, areaInfo => {        
+
+	return _.omitBy(allAreas, areaInfo => {
 		if(!options.includeSystemInternal && isInternalArea(areaInfo.areaTag)) {
 			return true;
 		}
@@ -102,7 +102,7 @@ function getDefaultFileAreaTag(client, disableAcsCheck) {
 	defaultArea = _.findKey(Config.fileBase.areas, (area, areaTag) => {
 		return WellKnownAreaTags.MessageAreaAttach !== areaTag && (true === disableAcsCheck || client.acs.hasFileAreaRead(area));
 	});
-    
+
 	return defaultArea;
 }
 
@@ -110,7 +110,7 @@ function getFileAreaByTag(areaTag) {
 	const areaInfo = Config.fileBase.areas[areaTag];
 	if(areaInfo) {
 		areaInfo.areaTag	= areaTag;	//	convienence!
-		areaInfo.storage	= getAreaStorageLocations(areaInfo); 
+		areaInfo.storage	= getAreaStorageLocations(areaInfo);
 		return areaInfo;
 	}
 }
@@ -165,13 +165,13 @@ function getAreaDefaultStorageDirectory(areaInfo) {
 }
 
 function getAreaStorageLocations(areaInfo) {
-	
-	const storageTags = Array.isArray(areaInfo.storageTags) ? 
-		areaInfo.storageTags : 
+
+	const storageTags = Array.isArray(areaInfo.storageTags) ?
+		areaInfo.storageTags :
 		[ areaInfo.storageTags || '' ];
 
 	const avail = Config.fileBase.storageTags;
-	
+
 	return _.compact(storageTags.map(storageTag => {
 		if(avail[storageTag]) {
 			return {
@@ -230,7 +230,7 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
 	const patterns	= Config.fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
 
 	function getMatch(input) {
-		if(input) {			
+		if(input) {
 			let m;
 			for(let i = 0; i < patterns.length; ++i) {
 				m = patterns[i].exec(input);
@@ -249,7 +249,7 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
 	//
 	const maxYear = moment().add(2, 'year').year();
 	const match = getMatch(fileEntry.desc) || getMatch(fileEntry.descLong);
-	
+
 	if(match && match[1]) {
 		let year;
 		if(2 === match[1].length) {
@@ -316,7 +316,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 					archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
 						if(err) {
 							return callback(err);
-						}				
+						}
 
 						const descFiles = {
 							desc		: shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
@@ -327,7 +327,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 					});
 				});
 			},
-			function readDescFiles(descFiles, callback) {				
+			function readDescFiles(descFiles, callback) {
 				async.each(Object.keys(descFiles), (descType, next) => {
 					const path = descFiles[descType];
 					if(!path) {
@@ -341,7 +341,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 
 						//	skip entries that are too large
 						const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;
-					
+
 						if(Config.fileBase[maxFileSizeKey] && stats.size > Config.fileBase[maxFileSizeKey]) {
 							logDebug( { byteSize : stats.size, maxByteSize : Config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
 							return next(null);
@@ -353,7 +353,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 							}
 
 							//
-							//	Assume FILE_ID.DIZ, NFO files, etc. are CP437. 
+							//	Assume FILE_ID.DIZ, NFO files, etc. are CP437.
 							//
 							//	:TODO: This isn't really always the case - how to handle this? We could do a quick detection...
 							fileEntry[descType]			= iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
@@ -389,10 +389,10 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
 					}
 
 					const archiveUtil = ArchiveUtil.getInstance();
-					
+
 					//	ensure we only extract one - there should only be one anyway -- we also just need the fileName
 					const extractList = archiveEntries.slice(0, 1).map(entry => entry.fileName);
-					
+
 					archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
 						if(err) {
 							return callback(err);
@@ -540,7 +540,7 @@ function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
 		});
 	}, () => {
 		return cb(null);
-	});	
+	});
 }
 
 function populateFileEntryNonArchive(fileEntry, filePath, stepInfo, iterator, cb) {
@@ -586,10 +586,6 @@ function addNewFileEntry(fileEntry, filePath, cb) {
 	);
 }
 
-function updateFileEntry(fileEntry, filePath, cb) {
-
-}
-
 const HASH_NAMES =  [ 'sha1', 'sha256', 'md5', 'crc32' ];
 
 function scanFile(filePath, options, iterator, cb) {
@@ -664,7 +660,7 @@ function scanFile(filePath, options, iterator, cb) {
 					return callIter(callback);
 				});
 			},
-			function processPhysicalFileGeneric(callback) {			
+			function processPhysicalFileGeneric(callback) {
 				stepInfo.bytesProcessed = 0;
 
 				const hashes = {};
@@ -690,7 +686,7 @@ function scanFile(filePath, options, iterator, cb) {
 				stream.on('data', data => {
 					stream.pause();	//	until iterator compeltes
 
-					stepInfo.bytesProcessed		+= data.length;		
+					stepInfo.bytesProcessed		+= data.length;
 					stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
 
 					//
@@ -710,13 +706,13 @@ function scanFile(filePath, options, iterator, cb) {
 
 							updateHashes(data);
 						});
-					}					
+					}
 				});
 
 				stream.on('end', () => {
 					fileEntry.meta.byte_size = stepInfo.bytesProcessed;
 
-					async.each(hashesToCalc, (hashName, nextHash) => {						
+					async.each(hashesToCalc, (hashName, nextHash) => {
 						if('sha256' === hashName) {
 							stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
 						} else if('sha1' === hashName || 'md5' === hashName) {
@@ -747,7 +743,9 @@ function scanFile(filePath, options, iterator, cb) {
 						populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
 							if(err) {
 								populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-									//	:TODO: log err
+									if(err) {
+										logDebug( { error : err.message }, 'Non-archive file entry population failed');
+									}
 									return callback(null);	//	ignore err
 								});
 							} else {
@@ -756,7 +754,9 @@ function scanFile(filePath, options, iterator, cb) {
 						});
 					} else {
 						populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-							//	:TODO: log err
+							if(err) {
+								logDebug( { error : err.message }, 'Non-archive file entry population failed');
+							}
 							return callback(null);	//	ignore err
 						});
 					}
@@ -773,7 +773,7 @@ function scanFile(filePath, options, iterator, cb) {
 					return callback(null, dupeEntries);
 				});
 			}
-		], 
+		],
 		(err, dupeEntries) => {
 			if(err) {
 				return cb(err);
@@ -858,12 +858,12 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
 					//	:TODO: Look @ db entries for area that were *not* processed above
 					return callback(null);
 				}
-			], 
+			],
 			err => {
 				return nextLocation(err);
 			}
 		);
-	}, 
+	},
 	err => {
 		return cb(err);
 	});
@@ -874,14 +874,14 @@ function getDescFromFileName(fileName) {
 	const ext   = paths.extname(fileName);
 	const name  = paths.basename(fileName, ext);
 
-	return _.upperFirst(name.replace(/[\-_.+]/g, ' ').replace(/\s+/g, ' '));
+	return _.upperFirst(name.replace(/[-_.+]/g, ' ').replace(/\s+/g, ' '));
 }
 
 //
 //	Return an object of stats about an area(s)
 //
 //	{
-//		
+//
 //		totalFiles : <totalFileCount>,
 //		totalBytes : <totalByteSize>,
 //		areas : {
@@ -892,7 +892,7 @@ function getDescFromFileName(fileName) {
 //		}
 //	}
 //
-function getAreaStats(cb) {	
+function getAreaStats(cb) {
 	FileDb.all(
 		`SELECT DISTINCT f.area_tag, COUNT(f.file_id) AS total_files, SUM(m.meta_value) AS total_byte_size
 		FROM file f, file_meta m
@@ -928,9 +928,9 @@ function getAreaStats(cb) {
 
 //	method exposed for event scheduler
 function updateAreaStatsScheduledEvent(args, cb) {
-	getAreaStats( (err, stats) => {		
+	getAreaStats( (err, stats) => {
 		if(!err) {
-			StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);	
+			StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
 		}
 
 		return cb(err);
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index 5ec266fd..87dfe9f4 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -38,7 +38,7 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 
 				const menuOpts = {
 					extraArgs	: {
-						filterCriteria	: filterCriteria,				
+						filterCriteria	: filterCriteria,
 					},
 					menuFlags	: [ 'popParent' ],
 				};
diff --git a/core/file_base_download_manager.js b/core/file_base_download_manager.js
index 7444af56..88ed2ddd 100644
--- a/core/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -59,8 +59,6 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 
 				return this.gotoMenu(this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection', modOpts, cb);
 			},
-			viewItemInfo : (formData, extraArgs, cb) => {
-			},
 			removeItem : (formData, extraArgs, cb) => {
 				const selectedItem = this.dlQueue.items[formData.value.queueItem];
 				if(!selectedItem) {
@@ -74,7 +72,7 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 			},
 			clearQueue : (formData, extraArgs, cb) => {
 				this.dlQueue.clear();
-								
+
 				//	:TODO: broken: does not redraw menu properly - needs fixed!
 				return this.removeItemsFromDownloadQueueView('all', cb);
 			}
@@ -230,10 +228,10 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 
 						return vc.loadFromMenuConfig(loadOpts, callback);
 					}
-					
+
 					self.viewControllers[name].setFocus(true);
 					return callback(null);
-										
+
 				},
 			],
 			err => {
diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index 320d36d3..d8b566b7 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -8,7 +8,7 @@ const uuidV4				= require('uuid/v4');
 module.exports = class FileBaseFilters {
 	constructor(client) {
 		this.client	= client;
-		
+
 		this.load();
 	}
 
@@ -25,7 +25,7 @@ module.exports = class FileBaseFilters {
 			'est_release_year',
 			'byte_size',
 			'file_name',
-		];			
+		];
 	}
 
 	toArray() {
@@ -40,11 +40,11 @@ module.exports = class FileBaseFilters {
 
 	add(filterInfo) {
 		const filterUuid = uuidV4();
-		
+
 		filterInfo.tags = this.cleanTags(filterInfo.tags);
-		
+
 		this.filters[filterUuid] = filterInfo;
-		
+
 		return filterUuid;
 	}
 
@@ -94,18 +94,18 @@ module.exports = class FileBaseFilters {
 	}
 
 	cleanTags(tags) {
-		return tags.toLowerCase().replace(/,?\s+|\,/g, ' ').trim();
+		return tags.toLowerCase().replace(/,?\s+|,/g, ' ').trim();
 	}
 
 	setActive(filterUuid) {
 		const activeFilter = this.get(filterUuid);
-		
+
 		if(activeFilter) {
 			this.activeFilter = activeFilter;
 			this.client.user.persistProperty('file_base_filter_active_uuid', filterUuid);
 			return true;
 		}
-		
+
 		return false;
 	}
 
diff --git a/core/file_base_search.js b/core/file_base_search.js
index 27656123..06dac204 100644
--- a/core/file_base_search.js
+++ b/core/file_base_search.js
@@ -110,7 +110,7 @@ exports.getModule = class FileBaseSearch extends MenuModule {
 
 		const menuOpts = {
 			extraArgs	: {
-				filterCriteria	: filterCriteria,				
+				filterCriteria	: filterCriteria,
 			},
 			menuFlags	: [ 'popParent' ],
 		};
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index dea7c5a8..13b7de33 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -32,13 +32,13 @@ const MciViewIds = {
 	queueManager : {
 		queue				: 1,
 		navMenu				: 2,
-		
+
 		customRangeStart	: 10,
 	}
 };
 
 exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
-	
+
 	constructor(options) {
 		super(options);
 
@@ -58,7 +58,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 			},
 			clearQueue : (formData, extraArgs, cb) => {
 				this.dlQueue.clear();
-								
+
 				//	:TODO: broken: does not redraw menu properly - needs fixed!
 				return this.removeItemsFromDownloadQueueView('all', cb);
 			},
@@ -109,7 +109,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 
 	displayFileInfoForFileEntry(fileEntry) {
 		this.updateCustomViewTextsWithFilter(
-			'queueManager', 
+			'queueManager',
 			MciViewIds.queueManager.customRangeStart, fileEntry,
 			{ filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }	//	:TODO: Others....
 		);
@@ -142,7 +142,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 		const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
 
 		FileAreaWeb.createAndServeTempBatchDownload(
-			this.client, 
+			this.client,
 			this.dlQueue.items,
 			{
 				expireTime : expireTime
@@ -162,7 +162,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 
 				this.updateCustomViewTextsWithFilter(
 					'queueManager',
-					MciViewIds.queueManager.customRangeStart, 
+					MciViewIds.queueManager.customRangeStart,
 					formatObj,
 					{ filter : Object.keys(formatObj).map(k => '{' + k + '}' ) }
 				);
@@ -187,13 +187,13 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 						FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
 							if(err) {
 								if(ErrNotEnabled === err.reasonCode) {
-									return nextFileEntry(err);	//	we should have caught this prior	
+									return nextFileEntry(err);	//	we should have caught this prior
 								}
 
 								const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
-								
+
 								FileAreaWeb.createAndServeTempDownload(
-									self.client, 
+									self.client,
 									fileEntry,
 									{ expireTime : expireTime },
 									(err, url) => {
@@ -202,13 +202,13 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 										}
 
 										fileEntry.webDlLinkRaw	= url;
-										fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;										
+										fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;
 										fileEntry.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
 
 										return nextFileEntry(null);
 									}
 								);
-							} else {								
+							} else {
 								fileEntry.webDlLinkRaw	= serveItem.url;
 								fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
 								fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
@@ -272,10 +272,10 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 
 						return vc.loadFromMenuConfig(loadOpts, callback);
 					}
-					
+
 					self.viewControllers[name].setFocus(true);
 					return callback(null);
-										
+
 				},
 			],
 			err => {
@@ -284,4 +284,3 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 		);
 	}
 };
-	
\ No newline at end of file
diff --git a/core/file_entry.js b/core/file_entry.js
index 8bf7a69d..861b9d79 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -15,7 +15,7 @@ const { unlink, readFile }	= require('graceful-fs');
 const crypto				= require('crypto');
 const moment				= require('moment');
 
-const FILE_TABLE_MEMBERS	= [ 
+const FILE_TABLE_MEMBERS	= [
 	'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
 	'desc', 'desc_long', 'upload_timestamp'
 ];
@@ -47,7 +47,7 @@ module.exports = class FileEntry {
 			//	values we always want
 			dl_count	: 0,
 		};
-				
+
 		this.hashTags	= options.hashTags || new Set();
 		this.fileName	= options.fileName;
 		this.storageTag	= options.storageTag;
@@ -173,7 +173,7 @@ module.exports = class FileEntry {
 					async.each(Object.keys(self.meta), (n, next) => {
 						const v = self.meta[n];
 						return FileEntry.persistMetaValue(self.fileId, n, v, trans, next);
-					}, 
+					},
 					err => {
 						return callback(err, trans);
 					});
@@ -185,7 +185,7 @@ module.exports = class FileEntry {
 					},
 					err => {
 						return callback(err, trans);
-					});					
+					});
 				}
 			],
 			(err, trans) => {
@@ -203,10 +203,10 @@ module.exports = class FileEntry {
 
 	static getAreaStorageDirectoryByTag(storageTag) {
 		const storageLocation = (storageTag && Config.fileBase.storageTags[storageTag]);
-	
+
 		//	absolute paths as-is
 		if(storageLocation && '/' === storageLocation.charAt(0)) {
-			return storageLocation;		
+			return storageLocation;
 		}
 
 		//	relative to |areaStoragePrefix|
@@ -283,7 +283,7 @@ module.exports = class FileEntry {
 		transOrDb.serialize( () => {
 			transOrDb.run(
 				`INSERT OR IGNORE INTO hash_tag (hash_tag)
-				VALUES (?);`, 
+				VALUES (?);`,
 				[ hashTag ]
 			);
 
@@ -321,7 +321,7 @@ module.exports = class FileEntry {
 			err => {
 				return cb(err);
 			}
-		);	
+		);
 	}
 
 	loadRating(cb) {
@@ -352,7 +352,7 @@ module.exports = class FileEntry {
 	}
 
 	static get WellKnownMetaValues()  {
-		return Object.keys(FILE_WELL_KNOWN_META); 
+		return Object.keys(FILE_WELL_KNOWN_META);
 	}
 
 	static findFileBySha(sha, cb) {
@@ -469,7 +469,7 @@ module.exports = class FileEntry {
 
 					sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
 				} else {
-					sql = 
+					sql =
 						`SELECT DISTINCT f.file_id, f.${filter.sort}
 						FROM file f`;
 
@@ -531,7 +531,7 @@ module.exports = class FileEntry {
 				)`
 			);
 		}
-		
+
 		if(filter.tags && filter.tags.length > 0) {
 			//	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
 			const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${tag}"` ).join(',');
@@ -617,7 +617,7 @@ module.exports = class FileEntry {
 
 		const srcPath	= srcFileEntry.filePath;
 		const dstDir	= FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
-		
+
 		if(!dstDir) {
 			return cb(Errors.Invalid('Invalid storage tag'));
 		}
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 4e81bf72..bb3d362c 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -65,7 +65,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			}
 
 			if(options.extraArgs.sendQueue) {
-				this.sendQueue = options.extraArgs.sendQueue;	
+				this.sendQueue = options.extraArgs.sendQueue;
 			}
 
 			if(options.extraArgs.recvFileName) {
@@ -107,7 +107,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 				return { path : item };
 			} else {
 				return item;
-			}			
+			}
 		});
 
 		this.sentFileIds = [];
@@ -137,7 +137,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 				this.sendQueue.forEach(f => {
 					f.sent = true;
 					sentFiles.push(f.path);
-					
+
 				});
 
 				this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
@@ -160,7 +160,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 					this.sendQueue.forEach(f => {
 						f.sent = true;
 						sentFiles.push(f.path);
-						
+
 					});
 
 					this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
@@ -180,16 +180,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
 					}
 					return next(err);
 				});
-			}, err => {				
+			}, err => {
 				return cb(err);
 			});
-		}		
+		}
 	}
 	*/
 
 	moveFileWithCollisionHandling(src, dst, cb) {
 		//
-		//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc. 
+		//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
 		//	in the case of collisions.
 		//
 		const dstPath		= paths.dirname(dst);
@@ -283,7 +283,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 						});
 					}, () => {
 						return cb(null);
-					});				
+					});
 				});
 			}
 		});
@@ -309,7 +309,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
 					temptmp.open( { prefix : TEMP_SUFFIX, suffix : '.txt' }, (err, tempFileInfo) => {
 						if(err) {
-							return callback(err);	//	failed to create it 
+							return callback(err);	//	failed to create it
 						}
 
 						fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL));
@@ -334,7 +334,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
 					return callback(null, args);
 				}
-			], 
+			],
 			(err, args) => {
 				return cb(err, args);
 			}
@@ -364,7 +364,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 		const externalProc = pty.spawn(cmd, args, {
 			cols	: this.client.term.termWidth,
 			rows	: this.client.term.termHeight,
-			cwd		: this.recvDirectory,				
+			cwd		: this.recvDirectory,
 		});
 
 		this.client.setTemporaryDirectDataHandler(data => {
@@ -376,7 +376,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 				externalProc.write(data);
 			}
 		});
-		
+
 		externalProc.on('data', data => {
 			//	needed for things like sz/rz
 			if(external.escapeTelnet) {
@@ -393,12 +393,12 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
 		externalProc.once('exit', (exitCode) => {
 			this.client.log.debug( { cmd : cmd, args : args, exitCode : exitCode }, 'Process exited' );
-			
+
 			this.restorePipeAfterExternalProc();
 			externalProc.removeAllListeners();
 
 			return cb(exitCode ? Errors.ExternalProcess(`Process exited with exit code ${exitCode}`, 'EBADEXIT') : null);
-		});	
+		});
 	}
 
 	executeExternalProtocolHandlerForSend(filePaths, cb) {
@@ -413,7 +413,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
 			this.executeExternalProtocolHandler(args, err => {
 				return cb(err);
-			});		
+			});
 		});
 	}
 
@@ -434,7 +434,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			return { sentFileIds : this.sentFileIds };
 		} else {
 			return { recvFilePaths : this.recvFilePaths };
-		}		
+		}
 	}
 
 	updateSendStats(cb) {
@@ -478,11 +478,11 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			fileIds.forEach(fileId => {
 				FileEntry.incrementAndPersistMetaValue(fileId, 'dl_count', 1);
 			});
-			
+
 			return cb(null);
 		});
 	}
-	
+
 	updateRecvStats(cb) {
 		let uploadBytes	= 0;
 		let uploadCount	= 0;
@@ -519,7 +519,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 				function validateConfig(callback) {
 					if(self.isSending()) {
 						if(!Array.isArray(self.sendQueue)) {
-							self.sendQueue = [ self.sendQueue ];  
+							self.sendQueue = [ self.sendQueue ];
 						}
 					}
 
@@ -555,7 +555,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 						});
 					}
 				},
-				function cleanupTempFiles(callback) {					
+				function cleanupTempFiles(callback) {
 					temptmp.cleanup( paths => {
 						Log.debug( { paths : paths, sessionId : temptmp.sessionId }, 'Temporary files cleaned up' );
 					});
diff --git a/core/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
index f1b3dbed..299c8af2 100644
--- a/core/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -64,7 +64,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 					return this.gotoMenu(this.config.downloadFilesMenu || 'sendFilesToUser', modOpts, cb);
 				} else {
 					return this.gotoMenu(this.config.uploadFilesMenu || 'recvFilesFromUser', modOpts, cb);
-				}				
+				}
 			},
 		};
 	}
@@ -118,7 +118,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 
 						protListView.redraw();
 
-						return callback(null); 
+						return callback(null);
 					}
 				],
 				err => {
diff --git a/core/file_util.js b/core/file_util.js
index 9452b23f..0f91e71a 100644
--- a/core/file_util.js
+++ b/core/file_util.js
@@ -66,11 +66,11 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
 		(err, finalPath) => {
 			return cb(err, finalPath);
 		}
-	);	
+	);
 }
 
 //
-//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc. 
+//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
 //	in the case of collisions.
 //
 function moveFileWithCollisionHandling(src, dst, cb) {
diff --git a/core/fnv1a.js b/core/fnv1a.js
index f7714936..743986d6 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -7,7 +7,7 @@ let _		= require('lodash');
 module.exports = class FNV1a {
 	constructor(data) {
 		this.hash = 0x811c9dc5;
-		
+
 		if(!_.isUndefined(data)) {
 			this.update(data);
 		}
@@ -17,7 +17,7 @@ module.exports = class FNV1a {
 		if(_.isNumber(data)) {
 			data = data.toString();
 		}
-		
+
 		if(_.isString(data)) {
 			data = new Buffer(data);
 		}
@@ -28,8 +28,8 @@ module.exports = class FNV1a {
 
 		for(let b of data) {
 			this.hash = this.hash ^ b;
-			this.hash += 
-				(this.hash << 24) + (this.hash << 8) + (this.hash << 7) + 
+			this.hash +=
+				(this.hash << 24) + (this.hash << 8) + (this.hash << 7) +
 				(this.hash << 4) + (this.hash << 1);
 		}
 
@@ -46,5 +46,5 @@ module.exports = class FNV1a {
 	get value() {
 		return this.hash & 0xffffffff;
 	}
-}
+};
 
diff --git a/core/fse.js b/core/fse.js
index b266a9c9..02134f31 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -39,7 +39,7 @@ exports.moduleInfo = {
 			TL2 - To
 			TL3 - Subject
 			TL4 - Area name
-			
+
 			TL5 - Date/Time (TODO: format)
 			TL6 - Message number
 			TL7 - Mesage total (in area)
@@ -50,7 +50,7 @@ exports.moduleInfo = {
 
 			TL12 - User1
 			TL13 - User2
-			
+
 
 		Footer - Viewing
 			HM1 - Menu (prev/next/etc.)
@@ -61,14 +61,14 @@ exports.moduleInfo = {
 			TL12 - User1 (fmt message object)
 			TL13 - User2
 
-			
+
 */
 const MciCodeIds = {
 	ViewModeHeader : {
 		From			: 1,
 		To				: 2,
 		Subject			: 3,
-		
+
 		DateTime		: 5,
 		MsgNum			: 6,
 		MsgTotal		: 7,
@@ -78,9 +78,9 @@ const MciCodeIds = {
 		ReplyToMsgID	: 11,
 
 		//	:TODO: ConfName
-		
+
 	},
-	
+
 	ViewModeFooter : {
 		MsgNum			: 6,
 		MsgTotal		: 7,
@@ -90,7 +90,7 @@ const MciCodeIds = {
 		From			: 1,
 		To				: 2,
 		Subject			: 3,
-		
+
 		ErrorMsg		: 13,
 	},
 };
@@ -116,12 +116,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		//		toUserId
 		//
 		this.editorType			= config.editorType;
-		this.editorMode			= config.editorMode;	
-		
+		this.editorMode			= config.editorMode;
+
 		if(config.messageAreaTag) {
 			this.messageAreaTag	= config.messageAreaTag;
 		}
-		
+
 		this.messageIndex		= config.messageIndex || 0;
 		this.messageTotal		= config.messageTotal || 0;
 		this.toUserId			= config.toUserId || 0;
@@ -160,7 +160,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				if(errMsgView) {
 					if(err) {
 						errMsgView.setText(err.message);
-						
+
 						if(MciCodeIds.ViewModeHeader.Subject === err.view.getId()) {
 							//	:TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
 						}
@@ -179,26 +179,24 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 				self.switchFooter(function next(err) {
 					if(err) {
-						//	:TODO:... what now?
-						console.log(err)
-					} else {
-						switch(self.footerMode) {
-							case 'editor' :
-								if(!_.isUndefined(self.viewControllers.footerEditorMenu)) {
-									//self.viewControllers.footerEditorMenu.setFocus(false);
-									self.viewControllers.footerEditorMenu.detachClientEvents();
-								}
-								self.viewControllers.body.switchFocus(1);
-								self.observeEditorEvents();
-								break;
+						return cb(err);
+					}
 
-							case 'editorMenu' :
-								self.viewControllers.body.setFocus(false);
-								self.viewControllers.footerEditorMenu.switchFocus(1);
-								break;
+					switch(self.footerMode) {
+						case 'editor' :
+							if(!_.isUndefined(self.viewControllers.footerEditorMenu)) {
+								self.viewControllers.footerEditorMenu.detachClientEvents();
+							}
+							self.viewControllers.body.switchFocus(1);
+							self.observeEditorEvents();
+							break;
 
-							default : throw new Error('Unexpected mode');
-						}
+						case 'editorMenu' :
+							self.viewControllers.body.setFocus(false);
+							self.viewControllers.footerEditorMenu.switchFocus(1);
+							break;
+
+						default : throw new Error('Unexpected mode');
 					}
 
 					return cb(null);
@@ -210,9 +208,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				return cb(null);
 			},
 			appendQuoteEntry: function(formData, extraArgs, cb) {
-				//	:TODO: Dont' use magic # ID's here			
+				//	:TODO: Dont' use magic # ID's here
 				const quoteMsgView = self.viewControllers.quoteBuilder.getView(1);
-				
+
 				if(self.newQuoteBlock) {
 					self.newQuoteBlock = false;
 
@@ -220,7 +218,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 					quoteMsgView.addText(self.getQuoteByHeader());
 				}
-				
+
 				const quoteText = self.viewControllers.quoteBuilder.getView(3).getItem(formData.value.quote);
 				quoteMsgView.addText(quoteText);
 
@@ -339,7 +337,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				//
 				//	Ensure first characters indicate ANSI for detection down
 				//	the line (other boards/etc.). We also set explicit_encoding
-				//	to packetAnsiMsgEncoding (generally cp437) as various boards 
+				//	to packetAnsiMsgEncoding (generally cp437) as various boards
 				//	really don't like ANSI messages in UTF-8 encoding (they should!)
 				//
 				msgOpts.meta		= { System : { 'explicit_encoding' : Config.scannerTossers.ftn_bso.packetAnsiMsgEncoding || 'cp437' } };
@@ -351,7 +349,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 		return cb(null);
 	}
-	
+
 	setMessage(message) {
 		this.message = message;
 
@@ -495,7 +493,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 						//	:TODO: We'd like to delete up to N rows, but this does not work
 						//	in NetRunner:
 						self.client.term.rawWrite(ansi.reset() + ansi.deleteLine(3));
-						
+
 						self.client.term.rawWrite(ansi.reset() + ansi.eraseLine(2));
 					}
 					callback(null);
@@ -534,7 +532,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 							art[n],
 							self.client,
 							{ font : self.menuConfig.font },
-							function displayed(err, artData) {
+							function displayed(err) {
 								next(err);
 							}
 						);
@@ -561,7 +559,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			function complete(err) {
 				cb(err);
 			}
-		);	
+		);
 	}
 
 	switchFooter(cb) {
@@ -645,14 +643,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			],
 			function complete(err) {
 				if(err) {
-					//	:TODO: This needs properly handled!
-					console.log(err)
+					self.client.log.warn( { error : err.message }, 'FSE init error');
 				} else {
 					self.isReady = true;
 					self.finishedLoading();
 				}
 			}
-		);	
+		);
 	}
 
 	createInitialViews(mciData, cb) {
@@ -666,7 +663,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					menuLoadOpts.mciMap	= mciData.header.mciMap;
 
 					self.addViewController(
-						'header', 
+						'header',
 						new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
 					).loadFromMenuConfig(menuLoadOpts, function headerReady(err) {
 						callback(err);
@@ -713,7 +710,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				},
 				function setInitialData(callback) {
 
-					switch(self.editorMode) {						
+					switch(self.editorMode) {
 						case 'view' :
 							if(self.message) {
 								self.initHeaderViewMode();
@@ -726,7 +723,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 								}
 							}
 							break;
-							
+
 						case 'edit' :
 							{
 								const fromView = self.viewControllers.header.getView(1);
@@ -747,9 +744,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					callback(null);
 				},
 				function setInitialFocus(callback) {
-					
+
 					switch(self.editorMode) {
-						case 'edit' :							
+						case 'edit' :
 							self.switchToHeader();
 							break;
 
@@ -763,10 +760,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				}
 			],
 			function complete(err) {
-				if(err) {
-					console.error(err)
-				}
-				cb(err);
+				return cb(err);
 			}
 		);
 	}
@@ -774,7 +768,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	mciReadyHandler(mciData, cb) {
 
 		this.createInitialViews(mciData, err => {
-			//	:TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in 
+			//	:TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in
 			//	place - if this is for existing usernames else validate spec
 
 			/*
@@ -787,7 +781,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 							view.clearText();
 							self.viewControllers.headers.switchFocus(2);
 						}
-					});				
+					});
 				}
 			});*/
 
@@ -813,7 +807,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			if(modeView) {
 				this.client.term.rawWrite(ansi.savePos());
 				modeView.setText('insert' === mode ? 'INS' : 'OVR');
-				this.client.term.rawWrite(ansi.restorePos());	
+				this.client.term.rawWrite(ansi.restorePos());
 			}
 		}
 	}
@@ -824,7 +818,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 	initHeaderViewMode() {
 		assert(_.isObject(this.message));
-		
+
 		this.setHeaderText(MciCodeIds.ViewModeHeader.From,			this.message.fromUserName);
 		this.setHeaderText(MciCodeIds.ViewModeHeader.To,			this.message.toUserName);
 		this.setHeaderText(MciCodeIds.ViewModeHeader.Subject,		this.message.subject);
@@ -881,7 +875,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		//
 		this.newQuoteBlock = true;
 		const self = this;
-		
+
 		async.waterfall(
 			[
 				function clearAndDisplayArt(callback) {
@@ -892,23 +886,23 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					self.client.term.rawWrite(
 						ansi.goto(self.header.height + 1, 1) +
 						ansi.deleteLine(24 - self.header.height));
-	
+
 					theme.displayThemeArt( { name : self.menuConfig.config.art.quote, client : self.client }, function displayed(err, artData) {
 						callback(err, artData);
 					});
 				},
 				function createViewsIfNecessary(artData, callback) {
 					var formId = self.getFormId('quoteBuilder');
-					
+
 					if(_.isUndefined(self.viewControllers.quoteBuilder)) {
 						var menuLoadOpts = {
 							callingMenu	: self,
 							formId		: formId,
-							mciMap		: artData.mciMap,	
+							mciMap		: artData.mciMap,
 						};
-						
+
 						self.addViewController(
-							'quoteBuilder', 
+							'quoteBuilder',
 							new ViewController( { client : self.client, formId : formId } )
 						).loadFromMenuConfig(menuLoadOpts, function quoteViewsReady(err) {
 							callback(err);
@@ -954,10 +948,10 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			],
 			function complete(err) {
 				if(err) {
-					console.log(err)	//	:TODO: needs real impl.
+					self.client.log.warn( { error : err.message }, 'Error displaying quote builder');
 				}
 			}
-		);	
+		);
 	}
 
 	observeEditorEvents() {
@@ -1004,22 +998,22 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		var body = this.viewControllers.body.getView(1);
 		body.redraw();
 		this.viewControllers.body.switchFocus(1);
-		
+
 		//	:TODO: create method (DRY)
-		
+
 		this.updateTextEditMode(body.getTextEditMode());
 		this.updateEditModePosition(body.getEditPosition());
 
 		this.observeEditorEvents();
 	}
-	
+
 	quoteBuilderFinalize() {
 		//	:TODO: fix magic #'s
 		const quoteMsgView	= this.viewControllers.quoteBuilder.getView(1);
 		const msgView		= this.viewControllers.body.getView(1);
-				
+
 		let quoteLines 		= quoteMsgView.getData().trim();
-		
+
 		if(quoteLines.length > 0) {
 			if(this.replyIsAnsi) {
 				const bodyMessageView = this.viewControllers.body.getView(1);
@@ -1027,7 +1021,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			}
 			msgView.addText(`${quoteLines}\n\n`);
 		}
-		
+
 		quoteMsgView.setText('');
 
 		this.footerMode = 'editor';
@@ -1040,14 +1034,14 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	getQuoteByHeader() {
 		let quoteFormat = this.menuConfig.config.quoteFormats;
 
-		if(Array.isArray(quoteFormat)) {			
+		if(Array.isArray(quoteFormat)) {
 			quoteFormat =  quoteFormat[ Math.floor(Math.random() * quoteFormat.length) ];
 		} else if(!_.isString(quoteFormat)) {
 			quoteFormat = 'On {dateTime} {userName} said...';
 		}
 
-		const dtFormat = this.menuConfig.config.quoteDateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();	
-		return stringFormat(quoteFormat, { 
+		const dtFormat = this.menuConfig.config.quoteDateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();
+		return stringFormat(quoteFormat, {
 			dateTime	: moment(this.replyToMessage.modTimestamp).format(dtFormat),
 			userName	: this.replyToMessage.fromUserName,
 		});
diff --git a/core/ftn_address.js b/core/ftn_address.js
index f0936e1d..6b1e57e0 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -3,8 +3,8 @@
 
 const _		= require('lodash');
 
-const FTN_ADDRESS_REGEXP = /^([0-9]+:)?([0-9]+)(\/[0-9]+)?(\.[0-9]+)?(@[a-z0-9\-\.]+)?$/i;
-const FTN_PATTERN_REGEXP = /^([0-9\*]+:)?([0-9\*]+)(\/[0-9\*]+)?(\.[0-9\*]+)?(@[a-z0-9\-\.\*]+)?$/i;
+const FTN_ADDRESS_REGEXP = /^([0-9]+:)?([0-9]+)(\/[0-9]+)?(\.[0-9]+)?(@[a-z0-9\-.]+)?$/i;
+const FTN_PATTERN_REGEXP = /^([0-9*]+:)?([0-9*]+)(\/[0-9*]+)?(\.[0-9*]+)?(@[a-z0-9\-.*]+)?$/i;
 
 module.exports = class Address {
 	constructor(addr) {
@@ -133,7 +133,7 @@ module.exports = class Address {
 
 	static fromString(addrStr) {
 		const m = FTN_ADDRESS_REGEXP.exec(addrStr);
-	
+
 		if(m) {
 			//  start with a 2D
 			let addr = {
@@ -165,7 +165,7 @@ module.exports = class Address {
 
 		let addrStr = `${this.zone}:${this.net}`;
 
-		//	allow for e.g. '4D' or 5 
+		//	allow for e.g. '4D' or 5
 		const dim = parseInt(dimensions.toString()[0]);
 
 		if(dim >= 3) {
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index d84b4a69..d2f003e9 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -56,7 +56,7 @@ class PacketHeader {
 		this.capWordValidate	= ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);	//	swap
 
 		this.prodCodeHi			= 0xfe;	//	see above
-		this.prodRevHi			= 0;		
+		this.prodRevHi			= 0;
 	}
 
 	get origAddress() {
@@ -84,9 +84,9 @@ class PacketHeader {
 
 		//	See FSC-48
 		//	:TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
-		/*if(address.point) {		
+		/*if(address.point) {
 			this.auxNet		= address.origNet;
-			this.origNet	= -1;			
+			this.origNet	= -1;
 		} else {
 			this.origNet	= address.net;
 			this.auxNet		= 0;
@@ -158,16 +158,16 @@ exports.PacketHeader = PacketHeader;
 //
 //	*	Type 2 FTS-0001	@ http://ftsc.org/docs/fts-0001.016 (Obsolete)
 //	*	Type 2.2 FSC-0045	@ http://ftsc.org/docs/fsc-0045.001
-//	*	Type 2+ FSC-0039 and FSC-0048 @ http://ftsc.org/docs/fsc-0039.004 
+//	*	Type 2+ FSC-0039 and FSC-0048 @ http://ftsc.org/docs/fsc-0039.004
 //		and http://ftsc.org/docs/fsc-0048.002
-//	
+//
 //	Additional resources:
 //	*	Writeup on differences between type 2, 2.2, and 2+:
 //		http://walon.org/pub/fidonet/FTSC-nodelists-etc./pkt-types.txt
 //
 function Packet(options) {
 	var self = this;
-    
+
 	this.options = options || {};
 
 	this.parsePacketHeader = function(packetBuffer, cb) {
@@ -240,11 +240,11 @@ function Packet(options) {
 					//
 					//	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
 					//
-					const capWordValidateSwapped = 
+					const capWordValidateSwapped =
 						((packetHeader.capWordValidate & 0xff) << 8) |
 						((packetHeader.capWordValidate >> 8) & 0xff);
 
-					if(capWordValidateSwapped === packetHeader.capWord && 
+					if(capWordValidateSwapped === packetHeader.capWord &&
 						0 != packetHeader.capWord &&
 						packetHeader.capWord & 0x0001)
 					{
@@ -260,7 +260,7 @@ function Packet(options) {
 						//	:TODO: should fill bytes be 0?
 					}
 				}
-						
+
 				packetHeader.created = moment({
 					year 	: packetHeader.year,
 					month	: packetHeader.month - 1,	//	moment uses 0 indexed months
@@ -269,36 +269,36 @@ function Packet(options) {
 					minute	: packetHeader.minute,
 					second	: packetHeader.second
 				});
-				
+
 				let ph = new PacketHeader();
 				_.assign(ph, packetHeader);
 
 				cb(null, ph);
 			});
 	};
-	
+
 	this.getPacketHeaderBuffer = function(packetHeader) {
 		let buffer = new Buffer(FTN_PACKET_HEADER_SIZE);
 
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
 		buffer.writeUInt16LE(packetHeader.year, 4);
-		buffer.writeUInt16LE(packetHeader.month, 6);	
+		buffer.writeUInt16LE(packetHeader.month, 6);
 		buffer.writeUInt16LE(packetHeader.day, 8);
 		buffer.writeUInt16LE(packetHeader.hour, 10);
 		buffer.writeUInt16LE(packetHeader.minute, 12);
 		buffer.writeUInt16LE(packetHeader.second, 14);
-		
+
 		buffer.writeUInt16LE(packetHeader.baud, 16);
 		buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
 		buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
 		buffer.writeUInt16LE(packetHeader.destNet, 22);
 		buffer.writeUInt8(packetHeader.prodCodeLo, 24);
 		buffer.writeUInt8(packetHeader.prodRevHi, 25);
-		
+
 		const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
 		pass.copy(buffer, 26);
-		
+
 		buffer.writeUInt16LE(packetHeader.origZone, 34);
 		buffer.writeUInt16LE(packetHeader.destZone, 36);
 		buffer.writeUInt16LE(packetHeader.auxNet, 38);
@@ -311,7 +311,7 @@ function Packet(options) {
 		buffer.writeUInt16LE(packetHeader.origPoint, 50);
 		buffer.writeUInt16LE(packetHeader.destPoint, 52);
 		buffer.writeUInt32LE(packetHeader.prodData, 54);
-		
+
 		return buffer;
 	};
 
@@ -321,22 +321,22 @@ function Packet(options) {
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
 		buffer.writeUInt16LE(packetHeader.year, 4);
-		buffer.writeUInt16LE(packetHeader.month, 6);	
+		buffer.writeUInt16LE(packetHeader.month, 6);
 		buffer.writeUInt16LE(packetHeader.day, 8);
 		buffer.writeUInt16LE(packetHeader.hour, 10);
 		buffer.writeUInt16LE(packetHeader.minute, 12);
 		buffer.writeUInt16LE(packetHeader.second, 14);
-		
+
 		buffer.writeUInt16LE(packetHeader.baud, 16);
 		buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
 		buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
 		buffer.writeUInt16LE(packetHeader.destNet, 22);
 		buffer.writeUInt8(packetHeader.prodCodeLo, 24);
 		buffer.writeUInt8(packetHeader.prodRevHi, 25);
-		
+
 		const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
 		pass.copy(buffer, 26);
-		
+
 		buffer.writeUInt16LE(packetHeader.origZone, 34);
 		buffer.writeUInt16LE(packetHeader.destZone, 36);
 		buffer.writeUInt16LE(packetHeader.auxNet, 38);
@@ -376,9 +376,9 @@ function Packet(options) {
 		//		likely need to re-decode as the specified encoding
 		//	*	SAUCE is binary-ish data, so we need to inspect for it before any
 		//		decoding occurs
-		//	
+		//
 		let messageBodyData = {
-			message		: [],			
+			message		: [],
 			kludgeLines	: {},	//	KLUDGE:[value1, value2, ...] map
 			seenBy		: [],
 		};
@@ -411,7 +411,7 @@ function Packet(options) {
 				messageBodyData.kludgeLines[key] = value;
 			}
 		}
-		
+
 		let encoding = 'cp437';
 
 		async.series(
@@ -426,12 +426,12 @@ function Packet(options) {
 							if(!err) {
 								//	we read some SAUCE - don't re-process that portion into the body
 								messageBodyBuffer		= messageBodyBuffer.slice(0, sauceHeaderPosition) + messageBodyBuffer.slice(sauceHeaderPosition + sauce.SAUCE_SIZE);
-//								messageBodyBuffer 		= messageBodyBuffer.slice(0, sauceHeaderPosition);
+								//								messageBodyBuffer 		= messageBodyBuffer.slice(0, sauceHeaderPosition);
 								messageBodyData.sauce	= theSauce;
 							} else {
-								console.log(err)
+								Log.warn( { error : err.message }, 'Found what looks like to be a SAUCE record, but failed to read');
 							}
-							callback(null);	//	failure to read SAUCE is OK
+							return callback(null);	//	failure to read SAUCE is OK
 						});
 					} else {
 						callback(null);
@@ -482,7 +482,7 @@ function Packet(options) {
 						Log.debug( { encoding : encoding, error : e.toString() }, 'Error decoding. Falling back to ASCII');
 						decoded = iconv.decode(messageBodyBuffer, 'ascii');
 					}
-					
+
 					const messageLines	= strUtil.splitTextAtTerms(decoded.replace(/\xec/g, ''));
 					let endOfMessage	= false;
 
@@ -491,13 +491,13 @@ function Packet(options) {
 							messageBodyData.message.push('');
 							return;
 						}
-						
+
 						if(line.startsWith('AREA:')) {
 							messageBodyData.area = line.substring(line.indexOf(':') + 1).trim();
 						} else if(line.startsWith('--- ')) {
 							//	Tear Lines are tracked allowing for specialized display/etc.
 							messageBodyData.tearLine = line;
-						} else if(/^[ ]{1,2}\* Origin\: /.test(line)) {	//	To spec is " * Origin: ..."
+						} else if(/^[ ]{1,2}\* Origin: /.test(line)) {	//	To spec is " * Origin: ..."
 							messageBodyData.originLine = line;
 							endOfMessage = true;	//	Anything past origin is not part of the message body
 						} else if(line.startsWith('SEEN-BY:')) {
@@ -523,7 +523,7 @@ function Packet(options) {
 			}
 		);
 	};
-	
+
 	this.parsePacketMessages = function(packetBuffer, iterator, cb) {
 		binary.parse(packetBuffer)
 			.word16lu('messageType')
@@ -540,22 +540,22 @@ function Packet(options) {
 			.scan('message', NULL_TERM_BUFFER)
 			.tap(function tapped(msgData) {	//	no arrow function; want classic this
 				if(!msgData.messageType) {
-					//	end marker -- no more messages			
+					//	end marker -- no more messages
 					return cb(null);
 				}
-				
+
 				if(FTN_PACKET_MESSAGE_TYPE != msgData.messageType) {
 					return cb(new Error('Unsupported message type: ' + msgData.messageType));
 				}
-				
-				const read = 
+
+				const read =
 					14 +								//	fixed header size
 					msgData.modDateTime.length + 1 +
 					msgData.toUserName.length + 1 +
 					msgData.fromUserName.length + 1 +
 					msgData.subject.length + 1 +
 					msgData.message.length + 1;
-				
+
 				//
 				//	Convert null terminated arrays to strings
 				//
@@ -575,7 +575,7 @@ function Packet(options) {
 					subject			: convMsgData.subject,
 					modTimestamp	: ftn.getDateFromFtnDateTime(convMsgData.modDateTime),
 				});
-									
+
 				msg.meta.FtnProperty = {};
 				msg.meta.FtnProperty.ftn_orig_node		= msgData.ftn_orig_node;
 				msg.meta.FtnProperty.ftn_dest_node		= msgData.ftn_dest_node;
@@ -587,31 +587,31 @@ function Packet(options) {
 				self.processMessageBody(msgData.message, messageBodyData => {
 					msg.message 		= messageBodyData.message;
 					msg.meta.FtnKludge	= messageBodyData.kludgeLines;
-			
+
 					if(messageBodyData.tearLine) {
 						msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
-                        
+
 						if(self.options.keepTearAndOrigin) {
 							msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
 						}
 					}
-					
+
 					if(messageBodyData.seenBy.length > 0) {
 						msg.meta.FtnProperty.ftn_seen_by = messageBodyData.seenBy;
 					}
-					
+
 					if(messageBodyData.area) {
 						msg.meta.FtnProperty.ftn_area = messageBodyData.area;
 					}
-					
+
 					if(messageBodyData.originLine) {
 						msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
-                        
+
 						if(self.options.keepTearAndOrigin) {
 							msg.message += `${messageBodyData.originLine}\r\n`;
 						}
 					}
-					
+
 					//
 					//	If we have a UTC offset kludge (e.g. TZUTC) then update
 					//	modDateTime with it
@@ -619,7 +619,7 @@ function Packet(options) {
 					if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
 						msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
 					}
-					
+
 					const nextBuf = packetBuffer.slice(read);
 					if(nextBuf.length > 0) {
 						let next = function(e) {
@@ -629,12 +629,12 @@ function Packet(options) {
 								self.parsePacketMessages(nextBuf, iterator, cb);
 							}
 						};
-						
+
 						iterator('message', msg, next);
 					} else {
 						cb(null);
 					}
-				});			
+				});
 			});
 	};
 
@@ -702,7 +702,7 @@ function Packet(options) {
 
 					//
 					//	message: unbound length, NULL term'd
-					//	
+					//
 					//	We need to build in various special lines - kludges, area,
 					//	seen-by, etc.
 					//
@@ -716,7 +716,7 @@ function Packet(options) {
 					if(message.meta.FtnProperty.ftn_area) {
 						msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
 					}
-					
+
 					//	:TODO: DRY with similar function in this file!
 					Object.keys(message.meta.FtnKludge).forEach(k => {
 						switch(k) {
@@ -731,7 +731,7 @@ function Packet(options) {
 								break;
 
 							default		:
-								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]); 
+								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
 								break;
 						}
 					});
@@ -780,22 +780,22 @@ function Packet(options) {
 					//
 					msgBody += getAppendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
 					msgBody += getAppendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
-					
+
 					let msgBodyEncoded;
 					try {
 						msgBodyEncoded = iconv.encode(msgBody + '\0', options.encoding);
 					} catch(e) {
 						msgBodyEncoded = iconv.encode(msgBody + '\0', 'ascii');
 					}
-					
+
 					return callback(
-						null, 
-						Buffer.concat( [ 
-							basicHeader, 
-							toUserNameBuf, 
-							fromUserNameBuf, 
+						null,
+						Buffer.concat( [
+							basicHeader,
+							toUserNameBuf,
+							fromUserNameBuf,
 							subjectBuf,
-							msgBodyEncoded 
+							msgBodyEncoded
 						])
 					);
 				}
@@ -808,7 +808,7 @@ function Packet(options) {
 
 	this.writeMessage = function(message, ws, options) {
 		let basicHeader = new Buffer(34);
-		
+
 		basicHeader.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
 		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
 		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_node, 4);
@@ -827,7 +827,7 @@ function Packet(options) {
 		let encBuf = iconv.encode(message.toUserName + '\0', 'CP437').slice(0, 36);
 		encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
 		ws.write(encBuf);
-		
+
 		encBuf = iconv.encode(message.fromUserName + '\0', 'CP437').slice(0, 36);
 		encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
 		ws.write(encBuf);
@@ -839,7 +839,7 @@ function Packet(options) {
 
 		//
 		//	message: unbound length, NULL term'd
-		//	
+		//
 		//	We need to build in various special lines - kludges, area,
 		//	seen-by, etc.
 		//
@@ -866,7 +866,7 @@ function Packet(options) {
 		if(message.meta.FtnProperty.ftn_area) {
 			msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
 		}
-		
+
 		Object.keys(message.meta.FtnKludge).forEach(k => {
 			switch(k) {
 				case 'PATH' : break;	//	skip & save for last
@@ -889,8 +889,8 @@ function Packet(options) {
 		if(message.meta.FtnProperty.ftn_tear_line) {
 			msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
 		}
-		
-		//		
+
+		//
 		//	Origin line should be near the bottom of a message
 		//
 		if(message.meta.FtnProperty.ftn_origin) {
@@ -918,11 +918,11 @@ function Packet(options) {
 						if(err) {
 							return callback(err);
 						}
-						
+
 						let next = function(e) {
 							callback(e);
 						};
-						
+
 						iterator('header', header, next);
 					});
 				},
@@ -934,7 +934,7 @@ function Packet(options) {
 				}
 			],
 			cb	//	complete
-		);		
+		);
 	};
 }
 
@@ -954,7 +954,7 @@ Packet.Attribute = {
 	InTransit				: 0x0020,
 	Orphan					: 0x0040,
 	KillSent				: 0x0080,
-	Local					: 0x0100,	//	Message is from *this* system	
+	Local					: 0x0100,	//	Message is from *this* system
 	Hold					: 0x0200,
 	Reserved0				: 0x0400,
 	FileRequest				: 0x0800,
@@ -998,7 +998,7 @@ Packet.prototype.writeHeader = function(ws, packetHeader) {
 
 Packet.prototype.writeMessageEntry = function(ws, msgEntry) {
 	ws.write(msgEntry);
-	return msgEntry.length; 	
+	return msgEntry.length;
 };
 
 Packet.prototype.writeTerminator = function(ws) {
@@ -1014,11 +1014,11 @@ Packet.prototype.writeStream = function(ws, messages, options) {
 	if(!_.isBoolean(options.terminatePacket)) {
 		options.terminatePacket = true;
 	}
-	
+
 	if(_.isObject(options.packetHeader)) {
 		this.writePacketHeader(options.packetHeader, ws);
 	}
-	
+
 	options.encoding = options.encoding || 'utf8';
 
 	messages.forEach(msg => {
@@ -1034,12 +1034,12 @@ Packet.prototype.write = function(path, packetHeader, messages, options) {
 	if(!_.isArray(messages)) {
 		messages = [ messages ];
 	}
-	
+
 	options = options || { encoding : 'utf8' };	//	utf-8 = 'CHRS UTF-8 4'
 
 	this.writeStream(
 		fs.createWriteStream(path),	//	:TODO: specify mode/etc.
 		messages,
-		{ packetHeader : packetHeader, terminatePacket : true }
-		);
+		Object.assign( { packetHeader : packetHeader, terminatePacket : true }, options)
+	);
 };
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 39093fab..03040484 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -45,7 +45,7 @@ exports.getQuotePrefix				= getQuotePrefix;
 
 //	See list here: https://github.com/Mithgol/node-fidonet-jam
 
-function stringToNullPaddedBuffer(s, bufLen) {	
+function stringToNullPaddedBuffer(s, bufLen) {
 	let buffer 	= new Buffer(bufLen).fill(0x00);
 	let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
 	for(let i = 0; i < enc.length; ++i) {
@@ -56,7 +56,7 @@ function stringToNullPaddedBuffer(s, bufLen) {
 
 //
 //	Convert a FTN style DateTime string to a Date object
-//	
+//
 //	:TODO: Name the next couple methods better - for FTN *packets*
 function getDateFromFtnDateTime(dateTime) {
 	//
@@ -103,7 +103,7 @@ function getMessageSerialNumber(messageId) {
 //
 //	Return a FTS-0009.001 compliant MSGID value given a message
 //	See http://ftsc.org/docs/fts-0009.001
-//	
+//
 //	"A MSGID line consists of the string "^AMSGID:" (where ^A is a
 //	control-A (hex 01) and the double-quotes are not part of the
 //	string),  followed by a space,  the address of the originating
@@ -113,9 +113,9 @@ function getMessageSerialNumber(messageId) {
 //		^AMSGID: origaddr serialno
 //
 //	The originating address should be specified in a form that
-//	constitutes a valid return address for the originating network.   
+//	constitutes a valid return address for the originating network.
 //	If the originating address is enclosed in double-quotes,  the
-//	entire string between the beginning and ending double-quotes is 
+//	entire string between the beginning and ending double-quotes is
 //	considered to be the orginating address.  A double-quote character
 //	within a quoted address is represented by by two consecutive
 //	double-quote characters.  The serial number may be any eight
@@ -123,13 +123,13 @@ function getMessageSerialNumber(messageId) {
 //	messages from a given system may have the same serial number
 //	within a three years.  The manner in which this serial number is
 //	generated is left to the implementor."
-//	
+//
 //
 //	Examples & Implementations
 //
 //	Synchronet: <msgNum>.<conf+area>@<ftnAddr> <serial>
 //		2606.agora-agn_tst@46:1/142 19609217
-//		
+//
 //	Mystic: <ftnAddress> <serial>
 //		46:3/102 46686263
 //
@@ -145,10 +145,10 @@ function getMessageSerialNumber(messageId) {
 //
 function getMessageIdentifier(message, address, isNetMail = false) {
 	const addrStr = new Address(address).toString('5D');
-	return isNetMail ? 
+	return isNetMail ?
 		`${addrStr} ${getMessageSerialNumber(message.messageId)}` :
 		`${message.messageId}.${message.areaTag.toLowerCase()}@${addrStr} ${getMessageSerialNumber(message.messageId)}`
-		;
+	;
 }
 
 //
@@ -166,7 +166,7 @@ function getProductIdentifier() {
 }
 
 //
-//	Return a FRL-1004 style time zone offset for a 
+//	Return a FRL-1004 style time zone offset for a
 //	'TZUTC' kludge line
 //
 //	http://ftsc.org/docs/frl-1004.002
@@ -178,10 +178,10 @@ function getUTCTimeZoneOffset() {
 //
 //	Get a FSC-0032 style quote prefix
 //	http://ftsc.org/docs/fsc-0032.001
-//	
+//
 function getQuotePrefix(name) {
 	let initials;
-	
+
 	const parts = name.split(' ');
 	if(parts.length > 1) {
 		//	First & Last initials - (Bryan Ashby -> BA)
@@ -199,7 +199,7 @@ function getQuotePrefix(name) {
 //	http://ftsc.org/docs/fts-0004.001
 //
 function getOrigin(address) {
-	const origin = _.has(Config, 'messageNetworks.originLine') ? 
+	const origin = _.has(Config, 'messageNetworks.originLine') ?
 		Config.messageNetworks.originLine :
 		Config.general.boardName;
 
@@ -220,16 +220,12 @@ function getVia(address) {
 	/*
 		FRL-1005.001 states teh following format:
 
-		^AVia: <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone] 
+		^AVia: <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone]
 	    <Program Name> <Version> [Serial Number]<CR>
 	*/
 	const addrStr	= new Address(address).toString('5D');
 	const dateTime	= moment().utc().format('YYYYMMDD.HHmmSS.SSSS.UTC');
-
-	const version	= packageJson.version
-		.replace(/\-/g, '.')
-		.replace(/alpha/,'a')
-		.replace(/beta/,'b');
+	const version	= getCleanEnigmaVersion();
 
 	return `${addrStr} @${dateTime} ENiGMA1/2 ${version}`;
 }
@@ -272,7 +268,7 @@ function parseAbbreviatedNetNodeList(netNodes) {
 	const re = /([0-9]+)\/([0-9]+)\s?|([0-9]+)\s?/g;
 	let net;
 	let m;
-	let results = [];	
+	let results = [];
 	while(null !== (m = re.exec(netNodes))) {
 		if(m[1] && m[2]) {
 			net = parseInt(m[1]);
@@ -288,7 +284,7 @@ function parseAbbreviatedNetNodeList(netNodes) {
 //
 //	Return a FTS-0004.001 SEEN-BY entry(s) that include
 //	all pre-existing SEEN-BY entries with the addition
-//	of |additions|. 
+//	of |additions|.
 //
 //	See http://ftsc.org/docs/fts-0004.001
 //	and notes at http://ftsc.org/docs/fsc-0043.002.
@@ -324,9 +320,9 @@ function getUpdatedSeenByEntries(existingEntries, additions) {
 	if(!_.isArray(existingEntries)) {
 		existingEntries = [ existingEntries ];
 	}
-	
+
 	if(!_.isString(additions)) {
-		additions = parseAbbreviatedNetNodeList(getAbbreviatedNetNodeList(additions)); 
+		additions = parseAbbreviatedNetNodeList(getAbbreviatedNetNodeList(additions));
 	}
 
 	additions = additions.sort(Address.getComparator());
@@ -361,13 +357,13 @@ const ENCODING_TO_FTS_5003_001_CHARS = {
 	//	level 1 - generally should not be used
 	ascii		: [ 'ASCII', 1 ],
 	'us-ascii'	: [ 'ASCII', 1 ],
-	
+
 	//	level 2 - 8 bit, ASCII based
 	cp437		: [ 'CP437', 2 ],
 	cp850		: [ 'CP850', 2 ],
-	
+
 	//	level 3 - reserved
-	
+
 	//	level 4
 	utf8		: [ 'UTF-8', 4 ],
 	'utf-8'		: [ 'UTF-8', 4 ],
@@ -381,7 +377,7 @@ function getCharacterSetIdentifierByEncoding(encodingName) {
 
 function getEncodingFromCharacterSetIdentifier(chrs) {
 	const ident = chrs.split(' ')[0].toUpperCase();
-	
+
 	//	:TODO: fill in the rest!!!
 	return {
 		//	level 1
@@ -399,7 +395,7 @@ function getEncodingFromCharacterSetIdentifier(chrs) {
 		'SWISS'		: 'iso-646',
 		'UK'		: 'iso-646',
 		'ISO-10'	: 'iso-646-10',
-		
+
 		//	level 2
 		'CP437'		: 'cp437',
 		'CP850'		: 'cp850',
@@ -414,15 +410,15 @@ function getEncodingFromCharacterSetIdentifier(chrs) {
 		'LATIN-2'	: 'iso-8859-2',
 		'LATIN-5'	: 'iso-8859-9',
 		'LATIN-9'	: 'iso-8859-15',
-		
+
 		//	level 4
 		'UTF-8'		: 'utf8',
-		
+
 		//	deprecated stuff
-		'IBMPC'		: 'cp1250',		//	:TODO: validate 
+		'IBMPC'		: 'cp1250',		//	:TODO: validate
 		'+7_FIDO'	: 'cp866',
-		'+7'		: 'cp866', 
+		'+7'		: 'cp866',
 		'MAC'		: 'macroman',	//	:TODO: validate
-		
+
 	}[ident];
 }
\ No newline at end of file
diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index 28f4c29d..81d477ad 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -63,7 +63,7 @@ function HorizontalMenuView(options) {
 		}
 
 		var text = strUtil.stylizeString(
-			item.text, 
+			item.text,
 			this.hasFocus && item.focused ? self.focusTextStyle : self.textStyle);
 
 		var drawWidth = text.length + self.getSpacer().length * 2;	//	* 2 = sides
@@ -72,7 +72,7 @@ function HorizontalMenuView(options) {
 			ansi.goto(self.position.row, item.col) +
 			(index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR()) +
 			strUtil.pad(text, drawWidth, self.fillChar, 'center')
-			);
+		);
 	};
 }
 
diff --git a/core/key_entry_view.js b/core/key_entry_view.js
index cf1ba008..304f8ef3 100644
--- a/core/key_entry_view.js
+++ b/core/key_entry_view.js
@@ -44,7 +44,7 @@ module.exports = class KeyEntryView extends View {
 		if(key && 'tab' === key.name && !this.eatTabKey) {
 			return this.emit('action', 'next', key);
 		}
-		
+
 		this.emit('action', 'accept');
 		//	NOTE: we don't call super here. KeyEntryView is a special snowflake.
 	}
@@ -69,7 +69,7 @@ module.exports = class KeyEntryView extends View {
 				}
 				break;
 		}
-		
+
 		super.setPropertyValue(propName, propValue);
 	}
 
diff --git a/core/last_callers.js b/core/last_callers.js
index 3a889468..1bc1f422 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -20,7 +20,7 @@ const _					= require('lodash');
 	location
 	affiliation
 	ts
-	
+
 */
 
 exports.moduleInfo = {
@@ -65,7 +65,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
 					function fetchHistory(callback) {
 						callersView = vc.getView(MciCodeIds.CallerList);
 
-						//	fetch up 
+						//	fetch up
 						StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, 200, (err, lh) => {
 							loginHistory = lh;
 
@@ -82,12 +82,12 @@ exports.getModule = class LastCallersModule extends MenuModule {
 									loginHistory = noOpLoginHistory;
 								}
 							}
-							
+
 							//
 							//	Finally, we need to trim up the list to the needed size
 							//
 							loginHistory = loginHistory.slice(0, callersView.dimens.height);
-							
+
 							return callback(err);
 						});
 					},
@@ -99,10 +99,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
 						const dateTimeFormat = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
 
 						async.each(
-							loginHistory, 
+							loginHistory,
 							(item, next) => {
 								item.userId = parseInt(item.log_value);
-								item.ts		= moment(item.timestamp).format(dateTimeFormat);						
+								item.ts		= moment(item.timestamp).format(dateTimeFormat);
 
 								User.getUserName(item.userId, (err, userName) => {
 									if(err) {
diff --git a/core/logger.js b/core/logger.js
index f90aec41..1f1efde2 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -12,7 +12,7 @@ module.exports = class Log {
 	static init() {
 		const Config	= require('./config.js').config;
 		const logPath	= Config.paths.logs;
-		
+
 		const err = this.checkLogPath(logPath);
 		if(err) {
 			console.error(err.message);	//	eslint-disable-line no-console
@@ -29,9 +29,9 @@ module.exports = class Log {
 			err			: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
 		};
 
-		//	try to remove sensitive info by default, e.g. 'password' fields	
+		//	try to remove sensitive info by default, e.g. 'password' fields
 		[ 'formData', 'formValue' ].forEach(keyName => {
-			serializers[keyName]	= (fd) => Log.hideSensitive(fd); 
+			serializers[keyName]	= (fd) => Log.hideSensitive(fd);
 		});
 
 		this.log = bunyan.createLogger({
@@ -46,7 +46,7 @@ module.exports = class Log {
 			if(!fs.statSync(logPath).isDirectory()) {
 				return new Error(`${logPath} is not a directory`);
 			}
-			
+
 			return null;
 		} catch(e) {
 			if('ENOENT' === e.code) {
diff --git a/core/login_server_module.js b/core/login_server_module.js
index 212d2e27..72958a0c 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -28,7 +28,7 @@ module.exports = class LoginServerModule extends ServerModule {
 		} else {
 			client.user.properties.theme_id = conf.config.preLoginTheme;
 		}
-		
+
 		theme.setClientTheme(client, client.user.properties.theme_id);
 		return cb(null);   //  note: currently useless to use cb here - but this may change...again...
 	}
@@ -37,7 +37,7 @@ module.exports = class LoginServerModule extends ServerModule {
 		//
 		//	Start tracking the client. We'll assign it an ID which is
 		//	just the index in our connections array.
-		//			
+		//
 		if(_.isUndefined(client.session)) {
 			client.session = {};
 		}
@@ -68,7 +68,7 @@ module.exports = class LoginServerModule extends ServerModule {
 		client.on('close', err => {
 			const logFunc = err ? logger.log.info : logger.log.debug;
 			logFunc( { clientId : client.session.id }, 'Connection closed');
-			
+
 			clientConns.removeClient(client);
 		});
 
@@ -80,7 +80,7 @@ module.exports = class LoginServerModule extends ServerModule {
 					//	likely just doesn't exist
 					client.term.write('\nIdle timeout expired. Goodbye!\n');
 					client.end();
-				}			
+				}
 			});
 		});
 	}
diff --git a/core/mail_packet.js b/core/mail_packet.js
index 3fb8b2d2..fbbb3e76 100644
--- a/core/mail_packet.js
+++ b/core/mail_packet.js
@@ -33,4 +33,4 @@ MailPacket.prototype.write = function(options) {
 	//	emits 'packet' event per packet constructed
 	//
 	assert(_.isArray(options.messages));
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/core/mail_util.js b/core/mail_util.js
index 654b1617..4e959389 100644
--- a/core/mail_util.js
+++ b/core/mail_util.js
@@ -6,7 +6,7 @@ const Message				= require('./message.js');
 
 exports.getAddressedToInfo	= getAddressedToInfo;
 
-const EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
 /*
 	Input                              Output
diff --git a/core/mask_edit_text_view.js b/core/mask_edit_text_view.js
index f99774e6..2c0b6021 100644
--- a/core/mask_edit_text_view.js
+++ b/core/mask_edit_text_view.js
@@ -25,7 +25,7 @@ exports.MaskEditTextView	= MaskEditTextView;
 //	:TODO:
 //	* Hint, e.g. YYYY/MM/DD
 //	* Return values with literals in place
-//	
+//
 
 function MaskEditTextView(options) {
 	options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
@@ -49,7 +49,7 @@ function MaskEditTextView(options) {
 
 	this.drawText = function(s) {
 		var textToDraw = strUtil.stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
-		
+
 		assert(textToDraw.length <= self.patternArray.length);
 
 		//	draw out the text we have so far
@@ -105,7 +105,7 @@ MaskEditTextView.maskPatternCharacterRegEx = {
 
 MaskEditTextView.prototype.setText = function(text) {
 	MaskEditTextView.super_.prototype.setText.call(this, text);
-	
+
 	if(this.patternArray) {	//	:TODO: This is a hack - see TextView ctor note about setText()
 		this.patternArrayPos = this.patternArray.length;
 	}
@@ -130,14 +130,14 @@ MaskEditTextView.prototype.onKeyPress = function(ch, key) {
 					this.clientBackspace();
 				} else {
 					while(this.patternArrayPos > 0) {
-						if(_.isRegExp(this.patternArray[this.patternArrayPos])) {			
+						if(_.isRegExp(this.patternArray[this.patternArrayPos])) {
 							this.text = this.text.substr(0, this.text.length - 1);
 							this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn() + 1));
 							this.clientBackspace();
 							break;
 						}
 						this.patternArrayPos--;
-					}				
+					}
 				}
 			}
 
@@ -162,7 +162,7 @@ MaskEditTextView.prototype.onKeyPress = function(ch, key) {
 			this.text += ch;
 			this.patternArrayPos++;
 
-			while(this.patternArrayPos < this.patternArray.length && 
+			while(this.patternArrayPos < this.patternArray.length &&
 				!_.isRegExp(this.patternArray[this.patternArrayPos]))
 			{
 				this.patternArrayPos++;
@@ -186,11 +186,11 @@ MaskEditTextView.prototype.setPropertyValue = function(propName, value) {
 
 MaskEditTextView.prototype.getData = function() {
 	var rawData = MaskEditTextView.super_.prototype.getData.call(this);
-	
+
 	if(!rawData || 0 === rawData.length) {
 		return rawData;
 	}
-	
+
 	var data	= '';
 
 	assert(rawData.length <= this.patternArray.length);
diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index c5b95bb3..eb783d41 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -4,13 +4,12 @@
 //	ENiGMA½
 const TextView				= require('./text_view.js').TextView;
 const EditTextView			= require('./edit_text_view.js').EditTextView;
-const ButtonView				= require('./button_view.js').ButtonView;
+const ButtonView			= require('./button_view.js').ButtonView;
 const VerticalMenuView		= require('./vertical_menu_view.js').VerticalMenuView;
-const HorizontalMenuView		= require('./horizontal_menu_view.js').HorizontalMenuView;
-const SpinnerMenuView			= require('./spinner_menu_view.js').SpinnerMenuView;
-const ToggleMenuView			= require('./toggle_menu_view.js').ToggleMenuView;
+const HorizontalMenuView	= require('./horizontal_menu_view.js').HorizontalMenuView;
+const SpinnerMenuView		= require('./spinner_menu_view.js').SpinnerMenuView;
+const ToggleMenuView		= require('./toggle_menu_view.js').ToggleMenuView;
 const MaskEditTextView		= require('./mask_edit_text_view.js').MaskEditTextView;
-//const StatusBarView			= require('./status_bar_view.js').StatusBarView;
 const KeyEntryView			= require('./key_entry_view.js');
 const MultiLineEditTextView	= require('./multi_line_edit_text_view.js').MultiLineEditTextView;
 const getPredefinedMCIValue	= require('./predefined_mci.js').getPredefinedMCIValue;
@@ -37,7 +36,7 @@ MCIViewFactory.UserViewCodes = [
 	'XY',
 ];
 
-MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
+MCIViewFactory.prototype.createFromMCI = function(mci) {
 	assert(mci.code);
 	assert(mci.id > 0);
 	assert(mci.position);
@@ -78,7 +77,7 @@ MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
 	//
 	switch(mci.code) {
 		//	Text Label (Text View)
-		case 'TL' : 
+		case 'TL' :
 			setOption(0,	'textStyle');
 			setOption(1,	'justify');
 			setWidth(2);
@@ -105,14 +104,14 @@ MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
 			break;
 
 		//	Multi Line Edit Text
-		case 'MT' : 
+		case 'MT' :
 			//	:TODO: apply params
 			view = new MultiLineEditTextView(options);
 			break;
 
 		//	Pre-defined Label (Text View)
 		//	:TODO: Currently no real point of PL -- @method replaces this pretty much... probably remove
-		case 'PL' : 
+		case 'PL' :
 			if(mci.args.length > 0) {
 				options.text = getPredefinedMCIValue(this.client, mci.args[0]);
 				if(options.text) {
@@ -126,7 +125,7 @@ MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
 			break;
 
 		//	Button
-		case 'BT' : 
+		case 'BT' :
 			if(mci.args.length > 0) {
 				options.dimens = { width : parseInt(mci.args[0], 10) };
 			}
@@ -144,14 +143,14 @@ MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
 			setOption(0,		'itemSpacing');
 			setOption(1, 		'justify');
 			setOption(2, 		'textStyle');
-			
+
 			setFocusOption(0,	'focusTextStyle');
 
 			view = new VerticalMenuView(options);
 			break;
 
 		//	Horizontal Menu
-		case 'HM' : 
+		case 'HM' :
 			setOption(0,		'itemSpacing');
 			setOption(1,		'textStyle');
 
@@ -165,7 +164,7 @@ MCIViewFactory.prototype.createFromMCI = function(mci, cb) {
 			setOption(1, 		'justify');
 
 			setFocusOption(0,	'focusTextStyle');
-			
+
 			view = new SpinnerMenuView(options);
 			break;
 
diff --git a/core/menu_module.js b/core/menu_module.js
index 884389ca..783cc40b 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -17,17 +17,17 @@ const assert				= require('assert');
 const _						= require('lodash');
 
 exports.MenuModule = class MenuModule extends PluginModule {
-	
+
 	constructor(options) {
-		super(options);	
+		super(options);
 
 		this.menuName			= options.menuName;
 		this.menuConfig			= options.menuConfig;
 		this.client				= options.client;
 		this.menuConfig.options	= options.menuConfig.options || {};
-		this.menuMethods		= {};	//	methods called from @method's		
+		this.menuMethods		= {};	//	methods called from @method's
 		this.menuConfig.config	= this.menuConfig.config || {};
-		
+
 		this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config.menus.cls;
 
 		this.viewControllers	= {};
@@ -70,7 +70,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 						}
 					);
 				},
-				function moveToPromptLocation(callback) {												
+				function moveToPromptLocation(callback) {
 					if(self.menuConfig.prompt) {
 						//	:TODO: fetch and move cursor to prompt location, if supplied. See notes/etc. on placements
 					}
@@ -171,10 +171,10 @@ exports.MenuModule = class MenuModule extends PluginModule {
 	}
 
 	nextMenu(cb) {
-		if(!this.haveNext()) {		
+		if(!this.haveNext()) {
 			return this.prevMenu(cb);	//	no next, go to prev
 		}
-		
+
 		return this.client.menuStack.next(cb);
 	}
 
@@ -210,7 +210,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 	haveNext() {
 		return (_.isString(this.menuConfig.next) || _.isArray(this.menuConfig.next));
 	}
-	
+
 	autoNextMenu(cb) {
 		const self = this;
 
@@ -221,8 +221,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
 				return self.prevMenu(cb);
 			}
 		}
-        
-		if(_.has(this.menuConfig, 'runtime.autoNext') && true === this.menuConfig.runtime.autoNext) {	
+
+		if(_.has(this.menuConfig, 'runtime.autoNext') && true === this.menuConfig.runtime.autoNext) {
 			if(this.hasNextTimeout()) {
 				setTimeout( () => {
 					return gotoNextMenu();
@@ -297,10 +297,10 @@ exports.MenuModule = class MenuModule extends PluginModule {
 		if(options.clearScreen) {
 			this.client.term.rawWrite(ansi.resetScreen());
 		}
-		
+
 		return theme.displayThemedAsset(
-			name, 
-			this.client, 
+			name,
+			this.client,
 			Object.assign( { font : this.menuConfig.config.font }, options ),
 			(err, artData) => {
 				if(cb) {
@@ -361,7 +361,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 	pausePrompt(position, cb) {
 		if(!cb && _.isFunction(position)) {
 			cb = position;
-			position = null;		
+			position = null;
 		}
 
 		this.optionalMoveToPosition(position);
@@ -390,7 +390,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 		if(!view) {
 			return;
 		}
-		
+
 		if(appendMultiLine && (view instanceof MultiLineEditTextView)) {
 			view.addText(text);
 		} else {
@@ -401,7 +401,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 	updateCustomViewTextsWithFilter(formName, startId, fmtObj, options) {
 		options = options || {};
 
-		let textView;					
+		let textView;
 		let customMciId = startId;
 		const config	= this.menuConfig.config;
 		const endId		= options.endId || 99;	//	we'll fail to get a view before 99
diff --git a/core/menu_stack.js b/core/menu_stack.js
index b4bebea6..26e88cc5 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -78,19 +78,19 @@ module.exports = class MenuStack {
 
 		//	:TODO: leave() should really take a cb...
 		this.pop().instance.leave();	//	leave & remove current
-	
+
 		const previousModuleInfo = this.pop();	//	get previous
 
 		if(previousModuleInfo) {
 			const opts = {
-				extraArgs		: previousModuleInfo.extraArgs, 
+				extraArgs		: previousModuleInfo.extraArgs,
 				savedState		: previousModuleInfo.savedState,
 				lastMenuResult	: menuResult,
 			};
 
 			return this.goto(previousModuleInfo.name, opts, cb);
 		}
-		
+
 		return cb(Errors.MenuStack('No previous menu available', 'NOPREV'));
 	}
 
@@ -106,14 +106,14 @@ module.exports = class MenuStack {
 
 		if(currentModuleInfo && name === currentModuleInfo.name) {
 			if(cb) {
-				cb(Errors.MenuStack('Already at supplied menu', 'ALREADYTHERE'));				
+				cb(Errors.MenuStack('Already at supplied menu', 'ALREADYTHERE'));
 			}
 			return;
 		}
 
 		const loadOpts = {
 			name		: name,
-			client		: self.client, 
+			client		: self.client,
 		};
 
 		if(_.isObject(options)) {
diff --git a/core/menu_util.js b/core/menu_util.js
index d9e5a1a6..a86690e5 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -42,7 +42,7 @@ function getMenuConfig(client, name, cb) {
 				} else {
 					callback(null);
 				}
-			}			
+			}
 		],
 		function complete(err) {
 			cb(err, menuConfig);
@@ -53,7 +53,7 @@ function getMenuConfig(client, name, cb) {
 function loadMenu(options, cb) {
 	assert(_.isObject(options));
 	assert(_.isString(options.name));
-	assert(_.isObject(options.client));	
+	assert(_.isObject(options.client));
 
 	async.waterfall(
 		[
@@ -88,7 +88,7 @@ function loadMenu(options, cb) {
 
 					return callback(err, modData);
 				});
-			},		
+			},
 			function createModuleInstance(modData, callback) {
 				Log.trace(
 					{ moduleName : modData.name, extraArgs : options.extraArgs, config : modData.config, info : modData.mod.modInfo },
@@ -98,11 +98,11 @@ function loadMenu(options, cb) {
 				try {
 					moduleInstance = new modData.mod.getModule({
 						menuName		: options.name,
-						menuConfig		: modData.config, 
+						menuConfig		: modData.config,
 						extraArgs		: options.extraArgs,
 						client			: options.client,
 						lastMenuResult	: options.lastMenuResult,
-					});					
+					});
 				} catch(e) {
 					return callback(e);
 				}
@@ -143,7 +143,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
 		Log.trace( { mciKey : mciReqKey }, 'Using exact configuration key match');
 		cb(null, formForId[mciReqKey]);
 		return;
-	} 
+	}
 
 	//
 	//	Generic match
@@ -184,24 +184,24 @@ function handleAction(client, formData, conf, cb) {
 
 	switch(actionAsset.type) {
 		case 'method' :
-		case 'systemMethod' : 
+		case 'systemMethod' :
 			if(_.isString(actionAsset.location)) {
 				return callModuleMenuMethod(
-					client, 
-					actionAsset, 
-					paths.join(Config.paths.mods, actionAsset.location), 
-					formData, 
-					conf.extraArgs, 
+					client,
+					actionAsset,
+					paths.join(Config.paths.mods, actionAsset.location),
+					formData,
+					conf.extraArgs,
 					cb);
 			} else if('systemMethod' === actionAsset.type) {
 				//	:TODO: Need to pass optional args here -- conf.extraArgs and args between e.g. ()
 				//	:TODO: Probably better as system_method.js
 				return callModuleMenuMethod(
-					client, 
-					actionAsset, 
-					paths.join(__dirname, 'system_menu_method.js'), 
-					formData, 
-					conf.extraArgs, 
+					client,
+					actionAsset,
+					paths.join(__dirname, 'system_menu_method.js'),
+					formData,
+					conf.extraArgs,
 					cb);
 			} else {
 				//	local to current module
@@ -209,7 +209,7 @@ function handleAction(client, formData, conf, cb) {
 				if(_.isFunction(currentModule.menuMethods[actionAsset.asset])) {
 					return currentModule.menuMethods[actionAsset.asset](formData, conf.extraArgs, cb);
 				}
-				
+
 				const err = new Error('Method does not exist');
 				client.log.warn( { method : actionAsset.asset }, err.message);
 				return cb(err);
@@ -222,14 +222,14 @@ function handleAction(client, formData, conf, cb) {
 
 function handleNext(client, nextSpec, conf, cb) {
 	assert(_.isString(nextSpec) || _.isArray(nextSpec));
-	
+
 	if(_.isArray(nextSpec)) {
 		nextSpec = client.acs.getConditionalValue(nextSpec, 'next');
 	}
-	
+
 	const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
 	//	:TODO: getAssetWithShorthand() can return undefined - handle it!
-	
+
 	conf = conf || {};
 	const extraArgs = conf.extraArgs || {};
 
@@ -252,7 +252,7 @@ function handleNext(client, nextSpec, conf, cb) {
 
 				const err = new Error('Method does not exist');
 				client.log.warn( { method : nextAsset.asset }, err.message);
-				return cb(err);	
+				return cb(err);
 			}
 
 		case 'menu' :
diff --git a/core/menu_view.js b/core/menu_view.js
index 41f1302f..5aed54ca 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -16,7 +16,7 @@ exports.MenuView	= MenuView;
 function MenuView(options) {
 	options.acceptsFocus = miscUtil.valueWithDefault(options.acceptsFocus, true);
 	options.acceptsInput = miscUtil.valueWithDefault(options.acceptsInput, true);
-	
+
 	View.call(this, options);
 
 	this.disablePipe = options.disablePipe || false;
@@ -65,11 +65,11 @@ util.inherits(MenuView, View);
 MenuView.prototype.setItems = function(items) {
 	const self = this;
 
-	if(items) {	
+	if(items) {
 		this.items = [];
 		items.forEach( itemText => {
 			this.items.push(
-				{ 
+				{
 					text : self.disablePipe ? itemText : pipeToAnsi(itemText, self.client)
 				}
 			);
@@ -79,7 +79,7 @@ MenuView.prototype.setItems = function(items) {
 
 MenuView.prototype.removeItem = function(index) {
 	this.items.splice(index, 1);
-	
+
 	if(this.focusItems) {
 		this.focusItems.splice(index, 1);
 	}
@@ -95,7 +95,7 @@ MenuView.prototype.getCount = function() {
 	return this.items.length;
 };
 
-MenuView.prototype.getItems = function() {	
+MenuView.prototype.getItems = function() {
 	return this.items.map( item => {
 		return item.text;
 	});
@@ -140,7 +140,7 @@ MenuView.prototype.onKeyPress = function(ch, key) {
 
 MenuView.prototype.setFocusItems = function(items) {
 	const self = this;
-	
+
 	if(items) {
 		this.focusItems = [];
 		items.forEach( itemText => {
@@ -183,7 +183,7 @@ MenuView.prototype.setHotKeys = function(hotKeys) {
 				this.hotKeys[key.toLowerCase()] = hotKeys[key];
 			}
 		} else {
-			this.hotKeys = hotKeys;	
+			this.hotKeys = hotKeys;
 		}
 	}
 };
diff --git a/core/message.js b/core/message.js
index 5d3c8db9..7cac5c79 100644
--- a/core/message.js
+++ b/core/message.js
@@ -9,9 +9,9 @@ const getISOTimestampString	= require('./database.js').getISOTimestampString;
 const Errors				= require('./enig_error.js').Errors;
 const ANSI					= require('./ansi_term.js');
 
-const { 
+const {
 	isAnsi, isFormattedLine,
-	splitTextAtTerms, 
+	splitTextAtTerms,
 	renderSubstr
 }							= require('./string_util.js');
 
@@ -45,7 +45,7 @@ function Message(options) {
 	this.fromUserName	= options.fromUserName || '';
 	this.subject		= options.subject || '';
 	this.message		= options.message || '';
-		
+
 	if(_.isDate(options.modTimestamp) || moment.isMoment(options.modTimestamp)) {
 		this.modTimestamp = moment(options.modTimestamp);
 	} else if(_.isString(options.modTimestamp)) {
@@ -115,7 +115,7 @@ Message.StateFlags0 = {
 	Exported	: 0x00000002,	//	exported to foreign system
 };
 
-Message.FtnPropertyNames = {	
+Message.FtnPropertyNames = {
 	FtnOrigNode			: 'ftn_orig_node',
 	FtnDestNode			: 'ftn_dest_node',
 	FtnOrigNetwork		: 'ftn_orig_network',
@@ -166,12 +166,12 @@ Message.createMessageUUID = function(areaTag, modTimestamp, subject, body) {
 	if(!moment.isMoment(modTimestamp)) {
 		modTimestamp = moment(modTimestamp);
 	}
-		
+
 	areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
 	modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
 	subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
 	body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
-	
+
 	return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
 };
 
@@ -180,8 +180,8 @@ Message.getMessageIdByUuid = function(uuid, cb) {
 		`SELECT message_id
 		FROM message
 		WHERE message_uuid = ?
-		LIMIT 1;`, 
-		[ uuid ], 
+		LIMIT 1;`,
+		[ uuid ],
 		(err, row) => {
 			if(err) {
 				cb(err);
@@ -210,30 +210,30 @@ Message.getMessageIdsByMetaValue = function(category, name, value, cb) {
 };
 
 Message.getMetaValuesByMessageId = function(messageId, category, name, cb) {
-	const sql = 
+	const sql =
 		`SELECT meta_value
 		FROM message_meta
 		WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
-	
+
 	msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
 		if(err) {
 			return cb(err);
 		}
-		
+
 		if(0 === rows.length) {
 			return cb(new Error('No value for category/name'));
 		}
-		
+
 		//	single values are returned without an array
 		if(1 === rows.length) {
 			return cb(null, rows[0].meta_value);
 		}
-		
+
 		cb(null, rows.map(r => r.meta_value));	//	map to array of values only
 	});
 };
 
-Message.getMetaValuesByMessageUuid = function(uuid, category, name, cb) {	
+Message.getMetaValuesByMessageUuid = function(uuid, category, name, cb) {
 	async.waterfall(
 		[
 			function getMessageId(callback) {
@@ -256,22 +256,22 @@ Message.getMetaValuesByMessageUuid = function(uuid, category, name, cb) {
 Message.prototype.loadMeta = function(cb) {
 	/*
 		Example of loaded this.meta:
-		
+
 		meta: {
 			System: {
-				local_to_user_id: 1234,				
+				local_to_user_id: 1234,
 			},
 			FtnProperty: {
 				ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
 			}
-		}					
-	*/	
-	
-	const sql = 
+		}
+	*/
+
+	const sql =
 		`SELECT meta_category, meta_name, meta_value
 		FROM message_meta
 		WHERE message_id = ?;`;
-		
+
 	let self = this;
 	msgDb.each(sql, [ this.messageId ], (err, row) => {
 		if(!(row.meta_category in self.meta)) {
@@ -279,12 +279,12 @@ Message.prototype.loadMeta = function(cb) {
 			self.meta[row.meta_category][row.meta_name] = row.meta_value;
 		} else {
 			if(!(row.meta_name in self.meta[row.meta_category])) {
-				self.meta[row.meta_category][row.meta_name] = row.meta_value; 
+				self.meta[row.meta_category][row.meta_name] = row.meta_value;
 			} else {
 				if(_.isString(self.meta[row.meta_category][row.meta_name])) {
-					self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];					
+					self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];
 				}
-				
+
 				self.meta[row.meta_category][row.meta_name].push(row.meta_value);
 			}
 		}
@@ -315,7 +315,7 @@ Message.prototype.load = function(options, cb) {
 						if(!msgRow) {
 							return callback(new Error('Message (no longer) available'));
 						}
-						
+
 						self.messageId		= msgRow.message_id;
 						self.areaTag		= msgRow.area_tag;
 						self.messageUuid	= msgRow.message_uuid;
@@ -356,13 +356,13 @@ Message.prototype.persistMetaValue = function(category, name, value, transOrDb,
 	const metaStmt = transOrDb.prepare(
 		`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
 		VALUES (?, ?, ?, ?);`);
-		
+
 	if(!_.isArray(value)) {
 		value = [ value ];
 	}
-	
+
 	let self = this;
-	
+
 	async.each(value, (v, next) => {
 		metaStmt.run(self.messageId, category, name, v, err => {
 			next(err);
@@ -379,7 +379,7 @@ Message.prototype.persist = function(cb) {
 	}
 
 	const self = this;
-	
+
 	async.waterfall(
 		[
 			function beginTransaction(callback) {
@@ -398,7 +398,7 @@ Message.prototype.persist = function(cb) {
 
 				trans.run(
 					`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?);`, 
+					VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
 					[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
 					function inserted(err) {	//	use non-arrow function for 'this' scope
 						if(!err) {
@@ -415,15 +415,15 @@ Message.prototype.persist = function(cb) {
 				}
 				/*
 					Example of self.meta:
-					
+
 					meta: {
 						System: {
-							local_to_user_id: 1234,				
+							local_to_user_id: 1234,
 						},
 						FtnProperty: {
 							ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
 						}
-					}					
+					}
 				*/
 				async.each(Object.keys(self.meta), (category, nextCat) => {
 					async.each(Object.keys(self.meta[category]), (name, nextName) => {
@@ -433,10 +433,10 @@ Message.prototype.persist = function(cb) {
 					}, err => {
 						nextCat(err);
 					});
-						
+
 				}, err => {
 					callback(err, trans);
-				});					
+				});
 			},
 			function storeHashTags(trans, callback) {
 				//	:TODO: hash tag support
@@ -470,21 +470,21 @@ Message.prototype.getQuoteLines = function(options, cb) {
 	if(!options.termWidth || !options.termHeight || !options.cols) {
 		return cb(Errors.MissingParam());
 	}
-	
+
 	options.startCol			= options.startCol || 1;
 	options.includePrefix 		= _.get(options, 'includePrefix', true);
 	options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
 	options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
 	options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
-	
+
 	/*
 		Some long text that needs to be wrapped and quoted should look right after
-		doing so, don't ya think? yeah I think so		
+		doing so, don't ya think? yeah I think so
 
-		Nu> Some long text that needs to be wrapped and quoted should look right 
+		Nu> Some long text that needs to be wrapped and quoted should look right
 		Nu> after doing so, don't ya think? yeah I think so
 
-		Ot> Nu> Some long text that needs to be wrapped and quoted should look 
+		Ot> Nu> Some long text that needs to be wrapped and quoted should look
 		Ot> Nu> right after doing so, don't ya think? yeah I think so
 
 	*/
@@ -498,7 +498,7 @@ Message.prototype.getQuoteLines = function(options, cb) {
 			tabHandling	: 'expand',
 			tabWidth	: 4,
 		};
-		
+
 		return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
 			return i === 0 ? `${quotePrefix}${w}` : `${quotePrefix}${extraPrefix}${w}`;
 		});
@@ -527,44 +527,44 @@ Message.prototype.getQuoteLines = function(options, cb) {
 				cols			: options.cols,
 				rows			: 'auto',
 				startCol		: options.startCol,
-				forceLineTerm	: true,				
+				forceLineTerm	: true,
 			},
 			(err, prepped) => {
 				prepped = prepped || this.message;
-				
+
 				let lastSgr = '';
 				const split = splitTextAtTerms(prepped);
-				
+
 				const quoteLines		= [];
 				const focusQuoteLines	= [];
 
 				//
 				//	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
-				//	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to 
+				//	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
 				//	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
 				//	the trick and allow them to leave them alone!
 				//
 				split.forEach(l => {
 					quoteLines.push(`${lastSgr}${l}`);
-					
+
 					focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
-					lastSgr = (l.match(/(?:\x1b\x5b)[\?=;0-9]*m(?!.*(?:\x1b\x5b)[\?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
+					lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
 				});
 
 				quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
-				
+
 				return cb(null, quoteLines, focusQuoteLines, true);
 			}
 		);
 	} else {
-		const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}\> )+(?:[A-Za-z0-9]{2}\>)*) */;
+		const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
 		const quoted	= [];
 		const input		= _.trimEnd(this.message).replace(/\b/g, '');
-	
+
 		//	find *last* tearline
 		let tearLinePos = this.getTearLinePosition(input);
 		tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
-		
+
 		input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
 			//
 			//	For each paragraph, a state machine:
@@ -612,7 +612,7 @@ Message.prototype.getQuoteLines = function(options, cb) {
 							buf += ` ${line}`;
 						}
 						break;
-						
+
 					case 'quote_line' :
 						if(quoteMatch) {
 							const rem = line.slice(quoteMatch[0].length);
@@ -628,7 +628,7 @@ Message.prototype.getQuoteLines = function(options, cb) {
 							state = 'line';
 						}
 						break;
-							
+
 					default :
 						if(isFormattedLine(line)) {
 							quoted.push(getFormattedLine(line));
@@ -637,12 +637,12 @@ Message.prototype.getQuoteLines = function(options, cb) {
 							buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
 						}
 						break;
-				}		
+				}
 			});
-			
+
 			quoted.push(...getWrapped(buf, quoteMatch ? quoteMatch[1] : null));
 		});
-		
+
 		input.slice(tearLinePos).split(/\r?\n/).forEach(l => {
 			quoted.push(...getWrapped(l));
 		});
diff --git a/core/message_area.js b/core/message_area.js
index 53dd3086..3c42e23f 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -40,9 +40,9 @@ function getAvailableMessageConferences(client, options) {
 	options = options || { includeSystemInternal : false };
 
 	assert(client || true === options.noClient);
-    
-    //	perform ACS check per conf & omit system_internal if desired
-	return _.omitBy(Config.messageConferences, (conf, confTag) => {        
+
+	//	perform ACS check per conf & omit system_internal if desired
+	return _.omitBy(Config.messageConferences, (conf, confTag) => {
 		if(!options.includeSystemInternal && 'system_internal' === confTag) {
 			return true;
 		}
@@ -60,15 +60,15 @@ function getSortedAvailMessageConferences(client, options) {
 	});
 
 	sortAreasOrConfs(confs, 'conf');
-	
+
 	return confs;
 }
 
 //  Return an *object* of available areas within |confTag|
 function getAvailableMessageAreasByConfTag(confTag, options) {
 	options = options || {};
-    
-    //  :TODO: confTag === "" then find default
+
+	//  :TODO: confTag === "" then find default
 
 	if(_.has(Config.messageConferences, [ confTag, 'areas' ])) {
 		const areas = Config.messageConferences[confTag].areas;
@@ -92,9 +92,9 @@ function getSortedAvailMessageAreasByConfTag(confTag, options) {
 			area	: v,
 		};
 	});
-	
+
 	sortAreasOrConfs(areas, 'area');
-	
+
 	return areas;
 }
 
@@ -103,7 +103,7 @@ function getDefaultMessageConferenceTag(client, disableAcsCheck) {
 	//	Find the first conference marked 'default'. If found,
 	//	inspect |client| against *read* ACS using defaults if not
 	//	specified.
-	//	
+	//
 	//	If the above fails, just go down the list until we get one
 	//	that passes.
 	//
@@ -116,14 +116,14 @@ function getDefaultMessageConferenceTag(client, disableAcsCheck) {
 		const conf = Config.messageConferences[defaultConf];
 		if(true === disableAcsCheck || client.acs.hasMessageConfRead(conf)) {
 			return defaultConf;
-		} 
+		}
 	}
 
 	//  just use anything we can
 	defaultConf = _.findKey(Config.messageConferences, (conf, confTag) => {
 		return 'system_internal' !== confTag && (true === disableAcsCheck || client.acs.hasMessageConfRead(conf));
 	});
-    
+
 	return defaultConf;
 }
 
@@ -138,19 +138,19 @@ function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
 	confTag = confTag || getDefaultMessageConferenceTag(client);
 
 	if(confTag && _.has(Config.messageConferences, [ confTag, 'areas' ])) {
-		const areaPool = Config.messageConferences[confTag].areas;        
+		const areaPool = Config.messageConferences[confTag].areas;
 		let defaultArea = _.findKey(areaPool, o => o.default);
 		if(defaultArea) {
 			const area = areaPool[defaultArea];
 			if(true === disableAcsCheck || client.acs.hasMessageAreaRead(area)) {
 				return defaultArea;
-			}            
+			}
 		}
-		
+
 		defaultArea = _.findKey(areaPool, (area) => {
-			return (true === disableAcsCheck || client.acs.hasMessageAreaRead(area));       
+			return (true === disableAcsCheck || client.acs.hasMessageAreaRead(area));
 		});
-		
+
 		return defaultArea;
 	}
 }
@@ -159,18 +159,6 @@ function getMessageConferenceByTag(confTag) {
 	return Config.messageConferences[confTag];
 }
 
-function getMessageConfByAreaTag(areaTag) {
-	const confs = Config.messageConferences;
-	let conf;
-	_.forEach(confs, (v) => {
-		if(_.has(v, [ 'areas', areaTag ])) {
-			conf = v;
-			return false;   //  stop iteration
-		}
-	});
-	return conf;
-}
-
 function getMessageConfTagByAreaTag(areaTag) {
 	const confs = Config.messageConferences;
 	return Object.keys(confs).find( (confTag) => {
@@ -194,9 +182,9 @@ function getMessageAreaByTag(areaTag, optionalConfTag) {
 			if(_.has(v, [ 'areas', areaTag ])) {
 				area = v.areas[areaTag];
 				return false;   //  stop iteration
-			} 
+			}
 		});
-		
+
 		return area;
 	}
 }
@@ -206,7 +194,7 @@ function changeMessageConference(client, confTag, cb) {
 		[
 			function getConf(callback) {
 				const conf = getMessageConferenceByTag(confTag);
-				
+
 				if(conf) {
 					callback(null, conf);
 				} else {
@@ -216,7 +204,7 @@ function changeMessageConference(client, confTag, cb) {
 			function getDefaultAreaInConf(conf, callback) {
 				const areaTag 	= getDefaultMessageAreaTagByConfTag(client, confTag);
 				const area		= getMessageAreaByTag(areaTag, confTag);
-				
+
 				if(area) {
 					callback(null, conf, { areaTag : areaTag, area : area } );
 				} else {
@@ -229,7 +217,7 @@ function changeMessageConference(client, confTag, cb) {
 				} else {
 					return callback(null, conf, areaInfo);
 				}
-			},			
+			},
 			function changeConferenceAndArea(conf, areaInfo, callback) {
 				const newProps = {
 					message_conf_tag	: confTag,
@@ -258,12 +246,12 @@ function changeMessageAreaWithOptions(client, areaTag, options, cb) {
 		[
 			function getArea(callback) {
 				const area = getMessageAreaByTag(areaTag);
-				return callback(area ? null : new Error('Invalid message areaTag'), area);				
+				return callback(area ? null : new Error('Invalid message areaTag'), area);
 			},
 			function validateAccess(area, callback) {
-                //
-                //  Need at least *read* to access the area
-                //
+				//
+				//  Need at least *read* to access the area
+				//
 				if(!client.acs.hasMessageAreaRead(area)) {
 					return callback(new Error('Access denied to message area'));
 				} else {
@@ -294,7 +282,7 @@ function changeMessageAreaWithOptions(client, areaTag, options, cb) {
 }
 
 //
-//	Temporairly -- e.g. non-persisted -- change to an area and it's 
+//	Temporairly -- e.g. non-persisted -- change to an area and it's
 //	associated underlying conference. ACS is checked for both.
 //
 //	This is useful for example when doing a new scan
@@ -312,7 +300,7 @@ function tempChangeMessageConfAndArea(client, areaTag) {
 	if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
 		return false;
 	}
-	
+
 	client.user.properties.message_conf_tag	= confTag;
 	client.user.properties.message_area_tag = areaTag;
 
@@ -324,7 +312,7 @@ function changeMessageArea(client, areaTag, cb) {
 }
 
 function getMessageFromRow(row) {
-	return { 
+	return {
 		messageId		: row.message_id,
 		messageUuid		: row.message_uuid,
 		replyToMsgId	: row.reply_to_message_id,
@@ -346,8 +334,8 @@ function getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, what)
 	//
 	//	* Only messages > |lastMessageId| should be returned/counted
 	//
-	const selectWhat = ('count' === what) ? 
-		'COUNT() AS count' : 
+	const selectWhat = ('count' === what) ?
+		'COUNT() AS count' :
 		'message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count';
 
 	let sql =
@@ -386,7 +374,7 @@ function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
 				msgDb.get(sql, (err, row) => {
 					return callback(err, row ? row.count : 0);
 				});
-			} 
+			}
 		],
 		cb
 	);
@@ -421,7 +409,7 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
 		function complete(err) {
 			cb(err, msgList);
 		}
-	);	
+	);
 }
 
 function getMessageListForArea(options, areaTag, cb) {
@@ -435,7 +423,7 @@ function getMessageListForArea(options, areaTag, cb) {
 
 	/*
 		[
-			{ 
+			{
 				messageId, messageUuid, replyToId, toUserName, fromUserName, subject, modTimestamp,
 				status(new|old),
 				viewCount
@@ -448,13 +436,13 @@ function getMessageListForArea(options, areaTag, cb) {
 	async.series(
 		[
 			function fetchMessages(callback) {
-				let sql = 
+				let sql =
 					`SELECT message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count
 					FROM message
 					WHERE area_tag = ?`;
 
 				if(Message.isPrivateAreaTag(areaTag)) {
-					sql += 
+					sql +=
 						` AND message_id IN (
 							SELECT message_id 
 							FROM message_meta 
@@ -462,7 +450,7 @@ function getMessageListForArea(options, areaTag, cb) {
 						)`;
 				}
 
-				sql += ' ORDER BY message_id;'; 
+				sql += ' ORDER BY message_id;';
 
 				msgDb.each(
 					sql,
@@ -551,12 +539,12 @@ function updateMessageAreaLastReadId(userId, areaTag, messageId, allowOlder, cb)
 		],
 		function complete(err, didUpdate) {
 			if(err) {
-				Log.debug( 
-					{ error : err.toString(), userId : userId, areaTag : areaTag, messageId : messageId }, 
+				Log.debug(
+					{ error : err.toString(), userId : userId, areaTag : areaTag, messageId : messageId },
 					'Failed updating area last read ID');
 			} else {
 				if(true === didUpdate) {
-					Log.trace( 
+					Log.trace(
 						{ userId : userId, areaTag : areaTag, messageId : messageId },
 						'Area last read ID updated');
 				}
@@ -574,7 +562,7 @@ function persistMessage(message, cb) {
 			},
 			function recordToMessageNetworks(callback) {
 				return msgNetRecord(message, callback);
-			}			
+			}
 		],
 		cb
 	);
@@ -582,7 +570,7 @@ function persistMessage(message, cb) {
 
 //	method exposed for event scheduler
 function trimMessageAreasScheduledEvent(args, cb) {
-	
+
 	function trimMessageAreaByMaxMessages(areaInfo, cb) {
 		if(0 === areaInfo.maxMessages) {
 			return cb(null);
@@ -605,7 +593,7 @@ function trimMessageAreasScheduledEvent(args, cb) {
 					Log.debug( { areaInfo : areaInfo, type : 'maxMessages', count : this.changes }, 'Area trimmed successfully');
 				}
 				return cb(err);
-			}	
+			}
 		);
 	}
 
@@ -690,7 +678,7 @@ function trimMessageAreasScheduledEvent(args, cb) {
 
 							trimMessageAreaByMaxAgeDays(areaInfo, err => {
 								return next(err);
-							});							
+							});
 						});
 					},
 					callback
diff --git a/core/mime_util.js b/core/mime_util.js
index 1e2bd32c..a110572c 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -36,6 +36,6 @@ function resolveMimeType(query) {
 	if(mimeTypes.extensions[query]) {
 		return query;	//	alreaed a mime-type
 	}
-	
+
 	return mimeTypes.lookup(query) || undefined;	//	lookup() returns false; we want undefined
 }
\ No newline at end of file
diff --git a/core/misc_util.js b/core/misc_util.js
index afe33dee..70bbb5e2 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -36,10 +36,10 @@ function resolvePath(path) {
 
 function getCleanEnigmaVersion() {
 	return packageJson.version
-		.replace(/\-/g, '.')
+		.replace(/-/g, '.')
 		.replace(/alpha/,'a')
 		.replace(/beta/,'b')
-		;
+	;
 }
 
 //	See also ftn_util.js getTearLine() & getProductIdentifier()
diff --git a/core/mod_mixins.js b/core/mod_mixins.js
index 291e0cc9..48546825 100644
--- a/core/mod_mixins.js
+++ b/core/mod_mixins.js
@@ -5,7 +5,7 @@ const messageArea	= require('../core/message_area.js');
 
 
 exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
-	
+
 	tempMessageConfAndAreaSwitch(messageAreaTag) {
 		messageAreaTag = messageAreaTag || this.messageAreaTag;
 		if(!messageAreaTag) {
@@ -14,7 +14,7 @@ exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
 		this.prevMessageConfAndArea = {
 			confTag	: this.client.user.properties.message_conf_tag,
-			areaTag	: this.client.user.properties.message_area_tag,		
+			areaTag	: this.client.user.properties.message_area_tag,
 		};
 
 		if(!messageArea.tempChangeMessageConfAndArea(this.client, this.messageAreaTag)) {
@@ -25,7 +25,7 @@ exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 	tempMessageConfAndAreaRestore() {
 		if(this.prevMessageConfAndArea) {
 			this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
-			this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;		
+			this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
 		}
 	}
 };
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index eaedbef8..96b0a51c 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -36,7 +36,7 @@ exports.moduleInfo = {
 const MciViewIds = {
 	AreaList		: 1,
 	SelAreaInfo1	: 2,
-	SelAreaInfo2	: 3, 
+	SelAreaInfo2	: 3,
 };
 
 exports.getModule = class MessageAreaListModule extends MenuModule {
@@ -61,7 +61,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 							self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
 
 							self.prevMenuOnTimeout(1000, cb);
-						} else {						
+						} else {
 							if(_.isString(area.art)) {
 								const dispOptions = {
 									client	: self.client,
@@ -72,7 +72,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 
 								displayThemeArt(dispOptions, () => {
 									//	pause by default, unless explicitly told not to
-									if(_.has(area, 'options.pause') && false === area.options.pause) { 
+									if(_.has(area, 'options.pause') && false === area.options.pause) {
 										return self.prevMenuOnTimeout(1000, cb);
 									} else {
 										self.pausePrompt( () => {
@@ -98,9 +98,9 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 		}, timeout);
 	}
 
-	updateGeneralAreaInfoViews(areaIndex) {
-		//	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
-		/* experimental: not yet avail
+	//	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
+	/*
+	updateGeneralAreaInfoViews(areaIndex) {				
 		const areaInfo = self.messageAreas[areaIndex];
 
 		[ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
@@ -109,8 +109,8 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 				v.setFormatObject(areaInfo.area);
 			}
 		});
-		*/
 	}
+	*/
 
 	mciReady(mciData, cb) {
 		super.mciReady(mciData, err => {
@@ -137,7 +137,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 					function populateAreaListView(callback) {
 						const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
 						const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
-						
+
 						const areaListView = vc.getView(MciViewIds.AreaList);
 						let i = 1;
 						areaListView.setItems(_.map(self.messageAreas, v => {
@@ -145,7 +145,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 								index   : i++,
 								areaTag : v.area.areaTag,
 								name    : v.area.name,
-								desc    : v.area.desc, 
+								desc    : v.area.desc,
 							});
 						}));
 
@@ -155,7 +155,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 								index   : i++,
 								areaTag : v.area.areaTag,
 								name    : v.area.name,
-								desc    : v.area.desc, 
+								desc    : v.area.desc,
 							});
 						}));
 
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index c13f39a6..3ffef698 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -48,9 +48,9 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
 						self.client.log.info(
 							{ to : msg.toUserName, subject : msg.subject, uuid : msg.uuid },
 							'Message persisted'
-							);
+						);
 					}
-					
+
 					return self.nextMenu(cb);
 				}
 			);
diff --git a/core/msg_area_view_fse.js b/core/msg_area_view_fse.js
index 02915f79..0f25c63f 100644
--- a/core/msg_area_view_fse.js
+++ b/core/msg_area_view_fse.js
@@ -69,7 +69,7 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 					case 'down arrow'	: bodyView.scrollDocumentUp(); break;
 					case 'up arrow'		: bodyView.scrollDocumentDown(); break;
 					case 'page up'		: bodyView.keyPressPageUp(); break;
-					case 'page down'	: bodyView.keyPressPageDown(); break;			
+					case 'page down'	: bodyView.keyPressPageDown(); break;
 				}
 
 				//	:TODO: need to stop down/page down if doing so would push the last
@@ -83,13 +83,13 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 					const modOpts = {
 						extraArgs : {
 							messageAreaTag		: self.messageAreaTag,
-							replyToMessage		: self.message,	
-						}				
+							replyToMessage		: self.message,
+						}
 					};
 
 					return self.gotoMenu(extraArgs.menu, modOpts, cb);
 				}
-				
+
 				self.client.log(extraArgs, 'Missing extraArgs.menu');
 				return cb(null);
 			}
diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index 6f42cf36..43e57820 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -21,10 +21,10 @@ exports.moduleInfo = {
 
 const MciViewIds = {
 	ConfList	: 1,
-	
+
 	//	:TODO:
 	//	# areas in conf .... see Obv/2, iNiQ, ...
-	//	
+	//
 };
 
 exports.getModule = class MessageConfListModule extends MenuModule {
@@ -33,16 +33,16 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 
 		this.messageConfs = messageArea.getSortedAvailMessageConferences(this.client);
 		const self = this;
-		
+
 		this.menuMethods = {
 			changeConference : function(formData, extraArgs, cb) {
 				if(1 === formData.submitId) {
 					let conf		= self.messageConfs[formData.value.conf];
 					const confTag	= conf.confTag;
-					conf = conf.conf;	//	what we want is embedded 
+					conf = conf.conf;	//	what we want is embedded
 
 					messageArea.changeMessageConference(self.client, confTag, err => {
-						if(err) {						
+						if(err) {
 							self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
 
 							setTimeout( () => {
@@ -59,7 +59,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 
 								displayThemeArt(dispOptions, () => {
 									//	pause by default, unless explicitly told not to
-									if(_.has(conf, 'options.pause') && false === conf.options.pause) { 
+									if(_.has(conf, 'options.pause') && false === conf.options.pause) {
 										return self.prevMenuOnTimeout(1000, cb);
 									} else {
 										self.pausePrompt( () => {
@@ -108,7 +108,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 					function populateConfListView(callback) {
 						const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
 						const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
-						
+
 						const confListView = vc.getView(MciViewIds.ConfList);
 						let i = 1;
 						confListView.setItems(_.map(self.messageConfs, v => {
@@ -116,7 +116,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 								index   : i++,
 								confTag : v.conf.confTag,
 								name    : v.conf.name,
-								desc    : v.conf.desc, 
+								desc    : v.conf.desc,
 							});
 						}));
 
@@ -126,7 +126,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 								index   : i++,
 								confTag : v.conf.confTag,
 								name    : v.conf.name,
-								desc    : v.conf.desc, 
+								desc    : v.conf.desc,
 							});
 						}));
 
diff --git a/core/msg_list.js b/core/msg_list.js
index e5a69e80..19ef30cd 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -26,7 +26,7 @@ const moment			= require('moment');
 	MCI codes:
 
 	VM1			: Message list
-	TL2			: Message info 1: { msgNumSelected, msgNumTotal }	
+	TL2			: Message info 1: { msgNumSelected, msgNumTotal }
 */
 
 exports.moduleInfo = {
@@ -84,9 +84,9 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 					//	due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
 					//
 					modOpts.extraArgs.toJSON = function() {
-						const logMsgList = (this.messageList.length <= 4) ? 
-							this.messageList : 
-							this.messageList.slice(0, 2).concat(this.messageList.slice(-2)); 
+						const logMsgList = (this.messageList.length <= 4) ?
+							this.messageList :
+							this.messageList.slice(0, 2).concat(this.messageList.slice(-2));
 
 						return {
 							messageAreaTag		: this.messageAreaTag,
@@ -158,14 +158,14 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						if(_.isArray(self.messageList)) {
 							return callback(0 === self.messageList.length ? new Error('No messages in area') : null);
 						}
-						
+
 						messageArea.getMessageListForArea( { client : self.client }, self.messageAreaTag, function msgs(err, msgList) {
 							if(!msgList || 0 === msgList.length) {
 								return callback(new Error('No messages in area'));
 							}
-							
+
 							self.messageList = msgList;
-							return callback(err);						
+							return callback(err);
 						});
 					},
 					function getLastReadMesageId(callback) {
@@ -187,15 +187,15 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
 							if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
 								self.initialFocusIndex = index;
-							}					
+							}
 						});
 						return callback(null);
 					},
 					function populateList(callback) {
-						const msgListView			= vc.getView(MCICodesIDs.MsgList);	
-						const listFormat			= self.menuConfig.config.listFormat || '{msgNum} - {subject} - {toUserName}';				
+						const msgListView			= vc.getView(MCICodesIDs.MsgList);
+						const listFormat			= self.menuConfig.config.listFormat || '{msgNum} - {subject} - {toUserName}';
 						const focusListFormat		= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default change color here
-						const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}'; 
+						const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 
 						//	:TODO: This can take a very long time to load large lists. What we need is to implement the "owner draw" concept in
 						//	which items are requested (e.g. their format at least) *as-needed* vs trying to get the format for all of them at once
@@ -211,10 +211,10 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						msgListView.on('index update', idx => {
 							self.setViewText(
 								'allViews',
-								MCICodesIDs.MsgInfo1, 
+								MCICodesIDs.MsgInfo1,
 								stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.messageList.length } ));
 						});
-						
+
 						if(self.initialFocusIndex > 0) {
 							//	note: causes redraw()
 							msgListView.setFocusItemIndex(self.initialFocusIndex);
@@ -228,29 +228,29 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						const messageInfo1Format = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 						self.setViewText(
 							'allViews',
-							MCICodesIDs.MsgInfo1, 
+							MCICodesIDs.MsgInfo1,
 							stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.messageList.length } ));
 						return callback(null);
 					},
-				],		
+				],
 				err => {
 					if(err) {
-						self.client.log.error( { error : err.message }, 'Error loading message list');				
+						self.client.log.error( { error : err.message }, 'Error loading message list');
 					}
 					return cb(err);
 				}
 			);
-		});			
+		});
 	}
 
 	getSaveState() {
-		return { initialFocusIndex : this.initialFocusIndex };	
+		return { initialFocusIndex : this.initialFocusIndex };
 	}
 
 	restoreSavedState(savedState) {
 		if(savedState) {
 			this.initialFocusIndex = savedState.initialFocusIndex;
-		}	
+		}
 	}
 
 	getMenuResult() {
diff --git a/core/msg_network.js b/core/msg_network.js
index 9e0813f4..890d1bcf 100644
--- a/core/msg_network.js
+++ b/core/msg_network.js
@@ -38,17 +38,17 @@ function startup(cb) {
 
 function shutdown(cb) {
 	async.each(
-		msgNetworkModules, 
+		msgNetworkModules,
 		(msgNetModule, next) => {
 			msgNetModule.shutdown( () => {
 				return next();
 			});
-		}, 
+		},
 		() => {
 			msgNetworkModules = [];
 			return cb(null);
 		}
-	);	
+	);
 }
 
 function recordMessage(message, cb) {
@@ -59,7 +59,7 @@ function recordMessage(message, cb) {
 	//
 	async.each(msgNetworkModules, (modInst, next) => {
 		modInst.record(message);
-		next();		
+		next();
 	}, err => {
 		cb(err);
 	});
diff --git a/core/msg_scan_toss_module.js b/core/msg_scan_toss_module.js
index 8172d77f..9b3598c1 100644
--- a/core/msg_scan_toss_module.js
+++ b/core/msg_scan_toss_module.js
@@ -13,12 +13,12 @@ function MessageScanTossModule() {
 require('util').inherits(MessageScanTossModule, PluginModule);
 
 MessageScanTossModule.prototype.startup = function(cb) {
-	cb(null);
+	return cb(null);
 };
 
 MessageScanTossModule.prototype.shutdown = function(cb) {
-	cb(null);
+	return cb(null);
 };
 
-MessageScanTossModule.prototype.record = function(message) {
+MessageScanTossModule.prototype.record = function(/*message*/) {
 };
\ No newline at end of file
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 68d8b3d6..bc73e903 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -4,7 +4,6 @@
 const View			= require('./view.js').View;
 const strUtil		= require('./string_util.js');
 const ansi			= require('./ansi_term.js');
-const colorCodes	= require('./color_codes.js');
 const wordWrapText	= require('./word_wrap.js').wordWrapText;
 const ansiPrep		= require('./ansi_prep.js');
 
@@ -12,11 +11,11 @@ const assert		= require('assert');
 const _				= require('lodash');
 
 //	:TODO: Determine CTRL-* keys for various things
-	//	See http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
-	//	http://wiki.synchro.net/howto:editor:slyedit#edit_mode
-	//	http://sublime-text-unofficial-documentation.readthedocs.org/en/latest/reference/keyboard_shortcuts_win.html
+//	See http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
+//	http://wiki.synchro.net/howto:editor:slyedit#edit_mode
+//	http://sublime-text-unofficial-documentation.readthedocs.org/en/latest/reference/keyboard_shortcuts_win.html
 
-	/* Mystic
+/* Mystic
 	 [^B]  Reformat Paragraph            [^O]  Show this help file
        [^I]  Insert tab space              [^Q]  Enter quote mode
        [^K]  Cut current line of text      [^V]  Toggle insert/overwrite
@@ -179,8 +178,8 @@ function MultiLineEditTextView(options) {
 
 		for(let i = startIndex; i < endIndex; ++i) {
 			//${self.getSGRFor('text')}
-			self.client.term.write(				
-				`${ansi.goto(absPos.row++, absPos.col)}${self.getRenderText(i)}`, 
+			self.client.term.write(
+				`${ansi.goto(absPos.row++, absPos.col)}${self.getRenderText(i)}`,
 				false	//	convertLineFeeds
 			);
 		}
@@ -268,7 +267,7 @@ function MultiLineEditTextView(options) {
 
 		if(remain > 0) {
 			text += ' '.repeat(remain + 1);
-//			text += new Array(remain + 1).join(' ');
+			//			text += new Array(remain + 1).join(' ');
 		}
 
 		return text;
@@ -291,7 +290,7 @@ function MultiLineEditTextView(options) {
 
 		lines.forEach(line => {
 			text += line.text.replace(re, '\t');
-			
+
 			if(options.forceLineTerms || (eolMarker && line.eol)) {
 				text += eolMarker;
 			}
@@ -459,7 +458,7 @@ function MultiLineEditTextView(options) {
 				self.getRenderText(index).slice(self.cursorPos.col - c.length) +
 				ansi.goto(absPos.row, absPos.col) +
 				ansi.showCursor(), false
-				);
+			);
 		}
 	};
 
@@ -502,7 +501,7 @@ function MultiLineEditTextView(options) {
 		}
 
 		return wordWrapText(
-			s, 
+			s,
 			{
 				width		: width,
 				tabHandling	: tabHandling || 'expand',
@@ -1122,19 +1121,19 @@ MultiLineEditTextView.prototype.getData = function(options = { forceLineTerms :
 
 MultiLineEditTextView.prototype.setPropertyValue = function(propName, value) {
 	switch(propName) {
-		case 'mode'			: 
+		case 'mode'			:
 			this.mode = value;
 			if('preview' === value && !this.specialKeyMap.next) {
 				this.specialKeyMap.next = [ 'tab' ];
-			} 
+			}
 			break;
 
-		case 'autoScroll'	: 
+		case 'autoScroll'	:
 			this.autoScroll = value;
 			break;
 
 		case 'tabSwitchesView' :
-			this.tabSwitchesView = value; 
+			this.tabSwitchesView = value;
 			this.specialKeyMap.next = this.specialKeyMap.next || [];
 			this.specialKeyMap.next.push('tab');
 			break;
diff --git a/core/new_scan.js b/core/new_scan.js
index f3e851fb..b088e47f 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -25,8 +25,8 @@ exports.moduleInfo = {
  * :TODO:
  * * User configurable new scan: Area selection (avail from messages area) (sep module)
  * * Add status TL/VM (either/both should update if present)
- * * 
- 
+ * *
+
 */
 
 const MciCodeIds = {
@@ -37,7 +37,7 @@ const MciCodeIds = {
 const Steps = {
 	MessageConfs	: 'messageConferences',
 	FileBase		: 'fileBase',
-	
+
 	Finished		: 'finished',
 };
 
@@ -53,7 +53,7 @@ exports.getModule = class NewScanModule extends MenuModule {
 
 		//  :TODO: Make this conf/area specific:
 		const config			= this.menuConfig.config;
-		this.scanStartFmt		= config.scanStartFmt || 'Scanning {confName} - {areaName}...';		
+		this.scanStartFmt		= config.scanStartFmt || 'Scanning {confName} - {areaName}...';
 		this.scanFinishNoneFmt	= config.scanFinishNoneFmt || 'Nothing new';
 		this.scanFinishNewFmt	= config.scanFinishNewFmt || '{count} entries found';
 		this.scanCompleteMsg	= config.scanCompleteMsg || 'Finished newscan';
@@ -62,16 +62,16 @@ exports.getModule = class NewScanModule extends MenuModule {
 	updateScanStatus(statusText) {
 		this.setViewText('allViews', MciCodeIds.ScanStatusLabel, statusText);
 	}
-    
+
 	newScanMessageConference(cb) {
-        //  lazy init
+		//  lazy init
 		if(!this.sortedMessageConfs) {
-			const getAvailOpts = { includeSystemInternal : true };      //  find new private messages, bulletins, etc.            
+			const getAvailOpts = { includeSystemInternal : true };      //  find new private messages, bulletins, etc.
 
 			this.sortedMessageConfs = _.map(msgArea.getAvailableMessageConferences(this.client, getAvailOpts), (v, k) => {
 				return {
 					confTag : k,
-					conf    : v,  
+					conf    : v,
 				};
 			});
 
@@ -91,27 +91,27 @@ exports.getModule = class NewScanModule extends MenuModule {
 			this.currentScanAux.conf = this.currentScanAux.conf || 0;
 			this.currentScanAux.area = this.currentScanAux.area || 0;
 		}
-        
+
 		const currentConf = this.sortedMessageConfs[this.currentScanAux.conf];
 
 		this.newScanMessageArea(currentConf, () => {
 			if(this.sortedMessageConfs.length > this.currentScanAux.conf + 1) {
-				this.currentScanAux.conf += 1;                            
+				this.currentScanAux.conf += 1;
 				this.currentScanAux.area = 0;
-				
+
 				return this.newScanMessageConference(cb);  //  recursive to next conf
 			}
 
 			this.updateScanStatus(this.scanCompleteMsg);
 			return cb(Errors.DoesNotExist('No more conferences'));
-		});        
+		});
 	}
-	
+
 	newScanMessageArea(conf, cb) {
-        //  :TODO: it would be nice to cache this - must be done by conf!
+		//  :TODO: it would be nice to cache this - must be done by conf!
 		const sortedAreas   = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } );
 		const currentArea	= sortedAreas[this.currentScanAux.area];
-				
+
 		//
 		//	Scan and update index until we find something. If results are found,
 		//	we'll goto the list module & show them.
@@ -207,20 +207,20 @@ exports.getModule = class NewScanModule extends MenuModule {
 
 	performScanCurrentStep(cb) {
 		switch(this.currentStep) {
-			case Steps.MessageConfs : 
-				this.newScanMessageConference( () => {									
+			case Steps.MessageConfs :
+				this.newScanMessageConference( () => {
 					this.currentStep = Steps.FileBase;
 					return this.performScanCurrentStep(cb);
 				});
 				break;
-				
+
 			case Steps.FileBase :
 				this.newScanFileBase( () => {
 					this.currentStep = Steps.Finished;
-					return this.performScanCurrentStep(cb);	
+					return this.performScanCurrentStep(cb);
 				});
 				break;
-				
+
 			default : return cb(null);
 		}
 	}
@@ -241,7 +241,7 @@ exports.getModule = class NewScanModule extends MenuModule {
 
 			//	:TODO: display scan step/etc.
 
-			async.series(		
+			async.series(
 				[
 					function loadFromConfig(callback) {
 						const loadOpts = {
diff --git a/core/nua.js b/core/nua.js
index 7939e739..61dbeb62 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -22,10 +22,10 @@ const MciViewIds = {
 };
 
 exports.getModule = class NewUserAppModule extends MenuModule {
-	
+
 	constructor(options) {
 		super(options);
-		
+
 		const self = this;
 
 		this.menuMethods = {
@@ -40,7 +40,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 			viewValidationListener : function(err, cb) {
 				const errMsgView = self.viewControllers.menu.getView(MciViewIds.errMsg);
 				let newFocusId;
-				
+
 				if(err) {
 					errMsgView.setText(err.message);
 					err.view.clearText();
@@ -67,14 +67,14 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 
 				//
 				//	We have to disable ACS checks for initial default areas as the user is not yet ready
-				//            
+				//
 				let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
 				let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
 
 				//  can't store undefined!
 				confTag = confTag || '';
 				areaTag = areaTag || '';
-				
+
 				newUser.properties = {
 					real_name			: formData.value.realName,
 					birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(), 	//	:TODO: Use moment & explicit ISO string format
@@ -84,12 +84,12 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 					email_address		: formData.value.email,
 					web_address			: formData.value.web,
 					account_created		: new Date().toISOString(),	//	:TODO: Use moment & explicit ISO string format
-					
+
 					message_conf_tag    : confTag,
 					message_area_tag    : areaTag,
 
 					term_height			: self.client.term.termHeight,
-					term_width			: self.client.term.termWidth,				
+					term_width			: self.client.term.termWidth,
 
 					//	:TODO: Other defaults
 					//	:TODO: should probably have a place to create defaults/etc.
@@ -100,7 +100,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 				} else {
 					newUser.properties.theme_id = Config.defaults.theme;
 				}
-				
+
 				//	:TODO: User.create() should validate email uniqueness!
 				newUser.create(formData.value.password, err => {
 					if(err) {
diff --git a/core/onelinerz.js b/core/onelinerz.js
index 9e89addf..65599ba9 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -20,7 +20,7 @@ const async					= require('async');
 const _						= require('lodash');
 const moment				= require('moment');
 
-/* 
+/*
 	Module :TODO:
 	* Add pipe code support
 		- override max length & monitor *display* len as user types in order to allow for actual display len with color
@@ -73,7 +73,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 							self.client.log.warn( { error : err.message }, 'Failed saving oneliner');
 						}
 
-						self.clearAddForm(); 
+						self.clearAddForm();
 						return self.displayViewScreen(true, cb);	//	true=cls
 					});
 
@@ -89,7 +89,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 			}
 		};
 	}
-	
+
 	initSequence() {
 		const self = this;
 		async.series(
@@ -136,7 +136,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 				function initOrRedrawViewController(artData, callback) {
 					if(_.isUndefined(self.viewControllers.add)) {
 						const vc = self.addViewController(
-							'view', 
+							'view',
 							new ViewController( { client : self.client, formId : FormIds.View } )
 						);
 
@@ -149,7 +149,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 						return vc.loadFromMenuConfig(loadOpts, callback);
 					} else {
 						self.viewControllers.view.setFocus(true);
-						self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt).redraw();						
+						self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt).redraw();
 						return callback(null);
 					}
 				},
@@ -216,7 +216,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 			[
 				function clearAndDisplayArt(callback) {
 					self.viewControllers.view.setFocus(false);
-					self.client.term.rawWrite(ansi.resetScreen());					
+					self.client.term.rawWrite(ansi.resetScreen());
 
 					theme.displayThemedAsset(
 						self.menuConfig.config.art.add,
@@ -230,7 +230,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 				function initOrRedrawViewController(artData, callback) {
 					if(_.isUndefined(self.viewControllers.add)) {
 						const vc = self.addViewController(
-							'add', 
+							'add',
 							new ViewController( { client : self.client, formId : FormIds.Add } )
 						);
 
@@ -269,7 +269,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 			[
 				function openDatabase(callback) {
 					self.db = getTransactionDatabase(new sqlite3.Database(
-						getModDatabasePath(exports.moduleInfo), 
+						getModDatabasePath(exports.moduleInfo),
 						err => {
 							return callback(err);
 						}
@@ -284,10 +284,10 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 							oneliner		VARCHAR NOT NULL,
 							timestamp		DATETIME NOT NULL
 						);`
-					,
-					err => {
-						return callback(err);
-					});
+						,
+						err => {
+							return callback(err);
+						});
 				}
 			],
 			err => {
@@ -327,7 +327,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 			err => {
 				return cb(err);
 			}
-		);		
+		);
 	}
 
 	beforeArt(cb) {
diff --git a/core/plugin_module.js b/core/plugin_module.js
index 31ba6f01..da9410b0 100644
--- a/core/plugin_module.js
+++ b/core/plugin_module.js
@@ -3,5 +3,5 @@
 
 exports.PluginModule	= PluginModule;
 
-function PluginModule(options) {
+function PluginModule(/*options*/) {
 }
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 7fe921b3..47370a66 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -92,7 +92,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	ST	: function serverName(client) { return client.session.serverName; },
 	FN	: function activeFileBaseFilterName(client) {
 		const activeFilter = FileBaseFilters.getActiveFilter(client);
-		return activeFilter ? activeFilter.name : ''; 
+		return activeFilter ? activeFilter.name : '';
 	},
 	DN	: function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },		//	Obv/2
 	DK	: function userByteDownload(client) {	//	Obv/2 uses DK=downloaded Kbytes
@@ -160,7 +160,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	},
 
 	OA	: function systemArchitecture() { return os.arch(); },
-	
+
 	SC	: function systemCpuModel() {
 		//
 		//	Clean up CPU strings a bit for better display
@@ -190,7 +190,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	//	System File Base, Up/Download Info
 	//
 	//	:TODO: DD - Today's # of downloads (iNiQUiTY)
-	//	
+	//
 	SD	: function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
 	SO	: function systemByteDownload() {
 		const byteSize = StatLog.getSystemStatNum('dl_total_bytes');
@@ -221,7 +221,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	//		-> Include FTN/etc.
 	//	:TODO: LC - name of last caller to system (Obv/2)
 	//	:TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
-	
+
 
 	//
 	//	Special handling for XY
diff --git a/core/rumorz.js b/core/rumorz.js
index b83853f0..da1ab5f6 100644
--- a/core/rumorz.js
+++ b/core/rumorz.js
@@ -52,9 +52,9 @@ exports.getModule = class RumorzModule extends MenuModule {
 			addEntry : (formData, extraArgs, cb) => {
 				if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
 					const rumor = formData.value.rumor.trim();	//	remove any trailing ws
-					
+
 					StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
-						this.clearAddForm(); 
+						this.clearAddForm();
 						return this.displayViewScreen(true, cb);	//	true=cls
 					});
 				} else {
@@ -77,7 +77,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 		const previewView	= this.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
 
 		newEntryView.setText('');
-		
+
 		//	preview is optional
 		if(previewView) {
 			previewView.setText('');
@@ -130,7 +130,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 				function initOrRedrawViewController(artData, callback) {
 					if(_.isUndefined(self.viewControllers.add)) {
 						const vc = self.addViewController(
-							'view', 
+							'view',
 							new ViewController( { client : self.client, formId : FormIds.View } )
 						);
 
@@ -143,7 +143,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 						return vc.loadFromMenuConfig(loadOpts, callback);
 					} else {
 						self.viewControllers.view.setFocus(true);
-						self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt).redraw();						
+						self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt).redraw();
 						return callback(null);
 					}
 				},
@@ -186,7 +186,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 			[
 				function clearAndDisplayArt(callback) {
 					self.viewControllers.view.setFocus(false);
-					self.client.term.rawWrite(resetScreen());					
+					self.client.term.rawWrite(resetScreen());
 
 					theme.displayThemedAsset(
 						self.config.art.add,
@@ -200,7 +200,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 				function initOrRedrawViewController(artData, callback) {
 					if(_.isUndefined(self.viewControllers.add)) {
 						const vc = self.addViewController(
-							'add', 
+							'add',
 							new ViewController( { client : self.client, formId : FormIds.Add } )
 						);
 
@@ -220,7 +220,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 				},
 				function initPreviewUpdates(callback) {
 					const previewView	= self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
-					const entryView		= self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry); 
+					const entryView		= self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
 					if(previewView) {
 						let timerId;
 						entryView.on('key press', () => {
@@ -230,7 +230,7 @@ exports.getModule = class RumorzModule extends MenuModule {
 								if(focused === entryView) {
 									previewView.setText(entryView.getData());
 									focused.setFocus(true);
-								} 
+								}
 							}, 500);
 						});
 					}
diff --git a/core/sauce.js b/core/sauce.js
index 295a6069..b976450b 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -8,7 +8,9 @@ exports.readSAUCE		= readSAUCE;
 
 const SAUCE_SIZE	= 128;
 const SAUCE_ID		= new Buffer([0x53, 0x41, 0x55, 0x43, 0x45]);	//	'SAUCE'
-const COMNT_ID		= new Buffer([0x43, 0x4f, 0x4d, 0x4e, 0x54]);	//	'COMNT'
+
+//	:TODO read comments
+//const COMNT_ID		= new Buffer([0x43, 0x4f, 0x4d, 0x4e, 0x54]);	//	'COMNT'
 
 exports.SAUCE_SIZE		= SAUCE_SIZE;
 //	:TODO: SAUCE should be a class
@@ -51,7 +53,7 @@ function readSAUCE(data, cb) {
 
 			if(!SAUCE_ID.equals(vars.id)) {
 				return cb(new Error('No SAUCE record present'));
-			}	
+			}
 
 			var ver = iconv.decode(vars.version, 'cp437');
 
@@ -137,7 +139,7 @@ var SAUCE_FONT_TO_ENCODING_HINT = {
 };
 
 ['437', '720', '737', '775', '819', '850', '852', '855', '857', '858',
-'860', '861', '862', '863', '864', '865', '866', '869', '872'].forEach(function onPage(page) {
+	'860', '861', '862', '863', '864', '865', '866', '869', '872'].forEach(function onPage(page) {
 	var codec = 'cp' + page;
 	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]	= codec;
 	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]		= codec;
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 8da71d02..20ab435f 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1213,7 +1213,30 @@ function FTNMessageScanTossModule() {
 
 					User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
 						if(err) {
-							return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
+							//
+							//	Couldn't find a local username. If the toUserName itself is a FTN address
+							//	we can only assume the message is to the +op, else we'll have to fail.
+							//
+							const toUserNameAsAddress = Address.fromString(message.toUserName);
+							if(toUserNameAsAddress.isValid()) {
+
+								Log.info(
+									{ toUserName : message.toUserName, fromUserName : message.fromUserName },
+									'No local "to" username for FTN message. Appears to be a FTN address only; assuming addressed to SysOp'
+								);
+
+								User.getUserName(User.RootUserID, (err, sysOpUserName) => {
+									if(err) {
+										return callback(Errors.UnexpectedState('Failed to get SysOp user information'));
+									}
+
+									message.meta.System[Message.SystemMetaNames.LocalToUserID] = User.RootUserID;
+									message.toUserName = sysOpUserName;
+									return callback(null);
+								});
+							} else {
+								return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
+							}
 						}
 
 						//	we do this after such that error cases can be preseved above
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
index 0e29e999..efcb1f19 100644
--- a/core/set_newscan_date.js
+++ b/core/set_newscan_date.js
@@ -43,7 +43,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 		const config = this.menuConfig.config;
 
 		this.target			= config.target || 'message';
-		this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';		
+		this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';
 
 		this.menuMethods = {
 			scanDateSubmit : (formData, extraArgs, cb) => {
@@ -232,7 +232,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 						const scanDateView = vc.getView(MciViewIds.main.scanDate);
 
 						//	:TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
-						const scanDateFormat = self.scanDateFormat.replace(/[\/\-. ]/g, '');
+						const scanDateFormat = self.scanDateFormat.replace(/[/\-. ]/g, '');
 						scanDateView.setText(today.format(scanDateFormat));
 
 						if('message' === self.target) {
diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index 65ac10af..e9145662 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -1,13 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-var MenuView		= require('./menu_view.js').MenuView;
-var ansi			= require('./ansi_term.js');
-var strUtil			= require('./string_util.js');
+const MenuView		= require('./menu_view.js').MenuView;
+const ansi			= require('./ansi_term.js');
+const strUtil		= require('./string_util.js');
 
-var util			= require('util');
-var assert			= require('assert');
-var _				= require('lodash');
+const util			= require('util');
+const assert		= require('assert');
 
 exports.SpinnerMenuView	= SpinnerMenuView;
 
@@ -16,7 +15,7 @@ function SpinnerMenuView(options) {
 	options.cursor	= options.cursor || 'hide';
 
 	MenuView.call(this, options);
-	
+
 	var self = this;
 
 	/*
@@ -29,7 +28,7 @@ function SpinnerMenuView(options) {
 		//assert(!self.positionCacheExpired);
 
 		assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
-		
+
 		self.drawItem(this.focusedItemIndex);
 	};
 
@@ -66,19 +65,19 @@ SpinnerMenuView.prototype.setFocus = function(focused) {
 
 SpinnerMenuView.prototype.setFocusItemIndex = function(index) {
 	SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
-	
+
 	this.updateSelection();	//	will redraw
 };
 
 SpinnerMenuView.prototype.onKeyPress = function(ch, key) {
 	if(key) {
-		if(this.isKeyMapped('up', key.name)) {		
+		if(this.isKeyMapped('up', key.name)) {
 			if(0 === this.focusedItemIndex) {
 				this.focusedItemIndex = this.items.length - 1;
 			} else {
 				this.focusedItemIndex--;
 			}
-			
+
 			this.updateSelection();
 			return;
 		} else if(this.isKeyMapped('down', key.name)) {
@@ -87,7 +86,7 @@ SpinnerMenuView.prototype.onKeyPress = function(ch, key) {
 			} else {
 				this.focusedItemIndex++;
 			}
-			
+
 			this.updateSelection();
 			return;
 		}
diff --git a/core/stat_log.js b/core/stat_log.js
index d6a53d28..edb2d98c 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -10,14 +10,14 @@ const moment	= require('moment');
 /*
 	System Event Log & Stats
 	------------------------
-	
+
 	System & user specific:
 	* Events for generating various statistics, logs such as last callers, etc.
 	* Stats such as counters
 
 	User specific stats are simply an alternate interface to user properties, while
 	system wide entries are handled on their own. Both are read accessible non-blocking
-	making them easily available for MCI codes for example. 
+	making them easily available for MCI codes for example.
 */
 class StatLog {
 	constructor() {
@@ -66,7 +66,7 @@ class StatLog {
 			TimestampDesc	: 'timestamp_desc',
 			Random			: 'random',
 		};
-	} 
+	}
 
 	setNonPeristentSystemStat(statName, statValue) {
 		this.systemStats[statName] = statValue;
@@ -139,7 +139,7 @@ class StatLog {
 				return cb(new Error(`Value for ${statName} is not a number!`));
 			}
 
-			newValue += incrementBy;			
+			newValue += incrementBy;
 		} else {
 			newValue = incrementBy;
 		}
@@ -201,19 +201,19 @@ class StatLog {
 								}
 							}
 						);
-						break; 
+						break;
 
 					case 'forever' :
 					default :
 						//	nop
 						break;
-				}							
+				}
 			}
 		);
 	}
 
 	getSystemLogEntries(logName, order, limit, cb) {
-		let sql = 
+		let sql =
 			`SELECT timestamp, log_value
 			FROM system_event_log
 			WHERE log_name = ?`;
@@ -228,7 +228,7 @@ class StatLog {
 				sql += ' ORDER BY timestamp DESC';
 				break;
 
-			case 'random'	: 
+			case 'random'	:
 				sql += ' ORDER BY RANDOM()';
 		}
 
@@ -279,7 +279,7 @@ class StatLog {
 				);
 			}
 		);
-	}	
+	}
 }
 
 module.exports = new StatLog();
diff --git a/core/stats.js b/core/stats.js
deleted file mode 100644
index ecc472de..00000000
--- a/core/stats.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* jslint node: true */
-'use strict';
-
-var userDb			= require('./database.js').dbs.user;
-
-exports.getSystemLoginHistory		= getSystemLoginHistory;
-
-function getSystemLoginHistory(numRequested, cb) {
-
-	numRequested = Math.max(1, numRequested);
-
-	var loginHistory = [];
-
-	userDb.each(
-		'SELECT user_id, user_name, timestamp '	+
-		'FROM user_login_history '				+
-		'ORDER BY timestamp DESC '				+
-		'LIMIT ' + numRequested + ';',
-		function historyRow(err, histEntry) {
-			loginHistory.push( {
-				userId		: histEntry.user_id,
-				userName	: histEntry.user_name,
-				timestamp	: histEntry.timestamp,
-			} );
-		},
-		function complete(err, recCount) {
-			cb(err, loginHistory);
-		}
-	);
-}
diff --git a/core/status_bar_view.js b/core/status_bar_view.js
deleted file mode 100644
index ed47ca7d..00000000
--- a/core/status_bar_view.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* jslint node: true */
-'use strict';
-
-var View		= require('./view.js').View;
-var TextView	= require('./text_view.js').TextView;
-
-var assert		= require('assert');
-var _			= require('lodash');
-
-function StatusBarView(options) {
-	View.call(this, options);
-
-	var self = this;
-
-
-}
-
-require('util').inherits(StatusBarView, View);
-
-StatusBarView.prototype.redraw = function() {
-
-	StatusBarView.super_.prototype.redraw.call(this);
-
-};
-
-StatusBarView.prototype.setPanels = function(panels) {
-
-/*
-	"panels" : [
-		{
-			"text" : "things and stuff",
-			"width" 20,
-			...
-		},
-		{
-			"width" : 40 // no text, etc... = spacer
-		}
-	]
-
-	|---------------------------------------------|
-	  | stuff |
-*/
-	assert(_.isArray(panels));
-
-	this.panels = [];
-
-	var tvOpts = {
-		cursor		: 'hide',
-		position	: { row : this.position.row, col : 0 },
-	};
-
-	panels.forEach(function panel(p) {
-		assert(_.isObject(p));
-		assert(_.has(p, 'width'));
-
-		if(p.text) {
-			this.panels.push( new TextView( { }))
-		} else {
-			this.panels.push( { width : p.width } );
-		}
-	});
-
-};
-
diff --git a/core/string_format.js b/core/string_format.js
index 7fb7109a..eba715d5 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -5,7 +5,7 @@ const EnigError				= require('./enig_error.js').EnigError;
 
 const {
 	pad,
-	stylizeString, 
+	stylizeString,
 	renderStringLength,
 	renderSubstr,
 	formatByteSize, formatByteSizeAbbr,
@@ -172,15 +172,15 @@ function formatNumberHelper(n, precision, type) {
 		case 'b' : return n.toString(2);
 		case 'o' : return n.toString(8);
 		case 'x' : return n.toString(16);
-		case 'e' : return n.toExponential(precision).replace(FormatNumRegExp.ExponentRep, '$&0'); 
-		case 'f' : return n.toFixed(precision); 
+		case 'e' : return n.toExponential(precision).replace(FormatNumRegExp.ExponentRep, '$&0');
+		case 'f' : return n.toFixed(precision);
 		case 'g' :
 			//	we don't want useless trailing zeros. parseFloat -> back to string fixes this for us
 			return parseFloat(n.toPrecision(precision || 1)).toString();
 
 		case '%' : return formatNumberHelper(n * 100, precision, 'f') + '%';
 		case ''  : return formatNumberHelper(n, precision, 'd');
-		
+
 		default :
 			throw new ValueError(`Unknown format code "${type}" for object of type 'float'`);
 	}
@@ -207,7 +207,7 @@ function formatNumber(value, tokens) {
 
 		if('' !== tokens.precision) {
 			throw new ValueError('Precision not allowed in integer format specifier');
-		}		
+		}
 	} else if( [ 'e', 'E', 'f', 'F', 'g', 'G', '%' ].indexOf(type) > - 1) {
 		if(tokens['#']) {
 			throw new ValueError('Alternate form (#) not allowed in float format specifier');
@@ -215,7 +215,7 @@ function formatNumber(value, tokens) {
 	}
 
 	const s			= formatNumberHelper(Math.abs(value), Number(tokens.precision || 6), type);
-	const sign		= value < 0 || 1 / value < 0 ? 
+	const sign		= value < 0 || 1 / value < 0 ?
 		'-' :
 		'-' === tokens.sign ? '' : tokens.sign;
 
@@ -223,7 +223,7 @@ function formatNumber(value, tokens) {
 
 	if(tokens[',']) {
 		const match 	= /^(\d*)(.*)$/.exec(s);
-		const separated	= match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2]; 
+		const separated	= match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2];
 
 		if('=' !== align) {
 			return pad(sign + separated, width, fill, getPadAlign(align));
@@ -246,7 +246,7 @@ function formatNumber(value, tokens) {
 
 	if(0 === width) {
 		return sign + prefix + s;
-	} 
+	}
 
 	if('=' === align) {
 		return sign + prefix + pad(s, width - sign.length - prefix.length, fill, getPadAlign('>'));
@@ -272,9 +272,9 @@ const transformers = {
 	styleL33t			: (s) => stylizeString(s, 'l33t'),
 
 	//	:TODO:
-	//	toMegs(), toKilobytes(), ... 
-	//	toList(), toCommaList(), 
-	
+	//	toMegs(), toKilobytes(), ...
+	//	toList(), toCommaList(),
+
 	sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
 	sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
 	sizeAbbr			: (n) => formatByteSizeAbbr(n),
@@ -293,14 +293,14 @@ function transformValue(transformerName, value) {
 }
 
 //	:TODO: Use explicit set of chars for paths & function/transforms such that } is allowed as fill/etc.
-const REGEXP_BASIC_FORMAT	= /{([^.!:}]+(?:\.[^.!:}]+)*)(?:\!([^:}]+))?(?:\:([^}]+))?}/g;
+const REGEXP_BASIC_FORMAT	= /{([^.!:}]+(?:\.[^.!:}]+)*)(?:!([^:}]+))?(?::([^}]+))?}/g;
 
 function getValue(obj, path) {
 	const value = _.get(obj, path);
 	if(!_.isUndefined(value)) {
 		return _.isFunction(value) ? value() : value;
 	}
-	
+
 	throw new KeyError(quote(path));
 }
 
@@ -350,7 +350,7 @@ module.exports = function format(fmt, obj) {
 	//	remainder
 	if(pos < fmt.length) {
 		out += fmt.slice(pos);
-	}	
+	}
 
-	return out;	
+	return out;
 };
diff --git a/core/string_util.js b/core/string_util.js
index 238aeeee..a4544754 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -3,7 +3,6 @@
 
 //	ENiGMA½
 const miscUtil			= require('./misc_util.js');
-const ANSIEscapeParser	= require('./ansi_escape_parser.js').ANSIEscapeParser;
 const ANSI				= require('./ansi_term.js');
 
 //	deps
@@ -53,12 +52,12 @@ function stylizeString(s, style) {
 	switch(style) {
 		//	None/normal
 		case 'normal' :
-		case 'N' : 
+		case 'N' :
 			return s;
 
 		//	UPPERCASE
-		case 'upper' : 
-		case 'U' : 
+		case 'upper' :
+		case 'U' :
 			return s.toUpperCase();
 
 		//	lowercase
@@ -107,8 +106,8 @@ function stylizeString(s, style) {
 			return stylized;
 
 		//	Small i's: DEMENTiA
-		case 'small i' : 
-		case 'i' : 
+		case 'small i' :
+		case 'i' :
 			return s.toUpperCase().replace(/I/g, 'i');
 
 		//	mIxeD CaSE (random upper/lower)
@@ -128,7 +127,7 @@ function stylizeString(s, style) {
 		case '3' :
 			for(i = 0; i < len; ++i) {
 				c = SIMPLE_ELITE_MAP[s[i].toLowerCase()];
-				stylized += c || s[i];				
+				stylized += c || s[i];
 			}
 			return stylized;
 	}
@@ -147,11 +146,11 @@ function pad(s, len, padChar, dir, stringSGR, padSGR, useRenderLen) {
 	useRenderLen 	= miscUtil.valueWithDefault(useRenderLen, true);
 
 	const renderLen	= useRenderLen ? renderStringLength(s) : s.length;
-	const padlen	= len >= renderLen ? len - renderLen : 0; 
+	const padlen	= len >= renderLen ? len - renderLen : 0;
 
 	switch(dir) {
 		case 'L' :
-		case 'left' : 
+		case 'left' :
 			s = padSGR + new Array(padlen).join(padChar) + stringSGR + s;
 			break;
 
@@ -162,10 +161,10 @@ function pad(s, len, padChar, dir, stringSGR, padSGR, useRenderLen) {
 				const right	= Math.ceil(padlen / 2);
 				const left	= padlen - right;
 				s			= padSGR + new Array(left + 1).join(padChar) + stringSGR + s + padSGR + new Array(right + 1).join(padChar);
-			}	
+			}
 			break;
 
-		case 'R' : 
+		case 'R' :
 		case 'right' :
 			s = stringSGR + s + padSGR + new Array(padlen).join(padChar);
 			break;
@@ -184,7 +183,7 @@ function replaceAt(s, n, t) {
 	return s.substring(0, n) + t + s.substring(n + 1);
 }
 
-const RE_NON_PRINTABLE = 
+const RE_NON_PRINTABLE =
 	/[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;	//	eslint-disable-line no-control-regex
 
 function isPrintable(s) {
@@ -198,11 +197,6 @@ function isPrintable(s) {
 	return !RE_NON_PRINTABLE.test(s);
 }
 
-function stringLength(s) {
-	//	:TODO: See https://mathiasbynens.be/notes/javascript-unicode
-	return s.length;
-}
-
 function stripAllLineFeeds(s) {
 	return s.replace(/\r?\n|[\r\u2028\u2029]/g, '');
 }
@@ -256,7 +250,7 @@ function renderSubstr(str, start, length) {
 		match	= re.exec(str);
 
 		if(match) {
-			if(match.index > pos) {				
+			if(match.index > pos) {
 				s = str.slice(pos + start, Math.min(match.index, pos + (length - renderLen)));
 				start		= 0;	//	start offset applies only once
 				out			+= s;
@@ -269,7 +263,7 @@ function renderSubstr(str, start, length) {
 
 	//	remainder
 	if(pos + start < str.length && renderLen < length) {
-		out += str.slice(pos + start, (pos + start + (length - renderLen))); 
+		out += str.slice(pos + start, (pos + start + (length - renderLen)));
 		//out += str.slice(pos + start, Math.max(1, pos + (length - renderLen - 1)));
 	}
 
@@ -277,7 +271,7 @@ function renderSubstr(str, start, length) {
 }
 
 //
-//	Method to return the "rendered" length taking into account Pipe and ANSI color codes. 
+//	Method to return the "rendered" length taking into account Pipe and ANSI color codes.
 //
 //	We additionally account for ANSI *forward* movement ESC sequences
 //	in the form of ESC[<N>C where <N> is the "go forward" character count.
@@ -291,40 +285,40 @@ function renderStringLength(s) {
 
 	const re = ANSI_OR_PIPE_REGEXP;
 	re.lastIndex = 0;	//	we recycle the rege; reset
-	
+
 	//
 	//	Loop counting only literal (non-control) sequences
 	//	paying special attention to ESC[<N>C which means forward <N>
-	//	
+	//
 	do {
 		pos	= re.lastIndex;
 		m	= re.exec(s);
-		
+
 		if(m) {
 			if(m.index > pos) {
 				len += s.slice(pos, m.index).length;
 			}
-			
+
 			if('C' === m[3]) {	//	ESC[<N>C is foward/right
 				len += parseInt(m[2], 10) || 0;
 			}
-		}  
+		}
 	} while(0 !== re.lastIndex);
-	
+
 	if(pos < s.length) {
 		len += s.slice(pos).length;
 	}
-	
+
 	return len;
 }
 
-const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:) 
+const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:)
 
 function formatByteSizeAbbr(byteSize) {
 	if(0 === byteSize) {
 		return BYTE_SIZE_ABBRS[0];	//	B
 	}
-	
+
 	return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
 }
 
@@ -332,7 +326,7 @@ function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
 	const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
 	let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
 	if(withAbbr) {
-		result += ` ${BYTE_SIZE_ABBRS[i]}`; 
+		result += ` ${BYTE_SIZE_ABBRS[i]}`;
 	}
 	return result;
 }
@@ -351,7 +345,7 @@ function formatCount(count, withAbbr = false, decimals = 2) {
 	const i		= 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
 	let result	= parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
 	if(withAbbr) {
-		result += `${COUNT_ABBRS[i]}`; 
+		result += `${COUNT_ABBRS[i]}`;
 	}
 	return result;
 }
@@ -359,7 +353,7 @@ function formatCount(count, withAbbr = false, decimals = 2) {
 
 //	:TODO: See notes in word_wrap.js about need to consolidate the various ANSI related RegExp's
 //const REGEXP_ANSI_CONTROL_CODES		= /(\x1b\x5b)([\?=;0-9]*?)([0-9A-ORZcf-npsu=><])/g;
-const REGEXP_ANSI_CONTROL_CODES		= /(?:\x1b\x5b)([\?=;0-9]*?)([A-ORZcf-npsu=><])/g;	//	eslint-disable-line no-control-regex
+const REGEXP_ANSI_CONTROL_CODES		= /(?:\x1b\x5b)([?=;0-9]*?)([A-ORZcf-npsu=><])/g;	//	eslint-disable-line no-control-regex
 const ANSI_OPCODES_ALLOWED_CLEAN	= [
 	//'A', 'B',	//	up, down
 	//'C', 'D',	//	right, left
@@ -370,17 +364,17 @@ function cleanControlCodes(input, options) {
 	let m;
 	let pos;
 	let cleaned = '';
-	
+
 	options = options || {};
-		
+
 	//
 	//	Loop through |input| adding only allowed ESC
 	//	sequences and literals to |cleaned|
-	//	
+	//
 	do {
 		pos	= REGEXP_ANSI_CONTROL_CODES.lastIndex;
 		m	= REGEXP_ANSI_CONTROL_CODES.exec(input);
-		
+
 		if(m) {
 			if(m.index > pos) {
 				cleaned += input.slice(pos, m.index);
@@ -394,205 +388,17 @@ function cleanControlCodes(input, options) {
 				cleaned += m[0];
 			}
 		}
-		
+
 	} while(0 !== REGEXP_ANSI_CONTROL_CODES.lastIndex);
-	
+
 	//	remainder
 	if(pos < input.length) {
 		cleaned += input.slice(pos);
 	}
-	
+
 	return cleaned;
 }
 
-function prepAnsi(input, options, cb) {
-	if(!input) {
-		return cb(null, '');
-	}
-
-	options.termWidth			= options.termWidth 	|| 80;
-	options.termHeight			= options.termHeight	|| 25;
-	options.cols				= options.cols || options.termWidth		|| 80;
-	options.rows				= options.rows || options.termHeight	|| 'auto';
-	options.startCol			= options.startCol || 1;
-	options.exportMode			= options.exportMode || false;
-
-	const canvas = Array.from( { length : 'auto' === options.rows ? 25 : options.rows }, () => Array.from( { length : options.cols}, () => new Object() ) );
-	const parser = new ANSIEscapeParser( { termHeight : options.termHeight, termWidth : options.termWidth } );
-
-	const state = {
-		row	: 0,
-		col	: 0,
-	};
-
-	let lastRow = 0;
-
-	function ensureRow(row) {
-		if(Array.isArray(canvas[row])) {
-			return;
-		}
-		
-		canvas[row] = Array.from( { length : options.cols}, () => new Object() );
-	}
-
-	parser.on('position update', (row, col) => {
-		state.row	= row - 1;
-		state.col	= col - 1;
-
-		lastRow		= Math.max(state.row, lastRow);
-	});
-
-	parser.on('literal', literal => {
-		//
-		//	CR/LF are handled for 'position update'; we don't need the chars themselves
-		//
-		literal = literal.replace(/\r?\n|[\r\u2028\u2029]/g, '');
-
-		for(let c of literal) {
-			if(state.col < options.cols && ('auto' === options.rows || state.row < options.rows)) {
-				ensureRow(state.row);
-
-				canvas[state.row][state.col].char = c;
-
-				if(state.sgr) {
-					canvas[state.row][state.col].sgr = state.sgr;
-					state.sgr = null;
-				}
-			}
-
-			state.col += 1;
-		}
-	});
-
-	parser.on('control', (match, opCode) => {
-		//
-		//	Movement is handled via 'position update', so we really only care about
-		//	display opCodes
-		//
-		switch(opCode) {
-			case 'm' 	: 
-				state.sgr = (state.sgr || '') + match;
-				break;
-				
-			default		: 
-				break;
-		}
-	});
-
-	function getLastPopulatedColumn(row) {
-		let col = row.length;
-		while(--col > 0) {
-			if(row[col].char || row[col].sgr) {
-				break;
-			}
-		}
-		return col;
-	}
-
-	parser.on('complete', () => {
-		let output = '';
-		let lastSgr = '';
-		let line;
-
-		canvas.slice(0, lastRow + 1).forEach(row => {
-			const lastCol = getLastPopulatedColumn(row) + 1;
-
-			let i;
-			line = '';
-			for(i = 0; i < lastCol; ++i) {
-				const col = row[i];
-				if(col.sgr) {
-					lastSgr = col.sgr;
-				}
-				line += `${col.sgr || ''}${col.char || ' '}`;
-			}
-
-			output += line;
-
-			if(i < row.length) {
-				output += `${ANSI.blackBG()}${row.slice(i).map( () => ' ').join('')}${lastSgr}`;
-			}
-
-			//if(options.startCol + options.cols < options.termWidth || options.forceLineTerm) {
-			if(options.startCol + i < options.termWidth || options.forceLineTerm) {
-				output += '\r\n';
-			}
-		});
-
-		if(options.exportMode) {
-			//
-			//	If we're in export mode, we do some additional hackery:
-			//	
-			//	* Hard wrap ALL lines at <= 79 *characters* (not visible columns)
-			//	  if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
-			//	  represents chars to get back to the position we were previously at
-			//
-			//	* Replace contig spaces with ESC[<N>C as well to save... space.
-			//
-			//	:TODO: this would be better to do as part of the processing above, but this will do for now
-			const MAX_CHARS	= 79 - 8;	//	79 max, - 8 for max ESC seq's we may prefix a line with
-			let exportOutput = '';			
-			
-			let m;
-			let afterSeq;
-			let wantMore;
-			let renderStart;
-
-			splitTextAtTerms(output).forEach(fullLine => {
-				renderStart = 0;
-
-				while(fullLine.length > 0) {
-					let splitAt;
-					const ANSI_REGEXP = ANSI.getFullMatchRegExp();
-					wantMore = true;
-
-					while((m = ANSI_REGEXP.exec(fullLine))) {
-						afterSeq = m.index + m[0].length;
-
-						if(afterSeq < MAX_CHARS) {
-							//	after current seq
-							splitAt = afterSeq;
-						} else {
-							if(m.index < MAX_CHARS) {
-								//	before last found seq
-								splitAt = m.index;
-								wantMore = false;	//	can't eat up any more
-							}
-							
-							break;	//	seq's beyond this point are >= MAX_CHARS
-						}
-					}
-
-					if(splitAt) {
-						if(wantMore) {
-							splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
-						}
-					} else {
-						splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
-					}
-
-					const part = fullLine.slice(0, splitAt);
-					fullLine = fullLine.slice(splitAt);
-					renderStart += renderStringLength(part);
-					exportOutput += `${part}\r\n`;
-
-					if(fullLine.length > 0) {	//	more to go for this line?
-						exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;	
-					} else {
-						exportOutput += ANSI.up();
-					}
-				}
-			});
-
-			return cb(null, exportOutput);
-		}
-
-		return cb(null, output);
-	});
-
-	parser.parse(input);
-}
-
 function isAnsiLine(line) {
 	return isAnsi(line);// || renderStringLength(line) < line.length;
 }
@@ -622,22 +428,23 @@ function isFormattedLine(line) {
 	return false;
 }
 
+//	:TODO: rename to containsAnsi()
 function isAnsi(input) {
 	if(!input || 0 === input.length) {
 		return false;
 	}
-	
+
 	//
 	//	* ANSI found - limited, just colors
 	//	* Full ANSI art
-	//	* 
-	//	
+	//	*
+	//
 	//	FULL ANSI art:
 	//	* SAUCE present & reports as ANSI art
 	//	* ANSI clear screen within first 2-3 codes
 	//	* ANSI movement codes (goto, right, left, etc.)
-	//	
-	//	* 
+	//
+	//	*
 	/*
 	readSAUCE(input, (err, sauce) => {
 		if(!err && ('ANSi' === sauce.fileType || 'ANSiMation' === sauce.fileType)) {
@@ -647,8 +454,8 @@ function isAnsi(input) {
 	*/
 
 	//	:TODO: if a similar method is kept, use exec() until threshold
-	const ANSI_DET_REGEXP = /(?:\x1b\x5b)[\?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g;	//	eslint-disable-line no-control-regex
-	const m = input.match(ANSI_DET_REGEXP) || []; 
+	const ANSI_DET_REGEXP = /(?:\x1b\x5b)[?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g;	//	eslint-disable-line no-control-regex
+	const m = input.match(ANSI_DET_REGEXP) || [];
 	return m.length >= 4;	//	:TODO: do this reasonably, e.g. a percent or soemthing
 }
 
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index f968a493..8a20af02 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -33,7 +33,7 @@ function login(callingMenu, formData, extraArgs, cb) {
 				return callingMenu.prevMenu(cb);
 			}
 		}
-		
+
 		//	success!
 		return callingMenu.nextMenu(cb);
 	});
@@ -72,7 +72,7 @@ function prevMenu(callingMenu, formData, extraArgs, cb) {
 
 	callingMenu.prevMenu( err => {
 		if(err) {
-			callingMenu.client.log.error( { error : err.message }, 'Error attempting to fallback!');			
+			callingMenu.client.log.error( { error : err.message }, 'Error attempting to fallback!');
 		}
 		return cb(err);
 	});
@@ -119,7 +119,7 @@ function nextConf(callingMenu, formData, extraArgs, cb) {
 		if(err) {
 			return cb(err);	//	logged within changeMessageConference()
 		}
-		
+
 		return reloadMenu(callingMenu, cb);
 	});
 }
@@ -132,7 +132,7 @@ function prevArea(callingMenu, formData, extraArgs, cb) {
 		if(err) {
 			return cb(err);	//	logged within changeMessageArea()
 		}
-		
+
 		return reloadMenu(callingMenu, cb);
 	});
 }
@@ -155,10 +155,10 @@ function nextArea(callingMenu, formData, extraArgs, cb) {
 }
 
 function sendForgotPasswordEmail(callingMenu, formData, extraArgs, cb) {
-	const username = formData.value.username || callingMenu.client.user.username;	
+	const username = formData.value.username || callingMenu.client.user.username;
 
 	const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
-	
+
 	WebPasswordReset.sendForgotPasswordEmail(username, err => {
 		if(err) {
 			callingMenu.client.log.warn( { err : err.message }, 'Failed sending forgot password email');
@@ -166,8 +166,8 @@ function sendForgotPasswordEmail(callingMenu, formData, extraArgs, cb) {
 
 		if(extraArgs.next) {
 			return callingMenu.gotoMenu(extraArgs.next, cb);
-		} 
-		
-		return logoff(callingMenu, formData, extraArgs, cb);		
+		}
+
+		return logoff(callingMenu, formData, extraArgs, cb);
 	});
 }
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index e2a5b2e0..beb6bcce 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -99,7 +99,7 @@ function validateGeneralMailAddressedTo(data, cb) {
 function validateEmailAvail(data, cb) {
 	//
 	//	This particular method allows empty data - e.g. no email entered
-	//	
+	//
 	if(!data || 0 === data.length) {
 		return cb(null);
 	}
@@ -110,7 +110,7 @@ function validateEmailAvail(data, cb) {
 	//
 	//	See http://stackoverflow.com/questions/7786058/find-the-regex-used-by-html5-forms-for-validation
 	//
-	const emailRegExp = /[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
+	const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
 	if(!emailRegExp.test(data)) {
 		return cb(new Error('Invalid email address'));
 	}
@@ -121,8 +121,8 @@ function validateEmailAvail(data, cb) {
 		} else if(uids.length > 0) {
 			return cb(new Error('Email address not unique'));
 		}
-		
-		return cb(null);		
+
+		return cb(null);
 	});
 }
 
diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index fa1754a5..30db1207 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -42,7 +42,7 @@ class TelnetClientConnection extends EventEmitter {
 		this.client		= client;
 	}
 
-	
+
 	restorePipe() {
 		if(!this.pipeRestored) {
 			this.pipeRestored = true;
@@ -68,14 +68,14 @@ class TelnetClientConnection extends EventEmitter {
 		this.bridgeConnection.on('data', data => {
 			this.client.term.rawWrite(data);
 
-			//	
+			//
 			//	Wait for a terminal type request, and send it eactly once.
 			//	This is enough (in additional to other negotiations handled in telnet.js)
 			//	to get us in on most systems
 			//
 			if(!this.termSent && data.indexOf(IAC_DO_TERM_TYPE) > -1) {
 				this.termSent = true;
-				this.bridgeConnection.write(this.getTermTypeNegotiationBuffer());				
+				this.bridgeConnection.write(this.getTermTypeNegotiationBuffer());
 			}
 		});
 
@@ -102,9 +102,9 @@ class TelnetClientConnection extends EventEmitter {
 		//	actual/current terminal type.
 		//
 		let bufs = buffers();
-		
+
 		bufs.push(new Buffer(
-			[ 
+			[
 				255,	//	IAC
 				250,	//	SB
 				24,		//	TERMINAL-TYPE
@@ -113,9 +113,9 @@ class TelnetClientConnection extends EventEmitter {
 		));
 
 		bufs.push(
-			new Buffer(this.client.term.termType),	//	e.g. "ansi" 
+			new Buffer(this.client.term.termType),	//	e.g. "ansi"
 			new Buffer( [ 255, 240 ] )				//	IAC, SE
-		); 
+		);
 
 		return bufs.toBuffer();
 	}
@@ -128,9 +128,9 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 
 		this.config			= options.menuConfig.config;
 		//	defaults
-		this.config.port	= this.config.port || 23; 
+		this.config.port	= this.config.port || 23;
 	}
-	
+
 	initSequence() {
 		let clientTerminated;
 		const self = this;
@@ -158,7 +158,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 					self.client.term.write(`  Connecting to ${connectOpts.host}, please wait...\n`);
 
 					const telnetConnection = new TelnetClientConnection(self.client);
-					
+
 					telnetConnection.on('connected', () => {
 						self.client.log.info(connectOpts, 'Telnet bridge connection established');
 
diff --git a/core/text_view.js b/core/text_view.js
index f1b3ee7e..8bd38213 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -35,7 +35,7 @@ function TextView(options) {
 	this.justify			= options.justify || 'right';
 	this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
 	this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
-	
+
 	if(_.isString(options.textOverflow)) {
 		this.textOverflow = options.textOverflow;
 	}
@@ -44,19 +44,19 @@ function TextView(options) {
 		this.textMaskChar = options.textMaskChar;
 	}
 
-/*
+	/*
 	this.drawText = function(s) {
 
-		//             
+		//
 		//                     |<- this.maxLength
 		//	 ABCDEFGHIJK
 		//	|ABCDEFG|  ^_ this.text.length
 		//	        ^-- this.dimens.width
 		//
-		let textToDraw = _.isString(this.textMaskChar) ? 
-			new Array(s.length + 1).join(this.textMaskChar) : 
+		let textToDraw = _.isString(this.textMaskChar) ?
+			new Array(s.length + 1).join(this.textMaskChar) :
 			stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
-		
+
 		if(textToDraw.length > this.dimens.width) {
 			if(this.hasFocus) {
 				if(this.horizScroll) {
@@ -64,7 +64,7 @@ function TextView(options) {
 				}
 			} else {
 				if(textToDraw.length > this.dimens.width) {
-					if(this.textOverflow && 
+					if(this.textOverflow &&
 						this.dimens.width > this.textOverflow.length &&
 						textToDraw.length - this.textOverflow.length >= this.textOverflow.length)
 					{
@@ -72,7 +72,7 @@ function TextView(options) {
 					} else {
 						textToDraw = textToDraw.substr(0, this.dimens.width);
 					}
-				}				
+				}
 			}
 		}
 
@@ -89,7 +89,7 @@ function TextView(options) {
 
 	this.drawText = function(s) {
 
-		//             
+		//
 		//                     |<- this.maxLength
 		//	 ABCDEFGHIJK
 		//	|ABCDEFG|  ^_ this.text.length
@@ -97,26 +97,26 @@ function TextView(options) {
 		//
 		let renderLength = renderStringLength(s);	//	initial; may be adjusted below:
 
-		let textToDraw = _.isString(this.textMaskChar) ? 
-			new Array(renderLength + 1).join(this.textMaskChar) : 
+		let textToDraw = _.isString(this.textMaskChar) ?
+			new Array(renderLength + 1).join(this.textMaskChar) :
 			stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
-		
+
 		renderLength = renderStringLength(textToDraw);
-		
+
 		if(renderLength >= this.dimens.width) {
 			if(this.hasFocus) {
 				if(this.horizScroll) {
 					textToDraw = renderSubstr(textToDraw, renderLength - this.dimens.width, renderLength);
 				}
 			} else {
-				if(this.textOverflow && 
+				if(this.textOverflow &&
 					this.dimens.width > this.textOverflow.length &&
 					renderLength - this.textOverflow.length >= this.textOverflow.length)
 				{
-					textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;						
+					textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
 				} else {
 					textToDraw = renderSubstr(textToDraw, 0, this.dimens.width);
-				}			
+				}
 			}
 		}
 
@@ -128,7 +128,7 @@ function TextView(options) {
 				this.justify,
 				this.hasFocus ? this.getFocusSGR() : this.getSGR(),
 				this.getStyleSGR(1) || this.getSGR()
-			), 
+			),
 			false	//	no converting CRLF needed
 		);
 	};
@@ -136,7 +136,7 @@ function TextView(options) {
 
 	this.getEndOfTextColumn = function() {
 		var offset = Math.min(this.text.length, this.dimens.width);
-		return this.position.col + offset;	
+		return this.position.col + offset;
 	};
 
 	this.setText(options.text || '', false);	//	false=do not redraw now
@@ -168,7 +168,7 @@ TextView.prototype.setFocus = function(focused) {
 	TextView.super_.prototype.setFocus.call(this, focused);
 
 	this.redraw();
-	
+
 	this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn()));
 	this.client.term.write(this.getFocusSGR());
 };
@@ -184,7 +184,7 @@ TextView.prototype.setText = function(text, redraw) {
 		text = text.toString();
 	}
 
-	text = pipeToAnsi(stripAllLineFeeds(text), this.client);	//	expand MCI/etc.	
+	text = pipeToAnsi(stripAllLineFeeds(text), this.client);	//	expand MCI/etc.
 
 	var widthDelta = 0;
 	if(this.text && this.text !== text) {
@@ -199,7 +199,7 @@ TextView.prototype.setText = function(text, redraw) {
 	}
 
 	//	:TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
-	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);	
+	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
 	if(this.autoScale.width) {
 		this.dimens.width = renderStringLength(this.text) + widthDelta;
@@ -214,7 +214,7 @@ TextView.prototype.setText = function(text, redraw) {
 TextView.prototype.setText = function(text) {
 	if(!_.isString(text)) {
 		text = text.toString();
-	}	
+	}
 
 	var widthDelta = 0;
 	if(this.text && this.text !== text) {
@@ -227,7 +227,7 @@ TextView.prototype.setText = function(text) {
 		this.text = this.text.substr(0, this.maxLength);
 	}
 
-	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);	
+	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
 	//if(this.resizable) {
 	//	this.dimens.width = this.text.length + widthDelta;
@@ -254,9 +254,9 @@ TextView.prototype.setPropertyValue = function(propName, value) {
 			if(true === value) {
 				this.textMaskChar = this.client.currentTheme.helpers.getPasswordChar();
 			}
-			break;	
+			break;
 	}
-	
+
 
 	TextView.super_.prototype.setPropertyValue.call(this, propName, value);
 };
diff --git a/core/theme.js b/core/theme.js
index 0796b8ab..a1045a18 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -87,8 +87,8 @@ function loadTheme(themeID, cb) {
 		if(err) {
 			return cb(err);
 		}
-		
-		if(!_.isObject(theme.info) || 
+
+		if(!_.isObject(theme.info) ||
 			!_.isString(theme.info.name) ||
 			!_.isString(theme.info.author))
 		{
@@ -114,16 +114,16 @@ const IMMUTABLE_MCI_PROPERTIES = [
 function getMergedTheme(menuConfig, promptConfig, theme) {
 	assert(_.isObject(menuConfig));
 	assert(_.isObject(theme));
-    
-    //  :TODO: merge in defaults (customization.defaults{} )
-    //	:TODO: apply generic stuff, e.g. "VM" (vs "VM1")
-    
-    //
-    //  Create a *clone* of menuConfig (menu.hjson) then bring in
-    //  promptConfig (prompt.hjson)
-    //
+
+	//  :TODO: merge in defaults (customization.defaults{} )
+	//	:TODO: apply generic stuff, e.g. "VM" (vs "VM1")
+
+	//
+	//  Create a *clone* of menuConfig (menu.hjson) then bring in
+	//  promptConfig (prompt.hjson)
+	//
 	var mergedTheme = _.cloneDeep(menuConfig);
-    
+
 	if(_.isObject(promptConfig.prompts)) {
 		mergedTheme.prompts = _.cloneDeep(promptConfig.prompts);
 	}
@@ -136,8 +136,8 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 
 	//
 	//  merge customizer to disallow immutable MCI properties
-	//	
-	var mciCustomizer = function(objVal, srcVal, key) {		
+	//
+	var mciCustomizer = function(objVal, srcVal, key) {
 		return IMMUTABLE_MCI_PROPERTIES.indexOf(key) > -1 ? objVal : srcVal;
 	};
 
@@ -159,69 +159,69 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 		} else {
 			if(_.has(src, [ formKey, 'mci' ])) {
 				mergeMciProperties(dest, src[formKey].mci);
-			}            
+			}
 		}
 	}
-    
-    //
-    //  menu.hjson can have a couple different structures:
-    //  1)  Explicit declaration of expected MCI code(s) under 'form:<id>' before a 'mci' block
-    //      (this allows multiple layout types defined by one menu for example)
-    //
-    //  2)  Non-explicit declaration: 'mci' directly under 'form:<id>'
-    //
-    //  theme.hjson has it's own mix:
-    //  1)  Explicit: Form ID before 'mci' (generally used where there are > 1 forms)
-    //
-    //  2)  Non-explicit: 'mci' directly under an entry
-    //
-    //  Additionally, #1 or #2 may be under an explicit key of MCI code(s) to match up
-    //  with menu.hjson in #1. 
-    //
-    //  *   When theming an explicit menu.hjson entry (1), we will use a matching explicit
-    //      entry with a matching MCI code(s) key in theme.hjson (e.g. menu="ETVM"/theme="ETVM"
-    //      and fall back to generic if a match is not found. 
-    //
-    //  *   If theme.hjson provides form ID's, use them. Otherwise, we'll apply directly assuming
-    //      there is a generic 'mci' block.
-    //    
-	function applyToForm(form, menuTheme, formKey) {     
+
+	//
+	//  menu.hjson can have a couple different structures:
+	//  1)  Explicit declaration of expected MCI code(s) under 'form:<id>' before a 'mci' block
+	//      (this allows multiple layout types defined by one menu for example)
+	//
+	//  2)  Non-explicit declaration: 'mci' directly under 'form:<id>'
+	//
+	//  theme.hjson has it's own mix:
+	//  1)  Explicit: Form ID before 'mci' (generally used where there are > 1 forms)
+	//
+	//  2)  Non-explicit: 'mci' directly under an entry
+	//
+	//  Additionally, #1 or #2 may be under an explicit key of MCI code(s) to match up
+	//  with menu.hjson in #1.
+	//
+	//  *   When theming an explicit menu.hjson entry (1), we will use a matching explicit
+	//      entry with a matching MCI code(s) key in theme.hjson (e.g. menu="ETVM"/theme="ETVM"
+	//      and fall back to generic if a match is not found.
+	//
+	//  *   If theme.hjson provides form ID's, use them. Otherwise, we'll apply directly assuming
+	//      there is a generic 'mci' block.
+	//
+	function applyToForm(form, menuTheme, formKey) {
 		if(_.isObject(form.mci)) {
 			//   non-explicit: no MCI code(s) key assumed since we found 'mci' directly under form ID
 			applyThemeMciBlock(form.mci, menuTheme, formKey);
-			
+
 		} else {
 			var menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
-				return k === k.toUpperCase(); //  remove anything not uppercase 
+				return k === k.toUpperCase(); //  remove anything not uppercase
 			});
-			
+
 			menuMciCodeKeys.forEach(function mciKeyEntry(mciKey) {
-				var applyFrom; 
+				var applyFrom;
 				if(_.has(menuTheme, [ mciKey, 'mci' ])) {
 					applyFrom = menuTheme[mciKey];
 				} else {
 					applyFrom = menuTheme;
 				}
-				
+
 				applyThemeMciBlock(form[mciKey].mci, applyFrom);
 			});
 		}
 	}
-    
+
 	[ 'menus', 'prompts' ].forEach(function areaEntry(sectionName) {
 		_.keys(mergedTheme[sectionName]).forEach(function menuEntry(menuName) {
 			var createdFormSection = false;
 			var mergedThemeMenu = mergedTheme[sectionName][menuName];
-			
+
 			if(_.has(theme, [ 'customization', sectionName, menuName ])) {
 				var menuTheme = theme.customization[sectionName][menuName];
-				
+
 				//	config block is direct assign/overwrite
 				//  :TODO: should probably be _.merge()
 				if(menuTheme.config) {
 					mergedThemeMenu.config = _.assign(mergedThemeMenu.config || {}, menuTheme.config);
 				}
-			
+
 				if('menus' === sectionName) {
 					if(_.isObject(mergedThemeMenu.form)) {
 						getFormKeys(mergedThemeMenu.form).forEach(function formKeyEntry(formKey) {
@@ -232,7 +232,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 							//
 							//  Not specified at menu level means we apply anything from the
 							//  theme to form.0.mci{}
-							//                            
+							//
 							mergedThemeMenu.form = { 0 : { mci : { } } };
 							mergeMciProperties(mergedThemeMenu.form[0], menuTheme);
 							createdFormSection = true;
@@ -241,9 +241,9 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 				} else if('prompts' === sectionName) {
 					//  no 'form' or form keys for prompts -- direct to mci
 					applyToForm(mergedThemeMenu, menuTheme);
-				}                
+				}
 			}
-			
+
 			//
 			//  Finished merging for this menu/prompt
 			//
@@ -259,13 +259,13 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 			}
 		});
 	});
-	
+
 
 	return mergedTheme;
 }
 
 function initAvailableThemes(cb) {
-   
+
 	async.waterfall(
 		[
 			function loadMenuConfig(callback) {
@@ -285,9 +285,9 @@ function initAvailableThemes(cb) {
 					}
 
 					return callback(
-						null, 
-						menuConfig, 
-						promptConfig, 
+						null,
+						menuConfig,
+						promptConfig,
 						files.filter( f => {
 							//	sync normally not allowed -- initAvailableThemes() is a startup-only method, however
 							return fs.statSync(paths.join(Config.paths.themes, f)).isDirectory();
@@ -363,7 +363,7 @@ function setClientTheme(client, themeId) {
 			logMsg = 'Failed setting theme by system default ID; Using the first one we can find';
 		}
 	}
-	
+
 	client.log.debug( { themeId : themeId, info : client.currentTheme.info }, logMsg);
 }
 
@@ -371,7 +371,7 @@ function getThemeArt(options, cb) {
 	//
 	//	options - required:
 	//		name
-	//	
+	//
 	//	options - optional
 	//		client - needed for user's theme/etc.
 	//		themeId
@@ -388,7 +388,7 @@ function getThemeArt(options, cb) {
 	//	:TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
 	//	:TODO: Some of these options should only be set if not provided!
 	options.asAnsi		= true;	//	always convert to ANSI
-	options.readSauce	= true;	//	read SAUCE, if avail	
+	options.readSauce	= true;	//	read SAUCE, if avail
 	options.random		= _.get(options, 'random', true);	//	FILENAME<n>.EXT support
 
 	//
@@ -406,7 +406,7 @@ function getThemeArt(options, cb) {
 				//
 				if('/' === options.name.charAt(0)) {
 					//	just take the path as-is
-					options.basePath = paths.dirname(options.name);					
+					options.basePath = paths.dirname(options.name);
 				} else if(options.name.indexOf('/') > -1) {
 					//	make relative to base BBS dir
 					options.basePath = paths.join(__dirname, '../', paths.dirname(options.name));
@@ -432,7 +432,7 @@ function getThemeArt(options, cb) {
 				if(artInfo || Config.defaults.theme === options.themeId) {
 					return callback(null, artInfo);
 				}
-				
+
 				options.basePath = paths.join(Config.paths.themes, Config.defaults.theme);
 				art.getArt(options.name, options, (err, artInfo) => {
 					return callback(null, artInfo);
@@ -442,11 +442,11 @@ function getThemeArt(options, cb) {
 				if(artInfo) {
 					return callback(null, artInfo);
 				}
-				
+
 				options.basePath = Config.paths.art;
 				art.getArt(options.name, options, (err, artInfo) => {
 					return callback(err, artInfo);
-				});				
+				});
 			}
 		],
 		function complete(err, artInfo) {
@@ -483,7 +483,7 @@ function displayThemeArt(options, cb) {
 
 /*
 function displayThemedPrompt(name, client, options, cb) {
-	
+
 	async.waterfall(
 		[
 			function loadConfig(callback) {
@@ -511,14 +511,14 @@ function displayThemedPrompt(name, client, options, cb) {
 
 				//
 				//	If we did not clear the screen, don't let the font change
-				//				
+				//
 				const dispOptions = Object.assign( {}, promptConfig.options );
 				if(!options.clearScreen) {
 					dispOptions.font = 'not_really_a_font!';
 				}
 
 				displayThemedAsset(
-					promptConfig.art, 
+					promptConfig.art,
 					client,
 					dispOptions,
 					(err, artData) => {
@@ -576,7 +576,7 @@ function displayThemedPrompt(name, client, options, cb) {
 				}
 
 				displayThemedAsset(
-					promptConfig.art, 
+					promptConfig.art,
 					client,
 					dispOptions,
 					(err, artInfo) => {
@@ -593,7 +593,7 @@ function displayThemedPrompt(name, client, options, cb) {
 					//	no need to query cursor - we're not gonna use it
 					return callback(null, promptConfig, artInfo);
 				}
-				
+
 				client.once('cursor position report', pos => {
 					artInfo.startRow = pos[0] - artInfo.height;
 					return callback(null, promptConfig, artInfo);
@@ -627,7 +627,7 @@ function displayThemedPrompt(name, client, options, cb) {
 				if(options.clearPrompt) {
 					if(artInfo.startRow && artInfo.height) {
 						client.term.rawWrite(ansi.goto(artInfo.startRow, 1));
-						
+
 						//	Note: Does not work properly in NetRunner < 2.0b17:
 						client.term.rawWrite(ansi.deleteLine(artInfo.height));
 					} else {
@@ -654,7 +654,7 @@ function displayThemedPrompt(name, client, options, cb) {
 
 //
 //	Pause prompts are a special prompt by the name 'pause'.
-//	
+//
 function displayThemedPause(client, options, cb) {
 
 	if(!cb && _.isFunction(options)) {
@@ -699,7 +699,7 @@ function displayThemedAsset(assetSpec, client, options, cb) {
 			});
 			break;
 
-		case 'method' : 
+		case 'method' :
 			//	:TODO: fetch & render via method
 			break;
 
diff --git a/core/tic_file_info.js b/core/tic_file_info.js
index d2216d66..27e31e4c 100644
--- a/core/tic_file_info.js
+++ b/core/tic_file_info.js
@@ -28,7 +28,7 @@ module.exports = class TicFileInfo {
 
 	static get requiredFields() {
 		return [
-			'Area', 'Origin', 'From', 'File', 'Crc', 
+			'Area', 'Origin', 'From', 'File', 'Crc',
 			//	:TODO: validate this:
 			//'Path', 'Seenby'	//	these two are questionable; some systems don't send them?
 		];
@@ -43,16 +43,16 @@ module.exports = class TicFileInfo {
 		if(value) {
 			//
 			//	We call toString() on values to ensure numbers, addresses, etc. are converted
-			//				
+			//
 			joinWith = joinWith || '';
 			if(Array.isArray(value)) {
 				return value.map(v => v.toString() ).join(joinWith);
 			}
-		
+
 			return value.toString();
 		}
 	}
-	
+
 	get filePath() {
 		return paths.join(paths.dirname(this.path), this.getAsString('File'));
 	}
@@ -86,7 +86,7 @@ module.exports = class TicFileInfo {
 					const localInfo = {
 						areaTag	: config.localAreaTags.find( areaTag => areaTag.toUpperCase() === area ),
 					};
-				
+
 					if(!localInfo.areaTag) {
 						return callback(Errors.Invalid(`No local area for "Area" of ${area}`));
 					}
@@ -112,7 +112,7 @@ module.exports = class TicFileInfo {
 					return callback(null, localInfo);
 				},
 				function checksumAndSize(localInfo, callback) {
-					const crcTic	= self.get('Crc');					
+					const crcTic	= self.get('Crc');
 					const stream	= fs.createReadStream(self.filePath);
 					const crc		= new CRC32();
 					let sizeActual	= 0;
@@ -193,7 +193,7 @@ module.exports = class TicFileInfo {
 		//	This is an optional keyword."
 		//
 		const to = this.get('To');
-		
+
 		if(!to) {
 			return allowNonExplicit;
 		}
@@ -219,10 +219,10 @@ module.exports = class TicFileInfo {
 			let key;
 			let value;
 			let entry;
-			
+
 			lines.forEach(line => {
 				keyEnd	= line.search(/\s/);
-			
+
 				if(keyEnd < 0) {
 					keyEnd = line.length;
 				}
@@ -253,7 +253,7 @@ module.exports = class TicFileInfo {
 						value = parseInt(value, 16);
 						break;
 
-					case 'size' : 
+					case 'size' :
 						value = parseInt(value, 10);
 						break;
 
diff --git a/core/ticker_text_view.js b/core/ticker_text_view.js
deleted file mode 100644
index 6574880b..00000000
--- a/core/ticker_text_view.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/* jslint node: true */
-'use strict';
-
-var View			= require('./view.js').View;
-var miscUtil		= require('./misc_util.js');
-var strUtil			= require('./string_util.js');
-var ansi			= require('./ansi_term.js');
-var util			= require('util');
-var assert			= require('assert');
-
-exports.TickerTextView		= TickerTextView;
-
-function TickerTextView(options) {
-	View.call(this, options);
-
-	var self = this;
-
-	this.text				= options.text || '';
-	this.tickerStyle		= options.tickerStyle || 'rightToLeft';
-	assert(this.tickerStyle in TickerTextView.TickerStyles);
-	
-	//	:TODO: Ticker |text| should have ANSI stripped before calculating any lengths/etc.
-	//	strUtil.ansiTextLength(s)
-	//	strUtil.pad(..., ignoreAnsi)
-	//	strUtil.stylizeString(..., ignoreAnsi)
-
-	this.tickerState = {};
-	switch(this.tickerStyle) {
-		case 'rightToLeft' :
-			this.tickerState.pos = this.position.row + this.dimens.width;
-			break;
-	}
-
-
-	self.onTickerInterval = function() {
-		switch(self.tickerStyle) {
-			case 'rightToLeft' : self.updateRightToLeftTicker(); break;
-		}
-	};
-
-	self.updateRightToLeftTicker = function() {
-		//	if pos < start
-		//		drawRemain()
-		//	if pos + remain > end
-		//		drawRemain(0, spaceFor)
-		//	else
-		//		drawString() + remainPading
-	};
-
-}
-
-util.inherits(TickerTextView, View);
-
-TickerTextView.TickerStyles = {
-	leftToRight		: 1,
-	rightToLeft		: 2,
-	bounce			: 3,
-	slamLeft		: 4,
-	slamRight		: 5,
-	slamBounce		: 6,
-	decrypt			: 7,
-	typewriter		: 8,
-};
-Object.freeze(TickerTextView.TickerStyles);
-
-/*
-TickerTextView.TICKER_STYLES = [
-	'leftToRight',
-	'rightToLeft',
-	'bounce',
-	'slamLeft',
-	'slamRight',
-	'slamBounce',
-	'decrypt',
-	'typewriter',
-];
-*/
-
-TickerTextView.prototype.controllerAttached = function() {
-	//	:TODO: call super
-};
-
-TickerTextView.prototype.controllerDetached = function() {
-	//	:TODO: call super
-	
-};
-
-TickerTextView.prototype.setText = function(text) {
-	this.text = strUtil.stylizeString(text, this.textStyle);
-
-	if(!this.dimens || !this.dimens.width) {
-		this.dimens.width = Math.ceil(this.text.length / 2);
-	}
-};
\ No newline at end of file
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index 35676193..27ae2169 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -1,13 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-var MenuView		= require('./menu_view.js').MenuView;
-var ansi			= require('./ansi_term.js');
-var strUtil			= require('./string_util.js');
+const MenuView		= require('./menu_view.js').MenuView;
+const strUtil		= require('./string_util.js');
 
-var util			= require('util');
-var assert			= require('assert');
-var _				= require('lodash');
+const util			= require('util');
+const assert		= require('assert');
 
 exports.ToggleMenuView		= ToggleMenuView;
 
@@ -44,7 +42,7 @@ ToggleMenuView.prototype.redraw = function() {
 		var item = this.items[i];
 		var text = strUtil.stylizeString(
 			item.text, i === this.focusedItemIndex && this.hasFocus ? this.focusTextStyle : this.textStyle);
-		
+
 		if(1 === i) {
 			//console.log(this.styleColor1)
 			//var sepColor = this.getANSIColor(this.styleColor1 || this.getColor());
diff --git a/core/upload.js b/core/upload.js
index 5a49a0ca..b4130433 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -85,7 +85,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
 			fileDetailsContinue : (formData, extraArgs, cb) => {
 				//	see displayFileDetailsPageForUploadEntry() for this hackery:
-				cb(null);				
+				cb(null);
 				return this.fileDetailsCurrentEntrySubmitCallback(null, formData.value);	//	move on to the next entry, if any
 			},
 
@@ -119,7 +119,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
 				return cb(null);
 			}
-		};	
+		};
 	}
 
 	getSaveState() {
@@ -143,12 +143,12 @@ exports.getModule = class UploadModule extends MenuModule {
 
 	isBlindUpload() { return 'blind' === this.uploadType; }
 	isFileTransferComplete() { return !_.isUndefined(this.recvFilePaths); }
-	
+
 	initSequence() {
 		const self = this;
 
 		if(0 === this.availAreas.length) {
-			//	
+			//
 			return this.gotoMenu(this.menuConfig.config.noUploadAreasAvailMenu || 'fileBaseNoUploadAreasAvail');
 		}
 
@@ -185,7 +185,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
 			//	need a terminator for various external protocols
 			this.tempRecvDirectory = pathWithTerminatingSeparator(tempRecvDirectory);
-		
+
 			const modOpts = {
 				extraArgs : {
 					recvDirectory	: this.tempRecvDirectory,	//	we'll move files from here to their area container once processed/confirmed
@@ -203,8 +203,8 @@ exports.getModule = class UploadModule extends MenuModule {
 			//	Upon completion, we'll re-enter the module with some file paths handed to us
 			//
 			return this.gotoMenu(
-				this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection', 
-				modOpts, 
+				this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection',
+				modOpts,
 				cb
 			);
 		});
@@ -219,7 +219,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
 		const fmtObj = Object.assign( {}, stepInfo);
 		let stepIndicatorFmt = '';
-		let logStepFmt;	
+		let logStepFmt;
 
 		const fmtConfig = this.menuConfig.config;
 
@@ -228,7 +228,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
 		const indicator = { };
 		const self = this;
-		
+
 		function updateIndicator(mci, isFinished) {
 			indicator.mci = mci;
 
@@ -253,7 +253,7 @@ exports.getModule = class UploadModule extends MenuModule {
 				updateIndicator(MciViewIds.processing.calcHashIndicator);
 				break;
 
-			case 'hash_finish' : 
+			case 'hash_finish' :
 				stepIndicatorFmt = fmtConfig.calcHashCompleteFormat || 'Finished calculating hash/checksums';
 				updateIndicator(MciViewIds.processing.calcHashIndicator, true);
 				break;
@@ -263,7 +263,7 @@ exports.getModule = class UploadModule extends MenuModule {
 				updateIndicator(MciViewIds.processing.archiveListIndicator);
 				break;
 
-			case 'archive_list_finish' : 
+			case 'archive_list_finish' :
 				fmtObj.archivedFileCount = stepInfo.archiveEntries.length;
 				stepIndicatorFmt = fmtConfig.extractArchiveListFinishFormat || 'Archive list extracted ({archivedFileCount} files)';
 				updateIndicator(MciViewIds.processing.archiveListIndicator, true);
@@ -273,7 +273,7 @@ exports.getModule = class UploadModule extends MenuModule {
 				stepIndicatorFmt = fmtConfig.extractArchiveListFailedFormat || 'Archive list extraction failed';
 				break;
 
-			case 'desc_files_start' : 
+			case 'desc_files_start' :
 				stepIndicatorFmt = fmtConfig.processingDescFilesFormat || 'Processing description files';
 				updateIndicator(MciViewIds.processing.descFileIndicator);
 				break;
@@ -289,7 +289,7 @@ exports.getModule = class UploadModule extends MenuModule {
 		}
 
 		fmtObj.stepIndicatorText = stringFormat(stepIndicatorFmt, fmtObj);
-		
+
 		if(this.hasProcessingArt) {
 			this.updateCustomViewTextsWithFilter('processing', MciViewIds.processing.customRangeStart, fmtObj, { appendMultiLine : true } );
 
@@ -339,7 +339,7 @@ exports.getModule = class UploadModule extends MenuModule {
 				return nextScanStep(null);
 			}
 
-			self.client.log.debug('Scanning file', { filePath : filePath } );		
+			self.client.log.debug('Scanning file', { filePath : filePath } );
 
 			scanFile(filePath, scanOpts, handleScanStep, (err, fileEntry, dupeEntries) => {
 				if(err) {
@@ -389,7 +389,7 @@ exports.getModule = class UploadModule extends MenuModule {
 						//	name changed; ajust before persist
 						newEntry.fileName = paths.basename(finalPath);
 					}
-					
+
 					return nextEntry(null);	//	still try next file
 				}
 
@@ -474,7 +474,7 @@ exports.getModule = class UploadModule extends MenuModule {
 							if(err) {
 								return nextDupe(err);
 							}
-							
+
 							const areaInfo = getFileAreaByTag(dupe.areaTag);
 							if(areaInfo) {
 								dupe.areaName 	= areaInfo.name;
@@ -553,12 +553,12 @@ exports.getModule = class UploadModule extends MenuModule {
 						return callback(null, scanResults);
 					}
 
-					return self.displayDupesPage(scanResults.dupes, () => {						
+					return self.displayDupesPage(scanResults.dupes, () => {
 						return callback(null, scanResults);
 					});
 				},
 				function prepDetails(scanResults, callback) {
-					return self.prepDetailsForUpload(scanResults, callback);					
+					return self.prepDetailsForUpload(scanResults, callback);
 				},
 				function startMovingAndPersistingToDatabase(scanResults, callback) {
 					//
@@ -583,14 +583,14 @@ exports.getModule = class UploadModule extends MenuModule {
 
 	displayOptionsPage(cb) {
 		const self = this;
-		
+
 		async.series(
 			[
 				function prepArtAndViewController(callback) {
 					return self.prepViewControllerWithArt(
-						'options', 
-						FormIds.options, 
-						{ clearScreen : true, trailingLF : false }, 
+						'options',
+						FormIds.options,
+						{ clearScreen : true, trailingLF : false },
 						callback
 					);
 				},
@@ -621,7 +621,7 @@ exports.getModule = class UploadModule extends MenuModule {
 							fileNameView.setText(sanatizeFilename(fileNameView.getData()));
 						}
 					});
-					
+
 					self.uploadType = 'blind';
 					uploadTypeView.setFocusItemIndex(0);	//	default to blind
 					fileNameView.setText(blindFileNameText);
@@ -658,14 +658,14 @@ exports.getModule = class UploadModule extends MenuModule {
 
 	displayFileDetailsPageForUploadEntry(fileEntry, cb) {
 		const self = this;
-		
+
 		async.waterfall(
 			[
 				function prepArtAndViewController(callback) {
 					return self.prepViewControllerWithArt(
-						'fileDetails', 
+						'fileDetails',
 						FormIds.fileDetails,
-						{ clearScreen : true, trailingLF : false }, 
+						{ clearScreen : true, trailingLF : false },
 						err => {
 							return callback(err);
 						}
diff --git a/core/user.js b/core/user.js
index 09d26163..76c493ea 100644
--- a/core/user.js
+++ b/core/user.js
@@ -49,7 +49,7 @@ module.exports = class User {
 			active		: 2,
 		};
 	}
-	
+
 	isAuthenticated() {
 		return true === this.authenticated;
 	}
@@ -83,7 +83,7 @@ module.exports = class User {
 			groupNames = [ groupNames ];
 		}
 
-		const isMember = groupNames.some(gn => (-1 !== this.groups.indexOf(gn))); 
+		const isMember = groupNames.some(gn => (-1 !== this.groups.indexOf(gn)));
 		return isMember;
 	}
 
@@ -91,11 +91,11 @@ module.exports = class User {
 		if(this.isRoot() || this.isGroupMember('sysops')) {
 			return 100;
 		}
-		
+
 		if(this.isGroupMember('users')) {
 			return 30;
 		}
-		
+
 		return 10;	//	:TODO: Is this what we want?
 	}
 
@@ -203,14 +203,14 @@ module.exports = class User {
 							if(err) {
 								return callback(err);
 							}
-							
+
 							self.userId = this.lastID;
 
 							//	Do not require activation for userId 1 (root/admin)
 							if(User.RootUserID === self.userId) {
 								self.properties.account_status = User.AccountStatus.active;
 							}
-							
+
 							return callback(null, trans);
 						}
 					);
@@ -220,7 +220,7 @@ module.exports = class User {
 						if(err) {
 							return callback(err);
 						}
-						
+
 						self.properties.pw_pbkdf2_salt	= info.salt;
 						self.properties.pw_pbkdf2_dk	= info.dk;
 						return callback(null, trans);
@@ -283,8 +283,8 @@ module.exports = class User {
 
 		userDb.run(
 			`REPLACE INTO user_property (user_id, prop_name, prop_value)
-			VALUES (?, ?, ?);`, 
-			[ this.userId, propName, propValue ], 
+			VALUES (?, ?, ?);`,
+			[ this.userId, propName, propValue ],
 			err => {
 				if(cb) {
 					return cb(err);
@@ -334,7 +334,7 @@ module.exports = class User {
 			if(err) {
 				return cb(err);
 			}
-			
+
 			stmt.finalize( () => {
 				return cb(null);
 			});
@@ -346,7 +346,7 @@ module.exports = class User {
 			if(err) {
 				return cb(err);
 			}
-			
+
 			const newProperties = {
 				pw_pbkdf2_salt	: info.salt,
 				pw_pbkdf2_dk	: info.dk,
@@ -395,7 +395,7 @@ module.exports = class User {
 			}
 		);
 	}
-	
+
 	static isRootUserId(userId) {
 		return (User.RootUserID === userId);
 	}
@@ -466,11 +466,11 @@ module.exports = class User {
 				if(err) {
 					return cb(err);
 				}
-				
+
 				if(row) {
 					return cb(null, row.user_name);
 				}
-				
+
 				return cb(Errors.DoesNotExist('No matching user ID'));
 			}
 		);
@@ -498,7 +498,7 @@ module.exports = class User {
 			if(err) {
 				return cb(err);
 			}
-			properties[row.prop_name] = row.prop_value;			
+			properties[row.prop_name] = row.prop_value;
 		}, (err) => {
 			return cb(err, err ? null : properties);
 		});
@@ -512,12 +512,12 @@ module.exports = class User {
 			`SELECT user_id
 			FROM user_property
 			WHERE prop_name = ? AND prop_value = ?;`,
-			[ propName, propValue ], 
+			[ propName, propValue ],
 			(err, row) => {
 				if(row) {
 					userIds.push(row.user_id);
 				}
-			}, 
+			},
 			() => {
 				return cb(null, userIds);
 			}
@@ -557,7 +557,7 @@ module.exports = class User {
 							return nextUser(err, user);
 						}
 					);
-				}, 
+				},
 				(err, transformed) => {
 					return cb(err, transformed);
 				});
@@ -594,14 +594,14 @@ module.exports = class User {
 		});
 	}
 
-	static generatePasswordDerivedKey(password, salt, cb) {	
+	static generatePasswordDerivedKey(password, salt, cb) {
 		password = new Buffer(password).toString('hex');
 
 		crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', (err, dk) => {
 			if(err) {
 				return cb(err);
 			}
-			
+
 			return cb(null, dk.toString('hex'));
 		});
 	}
diff --git a/core/user_config.js b/core/user_config.js
index 432cdade..70e1f068 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -28,10 +28,10 @@ const MciCodeIds = {
 	TermHeight	: 8,
 	Theme		: 9,
 	Password	: 10,
-	PassConfirm	: 11,	
+	PassConfirm	: 11,
 	ThemeInfo	: 20,
 	ErrorMsg	: 21,
-	
+
 	SaveCancel	: 25,
 };
 
@@ -52,11 +52,11 @@ exports.getModule = class UserConfigModule extends MenuModule {
 				if(self.client.user.properties.email_address.toLowerCase() === data.toLowerCase()) {
 					return cb(null);
 				}
-				
+
 				//	Otherwise we can use the standard system method
 				return sysValidate.validateEmailAvail(data, cb);
 			},
-			
+
 			validatePassword : function(data, cb) {
 				//
 				//	Blank is OK - this means we won't be changing it
@@ -64,23 +64,23 @@ exports.getModule = class UserConfigModule extends MenuModule {
 				if(!data || 0 === data.length) {
 					return cb(null);
 				}
-				
+
 				//	Otherwise we can use the standard system method
 				return sysValidate.validatePasswordSpec(data, cb);
 			},
-			
+
 			validatePassConfirmMatch : function(data, cb) {
 				var passwordView = self.getView(MciCodeIds.Password);
 				cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
 			},
-			
+
 			viewValidationListener : function(err, cb) {
 				var errMsgView = self.getView(MciCodeIds.ErrorMsg);
 				var newFocusId;
 				if(errMsgView) {
 					if(err) {
 						errMsgView.setText(err.message);
-						
+
 						if(err.view.getId() === MciCodeIds.PassConfirm) {
 							newFocusId = MciCodeIds.Password;
 							var passwordView = self.getView(MciCodeIds.Password);
@@ -93,13 +93,13 @@ exports.getModule = class UserConfigModule extends MenuModule {
 				}
 				cb(newFocusId);
 			},
-			
+
 			//
 			//	Handlers
 			//
 			saveChanges : function(formData, extraArgs, cb) {
 				assert(formData.value.password === formData.value.passwordConfirm);
-				
+
 				const newProperties = {
 					real_name			: formData.value.realName,
 					birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(),
@@ -108,15 +108,15 @@ exports.getModule = class UserConfigModule extends MenuModule {
 					affiliation			: formData.value.affils,
 					email_address		: formData.value.email,
 					web_address			: formData.value.web,
-					term_height			: formData.value.termHeight.toString(),				
+					term_height			: formData.value.termHeight.toString(),
 					theme_id			: self.availThemeInfo[formData.value.theme].themeId,
 				};
-				
+
 				//  runtime set theme
 				theme.setClientTheme(self.client, newProperties.theme_id);
-				
+
 				//  persist all changes
-				self.client.user.persistProperties(newProperties, err => {			
+				self.client.user.persistProperties(newProperties, err => {
 					if(err) {
 						self.client.log.warn( { error : err.toString() }, 'Failed persisting updated properties');
 						//	:TODO: warn end user!
@@ -126,7 +126,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
 					//	New password if it's not empty
 					//
 					self.client.log.info('User updated properties');
-					
+
 					if(formData.value.password.length > 0) {
 						self.client.user.setNewAuthCredentials(formData.value.password, err => {
 							if(err) {
@@ -155,7 +155,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
 			}
 
 			const self 				= this;
-			const vc				= self.viewControllers.menu = new ViewController( { client : self.client} );		
+			const vc				= self.viewControllers.menu = new ViewController( { client : self.client} );
 			let currentThemeIdIndex = 0;
 
 			async.series(
@@ -164,7 +164,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
 						vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
 					},
 					function prepareAvailableThemes(callback) {
-						self.availThemeInfo = _.sortBy(_.map(theme.getAvailableThemes(), function makeThemeInfo(t, themeId) {		
+						self.availThemeInfo = _.sortBy(_.map(theme.getAvailableThemes(), function makeThemeInfo(t, themeId) {
 							return {
 								themeId		: themeId,
 								name		: t.info.name,
@@ -173,11 +173,11 @@ exports.getModule = class UserConfigModule extends MenuModule {
 								group		: _.isString(t.info.group) ? t.info.group : '',
 							};
 						}), 'name');
-						
+
 						currentThemeIdIndex = _.findIndex(self.availThemeInfo, function cmp(ti) {
 							return ti.themeId === self.client.user.properties.theme_id;
 						});
-						
+
 						callback(null);
 					},
 					function populateViews(callback) {
@@ -191,19 +191,19 @@ exports.getModule = class UserConfigModule extends MenuModule {
 						self.setViewText('menu', MciCodeIds.Email, user.properties.email_address);
 						self.setViewText('menu', MciCodeIds.Web, user.properties.web_address);
 						self.setViewText('menu', MciCodeIds.TermHeight, user.properties.term_height.toString());
-								
-						
+
+
 						var themeView = self.getView(MciCodeIds.Theme);
 						if(themeView) {
 							themeView.setItems(_.map(self.availThemeInfo, 'name'));
 							themeView.setFocusItemIndex(currentThemeIdIndex);
 						}
-						
+
 						var realNameView = self.getView(MciCodeIds.RealName);
 						if(realNameView) {
 							realNameView.setFocus(true);	//	:TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
 						}
-						
+
 						callback(null);
 					}
 				],
diff --git a/core/user_group.js b/core/user_group.js
index 3903f2c3..db444296 100644
--- a/core/user_group.js
+++ b/core/user_group.js
@@ -1,11 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-var userDb			= require('./database.js').dbs.user;
-var Config			= require('./config.js').config;
+const userDb		= require('./database.js').dbs.user;
 
-var async			= require('async');
-var _				= require('lodash');
+const async			= require('async');
+const _				= require('lodash');
 
 exports.getGroupsForUser	 	= getGroupsForUser;
 exports.addUserToGroup			= addUserToGroup;
@@ -13,23 +12,22 @@ exports.addUserToGroups			= addUserToGroups;
 exports.removeUserFromGroup		= removeUserFromGroup;
 
 function getGroupsForUser(userId, cb) {
-	var sql =
-		'SELECT group_name '		+
-		'FROM user_group_member '	+
-		'WHERE user_id=?;';
+	const sql =
+		`SELECT group_name
+		FROM user_group_member
+		WHERE user_id=?;`;
 
-	var groups = [];
+	const groups = [];
 
-	userDb.each(sql, [ userId ], function rowData(err, row) {
+	userDb.each(sql, [ userId ], (err, row) => {
 		if(err) {
-			cb(err);
-			return;
-		} else {
-			groups.push(row.group_name);
+			return cb(err);
 		}
+
+		groups.push(row.group_name);
 	},
-	function complete() {
-		cb(null, groups);
+	() => {
+		return cb(null, groups);
 	});
 }
 
@@ -40,31 +38,31 @@ function addUserToGroup(userId, groupName, transOrDb, cb) {
 	}
 
 	transOrDb.run(
-		'REPLACE INTO user_group_member (group_name, user_id) ' +
-		'VALUES(?, ?);',
+		`REPLACE INTO user_group_member (group_name, user_id)
+		VALUES(?, ?);`,
 		[ groupName, userId ],
-		function complete(err) {
-			cb(err);
+		err => {
+			return cb(err);
 		}
 	);
 }
 
 function addUserToGroups(userId, groups, transOrDb, cb) {
 
-	async.each(groups, function item(groupName, next) {
-		addUserToGroup(userId, groupName, transOrDb, next);
-	}, function complete(err) {
-		cb(err);
+	async.each(groups, (groupName, nextGroupName) => {
+		return addUserToGroup(userId, groupName, transOrDb, nextGroupName);
+	}, err => {
+		return cb(err);
 	});
 }
 
 function removeUserFromGroup(userId, groupName, cb) {
 	userDb.run(
-		'DELETE FROM user_group_member ' +
-		'WHERE group_name=? AND user_id=?;', 
+		`DELETE FROM user_group_member
+		WHERE group_name=? AND user_id=?;`,
 		[ groupName, userId ],
-		function complete(err) {
-			cb(err);
+		err => {
+			return cb(err);
 		}
 	);
 }
diff --git a/core/user_list.js b/core/user_list.js
index be85c586..30313a28 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -12,7 +12,7 @@ const _					= require('lodash');
 
 /*
 	Available listFormat/focusListFormat object members:
-	
+
 	userId			: User ID
 	userName		: User name/handle
 	lastLoginTs		: Last login timestamp
@@ -99,7 +99,7 @@ exports.getModule = class UserListModule extends MenuModule {
 						userListView.redraw();
 						callback(null);
 					}
-				],		
+				],
 				function complete(err) {
 					if(err) {
 						self.client.log.error( { error : err.toString() }, 'Error loading user list');
@@ -108,5 +108,5 @@ exports.getModule = class UserListModule extends MenuModule {
 				}
 			);
 		});
-	}	
+	}
 };
diff --git a/core/user_login.js b/core/user_login.js
index 4bd9176c..37c3b306 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -39,8 +39,8 @@ function userLogin(client, username, password, cb) {
 		if(existingClientConnection) {
 			client.log.info(
 				{
-					existingClientId	: existingClientConnection.session.id, 
-					username			: user.username, 
+					existingClientId	: existingClientConnection.session.id,
+					username			: user.username,
 					userId				: user.userId
 				},
 				'Already logged in'
@@ -57,7 +57,7 @@ function userLogin(client, username, password, cb) {
 
 		//	update client logger with addition of username
 		client.log = logger.log.child( { clientId : client.log.fields.clientId, username : user.username });
-		client.log.info('Successful login');            
+		client.log.info('Successful login');
 
 		async.parallel(
 			[
@@ -72,7 +72,7 @@ function userLogin(client, username, password, cb) {
 					return StatLog.setUserStat(user, 'last_login_timestamp', StatLog.now, callback);
 				},
 				function updateUserLoginCount(callback) {
-					return StatLog.incrementUserStat(user, 'login_count', 1, callback);						
+					return StatLog.incrementUserStat(user, 'login_count', 1, callback);
 				},
 				function recordLoginHistory(callback) {
 					const LOGIN_HISTORY_MAX	= 200;	//	history of up to last 200 callers
diff --git a/core/uuid_util.js b/core/uuid_util.js
index d8023f95..de64ec30 100644
--- a/core/uuid_util.js
+++ b/core/uuid_util.js
@@ -9,15 +9,15 @@ function createNamedUUID(namespaceUuid, key) {
 	//
 	//	v5 UUID generation code based on the work here:
 	//	https://github.com/download13/uuidv5/blob/master/uuid.js
-	//	
+	//
 	if(!Buffer.isBuffer(namespaceUuid)) {
 		namespaceUuid = new Buffer(namespaceUuid);
 	}
-	
+
 	if(!Buffer.isBuffer(key)) {
 		key = new Buffer(key);
 	}
-    
+
 	let digest = createHash('sha1').update(
 		Buffer.concat( [ namespaceUuid, key ] )).digest();
 
@@ -31,8 +31,8 @@ function createNamedUUID(namespaceUuid, key) {
 	u[6] = (u[6] & 0x0f) | 0x50;		// version, 4 most significant bits are set to version 5 (0101)
 	u[8] = (digest[8] & 0x3f) | 0x80;	// clock_seq_hi_and_reserved, 2msb are set to 10
 	u[9] = digest[9];
-	
+
 	digest.copy(u, 10, 10, 16);
-	
+
 	return u;
 }
\ No newline at end of file
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 2cc2ad7a..847b9407 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -15,7 +15,7 @@ exports.VerticalMenuView		= VerticalMenuView;
 function VerticalMenuView(options) {
 	options.cursor	= options.cursor || 'hide';
 	options.justify = options.justify || 'right';	//	:TODO: default to center
-	
+
 	MenuView.call(this, options);
 
 	const self = this;
@@ -80,7 +80,7 @@ function VerticalMenuView(options) {
 
 		self.client.term.write(
 			ansi.goto(item.row, self.position.col) +
-			sgr + 
+			sgr +
 			strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)
 		);
 	};
@@ -89,7 +89,7 @@ function VerticalMenuView(options) {
 util.inherits(VerticalMenuView, MenuView);
 
 VerticalMenuView.prototype.redraw = function() {
-	VerticalMenuView.super_.prototype.redraw.call(this);	
+	VerticalMenuView.super_.prototype.redraw.call(this);
 
 	//	:TODO: rename positionCacheExpired to something that makese sense; combine methods for such
 	if(this.positionCacheExpired) {
@@ -106,14 +106,14 @@ VerticalMenuView.prototype.redraw = function() {
 		let seq			= ansi.goto(this.position.row, this.position.col) + this.getSGR() + blank;
 		let row			= this.position.row + 1;
 		const endRow	= (row + this.oldDimens.height) - 2;
-		
+
 		while(row <= endRow) {
 			seq += ansi.goto(row, this.position.col) + blank;
 			row += 1;
 		}
 		this.client.term.write(seq);
 		delete this.oldDimens;
-	}	
+	}
 
 	if(this.items.length) {
 		let row = this.position.row;
@@ -206,7 +206,7 @@ VerticalMenuView.prototype.removeItem = function(index) {
 VerticalMenuView.prototype.focusNext = function() {
 	if(this.items.length - 1 === this.focusedItemIndex) {
 		this.focusedItemIndex = 0;
-		
+
 		this.viewWindow = {
 			top		: 0,
 			bottom	: Math.min(this.maxVisibleItems, this.items.length) - 1
@@ -228,7 +228,7 @@ VerticalMenuView.prototype.focusNext = function() {
 VerticalMenuView.prototype.focusPrevious = function() {
 	if(0 === this.focusedItemIndex) {
 		this.focusedItemIndex = this.items.length - 1;
-		
+
 		this.viewWindow = {
 			//top		: this.items.length - this.maxVisibleItems,
 			top		: Math.max(this.items.length - this.maxVisibleItems, 0),
@@ -279,7 +279,7 @@ VerticalMenuView.prototype.focusNextPageItem = function() {
 	//
 	//	Jump to current + up to page size or bottom
 	//	If already at the bottom, jump to top
-	//	
+	//
 	if(this.items.length - 1 === this.focusedItemIndex) {
 		return this.focusNext();	//	will jump to top
 	}
diff --git a/core/view.js b/core/view.js
index fccca541..1829f26d 100644
--- a/core/view.js
+++ b/core/view.js
@@ -39,7 +39,7 @@ function View(options) {
 	var self			= this;
 
 	this.client			= options.client;
-	
+
 	this.cursor			= options.cursor || 'show';
 	this.cursorStyle	= options.cursorStyle || 'default';
 
@@ -72,7 +72,7 @@ function View(options) {
 	} else {
 		this.dimens = {
 			width	: options.width || 0,
-			height	: 0 
+			height	: 0
 		};
 	}
 
@@ -106,7 +106,7 @@ function View(options) {
 	this.restoreCursor = function() {
 		//this.client.term.write(ansi.setCursorStyle(this.cursorStyle));
 		this.client.term.rawWrite('show' === this.cursor ? ansi.showCursor() : ansi.hideCursor());
-	};	
+	};
 }
 
 util.inherits(View, events.EventEmitter);
@@ -150,7 +150,7 @@ View.prototype.setDimension = function(dimens) {
 
 View.prototype.setHeight = function(height) {
 	height	= parseInt(height) || 1;
-	height	= Math.min(height, this.client.term.termHeight); 
+	height	= Math.min(height, this.client.term.termHeight);
 
 	this.dimens.height		= height;
 	this.autoScale.height	= false;
@@ -182,9 +182,9 @@ View.prototype.setPropertyValue = function(propName, value) {
 		case 'height'	: this.setHeight(value); break;
 		case 'width'	: this.setWidth(value); break;
 		case 'focus'	: this.setFocus(value); break;
-		
-		case 'text'		: 
-			if('setText' in this) {				
+
+		case 'text'		:
+			if('setText' in this) {
 				this.setText(value);
 			}
 			break;
@@ -248,7 +248,7 @@ View.prototype.setFocus = function(focused) {
 	this.restoreCursor();
 };
 
-View.prototype.onKeyPress = function(ch, key) {	
+View.prototype.onKeyPress = function(ch, key) {
 	enigAssert(this.hasFocus,		'View does not have focus');
 	enigAssert(this.acceptsInput,	'View does not accept input');
 
diff --git a/core/view_controller.js b/core/view_controller.js
index ecf36be5..55b1bd1c 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -22,7 +22,7 @@ var MCI_REGEXP	= /([A-Z]{2})([0-9]{1,2})/;
 function ViewController(options) {
 	assert(_.isObject(options));
 	assert(_.isObject(options.client));
-	
+
 	events.EventEmitter.call(this);
 
 	var self			= this;
@@ -54,14 +54,14 @@ function ViewController(options) {
 					self.client.log.warn( { err : err }, 'Error during handleAction()');
 				}
 			}
-			
+
 			self.waitActionCompletion = false;
 		});
 	};
 
 	this.clientKeyPressHandler = function(ch, key) {
 		//
-		//	Process key presses treating form submit mapped	keys special. 
+		//	Process key presses treating form submit mapped	keys special.
 		//	Everything else is forwarded on to the focused View, if any.
 		//
 		var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
@@ -92,7 +92,7 @@ function ViewController(options) {
 				self.nextFocus();
 				break;
 
-			case 'accept' :			
+			case 'accept' :
 				if(self.focusedView && self.focusedView.submit) {
 					//	:TODO: need to do validation here!!!
 					var focusedView = self.focusedView;
@@ -166,37 +166,23 @@ function ViewController(options) {
 		var propAsset;
 		var propValue;
 
-		function callModuleMethod(path) {
-			if('' === paths.extname(path)) {
-				path += '.js';
-			}
-
-			try {
-				var methodMod = require(path);
-				//	:TODO: fix formData & extraArgs
-				return methodMod[propAsset.asset](self.client.currentMenuModule, {}, {} );
-			} catch(e) {
-				self.client.log.error( { error : e.toString(), methodName : propAsset.asset }, 'Failed to execute asset method');
-			}
-		}
-
-		for(var propName in conf) {			
+		for(var propName in conf) {
 			propAsset = asset.getViewPropertyAsset(conf[propName]);
 			if(propAsset) {
 				switch(propAsset.type) {
 					case 'config' :
-						propValue = asset.resolveConfigAsset(conf[propName]); 
+						propValue = asset.resolveConfigAsset(conf[propName]);
 						break;
-					
+
 					case 'sysStat' :
 						propValue = asset.resolveSystemStatAsset(conf[propName]);
 						break;
 
 						//	:TODO: handle @art (e.g. text : @art ...)
 
-					case 'method' : 
+					case 'method' :
 					case 'systemMethod' :
-						if('validate' === propName) {						
+						if('validate' === propName) {
 							//	:TODO: handle propAsset.location for @method script specification
 							if('systemMethod' === propAsset.type) {
 								//	:TODO: implementation validation @systemMethod handling!
@@ -211,7 +197,7 @@ function ViewController(options) {
 							}
 						} else {
 							if(_.isString(propAsset.location)) {
-
+								// :TODO: clean this code up!
 							} else {
 								if('systemMethod' === propAsset.type) {
 									//	:TODO:
@@ -227,7 +213,7 @@ function ViewController(options) {
 						}
 						break;
 
-					default : 
+					default :
 						propValue = propValue = conf[propName];
 						break;
 				}
@@ -238,7 +224,7 @@ function ViewController(options) {
 			if(!_.isUndefined(propValue)) {
 				view.setPropertyValue(propName, propValue);
 			}
-		}		
+		}
 	};
 
 	this.applyViewConfig = function(config, cb) {
@@ -251,7 +237,7 @@ function ViewController(options) {
 			if(null === mciMatch) {
 				self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
 				return;
-			}	
+			}
 
 			var viewId = parseInt(mciMatch[2]);
 			assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]);	//	shouldn't be possible with RegExp used
@@ -261,7 +247,7 @@ function ViewController(options) {
 			}
 
 			var view = self.getView(viewId);
-			
+
 			if(!view) {
 				self.client.log.warn( { viewId : viewId }, 'Cannot find view');
 				nextItem(null);
@@ -278,7 +264,7 @@ function ViewController(options) {
 
 			nextItem(null);
 		},
-		function complete(err) {		
+		function complete(err) {
 			//	default to highest ID if no 'submit' entry present
 			if(!submitId) {
 				var highestIdView = self.getView(highestId);
@@ -310,7 +296,7 @@ function ViewController(options) {
 		if(_.isUndefined(actionValue)) {
 			return false;
 		}
-		
+
 		if(_.isNumber(actionValue) || _.isString(actionValue)) {
 			if(_.isUndefined(formValue[actionValue])) {
 				return false;
@@ -337,10 +323,10 @@ function ViewController(options) {
 		}
 
 		self.client.log.trace(
-			{ 
+			{
 				formValue	: formValue,
 				actionValue	: actionValue
-			}, 
+			},
 			'Action match'
 		);
 
@@ -412,7 +398,7 @@ ViewController.prototype.detachClientEvents = function() {
 	if(!this.attached) {
 		return;
 	}
-	
+
 	this.client.removeListener('key press', this.clientKeyPressHandler);
 
 	for(var id in this.views) {
@@ -465,7 +451,7 @@ ViewController.prototype.switchFocus = function(id) {
 
 	self.validateView(focusedView, function validated(err, newFocusedViewId) {
 		if(err) {
-			var newFocusedView = self.getView(newFocusedViewId) || focusedView;	
+			var newFocusedView = self.getView(newFocusedViewId) || focusedView;
 			self.setViewFocusWithEvents(newFocusedView, true);
 		} else {
 			self.attachClientEvents();
@@ -524,7 +510,7 @@ ViewController.prototype.setViewOrder = function(order) {
 
 ViewController.prototype.redrawAll = function(initialFocusId) {
 	this.client.term.rawWrite(ansi.hideCursor());
-	
+
 	for(var id in this.views) {
 		if(initialFocusId === id) {
 			continue;	//	will draw @ focus
@@ -538,7 +524,7 @@ ViewController.prototype.redrawAll = function(initialFocusId) {
 ViewController.prototype.loadFromPromptConfig = function(options, cb) {
 	assert(_.isObject(options));
 	assert(_.isObject(options.mciMap));
-	
+
 	var self			= this;
 	var promptConfig	= _.isObject(options.config) ? options.config : self.client.currentMenuModule.menuConfig.promptConfig;
 	var initialFocusId	= 1;	//	default to first
@@ -560,7 +546,7 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
 					callback(null);
 				}
 			},
-			function prepareFormSubmission(callback) {				
+			function prepareFormSubmission(callback) {
 				if(false === self.noInput) {
 
 					self.on('submit', function promptSubmit(formData) {
@@ -610,7 +596,7 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
 					//
 					//	*	'keys' must be present and be an array of key names
 					//	*	If 'viewId' is present, key(s) will focus & submit on behalf
-					//		of the specified view. 
+					//		of the specified view.
 					//	*	If 'action' is present, that action will be procesed when
 					//		triggered by key(s)
 					//
@@ -681,7 +667,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 					callback(err);
 				});
 			},
-            /*
+			/*
 			function applyThemeCustomization(callback) {
 				formConfig = formConfig || {};
 				formConfig.mci = formConfig.mci || {};
@@ -701,7 +687,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 
 				//console.log('after theme...')
 				//console.log(self.client.currentMenuModule.menuConfig.config)
-				
+
 				callback(null);
 			},
             */
@@ -764,7 +750,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 					//
 					//	*	'keys' must be present and be an array of key names
 					//	*	If 'viewId' is present, key(s) will focus & submit on behalf
-					//		of the specified view. 
+					//		of the specified view.
 					//	*	If 'action' is present, that action will be procesed when
 					//		triggered by key(s)
 					//
@@ -807,7 +793,7 @@ ViewController.prototype.formatMCIString = function(format) {
 
 	return format.replace(/{(\d+)}/g, function replacer(match, number) {
 		view = self.getView(number);
-		
+
 		if(!view) {
 			return match;
 		}
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index c2d6852d..6ea1e6f8 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -13,13 +13,12 @@ const Log					= require('./logger.js').log;
 
 //	deps
 const async					= require('async');
-const _						= require('lodash');
 const crypto				= require('crypto');
 const fs					= require('graceful-fs');
 const url					= require('url');
 const querystring			= require('querystring');
 
-const PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT = 
+const PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT =
 	`%USERNAME%:
 a password reset has been requested for your account on %BOARDNAME%.
     
@@ -46,7 +45,7 @@ class WebPasswordReset {
 		}
 
 		async.waterfall(
-			[			
+			[
 				function getEmailAddress(callback) {
 					if(!username) {
 						return callback(Errors.MissingParam('Missing "username"'));
@@ -81,7 +80,7 @@ class WebPasswordReset {
 							email_password_reset_token		: token,
 							email_password_reset_token_ts	: getISOTimestampString(),
 						};
-						
+
 						//	we simply place the reset token in the user's properties
 						user.persistProperties(newProperties, err => {
 							return callback(err, user);
@@ -111,13 +110,13 @@ class WebPasswordReset {
 							.replace(/%USERNAME%/g, 	user.username)
 							.replace(/%TOKEN%/g,		user.properties.email_password_reset_token)
 							.replace(/%RESET_URL%/g,	resetUrl)
-							;
+						;
 					}
 
 					textTemplate = replaceTokens(textTemplate);
 					if(htmlTemplate) {
 						htmlTemplate = replaceTokens(htmlTemplate);
-					}					
+					}
 
 					const message = {
 						to		: `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
@@ -128,7 +127,11 @@ class WebPasswordReset {
 					};
 
 					sendMail(message, (err, info) => {
-						//	:TODO: Log me!
+						if(err) {
+							Log.warn( { error : err.message }, 'Failed sending password reset email' );
+						} else {
+							Log.debug( { info : info }, 'Successfully sent password reset email');
+						}
 
 						return callback(err);
 					});
@@ -162,7 +165,7 @@ class WebPasswordReset {
 				path		: '^\\/reset_password\\?token\\=[a-f0-9]+$',	//	Config.contentServers.web.forgotPasswordPageTemplate
 				handler		: WebPasswordReset.routeResetPasswordGet,
 			},
-				//	POST handler for performing the actual reset
+			//	POST handler for performing the actual reset
 			{
 				method		: 'POST',
 				path		: '^\\/reset_password$',
diff --git a/core/whos_online.js b/core/whos_online.js
index 6abd76ef..f832bc10 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -53,7 +53,7 @@ exports.getModule = class WhosOnlineModule extends MenuModule {
 						const nonAuthUser		= self.menuConfig.config.nonAuthUser || 'Logging In';
 						const otherUnknown		= self.menuConfig.config.otherUnknown || 'N/A';
 						const onlineList 		= getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
-						
+
 						onlineListView.setItems(_.map(onlineList, oe => {
 							if(oe.authenticated) {
 								oe.timeOn = _.upperFirst(oe.timeOn.humanize());
diff --git a/core/word_wrap.js b/core/word_wrap.js
index 0a4b122d..f246ad23 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -1,29 +1,31 @@
 /* jslint node: true */
 'use strict';
 
-var assert					= require('assert');
-var _						= require('lodash');
-const renderStringLength	= require('./string_util.js').renderStringLength; 
+const renderStringLength	= require('./string_util.js').renderStringLength;
 
-exports.wordWrapText	= wordWrapText2;
+//	deps
+const assert				= require('assert');
+const _						= require('lodash');
+
+exports.wordWrapText	= wordWrapText;
 
 const SPACE_CHARS		= [
-	' ', '\f', '\n', '\r', '\v', 
+	' ', '\f', '\n', '\r', '\v',
 	'​\u00a0', '\u1680', '​\u180e', '\u2000​', '\u2001', '\u2002', '​\u2003', '\u2004',
-	'\u2005', '\u2006​', '\u2007', '\u2008​', '\u2009', '\u200a​', '\u2028', '\u2029​', 
+	'\u2005', '\u2006​', '\u2007', '\u2008​', '\u2009', '\u200a​', '\u2028', '\u2029​',
 	'\u202f', '\u205f​', '\u3000',
 ];
 
-const REGEXP_WORD_WRAP = new RegExp(`\t|[${SPACE_CHARS.join('')}]`, 'g'); 
+const REGEXP_WORD_WRAP = new RegExp(`\t|[${SPACE_CHARS.join('')}]`, 'g');
 
-function wordWrapText2(text, options) {
+function wordWrapText(text, options) {
 	assert(_.isObject(options));
 	assert(_.isNumber(options.width));
-	
+
 	options.tabHandling	= options.tabHandling || 'expand';
 	options.tabWidth	= options.tabWidth || 4;
-	options.tabChar		= options.tabChar || ' ';		
-	
+	options.tabChar		= options.tabChar || ' ';
+
 	//const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}`, 'g');
 	//
 	//	For a given word, match 0->options.width chars -- alwasy include a full trailing ESC
@@ -31,7 +33,7 @@ function wordWrapText2(text, options) {
 	//
 	//	:TODO: Need to create ansi.getMatchRegex or something - this is used all over
 	const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}\\x1b\\[[\\?=;0-9]*[ABCDEFGHJKLMSTfhlmnprsu]|.{0,${options.width}}`, 'g');
-	
+
 	let m;
 	let word;
 	let c;
@@ -39,30 +41,30 @@ function wordWrapText2(text, options) {
 	let i			= 0;
 	let wordStart	= 0;
 	let result		= { wrapped : [ '' ], renderLen : [] };
-	
+
 	function expandTab(column) {
 		const remainWidth = options.tabWidth - (column % options.tabWidth);
 		return new Array(remainWidth).join(options.tabChar);
 	}
-	
+
 	function appendWord() {
 		word.match(REGEXP_GOBBLE).forEach( w => {
 			renderLen = renderStringLength(w);
-			
+
 			if(result.renderLen[i] + renderLen > options.width) {
 				if(0 === i) {
 					result.firstWrapRange = { start : wordStart, end : wordStart + w.length };
 				}
-				
+
 				result.wrapped[++i]	= w;
 				result.renderLen[i]	= renderLen;
 			} else {
-				result.wrapped[i] 	+= w;				
-				result.renderLen[i] = (result.renderLen[i] || 0) + renderLen;				
+				result.wrapped[i] 	+= w;
+				result.renderLen[i] = (result.renderLen[i] || 0) + renderLen;
 			}
 		});
 	}
-	
+
 	//
 	//	Some of the way we word wrap is modeled after Sublime Test 3:
 	//
@@ -74,10 +76,10 @@ function wordWrapText2(text, options) {
 	//		"\t" may resolve to "      " and must fit within the space.
 	//
 	//	*	If a word is ultimately too long to fit, break it up until it does.
-	//	
+	//
 	while(null !== (m = REGEXP_WORD_WRAP.exec(text))) {
 		word = text.substring(wordStart, REGEXP_WORD_WRAP.lastIndex - 1);
-		
+
 		c = m[0].charAt(0);
 		if(SPACE_CHARS.indexOf(c) > -1) {
 			word += m[0];
@@ -89,129 +91,13 @@ function wordWrapText2(text, options) {
 				word += m[0];
 			}
 		}
-		
+
 		appendWord();
 		wordStart = REGEXP_WORD_WRAP.lastIndex + m[0].length - 1;
 	}
-	
+
 	word = text.substring(wordStart);
 	appendWord();
-	
+
 	return result;
 }
-
-function wordWrapText(text, options) {
-	//
-	//	options.*:
-	//		width			: word wrap width
-	//		tabHandling		: expand (default=expand)
-	//		tabWidth		: tab width if tabHandling is 'expand' (default=4)
-	//		tabChar			: character to use for tab expansion
-	//
-	assert(_.isObject(options),			'Missing options!');
-	assert(_.isNumber(options.width),	'Missing options.width!');
-
-	options.tabHandling = options.tabHandling || 'expand';
-	
-	if(!_.isNumber(options.tabWidth)) {
-		options.tabWidth = 4;
-	}
-
-	options.tabChar = options.tabChar || ' ';
-
-	//
-	//	Notes
-	//	*	Sublime Text 3 for example considers spaces after a word
-	//		part of said word. For example, "word    " would be wraped
-	//		in it's entirity.
-	//
-	//	*	Tabs in Sublime Text 3 are also treated as a word, so, e.g.
-	//		"\t" may resolve to "      " and must fit within the space.
-	//
-	//	*	If a word is ultimately too long to fit, break it up until it does.
-	//
-	//	RegExp below is JavaScript '\s' minus the '\t'
-	//
-	var re = new RegExp(
-		'\t|[ \f\n\r\v​\u00a0\u1680​\u180e\u2000​\u2001\u2002​\u2003\u2004\u2005\u2006​' + 
-		'\u2007\u2008​\u2009\u200a​\u2028\u2029​\u202f\u205f​\u3000]', 'g');
-	var m;
-	var wordStart = 0;
-	var results = { wrapped : [ '' ] };
-	var i = 0;
-	var word;
-	var wordLen;
-
-	function expandTab(col) {
-		var remainWidth = options.tabWidth - (col % options.tabWidth);
-		return new Array(remainWidth).join(options.tabChar);
-	}
-
-	//	:TODO: support wrapping pipe code text (e.g. ignore color codes, expand MCI codes)
-
-	function addWord() {
-		word.match(new RegExp('.{0,' + options.width + '}', 'g')).forEach(function wrd(w) {
-			//wordLen = self.getStringLength(w);
-
-			if(results.wrapped[i].length + w.length > options.width) {
-			//if(results.wrapped[i].length + wordLen > width) {
-				if(0 === i) {
-					results.firstWrapRange = { start : wordStart, end : wordStart + w.length };
-					//results.firstWrapRange = { start : wordStart, end : wordStart + wordLen };
-				}
-				//	:TODO: Must handle len of |w| itself > options.width & split how ever many times required (e.g. handle paste)
-				results.wrapped[++i] = w;
-			} else {
-				results.wrapped[i] += w;
-			}
-		});
-	}
-
-	while((m = re.exec(text)) !== null) {
-		word = text.substring(wordStart, re.lastIndex - 1);
-
-		switch(m[0].charAt(0)) {
-			case ' ' :
-				word += m[0];
-				break;
-
-			case '\t' :
-				//
-				//	Expand tab given position
-				//
-				//	Nice info here: http://c-for-dummies.com/blog/?p=424
-				//
-				if('expand' === options.tabHandling) {
-					word += expandTab(results.wrapped[i].length + word.length) + options.tabChar;
-				} else {
-					word += m[0];
-				}
-				break;
-		}
-
-		addWord();
-		wordStart = re.lastIndex + m[0].length - 1;
-	}
-
-	//
-	//	Remainder
-	//
-	word = text.substring(wordStart);
-	addWord();
-
-	return results;
-}
-
-//const input = 'Hello, |04World! This |08i|02s a test it is \x1b[20Conly a test of the emergency broadcast system. What you see is not a joke!';
-//const input = "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five enturies, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.";
-
-/*
-const iconv = require('iconv-lite');
-const input = iconv.decode(require('graceful-fs').readFileSync('/home/nuskooler/Downloads/msg_out.txt'), 'cp437');
-
-const opts = {
-	width : 80,
-};
-
-console.log(wordWrapText2(input, opts).wrapped, 'utf8')
-*/
\ No newline at end of file

From a8d5e8477982ace10a8e0047f0244aeab605439d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 16:08:35 -0700
Subject: [PATCH 0123/1013] * Fix justification 'right' vs 'left': They were
 flipped (durp!). Right aligned is now really that, etc. You may need to
 update your theme.hjson/similar!

---
 art/themes/luciano_blocktronics/theme.hjson | 14 ++++++------
 core/string_format.js                       |  6 +++---
 core/string_util.js                         | 24 ++++++++++-----------
 core/text_view.js                           |  2 +-
 core/vertical_menu_view.js                  |  2 +-
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 19f63194..433f8884 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -722,15 +722,15 @@
 					}
 					SM4: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					SM5: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					SM6: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					BT7: {
 						focusTextStyle: first lower
@@ -748,15 +748,15 @@
 					}
 					SM3: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					SM4: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					SM5: {
 						width: 14
-						justify: right
+						justify: left
 					}
 					ET6: {
 						width: 26
@@ -826,7 +826,7 @@
 					mci: {
 						SM1: {
 							width: 14
-							justify: right
+							justify: left
 							focusTextStyle: first lower
 						}
 
diff --git a/core/string_format.js b/core/string_format.js
index eba715d5..38c2047f 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -122,10 +122,10 @@ function quote(s) {
 
 function getPadAlign(align) {
 	return {
-		'<' : 'right',
-		'>' : 'left',
+		'<' : 'left',
+		'>' : 'right',
 		'^' : 'center',
-	}[align] || '<';
+	}[align] || '>';
 }
 
 function formatString(value, tokens) {
diff --git a/core/string_util.js b/core/string_util.js
index a4544754..c846fc38 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -135,23 +135,21 @@ function stylizeString(s, style) {
 	return s;
 }
 
-//	Based on http://www.webtoolkit.info/
-//	:TODO: Look into lodash padLeft, padRight, etc.
-function pad(s, len, padChar, dir, stringSGR, padSGR, useRenderLen) {
-	len				= miscUtil.valueWithDefault(len, 0);
-	padChar			= miscUtil.valueWithDefault(padChar, ' ');
-	dir				= miscUtil.valueWithDefault(dir, 'right');
-	stringSGR		= miscUtil.valueWithDefault(stringSGR, '');
-	padSGR			= miscUtil.valueWithDefault(padSGR, '');
-	useRenderLen 	= miscUtil.valueWithDefault(useRenderLen, true);
+function pad(s, len, padChar, justify, stringSGR, padSGR, useRenderLen) {
+	len				= len || 0;
+	padChar			= padChar || ' ';
+	justify			= justify || 'left';
+	stringSGR		= stringSGR || '';
+	padSGR			= padSGR || '';
+	useRenderLen 	= _.isUndefined(useRenderLen) ? true : useRenderLen;
 
 	const renderLen	= useRenderLen ? renderStringLength(s) : s.length;
 	const padlen	= len >= renderLen ? len - renderLen : 0;
 
-	switch(dir) {
+	switch(justify) {
 		case 'L' :
 		case 'left' :
-			s = padSGR + new Array(padlen).join(padChar) + stringSGR + s;
+			s = `${stringSGR}${s}${padSGR}${Array(padlen).join(padChar)}`;
 			break;
 
 		case 'C' :
@@ -160,13 +158,13 @@ function pad(s, len, padChar, dir, stringSGR, padSGR, useRenderLen) {
 			{
 				const right	= Math.ceil(padlen / 2);
 				const left	= padlen - right;
-				s			= padSGR + new Array(left + 1).join(padChar) + stringSGR + s + padSGR + new Array(right + 1).join(padChar);
+				s			= `${padSGR}${Array(left + 1).join(padChar)}${stringSGR}${s}${padSGR}${Array(right + 1).join(padChar)}`;
 			}
 			break;
 
 		case 'R' :
 		case 'right' :
-			s = stringSGR + s + padSGR + new Array(padlen).join(padChar);
+			s = `${padSGR}${Array(padlen).join(padChar)}${stringSGR}${s}`;
 			break;
 
 		default : break;
diff --git a/core/text_view.js b/core/text_view.js
index 8bd38213..ea9c352a 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -32,7 +32,7 @@ function TextView(options) {
 	}
 
 	this.fillChar			= miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
-	this.justify			= options.justify || 'right';
+	this.justify			= options.justify || 'left';
 	this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
 	this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
 
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 847b9407..9fe4cc7d 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -14,7 +14,7 @@ exports.VerticalMenuView		= VerticalMenuView;
 
 function VerticalMenuView(options) {
 	options.cursor	= options.cursor || 'hide';
-	options.justify = options.justify || 'right';	//	:TODO: default to center
+	options.justify = options.justify || 'left';
 
 	MenuView.call(this, options);
 

From d1593ed159316a26b9df8768a100f8485e0449da Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 20:30:55 -0700
Subject: [PATCH 0124/1013] * Fix bug where 'submit' property was ignored in
 favor of highest MCI ID always; Will now properly set view with 'submit' to
 true else rely on highest ID

---
 core/view_controller.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/view_controller.js b/core/view_controller.js
index 55b1bd1c..71911f28 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -228,25 +228,25 @@ function ViewController(options) {
 	};
 
 	this.applyViewConfig = function(config, cb) {
-		var highestId = 1;
-		var submitId;
-		var initialFocusId = 1;
+		let highestId = 1;
+		let submitId;
+		let initialFocusId = 1;
 
 		async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
-			var mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
+			const mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
 			if(null === mciMatch) {
 				self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
 				return;
 			}
 
-			var viewId = parseInt(mciMatch[2]);
+			const viewId = parseInt(mciMatch[2]);
 			assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]);	//	shouldn't be possible with RegExp used
 
 			if(viewId > highestId) {
 				highestId = viewId;
 			}
 
-			var view = self.getView(viewId);
+			const view = self.getView(viewId);
 
 			if(!view) {
 				self.client.log.warn( { viewId : viewId }, 'Cannot find view');
@@ -254,7 +254,7 @@ function ViewController(options) {
 				return;
 			}
 
-			var mciConf	= config.mci[mci];
+			const mciConf = config.mci[mci];
 
 			self.setViewPropertiesFromMCIConf(view, mciConf);
 
@@ -262,9 +262,13 @@ function ViewController(options) {
 				initialFocusId = viewId;
 			}
 
+			if(true === view.submit) {
+				submitId = viewId;
+			}
+
 			nextItem(null);
 		},
-		function complete(err) {
+		err => {
 			//	default to highest ID if no 'submit' entry present
 			if(!submitId) {
 				var highestIdView = self.getView(highestId);
@@ -275,7 +279,7 @@ function ViewController(options) {
 				}
 			}
 
-			cb(err, { initialFocusId : initialFocusId } );
+			return cb(err, { initialFocusId : initialFocusId } );
 		});
 	};
 

From 827d793a2dae8ef5db725af4ac57017330443c20 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 20:31:37 -0700
Subject: [PATCH 0125/1013] Add notes about left/right justify

---
 UPGRADE.md  | 5 +++++
 WHATSNEW.md | 1 +
 2 files changed, 6 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index c7651fcd..5975b96e 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -37,6 +37,11 @@ npm install
 Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
+# 0.0.8-alpha to 0.0.9-alpha
+* Development is now against Node.js 8.x LTS. Follow your standard upgrade path to update to Node 8.x before using 0.0.9-alpha.
+* The property `justify` found on various views previously had `left` and `right` values swapped (oops!); you will need to adjust any custom `theme.hjson` that use one or the other and swap them as well.
+
+
 # 0.0.7-alpha to 0.0.8-alpha
 ENiGMA 0.0.8-alpha comes with some structure changes:
 * Configuration files are defaulted to `./config`. Related, the `--config` option now points to a configuration **directory**
diff --git a/WHATSNEW.md b/WHATSNEW.md
index 594418a7..d5d5fee2 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -3,6 +3,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 
 ## 0.0.9-alpha
 * Development is now against Node.js 8.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
+* Fixed `justify` properties: `left` and `right` values were formerly swapped (oops!)
 
 
 ## 0.0.8-alpha

From 05a93cae891157d26aa72ff0fb58242ef37e6472 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 20:31:55 -0700
Subject: [PATCH 0126/1013] Default to left justification

---
 core/spinner_menu_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index e9145662..72b8b2f7 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -11,7 +11,7 @@ const assert		= require('assert');
 exports.SpinnerMenuView	= SpinnerMenuView;
 
 function SpinnerMenuView(options) {
-	options.justify	= options.justify || 'center';
+	options.justify	= options.justify || 'left';
 	options.cursor	= options.cursor || 'hide';
 
 	MenuView.call(this, options);

From 23e77dcb319e50c16a6d821c03f12d13d8eb8749 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 21:05:55 -0700
Subject: [PATCH 0127/1013] Uncommeng out a deprecated function - will fix
 later; need for now

---
 core/msg_area_list.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 96b0a51c..fcc44b23 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -99,8 +99,8 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 	}
 
 	//	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
-	/*
-	updateGeneralAreaInfoViews(areaIndex) {				
+	updateGeneralAreaInfoViews(areaIndex) {
+		/*
 		const areaInfo = self.messageAreas[areaIndex];
 
 		[ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
@@ -109,8 +109,8 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 				v.setFormatObject(areaInfo.area);
 			}
 		});
+		*/
 	}
-	*/
 
 	mciReady(mciData, cb) {
 		super.mciReady(mciData, err => {

From 78ca1e9c4f8dedfd16d0b0577bbb02889ed202de Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 21:06:16 -0700
Subject: [PATCH 0128/1013] * Ensure explicit by-MCI key forms are properly
 themed, e.g. form: { 3: { HM1: { ... }}}

---
 core/theme.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index a1045a18..5c056c49 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -122,7 +122,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 	//  Create a *clone* of menuConfig (menu.hjson) then bring in
 	//  promptConfig (prompt.hjson)
 	//
-	var mergedTheme = _.cloneDeep(menuConfig);
+	const mergedTheme = _.cloneDeep(menuConfig);
 
 	if(_.isObject(promptConfig.prompts)) {
 		mergedTheme.prompts = _.cloneDeep(promptConfig.prompts);
@@ -137,7 +137,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 	//
 	//  merge customizer to disallow immutable MCI properties
 	//
-	var mciCustomizer = function(objVal, srcVal, key) {
+	const mciCustomizer = function(objVal, srcVal, key) {
 		return IMMUTABLE_MCI_PROPERTIES.indexOf(key) > -1 ? objVal : srcVal;
 	};
 
@@ -191,30 +191,30 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 			applyThemeMciBlock(form.mci, menuTheme, formKey);
 
 		} else {
-			var menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
+			const menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
 				return k === k.toUpperCase(); //  remove anything not uppercase
 			});
 
 			menuMciCodeKeys.forEach(function mciKeyEntry(mciKey) {
-				var applyFrom;
+				let applyFrom;
 				if(_.has(menuTheme, [ mciKey, 'mci' ])) {
 					applyFrom = menuTheme[mciKey];
 				} else {
 					applyFrom = menuTheme;
 				}
 
-				applyThemeMciBlock(form[mciKey].mci, applyFrom);
+				applyThemeMciBlock(form[mciKey].mci, applyFrom, formKey);
 			});
 		}
 	}
 
 	[ 'menus', 'prompts' ].forEach(function areaEntry(sectionName) {
 		_.keys(mergedTheme[sectionName]).forEach(function menuEntry(menuName) {
-			var createdFormSection = false;
-			var mergedThemeMenu = mergedTheme[sectionName][menuName];
+			let createdFormSection = false;
+			const mergedThemeMenu = mergedTheme[sectionName][menuName];
 
 			if(_.has(theme, [ 'customization', sectionName, menuName ])) {
-				var menuTheme = theme.customization[sectionName][menuName];
+				const menuTheme = theme.customization[sectionName][menuName];
 
 				//	config block is direct assign/overwrite
 				//  :TODO: should probably be _.merge()

From 16c8fd0afc57e2bd876e06df198e9807ee9f39ed Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 15 Jan 2018 21:40:13 -0700
Subject: [PATCH 0129/1013] Fix focusTextStyle for VerticalMenuView (lightbar)

---
 core/vertical_menu_view.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 9fe4cc7d..a7e566eb 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -68,11 +68,11 @@ function VerticalMenuView(options) {
 			const focusItem = self.focusItems[index];
 			text = strUtil.stylizeString(
 				focusItem ? focusItem.text : item.text,
-				self.textStyle
+				self.focusTextStyle
 			);
 			sgr = '';
 		} else {
-			text = strUtil.stylizeString(item.text, self.textStyle);
+			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
 			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		}
 

From b1cea5edd72868771e30aed37b729863501022af Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 15:16:10 -0700
Subject: [PATCH 0130/1013] Add in reason if available, to error message

---
 core/enig_error.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/enig_error.js b/core/enig_error.js
index b0dd2335..c6eb8097 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -11,6 +11,10 @@ class EnigError extends Error {
 		this.reason		= reason;
 		this.reasonCode	= reasonCode;
 
+		if(this.reason) {
+			this.message += `: ${this.reason}`;
+		}
+
 		if(typeof Error.captureStackTrace === 'function') {
 			Error.captureStackTrace(this, this.constructor);
 		} else {

From afe0c88cfc14a515ed1c3aee7efd73910b0056ad Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 15:16:35 -0700
Subject: [PATCH 0131/1013] NetMail non-HUB fixes * Properly separate FTN
 *packet* header vs *message* header DST/SRC information * Change routes{}
 handling: These are now *require* for out-of-HUB routing such that Enig will
 know where to send messages

---
 core/ftn_mail_packet.js         |  97 ++++++++++++++++--------------
 core/message.js                 |   8 +++
 core/scanner_tossers/ftn_bso.js | 101 ++++++++++++++++----------------
 3 files changed, 113 insertions(+), 93 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index d2f003e9..1c60e1f0 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -524,13 +524,13 @@ function Packet(options) {
 		);
 	};
 
-	this.parsePacketMessages = function(packetBuffer, iterator, cb) {
+	this.parsePacketMessages = function(header, packetBuffer, iterator, cb) {
 		binary.parse(packetBuffer)
 			.word16lu('messageType')
-			.word16lu('ftn_orig_node')
-			.word16lu('ftn_dest_node')
-			.word16lu('ftn_orig_network')
-			.word16lu('ftn_dest_network')
+			.word16lu('ftn_msg_orig_node')
+			.word16lu('ftn_msg_dest_node')
+			.word16lu('ftn_msg_orig_net')
+			.word16lu('ftn_msg_dest_net')
 			.word16lu('ftn_attr_flags')
 			.word16lu('ftn_cost')
 			.scan('modDateTime', NULL_TERM_BUFFER)	//	:TODO: 20 bytes max
@@ -569,20 +569,28 @@ function Packet(options) {
 				//	contain an origin line, kludges, SAUCE in the case
 				//	of ANSI files, etc.
 				//
-				let msg = new Message( {
+				const msg = new Message( {
 					toUserName		: convMsgData.toUserName,
 					fromUserName	: convMsgData.fromUserName,
 					subject			: convMsgData.subject,
 					modTimestamp	: ftn.getDateFromFtnDateTime(convMsgData.modDateTime),
 				});
 
-				msg.meta.FtnProperty = {};
-				msg.meta.FtnProperty.ftn_orig_node		= msgData.ftn_orig_node;
-				msg.meta.FtnProperty.ftn_dest_node		= msgData.ftn_dest_node;
-				msg.meta.FtnProperty.ftn_orig_network 	= msgData.ftn_orig_network;
-				msg.meta.FtnProperty.ftn_dest_network	= msgData.ftn_dest_network;
-				msg.meta.FtnProperty.ftn_attr_flags		= msgData.ftn_attr_flags;
-				msg.meta.FtnProperty.ftn_cost			= msgData.ftn_cost;
+				//	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
+				msg.meta.FtnProperty = {
+					ftn_orig_node		: header.origNode,
+					ftn_dest_node		: header.destNode,
+					ftn_orig_network	: header.origNet,
+					ftn_dest_network	: header.destNet,
+
+					ftn_attr_flags		: msgData.ftn_attr_flags,
+					ftn_cost			: msgData.ftn_cost,
+
+					ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
+					ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
+					ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
+					ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
+				};
 
 				self.processMessageBody(msgData.message, messageBodyData => {
 					msg.message 		= messageBodyData.message;
@@ -622,11 +630,11 @@ function Packet(options) {
 
 					const nextBuf = packetBuffer.slice(read);
 					if(nextBuf.length > 0) {
-						let next = function(e) {
+						const next = function(e) {
 							if(e) {
 								cb(e);
 							} else {
-								self.parsePacketMessages(nextBuf, iterator, cb);
+								self.parsePacketMessages(header, nextBuf, iterator, cb);
 							}
 						};
 
@@ -651,6 +659,10 @@ function Packet(options) {
 			Message.FtnPropertyNames.FtnOrigPoint,
 			Message.FtnPropertyNames.FtnDestPoint,
 			Message.FtnPropertyNames.FtnAttribute,
+			Message.FtnPropertyNames.FtnMsgOrigNode,
+			Message.FtnPropertyNames.FtnMsgDestNode,
+			Message.FtnPropertyNames.FtnMsgOrigNet,
+			Message.FtnPropertyNames.FtnMsgDestNet,
 		].forEach( propName => {
 			if(message.meta.FtnProperty[propName]) {
 				message.meta.FtnProperty[propName] = parseInt(message.meta.FtnProperty[propName]) || 0;
@@ -658,6 +670,25 @@ function Packet(options) {
 		});
 	};
 
+	this.writeMessageHeader = function(message, buf) {
+		//	ensure address FtnProperties are numbers
+		self.sanatizeFtnProperties(message);
+
+		const destNode	= message.meta.FtnProperty.ftn_msg_dest_node || message.meta.FtnProperty.ftn_dest_node;
+		const destNet	= message.meta.FtnProperty.ftn_msg_dest_net || message.meta.FtnProperty.ftn_dest_network;
+
+		buf.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
+		buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
+		buf.writeUInt16LE(destNode, 4);
+		buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_network, 6);
+		buf.writeUInt16LE(destNet, 8);
+		buf.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
+		buf.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
+
+		const dateTimeBuffer = new Buffer(ftn.getDateTimeString(message.modTimestamp) + '\0');
+		dateTimeBuffer.copy(buf, 14);
+	};
+
 	this.getMessageEntryBuffer = function(message, options, cb) {
 
 		function getAppendMeta(k, m, sepChar=':') {
@@ -678,20 +709,7 @@ function Packet(options) {
 			[
 				function prepareHeaderAndKludges(callback) {
 					const basicHeader = new Buffer(34);
-
-					//	ensure address FtnProperties are numbers
-					self.sanatizeFtnProperties(message);
-
-					basicHeader.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_node, 4);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_network, 6);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_network, 8);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
-					basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
-
-					const dateTimeBuffer = new Buffer(ftn.getDateTimeString(message.modTimestamp) + '\0');
-					dateTimeBuffer.copy(basicHeader, 14);
+					self.writeMessageHeader(message, basicHeader);			
 
 					//
 					//	To, from, and subject must be NULL term'd and have max lengths as per spec.
@@ -808,17 +826,7 @@ function Packet(options) {
 
 	this.writeMessage = function(message, ws, options) {
 		let basicHeader = new Buffer(34);
-
-		basicHeader.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_node, 4);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_orig_network, 6);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_dest_network, 8);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
-		basicHeader.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
-
-		const dateTimeBuffer = new Buffer(ftn.getDateTimeString(message.modTimestamp) + '\0');
-		dateTimeBuffer.copy(basicHeader, 14);
+		self.writeMessageHeader(message, basicHeader);
 
 		ws.write(basicHeader);
 
@@ -911,7 +919,7 @@ function Packet(options) {
 	};
 
 	this.parsePacketBuffer = function(packetBuffer, iterator, cb) {
-		async.series(
+		async.waterfall(
 			[
 				function processHeader(callback) {
 					self.parsePacketHeader(packetBuffer, (err, header) => {
@@ -919,15 +927,16 @@ function Packet(options) {
 							return callback(err);
 						}
 
-						let next = function(e) {
-							callback(e);
+						const next = function(e) {
+							return callback(e, header);
 						};
 
 						iterator('header', header, next);
 					});
 				},
-				function processMessages(callback) {
+				function processMessages(header, callback) {
 					self.parsePacketMessages(
+						header,
 						packetBuffer.slice(FTN_PACKET_HEADER_SIZE),
 						iterator,
 						callback);
diff --git a/core/message.js b/core/message.js
index 7cac5c79..f99efa8a 100644
--- a/core/message.js
+++ b/core/message.js
@@ -116,8 +116,10 @@ Message.StateFlags0 = {
 };
 
 Message.FtnPropertyNames = {
+	//	packet header oriented
 	FtnOrigNode			: 'ftn_orig_node',
 	FtnDestNode			: 'ftn_dest_node',
+	//	:TODO: rename these to ftn_*_net vs network - ensure things won't break, may need mapping
 	FtnOrigNetwork		: 'ftn_orig_network',
 	FtnDestNetwork		: 'ftn_dest_network',
 	FtnAttrFlags		: 'ftn_attr_flags',
@@ -127,6 +129,12 @@ Message.FtnPropertyNames = {
 	FtnOrigPoint		: 'ftn_orig_point',
 	FtnDestPoint		: 'ftn_dest_point',
 
+	//	message header oriented
+	FtnMsgOrigNode		: 'ftn_msg_orig_node',
+	FtnMsgDestNode		: 'ftn_msg_dest_node',
+	FtnMsgOrigNet		: 'ftn_msg_orig_net',
+	FtnMsgDestNet		: 'ftn_msg_dest_net',
+
 	FtnAttribute		: 'ftn_attribute',
 
 	FtnTearLine			: 'ftn_tear_line',		//	http://ftsc.org/docs/fts-0004.001
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 20ab435f..36ee815f 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -306,12 +306,26 @@ function FTNMessageScanTossModule() {
 		//
 		const localAddress = new Address(options.network.localAddress);	//	ensure we have an Address obj not a string version
 
+		//	:TODO: create Address.toMeta() / similar
 		message.meta.FtnProperty = message.meta.FtnProperty || {};
 		message.meta.FtnKludge = message.meta.FtnKludge || {};
 
-		message.meta.FtnProperty.ftn_orig_node		= localAddress.node;
-		message.meta.FtnProperty.ftn_orig_network	= localAddress.net;
-		message.meta.FtnProperty.ftn_cost			= 0;
+		message.meta.FtnProperty.ftn_orig_node			= localAddress.node;
+		message.meta.FtnProperty.ftn_orig_network		= localAddress.net;
+		message.meta.FtnProperty.ftn_cost				= 0;
+		message.meta.FtnProperty.ftn_msg_orig_node		= localAddress.node;
+		message.meta.FtnProperty.ftn_msg_orig_net	= localAddress.net;
+
+		const destAddress = options.routeAddress || options.destAddress;
+		message.meta.FtnProperty.ftn_dest_node		= destAddress.node;
+		message.meta.FtnProperty.ftn_dest_network	= destAddress.net;
+
+		if(destAddress.zone) {
+			message.meta.FtnProperty.ftn_dest_zone	= destAddress.zone;
+		}
+		if(destAddress.point) {
+			message.meta.FtnProperty.ftn_dest_point	= destAddress.point;
+		}
 
 		//	tear line and origin can both go in EchoMail & NetMail
 		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
@@ -320,9 +334,11 @@ function FTNMessageScanTossModule() {
 		let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
 
 		if(self.isNetMailMessage(message)) {
-			//	These should be set for Private/NetMail already
-			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_node)));
-			assert(_.isNumber(parseInt(message.meta.FtnProperty.ftn_dest_network)));
+			//
+			//	Set route and message destination properties -- they may differ
+			//
+			message.meta.FtnProperty.ftn_msg_dest_node		= options.destAddress.node;
+			message.meta.FtnProperty.ftn_msg_dest_net	= options.destAddress.net;
 
 			ftnAttribute |= ftnMailPacket.Packet.Attribute.Private;
 
@@ -353,10 +369,6 @@ function FTNMessageScanTossModule() {
 				message.meta.FtnKludge.TOPT = options.destAddress.point;
 			}
 		} else {
-			//	We need to set some destination info for EchoMail
-			message.meta.FtnProperty.ftn_dest_node		= options.destAddress.node;
-			message.meta.FtnProperty.ftn_dest_network	= options.destAddress.net;
-
 			//
 			//	Set appropriate attribute flag for export type
 			//
@@ -573,7 +585,7 @@ function FTNMessageScanTossModule() {
 
 					const packetHeader = new ftnMailPacket.PacketHeader(
 						exportOpts.network.localAddress,
-						exportOpts.destAddress,
+						exportOpts.routeAddress,
 						exportOpts.nodeConfig.packetType
 					);
 
@@ -801,57 +813,44 @@ function FTNMessageScanTossModule() {
 		return _.find(routes, (route, addrWildcard) => {
 			return dstAddr.isPatternMatch(addrWildcard);
 		});
-
-		/*
-		const route = _.find(routes, (route, addrWildcard) => {
-			return dstAddr.isPatternMatch(addrWildcard);
-		});
-
-		if(route && route.address) {
-			return Address.fromString(route.address);
-		}
-		*/
 	};
 
-	this.getAcceptableNetMailNetworkInfoFromAddress = function(dstAddr, cb) {
+	this.getNetMailRouteInfoFromAddress = function(destAddress, cb) {
 		//
-		//	Attempt to find an acceptable network configuration using the following
-		//	lookup order (most to least explicit config):
+		//	Attempt to find route information for |destAddress|:
 		//
 		//	1) Routes: messageNetworks.ftn.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send may not be where dstAddress is (it's routed!)
+		//		- Where we send may not be where destAddress is (it's routed!)
 		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send is direct to dstAddr
+		//		- Where we send is direct to destAddress
 		//
 		//	In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
 		//	falling back to Config.scannerTossers.ftn_bso.defaultNetwork
 		//
-		const route = this.getNetMailRoute(dstAddr);
+		const route = this.getNetMailRoute(destAddress);
 
 		let routeAddress;
 		let networkName;
+		let isRouted;
 		if(route) {
 			routeAddress	= Address.fromString(route.address);
 			networkName		= route.network;
+			isRouted		= true;
 		} else {
-			routeAddress = dstAddr;
+			routeAddress	= destAddress;
+			isRouted		= false;
 		}
 
-		networkName = networkName || 
-			this.getNetworkNameByAddressPattern(`${routeAddress.zone}:${routeAddress.net}/*`) ||
-			Config.scannerTossers.ftn_bso.defaultNetwork
-			;
+		networkName = networkName || this.getNetworkNameByAddress(routeAddress);
 
 		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
 			return routeAddress.isPatternMatch(nodeAddrWildcard);
-		}) || {
-			packetType	: '2+',
-			encoding	: Config.scannerTossers.ftn_bso.packetMsgEncoding,
-		};
+		}) || { packetType : '2+', encoding	: Config.scannerTossers.ftn_bso.packetMsgEncoding };
 
+		//	we should never be failing here; we may just be using defaults.
 		return cb(
-			config ? null : Errors.DoesNotExist(`No configuration found for ${dstAddr.toString()}`),
-			config, routeAddress, networkName
+			networkName ? null : Errors.DoesNotExist(`No NetMail route for ${destAddress.toString()}`),
+			{ destAddress, routeAddress, networkName, config, isRouted }
 		);
 	};
 
@@ -876,21 +875,22 @@ function FTNMessageScanTossModule() {
 					function discoverUplink(callback) {
 						const dstAddr = new Address(message.meta.System[Message.SystemMetaNames.RemoteToUser]);
 
-						return self.getAcceptableNetMailNetworkInfoFromAddress(dstAddr, (err, config, routeAddress, networkName) => {
+						self.getNetMailRouteInfoFromAddress(dstAddr, (err, routeInfo) => {
 							if(err) {
 								return callback(err);
 							}
 
-							exportOpts.nodeConfig	= config;
-							exportOpts.destAddress	= routeAddress;
-							exportOpts.fileCase		= config.fileCase || 'lower';
-							exportOpts.network		= Config.messageNetworks.ftn.networks[networkName];
-							exportOpts.networkName	= networkName;
+							exportOpts.nodeConfig	= routeInfo.config;
+							exportOpts.destAddress	= dstAddr;
+							exportOpts.routeAddress	= routeInfo.routeAddress;
+							exportOpts.fileCase		= routeInfo.config.fileCase || 'lower';
+							exportOpts.network		= Config.messageNetworks.ftn.networks[routeInfo.networkName];
+							exportOpts.networkName	= routeInfo.networkName;
 							exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
-							exportOpts.exportType	= self.getExportType(config);
+							exportOpts.exportType	= self.getExportType(routeInfo.config);
 
 							if(!exportOpts.network) {
-								return callback(Errors.DoesNotExist(`No configuration found for network ${networkName}`));
+								return callback(Errors.DoesNotExist(`No configuration found for network ${routeInfo.networkName}`));
 							}
 
 							return callback(null);
@@ -937,12 +937,15 @@ function FTNMessageScanTossModule() {
 				],
 				err => {
 					if(err) {
-						Log.warn( { error :err.message }, 'Error exporting message' );
+						Log.warn( { error : err.message }, 'Error exporting message' );
 					}
 					return nextMessageOrUuid(null);
 				}
 			);
 		}, err => {
+			if(err) {
+				Log.warn( { error : err.message }, 'Error(s) during NetMail export');
+			}
 			return cb(err);
 		});
 	};
@@ -962,6 +965,7 @@ function FTNMessageScanTossModule() {
 				fileCase		: self.moduleConfig.nodes[nodeConfigKey].fileCase || 'lower',
 			};
 
+			
 			if(_.isString(exportOpts.network.localAddress)) {
 				exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
 			}
@@ -2031,8 +2035,7 @@ function FTNMessageScanTossModule() {
 	this.isNetMailMessage = function(message) {
 		return message.isPrivate() &&
 			null === _.get(message, 'meta.System.LocalToUserID', null) &&
-			Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null)
-			;
+			Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null);
 	};
 }
 

From 70a2bc5160a6c25a0f14f50fdbb9ed16738f08ff Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 18:32:15 -0700
Subject: [PATCH 0132/1013] Rework BSO-style flow file generation * Add point
 address NNNNnnnn.pnt sub dir support * Use *route* address in case of
 non-direct destinations

---
 core/scanner_tossers/ftn_bso.js | 50 ++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 36ee815f..6a5c0c60 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -221,7 +221,13 @@ function FTNMessageScanTossModule() {
 	};
 
 	this.getOutgoingFlowFileName = function(basePath, destAddress, flowType, exportType, fileCase) {
-		let basename;
+		//
+		//	Refs
+		//	* http://ftsc.org/docs/fts-5005.003
+		//	* http://wiki.synchro.net/ref:fidonet_files#flow_files
+		//
+		let controlFileBaseName;
+		let pointDir;
 
 		const ext = self.getOutgoingFlowFileExtension(
 			destAddress,
@@ -230,32 +236,50 @@ function FTNMessageScanTossModule() {
 			fileCase
 		);
 
-		if(destAddress.point) {
+		const netComponent	= `0000${destAddress.net.toString(16)}`.substr(-4);
+		const nodeComponent	= `0000${destAddress.node.toString(16)}`.substr(-4);
 
+		if(destAddress.point) {
+			//	point's go in an extra subdir, e.g. outbound/NNNNnnnn.pnt/00000001.pnt (for a point of 1)
+			pointDir			= `${netComponent}${nodeComponent}.pnt`;
+			controlFileBaseName = `00000000${destAddress.point.toString(16)}`.substr(-8);
 		} else {
+			pointDir = '';
+
 			//
 			//	Use |destAddress| nnnnNNNN.??? where nnnn is dest net and NNNN is dest
 			//	node. This seems to match what Mystic does
 			//
-			basename =
-				`0000${destAddress.net.toString(16)}`.substr(-4) +
-				`0000${destAddress.node.toString(16)}`.substr(-4);
+			controlFileBaseName = `${netComponent}${nodeComponent}`;
 		}
 
+		//
+		//	From FTS-5005.003: "Lower case filenames are prefered if supported by the file system."
+		//	...but we let the user override.
+		//
 		if('upper' === fileCase) {
-			basename = basename.toUpperCase();
+			controlFileBaseName	= controlFileBaseName.toUpperCase();
+			pointDir			= pointDir.toUpperCase();
 		}
 
-		return paths.join(basePath, `${basename}.${ext}`);
+		return paths.join(basePath, pointDir, `${controlFileBaseName}.${ext}`);
 	};
 
 	this.flowFileAppendRefs = function(filePath, fileRefs, directive, cb) {
-		const appendLines = fileRefs.reduce( (content, ref) => {
-			return content + `${directive}${ref}\n`;
-		}, '');
+		//
+		//	We have to ensure the *directory* of |filePath| exists here esp.
+		//	for cases such as point destinations where a subdir may be
+		//	present in the path that doesn't yet exist.
+		//
+		const flowFileDir = paths.dirname(filePath);
+		fse.mkdirs(flowFileDir, () => {	//	note not checking err; let's try appendFile
+			const appendLines = fileRefs.reduce( (content, ref) => {
+				return content + `${directive}${ref}\n`;
+			}, '');
 
-		fs.appendFile(filePath, appendLines, err => {
-			cb(err);
+			fs.appendFile(filePath, appendLines, err => {
+				return cb(err);
+			});
 		});
 	};
 
@@ -915,7 +939,7 @@ function FTNMessageScanTossModule() {
 					function prepareFloFile(callback) {
 						const flowFilePath = self.getOutgoingFlowFileName(
 							exportOpts.outgoingDir,
-							exportOpts.destAddress,
+							exportOpts.routeAddress,
 							'ref',
 							exportOpts.exportType,
 							exportOpts.fileCase

From 5caf7a9fce3a3b3fcc5585e7cac71a3a8c34f3e2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 18:47:19 -0700
Subject: [PATCH 0133/1013] Move NetMail routes to scannerTossers: { ftn_bso: {
 ... } } where it belongs in config.hjson

---
 core/scanner_tossers/ftn_bso.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 6a5c0c60..a24024ee 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -827,9 +827,9 @@ function FTNMessageScanTossModule() {
 
 	this.getNetMailRoute = function(dstAddr) {
 		//
-		//	messageNetworks.ftn.netMail.routes{} full|wildcard -> full adddress lookup
+		//	Route full|wildcard -> full adddress/network lookup
 		//
-		const routes = _.get(Config, 'messageNetworks.ftn.netMail.routes');
+		const routes = _.get(Config, 'scannerTossers.ftn_bso.netMail.routes');
 		if(!routes) {
 			return;
 		}
@@ -843,7 +843,7 @@ function FTNMessageScanTossModule() {
 		//
 		//	Attempt to find route information for |destAddress|:
 		//
-		//	1) Routes: messageNetworks.ftn.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
+		//	1) Routes: scannerTossers.ftn_bso.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
 		//		- Where we send may not be where destAddress is (it's routed!)
 		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
 		//		- Where we send is direct to destAddress

From bc55317a4b979517c2640377b3588c3873ea2fa4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 19:30:10 -0700
Subject: [PATCH 0134/1013] Fix drawing when focus items set - we should not
 attempt to stylize!

---
 core/vertical_menu_view.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index a7e566eb..5b27c36d 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -66,10 +66,7 @@ function VerticalMenuView(options) {
 		let sgr;
 		if(item.focused && self.hasFocusItems()) {
 			const focusItem = self.focusItems[index];
-			text = strUtil.stylizeString(
-				focusItem ? focusItem.text : item.text,
-				self.focusTextStyle
-			);
+			text = focusItem ? focusItem.text : item.text;
 			sgr = '';
 		} else {
 			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);

From c1f971d2d997a2664229fdb02c5c72b460084acd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 19:30:21 -0700
Subject: [PATCH 0135/1013] Code readability

---
 core/bbs_list.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/bbs_list.js b/core/bbs_list.js
index 5c81f478..74c792c6 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -150,7 +150,10 @@ exports.getModule = class BBSListModule extends MenuModule {
 				self.database.run(
 					`INSERT INTO bbs_list (bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes) 
 					VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
-					[ formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www, formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes ],
+					[
+						formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www, 
+						formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes
+					],
 					err => {
 						if(err) {
 							self.client.log.error( { err : err }, 'Error adding to BBS list');

From 8bfad971a15ff2a348216e8a74439f4b37f9ca9d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 21 Jan 2018 11:58:19 -0700
Subject: [PATCH 0136/1013] Finish conversion from 'binary' -> 'binary-parser'
 * FTN packets * SAUCE

---
 core/ftn_mail_packet.js      | 475 +++++++++++++++++++----------------
 core/sauce.js                | 180 ++++++-------
 core/servers/login/telnet.js | 271 +++++++++++---------
 core/string_util.js          |   2 +-
 package.json                 |   2 +-
 5 files changed, 506 insertions(+), 424 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 1c60e1f0..bb72c40a 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -8,10 +8,11 @@ const Address		= require('./ftn_address.js');
 const strUtil		= require('./string_util.js');
 const Log			= require('./logger.js').log;
 const ansiPrep		= require('./ansi_prep.js');
+const Errors		= require('./enig_error.js').Errors;
 
 const _				= require('lodash');
 const assert		= require('assert');
-const binary		= require('binary');
+const { Parser }	= require('binary-parser');
 const fs			= require('graceful-fs');
 const async			= require('async');
 const iconv			= require('iconv-lite');
@@ -23,7 +24,6 @@ const FTN_PACKET_HEADER_SIZE	= 58;	//	fixed header size
 const FTN_PACKET_HEADER_TYPE	= 2;
 const FTN_PACKET_MESSAGE_TYPE	= 2;
 const FTN_PACKET_BAUD_TYPE_2_2	= 2;
-const NULL_TERM_BUFFER			= new Buffer( [ 0x00 ] );
 
 //	SAUCE magic header + version ("00")
 const FTN_MESSAGE_SAUCE_HEADER = new Buffer('SAUCE00');
@@ -173,108 +173,103 @@ function Packet(options) {
 	this.parsePacketHeader = function(packetBuffer, cb) {
 		assert(Buffer.isBuffer(packetBuffer));
 
-		if(packetBuffer.length < FTN_PACKET_HEADER_SIZE) {
-			cb(new Error('Buffer too small'));
-			return;
+		let packetHeader;
+		try {
+			packetHeader = new Parser()
+				.uint16le('origNode')
+				.uint16le('destNode')
+				.uint16le('year')
+				.uint16le('month')
+				.uint16le('day')
+				.uint16le('hour')
+				.uint16le('minute')
+				.uint16le('second')
+				.uint16le('baud')
+				.uint16le('packetType')
+				.uint16le('origNet')
+				.uint16le('destNet')
+				.int8('prodCodeLo')
+				.int8('prodRevLo')	//	aka serialNo
+				.buffer('password', { length : 8 })	//	can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
+				.uint16le('origZone')
+				.uint16le('destZone')
+				//
+				//	The following is "filler" in FTS-0001, specifics in
+				//	FSC-0045 and FSC-0048
+				//
+				.uint16le('auxNet')
+				.uint16le('capWordValidate')
+				.int8('prodCodeHi')
+				.int8('prodRevHi')
+				.uint16le('capWord')
+				.uint16le('origZone2')
+				.uint16le('destZone2')
+				.uint16le('origPoint')
+				.uint16le('destPoint')
+				.uint32le('prodData')
+				.parse(packetBuffer);
+		} catch(e) {
+			return Errors.Invalid(`Unable to parse FTN packet header: ${e.message}`);
+		}
+
+		//	Convert password from NULL padded array to string
+		packetHeader.password = strUtil.stringFromNullTermBuffer(packetHeader.password, 'CP437');
+
+		if(FTN_PACKET_HEADER_TYPE !== packetHeader.packetType) {
+			return cb(Errors.Invalid(`Unsupported FTN packet header type: ${packetHeader.packetType}`));
 		}
 
 		//
-		//	Start out reading as if this is a FSC-0048 2+ packet
+		//	What kind of packet do we really have here?
 		//
-		binary.parse(packetBuffer)
-			.word16lu('origNode')
-			.word16lu('destNode')
-			.word16lu('year')
-			.word16lu('month')
-			.word16lu('day')
-			.word16lu('hour')
-			.word16lu('minute')
-			.word16lu('second')
-			.word16lu('baud')
-			.word16lu('packetType')
-			.word16lu('origNet')
-			.word16lu('destNet')
-			.word8('prodCodeLo')
-			.word8('prodRevLo')	//	aka serialNo
-			.buffer('password', 8)	//	null padded C style string
-			.word16lu('origZone')
-			.word16lu('destZone')
+		//	:TODO: adjust values based on version discovered
+		if(FTN_PACKET_BAUD_TYPE_2_2 === packetHeader.baud) {
+			packetHeader.version = '2.2';
+
+			//	See FSC-0045
+			packetHeader.origPoint	= packetHeader.year;
+			packetHeader.destPoint	= packetHeader.month;
+
+			packetHeader.destDomain = packetHeader.origZone2;
+			packetHeader.origDomain	= packetHeader.auxNet;
+		} else {
 			//
-			//	The following is "filler" in FTS-0001, specifics in
-			//	FSC-0045 and FSC-0048
+			//	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
 			//
-			.word16lu('auxNet')
-			.word16lu('capWordValidate')
-			.word8('prodCodeHi')
-			.word8('prodRevHi')
-			.word16lu('capWord')
-			.word16lu('origZone2')
-			.word16lu('destZone2')
-			.word16lu('origPoint')
-			.word16lu('destPoint')
-			.word32lu('prodData')
-			.tap(packetHeader => {
-				//	Convert password from NULL padded array to string
-				//packetHeader.password = ftn.stringFromFTN(packetHeader.password);
-				packetHeader.password = strUtil.stringFromNullTermBuffer(packetHeader.password, 'CP437');
+			const capWordValidateSwapped =
+				((packetHeader.capWordValidate & 0xff) << 8) |
+				((packetHeader.capWordValidate >> 8) & 0xff);
 
-				if(FTN_PACKET_HEADER_TYPE !== packetHeader.packetType) {
-					cb(new Error('Unsupported header type: ' + packetHeader.packetType));
-					return;
+			if(capWordValidateSwapped === packetHeader.capWord &&
+				0 != packetHeader.capWord &&
+				packetHeader.capWord & 0x0001)
+			{
+				packetHeader.version = '2+';
+
+				//	See FSC-0048
+				if(-1 === packetHeader.origNet) {
+					packetHeader.origNet = packetHeader.auxNet;
 				}
+			} else {
+				packetHeader.version = '2';
 
-				//
-				//	What kind of packet do we really have here?
-				//
-				//	:TODO: adjust values based on version discovered
-				if(FTN_PACKET_BAUD_TYPE_2_2 === packetHeader.baud) {
-					packetHeader.version = '2.2';
+				//	:TODO: should fill bytes be 0?
+			}
+		}
 
-					//	See FSC-0045
-					packetHeader.origPoint	= packetHeader.year;
-					packetHeader.destPoint	= packetHeader.month;
+		packetHeader.created = moment({
+			year 	: packetHeader.year,
+			month	: packetHeader.month - 1,	//	moment uses 0 indexed months
+			date	: packetHeader.day,
+			hour	: packetHeader.hour,
+			minute	: packetHeader.minute,
+			second	: packetHeader.second
+		});
 
-					packetHeader.destDomain = packetHeader.origZone2;
-					packetHeader.origDomain	= packetHeader.auxNet;
-				} else {
-					//
-					//	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
-					//
-					const capWordValidateSwapped =
-						((packetHeader.capWordValidate & 0xff) << 8) |
-						((packetHeader.capWordValidate >> 8) & 0xff);
+		const ph = new PacketHeader();
+		_.assign(ph, packetHeader);
 
-					if(capWordValidateSwapped === packetHeader.capWord &&
-						0 != packetHeader.capWord &&
-						packetHeader.capWord & 0x0001)
-					{
-						packetHeader.version = '2+';
-
-						//	See FSC-0048
-						if(-1 === packetHeader.origNet) {
-							packetHeader.origNet = packetHeader.auxNet;
-						}
-					} else {
-						packetHeader.version = '2';
-
-						//	:TODO: should fill bytes be 0?
-					}
-				}
-
-				packetHeader.created = moment({
-					year 	: packetHeader.year,
-					month	: packetHeader.month - 1,	//	moment uses 0 indexed months
-					date	: packetHeader.day,
-					hour	: packetHeader.hour,
-					minute	: packetHeader.minute,
-					second	: packetHeader.second
-				});
-
-				let ph = new PacketHeader();
-				_.assign(ph, packetHeader);
-
-				cb(null, ph);
-			});
+		return cb(null, ph);
 	};
 
 	this.getPacketHeaderBuffer = function(packetHeader) {
@@ -454,21 +449,30 @@ function Packet(options) {
 					//	:TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
 					const FTN_CHRS_PREFIX 	= new Buffer( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
 					const FTN_CHRS_SUFFIX	= new Buffer( [ 0x0d ] );
-					binary.parse(messageBodyBuffer)
-						.scan('prefix', FTN_CHRS_PREFIX)
-						.scan('content', FTN_CHRS_SUFFIX)
-						.tap(chrsData => {
-							if(chrsData.prefix && chrsData.content && chrsData.content.length > 0) {
-								const chrs = iconv.decode(chrsData.content, 'CP437');
-								const chrsEncoding = ftn.getEncodingFromCharacterSetIdentifier(chrs);
-								if(chrsEncoding) {
-									encoding = chrsEncoding;
-								}
-								callback(null);
-							} else {
-								callback(null);
-							}
-						});
+
+					let chrsPrefixIndex = messageBodyBuffer.indexOf(FTN_CHRS_PREFIX);
+					if(chrsPrefixIndex < 0) {
+						return callback(null);
+					}
+
+					chrsPrefixIndex += FTN_CHRS_PREFIX.length;
+
+					const chrsEndIndex = messageBodyBuffer.indexOf(FTN_CHRS_SUFFIX, chrsPrefixIndex);
+					if(chrsEndIndex < 0) {
+						return callback(null);
+					}
+
+					let chrsContent = messageBodyBuffer.slice(chrsPrefixIndex, chrsEndIndex);
+					if(0 === chrsContent.length) {
+						return callback(null);
+					}
+
+					chrsContent = iconv.decode(chrsContent, 'CP437');
+					const chrsEncoding = ftn.getEncodingFromCharacterSetIdentifier(chrsContent);
+					if(chrsEncoding) {
+						encoding = chrsEncoding;
+					}
+					return callback(null);
 				},
 				function extractMessageData(callback) {
 					//
@@ -525,125 +529,160 @@ function Packet(options) {
 	};
 
 	this.parsePacketMessages = function(header, packetBuffer, iterator, cb) {
-		binary.parse(packetBuffer)
-			.word16lu('messageType')
-			.word16lu('ftn_msg_orig_node')
-			.word16lu('ftn_msg_dest_node')
-			.word16lu('ftn_msg_orig_net')
-			.word16lu('ftn_msg_dest_net')
-			.word16lu('ftn_attr_flags')
-			.word16lu('ftn_cost')
-			.scan('modDateTime', NULL_TERM_BUFFER)	//	:TODO: 20 bytes max
-			.scan('toUserName', NULL_TERM_BUFFER)	//	:TODO: 36 bytes max
-			.scan('fromUserName', NULL_TERM_BUFFER)	//	:TODO: 36 bytes max
-			.scan('subject', NULL_TERM_BUFFER)		//	:TODO: 72 bytes max6
-			.scan('message', NULL_TERM_BUFFER)
-			.tap(function tapped(msgData) {	//	no arrow function; want classic this
-				if(!msgData.messageType) {
-					//	end marker -- no more messages
-					return cb(null);
+		//
+		//	Check for end-of-messages marker up front before parse so we can easily
+		//	tell the difference between end and bad header
+		//
+		if(packetBuffer.length < 3) {
+			const peek = packetBuffer.slice(0, 2);
+			if(peek.equals(Buffer.from([ 0x00 ])) || peek.equals(Buffer.from( [ 0x00, 0x00 ]))) {
+				//	end marker - no more messages
+				return cb(null);
+			}
+			//	else fall through & hit exception below to log error
+		}
+
+		let msgData;
+		try {
+			msgData = new Parser()
+				.uint16le('messageType')
+				.uint16le('ftn_msg_orig_node')
+				.uint16le('ftn_msg_dest_node')
+				.uint16le('ftn_msg_orig_net')
+				.uint16le('ftn_msg_dest_net')
+				.uint16le('ftn_attr_flags')
+				.uint16le('ftn_cost')
+				//	:TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
+				.array('modDateTime', {
+					type		: 'uint8',
+					readUntil	: b => 0x00 === b,
+				})
+				.array('toUserName', {
+					type		: 'uint8',
+					readUntil	: b => 0x00 === b,
+				})
+				.array('fromUserName', {
+					type		: 'uint8',
+					readUntil	: b => 0x00 === b,
+				})
+				.array('subject', {
+					type		: 'uint8',
+					readUntil	: b => 0x00 === b,
+				})
+				.array('message', {
+					type		: 'uint8',
+					readUntil	: b => 0x00 === b,
+				})
+				.parse(packetBuffer);
+		} catch(e) {
+			return cb(Errors.Invalid(`Failed to parse FTN message header: ${e.message}`));
+		}
+
+		if(FTN_PACKET_MESSAGE_TYPE != msgData.messageType) {
+			return cb(Errors.Invalid(`Unsupported FTN message type: ${msgData.messageType}`));
+		}
+
+		//
+		//	Convert null terminated arrays to strings
+		//
+		[ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
+			msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
+		});
+
+		//	Technically the following fields have length limits as per fts-0001.016:
+		//	* modDateTime	: 20 bytes
+		//	* toUserName	: 36 bytes
+		//	* fromUserName	: 36 bytes
+		//	* subject		: 72 bytes
+
+		//
+		//	The message body itself is a special beast as it may
+		//	contain an origin line, kludges, SAUCE in the case
+		//	of ANSI files, etc.
+		//				
+		const msg = new Message( {
+			toUserName		: msgData.toUserName,
+			fromUserName	: msgData.fromUserName,
+			subject			: msgData.subject,
+			modTimestamp	: ftn.getDateFromFtnDateTime(msgData.modDateTime),
+		});
+
+		//	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
+		msg.meta.FtnProperty = {
+			ftn_orig_node		: header.origNode,
+			ftn_dest_node		: header.destNode,
+			ftn_orig_network	: header.origNet,
+			ftn_dest_network	: header.destNet,
+
+			ftn_attr_flags		: msgData.ftn_attr_flags,
+			ftn_cost			: msgData.ftn_cost,
+
+			ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
+			ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
+			ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
+			ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
+		};
+
+		self.processMessageBody(msgData.message, messageBodyData => {
+			msg.message 		= messageBodyData.message;
+			msg.meta.FtnKludge	= messageBodyData.kludgeLines;
+
+			if(messageBodyData.tearLine) {
+				msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
+
+				if(self.options.keepTearAndOrigin) {
+					msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
 				}
+			}
 
-				if(FTN_PACKET_MESSAGE_TYPE != msgData.messageType) {
-					return cb(new Error('Unsupported message type: ' + msgData.messageType));
+			if(messageBodyData.seenBy.length > 0) {
+				msg.meta.FtnProperty.ftn_seen_by = messageBodyData.seenBy;
+			}
+
+			if(messageBodyData.area) {
+				msg.meta.FtnProperty.ftn_area = messageBodyData.area;
+			}
+
+			if(messageBodyData.originLine) {
+				msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
+
+				if(self.options.keepTearAndOrigin) {
+					msg.message += `${messageBodyData.originLine}\r\n`;
 				}
+			}
 
-				const read =
-					14 +								//	fixed header size
-					msgData.modDateTime.length + 1 +
-					msgData.toUserName.length + 1 +
-					msgData.fromUserName.length + 1 +
-					msgData.subject.length + 1 +
-					msgData.message.length + 1;
+			//
+			//	If we have a UTC offset kludge (e.g. TZUTC) then update
+			//	modDateTime with it
+			//
+			if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
+				msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
+			}
 
-				//
-				//	Convert null terminated arrays to strings
-				//
-				let convMsgData = {};
-				[ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
-					convMsgData[k] = iconv.decode(msgData[k], 'CP437');
-				});
+			//	:TODO: Parser should give is this info:
+			const bytesRead =
+				14 +								//	fixed header size
+				msgData.modDateTime.length + 1 +	//	+1 = NULL
+				msgData.toUserName.length + 1 +		//	+1 = NULL
+				msgData.fromUserName.length + 1 +	//	+1 = NULL
+				msgData.subject.length + 1 +		//	+1 = NULL
+				msgData.message.length;				//	includes NULL
 
-				//
-				//	The message body itself is a special beast as it may
-				//	contain an origin line, kludges, SAUCE in the case
-				//	of ANSI files, etc.
-				//
-				const msg = new Message( {
-					toUserName		: convMsgData.toUserName,
-					fromUserName	: convMsgData.fromUserName,
-					subject			: convMsgData.subject,
-					modTimestamp	: ftn.getDateFromFtnDateTime(convMsgData.modDateTime),
-				});
-
-				//	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
-				msg.meta.FtnProperty = {
-					ftn_orig_node		: header.origNode,
-					ftn_dest_node		: header.destNode,
-					ftn_orig_network	: header.origNet,
-					ftn_dest_network	: header.destNet,
-
-					ftn_attr_flags		: msgData.ftn_attr_flags,
-					ftn_cost			: msgData.ftn_cost,
-
-					ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
-					ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
-					ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
-					ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
+			const nextBuf = packetBuffer.slice(bytesRead);
+			if(nextBuf.length > 0) {
+				const next = function(e) {
+					if(e) {
+						cb(e);
+					} else {
+						self.parsePacketMessages(header, nextBuf, iterator, cb);
+					}
 				};
 
-				self.processMessageBody(msgData.message, messageBodyData => {
-					msg.message 		= messageBodyData.message;
-					msg.meta.FtnKludge	= messageBodyData.kludgeLines;
-
-					if(messageBodyData.tearLine) {
-						msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
-
-						if(self.options.keepTearAndOrigin) {
-							msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
-						}
-					}
-
-					if(messageBodyData.seenBy.length > 0) {
-						msg.meta.FtnProperty.ftn_seen_by = messageBodyData.seenBy;
-					}
-
-					if(messageBodyData.area) {
-						msg.meta.FtnProperty.ftn_area = messageBodyData.area;
-					}
-
-					if(messageBodyData.originLine) {
-						msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
-
-						if(self.options.keepTearAndOrigin) {
-							msg.message += `${messageBodyData.originLine}\r\n`;
-						}
-					}
-
-					//
-					//	If we have a UTC offset kludge (e.g. TZUTC) then update
-					//	modDateTime with it
-					//
-					if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
-						msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
-					}
-
-					const nextBuf = packetBuffer.slice(read);
-					if(nextBuf.length > 0) {
-						const next = function(e) {
-							if(e) {
-								cb(e);
-							} else {
-								self.parsePacketMessages(header, nextBuf, iterator, cb);
-							}
-						};
-
-						iterator('message', msg, next);
-					} else {
-						cb(null);
-					}
-				});
-			});
+				iterator('message', msg, next);
+			} else {
+				cb(null);
+			}
+		});
 	};
 
 	this.sanatizeFtnProperties = function(message) {
diff --git a/core/sauce.js b/core/sauce.js
index b976450b..9ee75b47 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -1,8 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-var binary				= require('binary');
-var iconv				= require('iconv-lite');
+const Errors		= require('./enig_error.js').Errors;
+
+//	deps
+const iconv			= require('iconv-lite');
+const { Parser }	= require('binary-parser');
 
 exports.readSAUCE		= readSAUCE;
 
@@ -25,103 +28,107 @@ const SAUCE_VALID_DATA_TYPES = [0, 1, 2, 3, 4, 5, 6, 7, 8 ];
 
 function readSAUCE(data, cb) {
 	if(data.length < SAUCE_SIZE) {
-		cb(new Error('No SAUCE record present'));
-		return;
+		return cb(Errors.DoesNotExist('No SAUCE record present'));
 	}
 
-	var offset		= data.length - SAUCE_SIZE;
-	var sauceRec	= data.slice(offset);
+	let sauceRec;
+	try {
+		sauceRec = new Parser()
+			.buffer('id', { length : 5 } )
+			.buffer('version', { length : 2 } )
+			.buffer('title', { length: 35 } )
+			.buffer('author', { length : 20 } )
+			.buffer('group', { length: 20 } )
+			.buffer('date', { length: 8 } )
+			.uint32le('fileSize')
+			.int8('dataType')
+			.int8('fileType')
+			.uint16le('tinfo1')
+			.uint16le('tinfo2')
+			.uint16le('tinfo3')
+			.uint16le('tinfo4')
+			.int8('numComments')
+			.int8('flags')
+			//	:TODO: does this need to be optional?
+			.buffer('tinfos', { length: 22 } )	//	SAUCE 00.5
+			.parse(data.slice(data.length - SAUCE_SIZE));
+	} catch(e) {
+		return cb(Errors.Invalid('Invalid SAUCE record'));
+	}
 
-	binary.parse(sauceRec)
-		.buffer('id', 5)
-		.buffer('version', 2)
-		.buffer('title', 35)
-		.buffer('author', 20)
-		.buffer('group', 20)
-		.buffer('date', 8)
-		.word32lu('fileSize')
-		.word8('dataType')
-		.word8('fileType')
-		.word16lu('tinfo1')
-		.word16lu('tinfo2')
-		.word16lu('tinfo3')
-		.word16lu('tinfo4')
-		.word8('numComments')
-		.word8('flags')
-		.buffer('tinfos', 22)	//	SAUCE 00.5
-		.tap(function onVars(vars) {
 
-			if(!SAUCE_ID.equals(vars.id)) {
-				return cb(new Error('No SAUCE record present'));
-			}
+	if(!SAUCE_ID.equals(sauceRec.id)) {
+		return cb(Errors.DoesNotExist('No SAUCE record present'));
+	}
 
-			var ver = iconv.decode(vars.version, 'cp437');
+	const ver = iconv.decode(sauceRec.version, 'cp437');
 
-			if('00' !== ver) {
-				return cb(new Error('Unsupported SAUCE version: ' + ver));
-			}
+	if('00' !== ver) {
+		return cb(Errors.Invalid(`Unsupported SAUCE version: ${ver}`));
+	}
 
-			if(-1 === SAUCE_VALID_DATA_TYPES.indexOf(vars.dataType)) {
-				return cb(new Error('Unsupported SAUCE DataType: ' + vars.dataType));
-			}
+	if(-1 === SAUCE_VALID_DATA_TYPES.indexOf(sauceRec.dataType)) {
+		return cb(Errors.Invalid(`Unsupported SAUCE DataType: ${sauceRec.dataType}`));
+	}
 
-			var sauce = {
-				id 			: iconv.decode(vars.id, 'cp437'),
-				version		: iconv.decode(vars.version, 'cp437').trim(),
-				title		: iconv.decode(vars.title, 'cp437').trim(),
-				author		: iconv.decode(vars.author, 'cp437').trim(),
-				group		: iconv.decode(vars.group, 'cp437').trim(),
-				date		: iconv.decode(vars.date, 'cp437').trim(),
-				fileSize	: vars.fileSize,
-				dataType	: vars.dataType,
-				fileType	: vars.fileType,
-				tinfo1		: vars.tinfo1,
-				tinfo2		: vars.tinfo2,
-				tinfo3		: vars.tinfo3,
-				tinfo4		: vars.tinfo4,
-				numComments	: vars.numComments,
-				flags		: vars.flags,
-				tinfos		: vars.tinfos,
-			};
+	const sauce = {
+		id 			: iconv.decode(sauceRec.id, 'cp437'),
+		version		: iconv.decode(sauceRec.version, 'cp437').trim(),
+		title		: iconv.decode(sauceRec.title, 'cp437').trim(),
+		author		: iconv.decode(sauceRec.author, 'cp437').trim(),
+		group		: iconv.decode(sauceRec.group, 'cp437').trim(),
+		date		: iconv.decode(sauceRec.date, 'cp437').trim(),
+		fileSize	: sauceRec.fileSize,
+		dataType	: sauceRec.dataType,
+		fileType	: sauceRec.fileType,
+		tinfo1		: sauceRec.tinfo1,
+		tinfo2		: sauceRec.tinfo2,
+		tinfo3		: sauceRec.tinfo3,
+		tinfo4		: sauceRec.tinfo4,
+		numComments	: sauceRec.numComments,
+		flags		: sauceRec.flags,
+		tinfos		: sauceRec.tinfos,
+	};
 
-			var dt = SAUCE_DATA_TYPES[sauce.dataType];
-			if(dt && dt.parser) {
-				sauce[dt.name] = dt.parser(sauce);
-			}
+	const dt = SAUCE_DATA_TYPES[sauce.dataType];
+	if(dt && dt.parser) {
+		sauce[dt.name] = dt.parser(sauce);
+	}
 
-			cb(null, sauce);
-		});
+	return cb(null, sauce);
 }
 
 //	:TODO: These need completed:
-var SAUCE_DATA_TYPES = {};
-SAUCE_DATA_TYPES[0]		= { name : 'None' };
-SAUCE_DATA_TYPES[1]		= { name : 'Character', parser : parseCharacterSAUCE };
-SAUCE_DATA_TYPES[2]		= 'Bitmap';
-SAUCE_DATA_TYPES[3]		= 'Vector';
-SAUCE_DATA_TYPES[4]		= 'Audio';
-SAUCE_DATA_TYPES[5]		= 'BinaryText';
-SAUCE_DATA_TYPES[6]		= 'XBin';
-SAUCE_DATA_TYPES[7]		= 'Archive';
-SAUCE_DATA_TYPES[8]		= 'Executable';
+const SAUCE_DATA_TYPES = {
+	0	: { name : 'None' },
+	1	: { name : 'Character', parser : parseCharacterSAUCE },
+	2 	: 'Bitmap',
+	3	: 'Vector',
+	4	: 'Audio',
+	5	: 'BinaryText',
+	6	: 'XBin',
+	7	: 'Archive',
+	8	: 'Executable',
+};
 
-var SAUCE_CHARACTER_FILE_TYPES = {};
-SAUCE_CHARACTER_FILE_TYPES[0]	= 'ASCII';
-SAUCE_CHARACTER_FILE_TYPES[1]	= 'ANSi';
-SAUCE_CHARACTER_FILE_TYPES[2]	= 'ANSiMation';
-SAUCE_CHARACTER_FILE_TYPES[3]	= 'RIP script';
-SAUCE_CHARACTER_FILE_TYPES[4]	= 'PCBoard';
-SAUCE_CHARACTER_FILE_TYPES[5]	= 'Avatar';
-SAUCE_CHARACTER_FILE_TYPES[6]	= 'HTML';
-SAUCE_CHARACTER_FILE_TYPES[7]	= 'Source';
-SAUCE_CHARACTER_FILE_TYPES[8]	= 'TundraDraw';
+const SAUCE_CHARACTER_FILE_TYPES = {
+	0	: 'ASCII',
+	1	: 'ANSi',
+	2	: 'ANSiMation',
+	3	: 'RIP script',
+	4	: 'PCBoard',
+	5	: 'Avatar',
+	6	: 'HTML',
+	7	: 'Source',
+	8	: 'TundraDraw',
+};
 
 //
 //	Map of SAUCE font -> encoding hint
 //
 //	Note that this is the same mapping that x84 uses. Be compatible!
 //
-var SAUCE_FONT_TO_ENCODING_HINT = {
+const SAUCE_FONT_TO_ENCODING_HINT = {
 	'Amiga MicroKnight'		: 'amiga',
 	'Amiga MicroKnight+'	: 'amiga',
 	'Amiga mOsOul'			: 'amiga',
@@ -138,9 +145,11 @@ var SAUCE_FONT_TO_ENCODING_HINT = {
 	'IBM VGA'				: 'cp437',
 };
 
-['437', '720', '737', '775', '819', '850', '852', '855', '857', '858',
-	'860', '861', '862', '863', '864', '865', '866', '869', '872'].forEach(function onPage(page) {
-	var codec = 'cp' + page;
+[
+	'437', '720', '737', '775', '819', '850', '852', '855', '857', '858',
+	'860', '861', '862', '863', '864', '865', '866', '869', '872'
+].forEach( page => {
+	const codec = 'cp' + page;
 	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]	= codec;
 	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]		= codec;
 	SAUCE_FONT_TO_ENCODING_HINT['IBM VGA25g ' + page]	= codec;
@@ -149,7 +158,7 @@ var SAUCE_FONT_TO_ENCODING_HINT = {
 });
 
 function parseCharacterSAUCE(sauce) {
-	var result = {};
+	const result = {};
 
 	result.fileType	= SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
 
@@ -157,11 +166,12 @@ function parseCharacterSAUCE(sauce) {
 		//	convience: create ansiFlags
 		sauce.ansiFlags = sauce.flags;
 
-		var i = 0;
+		let i = 0;
 		while(i < sauce.tinfos.length && sauce.tinfos[i] !== 0x00) {
 			++i;
 		}
-		var fontName = iconv.decode(sauce.tinfos.slice(0, i), 'cp437');
+
+		const fontName = iconv.decode(sauce.tinfos.slice(0, i), 'cp437');
 		if(fontName.length > 0) {
 			result.fontName = fontName;
 		}
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index a6fa0deb..6ffb49a9 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -2,16 +2,17 @@
 'use strict';
 
 //	ENiGMA½
-const baseClient		= require('../../client.js');
-const Log				= require('../../logger.js').log;
-const LoginServerModule	= require('../../login_server_module.js');
-const Config			= require('../../config.js').config;
-const EnigAssert		= require('../../enigma_assert.js');
+const baseClient					= require('../../client.js');
+const Log							= require('../../logger.js').log;
+const LoginServerModule				= require('../../login_server_module.js');
+const Config						= require('../../config.js').config;
+const EnigAssert					= require('../../enigma_assert.js');
+const { stringFromNullTermBuffer }	= require('../../string_util.js');
 
 //	deps
 const net 			= require('net');
 const buffers		= require('buffers');
-const binary		= require('binary');
+const { Parser }	= require('binary-parser');
 const util			= require('util');
 
 //var debug	= require('debug')('telnet');
@@ -218,46 +219,42 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
 			return MORE_DATA_REQUIRED;
 		}
 
-		let end = bufs.indexOf(IAC_SE_BUF, 5);	//	look past header bytes
+		const end = bufs.indexOf(IAC_SE_BUF, 5);	//	look past header bytes
 		if(-1 === end) {
 			return MORE_DATA_REQUIRED;
 		}
 
-		//	eat up and process the header
-		let buf = bufs.splice(0, 4).toBuffer();
-		binary.parse(buf)
-			.word8('iac1')
-			.word8('sb')
-			.word8('ttype')
-			.word8('is')
-			.tap(function(vars) {
-				EnigAssert(vars.iac1 === COMMANDS.IAC);
-				EnigAssert(vars.sb === COMMANDS.SB);
-				EnigAssert(vars.ttype === OPTIONS.TERMINAL_TYPE);
-				EnigAssert(vars.is === SB_COMMANDS.IS);
-			});
-
-		//	eat up the rest
-		end -= 4;
-		buf = bufs.splice(0, end).toBuffer();
-
-		//
-		//	From this point -> |end| is our ttype
-		//
-		//	Look for trailing NULL(s). Clients such as NetRunner do this.
-		//	If none is found, we take the entire buffer
-		//
-		let trimAt = 0;
-		for(; trimAt < buf.length; ++trimAt) {
-			if(0x00 === buf[trimAt]) {
-				break;
-			}
+		let ttypeCmd;
+		try {
+			ttypeCmd = new Parser()
+				.uint8('iac1')
+				.uint8('sb')
+				.uint8('opt')
+				.uint8('is')
+				.array('ttype', {
+					type		: 'uint8',
+					readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+				})
+				//	note we read iac2 above
+				.uint8('se')
+				.parse(bufs.toBuffer());
+		} catch(e) {
+			Log.debug( { error : e }, 'Failed parsing TTYP telnet command');
+			return event;
 		}
 
-		event.ttype = buf.toString('ascii', 0, trimAt);
+		EnigAssert(COMMANDS.IAC === ttypeCmd.iac1);
+		EnigAssert(COMMANDS.SB === ttypeCmd.sb);
+		EnigAssert(OPTIONS.TERMINAL_TYPE === ttypeCmd.opt);
+		EnigAssert(SB_COMMANDS.IS === ttypeCmd.is);
+		EnigAssert(ttypeCmd.ttype.length > 0);
+		//	note we found IAC_SE above
 
-		//	pop off the terminating IAC SE
-		bufs.splice(0, 2);
+		//	some terminals such as NetRunner provide a NULL-terminated buffer
+		//	slice to remove IAC
+		event.ttype = stringFromNullTermBuffer(ttypeCmd.ttype.slice(0, -1), 'ascii');
+
+		bufs.splice(0, end);
 	}
 
 	return event;
@@ -272,25 +269,30 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
 			return MORE_DATA_REQUIRED;
 		}
 
-		event.buf = bufs.splice(0, 9).toBuffer();
-		binary.parse(event.buf)
-			.word8('iac1')
-			.word8('sb')
-			.word8('naws')
-			.word16bu('width')
-			.word16bu('height')
-			.word8('iac2')
-			.word8('se')
-			.tap(function(vars) {
-				EnigAssert(vars.iac1 == COMMANDS.IAC);
-				EnigAssert(vars.sb == COMMANDS.SB);
-				EnigAssert(vars.naws == OPTIONS.WINDOW_SIZE);
-				EnigAssert(vars.iac2 == COMMANDS.IAC);
-				EnigAssert(vars.se == COMMANDS.SE);
+		let nawsCmd;
+		try {
+			nawsCmd = new Parser()
+				.uint8('iac1')
+				.uint8('sb')
+				.uint8('opt')
+				.uint16be('width')
+				.uint16be('height')
+				.uint8('iac2')
+				.uint8('se')
+				.parse(bufs.splice(0, 9).toBuffer());
+		} catch(e) {
+			Log.debug( { error : e }, 'Failed parsing NAWS telnet command');
+			return event;
+		}
 
-				event.cols	= event.columns	= event.width = vars.width;
-				event.rows	= event.height = vars.height;
-			});		
+		EnigAssert(COMMANDS.IAC === nawsCmd.iac1);
+		EnigAssert(COMMANDS.SB === nawsCmd.sb);
+		EnigAssert(OPTIONS.WINDOW_SIZE === nawsCmd.opt);
+		EnigAssert(COMMANDS.IAC === nawsCmd.iac2);
+		EnigAssert(COMMANDS.SE === nawsCmd.se);
+
+		event.cols	= event.columns	= event.width = nawsCmd.width;
+		event.rows	= event.height = nawsCmd.height;
 	}
 	return event;
 };
@@ -321,78 +323,109 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
 			return MORE_DATA_REQUIRED;
 		}
 
-		//	eat up and process the header
-		let buf = bufs.splice(0, 4).toBuffer();
-		binary.parse(buf)
-			.word8('iac1')
-			.word8('sb')
-			.word8('newEnv')
-			.word8('isOrInfo')	//	initial=IS, updates=INFO
-			.tap(function(vars) {
-				EnigAssert(vars.iac1 === COMMANDS.IAC);
-				EnigAssert(vars.sb === COMMANDS.SB);
-				EnigAssert(vars.newEnv === OPTIONS.NEW_ENVIRONMENT || vars.newEnv === OPTIONS.NEW_ENVIRONMENT_DEP);
-				EnigAssert(vars.isOrInfo === SB_COMMANDS.IS || vars.isOrInfo === SB_COMMANDS.INFO);
+		//	:TODO: It's likely that we could do all the env name/value parsing directly in Parser.
 
-				event.type = vars.isOrInfo;
-
-				if(vars.newEnv === OPTIONS.NEW_ENVIRONMENT_DEP) {
-					//	:TODO: bring all this into Telnet class
-					Log.log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
-				}
-			});
-
-		//	eat up the rest
-		end -= 4;
-		buf = bufs.splice(0, end).toBuffer();
-
-		//
-		//	This part can become messy. The basic spec is:
-		//	IAC SB NEW-ENVIRON IS type ... [ VALUE ... ] [ type ... [ VALUE ... ] [ ... ] ] IAC SE
-		//
-		//	See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
-		//
-		//	Start by splitting up the remaining buffer. Keep the delimiters
-		//	as prefixes we can use for processing.
-		//
-		//	:TODO: Currently not supporting ESCaped values (ESC + <type>). Probably not really in the wild, but we should be compliant
-		//	:TODO: Could probably just convert this to use a regex & handle delims + escaped values... in any case, this is sloppy...
-		const params = [];
-		let p = 0;
-		let j;
-		let l;
-		for(j = 0, l = buf.length; j < l; ++j) {
-			if(NEW_ENVIRONMENT_DELIMITERS.indexOf(buf[j]) === -1) {
-				continue;
-			}
-
-			params.push(buf.slice(p, j));
-			p = j;
+		let envCmd;
+		try {
+			envCmd = new Parser()
+				.uint8('iac1')
+				.uint8('sb')
+				.uint8('opt')
+				.uint8('isOrInfo')	//	IS=initial, INFO=updates
+				.array('envBlock', {
+					type : 'uint8',
+					readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+				})
+				//	note we consume IAC above
+				.uint8('se')
+				.parse(bufs.splice(0, bufs.length).toBuffer());
+		} catch(e) {
+			Log.debug( { error : e }, 'Failed parsing NEW-ENVIRON telnet command');
+			return event;
 		}
 
-		//	remainder
-		if(p < l) {
-			params.push(buf.slice(p, l));
+		EnigAssert(COMMANDS.IAC === envCmd.iac1);
+		EnigAssert(COMMANDS.SB === envCmd.sb);
+		EnigAssert(OPTIONS.NEW_ENVIRONMENT === envCmd.opt || OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt);
+		EnigAssert(SB_COMMANDS.IS === envCmd.isOrInfo || SB_COMMANDS.INFO === envCmd.isOrInfo);
+
+		if(OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt) {
+			//	:TODO: we should probably support this for legacy clients?
+			Log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
 		}
 
+		const envBuf = envCmd.envBlock.slice(0, -1);	//	remove IAC
+
+		if(envBuf.length < 4) {	//	TYPE + single char name + sep + single char value
+			//	empty env block
+			return event;
+		}
+
+		const States = {
+			Name		: 1,
+			Value		: 2,
+		};
+
+		let state = States.Name;
+		const setVars = {};
+		const delVars = [];
 		let varName;
-		event.envVars = {};
-		//	:TODO: handle cases where a variable was present in a previous exchange, but missing here...e.g removed
-		for(j = 0; j < params.length; ++j) {
-			if(params[j].length < 2) {
-				continue;	 			
-			}
+		//	:TODO: handle ESC type!!!
+		while(envBuf.length) {
+			switch(state) {
+				case States.Name :
+					{
+						const type = parseInt(envBuf.splice(0, 1));
+						if(![ NEW_ENVIRONMENT_COMMANDS.VAR, NEW_ENVIRONMENT_COMMANDS.USERVAR, NEW_ENVIRONMENT_COMMANDS.ESC ].includes(type)) {
+							return event;	//	fail :(
+						}
 
-			let cmd = params[j].readUInt8();
-			if(cmd === NEW_ENVIRONMENT_COMMANDS.VAR || cmd === NEW_ENVIRONMENT_COMMANDS.USERVAR) {
-				varName = params[j].slice(1).toString('utf8');	//	:TODO: what encoding should this really be?
-			} else {
-				event.envVars[varName] = params[j].slice(1).toString('utf8');	//	:TODO: again, what encoding?
+						let nameEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VALUE);
+						if(-1 === nameEnd) {
+							nameEnd = envBuf.length;
+						}
+
+						varName = envBuf.splice(0, nameEnd);
+						if(!varName) {
+							return event;	//	something is wrong.
+						}
+
+						varName = Buffer.from(varName).toString('ascii');
+
+						const next = parseInt(envBuf.splice(0, 1));
+						if(NEW_ENVIRONMENT_COMMANDS.VALUE === next) {
+							state = States.Value;
+						} else {
+							state = States.Name;
+							delVars.push(varName);	//	no value; del this var
+						}
+					}
+					break;
+
+				case States.Value :
+					{
+						let valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VAR);
+						if(-1 === valueEnd) {
+							valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.USERVAR);
+						}
+						if(-1 === valueEnd) {
+							valueEnd = envBuf.length;
+						}
+
+						let value = envBuf.splice(0, valueEnd);
+						if(value) {
+							value = Buffer.from(value).toString('ascii');
+							setVars[varName] = value;
+						}
+						state = States.Name;
+					}
+					break;
 			}
 		}
 
-		//	pop off remaining IAC SE
-		bufs.splice(0, 2);
+		//	:TODO: Handle deleting previously set vars via delVars
+		event.type		= envCmd.isOrInfo;
+		event.envVars	= setVars;
 	}
 
 	return event;
diff --git a/core/string_util.js b/core/string_util.js
index c846fc38..f47bd6b5 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -204,7 +204,7 @@ function debugEscapedString(s) {
 }
 
 function stringFromNullTermBuffer(buf, encoding) {
-	let nullPos = buf.indexOf(new Buffer( [ 0x00 ] ));
+	let nullPos = buf.indexOf( 0x00 );
 	if(-1 === nullPos) {
 		nullPos = buf.length;
 	}
diff --git a/package.json b/package.json
index b44cc894..8c7a7a5d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "async": "^2.5.0",
-    "binary": "0.3.x",
+    "binary-parser": "^1.3.2",
     "buffers": "NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",

From 94f3721bf8f753c9af358ae36b0fd191414fa708 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 21 Jan 2018 20:49:38 -0700
Subject: [PATCH 0137/1013] Prompt when already logged in

---
 core/servers/login/ssh.js | 76 ++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index cd9ca1a9..d14bdbbd 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -41,14 +41,19 @@ function SSHClient(clientConn) {
 	clientConn.on('authentication', function authAttempt(ctx) {
 		const username	= ctx.username || '';
 		const password	= ctx.password || '';
-		
+
 		self.isNewUser	= (Config.users.newUserNames || []).indexOf(username) > -1;
 
 		self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
 
 		function terminateConnection() {
 			ctx.reject();
-			clientConn.end();
+			return clientConn.end();
+		}
+
+		function alreadyLoggedIn(username) {
+			ctx.prompt(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
+			return terminateConnection();
 		}
 
 		//
@@ -65,15 +70,13 @@ function SSHClient(clientConn) {
 			userLogin(self, ctx.username, ctx.password, function authResult(err) {
 				if(err) {
 					if(err.existingConn) {
-						//	:TODO: Can we display somthing here?
-						terminateConnection();
-						return;
-					} else {
-						return ctx.reject(SSHClient.ValidAuthMethods);
+						return alreadyLoggedIn(username);
 					}
-				} else {
-					ctx.accept();
+
+					return ctx.reject(SSHClient.ValidAuthMethods);
 				}
+
+				ctx.accept();
 			});
 		} else {
 			if(-1 === SSHClient.ValidAuthMethods.indexOf(ctx.method)) {
@@ -85,7 +88,7 @@ function SSHClient(clientConn) {
 				return ctx.reject();
 			}
 
-			let interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };
+			const interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };
 
 			ctx.prompt(interactivePrompt, function retryPrompt(answers) {
 				loginAttempts += 1;
@@ -93,37 +96,36 @@ function SSHClient(clientConn) {
 				userLogin(self, username, (answers[0] || ''), err => {
 					if(err) {
 						if(err.existingConn) {
-							//	:TODO: can we display something here?
-							terminateConnection();
-						} else {				
-							if(loginAttempts >= Config.general.loginAttempts) {
-								terminateConnection();
-							} else {
-								const artOpts = {
-									client		: self,
-									name 		: 'SSHPMPT.ASC',
-									readSauce	: false,
-								};
-
-								theme.getThemeArt(artOpts, (err, artInfo) => {
-									if(err) {
-										interactivePrompt.prompt = `Access denied\n${ctx.username}'s password: `;
-									} else {										
-										const newUserNameList = _.has(Config, 'users.newUserNames') && Config.users.newUserNames.length > 0 ?
-											Config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
-											'(No new user names enabled!)';
-
-										interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
-									}
-									return ctx.prompt(interactivePrompt, retryPrompt);
-								});
-							}
+							return alreadyLoggedIn(username);
 						}
+
+						if(loginAttempts >= Config.general.loginAttempts) {
+							return terminateConnection();
+						}
+
+						const artOpts = {
+							client		: self,
+							name 		: 'SSHPMPT.ASC',
+							readSauce	: false,
+						};
+
+						theme.getThemeArt(artOpts, (err, artInfo) => {
+							if(err) {
+								interactivePrompt.prompt = `Access denied\n${ctx.username}'s password: `;
+							} else {
+								const newUserNameList = _.has(Config, 'users.newUserNames') && Config.users.newUserNames.length > 0 ?
+									Config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
+									'(No new user names enabled!)';
+
+								interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
+							}
+							return ctx.prompt(interactivePrompt, retryPrompt);
+						});
 					} else {
 						ctx.accept();
 					}
-				});	
-			});		
+				});
+			});
 		}
 	});
 

From 50074d77656a1e03b93374e985bcf0e641462fd9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 21 Jan 2018 20:49:49 -0700
Subject: [PATCH 0138/1013] Remove unused require

---
 core/string_util.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/string_util.js b/core/string_util.js
index f47bd6b5..4539ea38 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -2,7 +2,6 @@
 'use strict';
 
 //	ENiGMA½
-const miscUtil			= require('./misc_util.js');
 const ANSI				= require('./ansi_term.js');
 
 //	deps

From cc74616a93f390273695762f6b8a35b9b3960424 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:34:10 -0700
Subject: [PATCH 0139/1013] Next at end of list goes to previous menu by
 default

---
 core/file_area_list.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/file_area_list.js b/core/file_area_list.js
index 87e794cb..f42bf93e 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -75,6 +75,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 		this.filterCriteria		= _.get(options, 'extraArgs.filterCriteria');
 		this.fileList			= _.get(options, 'extraArgs.fileList');
+		this.lastFileNextExit	= _.get(options, 'extraArgs.lastFileNextExit', true);
 
 		if(this.fileList) {
 			//	we'll need to adjust position as well!
@@ -103,6 +104,10 @@ exports.getModule = class FileAreaList extends MenuModule {
 					return this.displayBrowsePage(true, cb);	//	true=clerarScreen
 				}
 
+				if(this.lastFileNextExit) {
+					return this.prevMenu(cb);
+				}
+
 				return cb(null);
 			},
 			prevFile : (formData, extraArgs, cb) => {

From ec1876084cc4e079daab67cabd162b21eb4bdde9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:34:32 -0700
Subject: [PATCH 0140/1013] Add sanatizeString() method

---
 core/database.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/database.js b/core/database.js
index 10331fc0..2717a545 100644
--- a/core/database.js
+++ b/core/database.js
@@ -19,6 +19,7 @@ const dbs = {};
 exports.getTransactionDatabase		= getTransactionDatabase;
 exports.getModDatabasePath			= getModDatabasePath;
 exports.getISOTimestampString		= getISOTimestampString;
+exports.sanatizeString				= sanatizeString;
 exports.initializeDatabases			= initializeDatabases;
 
 exports.dbs							= dbs;
@@ -59,6 +60,25 @@ function getISOTimestampString(ts) {
 	return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 }
 
+function sanatizeString(s) {
+	return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {	//	eslint-disable-line no-control-regex
+		switch (c) {
+			case '\0'	: return '\\0';
+			case '\x08'	: return '\\b';
+			case '\x09'	: return '\\t';
+			case '\x1a'	: return '\\z';
+			case '\n'	: return '\\n';
+			case '\r'	: return '\\r';
+
+			case '"' :
+			case '\'' :
+			case '\\' :
+			case '%' :
+				return `\\${c}`;
+		}
+	});
+}
+
 function initializeDatabases(cb) {
 	async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
 		dbs[dbName] = sqlite3Trans.wrap(new sqlite3.Database(getDatabasePath(dbName), err => {

From 70b5d7a124b50447a99aa3709880d27bb77931c2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:36:16 -0700
Subject: [PATCH 0141/1013] MAJOR refactor of Message class * ES6 class vs old
 style * Add findMessages(filter, ...) similar to FileEntry.findFiles()
 allowing many filter types used throughout the system

---
 core/message.js | 1258 ++++++++++++++++++++++++++---------------------
 1 file changed, 711 insertions(+), 547 deletions(-)

diff --git a/core/message.js b/core/message.js
index f99efa8a..6c47a934 100644
--- a/core/message.js
+++ b/core/message.js
@@ -5,9 +5,11 @@ const msgDb					= require('./database.js').dbs.message;
 const wordWrapText			= require('./word_wrap.js').wordWrapText;
 const ftnUtil				= require('./ftn_util.js');
 const createNamedUUID		= require('./uuid_util.js').createNamedUUID;
-const getISOTimestampString	= require('./database.js').getISOTimestampString;
 const Errors				= require('./enig_error.js').Errors;
 const ANSI					= require('./ansi_term.js');
+const {
+	sanatizeString,
+	getISOTimestampString }	= require('./database.js');
 
 const {
 	isAnsi, isFormattedLine,
@@ -25,74 +27,15 @@ const assert				= require('assert');
 const moment				= require('moment');
 const iconvEncode			= require('iconv-lite').encode;
 
-module.exports = Message;
-
 const ENIGMA_MESSAGE_UUID_NAMESPACE 	= uuidParse.parse('154506df-1df8-46b9-98f8-ebb5815baaf8');
 
-function Message(options) {
-	options = options || {};
-
-	this.messageId		= options.messageId || 0;	//	always generated @ persist
-	this.areaTag		= options.areaTag || Message.WellKnownAreaTags.Invalid;
-
-	if(options.uuid) {
-		//	note: new messages have UUID generated @ time of persist. See also Message.createMessageUUID()
-		this.uuid = options.uuid;
-	}
-
-	this.replyToMsgId	= options.replyToMsgId || 0;
-	this.toUserName		= options.toUserName || '';
-	this.fromUserName	= options.fromUserName || '';
-	this.subject		= options.subject || '';
-	this.message		= options.message || '';
-
-	if(_.isDate(options.modTimestamp) || moment.isMoment(options.modTimestamp)) {
-		this.modTimestamp = moment(options.modTimestamp);
-	} else if(_.isString(options.modTimestamp)) {
-		this.modTimestamp = moment(options.modTimestamp);
-	}
-
-	this.viewCount		= options.viewCount || 0;
-
-	this.meta			= {
-		System	: {},	//	we'll always have this one
-	};
-
-	if(_.isObject(options.meta)) {
-		_.defaultsDeep(this.meta, options.meta);
-	}
-
-	if(options.meta) {
-		this.meta = options.meta;
-	}
-
-	this.hashTags		= options.hashTags || [];
-
-	this.isValid = function() {
-		//	:TODO: validate as much as possible
-		return true;
-	};
-
-	this.isPrivate = function() {
-		return Message.isPrivateAreaTag(this.areaTag);
-	};
-
-	this.isFromRemoteUser = function() {
-		return null !== _.get(this, 'meta.System.remote_from_user', null);
-	};
-}
-
-Message.WellKnownAreaTags = {
+const WELL_KNOWN_AREA_TAGS = {
 	Invalid		: '',
 	Private		: 'private_mail',
 	Bulletin	: 'local_bulletin',
 };
 
-Message.isPrivateAreaTag = function(areaTag) {
-	return areaTag.toLowerCase() === Message.WellKnownAreaTags.Private;
-};
-
-Message.SystemMetaNames = {
+const SYSTEM_META_NAMES = {
 	LocalToUserID			: 'local_to_user_id',
 	LocalFromUserID			: 'local_from_user_id',
 	StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
@@ -103,19 +46,20 @@ Message.SystemMetaNames = {
 };
 
 //	Types for Message.SystemMetaNames.ExternalFlavor meta
-Message.AddressFlavor = {
+const ADDRESS_FLAVOR = {
 	Local		: 'local',	//	local / non-remote addressing
 	FTN			: 'ftn',	//	FTN style
 	Email		: 'email',
 };
 
-Message.StateFlags0 = {
+const STATE_FLAGS0 = {
 	None		: 0x00000000,
 	Imported	: 0x00000001,	//	imported from foreign system
 	Exported	: 0x00000002,	//	exported to foreign system
 };
 
-Message.FtnPropertyNames = {
+//	:TODO: these should really live elsewhere...
+const FTN_PROPERTY_NAMES = {
 	//	packet header oriented
 	FtnOrigNode			: 'ftn_orig_node',
 	FtnDestNode			: 'ftn_dest_node',
@@ -143,518 +87,738 @@ Message.FtnPropertyNames = {
 	FtnSeenBy			: 'ftn_seen_by',		//	http://ftsc.org/docs/fts-0004.001
 };
 
-//	Note: kludges are stored with their names as-is
+module.exports = class Message {
+	constructor(
+		{
+			messageId = 0, areaTag = Message.WellKnownAreaTags.Invalid, uuid, replyToMsgId = 0,
+			toUserName = '', fromUserName = '', subject = '', message = '', modTimestamp = moment(),
+			meta, hashTags = [],
+		} = { }
+	)
+	{
+		this.messageId		= messageId;
+		this.areaTag		= areaTag;
+		this.uuid			= uuid;
+		this.replyToMsgId	= replyToMsgId;
+		this.toUserName		= toUserName;
+		this.fromUserName	= fromUserName;
+		this.subject		= subject;
+		this.message		= message;
 
-Message.prototype.setLocalToUserId = function(userId) {
-	this.meta.System = this.meta.System || {};
-	this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
-};
+		if(_.isDate(modTimestamp) || _.isString(modTimestamp)) {
+			modTimestamp = moment(modTimestamp);
+		}
 
-Message.prototype.setLocalFromUserId = function(userId) {
-	this.meta.System = this.meta.System || {};
-	this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
-};
+		this.modTimestamp	= modTimestamp;
 
-Message.prototype.setRemoteToUser = function(remoteTo) {
-	this.meta.System = this.meta.System || {};
-	this.meta.System[Message.SystemMetaNames.RemoteToUser] = remoteTo;
-};
+		this.meta = {};
+		_.defaultsDeep(this.meta, { System : {} }, meta);
 
-Message.prototype.setExternalFlavor = function(flavor) {
-	this.meta.System = this.meta.System || {};
-	this.meta.System[Message.SystemMetaNames.ExternalFlavor] = flavor;
-};
-
-Message.createMessageUUID = function(areaTag, modTimestamp, subject, body) {
-	assert(_.isString(areaTag));
-	assert(_.isDate(modTimestamp) || moment.isMoment(modTimestamp));
-	assert(_.isString(subject));
-	assert(_.isString(body));
-
-	if(!moment.isMoment(modTimestamp)) {
-		modTimestamp = moment(modTimestamp);
+		this.hashTags		= hashTags;
 	}
 
-	areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
-	modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
-	subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
-	body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
+	isValid() { return true; }	//	:TODO: obviously useless; look into this or remove it
 
-	return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
-};
+	static isPrivateAreaTag(areaTag) {
+		return areaTag.toLowerCase() === Message.WellKnownAreaTags.Private;
+	}
 
-Message.getMessageIdByUuid = function(uuid, cb) {
-	msgDb.get(
-		`SELECT message_id
-		FROM message
-		WHERE message_uuid = ?
-		LIMIT 1;`,
-		[ uuid ],
-		(err, row) => {
-			if(err) {
-				cb(err);
+	isPrivate() {
+		return Message.isPrivateAreaTag(this.areaTag);
+	}
+
+	isFromRemoteUser() {
+		return null !== _.get(this, 'meta.System.remote_from_user', null);
+	}
+
+	static get WellKnownAreaTags() {
+		return WELL_KNOWN_AREA_TAGS;
+	}
+
+	static get SystemMetaNames() {
+		return SYSTEM_META_NAMES;
+	}
+
+	static get AddressFlavor() {
+		return ADDRESS_FLAVOR;
+	}
+
+	static get StateFlags0() {
+		return STATE_FLAGS0;
+	}
+
+	static get FtnPropertyNames() {
+		return FTN_PROPERTY_NAMES;
+	}
+
+	setLocalToUserId(userId) {
+		this.meta.System = this.meta.System || {};
+		this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
+	}
+
+	setLocalFromUserId(userId) {
+		this.meta.System = this.meta.System || {};
+		this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
+	}
+
+	setRemoteToUser(remoteTo) {
+		this.meta.System = this.meta.System || {};
+		this.meta.System[Message.SystemMetaNames.RemoteToUser] = remoteTo;
+	}
+
+	setExternalFlavor(flavor) {
+		this.meta.System = this.meta.System || {};
+		this.meta.System[Message.SystemMetaNames.ExternalFlavor] = flavor;
+	}
+
+	static createMessageUUID(areaTag, modTimestamp, subject, body) {
+		assert(_.isString(areaTag));
+		assert(_.isDate(modTimestamp) || moment.isMoment(modTimestamp));
+		assert(_.isString(subject));
+		assert(_.isString(body));
+
+		if(!moment.isMoment(modTimestamp)) {
+			modTimestamp = moment(modTimestamp);
+		}
+
+		areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
+		modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
+		subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
+		body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
+
+		return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
+	}
+
+	/*
+		Find message IDs or UUIDs by filter. Available filters/options:
+
+		filter.uuids - use with resultType='id'
+		filter.ids - use with resultType='uuid'
+		filter.toUserName
+		filter.fromUserName
+		filter.replyToMesageId
+		filter.newerThanTimestamp
+		filter.newerThanMessageId
+		*filter.confTag - all area tags in confTag
+		filter.areaTag
+		*filter.metaTuples - {category, name, value}
+
+		*filter.terms - FTS search
+
+		filter.sort = modTimestamp | messageId
+		filter.order = ascending | (descending)
+
+		filter.limit
+		filter.resultType = (id) | uuid | count
+		filter.extraFields = []
+
+		filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
+		(any other areaTag or confTag filters will be ignored)
+
+		*=NYI
+	*/
+	static findMessages(filter, cb) {
+		filter = filter || {};
+
+		filter.resultType	= filter.resultType || 'id';
+		filter.extraFields	= filter.extraFields || [];
+
+		const field = 'id' === filter.resultType ? 'message_id' : 'message_uuid';
+
+		if(moment.isMoment(filter.newerThanTimestamp)) {
+			filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
+		}
+
+		let sql;
+		if('count' === filter.resultType) {
+			sql =
+				`SELECT COUNT() AS count
+				FROM message m`;
+
+		} else {
+			sql =
+				`SELECT DISTINCT m.${field}${filter.extraFields.length > 0 ? ', ' + filter.extraFields.map(f => `m.${f}`).join(', ') : ''}
+				FROM message m`;
+		}
+
+		const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
+		let sqlOrderBy;
+		let sqlWhere = '';
+
+		function appendWhereClause(clause) {
+			if(sqlWhere) {
+				sqlWhere += ' AND ';
 			} else {
+				sqlWhere += ' WHERE ';
+			}
+			sqlWhere += clause;
+		}
+
+		//	currently only avail sort
+		if('modTimestamp' === filter.sort) {
+			sqlOrderBy = `ORDER BY m.modified_timestamp ${sqlOrderDir}`;
+		} else {
+			sqlOrderBy = `ORDER BY m.message_id ${sqlOrderDir}`;
+		}
+
+		if(Array.isArray(filter.ids)) {
+			appendWhereClause(`m.message_id IN (${filter.ids.join(', ')})`);
+		}
+
+		if(Array.isArray(filter.uuids)) {
+			const uuidList = filter.uuids.map(u => `"${u}"`).join(', ');
+			appendWhereClause(`m.message_id IN (${uuidList})`);
+		}
+
+
+		if(_.isNumber(filter.privateTagUserId)) {
+			appendWhereClause(`m.area_tag = "${Message.WellKnownAreaTags.Private}"`);
+			appendWhereClause(
+				`m.message_id IN (
+					SELECT message_id 
+					FROM message_meta 
+					WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
+				)`);
+		} else {
+			let areaTags = [];
+			if(filter.confTag && filter.confTag.length > 0) {
+				//	:TODO: grab areas from conf -> add to areaTags[]
+			}
+
+			if(areaTags.length > 0 || filter.areaTag && filter.areaTag.length > 0) {
+				if(Array.isArray(filter.areaTag)) {
+					areaTags = areaTags.concat(filter.areaTag);
+				} else if(_.isString(filter.areaTag)) {
+					areaTags.push(filter.areaTag);
+				}
+
+				areaTags = _.uniq(areaTags);	//	remove any dupes
+
+				if(areaTags.length > 1) {
+					const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
+					appendWhereClause(`m.area_tag IN(${areaList})`);
+				} else {
+					appendWhereClause(`m.area_tag = "${areaTags[0]}"`);
+				}
+			}
+		}
+
+		[ 'toUserName', 'fromUserName', 'replyToMessageId' ].forEach(field => {
+			if(_.isString(filter[field]) && filter[field].length > 0) {
+				appendWhereClause(`m.${_.snakeCase(field)} = "${sanatizeString(filter[field])}"`);
+			}
+		});
+
+		if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
+			appendWhereClause(`DATETIME(m.modified_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
+		}
+
+		if(_.isNumber(filter.newerThanMessageId)) {
+			appendWhereClause(`m.message_id > ${filter.newerThanMessageId}`);
+		}
+
+		sql += `${sqlWhere} ${sqlOrderBy}`;
+
+		if(_.isNumber(filter.limit)) {
+			sql += ` LIMIT ${filter.limit}`;
+		}
+
+		sql += ';';
+
+		if('count' === filter.resultType) {
+			msgDb.get(sql, (err, row) => {
+				return cb(err, row ? row.count : 0);
+			});
+		} else {
+			const matches = [];
+			const extra = filter.extraFields.length > 0;
+			msgDb.each(sql, (err, row) => {
+				if(_.isObject(row)) {
+					matches.push(extra ? row : row[field]);
+				}
+			}, err => {
+				return cb(err, matches);
+			});
+		}
+	}
+
+	//	:TODO: use findMessages, by uuid, limit=1
+	static getMessageIdByUuid(uuid, cb) {
+		msgDb.get(
+			`SELECT message_id
+			FROM message
+			WHERE message_uuid = ?
+			LIMIT 1;`,
+			[ uuid ],
+			(err, row) => {
+				if(err) {
+					return cb(err);
+				}
+
 				const success = (row && row.message_id);
-				cb(success ? null : new Error('No match'), success ? row.message_id : null);
-			}
-		}
-	);
-};
-
-Message.getMessageIdsByMetaValue = function(category, name, value, cb) {
-	msgDb.all(
-		`SELECT message_id
-		FROM message_meta
-		WHERE meta_category = ? AND meta_name = ? AND meta_value = ?;`,
-		[ category, name, value ],
-		(err, rows) => {
-			if(err) {
-				cb(err);
-			} else {
-				cb(null, rows.map(r => parseInt(r.message_id)));	//	return array of ID(s)
-			}
-		}
-	);
-};
-
-Message.getMetaValuesByMessageId = function(messageId, category, name, cb) {
-	const sql =
-		`SELECT meta_value
-		FROM message_meta
-		WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
-
-	msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
-		if(err) {
-			return cb(err);
-		}
-
-		if(0 === rows.length) {
-			return cb(new Error('No value for category/name'));
-		}
-
-		//	single values are returned without an array
-		if(1 === rows.length) {
-			return cb(null, rows[0].meta_value);
-		}
-
-		cb(null, rows.map(r => r.meta_value));	//	map to array of values only
-	});
-};
-
-Message.getMetaValuesByMessageUuid = function(uuid, category, name, cb) {
-	async.waterfall(
-		[
-			function getMessageId(callback) {
-				Message.getMessageIdByUuid(uuid, (err, messageId) => {
-					callback(err, messageId);
-				});
-			},
-			function getMetaValues(messageId, callback) {
-				Message.getMetaValuesByMessageId(messageId, category, name, (err, values) => {
-					callback(err, values);
-				});
-			}
-		],
-		(err, values) => {
-			cb(err, values);
-		}
-	);
-};
-
-Message.prototype.loadMeta = function(cb) {
-	/*
-		Example of loaded this.meta:
-
-		meta: {
-			System: {
-				local_to_user_id: 1234,
-			},
-			FtnProperty: {
-				ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
-			}
-		}
-	*/
-
-	const sql =
-		`SELECT meta_category, meta_name, meta_value
-		FROM message_meta
-		WHERE message_id = ?;`;
-
-	let self = this;
-	msgDb.each(sql, [ this.messageId ], (err, row) => {
-		if(!(row.meta_category in self.meta)) {
-			self.meta[row.meta_category] = { };
-			self.meta[row.meta_category][row.meta_name] = row.meta_value;
-		} else {
-			if(!(row.meta_name in self.meta[row.meta_category])) {
-				self.meta[row.meta_category][row.meta_name] = row.meta_value;
-			} else {
-				if(_.isString(self.meta[row.meta_category][row.meta_name])) {
-					self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];
-				}
-
-				self.meta[row.meta_category][row.meta_name].push(row.meta_value);
-			}
-		}
-	}, err => {
-		cb(err);
-	});
-};
-
-Message.prototype.load = function(options, cb) {
-	assert(_.isString(options.uuid));
-
-	var self = this;
-
-	async.series(
-		[
-			function loadMessage(callback) {
-				msgDb.get(
-					'SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, '	+
-					'message, modified_timestamp, view_count '																	+
-					'FROM message '																								+
-					'WHERE message_uuid=? '																						+
-					'LIMIT 1;',
-					[ options.uuid ],
-					(err, msgRow) => {
-						if(err) {
-							return callback(err);
-						}
-						if(!msgRow) {
-							return callback(new Error('Message (no longer) available'));
-						}
-
-						self.messageId		= msgRow.message_id;
-						self.areaTag		= msgRow.area_tag;
-						self.messageUuid	= msgRow.message_uuid;
-						self.replyToMsgId	= msgRow.reply_to_message_id;
-						self.toUserName		= msgRow.to_user_name;
-						self.fromUserName	= msgRow.from_user_name;
-						self.subject		= msgRow.subject;
-						self.message		= msgRow.message;
-						self.modTimestamp	= moment(msgRow.modified_timestamp);
-						self.viewCount		= msgRow.view_count;
-
-						callback(err);
-					}
+				return cb(
+					success ? null : Errors.DoesNotExist(`No message for UUID ${uuid}`),
+					success ? row.message_id : null
 				);
-			},
-			function loadMessageMeta(callback) {
-				self.loadMeta(err => {
-					callback(err);
-				});
-			},
-			function loadHashTags(callback) {
-				//	:TODO:
-				callback(null);
-			}
-		],
-		function complete(err) {
-			cb(err);
-		}
-	);
-};
-
-Message.prototype.persistMetaValue = function(category, name, value, transOrDb, cb) {
-	if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-		cb = transOrDb;
-		transOrDb = msgDb;
-	}
-
-	const metaStmt = transOrDb.prepare(
-		`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
-		VALUES (?, ?, ?, ?);`);
-
-	if(!_.isArray(value)) {
-		value = [ value ];
-	}
-
-	let self = this;
-
-	async.each(value, (v, next) => {
-		metaStmt.run(self.messageId, category, name, v, err => {
-			next(err);
-		});
-	}, err => {
-		cb(err);
-	});
-};
-
-Message.prototype.persist = function(cb) {
-
-	if(!this.isValid()) {
-		return cb(new Error('Cannot persist invalid message!'));
-	}
-
-	const self = this;
-
-	async.waterfall(
-		[
-			function beginTransaction(callback) {
-				return msgDb.beginTransaction(callback);
-			},
-			function storeMessage(trans, callback) {
-				//	generate a UUID for this message if required (general case)
-				const msgTimestamp = moment();
-				if(!self.uuid) {
-					self.uuid = Message.createMessageUUID(
-						self.areaTag,
-						msgTimestamp,
-						self.subject,
-						self.message);
-				}
-
-				trans.run(
-					`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
-					[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
-					function inserted(err) {	//	use non-arrow function for 'this' scope
-						if(!err) {
-							self.messageId = this.lastID;
-						}
-
-						return callback(err, trans);
-					}
-				);
-			},
-			function storeMeta(trans, callback) {
-				if(!self.meta) {
-					return callback(null, trans);
-				}
-				/*
-					Example of self.meta:
-
-					meta: {
-						System: {
-							local_to_user_id: 1234,
-						},
-						FtnProperty: {
-							ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
-						}
-					}
-				*/
-				async.each(Object.keys(self.meta), (category, nextCat) => {
-					async.each(Object.keys(self.meta[category]), (name, nextName) => {
-						self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
-							nextName(err);
-						});
-					}, err => {
-						nextCat(err);
-					});
-
-				}, err => {
-					callback(err, trans);
-				});
-			},
-			function storeHashTags(trans, callback) {
-				//	:TODO: hash tag support
-				return callback(null, trans);
-			}
-		],
-		(err, trans) => {
-			if(trans) {
-				trans[err ? 'rollback' : 'commit'](transErr => {
-					return cb(err ? err : transErr, self.messageId);
-				});
-			} else {
-				return cb(err);
-			}
-		}
-	);
-};
-
-Message.prototype.getFTNQuotePrefix = function(source) {
-	source = source || 'fromUserName';
-
-	return ftnUtil.getQuotePrefix(this[source]);
-};
-
-Message.prototype.getTearLinePosition = function(input) {
-	const m = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m);
-	return m ? m.index : -1;
-};
-
-Message.prototype.getQuoteLines = function(options, cb) {
-	if(!options.termWidth || !options.termHeight || !options.cols) {
-		return cb(Errors.MissingParam());
-	}
-
-	options.startCol			= options.startCol || 1;
-	options.includePrefix 		= _.get(options, 'includePrefix', true);
-	options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
-	options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
-	options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
-
-	/*
-		Some long text that needs to be wrapped and quoted should look right after
-		doing so, don't ya think? yeah I think so
-
-		Nu> Some long text that needs to be wrapped and quoted should look right
-		Nu> after doing so, don't ya think? yeah I think so
-
-		Ot> Nu> Some long text that needs to be wrapped and quoted should look
-		Ot> Nu> right after doing so, don't ya think? yeah I think so
-
-	*/
-	const quotePrefix = options.includePrefix ? this.getFTNQuotePrefix(options.prefixSource || 'fromUserName') : '';
-
-	function getWrapped(text, extraPrefix) {
-		extraPrefix = extraPrefix ? ` ${extraPrefix}` : '';
-
-		const wrapOpts = {
-			width		: options.cols - (quotePrefix.length + extraPrefix.length),
-			tabHandling	: 'expand',
-			tabWidth	: 4,
-		};
-
-		return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
-			return i === 0 ? `${quotePrefix}${w}` : `${quotePrefix}${extraPrefix}${w}`;
-		});
-	}
-
-	function getFormattedLine(line) {
-		//	for pre-formatted text, we just append a line truncated to fit
-		let newLen;
-		const total = line.length + quotePrefix.length;
-
-		if(total > options.cols) {
-			newLen = options.cols - total;
-		} else {
-			newLen = total;
-		}
-
-		return `${quotePrefix}${line.slice(0, newLen)}`;
-	}
-
-	if(options.isAnsi) {
-		ansiPrep(
-			this.message.replace(/\r?\n/g, '\r\n'),	//	normalized LF -> CRLF
-			{
-				termWidth		: options.termWidth,
-				termHeight		: options.termHeight,
-				cols			: options.cols,
-				rows			: 'auto',
-				startCol		: options.startCol,
-				forceLineTerm	: true,
-			},
-			(err, prepped) => {
-				prepped = prepped || this.message;
-
-				let lastSgr = '';
-				const split = splitTextAtTerms(prepped);
-
-				const quoteLines		= [];
-				const focusQuoteLines	= [];
-
-				//
-				//	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
-				//	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
-				//	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
-				//	the trick and allow them to leave them alone!
-				//
-				split.forEach(l => {
-					quoteLines.push(`${lastSgr}${l}`);
-
-					focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
-					lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
-				});
-
-				quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
-
-				return cb(null, quoteLines, focusQuoteLines, true);
 			}
 		);
-	} else {
-		const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
-		const quoted	= [];
-		const input		= _.trimEnd(this.message).replace(/\b/g, '');
+	}
 
-		//	find *last* tearline
-		let tearLinePos = this.getTearLinePosition(input);
-		tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
+	//	:TODO: use findMessages
+	static getMessageIdsByMetaValue(category, name, value, cb) {
+		msgDb.all(
+			`SELECT message_id
+			FROM message_meta
+			WHERE meta_category = ? AND meta_name = ? AND meta_value = ?;`,
+			[ category, name, value ],
+			(err, rows) => {
+				if(err) {
+					return cb(err);
+				}
+				return cb(null, rows.map(r => parseInt(r.message_id)));	//	return array of ID(s)
+			}
+		);
+	}
 
-		input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
-			//
-			//	For each paragraph, a state machine:
-			//	- New line - line
-			//	- New (pre)quoted line - quote_line
-			//	- Continuation of new/quoted line
-			//
-			//	Also:
-			//	- Detect pre-formatted lines & try to keep them as-is
-			//
-			let state;
-			let buf = '';
-			let quoteMatch;
+	static getMetaValuesByMessageId(messageId, category, name, cb) {
+		const sql =
+			`SELECT meta_value
+			FROM message_meta
+			WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
 
-			if(quoted.length > 0) {
-				//
-				//	Preserve paragraph seperation.
-				//
-				//	FSC-0032 states something about leaving blank lines fully blank
-				//	(without a prefix) but it seems nicer (and more consistent with other systems)
-				//	to put 'em in.
-				//
-				quoted.push(quotePrefix);
+		msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
+			if(err) {
+				return cb(err);
 			}
 
-			paragraph.split(/\r?\n/).forEach(line => {
-				if(0 === line.trim().length) {
-					//	see blank line notes above
-					return quoted.push(quotePrefix);
+			if(0 === rows.length) {
+				return cb(Errors.DoesNotExist('No value for category/name'));
+			}
+
+			//	single values are returned without an array
+			if(1 === rows.length) {
+				return cb(null, rows[0].meta_value);
+			}
+
+			return cb(null, rows.map(r => r.meta_value));	//	map to array of values only
+		});
+	}
+
+	static getMetaValuesByMessageUuid(uuid, category, name, cb) {
+		async.waterfall(
+			[
+				function getMessageId(callback) {
+					Message.getMessageIdByUuid(uuid, (err, messageId) => {
+						return callback(err, messageId);
+					});
+				},
+				function getMetaValues(messageId, callback) {
+					Message.getMetaValuesByMessageId(messageId, category, name, (err, values) => {
+						return callback(err, values);
+					});
+				}
+			],
+			(err, values) => {
+				return cb(err, values);
+			}
+		);
+	}
+
+	loadMeta(cb) {
+		/*
+			Example of loaded this.meta:
+
+			meta: {
+				System: {
+					local_to_user_id: 1234,
+				},
+				FtnProperty: {
+					ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
+				}
+			}
+		*/
+		const sql =
+			`SELECT meta_category, meta_name, meta_value
+			FROM message_meta
+			WHERE message_id = ?;`;
+
+		const self = this;	//	:TODO: not required - arrow functions below:
+		msgDb.each(sql, [ this.messageId ], (err, row) => {
+			if(!(row.meta_category in self.meta)) {
+				self.meta[row.meta_category] = { };
+				self.meta[row.meta_category][row.meta_name] = row.meta_value;
+			} else {
+				if(!(row.meta_name in self.meta[row.meta_category])) {
+					self.meta[row.meta_category][row.meta_name] = row.meta_value;
+				} else {
+					if(_.isString(self.meta[row.meta_category][row.meta_name])) {
+						self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];
+					}
+
+					self.meta[row.meta_category][row.meta_name].push(row.meta_value);
+				}
+			}
+		}, err => {
+			return cb(err);
+		});
+	}
+
+	load(options, cb) {
+		assert(_.isString(options.uuid));
+
+		const self = this;
+
+		async.series(
+			[
+				function loadMessage(callback) {
+					msgDb.get(
+						`SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject,
+						message, modified_timestamp, view_count
+						FROM message
+						WHERE message_uuid=?
+						LIMIT 1;`,
+						[ options.uuid ],
+						(err, msgRow) => {
+							if(err) {
+								return callback(err);
+							}
+
+							if(!msgRow) {
+								return callback(Errors.DoesNotExist('Message (no longer) available'));
+							}
+
+							self.messageId		= msgRow.message_id;
+							self.areaTag		= msgRow.area_tag;
+							self.messageUuid	= msgRow.message_uuid;
+							self.replyToMsgId	= msgRow.reply_to_message_id;
+							self.toUserName		= msgRow.to_user_name;
+							self.fromUserName	= msgRow.from_user_name;
+							self.subject		= msgRow.subject;
+							self.message		= msgRow.message;
+							self.modTimestamp	= moment(msgRow.modified_timestamp);
+
+							return callback(err);
+						}
+					);
+				},
+				function loadMessageMeta(callback) {
+					self.loadMeta(err => {
+						return callback(err);
+					});
+				},
+				function loadHashTags(callback) {
+					//	:TODO:
+					return callback(null);
+				}
+			],
+			err => {
+				return cb(err);
+			}
+		);
+	}
+
+	persistMetaValue(category, name, value, transOrDb, cb) {
+		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+			cb = transOrDb;
+			transOrDb = msgDb;
+		}
+
+		const metaStmt = transOrDb.prepare(
+			`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
+			VALUES (?, ?, ?, ?);`);
+
+		if(!_.isArray(value)) {
+			value = [ value ];
+		}
+
+		const self = this;
+
+		async.each(value, (v, next) => {
+			metaStmt.run(self.messageId, category, name, v, err => {
+				return next(err);
+			});
+		}, err => {
+			return cb(err);
+		});
+	}
+
+	persist(cb) {
+		if(!this.isValid()) {
+			return cb(Errors.Invalid('Cannot persist invalid message!'));
+		}
+
+		const self = this;
+
+		async.waterfall(
+			[
+				function beginTransaction(callback) {
+					return msgDb.beginTransaction(callback);
+				},
+				function storeMessage(trans, callback) {
+					//	generate a UUID for this message if required (general case)
+					const msgTimestamp = moment();
+					if(!self.uuid) {
+						self.uuid = Message.createMessageUUID(
+							self.areaTag,
+							msgTimestamp,
+							self.subject,
+							self.message
+						);
+					}
+
+					trans.run(
+						`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
+						VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
+						[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
+						function inserted(err) {	//	use non-arrow function for 'this' scope
+							if(!err) {
+								self.messageId = this.lastID;
+							}
+
+							return callback(err, trans);
+						}
+					);
+				},
+				function storeMeta(trans, callback) {
+					if(!self.meta) {
+						return callback(null, trans);
+					}
+					/*
+						Example of self.meta:
+
+						meta: {
+							System: {
+								local_to_user_id: 1234,
+							},
+							FtnProperty: {
+								ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
+							}
+						}
+					*/
+					async.each(Object.keys(self.meta), (category, nextCat) => {
+						async.each(Object.keys(self.meta[category]), (name, nextName) => {
+							self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
+								return nextName(err);
+							});
+						}, err => {
+							return nextCat(err);
+						});
+
+					}, err => {
+						return callback(err, trans);
+					});
+				},
+				function storeHashTags(trans, callback) {
+					//	:TODO: hash tag support
+					return callback(null, trans);
+				}
+			],
+			(err, trans) => {
+				if(trans) {
+					trans[err ? 'rollback' : 'commit'](transErr => {
+						return cb(err ? err : transErr, self.messageId);
+					});
+				} else {
+					return cb(err);
+				}
+			}
+		);
+	}
+
+	//	:TODO: FTN stuff doesn't have any business here
+	getFTNQuotePrefix(source) {
+		source = source || 'fromUserName';
+
+		return ftnUtil.getQuotePrefix(this[source]);
+	}
+
+	getTearLinePosition(input) {
+		const m = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m);
+		return m ? m.index : -1;
+	}
+
+	getQuoteLines(options, cb) {
+		if(!options.termWidth || !options.termHeight || !options.cols) {
+			return cb(Errors.MissingParam());
+		}
+
+		options.startCol			= options.startCol || 1;
+		options.includePrefix 		= _.get(options, 'includePrefix', true);
+		options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
+		options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
+		options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
+
+		/*
+			Some long text that needs to be wrapped and quoted should look right after
+			doing so, don't ya think? yeah I think so
+
+			Nu> Some long text that needs to be wrapped and quoted should look right
+			Nu> after doing so, don't ya think? yeah I think so
+
+			Ot> Nu> Some long text that needs to be wrapped and quoted should look
+			Ot> Nu> right after doing so, don't ya think? yeah I think so
+
+		*/
+		const quotePrefix = options.includePrefix ? this.getFTNQuotePrefix(options.prefixSource || 'fromUserName') : '';
+
+		function getWrapped(text, extraPrefix) {
+			extraPrefix = extraPrefix ? ` ${extraPrefix}` : '';
+
+			const wrapOpts = {
+				width		: options.cols - (quotePrefix.length + extraPrefix.length),
+				tabHandling	: 'expand',
+				tabWidth	: 4,
+			};
+
+			return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
+				return i === 0 ? `${quotePrefix}${w}` : `${quotePrefix}${extraPrefix}${w}`;
+			});
+		}
+
+		function getFormattedLine(line) {
+			//	for pre-formatted text, we just append a line truncated to fit
+			let newLen;
+			const total = line.length + quotePrefix.length;
+
+			if(total > options.cols) {
+				newLen = options.cols - total;
+			} else {
+				newLen = total;
+			}
+
+			return `${quotePrefix}${line.slice(0, newLen)}`;
+		}
+
+		if(options.isAnsi) {
+			ansiPrep(
+				this.message.replace(/\r?\n/g, '\r\n'),	//	normalized LF -> CRLF
+				{
+					termWidth		: options.termWidth,
+					termHeight		: options.termHeight,
+					cols			: options.cols,
+					rows			: 'auto',
+					startCol		: options.startCol,
+					forceLineTerm	: true,
+				},
+				(err, prepped) => {
+					prepped = prepped || this.message;
+
+					let lastSgr = '';
+					const split = splitTextAtTerms(prepped);
+
+					const quoteLines		= [];
+					const focusQuoteLines	= [];
+
+					//
+					//	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
+					//	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
+					//	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
+					//	the trick and allow them to leave them alone!
+					//
+					split.forEach(l => {
+						quoteLines.push(`${lastSgr}${l}`);
+
+						focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
+						lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
+					});
+
+					quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
+
+					return cb(null, quoteLines, focusQuoteLines, true);
+				}
+			);
+		} else {
+			const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
+			const quoted	= [];
+			const input		= _.trimEnd(this.message).replace(/\b/g, '');
+
+			//	find *last* tearline
+			let tearLinePos = this.getTearLinePosition(input);
+			tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
+
+			input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
+				//
+				//	For each paragraph, a state machine:
+				//	- New line - line
+				//	- New (pre)quoted line - quote_line
+				//	- Continuation of new/quoted line
+				//
+				//	Also:
+				//	- Detect pre-formatted lines & try to keep them as-is
+				//
+				let state;
+				let buf = '';
+				let quoteMatch;
+
+				if(quoted.length > 0) {
+					//
+					//	Preserve paragraph seperation.
+					//
+					//	FSC-0032 states something about leaving blank lines fully blank
+					//	(without a prefix) but it seems nicer (and more consistent with other systems)
+					//	to put 'em in.
+					//
+					quoted.push(quotePrefix);
 				}
 
-				quoteMatch = line.match(QUOTE_RE);
+				paragraph.split(/\r?\n/).forEach(line => {
+					if(0 === line.trim().length) {
+						//	see blank line notes above
+						return quoted.push(quotePrefix);
+					}
 
-				switch(state) {
-					case 'line' :
-						if(quoteMatch) {
-							if(isFormattedLine(line)) {
-								quoted.push(getFormattedLine(line.replace(/\s/, '')));
+					quoteMatch = line.match(QUOTE_RE);
+
+					switch(state) {
+						case 'line' :
+							if(quoteMatch) {
+								if(isFormattedLine(line)) {
+									quoted.push(getFormattedLine(line.replace(/\s/, '')));
+								} else {
+									quoted.push(...getWrapped(buf, quoteMatch[1]));
+									state = 'quote_line';
+									buf = line;
+								}
 							} else {
-								quoted.push(...getWrapped(buf, quoteMatch[1]));
-								state = 'quote_line';
+								buf += ` ${line}`;
+							}
+							break;
+
+						case 'quote_line' :
+							if(quoteMatch) {
+								const rem = line.slice(quoteMatch[0].length);
+								if(!buf.startsWith(quoteMatch[0])) {
+									quoted.push(...getWrapped(buf, quoteMatch[1]));
+									buf = rem;
+								} else {
+									buf += ` ${rem}`;
+								}
+							} else {
+								quoted.push(...getWrapped(buf));
 								buf = line;
+								state = 'line';
 							}
-						} else {
-							buf += ` ${line}`;
-						}
-						break;
+							break;
 
-					case 'quote_line' :
-						if(quoteMatch) {
-							const rem = line.slice(quoteMatch[0].length);
-							if(!buf.startsWith(quoteMatch[0])) {
-								quoted.push(...getWrapped(buf, quoteMatch[1]));
-								buf = rem;
+						default :
+							if(isFormattedLine(line)) {
+								quoted.push(getFormattedLine(line));
 							} else {
-								buf += ` ${rem}`;
+								state	= quoteMatch ? 'quote_line' : 'line';
+								buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
 							}
-						} else {
-							quoted.push(...getWrapped(buf));
-							buf = line;
-							state = 'line';
-						}
-						break;
+							break;
+					}
+				});
 
-					default :
-						if(isFormattedLine(line)) {
-							quoted.push(getFormattedLine(line));
-						} else {
-							state	= quoteMatch ? 'quote_line' : 'line';
-							buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
-						}
-						break;
-				}
+				quoted.push(...getWrapped(buf, quoteMatch ? quoteMatch[1] : null));
 			});
 
-			quoted.push(...getWrapped(buf, quoteMatch ? quoteMatch[1] : null));
-		});
+			input.slice(tearLinePos).split(/\r?\n/).forEach(l => {
+				quoted.push(...getWrapped(l));
+			});
 
-		input.slice(tearLinePos).split(/\r?\n/).forEach(l => {
-			quoted.push(...getWrapped(l));
-		});
-
-		return cb(null, quoted, null, false);
+			return cb(null, quoted, null, false);
+		}
 	}
 };

From 3d575f764534234ecc999d86694cc5bf4b307434 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:37:26 -0700
Subject: [PATCH 0142/1013] Default renderLen array

---
 core/word_wrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/word_wrap.js b/core/word_wrap.js
index f246ad23..ecb728a5 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -40,7 +40,7 @@ function wordWrapText(text, options) {
 	let renderLen;
 	let i			= 0;
 	let wordStart	= 0;
-	let result		= { wrapped : [ '' ], renderLen : [] };
+	let result		= { wrapped : [ '' ], renderLen : [ 0 ] };
 
 	function expandTab(column) {
 		const remainWidth = options.tabWidth - (column % options.tabWidth);

From b6bda7f45f459bd241249282b7331083f742eb7b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:38:50 -0700
Subject: [PATCH 0143/1013] much cleaner code

---
 core/theme.js | 56 ++++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 5c056c49..2c984ae0 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -34,47 +34,31 @@ function refreshThemeHelpers(theme) {
 	//
 	theme.helpers = {
 		getPasswordChar : function() {
-			var pwChar = Config.defaults.passwordChar;
-			if(_.has(theme, 'customization.defaults.general')) {
-				var themePasswordChar = theme.customization.defaults.general.passwordChar;
-				if(_.isString(themePasswordChar)) {
-					pwChar = themePasswordChar.substr(0, 1);
-				} else if(_.isNumber(themePasswordChar)) {
-					pwChar = String.fromCharCode(themePasswordChar);
-				}
+			let pwChar = _.get(
+				theme,
+				'customization.defaults.general.passwordChar',
+				Config.defaults.passwordChar
+			);
+
+			if(_.isString(pwChar)) {
+				pwChar = pwChar.substr(0, 1);
+			} else if(_.isNumber(pwChar)) {
+				pwChar = String.fromCharCode(pwChar);
 			}
+
 			return pwChar;
 		},
-		getDateFormat : function(style) {
-			style = style || 'short';
-
-			var format = Config.defaults.dateFormat[style] || 'MM/DD/YYYY';
-
-			if(_.has(theme, 'customization.defaults.dateFormat')) {
-				return theme.customization.defaults.dateFormat[style] || format;
-			}
-			return format;
+		getDateFormat : function(style = 'short') {
+			const format = Config.defaults.dateFormat[style] || 'MM/DD/YYYY';
+			return _.get(theme, `customization.defaults.dateFormat.${style}`, format);
 		},
-		getTimeFormat : function(style) {
-			style = style || 'short';
-
-			var format = Config.defaults.timeFormat[style] || 'h:mm a';
-
-			if(_.has(theme, 'customization.defaults.timeFormat')) {
-				return theme.customization.defaults.timeFormat[style] || format;
-			}
-			return format;
+		getTimeFormat : function(style = 'short') {
+			const format = Config.defaults.timeFormat[style] || 'h:mm a';
+			return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
 		},
-		getDateTimeFormat : function(style) {
-			style = style || 'short';
-
-			var format = Config.defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
-
-			if(_.has(theme, 'customization.defaults.dateTimeFormat')) {
-				return theme.customization.defaults.dateTimeFormat[style] || format;
-			}
-
-			return format;
+		getDateTimeFormat : function(style = 'short') {
+			const format = Config.defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
+			return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
 		}
 	};
 }

From cc119297e83f33107ede69b85261f5878c376620 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:39:53 -0700
Subject: [PATCH 0144/1013] wcValue -> wildcards (readability)

---
 core/file_entry.js              | 2 +-
 core/scanner_tossers/ftn_bso.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 861b9d79..b95c7acb 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -496,7 +496,7 @@ module.exports = class FileEntry {
 		if(filter.metaPairs && filter.metaPairs.length > 0) {
 
 			filter.metaPairs.forEach(mp => {
-				if(mp.wcValue) {
+				if(mp.wildcards) {
 					//	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
 					mp.value = mp.value.replace(/\*/g, '%').replace(/\?/g, '_');
 					appendWhereClause(
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index a24024ee..8c87b61f 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1718,9 +1718,9 @@ function FTNMessageScanTossModule() {
 
 					const metaPairs = [
 						{
-							name	: 'short_file_name',
-							value	: replaces.toUpperCase(),	//	we store upper as well
-							wcValue	: true,	//	value may contain wildcards
+							name		: 'short_file_name',
+							value		: replaces.toUpperCase(),	//	we store upper as well
+							wildcards	: true,	//	value may contain wildcards
 						},
 						{
 							name	: 'tic_origin',

From f350e3d446c81e1bd797f42f4bfd317a55dfeb73 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:41:53 -0700
Subject: [PATCH 0145/1013] Use private message list header for 'inbox'

---
 art/themes/luciano_blocktronics/PRVMSGLIST.ANS | Bin 0 -> 2291 bytes
 config/menu.hjson                              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 art/themes/luciano_blocktronics/PRVMSGLIST.ANS

diff --git a/art/themes/luciano_blocktronics/PRVMSGLIST.ANS b/art/themes/luciano_blocktronics/PRVMSGLIST.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..911f1f2030dd91fe3cdf1e638635457a2565362e
GIT binary patch
literal 2291
zcmb_e%Wl&^6is)iTQ-zP;7!)pPT~l%Dp7@ysDvm~psWgtc!+5QrSK8_Ox175U)Yj=
zg>%lmGj<YS1D1$Acg}sBbMFitF7x>$pO5p94VOh|>h5Wqwizz-0DG~(4?(bX0DQFs
zWf_0%ow>_2dT2*J&3;zb7H~F++jUJVa*xY!_H}iJk32l$x(cJ0&r0Mifn^orF+Kpx
z!sUA}N5GQ630?B=zz{G@=|oN}+p_#QcNNaBkO4YW?o)=f)_S`&TwcBXw2fM?6A+*H
zE&|`_iBYf<!~FPgu^Xj_V}!Wu;zi3wpw;<qBufqZ27R>0BaBXui{WxQpOlowR+@m}
zvQpb5SHx5K8I>>0oLQJHbM~+17Sqx029en-PbtT<#H_{iY;PBsQVx~<YdBm^Pds|w
zfHm#kwk4vtVeUq+-;D7MJY-8+As0~)iPKqyronjt26I<pk!gwbq=bHW0fAri#`0=e
z%qNw@wZ}8WQRI=Tv9MSQD?2#hY0{1rV7;R+sws1}j18t3Jy%*i8*<H16dudUDrwM4
z&EV4aNW{xh-t8EG8MWx*!d8rclrs{<rx8P_Wb*>#9fcHQ(ubx9sJ8=*i~x%l>P43E
z9zftST&_N^-hGpkQux_VV)ttibKOYPT03l+i6GXJ4Yb;16OP^6fQdT-L^-3PD4`RS
zHCQZ3P*a~y1MKO%T7Q4rBqre8z>jl=qNtW%v}L$+aPPk4NMeMG?<<pnKD}Y^F5vdo
zW4qp=l*P)uxrvo+GO;#xb-F}xc;J*KiGge=Ov&EtW5`rlm)o@ID`Rc)k{i1uz-1O%
zl<InD8jemd@)A*0lMG+3KKeu?8F)D;wb4K`5f4Y&k8qC`i&qkp<N7*k*TY19Ry&kP
z!QxS4uXLaR?f!?^X<;0pm;-LT2vU>~$!PIRJzX9#2k!>@@!WtIXQUu8i2~wg^4qFq
z2ijONXNlJij9aD#_au?dEdtq%&fVpUpocN3{Rz<OZ;N*S?#bb+#ZjI!-hX<^yqFew
ck^j6k80_sm9~=zy+<yA_I6HlEXsh)53l8n_EdT%j

literal 0
HcmV?d00001

diff --git a/config/menu.hjson b/config/menu.hjson
index 386c6f89..b8d26521 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -2465,7 +2465,7 @@
 
 		mailMenuInbox: {
 			module: msg_list
-			art: MSGLIST
+			art: PRVMSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
 				messageAreaTag: private_mail

From dc1ff587a3ceb9c754e6b8ee5a66e115ec957734 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:42:43 -0700
Subject: [PATCH 0146/1013] Use new Message.findMessages() functionality

---
 core/message_area.js | 225 +++++++++++++------------------------------
 1 file changed, 69 insertions(+), 156 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index 3c42e23f..fb068e13 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -320,177 +320,90 @@ function getMessageFromRow(row) {
 		fromUserName	: row.from_user_name,
 		subject			: row.subject,
 		modTimestamp	: row.modified_timestamp,
-		viewCount		: row.view_count,
 	};
 }
 
-function getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, what) {
-	//
-	//	Helper for building SQL to fetch either a full message list or simply
-	//	a count of new messages based on |what|.
-	//
-	//	* If |areaTag| is Message.WellKnownAreaTags.Private,
-	//	  only messages addressed to |userId| should be returned/counted.
-	//
-	//	* Only messages > |lastMessageId| should be returned/counted
-	//
-	const selectWhat = ('count' === what) ?
-		'COUNT() AS count' :
-		'message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count';
-
-	let sql =
-		`SELECT ${selectWhat}
-		FROM message
-		WHERE area_tag = "${areaTag}" AND message_id > ${lastMessageId}`;
-
-	if(Message.isPrivateAreaTag(areaTag)) {
-		sql +=
-			` AND message_id in (
-				SELECT message_id 
-				FROM message_meta 
-				WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${userId}
-			)`;
-	}
-
-	if('count' === what) {
-		sql += ';';
-	} else {
-		sql += ' ORDER BY message_id;';
-	}
-
-	return sql;
-}
-
 function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
-	async.waterfall(
-		[
-			function getLastMessageId(callback) {
-				getMessageAreaLastReadId(userId, areaTag, function fetched(err, lastMessageId) {
-					callback(null, lastMessageId || 0);	//	note: willingly ignoring any errors here!
-				});
-			},
-			function getCount(lastMessageId, callback) {
-				const sql = getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, 'count');
-				msgDb.get(sql, (err, row) => {
-					return callback(err, row ? row.count : 0);
-				});
-			}
-		],
-		cb
-	);
+	getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
+		lastMessageId = lastMessageId || 0;
+
+		const filter = {
+			areaTag,
+			newerThanMessageId	: lastMessageId,
+			resultType			: 'count',
+		};
+
+		if(Message.isPrivateAreaTag(areaTag)) {
+			filter.privateTagUserId = userId;
+		}
+
+		Message.findMessages(filter, (err, count) => {
+			return cb(err, count);
+		});
+	});
 }
 
 function getNewMessagesInAreaForUser(userId, areaTag, cb) {
-	//
-	//	If |areaTag| is Message.WellKnownAreaTags.Private,
-	//	only messages addressed to |userId| should be returned.
-	//
-	//	Only messages > lastMessageId should be returned
-	//
-	let msgList = [];
+	getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
+		lastMessageId = lastMessageId || 0;
 
-	async.waterfall(
-		[
-			function getLastMessageId(callback) {
-				getMessageAreaLastReadId(userId, areaTag, function fetched(err, lastMessageId) {
-					callback(null, lastMessageId || 0);	//	note: willingly ignoring any errors here!
-				});
-			},
-			function getMessages(lastMessageId, callback) {
-				const sql = getNewMessageDataInAreaForUserSql(userId, areaTag, lastMessageId, 'messages');
+		const filter = {
+			areaTag,
+			newerThanMessageId	: lastMessageId,
+			sort				: 'messageId',
+			order				: 'ascending',
+			extraFields			: [ 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
+		};
 
-				msgDb.each(sql, function msgRow(err, row) {
-					if(!err) {
-						msgList.push(getMessageFromRow(row));
-					}
-				}, callback);
-			}
-		],
-		function complete(err) {
-			cb(err, msgList);
+		if(Message.isPrivateAreaTag(areaTag)) {
+			filter.privateTagUserId = userId;
 		}
-	);
-}
 
-function getMessageListForArea(options, areaTag, cb) {
-	//
-	//	options.client (required)
-	//
-
-	options.client.log.debug( { areaTag : areaTag }, 'Fetching available messages');
-
-	assert(_.isObject(options.client));
-
-	/*
-		[
-			{
-				messageId, messageUuid, replyToId, toUserName, fromUserName, subject, modTimestamp,
-				status(new|old),
-				viewCount
-			}
-		]
-	*/
-
-	let msgList = [];
-
-	async.series(
-		[
-			function fetchMessages(callback) {
-				let sql =
-					`SELECT message_id, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, modified_timestamp, view_count
-					FROM message
-					WHERE area_tag = ?`;
-
-				if(Message.isPrivateAreaTag(areaTag)) {
-					sql +=
-						` AND message_id IN (
-							SELECT message_id 
-							FROM message_meta 
-							WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${options.client.user.userId}
-						)`;
-				}
-
-				sql += ' ORDER BY message_id;';
-
-				msgDb.each(
-					sql,
-					[ areaTag.toLowerCase() ],
-					(err, row) => {
-						if(!err) {
-							msgList.push(getMessageFromRow(row));
-						}
-					},
-					callback
-				);
-			},
-			function fetchStatus(callback) {
-				callback(null);//	:TODO: fixmeh.
-			}
-		],
-		function complete(err) {
-			cb(err, msgList);
-		}
-	);
-}
-
-function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
-	if(moment.isMoment(newerThanTimestamp)) {
-		newerThanTimestamp = getISOTimestampString(newerThanTimestamp);
-	}
-
-	msgDb.get(
-		`SELECT message_id 
-		FROM message
-		WHERE area_tag = ? AND DATETIME(modified_timestamp) > DATETIME("${newerThanTimestamp}", "+1 seconds")
-		ORDER BY modified_timestamp ASC
-		LIMIT 1;`,
-		[ areaTag ],
-		(err, row) => {
+		Message.findMessages(filter, (err, messages) => {
 			if(err) {
 				return cb(err);
 			}
 
-			return cb(null, row ? row.message_id : null);
+			return cb(null, messages.map(msg => getMessageFromRow(msg)));
+		});
+	});
+}
+
+function getMessageListForArea(client, areaTag, cb) {
+	const filter = {
+		areaTag,
+		sort		: 'messageId',
+		order		: 'ascending',
+		extraFields	: [ 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
+	};
+
+	if(Message.isPrivateAreaTag(areaTag)) {
+		filter.privateTagUserId = client.user.userId;
+	}
+
+	Message.findMessages(filter, (err, messages) => {
+		if(err) {
+			return cb(err);
+		}
+
+		return cb(null, messages.map(msg => getMessageFromRow(msg)));
+	});
+}
+
+function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
+	Message.findMessages(
+		{
+			areaTag,
+			newerThanTimestamp,
+			sort 	: 'modTimestamp',
+			order	: 'ascending',
+			limit	: 1,
+		},
+		(err, id) => {
+			if(err) {
+				return cb(err);
+			}
+			return cb(null, id ? id[0] : null);
 		}
 	);
 }

From 303259841fc5fb69d0638ab46ae01846097398d3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:43:08 -0700
Subject: [PATCH 0147/1013] options -> client, since client was only option ;)

---
 core/msg_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/msg_list.js b/core/msg_list.js
index 19ef30cd..72ee20f5 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -159,7 +159,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 							return callback(0 === self.messageList.length ? new Error('No messages in area') : null);
 						}
 
-						messageArea.getMessageListForArea( { client : self.client }, self.messageAreaTag, function msgs(err, msgList) {
+						messageArea.getMessageListForArea(self.client, self.messageAreaTag, function msgs(err, msgList) {
 							if(!msgList || 0 === msgList.length) {
 								return callback(new Error('No messages in area'));
 							}

From a3e257aee3b086a2e150e525a9d06b9dd8df05f2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:44:07 -0700
Subject: [PATCH 0148/1013] Fix FSE word wrap bug when no barriers could be
 located in a > width string

---
 core/multi_line_edit_text_view.js | 63 ++++++++++++-------------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index bc73e903..1be0591f 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -56,9 +56,9 @@ const _				= require('lodash');
 //	To-Do
 //
 //	* Index pos % for emit scroll events
-//	* Some of this shoudl be async'd where there is lots of processing (e.g. word wrap)
+//	* Some of this should be async'd where there is lots of processing (e.g. word wrap)
 //	* Fix backspace when col=0 (e.g. bs to prev line)
-//	* Add back word delete
+//	* Add word delete (CTRL+????)
 //	*
 
 
@@ -336,13 +336,10 @@ function MultiLineEditTextView(options) {
 	*/
 
 	this.updateTextWordWrap = function(index) {
-		var nextEolIndex	= self.getNextEndOfLineIndex(index);
-		var wrapped			= self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
-		var newLines		= wrapped.wrapped;
+		const nextEolIndex	= self.getNextEndOfLineIndex(index);
+		const wrapped		= self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
+		const newLines		= wrapped.wrapped.map(l => { return { text : l }; } );
 
-		for(var i = 0; i < newLines.length; ++i) {
-			newLines[i] = { text : newLines[i] };
-		}
 		newLines[newLines.length - 1].eol = true;
 
 		Array.prototype.splice.apply(
@@ -420,44 +417,40 @@ function MultiLineEditTextView(options) {
 			self.textLines[index].text.slice(col)
 		].join('');
 
-		//self.cursorPos.col++;
 		self.cursorPos.col += c.length;
 
-		var cursorOffset;
-		var absPos;
+		let cursorOffset;
+		let absPos;
 
 		if(self.getTextLength(index) > self.dimens.width) {
 			//
 			//	Update word wrapping and |cursorOffset| if the cursor
 			//	was within the bounds of the wrapped text
 			//
-			var lastCol			= self.cursorPos.col - c.length;
-			var firstWrapRange	= self.updateTextWordWrap(index);
+			const lastCol			= self.cursorPos.col - c.length;
+			const firstWrapRange	= self.updateTextWordWrap(index);
 			if(lastCol >= firstWrapRange.start && lastCol <= firstWrapRange.end) {
 				cursorOffset = self.cursorPos.col - firstWrapRange.start;
+			} else {
+				cursorOffset = firstWrapRange.end;
 			}
 
 			//	redraw from current row to end of visible area
 			self.redrawRows(self.cursorPos.row, self.dimens.height);
 
-			if(!_.isUndefined(cursorOffset)) {
-				self.cursorBeginOfNextLine();
-				self.cursorPos.col += cursorOffset;
-				self.client.term.rawWrite(ansi.right(cursorOffset));
-			} else {
-				self.moveClientCursorToCursorPos();
-			}
+			self.cursorBeginOfNextLine();
+			self.cursorPos.col += cursorOffset;
+			self.client.term.rawWrite(ansi.right(cursorOffset));
 		} else {
 			//
 			//	We must only redraw from col -> end of current visible line
 			//
 			absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+			const renderText = self.getRenderText(index).slice(self.cursorPos.col - c.length);
+
 			self.client.term.write(
-				ansi.hideCursor() +
-				self.getSGRFor('text') +
-				self.getRenderText(index).slice(self.cursorPos.col - c.length) +
-				ansi.goto(absPos.row, absPos.col) +
-				ansi.showCursor(), false
+				`${ansi.hideCursor()}${self.getSGRFor('text')}${renderText}${ansi.goto(absPos.row, absPos.col)}${ansi.showCursor()}`,
+				false	//	convertLineFeeds
 			);
 		}
 	};
@@ -495,16 +488,12 @@ function MultiLineEditTextView(options) {
 		return new Array(self.getRemainingTabWidth(col)).join(expandChar);
 	};
 
-	this.wordWrapSingleLine = function(s, tabHandling, width) {
-		if(!_.isNumber(width)) {
-			width = self.dimens.width;
-		}
-
+	this.wordWrapSingleLine = function(line, tabHandling = 'expand') {
 		return wordWrapText(
-			s,
+			line,
 			{
-				width		: width,
-				tabHandling	: tabHandling || 'expand',
+				width		: self.dimens.width,
+				tabHandling	: tabHandling,
 				tabWidth	: self.tabWidth,
 				tabChar		: '\t',
 			}
@@ -615,11 +604,7 @@ function MultiLineEditTextView(options) {
 
 		let wrapped;
 		text.forEach(line => {
-			wrapped = self.wordWrapSingleLine(
-				line,	 	//	line to wrap
-				'expand', 	//	tabHandling
-				self.dimens.width
-			).wrapped;
+			wrapped = self.wordWrapSingleLine(line, 'expand').wrapped;
 
 			self.setTextLines(wrapped, index, true);	//	true=termWithEol
 			index += wrapped.length;
@@ -784,7 +769,7 @@ function MultiLineEditTextView(options) {
 		var index			= self.getTextLinesIndex();
 		var nextEolIndex	= self.getNextEndOfLineIndex(index);
 		var text			= self.getContiguousText(index, nextEolIndex);
-		var newLines		= self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
+		const newLines		= self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
 
 		newLines.unshift( { text : text.slice(0, self.cursorPos.col), eol : true } );
 		for(var i = 1; i < newLines.length; ++i) {

From 974ee1b389768d5a1337626e7a9b443efad86485 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 26 Jan 2018 21:45:08 -0700
Subject: [PATCH 0149/1013] MAJOR *POSSIBLY BREAKING* changes in FSE * WIP on
 cleanup to use 'standard' MCI formatting / theming  used elsewhere in system
 * Some MCI ID changes (e.g. FSE in edit mode %TL13 -> %TL4); update your
 theme.hjson / artwork!

---
 art/themes/luciano_blocktronics/MSGEHDR.ANS | Bin 1578 -> 1578 bytes
 core/fse.js                                 | 216 +++++++++-----------
 2 files changed, 100 insertions(+), 116 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSGEHDR.ANS b/art/themes/luciano_blocktronics/MSGEHDR.ANS
index b2ed34e7eb397451cec927bfb56d220142458478..c455a9a3eca82f881c2e882359903293b244c516 100644
GIT binary patch
delta 15
WcmZ3*vx;Yf8Y`2D!e$LtCPn}whXa8C

delta 15
WcmZ3*vx;Yf8Y`2b@n#KHCPn}w<O7ia

diff --git a/core/fse.js b/core/fse.js
index 02134f31..de8fb1f9 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -29,72 +29,57 @@ exports.moduleInfo = {
 	author	: 'NuSkooler',
 };
 
-/*
-	MCI Codes - General
-		MA - Message Area Desc
-
-	MCI Codes - View Mode
-		Header
-			TL1 - From
-			TL2 - To
-			TL3 - Subject
-			TL4 - Area name
-
-			TL5 - Date/Time (TODO: format)
-			TL6 - Message number
-			TL7 - Mesage total (in area)
-			TL8 - View Count
-			TL9 - Hash tags
-			TL10 - Message ID
-			TL11 - Reply to message ID
-
-			TL12 - User1
-			TL13 - User2
-
-
-		Footer - Viewing
-			HM1 - Menu (prev/next/etc.)
-
-			TL6 - Message number
-			TL7 - Message total (in area)
-
-			TL12 - User1 (fmt message object)
-			TL13 - User2
-
-
-*/
-const MciCodeIds = {
-	ViewModeHeader : {
-		From			: 1,
-		To				: 2,
-		Subject			: 3,
-
-		DateTime		: 5,
-		MsgNum			: 6,
-		MsgTotal		: 7,
-		ViewCount		: 8,
-		HashTags		: 9,
-		MessageID		: 10,
-		ReplyToMsgID	: 11,
-
-		//	:TODO: ConfName
+const MciViewIds = {
+	header : {
+		from 				: 1,
+		to					: 2,
+		subject				: 3,
+		errorMsg			: 4,
+		modTimestamp		: 5,
+		msgNum				: 6,
+		msgTotal			: 7,
 
+		customRangeStart	: 10,	//	10+ = customs
 	},
 
+	body : {
+		message	: 1,
+	},
+
+	//	:TODO: quote builder MCIs - remove all magic #'s
+
+	//	:TODO: consolidate all footer MCI's - remove all magic #'s
 	ViewModeFooter : {
 		MsgNum			: 6,
 		MsgTotal		: 7,
+		//	:TODO: Just use custom ranges
 	},
 
-	ReplyEditModeHeader : {
-		From			: 1,
-		To				: 2,
-		Subject			: 3,
-
-		ErrorMsg		: 13,
-	},
+	quoteBuilder : {
+		quotedMsg	: 1,
+		//	2 NYI
+		quoteLines	: 3,
+	}
 };
 
+/*
+	Custom formatting:
+	header
+		fromUserName
+		toUserName
+
+		fromRealName (may be fromUserName) NYI
+		toRealName (may be toUserName) NYI
+
+		fromRemoteUser (may be "N/A")
+		toRemoteUser (may be "N/A")
+		subject
+		modTimestamp
+		msgNum
+		msgTotal (in area)
+		messageId
+*/
+
 //	:TODO: convert code in this class to newer styles, conventions, etc. There is a lot of experimental stuff here that has better (DRY) alternatives
 
 exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModule extends MessageAreaConfTempSwitcher(MenuModule) {
@@ -155,13 +140,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			//	Validation stuff
 			//
 			viewValidationListener : function(err, cb) {
-				var errMsgView = self.viewControllers.header.getView(MciCodeIds.ReplyEditModeHeader.ErrorMsg);
+				var errMsgView = self.viewControllers.header.getView(MciViewIds.header.errorMsg);
 				var newFocusViewId;
 				if(errMsgView) {
 					if(err) {
 						errMsgView.setText(err.message);
 
-						if(MciCodeIds.ViewModeHeader.Subject === err.view.getId()) {
+						if(MciViewIds.header.subject === err.view.getId()) {
 							//	:TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
 						}
 					} else {
@@ -208,8 +193,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				return cb(null);
 			},
 			appendQuoteEntry: function(formData, extraArgs, cb) {
-				//	:TODO: Dont' use magic # ID's here
-				const quoteMsgView = self.viewControllers.quoteBuilder.getView(1);
+				const quoteMsgView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
 
 				if(self.newQuoteBlock) {
 					self.newQuoteBlock = false;
@@ -219,14 +203,16 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					quoteMsgView.addText(self.getQuoteByHeader());
 				}
 
-				const quoteText = self.viewControllers.quoteBuilder.getView(3).getItem(formData.value.quote);
+				const quoteListView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
+				const quoteText		= quoteListView.getItem(formData.value.quote);
+
 				quoteMsgView.addText(quoteText);
 
 				//
 				//	If this is *not* the last item, advance. Otherwise, do nothing as we
 				//	don't want to jump back to the top and repeat already quoted lines
 				//
-				const quoteListView = self.viewControllers.quoteBuilder.getView(3);
+				
 				if(quoteListView.getData() !== quoteListView.getCount() - 1) {
 					quoteListView.focusNext();
 				} else {
@@ -293,22 +279,28 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		}[name];
 	}
 
-	//	:TODO: convert to something like this for all view acces:
-	getHeaderViews() {
-		var vc = this.viewControllers.header;
+	getHeaderFormatObj() {
+		const remoteUserNotAvail 	= this.menuConfig.config.remoteUserNotAvail || 'N/A';
+		const localUserIdNotAvail	= this.menuConfig.config.localUserIdNotAvail || 'N/A';
+		const modTimestampFormat	= this.menuConfig.config.modTimestampFormat || this.client.currentTheme.helpers.getDateTimeFormat();
 
-		if(this.isViewMode()) {
-			return {
-				from		: vc.getView(1),
-				to			: vc.getView(2),
-				subject		: vc.getView(3),
-
-				dateTime	: vc.getView(5),
-				msgNum		: vc.getView(7),
-				//	...
-
-			};
-		}
+		return {
+			//	:TODO: ensure we show real names for form/to if they are enforced in the area
+			fromUserName		: this.message.fromUserName,
+			toUserName			: this.message.toUserName,
+			//	:TODO:
+			//fromRealName
+			//toRealName
+			fromUserId			: _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
+			toUserId			: _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
+			fromRemoteUser		: _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
+			toRemoteUser		: _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
+			subject				: this.message.subject,
+			modTimestamp		: this.message.modTimestamp.format(modTimestampFormat),
+			msgNum				: this.messageIndex + 1,
+			msgTotal			: this.messageTotal,
+			messageId			: this.message.messageId,
+		};
 	}
 
 	setInitialFooterMode() {
@@ -327,7 +319,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			fromUserName	: this.client.user.username,
 			subject			: headerValues.subject,
 			//	:TODO: don't hard code 1 here:
-			message			: this.viewControllers.body.getView(1).getData( { forceLineTerms : this.replyIsAnsi } ),
+			message			: this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
 		};
 
 		if(this.isReply()) {
@@ -360,7 +352,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					this.initHeaderViewMode();
 					this.initFooterViewMode();
 
-					const bodyMessageView	= this.viewControllers.body.getView(1);
+					const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
 					let msg					= this.message.message;
 
 					if(bodyMessageView && _.has(this, 'message.message')) {
@@ -407,14 +399,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 					return callback(null);
 				},
-				function populateLocalUserInfo(callback) {
+				function populateLocalUserInfo(callback) {					
+					self.message.setLocalFromUserId(self.client.user.userId);
+
 					if(!self.isPrivateMail()) {
 						return callback(null);
 					}
 
-					//	:TODO: shouldn't local from user ID be set for all mail?
-					self.message.setLocalFromUserId(self.client.user.userId);
-
 					if(self.toUserId > 0) {
 						self.message.setLocalToUserId(self.toUserId);
 						return callback(null);
@@ -695,12 +686,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				},
 				function prepareViewStates(callback) {
 					var header = self.viewControllers.header;
-					var from = header.getView(1);
+					var from = header.getView(MciViewIds.header.from);
 					from.acceptsFocus = false;
 					//from.setText(self.client.user.username);
 
 					//	:TODO: make this a method
-					var body = self.viewControllers.body.getView(1);
+					var body = self.viewControllers.body.getView(MciViewIds.body.message);
 					self.updateTextEditMode(body.getTextEditMode());
 					self.updateEditModePosition(body.getEditPosition());
 
@@ -716,7 +707,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 								self.initHeaderViewMode();
 								self.initFooterViewMode();
 
-								var bodyMessageView = self.viewControllers.body.getView(1);
+								var bodyMessageView = self.viewControllers.body.getView(MciViewIds.body.message);
 								if(bodyMessageView && _.has(self, 'message.message')) {
 									//self.setBodyMessageViewText();
 									bodyMessageView.setText(cleanControlCodes(self.message.message));
@@ -726,7 +717,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 						case 'edit' :
 							{
-								const fromView = self.viewControllers.header.getView(1);
+								const fromView = self.viewControllers.header.getView(MciViewIds.header.from);
 								const area = getMessageAreaByTag(self.messageAreaTag);
 								if(area && area.realNames) {
 									fromView.setText(self.client.user.properties.real_name || self.client.user.username);
@@ -817,24 +808,20 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	}
 
 	initHeaderViewMode() {
-		assert(_.isObject(this.message));
+		this.setHeaderText(MciViewIds.header.from,			this.message.fromUserName);
+		this.setHeaderText(MciViewIds.header.to,			this.message.toUserName);
+		this.setHeaderText(MciViewIds.header.subject,		this.message.subject);
+		this.setHeaderText(MciViewIds.header.modTimestamp,	moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
+		this.setHeaderText(MciViewIds.header.msgNum,		(this.messageIndex + 1).toString());
+		this.setHeaderText(MciViewIds.header.msgTotal,		this.messageTotal.toString());
 
-		this.setHeaderText(MciCodeIds.ViewModeHeader.From,			this.message.fromUserName);
-		this.setHeaderText(MciCodeIds.ViewModeHeader.To,			this.message.toUserName);
-		this.setHeaderText(MciCodeIds.ViewModeHeader.Subject,		this.message.subject);
-		this.setHeaderText(MciCodeIds.ViewModeHeader.DateTime,		moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
-		this.setHeaderText(MciCodeIds.ViewModeHeader.MsgNum,		(this.messageIndex + 1).toString());
-		this.setHeaderText(MciCodeIds.ViewModeHeader.MsgTotal,		this.messageTotal.toString());
-		this.setHeaderText(MciCodeIds.ViewModeHeader.ViewCount,		this.message.viewCount);
-		this.setHeaderText(MciCodeIds.ViewModeHeader.HashTags,		'TODO hash tags');
-		this.setHeaderText(MciCodeIds.ViewModeHeader.MessageID,		this.message.messageId);
-		this.setHeaderText(MciCodeIds.ViewModeHeader.ReplyToMsgID,	this.message.replyToMessageId);
+		this.updateCustomViewTextsWithFilter('header', MciViewIds.header.customRangeStart, this.getHeaderFormatObj());
 	}
 
 	initHeaderReplyEditMode() {
 		assert(_.isObject(this.replyToMessage));
 
-		this.setHeaderText(MciCodeIds.ReplyEditModeHeader.To, this.replyToMessage.fromUserName);
+		this.setHeaderText(MciViewIds.header.to, this.replyToMessage.fromUserName);
 
 		//
 		//	We want to prefix the subject with "RE: " only if it's not already
@@ -845,12 +832,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			newSubj = `RE: ${newSubj}`;
 		}
 
-		this.setHeaderText(MciCodeIds.ReplyEditModeHeader.Subject,	newSubj);
+		this.setHeaderText(MciViewIds.header.subject,	newSubj);
 	}
 
 	initFooterViewMode() {
-		this.setViewText('footerView', MciCodeIds.ViewModeFooter.MsgNum, (this.messageIndex + 1).toString() );
-		this.setViewText('footerView', MciCodeIds.ViewModeFooter.MsgTotal, this.messageTotal.toString() );
+		this.setViewText('footerView', MciViewIds.ViewModeFooter.msgNum, (this.messageIndex + 1).toString() );
+		this.setViewText('footerView', MciViewIds.ViewModeFooter.msgTotal, this.messageTotal.toString() );
 	}
 
 	displayHelp(cb) {
@@ -913,8 +900,8 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					}
 				},
 				function loadQuoteLines(callback) {
-					const quoteView = self.viewControllers.quoteBuilder.getView(3);
-					const bodyView	= self.viewControllers.body.getView(1);
+					const quoteView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
+					const bodyView	= self.viewControllers.body.getView(MciViewIds.body.message);
 
 					self.replyToMessage.getQuoteLines(
 						{
@@ -935,16 +922,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 							quoteView.setItems(quoteLines);
 							quoteView.setFocusItems(focusQuoteLines);
 
+							self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg).setFocus(false);
+							self.viewControllers.quoteBuilder.switchFocus(MciViewIds.quoteBuilder.quoteLines);
+
 							return callback(null);
 						}
 					);
 				},
-				function setViewFocus(callback) {
-					self.viewControllers.quoteBuilder.getView(1).setFocus(false);
-					self.viewControllers.quoteBuilder.switchFocus(3);
-
-					callback(null);
-				}
 			],
 			function complete(err) {
 				if(err) {
@@ -955,7 +939,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	}
 
 	observeEditorEvents() {
-		const bodyView = this.viewControllers.body.getView(1);
+		const bodyView = this.viewControllers.body.getView(MciViewIds.body.message);
 
 		bodyView.on('edit position', pos => {
 			this.updateEditModePosition(pos);
@@ -968,7 +952,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 	/*
 	this.observeViewPosition = function() {
-		self.viewControllers.body.getView(1).on('edit position', function positionUpdate(pos) {
+		self.viewControllers.body.getView(MciViewIds.body.message).on('edit position', function positionUpdate(pos) {
 			console.log(pos.percent + ' / ' + pos.below)
 		});
 	};
@@ -995,7 +979,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 	switchFromQuoteBuilderToBody() {
 		this.viewControllers.quoteBuilder.setFocus(false);
-		var body = this.viewControllers.body.getView(1);
+		var body = this.viewControllers.body.getView(MciViewIds.body.message);
 		body.redraw();
 		this.viewControllers.body.switchFocus(1);
 
@@ -1009,14 +993,14 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
 	quoteBuilderFinalize() {
 		//	:TODO: fix magic #'s
-		const quoteMsgView	= this.viewControllers.quoteBuilder.getView(1);
-		const msgView		= this.viewControllers.body.getView(1);
+		const quoteMsgView	= this.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
+		const msgView		= this.viewControllers.body.getView(MciViewIds.body.message);
 
 		let quoteLines 		= quoteMsgView.getData().trim();
 
 		if(quoteLines.length > 0) {
 			if(this.replyIsAnsi) {
-				const bodyMessageView = this.viewControllers.body.getView(1);
+				const bodyMessageView = this.viewControllers.body.getView(MciViewIds.body.message);
 				quoteLines += `${ansi.normal()}${bodyMessageView.getSGRFor('text')}`;
 			}
 			msgView.addText(`${quoteLines}\n\n`);

From 7a2df5685516c6dc89de8d3858b33fd5d6c1bdb9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 27 Jan 2018 22:21:48 -0700
Subject: [PATCH 0150/1013] Menu items can now be arrays of objects * Allows
 custom members of each item * 'data' overrides selection (vs returning the
 index) * 'text' is the default member for text if no formatters are supplied
 * formatters: 'itemFormat' and 'focusItemFormat', e.g. "{member1} -
 {member2}"

---
 core/horizontal_menu_view.js | 36 ++++++++++++++++---------
 core/menu_view.js            | 51 +++++++++++++++++++++++++++++-------
 core/toggle_menu_view.js     |  6 ++---
 core/vertical_menu_view.js   | 15 ++++++-----
 4 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index 81d477ad..ee1d5318 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -1,12 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-var MenuView		= require('./menu_view.js').MenuView;
-var ansi			= require('./ansi_term.js');
-var strUtil			= require('./string_util.js');
+const MenuView			= require('./menu_view.js').MenuView;
+const strUtil			= require('./string_util.js');
+const formatString		= require('./string_format');
+const { pipeToAnsi }	= require('./color_codes.js');
+const { goto }			= require('./ansi_term.js');
 
-var assert			= require('assert');
-var _				= require('lodash');
+const assert			= require('assert');
+const _					= require('lodash');
 
 exports.HorizontalMenuView		= HorizontalMenuView;
 
@@ -57,21 +59,29 @@ function HorizontalMenuView(options) {
 	this.drawItem = function(index) {
 		assert(!this.positionCacheExpired);
 
-		var item = self.items[index];
+		const item = self.items[index];
 		if(!item) {
 			return;
 		}
 
-		var text = strUtil.stylizeString(
-			item.text,
-			this.hasFocus && item.focused ? self.focusTextStyle : self.textStyle);
+		let text;
+		let sgr;
+		if(item.focused && self.hasFocusItems()) {
+			const focusItem = self.focusItems[index];
+			text = focusItem ? focusItem.text : item.text;
+			sgr = '';
+		} else if(this.complexItems) {
+			text = pipeToAnsi(formatString(item.focused ? this.focusItemFormat : this.itemFormat, item));
+			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+		} else {
+			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
+			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+		}
 
-		var drawWidth = text.length + self.getSpacer().length * 2;	//	* 2 = sides
+		const drawWidth = strUtil.renderStringLength(text) + (self.getSpacer().length * 2);
 
 		self.client.term.write(
-			ansi.goto(self.position.row, item.col) +
-			(index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR()) +
-			strUtil.pad(text, drawWidth, self.fillChar, 'center')
+			`${goto(self.position.row, item.col)}${sgr}${strUtil.pad(text, drawWidth, self.fillChar, 'center')}`
 		);
 	};
 }
diff --git a/core/menu_view.js b/core/menu_view.js
index 5aed54ca..56899077 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -63,17 +63,37 @@ function MenuView(options) {
 util.inherits(MenuView, View);
 
 MenuView.prototype.setItems = function(items) {
-	const self = this;
+	if(Array.isArray(items)) {
+		//
+		//	Items can be an array of strings or an array of objects.
+		//
+		//	In the case of objects, items are considered complex and
+		//	may have one or more members that can later be formatted
+		//	against. The default member is 'text'. The member 'data'
+		//	may be overridden to provide a form value other than the
+		//	item's index.
+		//
+		//	Items can be formatted with 'itemFormat' and 'focusItemFormat'
+		//
+		let text;
+		let stringItem;
+		this.items = items.map(item => {
+			stringItem = _.isString(item);
+			if(stringItem) {
+				text = item;
+			} else {
+				text = item.text || '';
+				this.complexItems = true;
+			}
 
-	if(items) {
-		this.items = [];
-		items.forEach( itemText => {
-			this.items.push(
-				{
-					text : self.disablePipe ? itemText : pipeToAnsi(itemText, self.client)
-				}
-			);
+			text = this.disablePipe ? text : pipeToAnsi(text, this.client);
+			return Object.assign({ }, { text }, stringItem ? {} : item);	//	ensure we have a text member, plus any others
 		});
+
+		if(this.complexItems) {
+			this.itemFormat			= this.itemFormat || '{text}';
+			this.focusItemFormat	= this.focusItemFormat || this.itemFormat;
+		}
 	}
 };
 
@@ -96,12 +116,20 @@ MenuView.prototype.getCount = function() {
 };
 
 MenuView.prototype.getItems = function() {
+	if(this.complexItems) {
+		return this.items;
+	}
+
 	return this.items.map( item => {
 		return item.text;
 	});
 };
 
 MenuView.prototype.getItem = function(index) {
+	if(this.complexItems) {
+		return this.items[index];
+	}
+
 	return this.items[index].text;
 };
 
@@ -170,6 +198,11 @@ MenuView.prototype.setPropertyValue = function(propName, value) {
 		case 'hotKeySubmit'		: this.hotKeySubmit = value; break;
 		case 'justify'			: this.justify = value; break;
 		case 'focusItemIndex'	: this.focusedItemIndex = value; break;
+
+		case 'itemFormat' :
+		case 'focusItemFormat' :
+			this[propName] = value;
+			break;
 	}
 
 	MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index 27ae2169..39d7ef95 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -113,9 +113,9 @@ ToggleMenuView.prototype.getData = function() {
 };
 
 ToggleMenuView.prototype.setItems = function(items) {
+	items = items.slice(0, 2);	//	switch/toggle only works with two elements
+
 	ToggleMenuView.super_.prototype.setItems.call(this, items);
 
-	this.items = this.items.splice(0, 2);	//	switch/toggle only works with two elements
-
-	this.dimens.width = this.items.join(' / ').length;	//	:TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
+	this.dimens.width = items.join(' / ').length;	//	:TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
 };
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 5b27c36d..e1d6cd17 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -5,6 +5,8 @@
 const MenuView		= require('./menu_view.js').MenuView;
 const ansi			= require('./ansi_term.js');
 const strUtil		= require('./string_util.js');
+const formatString	= require('./string_format');
+const pipeToAnsi	= require('./color_codes.js').pipeToAnsi;
 
 //	deps
 const util			= require('util');
@@ -68,17 +70,16 @@ function VerticalMenuView(options) {
 			const focusItem = self.focusItems[index];
 			text = focusItem ? focusItem.text : item.text;
 			sgr = '';
+		} else if(this.complexItems) {
+			text = pipeToAnsi(formatString(item.focused ? this.focusItemFormat : this.itemFormat, item));
+			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		} else {
 			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
 			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		}
 
-		text += self.getSGR();
-
 		self.client.term.write(
-			ansi.goto(item.row, self.position.col) +
-			sgr +
-			strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)
+			`${ansi.goto(item.row, self.position.col)}${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`
 		);
 	};
 }
@@ -176,7 +177,9 @@ VerticalMenuView.prototype.onKeyPress = function(ch, key) {
 };
 
 VerticalMenuView.prototype.getData = function() {
-	return this.focusedItemIndex;
+	const item = this.getItem(this.focusedItemIndex);
+	return item.data ? item.data : this.focusedItemIndex;
+	//return this.focusedItemIndex;
 };
 
 VerticalMenuView.prototype.setItems = function(items) {

From 342c37b38828c0573417cf8a91adebe51e96a75b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 12:56:35 -0700
Subject: [PATCH 0151/1013] Allow extraArgs such that we can launch from menu
 items easier

---
 core/telnet_bridge.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 30db1207..6fb81d21 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -126,8 +126,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 	constructor(options) {
 		super(options);
 
-		this.config			= options.menuConfig.config;
-		//	defaults
+		this.config			= Object.assign({}, _.get(options, 'menuConf.config'), options.extraArgs);
 		this.config.port	= this.config.port || 23;
 	}
 
@@ -152,10 +151,10 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 						host	: self.config.host,
 					};
 
-					let clientTerminated;
-
 					self.client.term.write(resetScreen());
-					self.client.term.write(`  Connecting to ${connectOpts.host}, please wait...\n`);
+					self.client.term.write(
+						`  Connecting to ${connectOpts.host}, please wait...\n`
+					);
 
 					const telnetConnection = new TelnetClientConnection(self.client);
 

From 90427ac89d0fb7978882bddd17d3f39f92afcd8a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 12:56:58 -0700
Subject: [PATCH 0152/1013] Notes on changes

---
 UPGRADE.md  | 1 +
 WHATSNEW.md | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index 5975b96e..bec189ed 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -40,6 +40,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 # 0.0.8-alpha to 0.0.9-alpha
 * Development is now against Node.js 8.x LTS. Follow your standard upgrade path to update to Node 8.x before using 0.0.9-alpha.
 * The property `justify` found on various views previously had `left` and `right` values swapped (oops!); you will need to adjust any custom `theme.hjson` that use one or the other and swap them as well.
+* Possible breaking changes in FSE: The MCI code `%TL13` for error indicator is now `%TL4`. This is part of a cleanup and standardization on "custom ranges". You may need to update your `theme.hjson` and related artwork.
 
 
 # 0.0.7-alpha to 0.0.8-alpha
diff --git a/WHATSNEW.md b/WHATSNEW.md
index d5d5fee2..99c47786 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,12 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 ## 0.0.9-alpha
 * Development is now against Node.js 8.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
 * Fixed `justify` properties: `left` and `right` values were formerly swapped (oops!)
+* Menu items can now be arrays of *objects* not just arrays of strings.
+  * The properties `itemFormat` and `focusItemFormat` allow you to supply the string format for items. For example if a menu object is `{ "userName" : "Bob", "age" : 35 }`, a `itemFormat` might be `|04{userName} |08- |14{age}`.
+  * If no `itemFormat` is supplied, the default formatter is `{text}`.
+  * Setting the `data` member of an object will cause form submissions to use this value instead of the selected items index.
+  * See the default `luciano_blocktronics` `matrix` menu for example usage.
+* You can now set the `sort` property on a menu to sort items. If `true` items are sorted by `text`. If the value is a string, it represents the key in menu objects to sort by.
 
 
 ## 0.0.8-alpha

From 70eefc008a997f367c5c6aa44cc83f6b08290f64 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 12:59:20 -0700
Subject: [PATCH 0153/1013] Update matrix example to show item formatting

---
 art/themes/luciano_blocktronics/theme.hjson |  3 +-
 config/menu.hjson                           | 33 +++++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 433f8884..27bd44ca 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -22,7 +22,8 @@
 			matrix: {
 				mci: {
 					VM1: {
-						focusTextStyle: first lower
+						itemFormat:			"|03{text}"
+						focusItemFormat:	"|11{text!styleFirstLower}"
 					}
 				}
 			}
diff --git a/config/menu.hjson b/config/menu.hjson
index b8d26521..3fb9c229 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -67,26 +67,47 @@
 								submit:	true
 								focus:	true
 								argName: navSelect
-								//	:TODO: need a good way to localize these ... Standard Orig->Lookup seems good.
-								items: [ "login", "apply", "forgot pw", "log off" ]
+								//
+								//	To enable forgot password, you will need to have the web server
+								//	enabled and mail/SMTP configured. Once that is in place, swap out
+								//	the commented lines below as well as in the submit block
+								//
+								items: [
+									{
+										text: login
+										data: login
+									}
+									{
+										text: apply
+										data: apply
+									}
+									{
+										text: forgot pass
+										data: forgot
+									}
+									{
+										text: log off
+										data: logoff
+									}
+								]
 							}
 						}
 						submit: {
 							*: [
 								{
-									value: { navSelect: 0 }
+									value: { navSelect: "login" }
 									action:	@menu:login
 								}
 								{
-									value: { navSelect: 1 },
+									value: { navSelect: "apply" }
 									action: @menu:newUserApplicationPre
 								}
 								{
-									value: { navSelect: 2 }
+									value: { navSelect: "forgot" }
 									action: @menu:forgotPassword
 								}
 								{
-									value: { navSelect: 3 },
+									value: { navSelect: "logoff" }
 									action: @menu:logoff
 								}
 							]

From b6317e05415dcaaeb8763d9d08d114b438faf9ac Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 13:02:24 -0700
Subject: [PATCH 0154/1013] File Base area selection using new simplified
 formatting

---
 config/menu.hjson             |  4 ++--
 core/file_base_area_select.js | 35 +++++++++--------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 3fb9c229..cf2c71dd 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -2782,14 +2782,14 @@
 					mci: {
 						VM1: {
 							focus: true
-							argName: areaSelect
+							argName: areaTag
 						}
 					}
 
 					submit: {
 						*: [
 							{
-								value: { areaSelect: null }
+								value: { areaTag: null }
 								action: @method:selectArea
 							}
 						]
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index 87dfe9f4..f762ab1d 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -3,8 +3,7 @@
 
 //	enigma-bbs
 const MenuModule						= require('./menu_module.js').MenuModule;
-const stringFormat						= require('./string_format.js');
-const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
+const { getSortedAvailableFileAreas }	= require('./file_base_area.js');
 const StatLog							= require('./stat_log.js');
 
 //	deps
@@ -24,16 +23,10 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 	constructor(options) {
 		super(options);
 
-		this.config = this.menuConfig.config || {};
-
-		this.loadAvailAreas();
-
 		this.menuMethods = {
 			selectArea : (formData, extraArgs, cb) => {
-				const area = this.availAreas[formData.value.areaSelect] || 0;
-
 				const filterCriteria = {
-					areaTag		: area.areaTag,
+					areaTag		: formData.value.areaTag,
 				};
 
 				const menuOpts = {
@@ -48,10 +41,6 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 		};
 	}
 
-	loadAvailAreas() {
-		this.availAreas = getSortedAvailableFileAreas(this.client);
-	}
-
 	mciReady(mciData, cb) {
 		super.mciReady(mciData, err => {
 			if(err) {
@@ -60,35 +49,29 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 
 			const self = this;
 
-			async.series(
+			async.waterfall(
 				[
 					function mergeAreaStats(callback) {
 						const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
 
-						self.availAreas.forEach(area => {
+						//	we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
+						const availAreas = getSortedAvailableFileAreas(self.client);
+						availAreas.forEach(area => {
 							const stats = areaStats.areas[area.areaTag];
 							area.totalFiles = stats ? stats.files : 0;
 							area.totalBytes	= stats ? stats.bytes : 0;
 						});
 
-						return callback(null);
+						return callback(null, availAreas);
 					},
-					function prepView(callback) {
+					function prepView(availAreas, callback) {
 						self.prepViewController('allViews', 0, { mciMap : mciData.menu }, (err, vc) => {
 							if(err) {
 								return callback(err);
 							}
 
 							const areaListView = vc.getView(MciViewIds.areaList);
-
-							const areaListFormat = self.config.areaListFormat || '{name}';
-
-							areaListView.setItems(self.availAreas.map(a => stringFormat(areaListFormat, a) ) );
-
-							if(self.config.areaListFocusFormat) {
-								areaListView.setFocusItems(self.availAreas.map(a => stringFormat(self.config.areaListFocusFormat, a) ) );
-							}
-
+							areaListView.setItems(availAreas.map(area => Object.assign(area, { text : area.name, data : area.areaTag } )));
 							areaListView.redraw();
 
 							return callback(null);

From 999033ec154848adf5d261e187b18825fd93d28c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 13:03:11 -0700
Subject: [PATCH 0155/1013] New menu sorting, fix up default SGR

---
 art/themes/luciano_blocktronics/MATRIX.ANS | Bin 4797 -> 5117 bytes
 core/horizontal_menu_view.js               |   2 +-
 core/menu_view.js                          |  33 +++++++++++++++++++--
 core/vertical_menu_view.js                 |   2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MATRIX.ANS b/art/themes/luciano_blocktronics/MATRIX.ANS
index 4e18372379762657be552e9bb01e2e8df65401ee..14219543d7a87cf9e911adada5c27c3a5f07c8bd 100644
GIT binary patch
delta 884
zcmZ8fyG{Z@6b%sMO#~8~MKTEzO$>3D#RbGht+hdoLP-1or?J4qM>N(pdTmH(EUat<
zYU5W}?IzpV8xlLkxihoL4$aQq$2oV-nfqS)U7puEdb6rG%^Hns9aE<diS`Byw9fht
zi!0P|*x`?5*pOv49G;&98ahMQMA@B1JH#b~xa{MwU$1J3ZkPs!N&hey1-C*h0pG!C
ziWdx1w2mjCdO+<hhtEX9V|xy_)Q+F<aTG6ycZY+y7apL_$H=zkpF31F!(QZ7jIXn1
zqiI&)FVa`J`_UscF^OJtesltQv972h0do~TV}nH@$Pk$~pOJjRRos-4<x9XQekm|g
zpzTVGQIV`xVl(U4Ve<yKNZb`sHy>`%(&4VbWXKZ>NN6-6pIlSm!Ukw1dkbEdX;DJF
zu~qm=786)9BttIMF7a5d2fIMELK#5k>&1R;d8a|@mXo45gR({7Fcbpi^hXLKbPlbc
z<4L*@%yVI!*P`m?SQH8wu_)cl3deF<#KL`M{|4El^R^u)u5H_{LzL}foMJPjIBvQ~
hdN#|H<6tA1$+~i}C7eGIgNp}P&7KCIa?sB%{R4tV2Ot0d

delta 567
zcmYjOJxjx25XQ7k+w@CQ5F~!QpjEdfO`En<#rkd)CyQu<;Gk2@;vk49qPQ011{EB2
za<Oz4|A2Er-asb*gi!D<iQsbY<;in*&pkI<dM~6jTW^&0hN(Ns-FQc>aM#srjGA2!
zLjU<-Y`LsEnqB2YHcO5dP+aCQ#ykuzrifV_R;9jF;qW6hVLdX67$zUIqO~!?da)A;
z8EJW&zPj?BT=yHor~D#Ug7hrDk){-f^hpK`<FBzA0tWOFk5p$Scj>uLUdVwSm{#_s
z8i!luDP<V^jf4|_EoDXwWL~DulNJ{qVkHif>6Jt{K)_-8no)CH%5n-jTLyB%*R0~g
z7XE`|rubLUhgRlvhETtPG2)ZV5Wvwe%*-pkTZUg9&320ZJS#L1jsEAP(Cl)_!9Hle
zzcmvAZn9SseofUuQ&BawhpF60JUqkTJ2xw3Xid}|8b7Bt;YeK!D7f~6+TILzD>*_a
o%o9R*F7wY66b9EL{d7Y#h>lNSkbB{I$p;U*`D3ZA!dHIb7Z850UjP6A

diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index ee1d5318..02f9c06e 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -71,7 +71,7 @@ function HorizontalMenuView(options) {
 			text = focusItem ? focusItem.text : item.text;
 			sgr = '';
 		} else if(this.complexItems) {
-			text = pipeToAnsi(formatString(item.focused ? this.focusItemFormat : this.itemFormat, item));
+			text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
 			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		} else {
 			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
diff --git a/core/menu_view.js b/core/menu_view.js
index 56899077..f15491cf 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -64,6 +64,8 @@ util.inherits(MenuView, View);
 
 MenuView.prototype.setItems = function(items) {
 	if(Array.isArray(items)) {
+		this.sorted = false;
+
 		//
 		//	Items can be an array of strings or an array of objects.
 		//
@@ -91,13 +93,38 @@ MenuView.prototype.setItems = function(items) {
 		});
 
 		if(this.complexItems) {
-			this.itemFormat			= this.itemFormat || '{text}';
-			this.focusItemFormat	= this.focusItemFormat || this.itemFormat;
+			this.itemFormat = this.itemFormat || '{text}';
 		}
 	}
 };
 
+MenuView.prototype.setSort = function(sort) {
+	if(this.sorted || !Array.isArray(this.items) || 0 === this.items.length) {
+		return;
+	}
+
+	const key = true === sort ? 'text' : sort;
+	if('text' !== sort && !this.complexItems) {
+		return;	//	need a valid sort key
+	}
+
+	this.items.sort( (a, b) => {
+		const a1 = a[key];
+		const b1 = b[key];
+		if(!a1) {
+			return -1;
+		}
+		if(!b1) {
+			return 1;
+		}
+		return a1.localeCompare( b1, { sensitivity : false, numeric : true } );
+	});
+
+	this.sorted = true;
+};
+
 MenuView.prototype.removeItem = function(index) {
+	this.sorted = false;
 	this.items.splice(index, 1);
 
 	if(this.focusItems) {
@@ -203,6 +230,8 @@ MenuView.prototype.setPropertyValue = function(propName, value) {
 		case 'focusItemFormat' :
 			this[propName] = value;
 			break;
+
+		case 'sort' 			: this.setSort(value); break;
 	}
 
 	MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index e1d6cd17..6f083193 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -71,7 +71,7 @@ function VerticalMenuView(options) {
 			text = focusItem ? focusItem.text : item.text;
 			sgr = '';
 		} else if(this.complexItems) {
-			text = pipeToAnsi(formatString(item.focused ? this.focusItemFormat : this.itemFormat, item));
+			text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
 			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		} else {
 			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);

From c81aa001f47fe868b2217c9682e8469ba6c61088 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 28 Jan 2018 13:22:47 -0700
Subject: [PATCH 0156/1013] Fix typo

---
 core/telnet_bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 6fb81d21..447efe4c 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -126,7 +126,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 	constructor(options) {
 		super(options);
 
-		this.config			= Object.assign({}, _.get(options, 'menuConf.config'), options.extraArgs);
+		this.config			= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 		this.config.port	= this.config.port || 23;
 	}
 

From 06ea2d1600b5275962454f15ba6ff7822ea7c4fc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 20 Jan 2018 19:30:21 -0700
Subject: [PATCH 0157/1013] Code readability

---
 core/bbs_list.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/bbs_list.js b/core/bbs_list.js
index 33a7ff59..ecf41c76 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -150,7 +150,10 @@ exports.getModule = class BBSListModule extends MenuModule {
 				self.database.run(
 					`INSERT INTO bbs_list (bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes) 
 					VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
-					[ formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www, formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes ],
+					[
+						formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www, 
+						formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes
+					],
 					err => {
 						if(err) {
 							self.client.log.error( { err : err }, 'Error adding to BBS list');

From 26849ba4fa943aa47d958890cff48162112504c2 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Wed, 31 Jan 2018 23:35:54 +0000
Subject: [PATCH 0158/1013] * Docs theme to match ENiGMA website * New docs
 layout ready for github pages serving * Tonnes of new docs * Update gitignore
 * Probably other stuff too

---
 .gitignore                                    |   5 +-
 docs/404.html                                 |  24 ++
 docs/Gemfile                                  |  31 ++
 docs/Gemfile.lock                             | 101 ++++++
 docs/_config.yml                              |  28 ++
 docs/_includes/nav.md                         |  67 ++++
 docs/_layouts/default.html                    |  41 +++
 docs/_layouts/page.html                       |   8 +
 docs/_layouts/post.html                       |  25 ++
 docs/_sass/_default_colors.scss               |  16 +
 docs/_sass/jekyll-theme-hacker.scss           | 326 ++++++++++++++++++
 docs/_sass/rouge-base16-dark.scss             |  87 +++++
 docs/about.md                                 |  19 -
 docs/art/general.md                           |   6 +
 docs/art/mci.md                               | 135 ++++++++
 docs/art/themes.md                            |  25 ++
 docs/assets/css/style.scss                    |   4 +
 docs/assets/images/bkg.png                    | Bin 0 -> 1218 bytes
 docs/assets/images/bullet.png                 | Bin 0 -> 603 bytes
 docs/assets/images/enigma-logo.png            | Bin 0 -> 16643 bytes
 .../archivers.md}                             |   5 +-
 .../config-hjson.md}                          |  19 +-
 docs/configuration/creating-config.md         |  27 ++
 docs/configuration/directory-structure.md     |  20 ++
 docs/configuration/editing-hjson.md           |  16 +
 docs/configuration/menu-hjson.md              | 101 ++++++
 docs/configuration/sysop-setup.md             |   6 +
 docs/file_base.md                             |  89 -----
 docs/filebase/acs.md                          |  25 ++
 docs/filebase/first-file-area.md              |  71 ++++
 docs/filebase/index.md                        |  19 +
 docs/filebase/tic-support.md                  | 100 ++++++
 docs/filebase/uploads.md                      |   8 +
 docs/filebase/web-access.md                   |  11 +
 docs/index.md                                 | 150 ++------
 docs/installation/docker.md                   |  21 ++
 docs/installation/install-script.md           |  16 +
 docs/installation/installation-methods.md     |  13 +
 docs/installation/manual.md                   |  74 ++++
 docs/installation/network.md                  |   6 +
 docs/{rpi.md => installation/os-hardware.md}  |  28 +-
 docs/installation/production.md               |  12 +
 docs/installation/testing.md                  |  44 +++
 docs/mci.md                                   | 113 ------
 docs/menu_system.md                           |  86 -----
 docs/messageareas/bso-import-export.md        |  74 ++++
 .../configuring-a-message-area.md             |  65 ++++
 docs/messageareas/message-networks.md         |  67 ++++
 docs/messageareas/netmail.md                  |  38 ++
 docs/modding.md                               |  15 -
 docs/modding/door-servers.md                  |  61 ++++
 docs/modding/existing-mods.md                 |  11 +
 docs/{doors.md => modding/local-doors.md}     |  74 +---
 docs/mods.md                                  |   9 -
 docs/msg_conf_area.md                         |  57 ---
 docs/msg_networks.md                          | 196 -----------
 docs/oputil/index.md                          |  17 +
 docs/servers/ssh.md                           |  36 ++
 docs/servers/telnet.md                        |   4 +
 docs/{web_server.md => servers/web-server.md} |  11 +-
 .../websocket.md}                             |   6 +-
 docs/troubleshooting/monitoring-logs.md       |  15 +
 62 files changed, 1974 insertions(+), 810 deletions(-)
 create mode 100644 docs/404.html
 create mode 100644 docs/Gemfile
 create mode 100644 docs/Gemfile.lock
 create mode 100644 docs/_config.yml
 create mode 100644 docs/_includes/nav.md
 create mode 100644 docs/_layouts/default.html
 create mode 100644 docs/_layouts/page.html
 create mode 100644 docs/_layouts/post.html
 create mode 100644 docs/_sass/_default_colors.scss
 create mode 100644 docs/_sass/jekyll-theme-hacker.scss
 create mode 100644 docs/_sass/rouge-base16-dark.scss
 delete mode 100644 docs/about.md
 create mode 100644 docs/art/general.md
 create mode 100644 docs/art/mci.md
 create mode 100644 docs/art/themes.md
 create mode 100644 docs/assets/css/style.scss
 create mode 100644 docs/assets/images/bkg.png
 create mode 100644 docs/assets/images/bullet.png
 create mode 100644 docs/assets/images/enigma-logo.png
 rename docs/{archive.md => configuration/archivers.md} (98%)
 rename docs/{config.md => configuration/config-hjson.md} (85%)
 create mode 100644 docs/configuration/creating-config.md
 create mode 100644 docs/configuration/directory-structure.md
 create mode 100644 docs/configuration/editing-hjson.md
 create mode 100644 docs/configuration/menu-hjson.md
 create mode 100644 docs/configuration/sysop-setup.md
 delete mode 100644 docs/file_base.md
 create mode 100644 docs/filebase/acs.md
 create mode 100644 docs/filebase/first-file-area.md
 create mode 100644 docs/filebase/index.md
 create mode 100644 docs/filebase/tic-support.md
 create mode 100644 docs/filebase/uploads.md
 create mode 100644 docs/filebase/web-access.md
 create mode 100644 docs/installation/docker.md
 create mode 100644 docs/installation/install-script.md
 create mode 100644 docs/installation/installation-methods.md
 create mode 100644 docs/installation/manual.md
 create mode 100644 docs/installation/network.md
 rename docs/{rpi.md => installation/os-hardware.md} (52%)
 create mode 100644 docs/installation/production.md
 create mode 100644 docs/installation/testing.md
 delete mode 100644 docs/mci.md
 delete mode 100644 docs/menu_system.md
 create mode 100644 docs/messageareas/bso-import-export.md
 create mode 100644 docs/messageareas/configuring-a-message-area.md
 create mode 100644 docs/messageareas/message-networks.md
 create mode 100644 docs/messageareas/netmail.md
 delete mode 100644 docs/modding.md
 create mode 100644 docs/modding/door-servers.md
 create mode 100644 docs/modding/existing-mods.md
 rename docs/{doors.md => modding/local-doors.md} (76%)
 delete mode 100644 docs/mods.md
 delete mode 100644 docs/msg_conf_area.md
 delete mode 100644 docs/msg_networks.md
 create mode 100644 docs/oputil/index.md
 create mode 100644 docs/servers/ssh.md
 create mode 100644 docs/servers/telnet.md
 rename docs/{web_server.md => servers/web-server.md} (82%)
 rename docs/{vtx_web_client.md => servers/websocket.md} (96%)
 create mode 100644 docs/troubleshooting/monitoring-logs.md

diff --git a/.gitignore b/.gitignore
index ee9fc3d8..5a58c717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,7 @@
 logs/
 db/
 dropfiles/
-node_modules/
\ No newline at end of file
+node_modules/
+docs/_site/
+docs/.sass-cache/
+`
\ No newline at end of file
diff --git a/docs/404.html b/docs/404.html
new file mode 100644
index 00000000..c472b4ea
--- /dev/null
+++ b/docs/404.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>
diff --git a/docs/Gemfile b/docs/Gemfile
new file mode 100644
index 00000000..1a0104dd
--- /dev/null
+++ b/docs/Gemfile
@@ -0,0 +1,31 @@
+source "https://rubygems.org"
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 3.7.0"
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "hacker"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.6"
+  gem 'jekyll-seo-tag'
+  gem 'jekyll-theme-hacker'
+  gem 'jekyll-sitemap'
+  gem 'jemoji'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
new file mode 100644
index 00000000..f49b797b
--- /dev/null
+++ b/docs/Gemfile.lock
@@ -0,0 +1,101 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.0.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.5)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.0)
+    hacker (0.0.1)
+    html-pipeline (2.7.1)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    http_parser.rb (0.6.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.7.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
+      safe_yaml (~> 1.0)
+    jekyll-feed (0.9.2)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.1)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.4.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.1.1)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.1.0)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-watch (2.0.0)
+      listen (~> 3.0)
+    jemoji (0.8.1)
+      activesupport (~> 4.0, >= 4.2.9)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    kramdown (1.16.2)
+    liquid (4.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    mercenary (0.3.6)
+    mini_portile2 (2.3.0)
+    minitest (5.11.1)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    pathutil (0.16.1)
+      forwardable-extended (~> 2.6)
+    public_suffix (3.0.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (3.1.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hacker
+  jekyll (~> 3.7.0)
+  jekyll-feed (~> 0.6)
+  jekyll-seo-tag
+  jekyll-sitemap
+  jekyll-theme-hacker
+  jemoji
+  tzinfo-data
+
+BUNDLED WITH
+   1.16.1
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..b791e4fb
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,28 @@
+title: ENiGMA½ BBS Software
+email: your-email@example.com
+description: >- # this means to ignore newlines until "baseurl:"
+  ENiGMA½ BBS is modern open source BBS software with a nostalgic flair, written in Node.js.
+url:
+logo: /assets/images/enigma-logo.png
+
+# Build settings
+markdown: kramdown
+theme: jekyll-theme-hacker
+plugins:
+  - jekyll-feed
+  - jekyll-seo-tag
+  - jekyll-sitemap
+  - jemoji
+
+# Exclude from processing.
+# The following items will not be processed, by default. Create a custom list
+# to override the default setting.
+exclude:
+ - Gemfile
+ - Gemfile.lock
+ - node_modules
+ - vendor/bundle/
+ - vendor/cache/
+ - vendor/gems/
+ - vendor/ruby/
+ - .idea
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
new file mode 100644
index 00000000..f8fbb643
--- /dev/null
+++ b/docs/_includes/nav.md
@@ -0,0 +1,67 @@
+ - Installation
+    - [Installation Methods](/installation/installation-methods)
+        - [Install script](/installation/install-script)
+        - [Docker](/installation/docker)
+        - [Manual installation](/installation/manual)
+    - [OS / Hardware Specific](/installation/os-hardware)  
+      - Raspberry Pi 
+      - Windows
+    - [Your Network Setup](/installation/network)
+    - [Testing Your Installation](/installation/testing)
+    - [Production Installation](/installation/production)
+    
+  - Configuration
+    - [Creating Config Files](/configuration/creating-config)
+    - [SysOp Setup](/configuration/sysop-setup)
+    - [Editing hjson](/configuration/editing-hjson)
+    - [config.hjson](/configuration/config-hjson)
+    - [menu.hjson](/configuration/menu-hjson)
+    - prompt.hjson
+    - [Directory Structure](/configuration/directory-structure)
+    - [Archivers](/configuration/archivers)
+    - Scheduled jobs
+    - SMTP
+
+  - File Base
+    - [About](/filebase/)
+    - [Configuring a File Area](/filebase/first-file-area)
+    - [ACS model](/filebase/acs)
+    - [Uploads](/filebase/uploads)
+    - [Web Access](/filebase/web-access)
+    - [TIC Support](/filebase/tic-support) (Importing from FTN networks)
+    - Tips and tricks
+      - Network mounts and symlinks
+    
+  - Message Areas
+    - [Configuring a Message Area](/messageareas/configuring-a-message-area)
+    - [Message networks](/messageareas/message-networks)
+    - [BSO Import & Export](/messageareas/bso-import-export)
+    - [Netmail](/messageareas/netmail)     
+    
+  - Art
+    - [General](/art/general)
+    - [Themes](/art/themes)
+    - [MCI Codes](/art/mci)
+
+  - Servers
+    - Login Servers
+      - [Telnet](/servers/telnet)
+      - [SSH](/servers/ssh)
+      - [WebSocket](/servers/websocket)
+      - Build your own
+    - Content Servers
+      - [Web](/servers/web-server)
+              
+  - Modding
+    - [Local Doors](/modding/local-doors)
+    - [Door Servers](/modding/door-servers) 
+        - DoorParty
+        - BBSLink
+        - Combatnet
+        - Exodus
+    - [Existing Mods](/modding/existing-mods)
+ 
+  - [Oputil](/oputil/)
+
+  - Troubleshooting
+    - [Monitoring Logs](/troubleshooting/monitoring-logs)
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
new file mode 100644
index 00000000..8b01d854
--- /dev/null
+++ b/docs/_layouts/default.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+    <link rel="stylesheet" href="{{ '/assets/css/OverlayScrollbars.min.css?v=' | append: site.github.build_revision | relative_url }}">
+    {% seo %}
+
+  </head>
+
+  <body>
+      <a href="https://github.com/NuSkooler/enigma-bbs"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png"></a>
+        <div class="sidebar" id="sidebar">
+            <div class="container">
+                <a href="/"><img src="/assets/images/enigma-logo.png" class="logo" /></a>
+            </div>
+            {% capture nav_include %}{% include nav.md %}{% endcapture %}
+            {{ nav_include | markdownify }}
+        </div>
+    <div class="main_area">
+        <div class="container">
+            <section id="main_content">
+                {{ content }}
+            </section>
+        </div>
+    </div>
+
+    {% if site.google_analytics %}
+      <script type="text/javascript">
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', '{{ site.google_analytics }}', 'auto');
+        ga('send', 'pageview');
+      </script>
+    {% endif %}
+  </body>
+</html>
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
new file mode 100644
index 00000000..404d540a
--- /dev/null
+++ b/docs/_layouts/page.html
@@ -0,0 +1,8 @@
+---
+layout: default
+---
+
+<div class="page">
+    <h1 class="page-title">{{ page.title }}</h1>
+    {{ content }}
+</div>
\ No newline at end of file
diff --git a/docs/_layouts/post.html b/docs/_layouts/post.html
new file mode 100644
index 00000000..f3def1e6
--- /dev/null
+++ b/docs/_layouts/post.html
@@ -0,0 +1,25 @@
+---
+layout: default
+---
+
+<div class="post">
+    <h1 class="post-title">{{ page.title }}</h1>
+    <span class="post-date">{{ page.date | date_to_string }}</span>
+    {{ content }}
+</div>
+
+<div class="related">
+    <h2>Related Posts</h2>
+    <ul class="related-posts">
+        {% for post in site.related_posts limit:3 %}
+        <li>
+            <h3>
+                <a href="{{ post.url }}">
+                    {{ post.title }}
+                    <small>{{ post.date | date_to_string }}</small>
+                </a>
+            </h3>
+        </li>
+        {% endfor %}
+    </ul>
+</div>
\ No newline at end of file
diff --git a/docs/_sass/_default_colors.scss b/docs/_sass/_default_colors.scss
new file mode 100644
index 00000000..4227975a
--- /dev/null
+++ b/docs/_sass/_default_colors.scss
@@ -0,0 +1,16 @@
+$apple-blossom: #ac4142;
+$alto: #d0d0d0;
+$bouquet: #aa759f;
+$enigma-purple: #8900aa;
+$chelsea-cucumber: #90a959;
+$cod-grey: #151515;
+$conifer: #b5e853;
+$dove-grey: #666;
+$gallery: #eaeaea;
+$grey: #888;
+$gulf-stream: #75b5aa;
+$hippie-blue: #6a9fb5;
+$potters-clay: #8f5536;
+$rajah: #f4bf75;
+$raw-sienna: #d28445;
+$silver-chalice: #aaa;
diff --git a/docs/_sass/jekyll-theme-hacker.scss b/docs/_sass/jekyll-theme-hacker.scss
new file mode 100644
index 00000000..e02b5aad
--- /dev/null
+++ b/docs/_sass/jekyll-theme-hacker.scss
@@ -0,0 +1,326 @@
+@import "rouge-base16-dark";
+@import "default_colors";
+
+$body-background: $cod-grey !default;
+$body-foreground: $gallery !default;
+$header: $conifer !default;
+$blockquote-color: $silver-chalice !default;
+$blockquote-border: $dove-grey !default;
+
+body {
+  margin: 0;
+  padding: 0;
+  background: $body-background url("../images/bkg.png") 0 0;
+  color: $body-foreground;
+  font-size: 16px;
+  line-height: 1.5;
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+}
+
+/* General & 'Reset' Stuff */
+
+.container {
+  width: 90%;
+  /*max-width: 1000px;*/
+  margin: 0 auto;
+}
+
+section {
+  display: block;
+  margin: 0 0 20px 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 0 0 20px;
+}
+
+li {
+  line-height: 1.4 ;
+}
+
+/* Header, <header>
+   header   - container
+   h1       - project name
+   h2       - project description
+*/
+
+header {
+  background: rgba(0, 0, 0, 0.1);
+  width: 100%;
+  border-bottom: 1px dashed $conifer; //header;
+  padding: 20px 0;
+  margin: 0 0 40px 0;
+  text-align: center;
+}
+
+header h1 {
+  font-size: 30px;
+  line-height: 1.5;
+  margin: 0 0 0 -40px;
+  font-weight: bold;
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+  color: $conifer;//$header;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1),
+               0 0 5px rgba(181, 232, 83, 0.1),
+               0 0 10px rgba(181, 232, 83, 0.1);
+  letter-spacing: -1px;
+  -webkit-font-smoothing: antialiased;
+}
+
+header h1:before {
+  content: "./ ";
+  font-size: 24px;
+}
+
+header h2 {
+  font-size: 18px;
+  font-weight: 300;
+  color: #666;
+}
+
+header img {
+  padding: 0px;
+  margin: 0px;
+  max-width: 100%;
+}
+
+#downloads .btn {
+  display: inline-block;
+  text-align: center;
+  margin: 0;
+}
+
+/* Main Content
+*/
+.sidebar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 22rem;
+  height: 100%;
+  text-align: left;
+  border-right: 1px dashed $conifer; //header;
+  overflow-y: scroll;
+  display: block;
+  float: left;
+
+  .logo {
+    padding-top: 20px;
+    max-width: 100%;
+  }
+
+  ul {
+    padding-bottom: 0px;
+  }
+  ul li {
+    margin-bottom: 0px;
+    padding-top: 5px;
+  }
+}
+
+.main_area {
+  padding-left: 22em;
+  padding-top: 20px;
+}
+
+#main_content {
+
+  -webkit-font-smoothing: antialiased;
+}
+section img {
+  max-width: 100%
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: normal;
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+  color: $header;
+  letter-spacing: -0.03em;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1),
+               0 0 5px rgba(181, 232, 83, 0.1),
+               0 0 10px rgba(181, 232, 83, 0.1);
+}
+
+#main_content h1 {
+  font-size: 30px;
+}
+
+#main_content h2 {
+  font-size: 24px;
+}
+
+#main_content h3 {
+  font-size: 18px;
+}
+
+#main_content h4 {
+  font-size: 14px;
+}
+
+#main_content h5 {
+  font-size: 12px;
+  text-transform: uppercase;
+  margin: 0 0 5px 0;
+}
+
+#main_content h6 {
+  font-size: 12px;
+  text-transform: uppercase;
+  color: #999;
+  margin: 0 0 5px 0;
+}
+
+dt {
+  font-style: italic;
+  font-weight: bold;
+}
+
+ul {
+  padding-bottom: 5px;
+}
+
+ul li {
+  list-style-image:url('../images/bullet.png');
+  margin-bottom: 10px;
+  padding-top: 10px;
+}
+
+nav {
+  text-align: left;
+
+  ul {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+    margin-top: 20;
+    margin-bottom: 0;
+    padding-bottom: 0;
+
+    li {
+      display: inline-block;
+      margin-left: 0.5em;
+      padding-right: 20px;
+
+      a {
+        color: $enigma-purple;
+        text-decoration: none;
+      }
+
+      a:hover {
+        color: $bouquet;
+      }
+    }
+  }
+}
+
+
+blockquote {
+  color: $blockquote-color;
+  padding-left: 10px;
+  border-left: 1px dotted $blockquote-border;
+}
+
+pre {
+  background: rgba(0, 0, 0, 0.9);
+  border: 1px solid rgba(255, 255, 255, 0.15);
+  padding: 10px;
+  font-size: 16px;
+  color: #b5e853;
+  border-radius: 2px;
+  text-wrap: normal;
+  overflow: auto;
+  overflow-y: hidden;
+}
+
+code.highlighter-rouge {
+  background: rgba(0,0,0,0.9);
+  border: 1px solid rgba(255, 255, 255, 0.15);
+  padding: 0px 3px;
+  margin: 0px -3px;
+  color: #aa759f;
+  border-radius: 2px;
+}
+
+table {
+  width: 100%;
+  margin: 0 0 20px 0;
+}
+
+th {
+  text-align: left;
+  border-bottom: 1px dashed #b5e853;
+  padding: 5px 10px;
+}
+
+td {
+  padding: 5px 10px;
+}
+
+hr {
+  height: 0;
+  border: 0;
+  border-bottom: 1px dashed #b5e853;
+  color: #b5e853;
+}
+
+/* Buttons
+*/
+
+.btn {
+  display: inline-block;
+  background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3));
+  padding: 8px 18px;
+  border-radius: 50px;
+  border: 2px solid rgba(0, 0, 0, 0.7);
+  border-bottom: 2px solid rgba(0, 0, 0, 0.7);
+  border-top: 2px solid rgba(0, 0, 0, 1);
+  color: rgba(255, 255, 255, 0.8);
+  font-family: Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  font-size: 13px;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05);
+}
+
+.btn:hover {
+  background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.6), rgba(35, 35, 35, 0.6) 50%, rgba(10, 10, 10, 0.8) 50%, rgba(0, 0, 0, 0.8));
+}
+
+.btn .icon {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin: 1px 8px 0 0;
+  float: left;
+}
+
+.btn-github .icon {
+  opacity: 0.6;
+  background: url("../images/blacktocat.png") 0 0 no-repeat;
+}
+
+/* Links
+   a, a:hover, a:visited
+*/
+
+a {
+  color: #63c0f5;
+  text-shadow: 0 0 5px rgba(104, 182, 255, 0.5);
+}
+
+/* Clearfix */
+
+.cf:before, .cf:after {
+  content:"";
+  display:table;
+}
+
+.cf:after {
+  clear:both;
+}
+
+.cf {
+  zoom:1;
+}
diff --git a/docs/_sass/rouge-base16-dark.scss b/docs/_sass/rouge-base16-dark.scss
new file mode 100644
index 00000000..7f839e96
--- /dev/null
+++ b/docs/_sass/rouge-base16-dark.scss
@@ -0,0 +1,87 @@
+/*
+   generated by rouge http://rouge.jneen.net/
+   original base16 by Chris Kempson (https://github.com/chriskempson/base16)
+*/
+
+@import "default_colors";
+
+.highlight {
+
+  $plaintext: $alto !default;
+  $string: $chelsea-cucumber !default;
+  $literal: $chelsea-cucumber !default;
+  $keyword: $bouquet !default;
+  $error-foreground: $cod-grey !default;
+  $error-background: $apple-blossom !default;
+  $comment: $grey !default;
+  $preprocessor: $rajah !default;
+  $name-space: $rajah !default;
+  $name-attribute: $hippie-blue !default;
+  $operator: $rajah !default;
+  $keyword-type: $raw-sienna !default;
+  $regex: $gulf-stream !default;
+  $string-escape: $potters-clay !default;
+  $deleted: $apple-blossom !default;
+  $header: $hippie-blue !default;
+
+  color: $plaintext;
+
+  table td { padding: 5px; }
+  table pre { margin: 0; }
+  .w {
+    color: $plaintext;
+  }
+  .err {
+    color: $error-foreground;
+    background-color: $error-background;
+  }
+  .c,  .cd,  .cm,  .c1,  .cs {
+    color: $comment;
+  }
+  .cp {
+    color: $preprocessor;
+  }
+  .o,  .ow {
+    color: $operator;
+  }
+  .p,  .pi {
+    color: $plaintext;
+  }
+  .gi {
+    color: $string;
+  }
+  .gd {
+    color: $deleted;
+  }
+  .gh {
+    color: $header;
+    font-weight: bold;
+  }
+  .k,  .kn,  .kp,  .kr,  .kv {
+    color: $keyword;
+  }
+  .kc, .kt, .kd {
+      color: $keyword-type;
+  }
+  .s,  .sb,  .sc,  .sd,  .s2,  .sh,  .sx,  .s1 {
+    color: $string;
+  }
+  .sr {
+    color: $regex;
+  }
+  .si, .se {
+    color: $string-escape;
+  }
+  .nt, .nn,  .nc, .no{
+    color: $name-space;
+  }
+  .na {
+    color: $name-attribute;
+  }
+  .m,  .mf,  .mh,  .mi,  .il,  .mo,  .mb,  .mx {
+    color: $literal;
+  }
+  .ss {
+    color: $string;
+  }
+}
diff --git a/docs/about.md b/docs/about.md
deleted file mode 100644
index 50656011..00000000
--- a/docs/about.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# About ENiGMA½
-
-## High Level Feature Overview
- * Multi platform: Anywhere [Node.js](https://nodejs.org/) runs likely works (known to work under Linux, FreeBSD, OpenBSD, OS X and Windows)
- * Unlimited multi node support (for all those BBS "callers"!)
- * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based mods
- * MCI support for lightbars, toggles, input areas, and so on plus many other other bells and whistles
- * Telnet & **SSH** access built in. Additional servers are easy to implement
- * [CP437](http://www.ascii-codes.com/) and UTF-8 output
- * [SyncTerm](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior
- * [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support
- * Renegade style pipe color codes
- * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
- * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption
- * [Door support](doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), and [DoorParty](http://forums.throwbackbbs.com/) support!
- * [Bunyan](https://github.com/trentm/node-bunyan) logging
- * [Message networks](msg_networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
- * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](web_server.md). Legacy X/Y/Z modem also supported!
- * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
\ No newline at end of file
diff --git a/docs/art/general.md b/docs/art/general.md
new file mode 100644
index 00000000..c43d915c
--- /dev/null
+++ b/docs/art/general.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: General
+---
+General art lives in the `art/general` directory. 'General' art is ANSI you want to stay consistent across themes,
+such as a welcome ANSI or a rotation of logoff ANSIs. 
diff --git a/docs/art/mci.md b/docs/art/mci.md
new file mode 100644
index 00000000..4befc411
--- /dev/null
+++ b/docs/art/mci.md
@@ -0,0 +1,135 @@
+---
+layout: page
+title: MCI Codes
+---
+ENiGMA½ supports a variety of MCI codes. Some **predefined** codes produce information about the current user, system, 
+or other statistics while others are used to instantiate a **View**. MCI codes are two characters in length and are 
+prefixed with a percent (%) symbol. Some MCI codes have additional options that may be set directly from the code itself 
+while others -- and more advanced options -- are controlled via the current theme. Standard (non-focus) and focus colors 
+are set by placing duplicate codes back to back in art files.
+
+## Predefined MCI Codes
+There are many predefined MCI codes that can be used anywhere on the system (placed in any art file). More are added all 
+the time so also check out [core/predefined_mci.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) 
+for a full listing. Many codes attempt to pay homage to Oblivion/2, 
+iNiQUiTY, etc.
+
+| Code | Description  |
+|------|--------------|
+| `BN` | Board Name |
+| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.3-alpha" |
+| `VN` | Version *number*, eg.. "0.0.3-alpha" |
+| `SN` | SysOp username |
+| `SR` | SysOp real name |
+| `SL` | SysOp location |
+| `SA` | SysOp affiliations |
+| `SS` | SysOp sex |
+| `SE` | SysOp email address |
+| `UN` | Current user's username |
+| `UI` | Current user's user ID |
+| `UG` | Current user's group membership(s) |
+| `UR` | Current user's real name |
+| `LO` | Current user's location |
+| `UA` | Current user's age |
+| `BD` | Current user's birthdate (using theme date format) |
+| `US` | Current user's sex |
+| `UE` | Current user's email address |
+| `UW` | Current user's web address |
+| `UF` | Current user's affiliations |
+| `UT` | Current user's *theme ID* (e.g. "luciano_blocktronics") |
+| `UC` | Current user's login/call count |
+| `ND` | Current user's connected node number |
+| `IP` | Current user's IP address |
+| `ST` | Current user's connected server name (e.g. "Telnet" or "SSH") |
+| `FN` | Current user's active file base filter name |
+| `DN` | Current user's number of downloads |
+| `DK` | Current user's download amount (formatted to appropriate bytes/megs/etc.) |
+| `UP` | Current user's number of uploads |
+| `UK` | Current user's upload amount (formatted to appropriate bytes/megs/etc.) |
+| `NR` | Current user's upload/download ratio |
+| `KR` | Current user's upload/download *bytes* ratio |
+| `MS` | Current user's account creation date (using theme date format) |
+| `PS` | Current user's post count |
+| `PC` | Current user's post/call ratio |
+| `MD` | Current user's status/viewing menu/activity |
+| `MA` | Current user's active message area name |
+| `MC` | Current user's active message conference name |
+| `ML` | Current user's active message area description |
+| `CM` | Current user's active message conference description |
+| `SH` | Current user's term height |
+| `SW` | Current user's term width |
+| `DT` | Current date (using theme date format) |
+| `CT` | Current time (using theme time format) |
+| `OS` | System OS (Linux, Windows, etc.) |
+| `OA` | System architecture (x86, x86_64, arm, etc.) |
+| `SC` | System CPU model |
+| `NV` | System underlying Node.js version |
+| `AN` | Current active node count |
+| `TC` | Total login/calls to system |
+| `RR` | Displays a random rumor |
+| `SD` | Total downloads, system wide |
+| `SO` | Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.) |
+| `SU` | Total uploads, system wide |
+| `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
+
+A special `XY` MCI code may also be utilized for placement identification when creating menus.
+
+
+## Views
+A **View** is a control placed on a **form** that can display variable data or collect input. One example of a View is 
+a Vertical Menu (`%VM`): Old-school BBSers may recognize this as a lightbar menu.
+
+| Code | Name                 | Description      |
+|------|----------------------|------------------|
+| `TL` | Text Label           | Displays text       |
+| `ET` | Edit Text            | Collect user input  |
+| `ME` | Masked Edit Text     | Collect user input using a *mask* |
+| `MT` | Multi Line Text Edit | Multi line edit control |
+| `BT` | Button               | A button |
+| `VM` | Vertical Menu        | A vertical menu aka a vertical lightbar | 
+| `HM` | Horizontal Menu      | A horizontal menu aka a horizontal lightbar | 
+| `SM` | Spinner Menu         | A spinner input control |
+| `TM` | Toggle Menu          | A toggle menu commonly used for Yes/No style input | 
+| `KE` | Key Entry            | A *single* key input control |
+
+     
+Peek at [/core/mci_view_factory.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) to 
+see additional information.
+
+
+## Properties & Theming
+Predefined MCI codes and other Views can have properties set via `menu.hjson` and further *themed* via `theme.hjson`.
+
+### Common Properties
+
+| Property    | Description  |
+|-------------|--------------|
+| `textStyle` | Sets the standard (non-focus) text style. See **Text Styles** below |
+| `focusTextStyle` | Sets focus text style. See **Text Styles** below. |
+| `itemSpacing` | Used to separate items in menus such as Vertical Menu and Horizontal Menu Views. |
+| `height` | Sets the height of views such as menus that may be > 1 character in height |
+| `width` | Sets the width of a view |
+| `focus` | If set to `true`, establishes initial focus |
+| `text` | (initial) text of a view |
+| `submit` | If set to `true` any `accept` action upon this view will submit the encompassing **form** |
+
+These are just a few of the properties set on various views. *Use the source Luke*, as well as taking a look at the default 
+`menu.hjson` and `theme.hjson` files!
+
+
+### Text Styles
+
+Standard style types available for `textStyle` and `focusTextStyle`:
+
+| Style    | Description  |
+|----------|--------------|
+| `normal` | Leaves text as-is. This is the default. | 
+| `upper` | ENIGMA BULLETIN BOARD SOFTWARE |
+| `lower` | enigma bulletin board software |
+| `title` | Enigma Bulletin Board Software |
+| `first lower` | eNIGMA bULLETIN bOARD sOFTWARE |
+| `small vowels` | eNiGMa BuLLeTiN BoaRD SoFTWaRe |
+| `big vowels` | EniGMa bUllEtIn bOArd sOftwArE |
+| `small i` | ENiGMA BULLETiN BOARD SOFTWARE |
+| `mixed` | EnIGma BUlLEtIn BoaRd SOfTWarE (randomly assigned) |
+| `l33t` | 3n1gm4 bull371n b04rd 50f7w4r3 |
\ No newline at end of file
diff --git a/docs/art/themes.md b/docs/art/themes.md
new file mode 100644
index 00000000..37631454
--- /dev/null
+++ b/docs/art/themes.md
@@ -0,0 +1,25 @@
+---
+layout: page
+title: Themes
+---
+:warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included 
+`luciano_blocktronics' theme. Create your own and make changes to that instead:
+
+1. Copy `/art/themes/luciano_blocktronics` to `art/themes/your_board_theme`
+2. Update the `info` block at the top of the theme.hjson file:
+   
+        info: {
+                name: Awesome Theme
+                author: Cool Artist
+                group: Sick Group
+                enabled: true
+        }
+
+3. Specify it in the `defaults` section of `config.hjson`. The name supplied should match the name of the 
+directory you created in step 1:
+
+        ```hjson 
+        defaults: {
+          theme: your_board_theme
+        }
+        ```
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
new file mode 100644
index 00000000..5f1392bd
--- /dev/null
+++ b/docs/assets/css/style.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import 'jekyll-theme-hacker';
diff --git a/docs/assets/images/bkg.png b/docs/assets/images/bkg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d10e5caf1adb7466673bc9cef83621fe855caa3f
GIT binary patch
literal 1218
zcmeAS@N?(olHy`uVBq!ia0y~yU=jggMrNQ$#TNBtK#DEEC&X1sN=jN<TJhgIUIqr1
za!(h>kczmscWgJUHsE1R2ws}X9=R$~%X@*3=-vhL@-NfkR)!pBoqVTzzlmJ$gw$h(
za!N&gzAjH}?UE-yuB@->I#KvPao+dRzrL@oCvVpee)R8SO|Rip8+r3Dza~8XxNqSP
zmGuR0<=?XLN*y=&ko@A*R?n;zmFGjmpL|X=el)GDnT?nCc-hJ9h-*>(U-v7SP21O(
zoNu0S!J*))p{S5clIq(!Rnv%W88O`}e-}D7AF~mxZ<pM6Cil`MzxnU%D@vtJGAgdP
zGBvvE1@fMbnNsq?Bl1W-kCe%R#FxsACj_I99By9o>fpV+3kwX-$FQx)Y;JvA%`)@d
zWYLYgd8JI0aw{r!Iv89Q>eyImcyRi@1&bblZJ%(NN9SER*F|RI`9Vy^n|kYj&a|m<
z<qcb&UnO2J|6SDIt00$O30vx5C#=V``Mk@b+qoAOOjKVO{UEfP^J}Beo*03xYk_Kd
zS8VSRdCSXubd61LitBTrLB0E{L%$ouGhS8EyJ6)ZwdXs?3x8twHvY>H+i{|PR}_n7
z-gd`kwp)J%TC%IUg`6V4t}fWH9jMCX-LAENwM{str7XO1;E!GNEuasI-gOzw-pnlj
z>{){B-p0ScV3upi-pM7+*5to^wpdM0Lo6uhXKvGLxTUb-aiDN)U^44#klW=8|4*sV
zntfrzKU=lq{IC4u?*i3*Ut)0K@G9flAeW??UW>QI-$6b&yzF|LRw2jj$QO!RxR2R@
z!p-JEk`UjzM<raFm`!#*;7Hu<*xVKtGV!QV@`uJ#;#ypF@o#ElK?eTJu~*2?=(N*m
zz95#7=dk$h0!QZF`l|i)TVMX-Y`qcH+#5e(^=+V_f3$|oiblPIRr9!9^=n>%QUGt5
zsq{^Wh=(VtSvB4F14E?hZ{X9Y?R-}fa@G1cS_<EQd{(?RZONXWleFXa{d=3gV+$~p
z6ml>4|1{K5DvW*TQF%BQWRm-W8rcnHXW5F_LnOa!0te-Gud{_`k1m{6m9unPa(^B$
zKx8W_XRUv@r+&lLzc+3*l|BZA<&8P3LiGe?mL9UxX48rf2YHj@p3l_yh=pvc)~tHC
z{nO?fprlo3bGdkWi`e7<jurW<Pi@?Ne}QB2JZ<5I_*+a<b+qresfdEKvi1FOoLzS?
zTl2c>f5A45eIR!{NSV4~V*iRMLf15OnS&>IfjrQ$5*USNy<-2E*PZ71vSAxg$R}ir
z*HrJV2QIesUSGbBCF#9c#svfK2|7o#H8-glPWYpw_zvjL75X#RJY~u`5Y-X(HrD(=
zUCM<84_%p-W@|H8MF_Nfy!EQ%2FOzxtQJYFtLIN<Wl3w@=f_nBG=E8fj+N8u$u^sh
zS~AYze*-j2ASC3YSZPVr&u|sdhe_8L0OM%!m(S0uUTbZAwDjNUwXMySTY(yRWS04@
z{qG^R!8u_^+?k`6YvX_k=FRgvrCYbGS{-$&RrPqsYG9l{e(hWT^e4}5w$j521-+O5
aGpK*M_1*RT+dN>Q#Ng@b=d#Wzp$P!*bu5qo

literal 0
HcmV?d00001

diff --git a/docs/assets/images/bullet.png b/docs/assets/images/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f8de1a7e0d469d77b8852396dd10f338ae23f2
GIT binary patch
literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^5<tu)zy>7${dCd>QY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MRn<n8VPq=De4^X_^e
z#a`m+>&pI+kyVsc_(xbi&_G6SPZ!4!i_=@D?9F0w6md%rmzMVCWO3ZMStxs>APeV`
z6HToPk{)y4eARTTV}i&**7yU5F8RqPByJ7f7<BN_8{S9{vwtah#WUv4eLuT8{h3tX
z<H~7M{j`@(37X6IrtD$Lr%%7W{P|aCwbJ_V&o42redq6UWICyG_$t@2q=LO|&5T=e
zd8VJfEp%ad{)&z+4d<Rmg?8bqH{5J#bt<@-!&Yr;A(vcZ(W3t8|F3w?7U^`O9x2|4
z_0Bt`e%s3Q9+5cw^Up5fUGe|Vv(%ZH{1H8>l(V(z*fP#y%N{ZA*k8}SM*o+)sk0^|
zVWo&jS?rFxude<7%Cf>m>EMbm?l6V<?Z+4Y-_E>rx6ksBe>HsTzdZg`C*I{YbAygX
z`No(wBmKJvw<YfHzmO)pFR=F4ze6Ehr<5mNx07+IG`S?3$6NcWj%l}S&i11mj+KA=
z+wA^w_sw{w^pE@JEMQ2hmbgZgq$HN4S|t~y0x1R~14DCN14CT{(-0#=D+5z2LrZM~
zAj6>3<wPrrhTQy=%(P0}8h%I?SOPV0fNaP~OiImRu(R82THXN^WAJqKb6Mw<&;$T2
C>*sg?

literal 0
HcmV?d00001

diff --git a/docs/assets/images/enigma-logo.png b/docs/assets/images/enigma-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..94f652aeabed0302d06b927b41c59c473ba745cb
GIT binary patch
literal 16643
zcma*P1yq#n7cWX9EuwTNAV`;Vsh~(piAZ<D&^0uoNQpE<C@EdiF@!YC5RyX-3@~(e
z%$(u-{{M5&J@=lq&a)Q0FzbD1p8f3p?Y$@JorV$_F+DLB78aTETSaXwEL?HS-_!R9
zFuyqiD|;{(0t;0oMa&hmE)`mWF&84hTLTX)EE1}_A8f3QOj^u~gr3UkuL)PM9}=_i
zh3D!gVqRjh*ZttB;Ogvb?c#~~7Yj?l-P+vK+Ul{7y{Fw{C1v$@R{Yk4SXhs-loem<
z`p)ex1OScove4-1MI<|t-PvE$jzOh~IwMItKdIFDTlB`;CS|Va$_;(+(&gg%d0-6c
zeqVLD6dXE6hdc*WO67e~dGw6*V<aVh=R?((`Hy}oV~3g~CMAxGJs;UMn%a*~9Gp${
zfXK-r**Q0_H`yqLw+0s-E8ETnP*(e=29H_)FPAoVO7jcF|M%ifG;x$j;q3tcJDOo3
z@-grW35IT<zQMzbP6@g^#O=l1?c6Uu7z0QpSw0xOn7RH;>10R+s4I2iJ_vUkKmX4y
z59j;8kQ`-p2p&OC%5dhyQ?8An_IJ+?_P(e2^3Mump!{dyi~qadf;>s_zV9#LfR5%U
zN*CDuQ6zUMy;5KfEwYajbB8we^ESV-0D^9_-g5$9><jk<<e4`qk1?ASHy{WbcKaam
z*ckQ&i-o(!na1J+8N0~fs}2V<9sHP08bL-tRw7|2OS~COE@~NpU2&itON06B1mYi@
z;+Dn&5@8G>p%0wIMO&Rqzl;fooGWX!;yJ65H;gdNv-7NGGSa)4+F&KnFN=|0W`d27
z${0GV7)LYzB|r<n_74HtTqhsrKDaSP`s*7oUa&1rS9>R$1@B`yOPD%le1MC2W7k#G
zXshM!W7n?$Cx@8%1yV(X(y&e+bl7B8`lm0Wc&CVHIhqEY;E!@rp*IjyF~U%e7=$Jh
z^+Cz{GUmwoXL3QQ)hphl(<@nUuo|*z2hw*Sjt82c!j{u6^l+z%eCkW}{9y~&LkLK;
z&sYe?H5t8lfFZM5LDQx8>%&b>(e#E4g{>4y^T=ztw*VaojclT?j%TVxa6R;}ATr+Y
zjxN%%|BbF(_?tV%DdtB!N4{at;Wm?6yyOpJwRTcs5-caZK9+75EEsUQW07!J5|Mpb
z<D+i(X*v*&k(>r(Ik*=PzI{=M9jyug3YgEZ{4gm#)Bj>C6!&`!3yNFHebL%{J%L4m
zyF@Xw9xVv$;Y_<Sgi8i;L}ADsn@D6RCdJL4F0LND@6YmhhF&7i%`osjt!FY*#ev7#
zo+fTK7GLV01Gg3(O-@fb%n`kH!|d^&-9DWESITsW+fu~d>*7)Y+NJc05G46=C#=aY
zw_<-2$?2OHm?rO`cs;A35`vWbnV@g{9vG?MisRUi^I{0($alqQe;$TBvmiBnI+Gdo
z3~(qx=VRInFz;xlz+NKpokyBo5b9%5613lQDjRLT#)~w>om#*GzRr=olUIL#caf>x
zKItcIJ`u3{EG|mIFBbYGwysUa6St3rUId5gueJDc&iC;&3OwkxeEhaw_}9>T%-#nT
zJY4=EL9sLTUmE_SDG3k8GeOl5+0Q+KM+QY@%ifL1`TPT$ae7U*im#q24ZveHwa~uZ
z>6|BFBlh$on&01cwEr5n=D}=ct%WaHyM?%08;<PYhrfqs3!k1w(P~%J=!C3wclJ<<
z9pJ+Ca=dSNA{DUD^az0*LvF)85;%0YKAE^9WRRCBY8`q${G4(Ux_@4ZW9M*hxu8eH
zm#nVOcKx>LEbSZ}5$)G|$IL#m0$SaYq23qFMSyP&xZ<M=Ib3iDIQz7oA^uGzabsK&
zKseEt=iNe(*u;oM;JZ7H6>kox7vGxF`iJy|PDJi^vj`wi-WT&TkS;-*eN&WUtrLPB
zZuWy=X2;tfrX^1!GJR^rC3(+w7(|?XGx;e^biTSrnIjxusrth(nq|;0d~YI0jaIHQ
zo%`wa{L97lAE*y^>Y1nN;i6KWa#AY(`E!7HSAUTW^_}&>DDUfQpK-?^BUS%}_|(w&
z;yWe4FhRYtAbGC10}rk~Ug`EabT<$1o)ZD&<5N51;tqP^V%4}yS5~}ugVl6$-epD+
zC&@bS@>fK$Nt9w(XQx@I^4Zz@{=5cmv+t$Xtj();?}!3|OZcBvyIT6v&tMs8`uq29
z5pN>V4Bbs~whI?P^s|E>K2-4wI0{iWEh<l!bEO4r&Q^Mb8T&2ZwRwwKATj6M($XQV
z_r}H}M{7fE$m{o{`Yl&M#DH|@%!jaL{#K8|J%XT0$2$>XXJ|`#?*PRi>sWh{c|w)R
zL*ftD3hF&w<IKFZCBp`5Bha1<mW-zOr!51AoP^-!=8vy2k3F1^`9%|o+ws6mV3eF!
zx8Wb@O9HLWC(XJ4_<TYy&WRn{Au!2zcb=?kg`DCA>#4+7-<t29RaER8`H+}Se1)Zg
z|IZD=uaf+V|5kJ#h#d%1BhAxDWhA?9WeB^Uz8Lf>{CqES=n{ATWugcrE$-*#>|hDd
zPi))55C!A?YDa{3S<JiH{2zy{RKGw5sljOm@8pB&M4%?rcKz)Q0rJuxrK_EIEQ6Ib
zoD4eiB}s6YmRLfZv0D(n9hKHCKKtvVPmq>PTU!o$&D;FBTDHu)X8>u#t9oDbZ}_=|
z-2>M-7lsSI(Vzc0s*xtHIwcVoxnOY>@!Z-F$G7q?2W2KqaZO043NLNVQ*!oVR0+sC
ziuFf)7W^2bOm?i0t_{*+PP3zz;}tlpJMkjNI}A9J^1siKt*Dvc&OzEX4(ti&#S1vx
zhGFxw)62}nr;X_%wsEevYeT64VGOm4Rn`mCu4|_u0Zmz{A(cE|{v(O|gzWEAj(&iu
zGUY7{n!MN9;5w{28_umlv>n0~#_3%mE~#uv4b}!9=(4P1+<^O=a-W3mSn>3y<i9>t
zn15qn#MkO=rCkn}?hJ=Emtch-%jUjwW}+WpIMD5{Cgsl97krLn?hP#U@up2rnA%I@
zB<>$BFN1{y33w1(->ucm`)r>_{6`o>_01(_kukv95SnBZJtEBz7jXZAqrzt}q``N_
zmCA>&=cFgg3+k9Y<j0b|I}>R=+j^i0wU~tv2Hjp?GY;Uz;fWR9_LvHtu2SHAb>U!H
zdU)}zD7!W77`-Le@1(@t^EZ*^dTOcBjZIHaFRtbuAgJRuOU8?P7(~+;2sQDf^m=0Z
zeD<5#k^bpvT+Q6ik9$!|h=mTW4s@3UB!^6fptT@%=1%q=&g<r0c39}&*Op~W!>dd3
zr2Z|h^eCS*AN}k?{ou1kSU4`E#&1L?t;I90)J-cJ{TX>r?>d6BqKz&Q5;E1eI``ej
za5si3t!0NQbbEiMx?7}^#Z03kr&5!HgxJM96DX`><hFK`&AhI!C+Y7&tkcN3Mm4WS
zD7V2)f(^xX-K@Fe;lLXYmp6u#i73^hV}p8oYgn2|I(Hgf9I8w^{?UJ!e8(_W;{RB9
z?(ggKF<z0v?c6r^Zupauk6~KLUa{%!dlTR%adp0Bucq&f^MtbYMMS0$OpJ~L{>rmN
zk36my=z})Yy)-nul%oZK$VNuiwtoP3p$+IUIh6Z8c)s`gFe;3J&RR2s({PR-T{4s^
zo}r_W4u2MHInjU=MT*Ga5-!g5F@Wz$yMPt+^ghV3*}S?f9=__BtnloMJU??Pa9tu-
zTF@2l+|&<*)W!x@-lpKXx_ZxdauQI8pyvb#_P#<O8ssc;J48<F(42iDz}fy1G!&PR
z(R#q@`-G-E6XGMO=h5l_e%AMRY|)Arw(BRG!&0;9^p*U&eb$wxZ~nS-NY609hExqr
zj%->$xX&A3W!|qcsdZEAH2^3am#~I~pK)01s$b$p94*{*k%=cYB)Zqh_oI}qFNT`X
zM}*>t>kEvBjH%ft09Usm;u4$IGiD|BGZf0&jzn{HGQBJfrN21u9?0-k1x^j6%bcrG
zFC3C-UV1Dwrc^AU=c{8^AGdd^BiD=k5KGfmax-QJkMZ%vVGXWD7&}Xu$)2eEzQSm;
z_<F0f(mxF3D+9@W9sO1ADZ0B7aJF-jI#kpUnDLFr`DEV*m7Tg5I1pg6{|8V}%8OGr
zZG9Jm=fc-%k5TGi%S%=CU<yKBsfS*pW!)Dm!8$x;t=w<}5-*cA08|m7ugrhssS$}r
z@(*dx1~i|PWMJ%We-78rkbmrN3<)NVnCqQ0T_I6pG&87BsBw3l`vA$|b8KkgxX{7Y
z^c(hN5cpT9;wS}hvaq53v$X3iVd2jJ`~B)1nxq}+4ZzsHqah;Ch&rbT-?z})rg`2N
z{2h@R(m7AAbCmJ$c@QqRUosg7I`u`r7;~<72A!RGYsXm;9(-i&+&*5H9P~#VQnKJU
z+h)E@-UWs<7v<$$9DX0!rTtz3|AjmAuF!3D(e&r5j`(E3m;Y*G`xK7LTt-N#v9(TU
zfKo+M6t-RavWBK#U$ngC#F8npKi}p7U>V6=;5JZ~eI?&C&MGX*27kgdlj(O{^1WfU
zhIbAITlmx}=E@9%$V?o<5%6cEq2;z&uj@+7jz`3!Sp;T{C`g+JO>o4LHnDCoLFK&z
z%RpV<81Iq=)<;=ejiPVLL~UZH&UlOi1I0-)=4x4%VrZ*{<G_*Dr_Wbsf)`Qy6`WJX
zIkwj%HF6DcJr;kMgCx#1-j@mHiK6Ts2Aj~4bVBs>XR(VH!{?Xdf1g*#vnaKpqyLVN
zTYUWZv1ZA?zJ7dePO1WJ_X}=QR%L`P7bK{PIleaX65&ZpkSko)A5;5uV)(7*dmNi%
zL|?gHn47?!>0%zpq2U5v*r?mrEl!(PcdIh}Zb@As&?k=g`YV}>J7#}{-Wk#NT<ly2
zndW~#ADvG^+*H`Jo$XE;g^p|#eT6(?B-jAg#6c4-fW>fVpVmHlC7j`X`QUBe%GA`9
z+bxea5&oS`#CYWYpZL+u;p$|o(mDve*P@V9SwYS`6v;|;Pye+s(J1+M#w|9<zx%&H
zD&&;Kpcp1%+oY#&pMIv@3Y>0Q*rLx(R8ZV1Y&_G~yD=mG9Hq#LiT!?vJ<NsZW#iB?
zTJ<MCn5%d0GT$!{?!Y2?P~pt5C1V(AC9EvGsmAc$nKY4=Qt1^o?%z*Cz6R}tq<-X9
zR_FR(UK$Vmt1D^s7Cnr|qY5li?kz!ovc3UQFKgky<AXx+#e+JJHP21WDZP6rJouZx
zmIlK|MC%V7hh}}xRg?@Y?z;rk$mp!6@)~HLi0zp+K&bkki;2~EZfa{TxE_!N_3blS
zE07-Y1g-s}%r(w1F(m`jV0rngRZdy2a{+^{<9K<OotTGX%Yd}WQvF){36A}T*GM78
zdjP;h$T3M;F8V1cvSpC9qX6FtF(q7pcflUH?MASq6H1a4c9%k9>=4gk<C9zD(O)gs
zZuZ-0U~x9q6McZCt>3uW=WbnfK&qbilAgXk6|p4EGLfxh`!g*L!A`H2m(ygQUg_#d
z=4ibBjw0ze;e5a-2TU7=b37#W%f7iW5CBMYbUwNQICa>zL=j7BDRev6ewC2J_!2sw
z|E4;<__9q2T_5spj#&{e+h5;5=4Dl)dN(Y^dI@CguY0@lOu#}PT$YVrO0x<C*Ey@Z
zZ6~eH1vSNk=N;`<7lIO^J*SW#EjjxyM{4hJy)X=j`@{|+C3)}hcUp7twMO(#4lp{Y
z_oL+j0HzfW&3$xv`M~hKW{j2*dtJZiR|^q~Z?=?Bqa!|6nJF3~x%zOB0c{xn{RP~e
zUm>tXDj_v;sjJWmN+%DRgA$B!d~PXY>*jLUvJGp<@-gun)Uwgn6Y<a@dEbAD(j56a
z`=?$mR=EvLpJ@&ItCpqSot`SaRk(utDDWkt&%9gQbSGA!TDtbE{vq{vW#L+)bE{Pg
z%9|XmR;c24I<)VfmX?QNjj{C7CGqupDDR<CbI*b<9K=Cl$2`e!AR|t(+U#d%IMF*b
zX&8TX!~dbJW7QDvcV-`pW2`}5^INkfn$2OKpkv-wb5o0drWiX%!ffo?JEg9+IhR<A
zdd@VnU#nO$G)I*W$pwYSKvy1l1cAPY{!S9b8mM(HP225@1b@8*(vLtXxNHF)k^tw9
zW&xaY-50L&cz9WfC=qxc+f02?weMWf4Gpd4n_`34dqW)+vGNwkT6y<}6pSIToHLYA
z;c-Eq?|O8q<oZPZgQ}D0ZOLmLv`iuYmz0#0YM)0-1|90nOTGi%x3apO(AgSeil93j
zKmtkfDHPm&5SIP)>z6Oj8i`o({}7$gYuCK;XH%{snuxSm-%5SoRW$N+Lvu(Y*t(|n
zW^ytA`;4BMEu_0)d`;VY@VN<h1|5o5rFk$WG92TBeDfl3?i>romHnGk|JS0tB}#UM
zsDC;6y0Q1pfh8G4?#sHV2MPa07hTlifAL2`^Y8Cxibj1CIU%9Gl5=LX0+&AmHrKE)
z(Ls3j>{WMnL1Co*M4|ccHI*y@;q7)a%{6baeLfA+GyeLp%;BPOfe3#v{n9x}XEVjH
zU3Zu*fx9U{!3Pq|GSrtNknHpgHPD0>l9M|w_zIbBA7hsPUDwIx+=LD!9r6h}Dx70R
zgvI2H-Q4iLS5S?%?@s`7P0gv4)p_Z{Of%p%B9XTh*VA<!)^a}8@t0PP+(ov5XAMLj
z)+Xu&Vv)njV&#t6R#1|C2@Y+gS5+%Ci*w@qA={uK%E%AEeVOQt;yBg}d6XXn^;g!i
zL`lC^O7+5~%1G8{De&Cwe8DGRtHKatf>tA5{p`YF1aG@C9R%h~_#6tQF*&hO^Rcx;
zwKNJ0QKl|UIzp+}1l1VAw2HHNZZE>~zw>PoIL5?7fyKEzfj6Uz<lFUeFz8AvlGC(g
zx0+>sRc%dfu6SMb{`_dGgI@MoL!1MHD%JcBA$hY)1@}|X%*z8j@z0VRdYZpjw?6i9
zJ~*m0e8g=k?NIp2^Q%ZB(X?Wpy1b#>p@NrJo$G?#^RLzh1z;4xeT+4cT(^V#>n)x&
z-UX_Zl*JF1DVHqy7A1ERg!f##?(Mtg$F3e)r=u_mOC?Y0-D{`vbbKu+(*H@)r6x7|
z=M&~hEzmvECWub*KMCQ(`J^Rl>x|JGds6Y{!9rYH{SLgXXd&RE{lSBv+zZVsND$CO
zA4f9@CFoFSI3N6JtzXy-+auMuhYx)4Mh@H-AgLLQvW!c6CV4Ms{#U`W>Q)%s@<wM}
zheLT>tA2aB#drP4me(sE6D2)sEPi;K&-vbVF;{O;))Uz1Jb>lJ_Ee%>xS&{!OJU@>
ztKYA=VA@Y5-HOJ=b&2848*k2qH~X08Ntx)i`|iT6#vlJPg^HNOXJy5wM@D;6mlqSg
ze{OA>&rcmLI!nV{X8K-JDEdQOy#>wXa6|9w>e~rHHgC0fs0CEB;M}yVC3|o0DsSn9
zp`kxtwo04aaUcrvWo)#nGPloEvTohLl4A*sG|Z>^;XIPDgK$lnZoI<|-95oZeW$Eh
zPd8agxvmAkpIJE0c6Y#7G-W1&h2bE~XOY(2Gt=r+?{2sB2T}(FakrtHTefHC7ClcG
zeDnE`ta&|g@`0!neMiUA$&ZR539bo{dQr!jW`D2O&<Q?u02LETs;lFRCW3;Zq0_yt
z^ubKGGnWk{R<x!s^~5k@vgYjx1GGu~=`96svf6jRNVVj946>xnbr(Ze@#2X$G`h_5
z!7bn{#yX3f81(1y&gH{M{E8X}IQZHL@%e+y+MMaH7+If3krYjXHB3v#AAkf@&pKb?
zT<DX2HeLhcq8K3TI2d;Pd<Z=5HiJPX^l1)zi^BKmDlV5{`9}7jbMU2f&?OjYZoL{N
zR*ZLCd5L4Ya3!i_Y}u<>_?zVbcMj10F_C>h6dgnsJ_&i|ve@be+%{ZtXAI^}wy=Af
zczKtya`QCKu6Zc1^p1WxCihbbg=LX5?sE^-MXL7QlM~1w#b;W|#+mbe5E-6M*?EvY
zr*qXUNT6}g*F^0B$KRY)uHZ_9=pyWxb0@}(CpiKzVzot&jE6<r%3p8(=%$)KIXe-)
z??n)j@HV2i_e~B;|DzK|PZG4X>Yx9kG5-$`JebPIr*bt}KAc)z_^2^<YuVZAtL|Iq
zCt#ebLsY%&Bjh~2!pmdFof0-WQtdd2`id!=8Xlrh{GEM5=?+zo*~K5kN}Rql4@JAz
zX2q-wEKw`f(KoOc7*gkc+h^-ftQ<-N1_oN&dyt8;zm*WEC7QfqPohlLNN#()4NjHT
zbC9c^A?;6aE@^KEMG6;QJKNd!r^h<{zE=9RaY#3mN+6|KVmmkY<{T^80o<AcMm(N8
z-oO`M>RY*%TSJGMKQ<d`CkA@qA;*Bs-A&lra-_gUHD|+}+J$6V)ClLjt8eFhKJpFG
zO8Se)eqZXE<vm+-kJJWKC7KEoGif*!c6Ez?SX9HMo~cN%`n)^~zOLfjP$ushJWZB{
zu67c#us<ARQU1sky+E_C0d0{|nJCgk)(r6<C*^oRB!P#~rtArC8BgnJ7TWqV-KOa(
zz~YKc)6G67d4tD-Kx{^#_q2@+7shlIT;N-44Eo(W6W_{%N_E5?Q6EVTIBu*A{SXK0
z!&l#3BX_YgnJf!sRT7muc5wadwatC*p;4SY#55mssSC}cnYT*(bNS+lep^D2J^!OB
zXPbxq{4(>LDW&l@F0Fi3PPTeOk$`8{%Xrq04)6wQ4)9*R{{+5gZ$SM%q)4US+VYVf
zMJ8YR3kgPksj(0`;p`J&Br!4fLJsZ#@#VZ$uM0*#gw+2JcrGQrIL;4y=szBIpW!kB
zNB-%|syV}qNSAW}`3!TF3m<@|m(olzbRVBWQlt5jU1ak_8PXj$ce4zU_iZ>N7Tj3q
zoelO8D~|A>KKUzkfgpl3js5)g8XC7-RmAxYwkR1$z0d1e$f~ZZSABs>ecSY%SWPMj
z+k?NAQmvPn53~ScUTKpxjFx&T0KO5f-;L?y)XW~9Z}O1!^4XhL){H;C&@O%$P0dH#
z3dSd)_B}&N%fycGB%1t8)Ig%%R+}y3T$NsB-CjbZcVG?B*_<|_jQ8SN)_Rf+furl4
zIdWgB7d5fWU}6Dh7pC{4!SyqL2oc$5&c<sy*8ue>{&P*jVc)b}{~27F2x%QZ^XY3s
z!RJjlH?Pi8)gLtCBKpg0LcGnQQJI*0Iv3u%+ezI1(zha{ej#kxL4Q^k9?<DCeR254
z##9=X;Kif(MSlL05E#Y~t>4;nJUt?=oMU$=s##_?c8v&p5d!ZG^U-vLYfk6veOV-k
za^DLS@SB=XmpIm4H$8t1wIOe9YubRXpH7?l<lEHqMjO=HToQ;gF)?|1c}WV#K2015
z3j?jM!#DLgg~xPKSbL&KG*6N^9}q3UZBQkb5hDBw;XjXUv&vfdeKR2I(jdD2FJh#T
z)6=aQuvFNfM|n9GIo_|-UH^@am7lCIL6#3Dg}1Vw4jFT>>o;g3F<vMPbU5gKd;Uw@
zG8PaXE>e*rgzwsN(w8Fe+P#`9Nhyfd;3*3Qn{Z*-q1!FKl$_2*kj28OB+V?t@ewZ$
zZFC#%wL34~h1-vTk{!g5b>poPwW>_by87t8l3|%>O3N!9swQeJ-gDMM?Zs`6zciap
z4q=bf4T23E6CkW>26&>>(Jv{ZJ?nq}PD_!A4q3-!w<?Z~jt0TlcQFCi>4>FIV9$Ji
zN)MZJmCN=R+TG!!*^e-qVkgI1_XVt8o8M_yDfkexDW>`Li*}qa1|Hjx+S~!N*hS0-
z=2us}wT(M0crB$m3YMgP87q4uSnV2o{i{z&Rh6XFofn7xd50E2CyIBx($+v}3G}}I
z=q7oAU$8GcR-L=U3WtOw@d&LDm4(N%DJ6zDU+wM9?`T{M6X^{`_vW{Hkr=U$(IWil
z6L&Y&o_Hx`Dnr8ujNVQNQ*&v@dAJDT3)I^qjNd))f0h3_&>?~wK2gxWEpTv1cjw_^
z-T^#*i>;{3eZxV`As0{7;X?b-e3iG|jywK#shsdbk#mGcY(P+)GtB8jHFgVk@Cz&L
z$Vdt?L7z_^6)NK$m71Zx<9?hb4cCH5^aMxW0>Z2{hh)z`!goA<)(rlFMgX|Y!8_!Q
zCw6))-=9gMF9A#7b>g}r;cx8l$deNk>>v?ng+CMTeP?P4&6M=u7H*vN>f+DNIclxl
zFK1UZ{h%_aBI%OfQs|vv1bSZo=<#TISdptg{gC%r&(CRceAoG6+KNu;PBgLuBqv}M
zh)+vgwXpTTYmr9iq$w=cCnT760(BF&j|UI7{c{~~Liy}YpKN4i<JLe1yBaZw-hR^a
zBg@5-1%_r^v|r$07}s!<UmROw)B|gTIs>jNBH|HeTCXF6?3!y!dxPLGdUKl*-Ni5b
zz*`7#-zM<P9}4wpy$~@$joDU<pyskvx-e9ZVqn$WW=X>pEFbDRUG5$XWp++ZW&O+J
zA_bpib<QMMm#_&iPzc3$Qc2wQ(VhDqF6mSoTqa-cgWfxF?+J}Ohrh}+AXVt7HQ16D
z!JywM*o4N@e=R$Dh3mTaFI;*6FW;1*tK@JnzMnf`s)<XK2YUY6+23l9EB?msqn~U1
zn2=#)^<DkzzX=Tc<F*tIR&9q%?drJCh(yb?o8FX3+}T>=WNAImGSN5Zkvp(TOq8df
z+WpJxpMZ{$?#QCrXE5M)^NJC6ls{Nl&X+ajmei}%u4X%w!k3q(J4Wono$%9XHkq{W
zm;OZASyfuve|rJ)B$7Im8)CMrlFhl{lGVVWvIHRKu$823VOK@zm=lN#0REJ3accP7
zQ}%$WjrLg{_57;Frx9W*$Nr#W?LFNw3_oU@r2@E*Fv)w`7^%x$+?U~)RT}7QEh{hF
zyQZ9+CH{iz_`=TFxy~J5qEx?9jM$|YWQygcKfAXg-r_nT_i72SzEoaPd{i!7N?w~k
z=Eq|5T@YEvUnsMP{N>0=2CHykRqN7f4_<t}*uFxlWY7wZ=e!VACSY6(pl~&x$mtlQ
zRp-EmG5f|4LEG1yjD(4J^t<3c*fu`OIMWZ=3_ly<vUhdmWQ557WlOk6A$Rfk=R1^4
z-}^y}>pIx-^K<-1>&n>}bjW3!Z}BL9O!fQfUmeY-F4BZ*&U$>tuAY9vh_;h1)jwxa
z(}h)zDhD?9PQLTawFNzcp0UGSRev5mqs53#zKcaxQBK3HCrDg4*fOGWTRg;+`a)z#
z<Twad0LNGkd&vKXYf`)>MxQg^0dySD+S%ZGZ<$$hFPT}&UwcG}%T%@s<86h*EK6Oj
zJM>rz2V0XQvYjJ~J!Ct^JE)=5o>CyR77Pi`asu`gJrO{Uf<uv+xP%l^U*C^_^y}d^
z7;Y=(jkTU)@P{s>Jo>T&)^_nb+FoWPJ&RBAOF+{!1L-Acw1gXVW^IQ~kWrr-W6)j|
zTbqZ(!}VhHK39EfW5Ef+k&t?crPFa04^AafTU!8Mjn=R^+nLQaa|6{mpX8X`Fh?)h
z0>P{uBAGBIT--AZWv3_uO*@R8dN}`9!(b_{w)K>F)}hHHm3uokk*#b-PO9dc?YcLq
z4bWP^gW??m%#lDhv@f2K*FK7QX!RMF;T@j*<;y=fvW5ZmBKQR4zPtU5nac{5yjYXD
z#L^?@QP)X}xYjk(jf1&K#f`}$K}T_YU!^tT5)hcOg%-fWN!o2K%4VD{5odDOWw)@j
zj%Reib75y7GiWl3{X3nHPW@}-z7OD6ZJ*Y3MWnOotcv=eB(l)l0C(bJA-)6bj}Ax8
zfh$cR@)2XxVV^~xwDg7_v`PMZhvwAF+$F7fDQjX(G5Ze!a6Gcfjz>q&7k!MWAtX{7
z(OOCX;8@q^`#yimD=OBj`<O|dBMUi<aCzJq2|HGm6D1EDsj@oX3J1==+;v^hbPD%~
zME$&Yve<g5ew7Gm-`L&dlLBN+3J?8l_{$Oqw=vxL&=8(oF55}(E*4oB!k~#Q@3FAM
z8A=t}>*g6MpW^p(S$^pb?Z6a6Y5FQ9vU?qmmqwV<gU2T6clLf&RL5QNAY1mB`N+Lm
zx5-?(4ti6?0_xqSwrX(*#S<Z!fAU4LUS@piX@Rz>#ybWphLpA`6Mg&)mVrn^6AZ}U
zbF;OVP#Tks;${rWC?zeO)e^1fyPBXBmXmba@k9DUnI-D=akT&V1K52;d?|W^Ysq_2
zjKH{$ut)xpgPlG6M6ZbD^oE5b+NYsa6*`q|CO?X2!~{SHV4I$Efz30G;f~4A{)Hqj
z7VVfvG@HUfl&-Z)rEc$geCl06d}TuC^agH@tOlR5cpPIgm$Zp$B0Ii5QUc$D303Sw
zKc<GY2a=60Dk=nupPnvw`b<-8S5VvpF226X`08ZVzDr2A^qThpEr>EaGH`7hJ@vt_
zPyaS1^OmNx^7GmJ_6Dz=19Votnz$WB|B>Fkf=U-$*1j_>znj<a)~QJze8hh=Z}nj`
z)AD*~D@w>8Y>L6sk18x{ZALQ6&?&Bz@9x@x@~GxlP1v1#h`Y(eAF@1V${TFIXF=p@
zVL>M@6bg2=3uADfzj<DVyQ{QR^*9=fnyLe7yqfs6-480=PM_f}ryPe}eKsGe?hyx%
zj0{X>#^5C-O%@eAU{v`koMZpOKc8%B?PCP>1W=)3CO^t3dL!lfT=gyx!Qkk0Gi4@i
z{<>)2A}9NQVsl~s|6n2sZZ9hfV!v&;X(dY9cC!zo6B*Tn4<IiVn<xnszCKJqu*UiD
zmVfJcfeb-@M!Z-$2o}kkX+-y$e@uEic@3(ss$%OzELw3Z1E1|lkPp>YDTpQ5{n45(
zsi!sTfXSPGX{<>y2nQU%U((XMCsDk~+u7gazyJxs!1@u??e*rSn?^`wMMWflmO~BT
z0tDPA0M1cHS@0rD%e?z-%<Qldh2uQ5^^9NlljC3Wy!yi-C8E;Gso|?lD`H2xMVBi-
zu4(GZvOFgkVYadG#Gz>V0rR~e`!}{qvC2}gOx8zsPS%#6CM-Kd)_J2t+ZKiTutpUy
zxQKUGq5m6Ej@3rygBIo;`rF%o%fq@!l055as?5z159!1aGd^-{H}=`!&C3@)InnP0
zgvEEf+VPAO$d+nb)BD75#T9xN$I)nQv$#^1ToxDKb1~MF0GGH#c3dV?eOnr+voGY5
zQ4n8Mz+iCvIHj4uD2?Sv0V?M5@!qt!<bG_?RM)45rM=>75;OlNobXRH@C6?c94TD%
znJZu^FuR1O@`Eyt?Z+MCtd@(}Zuw)zrPo9JD;J1(ioX$?(M2BW)1s}{^DQUN`<Cn0
zB6MHL4hxjp|Ljme3-@rnb{rS_zRCU>k4|+TOQcDt(Fv^&H0*OeX@M+Fi5eQndjx9j
zxAF%%6&qZIKrd@sk?~4Z_tKIo4l~|(C^sPee|+1%D|=x&Af5@iDP%SxZ6L&i;CPYz
zh6Jt%v`+Z_ciU9+Rsp?&f9}_#J+fZ#4ux^ch@-g@kA6#jLX!o^5Cyu~0(4|Q<Wd1P
z?w_1WhGWW&j;4*_%}L6a%%)E^GdTIOBVtD&N<QPB`c&5@b4vU5CXkC9+k-QCu=;|s
z*Ko5PHFW7rCc%*npK0;FLUs`UYnujL){9G?4gadIVCK8+VOpYMzV9u0iXgtz4I9g)
zGRe<%ay4Xjtx6`^V=!_1hO9SMZz5#nm%8m6a^3(RSCBJo$DQhqjf_OD@64tg6^xH0
zb8UWjcc$BTsXZ2Vs1{T`bEo)@v7M2OeKUU*D-L1zf1qLRyTM61>G4reC?i6ozAW45
za(pO@TgsLD5QyM0<vs->8oK0JQuz#fw<b$#Q9+K*&INUKb!FhChx3fvyrRzRq;1le
zh%VQ`;n8itHIXK1cql3^sH8~WQh%1zn?l%rjJ<E3nXVR`8NYkCy;Z4pV6kVsm$l|6
z7zQ+*iiIf^R0op%aW7a|7)`mp&@U6b3<DVzXT#<|y^7q&Uz2Tty&ufo3tsX2lx(yX
zXCKE_TJ*Voa<sR9vLq$3X0rXJb7U+dc3DE-;L$<uc{UK9h25OJ)x|E%vHO{iV3F=#
zYm0&_Q|@*Yf1lO%JH0Omerd>z9z=Os2a>(w$2ZUgIQYXAu>#Srcvbu`Ah-$i%PmDy
z#-5c5nnwG}dCV>e(+?tLG9gTRMR+ya;!~ODQctwvRm&;lv5cprD8iNzCc^M!r+IdN
zGqhpp%w=^o(fr6tUsnh(N)aBkx3$SSxeq)o3I36jUTY(DwMeV*oSv+80r4>|&*lvo
zEVwF5$3^<n9^b-A+iYKYum?vLc+2XHtk%A@CgIHW_rys##~EaP`>m7NXD0_prTNrv
zgE+|B9-ST3smpgd<fNH|=f?d^rh|pw%y8%ZM%jzc;SsrzRJz??=u41iFT2QcK2fN*
z{=^3bWTh0-zB;wP>|KcQtdXl=D8vyk5`xLXCj&ue2Icw>X$sl{(Xc7ld4TJNt7rrL
zIU}XWjl2(F;_MKgc3Rfy%YAU|lz)8-COi;E4;|yyIrpB>8P%LTK&lIhl|$>s$Htb+
zGOeWs+>klLgkbpM5>_UFFv2K`%mhfe*VNaNz~CD3RJC=jtu6HWQoJ0DJ#CbO!RPpI
z;RV^396`64BOTe;B@CtMn2q~4oC>>jD()nWgf21ta4})>{!>_49?xZ~@q{|6+IEu}
zDrRFMk!Ub{lnJhrL&h71fS=AFDrvBD_U5mW%R|veo<}2`B52p}*i_l=^Qz@RvJA7k
z_Rpt9GNnp9`0Pfehhuh;=fSfsjeMkHT+me4g?Huy<TrEX2JihNn!rGDi%99o)8x0l
z;O_=CjZYI%rzCBxMy4s&kN!e~ywQCwk>sR8$4BW-*C;WY=TI}7A+>rG*svJ<J3C`Q
zwDoorHr(dLul#*R4m~slHPEQ{0oq)vP|K664}zWBZwsgQ{;@={{WFsn%Wq1yN_>5~
zTZUV_m<dhfUz~d^47UU_UkA73gq{<m1uPgzv1|@!;A5iZf6YU)ax^DparEe+72#>H
z7Bm31WVsZ5opznxv=itr5Y<goXd;-Lwe9m@3YL548!>$>+<ND(&71Nw(D~Ad;vcrW
z87~o!Vx5d@lM(0@U)BjWPua1aRv6N6D&-C&O)xv*T*=eJRr5$zXNk4>>r0&#@uWjK
zDoB2kw9&+m`?V(ntD@*+#qL}L$7eGv;iAG1S~s>Oe+WZ^^v&hlMOHpX-Y~4_xL_B8
zmkg&XW0pOn;PWr++`rH}$Q&EqP~YJFDwqO|{#;^}daB}X^Icc?^{!hTd!F*y-mGe%
zv+Uu!%)LDq2aQs5R;oZ#_0mGA3m(TOIfv;Ze;xq8DRwDFNeK^H>lo{oLn$!Z#UK(|
z?Vo$j2Y>I5(4MsnPLb_TV9bNb{=(`elKy@0tYo^J_3_11=mCw#*#!Ys&rEdyAt<PJ
zfR5`^XeCaCCyGFD9o&pV7cIJbTs_r%)XYFqTDZhOTKBu7Pfjc|0^ZM2=K212<8kq4
zWe%Z+g?0PmY5vx4EvO@bELfTxnH(UlXb-ZUbpwx<f2-M!_6Y9!lxozENu^~%7Xz1C
z1ek7Ym`|wkMbgLu)*$-hXshAtvBh9bbdjwO1r)Vzz<YfwVp-&r-Ly(~c9AL1+z0xE
z!4(Y>iq3{;`2oqVLn-_lS}rR_rq)};wmqKw0y@sDUZ2ZETM^6!KNWZ&6-k{gQ^P!x
z;3bL^xHLtuTdo9#%0$yrw|p_{ArVHg1T{KMn>xKAr9ZPqpI_093VKg-4K#eQTHF?a
zvi^FFDP|!#p{H6qNKM`|jlH_BU)$PM+yYbF5;iQRe{r4Di(|6q$sqWT?e#`*NKTH0
zLOx5EvJybVs%UWB2v$EK-d2y`m+zwr4a$sH3R%TcY}?MfkY9`H4#j<4=T}uJa3RJ)
zPDo*H3$TP4WCu)=5@M$lCTxdBZ?j=^p+J6af2KXFM%h|Am=JiTA4Y0-(%k#RN_~wF
zAAMBw^$I`5Hes0Z8vi4|rCEaVIV%W1&~){1&G1jv%xk>97l6co8~Gc6TVD?HDuyiB
z8eHupJTK_oBEHZ1J^puRGovbgnVs;5HN#b5^yPp@;A-Oj1^4Z_LOM;93nnFh!}@}2
zt6kTJ?oL-&g_-}?I8rZ{r~}i=t~Av^%5D8JcTNOZD3#RJGX4u4Nfyan5=NH$R^paB
zB>*z=;(+6vQ|H^4fF*^}BYTBsc$0F8<JZ@+9xgTf7et$=flQCY@;$6~(Y6rvM*f}6
zy!%hk)8oVv!OK->Yq}D$%l%3tM~gQA2$PgH2WB4_FhnL!ZKmExJf7xC4G)bMStJ-2
zoK67jFg#yxlD-@uTk=`ZD*Awe@m$VS3g9LlvJKovk3?(?H8P0Pniw1tJC@fiipj4M
zw_*hm-mth%a-tCmMyN5W*3iVw?iyi`^I_d<+k?8-JhEQppP5w%Mbd+=4KMnFPxkf`
zlp1deL9MWh>EKTpF)f}$7N_a97Vj%gqPAKSx^%$4UwJB8yL1*+91lEhqcpp9c*dhB
z;;NjdZZG;sKc?__lW6S{FYY*iZ25yC`F0IkEfI92`zhwYAbeGt;(we_f*EmoRn}u!
zH<@E^ks;Ha>%=GH!R|f;;>+*GrS0YERs?TJ8^uxv&wh2@Mi7i^X55gw0`7s;?xn2x
zK#e-`V!6?rDs8hI7t>R(o^SEihJzDkrDqIpnlw&|sAwDG+6wE%Mq7UN(w1!1$SA9B
zX=8fq?;43&g{k#km5f!-w^s)NdkP=0IQJ9^e_qj+jX%4f-A1&`qbr~}mH{_h7&KLq
zBb=c$H~6KV|8?)xVeBc2Pb}H5x;Wb_Xb=`;%t9ZWr#3sTsIoE0Q>n{&=UZbQ$Trcb
zPfFA}ygZW>UtVrb4=ybk(VqO!Ef2@=zpCpSAnV8~&EWw%V{u1Ez4k0@IUA8+y{E~#
zT>GI&Ai9i7DObz&6*gGS{ssH@f@3we%|8z?(L^&cCs;1$cE`49r)DS<eLudawzg?~
zo*nCas(V>bYnt)ryJtxOW24y9m+!c-{w0)c3k{GwKT1N%EkP-&FOqp;XyNYd;cm7*
zK`Xob8uF*e`~F~mR+kT_nuM3VeKykGlyy3p2m9he)!cjc2v%C0;Ch-O?JdlaMm`9#
zB4dc8D~g08xql|Y{A_2gLt)3T(&sR17wkz6;nIO8=HU5^3d30h1Ft4>Y`P+d;v(>;
zM(+d9TL2rQS~-RBz*V+Z)YUd*_aik(+?9hm+WL>V7ACcBIvH0r00+rZ$Q)qN7<*Fo
z(rTDAew%<u_Klq@o5g85U0{Hy!vW18cMl0hIZlt@tgI|l9^y^wC2a~edUdcuoaiE=
zi}_!g*8m}=I{iyCEx;|Y73Gon7S2uvSEi%C<*JOr#~jTf!B2nM3b&;j{EZ2Hi7t9v
zOVRmb`^nJGsG^4KT7GVGuI(?7xWBP8$!BvksspyMvvYzbJWtHQQO}e}@H<}j8?>yZ
z{TbstJvD_1c!XMq?i(8$|FIB)NNw|Kq>07)QE?J1+WPpMuXH3!1AAZ7cJoeeWaO%9
zU>tX^_(&5a*Uyp??i7Aw6<1dQeIqygqHO;Xsk=lC)3eb(^IfID7amI3h=`M(X%Cdv
zls$b&#i{Y<p(Il2?v}7IM|;bKhnbZHbT#}Xl0uAq(w*|yI)yKP3s^F6Y?m70$}Uci
zuY3;IY=nwU%W4~v=osy*tApNW$Q{jU<k#2#IJ=DMLy%exqv>dA;T0`=SI6h#i@t2P
zx0|okNR(CXi#=`R&Fi*gJ2oracE_A(!l8O%bo|qt>sIr_rizxEdq&4Xt_#UL<~_u=
z-j$)xY}P1%7AqbhU~;*Qpc@3HpLf`7YfQ;}K}vJM(6uEtpGR<GV*@^Gn{)ctxY?5{
zHa0e{=AFdw-1Yvsm_-k9<DS&?A(@#AI8ae@0GC1rp4NbS@cs5dFbgWcw&y-T{NPo>
z^bQrRCh(dS5HClfXch6W<%{iI<sRerS^V8S)IQa4RT<mY?KpAebT9txiNf2oW!TH%
zI;i7;VcKU1#0|!!i@qysb0JalOSUO3=n)kgWg%nZEEk3K!&x?TN})3>`yrG%MO^+j
zS1Ty6=g>vESXDvs%{OYghY9YBhQ%azNB{rn(!*2*g&mTne0A-%$}oEW)<or*;Cmoe
zxO9^m-+@4<Yk=llb@;$u)b+C9b8!W|<U9#6OM<MFfQj1<zHBVyWHymZBjV93x;169
zwJ1*a_0@q{hTj3=PV;Hmf6=`R`whqWiD@!^!pb>TIG<Dsv@`wI(<5Fz@%Q(~NJhXF
z3+h5?V_%a~r18QcO@y$^yuH<nCu*1-FQsQQk;82$3L}Te^$`%!=VQ~47#XtKovTw6
z5$VIu^1MRRS@@)o-O`W-R@8`@MMGyUh!*j1vYK1}B{L@fvO}+;rnm!)x1?yPPgBb`
z6wudV7K$*$O)J(3-18$0WsoUwJ@p2hGk`MF`(l>o=|tQK#RJX@bzZc<W@q|$W^1c?
zOE>TZV}+iJikip#tgSu1g|AQQPncpAWnUrTHj|E(lHz6tM$(S&Uv`dQhT`6^KNv7{
z-TGTBgStTU$R}P(06Lf^u?>M+a{0C|{`H1$Kx<d~V+)&vSBI~B%p)6i$z8q@sq&Wo
zK8Gu{wdLKb2qUoSA#gF!%y?N@eK(mTr2L<fu9eYfBB;8HwN0hX>%<mXQzjp5eUvqA
z0lQBuIW)h-QtV)`$;p_m$r_`a8ZTO$bWHT{8}9*;>a&NeNd=XRG^P?p&7~3^KK|}^
zNd&P=ey%J@>smV{q1@+ACQvK>&3r&Wi!-eLv(L`Va@zAmHI6%@Mn_NY{yqrh=et5=
zYhcRKFbq=a(mTJ%pr11KOhAb84AuCGQ6q|^eWVC8t^K~!=*IYFo(`o5!Bw8Un^=O9
zK;>CBL|ZTe678tdN*zN(hR1O#hfUBxNMra=!=it54*CY!*_|jFvVAi4Q}tgk^liah
zRF6i^k$@Ry{L0$TuF7?({ZY_by>q}mOj>H3uE!{7Zk8w<!ek;HAhslf^3_}*^xj>u
z&5|o_#F3e#eKf#6WD7mp{7Rk;Yh!>x(A2i<50=+bP01P4fXgJNg5eb?(noXh<^CFX
zM}d>!@$XdKe>>&>JI|Grbk{L&b5WWE8ct>!&U#diN8-#pQ3Rzu&AIcFVGP)Cx5vxe
zFyk4HdS}=h)`Wwk9JgLNNauHz>eK4J@y+idt+KAnOHOu=H@QtE>>m_0)kJ=B2DQLo
zPZ%Q+ap7x26UC`ZK&rVptc|U$+{#J;$AAETf8Y?wRnxkS#OYtpAKvqBPo<eKvp(@b
zCwYZ~$&`DTX{h}2@)40k^kE;%`N{3xLW^j{o%xLmtKp5Rtc6GoHHL%io)2Q4U~^r2
zstP~O`8@n^u=rs-X3Sw)Ow6BfVXp3eEP1d<>l?_`X_fbGKNGyXp=(kf3=R$n#U3ti
z@GtT9^gNjNfZ`9Pq{y)&t*v9sZ?8_vj9cDMgYHZP-R3}S(ql#bmF$Jv4A@)liJ*nb
z^vybvJA0e(^FO_OcQYcfR@O0xtrp1zxyRtk#s>S?ao9)v`tDmi4#TAj+2XN@yUE4`
z%EmSwnlCw+I(T|yB!N=8GmQNK5mfy)z{_h#;?l|%kf`D|;Wh1c)#?}5tXDsxNk#N3
z{a8OHRQ{Hz-sSY~!p)o`JbSwaV|-@d&L=h2g0>n}h?WbBErG@k%29S5E*DH2amxd?
zleR+wrg*up$z$Y}q{!?5{@4o1*FWEV@!FoEB$r0J0N@?inz<nu2PfvbxYI^}G;74`
zcZwvtA($!u&k&Dn6QwD}W4_ndPc6Dx2f2z34FAE-=bYbfL<d3D&v8B0X`vIDR^QQ{
zh*;7_9s#3!)292+zT$vbfcIZLv0X?tIihfZNK;S?kl!CSd_D~7+a#fpV*T{&K%7E$
z6%5Wn{q+E1oJ=p%d_=c7Gw|Rglpl)m%@7F$sgfCO?3>wEzgo>ze4}s?5))eA*f5c0
zjG@3FB9vU8v|BNacAwhnsee~k;|Jqu=jsoZbvS$6rt&UD--&Ga1LC{Oo$O+c9kc#B
z5&JY>Qe0cEt*t5;?7^(Y`Z7m|l)O=!_~bmil=l%i7+sr!e|=VfhQYR5?zH)ps3_#s
zP;M|%17Ix>eSS7Ry|ka!`~B;iiQSPhN42Tj)3dXhV02KQQ3mF2EC-|Aw*}fK=jQ=~
zKr(E?kl|LcpUZc?nQ}lyC#m4^Y)ygle526C2mci!OtuBVTCtT6S7JV#3fvK*WsG=>
zmm&adnoT*~mR!{1#JlNtWkr8|1UQ|9bU1G5Ui2${ZRe0XPKTzox63KbPL&(_U9P2i
zwcVXcQbP88|Ff88K}_Q_Mk#)8jBtEcUa6?jtsk76+!V9IMC#*4<l*7re-MxqJ4#K=
zmJ*I8{<pEzyK&o$hxxU&6GD`WwB4b@mm=vJvXg?=Uu$_2LSh*vj_riiO3JNQ^z<bM
zUnwZ;Xt2wGVj-CWCr?!wG4r-o-`n3tKq~nA6opHhGtyH{z8V{D&%AMU=G%9kU6}{4
z<3v-_LAUJ*DY`(e1la-;V`H78qu=u47X$WX$?l@U1mOuhTdtgzJz-vh6|%>2S6Z5r
zuS@ksf+x9c@8iy&k1Alizyo5&;M-H)fK|#qAU%WK!tba!*?>$24UQ&6AqcQ$V+qR;
zZEf|hYZw7veBwM<>7iN94)83$69-)hOkekrGRK6bgYc(U?RsR3189Rp?0oHfAZh`p
z%GmWIJ;G3Y`vj%f1+&rjmbhbGvD*L9aDH2#e|xExc~7TEYN&>H%Kme=qMJ?QFYI5%
ze)2y%s&pmP$b26VN7xL9god8v{s^wf%$=$;7HO3?ohU45Se7II=ly*Lv7WN+fl+Iw
z8K^tPvWUB`W2RYTz2v<Xyx6}Fcy<T}O66<s_#()}WY9n@OP{eY{Pi*qh+ER+->IX8
zeW22G1ctbN+5%2-;gzfFD_VdolaN8puT!Nw_IN8E2J$c84YsJeB3@;S-JL@JOyPf8
zGyhw}&)43ldro)xl7^fLk~ZoZ(@BfA7A-9)sp3UGPkTpXqFU<=diQK~##^Fn=nj{+
z;+<HvFTQ7+6IgH12>8i1^Q*XcSsGvM06qFy&PqdK8Bg=E=YHF{L*|`2GUA>TITYV3
z)*S>{Jsz6Kbc&3O+}Phg$NOi*&fV#MAN&5FySf{X=4KnLch;=0DJdxltEVI;15YPm
zzAr%Y?t1|~$-v$b{M#sacaZ-#iz~B$|E@Xre_08GCurON|G|Rw>g-$0TVpA|)=;c?
IWft~702|8K8UO$Q

literal 0
HcmV?d00001

diff --git a/docs/archive.md b/docs/configuration/archivers.md
similarity index 98%
rename from docs/archive.md
rename to docs/configuration/archivers.md
index 68453098..26755162 100644
--- a/docs/archive.md
+++ b/docs/configuration/archivers.md
@@ -1,4 +1,7 @@
-# File Archives & Archivers
+---
+layout: page
+title: Archivers
+---
 ENiGMA½ can detect and process various archive formats such as zip and arj for a variety of tasks from file upload processing to EchoMail bundle compress/decompression. The `archives` section of `config.hjson` is used to override defaults, add new handlers, and so on.
 
 ## Archivers
diff --git a/docs/config.md b/docs/configuration/config-hjson.md
similarity index 85%
rename from docs/config.md
rename to docs/configuration/config-hjson.md
index 98a6730f..10ca119d 100644
--- a/docs/config.md
+++ b/docs/configuration/config-hjson.md
@@ -1,6 +1,7 @@
-# Configuration
-Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just like JSON but simplified and much more resilient to human error.
-
+---
+layout: page
+title: config.hjson
+---
 ## System Configuration
 The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `/enigma-bbs-install-path/config/config.hjson` though you can override the `config.hjson` location with the `--config` parameter when invoking `main.js`. Values found in `core/config.js` may be overridden by simply providing the object members you wish replace.
 
@@ -31,12 +32,6 @@ general: {
 
 While not everything that is available in your `config.hjson` file can be found defaulted in `core/config.js`, a lot is. [Poke around and see what you can find](https://github.com/NuSkooler/enigma-bbs/blob/master/core/config.js)!
 
-### Specific Areas of Interest
-* [Message Conferences](msg_conf_area.md)
-* [Message Networks](msg_networks.md)
-* [File Base](file_base.md)
-* [File Archives & Archivers](archives.md)
-* [Web Server](web_server.md)
 
 ### A Sample Configuration
 Below is a **sample** `config.hjson` illustrating various (but certainly not all!) elements that can be configured / tweaked.
@@ -125,9 +120,3 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 	}
 }
 ```
-
-## See Also
-* [Modding](modding.md)
-* [Doors](doors.md)
-* [MCI Codes](mci.md)
-* [Menu System docs](menu_system.md)
diff --git a/docs/configuration/creating-config.md b/docs/configuration/creating-config.md
new file mode 100644
index 00000000..c8495f1c
--- /dev/null
+++ b/docs/configuration/creating-config.md
@@ -0,0 +1,27 @@
+---
+layout: page
+title: Creating Initial Config Files
+---
+Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just 
+like JSON but simplified and much more resilient to human error.
+
+## config.hjson
+Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your 
+enigma-bbs root directory:
+```
+./oputil.js config new
+```
+
+You will be asked a series of questions to create an initial configuration.
+
+## menu.hjson and prompt.hjson
+
+Create your own copy of `/config/menu.hjson` and `/config/prompt.hjson`, and specify it in the
+`general` section of `config.hjson`:
+
+````hjson
+general: {
+    menuFile: my-menu.hjson
+    promptFile: my-prompt.hjson
+}
+````
\ No newline at end of file
diff --git a/docs/configuration/directory-structure.md b/docs/configuration/directory-structure.md
new file mode 100644
index 00000000..f27878c7
--- /dev/null
+++ b/docs/configuration/directory-structure.md
@@ -0,0 +1,20 @@
+---
+layout: page
+title: Directory Structure
+---
+All paths mentioned here are relative to the ENiGMA½ checkout directory. 
+
+| Directory           | Description                                                                                               |
+|---------------------|-----------------------------------------------------------------------------------------------------------|
+| `/art/general`      | Non-theme art - welcome ANSI, logoff ANSI, etc. See [General Art](/art/general).
+| `/art/themes`       | Theme art. Themes should be in their own subdirectory and contain a theme.hjson. See [Themes](/art/themes).
+| `/config`           | config.hjson, [menu.hjson](/configuration/menu-hjson) and prompt.hjson storage. Also default path for SSL certs and public/private keys
+| `/db`               | All ENiGMA½ databases in Sqlite3 format
+| `/docs`             | These docs ;-)
+| `/dropfiles`        | Dropfiles created for [local doors](/modding/local-doors)
+| `/logs`             | Logs. See [Monitoring Logs](/troubleshooting/monitoring-logs)
+| `/misc`             | Stuff with no other home; reset password templates, common password lists, other random bits
+| `/mods`             | User mods. See [Modding](/modding/existing-mods)
+| `/node_modules`     | External libraries required by ENiGMA½, installed when you run `npm install`
+| `/util`             | Various tools used in running/debugging ENiGMA½
+| `/www`              | ENiGMA½'s built in webserver root directory
\ No newline at end of file
diff --git a/docs/configuration/editing-hjson.md b/docs/configuration/editing-hjson.md
new file mode 100644
index 00000000..fde61290
--- /dev/null
+++ b/docs/configuration/editing-hjson.md
@@ -0,0 +1,16 @@
+---
+layout: page
+title: Editing Hjson
+---
+Hjson is a syntax extension to JSON. It's NOT a proposal to replace JSON or to incorporate it into the JSON spec itself. 
+It's intended to be used like a user interface for humans, to read and edit before passing the JSON data to the machine.
+
+You can find more info at the [Hjson.org website](http://hjson.org/).
+
+## Editor Plugins
+### Visual Studio Code
+
+[Visual Studio Code](https://code.visualstudio.com/) has a nice Hjson extension that can be installed from
+within the IDE. It provides syntax highlighting to make it clear when you've made a syntax mistake within
+a config file. 
+
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
new file mode 100644
index 00000000..3596e95a
--- /dev/null
+++ b/docs/configuration/menu-hjson.md
@@ -0,0 +1,101 @@
+---
+layout: page
+title: menu.hjson
+---
+:warning: ***IMPORTANT!*** Before making any customisations, create your own copy of `/config/menu.hjson`, and specify it in the
+`general` section of `config.hjson`:
+
+````hjson
+general: {
+    menuFile: my-menu.hjson
+}
+````
+This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson`
+
+## The Basics
+Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
+
+Entries in `menu.hjson` are objects defining a menu. A menu in this sense is something the user can see 
+or visit. Examples include but are not limited to:
+
+* Classical Main, Messages, and File menus
+* Art file display
+* Module driven menus such as door launchers
+
+
+Each entry in `menu.hjson` defines an object that represents a menu. These objects live within the `menus` 
+parent object. Each object's *key* is a menu name you can reference within other menus in the system. 
+
+## Example
+Let's look a couple basic menu entries:
+
+```hjson
+telnetConnected: {
+  art: CONNECT
+  next: matrix
+  options: { nextTimeout: 1500 }
+}
+```
+
+The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in 
+the Telnet server's config).
+
+An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents 
+a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If 
+desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
+
+The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after 
+`telnetConnected`.
+
+Finally, an `options` object may contain various common options for menus. In this case, `nextTimeout` 
+tells the system to proceed to the `next` entry automatically after 1500ms.
+
+Now let's look at `matrix`, the `next` entry from `telnetConnected`:
+
+```hjson
+matrix: {
+  art: matrix
+  desc: Login Matrix
+  form: {
+    0: {
+      VM: {
+        mci: {
+          VM1:  {
+            submit: true
+            focus:  true            
+            items: [ "login", "apply", "log off" ]
+            argName: matrixSubmit
+          }
+        }
+        submit: {
+          *: [
+              {
+                  value: { matrixSubmit: 0 }
+                  action: @menu:login
+              }
+              {
+                  value: { matrixSubmit: 1 },
+                  action: @menu:newUserApplication
+              }
+              {
+                  value: { matrixSubmit: 2 },
+                  action: @menu:logoff
+              }
+          ]
+        }
+      }
+    }
+  }
+}
+```
+
+In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form 
+by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` 
+(*VerticalMenuView*) MCI entry. `VM1` is then setup to `submit` and start focused via `focus: true` 
+as well as have some menu entries ("login", "apply", ...) defined. We provide an `argName` for this 
+action as `matrixSubmit`.
+
+The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`).
+ Upon submit, the first match will be executed. For example, if the user selects "login", the first entry 
+ with a value of `{ matrixSubmit: 0 }` will match causing `action` of `@menu:login` to be executed (go 
+ to `login` menu).
diff --git a/docs/configuration/sysop-setup.md b/docs/configuration/sysop-setup.md
new file mode 100644
index 00000000..b8c4beb6
--- /dev/null
+++ b/docs/configuration/sysop-setup.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: SysOp Setup
+---
+SySop privileges will be granted to the first user to log into a fresh ENiGMA½ installation.
+
diff --git a/docs/file_base.md b/docs/file_base.md
deleted file mode 100644
index 893a93de..00000000
--- a/docs/file_base.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# File Bases
-Starting with version 0.0.4-alpha, ENiGMA½ has support for File Bases! Documentation below covers setup of file area(s), but first some information on what to expect:
-
-## A Different Approach
-ENiGMA½ has strayed away from the old familure setup here and instead takes a more modern approach:
-* [Gazelle](https://whatcd.github.io/Gazelle/) inspired system for searching & browsing files
-* No File Conferences (just areas!)
-* File Areas are still around but should generally be used less. Instead, files can have one or more tags. Think things like `dos.retro`, `pc.warez`, `games`, etc.
-* Temporary web (http:// or https://) download links in additional to standard X/Y/Z protocol support
-* Users can star rate files & search/filter by ratings
-* Concept of user defined filters
-
-## Other bells and whistles
-* A given area can span one to many physical storage locations
-* Upload processor can extract and use `FILE_ID.DIZ`/`DESC.SDI`, for standard descriptions as well as `README.TXT`, `*.NFO`, and so on for longer descriptions
-* Upload processor also attempts release year estimation by scanning prementioned description file(s)
-* Fast indexed Full Text Search (FTS)
-* Duplicates validated by SHA-256
-
-## Configuration
-Like many things in ENiGMA½, configuration of file base(s) is handled via `config.hjson` -- specifically in the `fileBase` section.
-
-```hjson
-fileBase: {
-	areaStoragePrefix: /path/to/somewhere/
-
-	storageTags: {
-		/* ... */
-	}
-
-	areas: {
-		/* ... */
-	}
-}
-```
-
-(Take a look at `core/config.js` for additional keys that may be overridden)
-
-### Storage tags
-**Storage Tags** define paths to a physical (file) storage location that can later be referenced in a file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths are relative to the value set by the `areaStoragePrefix` key. Below is an example defining a both a relative and fully qualified path each attached to a storage tag:
-
-```hjson
-storageTags: {
-	retro_pc: "retro_pc" // relative
-	retro_pc_bbs: "retro_pc/bbs" // still relative!
-	bbs_stuff: "/path/to/bbs_stuff_storage" // fully qualified
-}
-```
-
-### Areas
-File base **Areas** are configured using the `fileBase::areas` configuration block in `config.hjson`. Each entry within `areas` must contain a `name`, `desc`, and `storageTags`. Remember that in ENiGMA½ while areas are important, they should generally be used less than in tradditional BBS software. It is recommended to favor the use of more **tags** over more areas. 
-
-Example areas section:
-```hjson
-areas: {
-	retro_pc: {
-		name: Retro PC
-		desc: Oldschool PC/DOS
-		storageTags: [ "retro_pc", "retro_pc_bbs" ]
-		acs: {
-			write: GM[users] /* optional, see ACS below */
-		}
-	}
-}
-```
-
-#### ACS
-If no `acs` block is supplied, the following defaults apply to an area:
-* `read` (list, download, etc.): `GM[users]`
-* `write` (upload): `GM[sysops]`
-
-To override read and/or write ACS, supply a valid `acs` member.
-
-#### Uploads
-Note that `storageTags` may contain *1:n* storage tag references. **Uploads in a particular area are stored in the first storage tag path**.
-
-## Web Access
-Temporary web HTTP(S) URLs can be used to download files using the built in web server. Temporary links expire after `fileBase::web::expireMinutes`. The full URL given to users is built using `contentServers::web::domain` and will default to HTTPS (http://) if enabled with a fallback to HTTP. The end result is users are given a temporary web link that may look something like this: `https://xibalba.l33t.codes:44512/f/h7JK`
-
-See [Web Server](web_server.md) for more information.
-
-## oputil
-The `oputil.js` +op utilty `fb` command has tools for managing file bases. For example, to import existing files found within **all** storage locations tied to an area and set tags `tag1` and `tag2` to each import:
-
-```bash
-oputil.js fb scan some_area --tags tag1,tag2
-```
-
-See `oputil.js fb --help` for additional information.
\ No newline at end of file
diff --git a/docs/filebase/acs.md b/docs/filebase/acs.md
new file mode 100644
index 00000000..50527928
--- /dev/null
+++ b/docs/filebase/acs.md
@@ -0,0 +1,25 @@
+---
+layout: page
+title: ACS
+---
+
+If no `acs` block is supplied in a file area definition, the following defaults apply to an area:
+* `read` (list, download, etc.): `GM[users]`
+* `write` (upload): `GM[sysops]`
+
+To override read and/or write ACS, supply a valid `acs` member.
+
+## Example File Area Config with ACS
+
+```hjson
+areas: {
+	retro_pc: {
+		name: Retro PC
+		desc: Oldschool PC/DOS
+		storageTags: [ "retro_pc", "retro_pc_bbs" ]
+		acs: {
+			write: GM[users]
+		}
+	}
+}
+```
\ No newline at end of file
diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
new file mode 100644
index 00000000..58d4a5c1
--- /dev/null
+++ b/docs/filebase/first-file-area.md
@@ -0,0 +1,71 @@
+---
+layout: page
+title: Configuring a File Base
+---
+## ENiGMA½ File Base Key Concepts
+Like many things in ENiGMA½, configuration of file base(s) is handled via `config.hjson` -- specifically 
+in the `fileBase` section. First, there are a couple of concepts you should understand.
+
+
+### Storage tags
+
+**Storage Tags** define paths to a physical (file) storage locations that are referenced in a 
+file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths 
+are relative to the value set by the `areaStoragePrefix` key (defaults to `<enigma_install_dir/file_base`). 
+Below is an example defining a both a relative and fully qualified path each attached to a storage tag:
+
+```hjson
+storageTags: {
+	retro_pc: "retro_pc" // relative
+	retro_pc_bbs: "retro_pc/bbs" // still relative!
+	bbs_stuff: "/path/to/bbs_stuff_storage" // fully qualified
+}
+```
+
+Note that on their own, storage tags don't do anything - they are simply pointers to storage locations on
+your system. 
+
+### Areas
+
+File base **Areas** are configured using the `fileBase::areas` configuration block in `config.hjson`. 
+Each entry within `areas` must contain a `name`, `desc`, and `storageTags`. Remember that in ENiGMA½ 
+while areas are important, they should generally be used less than in tradditional BBS software. It is 
+recommended to favor the use of more **tags** over more areas. 
+
+Example areas section:
+
+```hjson
+areas: {
+	retro_pc: {
+		name: Retro PC
+		desc: Oldschool PC/DOS
+		storageTags: [ "retro_pc", "retro_pc_bbs" ]
+	}
+}
+```
+
+## Example Configuration
+
+This combines the two concepts described above. When viewing the file areas from ENiGMA½ a user will 
+only see the "Retro PC" area, but the files in the area are stored in the two locations defined in the 
+`storageTags` section.
+
+```hjson
+fileBase: {
+	areaStoragePrefix: /enigma-bbs/file_base
+
+	storageTags: {
+		retro_pc: "retro_pc"
+        retro_pc_bbs: "retro_pc/bbs"
+	}
+
+	areas: {
+		retro_pc: {
+            name: Retro PC
+            desc: Oldschool PC/DOS
+            storageTags: [ "retro_pc", "retro_pc_bbs" ]
+        }
+	}
+}
+```
+
diff --git a/docs/filebase/index.md b/docs/filebase/index.md
new file mode 100644
index 00000000..c225338e
--- /dev/null
+++ b/docs/filebase/index.md
@@ -0,0 +1,19 @@
+---
+layout: page
+title: About File Areas
+---
+## A Different Approach
+ENiGMA½ has strayed away from the old familure setup here and instead takes a more modern approach:
+* [Gazelle](https://whatcd.github.io/Gazelle/) inspired system for searching & browsing files
+* No File Conferences (just areas!)
+* File Areas are still around but should generally be used less. Instead, files can have one or more tags. Think things like `dos.retro`, `pc.warez`, `games`, etc.
+* Temporary web (http:// or https://) download links in additional to standard X/Y/Z protocol support
+* Users can star rate files & search/filter by ratings
+* Concept of user defined filters
+
+## Other bells and whistles
+* A given area can span one to many physical storage locations
+* Upload processor can extract and use `FILE_ID.DIZ`/`DESC.SDI`, for standard descriptions as well as `README.TXT`, `*.NFO`, and so on for longer descriptions
+* Upload processor also attempts release year estimation by scanning prementioned description file(s)
+* Fast indexed Full Text Search (FTS)
+* Duplicates validated by SHA-256
\ No newline at end of file
diff --git a/docs/filebase/tic-support.md b/docs/filebase/tic-support.md
new file mode 100644
index 00000000..9d092fb1
--- /dev/null
+++ b/docs/filebase/tic-support.md
@@ -0,0 +1,100 @@
+---
+layout: page
+title: TIC Support
+---
+ENiGMA½ supports TIC files. This is handled by mapping TIC areas to local file areas.
+
+Under a given node defined in the `ftn_bso` config section in `config.hjson` (see 
+[BSO Import/Export](../messageareas/bso-import-export)), TIC configuration may be supplied:
+
+```hjson
+{
+  scannerTossers: {
+    ftn_bso: {
+      nodes: {
+        "46:*": {
+          packetPassword: mypass
+          encoding: cp437
+          archiveType: zip
+          tic: {
+            password: TESTY-TEST
+            uploadBy: Agoranet TIC
+            allowReplace: true
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+You then need to configure the mapping between TIC areas you want to carry, and the file 
+base area and storage tag for them to be tossed to. Optionally you can also add hashtags to the tossed
+files to assist users in searching for files:
+
+````hjson
+ticAreas: {
+    agn_node: {
+        areaTag: msgNetworks
+        storageTag: msg_network
+        hashTags: agoranet,nodelist
+    }
+}
+
+````
+Multiple TIC areas can be mapped to a single file base area. 
+
+## Example Configuration
+
+An example configuration linking filebase areas, FTN BSO node configuration and TIC area configuration.
+
+````hjson
+fileBase: {
+    areaStoragePrefix: /home/bbs/file_areas/
+    
+    storageTags: {
+        msg_network: "msg_network"
+    }
+    
+    areas: {
+        msgNetworks: {
+            name: Message Networks
+            desc: Message networks news & info
+            storageTags: [
+                "msg_network"
+            ]
+        }
+    }
+}
+
+scannerTossers: {
+    ftn_bso: {
+        nodes: {
+            "46:*": {
+                packetPassword: mypass
+                encoding: cp437
+                archiveType: zip
+                tic: {
+                    password: TESTY-TEST
+                    uploadBy: Agoranet TIC
+                    allowReplace: true
+                }
+            }
+        }
+    }
+}
+
+
+ticAreas: {
+    agn_node: {
+        areaTag: msgNetworks
+        storageTag: msg_network
+        hashTags: agoranet,nodelist
+    }
+    agn_info: {
+        areaTag: msgNetworks
+        storageTag: msg_network
+        hashTags: agoranet,infopack
+    }
+}
+````
\ No newline at end of file
diff --git a/docs/filebase/uploads.md b/docs/filebase/uploads.md
new file mode 100644
index 00000000..4b1e9c38
--- /dev/null
+++ b/docs/filebase/uploads.md
@@ -0,0 +1,8 @@
+---
+layout: page
+title: Uploads
+---
+
+Note that `storageTags` may contain *1:n* storage tag references. 
+
+**Uploads in a particular area are stored in the first storage tag defined in an area.**
diff --git a/docs/filebase/web-access.md b/docs/filebase/web-access.md
new file mode 100644
index 00000000..714a801e
--- /dev/null
+++ b/docs/filebase/web-access.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Web Access
+---
+Temporary web HTTP(S) URLs can be used to download files using the built in web server. Temporary links 
+expire after `fileBase::web::expireMinutes` (default 24 hours). The full URL given to users is built 
+using `contentServers::web::domain` and will default to HTTPS (https://) if enabled with a fallback to 
+HTTP. The end result is users are given a temporary web link that may look something like this: 
+`https://xibalba.l33t.codes:44512/f/h7JK`
+
+See [Web Server](web_server.md) for more information.
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 2320829c..5cbe5670 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,129 +1,27 @@
-# Introduction
-ENiGMA½ is a modern from scratch BBS package written in Node.js.
+---
+layout: default
+title: Home
+---
+![ENiGMA½ BBS](images/enigma-bbs.png "ENiGMA½ BBS")
 
-# Quickstart
-Unless you have a compelling reason to do otherwise, please use **The Easy Way** below.
+ENiGMA½ is a modern BBS software with a nostalgic flair!
 
-## The Easy Way
-Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Simply cut + paste the following into your terminal:
 
-```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
-```
-
-For other environments such as Windows, see **The Manual Way** below.
-
-## The Manual Way (aka Advanced)
-For Windows environments or if you simply like to do things manually, read on...
-
-### Prerequisites
-* [Node.js](https://nodejs.org/) version **v6.x or higher**
-  * :information_source: It is **highly** suggested to use [nvm](https://github.com/creationix/nvm) to manage your Node/io.js installs
-* [Python](https://www.python.org/downloads/) 2.7.x
-* A compiler such as Clang or GCC for Linux/UNIX systems or a recent copy of Visual Studio ([Visual Studio Express](https://www.visualstudio.com/en-us/products/visual-studio-express-vs.aspx) editions OK) for Windows users. Note that you **should only need the Visual C++ component**.
-  
- 
-### New to Node
-If you're new to Node.js and/or do not care about Node itself and just want to get ENiGMA½ running these steps should get you going on most \*nix type environments (Please consider the `install.sh` approach unless you really want to manually install!):
-
-```bash
-curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
-nvm install 6
-nvm use 6
-```
-
-If the above completed without errors, you should now have `nvm`, `node`, and `npm` installed and in your environment.
-
-For Windows nvm-like systems exist ([nvm-windows](https://github.com/coreybutler/nvm-windows), ...) or [just download the installer](https://nodejs.org/en/download/).
-
-  
-### Clone
-```bash
-git clone https://github.com/NuSkooler/enigma-bbs.git
-```
-
-### Install Node Modules
-```bash
-cd enigma-bbs
-npm install
-```
-
-## Generate a SSH Private Key
-To utilize the SSH server, a SSH Private Key will need generated. This step can be skipped if you do not wish to enable SSH access.
-```bash
-openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
-```
-
-### Create a Minimal Config
-The main system configuration is handled via `/enigma-bbs-install-path/config/config.hjson`. This is a [HJSON](http://hjson.org/) file (compiliant JSON is also OK). See [Configuration](config.md) for more information.
-
-#### Via oputil.js
-`oputil.js` can be utilized to generate your **initial** configuration. **This is the recommended way for all new users**:
-
-```bash
-./oputil.js config new
-```
-
-(You will be asked a series of basic questions)
-
-#### Example Starting Configuration
-Below is an _example_ configuration. It is recommended that you at least **start with a generated configuration using oputil.js described above**.
-
-```hjson
-{
-	general: {
-		boardName: Super Awesome BBS
-	}
-
-	loginServers: {
-		ssh: {
-	    		privateKeyPass: YOUR_PK_PASS
-	    		enabled: true /* set to false to disable the SSH server */
-	    	}
-		telnet: {                                                                                                                                                                                              
-			port: 8888                                                                                                                                                                                         
-    		}                                                                                                                                                                                                      
-	}
-
-	messageConferences: {
-		local_general: {
-			name: Local
-			desc: Local Discussions
-			default: true
-			areas: {
-		    		local_music: {
-					name: Music Discussion
-					desc: Music, bands, etc.
-					default: true
-	        		}
-	        	}
-	    	}
-	}
-}
-```
-
-## Launch!
-```bash
-./main.js
-```
-
-Read the Points of Interest below for more info. Also check-out all the other documentation files in the [docs](.) directory.
-
-## Points of Interest
-* **The first user you create via register/applying (user ID = 1) will be automatically be added to the `sysops` group, and thus becomes SysOp.** (aka root)
-* Default port for Telnet is 8888 and for SSH 8889
-  * Note that on *nix systems port such as telnet/23 are privileged (e.g. require root). See [this SO article](http://stackoverflow.com/questions/16573668/best-practices-when-running-node-js-with-port-80-ubuntu-linode) for some tips on using these ports on your system if desired.
-* All data is stored by default in Sqlite3 database files, within the `db` sub folder. Including user data, messages, system logs and file meta data.
-* You may want to tail the logfile with Bunyan. See Monitoring Logs below.
-
-## Monitoring Logs
-Logs are produced by Bunyan which outputs each entry as a JSON object. To tail logs in a colorized and pretty pretty format, issue the following command:
-    
-    tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | /path/to/enigma-bbs/node_modules/bunyan/bin/bunyan
-
-ENiGMA½ does not produce much to standard out. See below for tailing the log file to see what's going on.
-
-# Advanced Installation
-If you've become convinced you would like a "production" BBS running ENiGMA½ a more advanced installation may be in order. 
-
-[PM2](https://github.com/Unitech/pm2) is an excellent choice for managing your running ENiGMA½ instances. Additionally, it is suggested that you run as a specific more locked down user (e.g. 'enigma').
+## Features Available Now
+ * Multi platform: Anywhere [Node.js](https://nodejs.org/) runs likely works (known to work under Linux, FreeBSD, OpenBSD, OS X and Windows)
+ * Unlimited multi node support (for all those BBS "callers"!)
+ * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based [mods](docs/mods.md)
+ * [MCI support](docs/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
+ * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
+ * [CP437](http://www.ascii-codes.com/) and UTF-8 output
+ * [SyncTerm](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior
+ * Full [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support
+ * Renegade style pipe color codes
+ * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
+ * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption
+ * [Door support](docs/doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
+ * [Bunyan](https://github.com/trentm/node-bunyan) logging
+ * [Message networks](docs/msg_networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
+ * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/web_server.md). Legacy X/Y/Z modem also supported!
+ * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
+ * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on
diff --git a/docs/installation/docker.md b/docs/installation/docker.md
new file mode 100644
index 00000000..878c9b33
--- /dev/null
+++ b/docs/installation/docker.md
@@ -0,0 +1,21 @@
+---
+layout: page
+title: Docker
+---
+**You'll need Docker installed before going any further. How to do so are out of scope of these docs, but you can find full instructions 
+for every operating system on the [Docker website](https://docs.docker.com/engine/installation/).**
+
+## Quick Start
+
+Download and run the ENiGMA½ BBS image: 
+
+    docker run -d \
+      -p 8888:8888 \
+      davestephens\enigma-bbs
+
+As no config has been supplied the container will use a basic one so that it starts successfully. Note that as no persistence 
+directory has been supplied, once the container stops any changes made will be lost!
+
+## Customised Docker Setup
+
+TBC using Docker Compose
\ No newline at end of file
diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
new file mode 100644
index 00000000..d0ce2a89
--- /dev/null
+++ b/docs/installation/install-script.md
@@ -0,0 +1,16 @@
+---
+layout: page
+title: Install Script
+---
+Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the 
+`install.sh` script to get everything up and running. Cut + paste the following into your terminal:
+
+```
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+```
+
+It is recommended you review the [installation script](https://github.com/NuSkooler/enigma-bbs/blob/master/misc/install.sh) 
+on GitHub before running it. 
+
+The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you 
+through creating a basic configuration file, and recommend some packages to install.  
diff --git a/docs/installation/installation-methods.md b/docs/installation/installation-methods.md
new file mode 100644
index 00000000..99a1db6c
--- /dev/null
+++ b/docs/installation/installation-methods.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: Installation Methods
+---
+There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do 
+things manually versus have it automated for you.
+
+| Method                                 | Operating System Compatibility                 | Notes                                                                                       |     
+|----------------------------------------|------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [Installation Script](install-script)  | Linux, BSD, OSX                                | Quick and easy installation under most Linux/UNIX like environments (Linux, BSD, OS X, ...) |
+| [Docker Images](docker)                | Linux, BSD, OSX, Windows                       | Easy upgrades, compatible with all operating systems, no dependencies to install            |
+| [Manual Installation](manual)          | Linux, Windows (probably others but untested!  | If you like doing things manually, or are running Windows                                   |
+
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
new file mode 100644
index 00000000..eabaa928
--- /dev/null
+++ b/docs/installation/manual.md
@@ -0,0 +1,74 @@
+---
+layout: page
+title: Manual Installation
+---
+For Linux environments it's recommended you run the [install script](install-script.md). If you like to 
+do things manually, read on...
+
+## Prerequisites
+* [Node.js](https://nodejs.org/) version **v6.x or higher**
+  * :information_source: It is **highly** recommended to use [nvm](https://github.com/creationix/nvm) to manage your 
+  Node.js installation if you're on a Linux/Unix environment.
+  
+* [Python](https://www.python.org/downloads/) 2.7.x for compiling Node.js packages with native extensions.
+
+* A compiler such as Clang or GCC for Linux/UNIX systems or a recent copy of Visual Studio 
+([Visual Studio Express](https://www.visualstudio.com/en-us/products/visual-studio-express-vs.aspx) editions 
+are OK) for Windows users. Note that you **should only need the Visual C++ component**.
+
+* [git](https://git-scm.com/downloads) to check out the ENiGMA source code.  
+ 
+## Node.js
+If you're new to Node.js and/or do not care about Node itself and just want to get ENiGMA½ running 
+these steps should get you going on most \*nix type environments:
+
+```bash
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
+nvm install 6
+nvm use 6
+```
+
+If the above completed without errors, you should now have `nvm`, `node`, and `npm` installed and in your environment.
+
+For Windows nvm-like systems exist ([nvm-windows](https://github.com/coreybutler/nvm-windows), ...) or [just download the installer](https://nodejs.org/en/download/).
+
+  
+## ENiGMA BBS
+```bash
+git clone https://github.com/NuSkooler/enigma-bbs.git
+```
+
+## Install Node Packages
+```bash
+cd enigma-bbs
+npm install
+```
+
+## Other Recommended Packages
+
+ENiGMA BBS makes use of a few packages for unarchiving and modem support. They're not pre-requisites for
+running ENiGMA, but without them you'll miss certain functionality. Once installed, they should be made 
+available on your system path.
+
+| Package    | Description                       | Ubuntu Package                             | CentOS Package Name                               | Windows Package                                                  |
+|------------|-----------------------------------|--------------------------------------------|---------------------------------------------------|------------------------------------------------------------------|
+| arj        | Unpacking arj archives            | `arj`                                      | n/a, binaries [here](http://arj.sourceforge.net/) | [ARJ](http://arj.sourceforge.net/)                               |
+| 7zip       | Unpacking zip, rar, lha archives  | `p7zip-full`                               | `p7zip-full`                                      | [7-zip](http://www.7-zip.org/)                                   |
+| lrzsz      | sz/rz: X/Y/Z modem support        | `lrzsz`                                    | `lrzsz`                                           | Unknown                                                          | 
+| sexyz      | SexyZ modem support               | [sexyz](https://l33t.codes/outgoing/sexyz) | [sexyz](https://l33t.codes/outgoing/sexyz)        | Available with [Synchronet](http://wiki.synchro.net/install:win) |
+
+      - exiftool & other external tools
+
+## Config Files
+
+You'll need a basic configuration to get started. The main system configuration is handled via 
+`config/config.hjson`. This is an [HJSON](http://hjson.org/) file (compiliant JSON is also OK). 
+See [Configuration](../configuration/) for more information.
+
+Use `oputil.js` to generate your **initial** configuration: 
+
+```bash
+./oputil.js config new
+```
+
+Follow the prompts!
diff --git a/docs/installation/network.md b/docs/installation/network.md
new file mode 100644
index 00000000..def09ad2
--- /dev/null
+++ b/docs/installation/network.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: Network Setup
+---
+:zap: This page is to describe general information on how to set your router to forward traffic to ENiGMA. It
+needs fleshing out, please submit a PR if you'd like to help!
\ No newline at end of file
diff --git a/docs/rpi.md b/docs/installation/os-hardware.md
similarity index 52%
rename from docs/rpi.md
rename to docs/installation/os-hardware.md
index f474e959..21eac4d9 100644
--- a/docs/rpi.md
+++ b/docs/installation/os-hardware.md
@@ -1,21 +1,15 @@
-# Raspberry Pi
+---
+layout: page
+title: OS & Hardware Specific Information
+---
+## Raspberry Pi
 
-ENiGMA½ can run under your Linux / RPi installation! The following instructions should help get you started.
-
-## Tested RPi Models
-### Model A
-Works, but fairly slow when browsing message areas (Node itself is not the fastest on this device). May work better overlocked, etc.
-
-### v2 Model B
-Works well with Raspbian!
-
-Keep in mind, compiling the dependencies with `npm install` will take some time and appear to hang. Just be patient.
-
-## Example Configuration: RPi Model A + Raspbian Stretch Lite
+All Raspberry Pi models work great with ENiGMA½! Keep in mind compiling the dependencies with 
+`npm install` will take some time and *may* appear to hang. It's still working - just be patient and let it
+complete.
 
 ### Basic Instructions
 
-
 1. Download [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/). Follow the instructions
 on the [Raspbian site](https://www.raspberrypi.org/documentation/installation/installing-images/README.md) regarding how
 to get it written to an SD card.
@@ -29,6 +23,10 @@ to get it written to an SD card.
     
 4. Install required packages: `sudo apt install lrzsz p7zip-full`
 
-5. Follow the [Quickstart](docs/index.md) instructions to install ENiGMA½.
+5. Follow the [installation instructions](/installation) to install ENiGMA½.
 
 6. Profit!
+
+## Windows
+
+Needs more info, please submit a PR!
\ No newline at end of file
diff --git a/docs/installation/production.md b/docs/installation/production.md
new file mode 100644
index 00000000..53641d41
--- /dev/null
+++ b/docs/installation/production.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: Production Installation
+---
+If you've become convinced you would like a "production" BBS running ENiGMA½ a more advanced installation 
+may be in order. 
+
+[PM2](https://github.com/Unitech/pm2) is an excellent choice for managing your running ENiGMA½ instances if
+you've installed via the [install script](install-script) or [manual installation](manual) method. 
+Additionally, it is suggested that you run as a specific more locked down user (e.g. 'enigma').
+
+If you're running ENiGMA via Docker, then process management is already handled for you!
diff --git a/docs/installation/testing.md b/docs/installation/testing.md
new file mode 100644
index 00000000..9505f863
--- /dev/null
+++ b/docs/installation/testing.md
@@ -0,0 +1,44 @@
+---
+layout: page
+title: Testing Your Installation 
+---
+Once you've completed your chosen installation method, it's time to test! 
+
+_Note that if you've used the [Docker](docker) installation method, you've already done this._
+
+```bash
+./main.js
+```
+
+If everything went OK: 
+
+```bash
+ENiGMA½ Copyright (c) 2014-2018 Bryan Ashby
+_____________________   _____  ____________________    __________\_   /
+\__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+//   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+/____       _____|      __________       ___|__|      ____|     \   /  _____  \
+---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                     /__   _\
+ <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+
+-------------------------------------------------------------------------------
+
+System started!
+```
+Grab your favourite telnet client, connect to localhost:8888 and test out your installation. 
+
+## Points of Interest
+
+* The default port for Telnet is 8888 and 8889 for SSH.
+  * Note that on *nix systems port such as telnet/23 are privileged (e.g. require root). See 
+  [this SO article](http://stackoverflow.com/questions/16573668/best-practices-when-running-node-js-with-port-80-ubuntu-linode) for some tips on using these ports on your system if desired.
+* The first user you create when logging in will be automatically be added to the `sysops` group.
+
+## Telnet Software
+
+If you don't have any telnet software, these are compatible with ENiGMA½:
+
+* [SyncTERM](http://syncterm.bbsdev.net/)
+* [EtherTerm](https://github.com/M-griffin/EtherTerm)
+* [NetRunner](http://mysticbbs.com/downloads.html)
\ No newline at end of file
diff --git a/docs/mci.md b/docs/mci.md
deleted file mode 100644
index 61ffee04..00000000
--- a/docs/mci.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# MCI Codes
-
-## Introduction
-ENiGMA½ supports a variety of MCI codes. Some **predefined** codes produce information about the current user, system, or other statistics while others are used to instanciate a **View**. MCI codes are two characters in length and are prefixed with a percent (%) symbol. Some MCI codes have additional options that may be set directly from the code itself while others -- and more advanced options -- are controlled via the current theme. Standard (non-focus) and focus colors are set by placing duplicate codes back to back in art files.
-
-## Views
-A **View** is a control placed on a **form** that can display variable data or collect input. One example of a View is a Vertical Menu (`%VM`): Oldschool BBSers may recognize this as a lightbar menu.
-
-### Available Views
-* Text Label (`TL`): Displays text
-* Edit Text (`ET`): Collect user input
-* Masked Edit Text (`ME`): Collect user input using a *mask*
-* Multi Line Text Edit (`MT`): Multi line edit control
-* Button (`BT`): A button
-* Vertical Menu (`VM`): A vertical menu aka a vertical lightbar
-* Horizontal Menu (`HM`): A horizontal menu aka a horizontal lightbar
-* Spinner Menu (`SM`): A spinner input control
-* Toggle Menu (`TM`): A toggle menu commonly used for Yes/No style input
-* Key Entry (`KE`): A *single* key input control
-
-(Peek at `core/mci_view_factory.js` to see additional information on these)
-
-## Predefined
-There are many predefined MCI codes that can be used anywhere on the system (placed in any art file). More are added all the time so also check out `core/predefined_mci.js` for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, etc.
-
-* `BN`: Board Name
-* `VL`: Version *label*, e.g. "ENiGMA½ v0.0.3-alpha"
-* `VN`: Version *number*, eg.. "0.0.3-alpha"
-* `SN`: SysOp username
-* `SR`: SysOp real name
-* `SL`: SysOp location
-* `SA`: SysOp affiliations
-* `SS`: SysOp sex
-* `SE`: SysOp email address
-* `UN`: Current user's username
-* `UI`: Current user's user ID
-* `UG`: Current user's group membership(s)
-* `UR`: Current user's real name
-* `LO`: Current user's location
-* `UA`: Current user's age
-* `BD`: Current user's birthdate (using theme date format)
-* `US`: Current user's sex
-* `UE`: Current user's email address
-* `UW`: Current user's web address
-* `UF`: Current user's affiliations
-* `UT`: Current user's *theme ID* (e.g. "luciano_blocktronics")
-* `UC`: Current user's login/call count
-* `ND`: Current user's connected node number
-* `IP`: Current user's IP address
-* `ST`: Current user's connected server name (e.g. "Telnet" or "SSH")
-* `FN`: Current user's active file base filter name
-* `DN`: Current user's number of downloads
-* `DK`: Current user's download amount (formatted to appropriate bytes/megs/etc.)
-* `UP`: Current user's number of uploads
-* `UK`: Current user's upload amount (formatted to appropriate bytes/megs/etc.)
-* `NR`: Current user's upload/download ratio
-* `KR`: Current user's upload/download *bytes* ratio
-* `MS`: Current user's account creation date (using theme date format)
-* `PS`: Current user's post count
-* `PC`: Current user's post/call ratio
-* `MD`: Current user's status/viewing menu/activity
-* `MA`: Current user's active message area name
-* `MC`: Current user's active message conference name
-* `ML`: Current user's active message area description
-* `CM`: Current user's active message conference description
-* `SH`: Current user's term height
-* `SW`: Current user's term width
-* `DT`: Current date (using theme date format)
-* `CT`: Current time (using theme time format)
-* `OS`: System OS (Linux, Windows, etc.)
-* `OA`: System architecture (x86, x86_64, arm, etc.)
-* `SC`: System CPU model
-* `NV`: System underlying Node.js version
-* `AN`: Current active node count
-* `TC`: Total login/calls to system
-* `RR`: Displays a random rumor
-* `SD`: Total downloads, system wide
-* `SO`: Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.)
-* `SU`: Total uploads, system wide
-* `SP`: Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.)
-
-
-A special `XY` MCI code may also be utilized for placement identification when creating menus.
-
-## Properties & Theming
-Predefined MCI codes and other Views can have properties set via `menu.hjson` and further *themed* via `theme.hjson`.
-
-### Common Properties
-* `textStyle`: Sets the standard (non-focus) text style. See **Text Styles** below
-* `focusTextStyle`: Sets focus text style. See **Text Styles** below.
-* `itemSpacing`: Used to separate items in menus such as Vertical Menu and Horizontal Menu Views.
-* `height`: Sets the height of views such as menus that may be > 1 character in height
-* `width`: Sets the width of a view
-* `focus`: If set to `true`, establishes initial focus
-* `text`: (initial) text of a view
-* `submit`: If set to `true` any `accept` action upon this view will submit the encompassing **form**
-
-These are just a few of the properties set on various views. *Use the source Luke*, as well as taking a look at the default `menu.hjson` and `theme.hjson` files!
-
-
-#### Text Styles
-Standard style types available for `textStyle` and `focusTextStyle`:
-
-* `normal`: Leaves text as-is. This is the default.
-* `upper`: ENIGMA BULLETIN BOARD SOFTWARE
-* `lower`: enigma bulletin board software
-* `title`: Enigma Bulletin Board Software
-* `first lower`: eNIGMA bULLETIN bOARD sOFTWARE
-* `small vowels`: eNiGMa BuLLeTiN BoaRD SoFTWaRe
-* `big vowels`: EniGMa bUllEtIn bOArd sOftwArE
-* `small i`: ENiGMA BULLETiN BOARD SOFTWARE
-* `mixed`: EnIGma BUlLEtIn BoaRd SOfTWarE (randomly assigned)
-* `l33t`: 3n1gm4 bull371n b04rd 50f7w4r3
\ No newline at end of file
diff --git a/docs/menu_system.md b/docs/menu_system.md
deleted file mode 100644
index aef51199..00000000
--- a/docs/menu_system.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Menu System
-ENiGMA½'s menu system is highly flexible and moddable. The possibilities are almost endless!
-
-This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson` (or whatever you reference in `config.hjson` using the `menuFile` property — see below). By modifying your `menu.hjson` you will be able to create a custom experience unique to your board.
-
-The default `menu.hjson` file lives within the `config` directory. It is **highly recommended** to specify another file by setting the `menuFile` property in your `config.hjson` file:
-```hjson
-general: {
-  /* Can also specify a full path */
-  menuFile: yourboardname.hjson
-}
-```
-
-You can start by copying the default `mods/menu.hjson` to `yourboardname.hjson`.
-
-## The Basics
-Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
-
-Entries in `menu.hjson` are objects defining a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
-* Classical Main, Messages, and File menus
-* Art file display
-* Module driven menus such as door launchers
-
-
-Each entry in `menu.hjson` defines an object that represents a menu. These objects live within the `menus` parent object. Each object's *key* is a menu name you can reference within other menus in the system. 
-
-## Example
-Let's look a couple basic menu entries:
-
-```hjson
-telnetConnected: {
-  art: CONNECT
-  next: matrix
-  options: { nextTimeout: 1500 }
-}
-```
-
-The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config).
-
-An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
-
-The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
-
-Finally, an `options` object may contain various common options for menus. In this case, `nextTimeout` tells the system to proceed to the `next` entry automatically after 1500ms.
-
-Now let's look at `matrix`, the `next` entry from `telnetConnected`:
-```hjson
-matrix: {
-  art: matrix
-  desc: Login Matrix
-  form: {
-    0: {
-      VM: {
-        mci: {
-          VM1:  {
-            submit: true
-            focus:  true            
-            items: [ "login", "apply", "log off" ]
-            argName: matrixSubmit
-          }
-        }
-        submit: {
-          *: [
-              {
-                  value: { matrixSubmit: 0 }
-                  action: @menu:login
-              }
-              {
-                  value: { matrixSubmit: 1 },
-                  action: @menu:newUserApplication
-              }
-              {
-                  value: { matrixSubmit: 2 },
-                  action: @menu:logoff
-              }
-          ]
-        }
-      }
-    }
-  }
-}
-```
-
-In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` (*VerticalMenuView*) MCI entry. `VM1` is then setup to `submit` and start focused via `focus: true` as well as have some menu entries ("login", "apply", ...) defined. We provide an `argName` for this action as `matrixSubmit`.
-
-The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`). Upon submit, the first match will be executed. For example, if the user selects "login", the first entry with a value of `{ matrixSubmit: 0 }` will match causing `action` of `@menu:login` to be executed (go to `login` menu).
diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
new file mode 100644
index 00000000..49e533d8
--- /dev/null
+++ b/docs/messageareas/bso-import-export.md
@@ -0,0 +1,74 @@
+---
+layout: page
+title: BSO Import / Export
+---
+The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and 
+scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` 
+under `scannerTossers::ftn_bso`.
+
+| Config Item             | Required | Description                                                                     |
+|-------------------------|----------|---------------------------------------------------------------------------------|
+| `defaultZone`           | :+1:     | Sets the default BSO outbound zone
+| `defaultNetwork`        | :-1:     | Sets the default network name from `messageNetworks.ftn.networks`. **Required if more than one network is defined**.
+| `paths`                 | :-1:     | Override default paths set by the system. This section may contain `outbound`, `inbound`, and `secInbound`.
+| `packetTargetByteSize`  | :-1:     | Overrides the system *target* packet (.pkt) size of 512000 bytes (512k)
+| `bundleTargetByteSize`  | :-1:     | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M)
+| `schedule`              | :+1:     | See Scheduling
+| `nodes`                 | :+1:     | See Nodes
+
+## Scheduling
+Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. 
+Each entry is allowed a "free form" text and/or special indicators for immediate export or watch 
+file triggers.
+
+  * `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
+  * `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
+  * Free form text can be things like `at 5:00 pm` or `every 2 hours`. 
+  
+See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
+
+### Example Configuration
+
+```hjson
+{
+  scannerTossers: {
+    ftn_bso: {
+      schedule: {
+        import: every 1 hours or @watch:/path/to/watchfile.ext
+        export: every 1 hours or @immediate
+      }
+    }
+  }
+}
+```
+
+## Nodes
+The `nodes` section defines how to export messages for one or more uplinks. 
+
+A node entry starts with a FTN style address (up to 5D) **as a key** in `config.hjson`. This key may 
+contain wildcard(s) for net/zone/node/point/domain. 
+
+| Config Item      | Required | Description                                                                     |
+|------------------|----------|---------------------------------------------------------------------------------|
+| `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability          |
+| `packetPassword` | :-1:     | Password for the packet                                                         |
+| `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`                         |
+| `archiveType`    | :-1:     | Specifies the archive type for ArcMail bundles. Must be a valid archiver name such as `zip` (See archiver configuration) |
+
+**Example**:
+```hjson
+{
+  scannerTossers: {
+    ftn_bso: {
+      nodes: {
+        "46:*": {
+          packetType: 2+
+          packetPassword: mypass
+          encoding: cp437
+          archiveType: zip
+        }
+      }
+    }
+  }
+}
+```
\ No newline at end of file
diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md
new file mode 100644
index 00000000..5ba396ea
--- /dev/null
+++ b/docs/messageareas/configuring-a-message-area.md
@@ -0,0 +1,65 @@
+---
+layout: page
+title: Configuring a Message Area
+---
+**Message Conferences** and **Areas** allow for grouping of message base topics.
+
+## Message Conferences
+Message Conferences are the top level container for 1:n Message Areas via the `messageConferences` section 
+in `config.hjson`. Common message conferences may include a local conference and one or more conferences 
+each dedicated to a particular message network such as FsxNet, AgoraNet, etc.
+
+Each conference is represented by a entry under `messageConferences`. **The areas key is the conferences tag**.
+
+| Config Item | Required | Description                                                                     |
+|-------------|----------|---------------------------------------------------------------------------------|
+| `name`      | :+1:     | Friendly conference name                                                        |
+| `desc`      | :+1:     | Friendly conference description                                                 |
+| `sort`      | :-1:     | If supplied, provides a key used for sorting                                    |
+| `default`   | :-1:     | Specify `true` to make this the default conference (e.g. assigned to new users) |
+| `areas`     | :+1:     | Container of 1:n areas described below                                          |
+
+### Example
+
+```hjson
+{
+  messageConferences: {
+    local: {
+      name: Local
+      desc: Local discussion
+      sort: 1
+      default: true
+    }
+  }
+}
+```
+
+## Message Areas
+Message Areas are topic specific containers for messages that live within a particular conference. #
+**The area's key is its area tag**. For example, "General Discussion" may live under a Local conference 
+while an AgoraNet conference may contain "BBS Discussion".
+
+| Config Item | Required | Description                                                                     |
+|-------------|----------|---------------------------------------------------------------------------------|
+| `name`      | :+1:     | Friendly area name                                                              |
+| `desc`      | :+1:     | Friendly area discription                                                       |
+| `sort`      | :-1:     | If supplied, provides a key used for sorting                                    |
+| `default`   | :-1:     | Specify `true` to make this the default area (e.g. assigned to new users)       |
+
+### Example
+
+```hjson
+messageConferences: {
+  local: {
+    // ... see above ...
+    areas: {
+      enigma_dev: {                     // Area tag - required elsewhere!
+        name: ENiGMA 1/2 Development   
+        desc: ENiGMA 1/2 discussion!   
+        sort: 1                        
+        default: true                   
+      }
+    }
+  }
+}
+```
\ No newline at end of file
diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
new file mode 100644
index 00000000..bb98b0b7
--- /dev/null
+++ b/docs/messageareas/message-networks.md
@@ -0,0 +1,67 @@
+---
+layout: page
+title: Message Networks
+---
+Configuring message networks in ENiGMA½ requires three specific pieces of config - the network and your 
+assigned address on it, the message areas (echos) of the network you wish to map to ENiGMA½ message areas, 
+then the schedule and routes to send mail packets on the network.
+
+## FTN Networks 
+ 
+FTN networks are configured under the `messageNetworks::ftn` section of `config.hjson`.
+
+The `networks` section contains a sub section for each network you wish you join your board to. 
+Each entry's key name is referenced elsewhere in `config.hjson` for FTN oriented configurations.
+
+### Example Configuration
+
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      networks: {
+        agoranet: { 
+          localAddress: "46:3/102"
+        }
+        fsxnet: { 
+          localAddress: "21:4/333"
+        }
+      }
+    }
+  }
+}
+```
+
+## Message Areas
+
+The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see
+[Configuring a Message Area][/messageareas/configuring-a-message-area]) to a message network (described 
+above), a FTN specific area tag, and remote uplink address(s). 
+
+This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
+
+When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas`.
+
+| Config Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `network`   | :+1:     | Associated network from the `networks` section above     |            
+| `tag`       | :+1:     | FTN area tag                                             |
+| `uplinks`   | :+1:     | An array of FTN address uplink(s) for this network       |
+
+### Example Configuration
+
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      areas: {
+        agoranet_bbs: {          // tag found within messageConferences
+          network: agoranet
+          tag: AGN_BBS
+          uplinks: "46:1/100"
+        }
+      }
+    }
+  }
+}
+```
\ No newline at end of file
diff --git a/docs/messageareas/netmail.md b/docs/messageareas/netmail.md
new file mode 100644
index 00000000..3e947e68
--- /dev/null
+++ b/docs/messageareas/netmail.md
@@ -0,0 +1,38 @@
+---
+layout: page
+title: Netmail
+---
+ENiGMA support import and export of Netmail from the Private Mail area. `RiPuk @ 21:1/136` and 
+`RiPuk <21:1/136>` 'To' address formats are supported.
+
+## Netmail Routing
+
+A configuration block must be added to the `scannerTossers::ftn_bso` `config.hjson` section to tell the 
+ENiGMA½ tosser where to route netmail.
+
+The following configuration would tell ENiGMA½ to route all netmail addressed to 21:* through 21:1/100,
+and all 46:* netmail through 46:1/100:
+
+````hjson 
+
+scannerTossers: {
+    
+    /* other scannerTosser config removed for clarity */
+    
+    ftn_bso: {
+        netMail: {
+            routes: {
+                "21:*" : {
+                    address: "21:1/100"
+                    network: fsxnet
+                }
+                "46:*" : {
+                    address: "46:1/100"
+                    network: agoranet
+                }
+            }
+        }
+    }
+}
+````
+The `network` tag must match the networks defined in `messageNetworks::ftn::networks` within `config.hjson`.
\ No newline at end of file
diff --git a/docs/modding.md b/docs/modding.md
deleted file mode 100644
index 609729b4..00000000
--- a/docs/modding.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Modding
-
-## General Configuraiton
-See [Configuration](config.md)
-
-## Menus
-See [Menu System](menu_system.md)
-
-## Theming
-Take a look at how the default `luciano_blocktronics` theme found under `art/themes` works!
-
-TODO document me!
-
-## Add-On Modules
-See [Mods](mods.md)
\ No newline at end of file
diff --git a/docs/modding/door-servers.md b/docs/modding/door-servers.md
new file mode 100644
index 00000000..5deaf89b
--- /dev/null
+++ b/docs/modding/door-servers.md
@@ -0,0 +1,61 @@
+---
+layout: page
+title: Door Servers
+---
+## The bbs_link Module
+Native support for [BBSLink](http://www.bbslink.net/) doors is provided via the `bbs_link` module.
+
+Configuration for a BBSLink door is straight forward. Take a look at the following example for launching Tradewars 2002:
+
+```hjson
+doorTradeWars2002BBSLink: {
+	desc: Playing TW 2002 (BBSLink)
+	module: bbs_link
+	config: {
+		sysCode: XXXXXXXX
+		authCode: XXXXXXXX
+		schemeCode: XXXXXXXX
+		door: tw
+	}
+}
+
+```
+
+Fill in your credentials in `sysCode`, `authCode`, and `schemeCode` and that's it!
+
+## The door_party Module
+The module `door_party` provides native support for [DoorParty!](http://www.throwbackbbs.com/) Configuration is quite easy:
+
+```hjson
+doorParty: {
+    desc: Using DoorParty!
+    module: door_party
+    config: {
+        username: XXXXXXXX
+        password: XXXXXXXX
+        bbsTag: XX
+    }
+}
+```
+
+Fill in `username`, `password`, and `bbsTag` with credentials provided to you and you should be in business!
+
+## The CombatNet Module
+The `combatnet` module provides native support for [CombatNet](http://combatnet.us/). Add the following to your menu config:
+
+````hjson
+combatNet: {
+    desc: Using CombatNet
+    module: combatnet
+    config: {
+        bbsTag: CBNxxx
+        password: XXXXXXXXX
+    }
+}
+````
+Update `bbsTag` (in the format CBNxxx) and `password` with the details provided when you register, then
+you should be ready to rock!
+
+## The Exodus Module
+
+TBC
\ No newline at end of file
diff --git a/docs/modding/existing-mods.md b/docs/modding/existing-mods.md
new file mode 100644
index 00000000..af1b2b74
--- /dev/null
+++ b/docs/modding/existing-mods.md
@@ -0,0 +1,11 @@
+---
+layout: page
+title: Existing Mods
+---
+| Name                        | Author      | Description |
+|-----------------------------|-------------|-------------|
+| Married Bob Fetch Event     | NuSkooler   | An event for fetching the latest Married Bob ANSI's for display on you board. ACiDic release [ACD-MB4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MB4E.ZIP). Can also be [found on GitHub](https://github.com/NuSkooler/enigma-bbs-married_bob_evt) |
+| Latest Files Announcement   | NuSkooler   | An event for posting the latest file arrivals of your board to message areas such as FTN style networks. ACiDic release [ACD-LFA1.ZIP](https://l33t.codes/outgoing/ACD/ACD-LFA1.ZIP). Also [found on GitHub](https://github.com/NuSkooler/enigma-bbs-latest_files_announce_evt) | 
+| Message Post Event          | NuSkooler   | An event for posting messages/ads to networks. ACiDic release [ACD-MP4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MP4E.ZIP) |
+
+See also [ACiDic BBS Mods by NuSkooler](https://l33t.codes/acidic-mods-by-myself/)
\ No newline at end of file
diff --git a/docs/doors.md b/docs/modding/local-doors.md
similarity index 76%
rename from docs/doors.md
rename to docs/modding/local-doors.md
index 5f72d761..b9620748 100644
--- a/docs/doors.md
+++ b/docs/modding/local-doors.md
@@ -1,8 +1,7 @@
-# Doors
-ENiGMA½ supports a variety of methods for interacting with doors — not limited to:
-* `abracadabra` module: Standard in/out (stdio) capture or temporary socket server that can be used with [DOSEMU](http://www.dosemu.org/), [DOSBox](http://www.dosbox.com/), [QEMU](http://wiki.qemu.org/Main_Page), etc.
-* `bbs_link` module for interaction with [BBSLink](http://www.bbslink.net/)
-
+---
+layout: page
+title: Local Doors
+---
 ## The abracadabra Module
 The `abracadabra` module provides a generic and flexible solution for many door types. Through this module you can execute native processes & scripts directly, and process I/O through stdio or a temporary TCP server.
 
@@ -133,7 +132,7 @@ Note the `qemu-system-i386` line. We're telling QEMU to launch and use localtime
 
 For doors that do not *require* a FOSSIL driver, it is recommended to not load or use one unless you are having issues.
 
-#### Step 4: Create a menu entry
+#### Step 3: Create a menu entry
 Finally we can create a `menu.hjson` entry using the `abracadabra` module:
 ```hjson
 doorLORD: {
@@ -155,70 +154,15 @@ doorLORD: {
 }
 ```
 
-
-## The bbs_link Module
-Native support for [BBSLink](http://www.bbslink.net/) doors is provided via the `bbs_link` module.
-
-Configuration for a BBSLink door is straight forward. Take a look at the following example for launching Tradewars 2002:
-
-```hjson
-doorTradeWars2002BBSLink: {
-	desc: Playing TW 2002 (BBSLink)
-	module: bbs_link
-	config: {
-		sysCode: XXXXXXXX
-		authCode: XXXXXXXX
-		schemeCode: XXXXXXXX
-		door: tw
-	}
-}
-
-```
-
-Fill in your credentials in `sysCode`, `authCode`, and `schemeCode` and that's it!
-
-## The door_party Module
-The module `door_party` provides native support for [DoorParty!](http://www.throwbackbbs.com/) Configuration is quite easy:
-
-```hjson
-doorParty: {
-    desc: Using DoorParty!
-    module: door_party
-    config: {
-        username: XXXXXXXX
-        password: XXXXXXXX
-        bbsTag: XX
-    }
-}
-```
-
-Fill in `username`, `password`, and `bbsTag` with credentials provided to you and you should be in business!
-
-## The CombatNet Module
-The `combatnet` module provides native support for [CombatNet](http://combatnet.us/). Add the following to your menu config:
-
-````hjson
-combatNet: {
-    desc: Using CombatNet
-    module: combatnet
-    config: {
-        bbsTag: CBNxxx
-        password: XXXXXXXXX
-    }
-}
-````
-Update `bbsTag` (in the format CBNxxx) and `password` with the details provided when you register, then
-you should be ready to rock!
-
-# Resources
+## Resources
 
 ### DOSBox
 * Custom DOSBox builds http://home.arcor.de/h-a-l-9000/
 
-## Door Downloads & Support Sites
-### General
+### Door Downloads & Support Sites
+#### General
 * http://bbsfiles.com/
 * http://bbstorrents.bbses.info/
 
-### L.O.R.D.
+#### L.O.R.D.
 * http://lord.lordlegacy.com/
\ No newline at end of file
diff --git a/docs/mods.md b/docs/mods.md
deleted file mode 100644
index f73a3fc6..00000000
--- a/docs/mods.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Mods
-Custom mods should be added to `/enigma-install-path/mods`.
-
-## Existing Mods
-* **Married Bob Fetch Event**: An event for fetching the latest Married Bob ANSI's for display on you board. ACiDic release [ACD-MB4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MB4E.ZIP). Can also be [found on GitHub](https://github.com/NuSkooler/enigma-bbs-married_bob_evt)
-* **Latest Files Announcement**: An event for posting the latest file arrivals of your board to message areas such as FTN style networks. ACiDic release [ACD-LFA1.ZIP](https://l33t.codes/outgoing/ACD/ACD-LFA1.ZIP) Also [found on GitHub](https://github.com/NuSkooler/enigma-bbs-latest_files_announce_evt) 
-* **Message Post Event**: An event for posting messages/ads to networks. ACiDic release [ACD-MP4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MP4E.ZIP)
-
-See also [ACiDic BBS Mods by Myself](https://l33t.codes/acidic-mods-by-myself/)
\ No newline at end of file
diff --git a/docs/msg_conf_area.md b/docs/msg_conf_area.md
deleted file mode 100644
index 05c11441..00000000
--- a/docs/msg_conf_area.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Message Conferences & Areas
-**Message Conferences** and **Areas** allow for grouping of message base topics.
-
-## Message Conferences
-Message Conferences are the top level container for 1:n Message Areas via the `messageConferences` section in `config.hjson`. Common message conferences may include a local conference and one or more conferences each dedicated to a particular message network such as FidoNet, AgoraNet, etc.
-
-Each conference is represented by a entry under `messageConferences`. **The areas key is the conferences tag**.
-
-**Members**:
-* `name` (required): Friendly conference name
-* `desc` (required): Friendly conference description
-* `sort` (optional): If supplied, provides a key used for sorting
-* `default` (optional): Specify `true` to make this the default conference (e.g. assigned to new users)
-* `areas`: Container of 1:n areas described below
-
-**Example**:
-```hjson
-{
-  messageConferences: {
-    local: {
-      name: Local
-      desc: Local discussion
-      sort: 1
-      default: true
-    }
-  }
-}
-```
-
-## Message Areas
-Message Areas are topic specific containers for messages that live within a particular conference. **The areas key is it's areas tag**. For example, "General Discussion" may live under a Local conference while an AgoraNet conference may contain "BBS Discussion".
-
-**Members**:
-* `name` (required): Friendly area name
-* `desc` (required): Friendly area discription
-* `sort` (optional): If supplied, provides a key used for sorting
-* `default` (optional): Specify `true` to make this the default area (e.g. assigned to new users)
-
-**Example**:
-```hjson
-messageConferences: {
-  local: {
-    // ... see above ...
-    areas: {
-      local_enigma_dev: {
-        name: ENiGMA 1/2 Development
-        desc: Discussion related to features and development of ENiGMA 1/2!
-        sort: 1
-        default: true
-      }
-    }
-  }
-}
-```
-
-## Message Networks
-ENiGMA½ has the ability to network with other systems via [Message Networks](msg_networks.md). Message **area tags** (described above) are utilized to map foreign areas with locally defined areas.
\ No newline at end of file
diff --git a/docs/msg_networks.md b/docs/msg_networks.md
deleted file mode 100644
index 11fa9202..00000000
--- a/docs/msg_networks.md
+++ /dev/null
@@ -1,196 +0,0 @@
-# Message Networks
-Message networks are configured in `messageNetworks` section of `config.hjson`. Each network type has it's own sub section such as `ftn` for FidoNet Technology Network (FTN) style networks. Message Networks tie directly with [Message Areas](msg_conf_area.md) that are also defined in `config.hjson`.
-
-**Members**:
-  * `ftn`: Configure FTN networks (described below)
-  * `originLine` (optional): Overrwrite the default origin line for networks that support it. For example: `originLine: Xibalba - xibalba.l33t.codes:44510`
-
-## FidoNet Technology Network (FTN)
-FTN networks are configured under the `messageNetworks.ftn` section of `config.hjson`.
-
-### Networks
-The `networks` section contains a sub section for network(s) you wish you join your board with. Each entry's key name can be referenced elsewhere in `config.hjson` for FTN oriented configurations.
-
-**Members**:
-  * `localAddress` (required): FTN address of **your local system**
-  
-**Example**:
-```hjson
-{
-  messageNetworks: {
-    ftn: {
-      networks: {
-        agoranet: {
-          localAddress: "46:3/102"
-        }
-      }
-    }
-  }
-}
-```
-  
-### Areas
-The `areas` section describes a mapping of local **area tags** found in your `messageConferences` to a message network (from `networks` described previously), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages (In fact you can import AREAS.BBS using `oputil.js`!)
-
-When importing, messages will be placed in the local area that matches key under `areas`.
-
-**Members**:
-  * `network` (required): Associated network from the `networks` section
-  * `tag` (required): FTN area tag
-  * `uplinks`: An array of FTN address uplink(s) for this network
-
-**Example**:
-```hjson
-{
-  messageNetworks: {
-    ftn: {
-      areas: {
-        agoranet_bbs: { /* found within messageConferences */
-          network: agoranet
-          tag: AGN_BBS
-          uplinks: "46:1/100"
-        }
-      }
-    }
-  }
-}
-```
-
-### BSO Import / Export
-The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss & scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
-
-**Members**:
-  * `defaultZone` (required): Sets the default BSO outbound zone
-  * `defaultNetwork` (optional): Sets the default network name from `messageNetworks.ftn.networks`. **Required if more than one network is defined**.
-  * `paths` (optional): Override default paths set by the system. This section may contain `outbound`, `inbound`, and `secInbound`.
-  * `packetTargetByteSize` (optional): Overrides the system *target* packet (.pkt) size of 512000 bytes (512k)
-  * `bundleTargetByteSize` (optional): Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M)
-  * `schedule` (required): See Scheduling
-  * `nodes` (required): See Nodes
-
-#### Nodes
-The `nodes` section defines how to export messages for one or more uplinks. 
-
-A node entry starts with a FTN style address (up to 5D) **as a key** in `config.hjson`. This key may contain wildcard(s) for net/zone/node/point/domain.
-
-**Members**:
-  * `packetType` (optional): `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability
-  * `packetPassword` (optional): Password for the packet
-  * `encoding` (optional): Encoding to use for message bodies; Defaults to `utf-8`
-  * `archiveType` (optional): Specifies the archive type for ArcMail bundles. Must be a valid archiver name such as `zip` (See archiver configuration)
-
-**Example**:
-```hjson
-{
-  scannerTossers: {
-    ftn_bso: {
-      nodes: {
-        "46:*": {
-          packetType: 2+
-          packetPassword: mypass
-          encoding: cp437
-          archiveType: zip
-        }
-      }
-    }
-  }
-}
-```
-
-#### TIC Support
-ENiGMA½ supports TIC files. This is handled by mapping TIC areas to local file areas.
-
-Under a given node (like the one configured above), TIC configuration may be supplied:
-
-```hjson
-{
-  scannerTossers: {
-    ftn_bso: {
-      nodes: {
-        "46:*": {
-          packetType: 2+
-          packetPassword: mypass
-          encoding: cp437
-          archiveType: zip
-          tic: {
-            password: TESTY-TEST
-            uploadBy: Agoranet TIC
-            allowReplace: true
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-You then need to configure the mapping between TIC areas you want to carry, and the file 
-base area for them to be tossed to. Start by creating a storage tag and file base, if you haven't 
-already:
-
-````hjson
-fileBase: {
-    areaStoragePrefix: /home/bbs/file_areas/
-    
-    storageTags: {
-        msg_network: "msg_network"
-    }
-    
-    areas: {
-        msgNetworks: {
-            name: Message Networks
-            desc: Message networks news & info
-            storageTags: [
-                "msg_network"
-            ]
-        }
-    }
-}
-
-````
-and then create the mapping between the TIC area and the file area created:
-
-````hjson
-ticAreas: {
-    agn_node: {
-        areaTag: msgNetworks
-        hashTags: agoranet,nodelist
-        storageTag: msg_network
-    }
-    
-    agn_info: {
-        areaTag: msgNetworks
-        hashTags: agoranet,infopack
-        storageTag: msg_network
-    }
-}
-
-````
-Multiple TIC areas can be mapped to a single file base area. 
-
-
-#### Scheduling
-Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.
-
-  * `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
-  * `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
-  * Free form text can be things like `at 5:00 pm` or `every 2 hours`. 
-  
-See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
-
-**Example**:
-```hjson
-{
-  scannerTossers: {
-    ftn_bso: {
-      schedule: {
-        import: every 1 hours or @watch:/path/to/watchfile.ext
-        export: every 1 hours or @immediate
-      }
-    }
-  }
-}
-```
-
-## More Information
-* [ENiGMA 1/2 + Binkd on CentOS 7](https://www.l33t.codes/enigma-12-binkd-on-centos-7/)
\ No newline at end of file
diff --git a/docs/oputil/index.md b/docs/oputil/index.md
new file mode 100644
index 00000000..b23a7362
--- /dev/null
+++ b/docs/oputil/index.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: oputil
+---
+
+oputil is the ENiGMA½ command line utility for maintaining users, file areas and message areas, as well as 
+generating your initial ENiGMA½ config. 
+
+## File areas
+The `oputil.js` +op utilty `fb` command has tools for managing file bases. For example, to import existing 
+files found within **all** storage locations tied to an area and set tags `tag1` and `tag2` to each import:
+
+```bash
+oputil.js fb scan some_area --tags tag1,tag2
+```
+
+See `oputil.js fb --help` for additional information.
\ No newline at end of file
diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
new file mode 100644
index 00000000..ca0b62ec
--- /dev/null
+++ b/docs/servers/ssh.md
@@ -0,0 +1,36 @@
+---
+layout: page
+title: SSH Server
+---
+## Generate a SSH Private Key
+
+To utilize the SSH server, an SSH Private Key will need generated. From the ENiGMA installation directory:
+
+```bash
+openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+```
+
+You then need to enable the SSH server in your `config.hjson`:
+
+```hjson
+{
+	loginServers: {
+		ssh: {
+            enabled: true
+		    port: 8889
+            privateKeyPass: YOUR_PK_PASS
+        }                                                                                                                                                                                                   
+    }
+}
+```
+
+### SSH Server Options
+
+| Option              | Description
+|---------------------|--------------------------------------------------------------------------------------|
+| `privateKeyPem`	  | Path to private key file
+| `privateKeyPass`    | Password to private key file
+| `firstMenu`		  | First menu an SSH connected user is presented with
+| `firstMenuNewUser`  | Menu presented to user when logging in with `users::newUserNames` in your config.hjson (defaults to `new` and `apply`)
+| `enabled`           | Enable/disable SSH server
+| `port`              | Configure a custom port for the SSH server
diff --git a/docs/servers/telnet.md b/docs/servers/telnet.md
new file mode 100644
index 00000000..155e6726
--- /dev/null
+++ b/docs/servers/telnet.md
@@ -0,0 +1,4 @@
+---
+layout: page
+title: Telnet Server
+---
\ No newline at end of file
diff --git a/docs/web_server.md b/docs/servers/web-server.md
similarity index 82%
rename from docs/web_server.md
rename to docs/servers/web-server.md
index 1f87cd80..816c28a2 100644
--- a/docs/web_server.md
+++ b/docs/servers/web-server.md
@@ -1,6 +1,10 @@
-# Web Server
+---
+layout: page
+title: Web Server
+---
 ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the 
-[File Bases](file_base.md) registers routes for file downloads, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
+[File Bases](file_base.md) registers routes for file downloads, and static files can also be served 
+for your BBS. Other features will likely come in the future or you can easily write your own!
 
 ## Configuration
 By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in 
@@ -40,6 +44,9 @@ contentServers: {
 }
 ```
 
+If no certificate paths are supplied, ENiGMA½ will assume the defaults of `/config/https_cert.pem` and 
+`/config/https_cert_key.pem` accordingly.
+
 ### Static Routes
 Static files live relative to the `contentServers::web::staticRoot` path which defaults to `enigma-bbs/www`. 
 
diff --git a/docs/vtx_web_client.md b/docs/servers/websocket.md
similarity index 96%
rename from docs/vtx_web_client.md
rename to docs/servers/websocket.md
index 99c45f93..30614006 100644
--- a/docs/vtx_web_client.md
+++ b/docs/servers/websocket.md
@@ -1,3 +1,7 @@
+---
+layout: page
+title: Web Socket / Web Interface Server
+---
 # VTX Web Client
 ENiGMA supports the VTX websocket client for connecting to your BBS from a web page. Example usage can be found at 
 [Xibalba](https://l33t.codes/vtx/xibalba.html) and [fORCE9](https://bbs.force9.org/vtx/force9.html).
@@ -82,6 +86,6 @@ webserver, and unpack it to a temporary directory.
 otherwise.
     
 9. If you navigate to http://your-hostname.here/vtx.html, you should see a splash screen like the following:
-    ![VTXClient](images/vtxclient.png "VTXClient")
+    ![VTXClient](../images/vtxclient.png "VTXClient")
 
  
\ No newline at end of file
diff --git a/docs/troubleshooting/monitoring-logs.md b/docs/troubleshooting/monitoring-logs.md
new file mode 100644
index 00000000..7c04cb40
--- /dev/null
+++ b/docs/troubleshooting/monitoring-logs.md
@@ -0,0 +1,15 @@
+---
+layout: page
+title: Monitoring Logs
+---
+ENiGMA½ does not produce much to stdout. Logs are produced by Bunyan which outputs each entry as a 
+JSON object. 
+
+Start by installing bunyan and making it available on your path:
+
+    npm install bunyan -g
+    
+To tail logs in a colorized and pretty format, issue the following command:
+    
+    tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan
+

From ec87d11c31ae430194d4aacbe8c7d702de094940 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:36:31 -0700
Subject: [PATCH 0159/1013] Fix FileEntry.findFiles() terms MATCH expr

---
 core/file_entry.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index b95c7acb..8738fcbd 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -3,7 +3,10 @@
 
 const fileDb				= require('./database.js').dbs.file;
 const Errors				= require('./enig_error.js').Errors;
-const getISOTimestampString	= require('./database.js').getISOTimestampString;
+const {
+	getISOTimestampString,
+	sanatizeString
+}							= require('./database.js');
 const Config				= require('./config.js').config;
 
 //	deps
@@ -523,11 +526,12 @@ module.exports = class FileEntry {
 		}
 
 		if(filter.terms && filter.terms.length > 0) {
+			//	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
 			appendWhereClause(
 				`f.file_id IN (
 					SELECT rowid
 					FROM file_fts
-					WHERE file_fts MATCH "${filter.terms.replace(/"/g,'""')}"
+					WHERE file_fts MATCH ":${sanatizeString(filter.terms)}"
 				)`
 			);
 		}

From cb8d331415418e55b1946bab97d178a494eb0a6b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:37:03 -0700
Subject: [PATCH 0160/1013] Add 'data' member support to getData()

---
 core/horizontal_menu_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index 02f9c06e..d9921c96 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -163,5 +163,6 @@ HorizontalMenuView.prototype.onKeyPress = function(ch, key) {
 };
 
 HorizontalMenuView.prototype.getData = function() {
-	return this.focusedItemIndex;
+	const item = this.getItem(this.focusedItemIndex);
+	return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
\ No newline at end of file

From d244cd25fa4324947f6bb019e80240599473eb75 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:38:02 -0700
Subject: [PATCH 0161/1013] Add getViewsByMciCode() * Store MCI code in View
 when created from MCI * Allow retrieval by MCI code

---
 core/mci_view_factory.js |  4 ++++
 core/view_controller.js  | 26 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index eb783d41..eab2787c 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -199,5 +199,9 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
 			break;
 	}
 
+	if(view) {
+		view.mciCode = mci.code;
+	}
+
 	return view;
 };
diff --git a/core/view_controller.js b/core/view_controller.js
index 71911f28..65a5a1b3 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -140,9 +140,9 @@ function ViewController(options) {
 	};
 
 	this.createViewsFromMCI = function(mciMap, cb) {
-		async.each(Object.keys(mciMap), function entry(name, nextItem) {
-			var mci		= mciMap[name];
-			var view	= self.mciViewFactory.createFromMCI(mci);
+		async.each(Object.keys(mciMap), (name, nextItem) => {
+			const mci	= mciMap[name];
+			const view	= self.mciViewFactory.createFromMCI(mci);
 
 			if(view) {
 				if(false === self.noInput) {
@@ -152,11 +152,11 @@ function ViewController(options) {
 				self.addView(view);
 			}
 
-			nextItem(null);
+			return nextItem(null);
 		},
-		function complete(err) {
+		err => {
 			self.setViewOrder();
-			cb(err);
+			return cb(err);
 		});
 	};
 
@@ -426,6 +426,20 @@ ViewController.prototype.getView = function(id) {
 	return this.views[id];
 };
 
+ViewController.prototype.getViewsByMciCode = function(mciCode) {
+	if(!Array.isArray(mciCode)) {
+		mciCode = [ mciCode ];
+	}
+
+	const views = [];
+	_.each(this.views, v => {
+		if(mciCode.includes(v.mciCode)) {
+			views.push(v);
+		}
+	});
+	return views;
+};
+
 ViewController.prototype.getFocusedView = function() {
 	return this.focusedView;
 };

From 783f142e20facfd1a3b35f93e38eea64192e3c9e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:41:13 -0700
Subject: [PATCH 0162/1013] Add refreshPredefinedMciViewsByCode()

---
 core/menu_module.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 783cc40b..a6fb3b4d 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -1,15 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-const PluginModule			= require('./plugin_module.js').PluginModule;
-const theme					= require('./theme.js');
-const ansi					= require('./ansi_term.js');
-const ViewController		= require('./view_controller.js').ViewController;
-const menuUtil				= require('./menu_util.js');
-const Config				= require('./config.js').config;
-const stringFormat			= require('../core/string_format.js');
-const MultiLineEditTextView	= require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
-const Errors				= require('../core/enig_error.js').Errors;
+const PluginModule				= require('./plugin_module.js').PluginModule;
+const theme						= require('./theme.js');
+const ansi						= require('./ansi_term.js');
+const ViewController			= require('./view_controller.js').ViewController;
+const menuUtil					= require('./menu_util.js');
+const Config					= require('./config.js').config;
+const stringFormat				= require('../core/string_format.js');
+const MultiLineEditTextView		= require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
+const Errors					= require('../core/enig_error.js').Errors;
+const { getPredefinedMCIValue }	= require('../core/predefined_mci.js');
 
 //	deps
 const async					= require('async');
@@ -423,4 +424,17 @@ exports.MenuModule = class MenuModule extends PluginModule {
 			++customMciId;
 		}
 	}
+
+	refreshPredefinedMciViewsByCode(formName, mciCodes) {
+		const form = _.get(this, [ 'viewControllers', formName] );
+		if(form) {
+			form.getViewsByMciCode(mciCodes).forEach(v => {
+				if(!v.setText) {
+					return;
+				}
+
+				v.setText(getPredefinedMCIValue(this.client, v.mciCode));
+			});
+		}
+	}
 };

From 0eee701bf6ee457ae9b82b515d0b123e241bff6d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:42:20 -0700
Subject: [PATCH 0163/1013] Add 'data' member support to getData()

---
 core/spinner_menu_view.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index 72b8b2f7..829255ca 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -7,6 +7,7 @@ const strUtil		= require('./string_util.js');
 
 const util			= require('util');
 const assert		= require('assert');
+const _				= require('lodash');
 
 exports.SpinnerMenuView	= SpinnerMenuView;
 
@@ -29,7 +30,8 @@ function SpinnerMenuView(options) {
 
 		assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
 
-		self.drawItem(this.focusedItemIndex);
+		this.drawItem(this.focusedItemIndex);
+		this.emit('index update', this.focusedItemIndex);
 	};
 
 	this.drawItem = function() {
@@ -96,7 +98,8 @@ SpinnerMenuView.prototype.onKeyPress = function(ch, key) {
 };
 
 SpinnerMenuView.prototype.getData = function() {
-	return this.focusedItemIndex;
+	const item = this.getItem(this.focusedItemIndex);
+	return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
 
 SpinnerMenuView.prototype.setItems = function(items) {

From cc2ee9c586607e3fbcd3e0d51a24624b21eea3dc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:42:43 -0700
Subject: [PATCH 0164/1013] Add ESC support - WIP, not fully functional

---
 core/telnet_bridge.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 447efe4c..95ace6c6 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -158,7 +158,17 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 
 					const telnetConnection = new TelnetClientConnection(self.client);
 
+					const connectionKeyPressHandler = (ch, key) => {
+						if('escape' === key.name) {
+							self.client.removeListener('key press', connectionKeyPressHandler);
+							telnetConnection.disconnect();
+						}
+					};
+
+					self.client.on('key press', connectionKeyPressHandler);
+
 					telnetConnection.on('connected', () => {
+						self.client.removeListener('key press', connectionKeyPressHandler);
 						self.client.log.info(connectOpts, 'Telnet bridge connection established');
 
 						if(self.config.font) {
@@ -173,6 +183,8 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 					});
 
 					telnetConnection.on('end', err => {
+						self.client.removeListener('key press', connectionKeyPressHandler);
+
 						if(err) {
 							self.client.log.info(`Telnet bridge connection error: ${err.message}`);
 						}

From 837326e15ac41b02ccdbf10d951e1ba9c7985e70 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 22:45:03 -0700
Subject: [PATCH 0165/1013] MANY changes around message listing / viewing * If
 messageList is used, alwasy require items to contain areaTag * Standardize
 messageList a bit - still WIP, needs cleaned up * Lof of changes around
 area/conf tracking in relation to messages and message listings * Work for
 message searching * Clean up of various code, much to do...

---
 core/fse.js                 |  76 ++++++++++--------
 core/menu_stack.js          |   2 +-
 core/message.js             |  72 ++++++++++++------
 core/message_area.js        |  35 ++-------
 core/message_base_search.js | 148 ++++++++++++++++++++++++++++++++++++
 core/mod_mixins.js          |  17 +++--
 core/msg_area_view_fse.js   |  10 +++
 core/msg_list.js            | 112 ++++++++++++++-------------
 core/vertical_menu_view.js  |   3 +-
 9 files changed, 329 insertions(+), 146 deletions(-)
 create mode 100644 core/message_base_search.js

diff --git a/core/fse.js b/core/fse.js
index de8fb1f9..c0135919 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -104,6 +104,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		this.editorMode			= config.editorMode;
 
 		if(config.messageAreaTag) {
+			//	:TODO: swtich to this.config.messageAreaTag so we can follow Object.assign pattern for config/extraArgs
 			this.messageAreaTag	= config.messageAreaTag;
 		}
 
@@ -127,6 +128,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 			}
 		}
 
+		this.noUpdateLastReadId = _.get(options, 'extraArgs.noUpdateLastReadId', config.noUpdateLastReadId) || false;
+		console.log(this.noUpdateLastReadId);
+
 		this.isReady = false;
 
 		if(_.has(options, 'extraArgs.message')) {
@@ -342,49 +346,56 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		return cb(null);
 	}
 
+	updateLastReadId(cb) {
+		if(this.noUpdateLastReadId) {
+			return cb(null);
+		}
+
+		return updateMessageAreaLastReadId(
+			this.client.user.userId, this.messageAreaTag, this.message.messageId, cb
+		);
+	}
+
 	setMessage(message) {
 		this.message = message;
 
-		updateMessageAreaLastReadId(
-			this.client.user.userId, this.messageAreaTag, this.message.messageId, () => {
+		this.updateLastReadId( () => {
+			if(this.isReady) {
+				this.initHeaderViewMode();
+				this.initFooterViewMode();
 
-				if(this.isReady) {
-					this.initHeaderViewMode();
-					this.initFooterViewMode();
+				const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
+				let msg					= this.message.message;
 
-					const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
-					let msg					= this.message.message;
-
-					if(bodyMessageView && _.has(this, 'message.message')) {
+				if(bodyMessageView && _.has(this, 'message.message')) {
+					//
+					//	We handle ANSI messages differently than standard messages -- this is required as
+					//	we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
+					//	how the author wanted it
+					//
+					if(isAnsi(msg)) {
 						//
-						//	We handle ANSI messages differently than standard messages -- this is required as
-						//	we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
-						//	how the author wanted it
+						//	Find tearline - we want to color it differently.
 						//
-						if(isAnsi(msg)) {
-							//
-							//	Find tearline - we want to color it differently.
-							//
-							const tearLinePos = this.message.getTearLinePosition(msg);
+						const tearLinePos = this.message.getTearLinePosition(msg);
 
-							if(tearLinePos > -1) {
-								msg = insert(msg, tearLinePos, bodyMessageView.getSGRFor('text'));
-							}
-
-							bodyMessageView.setAnsi(
-								msg.replace(/\r?\n/g, '\r\n'),	//	messages are stored with CRLF -> LF
-								{
-									prepped				: false,
-									forceLineTerm		: true,
-								}
-							);
-						} else {
-							bodyMessageView.setText(cleanControlCodes(msg));
+						if(tearLinePos > -1) {
+							msg = insert(msg, tearLinePos, bodyMessageView.getSGRFor('text'));
 						}
+
+						bodyMessageView.setAnsi(
+							msg.replace(/\r?\n/g, '\r\n'),	//	messages are stored with CRLF -> LF
+							{
+								prepped				: false,
+								forceLineTerm		: true,
+							}
+						);
+					} else {
+						bodyMessageView.setText(cleanControlCodes(msg));
 					}
 				}
 			}
-		);
+		});
 	}
 
 	getMessage(cb) {
@@ -816,6 +827,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		this.setHeaderText(MciViewIds.header.msgTotal,		this.messageTotal.toString());
 
 		this.updateCustomViewTextsWithFilter('header', MciViewIds.header.customRangeStart, this.getHeaderFormatObj());
+
+		//	if we changed conf/area we need to update any related standard MCI view
+		this.refreshPredefinedMciViewsByCode('header', [ 'MA', 'MC', 'ML', 'CM' ] );
 	}
 
 	initHeaderReplyEditMode() {
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 26e88cc5..073dece5 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -117,7 +117,7 @@ module.exports = class MenuStack {
 		};
 
 		if(_.isObject(options)) {
-			loadOpts.extraArgs		= options.extraArgs;
+			loadOpts.extraArgs		= options.extraArgs || _.get(options, 'formData.value');
 			loadOpts.lastMenuResult	= options.lastMenuResult;
 		}
 
diff --git a/core/message.js b/core/message.js
index 6c47a934..f7f980f7 100644
--- a/core/message.js
+++ b/core/message.js
@@ -87,6 +87,12 @@ const FTN_PROPERTY_NAMES = {
 	FtnSeenBy			: 'ftn_seen_by',		//	http://ftsc.org/docs/fts-0004.001
 };
 
+//	:TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
+const MESSAGE_ROW_MAP = {
+	reply_to_message_id	: 'replyToMsgId',
+	modified_timestamp	: 'modTimestamp'
+};
+
 module.exports = class Message {
 	constructor(
 		{
@@ -189,6 +195,16 @@ module.exports = class Message {
 		return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
 	}
 
+	static getMessageFromRow(row) {
+		const msg = {};
+		_.each(row, (v, k) => {
+			//	:TODO: see notes around MESSAGE_ROW_MAP -- clean this up so we can just _camelCase()!
+			k = MESSAGE_ROW_MAP[k] || _.camelCase(k);
+			msg[k] = v;
+		});
+		return msg;
+	}
+
 	/*
 		Find message IDs or UUIDs by filter. Available filters/options:
 
@@ -199,11 +215,10 @@ module.exports = class Message {
 		filter.replyToMesageId
 		filter.newerThanTimestamp
 		filter.newerThanMessageId
-		*filter.confTag - all area tags in confTag
-		filter.areaTag
+		filter.areaTag - note if you want by conf, send in all areas for a conf
 		*filter.metaTuples - {category, name, value}
 
-		*filter.terms - FTS search
+		filter.terms - FTS search
 
 		filter.sort = modTimestamp | messageId
 		filter.order = ascending | (descending)
@@ -223,7 +238,13 @@ module.exports = class Message {
 		filter.resultType	= filter.resultType || 'id';
 		filter.extraFields	= filter.extraFields || [];
 
-		const field = 'id' === filter.resultType ? 'message_id' : 'message_uuid';
+		if('messageList' === filter.resultType) {
+			filter.extraFields = _.uniq(filter.extraFields.concat(
+				[ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ]
+			));
+		}
+
+		const field = 'uuid' === filter.resultType ? 'message_uuid' : 'message_id';
 
 		if(moment.isMoment(filter.newerThanTimestamp)) {
 			filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
@@ -280,32 +301,23 @@ module.exports = class Message {
 					WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
 				)`);
 		} else {
-			let areaTags = [];
-			if(filter.confTag && filter.confTag.length > 0) {
-				//	:TODO: grab areas from conf -> add to areaTags[]
-			}
-
-			if(areaTags.length > 0 || filter.areaTag && filter.areaTag.length > 0) {
+			if(filter.areaTag && filter.areaTag.length > 0) {
 				if(Array.isArray(filter.areaTag)) {
-					areaTags = areaTags.concat(filter.areaTag);
-				} else if(_.isString(filter.areaTag)) {
-					areaTags.push(filter.areaTag);
-				}
-
-				areaTags = _.uniq(areaTags);	//	remove any dupes
-
-				if(areaTags.length > 1) {
 					const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
 					appendWhereClause(`m.area_tag IN(${areaList})`);
-				} else {
-					appendWhereClause(`m.area_tag = "${areaTags[0]}"`);
+				} else if(_.isString(filter.areaTag)) {
+					appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
 				}
 			}
 		}
 
-		[ 'toUserName', 'fromUserName', 'replyToMessageId' ].forEach(field => {
+		if(_.isNumber(filter.replyToMessageId)) {
+			appendWhereClause(`m.reply_to_message_id=${filter.replyToMessageId}`);
+		}		
+
+		[ 'toUserName', 'fromUserName' ].forEach(field => {
 			if(_.isString(filter[field]) && filter[field].length > 0) {
-				appendWhereClause(`m.${_.snakeCase(field)} = "${sanatizeString(filter[field])}"`);
+				appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanatizeString(filter[field])}"`);
 			}
 		});
 
@@ -317,6 +329,17 @@ module.exports = class Message {
 			appendWhereClause(`m.message_id > ${filter.newerThanMessageId}`);
 		}
 
+		if(filter.terms && filter.terms.length > 0) {
+			//	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
+			appendWhereClause(
+				`m.message_id IN (
+					SELECT rowid
+					FROM message_fts
+					WHERE message_fts MATCH ":${sanatizeString(filter.terms)}"
+				)`
+			);
+		}
+
 		sql += `${sqlWhere} ${sqlOrderBy}`;
 
 		if(_.isNumber(filter.limit)) {
@@ -332,9 +355,12 @@ module.exports = class Message {
 		} else {
 			const matches = [];
 			const extra = filter.extraFields.length > 0;
+
+			const rowConv = 'messageList' === filter.resultType ? Message.getMessageFromRow : row => row;
+
 			msgDb.each(sql, (err, row) => {
 				if(_.isObject(row)) {
-					matches.push(extra ? row : row[field]);
+					matches.push(extra ? rowConv(row) : row[field]);
 				}
 			}, err => {
 				return cb(err, matches);
diff --git a/core/message_area.js b/core/message_area.js
index fb068e13..985da046 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -8,13 +8,11 @@ const Message					= require('./message.js');
 const Log						= require('./logger.js').log;
 const msgNetRecord				= require('./msg_network.js').recordMessage;
 const sortAreasOrConfs			= require('./conf_area_util.js').sortAreasOrConfs;
-const { getISOTimestampString } = require('./database.js');
 
 //	deps
 const async			= require('async');
 const _				= require('lodash');
 const assert		= require('assert');
-const moment		= require('moment');
 
 exports.getAvailableMessageConferences      = getAvailableMessageConferences;
 exports.getSortedAvailMessageConferences	= getSortedAvailMessageConferences;
@@ -169,6 +167,7 @@ function getMessageConfTagByAreaTag(areaTag) {
 function getMessageAreaByTag(areaTag, optionalConfTag) {
 	const confs = Config.messageConferences;
 
+	//	:TODO: this could be cached
 	if(_.isString(optionalConfTag)) {
 		if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
 			return confs[optionalConfTag].areas[areaTag];
@@ -311,18 +310,6 @@ function changeMessageArea(client, areaTag, cb) {
 	changeMessageAreaWithOptions(client, areaTag, { persist : true }, cb);
 }
 
-function getMessageFromRow(row) {
-	return {
-		messageId		: row.message_id,
-		messageUuid		: row.message_uuid,
-		replyToMsgId	: row.reply_to_message_id,
-		toUserName		: row.to_user_name,
-		fromUserName	: row.from_user_name,
-		subject			: row.subject,
-		modTimestamp	: row.modified_timestamp,
-	};
-}
-
 function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
 	getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
 		lastMessageId = lastMessageId || 0;
@@ -349,45 +336,33 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
 
 		const filter = {
 			areaTag,
+			resultType			: 'messageList',
 			newerThanMessageId	: lastMessageId,
 			sort				: 'messageId',
 			order				: 'ascending',
-			extraFields			: [ 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
 		};
 
 		if(Message.isPrivateAreaTag(areaTag)) {
 			filter.privateTagUserId = userId;
 		}
 
-		Message.findMessages(filter, (err, messages) => {
-			if(err) {
-				return cb(err);
-			}
-
-			return cb(null, messages.map(msg => getMessageFromRow(msg)));
-		});
+		return Message.findMessages(filter, cb);
 	});
 }
 
 function getMessageListForArea(client, areaTag, cb) {
 	const filter = {
 		areaTag,
+		resultType	: 'messageList',
 		sort		: 'messageId',
 		order		: 'ascending',
-		extraFields	: [ 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
 	};
 
 	if(Message.isPrivateAreaTag(areaTag)) {
 		filter.privateTagUserId = client.user.userId;
 	}
 
-	Message.findMessages(filter, (err, messages) => {
-		if(err) {
-			return cb(err);
-		}
-
-		return cb(null, messages.map(msg => getMessageFromRow(msg)));
-	});
+	return Message.findMessages(filter, cb);
 }
 
 function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
diff --git a/core/message_base_search.js b/core/message_base_search.js
new file mode 100644
index 00000000..b0259490
--- /dev/null
+++ b/core/message_base_search.js
@@ -0,0 +1,148 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const MenuModule					= require('./menu_module.js').MenuModule;
+const {
+	getSortedAvailMessageConferences,
+	getAvailableMessageAreasByConfTag,
+	getSortedAvailMessageAreasByConfTag,
+}									= require('./message_area.js');
+const Errors						= require('./enig_error.js').Errors;
+const Message						= require('./message.js');
+
+//	deps
+const _								= require('lodash');
+
+exports.moduleInfo = {
+	name	: 'Message Base Search',
+	desc	: 'Module for quickly searching the message base',
+	author	: 'NuSkooler',
+};
+
+const MciViewIds = {
+	search : {
+		searchTerms	: 1,
+		search		: 2,
+		conf		: 3,
+		area		: 4,
+		to			: 5,
+		from		: 6,
+		advSearch	: 7,
+	}
+};
+
+exports.getModule = class MessageBaseSearch extends MenuModule {
+	constructor(options) {
+		super(options);
+
+		this.menuMethods = {
+			search : (formData, extraArgs, cb) => {
+				return this.searchNow(formData, cb);
+			}
+		};
+	}
+
+	mciReady(mciData, cb) {
+		super.mciReady(mciData, err => {
+			if(err) {
+				return cb(err);
+			}
+
+			this.prepViewController('search', 0, { mciMap : mciData.menu }, (err, vc) => {
+				if(err) {
+					return cb(err);
+				}
+
+				const confView 	= vc.getView(MciViewIds.search.conf);
+				const areaView	= vc.getView(MciViewIds.search.area);
+
+				if(!confView || !areaView) {
+					return cb(Errors.DoesNotExist('Missing one or more required views'));
+				}
+
+				const availConfs = [ { text : '-ALL-', data : '' } ].concat(
+					getSortedAvailMessageConferences(this.client).map(conf => Object.assign(conf, { text : conf.conf.name, data : conf.confTag } )) || []
+				);
+
+				let availAreas = [ { text : '-ALL-', data : '' } ];	//	note: will populate if conf changes from ALL
+
+				confView.setItems(availConfs);
+				areaView.setItems(availAreas);
+
+				confView.setFocusItemIndex(0);
+				areaView.setFocusItemIndex(0);
+
+				confView.on('index update', idx => {
+					availAreas = [ { text : '-ALL-', data : '' } ].concat(
+						getSortedAvailMessageAreasByConfTag(availConfs[idx].confTag, { client : this.client }).map(
+							area => Object.assign(area, { text : area.area.name, data : area.areaTag } )
+						)
+					);
+					areaView.setItems(availAreas);
+					areaView.setFocusItemIndex(0);
+				});
+
+				vc.switchFocus(MciViewIds.search.searchTerms);
+				return cb(null);
+			});
+		});
+	}
+
+	searchNow(formData, cb) {
+		const isAdvanced	= formData.submitId === MciViewIds.search.advSearch;
+		const value			= formData.value;
+
+		const filter = {
+			resultType		: 'messageList',
+			sort			: 'modTimestamp',
+			terms			: value.searchTerms,
+			//extraFields		: [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
+			limit			: 2048,	//	:TODO: best way to handle this? we should probably let the user know if some results are returned
+		};
+
+		if(isAdvanced) {
+			filter.toUserName	= value.toUserName;
+			filter.fromUserName	= value.fromUserName;
+
+			if(value.confTag && !value.areaTag) {
+				//	areaTag may be a string or array of strings
+				//	getAvailableMessageAreasByConfTag() returns a obj - we only need tags				
+				filter.areaTag = _.map(
+					getAvailableMessageAreasByConfTag(value.confTag, { client : this.client } ),
+					(area, areaTag) => areaTag
+				);
+			} else if(value.areaTag) {
+				filter.areaTag = value.areaTag;	//	specific conf + area
+			}
+		}
+
+		Message.findMessages(filter, (err, messageList) => {
+			if(err) {
+				return cb(err);
+			}
+
+			if(0 === messageList.length) {
+				return this.gotoMenu(
+					this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
+					{ menuFlags : [ 'popParent' ] },
+					cb
+				);
+			}
+
+			const menuOpts = {
+				extraArgs : {
+					messageList,
+					noUpdateLastReadId	: true
+				},
+				menuFlags	: [ 'popParent' ],
+			};
+
+			return this.gotoMenu(
+				this.menuConfig.config.messageListMenu || 'messageAreaMessageList',
+				menuOpts,
+				cb
+			);
+		});
+	}
+};
diff --git a/core/mod_mixins.js b/core/mod_mixins.js
index 48546825..c830813a 100644
--- a/core/mod_mixins.js
+++ b/core/mod_mixins.js
@@ -2,22 +2,25 @@
 'use strict';
 
 const messageArea	= require('../core/message_area.js');
+const { get }		= require('lodash');
 
 
 exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
-	tempMessageConfAndAreaSwitch(messageAreaTag) {
-		messageAreaTag = messageAreaTag || this.messageAreaTag;
+	tempMessageConfAndAreaSwitch(messageAreaTag, recordPrevious = true) {
+		messageAreaTag = messageAreaTag || get(this, 'config.messageAreaTag', this.messageAreaTag);
 		if(!messageAreaTag) {
 			return;	//	nothing to do!
 		}
 
-		this.prevMessageConfAndArea = {
-			confTag	: this.client.user.properties.message_conf_tag,
-			areaTag	: this.client.user.properties.message_area_tag,
-		};
+		if(recordPrevious) {
+			this.prevMessageConfAndArea = {
+				confTag	: this.client.user.properties.message_conf_tag,
+				areaTag	: this.client.user.properties.message_area_tag,
+			};
+		}
 
-		if(!messageArea.tempChangeMessageConfAndArea(this.client, this.messageAreaTag)) {
+		if(!messageArea.tempChangeMessageConfAndArea(this.client, messageAreaTag)) {
 			this.client.log.warn( { messageAreaTag : messageArea }, 'Failed to perform temporary message area/conf switch');
 		}
 	}
diff --git a/core/msg_area_view_fse.js b/core/msg_area_view_fse.js
index 0f25c63f..7452d9d2 100644
--- a/core/msg_area_view_fse.js
+++ b/core/msg_area_view_fse.js
@@ -31,6 +31,10 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 		this.messageIndex	= this.messageIndex || 0;
 		this.messageTotal	= this.messageList.length;
 
+		if(this.messageList.length > 0) {
+			this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+		}
+
 		const self = this;
 
 		//	assign *additional* menuMethods
@@ -39,6 +43,9 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 				if(self.messageIndex + 1 < self.messageList.length) {
 					self.messageIndex++;
 
+					this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+					this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+
 					return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
 				}
 
@@ -55,6 +62,9 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 				if(self.messageIndex > 0) {
 					self.messageIndex--;
 
+					this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+					this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+
 					return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
 				}
 
diff --git a/core/msg_list.js b/core/msg_list.js
index 72ee20f5..d48c1588 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -35,8 +35,8 @@ exports.moduleInfo = {
 	author	: 'NuSkooler',
 };
 
-const MCICodesIDs = {
-	MsgList			: 1,	//	VM1
+const MciViewIds = {
+	msgList			: 1,	//	VM1
 	MsgInfo1		: 2,	//	TL2
 };
 
@@ -44,71 +44,68 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 	constructor(options) {
 		super(options);
 
-		const self		= this;
-		const config	= this.menuConfig.config;
+		//	:TODO: consider this pattern in base MenuModule - clean up code all over
+		this.config	= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
-		this.messageAreaTag = config.messageAreaTag;
+		//	:TODO: Ugg, this is needed for MessageAreaConfTempSwitcher, which wants |this.messageAreaTag| explicitly
+		//this.messageAreaTag = this.config.messageAreaTag;
 
 		this.lastMessageReachedExit = _.get(options, 'lastMenuResult.lastMessageReached', false);
 
-		if(options.extraArgs) {
-			//
-			//	|extraArgs| can override |messageAreaTag| provided by config
-			//	as well as supply a pre-defined message list
-			//
-			if(options.extraArgs.messageAreaTag) {
-				this.messageAreaTag = options.extraArgs.messageAreaTag;
-			}
-
-			if(options.extraArgs.messageList) {
-				this.messageList = options.extraArgs.messageList;
-			}
-		}
-
 		this.menuMethods = {
-			selectMessage : function(formData, extraArgs, cb) {
-				if(1 === formData.submitId) {
-					self.initialFocusIndex = formData.value.message;
+			selectMessage : (formData, extraArgs, cb) => {
+				if(MciViewIds.msgList === formData.submitId) {
+					this.initialFocusIndex = formData.value.message;
 
 					const modOpts = {
 						extraArgs 	: {
-							messageAreaTag		: self.messageAreaTag,
-							messageList			: self.messageList,
+							messageAreaTag		: this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
+							messageList			: this.config.messageList,
 							messageIndex		: formData.value.message,
-							lastMessageNextExit	: true,
+							lastMessageNextExit	: true,	
 						}
 					};
 
+					if(_.isBoolean(this.config.noUpdateLastReadId)) {
+						modOpts.extraArgs.noUpdateLastReadId = this.config.noUpdateLastReadId;
+					}
+
 					//
 					//	Provide a serializer so we don't dump *huge* bits of information to the log
 					//	due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
 					//
+					const self = this;
 					modOpts.extraArgs.toJSON = function() {
-						const logMsgList = (this.messageList.length <= 4) ?
-							this.messageList :
-							this.messageList.slice(0, 2).concat(this.messageList.slice(-2));
+						const logMsgList = (self.config.messageList.length <= 4) ?
+							self.config.messageList :
+							self.config.messageList.slice(0, 2).concat(self.config.messageList.slice(-2));
 
 						return {
+							//	note |this| is scope of toJSON()!
 							messageAreaTag		: this.messageAreaTag,
 							apprevMessageList	: logMsgList,
 							messageCount		: this.messageList.length,
-							messageIndex		: formData.value.message,
+							messageIndex		: this.messageIndex,
 						};
 					};
 
-					return self.gotoMenu(config.menuViewPost || 'messageAreaViewPost', modOpts, cb);
+					return this.gotoMenu(this.config.menuViewPost || 'messageAreaViewPost', modOpts, cb);
 				} else {
 					return cb(null);
 				}
 			},
 
-			fullExit : function(formData, extraArgs, cb) {
-				self.menuResult = { fullExit : true };
-				return self.prevMenu(cb);
+			fullExit : (formData, extraArgs, cb) => {
+				this.menuResult = { fullExit : true };
+				return this.prevMenu(cb);
 			}
 		};
 	}
 
+	getSelectedAreaTag(listIndex) {
+		return this.config.messageList[listIndex].areaTag || this.config.messageAreaTag;
+	}
+
 	enter() {
 		if(this.lastMessageReachedExit) {
 			return this.prevMenu();
@@ -118,12 +115,16 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
 		//
 		//	Config can specify |messageAreaTag| else it comes from
-		//	the user's current area
+		//	the user's current area. If |messageList| is supplied,
+		//	each item is expected to contain |areaTag|, so we use that
+		//	instead in those cases.
 		//
-		if(this.messageAreaTag) {
-			this.tempMessageConfAndAreaSwitch(this.messageAreaTag);
-		} else {
-			this.messageAreaTag = this.client.user.properties.message_area_tag;
+		if(!Array.isArray(this.config.messageList)) {
+			if(this.config.messageAreaTag) {
+				this.tempMessageConfAndAreaSwitch(this.config.messageAreaTag);
+			} else {
+				this.config.messageAreaTag = this.client.user.properties.message_area_tag;
+			}
 		}
 	}
 
@@ -155,21 +156,27 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						//
 						//	Config can supply messages else we'll need to populate the list now
 						//
-						if(_.isArray(self.messageList)) {
-							return callback(0 === self.messageList.length ? new Error('No messages in area') : null);
+						if(_.isArray(self.config.messageList)) {
+							return callback(0 === self.config.messageList.length ? new Error('No messages in area') : null);
 						}
 
-						messageArea.getMessageListForArea(self.client, self.messageAreaTag, function msgs(err, msgList) {
+						messageArea.getMessageListForArea(self.client, self.config.messageAreaTag, function msgs(err, msgList) {
 							if(!msgList || 0 === msgList.length) {
 								return callback(new Error('No messages in area'));
 							}
 
-							self.messageList = msgList;
+							self.config.messageList = msgList;
 							return callback(err);
 						});
 					},
 					function getLastReadMesageId(callback) {
-						messageArea.getMessageAreaLastReadId(self.client.user.userId, self.messageAreaTag, function lastRead(err, lastReadId) {
+						//	messageList entries can contain |isNew| if they want to be considered new
+						if(Array.isArray(self.config.messageList)) {
+							self.lastReadId = 0;
+							return callback(null);
+						}
+
+						messageArea.getMessageAreaLastReadId(self.client.user.userId, self.config.messageAreaTag, function lastRead(err, lastReadId) {
 							self.lastReadId = lastReadId || 0;
 							return callback(null);	//	ignore any errors, e.g. missing value
 						});
@@ -180,10 +187,11 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						const regIndicator		= new Array(newIndicator.length + 1).join(' ');	//	fill with space to avoid draw issues
 
 						let msgNum = 1;
-						self.messageList.forEach( (listItem, index) => {
+						self.config.messageList.forEach( (listItem, index) => {
 							listItem.msgNum			= msgNum++;
 							listItem.ts				= moment(listItem.modTimestamp).format(dateTimeFormat);
-							listItem.newIndicator	= listItem.messageId > self.lastReadId ? newIndicator : regIndicator;
+							const isNew				= _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
+							listItem.newIndicator	=  isNew ? newIndicator : regIndicator;
 
 							if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
 								self.initialFocusIndex = index;
@@ -192,7 +200,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						return callback(null);
 					},
 					function populateList(callback) {
-						const msgListView			= vc.getView(MCICodesIDs.MsgList);
+						const msgListView			= vc.getView(MciViewIds.msgList);
 						const listFormat			= self.menuConfig.config.listFormat || '{msgNum} - {subject} - {toUserName}';
 						const focusListFormat		= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default change color here
 						const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
@@ -200,19 +208,19 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						//	:TODO: This can take a very long time to load large lists. What we need is to implement the "owner draw" concept in
 						//	which items are requested (e.g. their format at least) *as-needed* vs trying to get the format for all of them at once
 
-						msgListView.setItems(_.map(self.messageList, listEntry => {
+						msgListView.setItems(_.map(self.config.messageList, listEntry => {
 							return stringFormat(listFormat, listEntry);
 						}));
 
-						msgListView.setFocusItems(_.map(self.messageList, listEntry => {
+						msgListView.setFocusItems(_.map(self.config.messageList, listEntry => {
 							return stringFormat(focusListFormat, listEntry);
 						}));
 
 						msgListView.on('index update', idx => {
 							self.setViewText(
 								'allViews',
-								MCICodesIDs.MsgInfo1,
-								stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.messageList.length } ));
+								MciViewIds.msgInfo1,
+								stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.config.messageList.length } ));
 						});
 
 						if(self.initialFocusIndex > 0) {
@@ -228,8 +236,8 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						const messageInfo1Format = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 						self.setViewText(
 							'allViews',
-							MCICodesIDs.MsgInfo1,
-							stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.messageList.length } ));
+							MciViewIds.msgInfo1,
+							stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.config.messageList.length } ));
 						return callback(null);
 					},
 				],
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 6f083193..423ffc00 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -178,8 +178,7 @@ VerticalMenuView.prototype.onKeyPress = function(ch, key) {
 
 VerticalMenuView.prototype.getData = function() {
 	const item = this.getItem(this.focusedItemIndex);
-	return item.data ? item.data : this.focusedItemIndex;
-	//return this.focusedItemIndex;
+	return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
 
 VerticalMenuView.prototype.setItems = function(items) {

From 5c580c1ecd698a46bc85da399dd9934e31fe3fbe Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jan 2018 23:01:42 -0700
Subject: [PATCH 0166/1013] Prevent private mail in message search results

---
 core/message.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/message.js b/core/message.js
index f7f980f7..d7204e13 100644
--- a/core/message.js
+++ b/core/message.js
@@ -228,7 +228,8 @@ module.exports = class Message {
 		filter.extraFields = []
 
 		filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
-		(any other areaTag or confTag filters will be ignored)
+		- any other areaTag or confTag filters will be ignored
+		- if NOT present, private areas are skipped	
 
 		*=NYI
 	*/
@@ -301,14 +302,21 @@ module.exports = class Message {
 					WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
 				)`);
 		} else {
-			if(filter.areaTag && filter.areaTag.length > 0) {
+			if(filter.areaTag && filter.areaTag.length > 0) {			
 				if(Array.isArray(filter.areaTag)) {
-					const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
-					appendWhereClause(`m.area_tag IN(${areaList})`);
-				} else if(_.isString(filter.areaTag)) {
+					const areaList = filter.areaTag
+						.filter(t => t != Message.WellKnownAreaTags.Private)
+						.map(t => `"${t}"`).join(', ');
+					if(areaList.length > 0) {
+						appendWhereClause(`m.area_tag IN(${areaList})`);
+					}
+				} else if(_.isString(filter.areaTag) && Message.WellKnownAreaTags.Private !== filter.areaTag) {
 					appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
 				}
 			}
+
+			//	explicit exclude of Private
+			appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
 		}
 
 		if(_.isNumber(filter.replyToMessageId)) {

From a121d60c1b72e60c9712d959ae30348e3a7ef98a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 1 Feb 2018 19:34:14 -0700
Subject: [PATCH 0167/1013] Fix lastReadId logic

---
 core/fse.js      | 1 -
 core/msg_list.js | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index c0135919..8a409589 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -129,7 +129,6 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		}
 
 		this.noUpdateLastReadId = _.get(options, 'extraArgs.noUpdateLastReadId', config.noUpdateLastReadId) || false;
-		console.log(this.noUpdateLastReadId);
 
 		this.isReady = false;
 
diff --git a/core/msg_list.js b/core/msg_list.js
index d48c1588..ab0ab108 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -141,6 +141,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
 			const self	= this;
 			const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+			let configProvidedMessageList = false;
 
 			async.series(
 				[
@@ -157,6 +158,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						//	Config can supply messages else we'll need to populate the list now
 						//
 						if(_.isArray(self.config.messageList)) {
+							configProvidedMessageList = true;
 							return callback(0 === self.config.messageList.length ? new Error('No messages in area') : null);
 						}
 
@@ -171,7 +173,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 					},
 					function getLastReadMesageId(callback) {
 						//	messageList entries can contain |isNew| if they want to be considered new
-						if(Array.isArray(self.config.messageList)) {
+						if(configProvidedMessageList) {
 							self.lastReadId = 0;
 							return callback(null);
 						}

From 548ff41467d60bb649ad2d9b31001f60825eb0e9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 1 Feb 2018 20:29:26 -0700
Subject: [PATCH 0168/1013] Conceptual MenuItem caching - WIP for testing, will
 impl. in others if it seems good

---
 core/menu_view.js          | 13 +++++++++++++
 core/vertical_menu_view.js | 11 ++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/menu_view.js b/core/menu_view.js
index f15491cf..dc2f5c81 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -29,6 +29,8 @@ function MenuView(options) {
 		this.items = [];
 	}
 
+	this.renderCache = {};
+
 	this.caseInsensitiveHotKeys = miscUtil.valueWithDefault(options.caseInsensitiveHotKeys, true);
 
 	this.setHotKeys(options.hotKeys);
@@ -65,6 +67,7 @@ util.inherits(MenuView, View);
 MenuView.prototype.setItems = function(items) {
 	if(Array.isArray(items)) {
 		this.sorted = false;
+		this.renderCache = {};
 
 		//
 		//	Items can be an array of strings or an array of objects.
@@ -98,6 +101,16 @@ MenuView.prototype.setItems = function(items) {
 	}
 };
 
+MenuView.prototype.getRenderCacheItem = function(index, focusItem = false) {
+	const item = this.renderCache[index];
+	return item && item[focusItem ? 'focus' : 'standard'];
+};
+
+MenuView.prototype.setRenderCacheItem = function(index, rendered, focusItem = false) {
+	this.renderCache[index] = this.renderCache[index] || {};
+	this.renderCache[index][focusItem ? 'focus' : 'standard'] = rendered;
+};
+
 MenuView.prototype.setSort = function(sort) {
 	if(this.sorted || !Array.isArray(this.items) || 0 === this.items.length) {
 		return;
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 423ffc00..57570e16 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -64,6 +64,11 @@ function VerticalMenuView(options) {
 			return;
 		}
 
+		const cached = this.getRenderCacheItem(index, item.focused);
+		if(cached) {
+			return self.client.term.write(`${ansi.goto(item.row, self.position.col)}${cached}`);
+		}
+
 		let text;
 		let sgr;
 		if(item.focused && self.hasFocusItems()) {
@@ -78,9 +83,9 @@ function VerticalMenuView(options) {
 			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 		}
 
-		self.client.term.write(
-			`${ansi.goto(item.row, self.position.col)}${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`
-		);
+		text = `${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`;
+		self.client.term.write(`${ansi.goto(item.row, self.position.col)}${text}`);
+		this.setRenderCacheItem(index, text, item.focused);
 	};
 }
 

From 7e748fc04dd6748c1c869893db75e4115698970b Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 2 Feb 2018 22:02:09 +0000
Subject: [PATCH 0169/1013] * Fix nav when on GH pages

---
 docs/_includes/nav.md      | 74 +++++++++++++++++++-------------------
 docs/_layouts/default.html |  4 +--
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index f8fbb643..f9787cb3 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -1,67 +1,67 @@
  - Installation
-    - [Installation Methods](/installation/installation-methods)
-        - [Install script](/installation/install-script)
-        - [Docker](/installation/docker)
-        - [Manual installation](/installation/manual)
-    - [OS / Hardware Specific](/installation/os-hardware)  
+    - [Installation Methods]({% link installation/installation-methods.md %})
+        - [Install script]({% link installation/install-script.md %})
+        - [Docker]({% link installation/docker.md %})
+        - [Manual installation]({% link installation/manual.md %})
+    - [OS / Hardware Specific]({% link installation/os-hardware.md %})  
       - Raspberry Pi 
       - Windows
-    - [Your Network Setup](/installation/network)
-    - [Testing Your Installation](/installation/testing)
-    - [Production Installation](/installation/production)
+    - [Your Network Setup]({% link installation/network.md %})
+    - [Testing Your Installation]({% link installation/testing.md %})
+    - [Production Installation]({% link installation/production.md %})
     
   - Configuration
-    - [Creating Config Files](/configuration/creating-config)
-    - [SysOp Setup](/configuration/sysop-setup)
-    - [Editing hjson](/configuration/editing-hjson)
-    - [config.hjson](/configuration/config-hjson)
-    - [menu.hjson](/configuration/menu-hjson)
+    - [Creating Config Files]({% link configuration/creating-config.md %})
+    - [SysOp Setup]({% link configuration/sysop-setup.md %})
+    - [Editing hjson]({% link configuration/editing-hjson.md %})
+    - [config.hjson]({% link configuration/config-hjson.md %})
+    - [menu.hjson]({% link configuration/menu-hjson.md %})
     - prompt.hjson
-    - [Directory Structure](/configuration/directory-structure)
-    - [Archivers](/configuration/archivers)
+    - [Directory Structure]({% link configuration/directory-structure.md %})
+    - [Archivers]({% link configuration/archivers.md %})
     - Scheduled jobs
     - SMTP
 
   - File Base
-    - [About](/filebase/)
-    - [Configuring a File Area](/filebase/first-file-area)
-    - [ACS model](/filebase/acs)
-    - [Uploads](/filebase/uploads)
-    - [Web Access](/filebase/web-access)
-    - [TIC Support](/filebase/tic-support) (Importing from FTN networks)
+    - [About]({% link filebase/index.md %})
+    - [Configuring a File Area]({% link filebase/first-file-area.md %})
+    - [ACS model]({% link filebase/acs.md %})
+    - [Uploads]({% link filebase/uploads.md %})
+    - [Web Access]({% link filebase/web-access.md %})
+    - [TIC Support]({% link filebase/tic-support.md %}) (Importing from FTN networks)
     - Tips and tricks
       - Network mounts and symlinks
     
   - Message Areas
-    - [Configuring a Message Area](/messageareas/configuring-a-message-area)
-    - [Message networks](/messageareas/message-networks)
-    - [BSO Import & Export](/messageareas/bso-import-export)
-    - [Netmail](/messageareas/netmail)     
+    - [Configuring a Message Area]({% link messageareas/configuring-a-message-area.md %})
+    - [Message networks]({% link messageareas/message-networks.md %})
+    - [BSO Import & Export]({% link messageareas/bso-import-export.md %})
+    - [Netmail]({% link messageareas/netmail.md %})     
     
   - Art
-    - [General](/art/general)
-    - [Themes](/art/themes)
-    - [MCI Codes](/art/mci)
+    - [General]({% link art/general.md %})
+    - [Themes]({% link art/themes.md %})
+    - [MCI Codes]({% link art/mci.md %})
 
   - Servers
     - Login Servers
-      - [Telnet](/servers/telnet)
-      - [SSH](/servers/ssh)
-      - [WebSocket](/servers/websocket)
+      - [Telnet]({% link servers/telnet.md %})
+      - [SSH]({% link servers/ssh.md %})
+      - [WebSocket]({% link servers/websocket.md %})
       - Build your own
     - Content Servers
-      - [Web](/servers/web-server)
+      - [Web]({% link servers/web-server.md %})
               
   - Modding
-    - [Local Doors](/modding/local-doors)
-    - [Door Servers](/modding/door-servers) 
+    - [Local Doors]({% link modding/local-doors.md %})
+    - [Door Servers]({% link modding/door-servers.md %}) 
         - DoorParty
         - BBSLink
         - Combatnet
         - Exodus
-    - [Existing Mods](/modding/existing-mods)
+    - [Existing Mods]({% link modding/existing-mods.md %})
  
-  - [Oputil](/oputil/)
+  - [Oputil]({% link oputil/index.md %})
 
   - Troubleshooting
-    - [Monitoring Logs](/troubleshooting/monitoring-logs)
+    - [Monitoring Logs]({% link troubleshooting/monitoring-logs.md %})
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 8b01d854..bb606e15 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -5,16 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
-    <link rel="stylesheet" href="{{ '/assets/css/OverlayScrollbars.min.css?v=' | append: site.github.build_revision | relative_url }}">
     {% seo %}
-
   </head>
 
   <body>
       <a href="https://github.com/NuSkooler/enigma-bbs"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png"></a>
         <div class="sidebar" id="sidebar">
             <div class="container">
-                <a href="/"><img src="/assets/images/enigma-logo.png" class="logo" /></a>
+                <a href="/"><img src="{{ '/assets/images/enigma-logo.png' | relative_url }}" class="logo" /></a>
             </div>
             {% capture nav_include %}{% include nav.md %}{% endcapture %}
             {{ nav_include | markdownify }}

From 81ce418b6ccb87b9dc60488b99d8970eba37e6e0 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 2 Feb 2018 22:48:36 +0000
Subject: [PATCH 0170/1013] * Try again to fix nav when on GH pages

---
 docs/_config.yml      |  2 ++
 docs/_includes/nav.md | 74 +++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index b791e4fb..c41690bf 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -14,6 +14,8 @@ plugins:
   - jekyll-sitemap
   - jemoji
 
+baseurl: /enigma-bbs
+
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
 # to override the default setting.
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index f9787cb3..2dabf856 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -1,67 +1,67 @@
  - Installation
-    - [Installation Methods]({% link installation/installation-methods.md %})
-        - [Install script]({% link installation/install-script.md %})
-        - [Docker]({% link installation/docker.md %})
-        - [Manual installation]({% link installation/manual.md %})
-    - [OS / Hardware Specific]({% link installation/os-hardware.md %})  
+    - [Installation Methods]({{ site.baseurl }{% link installation/installation-methods.md %})
+        - [Install script]({{ site.baseurl }}{% link installation/install-script.md %})
+        - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
+        - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
+    - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
       - Raspberry Pi 
       - Windows
-    - [Your Network Setup]({% link installation/network.md %})
-    - [Testing Your Installation]({% link installation/testing.md %})
-    - [Production Installation]({% link installation/production.md %})
+    - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
+    - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})
+    - [Production Installation]({{ site.baseurl }}{% link installation/production.md %})
     
   - Configuration
-    - [Creating Config Files]({% link configuration/creating-config.md %})
-    - [SysOp Setup]({% link configuration/sysop-setup.md %})
-    - [Editing hjson]({% link configuration/editing-hjson.md %})
-    - [config.hjson]({% link configuration/config-hjson.md %})
-    - [menu.hjson]({% link configuration/menu-hjson.md %})
+    - [Creating Config Files]({{ site.baseurl }}{% link configuration/creating-config.md %})
+    - [SysOp Setup]({{ site.baseurl }}{% link configuration/sysop-setup.md %})
+    - [Editing hjson]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
+    - [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %})
+    - [menu.hjson]({{ site.baseurl }}{% link configuration/menu-hjson.md %})
     - prompt.hjson
-    - [Directory Structure]({% link configuration/directory-structure.md %})
-    - [Archivers]({% link configuration/archivers.md %})
+    - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
+    - [Archivers]({{ site.baseurl }}{% link configuration/archivers.md %})
     - Scheduled jobs
     - SMTP
 
   - File Base
-    - [About]({% link filebase/index.md %})
-    - [Configuring a File Area]({% link filebase/first-file-area.md %})
-    - [ACS model]({% link filebase/acs.md %})
-    - [Uploads]({% link filebase/uploads.md %})
-    - [Web Access]({% link filebase/web-access.md %})
-    - [TIC Support]({% link filebase/tic-support.md %}) (Importing from FTN networks)
+    - [About]({{ site.baseurl }}{% link filebase/index.md %})
+    - [Configuring a File Area]({{ site.baseurl }}{% link filebase/first-file-area.md %})
+    - [ACS model]({{ site.baseurl }}{% link filebase/acs.md %})
+    - [Uploads]({{ site.baseurl }}{% link filebase/uploads.md %})
+    - [Web Access]({{ site.baseurl }}{% link filebase/web-access.md %})
+    - [TIC Support]({{ site.baseurl }}{% link filebase/tic-support.md %}) (Importing from FTN networks)
     - Tips and tricks
       - Network mounts and symlinks
     
   - Message Areas
-    - [Configuring a Message Area]({% link messageareas/configuring-a-message-area.md %})
-    - [Message networks]({% link messageareas/message-networks.md %})
-    - [BSO Import & Export]({% link messageareas/bso-import-export.md %})
-    - [Netmail]({% link messageareas/netmail.md %})     
+    - [Configuring a Message Area]({{ site.baseurl }}{% link messageareas/configuring-a-message-area.md %})
+    - [Message networks]({{ site.baseurl }}{% link messageareas/message-networks.md %})
+    - [BSO Import & Export]({{ site.baseurl }}{% link messageareas/bso-import-export.md %})
+    - [Netmail]({{ site.baseurl }}{% link messageareas/netmail.md %})     
     
   - Art
-    - [General]({% link art/general.md %})
-    - [Themes]({% link art/themes.md %})
-    - [MCI Codes]({% link art/mci.md %})
+    - [General]({{ site.baseurl }}{% link art/general.md %})
+    - [Themes]({{ site.baseurl }}{% link art/themes.md %})
+    - [MCI Codes]({{ site.baseurl }}{% link art/mci.md %})
 
   - Servers
     - Login Servers
-      - [Telnet]({% link servers/telnet.md %})
-      - [SSH]({% link servers/ssh.md %})
-      - [WebSocket]({% link servers/websocket.md %})
+      - [Telnet]({{ site.baseurl }}{% link servers/telnet.md %})
+      - [SSH]({{ site.baseurl }}{% link servers/ssh.md %})
+      - [WebSocket]({{ site.baseurl }}{% link servers/websocket.md %})
       - Build your own
     - Content Servers
-      - [Web]({% link servers/web-server.md %})
+      - [Web]({{ site.baseurl }}{% link servers/web-server.md %})
               
   - Modding
-    - [Local Doors]({% link modding/local-doors.md %})
-    - [Door Servers]({% link modding/door-servers.md %}) 
+    - [Local Doors]({{ site.baseurl }}{% link modding/local-doors.md %})
+    - [Door Servers]({{ site.baseurl }}{% link modding/door-servers.md %}) 
         - DoorParty
         - BBSLink
         - Combatnet
         - Exodus
-    - [Existing Mods]({% link modding/existing-mods.md %})
+    - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
  
-  - [Oputil]({% link oputil/index.md %})
+  - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
   - Troubleshooting
-    - [Monitoring Logs]({% link troubleshooting/monitoring-logs.md %})
+    - [Monitoring Logs]({{ site.baseurl }}{% link troubleshooting/monitoring-logs.md %})

From cf311ffad7316f1b9189d3c16614ff0f16cb3e67 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 2 Feb 2018 22:51:40 +0000
Subject: [PATCH 0171/1013] Try again (2) to fix nav when on GH pages

---
 docs/_includes/nav.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 2dabf856..c8af1abc 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -1,5 +1,5 @@
  - Installation
-    - [Installation Methods]({{ site.baseurl }{% link installation/installation-methods.md %})
+    - [Installation Methods]({{ site.baseurl }}{% link installation/installation-methods.md %})
         - [Install script]({{ site.baseurl }}{% link installation/install-script.md %})
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})

From 0aa7f4b0427e1ca87608b01011363bb6b1f96a2f Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 2 Feb 2018 23:03:00 +0000
Subject: [PATCH 0172/1013] Fix more links so they work on GH pages

---
 docs/_layouts/default.html                |  2 +-
 docs/configuration/directory-structure.md | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index bb606e15..60f87db8 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -12,7 +12,7 @@
       <a href="https://github.com/NuSkooler/enigma-bbs"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png"></a>
         <div class="sidebar" id="sidebar">
             <div class="container">
-                <a href="/"><img src="{{ '/assets/images/enigma-logo.png' | relative_url }}" class="logo" /></a>
+                <a href="{{ site.baseurl }}"><img src="{{ '/assets/images/enigma-logo.png' | relative_url }}" class="logo" /></a>
             </div>
             {% capture nav_include %}{% include nav.md %}{% endcapture %}
             {{ nav_include | markdownify }}
diff --git a/docs/configuration/directory-structure.md b/docs/configuration/directory-structure.md
index f27878c7..d968df17 100644
--- a/docs/configuration/directory-structure.md
+++ b/docs/configuration/directory-structure.md
@@ -6,15 +6,15 @@ All paths mentioned here are relative to the ENiGMA½ checkout directory.
 
 | Directory           | Description                                                                                               |
 |---------------------|-----------------------------------------------------------------------------------------------------------|
-| `/art/general`      | Non-theme art - welcome ANSI, logoff ANSI, etc. See [General Art](/art/general).
-| `/art/themes`       | Theme art. Themes should be in their own subdirectory and contain a theme.hjson. See [Themes](/art/themes).
-| `/config`           | config.hjson, [menu.hjson](/configuration/menu-hjson) and prompt.hjson storage. Also default path for SSL certs and public/private keys
+| `/art/general`      | Non-theme art - welcome ANSI, logoff ANSI, etc. See [General Art]({{ site.baseurl }}{% link art/general.md %}).
+| `/art/themes`       | Theme art. Themes should be in their own subdirectory and contain a theme.hjson. See [Themes]({{ site.baseurl }}{% link art/themes.md %}).
+| `/config`           | config.hjson, [menu.hjson]({{ site.baseurl }}{% link configuration/menu-hjson.md %}) and prompt.hjson storage. Also default path for SSL certs and public/private keys
 | `/db`               | All ENiGMA½ databases in Sqlite3 format
 | `/docs`             | These docs ;-)
-| `/dropfiles`        | Dropfiles created for [local doors](/modding/local-doors)
-| `/logs`             | Logs. See [Monitoring Logs](/troubleshooting/monitoring-logs)
+| `/dropfiles`        | Dropfiles created for [local doors]({{ site.baseurl }}{% link modding/local-doors.md %})
+| `/logs`             | Logs. See [Monitoring Logs]({{ site.baseurl }}{% link troubleshooting/monitoring-logs.md %})
 | `/misc`             | Stuff with no other home; reset password templates, common password lists, other random bits
-| `/mods`             | User mods. See [Modding](/modding/existing-mods)
+| `/mods`             | User mods. See [Modding]({{ site.baseurl }}{% link modding/existing-mods.md %})
 | `/node_modules`     | External libraries required by ENiGMA½, installed when you run `npm install`
 | `/util`             | Various tools used in running/debugging ENiGMA½
 | `/www`              | ENiGMA½'s built in webserver root directory
\ No newline at end of file

From 1b58b85b1f38a344edc2c1852a33c515cb3011c9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 2 Feb 2018 21:22:47 -0700
Subject: [PATCH 0173/1013] Code cleanup + provide default 'text' member

---
 core/msg_list.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/core/msg_list.js b/core/msg_list.js
index ab0ab108..90c5095a 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -47,9 +47,6 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 		//	:TODO: consider this pattern in base MenuModule - clean up code all over
 		this.config	= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
-		//	:TODO: Ugg, this is needed for MessageAreaConfTempSwitcher, which wants |this.messageAreaTag| explicitly
-		//this.messageAreaTag = this.config.messageAreaTag;
-
 		this.lastMessageReachedExit = _.get(options, 'lastMenuResult.lastMessageReached', false);
 
 		this.menuMethods = {
@@ -184,12 +181,12 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 						});
 					},
 					function updateMessageListObjects(callback) {
-						const dateTimeFormat	= self.menuConfig.config.dateTimeFormat || 'ddd MMM Do';
+						const dateTimeFormat	= self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
 						const newIndicator		= self.menuConfig.config.newIndicator || '*';
 						const regIndicator		= new Array(newIndicator.length + 1).join(' ');	//	fill with space to avoid draw issues
 
 						let msgNum = 1;
-						self.config.messageList.forEach( (listItem, index) => {
+						self.config.messageList.forEach( (listItem, index) => {							
 							listItem.msgNum			= msgNum++;
 							listItem.ts				= moment(listItem.modTimestamp).format(dateTimeFormat);
 							const isNew				= _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
@@ -198,25 +195,17 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 							if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
 								self.initialFocusIndex = index;
 							}
+
+							listItem.text			= `${listItem.msgNum} - ${listItem.subject} from ${listItem.fromUserName}`;	//	default text
 						});
 						return callback(null);
 					},
 					function populateList(callback) {
 						const msgListView			= vc.getView(MciViewIds.msgList);
-						const listFormat			= self.menuConfig.config.listFormat || '{msgNum} - {subject} - {toUserName}';
-						const focusListFormat		= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default change color here
+						//	:TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
 						const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 
-						//	:TODO: This can take a very long time to load large lists. What we need is to implement the "owner draw" concept in
-						//	which items are requested (e.g. their format at least) *as-needed* vs trying to get the format for all of them at once
-
-						msgListView.setItems(_.map(self.config.messageList, listEntry => {
-							return stringFormat(listFormat, listEntry);
-						}));
-
-						msgListView.setFocusItems(_.map(self.config.messageList, listEntry => {
-							return stringFormat(focusListFormat, listEntry);
-						}));
+						msgListView.setItems(self.config.messageList);
 
 						msgListView.on('index update', idx => {
 							self.setViewText(

From 7e82f754e1d4f30efc563155e601b94d3d9cf795 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 2 Feb 2018 21:31:22 -0700
Subject: [PATCH 0174/1013] Use new itemFormat/focusItemFormat for default
 theme msg list

---
 art/themes/luciano_blocktronics/theme.hjson | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 27bd44ca..9cdf3838 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -207,14 +207,14 @@
 			}
 
 			messageAreaMessageList: {
-				config: {
-					listFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |01|31{newIndicator}"
-					focusListFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
+				config: {					
 					dateTimeFormat: ddd MMM Do
 				}
 				mci: {
 					VM1: {
 						height: 14
+						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
+						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
 					}
 				}
 			}
@@ -468,14 +468,14 @@
 			}
 
 			newScanMessageList: {
-				config: {
-					listFormat: "|00|15  {msgNum:<5.5}|03{subject:<28.27} |15{fromUserName:<20.20} {ts}"
-					focusListFormat: "|00|19> |15{msgNum:<5.5}{subject:<28.27} {fromUserName:<20.20} {ts}"
+				config: {					
 					dateTimeFormat: ddd MMM Do
 				}
 				mci: {
 					VM1: {
 						height: 14
+						itemFormat: "|00|15  {msgNum:<5.5}|03{subject:<28.27} |15{fromUserName:<20.20} {ts}"
+						focusItemFormat: "|00|19> |15{msgNum:<5.5}{subject:<28.27} {fromUserName:<20.20} {ts}"
 					}
 				}
 			}

From f10cf63522921224809886577fd2533faed37d40 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 2 Feb 2018 21:58:17 -0700
Subject: [PATCH 0175/1013] Minor updates

---
 LICENSE.TXT                 |  2 +-
 README.md                   | 10 +++++-----
 docs/installation/manual.md |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 8d256374..8db0cf42 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017, Bryan D. Ashby
+Copyright (c) 2015-2018, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 93752343..045b6871 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 
 ## Boards
 * WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**telnet://xibalba.l33t.codes:44510** or via SSH secure on port 44511)
-* [Exotica](https://exoticabbs.com/): (**telnet://exoticabbs.com:8888**)
-* [force9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
+* [fORCE9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
 
 
 ## Installation
@@ -64,6 +63,7 @@ curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/inst
 Please see the [Quickstart](docs/index.md) for more information.
 
 ## Special Thanks
+* [Dave Stephens aka RiPuk](https://github.com/davestephens) for the [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.
 * [Daniel Mecklenburg Jr.](https://github.com/codewar65) for the awesome VTX terminal and general coding talk
 * [M. Brutman](http://www.brutman.com/), author of [mTCP](http://www.brutman.com/mTCP/mTCP.html) (Interwebs for DOS!)
 * [M. Griffin](https://github.com/M-griffin), author of [Enthral BBS](https://github.com/M-griffin/Enthral), [Oblivion/2 XRM](https://github.com/M-griffin/Oblivion2-XRM) and [EtherTerm](https://github.com/M-griffin/EtherTerm)!
@@ -71,14 +71,14 @@ Please see the [Quickstart](docs/index.md) for more information.
 * [Luciano Ayres](http://www.lucianoayres.com.br/) of [Blocktronics](http://blocktronics.org/), creator of the "Mystery Skulls" default ENiGMA½ theme!
 * Sudndeath for Xibalba ANSI work!
 * Jack Phlash for kick ass ENiGMA½ and Xibalba ASCII (Check out [IMPURE60](http://pc.textmod.es/pack/impure60/)!!)
-* Avon of [Agency BBS](http://bbs.geek.nz/) and [fsxNet](http://bbs.geek.nz/#fsxNet)
+* Avon of [Agency BBS](http://bbs.geek.nz/) and [fsxNet](http://bbs.geek.nz/#fsxNet) for putting up with my experiments to his system
 * Maskreet of [Throwback BBS](http://www.throwbackbbs.com/) hosting [DoorParty](http://forums.throwbackbbs.com/)!
-* [Apam](https://github.com/apamment) of HappyLand BBS and [HappyNet](http://andrew.homeunix.org/doku.php?id=happynet)!
+* [Apam](https://github.com/apamment) of [Magicka](https://magickabbs.com/)
 
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:
 
-Copyright (c) 2015-2017, Bryan D. Ashby
+Copyright (c) 2015-2018, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
index eabaa928..9958c2e3 100644
--- a/docs/installation/manual.md
+++ b/docs/installation/manual.md
@@ -53,7 +53,9 @@ available on your system path.
 | Package    | Description                       | Ubuntu Package                             | CentOS Package Name                               | Windows Package                                                  |
 |------------|-----------------------------------|--------------------------------------------|---------------------------------------------------|------------------------------------------------------------------|
 | arj        | Unpacking arj archives            | `arj`                                      | n/a, binaries [here](http://arj.sourceforge.net/) | [ARJ](http://arj.sourceforge.net/)                               |
-| 7zip       | Unpacking zip, rar, lha archives  | `p7zip-full`                               | `p7zip-full`                                      | [7-zip](http://www.7-zip.org/)                                   |
+| 7zip       | Unpacking zip, rar, archives  | `p7zip-full`                               | `p7zip-full`                                      | [7-zip](http://www.7-zip.org/)                                   |
+| lha        | Unpacking lha archives  | `lhasa`                               | n/a, source [here](http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm)                                      | Unknown                                   |
+| Rar        | Unpacking rar archives  | `unrar`                               | n/a, binaries [here](https://www.rarlab.com/download.htm)                                      | Unknown                                   |
 | lrzsz      | sz/rz: X/Y/Z modem support        | `lrzsz`                                    | `lrzsz`                                           | Unknown                                                          | 
 | sexyz      | SexyZ modem support               | [sexyz](https://l33t.codes/outgoing/sexyz) | [sexyz](https://l33t.codes/outgoing/sexyz)        | Available with [Synchronet](http://wiki.synchro.net/install:win) |
 

From ef21db300c0d114d74649391e4b06406c43d70ea Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 2 Feb 2018 22:01:54 -0700
Subject: [PATCH 0176/1013] Add docs link on README/etc.

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 045b6871..3a2cc7c3 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,13 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on
  
+## Documentation
+[Browse the docs online](https://nuskooler.github.io/enigma-bbs/)
+ 
 ## In the Works
-* More ES6+ usage, and **documentation**!
 * More ACS support coverage
 * SysOp dashboard (ye ol' WFC)
+* Native DOS emulation
 * A lot more! Feel free to request features via [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues)
 
 ## Known Issues

From aa274bb35468d2ac6d273bf81b9e54cd8c8ab814 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Feb 2018 08:20:51 -0700
Subject: [PATCH 0177/1013] Update copyright to 2018

---
 core/connect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/connect.js b/core/connect.js
index b94fa586..6a3c77f2 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -124,7 +124,7 @@ function displayBanner(term) {
 	//	note: intentional formatting:
 	term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
-|06Copyright (c) 2014-2017 Bryan Ashby |14- |12http://l33t.codes/
+|06Copyright (c) 2014-2018 Bryan Ashby |14- |12http://l33t.codes/
 |06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/
 |00`
 	);

From 1f29905f3081ae14f5eca7b5714a35d3d4d8b93c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Feb 2018 23:03:50 -0700
Subject: [PATCH 0178/1013] Documentation updates + Add File Transfer Protocols
 section * Minor updates

---
 docs/_includes/nav.md                         |  1 +
 docs/configuration/file-transfer-protocols.md | 49 +++++++++++++++++++
 docs/filebase/first-file-area.md              |  9 ++--
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 docs/configuration/file-transfer-protocols.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index c8af1abc..f5a7f319 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -19,6 +19,7 @@
     - prompt.hjson
     - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
     - [Archivers]({{ site.baseurl }}{% link configuration/archivers.md %})
+    - [File Transfer Protocols]({{ site.baseurl }}{% link configuration/file-transfer-protocols.md %})
     - Scheduled jobs
     - SMTP
 
diff --git a/docs/configuration/file-transfer-protocols.md b/docs/configuration/file-transfer-protocols.md
new file mode 100644
index 00000000..da5697c7
--- /dev/null
+++ b/docs/configuration/file-transfer-protocols.md
@@ -0,0 +1,49 @@
+---
+layout: page
+title: File Transfer Protocols
+---
+ENiGMA½ currently relies on external executables for "legacy" file transfer protocols such as X, Y, and ZModem. The `fileTransferProtocols` section of `config.hjson` is used to override defaults, add new handlers, etc. Remember that ENiGMA½ also support modern web (HTTP/HTTPS) downloads!
+
+## File Transfer Protocols
+File transfer protocols are managed via the `fileTransferProtocols` configuration block of `config.hjson`. Each entry defines an **external** protocol that can be used for uploads (recv), downloads (send), or both. Depending on the protocol and handler, batch receiving of files (uploads) may also be available.
+
+### Predefined File Transfer Protocols
+The following file transfer protocols are pre-configured in ENiGMA½ as of this writing. System operators may override or extend this list. PRs are welcome for pre-configured additions!
+
+#### SEXYZ
+[SEXYZ from Synchronet](http://wiki.synchro.net/util:sexyz) offers a nice X, Y, and ZModem implementation including ZModem-8k & works under *nix and Windows based systems. As of this writing, ENiGMA½ is pre-configured to support ZModem-8k, XModem, and YModem using SEXYZ. An x86_64 Linux binary, and hopefully more in the future, [can be downloaded here](http://132.0.0.249/bbs-linux-binaries/).
+
+#### sz/rz
+ZModem-8k is configured using the standard Linux [sz(1)](https://linux.die.net/man/1/sz) and [rz(1)](https://linux.die.net/man/1/rz) binaries. Note that these binaries also support XModem and YModem, and as such adding the configurations to your system should be fairly straight forward.
+
+Generally available as `lrzsz` under Apt or Yum type packaging.
+
+### File Transfer Protocol Configuration
+The following top-level members are available to an external protocol configuration:
+* `name`: Required; Display name of the protocol
+* `type`: Required; Currently must be `external`. This will be expanded upon in the future with built in protocols.
+* `sort`: Optional; Sort key. If not provided, `name` will be used for sorting.
+
+For protocols of type `external` the following members may be defined:
+* `sendCmd`: Required for protocols that can send (allow user downloads); The command/binary to execute.
+* `sendArgs`: Required if using `sendCmd`; An array of arguments. A placeholder of `{fileListPath}` may be used to supply a path to a **file containing** a list of files to send, or `{filePaths}` to supply *1:n* individual file paths to send.
+* `recvCmd`: Required for protocols that can receive (allow user uploads); The command/binary to execute.
+* `recvArgs`: Required if using `recvCmd` and supporting **batch** uploads; An array of arguments. A placeholder of `{uploadDir}` may be used to supply the system provided upload directory. If `{uploadDir}` is not present, the system expects uploaded files to be placed in CWD which will be set to the upload directory. 
+* `recvArgsNonBatch`: Required if using `recvCmd` and supporting non-batch (single file) uploads; A placeholder of `{fileName}` may be supplied to indicate to the protocol what the uploaded file should be named (this will be collected from the user before the upload starts).
+* `escapeTelnet`: Optional; If set to `true`, escape all internal Telnet related codes such as IAC's. This option is required for external protocol handlers such as `sz` and `rz` that do not escape themselves.
+
+#### Example File Transfer Protocol Configuration
+```
+zmodem8kSexyz : {
+	name		: 'ZModem 8k (SEXYZ)',
+	type		: 'external',
+	sort		: 1,
+	external	: {
+		sendCmd				: 'sexyz',
+		sendArgs			: [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
+		recvCmd				: 'sexyz',
+		recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
+		recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
+	}
+}
+```
\ No newline at end of file
diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 58d4a5c1..5e83e8d7 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -3,13 +3,13 @@ layout: page
 title: Configuring a File Base
 ---
 ## ENiGMA½ File Base Key Concepts
-Like many things in ENiGMA½, configuration of file base(s) is handled via `config.hjson` -- specifically 
-in the `fileBase` section. First, there are a couple of concepts you should understand.
+Like many things in ENiGMA½, configuration of file base(s) is handled via `config.hjson` — specifically 
+in the `fileBase` section. First, there are a couple of concepts you should understand:
 
 
 ### Storage tags
 
-**Storage Tags** define paths to a physical (file) storage locations that are referenced in a 
+**Storage Tags** define paths to physical (file) storage locations that are referenced in a 
 file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths 
 are relative to the value set by the `areaStoragePrefix` key (defaults to `<enigma_install_dir/file_base`). 
 Below is an example defining a both a relative and fully qualified path each attached to a storage tag:
@@ -22,8 +22,7 @@ storageTags: {
 }
 ```
 
-Note that on their own, storage tags don't do anything - they are simply pointers to storage locations on
-your system. 
+Note that on their own, storage tags don't do anything — they are simply pointers to storage locations on your system. 
 
 ### Areas
 

From 0a486d290f5e30445aaf88e94ef97668ecd24277 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Feb 2018 10:27:32 -0700
Subject: [PATCH 0179/1013] Fix word wrap crash reported by user when pipe
 codes are in play

---
 core/string_util.js | 17 +++++++++++++----
 core/word_wrap.js   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/string_util.js b/core/string_util.js
index 4539ea38..20ff3511 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -218,8 +218,6 @@ function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1
 }
 
 const PIPE_REGEXP			= /(\|[A-Z\d]{2})/g;
-//const ANSI_REGEXP			= /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
-//const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
 const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
 
 //
@@ -275,12 +273,23 @@ function renderSubstr(str, start, length) {
 //
 //	See also https://github.com/chalk/ansi-regex/blob/master/index.js
 //
-function renderStringLength(s) {
+function renderStringLength(s, options = { pipe : true, ansi : true } ) {
 	let m;
 	let pos;
 	let len = 0;
 
-	const re = ANSI_OR_PIPE_REGEXP;
+	let re;
+	if(options.pipe && options.ansi) {
+		re = ANSI_OR_PIPE_REGEXP;
+	} else if(options.pipe) {
+		re = PIPE_REGEXP;
+	} else if(options.ansi) {
+		re = ANSI.getFullMatchRegExp();
+	} else {
+		//	no options - just return string length.
+		return s.length;
+	}
+
 	re.lastIndex = 0;	//	we recycle the rege; reset
 
 	//
diff --git a/core/word_wrap.js b/core/word_wrap.js
index ecb728a5..d3e78b79 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -49,7 +49,7 @@ function wordWrapText(text, options) {
 
 	function appendWord() {
 		word.match(REGEXP_GOBBLE).forEach( w => {
-			renderLen = renderStringLength(w);
+			renderLen = renderStringLength(w, { ansi : true, pipe : false } );
 
 			if(result.renderLen[i] + renderLen > options.width) {
 				if(0 === i) {

From 1261af00c31e0916aba6a726a3a09cd90f04c680 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Feb 2018 10:38:52 -0700
Subject: [PATCH 0180/1013] Update Node.version for 0.0.9-alpha branch

---
 misc/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index 44554da1..36ab8202 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -2,7 +2,7 @@
 
 { # this ensures the entire script is downloaded before execution
 
-ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=6}
+ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=8}
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
@@ -24,7 +24,7 @@ ENiGMA½ will be installed to ${ENIGMA_INSTALL_DIR}, from source ${ENIGMA_SOURCE
 
 ENiGMA½ requires Node.js. Version ${ENIGMA_NODE_VERSION}.x current will be installed via nvm. If you already have nvm installed, this install script will update it to the latest version.
 
-If this isn't what you were expecting, hit ctrl-c now. Installation will continue in ${WAIT_BEFORE_INSTALL} seconds...
+If this isn't what you were expecting, hit CTRL-C now. Installation will continue in ${WAIT_BEFORE_INSTALL} seconds...
 
 EndOfMessage
     sleep ${WAIT_BEFORE_INSTALL}

From aecc24079f512c09d6f4096eff6ecb9386e1fa2c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Feb 2018 10:39:14 -0700
Subject: [PATCH 0181/1013] Revert "Fix word wrap crash reported by user when
 pipe codes are in play"

This reverts commit 0a486d290f5e30445aaf88e94ef97668ecd24277.
---
 core/string_util.js | 17 ++++-------------
 core/word_wrap.js   |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/core/string_util.js b/core/string_util.js
index 20ff3511..4539ea38 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -218,6 +218,8 @@ function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1
 }
 
 const PIPE_REGEXP			= /(\|[A-Z\d]{2})/g;
+//const ANSI_REGEXP			= /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
+//const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
 const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
 
 //
@@ -273,23 +275,12 @@ function renderSubstr(str, start, length) {
 //
 //	See also https://github.com/chalk/ansi-regex/blob/master/index.js
 //
-function renderStringLength(s, options = { pipe : true, ansi : true } ) {
+function renderStringLength(s) {
 	let m;
 	let pos;
 	let len = 0;
 
-	let re;
-	if(options.pipe && options.ansi) {
-		re = ANSI_OR_PIPE_REGEXP;
-	} else if(options.pipe) {
-		re = PIPE_REGEXP;
-	} else if(options.ansi) {
-		re = ANSI.getFullMatchRegExp();
-	} else {
-		//	no options - just return string length.
-		return s.length;
-	}
-
+	const re = ANSI_OR_PIPE_REGEXP;
 	re.lastIndex = 0;	//	we recycle the rege; reset
 
 	//
diff --git a/core/word_wrap.js b/core/word_wrap.js
index d3e78b79..ecb728a5 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -49,7 +49,7 @@ function wordWrapText(text, options) {
 
 	function appendWord() {
 		word.match(REGEXP_GOBBLE).forEach( w => {
-			renderLen = renderStringLength(w, { ansi : true, pipe : false } );
+			renderLen = renderStringLength(w);
 
 			if(result.renderLen[i] + renderLen > options.width) {
 				if(0 === i) {

From e64ee13382d5153f8d1619b350ef55dfd3142803 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 4 Feb 2018 23:05:44 +0000
Subject: [PATCH 0182/1013] Email config docs

---
 docs/_includes/nav.md       |  2 +-
 docs/configuration/email.md | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 docs/configuration/email.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index f5a7f319..93685df4 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -20,8 +20,8 @@
     - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
     - [Archivers]({{ site.baseurl }}{% link configuration/archivers.md %})
     - [File Transfer Protocols]({{ site.baseurl }}{% link configuration/file-transfer-protocols.md %})
+    - [Email]({{ site.baseurl }}{% link configuration/email.md %})
     - Scheduled jobs
-    - SMTP
 
   - File Base
     - [About]({{ site.baseurl }}{% link filebase/index.md %})
diff --git a/docs/configuration/email.md b/docs/configuration/email.md
new file mode 100644
index 00000000..3815210b
--- /dev/null
+++ b/docs/configuration/email.md
@@ -0,0 +1,30 @@
+---
+layout: page
+title: Email
+---
+ENiGMA½ uses email to send password reset information to users. For it to work, you need to provide valid SMTP 
+config in your [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %})
+
+## SMTP Services
+
+If you don't have an SMTP server to send from, [Sendgrid](https://sendgrid.com/) provide a reliable free
+service.
+
+## Example SMTP Configuration
+
+```hjson
+email: {
+    defaultFrom: sysop@bbs.force9.org
+    
+    transport: {
+        host: smtp.awesomeserver.com
+            port: 587
+            secure: false
+            auth: {
+                user: leisuresuitlarry
+                pass: sierra123
+            }
+        }
+    }
+}
+```
\ No newline at end of file

From 9b24d1498d1b63e5d5a15221780497fff6df1c48 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 4 Feb 2018 23:08:32 +0000
Subject: [PATCH 0183/1013] better change those docs off my own email :D

---
 docs/configuration/email.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration/email.md b/docs/configuration/email.md
index 3815210b..1677eb11 100644
--- a/docs/configuration/email.md
+++ b/docs/configuration/email.md
@@ -14,7 +14,7 @@ service.
 
 ```hjson
 email: {
-    defaultFrom: sysop@bbs.force9.org
+    defaultFrom: sysop@bbs.awesome.com
     
     transport: {
         host: smtp.awesomeserver.com

From 7555233ac769495e7415cc0733bab9e23929005d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Feb 2018 21:01:19 -0700
Subject: [PATCH 0184/1013] Fix some word wrap bugs previously introduced

---
 core/multi_line_edit_text_view.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 1be0591f..5757e708 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -411,6 +411,9 @@ function MultiLineEditTextView(options) {
 	};
 
 	this.insertCharactersInText = function(c, index, col) {
+		const prevTextLength	= self.getTextLength(index);
+		let editingEol			= self.cursorPos.col === prevTextLength;
+
 		self.textLines[index].text = [
 			self.textLines[index].text.slice(0, col),
 			c,
@@ -419,18 +422,17 @@ function MultiLineEditTextView(options) {
 
 		self.cursorPos.col += c.length;
 
-		let cursorOffset;
-		let absPos;
-
 		if(self.getTextLength(index) > self.dimens.width) {
 			//
 			//	Update word wrapping and |cursorOffset| if the cursor
 			//	was within the bounds of the wrapped text
 			//
+			let cursorOffset;
 			const lastCol			= self.cursorPos.col - c.length;
 			const firstWrapRange	= self.updateTextWordWrap(index);
 			if(lastCol >= firstWrapRange.start && lastCol <= firstWrapRange.end) {
 				cursorOffset = self.cursorPos.col - firstWrapRange.start;
+				editingEol = true; 	//override
 			} else {
 				cursorOffset = firstWrapRange.end;
 			}
@@ -438,14 +440,22 @@ function MultiLineEditTextView(options) {
 			//	redraw from current row to end of visible area
 			self.redrawRows(self.cursorPos.row, self.dimens.height);
 
-			self.cursorBeginOfNextLine();
-			self.cursorPos.col += cursorOffset;
-			self.client.term.rawWrite(ansi.right(cursorOffset));
+			//	If we're editing mid, we're done here. Else, we need to
+			//	move the cursor to the new editing position after a wrap
+			if(editingEol) {
+				self.cursorBeginOfNextLine();
+				self.cursorPos.col += cursorOffset;
+				self.client.term.rawWrite(ansi.right(cursorOffset));
+			} else {
+				//	adjust cursor after drawing new rows
+				const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+				self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
+			}
 		} else {
 			//
 			//	We must only redraw from col -> end of current visible line
 			//
-			absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+			const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
 			const renderText = self.getRenderText(index).slice(self.cursorPos.col - c.length);
 
 			self.client.term.write(

From ced943867e97fafed4c202188aac7cf9387b018c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Feb 2018 18:52:24 -0700
Subject: [PATCH 0185/1013] #146 Fix color codes

---
 core/color_codes.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index db9f4fe5..10e7a2c3 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -116,14 +116,14 @@ function ansiSgrFromRenegadeColorCode(cc) {
 		22	: [ 'yellowBG' ],
 		23	: [ 'whiteBG' ],
 
-		24	: [ 'bold', 'blackBG' ],
-		25	: [ 'bold', 'blueBG' ],
-		26	: [ 'bold', 'greenBG' ],
-		27	: [ 'bold', 'cyanBG' ],
-		28	: [ 'bold', 'redBG' ],
-		29	: [ 'bold', 'magentaBG' ],
-		30	: [ 'bold', 'yellowBG' ],
-		31	: [ 'bold', 'whiteBG' ],
+		24	: [ 'blink', 'blackBG' ],
+		25	: [ 'blink', 'blueBG' ],
+		26	: [ 'blink', 'greenBG' ],
+		27	: [ 'blink', 'cyanBG' ],
+		28	: [ 'blink', 'redBG' ],
+		29	: [ 'blink', 'magentaBG' ],
+		30	: [ 'blink', 'yellowBG' ],
+		31	: [ 'blink', 'whiteBG' ],
 	}[cc] || 'normal');
 }
 

From a611870dbfce8af659243fe9454bca73764b5cf9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Feb 2018 19:54:10 -0700
Subject: [PATCH 0186/1013] Update issue template for 0.0.9-alpha

---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5d3f54be..d53a6435 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -3,8 +3,8 @@ For :bug: bug reports, please fill out the information below plus any additional
 **Short problem description**
 
 **Environment**
-- [ ] I am using Node.js v6.x or higher
-- [ ] `npm install` reports success
+- [ ] I am using Node.js v8.x LTS or higher
+- [ ] `npm install` or `yarn` reports success
 - Actual Node.js version (`node --version`):
 - Operating system (`uname -a` on *nix systems):
 - Revision (`git rev-parse --short HEAD`):

From 3db50816989c118a9ceb6b0c9f7685238809f604 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Feb 2018 20:13:29 -0700
Subject: [PATCH 0187/1013] Allow wildcards such as "21:*" for node
 configuraiton keys * Resolves TODO * Aligns with docs

---
 core/scanner_tossers/ftn_bso.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 8c87b61f..a98c6f4d 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -584,15 +584,6 @@ function FTNMessageScanTossModule() {
 		});
 	};
 
-	//	:TODO: deprecate this in favor of getNodeConfigByAddress()
-	this.getNodeConfigKeyByAddress = function(uplink) {
-		const nodeKey = _.filter(Object.keys(this.moduleConfig.nodes), addr => {
-			return Address.fromString(addr).isPatternMatch(uplink);
-		})[0];
-
-		return nodeKey;
-	};
-
 	this.exportNetMailMessagePacket = function(message, exportOpts, cb) {
 		//
 		//	For NetMail, we always create a *single* packet per message.
@@ -976,20 +967,19 @@ function FTNMessageScanTossModule() {
 
 	this.exportEchoMailMessagesToUplinks = function(messageUuids, areaConfig, cb) {
 		async.each(areaConfig.uplinks, (uplink, nextUplink) => {
-			const nodeConfigKey = self.getNodeConfigKeyByAddress(uplink);
-			if(!nodeConfigKey) {
+			const nodeConfig = self.getNodeConfigByAddress(uplink);
+			if(!nodeConfig) {
 				return nextUplink();
 			}
 
 			const exportOpts = {
-				nodeConfig		: self.moduleConfig.nodes[nodeConfigKey],
+				nodeConfig,
 				network			: Config.messageNetworks.ftn.networks[areaConfig.network],
 				destAddress		: Address.fromString(uplink),
 				networkName		: areaConfig.network,
-				fileCase		: self.moduleConfig.nodes[nodeConfigKey].fileCase || 'lower',
+				fileCase		: nodeConfig.fileCase || 'lower',
 			};
 
-			
 			if(_.isString(exportOpts.network.localAddress)) {
 				exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
 			}

From 6287bdf39600c4d87d0d459bed9e1e4fa55751aa Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Feb 2018 20:35:56 -0700
Subject: [PATCH 0188/1013] Add Network Mounts & Symlinks initial docs

---
 docs/_includes/nav.md                        |  2 +-
 docs/filebase/network-mounts-and-symlinks.md | 24 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 docs/filebase/network-mounts-and-symlinks.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 93685df4..f3e6267f 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -31,7 +31,7 @@
     - [Web Access]({{ site.baseurl }}{% link filebase/web-access.md %})
     - [TIC Support]({{ site.baseurl }}{% link filebase/tic-support.md %}) (Importing from FTN networks)
     - Tips and tricks
-      - Network mounts and symlinks
+      - [Network mounts and symlinks]({{ site.baseurl }}{% link filebase/network-mounts-and-symlinks.md %})
     
   - Message Areas
     - [Configuring a Message Area]({{ site.baseurl }}{% link messageareas/configuring-a-message-area.md %})
diff --git a/docs/filebase/network-mounts-and-symlinks.md b/docs/filebase/network-mounts-and-symlinks.md
new file mode 100644
index 00000000..1ab8895a
--- /dev/null
+++ b/docs/filebase/network-mounts-and-symlinks.md
@@ -0,0 +1,24 @@
+---
+layout: page
+title: Network Mounts & Symlinks
+---
+## Network Mounts & Symlinks
+With many Bulletin Board Systems running on small headless boxes such as Raspberry Pis, it may not be practical to have all files you would like to make available in your file base. One solution to this is to utilize network mounts. Add in symbolic links to make things even easier!
+
+### A Practical Example
+The scenario: A Windows box containing a lot of files you'd like in your systems file base. The BBS itself is running on a Raspberry Pi with very limited space.
+
+To solve this problem, we can perform the following steps:
+  1. Create a network mount in `/mnt/windows_box_share`.
+  2. Next, we can create a local file base area such as `/home/enigma/file_base`
+  3. Within the file base directory above, create some symbolic links to areas within our share:
+  ```
+  cd /home/enigma/file_base
+  ln -s /mnt/windows_box_share/some/long/annoying/path area1
+  ```
+  
+What we've done here is make `/home/enigma/file_base/area1` point to the Windows share within some nested directories. Of course we could have just pointed directly to the `/mnt/windows_box_share` area, but using symbolic links has some advantages:
+  * We can now set `/home/enigma/file_base` as our `areaStoragePrefix`. That is, the base path of all of our file base
+  * Since we have `areaStoragePrefix` set, we can now make storage tags relative to that path. For example, `leet_files1: "area1/leet_files"
+  
+There are **many** ways one can achieve the mounts between various operating systems. See your distros documentation.
\ No newline at end of file

From d89030ec5338894873701b8283e80bfb329124d7 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Tue, 6 Feb 2018 10:14:25 +0000
Subject: [PATCH 0189/1013] Add notepad++ as an hjson editor

---
 docs/configuration/editing-hjson.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/configuration/editing-hjson.md b/docs/configuration/editing-hjson.md
index fde61290..0a752178 100644
--- a/docs/configuration/editing-hjson.md
+++ b/docs/configuration/editing-hjson.md
@@ -14,3 +14,7 @@ You can find more info at the [Hjson.org website](http://hjson.org/).
 within the IDE. It provides syntax highlighting to make it clear when you've made a syntax mistake within
 a config file. 
 
+### Notepad++
+
+[Notepad++](https://notepad-plus-plus.org) has an Hjson plugin that provides syntax highlighting and other
+usual text editor features. The plugin can be found [here](https://github.com/laktak/npp-hjson).
\ No newline at end of file

From 889170caf1292579e019d0e3272a081e66d2394a Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Tue, 6 Feb 2018 10:20:17 +0000
Subject: [PATCH 0190/1013] OCD docs tidy-up

---
 README.md                               |   2 +-
 docs/{ => assets}/images/enigma-bbs.png | Bin
 docs/{ => assets}/images/vtxclient.png  | Bin
 docs/index.md                           |   2 +-
 docs/servers/websocket.md               |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename docs/{ => assets}/images/enigma-bbs.png (100%)
 rename docs/{ => assets}/images/vtxclient.png (100%)

diff --git a/README.md b/README.md
index 3a2cc7c3..7c1870ce 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ENiGMA½ BBS Software
 
-![ENiGMA½ BBS](docs/images/enigma-bbs.png "ENiGMA½ BBS")
+![ENiGMA½ BBS](docs/assets/images/enigma-bbs.png "ENiGMA½ BBS")
 
 ENiGMA½ is a modern BBS software with a nostalgic flair!
 
diff --git a/docs/images/enigma-bbs.png b/docs/assets/images/enigma-bbs.png
similarity index 100%
rename from docs/images/enigma-bbs.png
rename to docs/assets/images/enigma-bbs.png
diff --git a/docs/images/vtxclient.png b/docs/assets/images/vtxclient.png
similarity index 100%
rename from docs/images/vtxclient.png
rename to docs/assets/images/vtxclient.png
diff --git a/docs/index.md b/docs/index.md
index 5cbe5670..a49f8ab1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,7 +2,7 @@
 layout: default
 title: Home
 ---
-![ENiGMA½ BBS](images/enigma-bbs.png "ENiGMA½ BBS")
+![ENiGMA½ BBS](assets/images/enigma-bbs.png "ENiGMA½ BBS")
 
 ENiGMA½ is a modern BBS software with a nostalgic flair!
 
diff --git a/docs/servers/websocket.md b/docs/servers/websocket.md
index 30614006..62df02d7 100644
--- a/docs/servers/websocket.md
+++ b/docs/servers/websocket.md
@@ -86,6 +86,6 @@ webserver, and unpack it to a temporary directory.
 otherwise.
     
 9. If you navigate to http://your-hostname.here/vtx.html, you should see a splash screen like the following:
-    ![VTXClient](../images/vtxclient.png "VTXClient")
+    ![VTXClient](../assets/images/vtxclient.png "VTXClient")
 
  
\ No newline at end of file

From 409423c6bda13ef631fa4c60ebe52ba3afbac4cf Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Tue, 6 Feb 2018 10:50:19 +0000
Subject: [PATCH 0191/1013] Create colour codes docs. Create empty prompt.hjson
 doc page pending it being written.

---
 docs/_includes/nav.md               |   4 +++-
 docs/assets/images/colour-codes.png | Bin 0 -> 15677 bytes
 docs/configuration/colour-codes.md  |  25 +++++++++++++++++++++++++
 docs/configuration/prompt-hjson.md  |   6 ++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 docs/assets/images/colour-codes.png
 create mode 100644 docs/configuration/colour-codes.md
 create mode 100644 docs/configuration/prompt-hjson.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index f3e6267f..66453598 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -16,13 +16,15 @@
     - [Editing hjson]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
     - [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %})
     - [menu.hjson]({{ site.baseurl }}{% link configuration/menu-hjson.md %})
-    - prompt.hjson
+    - [prompt.hjson]({{ site.baseurl }}{% link configuration/prompt-hjson.md %})
     - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
     - [Archivers]({{ site.baseurl }}{% link configuration/archivers.md %})
     - [File Transfer Protocols]({{ site.baseurl }}{% link configuration/file-transfer-protocols.md %})
     - [Email]({{ site.baseurl }}{% link configuration/email.md %})
+    - [Colour Codes]({{ site.baseurl }}{% link configuration/colour-codes.md %})
     - Scheduled jobs
 
+
   - File Base
     - [About]({{ site.baseurl }}{% link filebase/index.md %})
     - [Configuring a File Area]({{ site.baseurl }}{% link filebase/first-file-area.md %})
diff --git a/docs/assets/images/colour-codes.png b/docs/assets/images/colour-codes.png
new file mode 100644
index 0000000000000000000000000000000000000000..83267a62ae6a56850095671553909fa60f62bcae
GIT binary patch
literal 15677
zcmeHud00}3_cyj#O=ae^Sf-6ln=R^?S(;Karln<BsVSkAlcc1S8wm=wYUR@6UP@(Z
zE?}i-N{B6AZE_(OAQ7R-ToFhSk@dcpLYn!$zvp@Xc>n#`)59ZjFZZ5vKIeSS=bU@}
zkcaF1xy$E5Adva{_BtPiKxV9kK&JW6o&~;hX6}q)@MYF1cUNZ!p!xTJT67nDXU@63
zz7Y_}Pez*mdXSv^%fL7FBljKHqyKr@thxHX{XXVD1AJ>`@X=$Df1pA`PlrW<zd|5?
zgr7bcdHT;)=-|jRt6cXTIP~Y1)A|s|D#$+P-A6C51wGW1P5b<;K8<AGo;731g{%w9
zX3zU|-q%}J^^OHjcJ(=XCpk0G@m95rz+e781vxdJq^GYpYf;&)U6ji~RnWk~Pkc_R
z5!CoL%B4ZPH=lX*^q&m@UY&nku=#w_H-j}3yn<Erh!V|}Bz|ttT;alo<T;vmlU9KD
z0@=094!nCvyj9qK@C9;`lcjli{lZ!ge7SNya2ohByZ3(&)L7+Y-JzLHW8hCefU1Uh
z)#i7k`qQyZ4t}a!TbeXBnJsdmLz}nbTvBQIF>!HmQb|HW!jb!^%CP`y9Vr7SZQt@W
zBk{ZO6R*#O+3b|Ej@Z1wcBF>DTPt$G&s7T>^YIHV^6@yS%bBEMr^~grZ<fc^wY|qn
z<h6e4IMT@l=HK0AzIN{8ppe724X_>4>(d+Byn8JnR@)4}yVTI=iUVftCfmTwTAVN`
zptQ%ukKt;;t6>p0;{~z^R=-vL+<{EF|AS_E*EqLSR+M-3ARH?7m3vc?P2gtOCj5ll
zU10t!-AO7rszx>i_>nkLB%1NGaK_7nZ@&eR%UkE^Sk|SixXst|S<JmHohUdhvVm4<
zLPaQ%O&ujlBJ;$KlDc?tDy4uY_NmCLp#p-%8*b(N#jVAK{kc1IM@mZC6C&WrM~M_L
zNg6Db+Qci#MRt46m>KIj^&M}WP0h?o+Z~}$vpckW^K}?#$MGDVCqj+npD)dI-3VP+
z6!n%p*gN2P+lY#Yb{DT$yulL&45N1J!LAf+QvKZOF?A~NauI)~<ox0k(%)Zp*hcJ~
z07cMdCT>$q`ch!ihs&?*otAY^>zoxv3rC_U)ay<cVqy%bdXPB=1_r30u7H4mJ!Vg!
zCk|<`QfBSBii~s)nSYr&Wc){{gDH9AzH;S2ArC|Is)<X1G#sU1UwKmQJb}jJoWH}%
zG~;x(`s8!AF_RbtNpZuc%ei+-5;|iJD>$f?ybx&$C$h$Hrfaopu!?Nq6D&ihOkO4S
zB8KEUh;{gKbEypI+>ajK2^*?zCn7l2tw-(wol(^(NXK4Uwc53u#$;KB7F96trSc}K
z)A8J?U;|_B!HsO(gPGa@p@f6sELvo!XR`adeHxa7kyF2p%!W_@<fscV@I&!d+TWu4
zAdv0krCyLXwZ+rktvdBTB?jBI8K+}nViY6&g6L8=pB$V>qF*+Y%tEc(!5frd?&41*
zj#g|{F)!Q;PahqZNZwG&p*v%vZirjF@nfmc7bmn<a^8RRW6s|-G#qd*r?@y*Z#j$V
z<nMv0`y2B}IX!ck>rI+!g{$}dp14`j$ZOl=u@wx0G9UiHQ5XI*57S@wyLdD&-Jl0y
z-he>3>%L#_>Qm<Nvu}{2WT@S&zgk?wus!wz_#N8;@&L`Y6?#G$=!=`^n((LSJtp0~
zm&!qmrm`6iD%FQ&yn8s5%)L7}j^i!ou&`u+t7cgM1$~hBiQf}uV%C{e=%ov)$`G9a
z-sObC0=qG4)Ny`zr;AnPdwfam;Q`(~eEh-GH-IAax4$mD%#%?8M~ly^e1e_-<Jq^K
zNMpxJx8TbYFCBI4V+KYl2C5=L9d0~`-=;Ik{x74W&n$YxV)5=BCTqe^`SziXS|)b~
z?})+b`9vIj{I;u+?rFYG*t+e_ar=C(gBe+JArea<<0ZoKinJ9eYo|=`=%Q!dX~!*N
zCv!3~@$nGX@(m}IXOWf01MHqHl^b_CX|1TK3n#1$3<9Xv4_}B=t-?%SmZ2>f$o)UR
zfWE=tt0Zc)N-n<;WJGoU50_umj-v8H>=sjEA<btddJICEpls46h{*7JF^M^r(HAx0
z_9Qv-SW(jfT6$QM#N0Bx3Ev%)2Rm8Y-Jq!Ukcr@g>IMmLI7SWYRZh=OArKpAGV`Bl
z8&N{JUUBwVXG~Q)ssKj+h{`SUQX>Ua+)>#PR*yYNDsk`TpOx@R)a@)Oc2>B~E#ISd
zmt94<ppB3?=iM*g%@F9b00Mcj-q5gqw${RB;8mUrVP>76c~g*w-Y+-0^~XQ3aqhgi
zdAyC$_d9t8*2DU2-&522PhX$AR(r<(Dw6OW-?8xZ8x}I};WomDVji^Uf8zfA#cX?!
zvg`m#`Ri+bf;2M_J2|{t-L~aJ;uKu9wLyeu*=(z^`J-68>t4zxpngX~8~Z$K@-IW7
z%}1CGM}ruZE<AqT+w$?T`MPEf<b=sg$OZSQy!ZC{2)rlu{-v;&xb6!y5Oj(fmMFK*
zOATXTE%4MP+DKVZyLkG^!$`}~;9@T&OO#nxhl5Jx)Q;-+c+tdOxSf}pIwZ}2dgXa4
z0)lHWQYg}`UZMTsZwajmJ`}>^_cD?DMtU;ia`s;Lwi)L4y06|6F0QeQ<6{PUOx^P*
zYHUfoeEyulZ8*V7%j)ByCUJ2+cD<A+j(oD+Skx(l6`&+)Vf07ex^}TJl*i5n{3ST1
zdT9^zE=#JowomKQV}a%$+HNmOO-=P0$|Dfy@Y`fYm9(wD%Pbk!)#Y!wV!+x4ax^6q
zMmc2+<*`CGU&`+wkWEE>wLl9z|CbU+tZUZzFh2h}39;;|&f>E$&?DXNhgO^A*zWD^
z#S{<<^7LleHBDwa+@+u!&{f90AUc9p-+}b&aP)as$4H$Xq`tV1l&p7d#*gG9G+Y2H
z#Z})(T<B|fR<y-1U-VlWMF|s?qlaG1>@$nEz@p8bVt4OX-MkNJ-Syp3{UBQ#%A7_@
zK6I?ey?|%$)E91ORKqy8aX*?LtMVU0T@{%zOsiW3J}@X&Y;Yx+P|*8H9$Pb1ZXeb!
z<Q}T!{~>I?Adp}S4yIQ~lJMnY<*S#3bU)h)4_3j+0D}pZ1b2U)$apGTSD(5he!2|;
zdED5z7-_R`AHZ)Got*k3h>n!i=F=cIvTwTp(@EMQ3Kj{Ia)xj@#H#H@R|tCglZU{}
zQA*a7V>JHRUIA8!jz!k5e$~du$a@W{eqVdynB6Z1Iz;`Ofg<;B($K1jt`=B-#R-07
z4OrdM^YrUPholQu1N94g5uupgb+-P{*b5+~DzCePul(u$6`kw86R96ysh6&FR$p{a
z$|v`dM(>(PjYo*aVKP_BuAM(zbl7HF@w+)Tc93PRdJyiS@31zsel;47Xl5F&<wwE{
z*BAF5W?4Flm@+@tcaO*5FsLh7SC!M>xDlyui~5|J>bQ$f<c1+x@tx<3`I&ik7@x}=
zOczW|6|hQn7Ry^hi`Wx<1|G>P7vPy`@lHCZZaqYiqeBV@!;y#6T3_&hDpCTQPeQ1x
zQ~2osd-gSN3BdwCtOVV>ABmh_<eTQQlLJ(x?0iBMVy<EMFSs(E#X(^dvWZ7gVfOs|
zcz8p#X}$tgs`gnPqnD=5wuaV*gM)D&&8GMh+&Ydf%I=SoJYBrw{85EoLrY6J*@-90
zPa;rP&m-B}fJFnBF|iT8I<Qh5y`)VtuVUepS=#E?BX^sa%Fb=WqWLfU8zq0ww8E_w
z^br4$4XnBY`8bs*HEvzj{Kn^7$xwaWJwD57leWEJX03lpPL<0gl2LTARK~mE=kwBj
z$8)tC>+?r;L4H+FCG?Pzd@>fkgreWf#??@6K<;OMcX9KZ=bOqae0~?~Z(`zxh!eiF
zk)(q{;Zj(iWsl=(v@}`Lj1QByOH)heREZCa)IOHkZ?-I28M{HL_Sj?Ex-G1qWcJkd
zh<~kmmr!WLH&$@Q3q&GDsX7FtoLnRyEdq<j(6{1oM^ikW>x#!GOqnO7KE09bQRZpA
zPQcCPJ-oF?TNOwq#}oF>fvgW|IIfuHtgQ@S2yLGb_Ul26*pwC10%4-%w<%5f^|$|t
zh9G^xd%eh2cb5M69uPRzql*^0zMO9IPh0Amv@FY`ub#gw^QP3DCgmxfKXaQPhD&<b
zu}>>hcK)=Lv8wJ*lA`KMqc*l-)IWt=Jh7&|{m-0U*3tHN`4|}d;g1-{{7$KVr;9+4
zUj0%F(kqJH*rh-YY-rGX8I>XNJ0W^e6UAX}XJeG735w=1X0!MV>o#7sG;y_#JnRZ-
zD2nWNc{~GR^Kr$i4;bZ4NUPQ)U{4U=Y4bdDvve3Zf^^{gMz8p}(9-c>`PcySVCfhu
z4`6NwAT_<_JYVQ^0%jWy>2r~T7&<~(biXfKNyHSlpi9G9!r@yM2TQ0Cioe=aMU}^E
zL@Z&+$pdq?uhXG-{uievdqvU*OuuT4SOxn$Nhlsj9(V7L!e-((Y@)Y6QDXUMlv>X(
z^=3ucnrC^xc(knI0fj-$tg7~M9<NsDJAAq{me>Tx<ZY&!&uwMmG1cNTs--`Qrt^c&
zoJB;$rK#=%O-x|7Q%82<#%1KpT!|{Y4Wrkv0%$cIJ;xlaVED}{XsphegMu3r*z~sv
z4B_PnWTSs87k^Qt3nh>q7Oun0zrnS!YZ<N>J)bE+J7HR4)v|%6Y96lC{6Ph?m*aVR
z35drUn^zSr%UHr_>lL?W?E2NvsD2zbl!*(D`FeRC1oAt0%0lTIGxa$cktZkiK>;x|
z)5iw!fiprm{0i%aUaa@xw{OQteDF~+1r1R2Eya&6-Qxi={8!E(b)$dfAaG1dP?n*6
zLK`~!<2~T0oG4{cA~|bI02ECXEh7gg$bBea0+q>=<??*h;7Pjm=a|<4+ZsH3Mb;z!
z3y<K<*FnH|+Qf?$w~Wc<waNyRvSEycSFxJtfRbMNGZ@qFK;(8n55XNeo_qM@I7Q{L
z#ko~^Mk3zw+;vfPnQup3>65gr@9`EY_dXdaS&Vl9Bmn?9R@Rr<v@{@gsq+LHFGV+r
z0JX>xsvb>EUi9IFa({9}L2p3mDEjAOGAbOwj6f4U+Vi~SV9^V%3*R$9n~)dt!&b5s
z@_Y$_DH`w(P%hS>%8H7rll8YmKcp!rG>Wn>K;1VM0hLBrfNG3A2;co89-!i7TGEtb
z2Rh$A-_#VKVgzh9bBaBN8@o$*^6RSRn--sp%I3FcCeGP@Epg5Xj5P5&01Y|io6%<g
zd^O0_IAZAzP&ZlGl|DU-3wo6T+QzPFfPk;l_!;$RZCG_TcrN9ivR4MURpHa(-&{|G
z1bu1%uMJ!IRz;&bDbC733rPCRfKf9*ngz%RfUl{k>7AP&!1JEo`5wH=d#E~J@J8<S
zfu9S=q)pzW9rF(e$TU-a(r-c#;;Ld*5>^u{08f2cS6911um0~k%!La^YexT;NLui)
zM!lrB$>6o~a0<bgB`{{$BvNrjoAJs<{7dDaE7VUtn5rIZS-ldJhRnb|w?i?2R}b_V
zs6QEG;1$()7*5_n*n*!x;H$p5iJ<(8aBOl>{E-)~&SzEnR=;&$oz|hy7`M+ADsLO>
zAgCjKGfvB{225V<BdCW68Q*R)JwTS;*9cWVbDQ@1<CdR4ga1>0@i5Nfe!CD~=x0;g
z(IULOs0pR+M{R*B|2FViwD28q&ex%v=Od8UE`u1j(3ly3t5HsXVLGO<zxmquPxxgu
z)_QNx1zyVk_5qC*lr21EGS~vfw{F5|q?ap(*3ULIH8piF{Ht5woxUX<$Dd5&D6N74
zmD5{v=OG7KLQDglbN*?x$u|GPpWpBkPJ<3EO(?(iZh+k-j!RbtPyyu9*59WHw)0h@
zagKs7r4?tduyGg}PPlA&Z7pzu!?E9Do5FNi_4@f)`p*PL+$?NmY`_}8rvScvg)WuN
zJZ$4czHJ0KcbeF+`}QKpxdXc9dwVm}Mkei<#}uIi;kPhVP_n~oZtNG*=38#nQB*eH
z)C*7SrbVgU`A|DE;+VlpvFxwomrtqWn+$(0W{6oL6tRSW$=FF=4uFR_HRZWwVz$+d
z*SazSL^#iG9I;&lW;ONQVLVoGuv|@%s@QPbvJJ0%uYd1ocY>tM9=j%uw4}}{jGEy*
z{NlI|?B1j3rI$I`1MPbgm?DC}9@||cO~MaJFf4qzGJaJ2a>#X5?k7F68QovYN(vJy
z5EPGM=D<d3E0^zD9dMK~&>x7B(bclO1!BcDjhDcm*T(`s@2aucL5-GNh>b0ClPZ;*
zA}4Pf2AMwQy2ITm=r6D?lqs^`>Cc{2E?6>ju4**Gu_GJPuM}>gXQaxL6ux3=7!XC<
zZUGQi+oqIMm);~H-mTHqEU@7X7T88aq<K?LZ$(O91u^N~_zDKpN|>`SKb1g?ZaQ<i
z(zv^V!8<EsS^h&~gT#}9x*Vs!%cN|ZWu^baYeJiyFiOzlpexPGT7JP~YO`oNd23bl
z&=aB^CAL0=PCFkS(nit$NL^K^cJ_cYnSZ~W@u!=b_#^3u9R8^A&~}B_N(Y*=zp#5&
zGi`VUL)ERB?|Izu8XI|y#P1%!k@I^jF(C6)SK9$ry<kHkENFPuE<S!5?4RNkM?#Tn
zYoeuBB}q}ia-z6ktlBQl0$*$_JsOv0%5(Vq$VVj&12`Bbxx7FSStUn#;fwhS$2Xoj
zE>JHmn-8g<-P_T1?4F)VRI4=YU$4`APAoS!hdj7%96SzvV5hx*<bJE%&Wc*|4UlEQ
z9DBFYp830g6$!lmnCNH#*d1Tbjq_RXsn&V_xu3O%X*8$%UHQiDSqy>iN}V<TEkBoO
z!O0+L6;=Zuda8&f?5c^VY<eQF!l+Lcjz%CkO)K@Kg=UO|BB|XW#c=Osk0)x0nQHD9
zt(*li5fGJ+G^nhxaq>yNb&NtkgWBV9?i>`ChF=v8f-}r9MR)*OtC%;;oVRf}0BGA{
zW&gv$-}-~=zN^<jvbwpWtrzA%Sh~LN(m6hPT2-{qM|)Cabt;EEhdBfrsMrP&hikkX
zoEZV3>WfAx(;ZgNMI`S%4!u`L&H<R`3n<gRIQ>NP;Mo(%veXjLt=$?)=}6x`23iER
z2|$RpO_2V8-*2i=N;{*D)!0W`bDIKSEX>}p&?lXDTf_-tFne}>DMU$dqUev<*iad!
zPe0KNO3%Snp09{>!4M@$=wT(Xy&8irr}k}hL<QIQwJ4<}(uxV%pgP-aKstYl-9Kw^
zevmIciT@6~*k&SI(kxS<hCR-Y=YHYD`nNO%c1Jt8W2foI;^!^daDD>Bo)`lPb2ZSA
z&DS>9$aYdVauKy^7k_VZ{;**95#QKFtB9;VrIDI~9YgxpzI1GUQHuDK<^n%*Dr2-`
zf0!AW0&jK!F4t&pSCa{9pDSkFKPX`T3USmXhQzG(=LiqG*tTzyT8}d+`#Ob(&rgJ>
zgXVCfNpM49o2X+3GjKp+S=MXJftkon<Han_JN?^6^~Ty0fJqFr;xOAdBdV4&4jXc#
z+nkL<xGZ@b#6HqkU8nv=8$#tAX=+F+N6D%R2vv==K+h>PFbhq-jO_?G&1p{Fw7y63
z3p(iKgd8@+vXPL7B6z&gD49F|VU!}1$z#ZQTph4B>3{`>`$sRP)#n_HYe_TMLhCHP
z5o8=+w}8@<q4u-iq^DENtWWd&1f<=@Ai#doVGYcWgkR044eryn9U7r_-Ne|~qeT!4
zPMBS~)okrY{|%&(_s^6g758fB=An+_n)JE}<F-<#6<&T|&9Jnf!3HGrI3HCPIwv}S
z?cvI15KSrhJ|a5EcEA?9yiOj%igD{O%jFTp6YuQ?!tgRyd1Vt>=anZ<ZU2bGJECVj
zkNWdJXPA<0FdXqYjwsTTC5)Yq;J=V;ueDP#IEWe5LG#M<c%JWDvQ&}~@Ff3GT&5Kp
z-#hx{3gU(0P&tI9&YN)LB_N*ZZJ)YzL!)`6(V0m{YrQFzWgP{1L(nFnd9m%$!{tR|
z0hAKlkWD|4|IACVCmq<NG8m^_AeVL(wKIfcx4}YpO}UA3^K9R0&HN&QP;ihDAe3QU
zJJb9vzl&LvDzj8BK7@x-Ili6Ld2H*45DCi0<+L06ul31i)+eW}hX;NcoZ!OL#IXV{
z?R|+H+l@lWq)b#Ka5<ybe;6BpS68+(Mx?D-g{_oUx?JMTDkWDdVSVn@faTYpr{mIa
zS?|%IHCR>vsO^@H6FAYNP*=mBSvrV(o{^GM6RRzIWw)J9PGr}x#|B(#o5yM_iK3%l
z<{ppXIM{!FKiSndLb+7w*YwFka>zc=w8zxdRoE<-fjU;okM``Mw@m{TVc)_zS4h9S
z*XZ{AW<=*~v)*;C?{eqlg*IFekv7W>l5}Zu2INCJ`A~f6h90jOlUsk}zbfxH0kk?N
zQ@3Vrs*5GSRcf`}X}rMuqvHI4JAo4nh2VP|@L>M;<FY`e<c}!7!p_c$s-+Gg2*#Gg
zM)r7dBy1?6n^FmvPUJHs{(fq2!ab${-8oQFsq$msg)%x5$cj*IQgN6#15m0WHRZCe
zuChG>yXS<KUgp4!4mUC~@>%<%_+VdOJs~d`!ZHHOmEYv8hiHHr0u&PgZ%Jlt9nYp$
zCt2w6j9!H&k71Xrd?A;LyN-4Ly}Ym5<tm0|PMhASH9n|v75-xWncWAD2|gqwCL%L=
zNmTh&8|_IzmA509Ot~^f*vPA>G&{k$(H?@1_e}OvQz_P;#5TXtewsRy#{Qq)w$^Rb
zuLtSVvIMO*1>XUIcr;fG)R%!mrPu2zP3+$@)@KcG$0|zU10-%O*)1B(?ZfPfGIPb`
z<fM>~z!siOi#^OD<yZ9%$`GW{3f82LLrSV}XlSU11;r`X6V5<Y2PsxlMb^-0aaB-|
zu$%{w5NE>?k%tFrauoYT-p-d|+usZdo|uJSJs%;O%v^Etyq7flKg4WTnX_UD&%WxZ
z!}j`HIir6i--pC!SDNZ0Qqv&ur8-GzcNQD*<;YM~^g2+bBpQ2CnqD!ZFsyFx7`Fh>
z*_`Ni#7uulCK&PR6bn!+dt;nV+WpKatZMcRHsU#WAQ)Cf?v5+`DJAOv>p-rgT8bg7
zP$+QpMfXx16e!39Jksr{mR4vKQdZZ-hm8F#%;p0j=#<Sq@OzIUUGSoqBaP|(`95lC
zMmbsrqfeTxw0<VFCywz-fW%uT9&3!&ZDE$5bg#hXc})o7i@UgOBY<sUQIy!#rmc&t
z4H<x6I&B-^BZ5*j!hy0bd&+~hYZr7P&7{Z4Nc(Y21C6nK0amb?H)z8`1ShnOsCM>r
z+>EWi@B-R?imxh7A`pXK!=T+%w2OMs*3i$v-Qj+LsZb|8KT`0{sN$IP9gR~4ZF7zl
zK_DjSnq2^EP-UY(PjNDW$w$;>lE|Yn#@%<b)_bkka2p(NEH}!>bCKv3>unYL&xFYk
zrA7I2-X@hk$!)3+nK4pH4vII9iWeP^W6c}>LOKAEn;i#79$*Dom6UjWn$$Rt2)AjT
z-E!c|+p$6pACtWXC_p}}6xv10PW;)>wj;a7pPPn-TaFW<DuY&Sj+iog^tB+QnWUZZ
zruukP;TfbfNzyzjmrz0VCi-zu#<v*^$U%j|)diG{FZ~tYaT*XxsUiU!arJQK!X3E&
z6fCi^qckaBN|!N(Gx^3m2_H=c&#?AiXD}$BxM<G+(sZmMpnPJZ0PiD!k~QO<!=OSJ
zWUA|uKADrASH;^df;g$DdtpAl-LIA}9#-8@F1SDCLimmo3w=_5UARGSmw^wVZChYD
z?(exj3h!kQ;tgG6aTChv_f?9!2a#Z#_3c+a)T9lt1D+|qK3Jr$OV=8lg9leEvbHwR
zrps@{mVMU(QuyakN{kjq|6ZU7Oui20Mt^^<63|RWwY=X&IytGnW<{qPP+E`Vs0Wo{
zxz#>(*gl$1ToOCgb+Z(NeA#G4w6f`dUDNhj^4_?iijREpI3|PQg{yAuRv3>nWg;&#
zA5l3t3#$1s{ReYEq9z9v2E|qdg@ZZZhGL$8*{ooQv5_^f0es~IGITtg&JMee<dm%h
zNT!}y;RM52OpXoBHIovhc16;<njB!*;H8iLJ1soeOmCQe|K9np_jlf$U+=5?^NC|*
z%I}Y-%5Nd?q-W0~63h<@lf8qlco?<Aj|}o+B%MH6viB%(`E)UF<xTs47wmr=5w`>=
z1G5Og9mh5Wbf+F65dJxHJ+V{g{pIiA?x&FR=MJX{=eC73;P@~3%CZ1d6qPG^(JBRn
z^Ldq98o3kQpu*))(28fO6Gp|<^Ut^TFfTMI+<Yofwt=)LZWNALUR~=i!W<t^Y;s#|
zkzxUk-x>WBv<y3?u6IMLzwIXcCrWq6v%y`4p~d?~Cnt}k3uQ9j{J7^h(=A>p6|Nr2
z06cDGZ5>ifV|e)RQ;)-fA3F#Cx`z*cmPCj<e%j~Ok2x(aL%nQejZG8D9&!EFBdD$d
z&rcfLRGPhl^ym0H2w23=boSUK5sv?L#-<gE4s9b@&C-1mvdbsm#SL=SI5gC7yMylS
znVKH86er3x{4M|O^N*)bj?25TDvi(w6BIrI41<v-Tb=H_8CDHjK2n;m`yY$=H^y8J
zt(7#7_=OZ!ZHu$$@s<-KYi!sBeS@|~;4n2;Ld%m`h9=|>qfiR+FurC03IhULK_Ob$
zmy%F3P{ZC{tG-_t{R_Au!Yriss8*p_S31v=|8e*;@NmyzOK@XEj^gt(t5{vbG%r;F
zNhEFFu488P(w#7a?@emAUM#Nly-0Rm>xqx)mxB`%A@Sisk*@~yF+WDM9bJ?avmy7t
z_o#X&T%4fRN|M=BS^)E6ype-~WCB5~Id#fJ7gAuw9vPK*u7S+BfV<#5M_-$&|Gf#-
z|C86#O_r9HC^ZmGS$PMSOPY}9voS$c<Gv(G494*%=68<WecuHIDx#CVzu`iYvEamR
zq<5fWY+T4U%S`<z=4-t1nfS`4AI;FmU(o&Q(uGcMBJe7;bl3(eHD-ExuR!Gnl$Oy$
z$0u0$U~6IM%4*vM!sK%=Zzz(u%p@K|?BG_DT|o=j49FL|PSqG|&xcWu-^u~R&HEpl
zDg=;$Dzu5whPDJm@jtot;=}Zp;Yn=xZ-<9M(4acw?sylU(X*#&?6v}90n{LkDm{3h
zy27Vcs$iL*;Di{W9lx8H7|0;G5ZrtyO|BO3VdJkABU_%Qr*c?FWc0Wtby0F}nW)E<
ztg7~sQ~SzQCikg8dPXT4s3?3J^P|nxs7xcd#T($Ev2h&C=IdQSDHE-g!rVDrY@TG4
zI2IA<2(CteV;g^g$>N&B%ZEB@mDI7zqZN&l+2Lfc-N2$zk9UR1sWy4AMq(-|oxpt5
zM632s2^ruDo>#}ZR-**X_;L&s3EUJCiX(A66YYW#IM6hT`A)q@JpNwCM~pcXll$oK
zjSqd~e?#f%eF3g}6JuAs=I*_D^iL4JL=e8sbsP7Vl4qxQ;F*}0nS6D1B=Jsuw|MX!
z!54~elkA^bpD;99cdoPIX;9eq$Ar_ZFGRW7ON&2?n=iP)|M&|W;fEu_rLB{#+X7#r
zSxZ$0DgP)igCSKtg^<JHtcLg>`E~n;xNB#SjB_?_n{L7vO=RH5<$SpMn`&Rl4*iec
zvNWp&&l^WdMWW5Lo}W$)2Yi_^wMI2n!6UB)#l^aX&?KDR@*u~G+KilF;sJtNbvn43
zAWVu3-hpY^TD=7yj6;_5HmbOwC}B!fph8v7(trjNsC#1zQQVg|5Yjs+kH}!}S!LVd
zr(x)qIB)|kLyyohbZWaOl$JjXt)^A7srfztEd(glQFI;mvDV{NR9z<PL0l$rPAiZO
z-_)lPrKwYjjy-2xOPp<J2uU+CJn6DrW$;gIe<SA8&s`G<@+<v%@JA~$%~U8C+)^{$
z?%0$F6<@l@`n<`1*Xk!<m0(?;r8WD1?QUrIm}100b$95K@qA2d9R822cEl^@z>s8<
zZz)))SvKbarM;fr2Z7#qqY-h+3`tCQM?q`EV%SEHSWZk{>N>iJ83UEC_h<{~GZTb|
z>Jm)!liXLq>9|O#F`KyeO6dSPEj*$H?86gHEUV3pg^fKx*vd>de3aDqRna~%GIf#4
z3tSFi{b=zn?Y$l`dUj`hjR4L+nL*A>>GwSg`KKODExlUp7aAK)ru_M%B119g+eaPy
z`%x&zw7hCo*oFd$w`Qab_{z;*BA7kJk2*;~S}6B)w2o8xp&OckMi0p$40jMdKX18&
z<_&Iv(5h5UORA29DkQ@+vIrU#=GvgUvP&n^g?Bvd?*=U2@J!nad)fEawc`2F8>wL>
zIP3r(r4SGSaAjv8RfzwZ=Y4yT`Ih%-q#zo)VXLkV6WbFLiacZ`RAFOtFJ=H=+|1&R
zNyBLVhBJ#X?}?3r>h2Q2QJ^&KRqE=4ZaJ#rz2d0q_}N0);Jf5tXlnYmaW_N#&Ng`o
zxaKs{n?Lq*Ozj2e`dsVOFj~<k^-i$z9=w}@b<z1}?Wz82do^=z&Vc8i(~Xu#9hlR*
z?)HR``A`|La9{nP?mHn6c$e+;7dh?lJ@E&1^IyGnM%1QDaMM%#^2p68M7VuO_W^~`
zzCUMToy)l>Y5WdF>bp5-v{T-HLG!&l7Sx;ege<+*xjz)tq<YN4(aG;}+qP_WEzcfi
zk7X8?gZ*^kMYdezMW8A`MMK*;uavsc(UNyJBm-N?KkfcjsD(oP8jx0}l>YPBqFhP0
z!{>Y-6(a)xjreax*k*x_I(&7cGfQ3L4eNa94eYtYh60>7E+J)VFikSq|7L%kd?u(0
z!zDK-u5z^oDYJeRIU$_&h`U6hf9|!2$Mq8|u)0U3{9@$_{h*GUgxml422jF^o&dY!
zR=2lre-wF*V8-vwcZ2jR8;8XeZdp@19{=7{4tR1&vt{@VokXNuG757OTjvlFLGFY#
zFhUWl;tX+&62<i;Jmh<oS9Ag+s)T0^bZReQRE#}%P()LY_ST8h3ZeF(3?@hy`O07U
zl58-J58)qm0`}VlH8ysz#-gArLVUTsID+u^%G2agri}a^a~8Uc3Tn+Rrk3uF(B6Uf
zaW3bP4Wq-dl?5E1A^m(wbtyQQJH1F3P8Mk{ZXCEeo3$#BsK4E=m$xq_V@3R3olxO<
z(ouY5#qMWSX!NbFPGSEoZ8Z%!5YGiAtXx{9X#{KA6Odvl+=ErD4BCXU26@he>@a`)
zgwo-dAY`&Ql1zzx++L8kTSTS2V}i1zHMq*lj!qQ1V#Pfr9I_yw+u(=_S_`CQY?P{)
zyw&@)OT60fJ1N?KAX45Y$Q|l&FrrF#@_S)@15f0wEqD>esn*G@99=bb^VW%mQ5(D8
zN5T9b^tO|`_abK;i#T4L0yE=TK&h2^)+jH!E5o&%FC7jb4qMg&;7~DAC2S_}?8G`j
z1(cdsuQA<77{W&vjoo#j-G$u)+HK8A+uj6FTpH|u|NYDK2HM!(>%?9Wm<Owt`y>-`
zlfD()d2Xpt7?p^q6XD%ib9dA_KH^7Zz|Vs-_8nUJX_=vs-Xmt3Rm2}D9AiZnVq(v>
z`t6|8@BZ<nbq4)gp<S%fFVt?Xu0Hj7*F>;>{Uky;-D4Fxbl#_hI+uC8Yi{Sb@Cr^&
ze3QLs+=6^Y*aqh7`pL$vE&(c@aHh3nUHCMQe|N|yMY!P&QgM1=Qw#lxzmei~Q4j{%
zK?@SP5^{!G9Z6LtL`1EWDdozWHjCP9)CFKS3w+4~#Y_DOP&sIzam2?%Im&E$Ovuv9
zo%>Om3}6(FhVNbJ1507r^kDf|l&UYI8vS-pq&i;_z~`qj@qRQyOdJi-|ARi%4Rpmq
zT$T|$8rid(_X8qDsu!)XNc;Eiiq|xVMV6rpzycoHXfdxD>3CC)K<bSfh;J&{aEQxe
zpivpf5RC=v`W<kd|ExpwUhf0ntkisM;g4?wJ7Rw`)zRr$V`hB1K}VXGR;m8ilGpbQ
zmX|MI%7AVG(^e&)+*}}A*21)@D4-uE(mVLRW!|zLd(nRSE%-CDR5osme!F*oJ4&CF
zQHzpUP~lE`<J|!?|D{>nk_2I+**e+Fzo6{CySi*Va?2s2A}Th-Wl$|G(eUNgDZZQv
z^5wgD^Twuj@N6~V1W#<vR@y<QBY$AWV(x;ho32~`@_e}U@Mqx|{pGCDvpec*i~*1L
zHvN!)uA1?)3GCT(CyIO4tWGCIXQm#l?X(%CqL&7H36JgohoD0CwBpEO+dnX5a3p~2
zQ4_@hen5>ZQLX&I;`TgSf0VL3)&efrVpbe^(4j+0D(CQv-nUUejruf@<x4x5K7<4n
zW|c&3!l();9mnz?Rspe_M%I~aq$T)Cc~nisZJhIiJO8F?@5drSLOP1fHwR@~vmH8W
z&}*YbG0ev5_XkCoR`s31pRL>FstWkPAbq!pFChW`vcLU$5y4kJdo{GRh(y%e)5taq
zvlY3BxY$x<rMJVIu8pU@^zIfIMdcP8f%@CSi=+cj(TY7}Y?#wT1~5WMb*|0E@w9RA
zZ5vbZ6zb&UU4X^mn8yfK!@13p{ZWDnrDyA%RNt|l5)(dd?bt~V^6e$W)fP#FS56D^
zL`BH}FFXU$<QmtY3cjWOTG>V;cud4#=BjtLKHvDE<8dEJhtyN%L17<32pSWUwpHM&
z<oAf`9SNRjo)zx7duh*aezGU(FTfS&MN?_b1q{Fsj3?kYJu@8~+?qH~Nn~#?HZQyV
zX3NY#7H?1hj#CSe!Dj{So-mXXG$Q40gHOikXL8k`q)2sY_~4fr>$D**)=q5gI}X<#
zlz-c~bn3mU(WpCor!?wt#1;3ZHcX+NT>zQlT85}|?*JJKdyE`Lqe?)n`>AxGs4DJ}
z6Le&ShDozW#U;J{^l@>gg}OMql|5cV(f=Z}zh(a|OJE2V{Gv)zKLPhcttzC6RjZm{
z2JmrDP3{AObP)HMRUKW!K(93c$i~ri_>33DY=f(&Cw*02uxHLX1PtQk0R(*6&2J<2
zLAs`FC%u&GKe%M<DM?iq0d3m#x+L4RS*_fjU55Y&LeAZ}zmy^I1P}hA3hdF$njjFB
zCfvSbf7g!_YD!4`b!wec$&3d=GpqsK;^HsbYx%eKCBABLEF&{B(+<E>dKMhu$#;I~
z!UWk#eP2?C%Dq$bGqB^zH+y>rz>Gj1unsc~<STwdZ%zUS2&I<b)~3~T9WQbC(yBCx
zGJVexZDnzNx%Y69`I+5G)7~a$!fwx(_6qT=#?ah#=_yV;0{M1O#h#Muo17`Ta&!vl
zT=O-MRXpzOYe(N+eK!ZPZ0d0j@L8N<g#VGl^mqOYdA6FvxWZ}_z$J>al3Vw{$pUL5
zk1TTl^@%ZqbCuv?$ON`x0&8Du8bYHZ`IaT{h$fnyiW@FkSzX;eQ0LFCBg!?}HSMm_
z>F*L<elmFyNkeljsA60d<Ay68;AX#|g8ija8Sh{&jj`YS18(Q>rj=&IHEsP0Y#gU6
zI(NAvP<-Cnjz{hj!tvmq+F{L8GHt4L8YQYtw3PH?1LZ+yk|#g=L1SaB1C34(EN7gH
z%I8}16!ZA@;ipti=lo&4Y+p3v1$%M`JEj`_vZ?oiFezsIMeKNvNrier5(%;WhR#aU
z3xaT%^4;f|+4uZ{V!^q`amUw;hJ!Ywz|>6hnG)m+bFD)(1IKvt^72&Fqn}Mp^Y)-1
z4DDp&Sm33m?7prhVqBeTIlxxY!QHaXDhdMqkV-|a?@8sc$@$Xd2P(2oOMs{y;9e>c
z;K27loc>Gck1RYL7yF(ohKKeKJc)aL#Aa2oc-)O<2NWk><S3<KbY>rYb3m|TTEE#K
z6vxaPD7n3eeES5s_xH}pkHgp<b}Db`M9vT@7ibUf^ruC?6vU~Rw4YK*Q{$o}oe5_Y
z^%~<LA5E9q;X4mJcbTzN(U^$Co>9F9$2l4dyarXK4p2gd^fhnK$4|@up)w@|Q$v1(
z9CB*?{T<YPIXJ%U#w1ke*d4h1d@AV9#bNx&^{f*=7=}h<k}wY1W=)tO4Gb(UZuoyA
zr}lAxS!U^0s1I3^B;X=M%z@30JV(_NI^;d{TqiiMUI5DL*hZ1>**K^WPB|6FZ5Q`+
z5aQ-1`%BgVPMPeP>QtSNSB9)!C2Sr^+tJ<peh^*RXO_6!^2qJ0QW|mfLPS*6yXS4@
z9OosE;17NXl8c)=kKc4)K;p<Z7H(DN-F#;Y@%te$fh0C?);i5rF4%OY6>jY5TWxD|
z6jryHxO&GUF|Aq!>oc=br>sRwZ-N?=TSt0|L9wWpJ;q2uyH+=Gd23wL@uC-0%>!rt
zg71%;;n&IHripZYmEn5ZjzCt*PQC+63LNZd+tSmQAHDYB_#{V}d7~9y68G&18<3(E
zHNGN>_?<8AId}}<2$?AX{N5Dye@d&kZsHz_Qime}p}UnV7?l1rC6l<keS0w+5g#r+
zZz<7gx;04Z2sLo0yzX;8`#YG%CuU5fCQut_r6~j~;+pHqgw|~yX{}EPr;n51ci)O0
zoPL72_G6ZowO5qA;(d~-@v7%~R=7ncD~%DzU*Q$-i&fgZpaD$$U*M)*9r%#Vg$oO*
zdQ;C_f+K_JL}@4?jxa%tBb9rT+Pe}45eLB@ny-><SxN4j7}>H6Acd)@(dnWZDrISN
zonm*WECO8roZ1!8(EA}&LPqPCvebjV1WP-W7b5MjO+TMi-QH(fZF@H@XU@Cai|<=}
zgi-G0yjn+0AFT?0SaK)_|4G?9z>Jwlq2;IEgYinKbtoh)K$;SPrLnLr<5D&J1Nf|(
zzknx~Q*ldIdV#wy<>TV{K5M2{t~6tkoqT#RU~Mg9o4T?rkEd&cPcsvZM}vEhDZ2U&
zK1z0hg+V7$Dbac_|DoSNzV0(OkI&PZ3VhP!yh2luW^3#6e~C8#ZW90Zan}F8XMOtt
Zy}f$pT-*{Y{WbY--yRQV((flO{T~a2Wn};W

literal 0
HcmV?d00001

diff --git a/docs/configuration/colour-codes.md b/docs/configuration/colour-codes.md
new file mode 100644
index 00000000..9ad9abdd
--- /dev/null
+++ b/docs/configuration/colour-codes.md
@@ -0,0 +1,25 @@
+---
+layout: page
+title: Colour Codes
+---
+ENiGMA½ supports Renegade-style pipe colour codes for formatting strings. You'll see them used in [`config.hjson`](config-hjson),
+[`prompt.hjson`](prompt-hjson), [`menu.hjson`](menu-hjson), and can also be used in places like the oneliner, rumour mod,
+full screen editor etc.
+
+## Usage
+When ENiGMA½ encounters colour codes in strings, they'll be processed in order and combined where possible.
+
+For example:
+
+`|15|17Example` - white text on a blue background
+
+`|10|23Example` - light green text on a light grey background
+
+
+## Colour Code Reference
+
+:warning: Colour codes |24 to |31 are considered "blinking" or "iCE" colour codes. On terminals that support them they'll 
+be shown as the correct colours - for terminals that don't, or are that are set to "blinking" mode - they'll blink!
+
+![Regegade style colour codes](../assets/images/colour-codes.png "Colour Codes")
+
diff --git a/docs/configuration/prompt-hjson.md b/docs/configuration/prompt-hjson.md
new file mode 100644
index 00000000..7b7a3ab5
--- /dev/null
+++ b/docs/configuration/prompt-hjson.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: prompt.hjson
+---
+:zap: This page is to describe general information the `prompt.hjson` file. It
+needs fleshing out, please submit a PR if you'd like to help!
\ No newline at end of file

From c82dafa0e2f3151a715786aef01da52fbedf1b50 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 6 Feb 2018 21:05:22 -0700
Subject: [PATCH 0192/1013] Add initial ACS docs

---
 docs/_includes/nav.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 66453598..168e1cf5 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -22,6 +22,7 @@
     - [File Transfer Protocols]({{ site.baseurl }}{% link configuration/file-transfer-protocols.md %})
     - [Email]({{ site.baseurl }}{% link configuration/email.md %})
     - [Colour Codes]({{ site.baseurl }}{% link configuration/colour-codes.md %})
+    - [Access Condition System (ACS)]({{ site.baseurl }}{% link configuration/acs.md %})
     - Scheduled jobs
 
 

From 86f8952c744c7ce87448d60a194b1099d8343ecc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 6 Feb 2018 21:09:05 -0700
Subject: [PATCH 0193/1013] Add missing acs.md... durp

---
 docs/configuration/acs.md | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 docs/configuration/acs.md

diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
new file mode 100644
index 00000000..a8f83183
--- /dev/null
+++ b/docs/configuration/acs.md
@@ -0,0 +1,57 @@
+---
+layout: page
+title: Access Condition System (ACS)
+---
+
+## Access Condition System (ACS)
+ENiGMA½ uses an Access Condition System (ACS) that is both familure to oldschool BBS operators and has it's own style. With ACS, SysOp's are able to control access to various areas of the system based on various conditions such as group membership, connection type, etc. Various touch points in the system are configured to allow for `acs` checks. In some cases ACS is a simple boolean check while others (via ACS blocks) allow to define what conditions must be true for certain _rights_ such as `read` and `write` (though others exist as well).
+
+## ACS Codes
+The following are ACS codes available as of this writing:
+
+| Code | Condition |
+|------|-------------|
+| LC | Connection is local |
+| AG_age_ | User's age is >= _age_ |
+| AS_status_, AS[_status_,...] | User's account status is _group_ or one of [_group_,...] |
+| EC_encoding_ | Terminal encoding is set to _encoding_ where `0` is `CP437` and `1` is `UTF-8` |
+| GM[_group_,...] | User belongs to one of [_group_,...] |
+| NN_node_ | Current node is _node_ |
+| NP_posts_ | User's number of message posts is >= _posts_ |
+| NC_calls_ | User's number of calls is >= _calls_ |
+| SC | Connection is considered secure (SSL, secure WebSockets, etc.) |
+| TH_height_ | Terminal height is >= _height_ |
+| TW_width_ | Terminal width is >= _width_ |
+| TM[_themeId_,...] | User's current theme ID is one of [_themeId_,...] (e.g. `luciano_blocktronics`) |
+| TT[_termType_,...] | User's current terminal type is one of [_termType_,...] (`ANSI-BBS`, `utf8`, `xterm`, etc.) |
+| ID_n_, ID[_id_,...] | User's ID is _id_ or oen of [_id_,...] |
+| WD_n_, WD[_weekDay_,...] | Current day of week is _weekDay_ or one of [_weekDay_,...] where `0` is Sunday, `1` is Monday, and so on. |
+
+\* Many more ACS codes are planned for the near future.
+
+## ACS Strings
+ACS strings are one or more ACS codes in addition to some basic language semantics. 
+
+The following logical operators are supported:
+* `!` NOT
+* `|` OR
+* `&` AND (this is the default)
+
+ENiGMA½ also supports groupings using `(` and `)`. Lastly, some ACS codes allow for lists of acceptable values using `[` and `]` — for example, `GM[users,sysops]`.
+
+### Examples
+* `NC2`: User must have called two more more times for the check to return true (to pass)
+* `ID1`: User must be ID 1 (the +op)
+* `GM[elite,power]`: User must be a member of the `elite` or `power` user group (they could be both)
+* `ID1|GM[co-op]`: User must be ID 1 (SysOp!) or belong to the `co-op` group
+* `!TH24`: Terminal height must NOT be 24
+
+
+## ACS Touch Points
+The following touch points exist in the system. Many more are planned:
+
+* Message conferences and areas
+* File base areas
+* Menus within `menu.hjson`
+
+See the specific areas documentation for information on available ACS checks.

From 6df1e95b828e69524ab75c6a83ec3558fe03d146 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 6 Feb 2018 21:12:47 -0700
Subject: [PATCH 0194/1013] Hopefully GitHub markdown works better this way...

---
 docs/configuration/acs.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index a8f83183..827050c4 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -12,20 +12,20 @@ The following are ACS codes available as of this writing:
 | Code | Condition |
 |------|-------------|
 | LC | Connection is local |
-| AG_age_ | User's age is >= _age_ |
-| AS_status_, AS[_status_,...] | User's account status is _group_ or one of [_group_,...] |
-| EC_encoding_ | Terminal encoding is set to _encoding_ where `0` is `CP437` and `1` is `UTF-8` |
+| AG<i>age</i> | User's age is >= _age_ |
+| AS<i>status</i>, AS[_status_,...] | User's account status is _group_ or one of [_group_,...] |
+| EC<i>encoding</i> | Terminal encoding is set to _encoding_ where `0` is `CP437` and `1` is `UTF-8` |
 | GM[_group_,...] | User belongs to one of [_group_,...] |
-| NN_node_ | Current node is _node_ |
-| NP_posts_ | User's number of message posts is >= _posts_ |
-| NC_calls_ | User's number of calls is >= _calls_ |
+| NN<i>node</i> | Current node is _node_ |
+| NP<i>posts</i> | User's number of message posts is >= _posts_ |
+| NC<i>calls</i> | User's number of calls is >= _calls_ |
 | SC | Connection is considered secure (SSL, secure WebSockets, etc.) |
-| TH_height_ | Terminal height is >= _height_ |
-| TW_width_ | Terminal width is >= _width_ |
+| TH<i>height</i> | Terminal height is >= _height_ |
+| TW<i>width</i> | Terminal width is >= _width_ |
 | TM[_themeId_,...] | User's current theme ID is one of [_themeId_,...] (e.g. `luciano_blocktronics`) |
 | TT[_termType_,...] | User's current terminal type is one of [_termType_,...] (`ANSI-BBS`, `utf8`, `xterm`, etc.) |
-| ID_n_, ID[_id_,...] | User's ID is _id_ or oen of [_id_,...] |
-| WD_n_, WD[_weekDay_,...] | Current day of week is _weekDay_ or one of [_weekDay_,...] where `0` is Sunday, `1` is Monday, and so on. |
+| ID<i>id</i>, ID[_id_,...] | User's ID is _id_ or oen of [_id_,...] |
+| WD<i>weekDay</i>, WD[_weekDay_,...] | Current day of week is _weekDay_ or one of [_weekDay_,...] where `0` is Sunday, `1` is Monday, and so on. |
 
 \* Many more ACS codes are planned for the near future.
 

From 8c7c20862c6f5194490bc41e8ffeef82f6e76053 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 7 Feb 2018 20:26:29 -0700
Subject: [PATCH 0195/1013] * Implement some missing placeholder ACS checks *
 Add some new ACS checks * Add documentation on new ACS

---
 core/acs_parser.js        | 97 ++++++++++++++++++++++++++++-----------
 docs/configuration/acs.md | 11 ++++-
 misc/acs_parser.pegjs     | 97 ++++++++++++++++++++++++++++-----------
 3 files changed, 150 insertions(+), 55 deletions(-)

diff --git a/core/acs_parser.js b/core/acs_parser.js
index 36b9372a..3025f654 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -844,11 +844,10 @@ function peg$parse(input, options) {
   }
 
 
-  	var client	= options.client;
-  	var user	= options.client.user;
+  	const client	= options.client;
+  	const user		= options.client.user;
 
-  	var _		= require('lodash');
-  	var assert	= require('assert');
+  	const moment	= require('moment');
 
   	function checkAccess(acsCode, value) {
   		try {
@@ -860,41 +859,85 @@ function peg$parse(input, options) {
   					return !isNaN(value) && user.getAge() >= value;
   				},
   				AS	: function accountStatus() {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
 
   					const userAccountStatus = parseInt(user.properties.account_status, 10);
-  					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-  					return value.indexOf(userAccountStatus) > -1;
+  					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
   				},
   				EC	: function isEncoding() {
+  					const encoding = client.term.outputEncoding.toLowerCase();
   					switch(value) {
-  						case 0	: return 'cp437' === client.term.outputEncoding.toLowerCase();
-  						case 1	: return 'utf-8' === client.term.outputEncoding.toLowerCase();
+  						case 0	: return 'cp437' === encoding;
+  						case 1	: return 'utf-8' === encoding;
   						default	: return false;
   					}
   				},
   				GM	: function isOneOfGroups() {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						return false;
   					}
 
-  					return _.findIndex(value, function cmp(groupName) {
-  						return user.isGroupMember(groupName);
-  					}) > - 1;
+  					return value.some(groupName => user.isGroupMember(groupName));
   				},
   				NN	: function isNode() {
-  					return client.node === value;
+  					if(!Array.isArray(value)) {
+  						value = [ value ];
+  					}
+  					return value.map(n => parseInt(n, 10)).includes(client.node);
   				},
   				NP	: function numberOfPosts() {
-  					const postCount = parseInt(user.properties.post_count, 10);
+  					const postCount = parseInt(user.properties.post_count, 10) || 0;
   					return !isNaN(value) && postCount >= value;
   				},
   				NC	: function numberOfCalls() {
   					const loginCount = parseInt(user.properties.login_count, 10);
   					return !isNaN(value) && loginCount >= value;
   				},
+  				AA	: function accountAge() {
+  					const accountCreated = moment(user.properties.account_created);
+  					const now = moment();
+  					const daysOld = accountCreated.diff(moment(), 'days');
+  					return !isNaN(value) &&
+  						accountCreated.isValid() && 
+  						now.isAfter(accountCreated) && 
+  						daysOld >= value;
+  				},
+  				BU	: function bytesUploaded() {
+  					const bytesUp = parseInt(user.properties.ul_total_bytes, 10) || 0;
+  					return !isNaN(value) && bytesUp >= value;
+  				},
+  				UP	: function uploads() {
+  					const uls = parseInt(user.properties.ul_total_count, 10) || 0;
+  					return !isNaN(value) && uls >= value;
+  				},
+  				BD	: function bytesDownloaded() {
+  					const bytesDown = parseInt(user.properties.dl_total_bytes, 10) || 0;
+  					return !isNaN(value) && bytesDown >= value;
+  				},
+  				DL	: function downloads() {
+  					const dls = parseInt(user.properties.dl_total_count, 10) || 0;
+  					return !isNaN(value) && dls >= value;
+  				},
+  				NR	: function uploadDownloadRatioGreaterThan() {
+  					const ulCount = parseInt(user.properties.ul_total_count, 10) || 0;
+  					const dlCount = parseInt(user.properties.dl_total_count, 10) || 0;
+  					const ratio = ~~((ulCount / dlCount) * 100);
+  					return !isNaN(value) && ratio >= value;
+  				},
+  				KR	: function uploadDownloadByteRatioGreaterThan() {
+  					const ulBytes = parseInt(user.properties.ul_total_bytes, 10) || 0;
+  					const dlBytes = parseInt(user.properties.dl_total_bytes, 10) || 0;
+  					const ratio = ~~((ulBytes / dlBytes) * 100);
+  					return !isNaN(value) && ratio >= value;
+  				},
+  				PC	: function postCallRatio() {					
+  					const postCount		= parseInt(user.properties.post_count, 10) || 0;
+  					const loginCount	= parseInt(user.properties.login_count, 10);
+  					const ratio = ~~((postCount / loginCount) * 100);
+  					return !isNaN(value) && ratio >= value;
+  				},
   				SC 	: function isSecureConnection() {
   					return client.session.isSecure;
   				},
@@ -906,41 +949,41 @@ function peg$parse(input, options) {
   					return !isNaN(value) && client.term.termHeight >= value;
   				},
   				TM	: function isOneOfThemes() {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						return false;
   					}
 
-  					return value.indexOf(client.currentTheme.name) > -1;
+  					return value.includes(client.currentTheme.name);
   				},
   				TT	: function isOneOfTermTypes() {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						return false;
   					}
 
-  					return value.indexOf(client.term.termType) > -1;
+  					return value.includes(client.term.termType);
   				},
   				TW	: function termWidth() {
   					return !isNaN(value) && client.term.termWidth >= value;
   				},
   				ID	: function isUserId(value) {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
 
-  					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-  					return value.indexOf(user.userId) > -1;
+  					return value.map(n => parseInt(n, 10)).includes(user.userId);
   				},
   				WD	: function isOneOfDayOfWeek() {
-  					if(!_.isArray(value)) {
+  					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
 
-  					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-  					return value.indexOf(new Date().getDay()) > -1;
+  					return value.map(n => parseInt(n, 10)).includes(new Date().getDay());
   				},
   				MM	: function isMinutesPastMidnight() {
-  					//	:TODO: return true if value is >= minutes past midnight sys time
-  					return false;
+  					const now = moment();
+  					const midnight = now.clone().startOf('day')
+  					const minutesPastMidnight = now.diff(midnight, 'minutes');
+  					return !isNaN(value) && minutesPastMidnight >= value;
   				}
   			}[acsCode](value);
   		} catch (e) {
diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index 827050c4..3b7acbc0 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -16,7 +16,7 @@ The following are ACS codes available as of this writing:
 | AS<i>status</i>, AS[_status_,...] | User's account status is _group_ or one of [_group_,...] |
 | EC<i>encoding</i> | Terminal encoding is set to _encoding_ where `0` is `CP437` and `1` is `UTF-8` |
 | GM[_group_,...] | User belongs to one of [_group_,...] |
-| NN<i>node</i> | Current node is _node_ |
+| NN<i>node</i>, NN[_node_,...] | Current node is _node_ or one of [_node_,...] |
 | NP<i>posts</i> | User's number of message posts is >= _posts_ |
 | NC<i>calls</i> | User's number of calls is >= _calls_ |
 | SC | Connection is considered secure (SSL, secure WebSockets, etc.) |
@@ -26,6 +26,15 @@ The following are ACS codes available as of this writing:
 | TT[_termType_,...] | User's current terminal type is one of [_termType_,...] (`ANSI-BBS`, `utf8`, `xterm`, etc.) |
 | ID<i>id</i>, ID[_id_,...] | User's ID is _id_ or oen of [_id_,...] |
 | WD<i>weekDay</i>, WD[_weekDay_,...] | Current day of week is _weekDay_ or one of [_weekDay_,...] where `0` is Sunday, `1` is Monday, and so on. |
+| AA<i>days</i> | Account is >= _days_ old |
+| BU<i>bytes</i> | User has uploaded >= _bytes_ |
+| UP<i>uploads</i> | User has uploaded >= _uploads_ files |
+| BD<i>bytes</i> | User has downloaded >= _bytes_ |
+| DL<i>downloads</i> | User has downloaded >= _downloads_ files |
+| NR<i>ratio</i> | User has upload/download count ratio >= _ratio_ |
+| KR<i>ratio</i> | User has a upload/download byte ratio >= _ratio_ |
+| PC<i>ratio</i> | User has a post/call ratio >= _ratio_ |
+| MM<i>minutes</i> | It is currently >= _minutes_ past midnight (system time)
 
 \* Many more ACS codes are planned for the near future.
 
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index b381ccef..4c9bc37b 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -1,10 +1,9 @@
 
 {
-	var client	= options.client;
-	var user	= options.client.user;
+	const client	= options.client;
+	const user		= options.client.user;
 
-	var _		= require('lodash');
-	var assert	= require('assert');
+	const moment	= require('moment');
 
 	function checkAccess(acsCode, value) {
 		try {
@@ -16,41 +15,85 @@
 					return !isNaN(value) && user.getAge() >= value;
 				},
 				AS	: function accountStatus() {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
 
 					const userAccountStatus = parseInt(user.properties.account_status, 10);
-					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-					return value.indexOf(userAccountStatus) > -1;
+					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
 				},
 				EC	: function isEncoding() {
+					const encoding = client.term.outputEncoding.toLowerCase();
 					switch(value) {
-						case 0	: return 'cp437' === client.term.outputEncoding.toLowerCase();
-						case 1	: return 'utf-8' === client.term.outputEncoding.toLowerCase();
+						case 0	: return 'cp437' === encoding;
+						case 1	: return 'utf-8' === encoding;
 						default	: return false;
 					}
 				},
 				GM	: function isOneOfGroups() {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						return false;
 					}
 
-					return _.findIndex(value, function cmp(groupName) {
-						return user.isGroupMember(groupName);
-					}) > - 1;
+					return value.some(groupName => user.isGroupMember(groupName));
 				},
 				NN	: function isNode() {
-					return client.node === value;
+					if(!Array.isArray(value)) {
+						value = [ value ];
+					}
+					return value.map(n => parseInt(n, 10)).includes(client.node);
 				},
 				NP	: function numberOfPosts() {
-					const postCount = parseInt(user.properties.post_count, 10);
+					const postCount = parseInt(user.properties.post_count, 10) || 0;
 					return !isNaN(value) && postCount >= value;
 				},
 				NC	: function numberOfCalls() {
 					const loginCount = parseInt(user.properties.login_count, 10);
 					return !isNaN(value) && loginCount >= value;
 				},
+				AA	: function accountAge() {
+					const accountCreated = moment(user.properties.account_created);
+					const now = moment();
+					const daysOld = accountCreated.diff(moment(), 'days');
+					return !isNaN(value) &&
+						accountCreated.isValid() && 
+						now.isAfter(accountCreated) && 
+						daysOld >= value;
+				},
+				BU	: function bytesUploaded() {
+					const bytesUp = parseInt(user.properties.ul_total_bytes, 10) || 0;
+					return !isNaN(value) && bytesUp >= value;
+				},
+				UP	: function uploads() {
+					const uls = parseInt(user.properties.ul_total_count, 10) || 0;
+					return !isNaN(value) && uls >= value;
+				},
+				BD	: function bytesDownloaded() {
+					const bytesDown = parseInt(user.properties.dl_total_bytes, 10) || 0;
+					return !isNaN(value) && bytesDown >= value;
+				},
+				DL	: function downloads() {
+					const dls = parseInt(user.properties.dl_total_count, 10) || 0;
+					return !isNaN(value) && dls >= value;
+				},
+				NR	: function uploadDownloadRatioGreaterThan() {
+					const ulCount = parseInt(user.properties.ul_total_count, 10) || 0;
+					const dlCount = parseInt(user.properties.dl_total_count, 10) || 0;
+					const ratio = ~~((ulCount / dlCount) * 100);
+					return !isNaN(value) && ratio >= value;
+				},
+				KR	: function uploadDownloadByteRatioGreaterThan() {
+					const ulBytes = parseInt(user.properties.ul_total_bytes, 10) || 0;
+					const dlBytes = parseInt(user.properties.dl_total_bytes, 10) || 0;
+					const ratio = ~~((ulBytes / dlBytes) * 100);
+					return !isNaN(value) && ratio >= value;
+				},
+				PC	: function postCallRatio() {					
+					const postCount		= parseInt(user.properties.post_count, 10) || 0;
+					const loginCount	= parseInt(user.properties.login_count, 10);
+					const ratio = ~~((postCount / loginCount) * 100);
+					return !isNaN(value) && ratio >= value;
+				},
 				SC 	: function isSecureConnection() {
 					return client.session.isSecure;
 				},
@@ -62,41 +105,41 @@
 					return !isNaN(value) && client.term.termHeight >= value;
 				},
 				TM	: function isOneOfThemes() {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						return false;
 					}
 
-					return value.indexOf(client.currentTheme.name) > -1;
+					return value.includes(client.currentTheme.name);
 				},
 				TT	: function isOneOfTermTypes() {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						return false;
 					}
 
-					return value.indexOf(client.term.termType) > -1;
+					return value.includes(client.term.termType);
 				},
 				TW	: function termWidth() {
 					return !isNaN(value) && client.term.termWidth >= value;
 				},
 				ID	: function isUserId(value) {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
 
-					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-					return value.indexOf(user.userId) > -1;
+					return value.map(n => parseInt(n, 10)).includes(user.userId);
 				},
 				WD	: function isOneOfDayOfWeek() {
-					if(!_.isArray(value)) {
+					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
 
-					value = value.map(n => parseInt(n, 10));	//	ensure we have integers
-					return value.indexOf(new Date().getDay()) > -1;
+					return value.map(n => parseInt(n, 10)).includes(new Date().getDay());
 				},
 				MM	: function isMinutesPastMidnight() {
-					//	:TODO: return true if value is >= minutes past midnight sys time
-					return false;
+					const now = moment();
+					const midnight = now.clone().startOf('day')
+					const minutesPastMidnight = now.diff(midnight, 'minutes');
+					return !isNaN(value) && minutesPastMidnight >= value;
 				}
 			}[acsCode](value);
 		} catch (e) {

From c26a8872e61f3beca512d102a6ea5fd0d0b37d4d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Feb 2018 10:54:04 -0700
Subject: [PATCH 0196/1013] Fix TIC node config lookup when wildcards are
 present

---
 core/tic_file_info.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/tic_file_info.js b/core/tic_file_info.js
index 27e31e4c..124bbca1 100644
--- a/core/tic_file_info.js
+++ b/core/tic_file_info.js
@@ -91,8 +91,13 @@ module.exports = class TicFileInfo {
 						return callback(Errors.Invalid(`No local area for "Area" of ${area}`));
 					}
 
-					const from = self.getAsString('From');
-					localInfo.node = Object.keys(config.nodes).find( nodeAddr => Address.fromString(nodeAddr).isPatternMatch(from) );
+					const from = Address.fromString(self.getAsString('From'));
+					if(!from.isValid()) {
+						return callback(Errors.Invalid(`Invalid "From" address: ${self.getAsString('From')}`));
+					}
+
+					//	note that our config may have wildcards, such as "80:774/*"
+					localInfo.node = Object.keys(config.nodes).find( nodeAddrWildcard => from.isPatternMatch(nodeAddrWildcard) );
 
 					if(!localInfo.node) {
 						return callback(Errors.Invalid('TIC is not from a known node'));

From b5ad6ef1eec2b6c379ed74fb397c49256a0dcc18 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 12 Feb 2018 21:17:55 +0000
Subject: [PATCH 0197/1013] Update MMENU.ANS to include rumours and private
 mail

---
 art/themes/luciano_blocktronics/MMENU.ANS | Bin 3429 -> 3492 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
index 995a5db59590a759b09502a341a97ae8ed2fb8f8..4a058fc910136e6839ec43a91e6b84fb2c5ac686 100644
GIT binary patch
delta 123
zcmaDVwM2Tu87`?*1?gx5Yh$zAf}+f_#FA8n+{DZr>1bo4+{w?l9x0nTOGg{#mcta4
zXXF<v<mcsN=A{DFnCB`0!Q|822Ncc0>WYA7<pR|LjVmh6%`d6~vCVTq0+V}rHZfW9
JPIlx~0RZeaCnW#?

delta 41
zcmV+^0M`Gc8|50X%nFmv3l{@2Z6K583gQDYGDDN=3%~+3GLy^<vI6=HlYk8*RoD--


From 5b698b34ef44f85564f54f830907b6cacd6cc078 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 12 Feb 2018 21:45:56 +0000
Subject: [PATCH 0198/1013] Remove unused view to clear warn from logs

---
 config/menu.hjson | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index cf2c71dd..0a57414c 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1914,9 +1914,6 @@
 							submit: true
 							argName: message
 						}
-						TL6: {
-							//	theme me!
-						}
 					}
 					submit: {
 						*: [

From 26e8e0f6d045168f6327c58846aec19086bcea26 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 12 Feb 2018 21:53:15 +0000
Subject: [PATCH 0199/1013] Fix message counter and message area display in
 message listings

---
 art/themes/luciano_blocktronics/MSGLIST.ANS   | Bin 2291 -> 2249 bytes
 art/themes/luciano_blocktronics/NEWMSGS.ANS   | Bin 2325 -> 2312 bytes
 .../luciano_blocktronics/PRVMSGLIST.ANS       | Bin 2291 -> 2249 bytes
 core/msg_list.js                              |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/art/themes/luciano_blocktronics/MSGLIST.ANS b/art/themes/luciano_blocktronics/MSGLIST.ANS
index 911f1f2030dd91fe3cdf1e638635457a2565362e..e1e0ddf86c304f43a5d013de1c28e9a6b0bbad54 100644
GIT binary patch
delta 316
zcmew?cv5h}Ty9@S1?gymT<K^N(}`=PS&gKl&7C*i(qpU#3YnQYOGg`88yn=_zRjg@
z{|;28xiN~c0#;!K3We))@81F1iD?R08157km{aa^DcpvO!W{@w401aN-?<HQC|naz
g_Rf7QqQDTDtjH|NYmOWUn;n>YSs4>2pW{#k0Jr*IssI20

delta 370
zcmX>p_*rnmT-y*IBk5>EBWLMogIwuoV`Cu0*eF*aw>TXrY;A0iYo!1dQ4R4i0kI5n
z^&u*N0;U^J=rPuV6iG*$nF4hh=H9-|rEvcaP@w@t*c@aaR9FG4umXj`^||-&0PVyy
z1uTs26l3#Tpew*0yU(R?8(rEEY#7KBAbjUGnv0Qi1MR$XA0*9><WZ3P<QGheT!;|a
PEXLf+%Gf=535O~GJGpGE

diff --git a/art/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS
index 5a58161e82e783ba4de9bd4b97c1b8e9ebaa5c02..78f129c5669f92b50e8b4ddfce2ce482bae0fb5f 100644
GIT binary patch
delta 29
lcmbO#)FCusF0-$r!o&s2tVYt&=FS_hN^vkQnEZi56#$K@36uZ;

delta 42
xcmeAWnkqD5E^~;F(ZmJHLM95*(Z&Y3`asesS3xzz$8_TfDGtW9lOJ=a0ss!X48Z^Z

diff --git a/art/themes/luciano_blocktronics/PRVMSGLIST.ANS b/art/themes/luciano_blocktronics/PRVMSGLIST.ANS
index 911f1f2030dd91fe3cdf1e638635457a2565362e..e1e0ddf86c304f43a5d013de1c28e9a6b0bbad54 100644
GIT binary patch
delta 316
zcmew?cv5h}Ty9@S1?gymT<K^N(}`=PS&gKl&7C*i(qpU#3YnQYOGg`88yn=_zRjg@
z{|;28xiN~c0#;!K3We))@81F1iD?R08157km{aa^DcpvO!W{@w401aN-?<HQC|naz
g_Rf7QqQDTDtjH|NYmOWUn;n>YSs4>2pW{#k0Jr*IssI20

delta 370
zcmX>p_*rnmT-y*IBk5>EBWLMogIwuoV`Cu0*eF*aw>TXrY;A0iYo!1dQ4R4i0kI5n
z^&u*N0;U^J=rPuV6iG*$nF4hh=H9-|rEvcaP@w@t*c@aaR9FG4umXj`^||-&0PVyy
z1uTs26l3#Tpew*0yU(R?8(rEEY#7KBAbjUGnv0Qi1MR$XA0*9><WZ3P<QGheT!;|a
PEXLf+%Gf=535O~GJGpGE

diff --git a/core/msg_list.js b/core/msg_list.js
index 90c5095a..701542d6 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -37,7 +37,7 @@ exports.moduleInfo = {
 
 const MciViewIds = {
 	msgList			: 1,	//	VM1
-	MsgInfo1		: 2,	//	TL2
+	msgInfo1		: 2,	//	TL2
 };
 
 exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(MenuModule) {

From 2509a2b64b9feae82c6a66b543a955bcabbcbd95 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 12 Feb 2018 21:56:36 +0000
Subject: [PATCH 0200/1013] Correctly theme private message list

---
 art/themes/luciano_blocktronics/theme.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 9cdf3838..3b6e91aa 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -262,13 +262,13 @@
 
 			mailMenuInbox: {
 				config: {
-					listFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |01|31{newIndicator}"
-					focusListFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
 					dateTimeFormat: ddd MMM Do
 				}
 				mci: {
 					VM1: {
 						height: 14
+						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
+						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
 					}
 				}
 			}

From 9ad38f84a7775e011e440ae09cc11c206de2c217 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 16 Feb 2018 23:00:15 -0700
Subject: [PATCH 0201/1013] Add --quick option to fb scan ...

---
 core/file_entry.js              |  13 +++
 core/oputil/oputil_file_base.js | 144 +++++++++++++++++++++++++++-----
 2 files changed, 134 insertions(+), 23 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 8738fcbd..467e0d3a 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -221,6 +221,19 @@ module.exports = class FileEntry {
 		return paths.join(storageDir, this.fileName);
 	}
 
+	static quickCheckExistsByPath(fullPath, cb) {
+		fileDb.get(
+			`SELECT COUNT() AS count
+			FROM file
+			WHERE file_name = ?
+			LIMIT 1;`,
+			[ paths.basename(fullPath) ],
+			(err, rows) => {
+				return err ? cb(err) : cb(null, rows.count > 0 ? true : false);
+			}
+		);
+	}
+
 	static persistUserRating(fileId, userId, rating, cb) {
 		return fileDb.run(
 			`REPLACE INTO file_user_rating (file_id, user_id, rating)
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index d6a18026..b1d1d97b 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -24,7 +24,7 @@ exports.handleFileBaseCommand			= handleFileBaseCommand;
 
 	Global options:
 		--yes: assume yes
-		--no-prompt: try to avoid user input 
+		--no-prompt: try to avoid user input
 
 	Prompt for import and description before scan
 		* Only after finding duplicate-by-path
@@ -59,7 +59,7 @@ function finalizeEntryAndPersist(isUpdate, fileEntry, descHandler, cb) {
 
 				const getDescFromFileName	= require('../../core/file_base_area.js').getDescFromFileName;
 				const descFromFile			= getDescFromFileName(fileEntry.fileName);
-				
+
 				if(false === argv.prompt) {
 					fileEntry.desc = descFromFile;
 					return callback(null);
@@ -116,7 +116,9 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 			fe.hashTags = new Set(options.tags);
 		}
 	}
-	
+
+	const FileEntry = require('../file_entry.js');
+
 	async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
 		async.waterfall(
 			[
@@ -157,6 +159,100 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 
 								process.stdout.write(`Scanning ${fullPath}... `);
 
+								async.series(
+									[
+										function quickCheck(next) {
+											if(!options.quick) {
+												return next(null);
+											}
+
+											FileEntry.quickCheckExistsByPath(fullPath, (err, exists) => {
+												if(exists) {
+													console.info('Dupe');
+													return nextFile(null);
+												}
+
+												return next(null);
+											});
+										},
+										function fullScan() {
+											fileArea.scanFile(
+												fullPath,
+												{
+													areaTag		: areaInfo.areaTag,
+													storageTag	: storageLoc.storageTag
+												},
+												(err, fileEntry, dupeEntries) => {
+													if(err) {
+														console.info(`Error: ${err.message}`);
+														return nextFile(null);	//	try next anyway
+													}
+
+													//
+													//	We'll update the entry if the following conditions are met:
+													//	* We have a single duplicate, and:
+													//	* --update was passed or the existing entry's desc,
+													//	  longDesc, or est_release_year meta are blank/empty
+													//
+													if(argv.update && 1 === dupeEntries.length) {
+														const FileEntry		= require('../../core/file_entry.js');
+														const existingEntry	= new FileEntry();
+
+														return existingEntry.load(dupeEntries[0].fileId, err => {
+															if(err) {
+																console.info('Dupe (cannot update)');
+																return nextFile(null);
+															}
+
+															//
+															//	Update only if tags or desc changed
+															//
+															const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
+															const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
+
+															if( tagsEq &&
+																fileEntry.desc === existingEntry.desc &&
+																fileEntry.descLong == existingEntry.descLong &&
+																fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
+															{
+																console.info('Dupe');
+																return nextFile(null);
+															}
+
+															console.info('Dupe (updating)');
+
+															//	don't allow overwrite of values if new version is blank
+															existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
+															existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
+
+															if(fileEntry.meta.est_release_year) {
+																existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
+															}
+
+															updateTags(existingEntry);
+
+															finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
+																return nextFile(err);
+															});
+														});
+													} else if(dupeEntries.length > 0) {
+														console.info('Dupe');
+														return nextFile(null);
+													}
+
+													console.info('Done!');
+													updateTags(fileEntry);
+
+													finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
+														return nextFile(err);
+													});
+												}
+											);
+										}
+									]
+								);
+
+								/*
 								fileArea.scanFile(
 									fullPath,
 									{
@@ -165,7 +261,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 									},
 									(err, fileEntry, dupeEntries) => {
 										if(err) {
-											console.info(`Error: ${err.message}`);											
+											console.info(`Error: ${err.message}`);
 											return nextFile(null);	//	try next anyway
 										}
 
@@ -191,8 +287,8 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 												const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
 												const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
 
-												if( tagsEq && 
-													fileEntry.desc === existingEntry.desc && 
+												if( tagsEq &&
+													fileEntry.desc === existingEntry.desc &&
 													fileEntry.descLong == existingEntry.descLong &&
 													fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
 												{
@@ -220,15 +316,16 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 											console.info('Dupe');
 											return nextFile(null);
 										}
-										
+
 										console.info('Done!');
 										updateTags(fileEntry);
-										
+
 										finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
 											return nextFile(err);
 										});
 									}
 								);
+								*/
 							});
 						}, err => {
 							return callback(err);
@@ -239,12 +336,12 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 					//	:TODO: Look @ db entries for area that were *not* processed above
 					return callback(null);
 				}
-			], 
+			],
 			err => {
 				return nextLocation(err);
 			}
 		);
-	}, 
+	},
 	err => {
 		return cb(err);
 	});
@@ -259,7 +356,7 @@ function dumpAreaInfo(areaInfo, areaAndStorageInfo, cb) {
 		console.info(`storageTag: ${si.storageTag} => ${si.dir}`);
 	});
 	console.info('');
-	
+
 	return cb(null);
 }
 
@@ -325,7 +422,7 @@ function dumpFileInfo(shaOrFileId, cb) {
 				console.info(`path: ${fullPath}`);
 				console.info(`hashTags: ${Array.from(fileEntry.hashTags).join(', ')}`);
 				console.info(`uploaded: ${moment(fileEntry.uploadTimestamp).format()}`);
-				
+
 				_.each(fileEntry.meta, (metaValue, metaName) => {
 					console.info(`${metaName}: ${metaValue}`);
 				});
@@ -354,7 +451,7 @@ function displayFileAreaInfo() {
 		[
 			function init(callback) {
 				return initConfigAndDatabases(callback);
-			},	
+			},
 			function dumpInfo(callback) {
 				const Config = require('../../core/config.js').config;
 				let suppliedAreas = argv._.slice(2);
@@ -396,8 +493,9 @@ function scanFileAreas() {
 		options.tags = tags.split(',');
 	}
 
-	options.descFile = argv['desc-file'];	//	--desc-file or --desc-file PATH
-	
+	options.descFile 	= argv['desc-file'];	//	--desc-file or --desc-file PATH
+	options.quick 		= argv.quick;
+
 	options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
 
 	async.series(
@@ -405,10 +503,10 @@ function scanFileAreas() {
 			function init(callback) {
 				return initConfigAndDatabases(callback);
 			},
-			function initGlobalDescHandler(callback) {		
+			function initGlobalDescHandler(callback) {
 				//
 				//	If options.descFile is a String, it represents a FILE|PATH. We'll init
-				//	the description handler now. Else, we'll attempt to look for a description 
+				//	the description handler now. Else, we'll attempt to look for a description
 				//	file in each storage location.
 				//
 				if(!_.isString(options.descFile)) {
@@ -546,14 +644,14 @@ function moveFiles() {
 				});
 			},
 			function moveEntries(srcEntries, callback) {
-				
+
 				if(!dst.storageTag) {
 					dst.storageTag = dst.areaInfo.storageTags[0];
 				}
-				
+
 				const destDir = FileEntry.getAreaStorageDirectoryByTag(dst.storageTag);
-				
-				async.eachSeries(srcEntries, (entry, nextEntry) => {			
+
+				async.eachSeries(srcEntries, (entry, nextEntry) => {
 					const srcPath 	= entry.filePath;
 					const dstPath	= paths.join(destDir, entry.fileName);
 
@@ -566,7 +664,7 @@ function moveFiles() {
 							console.info('Done');
 						}
 						return nextEntry(null);	//	always try next
-					});					
+					});
 				},
 				err => {
 					return callback(err);
@@ -652,7 +750,7 @@ function handleFileBaseCommand() {
 
 	function errUsage()  {
 		return printUsageAndSetExitCode(
-			getHelpFor('FileBase') + getHelpFor('FileOpsInfo'), 
+			getHelpFor('FileBase') + getHelpFor('FileOpsInfo'),
 			ExitCodes.ERROR
 		);
 	}

From 82314cead0d8078a19e408ac57df3c2b0be700b5 Mon Sep 17 00:00:00 2001
From: haliphax <haliphax@users.noreply.github.com>
Date: Thu, 22 Feb 2018 11:35:18 -0600
Subject: [PATCH 0202/1013] docs/mci.md => docs/art/mci.md in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c1870ce..db69a1bb 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Multi platform: Anywhere [Node.js](https://nodejs.org/) runs likely works (known to work under Linux, FreeBSD, OpenBSD, OS X and Windows)
  * Unlimited multi node support (for all those BBS "callers"!)
  * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based [mods](docs/mods.md)
- * [MCI support](docs/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
+ * [MCI support](docs/art/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
  * [SyncTerm](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior

From 95f4cd3fe25387c354fcfeeec1df49a0a21ca9ed Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:16:01 -0700
Subject: [PATCH 0203/1013] Fix emit args

---
 core/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/events.js b/core/events.js
index 5febb463..1838e087 100644
--- a/core/events.js
+++ b/core/events.js
@@ -22,7 +22,7 @@ module.exports = new class Events extends events.EventEmitter {
 
 	emit(event, ...args) {
 		Log.trace( { event : event }, 'Emitting event');
-		return super.emit(event, args);
+		return super.emit(event, ...args);
 	}
 
 	on(event, listener) {

From c3b62ac6086882b198055871b38e05b6ff485680 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:16:21 -0700
Subject: [PATCH 0204/1013] Some default long formats for theme helpers

---
 core/config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/config.js b/core/config.js
index 79824db5..6fcadd5b 100644
--- a/core/config.js
+++ b/core/config.js
@@ -173,12 +173,14 @@ function getDefaultConfig() {
 			passwordChar	: '*',		//	TODO: move to user ?
 			dateFormat	: {
 				short	: 'MM/DD/YYYY',
+				long	: 'ddd, MMMM Do, YYYY',
 			},
 			timeFormat : {
 				short	: 'h:mm a',
 			},
 			dateTimeFormat : {
 				short	: 'MM/DD/YYYY h:mm a',
+				long	: 'ddd, MMMM Do, YYYY, h:mm a',
 			}
 		},
 

From bb605d8781d416dd19b95beb466983e3c9029138 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:40:28 -0700
Subject: [PATCH 0205/1013] * Add new well known meta for temp session d/ls *
 Better meta assign in ctor

---
 core/file_entry.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 467e0d3a..2ec03c17 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -38,6 +38,7 @@ const FILE_WELL_KNOWN_META = {
 	tic_origin			: null,	//	TIC "Origin"
 	tic_desc			: null,	//	TIC "Desc"
 	tic_ldesc			: null,	//	TIC "Ldesc" joined by '\n'
+	session_temp_dl		: (v) => parseInt(v) ? true : false,
 };
 
 module.exports = class FileEntry {
@@ -46,11 +47,7 @@ module.exports = class FileEntry {
 
 		this.fileId		= options.fileId || 0;
 		this.areaTag	= options.areaTag || '';
-		this.meta		= options.meta || {
-			//	values we always want
-			dl_count	: 0,
-		};
-
+		this.meta		= Object.assign( { dl_count : 0 }, options.meta);
 		this.hashTags	= options.hashTags || new Set();
 		this.fileName	= options.fileName;
 		this.storageTag	= options.storageTag;

From 4ccb059d614ef5b4f13f28b87f7fd47a1108ca6d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:41:17 -0700
Subject: [PATCH 0206/1013] Add --quick to help

---
 core/oputil/oputil_help.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index b4c48267..baa0138c 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -67,7 +67,8 @@ scan args:
                                other sources such as FILE_ID.DIZ.
                                if PATH is specified, use DESCRIPT.ION at PATH instead
                                of looking in specific storage locations
-  --update                     attempt to update information for existing entries                               
+  --update                     attempt to update information for existing entries
+  --quick                      perform quick scan
 
 info args:
   --show-desc                  display short description, if any

From d3d8268df8e9875c8121a9e4495e4f2f4a091a42 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:46:41 -0700
Subject: [PATCH 0207/1013] + New file base list export functionality (early
 beta!) * File base area startup() and cleanup * Better prepViewController()
 signature

---
 core/bbs.js                   |   3 +
 core/file_base_area_select.js |   2 +-
 core/file_base_list_export.js | 343 ++++++++++++++++++++++++++++++++++
 core/menu_module.js           |   6 +-
 core/message_base_search.js   |   2 +-
 5 files changed, 351 insertions(+), 5 deletions(-)
 create mode 100644 core/file_base_list_export.js

diff --git a/core/bbs.js b/core/bbs.js
index c2f54802..33301f70 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -259,6 +259,9 @@ function initialize(cb) {
 			function listenConnections(callback) {
 				return require('./listening_server.js').startup(callback);
 			},
+			function readyFileBaseArea(callback) {
+				return require('./file_base_area.js').startup(callback);
+			},
 			function readyFileAreaWeb(callback) {
 				return require('./file_area_web.js').startup(callback);
 			},
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index f762ab1d..df859bea 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -65,7 +65,7 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 						return callback(null, availAreas);
 					},
 					function prepView(availAreas, callback) {
-						self.prepViewController('allViews', 0, { mciMap : mciData.menu }, (err, vc) => {
+						self.prepViewController('allViews', 0, mciData.menu, (err, vc) => {
 							if(err) {
 								return callback(err);
 							}
diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
new file mode 100644
index 00000000..f3f185cd
--- /dev/null
+++ b/core/file_base_list_export.js
@@ -0,0 +1,343 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const { MenuModule }	= require('./menu_module.js');
+const stringFormat		= require('./string_format.js');
+const FileEntry			= require('./file_entry.js');
+const FileArea			= require('./file_base_area.js');
+const Config			= require('./config.js').config;
+const { Errors }		= require('./enig_error.js');
+const {
+	splitTextAtTerms,
+	isAnsi
+}						= require('./string_util.js');
+const AnsiPrep			= require('./ansi_prep.js');
+const Events			= require('./events.js');
+const Log				= require('./logger.js').log;
+const DownloadQueue		= require('./download_queue.js');
+
+//	deps
+const _					= require('lodash');
+const async				= require('async');
+const fs				= require('graceful-fs');
+const fse				= require('fs-extra');
+const paths				= require('path');
+const iconv				= require('iconv-lite');
+const moment			= require('moment');
+const uuidv4			= require('uuid/v4');
+
+/*
+	:TODO: document:
+	- config options
+		- header template
+		- entry template
+	- header format
+	- entry format
+*/
+
+//	:TODO: compress lists > N
+
+exports.moduleInfo = {
+	name	: 'File Base List Export',
+	desc	: 'Exports file base listings for download',
+	author	: 'NuSkooler',
+};
+
+const FormIds = {
+	main	: 0,
+};
+
+const MciViewIds = {
+	main : {
+		status				: 1,
+		progressBar			: 2,
+
+		customRangeStart	: 10,
+	}
+};
+
+const TEMPLATE_KEYS = [	//	config.templates.*
+	'header', 'entry',
+];
+
+exports.getModule = class FileBaseListExport extends MenuModule {
+
+	constructor(options) {
+		super(options);
+		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+
+		this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
+		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
+		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
+		this.config.progBarChar			= (this.config.progBarChar || 'â–’').charAt(0);
+	}
+
+	mciReady(mciData, cb) {
+		super.mciReady(mciData, err => {
+			if(err) {
+				return cb(err);
+			}
+
+			async.series(
+				[
+					(callback) => this.prepViewController('main', FormIds.main, mciData.menu, callback),
+					(callback) => this.prepareList(callback),
+				],
+				err => {
+					return cb(err);
+				}
+			);
+		});
+	}
+
+	finishedLoading() {
+		this.prevMenu();
+	}
+
+	prepareList(cb) {
+		const self = this;
+
+		const statusView = self.viewControllers.main.getView(MciViewIds.main.status);
+		const updateStatus = (status) => {
+			if(statusView) {
+				statusView.setText(status);
+			}
+		};
+
+		const progBarView = self.viewControllers.main.getView(MciViewIds.main.progressBar);
+		const updateProgressBar = (curr, total) => {
+			if(progBarView) {
+				const prog = Math.floor( (curr / total) * progBarView.dimens.width );
+				progBarView.setText(self.config.progBarChar.repeat(prog));
+			}
+		};
+
+		async.waterfall(
+			[
+				function readTemplateFiles(callback) {
+					updateStatus('Preparing');
+
+					async.map(TEMPLATE_KEYS, (templateKey, nextKey) => {
+						let templatePath = _.get(self.config, [ 'templates', templateKey ]);
+						templatePath = templatePath || `file_list_${templateKey}.asc`;
+						templatePath = paths.isAbsolute(templatePath) ? templatePath : paths.join(Config.paths.misc, templatePath);
+
+						fs.readFile(templatePath, (err, data) => {
+							return nextKey(err, data);
+						});
+					}, (err, templates) => {
+						if(err) {
+							return Errors.General(err.message);
+						}
+
+						//	decode + ensure DOS style CRLF
+						templates = templates.map(tmp => iconv.decode(tmp, self.config.templateEncoding).replace(/\r?\n/g, '\r\n') );
+
+						//	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
+						let descIndent = 0;
+						splitTextAtTerms(templates[1]).some(line => {
+							const pos = line.indexOf('{fileDesc}');
+							if(pos > -1) {
+								descIndent = pos;
+								return true;	//	found it!
+							}
+							return false;	//	keep looking
+						});
+
+						return callback(null, templates[0], templates[1], descIndent);
+					});
+				},
+				function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
+					const filterCriteria = Object.assign({}, self.config.filterCriteria);
+					if(!filterCriteria.areaTag) {
+						filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);
+					}
+
+					updateStatus('Gathering files for supplied criteria');
+
+					FileEntry.findFiles(filterCriteria, (err, fileIds) => {
+						//	:TODO: handle empty file IDs -- bail early.
+						return callback(err, headerTemplate, entryTemplate, descIndent, fileIds);
+					});
+				},
+				function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
+					const formatObj = {
+						totalFileCount	: fileIds.length,
+					};
+
+					const fileInfo = new FileEntry();
+					let current = 0;
+					let listBody = '';
+					const totals = { fileCount : fileIds.length, bytes : 0 };
+
+					async.eachSeries(fileIds, (fileId, nextFileId) => {
+						current += 1;
+
+						fileInfo.load(fileId, err => {
+							if(err) {
+								return nextFileId(null);	//	failed, but try the next
+							}
+
+							updateStatus(`Processing ${fileInfo.fileName}`);
+
+							totals.bytes += fileInfo.meta.byte_size;
+
+							updateProgressBar(current, fileIds.length);
+
+							const appendFileInfo = () => {
+								listBody += stringFormat(entryTemplate, formatObj);
+
+								self.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, formatObj);
+
+								return nextFileId(null);
+							};
+
+							const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
+
+							formatObj.fileId		= fileId;
+							formatObj.areaName		= _.get(area, 'name') || 'N/A';
+							formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
+							formatObj.userRating	= fileInfo.userRating || 0;
+							formatObj.fileName		= fileInfo.fileName;
+							formatObj.fileSize		= fileInfo.meta.byte_size;
+							formatObj.fileDesc		= fileInfo.desc || '';
+							formatObj.fileDescShort	= formatObj.fileDesc.slice(0, self.config.descWidth);
+							formatObj.fileSha256	= fileInfo.fileSha256;
+							formatObj.fileCrc32		= fileInfo.meta.file_crc32;
+							formatObj.fileMd5		= fileInfo.meta.file_md5;
+							formatObj.fileSha1		= fileInfo.meta.file_sha1;
+							formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
+							formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(self.config.tsFormat);
+							formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
+							formatObj.currentFile	= current;
+							formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
+
+							if(isAnsi(fileInfo.desc)) {
+								AnsiPrep(
+									fileInfo.desc,
+									{
+										cols			: Math.min(self.config.descWidth, 79 - descIndent),
+										forceLineTerm	: true,				//	ensure each line is term'd
+										asciiMode		: true,				//	export to ASCII
+										fillLines		: false,			//	don't fill up to |cols|
+										indent			: descIndent,
+									},
+									(err, desc) => {
+										if(desc) {
+											formatObj.fileDesc = desc;
+										}
+										return appendFileInfo();
+									}
+								);
+							} else {
+								const indentSpc = descIndent > 0 ? ' '.repeat(descIndent) : '';
+								formatObj.fileDesc = splitTextAtTerms(formatObj.fileDesc).join(`\r\n${indentSpc}`) + '\r\n';
+								return appendFileInfo();
+							}
+						});
+					}, err => {
+						return callback(err, listBody, headerTemplate, totals);
+					});
+				},
+				function buildHeader(listBody, headerTemplate, totals, callback) {
+					//	header is built last such that we can have totals/etc.
+
+					let filterAreaName;
+					let filterAreaDesc;
+					if(self.config.filterCriteria.areaTag) {
+						const area 		= FileArea.getFileAreaByTag(self.config.filterCriteria.areaTag);
+						filterAreaName	= _.get(area, 'name') || 'N/A';
+						filterAreaDesc	= _.get(area, 'desc') || 'N/A';
+					} else {
+						filterAreaName	= '-ALL-';
+						filterAreaDesc	= 'All areas';
+					}
+
+					const headerFormatObj = {
+						nowTs			: moment().format(self.config.tsFormat),
+						boardName		: Config.general.boardName,
+						totalFileCount	: totals.fileCount,
+						totalFileSize	: totals.bytes,
+						filterAreaTag	: self.config.filterCriteria.areaTag || '-ALL-',
+						filterAreaName	: filterAreaName,
+						filterAreaDesc	: filterAreaDesc,
+						filterTerms		: self.config.filterCriteria.terms || '(none)',
+						filterHashTags	: self.config.filterCriteria.tags || '(none)',
+					};
+
+					listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
+					return callback(null, listBody);
+				},
+				function persistList(listBody, callback) {
+
+					updateStatus('Persisting list');
+
+					const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
+					const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
+
+					fse.mkdirs(sysTempDownloadDir, err => {
+						if(err) {
+							return callback(err);
+						}
+
+						const outputFileName = paths.join(
+							sysTempDownloadDir,
+							`file_list_${uuidv4()}.txt`
+						);
+
+						fs.writeFile(outputFileName, listBody, 'utf8', err => {
+							return callback(err, outputFileName, sysTempDownloadArea);
+						});
+					});
+				},
+				function persistFileEntry(outputFileName, sysTempDownloadArea, callback) {
+					fse.stat(outputFileName, (err, stats) => {
+						const newEntry = new FileEntry({
+							areaTag		: sysTempDownloadArea.areaTag,
+							fileName	: paths.basename(outputFileName),
+							storageTag	: sysTempDownloadArea.storageTags[0],
+							meta		: {
+								upload_by_username	: self.client.user.username,
+								upload_by_user_id	: self.client.user.userId,
+								byte_size			: stats.size,
+								session_temp_dl		: 1,	//	download is valid until session is over
+							}
+						});
+
+						newEntry.desc = 'File List Export';
+
+						newEntry.persist(err => {
+							if(!err) {
+								//	queue it!
+								const dlQueue = new DownloadQueue(self.client);
+								dlQueue.add(newEntry);
+
+								//	clean up after ourselves when the session ends
+								const thisClientId = self.client.session.id;
+								Events.once('codes.l33t.enigma.system.disconnected', evt => {	//	:TODO: Make a enum for system events/etc.
+									if(thisClientId === _.get(evt, 'client.session.id')) {
+										FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
+											if(err) {
+												Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+											} else {
+												Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+											}
+										});
+									}
+								});
+							}
+							return callback(err);
+						});
+					});
+				},
+				function done(callback) {
+					updateStatus('Exported list has been added to your download queue');
+					return callback(null);
+				}
+			], err => {
+				return cb(err);
+			}
+		);
+	}
+};
\ No newline at end of file
diff --git a/core/menu_module.js b/core/menu_module.js
index a6fb3b4d..97536bc7 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -311,7 +311,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 		);
 	}
 
-	prepViewController(name, formId, artData, cb) {
+	prepViewController(name, formId, mciMap, cb) {
 		if(_.isUndefined(this.viewControllers[name])) {
 			const vcOpts = {
 				client		: this.client,
@@ -322,7 +322,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
 			const loadOpts = {
 				callingMenu		: this,
-				mciMap			: artData.mciMap,
+				mciMap			: mciMap,
 				formId			: formId,
 			};
 
@@ -345,7 +345,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 					return cb(err);
 				}
 
-				return this.prepViewController(name, formId, artData, cb);
+				return this.prepViewController(name, formId, artData.mciMap, cb);
 			}
 		);
 	}
diff --git a/core/message_base_search.js b/core/message_base_search.js
index b0259490..fdb17859 100644
--- a/core/message_base_search.js
+++ b/core/message_base_search.js
@@ -49,7 +49,7 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
 				return cb(err);
 			}
 
-			this.prepViewController('search', 0, { mciMap : mciData.menu }, (err, vc) => {
+			this.prepViewController('search', 0, mciData.menu, (err, vc) => {
 				if(err) {
 					return cb(err);
 				}

From d260011ce8a4f5e1fa293a736cb418890a93eed8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 3 Mar 2018 21:47:04 -0700
Subject: [PATCH 0208/1013] + New file base list export functionality (early
 beta!) * File base area startup() and cleanup * Better prepViewController()
 signature

---
 core/file_base_area.js | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 6c7318d6..5f3b974a 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -26,6 +26,7 @@ const iconv			= require('iconv-lite');
 const execFile		= require('child_process').execFile;
 const moment		= require('moment');
 
+exports.startup							= startup;
 exports.isInternalArea					= isInternalArea;
 exports.getAvailableFileAreas			= getAvailableFileAreas;
 exports.getAvailableFileAreaTags		= getAvailableFileAreaTags;
@@ -42,6 +43,7 @@ exports.scanFile						= scanFile;
 exports.scanFileAreaForChanges			= scanFileAreaForChanges;
 exports.getDescFromFileName				= getDescFromFileName;
 exports.getAreaStats					= getAreaStats;
+exports.cleanUpTempSessionItems			= cleanUpTempSessionItems;
 
 //	for scheduler:
 exports.updateAreaStatsScheduledEvent	= updateAreaStatsScheduledEvent;
@@ -52,6 +54,10 @@ const WellKnownAreaTags					= exports.WellKnownAreaTags = {
 	TempDownloads		: 'system_temporary_download',
 };
 
+function startup(cb) {
+	return cleanUpTempSessionItems(cb);
+}
+
 function isInternalArea(areaTag) {
 	return [ WellKnownAreaTags.MessageAreaAttach, WellKnownAreaTags.TempDownloads ].includes(areaTag);
 }
@@ -935,4 +941,42 @@ function updateAreaStatsScheduledEvent(args, cb) {
 
 		return cb(err);
 	});
+}
+
+function cleanUpTempSessionItems(cb) {
+	//	find (old) temporary session items and nuke 'em
+	const filter = {
+		areaTag 	: WellKnownAreaTags.TempDownloads,
+		metaPairs	: [
+			{
+				name	: 'session_temp_dl',
+				value	: 1
+			}
+		]
+	};
+
+	FileEntry.findFiles(filter, (err, fileIds) => {
+		if(err) {
+			return cb(err);
+		}
+
+		async.each(fileIds, (fileId, nextFileId) => {
+			const fileEntry = new FileEntry();
+			fileEntry.load(fileId, err => {
+				if(err) {
+					Log.warn( { fileId }, 'Failed loading temporary session download item for cleanup');
+					return nextFileId(null);
+				}
+
+				FileEntry.removeEntry(fileEntry, { removePhysFile : true }, err => {
+					if(err) {
+						Log.warn( { fileId : fileEntry.fileId, filePath : fileEntry.filePath }, 'Failed to clean up temporary session download item');
+					}
+					return nextFileId(null);
+				});
+			});
+		}, () => {
+			return cb(null);
+		});
+	});
 }
\ No newline at end of file

From 44a4a4aeb45a4b8a9b285d418f3191b77dd69e23 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 09:17:27 -0700
Subject: [PATCH 0209/1013] Updates to idle monitor inc. ability to disable

---
 core/client.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/client.js b/core/client.js
index 58700c8f..24c8b1d1 100644
--- a/core/client.js
+++ b/core/client.js
@@ -414,26 +414,28 @@ Client.prototype.setTermType = function(termType) {
 };
 
 Client.prototype.startIdleMonitor = function() {
-	var self = this;
-
-	self.lastKeyPressMs		= Date.now();
+	this.lastKeyPressMs = Date.now();
 
 	//
 	//	Every 1m, check for idle.
 	//
-	self.idleCheck = setInterval(function checkForIdle() {
+	this.idleCheck = setInterval( () => {
 		const nowMs	= Date.now();
 
-		const idleLogoutSeconds = self.user.isAuthenticated() ?
+		const idleLogoutSeconds = this.user.isAuthenticated() ?
 			Config.misc.idleLogoutSeconds :
 			Config.misc.preAuthIdleLogoutSeconds;
 
-		if(nowMs - self.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
-			self.emit('idle timeout');
+		if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
+			this.emit('idle timeout');
 		}
 	}, 1000 * 60);
 };
 
+Client.prototype.stopIdleMonitor = function() {
+	clearInterval(this.idleCheck);
+};
+
 Client.prototype.end = function () {
 	if(this.term) {
 		this.term.disconnect();
@@ -445,7 +447,7 @@ Client.prototype.end = function () {
 		currentModule.leave();
 	}
 
-	clearInterval(this.idleCheck);
+	this.stopIdleMonitor();
 
 	try {
 		//

From 74b9d587c9cb3e25349510001e9ee0d2d6a4ecd9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 09:17:49 -0700
Subject: [PATCH 0210/1013] + Add compression for larger exports * Temp disable
 of idle monitor while building large lists * Fix hash tags * Handle no
 results & other errors

---
 core/file_base_list_export.js | 135 ++++++++++++++++++++++++----------
 1 file changed, 96 insertions(+), 39 deletions(-)

diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index f3f185cd..f1f87aab 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -26,6 +26,7 @@ const paths				= require('path');
 const iconv				= require('iconv-lite');
 const moment			= require('moment');
 const uuidv4			= require('uuid/v4');
+const yazl				= require('yazl');
 
 /*
 	:TODO: document:
@@ -71,6 +72,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
 		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
 		this.config.progBarChar			= (this.config.progBarChar || 'â–’').charAt(0);
+		this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
 	}
 
 	mciReady(mciData, cb) {
@@ -85,6 +87,13 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 					(callback) => this.prepareList(callback),
 				],
 				err => {
+					if(err) {
+						if('NORESULTS' === err.reasonCode) {
+							return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'fileBaseExportListNoResults');
+						}
+
+						return this.prevMenu();
+					}
 					return cb(err);
 				}
 			);
@@ -157,7 +166,10 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 					updateStatus('Gathering files for supplied criteria');
 
 					FileEntry.findFiles(filterCriteria, (err, fileIds) => {
-						//	:TODO: handle empty file IDs -- bail early.
+						if(0 === fileIds.length) {
+							return callback(Errors.General('No results for criteria', 'NORESULTS'));
+						}
+
 						return callback(err, headerTemplate, entryTemplate, descIndent, fileIds);
 					});
 				},
@@ -166,12 +178,15 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 						totalFileCount	: fileIds.length,
 					};
 
-					const fileInfo = new FileEntry();
 					let current = 0;
 					let listBody = '';
 					const totals = { fileCount : fileIds.length, bytes : 0 };
 
+					//	this may take quite a while; temp disable of idle monitor
+					self.client.stopIdleMonitor();
+
 					async.eachSeries(fileIds, (fileId, nextFileId) => {
+						const fileInfo = new FileEntry();
 						current += 1;
 
 						fileInfo.load(fileId, err => {
@@ -237,6 +252,9 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 							}
 						});
 					}, err => {
+						//	re-enable idle monitor
+						self.client.startIdleMonitor();
+
 						return callback(err, listBody, headerTemplate, totals);
 					});
 				},
@@ -283,52 +301,56 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
 						const outputFileName = paths.join(
 							sysTempDownloadDir,
-							`file_list_${uuidv4()}.txt`
+							`file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
 						);
 
 						fs.writeFile(outputFileName, listBody, 'utf8', err => {
-							return callback(err, outputFileName, sysTempDownloadArea);
+							if(err) {
+								return callback(err);
+							}
+
+							self.getSizeAndCompressIfMeetsSizeThreshold(outputFileName, (err, finalOutputFileName, fileSize) => {
+								return callback(err, finalOutputFileName, fileSize, sysTempDownloadArea);
+							});
 						});
 					});
 				},
-				function persistFileEntry(outputFileName, sysTempDownloadArea, callback) {
-					fse.stat(outputFileName, (err, stats) => {
-						const newEntry = new FileEntry({
-							areaTag		: sysTempDownloadArea.areaTag,
-							fileName	: paths.basename(outputFileName),
-							storageTag	: sysTempDownloadArea.storageTags[0],
-							meta		: {
-								upload_by_username	: self.client.user.username,
-								upload_by_user_id	: self.client.user.userId,
-								byte_size			: stats.size,
-								session_temp_dl		: 1,	//	download is valid until session is over
-							}
-						});
+				function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
+					const newEntry = new FileEntry({
+						areaTag		: sysTempDownloadArea.areaTag,
+						fileName	: paths.basename(outputFileName),
+						storageTag	: sysTempDownloadArea.storageTags[0],
+						meta		: {
+							upload_by_username	: self.client.user.username,
+							upload_by_user_id	: self.client.user.userId,
+							byte_size			: fileSize,
+							session_temp_dl		: 1,	//	download is valid until session is over
+						}
+					});
 
-						newEntry.desc = 'File List Export';
+					newEntry.desc = 'File List Export';
 
-						newEntry.persist(err => {
-							if(!err) {
-								//	queue it!
-								const dlQueue = new DownloadQueue(self.client);
-								dlQueue.add(newEntry);
+					newEntry.persist(err => {
+						if(!err) {
+							//	queue it!
+							const dlQueue = new DownloadQueue(self.client);
+							dlQueue.add(newEntry);
 
-								//	clean up after ourselves when the session ends
-								const thisClientId = self.client.session.id;
-								Events.once('codes.l33t.enigma.system.disconnected', evt => {	//	:TODO: Make a enum for system events/etc.
-									if(thisClientId === _.get(evt, 'client.session.id')) {
-										FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
-											if(err) {
-												Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
-											} else {
-												Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
-											}
-										});
-									}
-								});
-							}
-							return callback(err);
-						});
+							//	clean up after ourselves when the session ends
+							const thisClientId = self.client.session.id;
+							Events.once('codes.l33t.enigma.system.disconnected', evt => {	//	:TODO: Make a enum for system events/etc.
+								if(thisClientId === _.get(evt, 'client.session.id')) {
+									FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
+										if(err) {
+											Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+										} else {
+											Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+										}
+									});
+								}
+							});
+						}
+						return callback(err);
 					});
 				},
 				function done(callback) {
@@ -340,4 +362,39 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 			}
 		);
 	}
+
+	getSizeAndCompressIfMeetsSizeThreshold(filePath, cb) {
+		fse.stat(filePath, (err, stats) => {
+			if(err) {
+				return cb(err);
+			}
+
+			if(stats.size < this.config.compressThreshold) {
+				//	small enough, keep orig
+				return cb(null, filePath, stats.size);
+			}
+
+			const zipFilePath = `${filePath}.zip`;
+
+			const zipFile = new yazl.ZipFile();
+			zipFile.addFile(filePath, paths.basename(filePath));
+			zipFile.end( () => {
+				const outZipFile = fs.createWriteStream(zipFilePath);
+				zipFile.outputStream.pipe(outZipFile);
+				zipFile.outputStream.on('finish', () => {
+					//	delete the original
+					fse.unlink(filePath, err => {
+						if(err) {
+							return cb(err);
+						}
+
+						//	finally stat the new output
+						fse.stat(zipFilePath, (err, stats) => {
+							return cb(err, zipFilePath, stats ? stats.size : 0);
+						});
+					});
+				});
+			});
+		});
+	}
 };
\ No newline at end of file

From 1482d0b78ffcc5118d27e84048b16a3a270946bf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 13:34:35 -0700
Subject: [PATCH 0211/1013] Add known system events enum - many more to come

---
 core/events.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/events.js b/core/events.js
index 1838e087..b1e15c21 100644
--- a/core/events.js
+++ b/core/events.js
@@ -10,11 +10,21 @@ const _					= require('lodash');
 const async				= require('async');
 const glob				= require('glob');
 
+const SYSTEM_EVENTS = {
+	ClientConnected		: 'codes.l33t.enigma.system.connected',
+	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',
+	TermDetected		: 'codes.l33t.enigma.term_detected',
+};
+
 module.exports = new class Events extends events.EventEmitter {
 	constructor() {
 		super();
 	}
 
+	getSystemEvents() {
+		return SYSTEM_EVENTS;
+	}
+
 	addListener(event, listener) {
 		Log.trace( { event : event }, 'Registering event listener');
 		return super.addListener(event, listener);

From e7fb56946646573cfbc88705fc90d0511eaf1fd0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 13:35:05 -0700
Subject: [PATCH 0212/1013] Docs, some minor updates

---
 core/file_base_list_export.js | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index f1f87aab..9c63ab2d 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -10,7 +10,8 @@ const Config			= require('./config.js').config;
 const { Errors }		= require('./enig_error.js');
 const {
 	splitTextAtTerms,
-	isAnsi
+	isAnsi,
+	renderSubstr
 }						= require('./string_util.js');
 const AnsiPrep			= require('./ansi_prep.js');
 const Events			= require('./events.js');
@@ -29,15 +30,27 @@ const uuidv4			= require('uuid/v4');
 const yazl				= require('yazl');
 
 /*
-	:TODO: document:
-	- config options
-		- header template
-		- entry template
-	- header format
-	- entry format
-*/
+	Module config block can contain the following:
+	templateEncoding	- encoding of template files (utf8)
+	tsFormat			- timestamp format (theme 'short')
+	descWidth			- max desc width (45)
+	progBarChar			- progress bar character (â–’)
+	compressThreshold	- threshold to kick in comrpession for lists (1.44 MiB)
+	templates			- object containing:
+		header			- filename of header template (misc/file_list_header.asc)
+		entry			- filename of entry template (misc/file_list_entry.asc)
 
-//	:TODO: compress lists > N
+	Header template variables:
+	nowTs, boardName, totalFileCount, totalFileSize,
+	filterAreaTag, filterAreaName, filterAreaDesc,
+	filterTerms, filterHashTags
+
+	Entry template variables:
+	fileId, areaName, areaDesc, userRating, fileName,
+	fileSize, fileDesc, fileDescShort, fileSha256, fileCrc32,
+	fileMd5, fileSha1, uploadBy, fileUploadTs, fileHashTags,
+	currentFile, progress,
+*/
 
 exports.moduleInfo = {
 	name	: 'File Base List Export',
@@ -71,7 +84,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 		this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
 		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
 		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
-		this.config.progBarChar			= (this.config.progBarChar || 'â–’').charAt(0);
+		this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
 		this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
 	}
 
@@ -338,7 +351,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
 							//	clean up after ourselves when the session ends
 							const thisClientId = self.client.session.id;
-							Events.once('codes.l33t.enigma.system.disconnected', evt => {	//	:TODO: Make a enum for system events/etc.
+							Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
 								if(thisClientId === _.get(evt, 'client.session.id')) {
 									FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
 										if(err) {

From cac3e0ceae445915955206efb93d43f43a6f7bbb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 13:35:36 -0700
Subject: [PATCH 0213/1013] Better fillChar handling, specialKeyMapOverride()

---
 core/view.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/view.js b/core/view.js
index 1829f26d..1333ca24 100644
--- a/core/view.js
+++ b/core/view.js
@@ -2,11 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const events		= require('events');
-const util			= require('util');
-const ansi			= require('./ansi_term.js');
-const colorCodes	= require('./color_codes.js');
-const enigAssert	= require('./enigma_assert.js');
+const events			= require('events');
+const util				= require('util');
+const ansi				= require('./ansi_term.js');
+const colorCodes		= require('./color_codes.js');
+const enigAssert		= require('./enigma_assert.js');
+const { renderSubstr }	= require('./string_util.js');
 
 //	deps
 const _				= require('lodash');
@@ -85,6 +86,10 @@ function View(options) {
 
 	if(this.acceptsInput) {
 		this.specialKeyMap = options.specialKeyMap || VIEW_SPECIAL_KEY_MAP_DEFAULT;
+
+		if(_.isObject(options.specialKeyMapOverride)) {
+			this.setSpecialKeyMapOverride(options.specialKeyMapOverride);
+		}
 	}
 
 	this.isKeyMapped = function(keySet, keyName) {
@@ -177,6 +182,10 @@ View.prototype.getFocusSGR = function() {
 	return this.ansiFocusSGR;
 };
 
+View.prototype.setSpecialKeyMapOverride = function(specialKeyMapOverride) {
+	this.specialKeyMap = Object.assign(this.specialKeyMap, specialKeyMapOverride);
+};
+
 View.prototype.setPropertyValue = function(propName, value) {
 	switch(propName) {
 		case 'height'	: this.setHeight(value); break;
@@ -199,7 +208,7 @@ View.prototype.setPropertyValue = function(propName, value) {
 				if(_.isNumber(value)) {
 					this.fillChar = String.fromCharCode(value);
 				} else if(_.isString(value)) {
-					this.fillChar = value.substr(0, 1);
+					this.fillChar = renderSubstr(value, 0, 1);
 				}
 			}
 			break;

From 17cebdebce43c3a5101d25e099f6536603f8d451 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 13:35:57 -0700
Subject: [PATCH 0214/1013] Better fillChar handling

---
 core/text_view.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/text_view.js b/core/text_view.js
index ea9c352a..8de04484 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -31,7 +31,7 @@ function TextView(options) {
 		this.maxLength = this.client.term.termWidth - this.position.col;
 	}
 
-	this.fillChar			= miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
+	this.fillChar			= renderSubstr(miscUtil.valueWithDefault(options.fillChar, ' '), 0, 1);
 	this.justify			= options.justify || 'left';
 	this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
 	this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
@@ -120,11 +120,13 @@ function TextView(options) {
 			}
 		}
 
+		const renderedFillChar = pipeToAnsi(this.fillChar);
+
 		this.client.term.write(
 			padStr(
 				textToDraw,
 				this.dimens.width + 1,
-				this.fillChar,
+				renderedFillChar, //this.fillChar,
 				this.justify,
 				this.hasFocus ? this.getFocusSGR() : this.getSGR(),
 				this.getStyleSGR(1) || this.getSGR()

From 281bfbc2aa563c0f1b4601148e934a73d76fa527 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Mar 2018 20:47:25 -0700
Subject: [PATCH 0215/1013] Implement isLocal() for 'LC' ACS

---
 core/client.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/client.js b/core/client.js
index 24c8b1d1..a6c6b78a 100644
--- a/core/client.js
+++ b/core/client.js
@@ -475,8 +475,8 @@ Client.prototype.waitForKeyPress = function(cb) {
 };
 
 Client.prototype.isLocal = function() {
-	//	:TODO: return rather client is a local connection or not
-	return false;
+	//	:TODO: Handle ipv6 better
+	return [ '127.0.0.1', '::ffff:127.0.0.1' ].includes(this.remoteAddress);
 };
 
 ///////////////////////////////////////////////////////////////////////////////

From 63ff2a60573f3760b2b00b970ab030059c4f85ab Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 8 Mar 2018 19:56:00 -0700
Subject: [PATCH 0216/1013] Templates for new export

---
 misc/file_list_entry.asc  |  7 +++++++
 misc/file_list_header.asc | 11 +++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 misc/file_list_entry.asc
 create mode 100644 misc/file_list_header.asc

diff --git a/misc/file_list_entry.asc b/misc/file_list_entry.asc
new file mode 100644
index 00000000..fe1785df
--- /dev/null
+++ b/misc/file_list_entry.asc
@@ -0,0 +1,7 @@
+{fileName:<32.33}  {fileSize!sizeWithAbbr:<8.7}  {fileUploadTs}
+
+    {fileDesc}
+
+tags: {fileHashTags}
+sha1: {fileSha1}
+
diff --git a/misc/file_list_header.asc b/misc/file_list_header.asc
new file mode 100644
index 00000000..4e307ca7
--- /dev/null
+++ b/misc/file_list_header.asc
@@ -0,0 +1,11 @@
+-------------------------------------------------------------------------------
+{boardName} File Base List Export - Generated {nowTs}
+
+Search Criteria:
+  Area : {filterAreaName}
+  Terms: {filterTerms}
+  Tags : {filterHashTags}
+
+Total Files: {totalFileCount} / {totalFileSize!sizeWithAbbr}
+-------------------------------------------------------------------------------
+

From f6f1de4bd884444019193cd06aae5fa28074ab8d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 8 Mar 2018 21:39:42 -0700
Subject: [PATCH 0217/1013] Move to pty-node over custom pty2.js

---
 core/archive_util.js    |  2 +-
 core/door.js            | 18 +++++++-----------
 core/event_scheduler.js |  2 +-
 core/file_transfer.js   | 15 +++++++++------
 package.json            |  2 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 00e48ed8..8a4c388a 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -10,7 +10,7 @@ const resolveMimeType	= require('./mime_util.js').resolveMimeType;
 //	base/modules
 const fs		= require('graceful-fs');
 const _			= require('lodash');
-const pty		= require('ptyw.js');
+const pty		= require('node-pty');
 
 let archiveUtil;
 
diff --git a/core/door.js b/core/door.js
index 525a7a02..58c8effa 100644
--- a/core/door.js
+++ b/core/door.js
@@ -6,7 +6,7 @@ const stringFormat	= require('./string_format.js');
 
 const events		= require('events');
 const _				= require('lodash');
-const pty			= require('ptyw.js');
+const pty			= require('node-pty');
 const decode 		= require('iconv-lite').decode;
 const createServer	= require('net').createServer;
 
@@ -18,8 +18,7 @@ function Door(client, exeInfo) {
 	const self 				= this;
 	this.client				= client;
 	this.exeInfo			= exeInfo;
-	this.exeInfo.encoding	= this.exeInfo.encoding || 'cp437';
-	this.exeInfo.encoding	= this.exeInfo.encoding.toLowerCase();
+	this.exeInfo.encoding	= (this.exeInfo.encoding || 'cp437').toLowerCase();
 	let restored			= false;
 
 	//
@@ -36,11 +35,7 @@ function Door(client, exeInfo) {
 	//
 
 	this.doorDataHandler = function(data) {
-		if(self.client.term.outputEncoding === self.exeInfo.encoding) {
-			self.client.term.rawWrite(data);
-		} else {
-			self.client.term.write(decode(data, self.exeInfo.encoding));
-		}
+		self.client.term.write(decode(data, self.exeInfo.encoding));
 	};
 
 	this.restoreIo = function(piped) {
@@ -113,10 +108,11 @@ Door.prototype.run = function() {
 		}
 
 		const door = pty.spawn(self.exeInfo.cmd, args, {
-			cols : self.client.term.termWidth,
-			rows : self.client.term.termHeight,
+			cols 		: self.client.term.termWidth,
+			rows		: self.client.term.termHeight,
 			//	:TODO: cwd
-			env	: self.exeInfo.env,
+			env			: self.exeInfo.env,
+			encoding	: null,	//	we want to handle all encoding ourself
 		});
 
 		if('stdio' === self.exeInfo.io) {
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 0366d5ba..10c59f72 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -9,7 +9,7 @@ const Log					= require('./logger.js').log;
 const _						= require('lodash');
 const later					= require('later');
 const path					= require('path');
-const pty					= require('ptyw.js');
+const pty					= require('node-pty');
 const sane					= require('sane');
 const moment				= require('moment');
 const paths					= require('path');
diff --git a/core/file_transfer.js b/core/file_transfer.js
index bb3d362c..757eff8a 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -14,7 +14,7 @@ const Log				= require('./logger.js').log;
 //	deps
 const async			= require('async');
 const _				= require('lodash');
-const pty			= require('ptyw.js');
+const pty			= require('node-pty');
 const temptmp		= require('temptmp').createTrackedSession('transfer_file');
 const paths			= require('path');
 const fs			= require('graceful-fs');
@@ -361,11 +361,14 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			'Executing external protocol'
 		);
 
-		const externalProc = pty.spawn(cmd, args, {
-			cols	: this.client.term.termWidth,
-			rows	: this.client.term.termHeight,
-			cwd		: this.recvDirectory,
-		});
+		const spawnOpts = {
+			cols		: this.client.term.termWidth,
+			rows		: this.client.term.termHeight,
+			cwd			: this.recvDirectory,
+			encoding	: null,	//	don't bork our data!
+		};
+
+		const externalProc = pty.spawn(cmd, args, spawnOpts);
 
 		this.client.setTemporaryDirectDataHandler(data => {
 			//	needed for things like sz/rz
diff --git a/package.json b/package.json
index 8c7a7a5d..88844455 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "minimist": "1.2.x",
     "moment": "^2.20.1",
     "nodemailer": "^4.4.1",
-    "ptyw.js": "NuSkooler/ptyw.js",
+    "node-pty": "^0.7.4",
     "rlogin": "^1.0.0",
     "sane": "^2.2.0",
     "sanitize-filename": "^1.6.1",

From 9c87d4543364193f45db97dd5b47b7768899c546 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Mar 2018 11:37:23 -0700
Subject: [PATCH 0218/1013] Add GLOB support to oputil fb scan...

---
 core/oputil/oputil_common.js    | 10 ++++++++++
 core/oputil/oputil_file_base.js | 22 ++++++++++++++++++++--
 core/oputil/oputil_help.js      |  2 ++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index e175a166..d03bb82f 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -15,6 +15,7 @@ exports.getDefaultConfigPath			= getDefaultConfigPath;
 exports.getConfigPath					= getConfigPath;
 exports.initConfigAndDatabases			= initConfigAndDatabases;
 exports.getAreaAndStorage				= getAreaAndStorage;
+exports.looksLikePattern				= looksLikePattern;
 
 const exitCodes = exports.ExitCodes = {
 	SUCCESS		: 0,
@@ -87,4 +88,13 @@ function getAreaAndStorage(tags) {
 		}
 		return entry;
 	});
+}
+
+function looksLikePattern(tag) {
+	//	globs can start with @
+	if(tag.indexOf('@') > 0) {
+		return false;
+	}
+
+	return /[*?[\]!()+|^]/.test(tag);
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index b1d1d97b..a2abbe99 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -7,7 +7,10 @@ const ExitCodes					= require('./oputil_common.js').ExitCodes;
 const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
-const getAreaAndStorage			= require('./oputil_common.js').getAreaAndStorage;
+const {
+	getAreaAndStorage,
+	looksLikePattern
+}								= require('./oputil_common.js');
 const Errors					= require('../enig_error.js').Errors;
 
 const async						= require('async');
@@ -16,6 +19,7 @@ const paths						= require('path');
 const _							= require('lodash');
 const moment					= require('moment');
 const inq						= require('inquirer');
+const glob						= require('glob');
 
 exports.handleFileBaseCommand			= handleFileBaseCommand;
 
@@ -119,6 +123,14 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 
 	const FileEntry = require('../file_entry.js');
 
+	const readDir = options.glob ?
+		(dir, next) => {
+			return glob(options.glob, { cwd : dir, nodir : true }, next);
+		} :
+		(dir, next) => {
+			return fs.readdir(dir, next);
+		};
+
 	async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
 		async.waterfall(
 			[
@@ -134,7 +146,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 				function scanPhysFiles(descHandler, callback) {
 					const physDir = storageLoc.dir;
 
-					fs.readdir(physDir, (err, files) => {
+					readDir(physDir, (err, files) => {
 						if(err) {
 							return callback(err);
 						}
@@ -498,6 +510,12 @@ function scanFileAreas() {
 
 	options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
 
+	const last = argv._[argv._.length - 1];
+	if(options.areaAndStorageInfo.length > 1 && looksLikePattern(last)) {
+		options.glob = last;
+		options.areaAndStorageInfo.length -= 1;
+	}
+
 	async.series(
 		[
 			function init(callback) {
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index baa0138c..4875d382 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -49,6 +49,8 @@ import-areas args:
 
 actions:
   scan AREA_TAG[@STORAGE_TAG]  scan specified area
+                               may also contain optional GLOB as last parameter,
+                               for examle: scan some_area *.zip
 
   info AREA_TAG|SHA|FILE_ID    display information about areas and/or files
                                SHA may be a full or partial SHA-256

From edc0bf5e068ade0d123a41422af5a20478e3d536 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Mar 2018 21:23:23 -0600
Subject: [PATCH 0219/1013] Split up code a bit in prep for DESCRIPT.ION
 generator

---
 core/file_base_user_list_export.js | 292 +++++++++++++++++++++++++++++
 1 file changed, 292 insertions(+)
 create mode 100644 core/file_base_user_list_export.js

diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
new file mode 100644
index 00000000..4a2d0c4b
--- /dev/null
+++ b/core/file_base_user_list_export.js
@@ -0,0 +1,292 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const { MenuModule }	= require('./menu_module.js');
+const FileEntry			= require('./file_entry.js');
+const FileArea			= require('./file_base_area.js');
+const { renderSubstr }	= require('./string_util.js');
+const { Errors }		= require('./enig_error.js');
+const Events			= require('./events.js');
+const Log				= require('./logger.js').log;
+const DownloadQueue		= require('./download_queue.js');
+const exportFileList	 = require('./file_base_list_export.js');
+
+//	deps
+const _					= require('lodash');
+const async				= require('async');
+const fs				= require('graceful-fs');
+const fse				= require('fs-extra');
+const paths				= require('path');
+const moment			= require('moment');
+const uuidv4			= require('uuid/v4');
+const yazl				= require('yazl');
+
+/*
+	Module config block can contain the following:
+	templateEncoding	- encoding of template files (utf8)
+	tsFormat			- timestamp format (theme 'short')
+	descWidth			- max desc width (45)
+	progBarChar			- progress bar character (â–’)
+	compressThreshold	- threshold to kick in comrpession for lists (1.44 MiB)
+	templates			- object containing:
+		header			- filename of header template (misc/file_list_header.asc)
+		entry			- filename of entry template (misc/file_list_entry.asc)
+
+	Header template variables:
+	nowTs, boardName, totalFileCount, totalFileSize,
+	filterAreaTag, filterAreaName, filterAreaDesc,
+	filterTerms, filterHashTags
+
+	Entry template variables:
+	fileId, areaName, areaDesc, userRating, fileName,
+	fileSize, fileDesc, fileDescShort, fileSha256, fileCrc32,
+	fileMd5, fileSha1, uploadBy, fileUploadTs, fileHashTags,
+	currentFile, progress,
+*/
+
+exports.moduleInfo = {
+	name	: 'File Base List Export',
+	desc	: 'Exports file base listings for download',
+	author	: 'NuSkooler',
+};
+
+const FormIds = {
+	main	: 0,
+};
+
+const MciViewIds = {
+	main : {
+		status				: 1,
+		progressBar			: 2,
+
+		customRangeStart	: 10,
+	}
+};
+
+exports.getModule = class FileBaseListExport extends MenuModule {
+
+	constructor(options) {
+		super(options);
+		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+
+		this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
+		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
+		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
+		this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
+		this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
+	}
+
+	mciReady(mciData, cb) {
+		super.mciReady(mciData, err => {
+			if(err) {
+				return cb(err);
+			}
+
+			async.series(
+				[
+					(callback) => this.prepViewController('main', FormIds.main, mciData.menu, callback),
+					(callback) => this.prepareList(callback),
+				],
+				err => {
+					if(err) {
+						if('NORESULTS' === err.reasonCode) {
+							return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'fileBaseExportListNoResults');
+						}
+
+						return this.prevMenu();
+					}
+					return cb(err);
+				}
+			);
+		});
+	}
+
+	finishedLoading() {
+		this.prevMenu();
+	}
+
+	prepareList(cb) {
+		const self = this;
+
+		const statusView = self.viewControllers.main.getView(MciViewIds.main.status);
+		const updateStatus = (status) => {
+			if(statusView) {
+				statusView.setText(status);
+			}
+		};
+
+		const progBarView = self.viewControllers.main.getView(MciViewIds.main.progressBar);
+		const updateProgressBar = (curr, total) => {
+			if(progBarView) {
+				const prog = Math.floor( (curr / total) * progBarView.dimens.width );
+				progBarView.setText(self.config.progBarChar.repeat(prog));
+			}
+		};
+
+		let cancel = false;
+
+		const exportListProgress = (state, progNext) => {
+			switch(state.step) {
+				case 'preparing' :
+				case 'gathering' :
+					updateStatus(state.status);
+					break;
+				case 'file' :
+					updateStatus(state.status);
+					updateProgressBar(state.current, state.total);
+					self.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.fileInfo);
+					break;
+				default :
+					break;
+			}
+
+			return progNext(cancel ? Errors.General('User canceled') : null);
+		};
+
+		const keyPressHandler = (ch, key) => {
+			if('escape' === key.name) {
+				cancel = true;
+				self.client.removeListener('key press', keyPressHandler);
+			}
+		};
+
+		async.waterfall(
+			[
+				function buildList(callback) {
+					//	this may take quite a while; temp disable of idle monitor
+					self.client.stopIdleMonitor();
+
+					const filterCriteria = Object.assign({}, self.config.filterCriteria);
+					if(!filterCriteria.areaTag) {
+						filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);
+					}
+
+					const opts = {
+						templateEncoding	: self.config.templateEncoding,
+						headerTemplate		: _.get(self.config, 'templates.header', 'file_list_header.asc'),
+						entryTemplate		: _.get(self.config, 'templates.entry', 'file_list_entry.asc'),
+						tsFormat			: self.config.tsFormat,
+						descWidth			: self.config.descWidth,
+						progress			: exportListProgress,
+					};
+
+					exportFileList(filterCriteria, opts, (err, listBody) => {
+						return callback(err, listBody);
+					});
+				},
+				function persistList(listBody, callback) {
+					updateStatus('Persisting list');
+
+					const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
+					const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
+
+					fse.mkdirs(sysTempDownloadDir, err => {
+						if(err) {
+							return callback(err);
+						}
+
+						const outputFileName = paths.join(
+							sysTempDownloadDir,
+							`file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
+						);
+
+						fs.writeFile(outputFileName, listBody, 'utf8', err => {
+							if(err) {
+								return callback(err);
+							}
+
+							self.getSizeAndCompressIfMeetsSizeThreshold(outputFileName, (err, finalOutputFileName, fileSize) => {
+								return callback(err, finalOutputFileName, fileSize, sysTempDownloadArea);
+							});
+						});
+					});
+				},
+				function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
+					const newEntry = new FileEntry({
+						areaTag		: sysTempDownloadArea.areaTag,
+						fileName	: paths.basename(outputFileName),
+						storageTag	: sysTempDownloadArea.storageTags[0],
+						meta		: {
+							upload_by_username	: self.client.user.username,
+							upload_by_user_id	: self.client.user.userId,
+							byte_size			: fileSize,
+							session_temp_dl		: 1,	//	download is valid until session is over
+						}
+					});
+
+					newEntry.desc = 'File List Export';
+
+					newEntry.persist(err => {
+						if(!err) {
+							//	queue it!
+							const dlQueue = new DownloadQueue(self.client);
+							dlQueue.add(newEntry);
+
+							//	clean up after ourselves when the session ends
+							const thisClientId = self.client.session.id;
+							Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
+								if(thisClientId === _.get(evt, 'client.session.id')) {
+									FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
+										if(err) {
+											Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+										} else {
+											Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+										}
+									});
+								}
+							});
+						}
+						return callback(err);
+					});
+				},
+				function done(callback) {
+					//	re-enable idle monitor
+					self.client.startIdleMonitor();
+
+					updateStatus('Exported list has been added to your download queue');
+					return callback(null);
+				}
+			],
+			err => {
+				self.client.removeListener('key press', keyPressHandler);
+				return cb(err);
+			}
+		);
+	}
+
+	getSizeAndCompressIfMeetsSizeThreshold(filePath, cb) {
+		fse.stat(filePath, (err, stats) => {
+			if(err) {
+				return cb(err);
+			}
+
+			if(stats.size < this.config.compressThreshold) {
+				//	small enough, keep orig
+				return cb(null, filePath, stats.size);
+			}
+
+			const zipFilePath = `${filePath}.zip`;
+
+			const zipFile = new yazl.ZipFile();
+			zipFile.addFile(filePath, paths.basename(filePath));
+			zipFile.end( () => {
+				const outZipFile = fs.createWriteStream(zipFilePath);
+				zipFile.outputStream.pipe(outZipFile);
+				zipFile.outputStream.on('finish', () => {
+					//	delete the original
+					fse.unlink(filePath, err => {
+						if(err) {
+							return cb(err);
+						}
+
+						//	finally stat the new output
+						fse.stat(zipFilePath, (err, stats) => {
+							return cb(err, zipFilePath, stats ? stats.size : 0);
+						});
+					});
+				});
+			});
+		});
+	}
+};
\ No newline at end of file

From 7bf49d973d1ff36a161b8a2cce59fd21e54d976a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Mar 2018 21:23:35 -0600
Subject: [PATCH 0220/1013] Split up code a bit in prep for DESCRIPT.ION
 generation

---
 core/file_base_list_export.js | 516 +++++++++++-----------------------
 1 file changed, 164 insertions(+), 352 deletions(-)

diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index 9c63ab2d..2ae4699d 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -2,7 +2,6 @@
 'use strict';
 
 //	ENiGMA½
-const { MenuModule }	= require('./menu_module.js');
 const stringFormat		= require('./string_format.js');
 const FileEntry			= require('./file_entry.js');
 const FileArea			= require('./file_base_area.js');
@@ -11,142 +10,54 @@ const { Errors }		= require('./enig_error.js');
 const {
 	splitTextAtTerms,
 	isAnsi,
-	renderSubstr
 }						= require('./string_util.js');
 const AnsiPrep			= require('./ansi_prep.js');
-const Events			= require('./events.js');
-const Log				= require('./logger.js').log;
-const DownloadQueue		= require('./download_queue.js');
 
 //	deps
 const _					= require('lodash');
 const async				= require('async');
 const fs				= require('graceful-fs');
-const fse				= require('fs-extra');
 const paths				= require('path');
 const iconv				= require('iconv-lite');
 const moment			= require('moment');
-const uuidv4			= require('uuid/v4');
-const yazl				= require('yazl');
 
-/*
-	Module config block can contain the following:
-	templateEncoding	- encoding of template files (utf8)
-	tsFormat			- timestamp format (theme 'short')
-	descWidth			- max desc width (45)
-	progBarChar			- progress bar character (â–’)
-	compressThreshold	- threshold to kick in comrpession for lists (1.44 MiB)
-	templates			- object containing:
-		header			- filename of header template (misc/file_list_header.asc)
-		entry			- filename of entry template (misc/file_list_entry.asc)
+module.exports = function exportFileList(filterCriteria, options, cb) {
+	options.templateEncoding	= options.templateEncoding || 'utf8';
+	options.headerTemplate 		= options.headerTemplate || 'description_export_header_template.asc';
+	options.entryTemplate		= options.entryTemplate || 'descripion_export_entry_template.asc';
+	options.tsFormat			= options.tsFormat || 'YYYY-MM-DD';
+	options.descWidth			= options.descWidth || 45;	//	FILE_ID.DIZ spec
 
-	Header template variables:
-	nowTs, boardName, totalFileCount, totalFileSize,
-	filterAreaTag, filterAreaName, filterAreaDesc,
-	filterTerms, filterHashTags
+	const state = {
+		total	: 0,
+		current	: 0,
+		step	: 'preparing',
+		status	: 'Preparing',
+	};
 
-	Entry template variables:
-	fileId, areaName, areaDesc, userRating, fileName,
-	fileSize, fileDesc, fileDescShort, fileSha256, fileCrc32,
-	fileMd5, fileSha1, uploadBy, fileUploadTs, fileHashTags,
-	currentFile, progress,
-*/
+	const updateProgress = _.isFunction(options.progress) ?
+		progCb => {
+			return options.progress(state, progCb);
+		} :
+		progCb => {
+			return progCb(null);
+		}
+		;
 
-exports.moduleInfo = {
-	name	: 'File Base List Export',
-	desc	: 'Exports file base listings for download',
-	author	: 'NuSkooler',
-};
-
-const FormIds = {
-	main	: 0,
-};
-
-const MciViewIds = {
-	main : {
-		status				: 1,
-		progressBar			: 2,
-
-		customRangeStart	: 10,
-	}
-};
-
-const TEMPLATE_KEYS = [	//	config.templates.*
-	'header', 'entry',
-];
-
-exports.getModule = class FileBaseListExport extends MenuModule {
-
-	constructor(options) {
-		super(options);
-		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
-
-		this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
-		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
-		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
-		this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
-		this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
-	}
-
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
-
-			async.series(
-				[
-					(callback) => this.prepViewController('main', FormIds.main, mciData.menu, callback),
-					(callback) => this.prepareList(callback),
-				],
-				err => {
+	async.waterfall(
+		[
+			function readTemplateFiles(callback) {
+				updateProgress(err => {
 					if(err) {
-						if('NORESULTS' === err.reasonCode) {
-							return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'fileBaseExportListNoResults');
-						}
-
-						return this.prevMenu();
+						return callback(err);
 					}
-					return cb(err);
-				}
-			);
-		});
-	}
 
-	finishedLoading() {
-		this.prevMenu();
-	}
+					const templateFiles = [ options.headerTemplate, options.entryTemplate ];
+					async.map(templateFiles, (template, nextTemplate) => {
+						template = paths.isAbsolute(template) ? template : paths.join(Config.paths.misc, template);
 
-	prepareList(cb) {
-		const self = this;
-
-		const statusView = self.viewControllers.main.getView(MciViewIds.main.status);
-		const updateStatus = (status) => {
-			if(statusView) {
-				statusView.setText(status);
-			}
-		};
-
-		const progBarView = self.viewControllers.main.getView(MciViewIds.main.progressBar);
-		const updateProgressBar = (curr, total) => {
-			if(progBarView) {
-				const prog = Math.floor( (curr / total) * progBarView.dimens.width );
-				progBarView.setText(self.config.progBarChar.repeat(prog));
-			}
-		};
-
-		async.waterfall(
-			[
-				function readTemplateFiles(callback) {
-					updateStatus('Preparing');
-
-					async.map(TEMPLATE_KEYS, (templateKey, nextKey) => {
-						let templatePath = _.get(self.config, [ 'templates', templateKey ]);
-						templatePath = templatePath || `file_list_${templateKey}.asc`;
-						templatePath = paths.isAbsolute(templatePath) ? templatePath : paths.join(Config.paths.misc, templatePath);
-
-						fs.readFile(templatePath, (err, data) => {
-							return nextKey(err, data);
+						fs.readFile(template, (err, data) => {
+							return nextTemplate(err, data);
 						});
 					}, (err, templates) => {
 						if(err) {
@@ -154,7 +65,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 						}
 
 						//	decode + ensure DOS style CRLF
-						templates = templates.map(tmp => iconv.decode(tmp, self.config.templateEncoding).replace(/\r?\n/g, '\r\n') );
+						templates = templates.map(tmp => iconv.decode(tmp, options.templateEncoding).replace(/\r?\n/g, '\r\n') );
 
 						//	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
 						let descIndent = 0;
@@ -169,15 +80,16 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
 						return callback(null, templates[0], templates[1], descIndent);
 					});
-				},
-				function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
-					const filterCriteria = Object.assign({}, self.config.filterCriteria);
-					if(!filterCriteria.areaTag) {
-						filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);
+				});
+			},
+			function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
+				state.step		= 'gathering';
+				state.status	= 'Gathering files for supplied criteria';
+				updateProgress(err => {
+					if(err) {
+						return callback(err);
 					}
 
-					updateStatus('Gathering files for supplied criteria');
-
 					FileEntry.findFiles(filterCriteria, (err, fileIds) => {
 						if(0 === fileIds.length) {
 							return callback(Errors.General('No results for criteria', 'NORESULTS'));
@@ -185,229 +97,129 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
 						return callback(err, headerTemplate, entryTemplate, descIndent, fileIds);
 					});
-				},
-				function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
-					const formatObj = {
-						totalFileCount	: fileIds.length,
-					};
-
-					let current = 0;
-					let listBody = '';
-					const totals = { fileCount : fileIds.length, bytes : 0 };
-
-					//	this may take quite a while; temp disable of idle monitor
-					self.client.stopIdleMonitor();
-
-					async.eachSeries(fileIds, (fileId, nextFileId) => {
-						const fileInfo = new FileEntry();
-						current += 1;
-
-						fileInfo.load(fileId, err => {
-							if(err) {
-								return nextFileId(null);	//	failed, but try the next
-							}
-
-							updateStatus(`Processing ${fileInfo.fileName}`);
-
-							totals.bytes += fileInfo.meta.byte_size;
-
-							updateProgressBar(current, fileIds.length);
-
-							const appendFileInfo = () => {
-								listBody += stringFormat(entryTemplate, formatObj);
-
-								self.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, formatObj);
-
-								return nextFileId(null);
-							};
-
-							const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
-
-							formatObj.fileId		= fileId;
-							formatObj.areaName		= _.get(area, 'name') || 'N/A';
-							formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
-							formatObj.userRating	= fileInfo.userRating || 0;
-							formatObj.fileName		= fileInfo.fileName;
-							formatObj.fileSize		= fileInfo.meta.byte_size;
-							formatObj.fileDesc		= fileInfo.desc || '';
-							formatObj.fileDescShort	= formatObj.fileDesc.slice(0, self.config.descWidth);
-							formatObj.fileSha256	= fileInfo.fileSha256;
-							formatObj.fileCrc32		= fileInfo.meta.file_crc32;
-							formatObj.fileMd5		= fileInfo.meta.file_md5;
-							formatObj.fileSha1		= fileInfo.meta.file_sha1;
-							formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
-							formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(self.config.tsFormat);
-							formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
-							formatObj.currentFile	= current;
-							formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
-
-							if(isAnsi(fileInfo.desc)) {
-								AnsiPrep(
-									fileInfo.desc,
-									{
-										cols			: Math.min(self.config.descWidth, 79 - descIndent),
-										forceLineTerm	: true,				//	ensure each line is term'd
-										asciiMode		: true,				//	export to ASCII
-										fillLines		: false,			//	don't fill up to |cols|
-										indent			: descIndent,
-									},
-									(err, desc) => {
-										if(desc) {
-											formatObj.fileDesc = desc;
-										}
-										return appendFileInfo();
-									}
-								);
-							} else {
-								const indentSpc = descIndent > 0 ? ' '.repeat(descIndent) : '';
-								formatObj.fileDesc = splitTextAtTerms(formatObj.fileDesc).join(`\r\n${indentSpc}`) + '\r\n';
-								return appendFileInfo();
-							}
-						});
-					}, err => {
-						//	re-enable idle monitor
-						self.client.startIdleMonitor();
-
-						return callback(err, listBody, headerTemplate, totals);
-					});
-				},
-				function buildHeader(listBody, headerTemplate, totals, callback) {
-					//	header is built last such that we can have totals/etc.
-
-					let filterAreaName;
-					let filterAreaDesc;
-					if(self.config.filterCriteria.areaTag) {
-						const area 		= FileArea.getFileAreaByTag(self.config.filterCriteria.areaTag);
-						filterAreaName	= _.get(area, 'name') || 'N/A';
-						filterAreaDesc	= _.get(area, 'desc') || 'N/A';
-					} else {
-						filterAreaName	= '-ALL-';
-						filterAreaDesc	= 'All areas';
-					}
-
-					const headerFormatObj = {
-						nowTs			: moment().format(self.config.tsFormat),
-						boardName		: Config.general.boardName,
-						totalFileCount	: totals.fileCount,
-						totalFileSize	: totals.bytes,
-						filterAreaTag	: self.config.filterCriteria.areaTag || '-ALL-',
-						filterAreaName	: filterAreaName,
-						filterAreaDesc	: filterAreaDesc,
-						filterTerms		: self.config.filterCriteria.terms || '(none)',
-						filterHashTags	: self.config.filterCriteria.tags || '(none)',
-					};
-
-					listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
-					return callback(null, listBody);
-				},
-				function persistList(listBody, callback) {
-
-					updateStatus('Persisting list');
-
-					const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
-					const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
-
-					fse.mkdirs(sysTempDownloadDir, err => {
-						if(err) {
-							return callback(err);
-						}
-
-						const outputFileName = paths.join(
-							sysTempDownloadDir,
-							`file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
-						);
-
-						fs.writeFile(outputFileName, listBody, 'utf8', err => {
-							if(err) {
-								return callback(err);
-							}
-
-							self.getSizeAndCompressIfMeetsSizeThreshold(outputFileName, (err, finalOutputFileName, fileSize) => {
-								return callback(err, finalOutputFileName, fileSize, sysTempDownloadArea);
-							});
-						});
-					});
-				},
-				function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
-					const newEntry = new FileEntry({
-						areaTag		: sysTempDownloadArea.areaTag,
-						fileName	: paths.basename(outputFileName),
-						storageTag	: sysTempDownloadArea.storageTags[0],
-						meta		: {
-							upload_by_username	: self.client.user.username,
-							upload_by_user_id	: self.client.user.userId,
-							byte_size			: fileSize,
-							session_temp_dl		: 1,	//	download is valid until session is over
-						}
-					});
-
-					newEntry.desc = 'File List Export';
-
-					newEntry.persist(err => {
-						if(!err) {
-							//	queue it!
-							const dlQueue = new DownloadQueue(self.client);
-							dlQueue.add(newEntry);
-
-							//	clean up after ourselves when the session ends
-							const thisClientId = self.client.session.id;
-							Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
-								if(thisClientId === _.get(evt, 'client.session.id')) {
-									FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
-										if(err) {
-											Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
-										} else {
-											Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
-										}
-									});
-								}
-							});
-						}
-						return callback(err);
-					});
-				},
-				function done(callback) {
-					updateStatus('Exported list has been added to your download queue');
-					return callback(null);
-				}
-			], err => {
-				return cb(err);
-			}
-		);
-	}
-
-	getSizeAndCompressIfMeetsSizeThreshold(filePath, cb) {
-		fse.stat(filePath, (err, stats) => {
-			if(err) {
-				return cb(err);
-			}
-
-			if(stats.size < this.config.compressThreshold) {
-				//	small enough, keep orig
-				return cb(null, filePath, stats.size);
-			}
-
-			const zipFilePath = `${filePath}.zip`;
-
-			const zipFile = new yazl.ZipFile();
-			zipFile.addFile(filePath, paths.basename(filePath));
-			zipFile.end( () => {
-				const outZipFile = fs.createWriteStream(zipFilePath);
-				zipFile.outputStream.pipe(outZipFile);
-				zipFile.outputStream.on('finish', () => {
-					//	delete the original
-					fse.unlink(filePath, err => {
-						if(err) {
-							return cb(err);
-						}
-
-						//	finally stat the new output
-						fse.stat(zipFilePath, (err, stats) => {
-							return cb(err, zipFilePath, stats ? stats.size : 0);
-						});
-					});
 				});
-			});
-		});
-	}
-};
\ No newline at end of file
+			},
+			function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
+				const formatObj = {
+					totalFileCount	: fileIds.length,
+				};
+
+				let current		= 0;
+				let listBody	= '';
+				const totals	= { fileCount : fileIds.length, bytes : 0 };
+				state.total		= fileIds.length;
+
+				state.step		= 'file';
+
+				async.eachSeries(fileIds, (fileId, nextFileId) => {
+					const fileInfo = new FileEntry();
+					current += 1;
+
+					fileInfo.load(fileId, err => {
+						if(err) {
+							return nextFileId(null);	//	failed, but try the next
+						}
+
+						totals.bytes += fileInfo.meta.byte_size;
+
+						const appendFileInfo = () => {
+							listBody += stringFormat(entryTemplate, formatObj);
+
+							state.current	= current;
+							state.status	= `Processing ${fileInfo.fileName}`;
+							state.fileInfo	= formatObj;
+
+							updateProgress(err => {
+								return nextFileId(err);
+							});
+						};
+
+						const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
+
+						formatObj.fileId		= fileId;
+						formatObj.areaName		= _.get(area, 'name') || 'N/A';
+						formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
+						formatObj.userRating	= fileInfo.userRating || 0;
+						formatObj.fileName		= fileInfo.fileName;
+						formatObj.fileSize		= fileInfo.meta.byte_size;
+						formatObj.fileDesc		= fileInfo.desc || '';
+						formatObj.fileDescShort	= formatObj.fileDesc.slice(0, options.descWidth);
+						formatObj.fileSha256	= fileInfo.fileSha256;
+						formatObj.fileCrc32		= fileInfo.meta.file_crc32;
+						formatObj.fileMd5		= fileInfo.meta.file_md5;
+						formatObj.fileSha1		= fileInfo.meta.file_sha1;
+						formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
+						formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(options.tsFormat);
+						formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
+						formatObj.currentFile	= current;
+						formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
+
+						if(isAnsi(fileInfo.desc)) {
+							AnsiPrep(
+								fileInfo.desc,
+								{
+									cols			: Math.min(options.descWidth, 79 - descIndent),
+									forceLineTerm	: true,				//	ensure each line is term'd
+									asciiMode		: true,				//	export to ASCII
+									fillLines		: false,			//	don't fill up to |cols|
+									indent			: descIndent,
+								},
+								(err, desc) => {
+									if(desc) {
+										formatObj.fileDesc = desc;
+									}
+									return appendFileInfo();
+								}
+							);
+						} else {
+							const indentSpc = descIndent > 0 ? ' '.repeat(descIndent) : '';
+							formatObj.fileDesc = splitTextAtTerms(formatObj.fileDesc).join(`\r\n${indentSpc}`) + '\r\n';
+							return appendFileInfo();
+						}
+					});
+				}, err => {
+					return callback(err, listBody, headerTemplate, totals);
+				});
+			},
+			function buildHeader(listBody, headerTemplate, totals, callback) {
+				//	header is built last such that we can have totals/etc.
+
+				let filterAreaName;
+				let filterAreaDesc;
+				if(filterCriteria.areaTag) {
+					const area 		= FileArea.getFileAreaByTag(filterCriteria.areaTag);
+					filterAreaName	= _.get(area, 'name') || 'N/A';
+					filterAreaDesc	= _.get(area, 'desc') || 'N/A';
+				} else {
+					filterAreaName	= '-ALL-';
+					filterAreaDesc	= 'All areas';
+				}
+
+				const headerFormatObj = {
+					nowTs			: moment().format(options.tsFormat),
+					boardName		: Config.general.boardName,
+					totalFileCount	: totals.fileCount,
+					totalFileSize	: totals.bytes,
+					filterAreaTag	: filterCriteria.areaTag || '-ALL-',
+					filterAreaName	: filterAreaName,
+					filterAreaDesc	: filterAreaDesc,
+					filterTerms		: filterCriteria.terms || '(none)',
+					filterHashTags	: filterCriteria.tags || '(none)',
+				};
+
+				listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
+				return callback(null, listBody);
+			},
+			function done(listBody, callback) {
+				delete state.fileInfo;
+				state.step 		= 'finished';
+				state.status	= 'Finished processing';
+				updateProgress( () => {
+					return callback(null, listBody);
+				});
+			}
+		], (err, listBody) => {
+			return cb(err, listBody);
+		}
+	);
+};

From 0de98a673f41a0885c4f368de047e4a5cd8b4d5c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Mar 2018 22:18:09 -0600
Subject: [PATCH 0221/1013] Add DESCRIPT.ION export ability * 4DOS style
 DESCRIPT.ION generated in storage areas @ weekly schedule by default * Format
 can be controlled via templates; schedule can be changed or disabled, etc.

---
 core/config.js                              |   5 +
 core/file_base_list_export.js               | 106 +++++++++++++++++---
 core/file_base_user_list_export.js          |  18 ++--
 misc/descript_ion_export_entry_template.asc |   1 +
 4 files changed, 105 insertions(+), 25 deletions(-)
 create mode 100644 misc/descript_ion_export_entry_template.asc

diff --git a/core/config.js b/core/config.js
index 6fcadd5b..cd87c771 100644
--- a/core/config.js
+++ b/core/config.js
@@ -738,6 +738,11 @@ function getDefaultConfig() {
 					schedule	: 'every 24 hours',
 					action		: '@method:core/web_password_reset.js:performMaintenanceTask',
 					args		: [ '24 hours' ]	//	items older than this will be removed
+				},
+
+				updateDescriptIonFiles : {
+					schedule	: 'every 168 hours',	//	once a week
+					action		: '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
 				}
 			}
 		},
diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index 2ae4699d..442946e3 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -12,6 +12,7 @@ const {
 	isAnsi,
 }						= require('./string_util.js');
 const AnsiPrep			= require('./ansi_prep.js');
+const Log				= require('./logger.js').log;
 
 //	deps
 const _					= require('lodash');
@@ -21,12 +22,19 @@ const paths				= require('path');
 const iconv				= require('iconv-lite');
 const moment			= require('moment');
 
-module.exports = function exportFileList(filterCriteria, options, cb) {
+exports.exportFileList							= exportFileList;
+exports.updateFileBaseDescFilesScheduledEvent	= updateFileBaseDescFilesScheduledEvent;
+
+function exportFileList(filterCriteria, options, cb) {
 	options.templateEncoding	= options.templateEncoding || 'utf8';
-	options.headerTemplate 		= options.headerTemplate || 'description_export_header_template.asc';
-	options.entryTemplate		= options.entryTemplate || 'descripion_export_entry_template.asc';
+	options.entryTemplate		= options.entryTemplate || 'descript_ion_export_entry_template.asc';
 	options.tsFormat			= options.tsFormat || 'YYYY-MM-DD';
 	options.descWidth			= options.descWidth || 45;	//	FILE_ID.DIZ spec
+	options.escapeDesc			= _.get(options, 'escapeDesc', false);	//	escape \r and \n in desc?
+
+	if(true === options.escapeDesc) {
+		options.escapeDesc = '\\n';
+	}
 
 	const state = {
 		total	: 0,
@@ -52,16 +60,22 @@ module.exports = function exportFileList(filterCriteria, options, cb) {
 						return callback(err);
 					}
 
-					const templateFiles = [ options.headerTemplate, options.entryTemplate ];
+					const templateFiles = [
+						{ name : options.headerTemplate,	req : false },
+						{ name : options.entryTemplate,		req : true }
+					];
 					async.map(templateFiles, (template, nextTemplate) => {
-						template = paths.isAbsolute(template) ? template : paths.join(Config.paths.misc, template);
+						if(!template.name && !template.req) {
+							return nextTemplate(null, Buffer.from([]));
+						}
 
-						fs.readFile(template, (err, data) => {
+						template.name = paths.isAbsolute(template.name) ? template.name : paths.join(Config.paths.misc, template.name);
+						fs.readFile(template.name, (err, data) => {
 							return nextTemplate(err, data);
 						});
 					}, (err, templates) => {
 						if(err) {
-							return Errors.General(err.message);
+							return callback(Errors.General(err.message));
 						}
 
 						//	decode + ensure DOS style CRLF
@@ -69,14 +83,16 @@ module.exports = function exportFileList(filterCriteria, options, cb) {
 
 						//	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
 						let descIndent = 0;
-						splitTextAtTerms(templates[1]).some(line => {
-							const pos = line.indexOf('{fileDesc}');
-							if(pos > -1) {
-								descIndent = pos;
-								return true;	//	found it!
-							}
-							return false;	//	keep looking
-						});
+						if(!options.escapeDesc) {
+							splitTextAtTerms(templates[1]).some(line => {
+								const pos = line.indexOf('{fileDesc}');
+								if(pos > -1) {
+									descIndent = pos;
+									return true;	//	found it!
+								}
+								return false;	//	keep looking
+							});
+						}
 
 						return callback(null, templates[0], templates[1], descIndent);
 					});
@@ -123,6 +139,14 @@ module.exports = function exportFileList(filterCriteria, options, cb) {
 						totals.bytes += fileInfo.meta.byte_size;
 
 						const appendFileInfo = () => {
+							if(options.escapeDesc) {
+								formatObj.fileDesc = formatObj.fileDesc.replace(/\r?\n/g, options.escapeDesc);
+							}
+
+							if(options.maxDescLen) {
+								formatObj.fileDesc = formatObj.fileDesc.slice(0, options.maxDescLen);
+							}
+
 							listBody += stringFormat(entryTemplate, formatObj);
 
 							state.current	= current;
@@ -222,4 +246,54 @@ module.exports = function exportFileList(filterCriteria, options, cb) {
 			return cb(err, listBody);
 		}
 	);
-};
+}
+
+function updateFileBaseDescFilesScheduledEvent(args, cb) {
+	//
+	//	For each area, loop over storage locations and build
+	//	DESCRIPT.ION file to store in the same directory.
+	//
+	//	Standard-ish 4DOS spec is as such:
+	//	* Entry: <QUOTED_LFN> <DESC>[0x04<AppData>]\r\n
+	//	* Multi line descriptions are stored with *escaped* \r\n pairs
+	//	* Default template uses 0x2c for <AppData> as per https://stackoverflow.com/questions/1810398/descript-ion-file-spec
+	//
+	const entryTemplate 	= args[0];
+	const headerTemplate	= args[1];
+
+	const areas = FileArea.getAvailableFileAreas(null, { skipAcsCheck : true });
+	async.each(areas, (area, nextArea) => {
+		const storageLocations = FileArea.getAreaStorageLocations(area);
+
+		async.each(storageLocations, (storageLoc, nextStorageLoc) => {
+			const filterCriteria = {
+				areaTag		: area.areaTag,
+				storageTag	: storageLoc.storageTag,
+			};
+
+			const exportOpts = {
+				headerTemplate	: headerTemplate,
+				entryTemplate	: entryTemplate,
+				escapeDesc		: true,	//	escape CRLF's
+				maxDescLen		: 4096,	//	DESCRIPT.ION: "The line length limit is 4096 bytes"
+			};
+
+			exportFileList(filterCriteria, exportOpts, (err, listBody) => {
+
+				const descIonPath = paths.join(storageLoc.dir, 'DESCRIPT.ION');
+				fs.writeFile(descIonPath, iconv.encode(listBody, 'cp437'), err => {
+					if(err) {
+						Log.warn( { error : err.message, path : descIonPath }, 'Failed (re)creating DESCRIPT.ION');
+					} else {
+						Log.debug( { path : descIonPath }, '(Re)generated DESCRIPT.ION');
+					}
+					return nextStorageLoc(null);
+				});
+			});
+		}, () => {
+			return nextArea(null);
+		});
+	}, () => {
+		return cb(null);
+	});
+}
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 4a2d0c4b..686833e5 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -2,15 +2,15 @@
 'use strict';
 
 //	ENiGMA½
-const { MenuModule }	= require('./menu_module.js');
-const FileEntry			= require('./file_entry.js');
-const FileArea			= require('./file_base_area.js');
-const { renderSubstr }	= require('./string_util.js');
-const { Errors }		= require('./enig_error.js');
-const Events			= require('./events.js');
-const Log				= require('./logger.js').log;
-const DownloadQueue		= require('./download_queue.js');
-const exportFileList	 = require('./file_base_list_export.js');
+const { MenuModule }		= require('./menu_module.js');
+const FileEntry				= require('./file_entry.js');
+const FileArea				= require('./file_base_area.js');
+const { renderSubstr }		= require('./string_util.js');
+const { Errors }			= require('./enig_error.js');
+const Events				= require('./events.js');
+const Log					= require('./logger.js').log;
+const DownloadQueue			= require('./download_queue.js');
+const { exportFileList }	= require('./file_base_list_export.js');
 
 //	deps
 const _					= require('lodash');
diff --git a/misc/descript_ion_export_entry_template.asc b/misc/descript_ion_export_entry_template.asc
new file mode 100644
index 00000000..e7618280
--- /dev/null
+++ b/misc/descript_ion_export_entry_template.asc
@@ -0,0 +1 @@
+"{fileName}" {fileDesc}Â

From 6311198f4d54938a0493dedff33838c863ae41ae Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Mar 2018 22:55:10 -0600
Subject: [PATCH 0222/1013] Schedule that actually is valid...

---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index cd87c771..d153d4cb 100644
--- a/core/config.js
+++ b/core/config.js
@@ -741,7 +741,7 @@ function getDefaultConfig() {
 				},
 
 				updateDescriptIonFiles : {
-					schedule	: 'every 168 hours',	//	once a week
+					schedule	: 'on the last day of the week',
 					action		: '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
 				}
 			}

From 91bbc2e5fea4426b39724d6155aa057d3552413e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Mar 2018 18:59:47 -0600
Subject: [PATCH 0223/1013] DESCRIPT.ION generation disabled by default

---
 core/config.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/config.js b/core/config.js
index d153d4cb..7e5d92a1 100644
--- a/core/config.js
+++ b/core/config.js
@@ -740,10 +740,16 @@ function getDefaultConfig() {
 					args		: [ '24 hours' ]	//	items older than this will be removed
 				},
 
+				//
+				//	Enable the following entry in your config.hjson to periodically create/update
+				//	DESCRIPT.ION files for your file base
+				//
+				/*
 				updateDescriptIonFiles : {
 					schedule	: 'on the last day of the week',
 					action		: '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
 				}
+				*/
 			}
 		},
 

From 534b51933a369e31ea769c61e93dc19972cd673c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Mar 2018 19:00:34 -0600
Subject: [PATCH 0224/1013] Register key press handler - oops!

---
 core/file_base_user_list_export.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 686833e5..2dba52ad 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -157,6 +157,8 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 					//	this may take quite a while; temp disable of idle monitor
 					self.client.stopIdleMonitor();
 
+					self.client.on('key press', keyPressHandler);
+
 					const filterCriteria = Object.assign({}, self.config.filterCriteria);
 					if(!filterCriteria.areaTag) {
 						filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);

From 66423068b1b9c42244b4f41fc9f56bc18cc1b68a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Mar 2018 19:10:20 -0600
Subject: [PATCH 0225/1013] Crash on delete in BBS List with zero entries #156

---
 core/bbs_list.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/bbs_list.js b/core/bbs_list.js
index 74c792c6..abff376f 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -99,6 +99,10 @@ exports.getModule = class BBSListModule extends MenuModule {
 				self.displayAddScreen(cb);
 			},
 			deleteBBS : function(formData, extraArgs, cb) {
+				if(!_.isNumber(self.selectedBBS) || 0 === self.entries.length) {
+					return cb(null);
+				}
+
 				const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
 
 				if(self.entries[self.selectedBBS].submitterUserId !== self.client.user.userId && !self.client.user.isSysOp()) {
@@ -323,6 +327,7 @@ exports.getModule = class BBSListModule extends MenuModule {
 						entriesView.setFocusItemIndex(self.selectedBBS);
 						self.drawSelectedEntry(self.entries[self.selectedBBS]);
 					} else if (self.entries.length > 0) {
+						self.selectedBBS = 0;
 						entriesView.setFocusItemIndex(0);
 						self.drawSelectedEntry(self.entries[0]);
 					}

From 4acbae86e36b4d44091734f7ab87326cab30375e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Mar 2018 19:22:26 -0600
Subject: [PATCH 0226/1013] Crash on configuration when theme no longer exists
 #157

---
 core/user_config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/user_config.js b/core/user_config.js
index 70e1f068..f60d2155 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -174,9 +174,9 @@ exports.getModule = class UserConfigModule extends MenuModule {
 							};
 						}), 'name');
 
-						currentThemeIdIndex = _.findIndex(self.availThemeInfo, function cmp(ti) {
+						currentThemeIdIndex = Math.max(0, _.findIndex(self.availThemeInfo, function cmp(ti) {
 							return ti.themeId === self.client.user.properties.theme_id;
-						});
+						}));
 
 						callback(null);
 					},

From 290b391bf84921dc4079e2c6be42bf74d1f92040 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Mar 2018 20:26:40 -0600
Subject: [PATCH 0227/1013] Fix TypeError: cb is not a function during ping

---
 core/servers/login/websocket.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 378af7ef..cc0270b1 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -77,7 +77,7 @@ function WebSocketClient(ws, req, serverType) {
 	//
 	//	Montior connection status with ping/pong
 	//
-	ws.on('pong', () => { 
+	ws.on('pong', () => {
 		Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
 		ws.isConnectionAlive = true;
 	});
@@ -187,13 +187,13 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 						}
 
 						ws.isConnectionAlive = false;	//	pong will reset this
-						
+
 						Log.trace('Ping to remote WebSocket client');
-						return ws.ping('', false, true);
+						return ws.ping('', false);	//	false=don't mask
 					});
 				}
 			});
-		}, 30000);	
+		}, 30000);
 
 		return true;
 	}

From 299d524b794bb02ec400a0eb757a2fb691d16f15 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Wed, 14 Mar 2018 22:51:08 -0400
Subject: [PATCH 0228/1013] Added widths to keep text within theme borders

---
 art/themes/luciano_blocktronics/theme.hjson | 52 ++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 3b6e91aa..e6662c2c 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -88,11 +88,11 @@
 
 			fullLoginSequenceOnelinerz: {
 				config: {
-					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.58}"
+					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.59}"
 				}
 				0: {
 					mci: {
-						VM1: { height: 10 }
+						VM1: { height: 10, width: 20 }
 						TM2: {
 							focusTextStyle: first lower
 						}						
@@ -111,14 +111,14 @@
 
 			mainMenuUserStats: {
 				mci: {
-					UN1: { width: 17 }
-					UR2: { width: 17 }
-					LO3: { width: 17 }
-					UF4: { width: 17 }
-					UG5: { width: 17 }
-					UT6: { width: 17 }
-					UC7: { width: 17 }
-					ST8: { width: 17 }
+					UN1: { width: 15 }
+					UR2: { width: 15 }
+					LO3: { width: 15 }
+					UF4: { width: 15 }
+					UG5: { width: 15 }
+					UT6: { width: 15 }
+					UC7: { width: 15 }
+					ST8: { width: 15 }
 				}
 			}
 
@@ -143,7 +143,7 @@
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 10 }
+					VM1: { height: 10, width: 20 }
 				}
 			}
 
@@ -154,7 +154,7 @@
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 15 }
+					VM1: { height: 15, width: 50}
 				}
 			}
 
@@ -163,7 +163,7 @@
 					listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
 				}
 				mci: {
-					VM1: { height: 10 }
+					VM1: { height: 10, width: 20 }
 				}
 			}
 
@@ -185,11 +185,11 @@
 			mainMenuOnelinerz: {
 				//	:TODO: Need way to just duplicate entry here & in menu.hjson, e.g. use: someName + must supply next/etc. in menu
 				config: {
-					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.58}"
+					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.59}"
 				}
 				0: {
 					mci: {
-						VM1: { height: 10 }
+						VM1: { height: 10, width: 10 }
 						TM2: {
 							focusTextStyle: first lower
 						}						
@@ -280,7 +280,7 @@
 				}
 				0: {
 					mci: {
-						VM1: { height: 14 }
+						VM1: { height: 14, width: 60}
 						TM2: {
 							focusTextStyle: upper
 							items: [ "yes", "no" ]
@@ -415,7 +415,7 @@
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 10 }
+					VM1: { height: 10, width: 20 }
 				}
 			}
 
@@ -424,7 +424,7 @@
 					listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
 				}
 				mci: {
-					VM1: { height: 10 }
+					VM1: { height: 10, width: 20 }
 				}
 			}
 
@@ -434,14 +434,14 @@
 
 			fullLoginSequenceUserStats: {
 				mci: {
-					UN1: { width: 17 }
-					UR2: { width: 17 }
-					LO3: { width: 17 }
-					UF4: { width: 17 }
-					UG5: { width: 17 }
-					UT6: { width: 17 }
-					UC7: { width: 17 }
-					ST8: { width: 17 }
+					UN1: { width: 15 }
+					UR2: { width: 15 }
+					LO3: { width: 15 }
+					UF4: { width: 15 }
+					UG5: { width: 15 }
+					UT6: { width: 15 }
+					UC7: { width: 15 }
+					ST8: { width: 15 }
 				}
 			}
 

From 18284d80386f838494278e3e4d3c0503594a2719 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Mar 2018 21:33:58 -0600
Subject: [PATCH 0229/1013] Merge minor theme stuff

---
 art/themes/luciano_blocktronics/theme.hjson | 2 +-
 core/text_view.js                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index e6662c2c..9a8d3b6c 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -280,7 +280,7 @@
 				}
 				0: {
 					mci: {
-						VM1: { height: 14, width: 60}
+						VM1: { height: 14, width: 70 }
 						TM2: {
 							focusTextStyle: upper
 							items: [ "yes", "no" ]
diff --git a/core/text_view.js b/core/text_view.js
index 8de04484..9497a16b 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -129,7 +129,8 @@ function TextView(options) {
 				renderedFillChar, //this.fillChar,
 				this.justify,
 				this.hasFocus ? this.getFocusSGR() : this.getSGR(),
-				this.getStyleSGR(1) || this.getSGR()
+				this.getStyleSGR(1) || this.getSGR(),
+				true	//	use render len
 			),
 			false	//	no converting CRLF needed
 		);

From f7639c90e51c98ee1122dddc3c2e34e12ae2afd8 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Thu, 15 Mar 2018 00:22:33 -0400
Subject: [PATCH 0230/1013] fixed mispelling of "reset"

---
 .../luciano_blocktronics/FORGOTPWSENT.ANS       | Bin 311 -> 313 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/FORGOTPWSENT.ANS b/art/themes/luciano_blocktronics/FORGOTPWSENT.ANS
index 99219c10e33321748bba3da1002be96392e7857e..c0ebbfd96b08ca66364d88a07c32798d38e8ad89 100644
GIT binary patch
delta 42
ycmdnaw3BIq9AoN4x#?VbTvEY~q0X)b1``i@@F*xK7#SFv8yFdx?Vc>es0sl7hzlG5

delta 37
tcmdnVw4G^!+(h~5oLo}Dj-k%31_l!kdT}Wj85o)y7#W%EoGikq3INf73P=C|


From 66f444d4fb4b9d9b462204f49b033789414075d6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Mar 2018 13:48:11 -0600
Subject: [PATCH 0231/1013] Slight findFiles optimization

---
 core/file_entry.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 2ec03c17..169bbb74 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -483,7 +483,7 @@ module.exports = class FileEntry {
 					sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
 				} else {
 					sql =
-						`SELECT DISTINCT f.file_id, f.${filter.sort}
+						`SELECT DISTINCT f.file_id
 						FROM file f`;
 
 					sqlOrderBy = getOrderByWithCast(`f.${filter.sort}`) +  ' ' + sqlOrderDir;
@@ -579,13 +579,14 @@ module.exports = class FileEntry {
 
 		sql += ';';
 
-		const matchingFileIds = [];
-		fileDb.each(sql, (err, fileId) => {
-			if(fileId) {
-				matchingFileIds.push(fileId.file_id);
+		fileDb.all(sql, (err, rows) => {
+			if(err) {
+				return cb(err);
 			}
-		}, err => {
-			return cb(err, matchingFileIds);
+			if(!rows || 0 === rows.length) {
+				return cb(null, []);	//	no matches
+			}
+			return cb(null, rows.map(r => r.file_id));
 		});
 	}
 

From 7bd980c8864e0db5acc12b3e6ba062cfbe6ed27c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 22 Mar 2018 20:48:31 -0600
Subject: [PATCH 0232/1013] Crash with color differences in same variable #164

---
 core/msg_area_list.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index fcc44b23..8238e4b6 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -8,6 +8,7 @@ const messageArea			= require('./message_area.js');
 const displayThemeArt		= require('./theme.js').displayThemeArt;
 const resetScreen			= require('./ansi_term.js').resetScreen;
 const stringFormat			= require('./string_format.js');
+const Errors				= require('./enig_error.js').Errors;
 
 //	deps
 const async				= require('async');
@@ -139,6 +140,9 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 						const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
 
 						const areaListView = vc.getView(MciViewIds.AreaList);
+						if(!areaListView) {
+							return callback(Errors.MissingMci('A MenuView compatible MCI code is required'));
+						}
 						let i = 1;
 						areaListView.setItems(_.map(self.messageAreas, v => {
 							return stringFormat(listFormat, {

From b1423fdb10454d2dd2dce27101c39bb795d22287 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 00:54:14 -0400
Subject: [PATCH 0233/1013] Set theme jekyll-theme-hacker


From 0e15c2f9a6fa97a18e8c0c5f76d6b92a9157c298 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 00:57:32 -0400
Subject: [PATCH 0234/1013] Added Windows info

---
 docs/installation/os-hardware.md | 35 +++++-----------------
 docs/installation/rpi.md         | 32 ++++++++++++++++++++
 docs/installation/windows.md     | 50 ++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 28 deletions(-)
 create mode 100644 docs/installation/rpi.md
 create mode 100644 docs/installation/windows.md

diff --git a/docs/installation/os-hardware.md b/docs/installation/os-hardware.md
index 21eac4d9..f50107ca 100644
--- a/docs/installation/os-hardware.md
+++ b/docs/installation/os-hardware.md
@@ -1,32 +1,11 @@
 ---
 layout: page
-title: OS & Hardware Specific Information
+title: OS/Hardware Specific
 ---
-## Raspberry Pi
+There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do 
+things manually versus have it automated for you.
 
-All Raspberry Pi models work great with ENiGMA½! Keep in mind compiling the dependencies with 
-`npm install` will take some time and *may* appear to hang. It's still working - just be patient and let it
-complete.
-
-### Basic Instructions
-
-1. Download [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/). Follow the instructions
-on the [Raspbian site](https://www.raspberrypi.org/documentation/installation/installing-images/README.md) regarding how
-to get it written to an SD card.
-
-2. Run `sudo raspi-config`, then:
-    1. Set your timezone (option 4, option I2)
-    2. Enable SSH (option 5, option P2)
-    3. Expand the filesystem to use the entire SD card (option 7, option A1)
-
-3. Update & upgrade all packages: `apt-get update && apt-get upgrade`
-    
-4. Install required packages: `sudo apt install lrzsz p7zip-full`
-
-5. Follow the [installation instructions](/installation) to install ENiGMA½.
-
-6. Profit!
-
-## Windows
-
-Needs more info, please submit a PR!
\ No newline at end of file
+| Method                                 | Operating System Compatibility                 | Notes                                                                                       |     
+|----------------------------------------|------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [Raspberry Pi](rpi)  | Linux, BSD, OSX                                | All Raspberry Pi models work great with ENiGMA½! |
+| [Windows](windows)                | Windows                       | Easy upgrades, compatible with all operating systems, no dependencies to install            |
diff --git a/docs/installation/rpi.md b/docs/installation/rpi.md
new file mode 100644
index 00000000..21eac4d9
--- /dev/null
+++ b/docs/installation/rpi.md
@@ -0,0 +1,32 @@
+---
+layout: page
+title: OS & Hardware Specific Information
+---
+## Raspberry Pi
+
+All Raspberry Pi models work great with ENiGMA½! Keep in mind compiling the dependencies with 
+`npm install` will take some time and *may* appear to hang. It's still working - just be patient and let it
+complete.
+
+### Basic Instructions
+
+1. Download [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/). Follow the instructions
+on the [Raspbian site](https://www.raspberrypi.org/documentation/installation/installing-images/README.md) regarding how
+to get it written to an SD card.
+
+2. Run `sudo raspi-config`, then:
+    1. Set your timezone (option 4, option I2)
+    2. Enable SSH (option 5, option P2)
+    3. Expand the filesystem to use the entire SD card (option 7, option A1)
+
+3. Update & upgrade all packages: `apt-get update && apt-get upgrade`
+    
+4. Install required packages: `sudo apt install lrzsz p7zip-full`
+
+5. Follow the [installation instructions](/installation) to install ENiGMA½.
+
+6. Profit!
+
+## Windows
+
+Needs more info, please submit a PR!
\ No newline at end of file
diff --git a/docs/installation/windows.md b/docs/installation/windows.md
new file mode 100644
index 00000000..9cb80108
--- /dev/null
+++ b/docs/installation/windows.md
@@ -0,0 +1,50 @@
+---
+layout: page
+title: Windows Full Install
+---
+## Windows
+
+ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doors naively then you should use a 32 bit Windows.  
+
+
+### Basic Instructions
+
+1. Download and Install [Node.JS](https://nodejs.org/en/download/). 
+
+	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method.
+
+		`Run PowerShell as Administrator
+
+		Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
+		npm install -g npm-windows-upgrade
+
+		npm-windows-upgrade`
+	 
+		Note: Do not run npm i -g npm. Instead use npm-windows-upgrade to update npm going forward. 
+		Also if you run the NodeJS installer, it will replace the node version.:
+
+
+	2. Install [windows-build-tools for npm] (https://www.npmjs.com/package/windows-build-tools)
+		'npm install --global --production windows-build-tools'
+		*This will also install python 2.7
+
+2. Install [7zip] (https://www.7-zip.org/download.html).
+	*Add 7zip to your path so 7z can be called from the console
+
+3. Install [Git] (https://git-scm.com/downloads) and optionally [TortoiseGit] (https://tortoisegit.org/download/). 
+
+4. Clone Enigma - browse to the directory you want and run "git clone https://github.com/NuSkooler/enigma-bbs.git"
+	Optionally use the tortoisegit gui by right clicking the directory and run git clone in the menu
+    
+
+5. Install ENiGMA½.
+	1. In the enigma directory run 'npm install'
+	2. Generate your initial configuration:
+		'node .\oputil.js config new'
+		Follow the prompts!
+	3. Edit any configuration files
+	4. Run ENiGMA½
+		'node .\main.js'
+	
+
+6. Profit!

From 37d27bb735de22581a03d88886847ff59dbce15f Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:01:31 -0400
Subject: [PATCH 0235/1013] Added links in nav bar

---
 docs/_includes/nav.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 168e1cf5..30dc21f5 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -4,8 +4,8 @@
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
     - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
-      - Raspberry Pi 
-      - Windows
+      - [Raspberry Pi] ({{ site.baseurl }}{% link installation/rpi.md %})  
+      - [Windows]({{ site.baseurl }}{% link installation/windows.md %})  
     - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
     - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})
     - [Production Installation]({{ site.baseurl }}{% link installation/production.md %})

From 77a1f2b38b2e1b6304670d7c61bbce171e1f14c4 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:03:58 -0400
Subject: [PATCH 0236/1013] Remove Space

---
 docs/_includes/nav.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 30dc21f5..dacb2f00 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -4,7 +4,7 @@
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
     - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
-      - [Raspberry Pi] ({{ site.baseurl }}{% link installation/rpi.md %})  
+      - [Raspberry Pi]({{ site.baseurl }}{% link installation/rpi.md %})  
       - [Windows]({{ site.baseurl }}{% link installation/windows.md %})  
     - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
     - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})

From b3fee74a90dbab39ac10cce25024ccd57bcfa541 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:07:22 -0400
Subject: [PATCH 0237/1013] test

---
 docs/_includes/nav.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index dacb2f00..128cb66d 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -4,7 +4,7 @@
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
     - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
-      - [Raspberry Pi]({{ site.baseurl }}{% link installation/rpi.md %})  
+      - [Raspberry Pi]({{ site.baseurl }}{% link installation/windows.md %})  
       - [Windows]({{ site.baseurl }}{% link installation/windows.md %})  
     - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
     - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})

From 7e3d8cbaf1b84e6319cec89cc2a09f92dba19b7d Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:08:40 -0400
Subject: [PATCH 0238/1013] try 2

---
 docs/_includes/nav.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 128cb66d..dacb2f00 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -4,7 +4,7 @@
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
     - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
-      - [Raspberry Pi]({{ site.baseurl }}{% link installation/windows.md %})  
+      - [Raspberry Pi]({{ site.baseurl }}{% link installation/rpi.md %})  
       - [Windows]({{ site.baseurl }}{% link installation/windows.md %})  
     - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
     - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})

From 26bdd8b7c78a1e9f8aad61a08161ce87601d64e2 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:12:25 -0400
Subject: [PATCH 0239/1013] Update rpi.md

---
 docs/installation/rpi.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/installation/rpi.md b/docs/installation/rpi.md
index 21eac4d9..570d0f6a 100644
--- a/docs/installation/rpi.md
+++ b/docs/installation/rpi.md
@@ -26,7 +26,3 @@ to get it written to an SD card.
 5. Follow the [installation instructions](/installation) to install ENiGMA½.
 
 6. Profit!
-
-## Windows
-
-Needs more info, please submit a PR!
\ No newline at end of file

From 6cd88178d639c52aef6612f08339c6bf2ef41322 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:14:10 -0400
Subject: [PATCH 0240/1013] fixed links

---
 docs/installation/windows.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 9cb80108..a7885573 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -24,14 +24,14 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 		Also if you run the NodeJS installer, it will replace the node version.:
 
 
-	2. Install [windows-build-tools for npm] (https://www.npmjs.com/package/windows-build-tools)
+	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
 		'npm install --global --production windows-build-tools'
 		*This will also install python 2.7
 
-2. Install [7zip] (https://www.7-zip.org/download.html).
+2. Install [7zip](https://www.7-zip.org/download.html).
 	*Add 7zip to your path so 7z can be called from the console
 
-3. Install [Git] (https://git-scm.com/downloads) and optionally [TortoiseGit] (https://tortoisegit.org/download/). 
+3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 
 4. Clone Enigma - browse to the directory you want and run "git clone https://github.com/NuSkooler/enigma-bbs.git"
 	Optionally use the tortoisegit gui by right clicking the directory and run git clone in the menu

From bd519430cef846ece9dd93f301b5736557bb0cb5 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:19:50 -0400
Subject: [PATCH 0241/1013] Update windows.md

---
 docs/installation/windows.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index a7885573..3eb0ccc4 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -29,6 +29,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 		*This will also install python 2.7
 
 2. Install [7zip](https://www.7-zip.org/download.html).
+
 	*Add 7zip to your path so 7z can be called from the console
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 

From 341a0a6be89e954b7aba6ace52f3c28634a75a1f Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:22:19 -0400
Subject: [PATCH 0242/1013] Update windows.md

---
 docs/installation/windows.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 3eb0ccc4..56a610c6 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -13,15 +13,14 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method.
 
-		`Run PowerShell as Administrator
+	`Run PowerShell as Administrator
+	
+	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
+	npm install -g npm-windows-upgrade
+	npm-windows-upgrade`
 
-		Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
-		npm install -g npm-windows-upgrade
-
-		npm-windows-upgrade`
-	 
-		Note: Do not run npm i -g npm. Instead use npm-windows-upgrade to update npm going forward. 
-		Also if you run the NodeJS installer, it will replace the node version.:
+	Note: Do not run npm i -g npm. Instead use npm-windows-upgrade to update npm going forward. 
+	Also if you run the NodeJS installer, it will replace the node version.:
 
 
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)

From 731c2124131061587174200341007f4cde4ee92f Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:25:12 -0400
Subject: [PATCH 0243/1013] Update windows.md

---
 docs/installation/windows.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 56a610c6..f06c4034 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -13,11 +13,13 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method.
 
-	`Run PowerShell as Administrator
+	```Powershell
+	*Run PowerShell as Administrator
 	
 	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 	npm install -g npm-windows-upgrade
-	npm-windows-upgrade`
+	npm-windows-upgrade
+	```
 
 	Note: Do not run npm i -g npm. Instead use npm-windows-upgrade to update npm going forward. 
 	Also if you run the NodeJS installer, it will replace the node version.:

From e45cba10a02a0a925f7359c82b86793c60cd92ff Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:26:48 -0400
Subject: [PATCH 0244/1013] Update windows.md

---
 docs/installation/windows.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index f06c4034..57b5ee0b 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -26,8 +26,11 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
-		'npm install --global --production windows-build-tools'
-		*This will also install python 2.7
+	*This will also install python 2.7
+		```Powershell
+		npm install --global --production windows-build-tools
+		```
+		
 
 2. Install [7zip](https://www.7-zip.org/download.html).
 

From 1568a718c9ac34026a46d1a832f7e75c9cd5ea5e Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:29:19 -0400
Subject: [PATCH 0245/1013] Update windows.md

---
 docs/installation/windows.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 57b5ee0b..40c4b6db 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -38,14 +38,19 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 
-4. Clone Enigma - browse to the directory you want and run "git clone https://github.com/NuSkooler/enigma-bbs.git"
-	Optionally use the tortoisegit gui by right clicking the directory and run git clone in the menu
+4. Clone Enigma - browse to the directory you want and run 
+	```Powershell
+	git clone "https://github.com/NuSkooler/enigma-bbs.git"
+	```
+	Optionally use the TortoiseGit by right clicking the directory and slecting "Git Clone...".
     
 
 5. Install ENiGMA½.
 	1. In the enigma directory run 'npm install'
 	2. Generate your initial configuration:
-		'node .\oputil.js config new'
+	```Powershell
+		node .\oputil.js config new
+	```
 		Follow the prompts!
 	3. Edit any configuration files
 	4. Run ENiGMA½

From 53f40187bee7ab221bb9183bf6a0c2b31665c1d3 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:30:38 -0400
Subject: [PATCH 0246/1013] Update windows.md

---
 docs/installation/windows.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 40c4b6db..ba3c6feb 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -54,7 +54,9 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 		Follow the prompts!
 	3. Edit any configuration files
 	4. Run ENiGMA½
-		'node .\main.js'
+	```Powershell
+		node .\main.js
+	```
 	
 
 6. Profit!

From 2756c1730ea6e47b334d7380e482f37441244fdc Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:35:07 -0400
Subject: [PATCH 0247/1013] Update windows.md

---
 docs/installation/windows.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index ba3c6feb..1fcc4823 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -35,6 +35,11 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 2. Install [7zip](https://www.7-zip.org/download.html).
 
 	*Add 7zip to your path so 7z can be called from the console
+	1. Right click "This PC" and Select "Properties"
+	2. Go to the Advanced Tab and click on "Enviromental Varibles"
+	3. Select Path under System Varibles and click Edit
+	4. Click New and paste the path to 7zip
+	5. Close your console window and reopen. You can type 7z to make sure it's working.
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 

From 2cd1e5f102feef911a5db6cfbb34b18cd4dd7f82 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:39:45 -0400
Subject: [PATCH 0248/1013] Update rpi.md

---
 docs/installation/rpi.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/rpi.md b/docs/installation/rpi.md
index 570d0f6a..998b741b 100644
--- a/docs/installation/rpi.md
+++ b/docs/installation/rpi.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: OS & Hardware Specific Information
+title: Raspberry Pi
 ---
 ## Raspberry Pi
 

From 7495cfb3851e448e7136e4218a23893a72f3a31d Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:39:52 -0400
Subject: [PATCH 0249/1013] Update os-hardware.md

---
 docs/installation/os-hardware.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/installation/os-hardware.md b/docs/installation/os-hardware.md
index f50107ca..15237ff9 100644
--- a/docs/installation/os-hardware.md
+++ b/docs/installation/os-hardware.md
@@ -1,11 +1,11 @@
 ---
 layout: page
-title: OS/Hardware Specific
+title: OS & Hardware Specific Information
 ---
 There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do 
 things manually versus have it automated for you.
 
-| Method                                 | Operating System Compatibility                 | Notes                                                                                       |     
-|----------------------------------------|------------------------------------------------|---------------------------------------------------------------------------------------------|
-| [Raspberry Pi](rpi)  | Linux, BSD, OSX                                | All Raspberry Pi models work great with ENiGMA½! |
-| [Windows](windows)                | Windows                       | Easy upgrades, compatible with all operating systems, no dependencies to install            |
+| Method                                 | Notes                                                                                       |     
+|----------------------------------------|---------------------------------------------------------------------------------------------|
+| [Raspberry Pi](rpi)  | All Raspberry Pi models work great with ENiGMA½! |
+| [Windows](windows)   | Compatible with all windows operating systems            |

From c85568b2922d799512ffbf63924b36035b8da39d Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:40:22 -0400
Subject: [PATCH 0250/1013] Update rpi.md

---
 docs/installation/rpi.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/installation/rpi.md b/docs/installation/rpi.md
index 998b741b..fb8ff235 100644
--- a/docs/installation/rpi.md
+++ b/docs/installation/rpi.md
@@ -2,7 +2,6 @@
 layout: page
 title: Raspberry Pi
 ---
-## Raspberry Pi
 
 All Raspberry Pi models work great with ENiGMA½! Keep in mind compiling the dependencies with 
 `npm install` will take some time and *may* appear to hang. It's still working - just be patient and let it

From 862f31539bba37b7422244de46a28f1074af5fad Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:41:40 -0400
Subject: [PATCH 0251/1013] Update os-hardware.md

---
 docs/installation/os-hardware.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/os-hardware.md b/docs/installation/os-hardware.md
index 15237ff9..a49283b4 100644
--- a/docs/installation/os-hardware.md
+++ b/docs/installation/os-hardware.md
@@ -8,4 +8,4 @@ things manually versus have it automated for you.
 | Method                                 | Notes                                                                                       |     
 |----------------------------------------|---------------------------------------------------------------------------------------------|
 | [Raspberry Pi](rpi)  | All Raspberry Pi models work great with ENiGMA½! |
-| [Windows](windows)   | Compatible with all windows operating systems            |
+| [Windows](windows)   | Compatible with all Windows Operating Systems    |

From ce0ee8639ac28db4dfdc587a13911cee124e953a Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:42:23 -0400
Subject: [PATCH 0252/1013] Update windows.md

---
 docs/installation/windows.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 1fcc4823..fbf8cc17 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -2,7 +2,6 @@
 layout: page
 title: Windows Full Install
 ---
-## Windows
 
 ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doors naively then you should use a 32 bit Windows.  
 

From 3f2821440c9df1aabe969548fd8fd1572e9fb7f7 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:46:56 -0400
Subject: [PATCH 0253/1013] Update windows.md

---
 docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index fbf8cc17..354f6252 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -3,7 +3,7 @@ layout: page
 title: Windows Full Install
 ---
 
-ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doors naively then you should use a 32 bit Windows.  
+ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doors natively then you should use a 32 bit Windows.  
 
 
 ### Basic Instructions

From 940cb016b3f76f2bc57b09b107b32d568da83356 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:54:34 -0400
Subject: [PATCH 0254/1013] Update windows.md

---
 docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 354f6252..3d802ce4 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -50,7 +50,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
     
 
 5. Install ENiGMA½.
-	1. In the enigma directory run 'npm install'
+	1. In the enigma directory run `npm install`
 	2. Generate your initial configuration:
 	```Powershell
 		node .\oputil.js config new

From 79b82efbdeb3fc88a5540e6a2dd3af2fedd61c7c Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:56:40 -0400
Subject: [PATCH 0255/1013] Update windows.md

---
 docs/installation/windows.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 3d802ce4..db26b0a6 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -12,18 +12,18 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method.
 
+	`*Run PowerShell as Administrator`
+
 	```Powershell
-	*Run PowerShell as Administrator
 	
 	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 	npm install -g npm-windows-upgrade
 	npm-windows-upgrade
 	```
 
-	Note: Do not run npm i -g npm. Instead use npm-windows-upgrade to update npm going forward. 
+	Note: Do not run `npm i -g npm`. Instead use `npm-windows-upgrade` to update npm going forward. 
 	Also if you run the NodeJS installer, it will replace the node version.:
 
-
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
 	*This will also install python 2.7
 		```Powershell

From f00bf71b5b131feaba0f304d3e7421e8d4de10f5 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:58:56 -0400
Subject: [PATCH 0256/1013] Update windows.md

---
 docs/installation/windows.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index db26b0a6..20378591 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -34,10 +34,10 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 2. Install [7zip](https://www.7-zip.org/download.html).
 
 	*Add 7zip to your path so 7z can be called from the console
-	1. Right click "This PC" and Select "Properties"
-	2. Go to the Advanced Tab and click on "Enviromental Varibles"
-	3. Select Path under System Varibles and click Edit
-	4. Click New and paste the path to 7zip
+	1. Right click `This PC` and Select `Properties`
+	2. Go to the `Advanced` Tab and click on `Enviromental Varibles`
+	3. Select `Path` under `System Varibles` and click `Edit`
+	4. Click `New` and paste the path to 7zip
 	5. Close your console window and reopen. You can type 7z to make sure it's working.
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
@@ -46,7 +46,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 	```Powershell
 	git clone "https://github.com/NuSkooler/enigma-bbs.git"
 	```
-	Optionally use the TortoiseGit by right clicking the directory and slecting "Git Clone...".
+	Optionally use the TortoiseGit by right clicking the directory and slecting `Git Clone...`.
     
 
 5. Install ENiGMA½.

From 04fcd3e6a76d392c29a9c4c153b78d90ffedfd41 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 01:59:47 -0400
Subject: [PATCH 0257/1013] Update windows.md

---
 docs/installation/windows.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 20378591..1531dc7b 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -15,7 +15,6 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 	`*Run PowerShell as Administrator`
 
 	```Powershell
-	
 	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 	npm install -g npm-windows-upgrade
 	npm-windows-upgrade
@@ -25,7 +24,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 	Also if you run the NodeJS installer, it will replace the node version.:
 
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
-	*This will also install python 2.7
+	`*This will also install python 2.7`
 		```Powershell
 		npm install --global --production windows-build-tools
 		```

From 51434774a984bfc9cd8aca7cff6c7cb4f4f61786 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:00:41 -0400
Subject: [PATCH 0258/1013] Update windows.md

---
 docs/installation/windows.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 1531dc7b..4c33a528 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -49,7 +49,8 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
     
 
 5. Install ENiGMA½.
-	1. In the enigma directory run `npm install`
+	1. In the enigma directory run 
+	```npm install```
 	2. Generate your initial configuration:
 	```Powershell
 		node .\oputil.js config new

From c2ccaf90d7ca4f90a45f9cd1dc7c508b264b10c0 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:03:27 -0400
Subject: [PATCH 0259/1013] Update windows.md

---
 docs/installation/windows.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 4c33a528..0b991923 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -3,7 +3,7 @@ layout: page
 title: Windows Full Install
 ---
 
-ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doors natively then you should use a 32 bit Windows.  
+ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit doors natively then you should use a 32bit Windows.  
 
 
 ### Basic Instructions
@@ -32,7 +32,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 2. Install [7zip](https://www.7-zip.org/download.html).
 
-	*Add 7zip to your path so 7z can be called from the console
+	*Add 7zip to your path so `7z` can be called from the console
 	1. Right click `This PC` and Select `Properties`
 	2. Go to the `Advanced` Tab and click on `Enviromental Varibles`
 	3. Select `Path` under `System Varibles` and click `Edit`
@@ -41,7 +41,7 @@ ENiGMA½ will run on both 32bit and 64 bit Windows. If you want to run 16bit doo
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 
-4. Clone Enigma - browse to the directory you want and run 
+4. Clone ENiGMA½ - browse to the directory you want and run 
 	```Powershell
 	git clone "https://github.com/NuSkooler/enigma-bbs.git"
 	```

From f1b8de85fd07f3e4d7a1c44a011e83fba5923bbe Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:06:00 -0400
Subject: [PATCH 0260/1013] Update windows.md

---
 docs/installation/windows.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 0b991923..e4ac0328 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -50,7 +50,9 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 
 5. Install ENiGMA½.
 	1. In the enigma directory run 
-	```npm install```
+	```Powershell
+	npm install
+	```
 	2. Generate your initial configuration:
 	```Powershell
 		node .\oputil.js config new

From de055961f99a1d85765742f9a83edefdfdaa72a5 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:06:29 -0400
Subject: [PATCH 0261/1013] Update windows.md

---
 docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index e4ac0328..02bb5181 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -45,7 +45,7 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 	```Powershell
 	git clone "https://github.com/NuSkooler/enigma-bbs.git"
 	```
-	Optionally use the TortoiseGit by right clicking the directory and slecting `Git Clone...`.
+	Optionally use the TortoiseGit by right clicking the directory and selecting `Git Clone`.
     
 
 5. Install ENiGMA½.

From baaa3d93bbf1206ddff39e90d80d1acebeed7fda Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:08:22 -0400
Subject: [PATCH 0262/1013] Update windows.md

---
 docs/installation/windows.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 02bb5181..32aba68e 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -53,11 +53,10 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 	```Powershell
 	npm install
 	```
-	2. Generate your initial configuration:
+	2. Generate your initial configuration: `Follow the prompts!`
 	```Powershell
 		node .\oputil.js config new
 	```
-		Follow the prompts!
 	3. Edit any configuration files
 	4. Run ENiGMA½
 	```Powershell

From 95564167b262bc7237abc00a1fd4f43784abb35a Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:11:37 -0400
Subject: [PATCH 0263/1013] Update windows.md

---
 docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 32aba68e..32df3466 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -57,7 +57,7 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 	```Powershell
 		node .\oputil.js config new
 	```
-	3. Edit any configuration files
+	3. Edit your configuration files in `enigma-bbs\config` with [Notepad++](https://notepad-plus-plus.org/download/) or [Visual Studio Code](https://code.visualstudio.com/Download)
 	4. Run ENiGMA½
 	```Powershell
 		node .\main.js

From 1fc4a8828b1a1749430f5dfbe3d6ca0f990251a6 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:16:26 -0400
Subject: [PATCH 0264/1013] Update windows.md

---
 docs/installation/windows.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 32df3466..a87c88be 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -10,13 +10,15 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 
 1. Download and Install [Node.JS](https://nodejs.org/en/download/). 
 
-	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method.
-
-	`*Run PowerShell as Administrator`
+	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method. `*Run PowerShell as Administrator`
 
+	`*Inital Install`
 	```Powershell
 	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 	npm install -g npm-windows-upgrade
+	```
+	`*Upgrade`
+	```Powershell
 	npm-windows-upgrade
 	```
 

From 2d67cddfd07ac5d6e10def31c6d1cd720260b03c Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:18:13 -0400
Subject: [PATCH 0265/1013] Update windows.md

---
 docs/installation/windows.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index a87c88be..f977a246 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -12,21 +12,21 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method. `*Run PowerShell as Administrator`
 
-	`*Inital Install`
-	```Powershell
-	Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
-	npm install -g npm-windows-upgrade
-	```
-	`*Upgrade`
-	```Powershell
-	npm-windows-upgrade
-	```
+		`*Inital Install`
+		```Powershell
+		Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
+		npm install -g npm-windows-upgrade
+		```
+		`*Upgrade`
+		```Powershell
+		npm-windows-upgrade
+		```
 
-	Note: Do not run `npm i -g npm`. Instead use `npm-windows-upgrade` to update npm going forward. 
-	Also if you run the NodeJS installer, it will replace the node version.:
+		Note: Do not run `npm i -g npm`. Instead use `npm-windows-upgrade` to update npm going forward. 
+		Also if you run the NodeJS installer, it will replace the node version.:
 
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
-	`*This will also install python 2.7`
+		`*This will also install python 2.7`
 		```Powershell
 		npm install --global --production windows-build-tools
 		```

From 9ecb587ed31dd22de6781f4a8400234115851f1e Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Sat, 24 Mar 2018 02:22:14 -0400
Subject: [PATCH 0266/1013] Update windows.md

---
 docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index f977a246..9ee0b0b4 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -39,7 +39,7 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 	2. Go to the `Advanced` Tab and click on `Enviromental Varibles`
 	3. Select `Path` under `System Varibles` and click `Edit`
 	4. Click `New` and paste the path to 7zip
-	5. Close your console window and reopen. You can type 7z to make sure it's working.
+	5. Close your console window and reopen. You can type `7z` to make sure it's working.
 
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 

From f08d6efb97f8dcf8a6714d458cb348ac6604dd54 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 28 Mar 2018 19:16:10 -0600
Subject: [PATCH 0267/1013] WIP work on door fixes, updates, etc.

---
 core/abracadabra.js |  66 +++++++++++----
 core/door.js        | 120 +++++++++++++++++++++++++-
 core/dropfile.js    | 201 +++++++++++++++++++++++---------------------
 core/enig_error.js  |   1 +
 package.json        |   3 +-
 5 files changed, 273 insertions(+), 118 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 0ac17887..603eab84 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -2,16 +2,15 @@
 'use strict';
 
 const MenuModule		= require('./menu_module.js').MenuModule;
-const DropFile			= require('./dropfile.js').DropFile;
-const door				= require('./door.js');
+const DropFile			= require('./dropfile.js');
+const Door				= require('./door.js');
 const theme				= require('./theme.js');
 const ansi				= require('./ansi_term.js');
 
 const async				= require('async');
 const assert			= require('assert');
-const paths				= require('path');
 const _					= require('lodash');
-const mkdirs			= require('fs-extra').mkdirs;
+const getSockHandle 	= require('getsockethandleaddress');	//	black magic
 
 //	:TODO: This should really be a system module... needs a little work to allow for such
 
@@ -122,19 +121,18 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 						callback(null);
 					}
 				},
+				function prepareDoor(callback) {
+					self.doorInstance = new Door(self.client);
+					return self.doorInstance.prepare(self.config.io || 'stdio', callback);
+				},
 				function generateDropfile(callback) {
-					self.dropFile	= new DropFile(self.client, self.config.dropFileType);
-					var fullPath	= self.dropFile.fullPath;
+					const dropFileOpts = {
+						fileType			: self.config.dropFileType,
+						socketDescriptor	: self.getSocketFd(),
+					};
 
-					mkdirs(paths.dirname(fullPath), function dirCreated(err) {
-						if(err) {
-							callback(err);
-						} else {
-							self.dropFile.createFile(function created(err) {
-								callback(err);
-							});
-						}
-					});
+					self.dropFile = new DropFile(self.client, dropFileOpts);
+					return self.dropFile.createFile(callback);
 				}
 			],
 			function complete(err) {
@@ -150,7 +148,38 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 	}
 
 	runDoor() {
+		this.client.term.write(ansi.resetScreen());
 
+		const exeInfo = {
+			cmd				: this.config.cmd,
+			args			: this.config.args,
+			io				: this.config.io || 'stdio',
+			encoding		: this.config.encoding || this.client.term.outputEncoding,
+			dropFile		: this.dropFile.fileName,
+			dropFilePath	: this.dropFile.fullPath,
+			node			: this.client.node,
+		};
+
+		if('socketfd' === this.config.io) {
+			exeInfo.srvSocketFd = this.getSocketFd();
+		}
+
+		this.doorInstance.run(exeInfo, () => {
+			//
+			//	Try to clean up various settings such as scroll regions that may
+			//	have been set within the door
+			//
+			this.client.term.rawWrite(
+				ansi.normal() +
+				ansi.goto(this.client.term.termHeight, this.client.term.termWidth) +
+				ansi.setScrollRegion() +
+				ansi.goto(this.client.term.termHeight, 0) +
+				'\r\n\r\n'
+			);
+
+			this.prevMenu();
+		});
+		/*
 		const exeInfo = {
 			cmd			: this.config.cmd,
 			args		: this.config.args,
@@ -178,10 +207,11 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
 			this.prevMenu();
 		});
-
+		
 		this.client.term.write(ansi.resetScreen());
 
 		doorInstance.run();
+		*/
 	}
 
 	leave() {
@@ -194,4 +224,8 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 	finishedLoading() {
 		this.runDoor();
 	}
+
+	getSocketFd() {
+		return getSockHandle.getAddress(this.client.output._handle);	//	seriously... black magic :(
+	}
 };
diff --git a/core/door.js b/core/door.js
index 58c8effa..ecf858f0 100644
--- a/core/door.js
+++ b/core/door.js
@@ -1,17 +1,128 @@
 /* jslint node: true */
 'use strict';
 
-
 const stringFormat	= require('./string_format.js');
+const { Errors }	= require('./enig_error.js');
 
-const events		= require('events');
-const _				= require('lodash');
 const pty			= require('node-pty');
 const decode 		= require('iconv-lite').decode;
 const createServer	= require('net').createServer;
 
-exports.Door		= Door;
+module.exports = class Door {
+	constructor(client) {
+		this.client		= client;
+		this.restored	= false;
+	}
 
+	prepare(ioType, cb) {
+		this.io = ioType;
+
+		//	we currently only have to do any real setup for 'socket'
+		if('socket' !== ioType) {
+			return cb(null);
+		}
+
+		this.sockServer = createServer(conn => {
+			this.sockServer.getConnections( (err, count) => {
+
+				//	We expect only one connection from our DOOR/emulator/etc.
+				if(!this && count <= 1) {
+					this.client.term.output.pipe(conn);
+
+					conn.on('data', this.doorDataHandler.bind(this));
+
+					conn.once('end', () => {
+						return this.restoreIo(conn);
+					});
+
+					conn.once('error', err => {
+						this.client.log.info( { error : err.message }, 'Door socket server connection');
+						return this.restoreIo(conn);
+					});
+				}
+			});
+		});
+
+		this.sockServer.listen(0, () => {
+			return cb(null);
+		});
+	}
+
+	run(exeInfo, cb) {
+		this.encoding = (exeInfo.encoding || 'cp437').toLowerCase();
+
+		if('socket' === this.io && !this.sockServer) {
+			return cb(Errors.UnexpectedState('Socket server is not running'));
+		}
+
+		const formatObj = {
+			dropFile		: exeInfo.dropFile,
+			dropFilePath	: exeInfo.dropFilePath,
+			node			: exeInfo.node.toString(),
+			srvPort			: this.sockServer ? this.sockServer.address().port.toString() : '-1',
+			userId			: this.client.user.userId.toString(),
+			srvSocketFd		: exeInfo.srvSocketFd ? exeInfo.srvSocketFd.toString() : '-1',
+		};
+
+		const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
+
+		const door = pty.spawn(exeInfo.cmd, args, {
+			cols 		: this.client.term.termWidth,
+			rows		: this.client.term.termHeight,
+			//	:TODO: cwd
+			env			: exeInfo.env,
+			encoding	: null,	//	we want to handle all encoding ourself
+		});
+
+		if('stdio' === this.io) {
+			this.client.log.debug('Using stdio for door I/O');
+
+			this.client.term.output.pipe(door);
+
+			door.on('data', this.doorDataHandler.bind(this));
+
+			door.once('close', () => {
+				return this.restoreIo(door);
+			});
+		} else if('socket' === this.io) {
+			this.client.log.debug(
+				{ srvPort : this.sockServer.address().port, srvSocketFd : this.sockServerSocket },
+				'Using temporary socket server for door I/O'
+			);
+		}
+
+		door.once('exit', exitCode => {
+			this.client.log.info( { exitCode : exitCode }, 'Door exited');
+
+			if(this.sockServer) {
+				this.sockServer.close();
+			}
+
+			//	we may not get a close
+			if('stdio' === this.io) {
+				this.restoreIo(door);
+			}
+
+			door.removeAllListeners();
+
+			return cb(null);
+		});
+	}
+
+	doorDataHandler(data) {
+		this.client.term.write(decode(data, this.encoding));
+	}
+
+	restoreIo(piped) {
+		if(!this.restored && this.client.term.output) {
+			this.client.term.output.unpipe(piped);
+			this.client.term.output.resume();
+			this.restored = true;
+		}
+	}
+};
+
+/*
 function Door(client, exeInfo) {
 	events.EventEmitter.call(this);
 
@@ -147,3 +258,4 @@ Door.prototype.run = function() {
 		});
 	});
 };
+*/
\ No newline at end of file
diff --git a/core/dropfile.js b/core/dropfile.js
index 20c027e3..9aea759a 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -1,16 +1,15 @@
 /* jslint node: true */
 'use strict';
 
-var Config			= require('./config.js').config;
+const Config		= require('./config.js').config;
 const StatLog		= require('./stat_log.js');
 
-var fs				= require('graceful-fs');
-var paths			= require('path');
-var _				= require('lodash');
-var moment			= require('moment');
-var iconv			= require('iconv-lite');
-
-exports.DropFile	= DropFile;
+const fs			= require('graceful-fs');
+const paths			= require('path');
+const _				= require('lodash');
+const moment		= require('moment');
+const iconv			= require('iconv-lite');
+const { mkdirs }	= require('fs-extra');
 
 //
 //	Resources
@@ -20,53 +19,56 @@ exports.DropFile	= DropFile;
 //	* http://thebbs.org/bbsfaq/ch06.02.htm
 
 //	http://lord.lordlegacy.com/dosemu/
+module.exports = class DropFile {
+	constructor(client, { fileType = 'DORINFO', baseDir = Config.paths.dropFiles, socketDescriptor = null } = {} ) {
+		this.client				= client;
+		this.fileType			= fileType.toUpperCase();
+		this.baseDir			= baseDir;
+		this.socketDescriptor	= socketDescriptor;
+	}
 
-function DropFile(client, fileType) {
+	get fullPath() {
+		return paths.join(this.baseDir, ('node' + this.client.node), this.fileName);
+	}
 
-	var self 			= this;
-	this.client			= client;
-	this.fileType		= (fileType || 'DORINFO').toUpperCase();
+	get fileName() {
+		return {
+			DOOR			: 'DOOR.SYS',					//	GAP BBS, many others
+			DOOR32			: 'DOOR32.SYS',					//	EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
+			CALLINFO		: 'CALLINFO.BBS',				//	Citadel?
+			DORINFO			: this.getDoorInfoFileName(),	//	RBBS, RemoteAccess, QBBS, ...
+			CHAIN			: 'CHAIN.TXT',					//	WWIV
+			CURRUSER		: 'CURRUSER.BBS',				//	RyBBS
+			SFDOORS			: 'SFDOORS.DAT',				//	Spitfire
+			PCBOARD			: 'PCBOARD.SYS',				//	PCBoard
+			TRIBBS			: 'TRIBBS.SYS',					//	TriBBS
+			USERINFO		: 'USERINFO.DAT',				//	Wildcat! 3.0+
+			JUMPER			: 'JUMPER.DAT',					//	2AM BBS
+			SXDOOR			: 'SXDOOR.' + _.pad(this.client.node.toString(), 3, '0'),	//	System/X, dESiRE
+			INFO			: 'INFO.BBS',					//	Phoenix BBS
+		}[this.fileType];
+	}
 
-	Object.defineProperty(this, 'fullPath', {
-		get : function() {
-			return paths.join(Config.paths.dropFiles, ('node' + self.client.node), self.fileName);
-		}
-	});
+	isSupported() {
+		return this.getHandler() ? true : false;
+	}
 
-	Object.defineProperty(this, 'fileName', {
-		get : function() {
-			return {
-				DOOR			: 'DOOR.SYS',					//	GAP BBS, many others
-				DOOR32			: 'DOOR32.SYS',					//	EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
-				CALLINFO		: 'CALLINFO.BBS',				//	Citadel?
-				DORINFO			: self.getDoorInfoFileName(),	//	RBBS, RemoteAccess, QBBS, ...
-				CHAIN			: 'CHAIN.TXT',					//	WWIV
-				CURRUSER		: 'CURRUSER.BBS',				//	RyBBS
-				SFDOORS			: 'SFDOORS.DAT',				//	Spitfire
-				PCBOARD			: 'PCBOARD.SYS',				//	PCBoard
-				TRIBBS			: 'TRIBBS.SYS',					//	TriBBS
-				USERINFO		: 'USERINFO.DAT',				//	Wildcat! 3.0+
-				JUMPER			: 'JUMPER.DAT',					//	2AM BBS
-				SXDOOR			: 								//	System/X, dESiRE
-					'SXDOOR.' + _.pad(self.client.node.toString(), 3, '0'),
-				INFO			: 'INFO.BBS',					//	Phoenix BBS
-			}[self.fileType];
-		}
-	});
+	getHandler() {
+		return {
+			DOOR		: this.getDoorSysBuffer,
+			DOOR32		: this.getDoor32Buffer,
+			DORINFO		: this.getDoorInfoDefBuffer,
+		}[this.fileType];
+	}
 
-	Object.defineProperty(this, 'dropFileContents', {
-		get : function() {
-			return {
-				DOOR			: self.getDoorSysBuffer(),
-				DOOR32			: self.getDoor32Buffer(),
-				DORINFO			: self.getDoorInfoDefBuffer(),
-			}[self.fileType];
-		}
-	});
+	getContents() {
+		const handler = this.getHandler().bind(this);
+		return handler();
+	}
 
-	this.getDoorInfoFileName = function() {
-		var x;
-		var node = self.client.node;
+	getDoorInfoFileName() {
+		let x;
+		const node = this.client.node;
 		if(10 === node) {
 			x = 0;
 		} else if(node < 10) {
@@ -75,54 +77,53 @@ function DropFile(client, fileType) {
 			x = String.fromCharCode('a'.charCodeAt(0) + (node - 11));
 		}
 		return 'DORINFO' + x + '.DEF';
-	};
+	}
 
-	this.getDoorSysBuffer = function() {
-		var up			= self.client.user.properties;
-		var now			= moment();
-		var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+	getDoorSysBuffer() {
+		const prop		= this.client.user.properties;
+		const now		= moment();
+		const secLevel	= this.client.user.getLegacySecurityLevel().toString();
 
 		//	:TODO: fix time remaining
 		//	:TODO: fix default protocol -- user prop: transfer_protocol
-
 		return iconv.encode( [
 			'COM1:',											//	"Comm Port - COM0: = LOCAL MODE"
 			'57600',											//	"Baud Rate - 300 to 38400" (Note: set as 57600 instead!)
 			'8',												//	"Parity - 7 or 8"
-			self.client.node.toString(),						//	"Node Number - 1 to 99"
+			this.client.node.toString(),						//	"Node Number - 1 to 99"
 			'57600',											//	"DTE Rate. Actual BPS rate to use. (kg)"
 			'Y',												//	"Screen Display - Y=On  N=Off             (Default to Y)"
 			'Y',												//	"Printer Toggle - Y=On  N=Off             (Default to Y)"
 			'Y',												//	"Page Bell      - Y=On  N=Off             (Default to Y)"
 			'Y',												//	"Caller Alarm   - Y=On  N=Off             (Default to Y)"
-			up.real_name || self.client.user.username,			//	"User Full Name"
-			up.location || 'Anywhere',							//	"Calling From"
+			prop.real_name || this.client.user.username,		//	"User Full Name"
+			prop.location || 'Anywhere',						//	"Calling From"
 			'123-456-7890',										//	"Home Phone"
 			'123-456-7890',										//	"Work/Data Phone"
 			'NOPE',												//	"Password" (Note: this is never given out or even stored plaintext)
 			secLevel,											//	"Security Level"
-			up.login_count.toString(),							//	"Total Times On"
+			prop.login_count.toString(),						//	"Total Times On"
 			now.format('MM/DD/YY'),								//	"Last Date Called"
 			'15360',											//	"Seconds Remaining THIS call (for those that particular)"
 			'256',												//	"Minutes Remaining THIS call"
 			'GR',												//	"Graphics Mode - GR=Graph, NG=Non-Graph, 7E=7,E Caller"
-			self.client.term.termHeight.toString(),				//	"Page Length"
+			this.client.term.termHeight.toString(),				//	"Page Length"
 			'N',												//	"User Mode - Y = Expert, N = Novice"
 			'1,2,3,4,5,6,7',									//	"Conferences/Forums Registered In  (ABCDEFG)"
 			'1',												//	"Conference Exited To DOOR From    (G)"
 			'01/01/99',											//	"User Expiration Date              (mm/dd/yy)"
-			self.client.user.userId.toString(),					//	"User File's Record Number"
+			this.client.user.userId.toString(),					//	"User File's Record Number"
 			'Z',												//	"Default Protocol - X, C, Y, G, I, N, Etc."
 			//	:TODO: fix up, down, etc. form user properties
 			'0',												//	"Total Uploads"
 			'0',												//	"Total Downloads"
 			'0',												//	"Daily Download "K" Total"
 			'999999',											//	"Daily Download Max. "K" Limit"
-			moment(up.birthdate).format('MM/DD/YY'),			//	"Caller's Birthdate"
+			moment(prop.birthdate).format('MM/DD/YY'),			//	"Caller's Birthdate"
 			'X:\\MAIN\\',										//	"Path to the MAIN directory (where User File is)"
 			'X:\\GEN\\',										//	"Path to the GEN directory"
 			StatLog.getSystemStat('sysop_username'),			//	"Sysop's Name (name BBS refers to Sysop as)"
-			self.client.user.username,							//	"Alias name"
+			this.client.user.username,							//	"Alias name"
 			'00:05',											//	"Event time                        (hh:mm)" (note: wat?)
 			'Y',												//	"If its an error correcting connection (Y/N)"
 			'Y',												//	"ANSI supported & caller using NG mode (Y/N)"
@@ -136,40 +137,47 @@ function DropFile(client, fileType) {
 			now.format('hh:mm'),								//	"Time of Last Call                 (hh:mm)"
 			'9999',												//	"Maximum daily files available"
 			//	:TODO: fix these stats:
-			'0',												//	"Files d/led so far today"
+			'0',												//	"Files d/led so far today"			
 			'0',												//	"Total "K" Bytes Uploaded"
 			'0',												//	"Total "K" Bytes Downloaded"
-			up.user_comment || 'None',							//	"User Comment"
+			prop.user_comment || 'None',						//	"User Comment"
 			'0',												//	"Total Doors Opened"
 			'0',												//	"Total Messages Left"
 
 		].join('\r\n') + '\r\n', 'cp437');
-	};
+	}
 
-	this.getDoor32Buffer = function() {
+	getDoor32Buffer() {
 		//
 		//	Resources:
 		//	* http://wiki.bbses.info/index.php/DOOR32.SYS
 		//
 		//	:TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
+		const Door32CommTypes = {
+			Local	: 0,
+			Serial	: 1,
+			Telnet	: 2,			
+		};
+
+		const socketFd = _.isNumber(this.socketDescriptor) ? this.socketDescriptor : -1;
+		const commType = socketFd > -1 ? Door32CommTypes.Telnet : Door32CommTypes.Local;
+
 		return iconv.encode([
-			'2',						//	:TODO: This needs to be configurable!
-			//	:TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
-			'-1',	//	self.client.output._handle.fd.toString(),	//	:TODO: ALWAYS -1 on Windows!
-			'57600',
+			commType.toString(),
+			socketFd.toString(),
+			'115200',
 			Config.general.boardName,
-			self.client.user.userId.toString(),
-			self.client.user.properties.real_name || self.client.user.username,
-			self.client.user.username,
-			self.client.user.getLegacySecurityLevel().toString(),
+			this.client.user.userId.toString(),
+			this.client.user.properties.real_name || this.client.user.username,
+			this.client.user.username,
+			this.client.user.getLegacySecurityLevel().toString(),
 			'546',	//	:TODO: Minutes left!
 			'1',	//	ANSI
-			self.client.node.toString(),
+			this.client.node.toString(),
 		].join('\r\n') + '\r\n', 'cp437');
+	}
 
-	};
-
-	this.getDoorInfoDefBuffer = function() {
+	getDoorInfoDefBuffer() {
 		//	:TODO: fix time remaining
 
 		//
@@ -178,34 +186,33 @@ function DropFile(client, fileType) {
 		//
 		//	Note that usernames are just used for first/last names here
 		//
-		var opUn		= /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
-		var un			= /[^\s]*/.exec(self.client.user.username)[0];
-		var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+		const opUserName	= /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
+		const userName		= /[^\s]*/.exec(this.client.user.username)[0];
+		const secLevel		= this.client.user.getLegacySecurityLevel().toString();
 
 		return iconv.encode( [
 			Config.general.boardName,							//	"The name of the system."
-			opUn,												//	"The sysop's name up to the first space."
-			opUn,												//	"The sysop's name following the first space."
+			opUserName,											//	"The sysop's name up to the first space."
+			opUserName,											//	"The sysop's name following the first space."
 			'COM1',												//	"The serial port the modem is connected to, or 0 if logged in on console."
 			'57600',											//	"The current port (DTE) rate."
 			'0',												//	"The number "0""
-			un,													//	"The current user's name, up to the first space."
-			un,													//	"The current user's name, following the first space."
-			self.client.user.properties.location || '',			//	"Where the user lives, or a blank line if unknown."
+			userName,											//	"The current user's name, up to the first space."
+			userName,											//	"The current user's name, following the first space."
+			this.client.user.properties.location || '',			//	"Where the user lives, or a blank line if unknown."
 			'1',												//	"The number "0" if TTY, or "1" if ANSI."
 			secLevel,											//	"The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
 			'546',												//	"The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
 			'-1'												//	"The number "-1" if using an external serial driver or "0" if using internal serial routines."
 		].join('\r\n') + '\r\n', 'cp437');
-	};
+	}
 
-}
-
-DropFile.fileTypes = [ 'DORINFO' ];
-
-DropFile.prototype.createFile = function(cb) {
-	fs.writeFile(this.fullPath, this.dropFileContents, function written(err) {
-		cb(err);
-	});
+	createFile(cb) {
+		mkdirs(paths.dirname(this.fullPath), err => {
+			if(err) {
+				return cb(err);
+			}
+			return fs.writeFile(this.fullPath, this.getContents(), cb);
+		});
+	}
 };
-
diff --git a/core/enig_error.js b/core/enig_error.js
index c6eb8097..4dc9047c 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -35,6 +35,7 @@ exports.Errors = {
 	MissingConfig		: (reason, reasonCode)	=> new EnigError('Missing configuration', -32006, reason, reasonCode),
 	UnexpectedState		: (reason, reasonCode)	=> new EnigError('Unexpected state', -32007, reason, reasonCode),
 	MissingParam		: (reason, reasonCode)	=> new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
+	MissingMci			: (reason, reasonCode)	=> new EnigError('Missing required MCI code(s)', -32009, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
diff --git a/package.json b/package.json
index 88844455..b6d19715 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,8 @@
     "uuid-parse": "^1.0.0",
     "ws": "^4.0.0",
     "xxhash": "^0.2.4",
-    "yazl": "^2.4.2"
+    "yazl": "^2.4.2",
+    "getsockethandleaddress" : "^1.1.0"
   },
   "devDependencies": {},
   "engines": {

From 2ad02d9ece4547a15c90cf262641968227f33a2b Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 18:20:55 -0400
Subject: [PATCH 0268/1013] Added Telnet content

---
 docs/servers/telnet.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/servers/telnet.md b/docs/servers/telnet.md
index 155e6726..951c09eb 100644
--- a/docs/servers/telnet.md
+++ b/docs/servers/telnet.md
@@ -1,4 +1,25 @@
 ---
 layout: page
 title: Telnet Server
----
\ No newline at end of file
+---
+
+Telnet is enabled by default on port `8888` in `config.hjson`:
+
+```hjson
+{
+    loginServers: {
+      telnet: {
+        enabled: true
+        port: 8888
+      }                                                                                                        
+    }
+}
+```
+
+### Telnet Server Options
+
+| Option              | Description
+|---------------------|--------------------------------------------------------------------------------------|
+| `firstMenu`		  | First menu a telnet connected user is presented with
+| `enabled`           | Enable/disable SSH server
+| `port`              | Configure a custom port for the SSH server

From cbb3970605a23a00d8f3a6780709e37ae10121ec Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 18:29:03 -0400
Subject: [PATCH 0269/1013] Update ssh.md

---
 docs/servers/ssh.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
index ca0b62ec..676afb51 100644
--- a/docs/servers/ssh.md
+++ b/docs/servers/ssh.md
@@ -16,10 +16,11 @@ You then need to enable the SSH server in your `config.hjson`:
 {
 	loginServers: {
 		ssh: {
-            enabled: true
+                    enabled: true
 		    port: 8889
-            privateKeyPass: YOUR_PK_PASS
-        }                                                                                                                                                                                                   
+		    privateKeyPem: /path/to/ssh_private_key.pem
+                    privateKeyPass: YOUR_PK_PASS
+        }                                                             
     }
 }
 ```

From 7378361d0954f5df35d50dac8e7f8c027d9b7e41 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 18:33:23 -0400
Subject: [PATCH 0270/1013] Update websocket.md

Added file location, put enable field at top
---
 docs/servers/websocket.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/servers/websocket.md b/docs/servers/websocket.md
index 62df02d7..40d4b679 100644
--- a/docs/servers/websocket.md
+++ b/docs/servers/websocket.md
@@ -21,14 +21,14 @@ There are a few things out of scope of this document:
  
 ## Setup
 
-1. Enable the websocket in ENiGMA, by adding `webSocket` configuration to the `loginServers` block (create it if you
+1. Enable the websocket in ENiGMA, by adding `webSocket` configuration to the `loginServers` block in `config.hjson` (create it if you
 don't already have it defined). 
 
     ````hjson
     loginServers: {
             webSocket : {
-                    port: 8810
                     enabled: true
+                    port: 8810
                     securePort: 8811
                     certPem: /path/to/https_cert.pem
                     keyPem: /path/to/https_cert_key.pem
@@ -88,4 +88,4 @@ otherwise.
 9. If you navigate to http://your-hostname.here/vtx.html, you should see a splash screen like the following:
     ![VTXClient](../assets/images/vtxclient.png "VTXClient")
 
- 
\ No newline at end of file
+ 

From d6633fb37857872f5161589b27984cea0b4ac690 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 18:46:14 -0400
Subject: [PATCH 0271/1013] Update windows.md

---
 docs/installation/windows.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 9ee0b0b4..4eaed906 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -12,7 +12,7 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method. `*Run PowerShell as Administrator`
 
-		`*Inital Install`
+		`*Initial Install`
 		```Powershell
 		Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force
 		npm install -g npm-windows-upgrade
@@ -23,7 +23,7 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 		```
 
 		Note: Do not run `npm i -g npm`. Instead use `npm-windows-upgrade` to update npm going forward. 
-		Also if you run the NodeJS installer, it will replace the node version.:
+		Also if you run the NodeJS installer, it will replace the node version.
 
 	2. Install [windows-build-tools for npm](https://www.npmjs.com/package/windows-build-tools)
 		`*This will also install python 2.7`
@@ -66,4 +66,4 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 	```
 	
 
-6. Profit!
+6. Look at [Production Installation](/installation/production) for maintaining ENiGMA½ when you are ready to go live.

From 2926bb55cc887c357afc65c2cbf673fe328a9be8 Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 21:47:51 -0400
Subject: [PATCH 0272/1013] Update telnet.md

---
 docs/servers/telnet.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/servers/telnet.md b/docs/servers/telnet.md
index 951c09eb..47aba591 100644
--- a/docs/servers/telnet.md
+++ b/docs/servers/telnet.md
@@ -21,5 +21,5 @@ Telnet is enabled by default on port `8888` in `config.hjson`:
 | Option              | Description
 |---------------------|--------------------------------------------------------------------------------------|
 | `firstMenu`		  | First menu a telnet connected user is presented with
-| `enabled`           | Enable/disable SSH server
-| `port`              | Configure a custom port for the SSH server
+| `enabled`           | Enable/disable telnet server
+| `port`              | Configure a custom port for the telnet server

From 6ec3619815f21017128ec18bac433382f8621e61 Mon Sep 17 00:00:00 2001
From: Jason Windisch <jason.windisch@gmail.com>
Date: Thu, 29 Mar 2018 22:16:45 -0400
Subject: [PATCH 0273/1013] Added arrows to theme selection

---
 art/themes/luciano_blocktronics/CONFSCR.ANS | Bin 2529 -> 2556 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/CONFSCR.ANS b/art/themes/luciano_blocktronics/CONFSCR.ANS
index 0bf72430fa56c7339d52bed57a21c0c0277846bb..e3db0cbb04fc67a019784ec9991e2906dfa68410 100644
GIT binary patch
delta 108
zcmaDT{6~1hPBvy^^W4qb**F<NjLG}hcNj`X8{|qy8yYzS32S4sTm?CKE|8c4m~W7K
p{|=a^pc>+1WFQ@FW<Gg2hrF;ULOsL)Bg4rjI6gB@p1g-s6#&aEA9er$

delta 83
zcmew({7`tqPPWba*w`5-pJLx;$R!<ZkgFgaZD?(5kbD0Qn5Uo`;$vhW9c}6?9c^rs
g3nYv|EOQ{s$a3;V4tXYXlgW=cJ~LKKzRsx%0C#p8J^%m!


From 92e0919b5c84b1991d4b38e0fad346791c65f5ec Mon Sep 17 00:00:00 2001
From: Jasin2069 <jason.windisch@gmail.com>
Date: Fri, 30 Mar 2018 00:52:30 -0400
Subject: [PATCH 0274/1013] Removed extra } in file

will cause failure to start if pasting entire snippet.
---
 docs/configuration/email.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/configuration/email.md b/docs/configuration/email.md
index 1677eb11..5bc4d4c8 100644
--- a/docs/configuration/email.md
+++ b/docs/configuration/email.md
@@ -26,5 +26,4 @@ email: {
             }
         }
     }
-}
-```
\ No newline at end of file
+```

From 207e361c03666bc4ec4229764024a905039b72fb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 10 Apr 2018 19:53:04 -0600
Subject: [PATCH 0275/1013] Pull copyright from license - easier to maintain
 single place

---
 core/bbs.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 33301f70..a7246b8b 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -25,9 +25,12 @@ exports.main	= main;
 //	object with various services we want to de-init/shutdown cleanly if possible
 const initServices = {};
 
-const ENIGMA_COPYRIGHT	= 'ENiGMA½ Copyright (c) 2014-2017 Bryan Ashby';
+//	only include bbs.js once @ startup; this should be fine
+const COPYRIGHT = fs.readFileSync(paths.join(__dirname, '../LICENSE.TXT'), 'utf8').split(/\r?\n/g)[0];
+
+const FULL_COPYRIGHT	= `ENiGMA½ ${COPYRIGHT}`;
 const HELP =
-`${ENIGMA_COPYRIGHT}
+`${FULL_COPYRIGHT}
 usage: main.js <args>
 eg   : main.js --config /enigma_install_path/config/
 
@@ -90,7 +93,7 @@ function main() {
 		function complete(err) {
 			//	note this is escaped:
 			fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
-				console.info(ENIGMA_COPYRIGHT);
+				console.info(FULL_COPYRIGHT);
 				if(!err) {
 					console.info(banner);
 				}

From 8ee573fb9d5bc104a52bcaca944ea750417588d5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Apr 2018 20:25:56 -0600
Subject: [PATCH 0276/1013] Initial commit of Gopher contnet server

---
 core/servers/content/gopher.js | 316 +++++++++++++++++++++++++++++++++
 1 file changed, 316 insertions(+)
 create mode 100644 core/servers/content/gopher.js

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
new file mode 100644
index 00000000..0a20b0aa
--- /dev/null
+++ b/core/servers/content/gopher.js
@@ -0,0 +1,316 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const Log					= require('../../logger.js').log;
+const { ServerModule }		= require('../../server_module.js');
+const Config				= require('../../config.js').config;
+const {
+	splitTextAtTerms,
+	isAnsi,
+	cleanControlCodes
+}							= require('../../string_util.js');
+const {
+	getMessageConferenceByTag,
+	getMessageAreaByTag,
+	getMessageListForArea,
+}							= require('../../message_area.js');
+const { sortAreasOrConfs }	= require('../../conf_area_util.js');
+const AnsiPrep				= require('../../ansi_prep.js');
+
+//	deps
+const net					= require('net');
+const _						= require('lodash');
+const fs					= require('graceful-fs');
+const paths					= require('path');
+const moment				= require('moment');
+
+const ModuleInfo = exports.moduleInfo = {
+	name		: 'Gopher',
+	desc		: 'Gopher Server',
+	author		: 'NuSkooler',
+	packageName	: 'codes.l33t.enigma.gopher.server',
+};
+
+const Message				= require('../../message.js');
+
+const ItemTypes = {
+	Invalid				: '',	//	not really a type, of course!
+
+	//	Canonical, RFC-1436
+	TextFile			: '0',
+	SubMenu				: '1',
+	CCSONameserver		: '2',
+	Error				: '3',
+	BinHexFile			: '4',
+	DOSFile				: '5',
+	UuEncodedFile		: '6',
+	FullTextSearch		: '7',
+	Telnet				: '8',
+	BinaryFile			: '9',
+	AltServer			: '+',
+	GIFFile				: 'g',
+	ImageFile			: 'I',
+	Telnet3270			: 'T',
+
+	//	Non-canonical
+	HtmlFile			: 'h',
+	InfoMessage			: 'i',
+	SoundFile			: 's',
+};
+
+exports.getModule = class GopherModule extends ServerModule {
+
+	constructor() {
+		super();
+
+		this.routes = new Map();	//	selector->generator => gopher item
+	}
+
+	createServer() {
+		if(!this.enabled) {
+			return;
+		}
+
+		this.publicHostname = Config.contentServers.gopher.publicHostname;
+		this.publicPort		= Config.contentServers.gopher.publicPort;
+
+		this.addRoute(/^\/?\r\n$/, this.defaultGenerator);
+		this.addRoute(/^\/msgarea(\/[a-z0-9_-]+(\/[a-z0-9_-]+)?(\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(_raw)?)?)?\/?\r\n$/, this.messageAreaGenerator);
+
+		this.server = net.createServer( socket => {
+			socket.setEncoding('ascii');
+
+			socket.on('data', data => {
+				this.routeRequest(data, socket);
+			});
+
+			socket.on('error', err => {
+				if('ECONNRESET' !== err.code) {	//	normal
+					Log.trace( { error : err.message }, 'Socket error');
+				}
+			});
+		});
+	}
+
+	listen() {
+		if(!this.enabled) {
+			return true;	//	nothing to do, but not an error
+		}
+
+		const port = parseInt(Config.contentServers.gopher.port);
+		if(isNaN(port)) {
+			Log.warn( { port : Config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
+			return false;
+		}
+
+		return this.server.listen(port);
+	}
+
+	get enabled() {
+		return _.get(Config, 'contentServers.gopher.enabled', false) && this.isConfigured();
+	}
+
+	isConfigured() {
+		//	public hostname & port must be set; responses contain them!
+		return _.isString(_.get(Config, 'contentServers.gopher.publicHostname')) &&
+			_.isNumber(_.get(Config, 'contentServers.gopher.publicPort'));
+	}
+
+	addRoute(selectorRegExp, generatorHandler) {
+		if(_.isString(selectorRegExp)) {
+			try {
+				selectorRegExp = new RegExp(`${selectorRegExp}\r\n`);
+			} catch(e) {
+				Log.warn( { pattern : selectorRegExp }, 'Invalid RegExp for selector' );
+				return false;
+			}
+		}
+		this.routes.set(selectorRegExp, generatorHandler.bind(this));
+	}
+
+	routeRequest(selector, socket) {
+		let generator;
+		let match;
+		for(let [regex, gen] of this.routes) {
+			match = selector.match(regex);
+			if(match) {
+				generator = gen;
+				break;
+			}
+		}
+		generator = generator || this.notFoundGenerator;
+		generator(match, res => {
+			socket.end(`${res}.\r\n`);	//	includes RFC-1436 'Lastline'
+		});
+	}
+
+	makeItem(itemType, text, selector, hostname, port) {
+		selector = selector || '';	//	e.g. for info
+		hostname = hostname || this.publicHostname;
+		port = port || this.publicPort;
+		return `${itemType}${text}\t${selector}\t${hostname}\t${port}\r\n`;
+	}
+
+	defaultGenerator(selectorMatch, cb) {
+		let bannerFile = _.get(Config, 'contentServers.gopher.banner', 'startup_banner.asc');
+		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
+		fs.readFile(bannerFile, 'utf8', (err, banner) => {
+			if(err) {
+				return cb('You have reached an ENiGMA½ Gopher server!');
+			}
+
+			banner = splitTextAtTerms(banner).map(l => this.makeItem(ItemTypes.InfoMessage, l)).join('');
+			banner += this.makeItem(ItemTypes.SubMenu, 'Public Message Area', '/msgarea');
+			return cb(banner);
+		});
+	}
+
+	notFoundGenerator(selectorMatch, cb) {
+		return cb('Not found');
+	}
+
+	isAreaAndConfExposed(confTag, areaTag) {
+		const conf = _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ]);
+		return Array.isArray(conf) && conf.includes(areaTag);
+	}
+
+	prepareMessageBody(body, cb) {
+		if(isAnsi(body)) {
+			AnsiPrep(
+				body,
+				{
+					cols			: 79,				//	Gopher std. wants 70, but we'll have to deal with it.
+					forceLineTerm	: true,				//	ensure each line is term'd
+					asciiMode		: true,				//	export to ASCII
+					fillLines		: false,			//	don't fill up to |cols|
+				},
+				(err, prepped) => {
+					return cb(prepped || body);
+				}
+			);
+		} else {
+			return cb(cleanControlCodes(body, { all : true } ));
+		}
+	}
+
+	messageAreaGenerator(selectorMatch, cb) {
+		//
+		//	Selector should be:
+		//	/msgarea - list confs
+		//	/msgarea/conftag - list areas in conf
+		//	/msgarea/conftag/areatag - list messages in area
+		//	/msgarea/conftag/areatag/<num> - message as text
+		//	/msgarea/conftag/areatag/<num>_raw - full message as text + headers
+		//
+		if(selectorMatch[3] || selectorMatch[4]) {
+			//	message
+			//const raw = selectorMatch[4] ? true : false;
+			//	:TODO: support 'raw'
+			const msgUuid	= selectorMatch[3].replace(/\r\n|\//g, '');
+			const confTag	= selectorMatch[1].substr(1).split('/')[0];
+			const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
+			const message 	= new Message();
+
+			return message.load( { uuid : msgUuid }, err => {
+				if(err) {
+					return this.notFoundGenerator(selectorMatch, cb);
+				}
+
+				if(message.areaTag !== areaTag || !this.isAreaAndConfExposed(confTag, areaTag)) {
+					return this.notFoundGenerator(selectorMatch, cb);
+				}
+
+				this.prepareMessageBody(message.message, msgBody => {
+					//	:TODO: create DRY for subject trimming...
+					const response = `${'-'.repeat(70)}
+To     : ${message.toUserName}
+From   : ${message.fromUserName}
+When   : ${moment(message.modTimestamp).format('dddd, MMMM Do YYYY, h:mm:ss a (UTCZ)')}
+Subject: ${message.subject}
+ID     : ${message.messageUuid} (${message.messageId})
+${'-'.repeat(70)}
+${msgBody}
+	`;
+					return cb(response);
+				});
+			});
+		} else if(selectorMatch[2]) {
+			//	list messages in area
+			const confTag	= selectorMatch[1].substr(1).split('/')[0];
+			const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
+			const area		= getMessageAreaByTag(areaTag);
+
+			if(Message.isPrivateAreaTag(areaTag)) {
+				return cb(this.makeItem(ItemTypes.InfoMessage, 'Area is private'));
+			}
+
+			if(!area || !this.isAreaAndConfExposed(confTag, areaTag)) {
+				return this.notFoundGenerator(selectorMatch, cb);
+			}
+
+			return getMessageListForArea(null, areaTag, (err, msgList) => {
+				const response = [
+					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+					this.makeItem(ItemTypes.InfoMessage, `Messages in ${area.name}`),
+					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+					...msgList.map(msg => this.makeItem(
+						ItemTypes.TextFile,
+						//	:TODO: reasonably trim string
+						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}  ${msg.subject} (${msg.fromUserName} to ${msg.toUserName})`,
+						`/msgarea/${confTag}/${areaTag}/${msg.messageUuid}`
+					))
+				].join('');
+
+				return cb(response);
+			});
+		} else if(selectorMatch[1]) {
+			//	list areas in conf
+			const confTag	= selectorMatch[1].replace(/\r\n|\//g, '');
+			const conf		= _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
+			if(!conf) {
+				return this.notFoundGenerator(selectorMatch, cb);
+			}
+
+			const areas = _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ], {})
+				.map(areaTag => Object.assign( { areaTag }, getMessageAreaByTag(areaTag)))
+				.filter(area => area && !Message.isPrivateAreaTag(area.areaTag));
+
+			if(0 === areas.length) {
+				return cb(this.makeIItem(ItemTypes.InfoMessage, 'No message areas available'));
+			}
+
+			sortAreasOrConfs(areas);
+
+			const response = [
+				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+				this.makeItem(ItemTypes.InfoMessage, `Message areas in ${conf.name}`),
+				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+				...areas.map(area => this.makeItem(ItemTypes.SubMenu, area.name, `/msgarea/${confTag}/${area.areaTag}`))
+			].join('');
+
+			return cb(response);
+		} else {
+			//	message area base (list confs)
+			const confs = Object.keys(_.get(Config, 'contentServers.gopher.messageConferences', {}))
+				.map(confTag => Object.assign( { confTag }, getMessageConferenceByTag(confTag)))
+				.filter(conf => conf);	//	remove any baddies
+
+			if(0 === confs.length) {
+				return cb(this.makeItem(ItemTypes.InfoMessage, 'No message conferences available'));
+			}
+
+			sortAreasOrConfs(confs);
+
+			const response = [
+				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+				this.makeItem(ItemTypes.InfoMessage, 'Available Message Conferences'),
+				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+				this.makeItem(ItemTypes.InfoMessage, ''),
+				...confs.map(conf => this.makeItem(ItemTypes.SubMenu, conf.name, `/msgarea/${conf.confTag}`))
+			].join('');
+
+			return cb(response);
+		}
+	}
+};
\ No newline at end of file

From f557e5b6e0d3616a517ef530d4562cf311e3f7e3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 16 Apr 2018 17:10:19 -0600
Subject: [PATCH 0277/1013] Minor Gopher updates

---
 core/message.js                |  1 +
 core/servers/content/gopher.js | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/message.js b/core/message.js
index d7204e13..f1fa2db8 100644
--- a/core/message.js
+++ b/core/message.js
@@ -497,6 +497,7 @@ module.exports = class Message {
 		});
 	}
 
+	//	:TODO: this should only take a UUID...
 	load(options, cb) {
 		assert(_.isString(options.uuid));
 
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 0a20b0aa..4d1e3f6a 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -153,7 +153,7 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	defaultGenerator(selectorMatch, cb) {
-		let bannerFile = _.get(Config, 'contentServers.gopher.banner', 'startup_banner.asc');
+		let bannerFile = _.get(Config, 'contentServers.gopher.bannerFile', 'startup_banner.asc');
 		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
 		fs.readFile(bannerFile, 'utf8', (err, banner) => {
 			if(err) {
@@ -194,6 +194,10 @@ exports.getModule = class GopherModule extends ServerModule {
 		}
 	}
 
+	shortenSubject(subject) {
+		return _.truncate(subject, { length : 30 } );
+	}
+
 	messageAreaGenerator(selectorMatch, cb) {
 		//
 		//	Selector should be:
@@ -222,7 +226,6 @@ exports.getModule = class GopherModule extends ServerModule {
 				}
 
 				this.prepareMessageBody(message.message, msgBody => {
-					//	:TODO: create DRY for subject trimming...
 					const response = `${'-'.repeat(70)}
 To     : ${message.toUserName}
 From   : ${message.fromUserName}
@@ -256,8 +259,7 @@ ${msgBody}
 					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
 					...msgList.map(msg => this.makeItem(
 						ItemTypes.TextFile,
-						//	:TODO: reasonably trim string
-						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}  ${msg.subject} (${msg.fromUserName} to ${msg.toUserName})`,
+						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}: ${this.shortenSubject(msg.subject)}  (${msg.fromUserName} to ${msg.toUserName})`,
 						`/msgarea/${confTag}/${areaTag}/${msg.messageUuid}`
 					))
 				].join('');

From 695e84e16f8b7d8419d3401e7679567adfa7c224 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 16 Apr 2018 19:29:25 -0600
Subject: [PATCH 0278/1013] * Remove "LastLine" indicator - does not seem to be
 used in practice/is not required * Add logging to Gopher

---
 core/servers/content/gopher.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 4d1e3f6a..f4fc3797 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -65,6 +65,7 @@ exports.getModule = class GopherModule extends ServerModule {
 		super();
 
 		this.routes = new Map();	//	selector->generator => gopher item
+		this.log = Log.child( { server : 'Gopher' } );
 	}
 
 	createServer() {
@@ -87,7 +88,7 @@ exports.getModule = class GopherModule extends ServerModule {
 
 			socket.on('error', err => {
 				if('ECONNRESET' !== err.code) {	//	normal
-					Log.trace( { error : err.message }, 'Socket error');
+					this.log.trace( { error : err.message }, 'Socket error');
 				}
 			});
 		});
@@ -100,7 +101,7 @@ exports.getModule = class GopherModule extends ServerModule {
 
 		const port = parseInt(Config.contentServers.gopher.port);
 		if(isNaN(port)) {
-			Log.warn( { port : Config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
+			this.log.warn( { port : Config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
 			return false;
 		}
 
@@ -122,7 +123,7 @@ exports.getModule = class GopherModule extends ServerModule {
 			try {
 				selectorRegExp = new RegExp(`${selectorRegExp}\r\n`);
 			} catch(e) {
-				Log.warn( { pattern : selectorRegExp }, 'Invalid RegExp for selector' );
+				this.log.warn( { pattern : selectorRegExp }, 'Invalid RegExp for selector' );
 				return false;
 			}
 		}
@@ -141,7 +142,7 @@ exports.getModule = class GopherModule extends ServerModule {
 		}
 		generator = generator || this.notFoundGenerator;
 		generator(match, res => {
-			socket.end(`${res}.\r\n`);	//	includes RFC-1436 'Lastline'
+			socket.end(`${res}`);
 		});
 	}
 
@@ -153,6 +154,8 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	defaultGenerator(selectorMatch, cb) {
+		this.log.trace( { selector : selectorMatch[0] }, 'Serving default content');
+
 		let bannerFile = _.get(Config, 'contentServers.gopher.bannerFile', 'startup_banner.asc');
 		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
 		fs.readFile(bannerFile, 'utf8', (err, banner) => {
@@ -167,6 +170,7 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	notFoundGenerator(selectorMatch, cb) {
+		this.log.trace( { selector : selectorMatch[0] }, 'Serving not found content');
 		return cb('Not found');
 	}
 
@@ -199,13 +203,14 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	messageAreaGenerator(selectorMatch, cb) {
+		this.log.trace( { selector : selectorMatch[0] }, 'Serving message area content');
 		//
 		//	Selector should be:
 		//	/msgarea - list confs
 		//	/msgarea/conftag - list areas in conf
 		//	/msgarea/conftag/areatag - list messages in area
-		//	/msgarea/conftag/areatag/<num> - message as text
-		//	/msgarea/conftag/areatag/<num>_raw - full message as text + headers
+		//	/msgarea/conftag/areatag/<UUID> - message as text
+		//	/msgarea/conftag/areatag/<UUID>_raw - full message as text + headers
 		//
 		if(selectorMatch[3] || selectorMatch[4]) {
 			//	message
@@ -218,10 +223,17 @@ exports.getModule = class GopherModule extends ServerModule {
 
 			return message.load( { uuid : msgUuid }, err => {
 				if(err) {
+					this.log.debug( { uuid : msgUuid }, 'Attempted access to non-existant message UUID!');
 					return this.notFoundGenerator(selectorMatch, cb);
 				}
 
 				if(message.areaTag !== areaTag || !this.isAreaAndConfExposed(confTag, areaTag)) {
+					this.log.warn( { areaTag }, 'Attempted access to non-exposed conference and/or area!');
+					return this.notFoundGenerator(selectorMatch, cb);
+				}
+
+				if(Message.isPrivateAreaTag(areaTag)) {
+					this.log.warn( { areaTag }, 'Attempted access to message in private area!');
 					return this.notFoundGenerator(selectorMatch, cb);
 				}
 
@@ -245,10 +257,12 @@ ${msgBody}
 			const area		= getMessageAreaByTag(areaTag);
 
 			if(Message.isPrivateAreaTag(areaTag)) {
+				this.log.warn( { areaTag }, 'Attempted access to private area!');
 				return cb(this.makeItem(ItemTypes.InfoMessage, 'Area is private'));
 			}
 
 			if(!area || !this.isAreaAndConfExposed(confTag, areaTag)) {
+				this.log.warn( { confTag, areaTag }, 'Attempted access to non-exposed conference and/or area!');
 				return this.notFoundGenerator(selectorMatch, cb);
 			}
 
@@ -279,7 +293,7 @@ ${msgBody}
 				.filter(area => area && !Message.isPrivateAreaTag(area.areaTag));
 
 			if(0 === areas.length) {
-				return cb(this.makeIItem(ItemTypes.InfoMessage, 'No message areas available'));
+				return cb(this.makeItem(ItemTypes.InfoMessage, 'No message areas available'));
 			}
 
 			sortAreasOrConfs(areas);

From 78feb2695849181df36c10ecc1c40c14742677bd Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Mon, 23 Apr 2018 20:20:31 -0400
Subject: [PATCH 0279/1013] Invalid JSON - Missing Comma

Was missing the ending comma on the wsConnect line. This just adds it.
---
 docs/servers/websocket.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/servers/websocket.md b/docs/servers/websocket.md
index 62df02d7..435e4482 100644
--- a/docs/servers/websocket.md
+++ b/docs/servers/websocket.md
@@ -64,7 +64,7 @@ webserver, and unpack it to a temporary directory.
     ````javascript
     var vtxdata = {
         sysName: "Your Awesome BBS",
-        wsConnect: "wss://your-hostname.here:8811" 
+        wsConnect: "wss://your-hostname.here:8811",
         term: "ansi-bbs",
         codePage: "CP437",
         fontName: "UVGA16",
@@ -88,4 +88,4 @@ otherwise.
 9. If you navigate to http://your-hostname.here/vtx.html, you should see a splash screen like the following:
     ![VTXClient](../assets/images/vtxclient.png "VTXClient")
 
- 
\ No newline at end of file
+ 

From a1f55e5ad51f82bb47a335d5758784c20f6d8021 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 23 Apr 2018 18:41:12 -0600
Subject: [PATCH 0280/1013] Webserver Crashes accessing Directory #177

---
 core/servers/content/web.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 8a9903b4..d1edb221 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -218,7 +218,7 @@ exports.getModule = class WebServerModule extends ServerModule {
 		const self = this;
 
 		fs.stat(filePath, (err, stats) => {
-			if(err) {
+			if(err || !stats.isFile()) {
 				return self.fileNotFound(resp);
 			}
 

From 389e52dcb9f184d11b8608550377ca75574d0257 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Mon, 23 Apr 2018 20:53:55 -0400
Subject: [PATCH 0281/1013] Missing mb command in oputil.js help

The `mb` sub-command was missing from the general help output from oputil.js - this add it.
---
 core/oputil/oputil_help.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 4875d382..c5e096b5 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -19,6 +19,7 @@ commands:
   user                      user utilities
   config                    config file management
   fb                        file base management
+  mb                        message base management
 `,
 	User : 
 `usage: optutil.js user --user USERNAME <args>
@@ -100,4 +101,4 @@ general information:
 
 function getHelpFor(command) {
 	return usageHelp[command];
-}
\ No newline at end of file
+}

From a0cd8fed83483efb127b378985c93e4c9fad6808 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 23 Apr 2018 19:03:35 -0600
Subject: [PATCH 0282/1013] Websocket config should be similar to web #176

---
 core/config.js                  | 18 +++++++++++++-----
 core/servers/login/websocket.js | 17 ++++++++++-------
 docs/servers/websocket.md       | 21 ++++++++++++++++-----
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/core/config.js b/core/config.js
index 7e5d92a1..2564c256 100644
--- a/core/config.js
+++ b/core/config.js
@@ -230,11 +230,19 @@ function getDefaultConfig() {
 				firstMenuNewUser	: 'sshConnectedNewUser',
 			},
 			webSocket : {
-				port		: 8810,	//	ws://
-				enabled		: false,
-				securePort	: 8811,	//	wss:// - must provide certPem and keyPem
-				certPem		: paths.join(__dirname, './../config/https_cert.pem'),
-				keyPem		: paths.join(__dirname, './../config/https_cert_key.pem'),
+				ws : {
+					//	non-secure ws://
+					enabled			: false,
+					port			: 8810,
+				},
+				wss : {
+					//	secure ws://
+					//	must provide valid certPem and keyPem
+					enabled			: false,
+					port			: 8811,
+					certPem			: paths.join(__dirname, './../config/https_cert.pem'),
+					keyPem			: paths.join(__dirname, './../config/https_cert_key.pem'),
+				},
 			},
 		},
 
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index cc0270b1..9e480ac9 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -118,12 +118,15 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 		//	* insecure websocket (ws://)
 		//	* secure (tls) websocket (wss://)
 		//
-		const config = _.get(Config, 'loginServers.webSocket') || { enabled : false };
-		if(!config || true !== config.enabled || !(config.port || config.securePort)) {
+		const config = _.get(Config, 'loginServers.webSocket');
+		if(!_.isObject(config)) {
 			return;
 		}
 
-		if(config.port) {
+		const wsPort 	= _.get(config, 'ws.port');
+		const wssPort	= _.get(config, 'wss.port');
+
+		if(true === _.get(config, 'ws.enabled') && _.isNumber(wsPort)) {
 			const httpServer = http.createServer( (req, resp) => {
 				//	dummy handler
 				resp.writeHead(200);
@@ -136,10 +139,10 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 			};
 		}
 
-		if(config.securePort) {
+		if(_.isObject(config, 'wss') && true === _.get(config, 'wss.enabled') && _.isNumber(wssPort)) {
 			const httpServer = https.createServer({
-				key		: fs.readFileSync(Config.loginServers.webSocket.keyPem),
-				cert	: fs.readFileSync(Config.loginServers.webSocket.certPem),
+				key		: fs.readFileSync(config.wss.keyPem),
+				cert	: fs.readFileSync(config.wss.certPem),
 			});
 
 			this.secure = {
@@ -157,7 +160,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 			}
 
 			const serverName 	= `${ModuleInfo.name} (${serverType})`;
-			const port			= parseInt(_.get(Config, [ 'loginServers', 'webSocket', 'secure' === serverType ? 'securePort' : 'port' ] ));
+			const port			= parseInt(_.get(Config, [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
 
 			if(isNaN(port)) {
 				Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
diff --git a/docs/servers/websocket.md b/docs/servers/websocket.md
index 435e4482..be5eb739 100644
--- a/docs/servers/websocket.md
+++ b/docs/servers/websocket.md
@@ -27,11 +27,22 @@ don't already have it defined).
     ````hjson
     loginServers: {
             webSocket : {
-                    port: 8810
-                    enabled: true
-                    securePort: 8811
-                    certPem: /path/to/https_cert.pem
-                    keyPem: /path/to/https_cert_key.pem
+                    ws: {
+                        // non-secure ws://
+                        port: 8810
+                        enabled: true
+                    }
+                    wss: {
+                        //  secure-over-tls wss://
+                        port: 8811
+                        enabled: true
+                        certPem: /path/to/https_cert.pem
+                        keyPem: /path/to/https_cert_key.pem
+                    }
+                    // set proxied to true to allow TLS-terminated proxied connections
+                    // containing the "X-Forwarded-Proto: https" header to be treated
+                    // as secure
+                    proxied: true
             }
     }
     ````

From 7ac388c30d96087b725265424049bd3a89f19158 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Tue, 24 Apr 2018 08:30:14 -0400
Subject: [PATCH 0283/1013] Force no compression

It appears as tho there is a problem with compression and the upstream library. This PR forces no compression mode, making a work around for #181.

This work around is derived from https://github.com/mscdex/ssh2/issues/594 which may be the cause for #181 as well.
---
 core/servers/login/ssh.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index d14bdbbd..80a99c7e 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -248,6 +248,7 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 					Log.trace(`SSH: ${sshDebugLine}`);
 				}
 			},
+			algorithms: { compress: ['none'] },
 		};
 
 		this.server = ssh2.Server(serverConf);

From 69ced917f38dabc968e206bc00fc7bf157e23acc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 24 Apr 2018 19:58:59 -0600
Subject: [PATCH 0284/1013] Bind notFoundGenerator

---
 core/servers/content/gopher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index f4fc3797..aa2e4be0 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -140,7 +140,7 @@ exports.getModule = class GopherModule extends ServerModule {
 				break;
 			}
 		}
-		generator = generator || this.notFoundGenerator;
+		generator = generator || this.notFoundGenerator.bind(this);
 		generator(match, res => {
 			socket.end(`${res}`);
 		});

From 0b77c1f79edba73fb986f1b34bdd37ce418f349d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 24 Apr 2018 20:07:02 -0600
Subject: [PATCH 0285/1013] Better notFoundGenerator

---
 core/servers/content/gopher.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index aa2e4be0..5e0ee42f 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -131,18 +131,17 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	routeRequest(selector, socket) {
-		let generator;
 		let match;
 		for(let [regex, gen] of this.routes) {
 			match = selector.match(regex);
 			if(match) {
-				generator = gen;
-				break;
+				return gen(match, res => {
+					return socket.end(`${res}`);
+				});
 			}
 		}
-		generator = generator || this.notFoundGenerator.bind(this);
-		generator(match, res => {
-			socket.end(`${res}`);
+		this.notFoundGenerator(selector, res => {
+			return socket.end(`${res}`);
 		});
 	}
 
@@ -169,8 +168,8 @@ exports.getModule = class GopherModule extends ServerModule {
 		});
 	}
 
-	notFoundGenerator(selectorMatch, cb) {
-		this.log.trace( { selector : selectorMatch[0] }, 'Serving not found content');
+	notFoundGenerator(selector, cb) {
+		this.log.trace( { selector }, 'Serving not found content');
 		return cb('Not found');
 	}
 

From 476e8f2f0c9fbae70ce0b8aed015cb6ea3b389b4 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 28 Apr 2018 00:33:34 +0100
Subject: [PATCH 0286/1013] Upgrade to node.js 10

---
 misc/install.sh   |    2 +-
 package-lock.json | 2663 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |    8 +-
 3 files changed, 2668 insertions(+), 5 deletions(-)
 create mode 100644 package-lock.json

diff --git a/misc/install.sh b/misc/install.sh
index 36ab8202..b50ca8c7 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -2,7 +2,7 @@
 
 { # this ensures the entire script is downloaded before execution
 
-ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=8}
+ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=10}
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..3e52f2b9
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,2663 @@
+{
+  "name": "enigma-bbs",
+  "version": "0.0.9-alpha",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+    },
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "1.9.1"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "requires": {
+        "micromatch": "3.1.10",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "async": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
+    "atob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "requires": {
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        }
+      }
+    },
+    "binary-parser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/binary-parser/-/binary-parser-1.3.2.tgz",
+      "integrity": "sha512-VDhHcpeF1/ZZy1XvDmYD67bBjRNm1gacw+772xNd5BnTH6ax5TzlDV5dl7216/UlQXQoN9vug07ehk7e0PhNUw=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "requires": {
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "repeat-element": "1.1.2",
+        "snapdragon": "0.8.2",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "bser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
+      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "requires": {
+        "node-int64": "0.4.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+    },
+    "buffers": {
+      "version": "github:NuSkooler/node-buffers#cd0855598f7048b02f0a51c90e22573973e9e2c2"
+    },
+    "bunyan": {
+      "version": "1.8.12",
+      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+      "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+      "requires": {
+        "dtrace-provider": "0.8.6",
+        "moment": "2.22.1",
+        "mv": "2.1.1",
+        "safe-json-stringify": "1.1.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "requires": {
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.4.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "requires": {
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "requires": {
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "requires": {
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "requires": {
+        "globby": "5.0.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.4.5"
+      }
+    },
+    "dtrace-provider": {
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz",
+      "integrity": "sha1-QooiOv4DQl0s1tY0f99AxmkDVj0=",
+      "optional": true,
+      "requires": {
+        "nan": "2.10.0"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "exec-sh": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
+      "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
+      "requires": {
+        "merge": "1.2.0"
+      }
+    },
+    "exiftool": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/exiftool/-/exiftool-0.0.3.tgz",
+      "integrity": "sha1-9YqSvXcnCtxU8xUc7WGko6tp1wc="
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "requires": {
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "requires": {
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.21",
+        "tmp": "0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "requires": {
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        }
+      }
+    },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "requires": {
+        "bser": "2.0.0"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "requires": {
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "requires": {
+        "map-cache": "0.2.2"
+      }
+    },
+    "fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz",
+      "integrity": "sha512-X+57O5YkDTiEQGiw8i7wYc2nQgweIekqkepI8Q3y4wVlurgBt2SuwxTeYUYMZIGpLZH3r/TsMjczCMXE5ZOt7Q==",
+      "optional": true,
+      "requires": {
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.9.1"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "2.1.2"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.21",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.9.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.6",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.4",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "requires": {
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "hashids": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
+      "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
+    },
+    "hjson": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.1.1.tgz",
+      "integrity": "sha512-1oGkOq4sssz7HFZ8Is9HuTR47r8gSC46qAzQxVlAkj0lNKpS+W5Lv2eci+c5+fFqL+Idtj5EvprFreUwH29a8A=="
+    },
+    "iconv-lite": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
+      "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "requires": {
+        "ansi-escapes": "3.1.0",
+        "chalk": "2.4.1",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "2.2.0",
+        "figures": "2.0.0",
+        "lodash": "4.17.10",
+        "mute-stream": "0.0.7",
+        "run-async": "2.3.0",
+        "rxjs": "5.5.10",
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "through": "2.3.8"
+      }
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "requires": {
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "requires": {
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "requires": {
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "is-odd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+      "requires": {
+        "is-number": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+        }
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "requires": {
+        "is-path-inside": "1.0.1"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "3.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+    },
+    "later": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/later/-/later-1.2.0.tgz",
+      "integrity": "sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8="
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "requires": {
+        "tmpl": "1.0.4"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "1.0.1"
+      }
+    },
+    "merge": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
+      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "requires": {
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.9",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      }
+    },
+    "mime-db": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+    },
+    "mime-types": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "requires": {
+        "mime-db": "1.33.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.11"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "requires": {
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "optional": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "optional": true
+        }
+      }
+    },
+    "moment": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz",
+      "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ=="
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "mv": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+      "optional": true,
+      "requires": {
+        "mkdirp": "0.5.1",
+        "ncp": "2.0.0",
+        "rimraf": "2.4.5"
+      }
+    },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+    },
+    "nanomatch": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+      "requires": {
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-odd": "2.0.0",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      }
+    },
+    "ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+      "optional": true
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+    },
+    "node-pty": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.7.4.tgz",
+      "integrity": "sha512-WxMY1BsGcHJ2Z2qWpYL7QbfOSnkkCzV0H/9+dJ7uQEIJyz0A4fVBLymswBCTc7RoweY5ingib2gNvf87KvJxuA==",
+      "requires": {
+        "nan": "2.10.0"
+      }
+    },
+    "nodemailer": {
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.4.tgz",
+      "integrity": "sha512-SD4uuX7NMzZ5f5m1XHDd13J4UC3SmdJk8DsmU1g6Nrs5h3x9LcXr6EBPZIqXRJ3LrF7RdklzGhZRF/TuylTcLg=="
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "3.0.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "1.2.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "rimraf": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+      "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+      "requires": {
+        "glob": "6.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "rlogin": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rlogin/-/rlogin-1.0.0.tgz",
+      "integrity": "sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM="
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "rxjs": {
+      "version": "5.5.10",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
+      "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-json-stringify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz",
+      "integrity": "sha512-EzBtUaFH9bHYPc69wqjp0efJI/DPNHdFbGE3uIMn4sVbO0zx8vZ8cG4WKxQfOpUOKsQyGBiT2mTqnCw+6nLswA==",
+      "optional": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "0.1.15"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sane": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.0.tgz",
+      "integrity": "sha512-glfKd7YH4UCrh/7dD+UESsr8ylKWRE7UQPoXuz28FgmcF0ViJQhCTCCZHICRKxf8G8O1KdLEn20dcICK54c7ew==",
+      "requires": {
+        "anymatch": "2.0.0",
+        "exec-sh": "0.2.1",
+        "fb-watchman": "2.0.0",
+        "fsevents": "1.2.3",
+        "micromatch": "3.1.10",
+        "minimist": "1.2.0",
+        "walker": "1.0.7",
+        "watch": "0.18.0"
+      }
+    },
+    "sanitize-filename": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
+      "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+      "requires": {
+        "truncate-utf8-bytes": "1.0.2"
+      }
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "requires": {
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.7",
+        "source-map-resolve": "0.5.1",
+        "use": "3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "6.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-resolve": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz",
+      "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
+      "requires": {
+        "atob": "2.1.1",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "requires": {
+        "extend-shallow": "3.0.2"
+      }
+    },
+    "sqlite3": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.0.tgz",
+      "integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
+      "requires": {
+        "nan": "2.9.2",
+        "node-pre-gyp": "0.9.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.5"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "requires": {
+            "minipass": "2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "requires": {
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "iconv-lite": {
+          "version": "0.4.19",
+          "bundled": true
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "minimatch": "3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "minipass": {
+          "version": "2.2.1",
+          "bundled": true,
+          "requires": {
+            "yallist": "3.0.2"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "minipass": "2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "nan": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
+          "integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw=="
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.19",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.9.0",
+          "bundled": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.6",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "rc": {
+          "version": "1.2.6",
+          "bundled": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.5",
+          "bundled": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "tar": {
+          "version": "4.4.0",
+          "bundled": true,
+          "requires": {
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.1",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "sqlite3-trans": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/sqlite3-trans/-/sqlite3-trans-1.2.0.tgz",
+      "integrity": "sha1-E8/K2wk+1I5m+U7IlWq3RU3clgg=",
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "ssh2": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.5.5.tgz",
+      "integrity": "sha1-x3gezS7OcwSiU89iD6taXCK7IjU=",
+      "requires": {
+        "ssh2-streams": "0.1.20"
+      }
+    },
+    "ssh2-streams": {
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz",
+      "integrity": "sha1-URGNFUVV31Rp7h9n4M8efoosDjo=",
+      "requires": {
+        "asn1": "0.2.3",
+        "semver": "5.5.0",
+        "streamsearch": "0.1.2"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        }
+      }
+    },
+    "streamsearch": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
+      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "3.0.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "requires": {
+        "has-flag": "3.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+    },
+    "temptmp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.0.0.tgz",
+      "integrity": "sha1-M7Djbh8nMXyKKBIO6Wufj+tw2UM=",
+      "requires": {
+        "del": "2.2.2"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "requires": {
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "truncate-utf8-bytes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
+      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+      "requires": {
+        "utf8-byte-length": "1.0.4"
+      }
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "requires": {
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "requires": {
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
+          }
+        }
+      }
+    },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        }
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "use": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
+      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
+      "requires": {
+        "kind-of": "6.0.2"
+      }
+    },
+    "utf8-byte-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
+      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
+    },
+    "uuid": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+    },
+    "uuid-parse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.0.0.tgz",
+      "integrity": "sha1-9GV3F2JLDkuIrzb5jYlYmlu+5Wk="
+    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "requires": {
+        "makeerror": "1.0.11"
+      }
+    },
+    "watch": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
+      "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
+      "requires": {
+        "exec-sh": "0.2.1",
+        "minimist": "1.2.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "ws": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
+      "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+      "requires": {
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "xxhash": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/xxhash/-/xxhash-0.2.4.tgz",
+      "integrity": "sha1-i4pIFiz8zCG5IPpQAmEYfUAhbDk=",
+      "requires": {
+        "nan": "2.10.0"
+      }
+    },
+    "yazl": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
+      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
+      "requires": {
+        "buffer-crc32": "0.2.13"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 88844455..27c5332a 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "async": "^2.5.0",
     "binary-parser": "^1.3.2",
-    "buffers": "NuSkooler/node-buffers",
+    "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
     "fs-extra": "^5.0.0",
@@ -39,12 +39,12 @@
     "mime-types": "^2.1.17",
     "minimist": "1.2.x",
     "moment": "^2.20.1",
-    "nodemailer": "^4.4.1",
     "node-pty": "^0.7.4",
+    "nodemailer": "^4.4.1",
     "rlogin": "^1.0.0",
     "sane": "^2.2.0",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^3.1.9",
+    "sqlite3": "^4.0.0",
     "sqlite3-trans": "^1.2.0",
     "ssh2": "^0.5.5",
     "temptmp": "^1.0.0",
@@ -56,6 +56,6 @@
   },
   "devDependencies": {},
   "engines": {
-    "node": ">=6.9.2"
+    "node": ">=10"
   }
 }

From f16eb6f3e698f570acc3e461b552bfa214d2f1bb Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 28 Apr 2018 13:59:07 +0100
Subject: [PATCH 0287/1013] Fix Node.js 10 deprecation warnings

---
 .gitignore                   |  1 +
 core/archive_util.js         |  4 ++--
 core/art.js                  |  2 +-
 core/file_transfer.js        |  4 ++--
 core/fnv1a.js                |  4 ++--
 core/ftn_mail_packet.js      | 20 ++++++++++----------
 core/ftn_util.js             |  2 +-
 core/sauce.js                |  4 ++--
 core/servers/login/telnet.js | 22 +++++++++++-----------
 core/telnet_bridge.js        |  8 ++++----
 core/user.js                 |  6 +++---
 core/uuid_util.js            |  6 +++---
 12 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a58c717..28a19883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pem
 
 #	Various directories
+config/config.hjson
 logs/
 db/
 dropfiles/
diff --git a/core/archive_util.js b/core/archive_util.js
index 8a4c388a..8ce2abc2 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -78,7 +78,7 @@ module.exports = class ArchiveUtil {
 			Object.keys(Config.fileTypes).forEach(mimeType => {
 				const fileType = Config.fileTypes[mimeType];
 				if(fileType.sig) {
-					fileType.sig 	= new Buffer(fileType.sig, 'hex');
+					fileType.sig 	= Buffer.alloc(fileType.sig, 'hex');
 					fileType.offset	= fileType.offset || 0;
 
 					//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
@@ -120,7 +120,7 @@ module.exports = class ArchiveUtil {
 				return cb(err);
 			}
 
-			const buf = new Buffer(this.longestSignature);
+			const buf = Buffer.from(this.longestSignature);
 			fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
 				if(err) {
 					return cb(err);
diff --git a/core/art.js b/core/art.js
index 546014bd..9234542d 100644
--- a/core/art.js
+++ b/core/art.js
@@ -288,7 +288,7 @@ function display(client, art, options, cb) {
 	}
 
 	if(!options.disableMciCache) {
-		artHash	= xxhash.hash(new Buffer(art), 0xCAFEBABE);
+		artHash	= xxhash.hash(Buffer.from(art), 0xCAFEBABE);
 
 		//	see if we have a mciMap cached for this art
 		if(client.mciCache) {
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 757eff8a..19388bab 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -374,7 +374,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			//	needed for things like sz/rz
 			if(external.escapeTelnet) {
 				const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');	//	de-escape
-				externalProc.write(new Buffer(tmp, 'binary'));
+				externalProc.write(Buffer.from(tmp, 'binary'));
 			} else {
 				externalProc.write(data);
 			}
@@ -384,7 +384,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			//	needed for things like sz/rz
 			if(external.escapeTelnet) {
 				const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');	//	escape
-				this.client.term.rawWrite(new Buffer(tmp, 'binary'));
+				this.client.term.rawWrite(Buffer.from(tmp, 'binary'));
 			} else {
 				this.client.term.rawWrite(data);
 			}
diff --git a/core/fnv1a.js b/core/fnv1a.js
index 743986d6..ce1fe105 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -19,7 +19,7 @@ module.exports = class FNV1a {
 		}
 
 		if(_.isString(data)) {
-			data = new Buffer(data);
+			data = Buffer.from(data);
 		}
 
 		if(!Buffer.isBuffer(data)) {
@@ -38,7 +38,7 @@ module.exports = class FNV1a {
 
 	digest(encoding) {
 		encoding = encoding || 'binary';
-		let buf = new Buffer(4);
+		let buf = Buffer.alloc(4);
 		buf.writeInt32BE(this.hash & 0xffffffff, 0);
 		return buf.toString(encoding);
 	}
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index bb72c40a..5db02227 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -26,7 +26,7 @@ const FTN_PACKET_MESSAGE_TYPE	= 2;
 const FTN_PACKET_BAUD_TYPE_2_2	= 2;
 
 //	SAUCE magic header + version ("00")
-const FTN_MESSAGE_SAUCE_HEADER = new Buffer('SAUCE00');
+const FTN_MESSAGE_SAUCE_HEADER = Buffer.from('SAUCE00');
 
 const FTN_MESSAGE_KLUDGE_PREFIX	= '\x01';
 
@@ -273,7 +273,7 @@ function Packet(options) {
 	};
 
 	this.getPacketHeaderBuffer = function(packetHeader) {
-		let buffer = new Buffer(FTN_PACKET_HEADER_SIZE);
+		let buffer = Buffer.from(FTN_PACKET_HEADER_SIZE);
 
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
@@ -311,7 +311,7 @@ function Packet(options) {
 	};
 
 	this.writePacketHeader = function(packetHeader, ws) {
-		let buffer = new Buffer(FTN_PACKET_HEADER_SIZE);
+		let buffer = Buffer.from(FTN_PACKET_HEADER_SIZE);
 
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
@@ -447,8 +447,8 @@ function Packet(options) {
 					//	Also according to the spec, the deprecated "CHARSET" value may be used
 					//	:TODO: Look into CHARSET more - should we bother supporting it?
 					//	:TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
-					const FTN_CHRS_PREFIX 	= new Buffer( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
-					const FTN_CHRS_SUFFIX	= new Buffer( [ 0x0d ] );
+					const FTN_CHRS_PREFIX 	= Buffer.from( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
+					const FTN_CHRS_SUFFIX	= Buffer.from( [ 0x0d ] );
 
 					let chrsPrefixIndex = messageBodyBuffer.indexOf(FTN_CHRS_PREFIX);
 					if(chrsPrefixIndex < 0) {
@@ -724,7 +724,7 @@ function Packet(options) {
 		buf.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
 		buf.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
 
-		const dateTimeBuffer = new Buffer(ftn.getDateTimeString(message.modTimestamp) + '\0');
+		const dateTimeBuffer = Buffer.from(ftn.getDateTimeString(message.modTimestamp) + '\0');
 		dateTimeBuffer.copy(buf, 14);
 	};
 
@@ -747,7 +747,7 @@ function Packet(options) {
 		async.waterfall(
 			[
 				function prepareHeaderAndKludges(callback) {
-					const basicHeader = new Buffer(34);
+					const basicHeader = Buffer.from(34);
 					self.writeMessageHeader(message, basicHeader);			
 
 					//
@@ -864,7 +864,7 @@ function Packet(options) {
 	};
 
 	this.writeMessage = function(message, ws, options) {
-		let basicHeader = new Buffer(34);
+		let basicHeader = Buffer.from(34);
 		self.writeMessageHeader(message, basicHeader);
 
 		ws.write(basicHeader);
@@ -1054,7 +1054,7 @@ Packet.prototype.writeTerminator = function(ws) {
 	//	From FTS-0001.016:
 	//	"A  pseudo-message beginning with the word 0000H signifies the end of the packet."
 	//
-	ws.write(new Buffer( [ 0x00, 0x00 ] ));	//	final extra null term
+	ws.write(Buffer.from( [ 0x00, 0x00 ] ));	//	final extra null term
 	return 2;
 };
 
@@ -1074,7 +1074,7 @@ Packet.prototype.writeStream = function(ws, messages, options) {
 	});
 
 	if(true === options.terminatePacket) {
-		ws.write(new Buffer( [ 0 ] ));	//	final extra null term
+		ws.write(Buffer.from( [ 0 ] ));	//	final extra null term
 	}
 };
 
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 03040484..e40d2687 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -46,7 +46,7 @@ exports.getQuotePrefix				= getQuotePrefix;
 //	See list here: https://github.com/Mithgol/node-fidonet-jam
 
 function stringToNullPaddedBuffer(s, bufLen) {
-	let buffer 	= new Buffer(bufLen).fill(0x00);
+	let buffer 	= Buffer.alloc(bufLen).fill(0x00);
 	let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
 	for(let i = 0; i < enc.length; ++i) {
 		buffer[i] = enc[i];
diff --git a/core/sauce.js b/core/sauce.js
index 9ee75b47..e0182ae7 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -10,10 +10,10 @@ const { Parser }	= require('binary-parser');
 exports.readSAUCE		= readSAUCE;
 
 const SAUCE_SIZE	= 128;
-const SAUCE_ID		= new Buffer([0x53, 0x41, 0x55, 0x43, 0x45]);	//	'SAUCE'
+const SAUCE_ID		= Buffer.from([0x53, 0x41, 0x55, 0x43, 0x45]);	//	'SAUCE'
 
 //	:TODO read comments
-//const COMNT_ID		= new Buffer([0x43, 0x4f, 0x4d, 0x4e, 0x54]);	//	'COMNT'
+//const COMNT_ID		= Buffer.from([0x43, 0x4f, 0x4d, 0x4e, 0x54]);	//	'COMNT'
 
 exports.SAUCE_SIZE		= SAUCE_SIZE;
 //	:TODO: SAUCE should be a class
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 6ffb49a9..3c585c84 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -159,8 +159,8 @@ const NEW_ENVIRONMENT_COMMANDS = {
 	USERVAR	: 3,
 };
 
-const IAC_BUF 		= new Buffer([ COMMANDS.IAC ]);
-const IAC_SE_BUF	= new Buffer([ COMMANDS.IAC, COMMANDS.SE ]);
+const IAC_BUF 		= Buffer.from([ COMMANDS.IAC ]);
+const IAC_SE_BUF	= Buffer.from([ COMMANDS.IAC, COMMANDS.SE ]);
 
 const COMMAND_NAMES = Object.keys(COMMANDS).reduce(function(names, name) {
 	names[COMMANDS[name]] = name.toLowerCase();
@@ -766,7 +766,7 @@ TelnetClient.prototype.handleMiscCommand = function(evt) {
 };
 
 TelnetClient.prototype.requestTerminalType = function() {
-	const buf = new Buffer( [
+	const buf = Buffer.from( [
 		COMMANDS.IAC, 
 		COMMANDS.SB, 
 		OPTIONS.TERMINAL_TYPE, 
@@ -777,10 +777,10 @@ TelnetClient.prototype.requestTerminalType = function() {
 };
 
 const WANTED_ENVIRONMENT_VAR_BUFS = [
-	new Buffer( 'LINES' ),
-	new Buffer( 'COLUMNS' ),
-	new Buffer( 'TERM' ),
-	new Buffer( 'TERM_PROGRAM' )
+	Buffer.from( 'LINES' ),
+	Buffer.from( 'COLUMNS' ),
+	Buffer.from( 'TERM' ),
+	Buffer.from( 'TERM_PROGRAM' )
 ];
 
 TelnetClient.prototype.requestNewEnvironment = function() {
@@ -793,7 +793,7 @@ TelnetClient.prototype.requestNewEnvironment = function() {
 	const self = this;	
 
 	const bufs = buffers();
-	bufs.push(new Buffer( [
+	bufs.push(Buffer.from( [
 		COMMANDS.IAC, 
 		COMMANDS.SB, 
 		OPTIONS.NEW_ENVIRONMENT, 
@@ -801,10 +801,10 @@ TelnetClient.prototype.requestNewEnvironment = function() {
 		));
 
 	for(let i = 0; i < WANTED_ENVIRONMENT_VAR_BUFS.length; ++i) {
-		bufs.push(new Buffer( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
+		bufs.push(Buffer.from( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
 	}
 
-	bufs.push(new Buffer([ NEW_ENVIRONMENT_COMMANDS.USERVAR, COMMANDS.IAC, COMMANDS.SE ]));
+	bufs.push(Buffer.from([ NEW_ENVIRONMENT_COMMANDS.USERVAR, COMMANDS.IAC, COMMANDS.SE ]));
 
 	self.output.write(bufs.toBuffer());
 
@@ -836,7 +836,7 @@ Object.keys(OPTIONS).forEach(function(name) {
 	const code = OPTIONS[name];
 
 	Command.prototype[name.toLowerCase()] = function() {
-		const buf = new Buffer(3);
+		const buf = Buffer.alloc(3);
 		buf[0]	= COMMANDS.IAC;
 		buf[1]	= this.command;
 		buf[2]	= code;
diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 95ace6c6..150996dd 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -33,7 +33,7 @@ exports.moduleInfo = {
 	author	: 'Andrew Pamment',
 };
 
-const IAC_DO_TERM_TYPE = new Buffer( [ 255, 253, 24 ] );
+const IAC_DO_TERM_TYPE = Buffer.from( [ 255, 253, 24 ] );
 
 class TelnetClientConnection extends EventEmitter {
 	constructor(client) {
@@ -103,7 +103,7 @@ class TelnetClientConnection extends EventEmitter {
 		//
 		let bufs = buffers();
 
-		bufs.push(new Buffer(
+		bufs.push(Buffer.from(
 			[
 				255,	//	IAC
 				250,	//	SB
@@ -113,8 +113,8 @@ class TelnetClientConnection extends EventEmitter {
 		));
 
 		bufs.push(
-			new Buffer(this.client.term.termType),	//	e.g. "ansi"
-			new Buffer( [ 255, 240 ] )				//	IAC, SE
+			Buffer.from(this.client.term.termType),	//	e.g. "ansi"
+			Buffer.from( [ 255, 240 ] )				//	IAC, SE
 		);
 
 		return bufs.toBuffer();
diff --git a/core/user.js b/core/user.js
index 76c493ea..59f150bb 100644
--- a/core/user.js
+++ b/core/user.js
@@ -130,8 +130,8 @@ module.exports = class User {
 					//
 					//	Use constant time comparison here for security feel-goods
 					//
-					const passDkBuf		= new Buffer(passDk,	'hex');
-					const propsDkBuf	= new Buffer(propsDk,	'hex');
+					const passDkBuf		= Buffer.from(passDk,	'hex');
+					const propsDkBuf	= Buffer.from(propsDk,	'hex');
 
 					if(passDkBuf.length !== propsDkBuf.length) {
 						return callback(Errors.AccessDenied('Invalid password'));
@@ -595,7 +595,7 @@ module.exports = class User {
 	}
 
 	static generatePasswordDerivedKey(password, salt, cb) {
-		password = new Buffer(password).toString('hex');
+		password = Buffer.from(password).toString('hex');
 
 		crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', (err, dk) => {
 			if(err) {
diff --git a/core/uuid_util.js b/core/uuid_util.js
index de64ec30..9af449dd 100644
--- a/core/uuid_util.js
+++ b/core/uuid_util.js
@@ -11,17 +11,17 @@ function createNamedUUID(namespaceUuid, key) {
 	//	https://github.com/download13/uuidv5/blob/master/uuid.js
 	//
 	if(!Buffer.isBuffer(namespaceUuid)) {
-		namespaceUuid = new Buffer(namespaceUuid);
+		namespaceUuid = Buffer.from(namespaceUuid);
 	}
 
 	if(!Buffer.isBuffer(key)) {
-		key = new Buffer(key);
+		key = Buffer.from(key);
 	}
 
 	let digest = createHash('sha1').update(
 		Buffer.concat( [ namespaceUuid, key ] )).digest();
 
-	let u = new Buffer(16);
+	let u = Buffer.alloc(16);
 
 	// bbbb - bb - bb - bb - bbbbbb
 	digest.copy(u, 0, 0, 4);			// time_low

From 0d7676a871d32b251b0e809c33b0abffc882cec6 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 28 Apr 2018 14:06:36 +0100
Subject: [PATCH 0288/1013] Buffer.alloc to init Buffer with a length

---
 core/archive_util.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 8ce2abc2..346e569e 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -82,7 +82,7 @@ module.exports = class ArchiveUtil {
 					fileType.offset	= fileType.offset || 0;
 
 					//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
-					const sigLen =fileType.offset + fileType.sig.length;
+					const sigLen = fileType.offset + fileType.sig.length;
 					if(sigLen > this.longestSignature) {
 						this.longestSignature = sigLen;
 					}
@@ -120,7 +120,7 @@ module.exports = class ArchiveUtil {
 				return cb(err);
 			}
 
-			const buf = Buffer.from(this.longestSignature);
+			const buf = Buffer.alloc(this.longestSignature);
 			fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
 				if(err) {
 					return cb(err);

From b45a6a8743e7283223ce4b352ced9797f833faa7 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 28 Apr 2018 21:39:04 +0100
Subject: [PATCH 0289/1013] * Buffer froms that should be allocs * Remove
 unnecessary Buffer fill after alloc *  minor cleanup on fnv1a.js

---
 core/fnv1a.js           | 2 +-
 core/ftn_mail_packet.js | 8 ++++----
 core/ftn_util.js        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/fnv1a.js b/core/fnv1a.js
index ce1fe105..1b8ece32 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -38,7 +38,7 @@ module.exports = class FNV1a {
 
 	digest(encoding) {
 		encoding = encoding || 'binary';
-		let buf = Buffer.alloc(4);
+		const buf = Buffer.alloc(4);
 		buf.writeInt32BE(this.hash & 0xffffffff, 0);
 		return buf.toString(encoding);
 	}
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 5db02227..c42d859b 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -273,7 +273,7 @@ function Packet(options) {
 	};
 
 	this.getPacketHeaderBuffer = function(packetHeader) {
-		let buffer = Buffer.from(FTN_PACKET_HEADER_SIZE);
+		let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
 
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
@@ -311,7 +311,7 @@ function Packet(options) {
 	};
 
 	this.writePacketHeader = function(packetHeader, ws) {
-		let buffer = Buffer.from(FTN_PACKET_HEADER_SIZE);
+		let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
 
 		buffer.writeUInt16LE(packetHeader.origNode, 0);
 		buffer.writeUInt16LE(packetHeader.destNode, 2);
@@ -747,7 +747,7 @@ function Packet(options) {
 		async.waterfall(
 			[
 				function prepareHeaderAndKludges(callback) {
-					const basicHeader = Buffer.from(34);
+					const basicHeader = Buffer.alloc(34);
 					self.writeMessageHeader(message, basicHeader);			
 
 					//
@@ -864,7 +864,7 @@ function Packet(options) {
 	};
 
 	this.writeMessage = function(message, ws, options) {
-		let basicHeader = Buffer.from(34);
+		const basicHeader = Buffer.alloc(34);
 		self.writeMessageHeader(message, basicHeader);
 
 		ws.write(basicHeader);
diff --git a/core/ftn_util.js b/core/ftn_util.js
index e40d2687..d1f69e0f 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -46,7 +46,7 @@ exports.getQuotePrefix				= getQuotePrefix;
 //	See list here: https://github.com/Mithgol/node-fidonet-jam
 
 function stringToNullPaddedBuffer(s, bufLen) {
-	let buffer 	= Buffer.alloc(bufLen).fill(0x00);
+	let buffer 	= Buffer.alloc(bufLen);
 	let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
 	for(let i = 0; i < enc.length; ++i) {
 		buffer[i] = enc[i];

From f692c593e7f09bfc10be581779a7de2f95b75a65 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Apr 2018 12:01:34 +0100
Subject: [PATCH 0290/1013] Buffer.alloc should be .from

---
 core/archive_util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 346e569e..e0d102d9 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -78,7 +78,7 @@ module.exports = class ArchiveUtil {
 			Object.keys(Config.fileTypes).forEach(mimeType => {
 				const fileType = Config.fileTypes[mimeType];
 				if(fileType.sig) {
-					fileType.sig 	= Buffer.alloc(fileType.sig, 'hex');
+					fileType.sig 	= Buffer.from(fileType.sig, 'hex');
 					fileType.offset	= fileType.offset || 0;
 
 					//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well

From a03305bc58f1e15be0e543a4020c7f2ad167fb5b Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 29 Apr 2018 12:01:51 +0100
Subject: [PATCH 0291/1013] Set node.js requirement to 8 LTS

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27c5332a..1155298c 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,6 @@
   },
   "devDependencies": {},
   "engines": {
-    "node": ">=10"
+    "node": ">=8"
   }
 }

From 6625c6d99a4bd9569ba6054f967149776a8968b9 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Sun, 29 Apr 2018 09:06:41 -0400
Subject: [PATCH 0292/1013] Fix broken links in readme.md

Fix some internal links in the readme.md file.
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index db69a1bb..5c0543a0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
 ## Features Available Now
  * Multi platform: Anywhere [Node.js](https://nodejs.org/) runs likely works (known to work under Linux, FreeBSD, OpenBSD, OS X and Windows)
  * Unlimited multi node support (for all those BBS "callers"!)
- * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based [mods](docs/mods.md)
+ * **Highly** customizable via [HJSON](http://hjson.org/) based configuration, menus, and themes in addition to JavaScript based [mods](docs/modding/existing-mods.md)
  * [MCI support](docs/art/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
@@ -17,10 +17,10 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Renegade style pipe color codes
  * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
  * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption
- * [Door support](docs/doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
+ * [Door support](docs/modding/door-servers.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging
- * [Message networks](docs/msg_networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
- * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/web_server.md). Legacy X/Y/Z modem also supported!
+ * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
+ * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on
  

From 31df2e8125219558ecc3c3533d70c00a0713e0b0 Mon Sep 17 00:00:00 2001
From: Jason Kendall <coolacid@users.noreply.github.com>
Date: Sun, 29 Apr 2018 09:16:39 -0400
Subject: [PATCH 0293/1013] Fix broken link in message-networks.md

Broken link fixed.
---
 docs/messageareas/message-networks.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index bb98b0b7..a334ab94 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -35,7 +35,7 @@ Each entry's key name is referenced elsewhere in `config.hjson` for FTN oriented
 ## Message Areas
 
 The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see
-[Configuring a Message Area][/messageareas/configuring-a-message-area]) to a message network (described 
+[Configuring a Message Area](configuring-a-message-area.md)) to a message network (described 
 above), a FTN specific area tag, and remote uplink address(s). 
 
 This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
@@ -64,4 +64,4 @@ When ENiGMA½ imports messages, they will be placed in the local area that match
     }
   }
 }
-```
\ No newline at end of file
+```

From a13a0762a0cc6ee96b8684d993e184382ee4bc71 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Apr 2018 09:13:16 -0600
Subject: [PATCH 0294/1013] Fix some formatting

---
 docs/filebase/first-file-area.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 5e83e8d7..7d7a133d 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -55,15 +55,15 @@ fileBase: {
 
 	storageTags: {
 		retro_pc: "retro_pc"
-        retro_pc_bbs: "retro_pc/bbs"
+		retro_pc_bbs: "retro_pc/bbs"
 	}
 
 	areas: {
 		retro_pc: {
-            name: Retro PC
-            desc: Oldschool PC/DOS
-            storageTags: [ "retro_pc", "retro_pc_bbs" ]
-        }
+			name: Retro PC
+			desc: Oldschool PC/DOS
+			storageTags: [ "retro_pc", "retro_pc_bbs" ]
+		}
 	}
 }
 ```

From ca0077e2097baf45ffbe0e0ba9528df9fa243457 Mon Sep 17 00:00:00 2001
From: richinseattle <richinseattle@gmail.com>
Date: Wed, 2 May 2018 18:28:04 -0700
Subject: [PATCH 0295/1013] Pass username as argument to door programs

---
 core/door.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/door.js b/core/door.js
index 5670db1e..925e143e 100644
--- a/core/door.js
+++ b/core/door.js
@@ -109,6 +109,7 @@ Door.prototype.run = function() {
 				node			: self.exeInfo.node.toString(),
 				srvPort			: sockServer ? sockServer.address().port.toString() : '-1',
 				userId			: self.client.user.userId.toString(),
+				username		: self.client.user.username,				
 			});
 		}
 

From d3df0f979a6ed604a8df6758e578bfff6c65ff69 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 7 May 2018 11:37:53 +0100
Subject: [PATCH 0296/1013] fORCE9 URL update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5c0543a0..8d448b25 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 
 ## Boards
 * WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**telnet://xibalba.l33t.codes:44510** or via SSH secure on port 44511)
-* [fORCE9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
+* [fORCE9](https://bbs.force9.org/): (**telnet://bbs.force9.org**)
 
 
 ## Installation

From 388e581b904a34ca56d203837f7e830f7140b36e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 12 May 2018 09:33:41 -0600
Subject: [PATCH 0297/1013] * Fix file transfer bug for WebSockets and SSH.
 Set/restore temp data handler belongs in base client. * Lint some files

---
 core/client.js                  | 10 +++++
 core/servers/login/ssh.js       | 18 ++++----
 core/servers/login/telnet.js    | 74 ++++++++++++++-------------------
 core/servers/login/websocket.js |  8 ++--
 4 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/core/client.js b/core/client.js
index a6c6b78a..d75b1b6d 100644
--- a/core/client.js
+++ b/core/client.js
@@ -100,6 +100,16 @@ function Client(/*input, output*/) {
 		}
 	});
 
+	this.setTemporaryDirectDataHandler = function(handler) {
+		this.input.removeAllListeners('data');
+		this.input.on('data', handler);
+	};
+
+	this.restoreDataHandler = function() {
+		this.input.removeAllListeners('data');
+		this.input.on('data', this.dataHandler);
+	};
+
 
 	//
 	//	Peek at incoming |data| and emit events for any special
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 80a99c7e..4ec57d2f 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -129,6 +129,10 @@ function SSHClient(clientConn) {
 		}
 	});
 
+	this.dataHandler = function(data) {
+		self.emit('data', data);
+	};
+
 	this.updateTermInfo = function(info) {
 		//
 		//	From ssh2 docs:
@@ -167,7 +171,7 @@ function SSHClient(clientConn) {
 		self.log.info('SSH authentication success');
 
 		clientConn.on('session', accept => {
-			
+
 			const session = accept();
 
 			session.on('pty', function pty(accept, reject, info) {
@@ -191,9 +195,7 @@ function SSHClient(clientConn) {
 
 				self.setInputOutput(channel.stdin, channel.stdout);
 
-				channel.stdin.on('data', data => {
-					self.emit('data', data);
-				});
+				channel.stdin.on('data', self.dataHandler);
 
 				if(self.cachedPtyInfo) {
 					self.updateTermInfo(self.cachedPtyInfo);
@@ -207,7 +209,7 @@ function SSHClient(clientConn) {
 
 			session.on('window-change', (accept, reject, info) => {
 				self.log.debug(info, 'SSH window-change event');
-				
+
 				self.updateTermInfo(info);
 			});
 
@@ -237,13 +239,13 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 			hostKeys : [
 				{
 					key			: fs.readFileSync(Config.loginServers.ssh.privateKeyPem),
-					passphrase	: Config.loginServers.ssh.privateKeyPass, 
+					passphrase	: Config.loginServers.ssh.privateKeyPass,
 				}
 			],
 			ident : 'enigma-bbs-' + enigVersion + '-srv',
-			
+
 			//	Note that sending 'banner' breaks at least EtherTerm!
-			debug : (sshDebugLine) => { 
+			debug : (sshDebugLine) => {
 				if(true === Config.loginServers.ssh.traceConnections) {
 					Log.trace(`SSH: ${sshDebugLine}`);
 				}
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 3c585c84..06f5199f 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -39,8 +39,8 @@ exports.TelnetClient	= TelnetClient;
 	* Document OPTIONS -- add any missing
 	* Internally handle OPTIONS:
 		* Some should be emitted generically
-		* Some shoudl be handled internally -- denied, handled, etc. 
-		* 
+		* Some shoudl be handled internally -- denied, handled, etc.
+		*
 
 	* Allow term (ttype) to be set by environ sub negotiation
 
@@ -67,7 +67,7 @@ const COMMANDS = {
 	EL		: 248,	//	Erase Line
 	GA		: 249,	//	Go Ahead
 	SB		: 250,	//	Start Sub-Negotiation Parameters
-	WILL	: 251,	//	
+	WILL	: 251,	//
 	WONT	: 252,
 	DO		: 253,
 	DONT	: 254,
@@ -101,7 +101,7 @@ const OPTIONS = {
 	TIMING_MARK				: 6, // http://tools.ietf.org/html/rfc860
 	//RC_TRANS_AND_ECHO		: 7,	//	aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
 	//OUPUT_LINE_WIDTH		: 8,
-	//OUTPUT_PAGE_SIZE		: 9,	//	
+	//OUTPUT_PAGE_SIZE		: 9,	//
 	//OUTPUT_CARRIAGE_RETURN_DISP	: 10,	//	RFC 652
 	//OUTPUT_HORIZ_TABSTOPS	: 11,	//	RFC 653
 	//OUTPUT_HORIZ_TAB_DISP	: 12,	//	RFC 654
@@ -195,15 +195,15 @@ function unknownOption(bufs, i, event) {
 const OPTION_IMPLS = {};
 //	:TODO: fill in the rest...
 OPTION_IMPLS.NO_ARGS						=
-OPTION_IMPLS[OPTIONS.ECHO]					= 
+OPTION_IMPLS[OPTIONS.ECHO]					=
 OPTION_IMPLS[OPTIONS.STATUS]				=
-OPTION_IMPLS[OPTIONS.LINEMODE]				= 
-OPTION_IMPLS[OPTIONS.TRANSMIT_BINARY]		=	
+OPTION_IMPLS[OPTIONS.LINEMODE]				=
+OPTION_IMPLS[OPTIONS.TRANSMIT_BINARY]		=
 OPTION_IMPLS[OPTIONS.AUTHENTICATION]		=
 OPTION_IMPLS[OPTIONS.TERMINAL_SPEED]		=
 OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL]	=
 OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION]	=
-OPTION_IMPLS[OPTIONS.SEND_LOCATION]			= 
+OPTION_IMPLS[OPTIONS.SEND_LOCATION]			=
 OPTION_IMPLS[OPTIONS.ARE_YOU_THERE]			=
 OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]		= function(bufs, i, event) {
 	event.buf = bufs.splice(0, i).toBuffer();
@@ -453,7 +453,7 @@ function parseCommand(bufs, i, event) {
 		}
 
 		event.buf = bufs.splice(0, 2).toBuffer();
-		return event;		
+		return event;
 	}
 }
 
@@ -486,16 +486,6 @@ function TelnetClient(input, output) {
 		newEnvironRequested	: false,
 	};
 
-	this.setTemporaryDirectDataHandler = function(handler) {
-		this.input.removeAllListeners('data');
-		this.input.on('data', handler);
-	};
-
-	this.restoreDataHandler = function() {
-		this.input.removeAllListeners('data');
-		this.input.on('data', this.dataHandler);
-	};
-
 	this.dataHandler = function(b) {
 		if(!Buffer.isBuffer(b)) {
 			EnigAssert(false, `Cannot push non-buffer ${typeof b}`);
@@ -516,15 +506,15 @@ function TelnetClient(input, output) {
 			}
 
 			EnigAssert(bufs.length > (i + 1));
-			
+
 			if(i > 0) {
 				self.emit('data', bufs.splice(0, i).toBuffer());
 			}
 
 			i = parseBufs(bufs);
-			
+
 			if(MORE_DATA_REQUIRED === i) {
-				break;				
+				break;
 			} else if(i) {
 				if(i.option) {
 					self.emit(i.option, i);	//	"transmit binary", "echo", ...
@@ -589,7 +579,7 @@ util.inherits(TelnetClient, baseClient.Client);
 //	Telnet Command/Option handling
 ///////////////////////////////////////////////////////////////////////////////
 TelnetClient.prototype.handleTelnetEvent = function(evt) {
-	
+
 	if(!evt.command) {
 		return this.connectionWarn( { evt : evt }, 'No command for event');
 	}
@@ -611,7 +601,7 @@ TelnetClient.prototype.handleWillCommand = function(evt) {
 		//
 		//	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
 		//
-		this.requestTerminalType();	
+		this.requestTerminalType();
 	} else if('new environment' === evt.option) {
 		//
 		//	See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
@@ -630,7 +620,7 @@ TelnetClient.prototype.handleWontCommand = function(evt) {
 
 	this.sentDont[evt.option] = true;
 
-	if('new environment' === evt.option) {		
+	if('new environment' === evt.option) {
 		this.dont.new_environment();
 	} else {
 		this.connectionTrace(evt, 'WONT');
@@ -693,16 +683,16 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
 				self.term.termHeight = parseInt(evt.envVars[name]);
 				self.clearMciCache();	//	term size changes = invalidate cache
 				self.connectionDebug({ termHeight : self.term.termHeight, source : 'NEW-ENVIRON'}, 'Window height updated');
-			} else {			
+			} else {
 				if(name in self.term.env) {
 
 					EnigAssert(
-						SB_COMMANDS.INFO === evt.type || SB_COMMANDS.IS === evt.type, 
+						SB_COMMANDS.INFO === evt.type || SB_COMMANDS.IS === evt.type,
 						'Unexpected type: ' + evt.type
 					);
 
 					self.connectionWarn(
-						{ varName : name, value : evt.envVars[name], existingValue : self.term.env[name] }, 
+						{ varName : name, value : evt.envVars[name], existingValue : self.term.env[name] },
 						'Environment variable already exists'
 					);
 				} else {
@@ -719,7 +709,7 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
 		//
 		self.term.termWidth		= evt.width;
 		self.term.termHeight	= evt.height;
-		
+
 		if(evt.width > 0) {
 			self.term.env.COLUMNS = evt.height;
 		}
@@ -752,11 +742,11 @@ TelnetClient.prototype.handleMiscCommand = function(evt) {
 	if('ip' === evt.command) {
 		//	Interrupt Process (IP)
 		this.log.debug('Interrupt Process (IP) - Ending');
-		
+
 		this.input.end();
 	} else if('ayt' === evt.command) {
 		this.output.write('\b');
-		
+
 		this.log.debug('Are You There (AYT) - Replied "\\b"');
 	} else if(IGNORED_COMMANDS.indexOf(evt.commandCode)) {
 		this.log.debug({ evt : evt }, 'Ignoring command');
@@ -767,11 +757,11 @@ TelnetClient.prototype.handleMiscCommand = function(evt) {
 
 TelnetClient.prototype.requestTerminalType = function() {
 	const buf = Buffer.from( [
-		COMMANDS.IAC, 
-		COMMANDS.SB, 
-		OPTIONS.TERMINAL_TYPE, 
-		SB_COMMANDS.SEND, 
-		COMMANDS.IAC, 
+		COMMANDS.IAC,
+		COMMANDS.SB,
+		OPTIONS.TERMINAL_TYPE,
+		SB_COMMANDS.SEND,
+		COMMANDS.IAC,
 		COMMANDS.SE ]);
 	this.output.write(buf);
 };
@@ -790,15 +780,15 @@ TelnetClient.prototype.requestNewEnvironment = function() {
 		return;
 	}
 
-	const self = this;	
+	const self = this;
 
 	const bufs = buffers();
 	bufs.push(Buffer.from( [
-		COMMANDS.IAC, 
-		COMMANDS.SB, 
-		OPTIONS.NEW_ENVIRONMENT, 
+		COMMANDS.IAC,
+		COMMANDS.SB,
+		OPTIONS.NEW_ENVIRONMENT,
 		SB_COMMANDS.SEND ]
-		));
+	));
 
 	for(let i = 0; i < WANTED_ENVIRONMENT_VAR_BUFS.length; ++i) {
 		bufs.push(Buffer.from( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
@@ -828,7 +818,7 @@ TelnetClient.prototype.banner = function() {
 
 function Command(command, client) {
 	this.command	= COMMANDS[command.toUpperCase()];
-	this.client		= client;	
+	this.client		= client;
 }
 
 //	Create Command objects with echo, transmit_binary, ...
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 9e480ac9..ed12bf0b 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -30,6 +30,10 @@ function WebSocketClient(ws, req, serverType) {
 
 	const self = this;
 
+	this.dataHandler = function(data) {
+		self.socketBridge.emit('data', data);
+	};
+
 	//
 	//	This bridge makes accessible various calls that client sub classes
 	//	want to access on I/O socket
@@ -65,9 +69,7 @@ function WebSocketClient(ws, req, serverType) {
 		}
 	}(ws);
 
-	ws.on('message', data => {
-		this.socketBridge.emit('data', data);
-	});
+	ws.on('message', this.dataHandler);
 
 	ws.on('close', () => {
 		//	we'll remove client connection which will in turn end() via our SocketBridge above

From 9385cd2c936ded1556714a0b6428e9c0e0b96b63 Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sat, 12 May 2018 15:59:28 -0400
Subject: [PATCH 0298/1013] Update telnet.js

Spelling
---
 core/servers/login/telnet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 06f5199f..3004513d 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -39,7 +39,7 @@ exports.TelnetClient	= TelnetClient;
 	* Document OPTIONS -- add any missing
 	* Internally handle OPTIONS:
 		* Some should be emitted generically
-		* Some shoudl be handled internally -- denied, handled, etc.
+		* Some should be handled internally -- denied, handled, etc.
 		*
 
 	* Allow term (ttype) to be set by environ sub negotiation

From 8a428e6f7485286859e9a25dff4c793be2b18a0f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 21 May 2018 20:36:34 -0600
Subject: [PATCH 0299/1013] oputil updates * oputil.js user ... now works more
 like other "action" based commands * add oputil.js user group .... for
 add/removal from groups

---
 core/oputil/oputil_help.js |  19 ++--
 core/oputil/oputil_user.js | 208 ++++++++++++++++++++++++++-----------
 2 files changed, 160 insertions(+), 67 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index c5e096b5..a560b17e 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -21,18 +21,19 @@ commands:
   fb                        file base management
   mb                        message base management
 `,
-	User : 
-`usage: optutil.js user --user USERNAME <args>
+	User :
+`usage: optutil.js user <action> [<args>]
 
-valid args:
-  --user USERNAME       specify username for further actions
-  --password PASS       set new password 
-  --delete              delete user
-  --activate            activate user
-  --deactivate          deactivate user
+actions:
+  pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
+  rm USERNAME                  permanantely removes USERNAME user from system
+  activate USERNAME            sets USERNAME's status to active
+  deactivate USERNAME          sets USERNAME's status to deactive
+  disable USERNAME             sets USERNAME's status to disabled
+  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
 `,
 
-	Config : 
+	Config :
 `usage: optutil.js config <action> [<args>]
 
 actions:
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index afe243bf..36762edb 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -7,65 +7,23 @@ const ExitCodes					= require('./oputil_common.js').ExitCodes;
 const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
+const Errors					= require('../enig_error.js').Errors;
 
 const async						= require('async');
 const _							= require('lodash');
 
 exports.handleUserCommand		= handleUserCommand;
 
-function handleUserCommand() {
-	if(true === argv.help || !_.isString(argv.user) || 0 === argv.user.length) {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
-
-	if(_.isString(argv.password)) {
-		if(0 === argv.password.length) {			
-			process.exitCode = ExitCodes.BAD_ARGS;
-			return console.error('Invalid password');
-		}
-
-		async.waterfall(
-			[
-				function init(callback) {
-					initAndGetUser(argv.user, callback);
-				},
-				function setNewPass(user, callback) {
-					user.setNewAuthCredentials(argv.password, function credsSet(err) {
-						if(err) {
-							process.exitCode = ExitCodes.ERROR;
-							callback(new Error('Failed setting password'));
-						} else {
-							callback(null);
-						}
-					});
-				}
-			],
-			function complete(err) {
-				if(err) {
-					console.error(err.message);
-				} else {
-					console.info('Password set');
-				}
-			}
-		);
-	} else if(argv.activate) {
-		setAccountStatus(argv.user, true);		
-	} else if(argv.deactivate) {
-		setAccountStatus(argv.user, false);
-	}
-}
-
 function getUser(userName, cb) {
 	const User = require('../../core/user.js');
-	User.getUserIdAndName(argv.user, function userNameAndId(err, userId) {
+	User.getUserIdAndName(userName, (err, userId) => {
 		if(err) {
 			process.exitCode = ExitCodes.BAD_ARGS;
-			return cb(new Error('Failed to retrieve user'));
-		} else {
-			let u = new User();
-			u.userId = userId;
-			return cb(null, u);
+			return cb(err);
 		}
+		const u = new User();
+		u.userId = userId;
+		return cb(null, u);
 	});	
 }
 
@@ -76,14 +34,14 @@ function initAndGetUser(userName, cb) {
 				initConfigAndDatabases(callback);
 			},
 			function getUserObject(callback) {
-				getUser(argv.user, (err, user) => {
+				getUser(userName, (err, user) => {
 					if(err) {
 						process.exitCode = ExitCodes.BAD_ARGS;
 						return callback(err);
 					}
 					return callback(null, user);
 				});
-			} 
+			}
 		],
 		(err, user) => {
 			return cb(err, user);
@@ -91,23 +49,157 @@ function initAndGetUser(userName, cb) {
 	);
 }
 
-function setAccountStatus(userName, active) {
+function setAccountStatus(user, status) {
+	if(argv._.length < 3) {
+		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+	}
+
+	const AccountStatus = require('../../core/user.js').AccountStatus;
+	const statusDesc = _.invert(AccountStatus)[status];
+	user.persistProperty('account_status', status, err => {
+		if(err) {
+			process.exitCode = ExitCodes.ERROR;
+			console.error(err.message);
+		} else {
+			console.info(`User status set to ${statusDesc}`);
+		}
+	});
+}
+
+function setUserPassword(user) {
+	if(argv._.length < 4) {
+		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+	}
+
 	async.waterfall(
 		[
-			function init(callback) {
-				initAndGetUser(argv.user, callback);
+			function validate(callback) {
+				//	:TODO: prompt if no password provided (more secure, no history, etc.)
+				const password = argv._[argv._.length - 1];
+				if(0 === password.length) {
+					return callback(Errors.Invalid('Invalid password'));
+				}
+				return callback(null, password);
 			},
-			function activateUser(user, callback) {
-				const AccountStatus = require('../../core/user.js').AccountStatus;
-				user.persistProperty('account_status', active ? AccountStatus.active : AccountStatus.inactive, callback);
+			function set(password, callback) {
+				user.setNewAuthCredentials(password, err => {
+					if(err) {
+						process.exitCode = ExitCodes.BAD_ARGS;
+					}
+					return callback(err);
+				});
 			}
 		],
 		err => {
 			if(err) {
 				console.error(err.message);
 			} else {
-				console.info('User ' + ((true === active) ? 'activated' : 'deactivated'));
+				console.info('New password set');
 			}
 		}
-	);	
+	);
+}
+
+function removeUser(user) {
+	console.error('NOT YET IMPLEMENTED');
+}
+
+function modUserGroups(user) {
+	if(argv._.length < 3) {
+		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+	}
+
+	let groupName = argv._[argv._.length - 1].replace(/["']/g, '');	//	remove any quotes - necessary to allow "-foo"
+	let action = groupName[0];	//	+ or -
+
+	if('-' === action || '+' === action) {
+		groupName = groupName.substr(1);
+	}
+
+	action = action || '+';
+
+	if(0 === groupName.length) {
+		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+	}
+
+	//
+	//	Groups are currently arbritary, so do a slight validation
+	//
+	if(!/[A-Za-z0-9]+/.test(groupName)) {
+		process.exitCode = ExitCodes.BAD_ARGS;
+		return console.error('Bad group name');
+	}
+
+	function done(err) {
+		if(err) {
+			process.exitCode = ExitCodes.BAD_ARGS;
+			console.error(err.message);
+		} else {
+			console.info('User groups modified');
+		}
+	}
+
+	const UserGroup = require('../../core/user_group.js');
+	if('-' === action) {
+		UserGroup.removeUserFromGroup(user.userId, groupName, done);
+	} else {
+		UserGroup.addUserToGroup(user.userId, groupName, done);
+	}
+}
+
+function activateUser(user) {
+	const AccountStatus = require('../../core/user.js').AccountStatus;
+	return setAccountStatus(user, AccountStatus.active);
+}
+
+function deactivateUser(user) {
+	const AccountStatus = require('../../core/user.js').AccountStatus;
+	return setAccountStatus(user, AccountStatus.inactive);
+}
+
+function disableUser(user) {
+	const AccountStatus = require('../../core/user.js').AccountStatus;
+	return setAccountStatus(user, AccountStatus.disabled);
+}
+
+function handleUserCommand() {
+	function errUsage()  {
+		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+	}
+
+	if(true === argv.help) {
+		return errUsage();
+	}
+
+	const action		= argv._[1];
+	const usernameIdx	= [ 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
+	const userName		= argv._[usernameIdx];
+
+	if(!userName) {
+		return errUsage();
+	}
+
+	initAndGetUser(userName, (err, user) => {
+		if(err) {
+			process.exitCode = ExitCodes.ERROR;
+			return console.error(err.message);
+		}
+
+		return ({
+			pass		: setUserPassword,
+			passwd		: setUserPassword,
+			password	: setUserPassword,
+
+			rm			: removeUser,
+			remove		: removeUser,
+			del			: removeUser,
+			delete		: removeUser,
+
+			activate	: activateUser,
+			deactivate	: deactivateUser,
+			disable		: disableUser,
+
+			group		: modUserGroups,
+		}[action] || errUsage)(user);
+	});
 }
\ No newline at end of file

From 39be44434a1c82ffacb031d9395645b9439e625c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 21 May 2018 20:39:52 -0600
Subject: [PATCH 0300/1013] Ensure all number groups work

---
 core/oputil/oputil_user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 36762edb..59813b3b 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -109,7 +109,7 @@ function modUserGroups(user) {
 		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
 	}
 
-	let groupName = argv._[argv._.length - 1].replace(/["']/g, '');	//	remove any quotes - necessary to allow "-foo"
+	let groupName = argv._[argv._.length - 1].toString().replace(/["']/g, '');	//	remove any quotes - necessary to allow "-foo"
 	let action = groupName[0];	//	+ or -
 
 	if('-' === action || '+' === action) {

From 37e5948f6527d92e9f7049a68f097e02b163ec0c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 31 May 2018 20:58:24 -0600
Subject: [PATCH 0301/1013] Add lzx archive support via unlzx

---
 core/archive_util.js | 19 ++++++++++++++-----
 core/config.js       | 24 ++++++++++++++++++++++++
 core/mime_util.js    |  1 +
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index e0d102d9..c3915389 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -207,7 +207,12 @@ module.exports = class ArchiveUtil {
 			extractPath		: extractPath,
 		};
 
-		const action = haveFileList ? 'extract' : 'decompress';
+		let action = haveFileList ? 'extract' : 'decompress';
+		if('extract' === action && !_.isObject(archiver[action])) {
+			//	we're forced to do a full decompress
+			action = 'decompress';
+			haveFileList = false;
+		}
 
 		//	we need to treat {fileList} special in that it should be broken up to 0:n args
 		const args = archiver[action].args.map( arg => {
@@ -222,7 +227,7 @@ module.exports = class ArchiveUtil {
 
 		let proc;
 		try {
-			proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts());
+			proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts(extractPath));
 		} catch(e) {
 			return cb(e);
 		}
@@ -278,13 +283,17 @@ module.exports = class ArchiveUtil {
 		});
 	}
 
-	getPtyOpts() {
-		return {
-			//	:TODO: cwd
+	getPtyOpts(extractPath) {
+		const opts = {
 			name	: 'enigma-archiver',
 			cols	: 80,
 			rows	: 24,
 			env		: process.env,
 		};
+		if(extractPath) {
+			opts.cwd = extractPath;
+		}
+		//	:TODO: set cwd to supplied temp path if not sepcific extract
+		return opts;
 	}
 };
diff --git a/core/config.js b/core/config.js
index 2564c256..b782531f 100644
--- a/core/config.js
+++ b/core/config.js
@@ -415,6 +415,12 @@ function getDefaultConfig() {
 				offset			: 2,
 				archiveHandler	: 'Lha',
 			},
+			'application/x-lzx' : {
+				desc			: 'LZX Archive',
+				sig				: '4c5a5800',
+				offset			: 0,
+				archiveHandler	: 'Lzx',
+			},
 			'application/x-7z-compressed' : {
 				desc			: '7-Zip Archive',
 				sig				: '377abcaf271c',
@@ -473,6 +479,24 @@ function getDefaultConfig() {
 					}
 				},
 
+				Lzx : {
+					//
+					//	'unlzx' command can be obtained from:
+					//	* Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
+					//	* Source: http://xavprods.free.fr/lzx/
+					//
+					decompress		: {
+						cmd			: 'unlzx',
+						//	unzlx doesn't have a output dir option, but we'll cwd to the temp output dir first
+						args		: [ '-x', '{archivePath}' ],
+					},
+					list			: {
+						cmd			: 'unlzx',
+						args		: [ '-v', '{archivePath}' ],
+						entryMatch	: '^\\s+([0-9]+)\\s+[^\\s]+\\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\\s+[0-9]{1,2}-[a-z]{3}-[0-9]{4}\\s+[a-z\\-]+\\s+\\"([^"]+)\\"$',
+					}
+				},
+
 				Arj : {
 					//
 					//	'arj' command can be obtained from:
diff --git a/core/mime_util.js b/core/mime_util.js
index a110572c..b9a7c5af 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -16,6 +16,7 @@ function startup(cb) {
 	const ADDITIONAL_EXT_MIMETYPES = {
 		ans				: 'text/x-ansi',
 		gz				: 'application/gzip',	//	not in mime-types 2.1.15 :(
+		lzx				: 'application/x-lzx',	//	:TODO: submit to mime-types
 	};
 
 	_.forEach(ADDITIONAL_EXT_MIMETYPES, (mimeType, ext) => {

From 881f9765a6c7a70945f70a7b874d6bf3bdab00ee Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 1 Jun 2018 19:10:42 -0600
Subject: [PATCH 0302/1013] Remove dead code, init MIME DB when doing file scan

---
 core/oputil/oputil_file_base.js | 78 ++-------------------------------
 1 file changed, 3 insertions(+), 75 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index a2abbe99..68f190fb 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -263,81 +263,6 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 										}
 									]
 								);
-
-								/*
-								fileArea.scanFile(
-									fullPath,
-									{
-										areaTag		: areaInfo.areaTag,
-										storageTag	: storageLoc.storageTag
-									},
-									(err, fileEntry, dupeEntries) => {
-										if(err) {
-											console.info(`Error: ${err.message}`);
-											return nextFile(null);	//	try next anyway
-										}
-
-										//
-										//	We'll update the entry if the following conditions are met:
-										//	* We have a single duplicate, and:
-										//	* --update was passed or the existing entry's desc,
-										//	  longDesc, or est_release_year meta are blank/empty
-										//
-										if(argv.update && 1 === dupeEntries.length) {
-											const FileEntry		= require('../../core/file_entry.js');
-											const existingEntry	= new FileEntry();
-
-											return existingEntry.load(dupeEntries[0].fileId, err => {
-												if(err) {
-													console.info('Dupe (cannot update)');
-													return nextFile(null);
-												}
-
-												//
-												//	Update only if tags or desc changed
-												//
-												const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
-												const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
-
-												if( tagsEq &&
-													fileEntry.desc === existingEntry.desc &&
-													fileEntry.descLong == existingEntry.descLong &&
-													fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
-												{
-													console.info('Dupe');
-													return nextFile(null);
-												}
-
-												console.info('Dupe (updating)');
-
-												//	don't allow overwrite of values if new version is blank
-												existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
-												existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
-
-												if(fileEntry.meta.est_release_year) {
-													existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
-												}
-
-												updateTags(existingEntry);
-
-												finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
-													return nextFile(err);
-												});
-											});
-										} else if(dupeEntries.length > 0) {
-											console.info('Dupe');
-											return nextFile(null);
-										}
-
-										console.info('Done!');
-										updateTags(fileEntry);
-
-										finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
-											return nextFile(err);
-										});
-									}
-								);
-								*/
 							});
 						}, err => {
 							return callback(err);
@@ -521,6 +446,9 @@ function scanFileAreas() {
 			function init(callback) {
 				return initConfigAndDatabases(callback);
 			},
+			function initMime(callback) {
+				return require('../../core/mime_util.js').startup(callback);
+			},
 			function initGlobalDescHandler(callback) {
 				//
 				//	If options.descFile is a String, it represents a FILE|PATH. We'll init

From 83dd4402191ec336c07bf6411a312b694792282d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 1 Jun 2018 19:32:00 -0600
Subject: [PATCH 0303/1013] Lzx / unlzx info

---
 core/config.js                  | 1 +
 docs/configuration/archivers.md | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/core/config.js b/core/config.js
index b782531f..070a6920 100644
--- a/core/config.js
+++ b/core/config.js
@@ -483,6 +483,7 @@ function getDefaultConfig() {
 					//
 					//	'unlzx' command can be obtained from:
 					//	* Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
+					//	* RedHat: https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html
 					//	* Source: http://xavprods.free.fr/lzx/
 					//
 					decompress		: {
diff --git a/docs/configuration/archivers.md b/docs/configuration/archivers.md
index 26755162..3d3f952a 100644
--- a/docs/configuration/archivers.md
+++ b/docs/configuration/archivers.md
@@ -20,6 +20,11 @@ The following archivers are pre-configured in ENiGMA½ as of this writing. Remem
 * Key: `Lha`
 * Homepage/package: `lhasa` on most *nix environments. See also https://fragglet.github.io/lhasa/ and http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
 
+#### Lzx
+* Formats: <a href="https://en.wikipedia.org/wiki/LZX_(algorithm)#Amiga_LZX">Amiga LZX</a>
+* Key: `Lzx`
+* Homepage/package: `unlzx` under most *nix platforms ([Debian/Ubuntu](https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127), [RedHat](https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html), [Source](http://xavprods.free.fr/lzx/))
+
 #### Arj
 * Formats: .arj
 * Key: `Arj`

From 70ce81c01ace8a2eb041000da33323f533254e21 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 1 Jun 2018 20:15:47 -0600
Subject: [PATCH 0304/1013] Fix bug with quote escaping in DB sanatizeString()

---
 core/database.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/database.js b/core/database.js
index 2717a545..0998f738 100644
--- a/core/database.js
+++ b/core/database.js
@@ -72,6 +72,8 @@ function sanatizeString(s) {
 
 			case '"' :
 			case '\'' :
+				return `${c}${c}`;
+
 			case '\\' :
 			case '%' :
 				return `\\${c}`;

From 95422f71bac3b27104726739ec1f7505799980d2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 1 Jun 2018 20:16:08 -0600
Subject: [PATCH 0305/1013] Fix possible SQL injection in file tags search

---
 core/file_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 169bbb74..f6b86c64 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -548,7 +548,7 @@ module.exports = class FileEntry {
 
 		if(filter.tags && filter.tags.length > 0) {
 			//	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
-			const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${tag}"` ).join(',');
+			const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanatizeString(tag)}"` ).join(',');
 
 			appendWhereClause(
 				`f.file_id IN (

From 3ecadebf9137b9e41e763d3c13d90628830671ae Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Jun 2018 16:06:04 -0600
Subject: [PATCH 0306/1013] Generic MIME types (file types) such as
 application/octet-stream can how have sub types for handlers (archive, info
 extract, ...) + Add Amiga DMS support via xdms

---
 core/archive_util.js        | 82 +++++++++++++++++++++++++------------
 core/config.js              | 29 ++++++++++---
 core/file_area_list.js      | 14 ++++++-
 core/file_base_area.js      | 17 ++++++--
 docs/installation/manual.md |  6 +--
 5 files changed, 108 insertions(+), 40 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index c3915389..71bad641 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -11,6 +11,7 @@ const resolveMimeType	= require('./mime_util.js').resolveMimeType;
 const fs		= require('graceful-fs');
 const _			= require('lodash');
 const pty		= require('node-pty');
+const paths		= require('path');
 
 let archiveUtil;
 
@@ -75,32 +76,56 @@ module.exports = class ArchiveUtil {
 		}
 
 		if(_.isObject(Config.fileTypes)) {
+			const updateSig = (ft) => {
+				ft.sig 		= Buffer.from(ft.sig, 'hex');
+				ft.offset	= ft.offset || 0;
+
+				//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
+				const sigLen = ft.offset + ft.sig.length;
+				if(sigLen > this.longestSignature) {
+					this.longestSignature = sigLen;
+				}
+			};
+
 			Object.keys(Config.fileTypes).forEach(mimeType => {
 				const fileType = Config.fileTypes[mimeType];
-				if(fileType.sig) {
-					fileType.sig 	= Buffer.from(fileType.sig, 'hex');
-					fileType.offset	= fileType.offset || 0;
-
-					//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
-					const sigLen = fileType.offset + fileType.sig.length;
-					if(sigLen > this.longestSignature) {
-						this.longestSignature = sigLen;
-					}
+				if(Array.isArray(fileType)) {
+					fileType.forEach(ft => {
+						if(ft.sig) {
+							updateSig(ft);
+						}
+					});
+				} else if(fileType.sig) {
+					updateSig(fileType);
 				}
 			});
 		}
 	}
 
-	getArchiver(mimeTypeOrExtension) {
-		mimeTypeOrExtension = resolveMimeType(mimeTypeOrExtension);
+	getArchiver(mimeTypeOrExtension, justExtention) {
+		const mimeType = resolveMimeType(mimeTypeOrExtension);
 
-		if(!mimeTypeOrExtension) {	//	lookup returns false on failure
+		if(!mimeType) {	//	lookup returns false on failure
 			return;
 		}
 
-		const archiveHandler = _.get( Config, [ 'fileTypes', mimeTypeOrExtension, 'archiveHandler'] );
-		if(archiveHandler) {
-			return _.get( Config, [ 'archives', 'archivers', archiveHandler ] );
+		let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+
+		if(Array.isArray(fileType)) {
+			if(!justExtention) {
+				//	need extention for lookup; ambiguous as-is :(
+				return;
+			}
+			//	further refine by extention
+			fileType = fileType.find(ft => justExtention === ft.ext);
+		}
+
+		if(!_.isObject(fileType)) {
+			return;
+		}
+
+		if(fileType.archiveHandler) {
+			return _.get( Config, [ 'archives', 'archivers', fileType.archiveHandler ] );
 		}
 	}
 
@@ -127,18 +152,21 @@ module.exports = class ArchiveUtil {
 				}
 
 				const archFormat = _.findKey(Config.fileTypes, fileTypeInfo => {
-					if(!fileTypeInfo.sig) {
-						return false;
-					}
+					const fileTypeInfos = Array.isArray(fileTypeInfo) ? fileTypeInfo : [ fileTypeInfo ];
+					return fileTypeInfos.find(fti => {
+						if(!fti.sig || !fti.archiveHandler) {
+							return false;
+						}
 
-					const lenNeeded = fileTypeInfo.offset + fileTypeInfo.sig.length;
+						const lenNeeded = fti.offset + fti.sig.length;
 
-					if(bytesRead < lenNeeded) {
-						return false;
-					}
+						if(bytesRead < lenNeeded) {
+							return false;
+						}
 
-					const comp = buf.slice(fileTypeInfo.offset, fileTypeInfo.offset + fileTypeInfo.sig.length);
-					return (fileTypeInfo.sig.equals(comp));
+						const comp = buf.slice(fti.offset, fti.offset + fti.sig.length);
+						return (fti.sig.equals(comp));
+					});
 				});
 
 				return cb(archFormat ? null : Errors.General('Unknown type'), archFormat);
@@ -162,7 +190,7 @@ module.exports = class ArchiveUtil {
 	}
 
 	compressTo(archType, archivePath, files, cb) {
-		const archiver = this.getArchiver(archType);
+		const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
 		if(!archiver) {
 			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
@@ -196,7 +224,7 @@ module.exports = class ArchiveUtil {
 			haveFileList = true;
 		}
 
-		const archiver = this.getArchiver(archType);
+		const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
 		if(!archiver) {
 			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
@@ -236,7 +264,7 @@ module.exports = class ArchiveUtil {
 	}
 
 	listEntries(archivePath, archType, cb) {
-		const archiver = this.getArchiver(archType);
+		const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
 		if(!archiver) {
 			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
diff --git a/core/config.js b/core/config.js
index 070a6920..70406e47 100644
--- a/core/config.js
+++ b/core/config.js
@@ -297,6 +297,16 @@ function getDefaultConfig() {
 					'--filemodifydate', '--fileaccessdate', '--fileinodechangedate', '--createdate', '--modifydate',
 					'--metadatadate', '--xmptoolkit'
 				]
+			},
+			XDMS2Desc : {
+				//	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+				cmd		: 'xdms',
+				args	: [ 'd', '{filePath}' ]
+			},
+			XDMS2LongDesc : {
+				//	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+				cmd		: 'xdms',
+				args	: [ 'f', '{filePath}' ]
 			}
 		},
 
@@ -426,13 +436,20 @@ function getDefaultConfig() {
 				sig				: '377abcaf271c',
 				offset			: 0,
 				archiveHandler	: '7Zip',
-			}
+			},
 
-			//	:TODO: update archives::formats to fall here
-			//	* archive handler -> archiveHandler (consider archive if archiveHandler present)
-			//	* sig, offset, ...
-			//	* mime-db -> exts lookup
-			//	*
+			//
+			//	Generics that need further mapping
+			//
+			'application/octet-stream' : [
+				{
+					desc			: 'Amiga DISKMASHER',
+					sig				: '444d5321',	//	DMS!
+					ext				: '.dms',
+					shortDescUtil	: 'XDMS2Desc',
+					longDescUtil	: 'XDMS2LongDesc',
+				}
+			]
 		},
 
 		archives : {
diff --git a/core/file_area_list.js b/core/file_area_list.js
index f42bf93e..b3d55e2c 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -24,6 +24,7 @@ const controlCodesToAnsi	= require('./color_codes.js').controlCodesToAnsi;
 const async				= require('async');
 const _					= require('lodash');
 const moment			= require('moment');
+const paths				= require('path');
 
 exports.moduleInfo = {
 	name	: 'File Area List',
@@ -252,7 +253,18 @@ exports.getModule = class FileAreaList extends MenuModule {
 
 		if(entryInfo.archiveType) {
 			const mimeType = resolveMimeType(entryInfo.archiveType);
-			entryInfo.archiveTypeDesc = mimeType ? _.get(Config, [ 'fileTypes', mimeType, 'desc' ] ) || mimeType : entryInfo.archiveType;
+			let desc;
+			if(mimeType) {
+				let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+
+				if(Array.isArray(fileType)) {
+					//	further refine by extention
+					fileType = fileType.find(ft => paths.extname(currEntry.fileName) === ft.ext);
+				}
+				desc = fileType && fileType.desc;
+			}
+			entryInfo.archiveTypeDesc = desc || mimeType || entryInfo.archiveType;
+			//entryInfo.archiveTypeDesc = mimeType ? _.get(Config, [ 'fileTypes', mimeType, 'desc' ] ) || mimeType : entryInfo.archiveType;
 		} else {
 			entryInfo.archiveTypeDesc = 'N/A';
 		}
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 5f3b974a..9cfb1cb9 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -487,8 +487,19 @@ function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, c
 	);
 }
 
-function getInfoExtractUtilForDesc(mimeType, descType) {
-	let util = _.get(Config, [ 'fileTypes', mimeType, `${descType}DescUtil` ]);
+function getInfoExtractUtilForDesc(mimeType, filePath, descType) {
+	let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+
+	if(Array.isArray(fileType)) {
+		//	further refine by extention
+		fileType = fileType.find(ft => paths.extname(filePath) === ft.ext);
+	}
+
+	if(!_.isObject(fileType)) {
+		return;
+	}
+
+	let util = _.get(fileType, `${descType}DescUtil`);
 	if(!_.isString(util)) {
 		return;
 	}
@@ -508,7 +519,7 @@ function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
 	}
 
 	async.eachSeries( [ 'short', 'long' ], (descType, nextDesc) => {
-		const util = getInfoExtractUtilForDesc(mimeType, descType);
+		const util = getInfoExtractUtilForDesc(mimeType, filePath, descType);
 		if(!util) {
 			return nextDesc(null);
 		}
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
index 9958c2e3..f03df762 100644
--- a/docs/installation/manual.md
+++ b/docs/installation/manual.md
@@ -50,7 +50,7 @@ ENiGMA BBS makes use of a few packages for unarchiving and modem support. They'r
 running ENiGMA, but without them you'll miss certain functionality. Once installed, they should be made 
 available on your system path.
 
-| Package    | Description                       | Ubuntu Package                             | CentOS Package Name                               | Windows Package                                                  |
+| Package    | Description                       | Debian/Ubuntu Package (APT/DEP)                             | Red Hat Package (YUM/RPM)                               | Windows Package                                                  |
 |------------|-----------------------------------|--------------------------------------------|---------------------------------------------------|------------------------------------------------------------------|
 | arj        | Unpacking arj archives            | `arj`                                      | n/a, binaries [here](http://arj.sourceforge.net/) | [ARJ](http://arj.sourceforge.net/)                               |
 | 7zip       | Unpacking zip, rar, archives  | `p7zip-full`                               | `p7zip-full`                                      | [7-zip](http://www.7-zip.org/)                                   |
@@ -58,8 +58,8 @@ available on your system path.
 | Rar        | Unpacking rar archives  | `unrar`                               | n/a, binaries [here](https://www.rarlab.com/download.htm)                                      | Unknown                                   |
 | lrzsz      | sz/rz: X/Y/Z modem support        | `lrzsz`                                    | `lrzsz`                                           | Unknown                                                          | 
 | sexyz      | SexyZ modem support               | [sexyz](https://l33t.codes/outgoing/sexyz) | [sexyz](https://l33t.codes/outgoing/sexyz)        | Available with [Synchronet](http://wiki.synchro.net/install:win) |
-
-      - exiftool & other external tools
+| exiftool   | [ExifTool](https://www.sno.phy.queensu.ca/~phil/exiftool/)    | libimage-exiftool-perl | perl-Image-ExifTool | Unknown
+| xdms  | Unpack/view Amiga DMS | [xdms](http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html)  | xdms | Unknown
 
 ## Config Files
 

From ccf29ea8d4ced5900d990aae3ab87657ee3d1051 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Jun 2018 17:09:43 -0600
Subject: [PATCH 0307/1013] Force overwrite when extracting lha archives - they
 can contain dupes!

---
 core/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index 70406e47..63e52032 100644
--- a/core/config.js
+++ b/core/config.js
@@ -483,7 +483,7 @@ function getDefaultConfig() {
 					//
 					decompress		: {
 						cmd			: 'lha',
-						args		: [ '-ew={extractPath}', '{archivePath}' ],
+						args		: [ '-efw={extractPath}', '{archivePath}' ],
 					},
 					list			: {
 						cmd			: 'lha',
@@ -492,7 +492,7 @@ function getDefaultConfig() {
 					},
 					extract			: {
 						cmd			: 'lha',
-						args		: [ '-ew={extractPath}', '{archivePath}', '{fileList}' ]
+						args		: [ '-efw={extractPath}', '{archivePath}', '{fileList}' ]
 					}
 				},
 

From 57ecac535072ae26ec5fb0f53997160a9dc5bc58 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Jun 2018 20:51:09 -0600
Subject: [PATCH 0308/1013] Add ESC support (actually works)

---
 core/telnet_bridge.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 150996dd..36d12f5d 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -96,6 +96,15 @@ class TelnetClientConnection extends EventEmitter {
 		}
 	}
 
+	destroy() {
+		if(this.bridgeConnection) {
+			this.bridgeConnection.destroy();
+			this.bridgeConnection.removeAllListeners();
+			this.restorePipe();
+			this.emit('end');
+		}
+	}
+
 	getTermTypeNegotiationBuffer() {
 		//
 		//	Create a TERMINAL-TYPE sub negotiation buffer using the
@@ -153,7 +162,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 
 					self.client.term.write(resetScreen());
 					self.client.term.write(
-						`  Connecting to ${connectOpts.host}, please wait...\n`
+						`  Connecting to ${connectOpts.host}, please wait...\n  (Press ESC to cancel)\n`
 					);
 
 					const telnetConnection = new TelnetClientConnection(self.client);
@@ -161,7 +170,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
 					const connectionKeyPressHandler = (ch, key) => {
 						if('escape' === key.name) {
 							self.client.removeListener('key press', connectionKeyPressHandler);
-							telnetConnection.disconnect();
+							telnetConnection.destroy();
 						}
 					};
 

From 2eb07aebb816a94076eb3f6447cf0450e1b3b5c9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Jun 2018 21:13:27 -0600
Subject: [PATCH 0309/1013] Dep. upgrades

---
 package-lock.json | 167 ++++++++++++++++++++++++----------------------
 package.json      |  26 ++++----
 2 files changed, 101 insertions(+), 92 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e52f2b9..c0ba359d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
       "requires": {
         "lodash": "4.17.10"
       }
@@ -206,16 +206,13 @@
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
-    "buffers": {
-      "version": "github:NuSkooler/node-buffers#cd0855598f7048b02f0a51c90e22573973e9e2c2"
-    },
     "bunyan": {
       "version": "1.8.12",
       "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
       "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
       "requires": {
         "dtrace-provider": "0.8.6",
-        "moment": "2.22.1",
+        "moment": "2.22.2",
         "mv": "2.1.1",
         "safe-json-stringify": "1.1.0"
       }
@@ -236,6 +233,14 @@
         "unset-value": "1.0.0"
       }
     },
+    "capture-exit": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+      "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+      "requires": {
+        "rsvp": "3.6.2"
+      }
+    },
     "chalk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
@@ -246,11 +251,6 @@
         "supports-color": "5.4.0"
       }
     },
-    "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -464,16 +464,6 @@
         }
       }
     },
-    "external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-      "requires": {
-        "chardet": "0.4.2",
-        "iconv-lite": "0.4.21",
-        "tmp": "0.0.33"
-      }
-    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -584,9 +574,9 @@
       }
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
       "requires": {
         "graceful-fs": "4.1.11",
         "jsonfile": "4.0.0",
@@ -1141,9 +1131,9 @@
       "integrity": "sha512-1oGkOq4sssz7HFZ8Is9HuTR47r8gSC46qAzQxVlAkj0lNKpS+W5Lv2eci+c5+fFqL+Idtj5EvprFreUwH29a8A=="
     },
     "iconv-lite": {
-      "version": "0.4.21",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
-      "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
         "safer-buffer": "2.1.2"
       }
@@ -1163,23 +1153,48 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "inquirer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
-      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz",
+      "integrity": "sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==",
       "requires": {
         "ansi-escapes": "3.1.0",
         "chalk": "2.4.1",
         "cli-cursor": "2.1.0",
         "cli-width": "2.2.0",
-        "external-editor": "2.2.0",
+        "external-editor": "3.0.0",
         "figures": "2.0.0",
         "lodash": "4.17.10",
         "mute-stream": "0.0.7",
         "run-async": "2.3.0",
-        "rxjs": "5.5.10",
+        "rxjs": "6.2.0",
         "string-width": "2.1.1",
         "strip-ansi": "4.0.0",
         "through": "2.3.8"
+      },
+      "dependencies": {
+        "chardet": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz",
+          "integrity": "sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="
+        },
+        "external-editor": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz",
+          "integrity": "sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==",
+          "requires": {
+            "chardet": "0.5.0",
+            "iconv-lite": "0.4.23",
+            "tmp": "0.0.33"
+          }
+        },
+        "rxjs": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz",
+          "integrity": "sha512-qBzf5uu6eOKiCZuAE0SgZ0/Qp+l54oeVxFfC2t+mJ2SFI6IB8gmMdJHs5DUMu5kqifqcCtsKS2XHjhZu6RKvAw==",
+          "requires": {
+            "tslib": "1.9.2"
+          }
+        }
       }
     },
     "is-accessor-descriptor": {
@@ -1469,9 +1484,9 @@
       }
     },
     "moment": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz",
-      "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ=="
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
     },
     "ms": {
       "version": "2.0.0",
@@ -1538,9 +1553,9 @@
       }
     },
     "nodemailer": {
-      "version": "4.6.4",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.4.tgz",
-      "integrity": "sha512-SD4uuX7NMzZ5f5m1XHDd13J4UC3SmdJk8DsmU1g6Nrs5h3x9LcXr6EBPZIqXRJ3LrF7RdklzGhZRF/TuylTcLg=="
+      "version": "4.6.5",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.5.tgz",
+      "integrity": "sha512-+bt+BgmnOXDz1uIaWXfXuTESth8UHkhtu7+X8+X2W+CHAn0AuuCyCk854qnathYQLWEC2jkpx7/pkVHcfmLKDw=="
     },
     "normalize-path": {
       "version": "2.1.1",
@@ -1728,6 +1743,11 @@
       "resolved": "https://registry.npmjs.org/rlogin/-/rlogin-1.0.0.tgz",
       "integrity": "sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM="
     },
+    "rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
+    },
     "run-async": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -1736,19 +1756,6 @@
         "is-promise": "2.1.0"
       }
     },
-    "rxjs": {
-      "version": "5.5.10",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
-      "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
-      "requires": {
-        "symbol-observable": "1.0.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
     "safe-json-stringify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz",
@@ -1769,11 +1776,12 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sane": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.0.tgz",
-      "integrity": "sha512-glfKd7YH4UCrh/7dD+UESsr8ylKWRE7UQPoXuz28FgmcF0ViJQhCTCCZHICRKxf8G8O1KdLEn20dcICK54c7ew==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+      "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
       "requires": {
         "anymatch": "2.0.0",
+        "capture-exit": "1.2.0",
         "exec-sh": "0.2.1",
         "fb-watchman": "2.0.0",
         "fsevents": "1.2.3",
@@ -2368,21 +2376,23 @@
       }
     },
     "ssh2": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.5.5.tgz",
-      "integrity": "sha1-x3gezS7OcwSiU89iD6taXCK7IjU=",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.6.1.tgz",
+      "integrity": "sha512-fNvocq+xetsaAZtBG/9Vhh0GDjw1jQeW7Uq/DPh4fVrJd0XxSfXAqBjOGVk4o2jyWHvyC6HiaPFpfHlR12coDw==",
       "requires": {
-        "ssh2-streams": "0.1.20"
-      }
-    },
-    "ssh2-streams": {
-      "version": "0.1.20",
-      "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz",
-      "integrity": "sha1-URGNFUVV31Rp7h9n4M8efoosDjo=",
-      "requires": {
-        "asn1": "0.2.3",
-        "semver": "5.5.0",
-        "streamsearch": "0.1.2"
+        "ssh2-streams": "0.2.1"
+      },
+      "dependencies": {
+        "ssh2-streams": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.2.1.tgz",
+          "integrity": "sha512-3zCOsmunh1JWgPshfhKmBCL3lUtHPoh+a/cyQ49Ft0Q0aF7xgN06b76L+oKtFi0fgO57FLjFztb1GlJcEZ4a3Q==",
+          "requires": {
+            "asn1": "0.2.3",
+            "semver": "5.5.0",
+            "streamsearch": "0.1.2"
+          }
+        }
       }
     },
     "static-extend": {
@@ -2434,11 +2444,6 @@
         "has-flag": "3.0.0"
       }
     },
-    "symbol-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
-    },
     "temptmp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.0.0.tgz",
@@ -2511,6 +2516,11 @@
         "utf8-byte-length": "1.0.4"
       }
     },
+    "tslib": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz",
+      "integrity": "sha512-AVP5Xol3WivEr7hnssHDsaM+lVrVXWUvd1cfXTRkTj80b//6g2wIFEH6hZG0muGZRnHGrfttpdzRk3YlBkWjKw=="
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -2635,12 +2645,11 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
-      "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz",
+      "integrity": "sha512-c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==",
       "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.2"
+        "async-limiter": "1.0.0"
       }
     },
     "xxhash": {
diff --git a/package.json b/package.json
index 1155298c..8b6cf110 100644
--- a/package.json
+++ b/package.json
@@ -22,35 +22,35 @@
     "retro"
   ],
   "dependencies": {
-    "async": "^2.5.0",
+    "async": "^2.6.1",
     "binary-parser": "^1.3.2",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^6.0.1",
     "glob": "^7.1.2",
     "graceful-fs": "^4.1.11",
     "hashids": "^1.1.1",
-    "hjson": "^3.1.0",
-    "iconv-lite": "^0.4.18",
-    "inquirer": "^5.0.0",
+    "hjson": "^3.1.1",
+    "iconv-lite": "^0.4.23",
+    "inquirer": "^6.0.0",
     "later": "1.2.0",
-    "lodash": "^4.17.4",
-    "mime-types": "^2.1.17",
+    "lodash": "^4.17.10",
+    "mime-types": "^2.1.18",
     "minimist": "1.2.x",
-    "moment": "^2.20.1",
+    "moment": "^2.22.2",
     "node-pty": "^0.7.4",
-    "nodemailer": "^4.4.1",
+    "nodemailer": "^4.6.5",
     "rlogin": "^1.0.0",
-    "sane": "^2.2.0",
+    "sane": "^2.5.2",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^4.0.0",
     "sqlite3-trans": "^1.2.0",
-    "ssh2": "^0.5.5",
+    "ssh2": "^0.6.1",
     "temptmp": "^1.0.0",
-    "uuid": "^3.1.0",
+    "uuid": "^3.2.1",
     "uuid-parse": "^1.0.0",
-    "ws": "^4.0.0",
+    "ws": "^5.2.0",
     "xxhash": "^0.2.4",
     "yazl": "^2.4.2"
   },

From b273101b61e628765d9faf6ef9c1dd3b3902af8b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Jun 2018 17:00:54 -0600
Subject: [PATCH 0310/1013] Work on Events system: + system_event.js +
 codes.l33t.enigma.system.user_upload and
 codes.l33t.enigma.system.user_download events

---
 core/system_events.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 core/system_events.js

diff --git a/core/system_events.js b/core/system_events.js
new file mode 100644
index 00000000..706ad8a5
--- /dev/null
+++ b/core/system_events.js
@@ -0,0 +1,14 @@
+/* jslint node: true */
+'use strict';
+
+module.exports = {
+	ClientConnected		: 'codes.l33t.enigma.system.connected',		//	{ client, connectionCount }
+	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',	//	{ client, connectionCount }
+	TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
+
+	//	User - includes { user, ...}
+	UserLogin			: 'codes.l33t.enigma.system.user_login',
+	UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
+	UserUpload			: 'codes.l33t.enigma.system.user_upload',	//	{..., files[ fileEntry, ...] }
+	UserDownload		: 'codes.l33t.enigma.system.user_download',	//	{..., files[ fileEntry, ...] }
+};
\ No newline at end of file

From c142a9c3d31a06fb32e29b7e14fc2b5afaa16b3a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Jun 2018 17:02:28 -0600
Subject: [PATCH 0311/1013] Work on Events missed files (see prev)

---
 core/client_connections.js         | 10 ++++++--
 core/connect.js                    |  2 +-
 core/download_queue.js             | 16 ++++++++----
 core/events.js                     |  9 ++-----
 core/file_area_web.js              | 41 ++++++++++++++++--------------
 core/file_base_user_list_export.js |  2 +-
 core/file_transfer.js              | 12 ++++++++-
 core/upload.js                     | 13 +++++++++-
 8 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index d81d0922..176b027a 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -77,7 +77,10 @@ function addNewClient(client, clientSock) {
 
 	client.log.info(connInfo, 'Client connected');
 
-	Events.emit('codes.l33t.enigma.system.connected', { client : client, connectionCount : clientConnections.length } );
+	Events.emit(
+		Events.getSystemEvents().ClientConnected,
+		{ client : client, connectionCount : clientConnections.length }
+	);
 
 	return id;
 }
@@ -97,7 +100,10 @@ function removeClient(client) {
 			'Client disconnected'
 		);
 
-		Events.emit('codes.l33t.enigma.system.disconnected', { client : client, connectionCount : clientConnections.length } );
+		Events.emit(
+			Events.getSystemEvents().ClientDisconnected,
+			{ client : client, connectionCount : clientConnections.length }
+		);
 	}
 }
 
diff --git a/core/connect.js b/core/connect.js
index 8593dff8..51ee4e37 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -177,7 +177,7 @@ function connectEntry(client, nextMenu) {
 			displayBanner(term);
 
 			// fire event
-			Events.emit('codes.l33t.enigma.system.term_detected', { client : client } );
+			Events.emit(Events.getSystemEvents().TermDetected, { client : client } );
 
 			setTimeout( () => {
 				return client.menuStack.goto(nextMenu);
diff --git a/core/download_queue.js b/core/download_queue.js
index 0f45b04d..0c31b13c 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -1,7 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-const FileEntry	= require('./file_entry.js');
+const FileEntry		= require('./file_entry.js');
+
+//	deps
+const { partition }	= require('lodash');
 
 module.exports = class DownloadQueue {
 	constructor(client) {
@@ -24,21 +27,22 @@ module.exports = class DownloadQueue {
 		this.client.user.downloadQueue = [];
 	}
 
-	toggle(fileEntry) {
+	toggle(fileEntry, systemFile=false) {
 		if(this.isQueued(fileEntry)) {
 			this.client.user.downloadQueue = this.client.user.downloadQueue.filter(e => fileEntry.fileId !== e.fileId);
 		} else {
-			this.add(fileEntry);
+			this.add(fileEntry, systemFile);
 		}
 	}
 
-	add(fileEntry) {
+	add(fileEntry, systemFile=false) {
 		this.client.user.downloadQueue.push({
 			fileId		: fileEntry.fileId,
 			areaTag		: fileEntry.areaTag,
 			fileName	: fileEntry.fileName,
 			path		: fileEntry.filePath,
 			byteSize	: fileEntry.meta.byte_size || 0,
+			systemFile	: systemFile,
 		});
 	}
 
@@ -47,7 +51,9 @@ module.exports = class DownloadQueue {
 			fileIds = [ fileIds ];
 		}
 
-		this.client.user.downloadQueue = this.client.user.downloadQueue.filter(e => ( -1 === fileIds.indexOf(e.fileId) ) );
+		const [ remain, removed ] = partition(this.client.user.downloadQueue, e => ( -1 === fileIds.indexOf(e.fileId) ));
+		this.client.user.downloadQueue = remain;
+		return removed;
 	}
 
 	isQueued(entryOrId) {
diff --git a/core/events.js b/core/events.js
index b1e15c21..e50c5723 100644
--- a/core/events.js
+++ b/core/events.js
@@ -4,25 +4,20 @@
 const paths				= require('path');
 const events			= require('events');
 const Log				= require('./logger.js').log;
+const SystemEvents		= require('./system_events.js');
 
 //	deps
 const _					= require('lodash');
 const async				= require('async');
 const glob				= require('glob');
 
-const SYSTEM_EVENTS = {
-	ClientConnected		: 'codes.l33t.enigma.system.connected',
-	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',
-	TermDetected		: 'codes.l33t.enigma.term_detected',
-};
-
 module.exports = new class Events extends events.EventEmitter {
 	constructor() {
 		super();
 	}
 
 	getSystemEvents() {
-		return SYSTEM_EVENTS;
+		return SystemEvents;
 	}
 
 	addListener(event, listener) {
diff --git a/core/file_area_web.js b/core/file_area_web.js
index b8a630fc..928be942 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -14,6 +14,7 @@ const User					= require('./user.js');
 const Log					= require('./logger.js').log;
 const getConnectionByUserId	= require('./client_connections.js').getConnectionByUserId;
 const webServerPackageName	= require('./servers/content/web.js').moduleInfo.packageName;
+const Events				= require('./events.js');
 
 //	deps
 const hashids		= require('hashids');
@@ -337,7 +338,7 @@ class FileAreaWebAccess {
 
 				resp.on('finish', () => {
 					//	transfer completed fully
-					this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size);
+					this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size, [ fileEntry ]);
 				});
 
 				const headers = {
@@ -382,24 +383,21 @@ class FileAreaWebAccess {
 					);
 				},
 				function loadFileEntries(fileIds, callback) {
-					const filePaths = [];
-					async.eachSeries(fileIds, (fileId, nextFileId) => {
+					async.map(fileIds, (fileId, nextFileId) => {
 						const fileEntry = new FileEntry();
 						fileEntry.load(fileId, err => {
-							if(!err) {
-								filePaths.push(fileEntry.filePath);
-							}
-							return nextFileId(err);
+							return nextFileId(err, fileEntry);
 						});
-					}, err => {
+					}, (err, fileEntries) => {
 						if(err) {
-							return callback(Errors.DoesNotExist('Coudl not load file IDs for batch'));
+							return callback(Errors.DoesNotExist('Could not load file IDs for batch'));
 						}
 
-						return callback(null, filePaths);
+						return callback(null, fileEntries);
 					});
 				},
-				function createAndServeStream(filePaths, callback) {
+				function createAndServeStream(fileEntries, callback) {
+					const filePaths = fileEntries.map(fe => fe.filePath);
 					Log.trace( { filePaths : filePaths }, 'Creating zip archive for batch web request');
 
 					const zipFile = new yazl.ZipFile();
@@ -430,7 +428,7 @@ class FileAreaWebAccess {
 
 						resp.on('finish', () => {
 							//	transfer completed fully
-							self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize);
+							self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize, fileEntries);
 						});
 
 						const batchFileName = `batch_${servedItem.hashId}.zip`;
@@ -457,7 +455,7 @@ class FileAreaWebAccess {
 		);
 	}
 
-	updateDownloadStatsForUserIdAndSystem(userId, dlBytes, cb) {
+	updateDownloadStatsForUserIdAndSystem(userId, dlBytes, fileEntries) {
 		async.waterfall(
 			[
 				function fetchActiveUser(callback) {
@@ -477,14 +475,19 @@ class FileAreaWebAccess {
 					StatLog.incrementSystemStat('dl_total_count', 1);
 					StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
 
+					return callback(null, user);
+				},
+				function sendEvent(user, callback) {
+					Events.emit(
+						Events.getSystemEvents().UserDownload,
+						{
+							user	: user,
+							files	: fileEntries,
+						}
+					);
 					return callback(null);
 				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
+			]
 		);
 	}
 }
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 2dba52ad..0b30d582 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -223,7 +223,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 						if(!err) {
 							//	queue it!
 							const dlQueue = new DownloadQueue(self.client);
-							dlQueue.add(newEntry);
+							dlQueue.add(newEntry, true);	//	true=systemFile
 
 							//	clean up after ourselves when the session ends
 							const thisClientId = self.client.session.id;
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 19388bab..a7aee20c 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -10,6 +10,7 @@ const DownloadQueue		= require('./download_queue.js');
 const StatLog			= require('./stat_log.js');
 const FileEntry			= require('./file_entry.js');
 const Log				= require('./logger.js').log;
+const Events			= require('./events.js');
 
 //	deps
 const async			= require('async');
@@ -545,7 +546,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
 							if(sentFileIds.length > 0) {
 								//	remove items we sent from the D/L queue
 								const dlQueue = new DownloadQueue(self.client);
-								dlQueue.removeItems(sentFileIds);
+								const dlFileEntries = dlQueue.removeItems(sentFileIds);
+
+								//	fire event for downloaded entries
+								Events.emit(
+									Events.getSystemEvents().UserDownload,
+									{
+										user	: self.client.user,
+										files	: dlFileEntries
+									}
+								);
 
 								self.sentFileIds = sentFileIds;
 							}
diff --git a/core/upload.js b/core/upload.js
index b4130433..4ff6b3fb 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -16,6 +16,7 @@ const Log								= require('./logger.js').log;
 const Errors							= require('./enig_error.js').Errors;
 const FileEntry							= require('./file_entry.js');
 const isAnsi							= require('./string_util.js').isAnsi;
+const Events							= require('./events.js');
 
 //	deps
 const async								= require('async');
@@ -567,8 +568,18 @@ exports.getModule = class UploadModule extends MenuModule {
 					//	here as I/O can take quite a bit of time. Log any failures.
 					//
 					self.moveAndPersistUploadsToDatabase(scanResults.newEntries);
-					return callback(null);
+					return callback(null, scanResults.newEntries);
 				},
+				function sendEvent(uploadedEntries, callback) {
+					Events.emit(
+						Events.getSystemEvents().UserUpload,
+						{
+							user	: self.client.user,
+							files	: uploadedEntries,
+						}
+					);
+					return callback(null);
+				}
 			],
 			err => {
 				if(err) {

From 0ae9d0d1434797bcb0922f16cab97efcfb52b3fc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Jun 2018 17:59:16 -0600
Subject: [PATCH 0312/1013] + User login and logoff events

---
 core/client_connections.js | 4 ++++
 core/user.js               | 3 ++-
 core/user_login.js         | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 176b027a..121ea0fa 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -100,6 +100,10 @@ function removeClient(client) {
 			'Client disconnected'
 		);
 
+		if(client.user && client.user.isValid()) {
+			Events.emit(Events.getSystemEvents().UserLogoff, { user : client.user } );
+		}
+
 		Events.emit(
 			Events.getSystemEvents().ClientDisconnected,
 			{ client : client, connectionCount : clientConnections.length }
diff --git a/core/user.js b/core/user.js
index 59f150bb..16f84e8b 100644
--- a/core/user.js
+++ b/core/user.js
@@ -67,7 +67,8 @@ module.exports = class User {
 			return false;
 		}
 
-		return this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2 && this.prop_name.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2;
+		return ((this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2) &&
+			(this.properties.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2));
 	}
 
 	isRoot() {
diff --git a/core/user_login.js b/core/user_login.js
index 37c3b306..8e0e7404 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -6,6 +6,7 @@ const setClientTheme	= require('./theme.js').setClientTheme;
 const clientConnections	= require('./client_connections.js').clientConnections;
 const StatLog			= require('./stat_log.js');
 const logger			= require('./logger.js');
+const Events			= require('./events.js');
 
 //	deps
 const async				= require('async');
@@ -59,6 +60,8 @@ function userLogin(client, username, password, cb) {
 		client.log = logger.log.child( { clientId : client.log.fields.clientId, username : user.username });
 		client.log.info('Successful login');
 
+		Events.emit(Events.getSystemEvents().UserLogin, { user } );
+
 		async.parallel(
 			[
 				function setTheme(callback) {

From fbe87640c5eca185e328e137c5b70aa8b65c350a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Jun 2018 19:58:05 -0600
Subject: [PATCH 0313/1013] + New user event

---
 core/system_events.js | 12 +++++++++---
 core/user.js          |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/system_events.js b/core/system_events.js
index 706ad8a5..133561cb 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -2,13 +2,19 @@
 'use strict';
 
 module.exports = {
-	ClientConnected		: 'codes.l33t.enigma.system.connected',		//	{ client, connectionCount }
-	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',	//	{ client, connectionCount }
+	ClientConnected		: 'codes.l33t.enigma.system.connected',			//	{ client, connectionCount }
+	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',		//	{ client, connectionCount }
 	TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
 
 	//	User - includes { user, ...}
+	NewUser				: 'codes.l33t.enigma.system.new_user',
 	UserLogin			: 'codes.l33t.enigma.system.user_login',
 	UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
 	UserUpload			: 'codes.l33t.enigma.system.user_upload',	//	{..., files[ fileEntry, ...] }
 	UserDownload		: 'codes.l33t.enigma.system.user_download',	//	{..., files[ fileEntry, ...] }
-};
\ No newline at end of file
+
+	//	NYI below here:
+	UserPostMessage		: 'codes.l33t.enigma.system.user_post_msg',
+	UserSendMail		: 'codes.l33t.enigma.system.user_send_mail',
+	UserSendRunDoor		: 'codes.l33t.enigma.system.user_run_door',
+};
diff --git a/core/user.js b/core/user.js
index 16f84e8b..7f50223d 100644
--- a/core/user.js
+++ b/core/user.js
@@ -5,6 +5,7 @@ const userDb		= require('./database.js').dbs.user;
 const Config		= require('./config.js').config;
 const userGroup		= require('./user_group.js');
 const Errors		= require('./enig_error.js').Errors;
+const Events		= require('./events.js');
 
 //	deps
 const crypto		= require('crypto');
@@ -240,6 +241,10 @@ module.exports = class User {
 					self.persistWithTransaction(trans, err => {
 						return callback(err, trans);
 					});
+				},
+				function sendEvent(trans, callback) {
+					Events.emit(Events.getSystemEvents().NewUser, { user : self });
+					return callback(null, trans);
 				}
 			],
 			(err, trans) => {

From 1cb811576b4b7f6d36d87edd9421800dee6e1571 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Jun 2018 19:58:31 -0600
Subject: [PATCH 0314/1013] + Add unique session ID to client sessions *
 Aliased to user for convienence * Added to logs for easy tracing * Can be
 used from events/etc. for grouping

---
 core/client_connections.js |  6 +++++-
 core/user_login.js         | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 121ea0fa..3e7378f9 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -8,6 +8,7 @@ const Events            = require('./events.js');
 //	deps
 const _					= require('lodash');
 const moment			= require('moment');
+const hashids			= require('hashids');
 
 exports.getActiveConnections	= getActiveConnections;
 exports.getActiveNodeList		= getActiveNodeList;
@@ -60,9 +61,12 @@ function addNewClient(client, clientSock) {
 	const id			= client.session.id		= clientConnections.push(client) - 1;
 	const remoteAddress = client.remoteAddress	= clientSock.remoteAddress;
 
+	//	create a uniqe identifier one-time ID for this session
+	client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
+
 	//	Create a client specific logger
 	//	Note that this will be updated @ login with additional information
-	client.log = logger.log.child( { clientId : id } );
+	client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );
 
 	const connInfo = {
 		remoteAddress	: remoteAddress,
diff --git a/core/user_login.js b/core/user_login.js
index 8e0e7404..80d832e0 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -55,11 +55,19 @@ function userLogin(client, username, password, cb) {
 			return cb(existingConnError);
 		}
 
-
 		//	update client logger with addition of username
-		client.log = logger.log.child( { clientId : client.log.fields.clientId, username : user.username });
+		client.log = logger.log.child(
+			{
+				clientId	: client.log.fields.clientId,
+				sessionId	: client.log.fields.sessionId,
+				username	: user.username,
+			}
+		);
 		client.log.info('Successful login');
 
+		//	User's unique session identifier is the same as the connection itself
+		user.sessionId = client.session.uniqueId;	//	convienence
+
 		Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
 		async.parallel(

From 973e10fb8b20e5e6c37ee1123e6cbc241d3e3a17 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Jun 2018 22:45:01 -0600
Subject: [PATCH 0315/1013] HOME/END key support in lists

---
 core/menu_view.js          | 20 ++++++++++++++++----
 core/vertical_menu_view.js | 17 +++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/core/menu_view.js b/core/menu_view.js
index dc2f5c81..598e04cd 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -60,6 +60,10 @@ function MenuView(options) {
 		}
 		return -1;
 	};
+
+	this.emitIndexUpdate = function() {
+		self.emit('index update', self.focusedItemIndex);
+	}
 }
 
 util.inherits(MenuView, View);
@@ -174,19 +178,27 @@ MenuView.prototype.getItem = function(index) {
 };
 
 MenuView.prototype.focusNext = function() {
-	this.emit('index update', this.focusedItemIndex);
+	this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusPrevious = function() {
-	this.emit('index update', this.focusedItemIndex);
+	this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusNextPageItem = function() {
-	this.emit('index update', this.focusedItemIndex);
+	this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusPreviousPageItem = function() {
-	this.emit('index update', this.focusedItemIndex);
+	this.emitIndexUpdate();
+};
+
+MenuView.prototype.focusFirst = function() {
+	this.emitIndexUpdate();
+};
+
+MenuView.prototype.focusLast = function() {
+	this.emitIndexUpdate();
 };
 
 MenuView.prototype.setFocusItemIndex = function(index) {
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 57570e16..fe5c1203 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -165,7 +165,6 @@ VerticalMenuView.prototype.setFocusItemIndex = function(index) {
 };
 
 VerticalMenuView.prototype.onKeyPress = function(ch, key) {
-
 	if(key) {
 		if(this.isKeyMapped('up', key.name)) {
 			this.focusPrevious();
@@ -173,8 +172,12 @@ VerticalMenuView.prototype.onKeyPress = function(ch, key) {
 			this.focusNext();
 		} else if(this.isKeyMapped('page up', key.name)) {
 			this.focusPreviousPageItem();
-		} else if( this.isKeyMapped('page down', key.name)) {
+		} else if(this.isKeyMapped('page down', key.name)) {
 			this.focusNextPageItem();
+		} else if(this.isKeyMapped('home', key.name)) {
+			this.focusFirst();
+		} else if(this.isKeyMapped('end', key.name)) {
+			this.focusLast();
 		}
 	}
 
@@ -308,6 +311,16 @@ VerticalMenuView.prototype.focusNextPageItem = function() {
 	return VerticalMenuView.super_.prototype.focusNextPageItem.call(this);
 };
 
+VerticalMenuView.prototype.focusFirst = function() {
+	this.setFocusItemIndex(0);
+	return VerticalMenuView.super_.prototype.focusFirst.call(this);
+};
+
+VerticalMenuView.prototype.focusLast = function() {
+	this.setFocusItemIndex(this.items.length - 1);
+	return VerticalMenuView.super_.prototype.focusLast.call(this);
+};
+
 VerticalMenuView.prototype.setFocusItems = function(items) {
 	VerticalMenuView.super_.prototype.setFocusItems.call(this, items);
 

From ec30c595c48037d6b59013cc3f5b7a1ff96bc8c2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Jun 2018 22:50:57 -0600
Subject: [PATCH 0316/1013] Fix drawing like page up/down

---
 core/vertical_menu_view.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index fe5c1203..7e8fc808 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -312,12 +312,31 @@ VerticalMenuView.prototype.focusNextPageItem = function() {
 };
 
 VerticalMenuView.prototype.focusFirst = function() {
+	if(0 < this.viewWindow.top) {
+		this.oldDimens = Object.assign({}, this.dimens);
+	}
 	this.setFocusItemIndex(0);
 	return VerticalMenuView.super_.prototype.focusFirst.call(this);
 };
 
 VerticalMenuView.prototype.focusLast = function() {
-	this.setFocusItemIndex(this.items.length - 1);
+	const index = this.items.length - 1;
+
+	if(index > this.viewWindow.bottom) {
+		this.oldDimens = Object.assign({}, this.dimens);
+
+		this.focusedItemIndex = index;
+
+		this.viewWindow = {
+			top		: this.focusedItemIndex,
+			bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+		};
+
+		this.redraw();
+	} else {
+		this.setFocusItemIndex(index);
+	}
+
 	return VerticalMenuView.super_.prototype.focusLast.call(this);
 };
 

From 82da4b8e1ea708ea2fe48e598138c5e46ff2abb9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 20:54:17 -0600
Subject: [PATCH 0317/1013] Resolve non-conditionals as-is

---
 core/acs.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/acs.js b/core/acs.js
index 9532ad78..90c7c2a6 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -52,7 +52,11 @@ class ACS {
 	}
 
 	getConditionalValue(condArray, memberName) {
-		assert(_.isArray(condArray));
+		if(!Array.isArray(condArray)) {
+			//	no cond array, just use the value
+			return condArray;
+		}
+
 		assert(_.isString(memberName));
 
 		const matchCond = condArray.find( cond => {

From c08e4dbe046b0f4b0d6732cb51c4b60da41d7fae Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 20:54:59 -0600
Subject: [PATCH 0318/1013] New system events

---
 core/system_events.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/system_events.js b/core/system_events.js
index 133561cb..a5e94cc1 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -6,12 +6,17 @@ module.exports = {
 	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',		//	{ client, connectionCount }
 	TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
 
+	ThemeChanged		: 'codes.l33t.enigma.system.theme_changed',		//	{ themeId }
+	ConfigChanged		: 'codes.l33t.enigma.system.config_changed',
+	MenusChanged		: 'codes.l33t.enigma.system.menus_changed',
+	PromptsChanged		: 'codes.l33t.enigma.system.prompts_changed',
+
 	//	User - includes { user, ...}
 	NewUser				: 'codes.l33t.enigma.system.new_user',
 	UserLogin			: 'codes.l33t.enigma.system.user_login',
 	UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
-	UserUpload			: 'codes.l33t.enigma.system.user_upload',	//	{..., files[ fileEntry, ...] }
-	UserDownload		: 'codes.l33t.enigma.system.user_download',	//	{..., files[ fileEntry, ...] }
+	UserUpload			: 'codes.l33t.enigma.system.user_upload',		//	{..., files[ fileEntry, ...] }
+	UserDownload		: 'codes.l33t.enigma.system.user_download',		//	{..., files[ fileEntry, ...] }
 
 	//	NYI below here:
 	UserPostMessage		: 'codes.l33t.enigma.system.user_post_msg',

From 7748765ce05e5d7f4b2c99bf8c3dbb43117cbdb0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 20:58:02 -0600
Subject: [PATCH 0319/1013] Clean up code for updated getConditionalValue()

---
 core/menu_util.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/menu_util.js b/core/menu_util.js
index a86690e5..4a4665b8 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -221,11 +221,7 @@ function handleAction(client, formData, conf, cb) {
 }
 
 function handleNext(client, nextSpec, conf, cb) {
-	assert(_.isString(nextSpec) || _.isArray(nextSpec));
-
-	if(_.isArray(nextSpec)) {
-		nextSpec = client.acs.getConditionalValue(nextSpec, 'next');
-	}
+	nextSpec = client.acs.getConditionalValue(nextSpec, 'next');	//	handle any conditionals
 
 	const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
 	//	:TODO: getAssetWithShorthand() can return undefined - handle it!

From ceab8a01808feca0301e5d1711df2beb7dcd86b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 20:58:59 -0600
Subject: [PATCH 0320/1013] Code cleanup

---
 core/logger.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/logger.js b/core/logger.js
index 1f1efde2..063757ff 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -26,12 +26,12 @@ module.exports = class Log {
 		}
 
 		const serializers = {
-			err			: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
+			err	: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
 		};
 
 		//	try to remove sensitive info by default, e.g. 'password' fields
 		[ 'formData', 'formValue' ].forEach(keyName => {
-			serializers[keyName]	= (fd) => Log.hideSensitive(fd);
+			serializers[keyName] = (fd) => Log.hideSensitive(fd);
 		});
 
 		this.log = bunyan.createLogger({

From 1870db7d38aa1c5f9a16dc6391f26442474c204f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 20:59:43 -0600
Subject: [PATCH 0321/1013] Cleanup code for new getConditionalValue() support

---
 core/menu_stack.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/core/menu_stack.js b/core/menu_stack.js
index 073dece5..360c2b38 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -52,18 +52,13 @@ module.exports = class MenuStack {
 		const currentModuleInfo = this.top();
 		assert(currentModuleInfo, 'Empty menu stack!');
 
-		const menuConfig = currentModuleInfo.instance.menuConfig;
-		let nextMenu;
-
-		if(_.isArray(menuConfig.next)) {
-			nextMenu = this.client.acs.getConditionalValue(menuConfig.next, 'next');
-			if(!nextMenu) {
-				return cb(Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH'));
-			}
-		} else if(_.isString(menuConfig.next)) {
-			nextMenu = menuConfig.next;
-		} else {
-			return cb(Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT'));
+		const menuConfig	= currentModuleInfo.instance.menuConfig;
+		const nextMenu		= this.client.acs.getConditionalValue(menuConfig.next, 'next');
+		if(!nextMenu) {
+			return cb(Array.isArray(menuConfig.next) ?
+				Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
+				Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT')
+			);
 		}
 
 		if(nextMenu === currentModuleInfo.name) {

From 4aab8224eda69431c48be37ee5714fd296d260a5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 Jun 2018 21:02:00 -0600
Subject: [PATCH 0322/1013] Initial version of hot-reload of config, menus, and
 prompts * Themes use ES6 Map vs object{} * Re-write and re-enable config
 cache using sane * Events sent for config, prompt, or menu changes * Event
 sent for theme changes * Theme (or parent menu/prompt) changes cause re-merge
 and updates to connected clients

---
 core/bbs.js          |   7 +-
 core/client.js       |   7 ++
 core/config.js       |  90 +++++++++----------
 core/config_cache.js | 121 +++++++++++--------------
 core/config_util.js  |  61 +++++++++++--
 core/fse.js          |  13 +--
 core/theme.js        | 205 +++++++++++++++++++++----------------------
 core/user_config.js  |  13 +--
 8 files changed, 275 insertions(+), 242 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index a7246b8b..883e1a87 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -190,10 +190,13 @@ function initialize(cb) {
 			function initStatLog(callback) {
 				return require('./stat_log.js').init(callback);
 			},
+			function initConfigs(callback) {
+				return require('./config_util.js').init(callback);
+			},
 			function initThemes(callback) {
 				//	Have to pull in here so it's after Config init
-				require('./theme.js').initAvailableThemes(function onThemesInit(err, themeCount) {
-					logger.log.info({ themeCount : themeCount }, 'Themes initialized');
+				require('./theme.js').initAvailableThemes( (err, themeCount) => {
+					logger.log.info({ themeCount }, 'Themes initialized');
 					return callback(err);
 				});
 			},
diff --git a/core/client.js b/core/client.js
index d75b1b6d..d3692cd5 100644
--- a/core/client.js
+++ b/core/client.js
@@ -38,6 +38,7 @@ const User		= require('./user.js');
 const Config	= require('./config.js').config;
 const MenuStack	= require('./menu_stack.js');
 const ACS		= require('./acs.js');
+const Events	= require('./events.js');
 
 //	deps
 const stream	= require('stream');
@@ -110,6 +111,12 @@ function Client(/*input, output*/) {
 		this.input.on('data', this.dataHandler);
 	};
 
+	Events.on(Events.getSystemEvents().ThemeChanged, ( { themeId } ) => {
+		if(_.get(this.currentTheme, 'info.themeId') === themeId) {
+			this.currentTheme = require('./theme.js').getAvailableThemes().get(themeId);
+		}
+	});
+
 
 	//
 	//	Peek at incoming |data| and emit events for any special
diff --git a/core/config.js b/core/config.js
index 63e52032..b11c43e9 100644
--- a/core/config.js
+++ b/core/config.js
@@ -2,13 +2,12 @@
 'use strict';
 
 //	ENiGMA½
+const Errors			= require('./enig_error.js').Errors;
 
 //	deps
-const fs				= require('graceful-fs');
 const paths				= require('path');
 const async				= require('async');
 const _					= require('lodash');
-const hjson				= require('hjson');
 const assert			= require('assert');
 
 exports.init			= init;
@@ -40,39 +39,13 @@ function hasMessageConferenceAndArea(config) {
 	return result;
 }
 
-function init(configPath, options, cb) {
-	if(!cb && _.isFunction(options)) {
-		cb = options;
-		options = {};
-	}
-
+function mergeValidateAndFinalize(config, cb) {
 	async.waterfall(
 		[
-			function loadUserConfig(callback) {
-				if(!_.isString(configPath)) {
-					return callback(null, { } );
-				}
-
-				fs.readFile(configPath, { encoding : 'utf8' }, (err, configData) => {
-					if(err) {
-						return callback(err);
-					}
-
-					let configJson;
-					try {
-						configJson = hjson.parse(configData, options);
-					} catch(e) {
-						return callback(e);
-					}
-
-					return callback(null, configJson);
-				});
-			},
-			function mergeWithDefaultConfig(configJson, callback) {
-
+			function mergeWithDefaultConfig(callback) {
 				const mergedConfig = _.mergeWith(
 					getDefaultConfig(),
-					configJson, (conf1, conf2) => {
+					config, (conf1, conf2) => {
 						//	Arrays should always concat
 						if(_.isArray(conf1)) {
 							//	:TODO: look for collisions & override dupes
@@ -89,26 +62,53 @@ function init(configPath, options, cb) {
 				//
 				//	:TODO: Logic is broken here:
 				if(hasMessageConferenceAndArea(mergedConfig)) {
-					var msgAreasErr = new Error('Please create at least one message conference and area!');
-					msgAreasErr.code = 'EBADCONFIG';
-					return callback(msgAreasErr);
-				} else {
-					return callback(null, mergedConfig);
+					return callback(Errors.MissingConfig('Please create at least one message conference and area!'));
 				}
+				return callback(null, mergedConfig);
+			},
+			function setIt(mergedConfig, callback) {
+				exports.config = mergedConfig;
+
+				exports.config.get = (path) => {
+					return _.get(exports.config, path);
+				};
+
+				return callback(null);
 			}
 		],
-		function complete(err, mergedConfig) {
-			exports.config = mergedConfig;
-
-			exports.config.get = function(path) {
-				return _.get(exports.config, path);
-			};
-
-			return cb(err);
+		err => {
+			if(cb) {
+				return cb(err);
+			}
 		}
 	);
 }
 
+function init(configPath, options, cb) {
+	if(!cb && _.isFunction(options)) {
+		cb = options;
+		options = {};
+	}
+
+	const changed = ( { fileName, fileRoot } ) => {
+		const reCachedPath = paths.join(fileRoot, fileName);
+		ConfigCache.getConfig(reCachedPath, (err, config) => {
+			if(!err) {
+				mergeValidateAndFinalize(config);
+			}
+		});
+	};
+
+	const ConfigCache = require('./config_cache.js');
+	ConfigCache.getConfigWithOptions( { filePath : configPath, callback : changed }, (err, config) => {
+		if(err) {
+			return cb(err);
+		}
+
+		return mergeValidateAndFinalize(config, cb);
+	});
+}
+
 function getDefaultPath() {
 	//	e.g. /enigma-bbs-install-path/config/
 	return './config/';
@@ -804,7 +804,7 @@ function getDefaultConfig() {
 		},
 
 		misc : {
-			preAuthIdleLogoutSeconds	: 60 * 3,	//	2m
+			preAuthIdleLogoutSeconds	: 60 * 3,	//	3m
 			idleLogoutSeconds			: 60 * 6,	//	6m
 		},
 
diff --git a/core/config_cache.js b/core/config_cache.js
index 875e1b2e..8ec7280c 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -1,85 +1,70 @@
 /* jslint node: true */
 'use strict';
 
-var Config				= require('./config.js').config;
-var Log					= require('./logger.js').log;
+//	deps
+const paths				= require('path');
+const fs				= require('graceful-fs');
+const hjson				= require('hjson');
+const sane				= require('sane');
 
-var paths				= require('path');
-var fs					= require('graceful-fs');
-var events				= require('events');
-var util				= require('util');
-var assert				= require('assert');
-var hjson				= require('hjson');
-var _					= require('lodash');
+module.exports = new class ConfigCache
+{
+	constructor() {
+		this.cache		= new Map();	//	path->parsed config
+	}
 
-function ConfigCache() {
-	events.EventEmitter.call(this);
+	getConfigWithOptions(options, cb) {
+		const cached = this.cache.has(options.filePath);
 
-	var self 	= this;
-	this.cache	= {};	//	filePath -> HJSON
-	//this.gaze	= new Gaze();
+		if(options.forceReCache || !cached) {
+			this.recacheConfigFromFile(options.filePath, (err, config) => {
+				if(!err && !cached) {
+					const watcher = sane(
+						paths.dirname(options.filePath),
+						{
+							glob : `**/${paths.basename(options.filePath)}`
+						}
+					);
 
-	this.reCacheConfigFromFile = function(filePath, cb) {
-		fs.readFile(filePath, { encoding : 'utf-8' }, function fileRead(err, data) {
-			try {
-				self.cache[filePath] = hjson.parse(data);
-				cb(null, self.cache[filePath]);
-			} catch(e) {
-				Log.error( { filePath : filePath, error : e.toString() }, 'Failed recaching');
-				cb(e);
-			}
-		});
-	};
+					watcher.on('change', (fileName, fileRoot) => {
+						require('./logger.js').log.info( { fileName, fileRoot }, 'Configuration file changed; re-caching');
 
-/*
-	this.gaze.on('error', function gazeErr(err) {
+						this.recacheConfigFromFile(paths.join(fileRoot, fileName), err => {
+							if(!err) {
+								if(options.callback) {
+									options.callback( { fileName, fileRoot } );
+								}
+							}
+						});
+					});
+				}
+				return cb(err, config, true);
+			});
+		} else {
+			return cb(null, this.cache.get(options.filePath), false);
+		}
+	}
 
-	});
+	getConfig(filePath, cb) {
+		return this.getConfigWithOptions( { filePath }, cb);
+	}
 
-	this.gaze.on('changed', function fileChanged(filePath) {
-		assert(filePath in self.cache);
-
-		Log.info( { path : filePath }, 'Configuration file changed; re-caching');
-
-		self.reCacheConfigFromFile(filePath, function reCached(err) {
+	recacheConfigFromFile(path, cb) {
+		fs.readFile(path, { encoding : 'utf-8' }, (err, data) => {
 			if(err) {
-				Log.error( { error : err.message, path : filePath } , 'Failed re-caching configuration');
-			} else {
-				self.emit('recached', filePath);
+				return cb(err);
 			}
-		});
-	});
-	*/
 
-}
-
-util.inherits(ConfigCache, events.EventEmitter);
-
-ConfigCache.prototype.getConfigWithOptions = function(options, cb) {
-	assert(_.isString(options.filePath));
-
-	//	var self		= this;
-	var isCached	= (options.filePath in this.cache);
-
-	if(options.forceReCache || !isCached) {
-		this.reCacheConfigFromFile(options.filePath, function fileCached(err, config) {
-			if(!err && !isCached) {
-				//self.gaze.add(options.filePath);
+			let parsed;
+			try {
+				parsed = hjson.parse(data);
+				this.cache.set(path, parsed);
+			} catch(e) {
+				require('./logger.js').log.error( { filePath : path, error : e.message }, 'Failed to re-cache' );
+				return cb(e);
 			}
-			cb(err, config, true);
+
+			return cb(null, parsed);
 		});
-	} else {
-		cb(null, this.cache[options.filePath], false);
 	}
 };
-
-
-ConfigCache.prototype.getConfig = function(filePath, cb) {
-	this.getConfigWithOptions( { filePath : filePath }, cb);
-};
-
-ConfigCache.prototype.getModConfig = function(fileName, cb) {
-	this.getConfig(paths.join(Config.paths.mods, fileName), cb);
-};
-
-module.exports = exports = new ConfigCache();
diff --git a/core/config_util.js b/core/config_util.js
index 40723d9a..94ce4344 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -1,18 +1,65 @@
 /* jslint node: true */
 'use strict';
-const Config	= require('./config.js').config;
-const configCache			= require('./config_cache.js');
-const paths				= require('path');
 
+const Config			= require('./config.js').config;
+const ConfigCache		= require('./config_cache.js');
+const Events			= require('./events.js');
+
+//	deps
+const paths				= require('path');
+const async				= require('async');
+
+exports.init			= init;
 exports.getFullConfig	= getFullConfig;
 
-function getFullConfig(filePath, cb) {
+function getConfigPath(filePath) {
 	//	|filePath| is assumed to be in the config path if it's only a file name
 	if('.' === paths.dirname(filePath)) {
 		filePath = paths.join(Config.paths.config, filePath);
 	}
+	return filePath;
+}
 
-	configCache.getConfig(filePath, function loaded(err, configJson) {
-		cb(err, configJson);
+function init(cb) {
+	//	pre-cache menu.hjson and prompt.hjson + establish events
+	const changed = ( { fileName, fileRoot } ) => {
+		const reCachedPath = paths.join(fileRoot, fileName);
+		if(reCachedPath === getConfigPath(Config.general.menuFile)) {
+			Events.emit(Events.getSystemEvents().MenusChanged);
+		} else if(reCachedPath === getConfigPath(Config.general.promptFile)) {
+			Events.emit(Events.getSystemEvents().PromptsChanged);
+		}
+	};
+
+	async.series(
+		[
+			function menu(callback) {
+				return ConfigCache.getConfigWithOptions(
+					{
+						filePath : getConfigPath(Config.general.menuFile),
+						callback : changed,
+					},
+					callback
+				);
+			},
+			function prompt(callback) {
+				return ConfigCache.getConfigWithOptions(
+					{
+						filePath : getConfigPath(Config.general.promptFile),
+						callback : changed,
+					},
+					callback
+				);
+			}
+		],
+		err => {
+			return cb(err);
+		}
+	);
+}
+
+function getFullConfig(filePath, cb) {
+	ConfigCache.getConfig(getConfigPath(filePath), (err, config) => {
+		return cb(err, config);
 	});
-}
\ No newline at end of file
+}
diff --git a/core/fse.js b/core/fse.js
index 8a409589..70b1ecec 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -532,12 +532,13 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 						theme.displayThemedAsset(
 							art[n],
 							self.client,
-							{ font : self.menuConfig.font },
+							{ font : self.menuConfig.font, acsCondMember : 'art' },
 							function displayed(err) {
 								next(err);
 							}
 						);
 					}, function complete(err) {
+						//self.body.height = self.client.term.termHeight - self.header.height - 1;
 						callback(err);
 					});
 				},
@@ -607,14 +608,11 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 					self.beforeArt(callback);
 				},
 				function displayHeaderAndBodyArt(callback) {
-					assert(_.isString(art.header));
-					assert(_.isString(art.body));
-
 					async.eachSeries( [ 'header', 'body' ], function dispArt(n, next) {
 						theme.displayThemedAsset(
 							art[n],
 							self.client,
-							{ font : self.menuConfig.font },
+							{ font : self.menuConfig.font, acsCondMember : 'art' },
 							function displayed(err, artData) {
 								if(artData) {
 									mciData[n] = artData;
@@ -879,13 +877,10 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 		async.waterfall(
 			[
 				function clearAndDisplayArt(callback) {
-
-					//	:TODO: use termHeight, not hard coded 24 here:
-
 					//	:TODO: NetRunner does NOT support delete line, so this does not work:
 					self.client.term.rawWrite(
 						ansi.goto(self.header.height + 1, 1) +
-						ansi.deleteLine(24 - self.header.height));
+						ansi.deleteLine((self.client.term.termHeight - self.header.height) - 1));
 
 					theme.displayThemeArt( { name : self.menuConfig.config.art.quote, client : self.client }, function displayed(err, artData) {
 						callback(err, artData);
diff --git a/core/theme.js b/core/theme.js
index 2c984ae0..77c737fc 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -5,12 +5,13 @@ const Config			= require('./config.js').config;
 const art				= require('./art.js');
 const ansi				= require('./ansi_term.js');
 const Log				= require('./logger.js').log;
-const configCache		= require('./config_cache.js');
+const ConfigCache		= require('./config_cache.js');
 const getFullConfig		= require('./config_util.js').getFullConfig;
 const asset				= require('./asset.js');
 const ViewController	= require('./view_controller.js').ViewController;
 const Errors			= require('./enig_error.js').Errors;
 const ErrorReasons		= require('./enig_error.js').ErrorReasons;
+const Events			= require('./events.js');
 
 const fs				= require('graceful-fs');
 const paths				= require('path');
@@ -63,11 +64,23 @@ function refreshThemeHelpers(theme) {
 	};
 }
 
-function loadTheme(themeID, cb) {
+function loadTheme(themeId, cb) {
+	const path = paths.join(Config.paths.themes, themeId, 'theme.hjson');
 
-	const path = paths.join(Config.paths.themes, themeID, 'theme.hjson');
+	const changed = ( { fileName, fileRoot } ) => {
+		const reCachedPath = paths.join(fileRoot, fileName);
+		if(reCachedPath === path) {
+			reloadTheme(themeId);
+		}
+	};
 
-	configCache.getConfigWithOptions( { filePath : path, forceReCache : true }, (err, theme) => {
+	const getOpts = {
+		filePath 		: path,
+		forceReCache	: true,
+		callback		: changed,
+	};
+
+	ConfigCache.getConfigWithOptions(getOpts, (err, theme) => {
 		if(err) {
 			return cb(err);
 		}
@@ -89,7 +102,7 @@ function loadTheme(themeID, cb) {
 	});
 }
 
-const availableThemes = {};
+const availableThemes = new Map();
 
 const IMMUTABLE_MCI_PROPERTIES = [
 	'maxLength', 'argName', 'submit', 'validate'
@@ -248,6 +261,56 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 	return mergedTheme;
 }
 
+function reloadTheme(themeId) {
+	async.waterfall(
+		[
+			function loadMenuConfig(callback) {
+				getFullConfig(Config.general.menuFile, (err, menuConfig) => {
+					return callback(err, menuConfig);
+				});
+			},
+			function loadPromptConfig(menuConfig, callback) {
+				getFullConfig(Config.general.promptFile, (err, promptConfig) => {
+					return callback(err, menuConfig, promptConfig);
+				});
+			},
+			function loadIt(menuConfig, promptConfig, callback) {
+				loadTheme(themeId, (err, theme) => {
+					if(err) {
+						if(ErrorReasons.NotEnabled !== err.reasonCode) {
+							Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
+							return;
+						}
+						return callback(err);
+					}
+
+					Object.assign(theme.info, { themeId } );
+					availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
+
+					Events.emit(
+						Events.getSystemEvents().ThemeChanged,
+						{ themeId }
+					);
+
+					return callback(null, theme);
+				});
+			}
+		],
+		(err, theme) => {
+			if(err) {
+				Log.warn( { themeId, error : err.message }, 'Failed to reload theme');
+			} else {
+				Log.debug( { info : theme.info }, 'Theme recached' );
+			}
+		}
+	);
+}
+
+function reloadAllThemes()
+{
+	async.each([ ...availableThemes.keys() ], themeId => reloadTheme(themeId));
+}
+
 function initAvailableThemes(cb) {
 
 	async.waterfall(
@@ -281,7 +344,7 @@ function initAvailableThemes(cb) {
 			},
 			function populateAvailable(menuConfig, promptConfig, themeDirectories, callback) {
 				async.each(themeDirectories, (themeId, nextThemeDir) => {	//	theme dir = theme ID
-					loadTheme(themeId, (err, theme, themePath) => {
+					loadTheme(themeId, (err, theme) => {
 						if(err) {
 							if(ErrorReasons.NotEnabled !== err.reasonCode) {
 								Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
@@ -290,31 +353,27 @@ function initAvailableThemes(cb) {
 							return nextThemeDir(null);	//	try next
 						}
 
-						availableThemes[themeId] = getMergedTheme(menuConfig, promptConfig, theme);
-
-						configCache.on('recached', recachedPath => {
-							if(themePath === recachedPath) {
-								loadTheme(themeId, (err, reloadedTheme) => {
-									if(!err) {
-										//	:TODO: This is still broken - Need to reapply *latest* menu config and prompt configs to theme at very least
-										Log.debug( { info : theme.info }, 'Theme recached' );
-										availableThemes[themeId] = getMergedTheme(menuConfig, promptConfig, reloadedTheme);
-									} else if(ErrorReasons.NotEnabled === err.reasonCode) {
-										//	:TODO: we need to disable this theme -- users may be using it! We'll need to re-assign them if so
-									}
-								});
-							}
-						});
-
+						Object.assign(theme.info, { themeId } );
+						availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
 						return nextThemeDir(null);
 					});
 				}, err => {
 					return callback(err);
 				});
+			},
+			function initEvents(callback) {
+				Events.on(Events.getSystemEvents().MenusChanged, () => {
+					return reloadAllThemes();
+				});
+				Events.on(Events.getSystemEvents().PromptsChanged, () => {
+					return reloadAllThemes();
+				});
+
+				return callback(null);
 			}
 		],
 		err => {
-			return cb(err, availableThemes ? availableThemes.length : 0);
+			return cb(err, availableThemes.size);
 		}
 	);
 }
@@ -324,31 +383,30 @@ function getAvailableThemes() {
 }
 
 function getRandomTheme() {
-	if(Object.getOwnPropertyNames(availableThemes).length > 0) {
-		var themeIds = Object.keys(availableThemes);
+	if(availableThemes.size > 0) {
+		const themeIds = [ ...availableThemes.keys() ];
 		return themeIds[Math.floor(Math.random() * themeIds.length)];
 	}
 }
 
 function setClientTheme(client, themeId) {
-	let logMsg;
-
 	const availThemes = getAvailableThemes();
 
-	client.currentTheme = availThemes[themeId];
-	if(client.currentTheme) {
-		logMsg = 'Set client theme';
+	let msg;
+	let setThemeId;
+	if(availThemes.has(themeId)) {
+		msg = 'Set client theme';
+		setThemeId = themeId;
+	} else if(availThemes.has(Config.defaults.theme)) {
+		msg = 'Failed setting theme by supplied ID; Using default';
+		setThemeId = Config.defaults.theme;
 	} else {
-		client.currentTheme = availThemes[Config.defaults.theme];
-		if(client.currentTheme) {
-			logMsg = 'Failed setting theme by supplied ID; Using default';
-		} else {
-			client.currentTheme = availThemes[Object.keys(availThemes)[0]];
-			logMsg = 'Failed setting theme by system default ID; Using the first one we can find';
-		}
+		msg = 'Failed setting theme by system default ID; Using the first one we can find';
+		setThemeId = availThemes.keys().next().value;
 	}
 
-	client.log.debug( { themeId : themeId, info : client.currentTheme.info }, logMsg);
+	client.currentTheme = availThemes.get(setThemeId);
+	client.log.debug( { setThemeId, requestedThemeId : themeId, info : client.currentTheme.info }, msg);
 }
 
 function getThemeArt(options, cb) {
@@ -465,73 +523,6 @@ function displayThemeArt(options, cb) {
 	});
 }
 
-/*
-function displayThemedPrompt(name, client, options, cb) {
-
-	async.waterfall(
-		[
-			function loadConfig(callback) {
-				configCache.getModConfig('prompt.hjson', (err, promptJson) => {
-					if(err) {
-						return callback(err);
-					}
-
-					if(_.has(promptJson, [ 'prompts', name ] )) {
-						return callback(Errors.DoesNotExist(`Prompt "${name}" does not exist`));
-					}
-
-					const promptConfig = promptJson.prompts[name];
-					if(!_.isObject(promptConfig)) {
-						return callback(Errors.Invalid(`Prompt "${name} is invalid`));
-					}
-
-					return callback(null, promptConfig);
-				});
-			},
-			function display(promptConfig, callback) {
-				if(options.clearScreen) {
-					client.term.rawWrite(ansi.clearScreen());
-				}
-
-				//
-				//	If we did not clear the screen, don't let the font change
-				//
-				const dispOptions = Object.assign( {}, promptConfig.options );
-				if(!options.clearScreen) {
-					dispOptions.font = 'not_really_a_font!';
-				}
-
-				displayThemedAsset(
-					promptConfig.art,
-					client,
-					dispOptions,
-					(err, artData) => {
-						if(err) {
-							return callback(err);
-						}
-
-						return callback(null, promptConfig, artData.mciMap);
-					}
-				);
-			},
-			function prepViews(promptConfig, mciMap, callback) {
-				vc = new ViewController( { client : client } );
-
-				const loadOpts = {
-					promptName	: name,
-					mciMap		: mciMap,
-					config		: promptConfig,
-				};
-
-				vc.loadFromPromptConfig(loadOpts, err => {
-					callback(null);
-				});
-			}
-		]
-	);
-}
-*/
-
 function displayThemedPrompt(name, client, options, cb) {
 
 	const useTempViewController = _.isUndefined(options.viewController);
@@ -663,6 +654,10 @@ function displayThemedAsset(assetSpec, client, options, cb) {
 		options = {};
 	}
 
+	if(Array.isArray(assetSpec) && _.isString(options.acsCondMember)) {
+		assetSpec = client.acs.getConditionalValue(assetSpec, options.acsCondMember);
+	}
+
 	const artAsset = asset.getArtAsset(assetSpec);
 	if(!artAsset) {
 		return cb(new Error('Asset not found: ' + assetSpec));
diff --git a/core/user_config.js b/core/user_config.js
index f60d2155..6a51a36b 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -164,13 +164,14 @@ exports.getModule = class UserConfigModule extends MenuModule {
 						vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
 					},
 					function prepareAvailableThemes(callback) {
-						self.availThemeInfo = _.sortBy(_.map(theme.getAvailableThemes(), function makeThemeInfo(t, themeId) {
+						self.availThemeInfo = _.sortBy([...theme.getAvailableThemes()].map(entry => {
+							const theme = entry[1];
 							return {
-								themeId		: themeId,
-								name		: t.info.name,
-								author		: t.info.author,
-								desc		: _.isString(t.info.desc) ? t.info.desc : '',
-								group		: _.isString(t.info.group) ? t.info.group : '',
+								themeId		: theme.info.themeId,
+								name		: theme.info.name,
+								author		: theme.info.author,
+								desc		: _.isString(theme.info.desc) ? theme.info.desc : '',
+								group		: _.isString(theme.info.group) ? theme.info.group : '',
 							};
 						}), 'name');
 

From 2f09f3e995a45c409f82e28bf1fb41f71fb0a37f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 Jun 2018 20:00:01 -0600
Subject: [PATCH 0323/1013] Fix a couple rare bugs around SSH sessions

---
 core/bbs.js               |  5 ++++-
 core/servers/login/ssh.js | 14 +++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 883e1a87..a352c555 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -119,7 +119,10 @@ function shutdownSystem() {
 				const activeConnections = ClientConns.getActiveConnections();
 				let i = activeConnections.length;
 				while(i--) {
-					activeConnections[i].term.write('\n\nServer is shutting down NOW! Disconnecting...\n\n');
+					const activeTerm = activeConnections[i].term;
+					if(activeTerm) {
+						activeTerm.write('\n\nServer is shutting down NOW! Disconnecting...\n\n');
+					}
 					ClientConns.removeClient(activeConnections[i]);
 				}
 				callback(null);
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 4ec57d2f..c50a7d70 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -184,7 +184,7 @@ function SSHClient(clientConn) {
 				if(self.input) {	//	do we have I/O?
 					self.updateTermInfo(info);
 				} else {
-					self.cachedPtyInfo = info;
+					self.cachedTermInfo = info;
 				}
 			});
 
@@ -197,9 +197,9 @@ function SSHClient(clientConn) {
 
 				channel.stdin.on('data', self.dataHandler);
 
-				if(self.cachedPtyInfo) {
-					self.updateTermInfo(self.cachedPtyInfo);
-					delete self.cachedPtyInfo;
+				if(self.cachedTermInfo) {
+					self.updateTermInfo(self.cachedTermInfo);
+					delete self.cachedTermInfo;
 				}
 
 				//	we're ready!
@@ -210,7 +210,11 @@ function SSHClient(clientConn) {
 			session.on('window-change', (accept, reject, info) => {
 				self.log.debug(info, 'SSH window-change event');
 
-				self.updateTermInfo(info);
+				if(self.input) {
+					self.updateTermInfo(info);
+				} else {
+					self.cachedTermInfo = info;
+				}
 			});
 
 		});

From 057ba684ea5fdb265b7dc215407bbae92cb1b6d7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Jun 2018 08:41:41 -0600
Subject: [PATCH 0324/1013] Use pre-generated table vs parsing a string

---
 core/crc.js | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/core/crc.js b/core/crc.js
index e4bd8551..d110807b 100644
--- a/core/crc.js
+++ b/core/crc.js
@@ -1,8 +1,45 @@
 /* jslint node: true */
 'use strict';
 
-const CRC32_TABLE = new Int32Array(
-	'00000000 77073096 EE0E612C 990951BA 076DC419 706AF48F E963A535 9E6495A3 0EDB8832 79DCB8A4 E0D5E91E 97D2D988 09B64C2B 7EB17CBD E7B82D07 90BF1D91 1DB71064 6AB020F2 F3B97148 84BE41DE 1ADAD47D 6DDDE4EB F4D4B551 83D385C7 136C9856 646BA8C0 FD62F97A 8A65C9EC 14015C4F 63066CD9 FA0F3D63 8D080DF5 3B6E20C8 4C69105E D56041E4 A2677172 3C03E4D1 4B04D447 D20D85FD A50AB56B 35B5A8FA 42B2986C DBBBC9D6 ACBCF940 32D86CE3 45DF5C75 DCD60DCF ABD13D59 26D930AC 51DE003A C8D75180 BFD06116 21B4F4B5 56B3C423 CFBA9599 B8BDA50F 2802B89E 5F058808 C60CD9B2 B10BE924 2F6F7C87 58684C11 C1611DAB B6662D3D 76DC4190 01DB7106 98D220BC EFD5102A 71B18589 06B6B51F 9FBFE4A5 E8B8D433 7807C9A2 0F00F934 9609A88E E10E9818 7F6A0DBB 086D3D2D 91646C97 E6635C01 6B6B51F4 1C6C6162 856530D8 F262004E 6C0695ED 1B01A57B 8208F4C1 F50FC457 65B0D9C6 12B7E950 8BBEB8EA FCB9887C 62DD1DDF 15DA2D49 8CD37CF3 FBD44C65 4DB26158 3AB551CE A3BC0074 D4BB30E2 4ADFA541 3DD895D7 A4D1C46D D3D6F4FB 4369E96A 346ED9FC AD678846 DA60B8D0 44042D73 33031DE5 AA0A4C5F DD0D7CC9 5005713C 270241AA BE0B1010 C90C2086 5768B525 206F85B3 B966D409 CE61E49F 5EDEF90E 29D9C998 B0D09822 C7D7A8B4 59B33D17 2EB40D81 B7BD5C3B C0BA6CAD EDB88320 9ABFB3B6 03B6E20C 74B1D29A EAD54739 9DD277AF 04DB2615 73DC1683 E3630B12 94643B84 0D6D6A3E 7A6A5AA8 E40ECF0B 9309FF9D 0A00AE27 7D079EB1 F00F9344 8708A3D2 1E01F268 6906C2FE F762575D 806567CB 196C3671 6E6B06E7 FED41B76 89D32BE0 10DA7A5A 67DD4ACC F9B9DF6F 8EBEEFF9 17B7BE43 60B08ED5 D6D6A3E8 A1D1937E 38D8C2C4 4FDFF252 D1BB67F1 A6BC5767 3FB506DD 48B2364B D80D2BDA AF0A1B4C 36034AF6 41047A60 DF60EFC3 A867DF55 316E8EEF 4669BE79 CB61B38C BC66831A 256FD2A0 5268E236 CC0C7795 BB0B4703 220216B9 5505262F C5BA3BBE B2BD0B28 2BB45A92 5CB36A04 C2D7FFA7 B5D0CF31 2CD99E8B 5BDEAE1D 9B64C2B0 EC63F226 756AA39C 026D930A 9C0906A9 EB0E363F 72076785 05005713 95BF4A82 E2B87A14 7BB12BAE 0CB61B38 92D28E9B E5D5BE0D 7CDCEFB7 0BDBDF21 86D3D2D4 F1D4E242 68DDB3F8 1FDA836E 81BE16CD F6B9265B 6FB077E1 18B74777 88085AE6 FF0F6A70 66063BCA 11010B5C 8F659EFF F862AE69 616BFFD3 166CCF45 A00AE278 D70DD2EE 4E048354 3903B3C2 A7672661 D06016F7 4969474D 3E6E77DB AED16A4A D9D65ADC 40DF0B66 37D83BF0 A9BCAE53 DEBB9EC5 47B2CF7F 30B5FFE9 BDBDF21C CABAC28A 53B39330 24B4A3A6 BAD03605 CDD70693 54DE5729 23D967BF B3667A2E C4614AB8 5D681B02 2A6F2B94 B40BBE37 C30C8EA1 5A05DF1B 2D02EF8D'.split(' ').map(s => parseInt(s, 16)));
+const CRC32_TABLE = new Int32Array([
+	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535,
+	0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd,
+	0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
+	0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+	0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+	0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+	0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac,
+	0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+	0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
+	0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+	0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
+	0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
+	0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce,
+	0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+	0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+	0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409,
+	0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739,
+	0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268,
+	0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
+	0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
+	0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+	0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
+	0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
+	0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+	0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae,
+	0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6,
+	0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+	0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
+	0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5,
+	0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+	0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+]);
 
 exports.CRC32 = class CRC32 {
 	constructor() {

From 5f0c9ed1abff8d6ae6f0f024aea0970cadb8ffd0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Jun 2018 08:42:16 -0600
Subject: [PATCH 0325/1013] Fix require paths

---
 core/exodus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/exodus.js b/core/exodus.js
index 8b3c7548..129671cb 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -2,8 +2,8 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../core/menu_module.js').MenuModule;
-const resetScreen			= require('../core/ansi_term.js').resetScreen;
+const MenuModule			= require('./menu_module.js').MenuModule;
+const resetScreen			= require('./ansi_term.js').resetScreen;
 const Config				= require('./config.js').config;
 const Errors				= require('./enig_error.js').Errors;
 const Log					= require('./logger.js').log;

From c9674e68fbb38616f02b453ea267a28b31c641a2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Jun 2018 10:01:08 -0600
Subject: [PATCH 0326/1013] * Re-work menu stack goto() a bit - cleaner,
 support 'mergeFlags', and 'forwardArgs' menuFlags. * Add show_art.js module:
 Advanced ways to show art in menu stacks. For example, by extraArgs, fileBase
 area art, etc -- this will replace e.g. showing message conf art later as to
 be more generic

---
 core/file_base_area_select.js |   2 +-
 core/menu_stack.js            |  27 +++++-
 core/show_art.js              | 170 ++++++++++++++++++++++++++++++++++
 3 files changed, 193 insertions(+), 6 deletions(-)
 create mode 100644 core/show_art.js

diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index df859bea..6c45a5d1 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -33,7 +33,7 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
 					extraArgs	: {
 						filterCriteria	: filterCriteria,
 					},
-					menuFlags	: [ 'popParent' ],
+					menuFlags	: [ 'popParent', 'mergeFlags' ],
 				};
 
 				return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 360c2b38..3775c065 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -97,6 +97,7 @@ module.exports = class MenuStack {
 			options = {};
 		}
 
+		options = options || {};
 		const self = this;
 
 		if(currentModuleInfo && name === currentModuleInfo.name) {
@@ -111,10 +112,12 @@ module.exports = class MenuStack {
 			client		: self.client,
 		};
 
-		if(_.isObject(options)) {
-			loadOpts.extraArgs		= options.extraArgs || _.get(options, 'formData.value');
-			loadOpts.lastMenuResult	= options.lastMenuResult;
+		if(currentModuleInfo && currentModuleInfo.menuFlags.includes('forwardArgs')) {
+			loadOpts.extraArgs = currentModuleInfo.extraArgs;
+		} else {
+			loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
 		}
+		loadOpts.lastMenuResult	= options.lastMenuResult;
 
 		loadMenu(loadOpts, (err, modInst) => {
 			if(err) {
@@ -124,7 +127,21 @@ module.exports = class MenuStack {
 			} else {
 				self.client.log.debug( { menuName : name }, 'Goto menu module');
 
-				const menuFlags = (options && Array.isArray(options.menuFlags)) ? options.menuFlags : modInst.menuConfig.options.menuFlags;
+				//
+				//	If menuFlags were supplied in menu.hjson, they should win over
+				//	anything supplied in code.
+				//
+				let menuFlags;
+				if(0 === modInst.menuConfig.options.menuFlags.length) {
+					menuFlags = Array.isArray(options.menuFlags) ? options.menuFlags : [];
+				} else {
+					menuFlags = modInst.menuConfig.options.menuFlags;
+
+					//	in code we can ask to merge in
+					if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
+						menuFlags = _.uniq(menuFlags.concat(options.menuFlags));
+					}
+				}
 
 				if(currentModuleInfo) {
 					//	save stack state
@@ -149,7 +166,7 @@ module.exports = class MenuStack {
 				});
 
 				//	restore previous state if requested
-				if(options && options.savedState) {
+				if(options.savedState) {
 					modInst.restoreSavedState(options.savedState);
 				}
 
diff --git a/core/show_art.js b/core/show_art.js
new file mode 100644
index 00000000..fbbb3141
--- /dev/null
+++ b/core/show_art.js
@@ -0,0 +1,170 @@
+/* jslint node: true */
+'use strict';
+
+//	ENiGMA½
+const MenuModule	= require('./menu_module.js').MenuModule;
+const Errors		= require('../core/enig_error.js').Errors;
+const ANSI			= require('./ansi_term.js');
+const Config		= require('./config.js').config;
+
+//	deps
+const async			= require('async');
+const _				= require('lodash');
+
+exports.moduleInfo = {
+	name	: 'Show Art',
+	desc	: 'Module for more advanced methods of displaying art',
+	author	: 'NuSkooler',
+};
+
+exports.getModule = class ShowArtModule extends MenuModule {
+	constructor(options) {
+		super(options);
+		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+
+		this.config.method = this.config.method || 'random';
+		this.config.optional = _.get(this.config, 'optional', true);
+	}
+
+	initSequence() {
+		const self = this;
+
+		async.series(
+			[
+				function before(callback) {
+					return self.beforeArt(callback);
+				},
+				function showArt(callback) {
+					//
+					//	How we show art depends on our configuration
+					//
+					let handler = {
+						extraArgs		: self.showByExtraArgs,
+						sequence		: self.showBySequence,
+						random			: self.showByRandom,
+						fileBaseArea	: self.showByFileBaseArea,
+					}[self.config.method] || self.showRandomArt;
+
+					handler = handler.bind(self);
+
+					return handler(callback);
+				}
+			],
+			err => {
+				if(err && !self.config.optional) {
+					self.client.log.warn('Error during init sequence', { error : err.message } );
+					return self.prevMenu( () => { /* dummy */ } );
+				}
+
+				self.finishedLoading();
+				return self.autoNextMenu( () => { /* dummy */ } );
+			}
+		);
+	}
+
+	showByExtraArgs(cb) {
+		this.getArtKeyValue( (err, artSpec) => {
+			if(err) {
+				return cb(err);
+			}
+			const options = {
+				pause 	: this.shouldPause(),
+				desc	: 'extraArgs',
+			};
+			return this.displaySingleArtWithOptions(artSpec, options, cb);
+		});
+	}
+
+	showBySequence(cb) {
+		return cb(null);
+	}
+
+	showByRandom(cb) {
+		return cb(null);
+	}
+
+	showByFileBaseArea(cb) {
+		this.getArtKeyValue( (err, key) => {
+			if(err) {
+				return cb(err);
+			}
+
+			//	further resolve key -> file base area art
+			const artSpec = _.get(Config, [ 'fileBase', 'areas', key, 'art' ]);
+			if(!artSpec) {
+				return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
+			}
+			const options = {
+				pause 	: this.shouldPause(),
+				desc	: 'fileBaseArea',
+			};
+			return this.displaySingleArtWithOptions(artSpec, options, cb);
+		});
+	}
+
+	getArtKeyValue(cb) {
+		const key = this.config.key;
+		if(!_.isString(key)) {
+			return cb(Errors.MissingConfig('Config option "key" is required for method "extraArgs"'));
+		}
+
+		const path = key.split('.');
+		const artKey = _.get(this.config, [ 'extraArgs' ].concat(path) );
+		if(!_.isString(artKey)) {
+			return cb(Errors.MissingParam(`Invalid or missing "extraArgs.${key}" value`));
+		}
+
+		return cb(null, artKey);
+	}
+
+	displaySingleArtWithOptions(artSpec, options, cb) {
+		const self = this;
+		async.waterfall(
+			[
+				function art(callback) {
+					//	:TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
+					self.displayAsset(
+						artSpec,
+						self.menuConfig.options,
+						(err, artData) => {
+							if(err) {
+								return callback(err);
+							}
+							const mciData = { menu : artData.mciMap };
+							return callback(null, mciData);
+						}
+					);
+				},
+				function recordCursorPosition(mciData, callback) {
+					if(!options.pause) {
+						return callback(null, mciData, null);	//	cursor position not needed
+					}
+
+					self.client.once('cursor position report', pos => {
+						const pausePosition = { row : pos[0], col : 1 };
+						return callback(null, mciData, pausePosition);
+					});
+
+					self.client.term.rawWrite(ANSI.queryPos());
+				},
+				function afterArtDisplayed(mciData, pausePosition, callback) {
+					self.mciReady(mciData, err => {
+						return callback(err, pausePosition);
+					});
+				},
+				function displayPauseIfRequested(pausePosition, callback) {
+					if(!options.pause) {
+						return callback(null);
+					}
+					return self.pausePrompt(pausePosition, callback);
+				},
+			],
+			err => {
+				if(err) {
+					self.client.log.warn( { artSpec, error : err.message }, `Failed to display "${options.desc}" art`);
+				}
+				return cb(err);
+			}
+		);
+	}
+};

From f3cd36ad079d0cf10f2a3a89b26e3ea79dff1686 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 Jun 2018 15:14:31 -0600
Subject: [PATCH 0327/1013] Fix oputil hang

---
 core/config.js               |  9 ++++++++-
 core/config_cache.js         | 34 ++++++++++++++++++----------------
 core/oputil/oputil_common.js |  6 ++----
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/core/config.js b/core/config.js
index b11c43e9..d8f1c873 100644
--- a/core/config.js
+++ b/core/config.js
@@ -100,7 +100,14 @@ function init(configPath, options, cb) {
 	};
 
 	const ConfigCache = require('./config_cache.js');
-	ConfigCache.getConfigWithOptions( { filePath : configPath, callback : changed }, (err, config) => {
+	const getConfigOptions = {
+		filePath	: configPath,
+		noWatch		: options.noWatch,
+	};
+	if(!options.noWatch) {
+		getConfigOptions.callback = changed;
+	}
+	ConfigCache.getConfigWithOptions(getConfigOptions, (err, config) => {
 		if(err) {
 			return cb(err);
 		}
diff --git a/core/config_cache.js b/core/config_cache.js
index 8ec7280c..4a1d1c5a 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -19,24 +19,26 @@ module.exports = new class ConfigCache
 		if(options.forceReCache || !cached) {
 			this.recacheConfigFromFile(options.filePath, (err, config) => {
 				if(!err && !cached) {
-					const watcher = sane(
-						paths.dirname(options.filePath),
-						{
-							glob : `**/${paths.basename(options.filePath)}`
-						}
-					);
-
-					watcher.on('change', (fileName, fileRoot) => {
-						require('./logger.js').log.info( { fileName, fileRoot }, 'Configuration file changed; re-caching');
-
-						this.recacheConfigFromFile(paths.join(fileRoot, fileName), err => {
-							if(!err) {
-								if(options.callback) {
-									options.callback( { fileName, fileRoot } );
-								}
+					if(!options.noWatch) {
+						const watcher = sane(
+							paths.dirname(options.filePath),
+							{
+								glob : `**/${paths.basename(options.filePath)}`
 							}
+						);
+
+						watcher.on('change', (fileName, fileRoot) => {
+							require('./logger.js').log.info( { fileName, fileRoot }, 'Configuration file changed; re-caching');
+
+							this.recacheConfigFromFile(paths.join(fileRoot, fileName), err => {
+								if(!err) {
+									if(options.callback) {
+										options.callback( { fileName, fileRoot } );
+									}
+								}
+							});
 						});
-					});
+					}
 				}
 				return cb(err, config, true);
 			});
diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index d03bb82f..18546c98 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -2,8 +2,6 @@
 /* eslint-disable no-console */
 'use strict';
 
-const resolvePath		= require('../misc_util.js').resolvePath;
-
 const config			= require('../../core/config.js');
 const db				= require('../../core/database.js');
 
@@ -46,7 +44,7 @@ function printUsageAndSetExitCode(errMsg, exitCode) {
 }
 
 function getDefaultConfigPath() {
-    return './config/';
+	return './config/';
 }
 
 function getConfigPath() {
@@ -57,7 +55,7 @@ function getConfigPath() {
 function initConfig(cb) {
 	const configPath = getConfigPath();
 
-	config.init(configPath, { keepWsc : true }, cb);
+	config.init(configPath, { keepWsc : true, noWatch : true }, cb);
 }
 
 function initConfigAndDatabases(cb) {

From 681e45cb6d1b5a573a06ff934d0f077c11574350 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 Jun 2018 20:39:43 -0600
Subject: [PATCH 0328/1013] Much faster hash calculation / processing &
 therefor faster scanFile() * Manaul read of buffers vs stream
 (fs.createReadStream()) * Small optimization by skipping work if no progress
 iterator * Don't use async loop for updating hashes - vanilla for loop

---
 core/file_base_area.js | 246 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 222 insertions(+), 24 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 9cfb1cb9..0c065357 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -630,23 +630,224 @@ function scanFile(filePath, options, iterator, cb) {
 		fileName	: paths.basename(filePath),
 	};
 
-	function callIter(next) {
-		if(iterator) {
-			return iterator(stepInfo, next);
-		} else {
-			return next(null);
-		}
-	}
+	const callIter = (next) => {
+		return iterator ? iterator(stepInfo, next) : next(null);
+	};
 
-	function readErrorCallIter(origError, next) {
+	const readErrorCallIter = (origError, next) => {
 		stepInfo.step	= 'read_error';
 		stepInfo.error	= origError.message;
 
 		callIter( () => {
 			return next(origError);
 		});
+	};
+
+	let lastCalcHashPercent;
+
+	//	don't re-calc hashes for any we already have in |options|
+	const hashesToCalc = HASH_NAMES.filter(hn =>  {
+		if('sha256' === hn && fileEntry.fileSha256) {
+			return false;
+		}
+
+		if(`file_${hn}` in fileEntry.meta) {
+			return false;
+		}
+
+		return true;
+	});
+
+	async.waterfall(
+		[
+			function startScan(callback) {
+				fs.stat(filePath, (err, stats) => {
+					if(err) {
+						return readErrorCallIter(err, callback);
+					}
+
+					stepInfo.step		= 'start';
+					stepInfo.byteSize	= fileEntry.meta.byte_size = stats.size;
+
+					return callIter(callback);
+				});
+			},
+			function processPhysicalFileGeneric(callback) {
+				stepInfo.bytesProcessed = 0;
+
+				const hashes = {};
+				hashesToCalc.forEach(hashName => {
+					if('crc32' === hashName) {
+						hashes.crc32 = new CRC32;
+					} else {
+						hashes[hashName] = crypto.createHash(hashName);
+					}
+				});
+
+				const updateHashes = (data) => {
+					for(let i = 0; i < hashesToCalc.length; ++i) {
+						hashes[hashesToCalc[i]].update(data);
+					}
+				};
+
+				//
+				//	Note that we are not using fs.createReadStream() here:
+				//	While convenient, it is quite a bit slower -- which adds
+				//	up to many seconds in time for larger files.
+				//
+				const chunkSize = 1024 * 64;
+				const buffer = new Buffer(chunkSize);
+
+				fs.open(filePath, 'r', (err, fd) => {
+					if(err) {
+						return readErrorCallIter(err, callback);
+					}
+
+					const nextChunk = () => {
+						fs.read(fd, buffer, 0, chunkSize, null, (err, bytesRead) => {
+							if(err) {
+								fs.close(fd);
+								return readErrorCallIter(err, callback);
+							}
+
+							if(0 === bytesRead) {
+								//	done - finalize
+								fileEntry.meta.byte_size = stepInfo.bytesProcessed;
+
+								for(let i = 0; i < hashesToCalc.length; ++i) {
+									const hashName = hashesToCalc[i];
+									if('sha256' === hashName) {
+										stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
+									} else if('sha1' === hashName || 'md5' === hashName) {
+										stepInfo[hashName] = fileEntry.meta[`file_${hashName}`] = hashes[hashName].digest('hex');
+									} else if('crc32' === hashName) {
+										stepInfo.crc32 = fileEntry.meta.file_crc32 = hashes.crc32.finalize().toString(16);
+									}
+								}
+
+								stepInfo.step = 'hash_finish';
+								fs.close(fd);
+								return callIter(callback);
+							}
+
+							stepInfo.bytesProcessed		+= bytesRead;
+							stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
+
+							//
+							//	Only send 'hash_update' step update if we have a noticable percentage change in progress
+							//
+							const data = bytesRead < chunkSize ? buffer.slice(0, bytesRead) : buffer;
+							if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
+								updateHashes(data);
+								return nextChunk();
+							} else {
+								lastCalcHashPercent = stepInfo.calcHashPercent;
+								stepInfo.step		= 'hash_update';
+
+								callIter(err => {
+									if(err) {
+										return callback(err);
+									}
+
+									updateHashes(data);
+									return nextChunk();
+								});
+							}
+						});
+					};
+
+					nextChunk();
+				});
+			},
+			function processPhysicalFileByType(callback) {
+				const archiveUtil = ArchiveUtil.getInstance();
+
+				archiveUtil.detectType(filePath, (err, archiveType) => {
+					if(archiveType) {
+						//	save this off
+						fileEntry.meta.archive_type = archiveType;
+
+						populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
+							if(err) {
+								populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
+									if(err) {
+										logDebug( { error : err.message }, 'Non-archive file entry population failed');
+									}
+									return callback(null);	//	ignore err
+								});
+							} else {
+								return callback(null);
+							}
+						});
+					} else {
+						populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
+							if(err) {
+								logDebug( { error : err.message }, 'Non-archive file entry population failed');
+							}
+							return callback(null);	//	ignore err
+						});
+					}
+				});
+			},
+			function fetchExistingEntry(callback) {
+				getExistingFileEntriesBySha256(fileEntry.fileSha256, (err, dupeEntries) => {
+					return callback(err, dupeEntries);
+				});
+			},
+			function finished(dupeEntries, callback) {
+				stepInfo.step = 'finished';
+				callIter( () => {
+					return callback(null, dupeEntries);
+				});
+			}
+		],
+		(err, dupeEntries) => {
+			if(err) {
+				return cb(err);
+			}
+
+			return cb(null, fileEntry, dupeEntries);
+		}
+	);
+}
+
+function scanFile2(filePath, options, iterator, cb) {
+
+	if(3 === arguments.length && _.isFunction(iterator)) {
+		cb			= iterator;
+		iterator	= null;
+	} else if(2 === arguments.length && _.isFunction(options)) {
+		cb			= options;
+		iterator	= null;
+		options		= {};
 	}
 
+	const fileEntry = new FileEntry({
+		areaTag		: options.areaTag,
+		meta		: options.meta,
+		hashTags	: options.hashTags,	//	Set() or Array
+		fileName	: paths.basename(filePath),
+		storageTag	: options.storageTag,
+		fileSha256	: options.sha256,	//	caller may know this already
+	});
+
+	const stepInfo = {
+		filePath	: filePath,
+		fileName	: paths.basename(filePath),
+	};
+
+	const callIter = (next) => {
+		return iterator ? iterator(stepInfo, next) : next(null);
+	};
+
+	const readErrorCallIter = (origError, next) => {
+		stepInfo.step	= 'read_error';
+		stepInfo.error	= origError.message;
+
+		callIter( () => {
+			return next(origError);
+		});
+	};
 
 	let lastCalcHashPercent;
 
@@ -691,17 +892,15 @@ function scanFile(filePath, options, iterator, cb) {
 
 				const stream = fs.createReadStream(filePath);
 
-				function updateHashes(data) {
-					async.each(hashesToCalc, (hashName, nextHash) => {
-						hashes[hashName].update(data);
-						return nextHash(null);
-					}, () => {
-						return stream.resume();
-					});
-				}
+				const updateHashes = (data) => {
+					for(let i = 0; i < hashesToCalc.length; ++i) {
+						hashes[hashesToCalc[i]].update(data);
+					}
+					return stream.resume();
+				};
 
 				stream.on('data', data => {
-					stream.pause();	//	until iterator compeltes
+					stream.pause();	//	until iterator completes
 
 					stepInfo.bytesProcessed		+= data.length;
 					stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
@@ -709,7 +908,7 @@ function scanFile(filePath, options, iterator, cb) {
 					//
 					//	Only send 'hash_update' step update if we have a noticable percentage change in progress
 					//
-					if(stepInfo.calcHashPercent === lastCalcHashPercent) {
+					if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
 						updateHashes(data);
 					} else {
 						lastCalcHashPercent = stepInfo.calcHashPercent;
@@ -729,7 +928,8 @@ function scanFile(filePath, options, iterator, cb) {
 				stream.on('end', () => {
 					fileEntry.meta.byte_size = stepInfo.bytesProcessed;
 
-					async.each(hashesToCalc, (hashName, nextHash) => {
+					for(let i = 0; i < hashesToCalc.length; ++i) {
+						const hashName = hashesToCalc[i];
 						if('sha256' === hashName) {
 							stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
 						} else if('sha1' === hashName || 'md5' === hashName) {
@@ -737,12 +937,10 @@ function scanFile(filePath, options, iterator, cb) {
 						} else if('crc32' === hashName) {
 							stepInfo.crc32 = fileEntry.meta.file_crc32 = hashes.crc32.finalize().toString(16);
 						}
+					}
 
-						return nextHash(null);
-					}, () => {
-						stepInfo.step = 'hash_finish';
-						return callIter(callback);
-					});
+					stepInfo.step = 'hash_finish';
+					return callIter(callback);
 				});
 
 				stream.on('error', err => {

From 4074d6852644def770ea6d65e4981e7f6f808289 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 Jun 2018 20:42:42 -0600
Subject: [PATCH 0329/1013] #195: Finish scanFile() & hash updates: Clean up
 code

---
 core/file_base_area.js | 188 -----------------------------------------
 1 file changed, 188 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 0c065357..3e0f9ff2 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -811,194 +811,6 @@ function scanFile(filePath, options, iterator, cb) {
 	);
 }
 
-function scanFile2(filePath, options, iterator, cb) {
-
-	if(3 === arguments.length && _.isFunction(iterator)) {
-		cb			= iterator;
-		iterator	= null;
-	} else if(2 === arguments.length && _.isFunction(options)) {
-		cb			= options;
-		iterator	= null;
-		options		= {};
-	}
-
-	const fileEntry = new FileEntry({
-		areaTag		: options.areaTag,
-		meta		: options.meta,
-		hashTags	: options.hashTags,	//	Set() or Array
-		fileName	: paths.basename(filePath),
-		storageTag	: options.storageTag,
-		fileSha256	: options.sha256,	//	caller may know this already
-	});
-
-	const stepInfo = {
-		filePath	: filePath,
-		fileName	: paths.basename(filePath),
-	};
-
-	const callIter = (next) => {
-		return iterator ? iterator(stepInfo, next) : next(null);
-	};
-
-	const readErrorCallIter = (origError, next) => {
-		stepInfo.step	= 'read_error';
-		stepInfo.error	= origError.message;
-
-		callIter( () => {
-			return next(origError);
-		});
-	};
-
-	let lastCalcHashPercent;
-
-	//	don't re-calc hashes for any we already have in |options|
-	const hashesToCalc = HASH_NAMES.filter(hn =>  {
-		if('sha256' === hn && fileEntry.fileSha256) {
-			return false;
-		}
-
-		if(`file_${hn}` in fileEntry.meta) {
-			return false;
-		}
-
-		return true;
-	});
-
-	async.waterfall(
-		[
-			function startScan(callback) {
-				fs.stat(filePath, (err, stats) => {
-					if(err) {
-						return readErrorCallIter(err, callback);
-					}
-
-					stepInfo.step		= 'start';
-					stepInfo.byteSize	= fileEntry.meta.byte_size = stats.size;
-
-					return callIter(callback);
-				});
-			},
-			function processPhysicalFileGeneric(callback) {
-				stepInfo.bytesProcessed = 0;
-
-				const hashes = {};
-				hashesToCalc.forEach(hashName => {
-					if('crc32' === hashName) {
-						hashes.crc32 = new CRC32;
-					} else {
-						hashes[hashName] = crypto.createHash(hashName);
-					}
-				});
-
-				const stream = fs.createReadStream(filePath);
-
-				const updateHashes = (data) => {
-					for(let i = 0; i < hashesToCalc.length; ++i) {
-						hashes[hashesToCalc[i]].update(data);
-					}
-					return stream.resume();
-				};
-
-				stream.on('data', data => {
-					stream.pause();	//	until iterator completes
-
-					stepInfo.bytesProcessed		+= data.length;
-					stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
-
-					//
-					//	Only send 'hash_update' step update if we have a noticable percentage change in progress
-					//
-					if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
-						updateHashes(data);
-					} else {
-						lastCalcHashPercent = stepInfo.calcHashPercent;
-						stepInfo.step		= 'hash_update';
-
-						callIter(err => {
-							if(err) {
-								stream.destroy();	//	cancel read
-								return callback(err);
-							}
-
-							updateHashes(data);
-						});
-					}
-				});
-
-				stream.on('end', () => {
-					fileEntry.meta.byte_size = stepInfo.bytesProcessed;
-
-					for(let i = 0; i < hashesToCalc.length; ++i) {
-						const hashName = hashesToCalc[i];
-						if('sha256' === hashName) {
-							stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
-						} else if('sha1' === hashName || 'md5' === hashName) {
-							stepInfo[hashName] = fileEntry.meta[`file_${hashName}`] = hashes[hashName].digest('hex');
-						} else if('crc32' === hashName) {
-							stepInfo.crc32 = fileEntry.meta.file_crc32 = hashes.crc32.finalize().toString(16);
-						}
-					}
-
-					stepInfo.step = 'hash_finish';
-					return callIter(callback);
-				});
-
-				stream.on('error', err => {
-					return readErrorCallIter(err, callback);
-				});
-			},
-			function processPhysicalFileByType(callback) {
-				const archiveUtil = ArchiveUtil.getInstance();
-
-				archiveUtil.detectType(filePath, (err, archiveType) => {
-					if(archiveType) {
-						//	save this off
-						fileEntry.meta.archive_type = archiveType;
-
-						populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
-							if(err) {
-								populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-									if(err) {
-										logDebug( { error : err.message }, 'Non-archive file entry population failed');
-									}
-									return callback(null);	//	ignore err
-								});
-							} else {
-								return callback(null);
-							}
-						});
-					} else {
-						populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-							if(err) {
-								logDebug( { error : err.message }, 'Non-archive file entry population failed');
-							}
-							return callback(null);	//	ignore err
-						});
-					}
-				});
-			},
-			function fetchExistingEntry(callback) {
-				getExistingFileEntriesBySha256(fileEntry.fileSha256, (err, dupeEntries) => {
-					return callback(err, dupeEntries);
-				});
-			},
-			function finished(dupeEntries, callback) {
-				stepInfo.step = 'finished';
-				callIter( () => {
-					return callback(null, dupeEntries);
-				});
-			}
-		],
-		(err, dupeEntries) => {
-			if(err) {
-				return cb(err);
-			}
-
-			return cb(null, fileEntry, dupeEntries);
-		}
-	);
-}
-
 function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
 	if(3 === arguments.length && _.isFunction(iterator)) {
 		cb			= iterator;

From ca0149eaf02d268a93892b58881fd230ef9638f8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Jun 2018 20:17:56 -0600
Subject: [PATCH 0330/1013] Fix rare race crash in CombatNet module

---
 core/combatnet.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/combatnet.js b/core/combatnet.js
index 217e6d17..8fb92de1 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -45,7 +45,9 @@ exports.getModule = class CombatNetModule extends MenuModule {
 					self.client.term.write('Connecting to CombatNet, please wait...\n');
 
 					const restorePipeToNormal = function() {
-						self.client.term.output.removeListener('data', sendToRloginBuffer);
+						if(self.client.term.output) {
+							self.client.term.output.removeListener('data', sendToRloginBuffer);
+						}
 					};
 
 					const rlogin = new RLogin(

From 1fe46894d36a7bb2c7d45d1cf39847277b6ca6bf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 Jun 2018 19:57:06 -0600
Subject: [PATCH 0331/1013] More Hot-Reload related changes * Config.get():
 Returns the latest config * Update code all over the place to use
 Config.get() vs Config.conf (which will be deprecated)

---
 WHATSNEW.md                            |  3 +-
 core/archive_util.js                   | 22 ++++----
 core/art.js                            |  4 +-
 core/asset.js                          |  4 +-
 core/client.js                         |  8 +--
 core/config.js                         | 10 ++--
 core/config_util.js                    | 13 ++---
 core/dropfile.js                       |  8 +--
 core/email.js                          |  9 ++--
 core/enigma_assert.js                  |  4 +-
 core/event_scheduler.js                |  7 +--
 core/exodus.js                         |  4 +-
 core/file_area_list.js                 |  7 ++-
 core/file_area_web.js                  | 10 ++--
 core/file_base_area.js                 | 43 ++++++++--------
 core/file_base_list_export.js          |  8 +--
 core/file_base_web_download_manager.js |  7 +--
 core/file_entry.js                     |  7 +--
 core/file_transfer.js                  |  9 ++--
 core/file_transfer_protocol_select.js  |  4 +-
 core/fse.js                            |  4 +-
 core/ftn_util.js                       | 24 ++++-----
 core/logger.js                         |  2 +-
 core/menu_module.js                    |  4 +-
 core/menu_util.js                      |  8 +--
 core/message_area.js                   | 32 +++++++-----
 core/module_util.js                    | 15 +++---
 core/nua.js                            |  9 ++--
 core/oputil/oputil_config.js           | 14 ++---
 core/oputil/oputil_file_base.js        |  4 +-
 core/predefined_mci.js                 |  4 +-
 core/scanner_tossers/ftn_bso.js        | 71 ++++++++++++++------------
 core/servers/content/gopher.js         | 30 ++++++-----
 core/servers/content/web.js            | 44 ++++++++--------
 core/servers/login/ssh.js              | 27 +++++-----
 core/servers/login/telnet.js           | 11 ++--
 core/servers/login/websocket.js        |  8 +--
 core/show_art.js                       |  4 +-
 core/system_view_validate.js           | 16 +++---
 core/theme.js                          | 43 ++++++++--------
 core/user.js                           | 11 ++--
 core/web_password_reset.js             | 17 +++---
 42 files changed, 320 insertions(+), 273 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 99c47786..27f9380d 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -10,7 +10,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
   * Setting the `data` member of an object will cause form submissions to use this value instead of the selected items index.
   * See the default `luciano_blocktronics` `matrix` menu for example usage.
 * You can now set the `sort` property on a menu to sort items. If `true` items are sorted by `text`. If the value is a string, it represents the key in menu objects to sort by.
-
+* Hot-reload of configuration files such as menu.hjson, config.hjson, your themes.hjson, etc.: When a file is saved, it will be hot-reloaded into the running system
+  * Note that any custom modules should make use of the new Config.get() method.
 
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.
diff --git a/core/archive_util.js b/core/archive_util.js
index 71bad641..e4604b62 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const stringFormat		= require('./string_format.js');
 const Errors			= require('./enig_error.js').Errors;
 const resolveMimeType	= require('./mime_util.js').resolveMimeType;
@@ -61,10 +61,11 @@ module.exports = class ArchiveUtil {
 		//
 		//	Load configuration
 		//
-		if(_.has(Config, 'archives.archivers')) {
-			Object.keys(Config.archives.archivers).forEach(archKey => {
+		const config = Config();
+		if(_.has(config, 'archives.archivers')) {
+			Object.keys(config.archives.archivers).forEach(archKey => {
 
-				const archConfig 	= Config.archives.archivers[archKey];
+				const archConfig 	= config.archives.archivers[archKey];
 				const archiver		= new Archiver(archConfig);
 
 				if(!archiver.ok()) {
@@ -75,7 +76,7 @@ module.exports = class ArchiveUtil {
 			});
 		}
 
-		if(_.isObject(Config.fileTypes)) {
+		if(_.isObject(config.fileTypes)) {
 			const updateSig = (ft) => {
 				ft.sig 		= Buffer.from(ft.sig, 'hex');
 				ft.offset	= ft.offset || 0;
@@ -87,8 +88,8 @@ module.exports = class ArchiveUtil {
 				}
 			};
 
-			Object.keys(Config.fileTypes).forEach(mimeType => {
-				const fileType = Config.fileTypes[mimeType];
+			Object.keys(config.fileTypes).forEach(mimeType => {
+				const fileType = config.fileTypes[mimeType];
 				if(Array.isArray(fileType)) {
 					fileType.forEach(ft => {
 						if(ft.sig) {
@@ -109,7 +110,8 @@ module.exports = class ArchiveUtil {
 			return;
 		}
 
-		let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+		const config = Config();
+		let fileType = _.get(config, [ 'fileTypes', mimeType ] );
 
 		if(Array.isArray(fileType)) {
 			if(!justExtention) {
@@ -125,7 +127,7 @@ module.exports = class ArchiveUtil {
 		}
 
 		if(fileType.archiveHandler) {
-			return _.get( Config, [ 'archives', 'archivers', fileType.archiveHandler ] );
+			return _.get( config, [ 'archives', 'archivers', fileType.archiveHandler ] );
 		}
 	}
 
@@ -151,7 +153,7 @@ module.exports = class ArchiveUtil {
 					return cb(err);
 				}
 
-				const archFormat = _.findKey(Config.fileTypes, fileTypeInfo => {
+				const archFormat = _.findKey(Config().fileTypes, fileTypeInfo => {
 					const fileTypeInfos = Array.isArray(fileTypeInfo) ? fileTypeInfo : [ fileTypeInfo ];
 					return fileTypeInfos.find(fti => {
 						if(!fti.sig || !fti.archiveHandler) {
diff --git a/core/art.js b/core/art.js
index 9234542d..dc873836 100644
--- a/core/art.js
+++ b/core/art.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config	= require('./config.js').config;
+const Config	= require('./config.js').get;
 const miscUtil	= require('./misc_util.js');
 const ansi		= require('./ansi_term.js');
 const aep		= require('./ansi_escape_parser.js');
@@ -126,7 +126,7 @@ function getArtFromPath(path, options, cb) {
 function getArt(name, options, cb) {
 	const ext = paths.extname(name);
 
-	options.basePath	= miscUtil.valueWithDefault(options.basePath, Config.paths.art);
+	options.basePath	= miscUtil.valueWithDefault(options.basePath, Config().paths.art);
 	options.asAnsi		= miscUtil.valueWithDefault(options.asAnsi, true);
 
 	//	:TODO: make use of asAnsi option and convert from supported -> ansi
diff --git a/core/asset.js b/core/asset.js
index 3f44a604..43c881c0 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config	= require('./config.js').config;
+const Config	= require('./config.js').get;
 const StatLog	= require('./stat_log.js');
 
 //	deps
@@ -95,7 +95,7 @@ function resolveConfigAsset(spec) {
 		assert('config' === asset.type);
 
 		const path	= asset.asset.split('.');
-		let conf	= Config;
+		let conf	= Config();
 		for(let i = 0; i < path.length; ++i) {
 			if(_.isUndefined(conf[path[i]])) {
 				return spec;
diff --git a/core/client.js b/core/client.js
index d3692cd5..10409c70 100644
--- a/core/client.js
+++ b/core/client.js
@@ -35,7 +35,7 @@
 const term		= require('./client_term.js');
 const ansi		= require('./ansi_term.js');
 const User		= require('./user.js');
-const Config	= require('./config.js').config;
+const Config	= require('./config.js').get;
 const MenuStack	= require('./menu_stack.js');
 const ACS		= require('./acs.js');
 const Events	= require('./events.js');
@@ -400,7 +400,7 @@ function Client(/*input, output*/) {
 			}
 
 			if(key || ch) {
-				if(Config.logging.traceUserKeyboardInput) {
+				if(Config().logging.traceUserKeyboardInput) {
 					self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input');	// jshint ignore:line
 				}
 
@@ -440,8 +440,8 @@ Client.prototype.startIdleMonitor = function() {
 		const nowMs	= Date.now();
 
 		const idleLogoutSeconds = this.user.isAuthenticated() ?
-			Config.misc.idleLogoutSeconds :
-			Config.misc.preAuthIdleLogoutSeconds;
+			Config().misc.idleLogoutSeconds :
+			Config().misc.preAuthIdleLogoutSeconds;
 
 		if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
 			this.emit('idle timeout');
diff --git a/core/config.js b/core/config.js
index d8f1c873..38962b1f 100644
--- a/core/config.js
+++ b/core/config.js
@@ -13,6 +13,8 @@ const assert			= require('assert');
 exports.init			= init;
 exports.getDefaultPath	= getDefaultPath;
 
+let currentConfiguration = {};
+
 function hasMessageConferenceAndArea(config) {
 	assert(_.isObject(config.messageConferences));  //  we create one ourself!
 
@@ -67,12 +69,10 @@ function mergeValidateAndFinalize(config, cb) {
 				return callback(null, mergedConfig);
 			},
 			function setIt(mergedConfig, callback) {
-				exports.config = mergedConfig;
-
-				exports.config.get = (path) => {
-					return _.get(exports.config, path);
-				};
+				//	:TODO: .config property is to be deprecated once conversions are done
+				exports.config = currentConfiguration = mergedConfig;
 
+				exports.get = () => currentConfiguration;
 				return callback(null);
 			}
 		],
diff --git a/core/config_util.js b/core/config_util.js
index 94ce4344..4b7ce5ed 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const ConfigCache		= require('./config_cache.js');
 const Events			= require('./events.js');
 
@@ -15,7 +15,7 @@ exports.getFullConfig	= getFullConfig;
 function getConfigPath(filePath) {
 	//	|filePath| is assumed to be in the config path if it's only a file name
 	if('.' === paths.dirname(filePath)) {
-		filePath = paths.join(Config.paths.config, filePath);
+		filePath = paths.join(Config().paths.config, filePath);
 	}
 	return filePath;
 }
@@ -24,19 +24,20 @@ function init(cb) {
 	//	pre-cache menu.hjson and prompt.hjson + establish events
 	const changed = ( { fileName, fileRoot } ) => {
 		const reCachedPath = paths.join(fileRoot, fileName);
-		if(reCachedPath === getConfigPath(Config.general.menuFile)) {
+		if(reCachedPath === getConfigPath(Config().general.menuFile)) {
 			Events.emit(Events.getSystemEvents().MenusChanged);
-		} else if(reCachedPath === getConfigPath(Config.general.promptFile)) {
+		} else if(reCachedPath === getConfigPath(Config().general.promptFile)) {
 			Events.emit(Events.getSystemEvents().PromptsChanged);
 		}
 	};
 
+	const config = Config();
 	async.series(
 		[
 			function menu(callback) {
 				return ConfigCache.getConfigWithOptions(
 					{
-						filePath : getConfigPath(Config.general.menuFile),
+						filePath : getConfigPath(config.general.menuFile),
 						callback : changed,
 					},
 					callback
@@ -45,7 +46,7 @@ function init(cb) {
 			function prompt(callback) {
 				return ConfigCache.getConfigWithOptions(
 					{
-						filePath : getConfigPath(Config.general.promptFile),
+						filePath : getConfigPath(config.general.promptFile),
 						callback : changed,
 					},
 					callback
diff --git a/core/dropfile.js b/core/dropfile.js
index 20c027e3..bdb3f3d1 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-var Config			= require('./config.js').config;
+var Config			= require('./config.js').get;
 const StatLog		= require('./stat_log.js');
 
 var fs				= require('graceful-fs');
@@ -29,7 +29,7 @@ function DropFile(client, fileType) {
 
 	Object.defineProperty(this, 'fullPath', {
 		get : function() {
-			return paths.join(Config.paths.dropFiles, ('node' + self.client.node), self.fileName);
+			return paths.join(Config().paths.dropFiles, ('node' + self.client.node), self.fileName);
 		}
 	});
 
@@ -157,7 +157,7 @@ function DropFile(client, fileType) {
 			//	:TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
 			'-1',	//	self.client.output._handle.fd.toString(),	//	:TODO: ALWAYS -1 on Windows!
 			'57600',
-			Config.general.boardName,
+			Config().general.boardName,
 			self.client.user.userId.toString(),
 			self.client.user.properties.real_name || self.client.user.username,
 			self.client.user.username,
@@ -183,7 +183,7 @@ function DropFile(client, fileType) {
 		var secLevel	= self.client.user.getLegacySecurityLevel().toString();
 
 		return iconv.encode( [
-			Config.general.boardName,							//	"The name of the system."
+			Config().general.boardName,							//	"The name of the system."
 			opUn,												//	"The sysop's name up to the first space."
 			opUn,												//	"The sysop's name following the first space."
 			'COM1',												//	"The serial port the modem is connected to, or 0 if logged in on console."
diff --git a/core/email.js b/core/email.js
index 0daf06b2..5cc66836 100644
--- a/core/email.js
+++ b/core/email.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const Errors				= require('./enig_error.js').Errors;
 const Log					= require('./logger.js').log;
 
@@ -13,13 +13,14 @@ const nodeMailer			= require('nodemailer');
 exports.sendMail			= sendMail;
 
 function sendMail(message, cb) {
-	if(!_.has(Config, 'email.transport')) {
+	const config = Config();
+	if(!_.has(config, 'email.transport')) {
 		return cb(Errors.MissingConfig('Email "email::transport" configuration missing'));
 	}
 
-	message.from = message.from || Config.email.defaultFrom;
+	message.from = message.from || config.email.defaultFrom;
 
-	const transportOptions = Object.assign( {}, Config.email.transport, {
+	const transportOptions = Object.assign( {}, config.email.transport, {
 		logger	: Log,
 	});
 
diff --git a/core/enigma_assert.js b/core/enigma_assert.js
index 9217ea49..2b72227a 100644
--- a/core/enigma_assert.js
+++ b/core/enigma_assert.js
@@ -2,14 +2,14 @@
 'use strict';
 
 //	ENiGMA½
-const Config	= require('./config.js').config;
+const Config	= require('./config.js').get;
 const Log		= require('./logger.js').log;
 
 //	deps
 const assert	= require('assert');
 
 module.exports = function(condition, message) {
-	if(Config.debug.assertsEnabled) {
+	if(Config().debug.assertsEnabled) {
 		assert.apply(this, arguments);
 	} else if(!(condition)) {
 		const stack = new Error().stack;
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 10c59f72..e425d3bd 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -3,7 +3,7 @@
 
 //	ENiGMA½
 const PluginModule			= require('./plugin_module.js').PluginModule;
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const Log					= require('./logger.js').log;
 
 const _						= require('lodash');
@@ -155,8 +155,9 @@ class ScheduledEvent {
 function EventSchedulerModule(options) {
 	PluginModule.call(this, options);
 
-	if(_.has(Config, 'eventScheduler')) {
-		this.moduleConfig = Config.eventScheduler;
+	const config = Config();
+	if(_.has(config, 'eventScheduler')) {
+		this.moduleConfig = config.eventScheduler;
 	}
 
 	const self = this;
diff --git a/core/exodus.js b/core/exodus.js
index 129671cb..409b5f2a 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 const MenuModule			= require('./menu_module.js').MenuModule;
 const resetScreen			= require('./ansi_term.js').resetScreen;
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const Errors				= require('./enig_error.js').Errors;
 const Log					= require('./logger.js').log;
 const getEnigmaUserAgent	= require('./misc_util.js').getEnigmaUserAgent;
@@ -66,7 +66,7 @@ exports.getModule = class ExodusModule extends MenuModule {
 		this.config.sshHost				= this.config.sshHost || this.config.ticketHost;
 		this.config.sshPort				= this.config.sshPort || 22;
 		this.config.sshUser				= this.config.sshUser || 'exodus_server';
-		this.config.sshKeyPem			= this.config.sshKeyPem || joinPath(Config.paths.misc, 'exodus.id_rsa');
+		this.config.sshKeyPem			= this.config.sshKeyPem || joinPath(Config().paths.misc, 'exodus.id_rsa');
 	}
 
 	initSequence() {
diff --git a/core/file_area_list.js b/core/file_area_list.js
index b3d55e2c..ae03ee11 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -12,7 +12,7 @@ const FileArea				= require('./file_base_area.js');
 const Errors				= require('./enig_error.js').Errors;
 const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
 const ArchiveUtil			= require('./archive_util.js');
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const DownloadQueue			= require('./download_queue.js');
 const FileAreaWeb			= require('./file_area_web.js');
 const FileBaseFilters		= require('./file_base_filter.js');
@@ -255,7 +255,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 			const mimeType = resolveMimeType(entryInfo.archiveType);
 			let desc;
 			if(mimeType) {
-				let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+				let fileType = _.get(Config(), [ 'fileTypes', mimeType ] );
 
 				if(Array.isArray(fileType)) {
 					//	further refine by extention
@@ -264,7 +264,6 @@ exports.getModule = class FileAreaList extends MenuModule {
 				desc = fileType && fileType.desc;
 			}
 			entryInfo.archiveTypeDesc = desc || mimeType || entryInfo.archiveType;
-			//entryInfo.archiveTypeDesc = mimeType ? _.get(Config, [ 'fileTypes', mimeType, 'desc' ] ) || mimeType : entryInfo.archiveType;
 		} else {
 			entryInfo.archiveTypeDesc = 'N/A';
 		}
@@ -510,7 +509,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 						return callback(null);
 					}
 
-					const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
+					const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
 
 					FileAreaWeb.createAndServeTempDownload(
 						self.client,
diff --git a/core/file_area_web.js b/core/file_area_web.js
index 928be942..94a2a664 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const FileDb				= require('./database.js').dbs.file;
 const getISOTimestampString	= require('./database.js').getISOTimestampString;
 const FileEntry				= require('./file_entry.js');
@@ -31,7 +31,7 @@ function notEnabledError() {
 
 class FileAreaWebAccess {
 	constructor() {
-		this.hashids		= new hashids(Config.general.boardName);
+		this.hashids		= new hashids(Config().general.boardName);
 		this.expireTimers	= {};	//	hashId->timer
 	}
 
@@ -52,7 +52,7 @@ class FileAreaWebAccess {
 					if(self.isEnabled()) {
 						const routeAdded = self.webServer.instance.addRoute({
 							method	: 'GET',
-							path	: Config.fileBase.web.routePath,
+							path	: Config().fileBase.web.routePath,
 							handler	: self.routeWebRequest.bind(self),
 						});
 						return callback(routeAdded ? null : Errors.General('Failed adding route'));
@@ -184,11 +184,11 @@ class FileAreaWebAccess {
 	buildSingleFileTempDownloadLink(client, fileEntry, hashId) {
 		hashId = hashId || this.getSingleFileHashId(client, fileEntry);
 
-		return this.webServer.instance.buildUrl(`${Config.fileBase.web.path}${hashId}`);
+		return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
 	}
 
 	buildBatchArchiveTempDownloadLink(client, hashId) {
-		return this.webServer.instance.buildUrl(`${Config.fileBase.web.path}${hashId}`);
+		return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
 	}
 
 	getExistingTempDownloadServeItem(client, fileEntry, cb) {
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 3e0f9ff2..6400ed6f 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const Errors			= require('./enig_error.js').Errors;
 const sortAreasOrConfs	= require('./conf_area_util.js').sortAreasOrConfs;
 const FileEntry			= require('./file_entry.js');
@@ -66,7 +66,7 @@ function getAvailableFileAreas(client, options) {
 	options = options || { };
 
 	//	perform ACS check per conf & omit internal if desired
-	const allAreas = _.map(Config.fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
+	const allAreas = _.map(Config().fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
 
 	return _.omitBy(allAreas, areaInfo => {
 		if(!options.includeSystemInternal && isInternalArea(areaInfo.areaTag)) {
@@ -96,16 +96,17 @@ function getSortedAvailableFileAreas(client, options) {
 }
 
 function getDefaultFileAreaTag(client, disableAcsCheck) {
-	let defaultArea = _.findKey(Config.fileBase, o => o.default);
+	const config = Config();
+	let defaultArea = _.findKey(config.fileBase, o => o.default);
 	if(defaultArea) {
-		const area = Config.fileBase.areas[defaultArea];
+		const area = config.fileBase.areas[defaultArea];
 		if(true === disableAcsCheck || client.acs.hasFileAreaRead(area)) {
 			return defaultArea;
 		}
 	}
 
 	//  just use anything we can
-	defaultArea = _.findKey(Config.fileBase.areas, (area, areaTag) => {
+	defaultArea = _.findKey(config.fileBase.areas, (area, areaTag) => {
 		return WellKnownAreaTags.MessageAreaAttach !== areaTag && (true === disableAcsCheck || client.acs.hasFileAreaRead(area));
 	});
 
@@ -113,7 +114,7 @@ function getDefaultFileAreaTag(client, disableAcsCheck) {
 }
 
 function getFileAreaByTag(areaTag) {
-	const areaInfo = Config.fileBase.areas[areaTag];
+	const areaInfo = Config().fileBase.areas[areaTag];
 	if(areaInfo) {
 		areaInfo.areaTag	= areaTag;	//	convienence!
 		areaInfo.storage	= getAreaStorageLocations(areaInfo);
@@ -157,13 +158,14 @@ function changeFileAreaWithOptions(client, areaTag, options, cb) {
 }
 
 function isValidStorageTag(storageTag) {
-	return storageTag in Config.fileBase.storageTags;
+	return storageTag in Config().fileBase.storageTags;
 }
 
 function getAreaStorageDirectoryByTag(storageTag) {
-	const storageLocation = (storageTag && Config.fileBase.storageTags[storageTag]);
+	const config = Config();
+	const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
 
-	return paths.resolve(Config.fileBase.areaStoragePrefix, storageLocation || '');
+	return paths.resolve(config.fileBase.areaStoragePrefix, storageLocation || '');
 }
 
 function getAreaDefaultStorageDirectory(areaInfo) {
@@ -176,7 +178,7 @@ function getAreaStorageLocations(areaInfo) {
 		areaInfo.storageTags :
 		[ areaInfo.storageTags || '' ];
 
-	const avail = Config.fileBase.storageTags;
+	const avail = Config().fileBase.storageTags;
 
 	return _.compact(storageTags.map(storageTag => {
 		if(avail[storageTag]) {
@@ -233,7 +235,7 @@ function sliceAtSauceMarker(data) {
 
 function attemptSetEstimatedReleaseDate(fileEntry) {
 	//	:TODO: yearEstPatterns RegExp's should be cached - we can do this @ Config (re)load time
-	const patterns	= Config.fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
+	const patterns	= Config().fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
 
 	function getMatch(input) {
 		if(input) {
@@ -290,11 +292,11 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 			function extractDescFiles(callback) {
 				//	:TODO: would be nice if these RegExp's were cached
 				//	:TODO: this is long winded...
-
+				const config = Config();
 				const extractList = [];
 
 				const shortDescFile = archiveEntries.find( e => {
-					return Config.fileBase.fileNamePatterns.desc.find( pat => new RegExp(pat, 'i').test(e.fileName) );
+					return config.fileBase.fileNamePatterns.desc.find( pat => new RegExp(pat, 'i').test(e.fileName) );
 				});
 
 				if(shortDescFile) {
@@ -302,7 +304,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 				}
 
 				const longDescFile = archiveEntries.find( e => {
-					return Config.fileBase.fileNamePatterns.descLong.find( pat => new RegExp(pat, 'i').test(e.fileName) );
+					return config.fileBase.fileNamePatterns.descLong.find( pat => new RegExp(pat, 'i').test(e.fileName) );
 				});
 
 				if(longDescFile) {
@@ -334,6 +336,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 				});
 			},
 			function readDescFiles(descFiles, callback) {
+				const config = Config();
 				async.each(Object.keys(descFiles), (descType, next) => {
 					const path = descFiles[descType];
 					if(!path) {
@@ -346,10 +349,9 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
 						}
 
 						//	skip entries that are too large
-						const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;
-
-						if(Config.fileBase[maxFileSizeKey] && stats.size > Config.fileBase[maxFileSizeKey]) {
-							logDebug( { byteSize : stats.size, maxByteSize : Config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
+						const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;						
+						if(config.fileBase[maxFileSizeKey] && stats.size > config.fileBase[maxFileSizeKey]) {
+							logDebug( { byteSize : stats.size, maxByteSize : config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
 							return next(null);
 						}
 
@@ -488,7 +490,8 @@ function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, c
 }
 
 function getInfoExtractUtilForDesc(mimeType, filePath, descType) {
-	let fileType = _.get(Config, [ 'fileTypes', mimeType ] );
+	const config = Config();
+	let fileType = _.get(config, [ 'fileTypes', mimeType ] );
 
 	if(Array.isArray(fileType)) {
 		//	further refine by extention
@@ -504,7 +507,7 @@ function getInfoExtractUtilForDesc(mimeType, filePath, descType) {
 		return;
 	}
 
-	util = _.get(Config, [ 'infoExtractUtils', util ]);
+	util = _.get(config, [ 'infoExtractUtils', util ]);
 	if(!util || !_.isString(util.cmd)) {
 		return;
 	}
diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index 442946e3..8b45da83 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -5,7 +5,7 @@
 const stringFormat		= require('./string_format.js');
 const FileEntry			= require('./file_entry.js');
 const FileArea			= require('./file_base_area.js');
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const { Errors }		= require('./enig_error.js');
 const {
 	splitTextAtTerms,
@@ -64,12 +64,14 @@ function exportFileList(filterCriteria, options, cb) {
 						{ name : options.headerTemplate,	req : false },
 						{ name : options.entryTemplate,		req : true }
 					];
+
+					const config = Config();
 					async.map(templateFiles, (template, nextTemplate) => {
 						if(!template.name && !template.req) {
 							return nextTemplate(null, Buffer.from([]));
 						}
 
-						template.name = paths.isAbsolute(template.name) ? template.name : paths.join(Config.paths.misc, template.name);
+						template.name = paths.isAbsolute(template.name) ? template.name : paths.join(config.paths.misc, template.name);
 						fs.readFile(template.name, (err, data) => {
 							return nextTemplate(err, data);
 						});
@@ -221,7 +223,7 @@ function exportFileList(filterCriteria, options, cb) {
 
 				const headerFormatObj = {
 					nowTs			: moment().format(options.tsFormat),
-					boardName		: Config.general.boardName,
+					boardName		: Config().general.boardName,
 					totalFileCount	: totals.fileCount,
 					totalFileSize	: totals.bytes,
 					filterAreaTag	: filterCriteria.areaTag || '-ALL-',
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index 13b7de33..f046de86 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -11,7 +11,7 @@ const Errors				= require('./enig_error.js').Errors;
 const stringFormat			= require('./string_format.js');
 const FileAreaWeb			= require('./file_area_web.js');
 const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 
 //	deps
 const async					= require('async');
@@ -139,7 +139,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 	}
 
 	generateAndDisplayBatchLink(cb) {
-		const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
+		const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
 
 		FileAreaWeb.createAndServeTempBatchDownload(
 			this.client,
@@ -183,6 +183,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 				function prepareQueueDownloadLinks(callback) {
 					const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
+					const config = Config();
 					async.each(self.dlQueue.items, (fileEntry, nextFileEntry) => {
 						FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
 							if(err) {
@@ -190,7 +191,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 									return nextFileEntry(err);	//	we should have caught this prior
 								}
 
-								const expireTime = moment().add(Config.fileBase.web.expireMinutes, 'minutes');
+								const expireTime = moment().add(config.fileBase.web.expireMinutes, 'minutes');
 
 								FileAreaWeb.createAndServeTempDownload(
 									self.client,
diff --git a/core/file_entry.js b/core/file_entry.js
index f6b86c64..1310d40a 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -7,7 +7,7 @@ const {
 	getISOTimestampString,
 	sanatizeString
 }							= require('./database.js');
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 
 //	deps
 const async					= require('async');
@@ -202,7 +202,8 @@ module.exports = class FileEntry {
 	}
 
 	static getAreaStorageDirectoryByTag(storageTag) {
-		const storageLocation = (storageTag && Config.fileBase.storageTags[storageTag]);
+		const config = Config();
+		const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
 
 		//	absolute paths as-is
 		if(storageLocation && '/' === storageLocation.charAt(0)) {
@@ -210,7 +211,7 @@ module.exports = class FileEntry {
 		}
 
 		//	relative to |areaStoragePrefix|
-		return paths.join(Config.fileBase.areaStoragePrefix, storageLocation || '');
+		return paths.join(config.fileBase.areaStoragePrefix, storageLocation || '');
 	}
 
 	get filePath() {
diff --git a/core/file_transfer.js b/core/file_transfer.js
index a7aee20c..456898c9 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -3,7 +3,7 @@
 
 //	enigma-bbs
 const MenuModule		= require('./menu_module.js').MenuModule;
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const stringFormat		= require('./string_format.js');
 const Errors			= require('./enig_error.js').Errors;
 const DownloadQueue		= require('./download_queue.js');
@@ -56,9 +56,10 @@ exports.getModule = class TransferFileModule extends MenuModule {
 		//
 		//	Most options can be set via extraArgs or config block
 		//
+		const config = Config();
 		if(options.extraArgs) {
 			if(options.extraArgs.protocol) {
-				this.protocolConfig = Config.fileTransferProtocols[options.extraArgs.protocol];
+				this.protocolConfig = config.fileTransferProtocols[options.extraArgs.protocol];
 			}
 
 			if(options.extraArgs.direction) {
@@ -78,7 +79,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			}
 		} else {
 			if(this.config.protocol) {
-				this.protocolConfig = Config.fileTransferProtocols[this.config.protocol];
+				this.protocolConfig = config.fileTransferProtocols[this.config.protocol];
 			}
 
 			if(this.config.direction) {
@@ -98,7 +99,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 			}
 		}
 
-		this.protocolConfig = this.protocolConfig || Config.fileTransferProtocols.zmodem8kSz;	//	try for *something*
+		this.protocolConfig = this.protocolConfig || config.fileTransferProtocols.zmodem8kSz;	//	try for *something*
 		this.direction		= this.direction || 'send';
 		this.sendQueue		= this.sendQueue || [];
 
diff --git a/core/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
index 299c8af2..3d3bd37b 100644
--- a/core/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -3,7 +3,7 @@
 
 //	enigma-bbs
 const MenuModule		= require('./menu_module.js').MenuModule;
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const stringFormat		= require('./string_format.js');
 const ViewController	= require('./view_controller.js').ViewController;
 
@@ -129,7 +129,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 	}
 
 	loadAvailProtocols() {
-		this.protocols = _.map(Config.fileTransferProtocols, (protInfo, protocol) => {
+		this.protocols = _.map(Config().fileTransferProtocols, (protInfo, protocol) => {
 			return {
 				protocol	: protocol,
 				name		: protInfo.name,
diff --git a/core/fse.js b/core/fse.js
index 70b1ecec..736f735a 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -14,7 +14,7 @@ const StatLog						= require('./stat_log.js');
 const stringFormat					= require('./string_format.js');
 const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 const { isAnsi, cleanControlCodes, insert }	= require('./string_util.js');
-const Config						= require('./config.js').config;
+const Config						= require('./config.js').get;
 const { getAddressedToInfo } 		= require('./mail_util.js');
 
 //	deps
@@ -335,7 +335,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				//	to packetAnsiMsgEncoding (generally cp437) as various boards
 				//	really don't like ANSI messages in UTF-8 encoding (they should!)
 				//
-				msgOpts.meta		= { System : { 'explicit_encoding' : Config.scannerTossers.ftn_bso.packetAnsiMsgEncoding || 'cp437' } };
+				msgOpts.meta		= { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
 				msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
 			}
 		}
diff --git a/core/ftn_util.js b/core/ftn_util.js
index d1f69e0f..3fc51cd3 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -1,18 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-let Config					= require('./config.js').config;
-let Address					= require('./ftn_address.js');
-let FNV1a					= require('./fnv1a.js');
+const Config				= require('./config.js').get;
+const Address				= require('./ftn_address.js');
+const FNV1a					= require('./fnv1a.js');
 const getCleanEnigmaVersion	= require('./misc_util.js').getCleanEnigmaVersion;
 
-let _						= require('lodash');
-let iconv					= require('iconv-lite');
-let moment					= require('moment');
-//let uuid			= require('node-uuid');
-let os						= require('os');
+const _						= require('lodash');
+const iconv					= require('iconv-lite');
+const moment				= require('moment');
+const os					= require('os');
 
-let packageJson 			= require('../package.json');
+const packageJson 			= require('../package.json');
 
 //	:TODO: Remove "Ftn" from most of these -- it's implied in the module
 exports.stringToNullPaddedBuffer	= stringToNullPaddedBuffer;
@@ -199,9 +198,10 @@ function getQuotePrefix(name) {
 //	http://ftsc.org/docs/fts-0004.001
 //
 function getOrigin(address) {
-	const origin = _.has(Config, 'messageNetworks.originLine') ?
-		Config.messageNetworks.originLine :
-		Config.general.boardName;
+	const config = Config();
+	const origin = _.has(config, 'messageNetworks.originLine') ?
+		config.messageNetworks.originLine :
+		config.general.boardName;
 
 	const addrStr = new Address(address).toString('5D');
 	return ` * Origin: ${origin} (${addrStr})`;
diff --git a/core/logger.js b/core/logger.js
index 063757ff..c9a75faf 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -10,7 +10,7 @@ const _			= require('lodash');
 module.exports = class Log {
 
 	static init() {
-		const Config	= require('./config.js').config;
+		const Config	= require('./config.js').get();
 		const logPath	= Config.paths.logs;
 
 		const err = this.checkLogPath(logPath);
diff --git a/core/menu_module.js b/core/menu_module.js
index 97536bc7..20680354 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -6,7 +6,7 @@ const theme						= require('./theme.js');
 const ansi						= require('./ansi_term.js');
 const ViewController			= require('./view_controller.js').ViewController;
 const menuUtil					= require('./menu_util.js');
-const Config					= require('./config.js').config;
+const Config					= require('./config.js').get;
 const stringFormat				= require('../core/string_format.js');
 const MultiLineEditTextView		= require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
 const Errors					= require('../core/enig_error.js').Errors;
@@ -29,7 +29,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 		this.menuMethods		= {};	//	methods called from @method's
 		this.menuConfig.config	= this.menuConfig.config || {};
 
-		this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config.menus.cls;
+		this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
 
 		this.viewControllers	= {};
 	}
diff --git a/core/menu_util.js b/core/menu_util.js
index 4a4665b8..c6ad3a85 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 var moduleUtil			= require('./module_util.js');
 var Log					= require('./logger.js').log;
-var Config				= require('./config.js').config;
+var Config				= require('./config.js').get;
 var asset				= require('./asset.js');
 var MCIViewFactory		= require('./mci_view_factory.js').MCIViewFactory;
 
@@ -75,7 +75,7 @@ function loadMenu(options, cb) {
 
 				const modLoadOpts = {
 					name		: modSupplied ? modAsset.asset : 'standard_menu',
-					path		: (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config.paths.mods,
+					path		: (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config().paths.mods,
 					category	: (!modSupplied || 'systemModule' === modAsset.type) ? null : 'mods',
 				};
 
@@ -189,7 +189,7 @@ function handleAction(client, formData, conf, cb) {
 				return callModuleMenuMethod(
 					client,
 					actionAsset,
-					paths.join(Config.paths.mods, actionAsset.location),
+					paths.join(Config().paths.mods, actionAsset.location),
 					formData,
 					conf.extraArgs,
 					cb);
@@ -234,7 +234,7 @@ function handleNext(client, nextSpec, conf, cb) {
 		case 'method' :
 		case 'systemMethod' :
 			if(_.isString(nextAsset.location)) {
-				return callModuleMenuMethod(client, nextAsset, paths.join(Config.paths.mods, nextAsset.location), {}, extraArgs, cb);
+				return callModuleMenuMethod(client, nextAsset, paths.join(Config().paths.mods, nextAsset.location), {}, extraArgs, cb);
 			} else if('systemMethod' === nextAsset.type) {
 				//	:TODO: see other notes about system_menu_method.js here
 				return callModuleMenuMethod(client, nextAsset, paths.join(__dirname, 'system_menu_method.js'), {}, extraArgs, cb);
diff --git a/core/message_area.js b/core/message_area.js
index 985da046..44a94c9a 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -3,7 +3,7 @@
 
 //	ENiGMA½
 const msgDb						= require('./database.js').dbs.message;
-const Config					= require('./config.js').config;
+const Config					= require('./config.js').get;
 const Message					= require('./message.js');
 const Log						= require('./logger.js').log;
 const msgNetRecord				= require('./msg_network.js').recordMessage;
@@ -40,7 +40,7 @@ function getAvailableMessageConferences(client, options) {
 	assert(client || true === options.noClient);
 
 	//	perform ACS check per conf & omit system_internal if desired
-	return _.omitBy(Config.messageConferences, (conf, confTag) => {
+	return _.omitBy(Config().messageConferences, (conf, confTag) => {
 		if(!options.includeSystemInternal && 'system_internal' === confTag) {
 			return true;
 		}
@@ -68,8 +68,9 @@ function getAvailableMessageAreasByConfTag(confTag, options) {
 
 	//  :TODO: confTag === "" then find default
 
-	if(_.has(Config.messageConferences, [ confTag, 'areas' ])) {
-		const areas = Config.messageConferences[confTag].areas;
+	const config = Config();
+	if(_.has(config.messageConferences, [ confTag, 'areas' ])) {
+		const areas = config.messageConferences[confTag].areas;
 
 		if(!options.client || true === options.noAcsCheck) {
 			//	everything - no ACS checks
@@ -109,16 +110,17 @@ function getDefaultMessageConferenceTag(client, disableAcsCheck) {
 	//
 	//	Note that built in 'system_internal' is always ommited here
 	//
-	let defaultConf = _.findKey(Config.messageConferences, o => o.default);
+	const config = Config();
+	let defaultConf = _.findKey(config.messageConferences, o => o.default);
 	if(defaultConf) {
-		const conf = Config.messageConferences[defaultConf];
+		const conf = config.messageConferences[defaultConf];
 		if(true === disableAcsCheck || client.acs.hasMessageConfRead(conf)) {
 			return defaultConf;
 		}
 	}
 
 	//  just use anything we can
-	defaultConf = _.findKey(Config.messageConferences, (conf, confTag) => {
+	defaultConf = _.findKey(config.messageConferences, (conf, confTag) => {
 		return 'system_internal' !== confTag && (true === disableAcsCheck || client.acs.hasMessageConfRead(conf));
 	});
 
@@ -135,8 +137,9 @@ function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
 	//
 	confTag = confTag || getDefaultMessageConferenceTag(client);
 
-	if(confTag && _.has(Config.messageConferences, [ confTag, 'areas' ])) {
-		const areaPool = Config.messageConferences[confTag].areas;
+	const config = Config();
+	if(confTag && _.has(config.messageConferences, [ confTag, 'areas' ])) {
+		const areaPool = config.messageConferences[confTag].areas;
 		let defaultArea = _.findKey(areaPool, o => o.default);
 		if(defaultArea) {
 			const area = areaPool[defaultArea];
@@ -154,18 +157,18 @@ function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
 }
 
 function getMessageConferenceByTag(confTag) {
-	return Config.messageConferences[confTag];
+	return Config().messageConferences[confTag];
 }
 
 function getMessageConfTagByAreaTag(areaTag) {
-	const confs = Config.messageConferences;
+	const confs = Config().messageConferences;
 	return Object.keys(confs).find( (confTag) => {
 		return _.has(confs, [ confTag, 'areas', areaTag]);
 	});
 }
 
 function getMessageAreaByTag(areaTag, optionalConfTag) {
-	const confs = Config.messageConferences;
+	const confs = Config().messageConferences;
 
 	//	:TODO: this could be cached
 	if(_.isString(optionalConfTag)) {
@@ -535,10 +538,11 @@ function trimMessageAreasScheduledEvent(args, cb) {
 				let areaInfos = [];
 
 				//	determine maxMessages & maxAgeDays per area
+				const config = Config();
 				areaTags.forEach(areaTag => {
 
-					let maxMessages = Config.messageAreaDefaults.maxMessages;
-					let maxAgeDays	= Config.messageAreaDefaults.maxAgeDays;
+					let maxMessages = config.messageAreaDefaults.maxMessages;
+					let maxAgeDays	= config.messageAreaDefaults.maxAgeDays;
 
 					const area = getMessageAreaByTag(areaTag);	//	note: we don't know the conf here
 					if(area) {
diff --git a/core/module_util.js b/core/module_util.js
index 67e87306..3bfd88d2 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config	= require('./config.js').config;
+const Config	= require('./config.js').get;
 
 //	deps
 const fs 		= require('graceful-fs');
@@ -64,7 +64,7 @@ function loadModuleEx(options, cb) {
 }
 
 function loadModule(name, category, cb) {
-	const path = Config.paths[category];
+	const path = Config().paths[category];
 
 	if(!_.isString(path)) {
 		return cb(new Error(`Not sure where to look for "${name}" of category "${category}"`));
@@ -77,7 +77,7 @@ function loadModule(name, category, cb) {
 
 function loadModulesForCategory(category, iterator, complete) {
 
-	fs.readdir(Config.paths[category], (err, files) => {
+	fs.readdir(Config().paths[category], (err, files) => {
 		if(err) {
 			return iterator(err);
 		}
@@ -100,10 +100,11 @@ function loadModulesForCategory(category, iterator, complete) {
 }
 
 function getModulePaths() {
+	const config = Config();
 	return [
-		Config.paths.mods,
-		Config.paths.loginServers,
-		Config.paths.contentServers,
-		Config.paths.scannerTossers,
+		config.paths.mods,
+		config.paths.loginServers,
+		config.paths.contentServers,
+		config.paths.scannerTossers,
 	];
 }
diff --git a/core/nua.js b/core/nua.js
index 61dbeb62..cb7e16a7 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -6,7 +6,7 @@ const MenuModule	= require('./menu_module.js').MenuModule;
 const User			= require('./user.js');
 const theme			= require('./theme.js');
 const login			= require('./system_menu_method.js').login;
-const Config		= require('./config.js').config;
+const Config		= require('./config.js').get;
 const messageArea	= require('./message_area.js');
 
 exports.moduleInfo = {
@@ -62,6 +62,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 			//
 			submitApplication : function(formData, extraArgs, cb) {
 				const newUser = new User();
+				const config = Config();
 
 				newUser.username = formData.value.username;
 
@@ -95,10 +96,10 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 					//	:TODO: should probably have a place to create defaults/etc.
 				};
 
-				if('*' === Config.defaults.theme) {
+				if('*' === config.defaults.theme) {
 					newUser.properties.theme_id = theme.getRandomTheme();
 				} else {
-					newUser.properties.theme_id = Config.defaults.theme;
+					newUser.properties.theme_id = config.defaults.theme;
 				}
 
 				//	:TODO: User.create() should validate email uniqueness!
@@ -118,7 +119,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 						//	Cache SysOp information now
 						//	:TODO: Similar to bbs.js. DRY
 						if(newUser.isSysOp()) {
-							Config.general.sysOp = {
+							config.general.sysOp = {
 								username	: formData.value.username,
 								properties	: newUser.properties,
 							};
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 4d1eb54b..3edfc1f3 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -333,7 +333,7 @@ function importAreas() {
 			},
 			function validateAndCollectInput(callback) {
 				const msgArea	= require('../../core/message_area.js');
-				const Config	= require('../../core/config.js').config;
+				const sysConfig	= require('../../core/config.js').get();
 
 				let msgConfs = msgArea.getSortedAvailMessageConferences(null, { noClient : true } );
 				if(!msgConfs) {
@@ -355,8 +355,8 @@ function importAreas() {
 				}
 
 				let existingNetworkNames = [];
-				if(_.has(Config, 'messageNetworks.ftn.networks')) {
-					existingNetworkNames = Object.keys(Config.messageNetworks.ftn.networks);
+				if(_.has(sysConfig, 'messageNetworks.ftn.networks')) {
+					existingNetworkNames = Object.keys(sysConfig.messageNetworks.ftn.networks);
 				}
 
 				if(0 === existingNetworkNames.length) {
@@ -366,7 +366,7 @@ function importAreas() {
 				if(networkName && !existingNetworkNames.find(net => networkName === net)) {
 					return callback(Errors.DoesNotExist(`FTN style Network "${networkName}" does not exist`));
 				}
-				
+
 				getAnswers([
 					{
 						name		: 'confTag',
@@ -407,13 +407,13 @@ function importAreas() {
 				});
 			},
 			function confirmWithUser(callback) {
-				const Config	= require('../../core/config.js').config;
+				const sysConfig	= require('../../core/config.js').get();
 
-				console.info(`Importing the following for "${confTag}" - (${Config.messageConferences[confTag].name} - ${Config.messageConferences[confTag].desc})`);
+				console.info(`Importing the following for "${confTag}" - (${sysConfig.messageConferences[confTag].name} - ${sysConfig.messageConferences[confTag].desc})`);
 				importEntries.forEach(ie => {
 					console.info(`  ${ie.ftnTag} - ${ie.name}`);
 				});
-				
+
 				console.info('');
 				console.info('Importing will NOT create required FTN network configurations.');
 				console.info('If you have not yet done this, you will need to complete additional steps after importing.');
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 68f190fb..b9ae8aeb 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -390,10 +390,10 @@ function displayFileAreaInfo() {
 				return initConfigAndDatabases(callback);
 			},
 			function dumpInfo(callback) {
-				const Config = require('../../core/config.js').config;
+				const sysConfig = require('../../core/config.js').get();
 				let suppliedAreas = argv._.slice(2);
 				if(!suppliedAreas || 0 === suppliedAreas.length) {
-					suppliedAreas = _.map(Config.fileBase.areas, (areaInfo, areaTag) => areaTag);
+					suppliedAreas = _.map(sysConfig.fileBase.areas, (areaInfo, areaTag) => areaTag);
 				}
 
 				const areaAndStorageInfo = getAreaAndStorage(suppliedAreas);
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 47370a66..c1f7e9fb 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config							= require('./config.js').config;
+const Config							= require('./config.js').get;
 const Log								= require('./logger.js').log;
 const getMessageAreaByTag				= require('./message_area.js').getMessageAreaByTag;
 const getMessageConferenceByTag			= require('./message_area.js').getMessageConferenceByTag;
@@ -56,7 +56,7 @@ const PREDEFINED_MCI_GENERATORS = {
 	//
 	//	Board
 	//
-	BN	: function boardName() { return Config.general.boardName; },
+	BN	: function boardName() { return Config().general.boardName; },
 
 	//	ENiGMA
 	VL	: function versionLabel() { return 'ENiGMA½ v' + packageJson.version; },
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index a98c6f4d..2d978852 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -3,7 +3,7 @@
 
 //	ENiGMA½
 const MessageScanTossModule				= require('../msg_scan_toss_module.js').MessageScanTossModule;
-const Config							= require('../config.js').config;
+const Config							= require('../config.js').get;
 const ftnMailPacket						= require('../ftn_mail_packet.js');
 const ftnUtil							= require('../ftn_util.js');
 const Address							= require('../ftn_address.js');
@@ -60,8 +60,9 @@ function FTNMessageScanTossModule() {
 
 	this.archUtil = ArchiveUtil.getInstance();
 
-	if(_.has(Config, 'scannerTossers.ftn_bso')) {
-		this.moduleConfig = Config.scannerTossers.ftn_bso;
+	const config = Config();
+	if(_.has(config, 'scannerTossers.ftn_bso')) {
+		this.moduleConfig = config.scannerTossers.ftn_bso;
 	}
 
 	this.getDefaultNetworkName = function() {
@@ -69,19 +70,20 @@ function FTNMessageScanTossModule() {
 			return this.moduleConfig.defaultNetwork.toLowerCase();
 		}
 
-		const networkNames = Object.keys(Config.messageNetworks.ftn.networks);
+		const networkNames = Object.keys(config.messageNetworks.ftn.networks);
 		if(1 === networkNames.length) {
 			return networkNames[0].toLowerCase();
 		}
 	};
 
 	this.getDefaultZone = function(networkName) {
-		if(_.isNumber(Config.messageNetworks.ftn.networks[networkName].defaultZone)) {
-			return Config.messageNetworks.ftn.networks[networkName].defaultZone;
+		const config = Config();
+		if(_.isNumber(config.messageNetworks.ftn.networks[networkName].defaultZone)) {
+			return config.messageNetworks.ftn.networks[networkName].defaultZone;
 		}
 
 		//	non-explicit: default to local address zone
-		const networkLocalAddress = Config.messageNetworks.ftn.networks[networkName].localAddress;
+		const networkLocalAddress = config.messageNetworks.ftn.networks[networkName].localAddress;
 		if(networkLocalAddress) {
 			const addr = Address.fromString(networkLocalAddress);
 			return addr.zone;
@@ -96,14 +98,14 @@ function FTNMessageScanTossModule() {
 	*/
 
 	this.getNetworkNameByAddress = function(remoteAddress) {
-		return _.findKey(Config.messageNetworks.ftn.networks, network => {
+		return _.findKey(Config().messageNetworks.ftn.networks, network => {
 			const localAddress = Address.fromString(network.localAddress);
 			return !_.isUndefined(localAddress) && localAddress.isEqual(remoteAddress);
 		});
 	};
 
 	this.getNetworkNameByAddressPattern = function(remoteAddressPattern) {
-		return _.findKey(Config.messageNetworks.ftn.networks, network => {
+		return _.findKey(Config().messageNetworks.ftn.networks, network => {
 			const localAddress = Address.fromString(network.localAddress);
 			return !_.isUndefined(localAddress) && localAddress.isPatternMatch(remoteAddressPattern);
 		});
@@ -111,7 +113,7 @@ function FTNMessageScanTossModule() {
 
 	this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
 		ftnAreaTag = ftnAreaTag.toUpperCase();	//	always compare upper
-		return _.findKey(Config.messageNetworks.ftn.areas, areaConf => {
+		return _.findKey(Config().messageNetworks.ftn.areas, areaConf => {
 			return areaConf.tag.toUpperCase() === ftnAreaTag;
 		});
 	};
@@ -357,6 +359,7 @@ function FTNMessageScanTossModule() {
 
 		let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
 
+		const config = Config();
 		if(self.isNetMailMessage(message)) {
 			//
 			//	Set route and message destination properties -- they may differ
@@ -405,14 +408,14 @@ function FTNMessageScanTossModule() {
 			//
 			//	EchoMail requires some additional properties & kludges
 			//
-			message.meta.FtnProperty.ftn_area = Config.messageNetworks.ftn.areas[message.areaTag].tag;
+			message.meta.FtnProperty.ftn_area = config.messageNetworks.ftn.areas[message.areaTag].tag;
 
 			//
 			//	When exporting messages, we should create/update SEEN-BY
 			//	with remote address(s) we are exporting to.
 			//
 			const seenByAdditions =
-				[ `${localAddress.net}/${localAddress.node}` ].concat(Config.messageNetworks.ftn.areas[message.areaTag].uplinks);
+				[ `${localAddress.net}/${localAddress.node}` ].concat(config.messageNetworks.ftn.areas[message.areaTag].uplinks);
 			message.meta.FtnProperty.ftn_seen_by =
 				ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
 
@@ -453,7 +456,7 @@ function FTNMessageScanTossModule() {
 		//	Determine CHRS and actual internal encoding name. If the message has an
 		//	explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
 		//
-		let encoding = options.nodeConfig.encoding || Config.scannerTossers.ftn_bso.packetMsgEncoding || 'utf8';
+		let encoding = options.nodeConfig.encoding || config.scannerTossers.ftn_bso.packetMsgEncoding || 'utf8';
 		const explicitEncoding = _.get(message.meta, 'System.explicit_encoding');
 		if(explicitEncoding) {
 			encoding = explicitEncoding;
@@ -513,7 +516,7 @@ function FTNMessageScanTossModule() {
 
 
 	this.hasValidConfiguration = function() {
-		if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config, 'messageNetworks.ftn.areas')) {
+		if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config(), 'messageNetworks.ftn.areas')) {
 			return false;
 		}
 
@@ -820,7 +823,7 @@ function FTNMessageScanTossModule() {
 		//
 		//	Route full|wildcard -> full adddress/network lookup
 		//
-		const routes = _.get(Config, 'scannerTossers.ftn_bso.netMail.routes');
+		const routes = _.get(Config(), 'scannerTossers.ftn_bso.netMail.routes');
 		if(!routes) {
 			return;
 		}
@@ -860,7 +863,7 @@ function FTNMessageScanTossModule() {
 
 		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
 			return routeAddress.isPatternMatch(nodeAddrWildcard);
-		}) || { packetType : '2+', encoding	: Config.scannerTossers.ftn_bso.packetMsgEncoding };
+		}) || { packetType : '2+', encoding	: Config().scannerTossers.ftn_bso.packetMsgEncoding };
 
 		//	we should never be failing here; we may just be using defaults.
 		return cb(
@@ -899,7 +902,7 @@ function FTNMessageScanTossModule() {
 							exportOpts.destAddress	= dstAddr;
 							exportOpts.routeAddress	= routeInfo.routeAddress;
 							exportOpts.fileCase		= routeInfo.config.fileCase || 'lower';
-							exportOpts.network		= Config.messageNetworks.ftn.networks[routeInfo.networkName];
+							exportOpts.network		= Config().messageNetworks.ftn.networks[routeInfo.networkName];
 							exportOpts.networkName	= routeInfo.networkName;
 							exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
 							exportOpts.exportType	= self.getExportType(routeInfo.config);
@@ -966,6 +969,7 @@ function FTNMessageScanTossModule() {
 	};
 
 	this.exportEchoMailMessagesToUplinks = function(messageUuids, areaConfig, cb) {
+		const config = Config();
 		async.each(areaConfig.uplinks, (uplink, nextUplink) => {
 			const nodeConfig = self.getNodeConfigByAddress(uplink);
 			if(!nodeConfig) {
@@ -974,7 +978,7 @@ function FTNMessageScanTossModule() {
 
 			const exportOpts = {
 				nodeConfig,
-				network			: Config.messageNetworks.ftn.networks[areaConfig.network],
+				network			: config.messageNetworks.ftn.networks[areaConfig.network],
 				destAddress		: Address.fromString(uplink),
 				networkName		: areaConfig.network,
 				fileCase		: nodeConfig.fileCase || 'lower',
@@ -1119,7 +1123,7 @@ function FTNMessageScanTossModule() {
 	this.getLocalUserNameFromAlias = function(lookup) {
 		lookup = lookup.toLowerCase();
 
-		const aliases = _.get(Config, 'messageNetworks.ftn.netMail.aliases');
+		const aliases = _.get(Config(), 'messageNetworks.ftn.netMail.aliases');
 		if(!aliases) {
 			return lookup;	//	keep orig
 		}
@@ -1195,7 +1199,7 @@ function FTNMessageScanTossModule() {
 					//	a random UUID. Otherwise, don't assign the UUID just yet. It will be
 					//	generated at persist() time and should be consistent across import/exports
 					//
-					if(true === _.get(Config, [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
+					if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
 						//	just generate a UUID & therefor always allow for dupes
 						message.uuid = uuidV4();
 					}
@@ -1650,7 +1654,8 @@ function FTNMessageScanTossModule() {
 	};
 
 	this.getLocalAreaTagsForTic = function() {
-		return _.union(Object.keys(Config.scannerTossers.ftn_bso.ticAreas || {} ), Object.keys(Config.fileBase.areas));
+		const config = Config();
+		return _.union(Object.keys(config.scannerTossers.ftn_bso.ticAreas || {} ), Object.keys(config.fileBase.areas));
 	};
 
 	this.processSingleTicFile = function(ticFileInfo, cb) {
@@ -1659,9 +1664,10 @@ function FTNMessageScanTossModule() {
 		async.waterfall(
 			[
 				function generalValidation(callback) {
+					const sysConfig = Config();
 					const config = {
-						nodes			: Config.scannerTossers.ftn_bso.nodes,
-						defaultPassword	: Config.scannerTossers.ftn_bso.tic.password,
+						nodes			: sysConfig.scannerTossers.ftn_bso.nodes,
+						defaultPassword	: sysConfig.scannerTossers.ftn_bso.tic.password,
 						localAreaTags	: self.getLocalAreaTagsForTic(),
 					};
 
@@ -1672,7 +1678,7 @@ function FTNMessageScanTossModule() {
 						}
 
 						//	We may need to map |localAreaTag| back to real areaTag if it's a mapping/alias
-						const mappedLocalAreaTag = _.get(Config.scannerTossers.ftn_bso, [ 'ticAreas', localInfo.areaTag ]);
+						const mappedLocalAreaTag = _.get(Config().scannerTossers.ftn_bso, [ 'ticAreas', localInfo.areaTag ]);
 
 						if(mappedLocalAreaTag) {
 							if(_.isString(mappedLocalAreaTag.areaTag)) {
@@ -1699,7 +1705,7 @@ function FTNMessageScanTossModule() {
 					//	Lastly, we will only replace if the item is in the same/specified area
 					//	and that come from the same origin as a previous entry.
 					//
-					const allowReplace	= _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config.scannerTossers.ftn_bso.tic.allowReplace);
+					const allowReplace	= _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config().scannerTossers.ftn_bso.tic.allowReplace);
 					const replaces		= ticFileInfo.getAsString('Replaces');
 
 					if(!allowReplace || !replaces) {
@@ -1755,7 +1761,7 @@ function FTNMessageScanTossModule() {
 							short_file_name		: ticFileInfo.getAsString('File').toUpperCase(),	//	upper to ensure no case issues later; this should be a DOS 8.3 name
 							tic_origin			: ticFileInfo.getAsString('Origin'),
 							tic_desc			: ticFileInfo.getAsString('Desc'),
-							upload_by_username	: _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config.scannerTossers.ftn_bso.tic.uploadBy),
+							upload_by_username	: _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config().scannerTossers.ftn_bso.tic.uploadBy),
 						}
 					};
 
@@ -1769,7 +1775,7 @@ function FTNMessageScanTossModule() {
 					//
 					const hashTags =
 						localInfo.hashTags ||
-						_.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );		//	catch-all*/
+						_.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );		//	catch-all*/
 
 					if(hashTags) {
 						scanOpts.hashTags = new Set(hashTags.split(/[\s,]+/));
@@ -1817,8 +1823,8 @@ function FTNMessageScanTossModule() {
 					//	We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
 					//
 					const descPriority = _.get(
-						Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
-						Config.scannerTossers.ftn_bso.tic.descPriority
+						Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
+						Config().scannerTossers.ftn_bso.tic.descPriority
 					);
 
 					if('tic' === descPriority) {
@@ -1926,11 +1932,12 @@ function FTNMessageScanTossModule() {
 			;
 
 		//	we shouldn't, but be sure we don't try to pick up private mail here
-		const areaTags = Object.keys(Config.messageNetworks.ftn.areas)
+		const config = Config();
+		const areaTags = Object.keys(config.messageNetworks.ftn.areas)
 			.filter(areaTag => Message.WellKnownAreaTags.Private !== areaTag);
 
 		async.each(areaTags, (areaTag, nextArea) => {
-			const areaConfig = Config.messageNetworks.ftn.areas[areaTag];
+			const areaConfig = config.messageNetworks.ftn.areas[areaTag];
 			if(!this.isAreaConfigValid(areaConfig)) {
 				return nextArea();
 			}
@@ -2336,7 +2343,7 @@ FTNMessageScanTossModule.prototype.record = function(message) {
 	} else if(message.areaTag) {
 		Object.assign(info, { type : 'EchoMail' } );
 
-		const areaConfig = Config.messageNetworks.ftn.areas[message.areaTag];
+		const areaConfig = Config().messageNetworks.ftn.areas[message.areaTag];
 		if(!this.isAreaConfigValid(areaConfig)) {
 			return;
 		}
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 5e0ee42f..d613052a 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 const Log					= require('../../logger.js').log;
 const { ServerModule }		= require('../../server_module.js');
-const Config				= require('../../config.js').config;
+const Config				= require('../../config.js').get;
 const {
 	splitTextAtTerms,
 	isAnsi,
@@ -73,8 +73,9 @@ exports.getModule = class GopherModule extends ServerModule {
 			return;
 		}
 
-		this.publicHostname = Config.contentServers.gopher.publicHostname;
-		this.publicPort		= Config.contentServers.gopher.publicPort;
+		const config = Config();
+		this.publicHostname = config.contentServers.gopher.publicHostname;
+		this.publicPort		= config.contentServers.gopher.publicPort;
 
 		this.addRoute(/^\/?\r\n$/, this.defaultGenerator);
 		this.addRoute(/^\/msgarea(\/[a-z0-9_-]+(\/[a-z0-9_-]+)?(\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(_raw)?)?)?\/?\r\n$/, this.messageAreaGenerator);
@@ -99,9 +100,10 @@ exports.getModule = class GopherModule extends ServerModule {
 			return true;	//	nothing to do, but not an error
 		}
 
-		const port = parseInt(Config.contentServers.gopher.port);
+		const config = Config();
+		const port = parseInt(config.contentServers.gopher.port);
 		if(isNaN(port)) {
-			this.log.warn( { port : Config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
+			this.log.warn( { port : config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
 			return false;
 		}
 
@@ -109,13 +111,14 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	get enabled() {
-		return _.get(Config, 'contentServers.gopher.enabled', false) && this.isConfigured();
+		return _.get(Config(), 'contentServers.gopher.enabled', false) && this.isConfigured();
 	}
 
 	isConfigured() {
 		//	public hostname & port must be set; responses contain them!
-		return _.isString(_.get(Config, 'contentServers.gopher.publicHostname')) &&
-			_.isNumber(_.get(Config, 'contentServers.gopher.publicPort'));
+		const config = Config();
+		return _.isString(_.get(config, 'contentServers.gopher.publicHostname')) &&
+			_.isNumber(_.get(config, 'contentServers.gopher.publicPort'));
 	}
 
 	addRoute(selectorRegExp, generatorHandler) {
@@ -155,7 +158,7 @@ exports.getModule = class GopherModule extends ServerModule {
 	defaultGenerator(selectorMatch, cb) {
 		this.log.trace( { selector : selectorMatch[0] }, 'Serving default content');
 
-		let bannerFile = _.get(Config, 'contentServers.gopher.bannerFile', 'startup_banner.asc');
+		let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'startup_banner.asc');
 		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
 		fs.readFile(bannerFile, 'utf8', (err, banner) => {
 			if(err) {
@@ -174,7 +177,7 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	isAreaAndConfExposed(confTag, areaTag) {
-		const conf = _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ]);
+		const conf = _.get(Config(), [ 'contentServers', 'gopher', 'messageConferences', confTag ]);
 		return Array.isArray(conf) && conf.includes(areaTag);
 	}
 
@@ -281,13 +284,14 @@ ${msgBody}
 			});
 		} else if(selectorMatch[1]) {
 			//	list areas in conf
+			const sysConfig = Config();
 			const confTag	= selectorMatch[1].replace(/\r\n|\//g, '');
-			const conf		= _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
+			const conf		= _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
 			if(!conf) {
 				return this.notFoundGenerator(selectorMatch, cb);
 			}
 
-			const areas = _.get(Config, [ 'contentServers', 'gopher', 'messageConferences', confTag ], {})
+			const areas = _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ], {})
 				.map(areaTag => Object.assign( { areaTag }, getMessageAreaByTag(areaTag)))
 				.filter(area => area && !Message.isPrivateAreaTag(area.areaTag));
 
@@ -307,7 +311,7 @@ ${msgBody}
 			return cb(response);
 		} else {
 			//	message area base (list confs)
-			const confs = Object.keys(_.get(Config, 'contentServers.gopher.messageConferences', {}))
+			const confs = Object.keys(_.get(Config(), 'contentServers.gopher.messageConferences', {}))
 				.map(confTag => Object.assign( { confTag }, getMessageConferenceByTag(confTag)))
 				.filter(conf => conf);	//	remove any baddies
 
diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index d1edb221..47e0661f 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -4,7 +4,7 @@
 //	ENiGMA½
 const Log			= require('../../logger.js').log;
 const ServerModule	= require('../../server_module.js').ServerModule;
-const Config		= require('../../config.js').config;
+const Config		= require('../../config.js').get;
 
 //	deps
 const http			= require('http');
@@ -55,12 +55,13 @@ exports.getModule = class WebServerModule extends ServerModule {
 	constructor() {
 		super();
 
-		this.enableHttp		= Config.contentServers.web.http.enabled || false;
-		this.enableHttps	= Config.contentServers.web.https.enabled || false;
+		const config 		= Config();
+		this.enableHttp		= config.contentServers.web.http.enabled || false;
+		this.enableHttps	= config.contentServers.web.https.enabled || false;
 
 		this.routes = {};
 
-		if(this.isEnabled() && Config.contentServers.web.staticRoot) {
+		if(this.isEnabled() && config.contentServers.web.staticRoot) {
 			this.addRoute({
 				method		: 'GET',
 				path		: '/static/.*$',
@@ -77,25 +78,26 @@ exports.getModule = class WebServerModule extends ServerModule {
 		//	Prefer HTTPS over HTTP. Be explicit about the port
 		//	only if non-standard. Allow users to override full prefix in config.
 		//
-		if(_.isString(Config.contentServers.web.overrideUrlPrefix)) {
-			return `${Config.contentServers.web.overrideUrlPrefix}${pathAndQuery}`;
+		const config = Config();
+		if(_.isString(config.contentServers.web.overrideUrlPrefix)) {
+			return `${config.contentServers.web.overrideUrlPrefix}${pathAndQuery}`;
 		}
 
 		let schema;
 		let port;
-		if(Config.contentServers.web.https.enabled) {
+		if(config.contentServers.web.https.enabled) {
 			schema	= 'https://';
-			port	=  (443 === Config.contentServers.web.https.port) ?
+			port	=  (443 === config.contentServers.web.https.port) ?
 				'' :
-				`:${Config.contentServers.web.https.port}`;
+				`:${config.contentServers.web.https.port}`;
 		} else {
 			schema	= 'http://';
-			port	= (80 === Config.contentServers.web.http.port) ?
+			port	= (80 === config.contentServers.web.http.port) ?
 				'' :
-				`:${Config.contentServers.web.http.port}`;
+				`:${config.contentServers.web.http.port}`;
 		}
 		
-		return `${schema}${Config.contentServers.web.domain}${port}${pathAndQuery}`;
+		return `${schema}${config.contentServers.web.domain}${port}${pathAndQuery}`;
 	}
 
 	isEnabled() {
@@ -107,14 +109,15 @@ exports.getModule = class WebServerModule extends ServerModule {
 			this.httpServer = http.createServer( (req, resp) => this.routeRequest(req, resp) );
 		}
 
+		const config = Config();
 		if(this.enableHttps) {
 			const options = {
-				cert	: fs.readFileSync(Config.contentServers.web.https.certPem),
-				key		: fs.readFileSync(Config.contentServers.web.https.keyPem),
+				cert	: fs.readFileSync(config.contentServers.web.https.certPem),
+				key		: fs.readFileSync(config.contentServers.web.https.keyPem),
 			};
 
 			//	additional options
-			Object.assign(options, Config.contentServers.web.https.options || {} );
+			Object.assign(options, config.contentServers.web.https.options || {} );
 
 			this.httpsServer = https.createServer(options, (req, resp) => this.routeRequest(req, resp) );			
 		}
@@ -123,13 +126,14 @@ exports.getModule = class WebServerModule extends ServerModule {
 	listen() {
 		let ok = true;
 
+		const config = Config();
 		[ 'http', 'https' ].forEach(service => {
 			const name = `${service}Server`;
 			if(this[name]) {
-				const port = parseInt(Config.contentServers.web[service].port);
+				const port = parseInt(config.contentServers.web[service].port);
 				if(isNaN(port)) {
 					ok = false;
-					return Log.warn( { port : Config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
+					return Log.warn( { port : config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
 				}
 				return this[name].listen(port);
 			} 
@@ -167,7 +171,7 @@ exports.getModule = class WebServerModule extends ServerModule {
 	}
 
 	respondWithError(resp, code, bodyText, title) {
-		const customErrorPage = paths.join(Config.contentServers.web.staticRoot, `${code}.html`);
+		const customErrorPage = paths.join(Config().contentServers.web.staticRoot, `${code}.html`);
 
 		fs.readFile(customErrorPage, 'utf8', (err, data) => {
 			resp.writeHead(code, { 'Content-Type' : 'text/html' } );
@@ -202,14 +206,14 @@ exports.getModule = class WebServerModule extends ServerModule {
 	}
 
 	routeIndex(req, resp) {
-		const filePath = paths.join(Config.contentServers.web.staticRoot, 'index.html');
+		const filePath = paths.join(Config().contentServers.web.staticRoot, 'index.html');
 
 		return this.returnStaticPage(filePath, resp);
 	}
 
 	routeStaticFile(req, resp) {
 		const fileName = req.url.substr(req.url.indexOf('/', 1));
-		const filePath = paths.join(Config.contentServers.web.staticRoot, fileName);
+		const filePath = paths.join(Config().contentServers.web.staticRoot, fileName);
 
 		return this.returnStaticPage(filePath, resp);
 	}
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index c50a7d70..0b8e3082 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config			= require('../../config.js').config;
+const Config			= require('../../config.js').get;
 const baseClient		= require('../../client.js');
 const Log				= require('../../logger.js').log;
 const LoginServerModule	= require('../../login_server_module.js');
@@ -42,7 +42,8 @@ function SSHClient(clientConn) {
 		const username	= ctx.username || '';
 		const password	= ctx.password || '';
 
-		self.isNewUser	= (Config.users.newUserNames || []).indexOf(username) > -1;
+		const config	= Config();
+		self.isNewUser	= (config.users.newUserNames || []).indexOf(username) > -1;
 
 		self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
 
@@ -60,7 +61,7 @@ function SSHClient(clientConn) {
 		//	If the system is open and |isNewUser| is true, the login
 		//	sequence is hijacked in order to start the applicaiton process.
 		//
-		if(false === Config.general.closedSystem && self.isNewUser) {
+		if(false === config.general.closedSystem && self.isNewUser) {
 			return ctx.accept();
 		}
 
@@ -99,7 +100,7 @@ function SSHClient(clientConn) {
 							return alreadyLoggedIn(username);
 						}
 
-						if(loginAttempts >= Config.general.loginAttempts) {
+						if(loginAttempts >= config.general.loginAttempts) {
 							return terminateConnection();
 						}
 
@@ -113,8 +114,8 @@ function SSHClient(clientConn) {
 							if(err) {
 								interactivePrompt.prompt = `Access denied\n${ctx.username}'s password: `;
 							} else {
-								const newUserNameList = _.has(Config, 'users.newUserNames') && Config.users.newUserNames.length > 0 ?
-									Config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
+								const newUserNameList = _.has(config, 'users.newUserNames') && config.users.newUserNames.length > 0 ?
+									config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
 									'(No new user names enabled!)';
 
 								interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
@@ -203,7 +204,7 @@ function SSHClient(clientConn) {
 				}
 
 				//	we're ready!
-				const firstMenu = self.isNewUser ? Config.loginServers.ssh.firstMenuNewUser : Config.loginServers.ssh.firstMenu;
+				const firstMenu = self.isNewUser ? Config().loginServers.ssh.firstMenuNewUser : Config().loginServers.ssh.firstMenu;
 				self.emit('ready', { firstMenu : firstMenu } );
 			});
 
@@ -239,18 +240,19 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 	}
 
 	createServer() {
+		const config = Config();
 		const serverConf = {
 			hostKeys : [
 				{
-					key			: fs.readFileSync(Config.loginServers.ssh.privateKeyPem),
-					passphrase	: Config.loginServers.ssh.privateKeyPass,
+					key			: fs.readFileSync(config.loginServers.ssh.privateKeyPem),
+					passphrase	: config.loginServers.ssh.privateKeyPass,
 				}
 			],
 			ident : 'enigma-bbs-' + enigVersion + '-srv',
 
 			//	Note that sending 'banner' breaks at least EtherTerm!
 			debug : (sshDebugLine) => {
-				if(true === Config.loginServers.ssh.traceConnections) {
+				if(true === config.loginServers.ssh.traceConnections) {
 					Log.trace(`SSH: ${sshDebugLine}`);
 				}
 			},
@@ -265,9 +267,10 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 	}
 
 	listen() {
-		const port = parseInt(Config.loginServers.ssh.port);
+		const config = Config();
+		const port = parseInt(config.loginServers.ssh.port);
 		if(isNaN(port)) {
-			Log.error( { server : ModuleInfo.name, port : Config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );
+			Log.error( { server : ModuleInfo.name, port : config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );
 			return false;
 		}
 
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 3004513d..3a58ae4e 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -5,7 +5,7 @@
 const baseClient					= require('../../client.js');
 const Log							= require('../../logger.js').log;
 const LoginServerModule				= require('../../login_server_module.js');
-const Config						= require('../../config.js').config;
+const Config						= require('../../config.js').get;
 const EnigAssert					= require('../../enigma_assert.js');
 const { stringFromNullTermBuffer }	= require('../../string_util.js');
 
@@ -549,7 +549,7 @@ function TelnetClient(input, output) {
 	});
 
 	this.connectionTrace = (info, msg) => {
-		if(Config.loginServers.telnet.traceConnections) {
+		if(Config().loginServers.telnet.traceConnections) {
 			const logger = self.log || Log;
 			return logger.trace(info, `Telnet: ${msg}`);
 		}
@@ -568,7 +568,7 @@ function TelnetClient(input, output) {
 	this.readyNow = () => {
 		if(!this.didReady) {
 			this.didReady = true;
-			this.emit('ready', { firstMenu : Config.loginServers.telnet.firstMenu } );
+			this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
 		}
 	};
 }
@@ -879,9 +879,10 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
 	}
 
 	listen() {
-		const port = parseInt(Config.loginServers.telnet.port);
+		const config = Config();
+		const port = parseInt(config.loginServers.telnet.port);
 		if(isNaN(port)) {
-			Log.error( { server : ModuleInfo.name, port : Config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
+			Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
 			return false;
 		}
 
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index ed12bf0b..e30d0303 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config			= require('../../config.js').config;
+const Config			= require('../../config.js').get;
 const TelnetClient		= require('./telnet.js').TelnetClient;
 const Log				= require('../../logger.js').log;
 const LoginServerModule	= require('../../login_server_module.js');
@@ -92,7 +92,7 @@ function WebSocketClient(ws, req, serverType) {
 	//	If the config allows it, look for 'x-forwarded-proto' as "https"
 	//	to override |isSecure|
 	//
-	if(true === _.get(Config, 'loginServers.webSocket.proxied') &&
+	if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
 		'https' === req.headers['x-forwarded-proto'])
 	{
 		Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
@@ -120,7 +120,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 		//	* insecure websocket (ws://)
 		//	* secure (tls) websocket (wss://)
 		//
-		const config = _.get(Config, 'loginServers.webSocket');
+		const config = _.get(Config(), 'loginServers.webSocket');
 		if(!_.isObject(config)) {
 			return;
 		}
@@ -162,7 +162,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 			}
 
 			const serverName 	= `${ModuleInfo.name} (${serverType})`;
-			const port			= parseInt(_.get(Config, [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
+			const port			= parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
 
 			if(isNaN(port)) {
 				Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
diff --git a/core/show_art.js b/core/show_art.js
index fbbb3141..6fb8d01b 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -5,7 +5,7 @@
 const MenuModule	= require('./menu_module.js').MenuModule;
 const Errors		= require('../core/enig_error.js').Errors;
 const ANSI			= require('./ansi_term.js');
-const Config		= require('./config.js').config;
+const Config		= require('./config.js').get;
 
 //	deps
 const async			= require('async');
@@ -90,7 +90,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
 			}
 
 			//	further resolve key -> file base area art
-			const artSpec = _.get(Config, [ 'fileBase', 'areas', key, 'art' ]);
+			const artSpec = _.get(Config(), [ 'fileBase', 'areas', key, 'art' ]);
 			if(!artSpec) {
 				return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
 			}
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index beb6bcce..e2d01a89 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -3,7 +3,7 @@
 
 //	ENiGMA½
 const User						= require('./user.js');
-const Config					= require('./config.js').config;
+const Config					= require('./config.js').get;
 const Log						= require('./logger.js').log;
 const { getAddressedToInfo } 	= require('./mail_util.js');
 const Message					= require('./message.js');
@@ -30,14 +30,15 @@ function validateMessageSubject(data, cb) {
 }
 
 function validateUserNameAvail(data, cb) {
-	if(!data || data.length < Config.users.usernameMin) {
+	const config = Config();
+	if(!data || data.length < config.users.usernameMin) {
 		cb(new Error('Username too short'));
-	} else if(data.length > Config.users.usernameMax) {
+	} else if(data.length > config.users.usernameMax) {
 		//	generally should be unreached due to view restraints
 		return cb(new Error('Username too long'));
 	} else {
-		const usernameRegExp	= new RegExp(Config.users.usernamePattern);
-		const invalidNames		= Config.users.newUserNames + Config.users.badUserNames;
+		const usernameRegExp	= new RegExp(config.users.usernamePattern);
+		const invalidNames		= config.users.newUserNames + config.users.badUserNames;
 
 		if(!usernameRegExp.test(data)) {
 			return cb(new Error('Username contains invalid characters'));
@@ -133,12 +134,13 @@ function validateBirthdate(data, cb) {
 }
 
 function validatePasswordSpec(data, cb) {
-	if(!data || data.length < Config.users.passwordMin) {
+	const config = Config();
+	if(!data || data.length < config.users.passwordMin) {
 		return cb(new Error('Password too short'));
 	}
 
 	//	check badpass, if avail
-	fs.readFile(Config.users.badPassFile, 'utf8', (err, passwords) => {
+	fs.readFile(config.users.badPassFile, 'utf8', (err, passwords) => {
 		if(err) {
 			Log.warn( { error : err.message }, 'Cannot read bad pass file');
 			return cb(null);
diff --git a/core/theme.js b/core/theme.js
index 77c737fc..5545fad3 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-const Config			= require('./config.js').config;
+const Config			= require('./config.js').get;
 const art				= require('./art.js');
 const ansi				= require('./ansi_term.js');
 const Log				= require('./logger.js').log;
@@ -38,7 +38,7 @@ function refreshThemeHelpers(theme) {
 			let pwChar = _.get(
 				theme,
 				'customization.defaults.general.passwordChar',
-				Config.defaults.passwordChar
+				Config().defaults.passwordChar
 			);
 
 			if(_.isString(pwChar)) {
@@ -50,22 +50,22 @@ function refreshThemeHelpers(theme) {
 			return pwChar;
 		},
 		getDateFormat : function(style = 'short') {
-			const format = Config.defaults.dateFormat[style] || 'MM/DD/YYYY';
+			const format = Config().defaults.dateFormat[style] || 'MM/DD/YYYY';
 			return _.get(theme, `customization.defaults.dateFormat.${style}`, format);
 		},
 		getTimeFormat : function(style = 'short') {
-			const format = Config.defaults.timeFormat[style] || 'h:mm a';
+			const format = Config().defaults.timeFormat[style] || 'h:mm a';
 			return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
 		},
 		getDateTimeFormat : function(style = 'short') {
-			const format = Config.defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
+			const format = Config().defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
 			return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
 		}
 	};
 }
 
 function loadTheme(themeId, cb) {
-	const path = paths.join(Config.paths.themes, themeId, 'theme.hjson');
+	const path = paths.join(Config().paths.themes, themeId, 'theme.hjson');
 
 	const changed = ( { fileName, fileRoot } ) => {
 		const reCachedPath = paths.join(fileRoot, fileName);
@@ -262,15 +262,16 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
 }
 
 function reloadTheme(themeId) {
+	const config = Config();
 	async.waterfall(
 		[
 			function loadMenuConfig(callback) {
-				getFullConfig(Config.general.menuFile, (err, menuConfig) => {
+				getFullConfig(config.general.menuFile, (err, menuConfig) => {
 					return callback(err, menuConfig);
 				});
 			},
 			function loadPromptConfig(menuConfig, callback) {
-				getFullConfig(Config.general.promptFile, (err, promptConfig) => {
+				getFullConfig(config.general.promptFile, (err, promptConfig) => {
 					return callback(err, menuConfig, promptConfig);
 				});
 			},
@@ -312,21 +313,21 @@ function reloadAllThemes()
 }
 
 function initAvailableThemes(cb) {
-
+	const config = Config();
 	async.waterfall(
 		[
 			function loadMenuConfig(callback) {
-				getFullConfig(Config.general.menuFile, (err, menuConfig) => {
+				getFullConfig(config.general.menuFile, (err, menuConfig) => {
 					return callback(err, menuConfig);
 				});
 			},
 			function loadPromptConfig(menuConfig, callback) {
-				getFullConfig(Config.general.promptFile, (err, promptConfig) => {
+				getFullConfig(config.general.promptFile, (err, promptConfig) => {
 					return callback(err, menuConfig, promptConfig);
 				});
 			},
 			function getThemeDirectories(menuConfig, promptConfig, callback) {
-				fs.readdir(Config.paths.themes, (err, files) =>  {
+				fs.readdir(config.paths.themes, (err, files) =>  {
 					if(err) {
 						return callback(err);
 					}
@@ -337,7 +338,7 @@ function initAvailableThemes(cb) {
 						promptConfig,
 						files.filter( f => {
 							//	sync normally not allowed -- initAvailableThemes() is a startup-only method, however
-							return fs.statSync(paths.join(Config.paths.themes, f)).isDirectory();
+							return fs.statSync(paths.join(config.paths.themes, f)).isDirectory();
 						})
 					);
 				});
@@ -394,12 +395,13 @@ function setClientTheme(client, themeId) {
 
 	let msg;
 	let setThemeId;
+	const config = Config();
 	if(availThemes.has(themeId)) {
 		msg = 'Set client theme';
 		setThemeId = themeId;
-	} else if(availThemes.has(Config.defaults.theme)) {
+	} else if(availThemes.has(config.defaults.theme)) {
 		msg = 'Failed setting theme by supplied ID; Using default';
-		setThemeId = Config.defaults.theme;
+		setThemeId = config.defaults.theme;
 	} else {
 		msg = 'Failed setting theme by system default ID; Using the first one we can find';
 		setThemeId = availThemes.keys().next().value;
@@ -421,10 +423,11 @@ function getThemeArt(options, cb) {
 	//		readSauce
 	//		random
 	//
+	const config = Config();
 	if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
 		options.themeId = options.client.user.properties.theme_id;
 	} else {
-		options.themeId = Config.defaults.theme;
+		options.themeId = config.defaults.theme;
 	}
 
 	//	:TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
@@ -465,17 +468,17 @@ function getThemeArt(options, cb) {
 					return callback(null, artInfo);
 				}
 
-				options.basePath = paths.join(Config.paths.themes, options.themeId);
+				options.basePath = paths.join(config.paths.themes, options.themeId);
 				art.getArt(options.name, options, (err, artInfo) => {
 					return callback(null, artInfo);
 				});
 			},
 			function fromDefaultTheme(artInfo, callback) {
-				if(artInfo || Config.defaults.theme === options.themeId) {
+				if(artInfo || config.defaults.theme === options.themeId) {
 					return callback(null, artInfo);
 				}
 
-				options.basePath = paths.join(Config.paths.themes, Config.defaults.theme);
+				options.basePath = paths.join(config.paths.themes, config.defaults.theme);
 				art.getArt(options.name, options, (err, artInfo) => {
 					return callback(null, artInfo);
 				});
@@ -485,7 +488,7 @@ function getThemeArt(options, cb) {
 					return callback(null, artInfo);
 				}
 
-				options.basePath = Config.paths.art;
+				options.basePath = config.paths.art;
 				art.getArt(options.name, options, (err, artInfo) => {
 					return callback(err, artInfo);
 				});
diff --git a/core/user.js b/core/user.js
index 7f50223d..457604b3 100644
--- a/core/user.js
+++ b/core/user.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const userDb		= require('./database.js').dbs.user;
-const Config		= require('./config.js').config;
+const Config		= require('./config.js').get;
 const userGroup		= require('./user_group.js');
 const Errors		= require('./enig_error.js').Errors;
 const Events		= require('./events.js');
@@ -56,7 +56,7 @@ module.exports = class User {
 	}
 
 	isValid() {
-		if(this.userId <= 0 || this.username.length < Config.users.usernameMin) {
+		if(this.userId <= 0 || this.username.length < Config().users.usernameMin) {
 			return false;
 		}
 
@@ -181,15 +181,16 @@ module.exports = class User {
 
 	create(password, cb) {
 		assert(0 === this.userId);
+		const config = Config();
 
-		if(this.username.length < Config.users.usernameMin || this.username.length > Config.users.usernameMax) {
+		if(this.username.length < config.users.usernameMin || this.username.length > config.users.usernameMax) {
 			return cb(Errors.Invalid('Invalid username length'));
 		}
 
 		const self = this;
 
 		//	:TODO: set various defaults, e.g. default activation status, etc.
-		self.properties.account_status = Config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
+		self.properties.account_status = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
 
 		async.waterfall(
 			[
@@ -229,7 +230,7 @@ module.exports = class User {
 					});
 				},
 				function setInitialGroupMembership(trans, callback) {
-					self.groups = Config.users.defaultGroups;
+					self.groups = config.users.defaultGroups;
 
 					if(User.RootUserID === self.userId) {	//	root/SysOp?
 						self.groups.push('sysops');
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 6ea1e6f8..2f98823c 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -2,7 +2,7 @@
 'use strict';
 
 //	ENiGMA½
-const Config				= require('./config.js').config;
+const Config				= require('./config.js').get;
 const Errors				= require('./enig_error.js').Errors;
 const getServer				= require('./listening_server.js').getServer;
 const webServerPackageName	= require('./servers/content/web.js').moduleInfo.packageName;
@@ -89,12 +89,13 @@ class WebPasswordReset {
 
 				},
 				function getEmailTemplates(user, callback) {
-					fs.readFile(Config.contentServers.web.resetPassword.resetPassEmailText, 'utf8', (err, textTemplate) => {
+					const config = Config();
+					fs.readFile(config.contentServers.web.resetPassword.resetPassEmailText, 'utf8', (err, textTemplate) => {
 						if(err) {
 							textTemplate = PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT;
 						}
 
-						fs.readFile(Config.contentServers.web.resetPassword.resetPassEmailHtml, 'utf8', (err, htmlTemplate) => {
+						fs.readFile(config.contentServers.web.resetPassword.resetPassEmailHtml, 'utf8', (err, htmlTemplate) => {
 							return callback(null, user, textTemplate, htmlTemplate);
 						});
 					});
@@ -106,7 +107,7 @@ class WebPasswordReset {
 
 					function replaceTokens(s) {
 						return s
-							.replace(/%BOARDNAME%/g,	Config.general.boardName)
+							.replace(/%BOARDNAME%/g,	Config().general.boardName)
 							.replace(/%USERNAME%/g, 	user.username)
 							.replace(/%TOKEN%/g,		user.properties.email_password_reset_token)
 							.replace(/%RESET_URL%/g,	resetUrl)
@@ -229,12 +230,13 @@ class WebPasswordReset {
 
 			const postResetUrl = webServer.instance.buildUrl('/reset_password');
 
+			const config = Config();
 			return webServer.instance.routeTemplateFilePage(
-				Config.contentServers.web.resetPassword.resetPageTemplate,
+				config.contentServers.web.resetPassword.resetPageTemplate,
 				(templateData, preprocessFinished) => {
 
 					const finalPage = templateData
-						.replace(/%BOARDNAME%/g,	Config.general.boardName)
+						.replace(/%BOARDNAME%/g,	config.general.boardName)
 						.replace(/%USERNAME%/g,		user.username)
 						.replace(/%TOKEN%/g,		token)
 						.replace(/%RESET_URL%/g,	postResetUrl)
@@ -262,9 +264,10 @@ class WebPasswordReset {
 		req.on('end', () => {
 			const formData = querystring.parse(bodyData);
 
+			const config = Config();
 			if(!formData.token || !formData.password || !formData.confirm_password ||
 				formData.password !== formData.confirm_password ||
-				formData.password.length < Config.users.passwordMin || formData.password.length > Config.users.passwordMax)
+				formData.password.length < config.users.passwordMin || formData.password.length > config.users.passwordMax)
 			{
 				return badRequest();
 			}

From 6325f92fa5e6880a48eb6168f0590c28cf585b5f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 Jun 2018 18:37:48 -0600
Subject: [PATCH 0332/1013] Increase max listeners in Events - experimental:
 may change this in the near future

---
 core/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/events.js b/core/events.js
index e50c5723..7bf307ad 100644
--- a/core/events.js
+++ b/core/events.js
@@ -14,6 +14,7 @@ const glob				= require('glob');
 module.exports = new class Events extends events.EventEmitter {
 	constructor() {
 		super();
+		this.setMaxListeners(32);	//	:TODO: play with this...
 	}
 
 	getSystemEvents() {

From 5ddf04c8826608c3d64f2ecf17da9c9495698d3f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 Jun 2018 22:58:56 -0600
Subject: [PATCH 0333/1013] Change tab rule to spaces

---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 5e9b45b6..612da123 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,7 +7,7 @@
     "rules": {
         "indent": [
             "error",
-            "tab",
+            4,
             {
                 "SwitchCase" : 1
             }

From e9787cee3e2a6ef8bc0b1446c4db349dc9ea2610 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 Jun 2018 23:15:04 -0600
Subject: [PATCH 0334/1013] ENiGMA 1/2 WILL USE SPACES FROM THIS POINT ON VS
 TABS * Really just to make GitHub formatting happy. Arg.

---
 core/abracadabra.js                    |  216 +-
 core/acs.js                            |  124 +-
 core/ansi_escape_parser.js             |  696 ++--
 core/ansi_prep.js                      |  330 +-
 core/ansi_term.js                      |  554 ++--
 core/archive_util.js                   |  494 +--
 core/art.js                            |  550 ++--
 core/asset.js                          |  138 +-
 core/bbs.js                            |  452 +--
 core/bbs_link.js                       |  282 +-
 core/bbs_list.js                       |  708 ++--
 core/button_view.js                    |   26 +-
 core/client.js                         |  718 ++---
 core/client_connections.js             |  138 +-
 core/client_term.js                    |  274 +-
 core/color_codes.js                    |  392 +--
 core/combatnet.js                      |  168 +-
 core/conf_area_util.js                 |   26 +-
 core/config.js                         | 1422 ++++----
 core/config_cache.js                   |  104 +-
 core/config_util.js                    |   86 +-
 core/connect.js                        |  268 +-
 core/crc.js                            |  154 +-
 core/database.js                       |  330 +-
 core/descript_ion_file.js              |  102 +-
 core/door.js                           |  206 +-
 core/door_party.js                     |  196 +-
 core/download_queue.js                 |  112 +-
 core/dropfile.js                       |  328 +-
 core/edit_text_view.js                 |  110 +-
 core/email.js                          |   24 +-
 core/enig_error.js                     |   60 +-
 core/enigma_assert.js                  |   12 +-
 core/erc_client.js                     |  234 +-
 core/event_scheduler.js                |  386 +--
 core/events.js                         |  106 +-
 core/exodus.js                         |  298 +-
 core/file_area_filter_edit.js          |  550 ++--
 core/file_area_list.js                 | 1346 ++++----
 core/file_area_web.js                  |  754 ++---
 core/file_base_area.js                 | 1482 ++++-----
 core/file_base_area_select.js          |  116 +-
 core/file_base_download_manager.js     |  352 +-
 core/file_base_filter.js               |  236 +-
 core/file_base_list_export.js          |  474 +--
 core/file_base_search.js               |  172 +-
 core/file_base_user_list_export.js     |  406 +--
 core/file_base_web_download_manager.js |  428 +--
 core/file_entry.js                     | 1000 +++---
 core/file_transfer.js                  |  852 ++---
 core/file_transfer_protocol_select.js  |  222 +-
 core/file_util.js                      |  104 +-
 core/fnv1a.js                          |   62 +-
 core/fse.js                            | 1804 +++++------
 core/ftn_address.js                    |  276 +-
 core/ftn_mail_packet.js                | 1736 +++++-----
 core/ftn_util.js                       |  354 +-
 core/horizontal_menu_view.js           |  190 +-
 core/key_entry_view.js                 |  102 +-
 core/last_callers.js                   |  204 +-
 core/listening_server.js               |   68 +-
 core/logger.js                         |  108 +-
 core/login_server_module.js            |  114 +-
 core/mail_packet.js                    |   32 +-
 core/mail_util.js                      |   88 +-
 core/mask_edit_text_view.js            |  252 +-
 core/mci_view_factory.js               |  278 +-
 core/menu_module.js                    |  666 ++--
 core/menu_stack.js                     |  282 +-
 core/menu_util.js                      |  390 +--
 core/menu_view.js                      |  330 +-
 core/message.js                        | 1226 +++----
 core/message_area.js                   |  890 ++---
 core/message_base_search.js            |  216 +-
 core/mime_util.js                      |   44 +-
 core/misc_util.js                      |   36 +-
 core/mod_mixins.js                     |   42 +-
 core/module_util.js                    |  138 +-
 core/msg_area_list.js                  |  234 +-
 core/msg_area_post_fse.js              |   92 +-
 core/msg_area_reply_fse.js             |    8 +-
 core/msg_area_view_fse.js              |  204 +-
 core/msg_conf_list.js                  |  218 +-
 core/msg_list.js                       |  376 +--
 core/msg_network.js                    |   84 +-
 core/msg_scan_toss_module.js           |    6 +-
 core/multi_line_edit_text_view.js      | 1936 +++++------
 core/new_scan.js                       |  396 +--
 core/nua.js                            |  208 +-
 core/onelinerz.js                      |  498 +--
 core/oputil/oputil_common.js           |  102 +-
 core/oputil/oputil_config.js           |  928 +++---
 core/oputil/oputil_file_base.js        | 1108 +++----
 core/oputil/oputil_help.js             |   14 +-
 core/oputil/oputil_main.js             |   30 +-
 core/oputil/oputil_message_base.js     |  214 +-
 core/oputil/oputil_user.js             |  288 +-
 core/predefined_mci.js                 |  366 +--
 core/rumorz.js                         |  390 +--
 core/sauce.js                          |  230 +-
 core/scanner_tossers/ftn_bso.js        | 4110 ++++++++++++------------
 core/server_module.js                  |    2 +-
 core/servers/content/gopher.js         |  504 +--
 core/servers/content/web.js            |  366 +--
 core/servers/login/ssh.js              |  398 +--
 core/servers/login/telnet.js           | 1200 +++----
 core/servers/login/websocket.js        |  292 +-
 core/set_newscan_date.js               |  396 +--
 core/show_art.js                       |  270 +-
 core/spinner_menu_view.js              |  118 +-
 core/standard_menu.js                  |   30 +-
 core/stat_log.js                       |  416 +--
 core/string_format.js                  |  482 +--
 core/string_util.js                    |  544 ++--
 core/system_events.js                  |   34 +-
 core/system_menu_method.js             |  196 +-
 core/system_view_validate.js           |  184 +-
 core/telnet_bridge.js                  |  292 +-
 core/text_view.js                      |  238 +-
 core/theme.js                          | 1084 +++----
 core/tic_file_info.js                  |  426 +--
 core/toggle_menu_view.js               |  116 +-
 core/upload.js                         | 1392 ++++----
 core/user.js                           |  984 +++---
 core/user_config.js                    |  352 +-
 core/user_group.js                     |   68 +-
 core/user_list.js                      |  138 +-
 core/user_login.js                     |  140 +-
 core/uuid_util.js                      |   44 +-
 core/vertical_menu_view.js             |  452 +--
 core/view.js                           |  350 +-
 core/view_controller.js                | 1290 ++++----
 core/web_password_reset.js             |  452 +--
 core/whos_online.js                    |  112 +-
 core/word_wrap.js                      |  146 +-
 135 files changed, 27397 insertions(+), 27397 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 0ac17887..77a5e4c3 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -18,9 +18,9 @@ const mkdirs			= require('fs-extra').mkdirs;
 const activeDoorNodeInstances = {};
 
 exports.moduleInfo = {
-	name	: 'Abracadabra',
-	desc	: 'External BBS Door Module',
-	author	: 'NuSkooler',
+    name	: 'Abracadabra',
+    desc	: 'External BBS Door Module',
+    author	: 'NuSkooler',
 };
 
 /*
@@ -60,138 +60,138 @@ exports.moduleInfo = {
 */
 
 exports.getModule = class AbracadabraModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config = options.menuConfig.config;
-		//	:TODO: MenuModule.validateConfig(cb) -- validate config section gracefully instead of asserts! -- { key : type, key2 : type2, ... }
-		assert(_.isString(this.config.name, 		'Config \'name\' is required'));
-		assert(_.isString(this.config.dropFileType,	'Config \'dropFileType\' is required'));
-		assert(_.isString(this.config.cmd,			'Config \'cmd\' is required'));
+        this.config = options.menuConfig.config;
+        //	:TODO: MenuModule.validateConfig(cb) -- validate config section gracefully instead of asserts! -- { key : type, key2 : type2, ... }
+        assert(_.isString(this.config.name, 		'Config \'name\' is required'));
+        assert(_.isString(this.config.dropFileType,	'Config \'dropFileType\' is required'));
+        assert(_.isString(this.config.cmd,			'Config \'cmd\' is required'));
 
-		this.config.nodeMax		= this.config.nodeMax || 0;
-		this.config.args		= this.config.args || [];
-	}
+        this.config.nodeMax		= this.config.nodeMax || 0;
+        this.config.args		= this.config.args || [];
+    }
 
-	/*
+    /*
 		:TODO:
 		* disconnecting wile door is open leaves dosemu
 		* http://bbslink.net/sysop.php support
 		* Font support ala all other menus... or does this just work?
 	*/
 
-	initSequence() {
-		const self = this;
+    initSequence() {
+        const self = this;
 
-		async.series(
-			[
-				function validateNodeCount(callback) {
-					if(self.config.nodeMax > 0 &&
+        async.series(
+            [
+                function validateNodeCount(callback) {
+                    if(self.config.nodeMax > 0 &&
 						_.isNumber(activeDoorNodeInstances[self.config.name]) &&
 						activeDoorNodeInstances[self.config.name] + 1 > self.config.nodeMax)
-					{
-						self.client.log.info(
-							{
-								name		: self.config.name,
-								activeCount : activeDoorNodeInstances[self.config.name]
-							},
-							'Too many active instances');
+                    {
+                        self.client.log.info(
+                            {
+                                name		: self.config.name,
+                                activeCount : activeDoorNodeInstances[self.config.name]
+                            },
+                            'Too many active instances');
 
-						if(_.isString(self.config.tooManyArt)) {
-							theme.displayThemeArt( { client : self.client, name : self.config.tooManyArt }, function displayed() {
-								self.pausePrompt( () => {
-									callback(new Error('Too many active instances'));
-								});
-							});
-						} else {
-							self.client.term.write('\nToo many active instances. Try again later.\n');
+                        if(_.isString(self.config.tooManyArt)) {
+                            theme.displayThemeArt( { client : self.client, name : self.config.tooManyArt }, function displayed() {
+                                self.pausePrompt( () => {
+                                    callback(new Error('Too many active instances'));
+                                });
+                            });
+                        } else {
+                            self.client.term.write('\nToo many active instances. Try again later.\n');
 
-							//	:TODO: Use MenuModule.pausePrompt()
-							self.pausePrompt( () => {
-								callback(new Error('Too many active instances'));
-							});
-						}
-					} else {
-						//	:TODO: JS elegant way to do this?
-						if(activeDoorNodeInstances[self.config.name]) {
-							activeDoorNodeInstances[self.config.name] += 1;
-						} else {
-							activeDoorNodeInstances[self.config.name] = 1;
-						}
+                            //	:TODO: Use MenuModule.pausePrompt()
+                            self.pausePrompt( () => {
+                                callback(new Error('Too many active instances'));
+                            });
+                        }
+                    } else {
+                        //	:TODO: JS elegant way to do this?
+                        if(activeDoorNodeInstances[self.config.name]) {
+                            activeDoorNodeInstances[self.config.name] += 1;
+                        } else {
+                            activeDoorNodeInstances[self.config.name] = 1;
+                        }
 
-						callback(null);
-					}
-				},
-				function generateDropfile(callback) {
-					self.dropFile	= new DropFile(self.client, self.config.dropFileType);
-					var fullPath	= self.dropFile.fullPath;
+                        callback(null);
+                    }
+                },
+                function generateDropfile(callback) {
+                    self.dropFile	= new DropFile(self.client, self.config.dropFileType);
+                    var fullPath	= self.dropFile.fullPath;
 
-					mkdirs(paths.dirname(fullPath), function dirCreated(err) {
-						if(err) {
-							callback(err);
-						} else {
-							self.dropFile.createFile(function created(err) {
-								callback(err);
-							});
-						}
-					});
-				}
-			],
-			function complete(err) {
-				if(err) {
-					self.client.log.warn( { error : err.toString() }, 'Could not start door');
-					self.lastError = err;
-					self.prevMenu();
-				} else {
-					self.finishedLoading();
-				}
-			}
-		);
-	}
+                    mkdirs(paths.dirname(fullPath), function dirCreated(err) {
+                        if(err) {
+                            callback(err);
+                        } else {
+                            self.dropFile.createFile(function created(err) {
+                                callback(err);
+                            });
+                        }
+                    });
+                }
+            ],
+            function complete(err) {
+                if(err) {
+                    self.client.log.warn( { error : err.toString() }, 'Could not start door');
+                    self.lastError = err;
+                    self.prevMenu();
+                } else {
+                    self.finishedLoading();
+                }
+            }
+        );
+    }
 
-	runDoor() {
+    runDoor() {
 
-		const exeInfo = {
-			cmd			: this.config.cmd,
-			args		: this.config.args,
-			io			: this.config.io || 'stdio',
-			encoding	: this.config.encoding || this.client.term.outputEncoding,
-			dropFile	: this.dropFile.fileName,
-			node		: this.client.node,
-			//inhSocket	: this.client.output._handle.fd,
-		};
+        const exeInfo = {
+            cmd			: this.config.cmd,
+            args		: this.config.args,
+            io			: this.config.io || 'stdio',
+            encoding	: this.config.encoding || this.client.term.outputEncoding,
+            dropFile	: this.dropFile.fileName,
+            node		: this.client.node,
+            //inhSocket	: this.client.output._handle.fd,
+        };
 
-		const doorInstance = new door.Door(this.client, exeInfo);
+        const doorInstance = new door.Door(this.client, exeInfo);
 
-		doorInstance.once('finished', () => {
-			//
-			//	Try to clean up various settings such as scroll regions that may
-			//	have been set within the door
-			//
-			this.client.term.rawWrite(
-				ansi.normal() +
+        doorInstance.once('finished', () => {
+            //
+            //	Try to clean up various settings such as scroll regions that may
+            //	have been set within the door
+            //
+            this.client.term.rawWrite(
+                ansi.normal() +
 				ansi.goto(this.client.term.termHeight, this.client.term.termWidth) +
 				ansi.setScrollRegion() +
 				ansi.goto(this.client.term.termHeight, 0) +
 				'\r\n\r\n'
-			);
+            );
 
-			this.prevMenu();
-		});
+            this.prevMenu();
+        });
 
-		this.client.term.write(ansi.resetScreen());
+        this.client.term.write(ansi.resetScreen());
 
-		doorInstance.run();
-	}
+        doorInstance.run();
+    }
 
-	leave() {
-		super.leave();
-		if(!this.lastError) {
-			activeDoorNodeInstances[this.config.name] -= 1;
-		}
-	}
+    leave() {
+        super.leave();
+        if(!this.lastError) {
+            activeDoorNodeInstances[this.config.name] -= 1;
+        }
+    }
 
-	finishedLoading() {
-		this.runDoor();
-	}
+    finishedLoading() {
+        this.runDoor();
+    }
 };
diff --git a/core/acs.js b/core/acs.js
index 90c7c2a6..b1461400 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -10,81 +10,81 @@ const assert	= require('assert');
 const _			= require('lodash');
 
 class ACS {
-	constructor(client) {
-		this.client = client;
-	}
+    constructor(client) {
+        this.client = client;
+    }
 
-	check(acs, scope, defaultAcs) {
-		acs = acs ? acs[scope] : defaultAcs;
-		acs = acs || defaultAcs;
-		try {
-			return checkAcs(acs, { client : this.client } );
-		} catch(e) {
-			Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
-			return false;
-		}
-	}
+    check(acs, scope, defaultAcs) {
+        acs = acs ? acs[scope] : defaultAcs;
+        acs = acs || defaultAcs;
+        try {
+            return checkAcs(acs, { client : this.client } );
+        } catch(e) {
+            Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
+            return false;
+        }
+    }
 
-	//
-	//	Message Conferences & Areas
-	//
-	hasMessageConfRead(conf) {
-		return this.check(conf.acs, 'read', ACS.Defaults.MessageConfRead);
-	}
+    //
+    //	Message Conferences & Areas
+    //
+    hasMessageConfRead(conf) {
+        return this.check(conf.acs, 'read', ACS.Defaults.MessageConfRead);
+    }
 
-	hasMessageAreaRead(area) {
-		return this.check(area.acs, 'read', ACS.Defaults.MessageAreaRead);
-	}
+    hasMessageAreaRead(area) {
+        return this.check(area.acs, 'read', ACS.Defaults.MessageAreaRead);
+    }
 
-	//
-	//	File Base / Areas
-	//
-	hasFileAreaRead(area) {
-		return this.check(area.acs, 'read', ACS.Defaults.FileAreaRead);
-	}
+    //
+    //	File Base / Areas
+    //
+    hasFileAreaRead(area) {
+        return this.check(area.acs, 'read', ACS.Defaults.FileAreaRead);
+    }
 
-	hasFileAreaWrite(area) {
-		return this.check(area.acs, 'write', ACS.Defaults.FileAreaWrite);
-	}
+    hasFileAreaWrite(area) {
+        return this.check(area.acs, 'write', ACS.Defaults.FileAreaWrite);
+    }
 
-	hasFileAreaDownload(area) {
-		return this.check(area.acs, 'download', ACS.Defaults.FileAreaDownload);
-	}
+    hasFileAreaDownload(area) {
+        return this.check(area.acs, 'download', ACS.Defaults.FileAreaDownload);
+    }
 
-	getConditionalValue(condArray, memberName) {
-		if(!Array.isArray(condArray)) {
-			//	no cond array, just use the value
-			return condArray;
-		}
+    getConditionalValue(condArray, memberName) {
+        if(!Array.isArray(condArray)) {
+            //	no cond array, just use the value
+            return condArray;
+        }
 
-		assert(_.isString(memberName));
+        assert(_.isString(memberName));
 
-		const matchCond = condArray.find( cond => {
-			if(_.has(cond, 'acs')) {
-				try {
-					return checkAcs(cond.acs, { client : this.client } );
-				} catch(e) {
-					Log.warn( { exception : e, acs : cond }, 'Exception caught checking ACS');
-					return false;
-				}
-			} else {
-				return true;	//	no acs check req.
-			}
-		});
+        const matchCond = condArray.find( cond => {
+            if(_.has(cond, 'acs')) {
+                try {
+                    return checkAcs(cond.acs, { client : this.client } );
+                } catch(e) {
+                    Log.warn( { exception : e, acs : cond }, 'Exception caught checking ACS');
+                    return false;
+                }
+            } else {
+                return true;	//	no acs check req.
+            }
+        });
 
-		if(matchCond) {
-			return matchCond[memberName];
-		}
-	}
+        if(matchCond) {
+            return matchCond[memberName];
+        }
+    }
 }
 
 ACS.Defaults = {
-	MessageAreaRead		: 'GM[users]',
-	MessageConfRead		: 'GM[users]',
+    MessageAreaRead		: 'GM[users]',
+    MessageConfRead		: 'GM[users]',
 
-	FileAreaRead		: 'GM[users]',
-	FileAreaWrite		: 'GM[sysops]',
-	FileAreaDownload	: 'GM[users]',
+    FileAreaRead		: 'GM[users]',
+    FileAreaWrite		: 'GM[sysops]',
+    FileAreaDownload	: 'GM[users]',
 };
 
-module.exports = ACS;
\ No newline at end of file
+module.exports = ACS;
diff --git a/core/ansi_escape_parser.js b/core/ansi_escape_parser.js
index feb7b164..49001363 100644
--- a/core/ansi_escape_parser.js
+++ b/core/ansi_escape_parser.js
@@ -16,278 +16,278 @@ const CR = 0x0d;
 const LF = 0x0a;
 
 function ANSIEscapeParser(options) {
-	var self = this;
+    var self = this;
 
-	events.EventEmitter.call(this);
+    events.EventEmitter.call(this);
 
-	this.column				= 1;
-	this.row				= 1;
-	this.scrollBack			= 0;
-	this.graphicRendition	= {};
+    this.column				= 1;
+    this.row				= 1;
+    this.scrollBack			= 0;
+    this.graphicRendition	= {};
 
-	this.parseState = {
-		re	: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
-	};
+    this.parseState = {
+        re	: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
+    };
 
-	options = miscUtil.valueWithDefault(options, {
-		mciReplaceChar		: '',
-		termHeight			: 25,
-		termWidth			: 80,
-		trailingLF			: 'default',	//	default|omit|no|yes, ...
-	});
+    options = miscUtil.valueWithDefault(options, {
+        mciReplaceChar		: '',
+        termHeight			: 25,
+        termWidth			: 80,
+        trailingLF			: 'default',	//	default|omit|no|yes, ...
+    });
 
-	this.mciReplaceChar		= miscUtil.valueWithDefault(options.mciReplaceChar, '');
-	this.termHeight			= miscUtil.valueWithDefault(options.termHeight, 25);
-	this.termWidth			= miscUtil.valueWithDefault(options.termWidth, 80);
-	this.trailingLF			= miscUtil.valueWithDefault(options.trailingLF, 'default');
+    this.mciReplaceChar		= miscUtil.valueWithDefault(options.mciReplaceChar, '');
+    this.termHeight			= miscUtil.valueWithDefault(options.termHeight, 25);
+    this.termWidth			= miscUtil.valueWithDefault(options.termWidth, 80);
+    this.trailingLF			= miscUtil.valueWithDefault(options.trailingLF, 'default');
 
-	self.moveCursor = function(cols, rows) {
-		self.column	+= cols;
-		self.row	+= rows;
+    self.moveCursor = function(cols, rows) {
+        self.column	+= cols;
+        self.row	+= rows;
 
-		self.column	= Math.max(self.column, 1);
-		self.column	= Math.min(self.column, self.termWidth);	//	can't move past term width
-		self.row	= Math.max(self.row, 1);
+        self.column	= Math.max(self.column, 1);
+        self.column	= Math.min(self.column, self.termWidth);	//	can't move past term width
+        self.row	= Math.max(self.row, 1);
 
-		self.positionUpdated();
-	};
+        self.positionUpdated();
+    };
 
-	self.saveCursorPosition = function() {
-		self.savedPosition = {
-			row		: self.row,
-			column	: self.column
-		};
-	};
+    self.saveCursorPosition = function() {
+        self.savedPosition = {
+            row		: self.row,
+            column	: self.column
+        };
+    };
 
-	self.restoreCursorPosition = function() {
-		self.row	= self.savedPosition.row;
-		self.column	= self.savedPosition.column;
-		delete self.savedPosition;
+    self.restoreCursorPosition = function() {
+        self.row	= self.savedPosition.row;
+        self.column	= self.savedPosition.column;
+        delete self.savedPosition;
 
-		self.positionUpdated();
-		//		self.rowUpdated();
-	};
+        self.positionUpdated();
+        //		self.rowUpdated();
+    };
 
-	self.clearScreen = function() {
-		//	:TODO: should be doing something with row/column?
-		self.emit('clear screen');
-	};
+    self.clearScreen = function() {
+        //	:TODO: should be doing something with row/column?
+        self.emit('clear screen');
+    };
 
-	/*
+    /*
 	self.rowUpdated = function() {
 		self.emit('row update', self.row + self.scrollBack);
 	};*/
 
-	self.positionUpdated = function() {
-		self.emit('position update', self.row, self.column);
-	};
+    self.positionUpdated = function() {
+        self.emit('position update', self.row, self.column);
+    };
 
-	function literal(text) {
-		const len	= text.length;
-		let pos		= 0;
-		let start	= 0;
-		let charCode;
+    function literal(text) {
+        const len	= text.length;
+        let pos		= 0;
+        let start	= 0;
+        let charCode;
 
-		while(pos < len) {
-			charCode = text.charCodeAt(pos) & 0xff;	//	8bit clean
+        while(pos < len) {
+            charCode = text.charCodeAt(pos) & 0xff;	//	8bit clean
 
-			switch(charCode) {
-				case CR :
-					self.emit('literal', text.slice(start, pos));
-					start = pos;
+            switch(charCode) {
+                case CR :
+                    self.emit('literal', text.slice(start, pos));
+                    start = pos;
 
-					self.column = 1;
+                    self.column = 1;
 
-					self.positionUpdated();
-					break;
+                    self.positionUpdated();
+                    break;
 
-				case LF :
-					self.emit('literal', text.slice(start, pos));
-					start = pos;
+                case LF :
+                    self.emit('literal', text.slice(start, pos));
+                    start = pos;
 
-					self.row += 1;
+                    self.row += 1;
 
-					self.positionUpdated();
-					break;
+                    self.positionUpdated();
+                    break;
 
-				default :
-					if(self.column === self.termWidth) {
-						self.emit('literal', text.slice(start, pos + 1));
-						start = pos + 1;
+                default :
+                    if(self.column === self.termWidth) {
+                        self.emit('literal', text.slice(start, pos + 1));
+                        start = pos + 1;
 
-						self.column = 1;
-						self.row	+= 1;
+                        self.column = 1;
+                        self.row	+= 1;
 
-						self.positionUpdated();
-					} else {
-						self.column += 1;
-					}
-					break;
-			}
+                        self.positionUpdated();
+                    } else {
+                        self.column += 1;
+                    }
+                    break;
+            }
 
-			++pos;
-		}
+            ++pos;
+        }
 
-		//
-		//	Finalize this chunk
-		//
-		if(self.column > self.termWidth) {
-			self.column = 1;
-			self.row	+= 1;
+        //
+        //	Finalize this chunk
+        //
+        if(self.column > self.termWidth) {
+            self.column = 1;
+            self.row	+= 1;
 
-			self.positionUpdated();
-		}
+            self.positionUpdated();
+        }
 
-		const rem = text.slice(start);
-		if(rem) {
-			self.emit('literal', rem);
-		}
-	}
+        const rem = text.slice(start);
+        if(rem) {
+            self.emit('literal', rem);
+        }
+    }
 
-	function parseMCI(buffer) {
-		//	:TODO: move this to "constants" seciton @ top
-		var mciRe = /%([A-Z]{2})([0-9]{1,2})?(?:\(([0-9A-Za-z,]+)\))*/g;
-		var pos = 0;
-		var match;
-		var mciCode;
-		var args;
-		var id;
+    function parseMCI(buffer) {
+        //	:TODO: move this to "constants" seciton @ top
+        var mciRe = /%([A-Z]{2})([0-9]{1,2})?(?:\(([0-9A-Za-z,]+)\))*/g;
+        var pos = 0;
+        var match;
+        var mciCode;
+        var args;
+        var id;
 
-		do {
-			pos		= mciRe.lastIndex;
-			match	= mciRe.exec(buffer);
+        do {
+            pos		= mciRe.lastIndex;
+            match	= mciRe.exec(buffer);
 
-			if(null !== match) {
-				if(match.index > pos) {
-					literal(buffer.slice(pos, match.index));
-				}
+            if(null !== match) {
+                if(match.index > pos) {
+                    literal(buffer.slice(pos, match.index));
+                }
 
-				mciCode	= match[1];
-				id		= match[2] || null;
+                mciCode	= match[1];
+                id		= match[2] || null;
 
-				if(match[3]) {
-					args = match[3].split(',');
-				} else {
-					args = [];
-				}
+                if(match[3]) {
+                    args = match[3].split(',');
+                } else {
+                    args = [];
+                }
 
-				//	if MCI codes are changing, save off the current color
-				var fullMciCode = mciCode + (id || '');
-				if(self.lastMciCode !== fullMciCode) {
+                //	if MCI codes are changing, save off the current color
+                var fullMciCode = mciCode + (id || '');
+                if(self.lastMciCode !== fullMciCode) {
 
-					self.lastMciCode = fullMciCode;
+                    self.lastMciCode = fullMciCode;
 
-					self.graphicRenditionForErase = _.clone(self.graphicRendition);
-				}
+                    self.graphicRenditionForErase = _.clone(self.graphicRendition);
+                }
 
 
-				self.emit('mci', {
-					mci		: mciCode,
-					id		: id ? parseInt(id, 10) : null,
-					args	: args,
-					SGR		: ansi.getSGRFromGraphicRendition(self.graphicRendition, true)
-				});
+                self.emit('mci', {
+                    mci		: mciCode,
+                    id		: id ? parseInt(id, 10) : null,
+                    args	: args,
+                    SGR		: ansi.getSGRFromGraphicRendition(self.graphicRendition, true)
+                });
 
-				if(self.mciReplaceChar.length > 0) {
-					const sgrCtrl = ansi.getSGRFromGraphicRendition(self.graphicRenditionForErase);
+                if(self.mciReplaceChar.length > 0) {
+                    const sgrCtrl = ansi.getSGRFromGraphicRendition(self.graphicRenditionForErase);
 
-					self.emit('control', sgrCtrl, 'm', sgrCtrl.slice(2).split(/[;m]/).slice(0, 3));
+                    self.emit('control', sgrCtrl, 'm', sgrCtrl.slice(2).split(/[;m]/).slice(0, 3));
 
-					literal(new Array(match[0].length + 1).join(self.mciReplaceChar));
-				} else {
-					literal(match[0]);
-				}
-			}
+                    literal(new Array(match[0].length + 1).join(self.mciReplaceChar));
+                } else {
+                    literal(match[0]);
+                }
+            }
 
-		} while(0 !== mciRe.lastIndex);
+        } while(0 !== mciRe.lastIndex);
 
-		if(pos < buffer.length) {
-			literal(buffer.slice(pos));
-		}
-	}
+        if(pos < buffer.length) {
+            literal(buffer.slice(pos));
+        }
+    }
 
-	self.reset = function(input) {
-		self.parseState = {
-			//	ignore anything past EOF marker, if any
-			buffer	: input.split(String.fromCharCode(0x1a), 1)[0],
-			re		: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
-			stop	: false,
-		};
-	};
+    self.reset = function(input) {
+        self.parseState = {
+            //	ignore anything past EOF marker, if any
+            buffer	: input.split(String.fromCharCode(0x1a), 1)[0],
+            re		: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
+            stop	: false,
+        };
+    };
 
-	self.stop = function()  {
-		self.parseState.stop = true;
-	};
+    self.stop = function()  {
+        self.parseState.stop = true;
+    };
 
-	self.parse = function(input) {
-		if(input) {
-			self.reset(input);
-		}
+    self.parse = function(input) {
+        if(input) {
+            self.reset(input);
+        }
 
-		//	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
-		var pos;
-		var match;
-		var opCode;
-		var args;
-		var re		= self.parseState.re;
-		var buffer	= self.parseState.buffer;
+        //	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
+        var pos;
+        var match;
+        var opCode;
+        var args;
+        var re		= self.parseState.re;
+        var buffer	= self.parseState.buffer;
 
-		self.parseState.stop = false;
+        self.parseState.stop = false;
 
-		do {
-			if(self.parseState.stop) {
-				return;
-			}
+        do {
+            if(self.parseState.stop) {
+                return;
+            }
 
-			pos		= re.lastIndex;
-			match	= re.exec(buffer);
+            pos		= re.lastIndex;
+            match	= re.exec(buffer);
 
-			if(null !== match) {
-				if(match.index > pos) {
-					parseMCI(buffer.slice(pos, match.index));
-				}
+            if(null !== match) {
+                if(match.index > pos) {
+                    parseMCI(buffer.slice(pos, match.index));
+                }
 
-				opCode	= match[2];
-				args	= match[1].split(';').map(v => parseInt(v, 10));	//	convert to array of ints
+                opCode	= match[2];
+                args	= match[1].split(';').map(v => parseInt(v, 10));	//	convert to array of ints
 
-				escape(opCode, args);
+                escape(opCode, args);
 
-				//self.emit('chunk', match[0]);
-				self.emit('control', match[0], opCode, args);
-			}
-		} while(0 !== re.lastIndex);
+                //self.emit('chunk', match[0]);
+                self.emit('control', match[0], opCode, args);
+            }
+        } while(0 !== re.lastIndex);
 
-		if(pos < buffer.length) {
-			var lastBit = buffer.slice(pos);
+        if(pos < buffer.length) {
+            var lastBit = buffer.slice(pos);
 
-			//	:TODO: check for various ending LF's, not just DOS \r\n
-			if('\r\n' === lastBit.slice(-2).toString()) {
-				switch(self.trailingLF) {
-					case 'default' :
-						//
-						//	Default is to *not* omit the trailing LF
-						//	if we're going to end on termHeight
-						//
-						if(this.termHeight === self.row) {
-							lastBit = lastBit.slice(0, -2);
-						}
-						break;
+            //	:TODO: check for various ending LF's, not just DOS \r\n
+            if('\r\n' === lastBit.slice(-2).toString()) {
+                switch(self.trailingLF) {
+                    case 'default' :
+                        //
+                        //	Default is to *not* omit the trailing LF
+                        //	if we're going to end on termHeight
+                        //
+                        if(this.termHeight === self.row) {
+                            lastBit = lastBit.slice(0, -2);
+                        }
+                        break;
 
-					case 'omit' :
-					case 'no' :
-					case false :
-						lastBit = lastBit.slice(0, -2);
-						break;
-				}
-			}
+                    case 'omit' :
+                    case 'no' :
+                    case false :
+                        lastBit = lastBit.slice(0, -2);
+                        break;
+                }
+            }
 
-			parseMCI(lastBit);
-		}
+            parseMCI(lastBit);
+        }
 
-		self.emit('complete');
-	};
+        self.emit('complete');
+    };
 
-	/*
+    /*
 	self.parse = function(buffer, savedRe) {
 		//	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
 		//	:TODO: move this to "constants" section @ top
@@ -329,164 +329,164 @@ function ANSIEscapeParser(options) {
 	};
 	*/
 
-	function escape(opCode, args) {
-		let arg;
+    function escape(opCode, args) {
+        let arg;
 
-		switch(opCode) {
-			//	cursor up
-			case 'A' :
-				//arg = args[0] || 1;
-				arg = isNaN(args[0]) ? 1 : args[0];
-				self.moveCursor(0, -arg);
-				break;
+        switch(opCode) {
+            //	cursor up
+            case 'A' :
+                //arg = args[0] || 1;
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.moveCursor(0, -arg);
+                break;
 
-			//	cursor down
-			case 'B' :
-				//arg = args[0] || 1;
-				arg = isNaN(args[0]) ? 1 : args[0];
-				self.moveCursor(0, arg);
-				break;
+                //	cursor down
+            case 'B' :
+                //arg = args[0] || 1;
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.moveCursor(0, arg);
+                break;
 
-			//	cursor forward/right
-			case 'C' :
-				//arg = args[0] || 1;
-				arg = isNaN(args[0]) ? 1 : args[0];
-				self.moveCursor(arg, 0);
-				break;
+                //	cursor forward/right
+            case 'C' :
+                //arg = args[0] || 1;
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.moveCursor(arg, 0);
+                break;
 
-			//	cursor back/left
-			case 'D' :
-				//arg = args[0] || 1;
-				arg = isNaN(args[0]) ? 1 : args[0];
-				self.moveCursor(-arg, 0);
-				break;
+                //	cursor back/left
+            case 'D' :
+                //arg = args[0] || 1;
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.moveCursor(-arg, 0);
+                break;
 
-			case 'f' :	//	horiz & vertical
-			case 'H' :	//	cursor position
-				//self.row	= args[0] || 1;
-				//self.column	= args[1] || 1;
-				self.row	= isNaN(args[0]) ? 1 : args[0];
-				self.column	= isNaN(args[1]) ? 1 : args[1];
-				//self.rowUpdated();
-				self.positionUpdated();
-				break;
+            case 'f' :	//	horiz & vertical
+            case 'H' :	//	cursor position
+                //self.row	= args[0] || 1;
+                //self.column	= args[1] || 1;
+                self.row	= isNaN(args[0]) ? 1 : args[0];
+                self.column	= isNaN(args[1]) ? 1 : args[1];
+                //self.rowUpdated();
+                self.positionUpdated();
+                break;
 
-			//	save position
-			case 's' :
-				self.saveCursorPosition();
-				break;
+                //	save position
+            case 's' :
+                self.saveCursorPosition();
+                break;
 
-			//	restore position
-			case 'u' :
-				self.restoreCursorPosition();
-				break;
+                //	restore position
+            case 'u' :
+                self.restoreCursorPosition();
+                break;
 
-			//	set graphic rendition
-			case 'm' :
-				self.graphicRendition.reset = false;
+                //	set graphic rendition
+            case 'm' :
+                self.graphicRendition.reset = false;
 
-				for(let i = 0, len = args.length; i < len; ++i) {
-					arg = args[i];
+                for(let i = 0, len = args.length; i < len; ++i) {
+                    arg = args[i];
 
-					if(ANSIEscapeParser.foregroundColors[arg]) {
-						self.graphicRendition.fg = arg;
-					} else if(ANSIEscapeParser.backgroundColors[arg]) {
-						self.graphicRendition.bg = arg;
-					} else if(ANSIEscapeParser.styles[arg]) {
-						switch(arg) {
-							case 0 :
-								//	clear out everything
-								delete self.graphicRendition.intensity;
-								delete self.graphicRendition.underline;
-								delete self.graphicRendition.blink;
-								delete self.graphicRendition.negative;
-								delete self.graphicRendition.invisible;
+                    if(ANSIEscapeParser.foregroundColors[arg]) {
+                        self.graphicRendition.fg = arg;
+                    } else if(ANSIEscapeParser.backgroundColors[arg]) {
+                        self.graphicRendition.bg = arg;
+                    } else if(ANSIEscapeParser.styles[arg]) {
+                        switch(arg) {
+                            case 0 :
+                                //	clear out everything
+                                delete self.graphicRendition.intensity;
+                                delete self.graphicRendition.underline;
+                                delete self.graphicRendition.blink;
+                                delete self.graphicRendition.negative;
+                                delete self.graphicRendition.invisible;
 
-								delete self.graphicRendition.fg;
-								delete self.graphicRendition.bg;
+                                delete self.graphicRendition.fg;
+                                delete self.graphicRendition.bg;
 
-								self.graphicRendition.reset = true;
-								//self.graphicRendition.fg = 39;
-								//self.graphicRendition.bg = 49;
-								break;
+                                self.graphicRendition.reset = true;
+                                //self.graphicRendition.fg = 39;
+                                //self.graphicRendition.bg = 49;
+                                break;
 
-							case 1 :
-							case 2 :
-							case 22 :
-								self.graphicRendition.intensity = arg;
-								break;
+                            case 1 :
+                            case 2 :
+                            case 22 :
+                                self.graphicRendition.intensity = arg;
+                                break;
 
-							case 4 :
-							case 24 :
-								self.graphicRendition.underline = arg;
-								break;
+                            case 4 :
+                            case 24 :
+                                self.graphicRendition.underline = arg;
+                                break;
 
-							case 5 :
-							case 6 :
-							case 25 :
-								self.graphicRendition.blink = arg;
-								break;
+                            case 5 :
+                            case 6 :
+                            case 25 :
+                                self.graphicRendition.blink = arg;
+                                break;
 
-							case 7 :
-							case 27 :
-								self.graphicRendition.negative = arg;
-								break;
+                            case 7 :
+                            case 27 :
+                                self.graphicRendition.negative = arg;
+                                break;
 
-							case 8 :
-							case 28 :
-								self.graphicRendition.invisible = arg;
-								break;
+                            case 8 :
+                            case 28 :
+                                self.graphicRendition.invisible = arg;
+                                break;
 
-							default :
-								Log.trace( { attribute : arg }, 'Unknown attribute while parsing ANSI');
-								break;
-						}
-					}
-				}
+                            default :
+                                Log.trace( { attribute : arg }, 'Unknown attribute while parsing ANSI');
+                                break;
+                        }
+                    }
+                }
 
-				self.emit('sgr update', self.graphicRendition);
-				break;	//	m
+                self.emit('sgr update', self.graphicRendition);
+                break;	//	m
 
-			//	:TODO: s, u, K
+                //	:TODO: s, u, K
 
-			//	erase display/screen
-			case 'J' :
-				//	:TODO: Handle other 'J' types!
-				if(2 === args[0]) {
-					self.clearScreen();
-				}
-				break;
-		}
-	}
+                //	erase display/screen
+            case 'J' :
+                //	:TODO: Handle other 'J' types!
+                if(2 === args[0]) {
+                    self.clearScreen();
+                }
+                break;
+        }
+    }
 }
 
 util.inherits(ANSIEscapeParser, events.EventEmitter);
 
 ANSIEscapeParser.foregroundColors = {
-	30	: 'black',
-	31	: 'red',
-	32	: 'green',
-	33	: 'yellow',
-	34	: 'blue',
-	35	: 'magenta',
-	36	: 'cyan',
-	37	: 'white',
-	39	: 'default',	//	same as white for most implementations
+    30	: 'black',
+    31	: 'red',
+    32	: 'green',
+    33	: 'yellow',
+    34	: 'blue',
+    35	: 'magenta',
+    36	: 'cyan',
+    37	: 'white',
+    39	: 'default',	//	same as white for most implementations
 
-	90	: 'grey'
+    90	: 'grey'
 };
 Object.freeze(ANSIEscapeParser.foregroundColors);
 
 ANSIEscapeParser.backgroundColors = {
-	40	: 'black',
-	41	: 'red',
-	42	: 'green',
-	43	: 'yellow',
-	44	: 'blue',
-	45	: 'magenta',
-	46	: 'cyan',
-	47	: 'white',
-	49	: 'default',	//	same as black for most implementations
+    40	: 'black',
+    41	: 'red',
+    42	: 'green',
+    43	: 'yellow',
+    44	: 'blue',
+    45	: 'magenta',
+    46	: 'cyan',
+    47	: 'white',
+    49	: 'default',	//	same as black for most implementations
 };
 Object.freeze(ANSIEscapeParser.backgroundColors);
 
@@ -501,24 +501,24 @@ Object.freeze(ANSIEscapeParser.backgroundColors);
 //	can be grouped by concept here in code.
 //
 ANSIEscapeParser.styles = {
-	0		: 'default',			//	Everything disabled
+    0		: 'default',			//	Everything disabled
 
-	1		: 'intensityBright',	//	aka bold
-	2		: 'intensityDim',
-	22		: 'intensityNormal',
+    1		: 'intensityBright',	//	aka bold
+    2		: 'intensityDim',
+    22		: 'intensityNormal',
 
-	4		: 'underlineOn',		//	Not supported by most BBS-like terminals
-	24		: 'underlineOff',		//	Not supported by most BBS-like terminals
+    4		: 'underlineOn',		//	Not supported by most BBS-like terminals
+    24		: 'underlineOff',		//	Not supported by most BBS-like terminals
 
-	5		: 'blinkSlow',			//	blinkSlow & blinkFast are generally treated the same
-	6		: 'blinkFast',			//	blinkSlow & blinkFast are generally treated the same
-	25		: 'blinkOff',
+    5		: 'blinkSlow',			//	blinkSlow & blinkFast are generally treated the same
+    6		: 'blinkFast',			//	blinkSlow & blinkFast are generally treated the same
+    25		: 'blinkOff',
 
-	7		: 'negativeImageOn',	//	Generally not supported or treated as "reverse FG & BG"
-	27		: 'negativeImageOff',	//	Generally not supported or treated as "reverse FG & BG"
+    7		: 'negativeImageOn',	//	Generally not supported or treated as "reverse FG & BG"
+    27		: 'negativeImageOff',	//	Generally not supported or treated as "reverse FG & BG"
 
-	8		: 'invisibleOn',		//	FG set to BG
-	28		: 'invisibleOff',		//	Not supported by most BBS-like terminals
+    8		: 'invisibleOn',		//	FG set to BG
+    28		: 'invisibleOff',		//	Not supported by most BBS-like terminals
 };
 Object.freeze(ANSIEscapeParser.styles);
 
diff --git a/core/ansi_prep.js b/core/ansi_prep.js
index a4c894d8..3eb05b08 100644
--- a/core/ansi_prep.js
+++ b/core/ansi_prep.js
@@ -5,216 +5,216 @@
 const ANSIEscapeParser	= require('./ansi_escape_parser.js').ANSIEscapeParser;
 const ANSI				= require('./ansi_term.js');
 const {
-	splitTextAtTerms,
-	renderStringLength
+    splitTextAtTerms,
+    renderStringLength
 }						= require('./string_util.js');
 
 //	deps
 const _					= require('lodash');
 
 module.exports = function ansiPrep(input, options, cb) {
-	if(!input) {
-		return cb(null, '');
-	}
+    if(!input) {
+        return cb(null, '');
+    }
 
-	options.termWidth			= options.termWidth 	|| 80;
-	options.termHeight			= options.termHeight	|| 25;
-	options.cols				= options.cols || options.termWidth		|| 80;
-	options.rows				= options.rows || options.termHeight	|| 'auto';
-	options.startCol			= options.startCol || 1;
-	options.exportMode			= options.exportMode || false;
-	options.fillLines			= _.get(options, 'fillLines', true);
-	options.indent				= options.indent || 0;
+    options.termWidth			= options.termWidth 	|| 80;
+    options.termHeight			= options.termHeight	|| 25;
+    options.cols				= options.cols || options.termWidth		|| 80;
+    options.rows				= options.rows || options.termHeight	|| 'auto';
+    options.startCol			= options.startCol || 1;
+    options.exportMode			= options.exportMode || false;
+    options.fillLines			= _.get(options, 'fillLines', true);
+    options.indent				= options.indent || 0;
 
-	//	in auto we start out at 25 rows, but can always expand for more
-	const canvas = Array.from( { length : 'auto' === options.rows ? 25 : options.rows }, () => Array.from( { length : options.cols}, () => new Object() ) );
-	const parser = new ANSIEscapeParser( { termHeight : options.termHeight, termWidth : options.termWidth } );
+    //	in auto we start out at 25 rows, but can always expand for more
+    const canvas = Array.from( { length : 'auto' === options.rows ? 25 : options.rows }, () => Array.from( { length : options.cols}, () => new Object() ) );
+    const parser = new ANSIEscapeParser( { termHeight : options.termHeight, termWidth : options.termWidth } );
 
-	const state = {
-		row	: 0,
-		col	: 0,
-	};
+    const state = {
+        row	: 0,
+        col	: 0,
+    };
 
-	let lastRow = 0;
+    let lastRow = 0;
 
-	function ensureRow(row) {
-		if(canvas[row]) {
-			return;
-		}
+    function ensureRow(row) {
+        if(canvas[row]) {
+            return;
+        }
 
-		canvas[row] = Array.from( { length : options.cols}, () => new Object() );
-	}
+        canvas[row] = Array.from( { length : options.cols}, () => new Object() );
+    }
 
-	parser.on('position update', (row, col) => {
-		state.row	= row - 1;
-		state.col	= col - 1;
+    parser.on('position update', (row, col) => {
+        state.row	= row - 1;
+        state.col	= col - 1;
 
-		if(0 === state.col) {
-			state.initialSgr = state.lastSgr;
-		}
+        if(0 === state.col) {
+            state.initialSgr = state.lastSgr;
+        }
 
-		lastRow		= Math.max(state.row, lastRow);
-	});
+        lastRow		= Math.max(state.row, lastRow);
+    });
 
-	parser.on('literal', literal => {
-		//
-		//	CR/LF are handled for 'position update'; we don't need the chars themselves
-		//
-		literal = literal.replace(/\r?\n|[\r\u2028\u2029]/g, '');
+    parser.on('literal', literal => {
+        //
+        //	CR/LF are handled for 'position update'; we don't need the chars themselves
+        //
+        literal = literal.replace(/\r?\n|[\r\u2028\u2029]/g, '');
 
-		for(let c of literal) {
-			if(state.col < options.cols && ('auto' === options.rows || state.row < options.rows)) {
-				ensureRow(state.row);
+        for(let c of literal) {
+            if(state.col < options.cols && ('auto' === options.rows || state.row < options.rows)) {
+                ensureRow(state.row);
 
-				if(0 === state.col) {
-					canvas[state.row][state.col].initialSgr = state.initialSgr;
-				}
+                if(0 === state.col) {
+                    canvas[state.row][state.col].initialSgr = state.initialSgr;
+                }
 
-				canvas[state.row][state.col].char = c;
+                canvas[state.row][state.col].char = c;
 
-				if(state.sgr) {
-					canvas[state.row][state.col].sgr	= _.clone(state.sgr);
-					state.lastSgr						= canvas[state.row][state.col].sgr;
-					state.sgr							= null;
-				}
-			}
+                if(state.sgr) {
+                    canvas[state.row][state.col].sgr	= _.clone(state.sgr);
+                    state.lastSgr						= canvas[state.row][state.col].sgr;
+                    state.sgr							= null;
+                }
+            }
 
-			state.col += 1;
-		}
-	});
+            state.col += 1;
+        }
+    });
 
-	parser.on('sgr update', sgr => {
-		ensureRow(state.row);
+    parser.on('sgr update', sgr => {
+        ensureRow(state.row);
 
-		if(state.col < options.cols) {
-			canvas[state.row][state.col].sgr	= _.clone(sgr);
-			state.lastSgr						= canvas[state.row][state.col].sgr;
-		} else {
-			state.sgr = sgr;
-		}
-	});
+        if(state.col < options.cols) {
+            canvas[state.row][state.col].sgr	= _.clone(sgr);
+            state.lastSgr						= canvas[state.row][state.col].sgr;
+        } else {
+            state.sgr = sgr;
+        }
+    });
 
-	function getLastPopulatedColumn(row) {
-		let col = row.length;
-		while(--col > 0) {
-			if(row[col].char || row[col].sgr) {
-				break;
-			}
-		}
-		return col;
-	}
+    function getLastPopulatedColumn(row) {
+        let col = row.length;
+        while(--col > 0) {
+            if(row[col].char || row[col].sgr) {
+                break;
+            }
+        }
+        return col;
+    }
 
-	parser.on('complete', () => {
-		let output = '';
-		let line;
-		let sgr;
+    parser.on('complete', () => {
+        let output = '';
+        let line;
+        let sgr;
 
-		canvas.slice(0, lastRow + 1).forEach(row => {
-			const lastCol = getLastPopulatedColumn(row) + 1;
+        canvas.slice(0, lastRow + 1).forEach(row => {
+            const lastCol = getLastPopulatedColumn(row) + 1;
 
-			let i;
-			line = options.indent ?
-				output.length > 0 ? ' '.repeat(options.indent) : '' :
-				'';
+            let i;
+            line = options.indent ?
+                output.length > 0 ? ' '.repeat(options.indent) : '' :
+                '';
 
-			for(i = 0; i < lastCol; ++i) {
-				const col = row[i];
+            for(i = 0; i < lastCol; ++i) {
+                const col = row[i];
 
-				sgr = !options.asciiMode && 0 === i ?
-					col.initialSgr ? ANSI.getSGRFromGraphicRendition(col.initialSgr) : '' :
-					'';
+                sgr = !options.asciiMode && 0 === i ?
+                    col.initialSgr ? ANSI.getSGRFromGraphicRendition(col.initialSgr) : '' :
+                    '';
 
-				if(!options.asciiMode && col.sgr) {
-					sgr += ANSI.getSGRFromGraphicRendition(col.sgr);
-				}
+                if(!options.asciiMode && col.sgr) {
+                    sgr += ANSI.getSGRFromGraphicRendition(col.sgr);
+                }
 
-				line += `${sgr}${col.char || ' '}`;
-			}
+                line += `${sgr}${col.char || ' '}`;
+            }
 
-			output += line;
+            output += line;
 
-			if(i < row.length) {
-				output += `${options.asciiMode ? '' : ANSI.blackBG()}`;
-				if(options.fillLines) {
-					output += `${row.slice(i).map( () => ' ').join('')}`;//${lastSgr}`;
-				}
-			}
+            if(i < row.length) {
+                output += `${options.asciiMode ? '' : ANSI.blackBG()}`;
+                if(options.fillLines) {
+                    output += `${row.slice(i).map( () => ' ').join('')}`;//${lastSgr}`;
+                }
+            }
 
-			if(options.startCol + i < options.termWidth || options.forceLineTerm) {
-				output += '\r\n';
-			}
-		});
+            if(options.startCol + i < options.termWidth || options.forceLineTerm) {
+                output += '\r\n';
+            }
+        });
 
-		if(options.exportMode) {
-			//
-			//	If we're in export mode, we do some additional hackery:
-			//
-			//	* Hard wrap ALL lines at <= 79 *characters* (not visible columns)
-			//	  if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
-			//	  represents chars to get back to the position we were previously at
-			//
-			//	* Replace contig spaces with ESC[<N>C as well to save... space.
-			//
-			//	:TODO: this would be better to do as part of the processing above, but this will do for now
-			const MAX_CHARS	= 79 - 8;	//	79 max, - 8 for max ESC seq's we may prefix a line with
-			let exportOutput = '';
+        if(options.exportMode) {
+            //
+            //	If we're in export mode, we do some additional hackery:
+            //
+            //	* Hard wrap ALL lines at <= 79 *characters* (not visible columns)
+            //	  if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
+            //	  represents chars to get back to the position we were previously at
+            //
+            //	* Replace contig spaces with ESC[<N>C as well to save... space.
+            //
+            //	:TODO: this would be better to do as part of the processing above, but this will do for now
+            const MAX_CHARS	= 79 - 8;	//	79 max, - 8 for max ESC seq's we may prefix a line with
+            let exportOutput = '';
 
-			let m;
-			let afterSeq;
-			let wantMore;
-			let renderStart;
+            let m;
+            let afterSeq;
+            let wantMore;
+            let renderStart;
 
-			splitTextAtTerms(output).forEach(fullLine => {
-				renderStart = 0;
+            splitTextAtTerms(output).forEach(fullLine => {
+                renderStart = 0;
 
-				while(fullLine.length > 0) {
-					let splitAt;
-					const ANSI_REGEXP = ANSI.getFullMatchRegExp();
-					wantMore = true;
+                while(fullLine.length > 0) {
+                    let splitAt;
+                    const ANSI_REGEXP = ANSI.getFullMatchRegExp();
+                    wantMore = true;
 
-					while((m = ANSI_REGEXP.exec(fullLine))) {
-						afterSeq = m.index + m[0].length;
+                    while((m = ANSI_REGEXP.exec(fullLine))) {
+                        afterSeq = m.index + m[0].length;
 
-						if(afterSeq < MAX_CHARS) {
-							//	after current seq
-							splitAt = afterSeq;
-						} else {
-							if(m.index < MAX_CHARS) {
-								//	before last found seq
-								splitAt = m.index;
-								wantMore = false;	//	can't eat up any more
-							}
+                        if(afterSeq < MAX_CHARS) {
+                            //	after current seq
+                            splitAt = afterSeq;
+                        } else {
+                            if(m.index < MAX_CHARS) {
+                                //	before last found seq
+                                splitAt = m.index;
+                                wantMore = false;	//	can't eat up any more
+                            }
 
-							break;	//	seq's beyond this point are >= MAX_CHARS
-						}
-					}
+                            break;	//	seq's beyond this point are >= MAX_CHARS
+                        }
+                    }
 
-					if(splitAt) {
-						if(wantMore) {
-							splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
-						}
-					} else {
-						splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
-					}
+                    if(splitAt) {
+                        if(wantMore) {
+                            splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
+                        }
+                    } else {
+                        splitAt = Math.min(fullLine.length, MAX_CHARS - 1);
+                    }
 
-					const part = fullLine.slice(0, splitAt);
-					fullLine = fullLine.slice(splitAt);
-					renderStart += renderStringLength(part);
-					exportOutput += `${part}\r\n`;
+                    const part = fullLine.slice(0, splitAt);
+                    fullLine = fullLine.slice(splitAt);
+                    renderStart += renderStringLength(part);
+                    exportOutput += `${part}\r\n`;
 
-					if(fullLine.length > 0) {	//	more to go for this line?
-						exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;
-					} else {
-						exportOutput += ANSI.up();
-					}
-				}
-			});
+                    if(fullLine.length > 0) {	//	more to go for this line?
+                        exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;
+                    } else {
+                        exportOutput += ANSI.up();
+                    }
+                }
+            });
 
-			return cb(null, exportOutput);
-		}
+            return cb(null, exportOutput);
+        }
 
-		return cb(null, output);
-	});
+        return cb(null, output);
+    });
 
-	parser.parse(input);
+    parser.parse(input);
 };
diff --git a/core/ansi_term.js b/core/ansi_term.js
index 0a1eaa41..dc3399a6 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -65,86 +65,86 @@ exports.vtxHyperlink		= vtxHyperlink;
 const ESC_CSI 	= '\u001b[';
 
 const CONTROL = {
-	up				: 'A',
-	down			: 'B',
+    up				: 'A',
+    down			: 'B',
 
-	forward			: 'C',
-	right			: 'C',
+    forward			: 'C',
+    right			: 'C',
 
-	back			: 'D',
-	left			: 'D',
+    back			: 'D',
+    left			: 'D',
 
-	nextLine		: 'E',
-	prevLine		: 'F',
-	horizAbsolute	: 'G',
+    nextLine		: 'E',
+    prevLine		: 'F',
+    horizAbsolute	: 'G',
 
-	//
-	//	CSI [ p1 ] J
-	//	Erase in Page / Erase Data
-	//	Defaults: p1 = 0
-	//	Erases from the current screen according to the value of p1
-	//	0 - Erase from the current position to the end of the screen.
-	//	1 - Erase from the current position to the start of the screen.
-	//	2 - Erase entire screen.  As a violation of ECMA-048, also moves
-	//	    the cursor to position 1/1 as a number of BBS programs assume
-	//		this behaviour.
-	//	Erased characters are set to the current attribute.
-	//
-	//	Support:
-	//	* SyncTERM: Works as expected
-	//	* NetRunner: Always clears a screen *height* (e.g. 25) regardless of p1
-	//	  and screen remainder
-	//
-	eraseData		: 'J',
+    //
+    //	CSI [ p1 ] J
+    //	Erase in Page / Erase Data
+    //	Defaults: p1 = 0
+    //	Erases from the current screen according to the value of p1
+    //	0 - Erase from the current position to the end of the screen.
+    //	1 - Erase from the current position to the start of the screen.
+    //	2 - Erase entire screen.  As a violation of ECMA-048, also moves
+    //	    the cursor to position 1/1 as a number of BBS programs assume
+    //		this behaviour.
+    //	Erased characters are set to the current attribute.
+    //
+    //	Support:
+    //	* SyncTERM: Works as expected
+    //	* NetRunner: Always clears a screen *height* (e.g. 25) regardless of p1
+    //	  and screen remainder
+    //
+    eraseData		: 'J',
 
-	eraseLine		: 'K',
-	insertLine		: 'L',
+    eraseLine		: 'K',
+    insertLine		: 'L',
 
-	//
-	//	CSI [ p1 ] M
-	//	Delete Line(s) / "ANSI" Music
-	//	Defaults: p1 = 1
-	//	Deletes the current line and the p1 - 1 lines after it scrolling the
-	//	first non-deleted line up to the current line and filling the newly
-	//	empty lines at the end of the screen with the current attribute.
-	//	If "ANSI" Music is fully enabled (CSI = 2 M), performs "ANSI" music
-	//	instead.
-	//	See "ANSI" MUSIC section for more details.
-	//
-	//	Support:
-	//	* SyncTERM: Works as expected
-	//	* NetRunner:
-	//
-	//	General Notes:
-	//	See also notes in bansi.txt and cterm.txt about the various
-	//	incompatibilities & oddities around this sequence. ANSI-BBS
-	//	states that it *should* work with any value of p1.
-	//
-	deleteLine		: 'M',
-	ansiMusic		: 'M',
+    //
+    //	CSI [ p1 ] M
+    //	Delete Line(s) / "ANSI" Music
+    //	Defaults: p1 = 1
+    //	Deletes the current line and the p1 - 1 lines after it scrolling the
+    //	first non-deleted line up to the current line and filling the newly
+    //	empty lines at the end of the screen with the current attribute.
+    //	If "ANSI" Music is fully enabled (CSI = 2 M), performs "ANSI" music
+    //	instead.
+    //	See "ANSI" MUSIC section for more details.
+    //
+    //	Support:
+    //	* SyncTERM: Works as expected
+    //	* NetRunner:
+    //
+    //	General Notes:
+    //	See also notes in bansi.txt and cterm.txt about the various
+    //	incompatibilities & oddities around this sequence. ANSI-BBS
+    //	states that it *should* work with any value of p1.
+    //
+    deleteLine		: 'M',
+    ansiMusic		: 'M',
 
-	scrollUp		: 'S',
-	scrollDown		: 'T',
-	setScrollRegion	: 'r',
-	savePos			: 's',
-	restorePos		: 'u',
-	queryPos		: '6n',
-	queryScreenSize	: '255n',	//	See bansi.txt
-	goto			: 'H',	//	row Pr, column Pc -- same as f
-	gotoAlt			: 'f',	//	same as H
+    scrollUp		: 'S',
+    scrollDown		: 'T',
+    setScrollRegion	: 'r',
+    savePos			: 's',
+    restorePos		: 'u',
+    queryPos		: '6n',
+    queryScreenSize	: '255n',	//	See bansi.txt
+    goto			: 'H',	//	row Pr, column Pc -- same as f
+    gotoAlt			: 'f',	//	same as H
 
-	blinkToBrightIntensity : '?33h',
-	blinkNormal				: '?33l',
+    blinkToBrightIntensity : '?33h',
+    blinkNormal				: '?33l',
 
-	emulationSpeed	: '*r',	//	Set output emulation speed. See cterm.txt
+    emulationSpeed	: '*r',	//	Set output emulation speed. See cterm.txt
 
-	hideCursor		: '?25l',	//	Nonstandard - cterm.txt
-	showCursor		: '?25h',	//	Nonstandard - cterm.txt
+    hideCursor		: '?25l',	//	Nonstandard - cterm.txt
+    showCursor		: '?25h',	//	Nonstandard - cterm.txt
 
-	queryDeviceAttributes	: 'c',	//	Nonstandard - cterm.txt
+    queryDeviceAttributes	: 'c',	//	Nonstandard - cterm.txt
 
-	//	:TODO: see https://code.google.com/p/conemu-maximus5/wiki/AnsiEscapeCodes
-	//	apparently some terms can report screen size and text area via 18t and 19t
+    //	:TODO: see https://code.google.com/p/conemu-maximus5/wiki/AnsiEscapeCodes
+    //	apparently some terms can report screen size and text area via 18t and 19t
 };
 
 //
@@ -152,49 +152,49 @@ const CONTROL = {
 //	See http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt
 //
 const SGRValues = {
-	reset			: 0,
-	bold			: 1,
-	dim				: 2,
-	blink			: 5,
-	fastBlink		: 6,
-	negative		: 7,
-	hidden			: 8,
+    reset			: 0,
+    bold			: 1,
+    dim				: 2,
+    blink			: 5,
+    fastBlink		: 6,
+    negative		: 7,
+    hidden			: 8,
 
-	normal			: 22,	//
-	steady			: 25,
-	positive		: 27,
+    normal			: 22,	//
+    steady			: 25,
+    positive		: 27,
 
-	black			: 30,
-	red				: 31,
-	green			: 32,
-	yellow			: 33,
-	blue			: 34,
-	magenta			: 35,
-	cyan			: 36,
-	white			: 37,
+    black			: 30,
+    red				: 31,
+    green			: 32,
+    yellow			: 33,
+    blue			: 34,
+    magenta			: 35,
+    cyan			: 36,
+    white			: 37,
 
-	blackBG			: 40,
-	redBG			: 41,
-	greenBG			: 42,
-	yellowBG		: 43,
-	blueBG			: 44,
-	magentaBG		: 45,
-	cyanBG			: 46,
-	whiteBG			: 47,
+    blackBG			: 40,
+    redBG			: 41,
+    greenBG			: 42,
+    yellowBG		: 43,
+    blueBG			: 44,
+    magentaBG		: 45,
+    cyanBG			: 46,
+    whiteBG			: 47,
 };
 
 function getFullMatchRegExp(flags = 'g') {
-	//	:TODO: expand this a bit - see strip-ansi/etc.
-	//	:TODO: \u009b ?
-	return new RegExp(/[\u001b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/, flags);	//	eslint-disable-line no-control-regex
+    //	:TODO: expand this a bit - see strip-ansi/etc.
+    //	:TODO: \u009b ?
+    return new RegExp(/[\u001b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/, flags);	//	eslint-disable-line no-control-regex
 }
 
 function getFGColorValue(name) {
-	return SGRValues[name];
+    return SGRValues[name];
 }
 
 function getBGColorValue(name) {
-	return SGRValues[name + 'BG'];
+    return SGRValues[name + 'BG'];
 }
 
 
@@ -214,49 +214,49 @@ function getBGColorValue(name) {
 //	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
 //
 const SYNCTERM_FONT_AND_ENCODING_TABLE = [
-	'cp437',
-	'cp1251',
-	'koi8_r',
-	'iso8859_2',
-	'iso8859_4',
-	'cp866',
-	'iso8859_9',
-	'haik8',
-	'iso8859_8',
-	'koi8_u',
-	'iso8859_15',
-	'iso8859_4',
-	'koi8_r_b',
-	'iso8859_4',
-	'iso8859_5',
-	'ARMSCII_8',
-	'iso8859_15',
-	'cp850',
-	'cp850',
-	'cp885',
-	'cp1251',
-	'iso8859_7',
-	'koi8-r_c',
-	'iso8859_4',
-	'iso8859_1',
-	'cp866',
-	'cp437',
-	'cp866',
-	'cp885',
-	'cp866_u',
-	'iso8859_1',
-	'cp1131',
-	'c64_upper',
-	'c64_lower',
-	'c128_upper',
-	'c128_lower',
-	'atari',
-	'pot_noodle',
-	'mo_soul',
-	'microknight_plus',
-	'topaz_plus',
-	'microknight',
-	'topaz',
+    'cp437',
+    'cp1251',
+    'koi8_r',
+    'iso8859_2',
+    'iso8859_4',
+    'cp866',
+    'iso8859_9',
+    'haik8',
+    'iso8859_8',
+    'koi8_u',
+    'iso8859_15',
+    'iso8859_4',
+    'koi8_r_b',
+    'iso8859_4',
+    'iso8859_5',
+    'ARMSCII_8',
+    'iso8859_15',
+    'cp850',
+    'cp850',
+    'cp885',
+    'cp1251',
+    'iso8859_7',
+    'koi8-r_c',
+    'iso8859_4',
+    'iso8859_1',
+    'cp866',
+    'cp437',
+    'cp866',
+    'cp885',
+    'cp866_u',
+    'iso8859_1',
+    'cp1131',
+    'c64_upper',
+    'c64_lower',
+    'c128_upper',
+    'c128_lower',
+    'atari',
+    'pot_noodle',
+    'mo_soul',
+    'microknight_plus',
+    'topaz_plus',
+    'microknight',
+    'topaz',
 ];
 
 //
@@ -267,137 +267,137 @@ const SYNCTERM_FONT_AND_ENCODING_TABLE = [
 //	replaced with '_' for lookup purposes.
 //
 const FONT_ALIAS_TO_SYNCTERM_MAP = {
-	'cp437'					: 'cp437',
-	'ibm_vga'				: 'cp437',
-	'ibmpc'					: 'cp437',
-	'ibm_pc'				: 'cp437',
-	'pc'					: 'cp437',
-	'cp437_art'	 			: 'cp437',
-	'ibmpcart'				: 'cp437',
-	'ibmpc_art'				: 'cp437',
-	'ibm_pc_art'			: 'cp437',
-	'msdos_art'				: 'cp437',
-	'msdosart'				: 'cp437',
-	'pc_art'				: 'cp437',
-	'pcart'					: 'cp437',
+    'cp437'					: 'cp437',
+    'ibm_vga'				: 'cp437',
+    'ibmpc'					: 'cp437',
+    'ibm_pc'				: 'cp437',
+    'pc'					: 'cp437',
+    'cp437_art'	 			: 'cp437',
+    'ibmpcart'				: 'cp437',
+    'ibmpc_art'				: 'cp437',
+    'ibm_pc_art'			: 'cp437',
+    'msdos_art'				: 'cp437',
+    'msdosart'				: 'cp437',
+    'pc_art'				: 'cp437',
+    'pcart'					: 'cp437',
 
-	'ibm_vga50'				: 'cp437',
-	'ibm_vga25g'			: 'cp437',
-	'ibm_ega'				: 'cp437',
-	'ibm_ega43'				: 'cp437',
+    'ibm_vga50'				: 'cp437',
+    'ibm_vga25g'			: 'cp437',
+    'ibm_ega'				: 'cp437',
+    'ibm_ega43'				: 'cp437',
 
-	'topaz'					: 'topaz',
-	'amiga_topaz_1'			: 'topaz',
-	'amiga_topaz_1+'		: 'topaz_plus',
-	'topazplus'				: 'topaz_plus',
-	'topaz_plus'			: 'topaz_plus',
-	'amiga_topaz_2'			: 'topaz',
-	'amiga_topaz_2+'		: 'topaz_plus',
-	'topaz2plus'			: 'topaz_plus',
+    'topaz'					: 'topaz',
+    'amiga_topaz_1'			: 'topaz',
+    'amiga_topaz_1+'		: 'topaz_plus',
+    'topazplus'				: 'topaz_plus',
+    'topaz_plus'			: 'topaz_plus',
+    'amiga_topaz_2'			: 'topaz',
+    'amiga_topaz_2+'		: 'topaz_plus',
+    'topaz2plus'			: 'topaz_plus',
 
-	'pot_noodle'			: 'pot_noodle',
-	'p0tnoodle'				: 'pot_noodle',
-	'amiga_p0t-noodle'		: 'pot_noodle',
+    'pot_noodle'			: 'pot_noodle',
+    'p0tnoodle'				: 'pot_noodle',
+    'amiga_p0t-noodle'		: 'pot_noodle',
 
-	'mo_soul'				: 'mo_soul',
-	'mosoul'				: 'mo_soul',
-	'mO\'sOul'				: 'mo_soul',
+    'mo_soul'				: 'mo_soul',
+    'mosoul'				: 'mo_soul',
+    'mO\'sOul'				: 'mo_soul',
 
-	'amiga_microknight'		: 'microknight',
-	'amiga_microknight+'	: 'microknight_plus',
+    'amiga_microknight'		: 'microknight',
+    'amiga_microknight+'	: 'microknight_plus',
 
-	'atari'					: 'atari',
-	'atarist'				: 'atari',
+    'atari'					: 'atari',
+    'atarist'				: 'atari',
 
 };
 
 function setSyncTERMFont(name, fontPage) {
-	const p1 = miscUtil.valueWithDefault(fontPage, 0);
+    const p1 = miscUtil.valueWithDefault(fontPage, 0);
 
-	assert(p1 >= 0 && p1 <= 3);
+    assert(p1 >= 0 && p1 <= 3);
 
-	const p2 = SYNCTERM_FONT_AND_ENCODING_TABLE.indexOf(name);
-	if(p2 > -1) {
-		return `${ESC_CSI}${p1};${p2} D`;
-	}
+    const p2 = SYNCTERM_FONT_AND_ENCODING_TABLE.indexOf(name);
+    if(p2 > -1) {
+        return `${ESC_CSI}${p1};${p2} D`;
+    }
 
-	return '';
+    return '';
 }
 
 function getSyncTERMFontFromAlias(alias) {
-	return FONT_ALIAS_TO_SYNCTERM_MAP[alias.toLowerCase().replace(/ /g, '_')];
+    return FONT_ALIAS_TO_SYNCTERM_MAP[alias.toLowerCase().replace(/ /g, '_')];
 }
 
 function setSyncTermFontWithAlias(nameOrAlias) {
-	nameOrAlias = getSyncTERMFontFromAlias(nameOrAlias) || nameOrAlias;
-	return setSyncTERMFont(nameOrAlias);
+    nameOrAlias = getSyncTERMFontFromAlias(nameOrAlias) || nameOrAlias;
+    return setSyncTERMFont(nameOrAlias);
 }
 
 const DEC_CURSOR_STYLE = {
-	'blinking block'		: 0,
-	'default'				: 1,
-	'steady block'			: 2,
-	'blinking underline'	: 3,
-	'steady underline'		: 4,
-	'blinking bar'			: 5,
-	'steady bar'			: 6,
+    'blinking block'		: 0,
+    'default'				: 1,
+    'steady block'			: 2,
+    'blinking underline'	: 3,
+    'steady underline'		: 4,
+    'blinking bar'			: 5,
+    'steady bar'			: 6,
 };
 
 function setCursorStyle(cursorStyle) {
-	const ps = DEC_CURSOR_STYLE[cursorStyle];
-	if(ps) {
-		return `${ESC_CSI}${ps} q`;
-	}
-	return '';
+    const ps = DEC_CURSOR_STYLE[cursorStyle];
+    if(ps) {
+        return `${ESC_CSI}${ps} q`;
+    }
+    return '';
 
 }
 
 //	Create methods such as up(), nextLine(),...
 Object.keys(CONTROL).forEach(function onControlName(name) {
-	const code = CONTROL[name];
+    const code = CONTROL[name];
 
-	exports[name] = function() {
-		let c = code;
-		if(arguments.length > 0) {
-			//	arguments are array like -- we want an array
-			c = Array.prototype.slice.call(arguments).map(Math.round).join(';') + code;
-		}
-		return `${ESC_CSI}${c}`;
-	};
+    exports[name] = function() {
+        let c = code;
+        if(arguments.length > 0) {
+            //	arguments are array like -- we want an array
+            c = Array.prototype.slice.call(arguments).map(Math.round).join(';') + code;
+        }
+        return `${ESC_CSI}${c}`;
+    };
 });
 
 //	Create various color methods such as white(), yellowBG(), reset(), ...
 Object.keys(SGRValues).forEach( name => {
-	const code = SGRValues[name];
+    const code = SGRValues[name];
 
-	exports[name] = function() {
-		return `${ESC_CSI}${code}m`;
-	};
+    exports[name] = function() {
+        return `${ESC_CSI}${code}m`;
+    };
 });
 
 function sgr() {
-	//
-	//	- Allow an single array or variable number of arguments
-	//	- Each element can be either a integer or string found in SGRValues
-	//	  which in turn maps to a integer
-	//
-	if(arguments.length <= 0) {
-		return '';
-	}
+    //
+    //	- Allow an single array or variable number of arguments
+    //	- Each element can be either a integer or string found in SGRValues
+    //	  which in turn maps to a integer
+    //
+    if(arguments.length <= 0) {
+        return '';
+    }
 
-	let result	= [];
-	const args	= Array.isArray(arguments[0]) ? arguments[0] : arguments;
+    let result	= [];
+    const args	= Array.isArray(arguments[0]) ? arguments[0] : arguments;
 
-	for(let i = 0; i < args.length; ++i) {
-		const arg = args[i];
-		if(_.isString(arg) && arg in SGRValues) {
-			result.push(SGRValues[arg]);
-		} else if(_.isNumber(arg)) {
-			result.push(arg);
-		}
-	}
+    for(let i = 0; i < args.length; ++i) {
+        const arg = args[i];
+        if(_.isString(arg) && arg in SGRValues) {
+            result.push(SGRValues[arg]);
+        } else if(_.isNumber(arg)) {
+            result.push(arg);
+        }
+    }
 
-	return `${ESC_CSI}${result.join(';')}m`;
+    return `${ESC_CSI}${result.join(';')}m`;
 }
 
 //
@@ -405,29 +405,29 @@ function sgr() {
 //	to a ANSI SGR sequence.
 //
 function getSGRFromGraphicRendition(graphicRendition, initialReset) {
-	let sgrSeq		= [];
-	let styleCount	= 0;
+    let sgrSeq		= [];
+    let styleCount	= 0;
 
-	[ 'intensity', 'underline', 'blink', 'negative', 'invisible' ].forEach( s => {
-		if(graphicRendition[s]) {
-			sgrSeq.push(graphicRendition[s]);
-			++styleCount;
-		}
-	});
+    [ 'intensity', 'underline', 'blink', 'negative', 'invisible' ].forEach( s => {
+        if(graphicRendition[s]) {
+            sgrSeq.push(graphicRendition[s]);
+            ++styleCount;
+        }
+    });
 
-	if(graphicRendition.fg) {
-		sgrSeq.push(graphicRendition.fg);
-	}
+    if(graphicRendition.fg) {
+        sgrSeq.push(graphicRendition.fg);
+    }
 
-	if(graphicRendition.bg) {
-		sgrSeq.push(graphicRendition.bg);
-	}
+    if(graphicRendition.bg) {
+        sgrSeq.push(graphicRendition.bg);
+    }
 
-	if(0 === styleCount || initialReset) {
-		sgrSeq.unshift(0);
-	}
+    if(0 === styleCount || initialReset) {
+        sgrSeq.unshift(0);
+    }
 
-	return sgr(sgrSeq);
+    return sgr(sgrSeq);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -435,19 +435,19 @@ function getSGRFromGraphicRendition(graphicRendition, initialReset) {
 ///////////////////////////////////////////////////////////////////////////////
 
 function clearScreen() {
-	return exports.eraseData(2);
+    return exports.eraseData(2);
 }
 
 function resetScreen() {
-	return `${exports.reset()}${exports.eraseData(2)}${exports.goHome()}`;
+    return `${exports.reset()}${exports.eraseData(2)}${exports.goHome()}`;
 }
 
 function normal() {
-	return sgr( [ 'normal', 'reset' ] );
+    return sgr( [ 'normal', 'reset' ] );
 }
 
 function goHome() {
-	return exports.goto();	//	no params = home = 1,1
+    return exports.goto();	//	no params = home = 1,1
 }
 
 //
@@ -463,36 +463,36 @@ function goHome() {
 //	  and use term width -- generally 80 columns -- will display garbled!
 //
 function disableVT100LineWrapping() {
-	return `${ESC_CSI}?7l`;
+    return `${ESC_CSI}?7l`;
 }
 
 function setEmulatedBaudRate(rate) {
-	const speed = {
-		unlimited	: 0,
-		off			: 0,
-		0			: 0,
-		300			: 1,
-		600			: 2,
-		1200		: 3,
-		2400		: 4,
-		4800		: 5,
-		9600		: 6,
-		19200		: 7,
-		38400		: 8,
-		57600		: 9,
-		76800		: 10,
-		115200		: 11,
-	}[rate] || 0;
-	return 0 === speed ? exports.emulationSpeed() : exports.emulationSpeed(1, speed);
+    const speed = {
+        unlimited	: 0,
+        off			: 0,
+        0			: 0,
+        300			: 1,
+        600			: 2,
+        1200		: 3,
+        2400		: 4,
+        4800		: 5,
+        9600		: 6,
+        19200		: 7,
+        38400		: 8,
+        57600		: 9,
+        76800		: 10,
+        115200		: 11,
+    }[rate] || 0;
+    return 0 === speed ? exports.emulationSpeed() : exports.emulationSpeed(1, speed);
 }
 
 function vtxHyperlink(client, url, len) {
-	if(!client.terminalSupports('vtx_hyperlink')) {
-		return '';
-	}
+    if(!client.terminalSupports('vtx_hyperlink')) {
+        return '';
+    }
 
-	len = len || url.length;
+    len = len || url.length;
 
-	url = url.split('').map(c => c.charCodeAt(0)).join(';');
-	return `${ESC_CSI}1;${len};1;1;${url}\\`;
+    url = url.split('').map(c => c.charCodeAt(0)).join(';');
+    return `${ESC_CSI}1;${len};1;1;${url}\\`;
 }
\ No newline at end of file
diff --git a/core/archive_util.js b/core/archive_util.js
index e4604b62..d59a2609 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -16,314 +16,314 @@ const paths		= require('path');
 let archiveUtil;
 
 class Archiver {
-	constructor(config) {
-		this.compress	= config.compress;
-		this.decompress	= config.decompress;
-		this.list		= config.list;
-		this.extract	= config.extract;
-	}
+    constructor(config) {
+        this.compress	= config.compress;
+        this.decompress	= config.decompress;
+        this.list		= config.list;
+        this.extract	= config.extract;
+    }
 
-	ok() {
-		return this.canCompress() && this.canDecompress();
-	}
+    ok() {
+        return this.canCompress() && this.canDecompress();
+    }
 
-	can(what) {
-		if(!_.has(this, [ what, 'cmd' ]) || !_.has(this, [ what, 'args' ])) {
-			return false;
-		}
+    can(what) {
+        if(!_.has(this, [ what, 'cmd' ]) || !_.has(this, [ what, 'args' ])) {
+            return false;
+        }
 
-		return _.isString(this[what].cmd) && Array.isArray(this[what].args) && this[what].args.length > 0;
-	}
+        return _.isString(this[what].cmd) && Array.isArray(this[what].args) && this[what].args.length > 0;
+    }
 
-	canCompress() { return this.can('compress'); }
-	canDecompress() { return this.can('decompress'); }
-	canList() { return this.can('list'); }	//	:TODO: validate entryMatch
-	canExtract() { return this.can('extract'); }
+    canCompress() { return this.can('compress'); }
+    canDecompress() { return this.can('decompress'); }
+    canList() { return this.can('list'); }	//	:TODO: validate entryMatch
+    canExtract() { return this.can('extract'); }
 }
 
 module.exports = class ArchiveUtil {
 
-	constructor() {
-		this.archivers = {};
-		this.longestSignature = 0;
-	}
+    constructor() {
+        this.archivers = {};
+        this.longestSignature = 0;
+    }
 
-	//	singleton access
-	static getInstance() {
-		if(!archiveUtil) {
-			archiveUtil = new ArchiveUtil();
-			archiveUtil.init();
-		}
-		return archiveUtil;
-	}
+    //	singleton access
+    static getInstance() {
+        if(!archiveUtil) {
+            archiveUtil = new ArchiveUtil();
+            archiveUtil.init();
+        }
+        return archiveUtil;
+    }
 
-	init() {
-		//
-		//	Load configuration
-		//
-		const config = Config();
-		if(_.has(config, 'archives.archivers')) {
-			Object.keys(config.archives.archivers).forEach(archKey => {
+    init() {
+        //
+        //	Load configuration
+        //
+        const config = Config();
+        if(_.has(config, 'archives.archivers')) {
+            Object.keys(config.archives.archivers).forEach(archKey => {
 
-				const archConfig 	= config.archives.archivers[archKey];
-				const archiver		= new Archiver(archConfig);
+                const archConfig 	= config.archives.archivers[archKey];
+                const archiver		= new Archiver(archConfig);
 
-				if(!archiver.ok()) {
-					//	:TODO: Log warning - bad archiver/config
-				}
+                if(!archiver.ok()) {
+                    //	:TODO: Log warning - bad archiver/config
+                }
 
-				this.archivers[archKey] = archiver;
-			});
-		}
+                this.archivers[archKey] = archiver;
+            });
+        }
 
-		if(_.isObject(config.fileTypes)) {
-			const updateSig = (ft) => {
-				ft.sig 		= Buffer.from(ft.sig, 'hex');
-				ft.offset	= ft.offset || 0;
+        if(_.isObject(config.fileTypes)) {
+            const updateSig = (ft) => {
+                ft.sig 		= Buffer.from(ft.sig, 'hex');
+                ft.offset	= ft.offset || 0;
 
-				//	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
-				const sigLen = ft.offset + ft.sig.length;
-				if(sigLen > this.longestSignature) {
-					this.longestSignature = sigLen;
-				}
-			};
+                //	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
+                const sigLen = ft.offset + ft.sig.length;
+                if(sigLen > this.longestSignature) {
+                    this.longestSignature = sigLen;
+                }
+            };
 
-			Object.keys(config.fileTypes).forEach(mimeType => {
-				const fileType = config.fileTypes[mimeType];
-				if(Array.isArray(fileType)) {
-					fileType.forEach(ft => {
-						if(ft.sig) {
-							updateSig(ft);
-						}
-					});
-				} else if(fileType.sig) {
-					updateSig(fileType);
-				}
-			});
-		}
-	}
+            Object.keys(config.fileTypes).forEach(mimeType => {
+                const fileType = config.fileTypes[mimeType];
+                if(Array.isArray(fileType)) {
+                    fileType.forEach(ft => {
+                        if(ft.sig) {
+                            updateSig(ft);
+                        }
+                    });
+                } else if(fileType.sig) {
+                    updateSig(fileType);
+                }
+            });
+        }
+    }
 
-	getArchiver(mimeTypeOrExtension, justExtention) {
-		const mimeType = resolveMimeType(mimeTypeOrExtension);
+    getArchiver(mimeTypeOrExtension, justExtention) {
+        const mimeType = resolveMimeType(mimeTypeOrExtension);
 
-		if(!mimeType) {	//	lookup returns false on failure
-			return;
-		}
+        if(!mimeType) {	//	lookup returns false on failure
+            return;
+        }
 
-		const config = Config();
-		let fileType = _.get(config, [ 'fileTypes', mimeType ] );
+        const config = Config();
+        let fileType = _.get(config, [ 'fileTypes', mimeType ] );
 
-		if(Array.isArray(fileType)) {
-			if(!justExtention) {
-				//	need extention for lookup; ambiguous as-is :(
-				return;
-			}
-			//	further refine by extention
-			fileType = fileType.find(ft => justExtention === ft.ext);
-		}
+        if(Array.isArray(fileType)) {
+            if(!justExtention) {
+                //	need extention for lookup; ambiguous as-is :(
+                return;
+            }
+            //	further refine by extention
+            fileType = fileType.find(ft => justExtention === ft.ext);
+        }
 
-		if(!_.isObject(fileType)) {
-			return;
-		}
+        if(!_.isObject(fileType)) {
+            return;
+        }
 
-		if(fileType.archiveHandler) {
-			return _.get( config, [ 'archives', 'archivers', fileType.archiveHandler ] );
-		}
-	}
+        if(fileType.archiveHandler) {
+            return _.get( config, [ 'archives', 'archivers', fileType.archiveHandler ] );
+        }
+    }
 
-	haveArchiver(archType) {
-		return this.getArchiver(archType) ? true : false;
-	}
+    haveArchiver(archType) {
+        return this.getArchiver(archType) ? true : false;
+    }
 
-	//	:TODO: implement me:
-	/*
-	detectTypeWithBuf(buf, cb) {		
+    //	:TODO: implement me:
+    /*
+	detectTypeWithBuf(buf, cb) {
 	}
 	*/
 
-	detectType(path, cb) {
-		fs.open(path, 'r', (err, fd) => {
-			if(err) {
-				return cb(err);
-			}
+    detectType(path, cb) {
+        fs.open(path, 'r', (err, fd) => {
+            if(err) {
+                return cb(err);
+            }
 
-			const buf = Buffer.alloc(this.longestSignature);
-			fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
-				if(err) {
-					return cb(err);
-				}
+            const buf = Buffer.alloc(this.longestSignature);
+            fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				const archFormat = _.findKey(Config().fileTypes, fileTypeInfo => {
-					const fileTypeInfos = Array.isArray(fileTypeInfo) ? fileTypeInfo : [ fileTypeInfo ];
-					return fileTypeInfos.find(fti => {
-						if(!fti.sig || !fti.archiveHandler) {
-							return false;
-						}
+                const archFormat = _.findKey(Config().fileTypes, fileTypeInfo => {
+                    const fileTypeInfos = Array.isArray(fileTypeInfo) ? fileTypeInfo : [ fileTypeInfo ];
+                    return fileTypeInfos.find(fti => {
+                        if(!fti.sig || !fti.archiveHandler) {
+                            return false;
+                        }
 
-						const lenNeeded = fti.offset + fti.sig.length;
+                        const lenNeeded = fti.offset + fti.sig.length;
 
-						if(bytesRead < lenNeeded) {
-							return false;
-						}
+                        if(bytesRead < lenNeeded) {
+                            return false;
+                        }
 
-						const comp = buf.slice(fti.offset, fti.offset + fti.sig.length);
-						return (fti.sig.equals(comp));
-					});
-				});
+                        const comp = buf.slice(fti.offset, fti.offset + fti.sig.length);
+                        return (fti.sig.equals(comp));
+                    });
+                });
 
-				return cb(archFormat ? null : Errors.General('Unknown type'), archFormat);
-			});
-		});
-	}
+                return cb(archFormat ? null : Errors.General('Unknown type'), archFormat);
+            });
+        });
+    }
 
-	spawnHandler(proc, action, cb) {
-		//	pty.js doesn't currently give us a error when things fail,
-		//	so we have this horrible, horrible hack:
-		let err;
-		proc.once('data', d => {
-			if(_.isString(d) && d.startsWith('execvp(3) failed.')) {
-				err = Errors.ExternalProcess(`${action} failed: ${d.trim()}`);
-			}
-		});
+    spawnHandler(proc, action, cb) {
+        //	pty.js doesn't currently give us a error when things fail,
+        //	so we have this horrible, horrible hack:
+        let err;
+        proc.once('data', d => {
+            if(_.isString(d) && d.startsWith('execvp(3) failed.')) {
+                err = Errors.ExternalProcess(`${action} failed: ${d.trim()}`);
+            }
+        });
 
-		proc.once('exit', exitCode => {
-			return cb(exitCode ? Errors.ExternalProcess(`${action} failed with exit code: ${exitCode}`) : err);
-		});
-	}
+        proc.once('exit', exitCode => {
+            return cb(exitCode ? Errors.ExternalProcess(`${action} failed with exit code: ${exitCode}`) : err);
+        });
+    }
 
-	compressTo(archType, archivePath, files, cb) {
-		const archiver = this.getArchiver(archType, paths.extname(archivePath));
+    compressTo(archType, archivePath, files, cb) {
+        const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
-		if(!archiver) {
-			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
-		}
+        if(!archiver) {
+            return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
+        }
 
-		const fmtObj = {
-			archivePath	: archivePath,
-			fileList	: files.join(' '),	//	:TODO: probably need same hack as extractTo here!
-		};
+        const fmtObj = {
+            archivePath	: archivePath,
+            fileList	: files.join(' '),	//	:TODO: probably need same hack as extractTo here!
+        };
 
-		const args = archiver.compress.args.map( arg => stringFormat(arg, fmtObj) );
+        const args = archiver.compress.args.map( arg => stringFormat(arg, fmtObj) );
 
-		let proc;
-		try {
-			proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts());
-		} catch(e) {
-			return cb(e);
-		}
+        let proc;
+        try {
+            proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts());
+        } catch(e) {
+            return cb(e);
+        }
 
-		return this.spawnHandler(proc, 'Compression', cb);
-	}
+        return this.spawnHandler(proc, 'Compression', cb);
+    }
 
-	extractTo(archivePath, extractPath, archType, fileList, cb) {
-		let haveFileList;
+    extractTo(archivePath, extractPath, archType, fileList, cb) {
+        let haveFileList;
 
-		if(!cb && _.isFunction(fileList)) {
-			cb = fileList;
-			fileList = [];
-			haveFileList = false;
-		} else {
-			haveFileList = true;
-		}
+        if(!cb && _.isFunction(fileList)) {
+            cb = fileList;
+            fileList = [];
+            haveFileList = false;
+        } else {
+            haveFileList = true;
+        }
 
-		const archiver = this.getArchiver(archType, paths.extname(archivePath));
+        const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
-		if(!archiver) {
-			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
-		}
+        if(!archiver) {
+            return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
+        }
 
-		const fmtObj = {
-			archivePath		: archivePath,
-			extractPath		: extractPath,
-		};
+        const fmtObj = {
+            archivePath		: archivePath,
+            extractPath		: extractPath,
+        };
 
-		let action = haveFileList ? 'extract' : 'decompress';
-		if('extract' === action && !_.isObject(archiver[action])) {
-			//	we're forced to do a full decompress
-			action = 'decompress';
-			haveFileList = false;
-		}
+        let action = haveFileList ? 'extract' : 'decompress';
+        if('extract' === action && !_.isObject(archiver[action])) {
+            //	we're forced to do a full decompress
+            action = 'decompress';
+            haveFileList = false;
+        }
 
-		//	we need to treat {fileList} special in that it should be broken up to 0:n args
-		const args = archiver[action].args.map( arg => {
-			return '{fileList}' === arg ? arg : stringFormat(arg, fmtObj);
-		});
+        //	we need to treat {fileList} special in that it should be broken up to 0:n args
+        const args = archiver[action].args.map( arg => {
+            return '{fileList}' === arg ? arg : stringFormat(arg, fmtObj);
+        });
 
-		const fileListPos = args.indexOf('{fileList}');
-		if(fileListPos > -1) {
-			//	replace {fileList} with 0:n sep file list arguments
-			args.splice.apply(args, [fileListPos, 1].concat(fileList));
-		}
+        const fileListPos = args.indexOf('{fileList}');
+        if(fileListPos > -1) {
+            //	replace {fileList} with 0:n sep file list arguments
+            args.splice.apply(args, [fileListPos, 1].concat(fileList));
+        }
 
-		let proc;
-		try {
-			proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts(extractPath));
-		} catch(e) {
-			return cb(e);
-		}
+        let proc;
+        try {
+            proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts(extractPath));
+        } catch(e) {
+            return cb(e);
+        }
 
-		return this.spawnHandler(proc, (haveFileList ? 'Extraction' : 'Decompression'), cb);
-	}
+        return this.spawnHandler(proc, (haveFileList ? 'Extraction' : 'Decompression'), cb);
+    }
 
-	listEntries(archivePath, archType, cb) {
-		const archiver = this.getArchiver(archType, paths.extname(archivePath));
+    listEntries(archivePath, archType, cb) {
+        const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
-		if(!archiver) {
-			return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
-		}
+        if(!archiver) {
+            return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
+        }
 
-		const fmtObj = {
-			archivePath		: archivePath,
-		};
+        const fmtObj = {
+            archivePath		: archivePath,
+        };
 
-		const args	= archiver.list.args.map( arg => stringFormat(arg, fmtObj) );
+        const args	= archiver.list.args.map( arg => stringFormat(arg, fmtObj) );
 
-		let proc;
-		try {
-			proc = pty.spawn(archiver.list.cmd, args, this.getPtyOpts());
-		} catch(e) {
-			return cb(e);
-		}
+        let proc;
+        try {
+            proc = pty.spawn(archiver.list.cmd, args, this.getPtyOpts());
+        } catch(e) {
+            return cb(e);
+        }
 
-		let output = '';
-		proc.on('data', data => {
-			//	:TODO: hack for: execvp(3) failed.: No such file or directory
+        let output = '';
+        proc.on('data', data => {
+            //	:TODO: hack for: execvp(3) failed.: No such file or directory
 
-			output += data;
-		});
+            output += data;
+        });
 
-		proc.once('exit', exitCode => {
-			if(exitCode) {
-				return cb(Errors.ExternalProcess(`List failed with exit code: ${exitCode}`));
-			}
+        proc.once('exit', exitCode => {
+            if(exitCode) {
+                return cb(Errors.ExternalProcess(`List failed with exit code: ${exitCode}`));
+            }
 
-			const entryGroupOrder = archiver.list.entryGroupOrder || { byteSize : 1, fileName : 2 };
+            const entryGroupOrder = archiver.list.entryGroupOrder || { byteSize : 1, fileName : 2 };
 
-			const entries = [];
-			const entryMatchRe = new RegExp(archiver.list.entryMatch, 'gm');
-			let m;
-			while((m = entryMatchRe.exec(output))) {
-				entries.push({
-					byteSize	: parseInt(m[entryGroupOrder.byteSize]),
-					fileName	: m[entryGroupOrder.fileName].trim(),
-				});
-			}
+            const entries = [];
+            const entryMatchRe = new RegExp(archiver.list.entryMatch, 'gm');
+            let m;
+            while((m = entryMatchRe.exec(output))) {
+                entries.push({
+                    byteSize	: parseInt(m[entryGroupOrder.byteSize]),
+                    fileName	: m[entryGroupOrder.fileName].trim(),
+                });
+            }
 
-			return cb(null, entries);
-		});
-	}
+            return cb(null, entries);
+        });
+    }
 
-	getPtyOpts(extractPath) {
-		const opts = {
-			name	: 'enigma-archiver',
-			cols	: 80,
-			rows	: 24,
-			env		: process.env,
-		};
-		if(extractPath) {
-			opts.cwd = extractPath;
-		}
-		//	:TODO: set cwd to supplied temp path if not sepcific extract
-		return opts;
-	}
+    getPtyOpts(extractPath) {
+        const opts = {
+            name	: 'enigma-archiver',
+            cols	: 80,
+            rows	: 24,
+            env		: process.env,
+        };
+        if(extractPath) {
+            opts.cwd = extractPath;
+        }
+        //	:TODO: set cwd to supplied temp path if not sepcific extract
+        return opts;
+    }
 };
diff --git a/core/art.js b/core/art.js
index dc873836..3a1949b1 100644
--- a/core/art.js
+++ b/core/art.js
@@ -26,87 +26,87 @@ exports.defaultEncodingFromExtension	= defaultEncodingFromExtension;
 //	:TODO: return font + font mapped information from SAUCE
 
 const SUPPORTED_ART_TYPES = {
-	//	:TODO: the defualt encoding are really useless if they are all the same ...
-	//	perhaps .ansamiga and .ascamiga could be supported as well as overrides via conf
-	'.ans'	: { name : 'ANSI',		defaultEncoding : 'cp437',	eof : 0x1a	},
-	'.asc'	: { name : 'ASCII',		defaultEncoding : 'cp437',	eof : 0x1a  },
-	'.pcb'	: { name : 'PCBoard',	defaultEncoding : 'cp437',	eof : 0x1a  },
-	'.bbs'	: { name : 'Wildcat',	defaultEncoding : 'cp437',	eof : 0x1a  },
+    //	:TODO: the defualt encoding are really useless if they are all the same ...
+    //	perhaps .ansamiga and .ascamiga could be supported as well as overrides via conf
+    '.ans'	: { name : 'ANSI',		defaultEncoding : 'cp437',	eof : 0x1a	},
+    '.asc'	: { name : 'ASCII',		defaultEncoding : 'cp437',	eof : 0x1a  },
+    '.pcb'	: { name : 'PCBoard',	defaultEncoding : 'cp437',	eof : 0x1a  },
+    '.bbs'	: { name : 'Wildcat',	defaultEncoding : 'cp437',	eof : 0x1a  },
 
-	'.amiga'	: { name : 'Amiga',			defaultEncoding	: 'amiga',	eof : 0x1a },
-	'.txt'		: { name : 'Amiga Text',	defaultEncoding : 'cp437',	eof : 0x1a  },
-	//	:TODO: extentions for wwiv, renegade, celerity, syncronet, ...
-	//	:TODO: extension for atari
-	//	:TODO: extension for topaz ansi/ascii.
+    '.amiga'	: { name : 'Amiga',			defaultEncoding	: 'amiga',	eof : 0x1a },
+    '.txt'		: { name : 'Amiga Text',	defaultEncoding : 'cp437',	eof : 0x1a  },
+    //	:TODO: extentions for wwiv, renegade, celerity, syncronet, ...
+    //	:TODO: extension for atari
+    //	:TODO: extension for topaz ansi/ascii.
 };
 
 function getFontNameFromSAUCE(sauce) {
-	if(sauce.Character) {
-		return sauce.Character.fontName;
-	}
+    if(sauce.Character) {
+        return sauce.Character.fontName;
+    }
 }
 
 function sliceAtEOF(data, eofMarker) {
-	let eof			= data.length;
-	const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
+    let eof			= data.length;
+    const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
 
-	for(let i = eof - 1; i > stopPos; i--) {
-		if(eofMarker === data[i]) {
-			eof = i;
-			break;
-		}
-	}
-	return data.slice(0, eof);
+    for(let i = eof - 1; i > stopPos; i--) {
+        if(eofMarker === data[i]) {
+            eof = i;
+            break;
+        }
+    }
+    return data.slice(0, eof);
 }
 
 function getArtFromPath(path, options, cb) {
-	fs.readFile(path, (err, data) => {
-		if(err) {
-			return cb(err);
-		}
+    fs.readFile(path, (err, data) => {
+        if(err) {
+            return cb(err);
+        }
 
-		//
-		//	Convert from encodedAs -> j
-		//
-		const ext		= paths.extname(path).toLowerCase();
-		const encoding	= options.encodedAs || defaultEncodingFromExtension(ext);
+        //
+        //	Convert from encodedAs -> j
+        //
+        const ext		= paths.extname(path).toLowerCase();
+        const encoding	= options.encodedAs || defaultEncodingFromExtension(ext);
 
-		//	:TODO: how are BOM's currently handled if present? Are they removed? Do we need to?
+        //	:TODO: how are BOM's currently handled if present? Are they removed? Do we need to?
 
-		function sliceOfData() {
-			if(options.fullFile === true) {
-				return iconv.decode(data, encoding);
-			} else {
-				const eofMarker = defaultEofFromExtension(ext);
-				return iconv.decode(eofMarker ? sliceAtEOF(data, eofMarker) : data, encoding);
-			}
-		}
+        function sliceOfData() {
+            if(options.fullFile === true) {
+                return iconv.decode(data, encoding);
+            } else {
+                const eofMarker = defaultEofFromExtension(ext);
+                return iconv.decode(eofMarker ? sliceAtEOF(data, eofMarker) : data, encoding);
+            }
+        }
 
-		function getResult(sauce) {
-			const result = {
-				data		: sliceOfData(),
-				fromPath	: path,
-			};
+        function getResult(sauce) {
+            const result = {
+                data		: sliceOfData(),
+                fromPath	: path,
+            };
 
-			if(sauce) {
-				result.sauce = sauce;
-			}
+            if(sauce) {
+                result.sauce = sauce;
+            }
 
-			return result;
-		}
+            return result;
+        }
 
-		if(options.readSauce === true) {
-			sauce.readSAUCE(data, (err, sauce) => {
-				if(err) {
-					return cb(null, getResult());
-				}
+        if(options.readSauce === true) {
+            sauce.readSAUCE(data, (err, sauce) => {
+                if(err) {
+                    return cb(null, getResult());
+                }
 
-				//
-				//	If a encoding was not provided & we have a mapping from
-				//	the information provided by SAUCE, use that.
-				//
-				if(!options.encodedAs) {
-					/*
+                //
+                //	If a encoding was not provided & we have a mapping from
+                //	the information provided by SAUCE, use that.
+                //
+                if(!options.encodedAs) {
+                    /*
 					if(sauce.Character && sauce.Character.fontName) {
 						var enc = SAUCE_FONT_TO_ENCODING_HINT[sauce.Character.fontName];
 						if(enc) {
@@ -114,115 +114,115 @@ function getArtFromPath(path, options, cb) {
 						}
 					}
 					*/
-				}
-				return cb(null, getResult(sauce));
-			});
-		} else {
-			return cb(null, getResult());
-		}
-	});
+                }
+                return cb(null, getResult(sauce));
+            });
+        } else {
+            return cb(null, getResult());
+        }
+    });
 }
 
 function getArt(name, options, cb) {
-	const ext = paths.extname(name);
+    const ext = paths.extname(name);
 
-	options.basePath	= miscUtil.valueWithDefault(options.basePath, Config().paths.art);
-	options.asAnsi		= miscUtil.valueWithDefault(options.asAnsi, true);
+    options.basePath	= miscUtil.valueWithDefault(options.basePath, Config().paths.art);
+    options.asAnsi		= miscUtil.valueWithDefault(options.asAnsi, true);
 
-	//	:TODO: make use of asAnsi option and convert from supported -> ansi
+    //	:TODO: make use of asAnsi option and convert from supported -> ansi
 
-	if('' !== ext) {
-		options.types = [ ext.toLowerCase() ];
-	} else {
-		if(_.isUndefined(options.types)) {
-			options.types = Object.keys(SUPPORTED_ART_TYPES);
-		} else if(_.isString(options.types)) {
-			options.types = [ options.types.toLowerCase() ];
-		}
-	}
+    if('' !== ext) {
+        options.types = [ ext.toLowerCase() ];
+    } else {
+        if(_.isUndefined(options.types)) {
+            options.types = Object.keys(SUPPORTED_ART_TYPES);
+        } else if(_.isString(options.types)) {
+            options.types = [ options.types.toLowerCase() ];
+        }
+    }
 
-	//	If an extension is provided, just read the file now
-	if('' !== ext) {
-		const directPath = paths.join(options.basePath, name);
-		return getArtFromPath(directPath, options, cb);
-	}
+    //	If an extension is provided, just read the file now
+    if('' !== ext) {
+        const directPath = paths.join(options.basePath, name);
+        return getArtFromPath(directPath, options, cb);
+    }
 
-	fs.readdir(options.basePath, (err, files) => {
-		if(err) {
-			return cb(err);
-		}
+    fs.readdir(options.basePath, (err, files) => {
+        if(err) {
+            return cb(err);
+        }
 
-		const filtered = files.filter( file => {
-			//
-			//  Ignore anything not allowed in |options.types|
-			//
-			const fext = paths.extname(file);
-			if(!options.types.includes(fext.toLowerCase())) {
-				return false;
-			}
+        const filtered = files.filter( file => {
+            //
+            //  Ignore anything not allowed in |options.types|
+            //
+            const fext = paths.extname(file);
+            if(!options.types.includes(fext.toLowerCase())) {
+                return false;
+            }
 
-			const bn = paths.basename(file, fext).toLowerCase();
-			if(options.random) {
-				const suppliedBn = paths.basename(name, fext).toLowerCase();
+            const bn = paths.basename(file, fext).toLowerCase();
+            if(options.random) {
+                const suppliedBn = paths.basename(name, fext).toLowerCase();
 
-				//
-				//  Random selection enabled. We'll allow for
-				//  basename1.ext, basename2.ext, ...
-				//
-				if(!bn.startsWith(suppliedBn)) {
-					return false;
-				}
+                //
+                //  Random selection enabled. We'll allow for
+                //  basename1.ext, basename2.ext, ...
+                //
+                if(!bn.startsWith(suppliedBn)) {
+                    return false;
+                }
 
-				const num = bn.substr(suppliedBn.length);
-				if(num.length > 0) {
-					if(isNaN(parseInt(num, 10))) {
-						return false;
-					}
-				}
-			} else {
-				//
-				//  We've already validated the extension (above). Must be an exact
-				//  match to basename here
-				//
-				if(bn != paths.basename(name, fext).toLowerCase()) {
-					return false;
-				}
-			}
+                const num = bn.substr(suppliedBn.length);
+                if(num.length > 0) {
+                    if(isNaN(parseInt(num, 10))) {
+                        return false;
+                    }
+                }
+            } else {
+                //
+                //  We've already validated the extension (above). Must be an exact
+                //  match to basename here
+                //
+                if(bn != paths.basename(name, fext).toLowerCase()) {
+                    return false;
+                }
+            }
 
-			return true;
-		});
+            return true;
+        });
 
-		if(filtered.length > 0) {
-			//
-			//  We should now have:
-			//  - Exactly (1) item in |filtered| if non-random
-			//  - 1:n items in |filtered| to choose from if random
-			//
-			let readPath;
-			if(options.random) {
-				readPath = paths.join(options.basePath, filtered[Math.floor(Math.random() * filtered.length)]);
-			} else {
-				assert(1 === filtered.length);
-				readPath = paths.join(options.basePath, filtered[0]);
-			}
+        if(filtered.length > 0) {
+            //
+            //  We should now have:
+            //  - Exactly (1) item in |filtered| if non-random
+            //  - 1:n items in |filtered| to choose from if random
+            //
+            let readPath;
+            if(options.random) {
+                readPath = paths.join(options.basePath, filtered[Math.floor(Math.random() * filtered.length)]);
+            } else {
+                assert(1 === filtered.length);
+                readPath = paths.join(options.basePath, filtered[0]);
+            }
 
-			return getArtFromPath(readPath, options, cb);
-		}
+            return getArtFromPath(readPath, options, cb);
+        }
 
-		return cb(new Error(`No matching art for supplied criteria: ${name}`));
-	});
+        return cb(new Error(`No matching art for supplied criteria: ${name}`));
+    });
 }
 
 function defaultEncodingFromExtension(ext) {
-	const artType = SUPPORTED_ART_TYPES[ext.toLowerCase()];
-	return artType ? artType.defaultEncoding : 'utf8';
+    const artType = SUPPORTED_ART_TYPES[ext.toLowerCase()];
+    return artType ? artType.defaultEncoding : 'utf8';
 }
 
 function defaultEofFromExtension(ext) {
-	const artType = SUPPORTED_ART_TYPES[ext.toLowerCase()];
-	if(artType) {
-		return artType.eof;
-	}
+    const artType = SUPPORTED_ART_TYPES[ext.toLowerCase()];
+    if(artType) {
+        return artType.eof;
+    }
 }
 
 //	:TODO: Implement the following
@@ -230,161 +230,161 @@ function defaultEofFromExtension(ext) {
 //	* Cancel (disabled | <keys> )
 //	* Resume from pause -> continous (disabled | <keys>)
 function display(client, art, options, cb) {
-	if(_.isFunction(options) && !cb) {
-		cb = options;
-		options = {};
-	}
+    if(_.isFunction(options) && !cb) {
+        cb = options;
+        options = {};
+    }
 
-	if(!art || !art.length) {
-		return cb(new Error('Empty art'));
-	}
+    if(!art || !art.length) {
+        return cb(new Error('Empty art'));
+    }
 
-	options.mciReplaceChar 	= options.mciReplaceChar || ' ';
-	options.disableMciCache	= options.disableMciCache || false;
+    options.mciReplaceChar 	= options.mciReplaceChar || ' ';
+    options.disableMciCache	= options.disableMciCache || false;
 
-	//	:TODO: this is going to be broken into two approaches controlled via options:
-	//	1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
-	//	2) CPR driven
+    //	:TODO: this is going to be broken into two approaches controlled via options:
+    //	1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
+    //	2) CPR driven
 
-	if(!_.isBoolean(options.iceColors)) {
-		//	try to detect from SAUCE
-		if(_.has(options, 'sauce.ansiFlags') && (options.sauce.ansiFlags & (1 << 0))) {
-			options.iceColors = true;
-		}
-	}
+    if(!_.isBoolean(options.iceColors)) {
+        //	try to detect from SAUCE
+        if(_.has(options, 'sauce.ansiFlags') && (options.sauce.ansiFlags & (1 << 0))) {
+            options.iceColors = true;
+        }
+    }
 
-	const ansiParser = new aep.ANSIEscapeParser({
-		mciReplaceChar	: options.mciReplaceChar,
-		termHeight		: client.term.termHeight,
-		termWidth		: client.term.termWidth,
-		trailingLF		: options.trailingLF,
-	});
+    const ansiParser = new aep.ANSIEscapeParser({
+        mciReplaceChar	: options.mciReplaceChar,
+        termHeight		: client.term.termHeight,
+        termWidth		: client.term.termWidth,
+        trailingLF		: options.trailingLF,
+    });
 
-	let parseComplete = false;
-	let cprListener;
-	let mciMap;
-	const mciCprQueue = [];
-	let artHash;
-	let mciMapFromCache;
+    let parseComplete = false;
+    let cprListener;
+    let mciMap;
+    const mciCprQueue = [];
+    let artHash;
+    let mciMapFromCache;
 
-	function completed() {
-		if(cprListener) {
-			client.removeListener('cursor position report', cprListener);
-		}
+    function completed() {
+        if(cprListener) {
+            client.removeListener('cursor position report', cprListener);
+        }
 
-		if(!options.disableMciCache && !mciMapFromCache) {
-			//	cache our MCI findings...
-			client.mciCache[artHash] = mciMap;
-			client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Added MCI map to cache');
-		}
+        if(!options.disableMciCache && !mciMapFromCache) {
+            //	cache our MCI findings...
+            client.mciCache[artHash] = mciMap;
+            client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Added MCI map to cache');
+        }
 
-		ansiParser.removeAllListeners();	//	:TODO: Necessary???
+        ansiParser.removeAllListeners();	//	:TODO: Necessary???
 
-		const extraInfo = {
-			height : ansiParser.row - 1,
-		};
+        const extraInfo = {
+            height : ansiParser.row - 1,
+        };
 
-		return cb(null, mciMap, extraInfo);
-	}
+        return cb(null, mciMap, extraInfo);
+    }
 
-	if(!options.disableMciCache) {
-		artHash	= xxhash.hash(Buffer.from(art), 0xCAFEBABE);
+    if(!options.disableMciCache) {
+        artHash	= xxhash.hash(Buffer.from(art), 0xCAFEBABE);
 
-		//	see if we have a mciMap cached for this art
-		if(client.mciCache) {
-			mciMap	= client.mciCache[artHash];
-		}
-	}
+        //	see if we have a mciMap cached for this art
+        if(client.mciCache) {
+            mciMap	= client.mciCache[artHash];
+        }
+    }
 
-	if(mciMap) {
-		mciMapFromCache = true;
-		client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Loaded MCI map from cache');
-	} else {
-		//	no cached MCI info
-		mciMap = {};
+    if(mciMap) {
+        mciMapFromCache = true;
+        client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Loaded MCI map from cache');
+    } else {
+        //	no cached MCI info
+        mciMap = {};
 
-		cprListener = function(pos) {
-			if(mciCprQueue.length > 0) {
-				mciMap[mciCprQueue.shift()].position = pos;
+        cprListener = function(pos) {
+            if(mciCprQueue.length > 0) {
+                mciMap[mciCprQueue.shift()].position = pos;
 
-				if(parseComplete && 0 === mciCprQueue.length) {
-					return completed();
-				}
-			}
-		};
+                if(parseComplete && 0 === mciCprQueue.length) {
+                    return completed();
+                }
+            }
+        };
 
-		client.on('cursor position report', cprListener);
+        client.on('cursor position report', cprListener);
 
-		let generatedId = 100;
+        let generatedId = 100;
 
-		ansiParser.on('mci', mciInfo => {
-			//	:TODO: ensure generatedId's do not conflict with any existing |id|
-			const id		= _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
-			const mapKey	= `${mciInfo.mci}${id}`;
-			const mapEntry	= mciMap[mapKey];
+        ansiParser.on('mci', mciInfo => {
+            //	:TODO: ensure generatedId's do not conflict with any existing |id|
+            const id		= _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
+            const mapKey	= `${mciInfo.mci}${id}`;
+            const mapEntry	= mciMap[mapKey];
 
-			if(mapEntry) {
-				mapEntry.focusSGR	= mciInfo.SGR;
-				mapEntry.focusArgs	= mciInfo.args;
-			} else {
-				mciMap[mapKey] = {
-					args	: mciInfo.args,
-					SGR		: mciInfo.SGR,
-					code	: mciInfo.mci,
-					id		: id,
-				};
+            if(mapEntry) {
+                mapEntry.focusSGR	= mciInfo.SGR;
+                mapEntry.focusArgs	= mciInfo.args;
+            } else {
+                mciMap[mapKey] = {
+                    args	: mciInfo.args,
+                    SGR		: mciInfo.SGR,
+                    code	: mciInfo.mci,
+                    id		: id,
+                };
 
-				if(!mciInfo.id) {
-					++generatedId;
-				}
+                if(!mciInfo.id) {
+                    ++generatedId;
+                }
 
-				mciCprQueue.push(mapKey);
-				client.term.rawWrite(ansi.queryPos());
-			}
+                mciCprQueue.push(mapKey);
+                client.term.rawWrite(ansi.queryPos());
+            }
 
-		});
-	}
+        });
+    }
 
-	ansiParser.on('literal', literal => client.term.write(literal, false) );
-	ansiParser.on('control', control => client.term.rawWrite(control) );
+    ansiParser.on('literal', literal => client.term.write(literal, false) );
+    ansiParser.on('control', control => client.term.rawWrite(control) );
 
-	ansiParser.on('complete', () => {
-		parseComplete = true;
+    ansiParser.on('complete', () => {
+        parseComplete = true;
 
-		if(0 === mciCprQueue.length) {
-			return completed();
-		}
-	});
+        if(0 === mciCprQueue.length) {
+            return completed();
+        }
+    });
 
-	let initSeq = '';
-	if(options.font) {
-		initSeq = ansi.setSyncTermFontWithAlias(options.font);
-	} else if(options.sauce) {
-		let fontName = getFontNameFromSAUCE(options.sauce);
-		if(fontName) {
-			fontName = ansi.getSyncTERMFontFromAlias(fontName);
-		}
+    let initSeq = '';
+    if(options.font) {
+        initSeq = ansi.setSyncTermFontWithAlias(options.font);
+    } else if(options.sauce) {
+        let fontName = getFontNameFromSAUCE(options.sauce);
+        if(fontName) {
+            fontName = ansi.getSyncTERMFontFromAlias(fontName);
+        }
 
-		//
-		//	Set SyncTERM font if we're switching only. Most terminals
-		//	that support this ESC sequence can only show *one* font
-		//	at a time. This applies to detection only (e.g. SAUCE).
-		//	If explicit, we'll set it no matter what (above)
-		//
-		if(fontName && client.term.currentSyncFont != fontName) {
-			client.term.currentSyncFont = fontName;
-			initSeq = ansi.setSyncTERMFont(fontName);
-		}
-	}
+        //
+        //	Set SyncTERM font if we're switching only. Most terminals
+        //	that support this ESC sequence can only show *one* font
+        //	at a time. This applies to detection only (e.g. SAUCE).
+        //	If explicit, we'll set it no matter what (above)
+        //
+        if(fontName && client.term.currentSyncFont != fontName) {
+            client.term.currentSyncFont = fontName;
+            initSeq = ansi.setSyncTERMFont(fontName);
+        }
+    }
 
-	if(options.iceColors) {
-		initSeq += ansi.blinkToBrightIntensity();
-	}
+    if(options.iceColors) {
+        initSeq += ansi.blinkToBrightIntensity();
+    }
 
-	if(initSeq) {
-		client.term.rawWrite(initSeq);
-	}
+    if(initSeq) {
+        client.term.rawWrite(initSeq);
+    }
 
-	ansiParser.reset(art);
-	return ansiParser.parse();
+    ansiParser.reset(art);
+    return ansiParser.parse();
 }
diff --git a/core/asset.js b/core/asset.js
index 43c881c0..ece05cfc 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -18,111 +18,111 @@ exports.resolveSystemStatAsset	= resolveSystemStatAsset;
 exports.getViewPropertyAsset	= getViewPropertyAsset;
 
 const ALL_ASSETS = [
-	'art',
-	'menu',
-	'method',
-	'userModule',
-	'systemMethod',
-	'systemModule',
-	'prompt',
-	'config',
-	'sysStat',
+    'art',
+    'menu',
+    'method',
+    'userModule',
+    'systemMethod',
+    'systemModule',
+    'prompt',
+    'config',
+    'sysStat',
 ];
 
 const ASSET_RE = new RegExp('\\@(' + ALL_ASSETS.join('|') + ')\\:([\\w\\d\\.]*)(?:\\/([\\w\\d\\_]+))*');
 
 function parseAsset(s) {
-	const m = ASSET_RE.exec(s);
+    const m = ASSET_RE.exec(s);
 
-	if(m) {
-		let result = { type : m[1] };
+    if(m) {
+        let result = { type : m[1] };
 
-		if(m[3]) {
-			result.location = m[2];
-			result.asset	= m[3];
-		} else {
-			result.asset	= m[2];
-		}
+        if(m[3]) {
+            result.location = m[2];
+            result.asset	= m[3];
+        } else {
+            result.asset	= m[2];
+        }
 
-		return result;
-	}
+        return result;
+    }
 }
 
 function getAssetWithShorthand(spec, defaultType) {
-	if(!_.isString(spec)) {
-		return null;
-	}
+    if(!_.isString(spec)) {
+        return null;
+    }
 
-	if('@' === spec[0]) {
-		const asset = parseAsset(spec);
-		assert(_.isString(asset.type));
+    if('@' === spec[0]) {
+        const asset = parseAsset(spec);
+        assert(_.isString(asset.type));
 
-		return asset;
-	}
+        return asset;
+    }
 
-	return {
-		type	: defaultType,
-		asset	: spec,
-	};
+    return {
+        type	: defaultType,
+        asset	: spec,
+    };
 }
 
 function getArtAsset(spec) {
-	const asset = getAssetWithShorthand(spec, 'art');
+    const asset = getAssetWithShorthand(spec, 'art');
 
-	if(!asset) {
-		return null;
-	}
+    if(!asset) {
+        return null;
+    }
 
-	assert( ['art', 'method' ].indexOf(asset.type) > -1);
-	return asset;
+    assert( ['art', 'method' ].indexOf(asset.type) > -1);
+    return asset;
 }
 
 function getModuleAsset(spec) {
-	const asset = getAssetWithShorthand(spec, 'systemModule');
+    const asset = getAssetWithShorthand(spec, 'systemModule');
 
-	if(!asset) {
-		return null;
-	}
+    if(!asset) {
+        return null;
+    }
 
-	assert( ['userModule', 'systemModule' ].includes(asset.type) );
+    assert( ['userModule', 'systemModule' ].includes(asset.type) );
 
-	return asset;
+    return asset;
 }
 
 function resolveConfigAsset(spec) {
-	const asset = parseAsset(spec);
-	if(asset) {
-		assert('config' === asset.type);
+    const asset = parseAsset(spec);
+    if(asset) {
+        assert('config' === asset.type);
 
-		const path	= asset.asset.split('.');
-		let conf	= Config();
-		for(let i = 0; i < path.length; ++i) {
-			if(_.isUndefined(conf[path[i]])) {
-				return spec;
-			}
-			conf = conf[path[i]];
-		}
-		return conf;
-	} else {
-		return spec;
-	}
+        const path	= asset.asset.split('.');
+        let conf	= Config();
+        for(let i = 0; i < path.length; ++i) {
+            if(_.isUndefined(conf[path[i]])) {
+                return spec;
+            }
+            conf = conf[path[i]];
+        }
+        return conf;
+    } else {
+        return spec;
+    }
 }
 
 function resolveSystemStatAsset(spec) {
-	const asset = parseAsset(spec);
-	if(!asset) {
-		return spec;
-	}
+    const asset = parseAsset(spec);
+    if(!asset) {
+        return spec;
+    }
 
-	assert('sysStat' === asset.type);
+    assert('sysStat' === asset.type);
 
-	return StatLog.getSystemStat(asset.asset) || spec;
+    return StatLog.getSystemStat(asset.asset) || spec;
 }
 
 function getViewPropertyAsset(src) {
-	if(!_.isString(src) || '@' !== src.charAt(0)) {
-		return null;
-	}
+    if(!_.isString(src) || '@' !== src.charAt(0)) {
+        return null;
+    }
 
-	return parseAsset(src);
+    return parseAsset(src);
 }
diff --git a/core/bbs.js b/core/bbs.js
index a352c555..597a0b97 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -41,253 +41,253 @@ valid args:
 `;
 
 function printHelpAndExit() {
-	console.info(HELP);
-	process.exit();
+    console.info(HELP);
+    process.exit();
 }
 
 function main() {
-	async.waterfall(
-		[
-			function processArgs(callback) {
-				const argv = require('minimist')(process.argv.slice(2));
+    async.waterfall(
+        [
+            function processArgs(callback) {
+                const argv = require('minimist')(process.argv.slice(2));
 
-				if(argv.help) {
-					printHelpAndExit();
-				}
+                if(argv.help) {
+                    printHelpAndExit();
+                }
 
-				const configOverridePath = argv.config;
+                const configOverridePath = argv.config;
 
-				return callback(null, configOverridePath || conf.getDefaultPath(), _.isString(configOverridePath));
-			},
-			function initConfig(configPath, configPathSupplied, callback) {
-				const configFile = configPath + 'config.hjson';
-				conf.init(resolvePath(configFile), function configInit(err) {
+                return callback(null, configOverridePath || conf.getDefaultPath(), _.isString(configOverridePath));
+            },
+            function initConfig(configPath, configPathSupplied, callback) {
+                const configFile = configPath + 'config.hjson';
+                conf.init(resolvePath(configFile), function configInit(err) {
 
-					//
-					//	If the user supplied a path and we can't read/parse it
-					//	then it's a fatal error
-					//
-					if(err) {
-						if('ENOENT' === err.code)  {
-							if(configPathSupplied) {
-								console.error('Configuration file does not exist: ' + configFile);
-							} else {
-								configPathSupplied = null;	//	make non-fatal; we'll go with defaults
-							}
-						} else {
-							console.error(err.toString());
-						}
-					}
-					callback(err);
-				});
-			},
-			function initSystem(callback) {
-				initialize(function init(err) {
-					if(err) {
-						console.error('Error initializing: ' + util.inspect(err));
-					}
-					return callback(err);
-				});
-			}
-		],
-		function complete(err) {
-			//	note this is escaped:
-			fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
-				console.info(FULL_COPYRIGHT);
-				if(!err) {
-					console.info(banner);
-				}
-				console.info('System started!');
-			});
+                    //
+                    //	If the user supplied a path and we can't read/parse it
+                    //	then it's a fatal error
+                    //
+                    if(err) {
+                        if('ENOENT' === err.code)  {
+                            if(configPathSupplied) {
+                                console.error('Configuration file does not exist: ' + configFile);
+                            } else {
+                                configPathSupplied = null;	//	make non-fatal; we'll go with defaults
+                            }
+                        } else {
+                            console.error(err.toString());
+                        }
+                    }
+                    callback(err);
+                });
+            },
+            function initSystem(callback) {
+                initialize(function init(err) {
+                    if(err) {
+                        console.error('Error initializing: ' + util.inspect(err));
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        function complete(err) {
+            //	note this is escaped:
+            fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
+                console.info(FULL_COPYRIGHT);
+                if(!err) {
+                    console.info(banner);
+                }
+                console.info('System started!');
+            });
 
-			if(err) {
-				console.error('Error initializing: ' + util.inspect(err));
-			}
-		}
-	);
+            if(err) {
+                console.error('Error initializing: ' + util.inspect(err));
+            }
+        }
+    );
 }
 
 function shutdownSystem() {
-	const msg = 'Process interrupted. Shutting down...';
-	console.info(msg);
-	logger.log.info(msg);
+    const msg = 'Process interrupted. Shutting down...';
+    console.info(msg);
+    logger.log.info(msg);
 
-	async.series(
-		[
-			function closeConnections(callback) {
-				const ClientConns = require('./client_connections.js');
-				const activeConnections = ClientConns.getActiveConnections();
-				let i = activeConnections.length;
-				while(i--) {
-					const activeTerm = activeConnections[i].term;
-					if(activeTerm) {
-						activeTerm.write('\n\nServer is shutting down NOW! Disconnecting...\n\n');
-					}
-					ClientConns.removeClient(activeConnections[i]);
-				}
-				callback(null);
-			},
-			function stopListeningServers(callback) {
-				return require('./listening_server.js').shutdown( () => {
-					return callback(null);	//	ignore err
-				});
-			},
-			function stopEventScheduler(callback) {
-				if(initServices.eventScheduler) {
-					return initServices.eventScheduler.shutdown( () => {
-						return callback(null);	// ignore err
-					});
-				} else {
-					return callback(null);
-				}
-			},
-			function stopFileAreaWeb(callback) {
-				require('./file_area_web.js').startup( () => {
-					return callback(null);	// ignore err
-				});
-			},
-			function stopMsgNetwork(callback) {
-				require('./msg_network.js').shutdown(callback);
-			}
-		],
-		() => {
-			console.info('Goodbye!');
-			return process.exit();
-		}
-	);
+    async.series(
+        [
+            function closeConnections(callback) {
+                const ClientConns = require('./client_connections.js');
+                const activeConnections = ClientConns.getActiveConnections();
+                let i = activeConnections.length;
+                while(i--) {
+                    const activeTerm = activeConnections[i].term;
+                    if(activeTerm) {
+                        activeTerm.write('\n\nServer is shutting down NOW! Disconnecting...\n\n');
+                    }
+                    ClientConns.removeClient(activeConnections[i]);
+                }
+                callback(null);
+            },
+            function stopListeningServers(callback) {
+                return require('./listening_server.js').shutdown( () => {
+                    return callback(null);	//	ignore err
+                });
+            },
+            function stopEventScheduler(callback) {
+                if(initServices.eventScheduler) {
+                    return initServices.eventScheduler.shutdown( () => {
+                        return callback(null);	// ignore err
+                    });
+                } else {
+                    return callback(null);
+                }
+            },
+            function stopFileAreaWeb(callback) {
+                require('./file_area_web.js').startup( () => {
+                    return callback(null);	// ignore err
+                });
+            },
+            function stopMsgNetwork(callback) {
+                require('./msg_network.js').shutdown(callback);
+            }
+        ],
+        () => {
+            console.info('Goodbye!');
+            return process.exit();
+        }
+    );
 }
 
 function initialize(cb) {
-	async.series(
-		[
-			function createMissingDirectories(callback) {
-				async.each(Object.keys(conf.config.paths), function entry(pathKey, next) {
-					mkdirs(conf.config.paths[pathKey], function dirCreated(err) {
-						if(err) {
-							console.error('Could not create path: ' + conf.config.paths[pathKey] + ': ' + err.toString());
-						}
-						return next(err);
-					});
-				}, function dirCreationComplete(err) {
-					return callback(err);
-				});
-			},
-			function basicInit(callback) {
-				logger.init();
-				logger.log.info(
-					{ version : require('../package.json').version },
-					'**** ENiGMA½ Bulletin Board System Starting Up! ****');
+    async.series(
+        [
+            function createMissingDirectories(callback) {
+                async.each(Object.keys(conf.config.paths), function entry(pathKey, next) {
+                    mkdirs(conf.config.paths[pathKey], function dirCreated(err) {
+                        if(err) {
+                            console.error('Could not create path: ' + conf.config.paths[pathKey] + ': ' + err.toString());
+                        }
+                        return next(err);
+                    });
+                }, function dirCreationComplete(err) {
+                    return callback(err);
+                });
+            },
+            function basicInit(callback) {
+                logger.init();
+                logger.log.info(
+                    { version : require('../package.json').version },
+                    '**** ENiGMA½ Bulletin Board System Starting Up! ****');
 
-				process.on('SIGINT', shutdownSystem);
+                process.on('SIGINT', shutdownSystem);
 
-				require('later').date.localTime();	//	use local times for later.js/scheduling
+                require('later').date.localTime();	//	use local times for later.js/scheduling
 
-				return callback(null);
-			},
-			function initDatabases(callback) {
-				return database.initializeDatabases(callback);
-			},
-			function initMimeTypes(callback) {
-				return require('./mime_util.js').startup(callback);
-			},
-			function initStatLog(callback) {
-				return require('./stat_log.js').init(callback);
-			},
-			function initConfigs(callback) {
-				return require('./config_util.js').init(callback);
-			},
-			function initThemes(callback) {
-				//	Have to pull in here so it's after Config init
-				require('./theme.js').initAvailableThemes( (err, themeCount) => {
-					logger.log.info({ themeCount }, 'Themes initialized');
-					return callback(err);
-				});
-			},
-			function loadSysOpInformation(callback) {
-				//
-				//	Copy over some +op information from the user DB -> system propertys.
-				//	* Makes this accessible for MCI codes, easy non-blocking access, etc.
-				//	* We do this every time as the op is free to change this information just
-				//	  like any other user
-				//
-				const User = require('./user.js');
+                return callback(null);
+            },
+            function initDatabases(callback) {
+                return database.initializeDatabases(callback);
+            },
+            function initMimeTypes(callback) {
+                return require('./mime_util.js').startup(callback);
+            },
+            function initStatLog(callback) {
+                return require('./stat_log.js').init(callback);
+            },
+            function initConfigs(callback) {
+                return require('./config_util.js').init(callback);
+            },
+            function initThemes(callback) {
+                //	Have to pull in here so it's after Config init
+                require('./theme.js').initAvailableThemes( (err, themeCount) => {
+                    logger.log.info({ themeCount }, 'Themes initialized');
+                    return callback(err);
+                });
+            },
+            function loadSysOpInformation(callback) {
+                //
+                //	Copy over some +op information from the user DB -> system propertys.
+                //	* Makes this accessible for MCI codes, easy non-blocking access, etc.
+                //	* We do this every time as the op is free to change this information just
+                //	  like any other user
+                //
+                const User = require('./user.js');
 
-				async.waterfall(
-					[
-						function getOpUserName(next) {
-							return User.getUserName(1, next);
-						},
-						function getOpProps(opUserName, next) {
-							const propLoadOpts = {
-								names	: [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
-							};
-							User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
-								return next(err, opUserName, opProps);
-							});
-						}
-					],
-					(err, opUserName, opProps) => {
-						const StatLog = require('./stat_log.js');
+                async.waterfall(
+                    [
+                        function getOpUserName(next) {
+                            return User.getUserName(1, next);
+                        },
+                        function getOpProps(opUserName, next) {
+                            const propLoadOpts = {
+                                names	: [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
+                            };
+                            User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
+                                return next(err, opUserName, opProps);
+                            });
+                        }
+                    ],
+                    (err, opUserName, opProps) => {
+                        const StatLog = require('./stat_log.js');
 
-						if(err) {
-							[ 'username', 'real_name', 'sex', 'email_address', 'location', 'affiliation' ].forEach(v => {
-								StatLog.setNonPeristentSystemStat(`sysop_${v}`, 'N/A');
-							});
-						} else {
-							opProps.username = opUserName;
+                        if(err) {
+                            [ 'username', 'real_name', 'sex', 'email_address', 'location', 'affiliation' ].forEach(v => {
+                                StatLog.setNonPeristentSystemStat(`sysop_${v}`, 'N/A');
+                            });
+                        } else {
+                            opProps.username = opUserName;
 
-							_.each(opProps, (v, k) => {
-								StatLog.setNonPeristentSystemStat(`sysop_${k}`, v);
-							});
-						}
+                            _.each(opProps, (v, k) => {
+                                StatLog.setNonPeristentSystemStat(`sysop_${k}`, v);
+                            });
+                        }
 
-						return callback(null);
-					}
-				);
-			},
-			function initFileAreaStats(callback) {
-				const getAreaStats = require('./file_base_area.js').getAreaStats;
-				getAreaStats( (err, stats) => {
-					if(!err) {
-						const StatLog = require('./stat_log.js');
-						StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
-					}
+                        return callback(null);
+                    }
+                );
+            },
+            function initFileAreaStats(callback) {
+                const getAreaStats = require('./file_base_area.js').getAreaStats;
+                getAreaStats( (err, stats) => {
+                    if(!err) {
+                        const StatLog = require('./stat_log.js');
+                        StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
+                    }
 
-					return callback(null);
-				});
-			},
-			function initMCI(callback) {
-				return require('./predefined_mci.js').init(callback);
-			},
-			function readyMessageNetworkSupport(callback) {
-				return require('./msg_network.js').startup(callback);
-			},
-			function readyEvents(callback) {
-				return require('./events.js').startup(callback);
-			},
-			function listenConnections(callback) {
-				return require('./listening_server.js').startup(callback);
-			},
-			function readyFileBaseArea(callback) {
-				return require('./file_base_area.js').startup(callback);
-			},
-			function readyFileAreaWeb(callback) {
-				return require('./file_area_web.js').startup(callback);
-			},
-			function readyPasswordReset(callback) {
-				const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
-				return WebPasswordReset.startup(callback);
-			},
-			function readyEventScheduler(callback) {
-				const EventSchedulerModule = require('./event_scheduler.js').EventSchedulerModule;
-				EventSchedulerModule.loadAndStart( (err, modInst) => {
-					initServices.eventScheduler = modInst;
-					return callback(err);
-				});
-			}
-		],
-		function onComplete(err) {
-			return cb(err);
-		}
-	);
+                    return callback(null);
+                });
+            },
+            function initMCI(callback) {
+                return require('./predefined_mci.js').init(callback);
+            },
+            function readyMessageNetworkSupport(callback) {
+                return require('./msg_network.js').startup(callback);
+            },
+            function readyEvents(callback) {
+                return require('./events.js').startup(callback);
+            },
+            function listenConnections(callback) {
+                return require('./listening_server.js').startup(callback);
+            },
+            function readyFileBaseArea(callback) {
+                return require('./file_base_area.js').startup(callback);
+            },
+            function readyFileAreaWeb(callback) {
+                return require('./file_area_web.js').startup(callback);
+            },
+            function readyPasswordReset(callback) {
+                const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
+                return WebPasswordReset.startup(callback);
+            },
+            function readyEventScheduler(callback) {
+                const EventSchedulerModule = require('./event_scheduler.js').EventSchedulerModule;
+                EventSchedulerModule.loadAndStart( (err, modInst) => {
+                    initServices.eventScheduler = modInst;
+                    return callback(err);
+                });
+            }
+        ],
+        function onComplete(err) {
+            return cb(err);
+        }
+    );
 }
diff --git a/core/bbs_link.js b/core/bbs_link.js
index 15416c2e..4034b383 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -37,171 +37,171 @@ const packageJson 	= require('../package.json');
 //	:TODO: ENH: Support nodeMax and tooManyArt
 
 exports.moduleInfo = {
-	name	: 'BBSLink',
-	desc	: 'BBSLink Access Module',
-	author	: 'NuSkooler',
+    name	: 'BBSLink',
+    desc	: 'BBSLink Access Module',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class BBSLinkModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config			= options.menuConfig.config;
-		this.config.host	= this.config.host || 'games.bbslink.net';
-		this.config.port	= this.config.port || 23;
-	}
+        this.config			= options.menuConfig.config;
+        this.config.host	= this.config.host || 'games.bbslink.net';
+        this.config.port	= this.config.port || 23;
+    }
 
-	initSequence() {
-		let token;
-		let randomKey;
-		let clientTerminated;
-		const self = this;
+    initSequence() {
+        let token;
+        let randomKey;
+        let clientTerminated;
+        const self = this;
 
-		async.series(
-			[
-				function validateConfig(callback) {
-					if(_.isString(self.config.sysCode) &&
+        async.series(
+            [
+                function validateConfig(callback) {
+                    if(_.isString(self.config.sysCode) &&
 						_.isString(self.config.authCode) &&
 						_.isString(self.config.schemeCode) &&
 						_.isString(self.config.door))
-					{
-						callback(null);
-					} else {
-						callback(new Error('Configuration is missing option(s)'));
-					}
-				},
-				function acquireToken(callback) {
-					//
-					//	Acquire an authentication token
-					//
-					crypto.randomBytes(16, function rand(ex, buf) {
-						if(ex) {
-							callback(ex);
-						} else {
-							randomKey = buf.toString('base64').substr(0, 6);
-							self.simpleHttpRequest('/token.php?key=' + randomKey, null, function resp(err, body) {
-								if(err) {
-									callback(err);
-								} else {
-									token = body.trim();
-									self.client.log.trace( { token : token }, 'BBSLink token');
-									callback(null);
-								}
-							});
-						}
-					});
-				},
-				function authenticateToken(callback) {
-					//
-					//	Authenticate the token we acquired previously
-					//
-					var headers = {
-						'X-User'	: self.client.user.userId.toString(),
-						'X-System'	: self.config.sysCode,
-						'X-Auth'	: crypto.createHash('md5').update(self.config.authCode + token).digest('hex'),
-						'X-Code'	: crypto.createHash('md5').update(self.config.schemeCode + token).digest('hex'),
-						'X-Rows'	: self.client.term.termHeight.toString(),
-						'X-Key'		: randomKey,
-						'X-Door'	: self.config.door,
-						'X-Token'	: token,
-						'X-Type'	: 'enigma-bbs',
-						'X-Version'	: packageJson.version,
-					};
+                    {
+                        callback(null);
+                    } else {
+                        callback(new Error('Configuration is missing option(s)'));
+                    }
+                },
+                function acquireToken(callback) {
+                    //
+                    //	Acquire an authentication token
+                    //
+                    crypto.randomBytes(16, function rand(ex, buf) {
+                        if(ex) {
+                            callback(ex);
+                        } else {
+                            randomKey = buf.toString('base64').substr(0, 6);
+                            self.simpleHttpRequest('/token.php?key=' + randomKey, null, function resp(err, body) {
+                                if(err) {
+                                    callback(err);
+                                } else {
+                                    token = body.trim();
+                                    self.client.log.trace( { token : token }, 'BBSLink token');
+                                    callback(null);
+                                }
+                            });
+                        }
+                    });
+                },
+                function authenticateToken(callback) {
+                    //
+                    //	Authenticate the token we acquired previously
+                    //
+                    var headers = {
+                        'X-User'	: self.client.user.userId.toString(),
+                        'X-System'	: self.config.sysCode,
+                        'X-Auth'	: crypto.createHash('md5').update(self.config.authCode + token).digest('hex'),
+                        'X-Code'	: crypto.createHash('md5').update(self.config.schemeCode + token).digest('hex'),
+                        'X-Rows'	: self.client.term.termHeight.toString(),
+                        'X-Key'		: randomKey,
+                        'X-Door'	: self.config.door,
+                        'X-Token'	: token,
+                        'X-Type'	: 'enigma-bbs',
+                        'X-Version'	: packageJson.version,
+                    };
 
-					self.simpleHttpRequest('/auth.php?key=' + randomKey, headers, function resp(err, body) {
-						var status = body.trim();
+                    self.simpleHttpRequest('/auth.php?key=' + randomKey, headers, function resp(err, body) {
+                        var status = body.trim();
 
-						if('complete' === status) {
-							callback(null);
-						} else {
-							callback(new Error('Bad authentication status: ' + status));
-						}
-					});
-				},
-				function createTelnetBridge(callback) {
-					//
-					//	Authentication with BBSLink successful. Now, we need to create a telnet
-					//	bridge from us to them
-					//
-					var connectOpts = {
-						port	: self.config.port,
-						host	: self.config.host,
-					};
+                        if('complete' === status) {
+                            callback(null);
+                        } else {
+                            callback(new Error('Bad authentication status: ' + status));
+                        }
+                    });
+                },
+                function createTelnetBridge(callback) {
+                    //
+                    //	Authentication with BBSLink successful. Now, we need to create a telnet
+                    //	bridge from us to them
+                    //
+                    var connectOpts = {
+                        port	: self.config.port,
+                        host	: self.config.host,
+                    };
 
-					var clientTerminated;
+                    var clientTerminated;
 
-					self.client.term.write(resetScreen());
-					self.client.term.write('  Connecting to BBSLink.net, please wait...\n');
+                    self.client.term.write(resetScreen());
+                    self.client.term.write('  Connecting to BBSLink.net, please wait...\n');
 
-					var bridgeConnection = net.createConnection(connectOpts, function connected() {
-						self.client.log.info(connectOpts, 'BBSLink bridge connection established');
+                    var bridgeConnection = net.createConnection(connectOpts, function connected() {
+                        self.client.log.info(connectOpts, 'BBSLink bridge connection established');
 
-						self.client.term.output.pipe(bridgeConnection);
+                        self.client.term.output.pipe(bridgeConnection);
 
-						self.client.once('end', function clientEnd() {
-							self.client.log.info('Connection ended. Terminating BBSLink connection');
-							clientTerminated = true;
-							bridgeConnection.end();
-						});
-					});
+                        self.client.once('end', function clientEnd() {
+                            self.client.log.info('Connection ended. Terminating BBSLink connection');
+                            clientTerminated = true;
+                            bridgeConnection.end();
+                        });
+                    });
 
-					var restorePipe = function() {
-						self.client.term.output.unpipe(bridgeConnection);
-						self.client.term.output.resume();
-					};
+                    var restorePipe = function() {
+                        self.client.term.output.unpipe(bridgeConnection);
+                        self.client.term.output.resume();
+                    };
 
-					bridgeConnection.on('data', function incomingData(data) {
-						//	pass along
-						//	:TODO: just pipe this as well
-						self.client.term.rawWrite(data);
-					});
+                    bridgeConnection.on('data', function incomingData(data) {
+                        //	pass along
+                        //	:TODO: just pipe this as well
+                        self.client.term.rawWrite(data);
+                    });
 
-					bridgeConnection.on('end', function connectionEnd() {
-						restorePipe();
-						callback(clientTerminated ? new Error('Client connection terminated') : null);
-					});
+                    bridgeConnection.on('end', function connectionEnd() {
+                        restorePipe();
+                        callback(clientTerminated ? new Error('Client connection terminated') : null);
+                    });
 
-					bridgeConnection.on('error', function error(err) {
-						self.client.log.info('BBSLink bridge connection error: ' + err.message);
-						restorePipe();
-						callback(err);
-					});
-				}
-			],
-			function complete(err) {
-				if(err) {
-					self.client.log.warn( { error : err.toString() }, 'BBSLink connection error');
-				}
+                    bridgeConnection.on('error', function error(err) {
+                        self.client.log.info('BBSLink bridge connection error: ' + err.message);
+                        restorePipe();
+                        callback(err);
+                    });
+                }
+            ],
+            function complete(err) {
+                if(err) {
+                    self.client.log.warn( { error : err.toString() }, 'BBSLink connection error');
+                }
 
-				if(!clientTerminated) {
-					self.prevMenu();
-				}
-			}
-		);
-	}
+                if(!clientTerminated) {
+                    self.prevMenu();
+                }
+            }
+        );
+    }
 
-	simpleHttpRequest(path, headers, cb) {
-		const getOpts = {
-			host	: this.config.host,
-			path	: path,
-			headers	: headers,
-		};
+    simpleHttpRequest(path, headers, cb) {
+        const getOpts = {
+            host	: this.config.host,
+            path	: path,
+            headers	: headers,
+        };
 
-		const req = http.get(getOpts, function response(resp) {
-			let data = '';
+        const req = http.get(getOpts, function response(resp) {
+            let data = '';
 
-			resp.on('data', function chunk(c) {
-				data += c;
-			});
+            resp.on('data', function chunk(c) {
+                data += c;
+            });
 
-			resp.on('end', function respEnd() {
-				cb(null, data);
-				req.end();
-			});
-		});
+            resp.on('end', function respEnd() {
+                cb(null, data);
+                req.end();
+            });
+        });
 
-		req.on('error', function reqErr(err) {
-			cb(err);
-		});
-	}
+        req.on('error', function reqErr(err) {
+            cb(err);
+        });
+    }
 };
diff --git a/core/bbs_list.js b/core/bbs_list.js
index abff376f..b0da3dbb 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -5,8 +5,8 @@
 const MenuModule			= require('./menu_module.js').MenuModule;
 
 const {
-	getModDatabasePath,
-	getTransactionDatabase
+    getModDatabasePath,
+    getTransactionDatabase
 }							= require('./database.js');
 
 const ViewController		= require('./view_controller.js').ViewController;
@@ -23,397 +23,397 @@ const _						= require('lodash');
 //	:TODO: add notes field
 
 const moduleInfo = exports.moduleInfo = {
-	name		: 'BBS List',
-	desc		: 'List of other BBSes',
-	author		: 'Andrew Pamment',
-	packageName	: 'com.magickabbs.enigma.bbslist'
+    name		: 'BBS List',
+    desc		: 'List of other BBSes',
+    author		: 'Andrew Pamment',
+    packageName	: 'com.magickabbs.enigma.bbslist'
 };
 
 const MciViewIds = {
-	view : {
-		BBSList					: 1,
-		SelectedBBSName			: 2,
-		SelectedBBSSysOp		: 3,
-		SelectedBBSTelnet		: 4,
-		SelectedBBSWww			: 5,
-		SelectedBBSLoc			: 6,
-		SelectedBBSSoftware		: 7,
-		SelectedBBSNotes		: 8,
-		SelectedBBSSubmitter	: 9,
-	},
-	add : {
-		BBSName		: 1,
-		Sysop		: 2,
-		Telnet		: 3,
-		Www			: 4,
-		Location	: 5,
-		Software	: 6,
-		Notes		: 7,
-		Error		: 8,
-	}
+    view : {
+        BBSList					: 1,
+        SelectedBBSName			: 2,
+        SelectedBBSSysOp		: 3,
+        SelectedBBSTelnet		: 4,
+        SelectedBBSWww			: 5,
+        SelectedBBSLoc			: 6,
+        SelectedBBSSoftware		: 7,
+        SelectedBBSNotes		: 8,
+        SelectedBBSSubmitter	: 9,
+    },
+    add : {
+        BBSName		: 1,
+        Sysop		: 2,
+        Telnet		: 3,
+        Www			: 4,
+        Location	: 5,
+        Software	: 6,
+        Notes		: 7,
+        Error		: 8,
+    }
 };
 
 const FormIds = {
-	View	: 0,
-	Add		: 1,
+    View	: 0,
+    Add		: 1,
 };
 
 const SELECTED_MCI_NAME_TO_ENTRY = {
-	SelectedBBSName			: 'bbsName',
-	SelectedBBSSysOp		: 'sysOp',
-	SelectedBBSTelnet		: 'telnet',
-	SelectedBBSWww			: 'www',
-	SelectedBBSLoc			: 'location',
-	SelectedBBSSoftware		: 'software',
-	SelectedBBSSubmitter	: 'submitter',
-	SelectedBBSSubmitterId	: 'submitterUserId',
-	SelectedBBSNotes		: 'notes',
+    SelectedBBSName			: 'bbsName',
+    SelectedBBSSysOp		: 'sysOp',
+    SelectedBBSTelnet		: 'telnet',
+    SelectedBBSWww			: 'www',
+    SelectedBBSLoc			: 'location',
+    SelectedBBSSoftware		: 'software',
+    SelectedBBSSubmitter	: 'submitter',
+    SelectedBBSSubmitterId	: 'submitterUserId',
+    SelectedBBSNotes		: 'notes',
 };
 
 exports.getModule = class BBSListModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self = this;
-		this.menuMethods = {
-			//
-			//	Validators
-			//
-			viewValidationListener : function(err, cb) {
-				const errMsgView = self.viewControllers.add.getView(MciViewIds.add.Error);
-				if(errMsgView) {
-					if(err) {
-						errMsgView.setText(err.message);
-					} else {
-						errMsgView.clearText();
-					}
-				}
+        const self = this;
+        this.menuMethods = {
+            //
+            //	Validators
+            //
+            viewValidationListener : function(err, cb) {
+                const errMsgView = self.viewControllers.add.getView(MciViewIds.add.Error);
+                if(errMsgView) {
+                    if(err) {
+                        errMsgView.setText(err.message);
+                    } else {
+                        errMsgView.clearText();
+                    }
+                }
 
-				return cb(null);
-			},
+                return cb(null);
+            },
 
-			//
-			//	Key & submit handlers
-			//
-			addBBS : function(formData, extraArgs, cb) {
-				self.displayAddScreen(cb);
-			},
-			deleteBBS : function(formData, extraArgs, cb) {
-				if(!_.isNumber(self.selectedBBS) || 0 === self.entries.length) {
-					return cb(null);
-				}
+            //
+            //	Key & submit handlers
+            //
+            addBBS : function(formData, extraArgs, cb) {
+                self.displayAddScreen(cb);
+            },
+            deleteBBS : function(formData, extraArgs, cb) {
+                if(!_.isNumber(self.selectedBBS) || 0 === self.entries.length) {
+                    return cb(null);
+                }
 
-				const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
+                const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
 
-				if(self.entries[self.selectedBBS].submitterUserId !== self.client.user.userId && !self.client.user.isSysOp()) {
-					//	must be owner or +op
-					return cb(null);
-				}
+                if(self.entries[self.selectedBBS].submitterUserId !== self.client.user.userId && !self.client.user.isSysOp()) {
+                    //	must be owner or +op
+                    return cb(null);
+                }
 
-				const entry = self.entries[self.selectedBBS];
-				if(!entry) {
-					return cb(null);
-				}
+                const entry = self.entries[self.selectedBBS];
+                if(!entry) {
+                    return cb(null);
+                }
 
-				self.database.run(
-					`DELETE FROM bbs_list 
+                self.database.run(
+                    `DELETE FROM bbs_list 
 					WHERE id=?;`,
-					[ entry.id ],
-					err => {
-						if (err) {
-							self.client.log.error( { err : err }, 'Error deleting from BBS list');
-						} else {
-							self.entries.splice(self.selectedBBS, 1);
+                    [ entry.id ],
+                    err => {
+                        if (err) {
+                            self.client.log.error( { err : err }, 'Error deleting from BBS list');
+                        } else {
+                            self.entries.splice(self.selectedBBS, 1);
 
-							self.setEntries(entriesView);
+                            self.setEntries(entriesView);
 
-							if(self.entries.length > 0) {
-								entriesView.focusPrevious();
-							}
+                            if(self.entries.length > 0) {
+                                entriesView.focusPrevious();
+                            }
 
-							self.viewControllers.view.redrawAll();
-						}
+                            self.viewControllers.view.redrawAll();
+                        }
 
-						return cb(null);
-					}
-				);
-			},
-			submitBBS : function(formData, extraArgs, cb) {
+                        return cb(null);
+                    }
+                );
+            },
+            submitBBS : function(formData, extraArgs, cb) {
 
-				let ok = true;
-				[ 'BBSName', 'Sysop', 'Telnet' ].forEach( mciName => {
-					if('' === self.viewControllers.add.getView(MciViewIds.add[mciName]).getData()) {
-						ok = false;
-					}
-				});
-				if(!ok) {
-					//	validators should prevent this!
-					return cb(null);
-				}
+                let ok = true;
+                [ 'BBSName', 'Sysop', 'Telnet' ].forEach( mciName => {
+                    if('' === self.viewControllers.add.getView(MciViewIds.add[mciName]).getData()) {
+                        ok = false;
+                    }
+                });
+                if(!ok) {
+                    //	validators should prevent this!
+                    return cb(null);
+                }
 
-				self.database.run(
-					`INSERT INTO bbs_list (bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes) 
+                self.database.run(
+                    `INSERT INTO bbs_list (bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes) 
 					VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
-					[
-						formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www, 
-						formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes
-					],
-					err => {
-						if(err) {
-							self.client.log.error( { err : err }, 'Error adding to BBS list');
-						}
+                    [
+                        formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www,
+                        formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes
+                    ],
+                    err => {
+                        if(err) {
+                            self.client.log.error( { err : err }, 'Error adding to BBS list');
+                        }
 
-						self.clearAddForm();
-						self.displayBBSList(true, cb);
-					}
-				);
-			},
-			cancelSubmit : function(formData, extraArgs, cb) {
-				self.clearAddForm();
-				self.displayBBSList(true, cb);
-			}
-		};
-	}
+                        self.clearAddForm();
+                        self.displayBBSList(true, cb);
+                    }
+                );
+            },
+            cancelSubmit : function(formData, extraArgs, cb) {
+                self.clearAddForm();
+                self.displayBBSList(true, cb);
+            }
+        };
+    }
 
-	initSequence() {
-		const self = this;
-		async.series(
-			[
-				function beforeDisplayArt(callback) {
-					self.beforeArt(callback);
-				},
-				function display(callback) {
-					self.displayBBSList(false, callback);
-				}
-			],
-			err => {
-				if(err) {
-					//	:TODO: Handle me -- initSequence() should really take a completion callback
-				}
-				self.finishedLoading();
-			}
-		);
-	}
+    initSequence() {
+        const self = this;
+        async.series(
+            [
+                function beforeDisplayArt(callback) {
+                    self.beforeArt(callback);
+                },
+                function display(callback) {
+                    self.displayBBSList(false, callback);
+                }
+            ],
+            err => {
+                if(err) {
+                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                }
+                self.finishedLoading();
+            }
+        );
+    }
 
-	drawSelectedEntry(entry) {
-		if(!entry) {
-			Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
-				this.setViewText('view', MciViewIds.view[mciName], '');
-			});
-		} else {
-			const youSubmittedFormat = this.menuConfig.youSubmittedFormat || '{submitter} (You!)';
+    drawSelectedEntry(entry) {
+        if(!entry) {
+            Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
+                this.setViewText('view', MciViewIds.view[mciName], '');
+            });
+        } else {
+            const youSubmittedFormat = this.menuConfig.youSubmittedFormat || '{submitter} (You!)';
 
-			Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
-				const t = entry[SELECTED_MCI_NAME_TO_ENTRY[mciName]];
-				if(MciViewIds.view[mciName]) {
+            Object.keys(SELECTED_MCI_NAME_TO_ENTRY).forEach(mciName => {
+                const t = entry[SELECTED_MCI_NAME_TO_ENTRY[mciName]];
+                if(MciViewIds.view[mciName]) {
 
-					if('SelectedBBSSubmitter' == mciName && entry.submitterUserId == this.client.user.userId) {
-						this.setViewText('view',MciViewIds.view.SelectedBBSSubmitter, stringFormat(youSubmittedFormat, entry));
-					} else {
-						this.setViewText('view',MciViewIds.view[mciName], t);
-					}
-				}
-			});
-		}
-	}
+                    if('SelectedBBSSubmitter' == mciName && entry.submitterUserId == this.client.user.userId) {
+                        this.setViewText('view',MciViewIds.view.SelectedBBSSubmitter, stringFormat(youSubmittedFormat, entry));
+                    } else {
+                        this.setViewText('view',MciViewIds.view[mciName], t);
+                    }
+                }
+            });
+        }
+    }
 
-	setEntries(entriesView) {
-		const config			= this.menuConfig.config;
-		const listFormat		= config.listFormat || '{bbsName}';
-		const focusListFormat	= config.focusListFormat || '{bbsName}';
+    setEntries(entriesView) {
+        const config			= this.menuConfig.config;
+        const listFormat		= config.listFormat || '{bbsName}';
+        const focusListFormat	= config.focusListFormat || '{bbsName}';
 
-		entriesView.setItems(this.entries.map( e => stringFormat(listFormat, e) ) );
-		entriesView.setFocusItems(this.entries.map( e => stringFormat(focusListFormat, e) ) );
-	}
+        entriesView.setItems(this.entries.map( e => stringFormat(listFormat, e) ) );
+        entriesView.setFocusItems(this.entries.map( e => stringFormat(focusListFormat, e) ) );
+    }
 
-	displayBBSList(clearScreen, cb) {
-		const self = this;
+    displayBBSList(clearScreen, cb) {
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					if(self.viewControllers.add) {
-						self.viewControllers.add.setFocus(false);
-					}
-					if (clearScreen) {
-						self.client.term.rawWrite(ansi.resetScreen());
-					}
-					theme.displayThemedAsset(
-						self.menuConfig.config.art.entries,
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'view',
-							new ViewController( { client : self.client, formId : FormIds.View } )
-						);
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    if(self.viewControllers.add) {
+                        self.viewControllers.add.setFocus(false);
+                    }
+                    if (clearScreen) {
+                        self.client.term.rawWrite(ansi.resetScreen());
+                    }
+                    theme.displayThemedAsset(
+                        self.menuConfig.config.art.entries,
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'view',
+                            new ViewController( { client : self.client, formId : FormIds.View } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.View,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.View,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.view.setFocus(true);
-						self.viewControllers.view.getView(MciViewIds.view.BBSList).redraw();
-						return callback(null);
-					}
-				},
-				function fetchEntries(callback) {
-					const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
-					self.entries = [];
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.view.setFocus(true);
+                        self.viewControllers.view.getView(MciViewIds.view.BBSList).redraw();
+                        return callback(null);
+                    }
+                },
+                function fetchEntries(callback) {
+                    const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
+                    self.entries = [];
 
-					self.database.each(
-						`SELECT id, bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes
+                    self.database.each(
+                        `SELECT id, bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes
 						FROM bbs_list;`,
-						(err, row) => {
-							if (!err) {
-								self.entries.push({
-									id				: row.id,
-									bbsName			: row.bbs_name,
-									sysOp			: row.sysop,
-									telnet			: row.telnet,
-									www				: row.www,
-									location		: row.location,
-									software		: row.software,
-									submitterUserId	: row.submitter_user_id,
-									notes			: row.notes,
-								});
-							}
-						},
-						err => {
-							return callback(err, entriesView);
-						}
-					);
-				},
-				function getUserNames(entriesView, callback) {
-					async.each(self.entries, (entry, next) => {
-						User.getUserName(entry.submitterUserId, (err, username) => {
-							if(username) {
-								entry.submitter = username;
-							} else {
-								entry.submitter = 'N/A';
-							}
-							return next();
-						});
-					}, () => {
-						return callback(null, entriesView);
-					});
-				},
-				function populateEntries(entriesView, callback) {
-					self.setEntries(entriesView);
+                        (err, row) => {
+                            if (!err) {
+                                self.entries.push({
+                                    id				: row.id,
+                                    bbsName			: row.bbs_name,
+                                    sysOp			: row.sysop,
+                                    telnet			: row.telnet,
+                                    www				: row.www,
+                                    location		: row.location,
+                                    software		: row.software,
+                                    submitterUserId	: row.submitter_user_id,
+                                    notes			: row.notes,
+                                });
+                            }
+                        },
+                        err => {
+                            return callback(err, entriesView);
+                        }
+                    );
+                },
+                function getUserNames(entriesView, callback) {
+                    async.each(self.entries, (entry, next) => {
+                        User.getUserName(entry.submitterUserId, (err, username) => {
+                            if(username) {
+                                entry.submitter = username;
+                            } else {
+                                entry.submitter = 'N/A';
+                            }
+                            return next();
+                        });
+                    }, () => {
+                        return callback(null, entriesView);
+                    });
+                },
+                function populateEntries(entriesView, callback) {
+                    self.setEntries(entriesView);
 
-					entriesView.on('index update', idx => {
-						const entry = self.entries[idx];
+                    entriesView.on('index update', idx => {
+                        const entry = self.entries[idx];
 
-						self.drawSelectedEntry(entry);
+                        self.drawSelectedEntry(entry);
 
-						if(!entry) {
-							self.selectedBBS = -1;
-						} else {
-							self.selectedBBS = idx;
-						}
-					});
+                        if(!entry) {
+                            self.selectedBBS = -1;
+                        } else {
+                            self.selectedBBS = idx;
+                        }
+                    });
 
-					if (self.selectedBBS >= 0) {
-						entriesView.setFocusItemIndex(self.selectedBBS);
-						self.drawSelectedEntry(self.entries[self.selectedBBS]);
-					} else if (self.entries.length > 0) {
-						self.selectedBBS = 0;
-						entriesView.setFocusItemIndex(0);
-						self.drawSelectedEntry(self.entries[0]);
-					}
+                    if (self.selectedBBS >= 0) {
+                        entriesView.setFocusItemIndex(self.selectedBBS);
+                        self.drawSelectedEntry(self.entries[self.selectedBBS]);
+                    } else if (self.entries.length > 0) {
+                        self.selectedBBS = 0;
+                        entriesView.setFocusItemIndex(0);
+                        self.drawSelectedEntry(self.entries[0]);
+                    }
 
-					entriesView.redraw();
+                    entriesView.redraw();
 
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	displayAddScreen(cb) {
-		const self = this;
+    displayAddScreen(cb) {
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					self.viewControllers.view.setFocus(false);
-					self.client.term.rawWrite(ansi.resetScreen());
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    self.viewControllers.view.setFocus(false);
+                    self.client.term.rawWrite(ansi.resetScreen());
 
-					theme.displayThemedAsset(
-						self.menuConfig.config.art.add,
-						self.client,
-						{ font : self.menuConfig.font },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'add',
-							new ViewController( { client : self.client, formId : FormIds.Add } )
-						);
+                    theme.displayThemedAsset(
+                        self.menuConfig.config.art.add,
+                        self.client,
+                        { font : self.menuConfig.font },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'add',
+                            new ViewController( { client : self.client, formId : FormIds.Add } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.Add,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.Add,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.add.setFocus(true);
-						self.viewControllers.add.redrawAll();
-						self.viewControllers.add.switchFocus(MciViewIds.add.BBSName);
-						return callback(null);
-					}
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.add.setFocus(true);
+                        self.viewControllers.add.redrawAll();
+                        self.viewControllers.add.switchFocus(MciViewIds.add.BBSName);
+                        return callback(null);
+                    }
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	clearAddForm() {
-		[ 'BBSName', 'Sysop', 'Telnet', 'Www', 'Location', 'Software', 'Error', 'Notes' ].forEach( mciName => {
-			this.setViewText('add', MciViewIds.add[mciName], '');
-		});
-	}
+    clearAddForm() {
+        [ 'BBSName', 'Sysop', 'Telnet', 'Www', 'Location', 'Software', 'Error', 'Notes' ].forEach( mciName => {
+            this.setViewText('add', MciViewIds.add[mciName], '');
+        });
+    }
 
-	initDatabase(cb) {
-		const self = this;
+    initDatabase(cb) {
+        const self = this;
 
-		async.series(
-			[
-				function openDatabase(callback) {
-					self.database = getTransactionDatabase(new sqlite3.Database(
-						getModDatabasePath(moduleInfo),
-						callback
-					));
-				},
-				function createTables(callback) {
-					self.database.serialize( () => {
-						self.database.run(
-							`CREATE TABLE IF NOT EXISTS bbs_list (
+        async.series(
+            [
+                function openDatabase(callback) {
+                    self.database = getTransactionDatabase(new sqlite3.Database(
+                        getModDatabasePath(moduleInfo),
+                        callback
+                    ));
+                },
+                function createTables(callback) {
+                    self.database.serialize( () => {
+                        self.database.run(
+                            `CREATE TABLE IF NOT EXISTS bbs_list (
 								id					INTEGER PRIMARY KEY,
 								bbs_name			VARCHAR NOT NULL,
 								sysop				VARCHAR NOT NULL,
@@ -424,20 +424,20 @@ exports.getModule = class BBSListModule extends MenuModule {
 								submitter_user_id	INTEGER NOT NULL,
 								notes				VARCHAR
 							);`
-						);
-					});
-					callback(null);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                        );
+                    });
+                    callback(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	beforeArt(cb) {
-		super.beforeArt(err => {
-			return err ? cb(err) : this.initDatabase(cb);
-		});
-	}
+    beforeArt(cb) {
+        super.beforeArt(err => {
+            return err ? cb(err) : this.initDatabase(cb);
+        });
+    }
 };
diff --git a/core/button_view.js b/core/button_view.js
index d5b858c7..6c86b5c3 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -8,24 +8,24 @@ const util			= require('util');
 exports.ButtonView			= ButtonView;
 
 function ButtonView(options) {
-	options.acceptsFocus	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-	options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-	options.justify			= miscUtil.valueWithDefault(options.justify, 'center');
-	options.cursor 			= miscUtil.valueWithDefault(options.cursor, 'hide');
+    options.acceptsFocus	= miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.justify			= miscUtil.valueWithDefault(options.justify, 'center');
+    options.cursor 			= miscUtil.valueWithDefault(options.cursor, 'hide');
 
-	TextView.call(this, options);
+    TextView.call(this, options);
 }
 
 util.inherits(ButtonView, TextView);
 
 ButtonView.prototype.onKeyPress = function(ch, key) {
-	if(this.isKeyMapped('accept', key.name) || ' ' === ch) {
-		this.submitData = 'accept';
-		this.emit('action', 'accept');
-		delete this.submitData;
-	} else {
-		ButtonView.super_.prototype.onKeyPress.call(this, ch, key);
-	}
+    if(this.isKeyMapped('accept', key.name) || ' ' === ch) {
+        this.submitData = 'accept';
+        this.emit('action', 'accept');
+        delete this.submitData;
+    } else {
+        ButtonView.super_.prototype.onKeyPress.call(this, ch, key);
+    }
 };
 /*
 ButtonView.prototype.onKeyPress = function(ch, key) {
@@ -39,5 +39,5 @@ ButtonView.prototype.onKeyPress = function(ch, key) {
 */
 
 ButtonView.prototype.getData = function() {
-	return this.submitData || null;
+    return this.submitData || null;
 };
diff --git a/core/client.js b/core/client.js
index 10409c70..4347c0b2 100644
--- a/core/client.js
+++ b/core/client.js
@@ -58,442 +58,442 @@ const RE_DEV_ATTR_RESPONSE_ANYWHERE	= /(?:\u001b\[)[=?]([0-9a-zA-Z;]+)(c)/;
 const RE_META_KEYCODE_ANYWHERE		= /(?:\u001b)([a-zA-Z0-9])/;
 const RE_META_KEYCODE				= new RegExp('^' + RE_META_KEYCODE_ANYWHERE.source + '$');
 const RE_FUNCTION_KEYCODE_ANYWHERE	= new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:' + [
-	'(\\d+)(?:;(\\d+))?([~^$])',
-	'(?:M([@ #!a`])(.)(.))',		// mouse stuff
-	'(?:1;)?(\\d+)?([a-zA-Z@])'
+    '(\\d+)(?:;(\\d+))?([~^$])',
+    '(?:M([@ #!a`])(.)(.))',		// mouse stuff
+    '(?:1;)?(\\d+)?([a-zA-Z@])'
 ].join('|') + ')');
 
 const RE_FUNCTION_KEYCODE			= new RegExp('^' + RE_FUNCTION_KEYCODE_ANYWHERE.source);
 const RE_ESC_CODE_ANYWHERE			= new RegExp( [
-	RE_FUNCTION_KEYCODE_ANYWHERE.source,
-	RE_META_KEYCODE_ANYWHERE.source,
-	RE_DSR_RESPONSE_ANYWHERE.source,
-	RE_DEV_ATTR_RESPONSE_ANYWHERE.source,
-	/\u001b./.source
+    RE_FUNCTION_KEYCODE_ANYWHERE.source,
+    RE_META_KEYCODE_ANYWHERE.source,
+    RE_DSR_RESPONSE_ANYWHERE.source,
+    RE_DEV_ATTR_RESPONSE_ANYWHERE.source,
+    /\u001b./.source
 ].join('|'));
 
 
 function Client(/*input, output*/) {
-	stream.call(this);
+    stream.call(this);
 
-	const self	= this;
+    const self	= this;
 
-	this.user				= new User();
-	this.currentTheme		= { info : { name : 'N/A', description : 'None' } };
-	this.lastKeyPressMs		= Date.now();
-	this.menuStack			= new MenuStack(this);
-	this.acs				= new ACS(this);
-	this.mciCache			= {};
+    this.user				= new User();
+    this.currentTheme		= { info : { name : 'N/A', description : 'None' } };
+    this.lastKeyPressMs		= Date.now();
+    this.menuStack			= new MenuStack(this);
+    this.acs				= new ACS(this);
+    this.mciCache			= {};
 
-	this.clearMciCache = function() {
-		this.mciCache = {};
-	};
+    this.clearMciCache = function() {
+        this.mciCache = {};
+    };
 
-	Object.defineProperty(this, 'node', {
-		get : function() {
-			return self.session.id + 1;
-		}
-	});
+    Object.defineProperty(this, 'node', {
+        get : function() {
+            return self.session.id + 1;
+        }
+    });
 
-	Object.defineProperty(this, 'currentMenuModule', {
-		get : function() {
-			return self.menuStack.currentModule;
-		}
-	});
+    Object.defineProperty(this, 'currentMenuModule', {
+        get : function() {
+            return self.menuStack.currentModule;
+        }
+    });
 
-	this.setTemporaryDirectDataHandler = function(handler) {
-		this.input.removeAllListeners('data');
-		this.input.on('data', handler);
-	};
+    this.setTemporaryDirectDataHandler = function(handler) {
+        this.input.removeAllListeners('data');
+        this.input.on('data', handler);
+    };
 
-	this.restoreDataHandler = function() {
-		this.input.removeAllListeners('data');
-		this.input.on('data', this.dataHandler);
-	};
+    this.restoreDataHandler = function() {
+        this.input.removeAllListeners('data');
+        this.input.on('data', this.dataHandler);
+    };
 
-	Events.on(Events.getSystemEvents().ThemeChanged, ( { themeId } ) => {
-		if(_.get(this.currentTheme, 'info.themeId') === themeId) {
-			this.currentTheme = require('./theme.js').getAvailableThemes().get(themeId);
-		}
-	});
+    Events.on(Events.getSystemEvents().ThemeChanged, ( { themeId } ) => {
+        if(_.get(this.currentTheme, 'info.themeId') === themeId) {
+            this.currentTheme = require('./theme.js').getAvailableThemes().get(themeId);
+        }
+    });
 
 
-	//
-	//	Peek at incoming |data| and emit events for any special
-	//	handling that may include:
-	//	*	Keyboard input
-	//	*	ANSI CSR's and the like
-	//
-	//	References:
-	//	*	http://www.ansi-bbs.org/ansi-bbs-core-server.html
-	//	*	Christopher Jeffrey's Blessed library @ https://github.com/chjj/blessed/
-	//
-	this.getTermClient = function(deviceAttr) {
-		let termClient = {
-			//
-			//	See http://www.fbl.cz/arctel/download/techman.pdf
-			//
-			//	Known clients:
-			//	* Irssi ConnectBot (Android)
-			//
-			'63;1;2'		: 'arctel',
-			'50;86;84;88'	: 'vtx',
-		}[deviceAttr];
+    //
+    //	Peek at incoming |data| and emit events for any special
+    //	handling that may include:
+    //	*	Keyboard input
+    //	*	ANSI CSR's and the like
+    //
+    //	References:
+    //	*	http://www.ansi-bbs.org/ansi-bbs-core-server.html
+    //	*	Christopher Jeffrey's Blessed library @ https://github.com/chjj/blessed/
+    //
+    this.getTermClient = function(deviceAttr) {
+        let termClient = {
+            //
+            //	See http://www.fbl.cz/arctel/download/techman.pdf
+            //
+            //	Known clients:
+            //	* Irssi ConnectBot (Android)
+            //
+            '63;1;2'		: 'arctel',
+            '50;86;84;88'	: 'vtx',
+        }[deviceAttr];
 
-		if(!termClient) {
-			if(_.startsWith(deviceAttr, '67;84;101;114;109')) {
-				//
-				//	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
-				//
-				//	Known clients:
-				//	* SyncTERM
-				//
-				termClient = 'cterm';
-			}
-		}
+        if(!termClient) {
+            if(_.startsWith(deviceAttr, '67;84;101;114;109')) {
+                //
+                //	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+                //
+                //	Known clients:
+                //	* SyncTERM
+                //
+                termClient = 'cterm';
+            }
+        }
 
-		return termClient;
-	};
+        return termClient;
+    };
 
-	this.isMouseInput = function(data) {
-		return /\x1b\[M/.test(data) ||							//	eslint-disable-line no-control-regex
+    this.isMouseInput = function(data) {
+        return /\x1b\[M/.test(data) ||							//	eslint-disable-line no-control-regex
 			/\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||	//	eslint-disable-line no-control-regex
 			/\u001b\[(\d+;\d+;\d+)M/.test(data) ||
 			/\u001b\[<(\d+;\d+;\d+)([mM])/.test(data) ||
 			/\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) ||
 			/\u001b\[24([0135])~\[(\d+),(\d+)\]\r/.test(data) ||
 			/\u001b\[(O|I)/.test(data);
-	};
+    };
 
-	this.getKeyComponentsFromCode = function(code) {
-		return {
-			//	xterm/gnome
-			'OP' : { name : 'f1' },
-			'OQ' : { name : 'f2' },
-			'OR' : { name : 'f3' },
-			'OS' : { name : 'f4' },
+    this.getKeyComponentsFromCode = function(code) {
+        return {
+            //	xterm/gnome
+            'OP' : { name : 'f1' },
+            'OQ' : { name : 'f2' },
+            'OR' : { name : 'f3' },
+            'OS' : { name : 'f4' },
 
-			'OA' : { name : 'up arrow' },
-			'OB' : { name : 'down arrow' },
-			'OC' : { name : 'right arrow' },
-			'OD' : { name : 'left arrow' },
-			'OE' : { name : 'clear' },
-			'OF' : { name : 'end' },
-			'OH' : { name : 'home' },
+            'OA' : { name : 'up arrow' },
+            'OB' : { name : 'down arrow' },
+            'OC' : { name : 'right arrow' },
+            'OD' : { name : 'left arrow' },
+            'OE' : { name : 'clear' },
+            'OF' : { name : 'end' },
+            'OH' : { name : 'home' },
 
-			//	xterm/rxvt
-			'[11~'	: { name : 'f1' },
-			'[12~'	: { name : 'f2' },
-			'[13~'	: { name : 'f3' },
-			'[14~'	: { name : 'f4' },
+            //	xterm/rxvt
+            '[11~'	: { name : 'f1' },
+            '[12~'	: { name : 'f2' },
+            '[13~'	: { name : 'f3' },
+            '[14~'	: { name : 'f4' },
 
-			'[1~'	: { name : 'home' },
-			'[2~'	: { name : 'insert' },
-			'[3~'	: { name : 'delete' },
-			'[4~'	: { name : 'end' },
-			'[5~'	: { name : 'page up' },
-			'[6~'	: { name : 'page down' },
+            '[1~'	: { name : 'home' },
+            '[2~'	: { name : 'insert' },
+            '[3~'	: { name : 'delete' },
+            '[4~'	: { name : 'end' },
+            '[5~'	: { name : 'page up' },
+            '[6~'	: { name : 'page down' },
 
-			//	Cygwin & libuv
-			'[[A'	: { name : 'f1' },
-			'[[B'	: { name : 'f2' },
-			'[[C'	: { name : 'f3' },
-			'[[D'	: { name : 'f4' },
-			'[[E'	: { name : 'f5' },
+            //	Cygwin & libuv
+            '[[A'	: { name : 'f1' },
+            '[[B'	: { name : 'f2' },
+            '[[C'	: { name : 'f3' },
+            '[[D'	: { name : 'f4' },
+            '[[E'	: { name : 'f5' },
 
-			//	Common impls
-			'[15~'	: { name : 'f5' },
-			'[17~'	: { name : 'f6' },
-			'[18~'	: { name : 'f7' },
-			'[19~'	: { name : 'f8' },
-			'[20~'	: { name : 'f9' },
-			'[21~'	: { name : 'f10' },
-			'[23~'	: { name : 'f11' },
-			'[24~'	: { name : 'f12' },
+            //	Common impls
+            '[15~'	: { name : 'f5' },
+            '[17~'	: { name : 'f6' },
+            '[18~'	: { name : 'f7' },
+            '[19~'	: { name : 'f8' },
+            '[20~'	: { name : 'f9' },
+            '[21~'	: { name : 'f10' },
+            '[23~'	: { name : 'f11' },
+            '[24~'	: { name : 'f12' },
 
-			//	xterm
-			'[A'	: { name : 'up arrow' },
-			'[B'	: { name : 'down arrow' },
-			'[C'	: { name : 'right arrow' },
-			'[D'	: { name : 'left arrow' },
-			'[E'	: { name : 'clear' },
-			'[F'	: { name : 'end' },
-			'[H'	: { name : 'home' },
+            //	xterm
+            '[A'	: { name : 'up arrow' },
+            '[B'	: { name : 'down arrow' },
+            '[C'	: { name : 'right arrow' },
+            '[D'	: { name : 'left arrow' },
+            '[E'	: { name : 'clear' },
+            '[F'	: { name : 'end' },
+            '[H'	: { name : 'home' },
 
-			//	PuTTY
-			'[[5~'	: { name : 'page up' },
-			'[[6~'	: { name : 'page down' },
+            //	PuTTY
+            '[[5~'	: { name : 'page up' },
+            '[[6~'	: { name : 'page down' },
 
-			//	rvxt
-			'[7~'	: { name : 'home' },
-			'[8~'	: { name : 'end' },
+            //	rvxt
+            '[7~'	: { name : 'home' },
+            '[8~'	: { name : 'end' },
 
-			//	rxvt with modifiers
-			'[a'	: { name : 'up arrow', shift : true },
-			'[b'	: { name : 'down arrow', shift : true },
-			'[c'	: { name : 'right arrow', shift : true },
-			'[d'	: { name : 'left arrow', shift : true },
-			'[e'	: { name : 'clear', shift : true },
+            //	rxvt with modifiers
+            '[a'	: { name : 'up arrow', shift : true },
+            '[b'	: { name : 'down arrow', shift : true },
+            '[c'	: { name : 'right arrow', shift : true },
+            '[d'	: { name : 'left arrow', shift : true },
+            '[e'	: { name : 'clear', shift : true },
 
-			'[2$'	: { name : 'insert', shift : true },
-			'[3$'	: { name : 'delete', shift : true },
-			'[5$'	: { name : 'page up', shift : true },
-			'[6$'	: { name : 'page down', shift : true },
-			'[7$'	: { name : 'home', shift : true },
-			'[8$'	: { name : 'end', shift : true },
+            '[2$'	: { name : 'insert', shift : true },
+            '[3$'	: { name : 'delete', shift : true },
+            '[5$'	: { name : 'page up', shift : true },
+            '[6$'	: { name : 'page down', shift : true },
+            '[7$'	: { name : 'home', shift : true },
+            '[8$'	: { name : 'end', shift : true },
 
-			'Oa'	: { name : 'up arrow', ctrl :  true },
-			'Ob'	: { name : 'down arrow', ctrl :  true },
-			'Oc'	: { name : 'right arrow', ctrl :  true },
-			'Od'	: { name : 'left arrow', ctrl :  true },
-			'Oe'	: { name : 'clear', ctrl :  true },
+            'Oa'	: { name : 'up arrow', ctrl :  true },
+            'Ob'	: { name : 'down arrow', ctrl :  true },
+            'Oc'	: { name : 'right arrow', ctrl :  true },
+            'Od'	: { name : 'left arrow', ctrl :  true },
+            'Oe'	: { name : 'clear', ctrl :  true },
 
-			'[2^'	: { name : 'insert', ctrl :  true },
-			'[3^'	: { name : 'delete', ctrl :  true },
-			'[5^'	: { name : 'page up', ctrl :  true },
-			'[6^'	: { name : 'page down', ctrl :  true },
-			'[7^'	: { name : 'home', ctrl :  true },
-			'[8^'	: { name : 'end', ctrl :  true },
+            '[2^'	: { name : 'insert', ctrl :  true },
+            '[3^'	: { name : 'delete', ctrl :  true },
+            '[5^'	: { name : 'page up', ctrl :  true },
+            '[6^'	: { name : 'page down', ctrl :  true },
+            '[7^'	: { name : 'home', ctrl :  true },
+            '[8^'	: { name : 'end', ctrl :  true },
 
-			//	SyncTERM / EtherTerm
-			'[K'	: { name : 'end' },
-			'[@'	: { name : 'insert' },
-			'[V'	: { name : 'page up' },
-			'[U'	: { name : 'page down' },
+            //	SyncTERM / EtherTerm
+            '[K'	: { name : 'end' },
+            '[@'	: { name : 'insert' },
+            '[V'	: { name : 'page up' },
+            '[U'	: { name : 'page down' },
 
-			//	other
-			'[Z'	: { name : 'tab', shift : true },
-		}[code];
-	};
+            //	other
+            '[Z'	: { name : 'tab', shift : true },
+        }[code];
+    };
 
-	this.on('data', function clientData(data) {
-		//	create a uniform format that can be parsed below
-		if(data[0] > 127 && undefined === data[1]) {
-			data[0] -= 128;
-			data = '\u001b' + data.toString('utf-8');
-		} else {
-			data = data.toString('utf-8');
-		}
+    this.on('data', function clientData(data) {
+        //	create a uniform format that can be parsed below
+        if(data[0] > 127 && undefined === data[1]) {
+            data[0] -= 128;
+            data = '\u001b' + data.toString('utf-8');
+        } else {
+            data = data.toString('utf-8');
+        }
 
-		if(self.isMouseInput(data)) {
-			return;
-		}
+        if(self.isMouseInput(data)) {
+            return;
+        }
 
-		var buf = [];
-		var m;
-		while((m = RE_ESC_CODE_ANYWHERE.exec(data))) {
-			buf = buf.concat(data.slice(0, m.index).split(''));
-			buf.push(m[0]);
-			data = data.slice(m.index + m[0].length);
-		}
+        var buf = [];
+        var m;
+        while((m = RE_ESC_CODE_ANYWHERE.exec(data))) {
+            buf = buf.concat(data.slice(0, m.index).split(''));
+            buf.push(m[0]);
+            data = data.slice(m.index + m[0].length);
+        }
 
-		buf = buf.concat(data.split(''));	//	remainder
+        buf = buf.concat(data.split(''));	//	remainder
 
-		buf.forEach(function bufPart(s) {
-			var key = {
-				seq			: s,
-				name		: undefined,
-				ctrl		: false,
-				meta		: false,
-				shift		: false,
-			};
+        buf.forEach(function bufPart(s) {
+            var key = {
+                seq			: s,
+                name		: undefined,
+                ctrl		: false,
+                meta		: false,
+                shift		: false,
+            };
 
-			var parts;
+            var parts;
 
-			if((parts = RE_DSR_RESPONSE_ANYWHERE.exec(s))) {
-				if('R' === parts[2]) {
-					const cprArgs = parts[1].split(';').map(v => (parseInt(v, 10) || 0) );
-					if(2 === cprArgs.length) {
-						if(self.cprOffset) {
-							cprArgs[0] = cprArgs[0] + self.cprOffset;
-							cprArgs[1] = cprArgs[1] + self.cprOffset;
-						}
-						self.emit('cursor position report', cprArgs);
-					}
-				}
-			} else if((parts = RE_DEV_ATTR_RESPONSE_ANYWHERE.exec(s))) {
-				assert('c' === parts[2]);
-				var termClient = self.getTermClient(parts[1]);
-				if(termClient) {
-					self.term.termClient = termClient;
-				}
-			} else if('\r' === s) {
-				key.name = 'return';
-			} else if('\n' === s) {
-				key.name = 'line feed';
-			} else if('\t' === s) {
-				key.name = 'tab';
-			} else if('\x7f' === s) {
-				//
-				//	Backspace vs delete is a crazy thing, especially in *nix.
-				//	- ANSI-BBS uses 0x7f for DEL
-				//	- xterm et. al clients send 0x7f for backspace... ugg.
-				//
-				//	See http://www.hypexr.org/linux_ruboff.php
-				//	And a great discussion @ https://lists.debian.org/debian-i18n/1998/04/msg00015.html
-				//
-				if(self.term.isNixTerm()) {
-					key.name	= 'backspace';
-				} else {
-					key.name	= 'delete';
-				}
-			} else if ('\b' === s || '\x1b\x7f' === s || '\x1b\b' === s) {
-				//	backspace, CTRL-H
-				key.name	= 'backspace';
-				key.meta	= ('\x1b' === s.charAt(0));
-			} else if('\x1b' === s || '\x1b\x1b' === s) {
-				key.name	= 'escape';
-				key.meta	= (2 === s.length);
-			} else if (' ' === s || '\x1b ' === s) {
-				//	rather annoying that space can come in other than just " "
-				key.name	= 'space';
-				key.meta	= (2 === s.length);
-			} else if(1 === s.length && s <= '\x1a') {
-				//	CTRL-<letter>
-				key.name	= String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
-				key.ctrl	= true;
-			} else if(1 === s.length && s >= 'a' && s <= 'z') {
-				//	normal, lowercased letter
-				key.name	= s;
-			} else if(1 === s.length && s >= 'A' && s <= 'Z') {
-				key.name	= s.toLowerCase();
-				key.shift	= true;
-			} else if ((parts = RE_META_KEYCODE.exec(s))) {
-				//	meta with character key
-				key.name	= parts[1].toLowerCase();
-				key.meta	= true;
-				key.shift	= /^[A-Z]$/.test(parts[1]);
-			} else if((parts = RE_FUNCTION_KEYCODE.exec(s))) {
-				var code =
+            if((parts = RE_DSR_RESPONSE_ANYWHERE.exec(s))) {
+                if('R' === parts[2]) {
+                    const cprArgs = parts[1].split(';').map(v => (parseInt(v, 10) || 0) );
+                    if(2 === cprArgs.length) {
+                        if(self.cprOffset) {
+                            cprArgs[0] = cprArgs[0] + self.cprOffset;
+                            cprArgs[1] = cprArgs[1] + self.cprOffset;
+                        }
+                        self.emit('cursor position report', cprArgs);
+                    }
+                }
+            } else if((parts = RE_DEV_ATTR_RESPONSE_ANYWHERE.exec(s))) {
+                assert('c' === parts[2]);
+                var termClient = self.getTermClient(parts[1]);
+                if(termClient) {
+                    self.term.termClient = termClient;
+                }
+            } else if('\r' === s) {
+                key.name = 'return';
+            } else if('\n' === s) {
+                key.name = 'line feed';
+            } else if('\t' === s) {
+                key.name = 'tab';
+            } else if('\x7f' === s) {
+                //
+                //	Backspace vs delete is a crazy thing, especially in *nix.
+                //	- ANSI-BBS uses 0x7f for DEL
+                //	- xterm et. al clients send 0x7f for backspace... ugg.
+                //
+                //	See http://www.hypexr.org/linux_ruboff.php
+                //	And a great discussion @ https://lists.debian.org/debian-i18n/1998/04/msg00015.html
+                //
+                if(self.term.isNixTerm()) {
+                    key.name	= 'backspace';
+                } else {
+                    key.name	= 'delete';
+                }
+            } else if ('\b' === s || '\x1b\x7f' === s || '\x1b\b' === s) {
+                //	backspace, CTRL-H
+                key.name	= 'backspace';
+                key.meta	= ('\x1b' === s.charAt(0));
+            } else if('\x1b' === s || '\x1b\x1b' === s) {
+                key.name	= 'escape';
+                key.meta	= (2 === s.length);
+            } else if (' ' === s || '\x1b ' === s) {
+                //	rather annoying that space can come in other than just " "
+                key.name	= 'space';
+                key.meta	= (2 === s.length);
+            } else if(1 === s.length && s <= '\x1a') {
+                //	CTRL-<letter>
+                key.name	= String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
+                key.ctrl	= true;
+            } else if(1 === s.length && s >= 'a' && s <= 'z') {
+                //	normal, lowercased letter
+                key.name	= s;
+            } else if(1 === s.length && s >= 'A' && s <= 'Z') {
+                key.name	= s.toLowerCase();
+                key.shift	= true;
+            } else if ((parts = RE_META_KEYCODE.exec(s))) {
+                //	meta with character key
+                key.name	= parts[1].toLowerCase();
+                key.meta	= true;
+                key.shift	= /^[A-Z]$/.test(parts[1]);
+            } else if((parts = RE_FUNCTION_KEYCODE.exec(s))) {
+                var code =
 					(parts[1] || '') + (parts[2] || '') +
 					(parts[4] || '') + (parts[9] || '');
 
-				var modifier = (parts[3] || parts[8] || 1) - 1;
+                var modifier = (parts[3] || parts[8] || 1) - 1;
 
-				key.ctrl	= !!(modifier & 4);
-				key.meta	= !!(modifier & 10);
-				key.shift	= !!(modifier & 1);
-				key.code	= code;
+                key.ctrl	= !!(modifier & 4);
+                key.meta	= !!(modifier & 10);
+                key.shift	= !!(modifier & 1);
+                key.code	= code;
 
-				_.assign(key, self.getKeyComponentsFromCode(code));
-			}
+                _.assign(key, self.getKeyComponentsFromCode(code));
+            }
 
-			var ch;
-			if(1 === s.length) {
-				ch = s;
-			} else if('space' === key.name) {
-				//	stupid hack to always get space as a regular char
-				ch = ' ';
-			}
+            var ch;
+            if(1 === s.length) {
+                ch = s;
+            } else if('space' === key.name) {
+                //	stupid hack to always get space as a regular char
+                ch = ' ';
+            }
 
-			if(_.isUndefined(key.name)) {
-				key = undefined;
-			} else {
-				//
-				//	Adjust name for CTRL/Shift/Meta modifiers
-				//
-				key.name =
+            if(_.isUndefined(key.name)) {
+                key = undefined;
+            } else {
+                //
+                //	Adjust name for CTRL/Shift/Meta modifiers
+                //
+                key.name =
 					(key.ctrl ? 'ctrl + ' : '') +
 					(key.meta ? 'meta + ' : '') +
 					(key.shift ? 'shift + ' : '') +
 					key.name;
-			}
+            }
 
-			if(key || ch) {
-				if(Config().logging.traceUserKeyboardInput) {
-					self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input');	// jshint ignore:line
-				}
+            if(key || ch) {
+                if(Config().logging.traceUserKeyboardInput) {
+                    self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input');	// jshint ignore:line
+                }
 
-				self.lastKeyPressMs = Date.now();
+                self.lastKeyPressMs = Date.now();
 
-				if(!self.ignoreInput) {
-					self.emit('key press', ch, key);
-				}
-			}
-		});
-	});
+                if(!self.ignoreInput) {
+                    self.emit('key press', ch, key);
+                }
+            }
+        });
+    });
 }
 
 require('util').inherits(Client, stream);
 
 Client.prototype.setInputOutput = function(input, output) {
-	this.input	= input;
-	this.output	= output;
+    this.input	= input;
+    this.output	= output;
 
-	this.term	= new term.ClientTerminal(this.output);
+    this.term	= new term.ClientTerminal(this.output);
 };
 
 Client.prototype.setTermType = function(termType) {
-	this.term.env.TERM		= termType;
-	this.term.termType		= termType;
+    this.term.env.TERM		= termType;
+    this.term.termType		= termType;
 
-	this.log.debug( { termType : termType }, 'Set terminal type');
+    this.log.debug( { termType : termType }, 'Set terminal type');
 };
 
 Client.prototype.startIdleMonitor = function() {
-	this.lastKeyPressMs = Date.now();
+    this.lastKeyPressMs = Date.now();
 
-	//
-	//	Every 1m, check for idle.
-	//
-	this.idleCheck = setInterval( () => {
-		const nowMs	= Date.now();
+    //
+    //	Every 1m, check for idle.
+    //
+    this.idleCheck = setInterval( () => {
+        const nowMs	= Date.now();
 
-		const idleLogoutSeconds = this.user.isAuthenticated() ?
-			Config().misc.idleLogoutSeconds :
-			Config().misc.preAuthIdleLogoutSeconds;
+        const idleLogoutSeconds = this.user.isAuthenticated() ?
+            Config().misc.idleLogoutSeconds :
+            Config().misc.preAuthIdleLogoutSeconds;
 
-		if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
-			this.emit('idle timeout');
-		}
-	}, 1000 * 60);
+        if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
+            this.emit('idle timeout');
+        }
+    }, 1000 * 60);
 };
 
 Client.prototype.stopIdleMonitor = function() {
-	clearInterval(this.idleCheck);
+    clearInterval(this.idleCheck);
 };
 
 Client.prototype.end = function () {
-	if(this.term) {
-		this.term.disconnect();
-	}
+    if(this.term) {
+        this.term.disconnect();
+    }
 
-	var currentModule = this.menuStack.getCurrentModule;
+    var currentModule = this.menuStack.getCurrentModule;
 
-	if(currentModule) {
-		currentModule.leave();
-	}
+    if(currentModule) {
+        currentModule.leave();
+    }
 
-	this.stopIdleMonitor();
+    this.stopIdleMonitor();
 
-	try {
-		//
-		//	We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
-		//
-		//	:TODO: is this OK?
-		return this.output.end.apply(this.output, arguments);
-	} catch(e) {
-		//	TypeError
-	}
+    try {
+        //
+        //	We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
+        //
+        //	:TODO: is this OK?
+        return this.output.end.apply(this.output, arguments);
+    } catch(e) {
+        //	TypeError
+    }
 };
 
 Client.prototype.destroy = function () {
-	return this.output.destroy.apply(this.output, arguments);
+    return this.output.destroy.apply(this.output, arguments);
 };
 
 Client.prototype.destroySoon = function () {
-	return this.output.destroySoon.apply(this.output, arguments);
+    return this.output.destroySoon.apply(this.output, arguments);
 };
 
 Client.prototype.waitForKeyPress = function(cb) {
-	this.once('key press', function kp(ch, key) {
-		cb(ch, key);
-	});
+    this.once('key press', function kp(ch, key) {
+        cb(ch, key);
+    });
 };
 
 Client.prototype.isLocal = function() {
-	//	:TODO: Handle ipv6 better
-	return [ '127.0.0.1', '::ffff:127.0.0.1' ].includes(this.remoteAddress);
+    //	:TODO: Handle ipv6 better
+    return [ '127.0.0.1', '::ffff:127.0.0.1' ].includes(this.remoteAddress);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -502,41 +502,41 @@ Client.prototype.isLocal = function() {
 
 //	:TODO: getDefaultHandler(name) -- handlers in default_handlers.js or something
 Client.prototype.defaultHandlerMissingMod = function() {
-	var self = this;
+    var self = this;
 
-	function handler(err) {
-		self.log.error(err);
+    function handler(err) {
+        self.log.error(err);
 
-		self.term.write(ansi.resetScreen());
-		self.term.write('An unrecoverable error has been encountered!\n');
-		self.term.write('This has been logged for your SysOp to review.\n');
-		self.term.write('\nGoodbye!\n');
+        self.term.write(ansi.resetScreen());
+        self.term.write('An unrecoverable error has been encountered!\n');
+        self.term.write('This has been logged for your SysOp to review.\n');
+        self.term.write('\nGoodbye!\n');
 
 
-		//self.term.write(err);
+        //self.term.write(err);
 
-		//if(miscUtil.isDevelopment() && err.stack) {
-		//	self.term.write('\n' + err.stack + '\n');
-		//}
+        //if(miscUtil.isDevelopment() && err.stack) {
+        //	self.term.write('\n' + err.stack + '\n');
+        //}
 
-		self.end();
-	}
+        self.end();
+    }
 
-	return handler;
+    return handler;
 };
 
 Client.prototype.terminalSupports = function(query) {
-	const termClient = this.term.termClient;
+    const termClient = this.term.termClient;
 
-	switch(query) {
-		case 'vtx_audio' :
-			//	https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
-			return 'vtx' === termClient;
+    switch(query) {
+        case 'vtx_audio' :
+            //	https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
+            return 'vtx' === termClient;
 
-		case 'vtx_hyperlink' :
-			return 'vtx' === termClient;
+        case 'vtx_hyperlink' :
+            return 'vtx' === termClient;
 
-		default :
-			return false;
-	}
+        default :
+            return false;
+    }
 };
diff --git a/core/client_connections.js b/core/client_connections.js
index 3e7378f9..bdeb4539 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -23,98 +23,98 @@ function getActiveConnections() { return clientConnections; }
 
 function getActiveNodeList(authUsersOnly) {
 
-	if(!_.isBoolean(authUsersOnly)) {
-		authUsersOnly = true;
-	}
+    if(!_.isBoolean(authUsersOnly)) {
+        authUsersOnly = true;
+    }
 
-	const now = moment();
+    const now = moment();
 
-	const activeConnections = getActiveConnections().filter(ac => {
-		return ((authUsersOnly && ac.user.isAuthenticated()) || !authUsersOnly);
-	});
+    const activeConnections = getActiveConnections().filter(ac => {
+        return ((authUsersOnly && ac.user.isAuthenticated()) || !authUsersOnly);
+    });
 
-	return _.map(activeConnections, ac => {
-		const entry = {
-			node			: ac.node,
-			authenticated	: ac.user.isAuthenticated(),
-			userId			: ac.user.userId,
-			action			: _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
-		};
+    return _.map(activeConnections, ac => {
+        const entry = {
+            node			: ac.node,
+            authenticated	: ac.user.isAuthenticated(),
+            userId			: ac.user.userId,
+            action			: _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
+        };
 
-		//
-		//	There may be a connection, but not a logged in user as of yet
-		//
-		if(ac.user.isAuthenticated()) {
-			entry.userName	= ac.user.username;
-			entry.realName	= ac.user.properties.real_name;
-			entry.location	= ac.user.properties.location;
-			entry.affils	= ac.user.properties.affiliation;
+        //
+        //	There may be a connection, but not a logged in user as of yet
+        //
+        if(ac.user.isAuthenticated()) {
+            entry.userName	= ac.user.username;
+            entry.realName	= ac.user.properties.real_name;
+            entry.location	= ac.user.properties.location;
+            entry.affils	= ac.user.properties.affiliation;
 
-			const diff 		= now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
-			entry.timeOn	= moment.duration(diff, 'minutes');
-		}
-		return entry;
-	});
+            const diff 		= now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
+            entry.timeOn	= moment.duration(diff, 'minutes');
+        }
+        return entry;
+    });
 }
 
 function addNewClient(client, clientSock) {
-	const id			= client.session.id		= clientConnections.push(client) - 1;
-	const remoteAddress = client.remoteAddress	= clientSock.remoteAddress;
+    const id			= client.session.id		= clientConnections.push(client) - 1;
+    const remoteAddress = client.remoteAddress	= clientSock.remoteAddress;
 
-	//	create a uniqe identifier one-time ID for this session
-	client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
+    //	create a uniqe identifier one-time ID for this session
+    client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
 
-	//	Create a client specific logger
-	//	Note that this will be updated @ login with additional information
-	client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );
+    //	Create a client specific logger
+    //	Note that this will be updated @ login with additional information
+    client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );
 
-	const connInfo = {
-		remoteAddress	: remoteAddress,
-		serverName		: client.session.serverName,
-		isSecure		: client.session.isSecure,
-	};
+    const connInfo = {
+        remoteAddress	: remoteAddress,
+        serverName		: client.session.serverName,
+        isSecure		: client.session.isSecure,
+    };
 
-	if(client.log.debug()) {
-		connInfo.port		= clientSock.localPort;
-		connInfo.family		= clientSock.localFamily;
-	}
+    if(client.log.debug()) {
+        connInfo.port		= clientSock.localPort;
+        connInfo.family		= clientSock.localFamily;
+    }
 
-	client.log.info(connInfo, 'Client connected');
+    client.log.info(connInfo, 'Client connected');
 
-	Events.emit(
-		Events.getSystemEvents().ClientConnected,
-		{ client : client, connectionCount : clientConnections.length }
-	);
+    Events.emit(
+        Events.getSystemEvents().ClientConnected,
+        { client : client, connectionCount : clientConnections.length }
+    );
 
-	return id;
+    return id;
 }
 
 function removeClient(client) {
-	client.end();
+    client.end();
 
-	const i = clientConnections.indexOf(client);
-	if(i > -1) {
-		clientConnections.splice(i, 1);
+    const i = clientConnections.indexOf(client);
+    if(i > -1) {
+        clientConnections.splice(i, 1);
 
-		logger.log.info(
-			{
-				connectionCount	: clientConnections.length,
-				clientId		: client.session.id
-			},
-			'Client disconnected'
-		);
+        logger.log.info(
+            {
+                connectionCount	: clientConnections.length,
+                clientId		: client.session.id
+            },
+            'Client disconnected'
+        );
 
-		if(client.user && client.user.isValid()) {
-			Events.emit(Events.getSystemEvents().UserLogoff, { user : client.user } );
-		}
+        if(client.user && client.user.isValid()) {
+            Events.emit(Events.getSystemEvents().UserLogoff, { user : client.user } );
+        }
 
-		Events.emit(
-			Events.getSystemEvents().ClientDisconnected,
-			{ client : client, connectionCount : clientConnections.length }
-		);
-	}
+        Events.emit(
+            Events.getSystemEvents().ClientDisconnected,
+            { client : client, connectionCount : clientConnections.length }
+        );
+    }
 }
 
 function getConnectionByUserId(userId) {
-	return getActiveConnections().find( ac => userId === ac.user.userId );
+    return getActiveConnections().find( ac => userId === ac.user.userId );
 }
diff --git a/core/client_term.js b/core/client_term.js
index b944988d..77196586 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -13,185 +13,185 @@ var _				= require('lodash');
 exports.ClientTerminal	= ClientTerminal;
 
 function ClientTerminal(output) {
-	this.output		= output;
+    this.output		= output;
 
-	var outputEncoding = 'cp437';
-	assert(iconv.encodingExists(outputEncoding));
+    var outputEncoding = 'cp437';
+    assert(iconv.encodingExists(outputEncoding));
 
-	//	convert line feeds such as \n -> \r\n
-	this.convertLF		= true;
+    //	convert line feeds such as \n -> \r\n
+    this.convertLF		= true;
 
-	//
-	//	Some terminal we handle specially
-	//	They can also be found in this.env{}
-	//
-	var termType		= 'unknown';
-	var termHeight		= 0;
-	var termWidth		= 0;
-	var termClient		= 'unknown';
+    //
+    //	Some terminal we handle specially
+    //	They can also be found in this.env{}
+    //
+    var termType		= 'unknown';
+    var termHeight		= 0;
+    var termWidth		= 0;
+    var termClient		= 'unknown';
 
-	this.currentSyncFont	= 'not_set';
+    this.currentSyncFont	= 'not_set';
 
-	//	Raw values set by e.g. telnet NAWS, ENVIRONMENT, etc.
-	this.env			= {};
+    //	Raw values set by e.g. telnet NAWS, ENVIRONMENT, etc.
+    this.env			= {};
 
-	Object.defineProperty(this, 'outputEncoding', {
-		get : function() {
-			return outputEncoding;
-		},
-		set : function(enc) {
-			if(iconv.encodingExists(enc)) {
-				outputEncoding = enc;
-			} else {
-				Log.warn({ encoding : enc }, 'Unknown encoding');
-			}
-		}
-	});
+    Object.defineProperty(this, 'outputEncoding', {
+        get : function() {
+            return outputEncoding;
+        },
+        set : function(enc) {
+            if(iconv.encodingExists(enc)) {
+                outputEncoding = enc;
+            } else {
+                Log.warn({ encoding : enc }, 'Unknown encoding');
+            }
+        }
+    });
 
-	Object.defineProperty(this, 'termType', {
-		get : function() {
-			return termType;
-		},
-		set : function(ttype) {
-			termType = ttype.toLowerCase();
+    Object.defineProperty(this, 'termType', {
+        get : function() {
+            return termType;
+        },
+        set : function(ttype) {
+            termType = ttype.toLowerCase();
 
-			if(this.isANSI()) {
-				this.outputEncoding = 'cp437';
-			} else {
-				//	:TODO: See how x84 does this -- only set if local/remote are binary
-				this.outputEncoding = 'utf8';
-			}
+            if(this.isANSI()) {
+                this.outputEncoding = 'cp437';
+            } else {
+                //	:TODO: See how x84 does this -- only set if local/remote are binary
+                this.outputEncoding = 'utf8';
+            }
 
-			//	:TODO: according to this: http://mud-dev.wikidot.com/article:telnet-client-identification
-			//	Windows telnet will send "VTNT". If so, set termClient='windows'
-			//	there are some others on the page as well
+            //	:TODO: according to this: http://mud-dev.wikidot.com/article:telnet-client-identification
+            //	Windows telnet will send "VTNT". If so, set termClient='windows'
+            //	there are some others on the page as well
 
-			Log.debug( { encoding : this.outputEncoding }, 'Set output encoding due to terminal type change');
-		}
-	});
+            Log.debug( { encoding : this.outputEncoding }, 'Set output encoding due to terminal type change');
+        }
+    });
 
-	Object.defineProperty(this, 'termWidth', {
-		get : function() {
-			return termWidth;
-		},
-		set : function(width) {
-			if(width > 0) {
-				termWidth = width;
-			}
-		}
-	});
+    Object.defineProperty(this, 'termWidth', {
+        get : function() {
+            return termWidth;
+        },
+        set : function(width) {
+            if(width > 0) {
+                termWidth = width;
+            }
+        }
+    });
 
-	Object.defineProperty(this, 'termHeight', {
-		get : function() {
-			return termHeight;
-		},
-		set : function(height) {
-			if(height > 0) {
-				termHeight = height;
-			}
-		}
-	});
+    Object.defineProperty(this, 'termHeight', {
+        get : function() {
+            return termHeight;
+        },
+        set : function(height) {
+            if(height > 0) {
+                termHeight = height;
+            }
+        }
+    });
 
-	Object.defineProperty(this, 'termClient', {
-		get : function() {
-			return termClient;
-		},
-		set : function(tc) {
-			termClient = tc;
+    Object.defineProperty(this, 'termClient', {
+        get : function() {
+            return termClient;
+        },
+        set : function(tc) {
+            termClient = tc;
 
-			Log.debug( { termClient : this.termClient }, 'Set known terminal client');
-		}
-	});
+            Log.debug( { termClient : this.termClient }, 'Set known terminal client');
+        }
+    });
 }
 
 ClientTerminal.prototype.disconnect = function() {
-	this.output = null;
+    this.output = null;
 };
 
 ClientTerminal.prototype.isNixTerm = function() {
-	//
-	//	Standard *nix type terminals
-	//
-	if(this.termType.startsWith('xterm')) {
-		return true;
-	}
+    //
+    //	Standard *nix type terminals
+    //
+    if(this.termType.startsWith('xterm')) {
+        return true;
+    }
 
-	return [ 'xterm', 'linux', 'screen', 'dumb', 'rxvt', 'konsole', 'gnome', 'x11 terminal emulator' ].includes(this.termType);
+    return [ 'xterm', 'linux', 'screen', 'dumb', 'rxvt', 'konsole', 'gnome', 'x11 terminal emulator' ].includes(this.termType);
 };
 
 ClientTerminal.prototype.isANSI = function() {
-	//
-	//	ANSI terminals should be encoded to CP437
-	//
-	//	Some terminal types provided by Mercyful Fate / Enthral:
-	//		ANSI-BBS
-	//		PC-ANSI
-	//		QANSI
-	//		SCOANSI
-	//		VT100
-	//		QNX
-	//
-	//	Reports from various terminals
-	//
-	//	syncterm:
-	//		* SyncTERM
-	//
-	//	xterm:
-	//		* PuTTY
-	//
-	//	ansi-bbs:
-	//		* fTelnet
-	//
-	//	pcansi:
-	//		* ZOC
-	//
-	//	screen:
-	//		* ConnectBot (Android)
-	//
-	//	linux:
-	//		* JuiceSSH (note: TERM=linux also)
-	//
-	return [ 'ansi', 'pcansi', 'pc-ansi', 'ansi-bbs', 'qansi', 'scoansi', 'syncterm' ].includes(this.termType);
+    //
+    //	ANSI terminals should be encoded to CP437
+    //
+    //	Some terminal types provided by Mercyful Fate / Enthral:
+    //		ANSI-BBS
+    //		PC-ANSI
+    //		QANSI
+    //		SCOANSI
+    //		VT100
+    //		QNX
+    //
+    //	Reports from various terminals
+    //
+    //	syncterm:
+    //		* SyncTERM
+    //
+    //	xterm:
+    //		* PuTTY
+    //
+    //	ansi-bbs:
+    //		* fTelnet
+    //
+    //	pcansi:
+    //		* ZOC
+    //
+    //	screen:
+    //		* ConnectBot (Android)
+    //
+    //	linux:
+    //		* JuiceSSH (note: TERM=linux also)
+    //
+    return [ 'ansi', 'pcansi', 'pc-ansi', 'ansi-bbs', 'qansi', 'scoansi', 'syncterm' ].includes(this.termType);
 };
 
 //	:TODO: probably need to update these to convert IAC (0xff) -> IACIAC (escape it)
 
 ClientTerminal.prototype.write = function(s, convertLineFeeds, cb) {
-	this.rawWrite(this.encode(s, convertLineFeeds), cb);
+    this.rawWrite(this.encode(s, convertLineFeeds), cb);
 };
 
 ClientTerminal.prototype.rawWrite = function(s, cb) {
-	if(this.output) {
-		this.output.write(s, err => {
-			if(cb) {
-				return cb(err);
-			}
+    if(this.output) {
+        this.output.write(s, err => {
+            if(cb) {
+                return cb(err);
+            }
 
-			if(err) {
-				Log.warn( { error : err.message }, 'Failed writing to socket');
-			}
-		});
-	}
+            if(err) {
+                Log.warn( { error : err.message }, 'Failed writing to socket');
+            }
+        });
+    }
 };
 
 ClientTerminal.prototype.pipeWrite = function(s, spec, cb) {
-	spec = spec || 'renegade';
+    spec = spec || 'renegade';
 
-	var conv = {
-		enigma		: enigmaToAnsi,
-		renegade	: renegadeToAnsi,
-	}[spec] || renegadeToAnsi;
+    var conv = {
+        enigma		: enigmaToAnsi,
+        renegade	: renegadeToAnsi,
+    }[spec] || renegadeToAnsi;
 
-	this.write(conv(s, this), null, cb);	//	null = use default for |convertLineFeeds|
+    this.write(conv(s, this), null, cb);	//	null = use default for |convertLineFeeds|
 };
 
 ClientTerminal.prototype.encode = function(s, convertLineFeeds) {
-	convertLineFeeds = _.isBoolean(convertLineFeeds) ? convertLineFeeds : this.convertLF;
+    convertLineFeeds = _.isBoolean(convertLineFeeds) ? convertLineFeeds : this.convertLF;
 
-	if(convertLineFeeds && _.isString(s)) {
-		s = s.replace(/\n/g, '\r\n');
-	}
-	return iconv.encode(s, this.outputEncoding);
+    if(convertLineFeeds && _.isString(s)) {
+        s = s.replace(/\n/g, '\r\n');
+    }
+    return iconv.encode(s, this.outputEncoding);
 };
 
 
diff --git a/core/color_codes.js b/core/color_codes.js
index 10e7a2c3..b04d2c0b 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -28,139 +28,139 @@ exports.controlCodesToAnsi	= controlCodesToAnsi;
 
 //	:TODO: rid of enigmaToAnsi() -- never really use. Instead, create bbsToAnsi() that supports renegade, PCB, WWIV, etc...
 function enigmaToAnsi(s, client) {
-	if(-1 == s.indexOf('|')) {
-		return s;	//	no pipe codes present
-	}
+    if(-1 == s.indexOf('|')) {
+        return s;	//	no pipe codes present
+    }
 
-	var result	= '';
-	var re		= /\|([A-Z\d]{2}|\|)/g;
-	var m;
-	var lastIndex = 0;
-	while((m = re.exec(s))) {
-		var val = m[1];
+    var result	= '';
+    var re		= /\|([A-Z\d]{2}|\|)/g;
+    var m;
+    var lastIndex = 0;
+    while((m = re.exec(s))) {
+        var val = m[1];
 
-		if('|' == val) {
-			result += '|';
-			continue;
-		}
+        if('|' == val) {
+            result += '|';
+            continue;
+        }
 
-		//	convert to number
-		val = parseInt(val, 10);
-		if(isNaN(val)) {
-			//
-			//	ENiGMA MCI code? Only available if |client|
-			//	is supplied.
-			//
-			val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
-		}
+        //	convert to number
+        val = parseInt(val, 10);
+        if(isNaN(val)) {
+            //
+            //	ENiGMA MCI code? Only available if |client|
+            //	is supplied.
+            //
+            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
+        }
 
-		if(_.isString(val)) {
-			result += s.substr(lastIndex, m.index - lastIndex) + val;
-		} else {
-			assert(val >= 0 && val <= 47);
+        if(_.isString(val)) {
+            result += s.substr(lastIndex, m.index - lastIndex) + val;
+        } else {
+            assert(val >= 0 && val <= 47);
 
-			var attr = '';
-			if(7 == val) {
-				attr = ansi.sgr('normal');
-			} else if (val < 7 || val >= 16) {
-				attr = ansi.sgr(['normal', val]);
-			} else if (val <= 15) {
-				attr = ansi.sgr(['normal', val - 8, 'bold']);
-			}
+            var attr = '';
+            if(7 == val) {
+                attr = ansi.sgr('normal');
+            } else if (val < 7 || val >= 16) {
+                attr = ansi.sgr(['normal', val]);
+            } else if (val <= 15) {
+                attr = ansi.sgr(['normal', val - 8, 'bold']);
+            }
 
-			result += s.substr(lastIndex, m.index - lastIndex) + attr;
-		}
+            result += s.substr(lastIndex, m.index - lastIndex) + attr;
+        }
 
-		lastIndex = re.lastIndex;
-	}
+        lastIndex = re.lastIndex;
+    }
 
-	result = (0 === result.length ? s : result + s.substr(lastIndex));
+    result = (0 === result.length ? s : result + s.substr(lastIndex));
 
-	return result;
+    return result;
 }
 
 function stripEnigmaCodes(s) {
-	return s.replace(/\|[A-Z\d]{2}/g, '');
+    return s.replace(/\|[A-Z\d]{2}/g, '');
 }
 
 function enigmaStrLen(s) {
-	return stripEnigmaCodes(s).length;
+    return stripEnigmaCodes(s).length;
 }
 
 function ansiSgrFromRenegadeColorCode(cc) {
-	return ansi.sgr({
-		0	: [ 'reset', 'black' ],
-		1	: [ 'reset', 'blue' ],
-		2	: [ 'reset', 'green' ],
-		3	: [ 'reset', 'cyan' ],
-		4	: [ 'reset', 'red' ],
-		5	: [ 'reset', 'magenta' ],
-		6	: [ 'reset', 'yellow' ],
-		7	: [ 'reset', 'white' ],
+    return ansi.sgr({
+        0	: [ 'reset', 'black' ],
+        1	: [ 'reset', 'blue' ],
+        2	: [ 'reset', 'green' ],
+        3	: [ 'reset', 'cyan' ],
+        4	: [ 'reset', 'red' ],
+        5	: [ 'reset', 'magenta' ],
+        6	: [ 'reset', 'yellow' ],
+        7	: [ 'reset', 'white' ],
 
-		8	: [ 'bold', 'black' ],
-		9	: [ 'bold', 'blue' ],
-		10	: [ 'bold', 'green' ],
-		11	: [ 'bold', 'cyan' ],
-		12	: [ 'bold', 'red' ],
-		13	: [ 'bold', 'magenta' ],
-		14	: [ 'bold', 'yellow' ],
-		15	: [ 'bold', 'white' ],
+        8	: [ 'bold', 'black' ],
+        9	: [ 'bold', 'blue' ],
+        10	: [ 'bold', 'green' ],
+        11	: [ 'bold', 'cyan' ],
+        12	: [ 'bold', 'red' ],
+        13	: [ 'bold', 'magenta' ],
+        14	: [ 'bold', 'yellow' ],
+        15	: [ 'bold', 'white' ],
 
-		16	: [ 'blackBG' ],
-		17 	: [ 'blueBG' ],
-		18	: [ 'greenBG' ],
-		19	: [ 'cyanBG' ],
-		20	: [ 'redBG' ],
-		21	: [ 'magentaBG' ],
-		22	: [ 'yellowBG' ],
-		23	: [ 'whiteBG' ],
+        16	: [ 'blackBG' ],
+        17 	: [ 'blueBG' ],
+        18	: [ 'greenBG' ],
+        19	: [ 'cyanBG' ],
+        20	: [ 'redBG' ],
+        21	: [ 'magentaBG' ],
+        22	: [ 'yellowBG' ],
+        23	: [ 'whiteBG' ],
 
-		24	: [ 'blink', 'blackBG' ],
-		25	: [ 'blink', 'blueBG' ],
-		26	: [ 'blink', 'greenBG' ],
-		27	: [ 'blink', 'cyanBG' ],
-		28	: [ 'blink', 'redBG' ],
-		29	: [ 'blink', 'magentaBG' ],
-		30	: [ 'blink', 'yellowBG' ],
-		31	: [ 'blink', 'whiteBG' ],
-	}[cc] || 'normal');
+        24	: [ 'blink', 'blackBG' ],
+        25	: [ 'blink', 'blueBG' ],
+        26	: [ 'blink', 'greenBG' ],
+        27	: [ 'blink', 'cyanBG' ],
+        28	: [ 'blink', 'redBG' ],
+        29	: [ 'blink', 'magentaBG' ],
+        30	: [ 'blink', 'yellowBG' ],
+        31	: [ 'blink', 'whiteBG' ],
+    }[cc] || 'normal');
 }
 
 function renegadeToAnsi(s, client) {
-	if(-1 == s.indexOf('|')) {
-		return s;	//	no pipe codes present
-	}
+    if(-1 == s.indexOf('|')) {
+        return s;	//	no pipe codes present
+    }
 
-	var result	= '';
-	var re		= /\|([A-Z\d]{2}|\|)/g;
-	var m;
-	var lastIndex = 0;
-	while((m = re.exec(s))) {
-		var val = m[1];
+    var result	= '';
+    var re		= /\|([A-Z\d]{2}|\|)/g;
+    var m;
+    var lastIndex = 0;
+    while((m = re.exec(s))) {
+        var val = m[1];
 
-		if('|' == val) {
-			result += '|';
-			continue;
-		}
+        if('|' == val) {
+            result += '|';
+            continue;
+        }
 
-		//	convert to number
-		val = parseInt(val, 10);
-		if(isNaN(val)) {
-			val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
-		}
+        //	convert to number
+        val = parseInt(val, 10);
+        if(isNaN(val)) {
+            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
+        }
 
-		if(_.isString(val)) {
-			result += s.substr(lastIndex, m.index - lastIndex) + val;
-		} else {
-			const attr = ansiSgrFromRenegadeColorCode(val);
-			result += s.substr(lastIndex, m.index - lastIndex) + attr;
-		}
+        if(_.isString(val)) {
+            result += s.substr(lastIndex, m.index - lastIndex) + val;
+        } else {
+            const attr = ansiSgrFromRenegadeColorCode(val);
+            result += s.substr(lastIndex, m.index - lastIndex) + attr;
+        }
 
-		lastIndex = re.lastIndex;
-	}
+        lastIndex = re.lastIndex;
+    }
 
-	return (0 === result.length ? s : result + s.substr(lastIndex));
+    return (0 === result.length ? s : result + s.substr(lastIndex));
 }
 
 //
@@ -180,113 +180,113 @@ function renegadeToAnsi(s, client) {
 //	* http://wiki.synchro.net/custom:colors
 //
 function controlCodesToAnsi(s, client) {
-	const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
+    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
 
-	let m;
-	let result		= '';
-	let lastIndex	= 0;
-	let v;
-	let fg;
-	let bg;
+    let m;
+    let result		= '';
+    let lastIndex	= 0;
+    let v;
+    let fg;
+    let bg;
 
-	while((m = RE.exec(s))) {
-		switch(m[0].charAt(0)) {
-			case '|' :
-				//	Renegade or ENiGMA MCI
-				v = parseInt(m[2], 10);
+    while((m = RE.exec(s))) {
+        switch(m[0].charAt(0)) {
+            case '|' :
+                //	Renegade or ENiGMA MCI
+                v = parseInt(m[2], 10);
 
-				if(isNaN(v)) {
-					v = getPredefinedMCIValue(client, m[2]) || m[0];	//	value itself or literal
-				}
+                if(isNaN(v)) {
+                    v = getPredefinedMCIValue(client, m[2]) || m[0];	//	value itself or literal
+                }
 
-				if(_.isString(v)) {
-					result += s.substr(lastIndex, m.index - lastIndex) + v;
-				} else {
-					v = ansiSgrFromRenegadeColorCode(v);
-					result += s.substr(lastIndex, m.index - lastIndex) + v;
-				}
-				break;
+                if(_.isString(v)) {
+                    result += s.substr(lastIndex, m.index - lastIndex) + v;
+                } else {
+                    v = ansiSgrFromRenegadeColorCode(v);
+                    result += s.substr(lastIndex, m.index - lastIndex) + v;
+                }
+                break;
 
-			case '@' :
-				//	PCBoard @X## or Wildcat! @##@
-				if('@' === m[0].substr(-1)) {
-					//	Wildcat!
-					v = m[6];
-				} else {
-					v = m[4];
-				}
+            case '@' :
+                //	PCBoard @X## or Wildcat! @##@
+                if('@' === m[0].substr(-1)) {
+                    //	Wildcat!
+                    v = m[6];
+                } else {
+                    v = m[4];
+                }
 
-				fg = {
-					0	: [ 'reset', 'black' ],
-					1	: [ 'reset', 'blue' ],
-					2	: [ 'reset', 'green' ],
-					3	: [ 'reset', 'cyan' ],
-					4	: [ 'reset', 'red' ],
-					5	: [ 'reset', 'magenta' ],
-					6	: [ 'reset', 'yellow' ],
-					7	: [ 'reset', 'white' ],
+                fg = {
+                    0	: [ 'reset', 'black' ],
+                    1	: [ 'reset', 'blue' ],
+                    2	: [ 'reset', 'green' ],
+                    3	: [ 'reset', 'cyan' ],
+                    4	: [ 'reset', 'red' ],
+                    5	: [ 'reset', 'magenta' ],
+                    6	: [ 'reset', 'yellow' ],
+                    7	: [ 'reset', 'white' ],
 
-					8	: [ 'blink', 'black' ],
-					9	: [ 'blink', 'blue' ],
-					A	: [ 'blink', 'green' ],
-					B	: [ 'blink', 'cyan' ],
-					C	: [ 'blink', 'red' ],
-					D	: [ 'blink', 'magenta' ],
-					E	: [ 'blink', 'yellow' ],
-					F	: [ 'blink', 'white' ],
-				}[v.charAt(0)] || ['normal'];
+                    8	: [ 'blink', 'black' ],
+                    9	: [ 'blink', 'blue' ],
+                    A	: [ 'blink', 'green' ],
+                    B	: [ 'blink', 'cyan' ],
+                    C	: [ 'blink', 'red' ],
+                    D	: [ 'blink', 'magenta' ],
+                    E	: [ 'blink', 'yellow' ],
+                    F	: [ 'blink', 'white' ],
+                }[v.charAt(0)] || ['normal'];
 
-				bg = {
-					0	: [ 'blackBG' ],
-					1 	: [ 'blueBG' ],
-					2	: [ 'greenBG' ],
-					3	: [ 'cyanBG' ],
-					4	: [ 'redBG' ],
-					5	: [ 'magentaBG' ],
-					6	: [ 'yellowBG' ],
-					7	: [ 'whiteBG' ],
+                bg = {
+                    0	: [ 'blackBG' ],
+                    1 	: [ 'blueBG' ],
+                    2	: [ 'greenBG' ],
+                    3	: [ 'cyanBG' ],
+                    4	: [ 'redBG' ],
+                    5	: [ 'magentaBG' ],
+                    6	: [ 'yellowBG' ],
+                    7	: [ 'whiteBG' ],
 
-					8	: [ 'bold', 'blackBG' ],
-					9	: [ 'bold', 'blueBG' ],
-					A	: [ 'bold', 'greenBG' ],
-					B	: [ 'bold', 'cyanBG' ],
-					C	: [ 'bold', 'redBG' ],
-					D	: [ 'bold', 'magentaBG' ],
-					E	: [ 'bold', 'yellowBG' ],
-					F	: [ 'bold', 'whiteBG' ],
-				}[v.charAt(1)] || [ 'normal' ];
+                    8	: [ 'bold', 'blackBG' ],
+                    9	: [ 'bold', 'blueBG' ],
+                    A	: [ 'bold', 'greenBG' ],
+                    B	: [ 'bold', 'cyanBG' ],
+                    C	: [ 'bold', 'redBG' ],
+                    D	: [ 'bold', 'magentaBG' ],
+                    E	: [ 'bold', 'yellowBG' ],
+                    F	: [ 'bold', 'whiteBG' ],
+                }[v.charAt(1)] || [ 'normal' ];
 
-				v = ansi.sgr(fg.concat(bg));
-				result += s.substr(lastIndex, m.index - lastIndex) + v;
-				break;
+                v = ansi.sgr(fg.concat(bg));
+                result += s.substr(lastIndex, m.index - lastIndex) + v;
+                break;
 
-			case '\x03' :
-				v = parseInt(m[8], 10);
+            case '\x03' :
+                v = parseInt(m[8], 10);
 
-				if(isNaN(v)) {
-					v += m[0];
-				} else {
-					v = ansi.sgr({
-						0	: [ 'reset', 'black' ],
-						1	: [ 'bold', 'cyan' ],
-						2	: [ 'bold', 'yellow' ],
-						3	: [ 'reset', 'magenta' ],
-						4	: [ 'bold', 'white', 'blueBG' ],
-						5	: [ 'reset', 'green' ],
-						6	: [ 'bold', 'blink', 'red' ],
-						7	: [ 'bold', 'blue' ],
-						8	: [ 'reset', 'blue' ],
-						9	: [ 'reset', 'cyan' ],
-					}[v] || 'normal');
-				}
+                if(isNaN(v)) {
+                    v += m[0];
+                } else {
+                    v = ansi.sgr({
+                        0	: [ 'reset', 'black' ],
+                        1	: [ 'bold', 'cyan' ],
+                        2	: [ 'bold', 'yellow' ],
+                        3	: [ 'reset', 'magenta' ],
+                        4	: [ 'bold', 'white', 'blueBG' ],
+                        5	: [ 'reset', 'green' ],
+                        6	: [ 'bold', 'blink', 'red' ],
+                        7	: [ 'bold', 'blue' ],
+                        8	: [ 'reset', 'blue' ],
+                        9	: [ 'reset', 'cyan' ],
+                    }[v] || 'normal');
+                }
 
-				result += s.substr(lastIndex, m.index - lastIndex) + v;
+                result += s.substr(lastIndex, m.index - lastIndex) + v;
 
-				break;
-		}
+                break;
+        }
 
-		lastIndex = RE.lastIndex;
-	}
+        lastIndex = RE.lastIndex;
+    }
 
-	return (0 === result.length ? s : result + s.substr(lastIndex));
+    return (0 === result.length ? s : result + s.substr(lastIndex));
 }
\ No newline at end of file
diff --git a/core/combatnet.js b/core/combatnet.js
index 8fb92de1..d6616449 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -11,107 +11,107 @@ const _				= require('lodash');
 const RLogin        = require('rlogin');
 
 exports.moduleInfo = {
-	name	: 'CombatNet',
-	desc	: 'CombatNet Access Module',
-	author	: 'Dave Stephens',
+    name	: 'CombatNet',
+    desc	: 'CombatNet Access Module',
+    author	: 'Dave Stephens',
 };
 
 exports.getModule = class CombatNetModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		//	establish defaults
-		this.config				= options.menuConfig.config;
-		this.config.host		= this.config.host || 'bbs.combatnet.us';
-		this.config.rloginPort	= this.config.rloginPort || 4513;
-	}
+        //	establish defaults
+        this.config				= options.menuConfig.config;
+        this.config.host		= this.config.host || 'bbs.combatnet.us';
+        this.config.rloginPort	= this.config.rloginPort || 4513;
+    }
 
-	initSequence() {
-		const self = this;
+    initSequence() {
+        const self = this;
 
-		async.series(
-			[
-				function validateConfig(callback) {
-					if(!_.isString(self.config.password)) {
-						return callback(new Error('Config requires "password"!'));
-					}
-					if(!_.isString(self.config.bbsTag)) {
-						return callback(new Error('Config requires "bbsTag"!'));
-					}
-					return callback(null);
-				},
-				function establishRloginConnection(callback) {
-					self.client.term.write(resetScreen());
-					self.client.term.write('Connecting to CombatNet, please wait...\n');
+        async.series(
+            [
+                function validateConfig(callback) {
+                    if(!_.isString(self.config.password)) {
+                        return callback(new Error('Config requires "password"!'));
+                    }
+                    if(!_.isString(self.config.bbsTag)) {
+                        return callback(new Error('Config requires "bbsTag"!'));
+                    }
+                    return callback(null);
+                },
+                function establishRloginConnection(callback) {
+                    self.client.term.write(resetScreen());
+                    self.client.term.write('Connecting to CombatNet, please wait...\n');
 
-					const restorePipeToNormal = function() {
-						if(self.client.term.output) {
-							self.client.term.output.removeListener('data', sendToRloginBuffer);
-						}
-					};
+                    const restorePipeToNormal = function() {
+                        if(self.client.term.output) {
+                            self.client.term.output.removeListener('data', sendToRloginBuffer);
+                        }
+                    };
 
-					const rlogin = new RLogin(
-						{	'clientUsername' : self.config.password,
-							'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
-							'host' : self.config.host,
-							'port' : self.config.rloginPort,
-							'terminalType' : self.client.term.termClient,
-							'terminalSpeed' : 57600
-						}
-					);
+                    const rlogin = new RLogin(
+                        {	'clientUsername' : self.config.password,
+                            'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
+                            'host' : self.config.host,
+                            'port' : self.config.rloginPort,
+                            'terminalType' : self.client.term.termClient,
+                            'terminalSpeed' : 57600
+                        }
+                    );
 
-					// If there was an error ...
-					rlogin.on('error', err => {
-						self.client.log.info(`CombatNet rlogin client error: ${err.message}`);
-						restorePipeToNormal();
-						return callback(err);
-					});
+                    // If there was an error ...
+                    rlogin.on('error', err => {
+                        self.client.log.info(`CombatNet rlogin client error: ${err.message}`);
+                        restorePipeToNormal();
+                        return callback(err);
+                    });
 
-					// If we've been disconnected ...
-					rlogin.on('disconnect', () => {
-						self.client.log.info('Disconnected from CombatNet');
-						restorePipeToNormal();
-						return callback(null);
-					});
+                    // If we've been disconnected ...
+                    rlogin.on('disconnect', () => {
+                        self.client.log.info('Disconnected from CombatNet');
+                        restorePipeToNormal();
+                        return callback(null);
+                    });
 
-					function sendToRloginBuffer(buffer) {
-						rlogin.send(buffer);
-					}
+                    function sendToRloginBuffer(buffer) {
+                        rlogin.send(buffer);
+                    }
 
-					rlogin.on('connect',
-						/*	The 'connect' event handler will be supplied with one argument,
+                    rlogin.on('connect',
+                        /*	The 'connect' event handler will be supplied with one argument,
                             a boolean indicating whether or not the connection was established. */
 
-						function(state) {
-							if(state) {
-								self.client.log.info('Connected to CombatNet');
-								self.client.term.output.on('data', sendToRloginBuffer);
+                        function(state) {
+                            if(state) {
+                                self.client.log.info('Connected to CombatNet');
+                                self.client.term.output.on('data', sendToRloginBuffer);
 
-							} else {
-								return callback(new Error('Failed to establish establish CombatNet connection'));
-							}
-						}
-					);
+                            } else {
+                                return callback(new Error('Failed to establish establish CombatNet connection'));
+                            }
+                        }
+                    );
 
-					// If data (a Buffer) has been received from the server ...
-					rlogin.on('data', (data) => {
-						self.client.term.rawWrite(data);
-					});
+                    // If data (a Buffer) has been received from the server ...
+                    rlogin.on('data', (data) => {
+                        self.client.term.rawWrite(data);
+                    });
 
-					// connect...
-					rlogin.connect();
+                    // connect...
+                    rlogin.connect();
 
-					//	note: no explicit callback() until we're finished!
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'CombatNet error');
-				}
+                    //	note: no explicit callback() until we're finished!
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'CombatNet error');
+                }
 
-				//	if the client is still here, go to previous
-				self.prevMenu();
-			}
-		);
-	}
+                //	if the client is still here, go to previous
+                self.prevMenu();
+            }
+        );
+    }
 };
diff --git a/core/conf_area_util.js b/core/conf_area_util.js
index 6b71061b..7c4bf5bb 100644
--- a/core/conf_area_util.js
+++ b/core/conf_area_util.js
@@ -12,19 +12,19 @@ exports.sortAreasOrConfs	= sortAreasOrConfs;
 //	Otherwise, use a locale comparison on the sort key or name as a fallback
 //
 function sortAreasOrConfs(areasOrConfs, type) {
-	let entryA;
-	let entryB;
+    let entryA;
+    let entryB;
 
-	areasOrConfs.sort((a, b) => {
-		entryA = type ? a[type] : a;
-		entryB = type ? b[type] : b;
+    areasOrConfs.sort((a, b) => {
+        entryA = type ? a[type] : a;
+        entryB = type ? b[type] : b;
 
-		if(_.isNumber(entryA.sort) && _.isNumber(entryB.sort)) {
-			return entryA.sort - entryB.sort;
-		} else {
-			const keyA = entryA.sort ? entryA.sort.toString() : entryA.name;
-			const keyB = entryB.sort ? entryB.sort.toString() : entryB.name;
-			return keyA.localeCompare(keyB, { sensitivity : false, numeric : true } );	//	"natural" compare
-		}
-	});
+        if(_.isNumber(entryA.sort) && _.isNumber(entryB.sort)) {
+            return entryA.sort - entryB.sort;
+        } else {
+            const keyA = entryA.sort ? entryA.sort.toString() : entryA.name;
+            const keyB = entryB.sort ? entryB.sort.toString() : entryB.name;
+            return keyA.localeCompare(keyB, { sensitivity : false, numeric : true } );	//	"natural" compare
+        }
+    });
 }
\ No newline at end of file
diff --git a/core/config.js b/core/config.js
index 38962b1f..3a1359d7 100644
--- a/core/config.js
+++ b/core/config.js
@@ -16,157 +16,157 @@ exports.getDefaultPath	= getDefaultPath;
 let currentConfiguration = {};
 
 function hasMessageConferenceAndArea(config) {
-	assert(_.isObject(config.messageConferences));  //  we create one ourself!
+    assert(_.isObject(config.messageConferences));  //  we create one ourself!
 
-	const nonInternalConfs = Object.keys(config.messageConferences).filter(confTag => {
-		return 'system_internal' !== confTag;
-	});
+    const nonInternalConfs = Object.keys(config.messageConferences).filter(confTag => {
+        return 'system_internal' !== confTag;
+    });
 
-	if(0 === nonInternalConfs.length) {
-		return false;
-	}
+    if(0 === nonInternalConfs.length) {
+        return false;
+    }
 
-	//  :TODO: there is likely a better/cleaner way of doing this
+    //  :TODO: there is likely a better/cleaner way of doing this
 
-	let result = false;
-	_.forEach(nonInternalConfs, confTag => {
-		if(_.has(config.messageConferences[confTag], 'areas') &&
+    let result = false;
+    _.forEach(nonInternalConfs, confTag => {
+        if(_.has(config.messageConferences[confTag], 'areas') &&
 			Object.keys(config.messageConferences[confTag].areas) > 0)
-		{
-			result = true;
-			return false;   //  stop iteration
-		}
-	});
+        {
+            result = true;
+            return false;   //  stop iteration
+        }
+    });
 
-	return result;
+    return result;
 }
 
 function mergeValidateAndFinalize(config, cb) {
-	async.waterfall(
-		[
-			function mergeWithDefaultConfig(callback) {
-				const mergedConfig = _.mergeWith(
-					getDefaultConfig(),
-					config, (conf1, conf2) => {
-						//	Arrays should always concat
-						if(_.isArray(conf1)) {
-							//	:TODO: look for collisions & override dupes
-							return conf1.concat(conf2);
-						}
-					}
-				);
+    async.waterfall(
+        [
+            function mergeWithDefaultConfig(callback) {
+                const mergedConfig = _.mergeWith(
+                    getDefaultConfig(),
+                    config, (conf1, conf2) => {
+                        //	Arrays should always concat
+                        if(_.isArray(conf1)) {
+                            //	:TODO: look for collisions & override dupes
+                            return conf1.concat(conf2);
+                        }
+                    }
+                );
 
-				return callback(null, mergedConfig);
-			},
-			function validate(mergedConfig, callback) {
-				//
-				//	Various sections must now exist in config
-				//
-				//	:TODO: Logic is broken here:
-				if(hasMessageConferenceAndArea(mergedConfig)) {
-					return callback(Errors.MissingConfig('Please create at least one message conference and area!'));
-				}
-				return callback(null, mergedConfig);
-			},
-			function setIt(mergedConfig, callback) {
-				//	:TODO: .config property is to be deprecated once conversions are done
-				exports.config = currentConfiguration = mergedConfig;
+                return callback(null, mergedConfig);
+            },
+            function validate(mergedConfig, callback) {
+                //
+                //	Various sections must now exist in config
+                //
+                //	:TODO: Logic is broken here:
+                if(hasMessageConferenceAndArea(mergedConfig)) {
+                    return callback(Errors.MissingConfig('Please create at least one message conference and area!'));
+                }
+                return callback(null, mergedConfig);
+            },
+            function setIt(mergedConfig, callback) {
+                //	:TODO: .config property is to be deprecated once conversions are done
+                exports.config = currentConfiguration = mergedConfig;
 
-				exports.get = () => currentConfiguration;
-				return callback(null);
-			}
-		],
-		err => {
-			if(cb) {
-				return cb(err);
-			}
-		}
-	);
+                exports.get = () => currentConfiguration;
+                return callback(null);
+            }
+        ],
+        err => {
+            if(cb) {
+                return cb(err);
+            }
+        }
+    );
 }
 
 function init(configPath, options, cb) {
-	if(!cb && _.isFunction(options)) {
-		cb = options;
-		options = {};
-	}
+    if(!cb && _.isFunction(options)) {
+        cb = options;
+        options = {};
+    }
 
-	const changed = ( { fileName, fileRoot } ) => {
-		const reCachedPath = paths.join(fileRoot, fileName);
-		ConfigCache.getConfig(reCachedPath, (err, config) => {
-			if(!err) {
-				mergeValidateAndFinalize(config);
-			}
-		});
-	};
+    const changed = ( { fileName, fileRoot } ) => {
+        const reCachedPath = paths.join(fileRoot, fileName);
+        ConfigCache.getConfig(reCachedPath, (err, config) => {
+            if(!err) {
+                mergeValidateAndFinalize(config);
+            }
+        });
+    };
 
-	const ConfigCache = require('./config_cache.js');
-	const getConfigOptions = {
-		filePath	: configPath,
-		noWatch		: options.noWatch,
-	};
-	if(!options.noWatch) {
-		getConfigOptions.callback = changed;
-	}
-	ConfigCache.getConfigWithOptions(getConfigOptions, (err, config) => {
-		if(err) {
-			return cb(err);
-		}
+    const ConfigCache = require('./config_cache.js');
+    const getConfigOptions = {
+        filePath	: configPath,
+        noWatch		: options.noWatch,
+    };
+    if(!options.noWatch) {
+        getConfigOptions.callback = changed;
+    }
+    ConfigCache.getConfigWithOptions(getConfigOptions, (err, config) => {
+        if(err) {
+            return cb(err);
+        }
 
-		return mergeValidateAndFinalize(config, cb);
-	});
+        return mergeValidateAndFinalize(config, cb);
+    });
 }
 
 function getDefaultPath() {
-	//	e.g. /enigma-bbs-install-path/config/
-	return './config/';
+    //	e.g. /enigma-bbs-install-path/config/
+    return './config/';
 }
 
 function getDefaultConfig() {
-	return {
-		general : {
-			boardName		: 'Another Fine ENiGMA½ BBS',
+    return {
+        general : {
+            boardName		: 'Another Fine ENiGMA½ BBS',
 
-			closedSystem	: false,					//	is the system closed to new users?
+            closedSystem	: false,					//	is the system closed to new users?
 
-			loginAttempts	: 3,
+            loginAttempts	: 3,
 
-			menuFile		: 'menu.hjson',				//	Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
-			promptFile		: 'prompt.hjson',			//	Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
-		},
+            menuFile		: 'menu.hjson',				//	Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
+            promptFile		: 'prompt.hjson',			//	Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
+        },
 
-		//	:TODO: see notes below about 'theme' section - move this!
-		preLoginTheme : 'luciano_blocktronics',
+        //	:TODO: see notes below about 'theme' section - move this!
+        preLoginTheme : 'luciano_blocktronics',
 
-		users : {
-			usernameMin			: 2,
-			usernameMax			: 16,	//	Note that FidoNet wants 36 max
-			usernamePattern		: '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ ]+$',
+        users : {
+            usernameMin			: 2,
+            usernameMax			: 16,	//	Note that FidoNet wants 36 max
+            usernamePattern		: '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ ]+$',
 
-			passwordMin			: 6,
-			passwordMax			: 128,
-			badPassFile			: paths.join(__dirname, '../misc/10_million_password_list_top_10000.txt'),	//	https://github.com/danielmiessler/SecLists
+            passwordMin			: 6,
+            passwordMax			: 128,
+            badPassFile			: paths.join(__dirname, '../misc/10_million_password_list_top_10000.txt'),	//	https://github.com/danielmiessler/SecLists
 
-			realNameMax			: 32,
-			locationMax			: 32,
-			affilsMax			: 32,
-			emailMax			: 255,
-			webMax				: 255,
+            realNameMax			: 32,
+            locationMax			: 32,
+            affilsMax			: 32,
+            emailMax			: 255,
+            webMax				: 255,
 
-			requireActivation	: false,	//	require SysOp activation? false = auto-activate
+            requireActivation	: false,	//	require SysOp activation? false = auto-activate
 
-			groups				: [ 'users', 'sysops' ],		//	built in groups
-			defaultGroups		: [ 'users' ],					//	default groups new users belong to
+            groups				: [ 'users', 'sysops' ],		//	built in groups
+            defaultGroups		: [ 'users' ],					//	default groups new users belong to
 
-			newUserNames		: [ 'new', 'apply' ],			//	Names reserved for applying
+            newUserNames		: [ 'new', 'apply' ],			//	Names reserved for applying
 
-			badUserNames		: [
-				'sysop', 'admin', 'administrator', 'root', 'all',
-				'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
-			],
-		},
+            badUserNames		: [
+                'sysop', 'admin', 'administrator', 'root', 'all',
+                'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
+            ],
+        },
 
-		//	:TODO: better name for "defaults"... which is redundant here!
-		/*
+        //	:TODO: better name for "defaults"... which is redundant here!
+        /*
 		Concept
 		"theme" : {
 			"default" : "defaultThemeName", // or "*"
@@ -175,662 +175,662 @@ function getDefaultConfig() {
 			...
 		}
 		*/
-		defaults : {
-			theme			: 'luciano_blocktronics',
-			passwordChar	: '*',		//	TODO: move to user ?
-			dateFormat	: {
-				short	: 'MM/DD/YYYY',
-				long	: 'ddd, MMMM Do, YYYY',
-			},
-			timeFormat : {
-				short	: 'h:mm a',
-			},
-			dateTimeFormat : {
-				short	: 'MM/DD/YYYY h:mm a',
-				long	: 'ddd, MMMM Do, YYYY, h:mm a',
-			}
-		},
+        defaults : {
+            theme			: 'luciano_blocktronics',
+            passwordChar	: '*',		//	TODO: move to user ?
+            dateFormat	: {
+                short	: 'MM/DD/YYYY',
+                long	: 'ddd, MMMM Do, YYYY',
+            },
+            timeFormat : {
+                short	: 'h:mm a',
+            },
+            dateTimeFormat : {
+                short	: 'MM/DD/YYYY h:mm a',
+                long	: 'ddd, MMMM Do, YYYY, h:mm a',
+            }
+        },
 
-		menus : {
-			cls		: true,	//	Clear screen before each menu by default?
-		},
+        menus : {
+            cls		: true,	//	Clear screen before each menu by default?
+        },
 
-		paths		: {
-			config				: paths.join(__dirname, './../config/'),
-			mods				: paths.join(__dirname, './../mods/'),
-			loginServers		: paths.join(__dirname, './servers/login/'),
-			contentServers		: paths.join(__dirname, './servers/content/'),
+        paths		: {
+            config				: paths.join(__dirname, './../config/'),
+            mods				: paths.join(__dirname, './../mods/'),
+            loginServers		: paths.join(__dirname, './servers/login/'),
+            contentServers		: paths.join(__dirname, './servers/content/'),
 
-			scannerTossers		: paths.join(__dirname, './scanner_tossers/'),
-			mailers				: paths.join(__dirname, './mailers/')		,
+            scannerTossers		: paths.join(__dirname, './scanner_tossers/'),
+            mailers				: paths.join(__dirname, './mailers/')		,
 
-			art					: paths.join(__dirname, './../art/general/'),
-			themes				: paths.join(__dirname, './../art/themes/'),
-			logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
-			db					: paths.join(__dirname, './../db/'),
-			modsDb				: paths.join(__dirname, './../db/mods/'),
-			dropFiles			: paths.join(__dirname, './../dropfiles/'),	//	+ "/node<x>/
-			misc				: paths.join(__dirname, './../misc/'),
-		},
+            art					: paths.join(__dirname, './../art/general/'),
+            themes				: paths.join(__dirname, './../art/themes/'),
+            logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
+            db					: paths.join(__dirname, './../db/'),
+            modsDb				: paths.join(__dirname, './../db/mods/'),
+            dropFiles			: paths.join(__dirname, './../dropfiles/'),	//	+ "/node<x>/
+            misc				: paths.join(__dirname, './../misc/'),
+        },
 
-		loginServers : {
-			telnet : {
-				port			: 8888,
-				enabled			: true,
-				firstMenu		: 'telnetConnected',
-			},
-			ssh : {
-				port				: 8889,
-				enabled				: false,    //  default to false as PK/pass in config.hjson are required
+        loginServers : {
+            telnet : {
+                port			: 8888,
+                enabled			: true,
+                firstMenu		: 'telnetConnected',
+            },
+            ssh : {
+                port				: 8889,
+                enabled				: false,    //  default to false as PK/pass in config.hjson are required
 
-				//
-				//	Private key in PEM format
-				//
-				//	Generating your PK:
-				//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
-				//
-				//	Then, set servers.ssh.privateKeyPass to the password you use above
-				//	in your config.hjson
-				//
-				privateKeyPem		: paths.join(__dirname, './../config/ssh_private_key.pem'),
-				firstMenu			: 'sshConnected',
-				firstMenuNewUser	: 'sshConnectedNewUser',
-			},
-			webSocket : {
-				ws : {
-					//	non-secure ws://
-					enabled			: false,
-					port			: 8810,
-				},
-				wss : {
-					//	secure ws://
-					//	must provide valid certPem and keyPem
-					enabled			: false,
-					port			: 8811,
-					certPem			: paths.join(__dirname, './../config/https_cert.pem'),
-					keyPem			: paths.join(__dirname, './../config/https_cert_key.pem'),
-				},
-			},
-		},
+                //
+                //	Private key in PEM format
+                //
+                //	Generating your PK:
+                //	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+                //
+                //	Then, set servers.ssh.privateKeyPass to the password you use above
+                //	in your config.hjson
+                //
+                privateKeyPem		: paths.join(__dirname, './../config/ssh_private_key.pem'),
+                firstMenu			: 'sshConnected',
+                firstMenuNewUser	: 'sshConnectedNewUser',
+            },
+            webSocket : {
+                ws : {
+                    //	non-secure ws://
+                    enabled			: false,
+                    port			: 8810,
+                },
+                wss : {
+                    //	secure ws://
+                    //	must provide valid certPem and keyPem
+                    enabled			: false,
+                    port			: 8811,
+                    certPem			: paths.join(__dirname, './../config/https_cert.pem'),
+                    keyPem			: paths.join(__dirname, './../config/https_cert_key.pem'),
+                },
+            },
+        },
 
-		contentServers : {
-			web : {
-				domain : 'another-fine-enigma-bbs.org',
+        contentServers : {
+            web : {
+                domain : 'another-fine-enigma-bbs.org',
 
-				staticRoot : paths.join(__dirname, './../www'),
+                staticRoot : paths.join(__dirname, './../www'),
 
-				resetPassword : {
-					//
-					//	The following templates have these variables available to them:
-					//
-					//	* %BOARDNAME%		: Name of BBS
-					//	* %USERNAME%		: Username of whom to reset password
-					//	* %TOKEN%			: Reset token
-					//	* %RESET_URL%		: In case of email, the link to follow for reset. In case of landing page,
-					//						  URL to POST submit reset form.
+                resetPassword : {
+                    //
+                    //	The following templates have these variables available to them:
+                    //
+                    //	* %BOARDNAME%		: Name of BBS
+                    //	* %USERNAME%		: Username of whom to reset password
+                    //	* %TOKEN%			: Reset token
+                    //	* %RESET_URL%		: In case of email, the link to follow for reset. In case of landing page,
+                    //						  URL to POST submit reset form.
 
-					//	templates for pw reset *email*
-					resetPassEmailText	: paths.join(__dirname, '../misc/reset_password_email.template.txt'),	//	plain text version
-					resetPassEmailHtml	: paths.join(__dirname, '../misc/reset_password_email.template.html'),	//	HTML version
+                    //	templates for pw reset *email*
+                    resetPassEmailText	: paths.join(__dirname, '../misc/reset_password_email.template.txt'),	//	plain text version
+                    resetPassEmailHtml	: paths.join(__dirname, '../misc/reset_password_email.template.html'),	//	HTML version
 
-					//	tempalte for pw reset *landing page*
-					//
-					resetPageTemplate	: paths.join(__dirname, './../www/reset_password.template.html'),
-				},
+                    //	tempalte for pw reset *landing page*
+                    //
+                    resetPageTemplate	: paths.join(__dirname, './../www/reset_password.template.html'),
+                },
 
-				http : {
-					enabled : false,
-					port	: 8080,
-				},
-				https : {
-					enabled	: false,
-					port	: 8443,
-					certPem	: paths.join(__dirname, './../config/https_cert.pem'),
-					keyPem	: paths.join(__dirname, './../config/https_cert_key.pem'),
-				}
-			}
-		},
+                http : {
+                    enabled : false,
+                    port	: 8080,
+                },
+                https : {
+                    enabled	: false,
+                    port	: 8443,
+                    certPem	: paths.join(__dirname, './../config/https_cert.pem'),
+                    keyPem	: paths.join(__dirname, './../config/https_cert_key.pem'),
+                }
+            }
+        },
 
-		infoExtractUtils : {
-			Exiftool2Desc :  {
-				cmd			: `${__dirname}/../util/exiftool2desc.js`,	//	ensure chmod +x
-			},
-			Exiftool : {
-				cmd			: 'exiftool',
-				args		: [
-					'-charset', 'utf8', '{filePath}',
-					//	exclude the following:
-					'--directory', '--filepermissions', '--exiftoolversion', '--filename', '--filesize',
-					'--filemodifydate', '--fileaccessdate', '--fileinodechangedate', '--createdate', '--modifydate',
-					'--metadatadate', '--xmptoolkit'
-				]
-			},
-			XDMS2Desc : {
-				//	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
-				cmd		: 'xdms',
-				args	: [ 'd', '{filePath}' ]
-			},
-			XDMS2LongDesc : {
-				//	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
-				cmd		: 'xdms',
-				args	: [ 'f', '{filePath}' ]
-			}
-		},
+        infoExtractUtils : {
+            Exiftool2Desc :  {
+                cmd			: `${__dirname}/../util/exiftool2desc.js`,	//	ensure chmod +x
+            },
+            Exiftool : {
+                cmd			: 'exiftool',
+                args		: [
+                    '-charset', 'utf8', '{filePath}',
+                    //	exclude the following:
+                    '--directory', '--filepermissions', '--exiftoolversion', '--filename', '--filesize',
+                    '--filemodifydate', '--fileaccessdate', '--fileinodechangedate', '--createdate', '--modifydate',
+                    '--metadatadate', '--xmptoolkit'
+                ]
+            },
+            XDMS2Desc : {
+                //	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+                cmd		: 'xdms',
+                args	: [ 'd', '{filePath}' ]
+            },
+            XDMS2LongDesc : {
+                //	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+                cmd		: 'xdms',
+                args	: [ 'f', '{filePath}' ]
+            }
+        },
 
-		fileTypes : {
-			//
-			//	File types explicitly known to the system. Here we can configure
-			//	information extraction, archive treatment, etc.
-			//
-			//	MIME types can be found in mime-db: https://github.com/jshttp/mime-db
-			//
-			//	Resources for signature/magic bytes:
-			//	* http://www.garykessler.net/library/file_sigs.html
-			//
-			//
-			//	:TODO: text/x-ansi -> SAUCE extraction for .ans uploads
-			//	:TODO: textual : bool -- if text, we can view.
-			//	:TODO: asText : { cmd, args[] } -> viewable text
+        fileTypes : {
+            //
+            //	File types explicitly known to the system. Here we can configure
+            //	information extraction, archive treatment, etc.
+            //
+            //	MIME types can be found in mime-db: https://github.com/jshttp/mime-db
+            //
+            //	Resources for signature/magic bytes:
+            //	* http://www.garykessler.net/library/file_sigs.html
+            //
+            //
+            //	:TODO: text/x-ansi -> SAUCE extraction for .ans uploads
+            //	:TODO: textual : bool -- if text, we can view.
+            //	:TODO: asText : { cmd, args[] } -> viewable text
 
-			//
-			//	Audio
-			//
-			'audio/mpeg' : {
-				desc 			: 'MP3 Audio',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'application/pdf' : {
-				desc			: 'Adobe PDF',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			//
-			//	Video
-			//
-			'video/mp4' : {
-				desc			: 'MPEG Video',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'video/x-matroska ' : {
-				desc			: 'Matroska Video',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'video/x-msvideo' : {
-				desc			: 'Audio Video Interleave',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			//
-			//	Images
-			//
-			'image/jpeg'	: {
-				desc			: 'JPEG Image',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'image/png'	: {
-				desc			: 'Portable Network Graphic Image',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'image/gif' : {
-				desc			: 'Graphics Interchange Format Image',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			'image/webp' :  {
-				desc			: 'WebP Image',
-				shortDescUtil	: 'Exiftool2Desc',
-				longDescUtil	: 'Exiftool',
-			},
-			//
-			//	Archives
-			//
-			'application/zip' : {
-				desc			: 'ZIP Archive',
-				sig				: '504b0304',
-				offset			: 0,
-				archiveHandler	: '7Zip',
-			},
-			/*
+            //
+            //	Audio
+            //
+            'audio/mpeg' : {
+                desc 			: 'MP3 Audio',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'application/pdf' : {
+                desc			: 'Adobe PDF',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            //
+            //	Video
+            //
+            'video/mp4' : {
+                desc			: 'MPEG Video',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'video/x-matroska ' : {
+                desc			: 'Matroska Video',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'video/x-msvideo' : {
+                desc			: 'Audio Video Interleave',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            //
+            //	Images
+            //
+            'image/jpeg'	: {
+                desc			: 'JPEG Image',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'image/png'	: {
+                desc			: 'Portable Network Graphic Image',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'image/gif' : {
+                desc			: 'Graphics Interchange Format Image',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            'image/webp' :  {
+                desc			: 'WebP Image',
+                shortDescUtil	: 'Exiftool2Desc',
+                longDescUtil	: 'Exiftool',
+            },
+            //
+            //	Archives
+            //
+            'application/zip' : {
+                desc			: 'ZIP Archive',
+                sig				: '504b0304',
+                offset			: 0,
+                archiveHandler	: '7Zip',
+            },
+            /*
 			'application/x-cbr' : {
 				desc			: 'Comic Book Archive',
 				sig				: '504b0304',
 			},
 			*/
-			'application/x-arj' : {
-				desc			: 'ARJ Archive',
-				sig				: '60ea',
-				offset			: 0,
-				archiveHandler	: 'Arj',
-			},
-			'application/x-rar-compressed' : {
-				desc			: 'RAR Archive',
-				sig				: '526172211a0700',
-				offset			: 0,
-				archiveHandler	: 'Rar',
-			},
-			'application/gzip' : {
-				desc			: 'Gzip Archive',
-				sig				: '1f8b',
-				offset			: 0,
-				archiveHandler	: 'TarGz',
-			},
-			//	:TODO: application/x-bzip
-			'application/x-bzip2' : {
-				desc			: 'BZip2 Archive',
-				sig				: '425a68',
-				offset			: 0,
-				archiveHandler	: '7Zip',
-			},
-			'application/x-lzh-compressed' : {
-				desc			: 'LHArc Archive',
-				sig				: '2d6c68',
-				offset			: 2,
-				archiveHandler	: 'Lha',
-			},
-			'application/x-lzx' : {
-				desc			: 'LZX Archive',
-				sig				: '4c5a5800',
-				offset			: 0,
-				archiveHandler	: 'Lzx',
-			},
-			'application/x-7z-compressed' : {
-				desc			: '7-Zip Archive',
-				sig				: '377abcaf271c',
-				offset			: 0,
-				archiveHandler	: '7Zip',
-			},
+            'application/x-arj' : {
+                desc			: 'ARJ Archive',
+                sig				: '60ea',
+                offset			: 0,
+                archiveHandler	: 'Arj',
+            },
+            'application/x-rar-compressed' : {
+                desc			: 'RAR Archive',
+                sig				: '526172211a0700',
+                offset			: 0,
+                archiveHandler	: 'Rar',
+            },
+            'application/gzip' : {
+                desc			: 'Gzip Archive',
+                sig				: '1f8b',
+                offset			: 0,
+                archiveHandler	: 'TarGz',
+            },
+            //	:TODO: application/x-bzip
+            'application/x-bzip2' : {
+                desc			: 'BZip2 Archive',
+                sig				: '425a68',
+                offset			: 0,
+                archiveHandler	: '7Zip',
+            },
+            'application/x-lzh-compressed' : {
+                desc			: 'LHArc Archive',
+                sig				: '2d6c68',
+                offset			: 2,
+                archiveHandler	: 'Lha',
+            },
+            'application/x-lzx' : {
+                desc			: 'LZX Archive',
+                sig				: '4c5a5800',
+                offset			: 0,
+                archiveHandler	: 'Lzx',
+            },
+            'application/x-7z-compressed' : {
+                desc			: '7-Zip Archive',
+                sig				: '377abcaf271c',
+                offset			: 0,
+                archiveHandler	: '7Zip',
+            },
 
-			//
-			//	Generics that need further mapping
-			//
-			'application/octet-stream' : [
-				{
-					desc			: 'Amiga DISKMASHER',
-					sig				: '444d5321',	//	DMS!
-					ext				: '.dms',
-					shortDescUtil	: 'XDMS2Desc',
-					longDescUtil	: 'XDMS2LongDesc',
-				}
-			]
-		},
+            //
+            //	Generics that need further mapping
+            //
+            'application/octet-stream' : [
+                {
+                    desc			: 'Amiga DISKMASHER',
+                    sig				: '444d5321',	//	DMS!
+                    ext				: '.dms',
+                    shortDescUtil	: 'XDMS2Desc',
+                    longDescUtil	: 'XDMS2LongDesc',
+                }
+            ]
+        },
 
-		archives : {
-			archivers : {
-				'7Zip' : {
-					compress		: {
-						cmd			: '7za',
-						args		: [ 'a', '-tzip', '{archivePath}', '{fileList}' ],
-					},
-					decompress		: {
-						cmd			: '7za',
-						args		: [ 'e', '-o{extractPath}', '{archivePath}' ]	//	:TODO: should be 'x'?
-					},
-					list			: {
-						cmd			: '7za',
-						args		: [ 'l', '{archivePath}' ],
-						entryMatch	: '^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\s[A-Za-z\\.]{5}\\s+([0-9]+)\\s+[0-9]+\\s+([^\\r\\n]+)$',
-					},
-					extract			: {
-						cmd			: '7za',
-						args		: [ 'e', '-o{extractPath}', '{archivePath}', '{fileList}' ],
-					},
-				},
+        archives : {
+            archivers : {
+                '7Zip' : {
+                    compress		: {
+                        cmd			: '7za',
+                        args		: [ 'a', '-tzip', '{archivePath}', '{fileList}' ],
+                    },
+                    decompress		: {
+                        cmd			: '7za',
+                        args		: [ 'e', '-o{extractPath}', '{archivePath}' ]	//	:TODO: should be 'x'?
+                    },
+                    list			: {
+                        cmd			: '7za',
+                        args		: [ 'l', '{archivePath}' ],
+                        entryMatch	: '^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\s[A-Za-z\\.]{5}\\s+([0-9]+)\\s+[0-9]+\\s+([^\\r\\n]+)$',
+                    },
+                    extract			: {
+                        cmd			: '7za',
+                        args		: [ 'e', '-o{extractPath}', '{archivePath}', '{fileList}' ],
+                    },
+                },
 
-				Lha : {
-					//
-					//	'lha' command can be obtained from:
-					//	* apt-get: lhasa
-					//
-					//	(compress not currently supported)
-					//
-					decompress		: {
-						cmd			: 'lha',
-						args		: [ '-efw={extractPath}', '{archivePath}' ],
-					},
-					list			: {
-						cmd			: 'lha',
-						args		: [ '-l', '{archivePath}' ],
-						entryMatch	: '^[\\[a-z\\]]+(?:\\s+[0-9]+\\s+[0-9]+|\\s+)([0-9]+)\\s+[0-9]{2}\\.[0-9]\\%\\s+[A-Za-z]{3}\\s+[0-9]{1,2}\\s+[0-9]{4}\\s+([^\\r\\n]+)$',
-					},
-					extract			: {
-						cmd			: 'lha',
-						args		: [ '-efw={extractPath}', '{archivePath}', '{fileList}' ]
-					}
-				},
+                Lha : {
+                    //
+                    //	'lha' command can be obtained from:
+                    //	* apt-get: lhasa
+                    //
+                    //	(compress not currently supported)
+                    //
+                    decompress		: {
+                        cmd			: 'lha',
+                        args		: [ '-efw={extractPath}', '{archivePath}' ],
+                    },
+                    list			: {
+                        cmd			: 'lha',
+                        args		: [ '-l', '{archivePath}' ],
+                        entryMatch	: '^[\\[a-z\\]]+(?:\\s+[0-9]+\\s+[0-9]+|\\s+)([0-9]+)\\s+[0-9]{2}\\.[0-9]\\%\\s+[A-Za-z]{3}\\s+[0-9]{1,2}\\s+[0-9]{4}\\s+([^\\r\\n]+)$',
+                    },
+                    extract			: {
+                        cmd			: 'lha',
+                        args		: [ '-efw={extractPath}', '{archivePath}', '{fileList}' ]
+                    }
+                },
 
-				Lzx : {
-					//
-					//	'unlzx' command can be obtained from:
-					//	* Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
-					//	* RedHat: https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html
-					//	* Source: http://xavprods.free.fr/lzx/
-					//
-					decompress		: {
-						cmd			: 'unlzx',
-						//	unzlx doesn't have a output dir option, but we'll cwd to the temp output dir first
-						args		: [ '-x', '{archivePath}' ],
-					},
-					list			: {
-						cmd			: 'unlzx',
-						args		: [ '-v', '{archivePath}' ],
-						entryMatch	: '^\\s+([0-9]+)\\s+[^\\s]+\\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\\s+[0-9]{1,2}-[a-z]{3}-[0-9]{4}\\s+[a-z\\-]+\\s+\\"([^"]+)\\"$',
-					}
-				},
+                Lzx : {
+                    //
+                    //	'unlzx' command can be obtained from:
+                    //	* Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
+                    //	* RedHat: https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html
+                    //	* Source: http://xavprods.free.fr/lzx/
+                    //
+                    decompress		: {
+                        cmd			: 'unlzx',
+                        //	unzlx doesn't have a output dir option, but we'll cwd to the temp output dir first
+                        args		: [ '-x', '{archivePath}' ],
+                    },
+                    list			: {
+                        cmd			: 'unlzx',
+                        args		: [ '-v', '{archivePath}' ],
+                        entryMatch	: '^\\s+([0-9]+)\\s+[^\\s]+\\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\\s+[0-9]{1,2}-[a-z]{3}-[0-9]{4}\\s+[a-z\\-]+\\s+\\"([^"]+)\\"$',
+                    }
+                },
 
-				Arj : {
-					//
-					//	'arj' command can be obtained from:
-					//	* apt-get: arj
-					//
-					decompress		: {
-						cmd			: 'arj',
-						args		: [ 'x', '{archivePath}', '{extractPath}' ],
-					},
-					list			: {
-						cmd				: 'arj',
-						args			: [ 'l', '{archivePath}' ],
-						entryMatch		: '^([^\\s]+)\\s+([0-9]+)\\s+[0-9]+\\s[0-9\\.]+\\s+[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}\\s+(?:[^\\r\\n]+)$',
-						entryGroupOrder	: {	//	defaults to { byteSize : 1, fileName : 2 }
-							fileName	: 1,
-							byteSize	: 2,
-						}
-					},
-					extract			: {
-						cmd			: 'arj',
-						args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
-					}
-				},
+                Arj : {
+                    //
+                    //	'arj' command can be obtained from:
+                    //	* apt-get: arj
+                    //
+                    decompress		: {
+                        cmd			: 'arj',
+                        args		: [ 'x', '{archivePath}', '{extractPath}' ],
+                    },
+                    list			: {
+                        cmd				: 'arj',
+                        args			: [ 'l', '{archivePath}' ],
+                        entryMatch		: '^([^\\s]+)\\s+([0-9]+)\\s+[0-9]+\\s[0-9\\.]+\\s+[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}\\s+(?:[^\\r\\n]+)$',
+                        entryGroupOrder	: {	//	defaults to { byteSize : 1, fileName : 2 }
+                            fileName	: 1,
+                            byteSize	: 2,
+                        }
+                    },
+                    extract			: {
+                        cmd			: 'arj',
+                        args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
+                    }
+                },
 
-				Rar : {
-					decompress		: {
-						cmd			: 'unrar',
-						args		: [ 'x', '{archivePath}', '{extractPath}' ],
-					},
-					list			: {
-						cmd			: 'unrar',
-						args		: [ 'l', '{archivePath}' ],
-						entryMatch	: '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
-					},
-					extract			: {
-						cmd			: 'unrar',
-						args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
-					}
-				},
+                Rar : {
+                    decompress		: {
+                        cmd			: 'unrar',
+                        args		: [ 'x', '{archivePath}', '{extractPath}' ],
+                    },
+                    list			: {
+                        cmd			: 'unrar',
+                        args		: [ 'l', '{archivePath}' ],
+                        entryMatch	: '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
+                    },
+                    extract			: {
+                        cmd			: 'unrar',
+                        args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
+                    }
+                },
 
-				TarGz : {
-					decompress		: {
-						cmd			: 'tar',
-						args		: [ '-xf', '{archivePath}', '-C', '{extractPath}', '--strip-components=1' ],
-					},
-					list			: {
-						cmd			: 'tar',
-						args		: [ '-tvf', '{archivePath}' ],
-						entryMatch	: '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',
-					},
-					extract			: {
-						cmd			: 'tar',
-						args		: [ '-xvf', '{archivePath}', '-C', '{extractPath}', '{fileList}' ],
-					}
-				}
-			},
-		},
+                TarGz : {
+                    decompress		: {
+                        cmd			: 'tar',
+                        args		: [ '-xf', '{archivePath}', '-C', '{extractPath}', '--strip-components=1' ],
+                    },
+                    list			: {
+                        cmd			: 'tar',
+                        args		: [ '-tvf', '{archivePath}' ],
+                        entryMatch	: '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',
+                    },
+                    extract			: {
+                        cmd			: 'tar',
+                        args		: [ '-xvf', '{archivePath}', '-C', '{extractPath}', '{fileList}' ],
+                    }
+                }
+            },
+        },
 
-		fileTransferProtocols : {
-			//
-			//	See http://www.synchro.net/docs/sexyz.txt for information on SEXYZ
-			//
-			zmodem8kSexyz : {
-				name		: 'ZModem 8k (SEXYZ)',
-				type		: 'external',
-				sort		: 1,
-				external	: {
-					//	:TODO: Look into shipping sexyz binaries or at least hosting them somewhere for common systems
-					sendCmd				: 'sexyz',
-					sendArgs			: [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
-					recvCmd				: 'sexyz',
-					recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
-					recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
-				}
-			},
+        fileTransferProtocols : {
+            //
+            //	See http://www.synchro.net/docs/sexyz.txt for information on SEXYZ
+            //
+            zmodem8kSexyz : {
+                name		: 'ZModem 8k (SEXYZ)',
+                type		: 'external',
+                sort		: 1,
+                external	: {
+                    //	:TODO: Look into shipping sexyz binaries or at least hosting them somewhere for common systems
+                    sendCmd				: 'sexyz',
+                    sendArgs			: [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
+                    recvCmd				: 'sexyz',
+                    recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
+                    recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
+                }
+            },
 
-			xmodemSexyz : {
-				name		: 'XModem (SEXYZ)',
-				type		: 'external',
-				sort		: 3,
-				external	: {
-					sendCmd				: 'sexyz',
-					sendArgs			: [ '-telnet', 'sX', '@{fileListPath}' ],
-					recvCmd				: 'sexyz',
-					recvArgsNonBatch	: [ '-telnet', 'rC', '{fileName}' ]
-				}
-			},
+            xmodemSexyz : {
+                name		: 'XModem (SEXYZ)',
+                type		: 'external',
+                sort		: 3,
+                external	: {
+                    sendCmd				: 'sexyz',
+                    sendArgs			: [ '-telnet', 'sX', '@{fileListPath}' ],
+                    recvCmd				: 'sexyz',
+                    recvArgsNonBatch	: [ '-telnet', 'rC', '{fileName}' ]
+                }
+            },
 
-			ymodemSexyz : {
-				name		: 'YModem (SEXYZ)',
-				type		: 'external',
-				sort		: 4,
-				external	: {
-					sendCmd				: 'sexyz',
-					sendArgs			: [ '-telnet', 'sY', '@{fileListPath}' ],
-					recvCmd				: 'sexyz',
-					recvArgs			: [ '-telnet', 'ry', '{uploadDir}' ],
-				}
-			},
+            ymodemSexyz : {
+                name		: 'YModem (SEXYZ)',
+                type		: 'external',
+                sort		: 4,
+                external	: {
+                    sendCmd				: 'sexyz',
+                    sendArgs			: [ '-telnet', 'sY', '@{fileListPath}' ],
+                    recvCmd				: 'sexyz',
+                    recvArgs			: [ '-telnet', 'ry', '{uploadDir}' ],
+                }
+            },
 
-			zmodem8kSz : {
-				name		: 'ZModem 8k',
-				type		: 'external',
-				sort		: 2,
-				external	: {
-					sendCmd		: 'sz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
-					sendArgs	: [
-						//	:TODO: try -q
-						'--zmodem', '--try-8k', '--binary', '--restricted', '{filePaths}'
-					],
-					recvCmd		: 'rz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
-					recvArgs	: [
-						'--zmodem', '--binary', '--restricted', '--keep-uppercase', 	//	dumps to CWD which is set to {uploadDir}
-					],
-					//	:TODO: can we not just use --escape ?
-					escapeTelnet	: true,	//	set to true to escape Telnet codes such as IAC
-				}
-			}
-		},
+            zmodem8kSz : {
+                name		: 'ZModem 8k',
+                type		: 'external',
+                sort		: 2,
+                external	: {
+                    sendCmd		: 'sz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
+                    sendArgs	: [
+                        //	:TODO: try -q
+                        '--zmodem', '--try-8k', '--binary', '--restricted', '{filePaths}'
+                    ],
+                    recvCmd		: 'rz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
+                    recvArgs	: [
+                        '--zmodem', '--binary', '--restricted', '--keep-uppercase', 	//	dumps to CWD which is set to {uploadDir}
+                    ],
+                    //	:TODO: can we not just use --escape ?
+                    escapeTelnet	: true,	//	set to true to escape Telnet codes such as IAC
+                }
+            }
+        },
 
-		messageAreaDefaults : {
-			//
-			//	The following can be override per-area as well
-			//
-			maxMessages		: 1024,	//	0 = unlimited
-			maxAgeDays		: 0,	//	0 = unlimited
-		},
+        messageAreaDefaults : {
+            //
+            //	The following can be override per-area as well
+            //
+            maxMessages		: 1024,	//	0 = unlimited
+            maxAgeDays		: 0,	//	0 = unlimited
+        },
 
-		messageConferences : {
-			system_internal : {
-				name 	: 'System Internal',
-				desc 	: 'Built in conference for private messages, bulletins, etc.',
+        messageConferences : {
+            system_internal : {
+                name 	: 'System Internal',
+                desc 	: 'Built in conference for private messages, bulletins, etc.',
 
-				areas : {
-					private_mail : {
-						name					: 'Private Mail',
-						desc					: 'Private user to user mail/email',
-						maxExternalSentAgeDays	: 30,	//	max external "outbox" item age
-					},
+                areas : {
+                    private_mail : {
+                        name					: 'Private Mail',
+                        desc					: 'Private user to user mail/email',
+                        maxExternalSentAgeDays	: 30,	//	max external "outbox" item age
+                    },
 
-					local_bulletin : {
-						name	: 'System Bulletins',
-						desc	: 'Bulletin messages for all users',
-					}
-				}
-			}
-		},
+                    local_bulletin : {
+                        name	: 'System Bulletins',
+                        desc	: 'Bulletin messages for all users',
+                    }
+                }
+            }
+        },
 
-		scannerTossers : {
-			ftn_bso : {
-				paths : {
-					outbound		: paths.join(__dirname, './../mail/ftn_out/'),
-					inbound			: paths.join(__dirname, './../mail/ftn_in/'),
-					secInbound		: paths.join(__dirname, './../mail/ftn_secin/'),
-					reject			: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
-					//outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
-					//	set 'retain' to a valid path to keep good pkt files
-				},
+        scannerTossers : {
+            ftn_bso : {
+                paths : {
+                    outbound		: paths.join(__dirname, './../mail/ftn_out/'),
+                    inbound			: paths.join(__dirname, './../mail/ftn_in/'),
+                    secInbound		: paths.join(__dirname, './../mail/ftn_secin/'),
+                    reject			: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
+                    //outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
+                    //	set 'retain' to a valid path to keep good pkt files
+                },
 
-				//
-				//	Packet and (ArcMail) bundle target sizes are just that: targets.
-				//	Actual sizes may be slightly larger when we must place a full
-				//	PKT contents *somewhere*
-				//
-				packetTargetByteSize	: 512000,		//	512k, before placing messages in a new pkt
-				bundleTargetByteSize	: 2048000,		//	2M, before creating another archive
-				packetMsgEncoding		: 'utf8',		//	default packet encoding. Override per node if desired.
-				packetAnsiMsgEncoding	: 'cp437',		//	packet encoding for *ANSI ART* messages
+                //
+                //	Packet and (ArcMail) bundle target sizes are just that: targets.
+                //	Actual sizes may be slightly larger when we must place a full
+                //	PKT contents *somewhere*
+                //
+                packetTargetByteSize	: 512000,		//	512k, before placing messages in a new pkt
+                bundleTargetByteSize	: 2048000,		//	2M, before creating another archive
+                packetMsgEncoding		: 'utf8',		//	default packet encoding. Override per node if desired.
+                packetAnsiMsgEncoding	: 'cp437',		//	packet encoding for *ANSI ART* messages
 
-				tic : {
-					secureInOnly	: true,				//	only bring in from secure inbound (|secInbound| path, password protected)
-					uploadBy		: 'ENiGMA TIC',		//	default upload by username (override @ network)
-					allowReplace	: false,			//	use "Replaces" TIC field
-					descPriority	: 'diz',			//	May be diz=.DIZ/etc., or tic=from TIC Ldesc
-				}
-			}
-		},
+                tic : {
+                    secureInOnly	: true,				//	only bring in from secure inbound (|secInbound| path, password protected)
+                    uploadBy		: 'ENiGMA TIC',		//	default upload by username (override @ network)
+                    allowReplace	: false,			//	use "Replaces" TIC field
+                    descPriority	: 'diz',			//	May be diz=.DIZ/etc., or tic=from TIC Ldesc
+                }
+            }
+        },
 
-		fileBase: {
-			//	areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|:
-			areaStoragePrefix	: paths.join(__dirname, './../file_base/'),
+        fileBase: {
+            //	areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|:
+            areaStoragePrefix	: paths.join(__dirname, './../file_base/'),
 
-			maxDescFileByteSize			: 471859,	//	~1/4 MB
-			maxDescLongFileByteSize		: 524288,	//	1/2 MB
+            maxDescFileByteSize			: 471859,	//	~1/4 MB
+            maxDescLongFileByteSize		: 524288,	//	1/2 MB
 
-			fileNamePatterns: {
-				//	These are NOT case sensitive
-				//	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
-				//	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
-				desc		: [
-					'^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'	//	eslint-disable-line no-useless-escape
-				],
+            fileNamePatterns: {
+                //	These are NOT case sensitive
+                //	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
+                //	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
+                desc		: [
+                    '^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'	//	eslint-disable-line no-useless-escape
+                ],
 
-				//	common README filename - https://en.wikipedia.org/wiki/README
-				descLong		: [
-					'^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'	//	eslint-disable-line no-useless-escape
-				],
-			},
+                //	common README filename - https://en.wikipedia.org/wiki/README
+                descLong		: [
+                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'	//	eslint-disable-line no-useless-escape
+                ],
+            },
 
-			yearEstPatterns: [
-				//
-				//	Patterns should produce the year in the first submatch.
-				//	The extracted year may be YY or YYYY
-				//
-				'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',	//	yyyy-mm-dd, yyyy/mm/dd, ...
-				'\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1-2][0-9][0-9]{2}))\\b',	//	mm/dd/yyyy, mm.dd.yyyy, ...
-				'\\b((?:[1789][0-9]))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',			//	yy-mm-dd, yy-mm-dd, ...
-				'\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',			//	mm-dd-yy, mm/dd/yy, ...
-				//'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
-				//"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
-				'\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',
-				'\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',	//	November 29th, 1997
-				'\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
-				'\\b((?:19|20)[0-9]{2})\\b',	//	simple 19xx or 20xx with word boundaries
-				'\\b\'([17-9][0-9])\\b',		//	'95, '17, ...
-				//	:TODO: DD/MMM/YY, DD/MMMM/YY, DD/MMM/YYYY, etc.
-			],
+            yearEstPatterns: [
+                //
+                //	Patterns should produce the year in the first submatch.
+                //	The extracted year may be YY or YYYY
+                //
+                '\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',	//	yyyy-mm-dd, yyyy/mm/dd, ...
+                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1-2][0-9][0-9]{2}))\\b',	//	mm/dd/yyyy, mm.dd.yyyy, ...
+                '\\b((?:[1789][0-9]))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',			//	yy-mm-dd, yy-mm-dd, ...
+                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',			//	mm-dd-yy, mm/dd/yy, ...
+                //'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
+                //"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
+                '\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',
+                '\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',	//	November 29th, 1997
+                '\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
+                '\\b((?:19|20)[0-9]{2})\\b',	//	simple 19xx or 20xx with word boundaries
+                '\\b\'([17-9][0-9])\\b',		//	'95, '17, ...
+                //	:TODO: DD/MMM/YY, DD/MMMM/YY, DD/MMM/YYYY, etc.
+            ],
 
-			web : {
-				path			: '/f/',
-				routePath		: '/f/[a-zA-Z0-9]+$',
-				expireMinutes	: 1440,	//	1 day
-			},
+            web : {
+                path			: '/f/',
+                routePath		: '/f/[a-zA-Z0-9]+$',
+                expireMinutes	: 1440,	//	1 day
+            },
 
-			//
-			//	File area storage location tag/value pairs.
-			//	Non-absolute paths are relative to |areaStoragePrefix|.
-			//
-			storageTags : {
-				sys_msg_attach		: 'sys_msg_attach',
-				sys_temp_download	: 'sys_temp_download',
-			},
+            //
+            //	File area storage location tag/value pairs.
+            //	Non-absolute paths are relative to |areaStoragePrefix|.
+            //
+            storageTags : {
+                sys_msg_attach		: 'sys_msg_attach',
+                sys_temp_download	: 'sys_temp_download',
+            },
 
-			areas: {
-				system_message_attachment : {
-					name		: 'System Message Attachments',
-					desc		: 'File attachments to messages',
-					storageTags	: [ 'sys_msg_attach' ],
-				},
+            areas: {
+                system_message_attachment : {
+                    name		: 'System Message Attachments',
+                    desc		: 'File attachments to messages',
+                    storageTags	: [ 'sys_msg_attach' ],
+                },
 
-				system_temporary_download : {
-					name		: 'System Temporary Downloads',
-					desc		: 'Temporary downloadables',
-					storageTags	: [ 'sys_temp_download' ],
-				}
-			}
-		},
+                system_temporary_download : {
+                    name		: 'System Temporary Downloads',
+                    desc		: 'Temporary downloadables',
+                    storageTags	: [ 'sys_temp_download' ],
+                }
+            }
+        },
 
-		eventScheduler : {
+        eventScheduler : {
 
-			events : {
-				trimMessageAreas : {
-					//	may optionally use [or ]@watch:/path/to/file
-					schedule	: 'every 24 hours',
+            events : {
+                trimMessageAreas : {
+                    //	may optionally use [or ]@watch:/path/to/file
+                    schedule	: 'every 24 hours',
 
-					//	action:
-					//	- @method:path/to/module.js:theMethodName
-					//	  (path is relative to engima base dir)
-					//
-					//	- @execute:/path/to/something/executable.sh
-					//
-					action		: '@method:core/message_area.js:trimMessageAreasScheduledEvent',
-				},
+                    //	action:
+                    //	- @method:path/to/module.js:theMethodName
+                    //	  (path is relative to engima base dir)
+                    //
+                    //	- @execute:/path/to/something/executable.sh
+                    //
+                    action		: '@method:core/message_area.js:trimMessageAreasScheduledEvent',
+                },
 
-				updateFileAreaStats : {
-					schedule	: 'every 1 hours',
-					action		: '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
-				},
+                updateFileAreaStats : {
+                    schedule	: 'every 1 hours',
+                    action		: '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
+                },
 
-				forgotPasswordMaintenance : {
-					schedule	: 'every 24 hours',
-					action		: '@method:core/web_password_reset.js:performMaintenanceTask',
-					args		: [ '24 hours' ]	//	items older than this will be removed
-				},
+                forgotPasswordMaintenance : {
+                    schedule	: 'every 24 hours',
+                    action		: '@method:core/web_password_reset.js:performMaintenanceTask',
+                    args		: [ '24 hours' ]	//	items older than this will be removed
+                },
 
-				//
-				//	Enable the following entry in your config.hjson to periodically create/update
-				//	DESCRIPT.ION files for your file base
-				//
-				/*
+                //
+                //	Enable the following entry in your config.hjson to periodically create/update
+                //	DESCRIPT.ION files for your file base
+                //
+                /*
 				updateDescriptIonFiles : {
 					schedule	: 'on the last day of the week',
 					action		: '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
 				}
 				*/
-			}
-		},
+            }
+        },
 
-		misc : {
-			preAuthIdleLogoutSeconds	: 60 * 3,	//	3m
-			idleLogoutSeconds			: 60 * 6,	//	6m
-		},
+        misc : {
+            preAuthIdleLogoutSeconds	: 60 * 3,	//	3m
+            idleLogoutSeconds			: 60 * 6,	//	6m
+        },
 
-		logging : {
-			level	: 'debug',
+        logging : {
+            level	: 'debug',
 
-			rotatingFile	: {	//	set to 'disabled' or false to disable
-				type		: 'rotating-file',
-				fileName	: 'enigma-bbs.log',
-				period		: '1d',
-				count		: 3,
-				level		: 'debug',
-			}
+            rotatingFile	: {	//	set to 'disabled' or false to disable
+                type		: 'rotating-file',
+                fileName	: 'enigma-bbs.log',
+                period		: '1d',
+                count		: 3,
+                level		: 'debug',
+            }
 
-			//	:TODO: syslog - https://github.com/mcavage/node-bunyan-syslog
-		},
+            //	:TODO: syslog - https://github.com/mcavage/node-bunyan-syslog
+        },
 
-		debug : {
-			assertsEnabled	: false,
-		}
-	};
+        debug : {
+            assertsEnabled	: false,
+        }
+    };
 }
diff --git a/core/config_cache.js b/core/config_cache.js
index 4a1d1c5a..15143efc 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -9,64 +9,64 @@ const sane				= require('sane');
 
 module.exports = new class ConfigCache
 {
-	constructor() {
-		this.cache		= new Map();	//	path->parsed config
-	}
+    constructor() {
+        this.cache		= new Map();	//	path->parsed config
+    }
 
-	getConfigWithOptions(options, cb) {
-		const cached = this.cache.has(options.filePath);
+    getConfigWithOptions(options, cb) {
+        const cached = this.cache.has(options.filePath);
 
-		if(options.forceReCache || !cached) {
-			this.recacheConfigFromFile(options.filePath, (err, config) => {
-				if(!err && !cached) {
-					if(!options.noWatch) {
-						const watcher = sane(
-							paths.dirname(options.filePath),
-							{
-								glob : `**/${paths.basename(options.filePath)}`
-							}
-						);
+        if(options.forceReCache || !cached) {
+            this.recacheConfigFromFile(options.filePath, (err, config) => {
+                if(!err && !cached) {
+                    if(!options.noWatch) {
+                        const watcher = sane(
+                            paths.dirname(options.filePath),
+                            {
+                                glob : `**/${paths.basename(options.filePath)}`
+                            }
+                        );
 
-						watcher.on('change', (fileName, fileRoot) => {
-							require('./logger.js').log.info( { fileName, fileRoot }, 'Configuration file changed; re-caching');
+                        watcher.on('change', (fileName, fileRoot) => {
+                            require('./logger.js').log.info( { fileName, fileRoot }, 'Configuration file changed; re-caching');
 
-							this.recacheConfigFromFile(paths.join(fileRoot, fileName), err => {
-								if(!err) {
-									if(options.callback) {
-										options.callback( { fileName, fileRoot } );
-									}
-								}
-							});
-						});
-					}
-				}
-				return cb(err, config, true);
-			});
-		} else {
-			return cb(null, this.cache.get(options.filePath), false);
-		}
-	}
+                            this.recacheConfigFromFile(paths.join(fileRoot, fileName), err => {
+                                if(!err) {
+                                    if(options.callback) {
+                                        options.callback( { fileName, fileRoot } );
+                                    }
+                                }
+                            });
+                        });
+                    }
+                }
+                return cb(err, config, true);
+            });
+        } else {
+            return cb(null, this.cache.get(options.filePath), false);
+        }
+    }
 
-	getConfig(filePath, cb) {
-		return this.getConfigWithOptions( { filePath }, cb);
-	}
+    getConfig(filePath, cb) {
+        return this.getConfigWithOptions( { filePath }, cb);
+    }
 
-	recacheConfigFromFile(path, cb) {
-		fs.readFile(path, { encoding : 'utf-8' }, (err, data) => {
-			if(err) {
-				return cb(err);
-			}
+    recacheConfigFromFile(path, cb) {
+        fs.readFile(path, { encoding : 'utf-8' }, (err, data) => {
+            if(err) {
+                return cb(err);
+            }
 
-			let parsed;
-			try {
-				parsed = hjson.parse(data);
-				this.cache.set(path, parsed);
-			} catch(e) {
-				require('./logger.js').log.error( { filePath : path, error : e.message }, 'Failed to re-cache' );
-				return cb(e);
-			}
+            let parsed;
+            try {
+                parsed = hjson.parse(data);
+                this.cache.set(path, parsed);
+            } catch(e) {
+                require('./logger.js').log.error( { filePath : path, error : e.message }, 'Failed to re-cache' );
+                return cb(e);
+            }
 
-			return cb(null, parsed);
-		});
-	}
+            return cb(null, parsed);
+        });
+    }
 };
diff --git a/core/config_util.js b/core/config_util.js
index 4b7ce5ed..1c61162c 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -13,54 +13,54 @@ exports.init			= init;
 exports.getFullConfig	= getFullConfig;
 
 function getConfigPath(filePath) {
-	//	|filePath| is assumed to be in the config path if it's only a file name
-	if('.' === paths.dirname(filePath)) {
-		filePath = paths.join(Config().paths.config, filePath);
-	}
-	return filePath;
+    //	|filePath| is assumed to be in the config path if it's only a file name
+    if('.' === paths.dirname(filePath)) {
+        filePath = paths.join(Config().paths.config, filePath);
+    }
+    return filePath;
 }
 
 function init(cb) {
-	//	pre-cache menu.hjson and prompt.hjson + establish events
-	const changed = ( { fileName, fileRoot } ) => {
-		const reCachedPath = paths.join(fileRoot, fileName);
-		if(reCachedPath === getConfigPath(Config().general.menuFile)) {
-			Events.emit(Events.getSystemEvents().MenusChanged);
-		} else if(reCachedPath === getConfigPath(Config().general.promptFile)) {
-			Events.emit(Events.getSystemEvents().PromptsChanged);
-		}
-	};
+    //	pre-cache menu.hjson and prompt.hjson + establish events
+    const changed = ( { fileName, fileRoot } ) => {
+        const reCachedPath = paths.join(fileRoot, fileName);
+        if(reCachedPath === getConfigPath(Config().general.menuFile)) {
+            Events.emit(Events.getSystemEvents().MenusChanged);
+        } else if(reCachedPath === getConfigPath(Config().general.promptFile)) {
+            Events.emit(Events.getSystemEvents().PromptsChanged);
+        }
+    };
 
-	const config = Config();
-	async.series(
-		[
-			function menu(callback) {
-				return ConfigCache.getConfigWithOptions(
-					{
-						filePath : getConfigPath(config.general.menuFile),
-						callback : changed,
-					},
-					callback
-				);
-			},
-			function prompt(callback) {
-				return ConfigCache.getConfigWithOptions(
-					{
-						filePath : getConfigPath(config.general.promptFile),
-						callback : changed,
-					},
-					callback
-				);
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+    const config = Config();
+    async.series(
+        [
+            function menu(callback) {
+                return ConfigCache.getConfigWithOptions(
+                    {
+                        filePath : getConfigPath(config.general.menuFile),
+                        callback : changed,
+                    },
+                    callback
+                );
+            },
+            function prompt(callback) {
+                return ConfigCache.getConfigWithOptions(
+                    {
+                        filePath : getConfigPath(config.general.promptFile),
+                        callback : changed,
+                    },
+                    callback
+                );
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function getFullConfig(filePath, cb) {
-	ConfigCache.getConfig(getConfigPath(filePath), (err, config) => {
-		return cb(err, config);
-	});
+    ConfigCache.getConfig(getConfigPath(filePath), (err, config) => {
+        return cb(err, config);
+    });
 }
diff --git a/core/connect.js b/core/connect.js
index 51ee4e37..86cf3833 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -11,177 +11,177 @@ const async		= require('async');
 exports.connectEntry	= connectEntry;
 
 function ansiDiscoverHomePosition(client, cb) {
-	//
-	//	We want to find the home position. ANSI-BBS and most terminals
-	//	utilize 1,1 as home. However, some terminals such as ConnectBot
-	//	think of home as 0,0. If this is the case, we need to offset
-	//	our positioning to accomodate for such.
-	//
-	const done = function(err) {
-		client.removeListener('cursor position report', cprListener);
-		clearTimeout(giveUpTimer);
-		return cb(err);
-	};
+    //
+    //	We want to find the home position. ANSI-BBS and most terminals
+    //	utilize 1,1 as home. However, some terminals such as ConnectBot
+    //	think of home as 0,0. If this is the case, we need to offset
+    //	our positioning to accomodate for such.
+    //
+    const done = function(err) {
+        client.removeListener('cursor position report', cprListener);
+        clearTimeout(giveUpTimer);
+        return cb(err);
+    };
 
-	const cprListener = function(pos) {
-		const h = pos[0];
-		const w = pos[1];
+    const cprListener = function(pos) {
+        const h = pos[0];
+        const w = pos[1];
 
-		//
-		//	We expect either 0,0, or 1,1. Anything else will be filed as bad data
-		//
-		if(h > 1 || w > 1) {
-			client.log.warn( { height : h, width : w }, 'Ignoring ANSI home position CPR due to unexpected values');
-			return done(new Error('Home position CPR expected to be 0,0, or 1,1'));
-		}
+        //
+        //	We expect either 0,0, or 1,1. Anything else will be filed as bad data
+        //
+        if(h > 1 || w > 1) {
+            client.log.warn( { height : h, width : w }, 'Ignoring ANSI home position CPR due to unexpected values');
+            return done(new Error('Home position CPR expected to be 0,0, or 1,1'));
+        }
 
-		if(0 === h & 0 === w) {
-			//
-			//	Store a CPR offset in the client. All CPR's from this point on will offset by this amount
-			//
-			client.log.info('Setting CPR offset to 1');
-			client.cprOffset = 1;
-		}
+        if(0 === h & 0 === w) {
+            //
+            //	Store a CPR offset in the client. All CPR's from this point on will offset by this amount
+            //
+            client.log.info('Setting CPR offset to 1');
+            client.cprOffset = 1;
+        }
 
-		return done(null);
-	};
+        return done(null);
+    };
 
-	client.once('cursor position report', cprListener);
+    client.once('cursor position report', cprListener);
 
-	const giveUpTimer = setTimeout( () => {
-		return done(new Error('Giving up on home position CPR'));
-	}, 3000);	//	3s
+    const giveUpTimer = setTimeout( () => {
+        return done(new Error('Giving up on home position CPR'));
+    }, 3000);	//	3s
 
-	client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);	//	go home, query pos
+    client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);	//	go home, query pos
 }
 
 function ansiQueryTermSizeIfNeeded(client, cb) {
-	if(client.term.termHeight > 0 || client.term.termWidth > 0) {
-		return cb(null);
-	}
+    if(client.term.termHeight > 0 || client.term.termWidth > 0) {
+        return cb(null);
+    }
 
-	const done = function(err) {
-		client.removeListener('cursor position report', cprListener);
-		clearTimeout(giveUpTimer);
-		return cb(err);
-	};
+    const done = function(err) {
+        client.removeListener('cursor position report', cprListener);
+        clearTimeout(giveUpTimer);
+        return cb(err);
+    };
 
-	const cprListener = function(pos) {
-		//
-		//	If we've already found out, disregard
-		//
-		if(client.term.termHeight > 0 || client.term.termWidth > 0) {
-			return done(null);
-		}
+    const cprListener = function(pos) {
+        //
+        //	If we've already found out, disregard
+        //
+        if(client.term.termHeight > 0 || client.term.termWidth > 0) {
+            return done(null);
+        }
 
-		const h = pos[0];
-		const w = pos[1];
+        const h = pos[0];
+        const w = pos[1];
 
-		//
-		//	Netrunner for example gives us 1x1 here. Not really useful. Ignore
-		//	values that seem obviously bad.
-		//
-		if(h < 10 || w < 10) {
-			client.log.warn(
-				{ height : h, width : w },
-				'Ignoring ANSI CPR screen size query response due to very small values');
-			return done(new Error('Term size <= 10 considered invalid'));
-		}
+        //
+        //	Netrunner for example gives us 1x1 here. Not really useful. Ignore
+        //	values that seem obviously bad.
+        //
+        if(h < 10 || w < 10) {
+            client.log.warn(
+                { height : h, width : w },
+                'Ignoring ANSI CPR screen size query response due to very small values');
+            return done(new Error('Term size <= 10 considered invalid'));
+        }
 
-		client.term.termHeight	= h;
-		client.term.termWidth	= w;
+        client.term.termHeight	= h;
+        client.term.termWidth	= w;
 
-		client.log.debug(
-			{
-				termWidth	: client.term.termWidth,
-				termHeight	: client.term.termHeight,
-				source		: 'ANSI CPR'
-			},
-			'Window size updated'
-		);
+        client.log.debug(
+            {
+                termWidth	: client.term.termWidth,
+                termHeight	: client.term.termHeight,
+                source		: 'ANSI CPR'
+            },
+            'Window size updated'
+        );
 
-		return done(null);
-	};
+        return done(null);
+    };
 
-	client.once('cursor position report', cprListener);
+    client.once('cursor position report', cprListener);
 
-	//	give up after 2s
-	const giveUpTimer = setTimeout( () => {
-		return done(new Error('No term size established by CPR within timeout'));
-	}, 2000);
+    //	give up after 2s
+    const giveUpTimer = setTimeout( () => {
+        return done(new Error('No term size established by CPR within timeout'));
+    }, 2000);
 
-	//	Start the process: Query for CPR
-	client.term.rawWrite(ansi.queryScreenSize());
+    //	Start the process: Query for CPR
+    client.term.rawWrite(ansi.queryScreenSize());
 }
 
 function prepareTerminal(term) {
-	term.rawWrite(ansi.normal());
-	//term.rawWrite(ansi.disableVT100LineWrapping());
-	//	:TODO: set xterm stuff -- see x84/others
+    term.rawWrite(ansi.normal());
+    //term.rawWrite(ansi.disableVT100LineWrapping());
+    //	:TODO: set xterm stuff -- see x84/others
 }
 
 function displayBanner(term) {
-	//	note: intentional formatting:
-	term.pipeWrite(`
+    //	note: intentional formatting:
+    term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
 |06Copyright (c) 2014-2018 Bryan Ashby |14- |12http://l33t.codes/
 |06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/
 |00`
-	);
+    );
 }
 
 function connectEntry(client, nextMenu) {
-	const term = client.term;
+    const term = client.term;
 
-	async.series(
-		[
-			function basicPrepWork(callback) {
-				term.rawWrite(ansi.queryDeviceAttributes(0));
-				return callback(null);
-			},
-			function discoverHomePosition(callback) {
-				ansiDiscoverHomePosition(client, () => {
-					//	:TODO: If CPR for home fully fails, we should bail out on the connection with an error, e.g. ANSI support required
-					return callback(null);	//	we try to continue anyway
-				});
-			},
-			function queryTermSizeByNonStandardAnsi(callback) {
-				ansiQueryTermSizeIfNeeded(client, err => {
-					if(err) {
-						//
-						//	Check again; We may have got via NAWS/similar before CPR completed.
-						//
-						if(0 === term.termHeight || 0 === term.termWidth) {
-							//
-							//	We still don't have something good for term height/width.
-							//	Default to DOS size 80x25.
-							//
-							//	:TODO: Netrunner is currenting hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
-							client.log.warn( { reason : err.message }, 'Failed to negotiate term size; Defaulting to 80x25!');
+    async.series(
+        [
+            function basicPrepWork(callback) {
+                term.rawWrite(ansi.queryDeviceAttributes(0));
+                return callback(null);
+            },
+            function discoverHomePosition(callback) {
+                ansiDiscoverHomePosition(client, () => {
+                    //	:TODO: If CPR for home fully fails, we should bail out on the connection with an error, e.g. ANSI support required
+                    return callback(null);	//	we try to continue anyway
+                });
+            },
+            function queryTermSizeByNonStandardAnsi(callback) {
+                ansiQueryTermSizeIfNeeded(client, err => {
+                    if(err) {
+                        //
+                        //	Check again; We may have got via NAWS/similar before CPR completed.
+                        //
+                        if(0 === term.termHeight || 0 === term.termWidth) {
+                            //
+                            //	We still don't have something good for term height/width.
+                            //	Default to DOS size 80x25.
+                            //
+                            //	:TODO: Netrunner is currenting hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
+                            client.log.warn( { reason : err.message }, 'Failed to negotiate term size; Defaulting to 80x25!');
 
-							term.termHeight	= 25;
-							term.termWidth	= 80;
-						}
-					}
+                            term.termHeight	= 25;
+                            term.termWidth	= 80;
+                        }
+                    }
 
-					return callback(null);
-				});
-			},
-		],
-		() => {
-			prepareTerminal(term);
+                    return callback(null);
+                });
+            },
+        ],
+        () => {
+            prepareTerminal(term);
 
-			//
-			//	Always show an ENiGMA½ banner
-			//
-			displayBanner(term);
+            //
+            //	Always show an ENiGMA½ banner
+            //
+            displayBanner(term);
 
-			// fire event
-			Events.emit(Events.getSystemEvents().TermDetected, { client : client } );
+            // fire event
+            Events.emit(Events.getSystemEvents().TermDetected, { client : client } );
 
-			setTimeout( () => {
-				return client.menuStack.goto(nextMenu);
-			}, 500);
-		}
-	);
+            setTimeout( () => {
+                return client.menuStack.goto(nextMenu);
+            }, 500);
+        }
+    );
 }
diff --git a/core/crc.js b/core/crc.js
index d110807b..d7974c66 100644
--- a/core/crc.js
+++ b/core/crc.js
@@ -2,90 +2,90 @@
 'use strict';
 
 const CRC32_TABLE = new Int32Array([
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535,
-	0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd,
-	0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
-	0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-	0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-	0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-	0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac,
-	0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-	0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
-	0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-	0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
-	0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
-	0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce,
-	0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-	0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-	0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409,
-	0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739,
-	0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268,
-	0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
-	0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
-	0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-	0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
-	0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
-	0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-	0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae,
-	0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6,
-	0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-	0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
-	0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5,
-	0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-	0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535,
+    0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd,
+    0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
+    0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+    0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac,
+    0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
+    0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
+    0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
+    0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce,
+    0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409,
+    0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739,
+    0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268,
+    0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
+    0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
+    0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
+    0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
+    0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+    0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae,
+    0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6,
+    0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
+    0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5,
+    0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 ]);
 
 exports.CRC32 = class CRC32 {
-	constructor() {
-		this.crc = -1;
-	}
+    constructor() {
+        this.crc = -1;
+    }
 
-	update(input) {
-		input = Buffer.isBuffer(input) ? input : Buffer.from(input, 'binary');
-		return input.length > 10240 ? this.update_8(input) : this.update_4(input);
-	}
+    update(input) {
+        input = Buffer.isBuffer(input) ? input : Buffer.from(input, 'binary');
+        return input.length > 10240 ? this.update_8(input) : this.update_4(input);
+    }
 
-	update_4(input) {
-		const len	= input.length - 3;
-		let i		= 0;
+    update_4(input) {
+        const len	= input.length - 3;
+        let i		= 0;
 
-		for(i = 0; i < len;) {
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-		}
-		while(i < len + 3) {
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++] ) & 0xff ];
-		}
-	}
+        for(i = 0; i < len;) {
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+        }
+        while(i < len + 3) {
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++] ) & 0xff ];
+        }
+    }
 
-	update_8(input) {
-		const len	= input.length - 7;
-		let i		= 0;
+    update_8(input) {
+        const len	= input.length - 7;
+        let i		= 0;
 
-		for(i = 0; i < len;) {
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
-		}
-		while(i < len + 7) {
-			this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++] ) & 0xff ];
-		}
-	}
+        for(i = 0; i < len;) {
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
+        }
+        while(i < len + 7) {
+            this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++] ) & 0xff ];
+        }
+    }
 
-	finalize() {
-		return (this.crc ^ (-1)) >>> 0;
-	}
+    finalize() {
+        return (this.crc ^ (-1)) >>> 0;
+    }
 };
diff --git a/core/database.js b/core/database.js
index 0998f738..3ce2e031 100644
--- a/core/database.js
+++ b/core/database.js
@@ -25,98 +25,98 @@ exports.initializeDatabases			= initializeDatabases;
 exports.dbs							= dbs;
 
 function getTransactionDatabase(db) {
-	return sqlite3Trans.wrap(db);
+    return sqlite3Trans.wrap(db);
 }
 
 function getDatabasePath(name) {
-	return paths.join(conf.config.paths.db, `${name}.sqlite3`);
+    return paths.join(conf.config.paths.db, `${name}.sqlite3`);
 }
 
 function getModDatabasePath(moduleInfo, suffix) {
-	//
-	//	Mods that use a database are stored in Config.paths.modsDb (e.g. enigma-bbs/db/mods)
-	//	We expect that moduleInfo defines packageName which will be the base of the modules
-	//	filename. An optional suffix may be supplied as well.
-	//
-	const HOST_RE = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
+    //
+    //	Mods that use a database are stored in Config.paths.modsDb (e.g. enigma-bbs/db/mods)
+    //	We expect that moduleInfo defines packageName which will be the base of the modules
+    //	filename. An optional suffix may be supplied as well.
+    //
+    const HOST_RE = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
 
-	assert(_.isObject(moduleInfo));
-	assert(_.isString(moduleInfo.packageName), 'moduleInfo must define "packageName"!');
+    assert(_.isObject(moduleInfo));
+    assert(_.isString(moduleInfo.packageName), 'moduleInfo must define "packageName"!');
 
-	let full = moduleInfo.packageName;
-	if(suffix) {
-		full += `.${suffix}`;
-	}
+    let full = moduleInfo.packageName;
+    if(suffix) {
+        full += `.${suffix}`;
+    }
 
-	assert(
-		(full.split('.').length > 1 && HOST_RE.test(full)),
-		'packageName must follow Reverse Domain Name Notation - https://en.wikipedia.org/wiki/Reverse_domain_name_notation');
+    assert(
+        (full.split('.').length > 1 && HOST_RE.test(full)),
+        'packageName must follow Reverse Domain Name Notation - https://en.wikipedia.org/wiki/Reverse_domain_name_notation');
 
-	return paths.join(conf.config.paths.modsDb, `${full}.sqlite3`);
+    return paths.join(conf.config.paths.modsDb, `${full}.sqlite3`);
 }
 
 function getISOTimestampString(ts) {
-	ts = ts || moment();
-	return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+    ts = ts || moment();
+    return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 }
 
 function sanatizeString(s) {
-	return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {	//	eslint-disable-line no-control-regex
-		switch (c) {
-			case '\0'	: return '\\0';
-			case '\x08'	: return '\\b';
-			case '\x09'	: return '\\t';
-			case '\x1a'	: return '\\z';
-			case '\n'	: return '\\n';
-			case '\r'	: return '\\r';
+    return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {	//	eslint-disable-line no-control-regex
+        switch (c) {
+            case '\0'	: return '\\0';
+            case '\x08'	: return '\\b';
+            case '\x09'	: return '\\t';
+            case '\x1a'	: return '\\z';
+            case '\n'	: return '\\n';
+            case '\r'	: return '\\r';
 
-			case '"' :
-			case '\'' :
-				return `${c}${c}`;
+            case '"' :
+            case '\'' :
+                return `${c}${c}`;
 
-			case '\\' :
-			case '%' :
-				return `\\${c}`;
-		}
-	});
+            case '\\' :
+            case '%' :
+                return `\\${c}`;
+        }
+    });
 }
 
 function initializeDatabases(cb) {
-	async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
-		dbs[dbName] = sqlite3Trans.wrap(new sqlite3.Database(getDatabasePath(dbName), err => {
-			if(err) {
-				return cb(err);
-			}
+    async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
+        dbs[dbName] = sqlite3Trans.wrap(new sqlite3.Database(getDatabasePath(dbName), err => {
+            if(err) {
+                return cb(err);
+            }
 
-			dbs[dbName].serialize( () => {
-				DB_INIT_TABLE[dbName]( () => {
-					return next(null);
-				});
-			});
-		}));
-	}, err => {
-		return cb(err);
-	});
+            dbs[dbName].serialize( () => {
+                DB_INIT_TABLE[dbName]( () => {
+                    return next(null);
+                });
+            });
+        }));
+    }, err => {
+        return cb(err);
+    });
 }
 
 function enableForeignKeys(db) {
-	db.run('PRAGMA foreign_keys = ON;');
+    db.run('PRAGMA foreign_keys = ON;');
 }
 
 const DB_INIT_TABLE = {
-	system : (cb) => {
-		enableForeignKeys(dbs.system);
+    system : (cb) => {
+        enableForeignKeys(dbs.system);
 
-		//	Various stat/event logging - see stat_log.js
-		dbs.system.run(
-			`CREATE TABLE IF NOT EXISTS system_stat (
+        //	Various stat/event logging - see stat_log.js
+        dbs.system.run(
+            `CREATE TABLE IF NOT EXISTS system_stat (
 				stat_name		VARCHAR PRIMARY KEY NOT NULL,
 				stat_value		VARCHAR NOT NULL
 			);`
-		);
+        );
 
-		dbs.system.run(
-			`CREATE TABLE IF NOT EXISTS system_event_log (
+        dbs.system.run(
+            `CREATE TABLE IF NOT EXISTS system_event_log (
 				id				INTEGER PRIMARY KEY,
 				timestamp		DATETIME NOT NULL,
 				log_name		VARCHAR NOT NULL,
@@ -124,10 +124,10 @@ const DB_INIT_TABLE = {
 
 				UNIQUE(timestamp, log_name)
 			);`
-		);
+        );
 
-		dbs.system.run(
-			`CREATE TABLE IF NOT EXISTS user_event_log (
+        dbs.system.run(
+            `CREATE TABLE IF NOT EXISTS user_event_log (
 				id				INTEGER PRIMARY KEY,
 				timestamp		DATETIME NOT NULL,
 				user_id			INTEGER NOT NULL,
@@ -136,58 +136,58 @@ const DB_INIT_TABLE = {
 
 				UNIQUE(timestamp, user_id, log_name)
 			);`
-		);
+        );
 
-		return cb(null);
-	},
+        return cb(null);
+    },
 
-	user : (cb) => {
-		enableForeignKeys(dbs.user);
+    user : (cb) => {
+        enableForeignKeys(dbs.user);
 
-		dbs.user.run(
-			`CREATE TABLE IF NOT EXISTS user ( 
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user ( 
 				id			INTEGER PRIMARY KEY,
 				user_name	VARCHAR NOT NULL, 
 				UNIQUE(user_name)
 			);`
-		);
+        );
 
-		//	:TODO: create FK on delete/etc.
+        //	:TODO: create FK on delete/etc.
 
-		dbs.user.run(
-			`CREATE TABLE IF NOT EXISTS user_property (
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user_property (
 				user_id		INTEGER NOT NULL,
 				prop_name	VARCHAR NOT NULL,
 				prop_value	VARCHAR,
 				UNIQUE(user_id, prop_name),
 				FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE 
 			);`
-		);
+        );
 
-		dbs.user.run(
-			`CREATE TABLE IF NOT EXISTS user_group_member ( 
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user_group_member ( 
 				group_name	VARCHAR NOT NULL, 
 				user_id		INTEGER NOT NULL,
 				UNIQUE(group_name, user_id)
 			);`
-		);
+        );
 
-		dbs.user.run(
-			`CREATE TABLE IF NOT EXISTS user_login_history (	
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user_login_history (	
 				user_id		INTEGER NOT NULL,
 				user_name	VARCHAR NOT NULL,
 				timestamp	DATETIME NOT NULL
 			);`
-		);
+        );
 
-		return cb(null);
-	},
+        return cb(null);
+    },
 
-	message : (cb) => {
-		enableForeignKeys(dbs.message);
+    message : (cb) => {
+        enableForeignKeys(dbs.message);
 
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS message (
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS message (
 				message_id				INTEGER PRIMARY KEY, 
 				area_tag				VARCHAR NOT NULL,
 				message_uuid			VARCHAR(36) NOT NULL, 
@@ -200,47 +200,47 @@ const DB_INIT_TABLE = {
 				view_count				INTEGER NOT NULL DEFAULT 0,
 				UNIQUE(message_uuid) 
 			);`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE INDEX IF NOT EXISTS message_by_area_tag_index
+        dbs.message.run(
+            `CREATE INDEX IF NOT EXISTS message_by_area_tag_index
 			ON message (area_tag);`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE VIRTUAL TABLE IF NOT EXISTS message_fts USING fts4 (
+        dbs.message.run(
+            `CREATE VIRTUAL TABLE IF NOT EXISTS message_fts USING fts4 (
 				content="message",
 				subject,
 				message
 			);`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TRIGGER IF NOT EXISTS message_before_update BEFORE UPDATE ON message BEGIN
+        dbs.message.run(
+            `CREATE TRIGGER IF NOT EXISTS message_before_update BEFORE UPDATE ON message BEGIN
 				DELETE FROM message_fts WHERE docid=old.rowid;
 			END;`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TRIGGER IF NOT EXISTS message_before_delete BEFORE DELETE ON message BEGIN
+        dbs.message.run(
+            `CREATE TRIGGER IF NOT EXISTS message_before_delete BEFORE DELETE ON message BEGIN
 				DELETE FROM message_fts WHERE docid=old.rowid;
 			END;`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TRIGGER IF NOT EXISTS message_after_update AFTER UPDATE ON message BEGIN
+        dbs.message.run(
+            `CREATE TRIGGER IF NOT EXISTS message_after_update AFTER UPDATE ON message BEGIN
 				INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
 			END;`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TRIGGER IF NOT EXISTS message_after_insert AFTER INSERT ON message BEGIN
+        dbs.message.run(
+            `CREATE TRIGGER IF NOT EXISTS message_after_insert AFTER INSERT ON message BEGIN
 				INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
 			END;`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS message_meta (
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS message_meta (
 				message_id		INTEGER NOT NULL,
 				meta_category	INTEGER NOT NULL,
 				meta_name		VARCHAR NOT NULL,
@@ -248,11 +248,11 @@ const DB_INIT_TABLE = {
 				UNIQUE(message_id, meta_category, meta_name, meta_value), 
 				FOREIGN KEY(message_id) REFERENCES message(message_id) ON DELETE CASCADE
 			);`
-		);
+        );
 
 
-		//	:TODO: need SQL to ensure cleaned up if delete from message?
-		/*
+        //	:TODO: need SQL to ensure cleaned up if delete from message?
+        /*
 		dbs.message.run(
 			`CREATE TABLE IF NOT EXISTS hash_tag (
 				hash_tag_id		INTEGER PRIMARY KEY,
@@ -270,33 +270,33 @@ const DB_INIT_TABLE = {
 		);
 		*/
 
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS user_message_area_last_read (
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS user_message_area_last_read (
 				user_id		INTEGER NOT NULL,
 				area_tag	VARCHAR NOT NULL,
 				message_id	INTEGER NOT NULL,
 				UNIQUE(user_id, area_tag)
 			);`
-		);
+        );
 
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS message_area_last_scan (
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS message_area_last_scan (
 				scan_toss		VARCHAR NOT NULL,
 				area_tag		VARCHAR NOT NULL,
 				message_id		INTEGER NOT NULL,
 				UNIQUE(scan_toss, area_tag)
 			);`
-		);
+        );
 
-		return cb(null);
-	},
+        return cb(null);
+    },
 
-	file : (cb) => {
-		enableForeignKeys(dbs.file);
+    file : (cb) => {
+        enableForeignKeys(dbs.file);
 
-		dbs.file.run(
-			//	:TODO: should any of this be unique -- file_sha256 unless dupes are allowed on the system
-			`CREATE TABLE IF NOT EXISTS file (
+        dbs.file.run(
+            //	:TODO: should any of this be unique -- file_sha256 unless dupes are allowed on the system
+            `CREATE TABLE IF NOT EXISTS file (
 				file_id				INTEGER PRIMARY KEY,
 				area_tag			VARCHAR NOT NULL,
 				file_sha256			VARCHAR NOT NULL,
@@ -306,105 +306,105 @@ const DB_INIT_TABLE = {
 				desc_long,			/* FTS @ file_fts */				
 				upload_timestamp	DATETIME NOT NULL
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE INDEX IF NOT EXISTS file_by_area_tag_index
+        dbs.file.run(
+            `CREATE INDEX IF NOT EXISTS file_by_area_tag_index
 			ON file (area_tag);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE INDEX IF NOT EXISTS file_by_sha256_index
+        dbs.file.run(
+            `CREATE INDEX IF NOT EXISTS file_by_sha256_index
 			ON file (file_sha256);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE VIRTUAL TABLE IF NOT EXISTS file_fts USING fts4 (
+        dbs.file.run(
+            `CREATE VIRTUAL TABLE IF NOT EXISTS file_fts USING fts4 (
 				content="file",
 				file_name,
 				desc,
 				desc_long
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TRIGGER IF NOT EXISTS file_before_update BEFORE UPDATE ON file BEGIN
+        dbs.file.run(
+            `CREATE TRIGGER IF NOT EXISTS file_before_update BEFORE UPDATE ON file BEGIN
 				DELETE FROM file_fts WHERE docid=old.rowid;
 			END;`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TRIGGER IF NOT EXISTS file_before_delete BEFORE DELETE ON file BEGIN
+        dbs.file.run(
+            `CREATE TRIGGER IF NOT EXISTS file_before_delete BEFORE DELETE ON file BEGIN
 				DELETE FROM file_fts WHERE docid=old.rowid;
 			END;`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TRIGGER IF NOT EXISTS file_after_update AFTER UPDATE ON file BEGIN
+        dbs.file.run(
+            `CREATE TRIGGER IF NOT EXISTS file_after_update AFTER UPDATE ON file BEGIN
 				INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
 			END;`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TRIGGER IF NOT EXISTS file_after_insert AFTER INSERT ON file BEGIN
+        dbs.file.run(
+            `CREATE TRIGGER IF NOT EXISTS file_after_insert AFTER INSERT ON file BEGIN
 				INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
 			END;`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS file_meta (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS file_meta (
 				file_id			INTEGER NOT NULL,
 				meta_name		VARCHAR NOT NULL,
 				meta_value		VARCHAR NOT NULL,
 				UNIQUE(file_id, meta_name, meta_value), 
 				FOREIGN KEY(file_id) REFERENCES file(file_id) ON DELETE CASCADE
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS hash_tag (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS hash_tag (
 				hash_tag_id		INTEGER PRIMARY KEY,
 				hash_tag		VARCHAR NOT NULL,
 			
 				UNIQUE(hash_tag)
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS file_hash_tag (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS file_hash_tag (
 				hash_tag_id		INTEGER NOT NULL,
 				file_id			INTEGER NOT NULL,
 			
 				UNIQUE(hash_tag_id, file_id)
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS file_user_rating (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS file_user_rating (
 				file_id			INTEGER NOT NULL,
 				user_id			INTEGER NOT NULL,
 				rating			INTEGER NOT NULL,
 
 				UNIQUE(file_id, user_id)
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS file_web_serve (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS file_web_serve (
 				hash_id				VARCHAR NOT NULL PRIMARY KEY,
 				expire_timestamp	DATETIME NOT NULL
 			);`
-		);
+        );
 
-		dbs.file.run(
-			`CREATE TABLE IF NOT EXISTS file_web_serve_batch (
+        dbs.file.run(
+            `CREATE TABLE IF NOT EXISTS file_web_serve_batch (
 				hash_id		VARCHAR NOT NULL,
 				file_id		INTEGER NOT NULL,
 
 				UNIQUE(hash_id, file_id)
 			);`
-		);
+        );
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 };
\ No newline at end of file
diff --git a/core/descript_ion_file.js b/core/descript_ion_file.js
index 8f2bc1b3..1ead544f 100644
--- a/core/descript_ion_file.js
+++ b/core/descript_ion_file.js
@@ -7,66 +7,66 @@ const iconv			= require('iconv-lite');
 const async			= require('async');
 
 module.exports = class DescriptIonFile {
-	constructor() {
-		this.entries = new Map();
-	}
+    constructor() {
+        this.entries = new Map();
+    }
 
-	get(fileName) {
-		return this.entries.get(fileName);
-	}
+    get(fileName) {
+        return this.entries.get(fileName);
+    }
 
-	getDescription(fileName) {
-		const entry = this.get(fileName);
-		if(entry) {
-			return entry.desc;
-		}
-	}
+    getDescription(fileName) {
+        const entry = this.get(fileName);
+        if(entry) {
+            return entry.desc;
+        }
+    }
 
-	static createFromFile(path, cb) {
-		fs.readFile(path, (err, descData) => {
-			if(err) {
-				return cb(err);
-			}
+    static createFromFile(path, cb) {
+        fs.readFile(path, (err, descData) => {
+            if(err) {
+                return cb(err);
+            }
 
-			const descIonFile = new DescriptIonFile();
+            const descIonFile = new DescriptIonFile();
 
-			//	DESCRIPT.ION entries are terminated with a CR and/or LF
-			const lines = iconv.decode(descData, 'cp437').split(/\r?\n/g);
+            //	DESCRIPT.ION entries are terminated with a CR and/or LF
+            const lines = iconv.decode(descData, 'cp437').split(/\r?\n/g);
 
-			async.each(lines, (entryData, nextLine) => {
-				//
-				//	We allow quoted (long) filenames or non-quoted filenames.
-				//	FILENAME<SPC>DESC<0x04><program data><CR/LF>
-				//
-				const parts = entryData.match(/^(?:(?:"([^"]+)" )|(?:([^ ]+) ))([^\x04]+)\x04(.)[^\r\n]*$/);	//	eslint-disable-line no-control-regex
-				if(!parts) {
-					return nextLine(null);
-				}
+            async.each(lines, (entryData, nextLine) => {
+                //
+                //	We allow quoted (long) filenames or non-quoted filenames.
+                //	FILENAME<SPC>DESC<0x04><program data><CR/LF>
+                //
+                const parts = entryData.match(/^(?:(?:"([^"]+)" )|(?:([^ ]+) ))([^\x04]+)\x04(.)[^\r\n]*$/);	//	eslint-disable-line no-control-regex
+                if(!parts) {
+                    return nextLine(null);
+                }
 
-				const fileName	= parts[1] || parts[2];
+                const fileName	= parts[1] || parts[2];
 
-				//
-				//	Un-escape CR/LF's
-				//	- escapped \r and/or \n
-				//	- BBBS style @n - See https://www.bbbs.net/sysop.html
-				//
-				const desc		= parts[3].replace(/\\r\\n|\\n|[^@]@n/g, '\r\n');
+                //
+                //	Un-escape CR/LF's
+                //	- escapped \r and/or \n
+                //	- BBBS style @n - See https://www.bbbs.net/sysop.html
+                //
+                const desc		= parts[3].replace(/\\r\\n|\\n|[^@]@n/g, '\r\n');
 
-				descIonFile.entries.set(
-					fileName,
-					{
-						desc		: desc,
-						programId	: parts[4],
-						programData	: parts[5],
-					}
-				);
+                descIonFile.entries.set(
+                    fileName,
+                    {
+                        desc		: desc,
+                        programId	: parts[4],
+                        programData	: parts[5],
+                    }
+                );
 
-				return nextLine(null);
-			},
-			() => {
-				return cb(null, descIonFile);
-			});
-		});
-	}
+                return nextLine(null);
+            },
+            () => {
+                return cb(null, descIonFile);
+            });
+        });
+    }
 };
 
diff --git a/core/door.js b/core/door.js
index 58c8effa..06a10f60 100644
--- a/core/door.js
+++ b/core/door.js
@@ -13,137 +13,137 @@ const createServer	= require('net').createServer;
 exports.Door		= Door;
 
 function Door(client, exeInfo) {
-	events.EventEmitter.call(this);
+    events.EventEmitter.call(this);
 
-	const self 				= this;
-	this.client				= client;
-	this.exeInfo			= exeInfo;
-	this.exeInfo.encoding	= (this.exeInfo.encoding || 'cp437').toLowerCase();
-	let restored			= false;
+    const self 				= this;
+    this.client				= client;
+    this.exeInfo			= exeInfo;
+    this.exeInfo.encoding	= (this.exeInfo.encoding || 'cp437').toLowerCase();
+    let restored			= false;
 
-	//
-	//	Members of exeInfo:
-	//	cmd
-	//	args[]
-	//	env{}
-	//	cwd
-	//	io
-	//	encoding
-	//	dropFile
-	//	node
-	//	inhSocket
-	//
+    //
+    //	Members of exeInfo:
+    //	cmd
+    //	args[]
+    //	env{}
+    //	cwd
+    //	io
+    //	encoding
+    //	dropFile
+    //	node
+    //	inhSocket
+    //
 
-	this.doorDataHandler = function(data) {
-		self.client.term.write(decode(data, self.exeInfo.encoding));
-	};
+    this.doorDataHandler = function(data) {
+        self.client.term.write(decode(data, self.exeInfo.encoding));
+    };
 
-	this.restoreIo = function(piped) {
-		if(!restored && self.client.term.output) {
-			self.client.term.output.unpipe(piped);
-			self.client.term.output.resume();
-			restored = true;
-		}
-	};
+    this.restoreIo = function(piped) {
+        if(!restored && self.client.term.output) {
+            self.client.term.output.unpipe(piped);
+            self.client.term.output.resume();
+            restored = true;
+        }
+    };
 
-	this.prepareSocketIoServer = function(cb) {
-		if('socket' === self.exeInfo.io) {
-			const sockServer =  createServer(conn => {
+    this.prepareSocketIoServer = function(cb) {
+        if('socket' === self.exeInfo.io) {
+            const sockServer =  createServer(conn => {
 
-				sockServer.getConnections( (err, count) => {
+                sockServer.getConnections( (err, count) => {
 
-					//	We expect only one connection from our DOOR/emulator/etc.
-					if(!err && count <= 1) {
-						self.client.term.output.pipe(conn);
+                    //	We expect only one connection from our DOOR/emulator/etc.
+                    if(!err && count <= 1) {
+                        self.client.term.output.pipe(conn);
 
-						conn.on('data', self.doorDataHandler);
+                        conn.on('data', self.doorDataHandler);
 
-						conn.once('end', () => {
-							return self.restoreIo(conn);
-						});
+                        conn.once('end', () => {
+                            return self.restoreIo(conn);
+                        });
 
-						conn.once('error', err => {
-							self.client.log.info( { error : err.toString() }, 'Door socket server connection');
-							return self.restoreIo(conn);
-						});
-					}
-				});
-			});
+                        conn.once('error', err => {
+                            self.client.log.info( { error : err.toString() }, 'Door socket server connection');
+                            return self.restoreIo(conn);
+                        });
+                    }
+                });
+            });
 
-			sockServer.listen(0, () => {
-				return cb(null, sockServer);
-			});
-		} else {
-			return cb(null);
-		}
-	};
+            sockServer.listen(0, () => {
+                return cb(null, sockServer);
+            });
+        } else {
+            return cb(null);
+        }
+    };
 
-	this.doorExited = function() {
-		self.emit('finished');
-	};
+    this.doorExited = function() {
+        self.emit('finished');
+    };
 }
 
 require('util').inherits(Door, events.EventEmitter);
 
 Door.prototype.run = function() {
-	const self = this;
+    const self = this;
 
-	this.prepareSocketIoServer( (err, sockServer) => {
-		if(err) {
-			this.client.log.warn( { error : err.toString() }, 'Failed executing door');
-			return self.doorExited();
-		}
+    this.prepareSocketIoServer( (err, sockServer) => {
+        if(err) {
+            this.client.log.warn( { error : err.toString() }, 'Failed executing door');
+            return self.doorExited();
+        }
 
-		//	Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
-		//	:TODO: Use .map() here
-		let args = _.clone(self.exeInfo.args);	//	we need a copy so the original is not modified
+        //	Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
+        //	:TODO: Use .map() here
+        let args = _.clone(self.exeInfo.args);	//	we need a copy so the original is not modified
 
-		for(let i = 0; i < args.length; ++i) {
-			args[i] = stringFormat(self.exeInfo.args[i], {
-				dropFile		: self.exeInfo.dropFile,
-				node			: self.exeInfo.node.toString(),
-				srvPort			: sockServer ? sockServer.address().port.toString() : '-1',
-				userId			: self.client.user.userId.toString(),
-			});
-		}
+        for(let i = 0; i < args.length; ++i) {
+            args[i] = stringFormat(self.exeInfo.args[i], {
+                dropFile		: self.exeInfo.dropFile,
+                node			: self.exeInfo.node.toString(),
+                srvPort			: sockServer ? sockServer.address().port.toString() : '-1',
+                userId			: self.client.user.userId.toString(),
+            });
+        }
 
-		const door = pty.spawn(self.exeInfo.cmd, args, {
-			cols 		: self.client.term.termWidth,
-			rows		: self.client.term.termHeight,
-			//	:TODO: cwd
-			env			: self.exeInfo.env,
-			encoding	: null,	//	we want to handle all encoding ourself
-		});
+        const door = pty.spawn(self.exeInfo.cmd, args, {
+            cols 		: self.client.term.termWidth,
+            rows		: self.client.term.termHeight,
+            //	:TODO: cwd
+            env			: self.exeInfo.env,
+            encoding	: null,	//	we want to handle all encoding ourself
+        });
 
-		if('stdio' === self.exeInfo.io) {
-			self.client.log.debug('Using stdio for door I/O');
+        if('stdio' === self.exeInfo.io) {
+            self.client.log.debug('Using stdio for door I/O');
 
-			self.client.term.output.pipe(door);
+            self.client.term.output.pipe(door);
 
-			door.on('data', self.doorDataHandler);
+            door.on('data', self.doorDataHandler);
 
-			door.once('close', () => {
-				return self.restoreIo(door);
-			});
-		} else if('socket' === self.exeInfo.io) {
-			self.client.log.debug( { port : sockServer.address().port }, 'Using temporary socket server for door I/O');
-		}
+            door.once('close', () => {
+                return self.restoreIo(door);
+            });
+        } else if('socket' === self.exeInfo.io) {
+            self.client.log.debug( { port : sockServer.address().port }, 'Using temporary socket server for door I/O');
+        }
 
-		door.once('exit', exitCode => {
-			self.client.log.info( { exitCode : exitCode }, 'Door exited');
+        door.once('exit', exitCode => {
+            self.client.log.info( { exitCode : exitCode }, 'Door exited');
 
-			if(sockServer) {
-				sockServer.close();
-			}
+            if(sockServer) {
+                sockServer.close();
+            }
 
-			//	we may not get a close
-			if('stdio' === self.exeInfo.io) {
-				self.restoreIo(door);
-			}
+            //	we may not get a close
+            if('stdio' === self.exeInfo.io) {
+                self.restoreIo(door);
+            }
 
-			door.removeAllListeners();
+            door.removeAllListeners();
 
-			return self.doorExited();
-		});
-	});
+            return self.doorExited();
+        });
+    });
 };
diff --git a/core/door_party.js b/core/door_party.js
index a64f92c8..3c5b29a7 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -11,121 +11,121 @@ const _				= require('lodash');
 const SSHClient		= require('ssh2').Client;
 
 exports.moduleInfo = {
-	name	: 'DoorParty',
-	desc	: 'DoorParty Access Module',
-	author	: 'NuSkooler',
+    name	: 'DoorParty',
+    desc	: 'DoorParty Access Module',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class DoorPartyModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		//	establish defaults
-		this.config				= options.menuConfig.config;
-		this.config.host		= this.config.host || 'dp.throwbackbbs.com';
-		this.config.sshPort 	= this.config.sshPort || 2022;
-		this.config.rloginPort	= this.config.rloginPort || 513;
-	}
+        //	establish defaults
+        this.config				= options.menuConfig.config;
+        this.config.host		= this.config.host || 'dp.throwbackbbs.com';
+        this.config.sshPort 	= this.config.sshPort || 2022;
+        this.config.rloginPort	= this.config.rloginPort || 513;
+    }
 
-	initSequence() {
-		let clientTerminated;
-		const self = this;
+    initSequence() {
+        let clientTerminated;
+        const self = this;
 
-		async.series(
-			[
-				function validateConfig(callback) {
-					if(!_.isString(self.config.username)) {
-						return callback(new Error('Config requires "username"!'));
-					}
-					if(!_.isString(self.config.password)) {
-						return callback(new Error('Config requires "password"!'));
-					}
-					if(!_.isString(self.config.bbsTag)) {
-						return callback(new Error('Config requires "bbsTag"!'));
-					}
-					return callback(null);
-				},
-				function establishSecureConnection(callback) {
-					self.client.term.write(resetScreen());
-					self.client.term.write('Connecting to DoorParty, please wait...\n');
+        async.series(
+            [
+                function validateConfig(callback) {
+                    if(!_.isString(self.config.username)) {
+                        return callback(new Error('Config requires "username"!'));
+                    }
+                    if(!_.isString(self.config.password)) {
+                        return callback(new Error('Config requires "password"!'));
+                    }
+                    if(!_.isString(self.config.bbsTag)) {
+                        return callback(new Error('Config requires "bbsTag"!'));
+                    }
+                    return callback(null);
+                },
+                function establishSecureConnection(callback) {
+                    self.client.term.write(resetScreen());
+                    self.client.term.write('Connecting to DoorParty, please wait...\n');
 
-					const sshClient = new SSHClient();
+                    const sshClient = new SSHClient();
 
-					let pipeRestored = false;
-					let pipedStream;
-					const restorePipe = function() {
-						if(pipedStream && !pipeRestored && !clientTerminated) {
-							self.client.term.output.unpipe(pipedStream);
-							self.client.term.output.resume();
-						}
-					};
+                    let pipeRestored = false;
+                    let pipedStream;
+                    const restorePipe = function() {
+                        if(pipedStream && !pipeRestored && !clientTerminated) {
+                            self.client.term.output.unpipe(pipedStream);
+                            self.client.term.output.resume();
+                        }
+                    };
 
-					sshClient.on('ready', () => {
-						//	track client termination so we can clean up early
-						self.client.once('end', () => {
-							self.client.log.info('Connection ended. Terminating DoorParty connection');
-							clientTerminated = true;
-							sshClient.end();
-						});
+                    sshClient.on('ready', () => {
+                        //	track client termination so we can clean up early
+                        self.client.once('end', () => {
+                            self.client.log.info('Connection ended. Terminating DoorParty connection');
+                            clientTerminated = true;
+                            sshClient.end();
+                        });
 
-						//	establish tunnel for rlogin
-						sshClient.forwardOut('127.0.0.1', self.config.sshPort, self.config.host, self.config.rloginPort, (err, stream) => {
-							if(err) {
-								return callback(new Error('Failed to establish tunnel'));
-							}
+                        //	establish tunnel for rlogin
+                        sshClient.forwardOut('127.0.0.1', self.config.sshPort, self.config.host, self.config.rloginPort, (err, stream) => {
+                            if(err) {
+                                return callback(new Error('Failed to establish tunnel'));
+                            }
 
-							//
-							//	Send rlogin
-							//	DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
-							//	[XA]nuskooler
-							//
-							const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
-							stream.write(rlogin);
+                            //
+                            //	Send rlogin
+                            //	DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
+                            //	[XA]nuskooler
+                            //
+                            const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
+                            stream.write(rlogin);
 
-							pipedStream = stream;	//	:TODO: this is hacky...
-							self.client.term.output.pipe(stream);
+                            pipedStream = stream;	//	:TODO: this is hacky...
+                            self.client.term.output.pipe(stream);
 
-							stream.on('data', d => {
-								//	:TODO: we should just pipe this...
-								self.client.term.rawWrite(d);
-							});
+                            stream.on('data', d => {
+                                //	:TODO: we should just pipe this...
+                                self.client.term.rawWrite(d);
+                            });
 
-							stream.on('close', () => {
-								restorePipe();
-								sshClient.end();
-							});
-						});
-					});
+                            stream.on('close', () => {
+                                restorePipe();
+                                sshClient.end();
+                            });
+                        });
+                    });
 
-					sshClient.on('error', err => {
-						self.client.log.info(`DoorParty SSH client error: ${err.message}`);
-					});
+                    sshClient.on('error', err => {
+                        self.client.log.info(`DoorParty SSH client error: ${err.message}`);
+                    });
 
-					sshClient.on('close', () => {
-						restorePipe();
-						callback(null);
-					});
+                    sshClient.on('close', () => {
+                        restorePipe();
+                        callback(null);
+                    });
 
-					sshClient.connect( {
-						host 		: self.config.host,
-						port		: self.config.sshPort,
-						username	: self.config.username,
-						password	: self.config.password,
-					});
+                    sshClient.connect( {
+                        host 		: self.config.host,
+                        port		: self.config.sshPort,
+                        username	: self.config.username,
+                        password	: self.config.password,
+                    });
 
-					//	note: no explicit callback() until we're finished!
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'DoorParty error');
-				}
+                    //	note: no explicit callback() until we're finished!
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'DoorParty error');
+                }
 
-				//	if the client is stil here, go to previous
-				if(!clientTerminated) {
-					self.prevMenu();
-				}
-			}
-		);
-	}
+                //	if the client is stil here, go to previous
+                if(!clientTerminated) {
+                    self.prevMenu();
+                }
+            }
+        );
+    }
 };
diff --git a/core/download_queue.js b/core/download_queue.js
index 0c31b13c..d8617f75 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -7,72 +7,72 @@ const FileEntry		= require('./file_entry.js');
 const { partition }	= require('lodash');
 
 module.exports = class DownloadQueue {
-	constructor(client) {
-		this.client	= client;
+    constructor(client) {
+        this.client	= client;
 
-		if(!Array.isArray(this.client.user.downloadQueue)) {
-			if(this.client.user.properties.dl_queue) {
-				this.loadFromProperty(this.client.user.properties.dl_queue);
-			} else {
-				this.client.user.downloadQueue = [];
-			}
-		}
-	}
+        if(!Array.isArray(this.client.user.downloadQueue)) {
+            if(this.client.user.properties.dl_queue) {
+                this.loadFromProperty(this.client.user.properties.dl_queue);
+            } else {
+                this.client.user.downloadQueue = [];
+            }
+        }
+    }
 
-	get items() {
-		return this.client.user.downloadQueue;
-	}
+    get items() {
+        return this.client.user.downloadQueue;
+    }
 
-	clear() {
-		this.client.user.downloadQueue = [];
-	}
+    clear() {
+        this.client.user.downloadQueue = [];
+    }
 
-	toggle(fileEntry, systemFile=false) {
-		if(this.isQueued(fileEntry)) {
-			this.client.user.downloadQueue = this.client.user.downloadQueue.filter(e => fileEntry.fileId !== e.fileId);
-		} else {
-			this.add(fileEntry, systemFile);
-		}
-	}
+    toggle(fileEntry, systemFile=false) {
+        if(this.isQueued(fileEntry)) {
+            this.client.user.downloadQueue = this.client.user.downloadQueue.filter(e => fileEntry.fileId !== e.fileId);
+        } else {
+            this.add(fileEntry, systemFile);
+        }
+    }
 
-	add(fileEntry, systemFile=false) {
-		this.client.user.downloadQueue.push({
-			fileId		: fileEntry.fileId,
-			areaTag		: fileEntry.areaTag,
-			fileName	: fileEntry.fileName,
-			path		: fileEntry.filePath,
-			byteSize	: fileEntry.meta.byte_size || 0,
-			systemFile	: systemFile,
-		});
-	}
+    add(fileEntry, systemFile=false) {
+        this.client.user.downloadQueue.push({
+            fileId		: fileEntry.fileId,
+            areaTag		: fileEntry.areaTag,
+            fileName	: fileEntry.fileName,
+            path		: fileEntry.filePath,
+            byteSize	: fileEntry.meta.byte_size || 0,
+            systemFile	: systemFile,
+        });
+    }
 
-	removeItems(fileIds) {
-		if(!Array.isArray(fileIds)) {
-			fileIds = [ fileIds ];
-		}
+    removeItems(fileIds) {
+        if(!Array.isArray(fileIds)) {
+            fileIds = [ fileIds ];
+        }
 
-		const [ remain, removed ] = partition(this.client.user.downloadQueue, e => ( -1 === fileIds.indexOf(e.fileId) ));
-		this.client.user.downloadQueue = remain;
-		return removed;
-	}
+        const [ remain, removed ] = partition(this.client.user.downloadQueue, e => ( -1 === fileIds.indexOf(e.fileId) ));
+        this.client.user.downloadQueue = remain;
+        return removed;
+    }
 
-	isQueued(entryOrId) {
-		if(entryOrId instanceof FileEntry) {
-			entryOrId = entryOrId.fileId;
-		}
+    isQueued(entryOrId) {
+        if(entryOrId instanceof FileEntry) {
+            entryOrId = entryOrId.fileId;
+        }
 
-		return this.client.user.downloadQueue.find(e => entryOrId === e.fileId) ? true : false;
-	}
+        return this.client.user.downloadQueue.find(e => entryOrId === e.fileId) ? true : false;
+    }
 
-	toProperty() { return JSON.stringify(this.client.user.downloadQueue); }
+    toProperty() { return JSON.stringify(this.client.user.downloadQueue); }
 
-	loadFromProperty(prop) {
-		try {
-			this.client.user.downloadQueue = JSON.parse(prop);
-		} catch(e) {
-			this.client.user.downloadQueue = [];
+    loadFromProperty(prop) {
+        try {
+            this.client.user.downloadQueue = JSON.parse(prop);
+        } catch(e) {
+            this.client.user.downloadQueue = [];
 
-			this.client.log.error( { error : e.message, property : prop }, 'Failed parsing download queue property');
-		}
-	}
+            this.client.log.error( { error : e.message, property : prop }, 'Failed parsing download queue property');
+        }
+    }
 };
diff --git a/core/dropfile.js b/core/dropfile.js
index bdb3f3d1..7a49cca4 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -23,189 +23,189 @@ exports.DropFile	= DropFile;
 
 function DropFile(client, fileType) {
 
-	var self 			= this;
-	this.client			= client;
-	this.fileType		= (fileType || 'DORINFO').toUpperCase();
+    var self 			= this;
+    this.client			= client;
+    this.fileType		= (fileType || 'DORINFO').toUpperCase();
 
-	Object.defineProperty(this, 'fullPath', {
-		get : function() {
-			return paths.join(Config().paths.dropFiles, ('node' + self.client.node), self.fileName);
-		}
-	});
+    Object.defineProperty(this, 'fullPath', {
+        get : function() {
+            return paths.join(Config().paths.dropFiles, ('node' + self.client.node), self.fileName);
+        }
+    });
 
-	Object.defineProperty(this, 'fileName', {
-		get : function() {
-			return {
-				DOOR			: 'DOOR.SYS',					//	GAP BBS, many others
-				DOOR32			: 'DOOR32.SYS',					//	EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
-				CALLINFO		: 'CALLINFO.BBS',				//	Citadel?
-				DORINFO			: self.getDoorInfoFileName(),	//	RBBS, RemoteAccess, QBBS, ...
-				CHAIN			: 'CHAIN.TXT',					//	WWIV
-				CURRUSER		: 'CURRUSER.BBS',				//	RyBBS
-				SFDOORS			: 'SFDOORS.DAT',				//	Spitfire
-				PCBOARD			: 'PCBOARD.SYS',				//	PCBoard
-				TRIBBS			: 'TRIBBS.SYS',					//	TriBBS
-				USERINFO		: 'USERINFO.DAT',				//	Wildcat! 3.0+
-				JUMPER			: 'JUMPER.DAT',					//	2AM BBS
-				SXDOOR			: 								//	System/X, dESiRE
+    Object.defineProperty(this, 'fileName', {
+        get : function() {
+            return {
+                DOOR			: 'DOOR.SYS',					//	GAP BBS, many others
+                DOOR32			: 'DOOR32.SYS',					//	EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
+                CALLINFO		: 'CALLINFO.BBS',				//	Citadel?
+                DORINFO			: self.getDoorInfoFileName(),	//	RBBS, RemoteAccess, QBBS, ...
+                CHAIN			: 'CHAIN.TXT',					//	WWIV
+                CURRUSER		: 'CURRUSER.BBS',				//	RyBBS
+                SFDOORS			: 'SFDOORS.DAT',				//	Spitfire
+                PCBOARD			: 'PCBOARD.SYS',				//	PCBoard
+                TRIBBS			: 'TRIBBS.SYS',					//	TriBBS
+                USERINFO		: 'USERINFO.DAT',				//	Wildcat! 3.0+
+                JUMPER			: 'JUMPER.DAT',					//	2AM BBS
+                SXDOOR			: 								//	System/X, dESiRE
 					'SXDOOR.' + _.pad(self.client.node.toString(), 3, '0'),
-				INFO			: 'INFO.BBS',					//	Phoenix BBS
-			}[self.fileType];
-		}
-	});
+                INFO			: 'INFO.BBS',					//	Phoenix BBS
+            }[self.fileType];
+        }
+    });
 
-	Object.defineProperty(this, 'dropFileContents', {
-		get : function() {
-			return {
-				DOOR			: self.getDoorSysBuffer(),
-				DOOR32			: self.getDoor32Buffer(),
-				DORINFO			: self.getDoorInfoDefBuffer(),
-			}[self.fileType];
-		}
-	});
+    Object.defineProperty(this, 'dropFileContents', {
+        get : function() {
+            return {
+                DOOR			: self.getDoorSysBuffer(),
+                DOOR32			: self.getDoor32Buffer(),
+                DORINFO			: self.getDoorInfoDefBuffer(),
+            }[self.fileType];
+        }
+    });
 
-	this.getDoorInfoFileName = function() {
-		var x;
-		var node = self.client.node;
-		if(10 === node) {
-			x = 0;
-		} else if(node < 10) {
-			x = node;
-		} else {
-			x = String.fromCharCode('a'.charCodeAt(0) + (node - 11));
-		}
-		return 'DORINFO' + x + '.DEF';
-	};
+    this.getDoorInfoFileName = function() {
+        var x;
+        var node = self.client.node;
+        if(10 === node) {
+            x = 0;
+        } else if(node < 10) {
+            x = node;
+        } else {
+            x = String.fromCharCode('a'.charCodeAt(0) + (node - 11));
+        }
+        return 'DORINFO' + x + '.DEF';
+    };
 
-	this.getDoorSysBuffer = function() {
-		var up			= self.client.user.properties;
-		var now			= moment();
-		var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+    this.getDoorSysBuffer = function() {
+        var up			= self.client.user.properties;
+        var now			= moment();
+        var secLevel	= self.client.user.getLegacySecurityLevel().toString();
 
-		//	:TODO: fix time remaining
-		//	:TODO: fix default protocol -- user prop: transfer_protocol
+        //	:TODO: fix time remaining
+        //	:TODO: fix default protocol -- user prop: transfer_protocol
 
-		return iconv.encode( [
-			'COM1:',											//	"Comm Port - COM0: = LOCAL MODE"
-			'57600',											//	"Baud Rate - 300 to 38400" (Note: set as 57600 instead!)
-			'8',												//	"Parity - 7 or 8"
-			self.client.node.toString(),						//	"Node Number - 1 to 99"
-			'57600',											//	"DTE Rate. Actual BPS rate to use. (kg)"
-			'Y',												//	"Screen Display - Y=On  N=Off             (Default to Y)"
-			'Y',												//	"Printer Toggle - Y=On  N=Off             (Default to Y)"
-			'Y',												//	"Page Bell      - Y=On  N=Off             (Default to Y)"
-			'Y',												//	"Caller Alarm   - Y=On  N=Off             (Default to Y)"
-			up.real_name || self.client.user.username,			//	"User Full Name"
-			up.location || 'Anywhere',							//	"Calling From"
-			'123-456-7890',										//	"Home Phone"
-			'123-456-7890',										//	"Work/Data Phone"
-			'NOPE',												//	"Password" (Note: this is never given out or even stored plaintext)
-			secLevel,											//	"Security Level"
-			up.login_count.toString(),							//	"Total Times On"
-			now.format('MM/DD/YY'),								//	"Last Date Called"
-			'15360',											//	"Seconds Remaining THIS call (for those that particular)"
-			'256',												//	"Minutes Remaining THIS call"
-			'GR',												//	"Graphics Mode - GR=Graph, NG=Non-Graph, 7E=7,E Caller"
-			self.client.term.termHeight.toString(),				//	"Page Length"
-			'N',												//	"User Mode - Y = Expert, N = Novice"
-			'1,2,3,4,5,6,7',									//	"Conferences/Forums Registered In  (ABCDEFG)"
-			'1',												//	"Conference Exited To DOOR From    (G)"
-			'01/01/99',											//	"User Expiration Date              (mm/dd/yy)"
-			self.client.user.userId.toString(),					//	"User File's Record Number"
-			'Z',												//	"Default Protocol - X, C, Y, G, I, N, Etc."
-			//	:TODO: fix up, down, etc. form user properties
-			'0',												//	"Total Uploads"
-			'0',												//	"Total Downloads"
-			'0',												//	"Daily Download "K" Total"
-			'999999',											//	"Daily Download Max. "K" Limit"
-			moment(up.birthdate).format('MM/DD/YY'),			//	"Caller's Birthdate"
-			'X:\\MAIN\\',										//	"Path to the MAIN directory (where User File is)"
-			'X:\\GEN\\',										//	"Path to the GEN directory"
-			StatLog.getSystemStat('sysop_username'),			//	"Sysop's Name (name BBS refers to Sysop as)"
-			self.client.user.username,							//	"Alias name"
-			'00:05',											//	"Event time                        (hh:mm)" (note: wat?)
-			'Y',												//	"If its an error correcting connection (Y/N)"
-			'Y',												//	"ANSI supported & caller using NG mode (Y/N)"
-			'Y',												//	"Use Record Locking                    (Y/N)"
-			'7',												//	"BBS Default Color (Standard IBM color code, ie, 1-15)"
-			//	:TODO: fix minutes here also:
-			'256',												//	"Time Credits In Minutes (positive/negative)"
-			'07/07/90',											//	"Last New Files Scan Date          (mm/dd/yy)"
-			//	:TODO: fix last vs now times:
-			now.format('hh:mm'),								//	"Time of This Call"
-			now.format('hh:mm'),								//	"Time of Last Call                 (hh:mm)"
-			'9999',												//	"Maximum daily files available"
-			//	:TODO: fix these stats:
-			'0',												//	"Files d/led so far today"
-			'0',												//	"Total "K" Bytes Uploaded"
-			'0',												//	"Total "K" Bytes Downloaded"
-			up.user_comment || 'None',							//	"User Comment"
-			'0',												//	"Total Doors Opened"
-			'0',												//	"Total Messages Left"
+        return iconv.encode( [
+            'COM1:',											//	"Comm Port - COM0: = LOCAL MODE"
+            '57600',											//	"Baud Rate - 300 to 38400" (Note: set as 57600 instead!)
+            '8',												//	"Parity - 7 or 8"
+            self.client.node.toString(),						//	"Node Number - 1 to 99"
+            '57600',											//	"DTE Rate. Actual BPS rate to use. (kg)"
+            'Y',												//	"Screen Display - Y=On  N=Off             (Default to Y)"
+            'Y',												//	"Printer Toggle - Y=On  N=Off             (Default to Y)"
+            'Y',												//	"Page Bell      - Y=On  N=Off             (Default to Y)"
+            'Y',												//	"Caller Alarm   - Y=On  N=Off             (Default to Y)"
+            up.real_name || self.client.user.username,			//	"User Full Name"
+            up.location || 'Anywhere',							//	"Calling From"
+            '123-456-7890',										//	"Home Phone"
+            '123-456-7890',										//	"Work/Data Phone"
+            'NOPE',												//	"Password" (Note: this is never given out or even stored plaintext)
+            secLevel,											//	"Security Level"
+            up.login_count.toString(),							//	"Total Times On"
+            now.format('MM/DD/YY'),								//	"Last Date Called"
+            '15360',											//	"Seconds Remaining THIS call (for those that particular)"
+            '256',												//	"Minutes Remaining THIS call"
+            'GR',												//	"Graphics Mode - GR=Graph, NG=Non-Graph, 7E=7,E Caller"
+            self.client.term.termHeight.toString(),				//	"Page Length"
+            'N',												//	"User Mode - Y = Expert, N = Novice"
+            '1,2,3,4,5,6,7',									//	"Conferences/Forums Registered In  (ABCDEFG)"
+            '1',												//	"Conference Exited To DOOR From    (G)"
+            '01/01/99',											//	"User Expiration Date              (mm/dd/yy)"
+            self.client.user.userId.toString(),					//	"User File's Record Number"
+            'Z',												//	"Default Protocol - X, C, Y, G, I, N, Etc."
+            //	:TODO: fix up, down, etc. form user properties
+            '0',												//	"Total Uploads"
+            '0',												//	"Total Downloads"
+            '0',												//	"Daily Download "K" Total"
+            '999999',											//	"Daily Download Max. "K" Limit"
+            moment(up.birthdate).format('MM/DD/YY'),			//	"Caller's Birthdate"
+            'X:\\MAIN\\',										//	"Path to the MAIN directory (where User File is)"
+            'X:\\GEN\\',										//	"Path to the GEN directory"
+            StatLog.getSystemStat('sysop_username'),			//	"Sysop's Name (name BBS refers to Sysop as)"
+            self.client.user.username,							//	"Alias name"
+            '00:05',											//	"Event time                        (hh:mm)" (note: wat?)
+            'Y',												//	"If its an error correcting connection (Y/N)"
+            'Y',												//	"ANSI supported & caller using NG mode (Y/N)"
+            'Y',												//	"Use Record Locking                    (Y/N)"
+            '7',												//	"BBS Default Color (Standard IBM color code, ie, 1-15)"
+            //	:TODO: fix minutes here also:
+            '256',												//	"Time Credits In Minutes (positive/negative)"
+            '07/07/90',											//	"Last New Files Scan Date          (mm/dd/yy)"
+            //	:TODO: fix last vs now times:
+            now.format('hh:mm'),								//	"Time of This Call"
+            now.format('hh:mm'),								//	"Time of Last Call                 (hh:mm)"
+            '9999',												//	"Maximum daily files available"
+            //	:TODO: fix these stats:
+            '0',												//	"Files d/led so far today"
+            '0',												//	"Total "K" Bytes Uploaded"
+            '0',												//	"Total "K" Bytes Downloaded"
+            up.user_comment || 'None',							//	"User Comment"
+            '0',												//	"Total Doors Opened"
+            '0',												//	"Total Messages Left"
 
-		].join('\r\n') + '\r\n', 'cp437');
-	};
+        ].join('\r\n') + '\r\n', 'cp437');
+    };
 
-	this.getDoor32Buffer = function() {
-		//
-		//	Resources:
-		//	* http://wiki.bbses.info/index.php/DOOR32.SYS
-		//
-		//	:TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
-		return iconv.encode([
-			'2',						//	:TODO: This needs to be configurable!
-			//	:TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
-			'-1',	//	self.client.output._handle.fd.toString(),	//	:TODO: ALWAYS -1 on Windows!
-			'57600',
-			Config().general.boardName,
-			self.client.user.userId.toString(),
-			self.client.user.properties.real_name || self.client.user.username,
-			self.client.user.username,
-			self.client.user.getLegacySecurityLevel().toString(),
-			'546',	//	:TODO: Minutes left!
-			'1',	//	ANSI
-			self.client.node.toString(),
-		].join('\r\n') + '\r\n', 'cp437');
+    this.getDoor32Buffer = function() {
+        //
+        //	Resources:
+        //	* http://wiki.bbses.info/index.php/DOOR32.SYS
+        //
+        //	:TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
+        return iconv.encode([
+            '2',						//	:TODO: This needs to be configurable!
+            //	:TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
+            '-1',	//	self.client.output._handle.fd.toString(),	//	:TODO: ALWAYS -1 on Windows!
+            '57600',
+            Config().general.boardName,
+            self.client.user.userId.toString(),
+            self.client.user.properties.real_name || self.client.user.username,
+            self.client.user.username,
+            self.client.user.getLegacySecurityLevel().toString(),
+            '546',	//	:TODO: Minutes left!
+            '1',	//	ANSI
+            self.client.node.toString(),
+        ].join('\r\n') + '\r\n', 'cp437');
 
-	};
+    };
 
-	this.getDoorInfoDefBuffer = function() {
-		//	:TODO: fix time remaining
+    this.getDoorInfoDefBuffer = function() {
+        //	:TODO: fix time remaining
 
-		//
-		//	Resources:
-		//	* http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm
-		//
-		//	Note that usernames are just used for first/last names here
-		//
-		var opUn		= /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
-		var un			= /[^\s]*/.exec(self.client.user.username)[0];
-		var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+        //
+        //	Resources:
+        //	* http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm
+        //
+        //	Note that usernames are just used for first/last names here
+        //
+        var opUn		= /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
+        var un			= /[^\s]*/.exec(self.client.user.username)[0];
+        var secLevel	= self.client.user.getLegacySecurityLevel().toString();
 
-		return iconv.encode( [
-			Config().general.boardName,							//	"The name of the system."
-			opUn,												//	"The sysop's name up to the first space."
-			opUn,												//	"The sysop's name following the first space."
-			'COM1',												//	"The serial port the modem is connected to, or 0 if logged in on console."
-			'57600',											//	"The current port (DTE) rate."
-			'0',												//	"The number "0""
-			un,													//	"The current user's name, up to the first space."
-			un,													//	"The current user's name, following the first space."
-			self.client.user.properties.location || '',			//	"Where the user lives, or a blank line if unknown."
-			'1',												//	"The number "0" if TTY, or "1" if ANSI."
-			secLevel,											//	"The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
-			'546',												//	"The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
-			'-1'												//	"The number "-1" if using an external serial driver or "0" if using internal serial routines."
-		].join('\r\n') + '\r\n', 'cp437');
-	};
+        return iconv.encode( [
+            Config().general.boardName,							//	"The name of the system."
+            opUn,												//	"The sysop's name up to the first space."
+            opUn,												//	"The sysop's name following the first space."
+            'COM1',												//	"The serial port the modem is connected to, or 0 if logged in on console."
+            '57600',											//	"The current port (DTE) rate."
+            '0',												//	"The number "0""
+            un,													//	"The current user's name, up to the first space."
+            un,													//	"The current user's name, following the first space."
+            self.client.user.properties.location || '',			//	"Where the user lives, or a blank line if unknown."
+            '1',												//	"The number "0" if TTY, or "1" if ANSI."
+            secLevel,											//	"The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
+            '546',												//	"The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
+            '-1'												//	"The number "-1" if using an external serial driver or "0" if using internal serial routines."
+        ].join('\r\n') + '\r\n', 'cp437');
+    };
 
 }
 
 DropFile.fileTypes = [ 'DORINFO' ];
 
 DropFile.prototype.createFile = function(cb) {
-	fs.writeFile(this.fullPath, this.dropFileContents, function written(err) {
-		cb(err);
-	});
+    fs.writeFile(this.fullPath, this.dropFileContents, function written(err) {
+        cb(err);
+    });
 };
 
diff --git a/core/edit_text_view.js b/core/edit_text_view.js
index 0db02638..b1b89726 100644
--- a/core/edit_text_view.js
+++ b/core/edit_text_view.js
@@ -12,79 +12,79 @@ const _				= require('lodash');
 exports.EditTextView	= EditTextView;
 
 function EditTextView(options) {
-	options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-	options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-	options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
-	options.resizable		= false;
+    options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
+    options.resizable		= false;
 
-	TextView.call(this, options);
+    TextView.call(this, options);
 
-	this.cursorPos = { row : 0, col : 0 };
+    this.cursorPos = { row : 0, col : 0 };
 
-	this.clientBackspace = function() {
-		const fillCharSGR = this.getStyleSGR(1) || this.getSGR();
-		this.client.term.write(`\b${fillCharSGR}${this.fillChar}\b${this.getFocusSGR()}`);
-	};
+    this.clientBackspace = function() {
+        const fillCharSGR = this.getStyleSGR(1) || this.getSGR();
+        this.client.term.write(`\b${fillCharSGR}${this.fillChar}\b${this.getFocusSGR()}`);
+    };
 }
 
 require('util').inherits(EditTextView, TextView);
 
 EditTextView.prototype.onKeyPress = function(ch, key) {
-	if(key) {
-		if(this.isKeyMapped('backspace', key.name)) {
-			if(this.text.length > 0) {
-				this.text = this.text.substr(0, this.text.length - 1);
+    if(key) {
+        if(this.isKeyMapped('backspace', key.name)) {
+            if(this.text.length > 0) {
+                this.text = this.text.substr(0, this.text.length - 1);
 
-				if(this.text.length >= this.dimens.width) {
-					this.redraw();
-				} else {
-					this.cursorPos.col -= 1;
-					if(this.cursorPos.col >= 0) {
-						this.clientBackspace();
-					}
-				}
-			}
+                if(this.text.length >= this.dimens.width) {
+                    this.redraw();
+                } else {
+                    this.cursorPos.col -= 1;
+                    if(this.cursorPos.col >= 0) {
+                        this.clientBackspace();
+                    }
+                }
+            }
 
-			return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
-		} else if(this.isKeyMapped('clearLine', key.name)) {
-			this.text			= '';
-			this.cursorPos.col	= 0;
-			this.setFocus(true);	//	resetting focus will redraw & adjust cursor
+            return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
+        } else if(this.isKeyMapped('clearLine', key.name)) {
+            this.text			= '';
+            this.cursorPos.col	= 0;
+            this.setFocus(true);	//	resetting focus will redraw & adjust cursor
 
-			return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
-		}
-	}
+            return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
+        }
+    }
 
-	if(ch && strUtil.isPrintable(ch)) {
-		if(this.text.length < this.maxLength) {
-			ch = strUtil.stylizeString(ch, this.textStyle);
+    if(ch && strUtil.isPrintable(ch)) {
+        if(this.text.length < this.maxLength) {
+            ch = strUtil.stylizeString(ch, this.textStyle);
 
-			this.text += ch;
+            this.text += ch;
 
-			if(this.text.length > this.dimens.width) {
-				//	no shortcuts - redraw the view
-				this.redraw();
-			} else {
-				this.cursorPos.col += 1;
+            if(this.text.length > this.dimens.width) {
+                //	no shortcuts - redraw the view
+                this.redraw();
+            } else {
+                this.cursorPos.col += 1;
 
-				if(_.isString(this.textMaskChar)) {
-					if(this.textMaskChar.length > 0) {
-						this.client.term.write(this.textMaskChar);
-					}
-				} else {
-					this.client.term.write(ch);
-				}
-			}
-		}
-	}
+                if(_.isString(this.textMaskChar)) {
+                    if(this.textMaskChar.length > 0) {
+                        this.client.term.write(this.textMaskChar);
+                    }
+                } else {
+                    this.client.term.write(ch);
+                }
+            }
+        }
+    }
 
-	EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
+    EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 EditTextView.prototype.setText = function(text) {
-	//	draw & set |text|
-	EditTextView.super_.prototype.setText.call(this, text);
+    //	draw & set |text|
+    EditTextView.super_.prototype.setText.call(this, text);
 
-	//	adjust local cursor tracking
-	this.cursorPos = { row : 0, col : text.length };
+    //	adjust local cursor tracking
+    this.cursorPos = { row : 0, col : text.length };
 };
diff --git a/core/email.js b/core/email.js
index 5cc66836..af195da5 100644
--- a/core/email.js
+++ b/core/email.js
@@ -13,20 +13,20 @@ const nodeMailer			= require('nodemailer');
 exports.sendMail			= sendMail;
 
 function sendMail(message, cb) {
-	const config = Config();
-	if(!_.has(config, 'email.transport')) {
-		return cb(Errors.MissingConfig('Email "email::transport" configuration missing'));
-	}
+    const config = Config();
+    if(!_.has(config, 'email.transport')) {
+        return cb(Errors.MissingConfig('Email "email::transport" configuration missing'));
+    }
 
-	message.from = message.from || config.email.defaultFrom;
+    message.from = message.from || config.email.defaultFrom;
 
-	const transportOptions = Object.assign( {}, config.email.transport, {
-		logger	: Log,
-	});
+    const transportOptions = Object.assign( {}, config.email.transport, {
+        logger	: Log,
+    });
 
-	const transport = nodeMailer.createTransport(transportOptions);
+    const transport = nodeMailer.createTransport(transportOptions);
 
-	transport.sendMail(message, (err, info) => {
-		return cb(err, info);
-	});
+    transport.sendMail(message, (err, info) => {
+        return cb(err, info);
+    });
 }
diff --git a/core/enig_error.js b/core/enig_error.js
index c6eb8097..879a18ab 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -2,45 +2,45 @@
 'use strict';
 
 class EnigError extends Error {
-	constructor(message, code, reason, reasonCode) {
-		super(message);
+    constructor(message, code, reason, reasonCode) {
+        super(message);
 
-		this.name		= this.constructor.name;
-		this.message	= message;
-		this.code		= code;
-		this.reason		= reason;
-		this.reasonCode	= reasonCode;
+        this.name		= this.constructor.name;
+        this.message	= message;
+        this.code		= code;
+        this.reason		= reason;
+        this.reasonCode	= reasonCode;
 
-		if(this.reason) {
-			this.message += `: ${this.reason}`;
-		}
+        if(this.reason) {
+            this.message += `: ${this.reason}`;
+        }
 
-		if(typeof Error.captureStackTrace === 'function') {
-			Error.captureStackTrace(this, this.constructor);
-		} else {
-			this.stack = (new Error(message)).stack;
-		}
-	}
+        if(typeof Error.captureStackTrace === 'function') {
+            Error.captureStackTrace(this, this.constructor);
+        } else {
+            this.stack = (new Error(message)).stack;
+        }
+    }
 }
 
 exports.EnigError				= EnigError;
 
 exports.Errors = {
-	General				: (reason, reasonCode) 	=> new EnigError('An error occurred', -33000, reason, reasonCode),
-	MenuStack			: (reason, reasonCode)	=> new EnigError('Menu stack error', -33001, reason, reasonCode),
-	DoesNotExist		: (reason, reasonCode) 	=> new EnigError('Object does not exist', -33002, reason, reasonCode),
-	AccessDenied		: (reason, reasonCode)	=> new EnigError('Access denied', -32003, reason, reasonCode),
-	Invalid				: (reason, reasonCode)	=> new EnigError('Invalid', -32004, reason, reasonCode),
-	ExternalProcess		: (reason, reasonCode)	=> new EnigError('External process error', -32005, reason, reasonCode),
-	MissingConfig		: (reason, reasonCode)	=> new EnigError('Missing configuration', -32006, reason, reasonCode),
-	UnexpectedState		: (reason, reasonCode)	=> new EnigError('Unexpected state', -32007, reason, reasonCode),
-	MissingParam		: (reason, reasonCode)	=> new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
+    General				: (reason, reasonCode) 	=> new EnigError('An error occurred', -33000, reason, reasonCode),
+    MenuStack			: (reason, reasonCode)	=> new EnigError('Menu stack error', -33001, reason, reasonCode),
+    DoesNotExist		: (reason, reasonCode) 	=> new EnigError('Object does not exist', -33002, reason, reasonCode),
+    AccessDenied		: (reason, reasonCode)	=> new EnigError('Access denied', -32003, reason, reasonCode),
+    Invalid				: (reason, reasonCode)	=> new EnigError('Invalid', -32004, reason, reasonCode),
+    ExternalProcess		: (reason, reasonCode)	=> new EnigError('External process error', -32005, reason, reasonCode),
+    MissingConfig		: (reason, reasonCode)	=> new EnigError('Missing configuration', -32006, reason, reasonCode),
+    UnexpectedState		: (reason, reasonCode)	=> new EnigError('Unexpected state', -32007, reason, reasonCode),
+    MissingParam		: (reason, reasonCode)	=> new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
-	AlreadyThere		: 'ALREADYTHERE',
-	InvalidNextMenu		: 'BADNEXT',
-	NoPreviousMenu		: 'NOPREV',
-	NoConditionMatch	: 'NOCONDMATCH',
-	NotEnabled			: 'NOTENABLED',
+    AlreadyThere		: 'ALREADYTHERE',
+    InvalidNextMenu		: 'BADNEXT',
+    NoPreviousMenu		: 'NOPREV',
+    NoConditionMatch	: 'NOCONDMATCH',
+    NotEnabled			: 'NOTENABLED',
 };
\ No newline at end of file
diff --git a/core/enigma_assert.js b/core/enigma_assert.js
index 2b72227a..0d1d5176 100644
--- a/core/enigma_assert.js
+++ b/core/enigma_assert.js
@@ -9,10 +9,10 @@ const Log		= require('./logger.js').log;
 const assert	= require('assert');
 
 module.exports = function(condition, message) {
-	if(Config().debug.assertsEnabled) {
-		assert.apply(this, arguments);
-	} else if(!(condition)) {
-		const stack = new Error().stack;
-		Log.error( { condition : condition, stack : stack }, message || 'Assertion failed' );
-	}
+    if(Config().debug.assertsEnabled) {
+        assert.apply(this, arguments);
+    } else if(!(condition)) {
+        const stack = new Error().stack;
+        Log.error( { condition : condition, stack : stack }, message || 'Assertion failed' );
+    }
 };
diff --git a/core/erc_client.js b/core/erc_client.js
index ccc70199..79a47240 100644
--- a/core/erc_client.js
+++ b/core/erc_client.js
@@ -23,157 +23,157 @@ const net			= require('net');
 exports.getModule	= ErcClientModule;
 
 exports.moduleInfo = {
-	name	: 'ENiGMA Relay Chat Client',
-	desc	: 'Chat with other ENiGMA BBSes',
-	author	: 'Andrew Pamment',
+    name	: 'ENiGMA Relay Chat Client',
+    desc	: 'Chat with other ENiGMA BBSes',
+    author	: 'Andrew Pamment',
 };
 
 var MciViewIds = {
-	ChatDisplay : 1,
-	InputArea 	: 3,
+    ChatDisplay : 1,
+    InputArea 	: 3,
 };
 
 //	:TODO: needs converted to ES6 MenuModule subclass
 function ErcClientModule(options) {
-	MenuModule.prototype.ctorShim.call(this, options);
+    MenuModule.prototype.ctorShim.call(this, options);
 
-	const self			= this;
-	this.config			= options.menuConfig.config;
+    const self			= this;
+    this.config			= options.menuConfig.config;
 
-	this.chatEntryFormat	= this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
-	this.systemEntryFormat	= this.config.systemEntryFormat || '[*SYSTEM*] {message}';
+    this.chatEntryFormat	= this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
+    this.systemEntryFormat	= this.config.systemEntryFormat || '[*SYSTEM*] {message}';
 
-	this.finishedLoading = function() {
-		async.waterfall(
-			[
-				function validateConfig(callback) {
-					if(_.isString(self.config.host) &&
+    this.finishedLoading = function() {
+        async.waterfall(
+            [
+                function validateConfig(callback) {
+                    if(_.isString(self.config.host) &&
 						_.isNumber(self.config.port) &&
 						_.isString(self.config.bbsTag))
-					{
-						return callback(null);
-					} else {
-						return callback(new Error('Configuration is missing required option(s)'));
-					}
-				},
-				function connectToServer(callback) {
-					const connectOpts = {
-						port	: self.config.port,
-						host	: self.config.host,
-					};
+                    {
+                        return callback(null);
+                    } else {
+                        return callback(new Error('Configuration is missing required option(s)'));
+                    }
+                },
+                function connectToServer(callback) {
+                    const connectOpts = {
+                        port	: self.config.port,
+                        host	: self.config.host,
+                    };
 
-					const chatMessageView = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
+                    const chatMessageView = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
 
-					chatMessageView.setText('Connecting to server...');
-					chatMessageView.redraw();
+                    chatMessageView.setText('Connecting to server...');
+                    chatMessageView.redraw();
 
-					self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
+                    self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
 
-					//	:TODO: Track actual client->enig connection for optional prevMenu @ final CB
-					self.chatConnection = net.createConnection(connectOpts.port, connectOpts.host);
+                    //	:TODO: Track actual client->enig connection for optional prevMenu @ final CB
+                    self.chatConnection = net.createConnection(connectOpts.port, connectOpts.host);
 
-					self.chatConnection.on('data', data => {
-						data = data.toString();
+                    self.chatConnection.on('data', data => {
+                        data = data.toString();
 
-						if(data.startsWith('ERCHANDSHAKE')) {
-							self.chatConnection.write(`ERCMAGIC|${self.config.bbsTag}|${self.client.user.username}\r\n`);
-						} else if(data.startsWith('{')) {
-							try {
-								data = JSON.parse(data);
-							} catch(e) {
-								return self.client.log.warn( { error : e.message }, 'ERC: Error parsing ERC data from server');
-							}
+                        if(data.startsWith('ERCHANDSHAKE')) {
+                            self.chatConnection.write(`ERCMAGIC|${self.config.bbsTag}|${self.client.user.username}\r\n`);
+                        } else if(data.startsWith('{')) {
+                            try {
+                                data = JSON.parse(data);
+                            } catch(e) {
+                                return self.client.log.warn( { error : e.message }, 'ERC: Error parsing ERC data from server');
+                            }
 
-							let text;
-							try {
-								if(data.userName) {
-									//	user message
-									text = stringFormat(self.chatEntryFormat, data);
-								} else {
-									//	system message
-									text = stringFormat(self.systemEntryFormat, data);
-								}
-							} catch(e) {
-								return self.client.log.warn( { error : e.message }, 'ERC: chatEntryFormat error');
-							}
+                            let text;
+                            try {
+                                if(data.userName) {
+                                    //	user message
+                                    text = stringFormat(self.chatEntryFormat, data);
+                                } else {
+                                    //	system message
+                                    text = stringFormat(self.systemEntryFormat, data);
+                                }
+                            } catch(e) {
+                                return self.client.log.warn( { error : e.message }, 'ERC: chatEntryFormat error');
+                            }
 
-							chatMessageView.addText(text);
+                            chatMessageView.addText(text);
 
-							if(chatMessageView.getLineCount() > 30) {	//	:TODO: should probably be ChatDisplay.height?
-								chatMessageView.deleteLine(0);
-								chatMessageView.scrollDown();
-							}
+                            if(chatMessageView.getLineCount() > 30) {	//	:TODO: should probably be ChatDisplay.height?
+                                chatMessageView.deleteLine(0);
+                                chatMessageView.scrollDown();
+                            }
 
-							chatMessageView.redraw();
-							self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
-						}
-					});
+                            chatMessageView.redraw();
+                            self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
+                        }
+                    });
 
-					self.chatConnection.once('end', () => {
-						return callback(null);
-					});
+                    self.chatConnection.once('end', () => {
+                        return callback(null);
+                    });
 
-					self.chatConnection.once('error', err => {
-						self.client.log.info(`ERC connection error: ${err.message}`);
-						return callback(new Error('Failed connecting to ERC server!'));
-					});
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'ERC error');
-				}
+                    self.chatConnection.once('error', err => {
+                        self.client.log.info(`ERC connection error: ${err.message}`);
+                        return callback(new Error('Failed connecting to ERC server!'));
+                    });
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'ERC error');
+                }
 
-				self.prevMenu();
-			}
-		);
-	};
+                self.prevMenu();
+            }
+        );
+    };
 
-	this.scrollHandler = function(keyName) {
-		const inputAreaView 	= self.viewControllers.menu.getView(MciViewIds.InputArea);
-		const chatDisplayView	= self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
+    this.scrollHandler = function(keyName) {
+        const inputAreaView 	= self.viewControllers.menu.getView(MciViewIds.InputArea);
+        const chatDisplayView	= self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
 
-		if('up arrow' === keyName) {
-			chatDisplayView.scrollUp();
-		} else {
-			chatDisplayView.scrollDown();
-		}
+        if('up arrow' === keyName) {
+            chatDisplayView.scrollUp();
+        } else {
+            chatDisplayView.scrollDown();
+        }
 
-		chatDisplayView.redraw();
-		inputAreaView.setFocus(true);
-	};
+        chatDisplayView.redraw();
+        inputAreaView.setFocus(true);
+    };
 
 
-	this.menuMethods = {
-		inputAreaSubmit : function(formData, extraArgs, cb) {
-			const inputAreaView = self.viewControllers.menu.getView(MciViewIds.InputArea);
-			const inputData		= inputAreaView.getData();
+    this.menuMethods = {
+        inputAreaSubmit : function(formData, extraArgs, cb) {
+            const inputAreaView = self.viewControllers.menu.getView(MciViewIds.InputArea);
+            const inputData		= inputAreaView.getData();
 
-			if('/quit' === inputData.toLowerCase()) {
-				self.chatConnection.end();
-			} else {
-				try {
-					self.chatConnection.write(`${inputData}\r\n`);
-				} catch(e) {
-					self.client.log.warn( { error : e.message }, 'ERC error');
-				}
-				inputAreaView.clearText();
-			}
-			return cb(null);
-		},
-		scrollUp : function(formData, extraArgs, cb) {
-			self.scrollHandler(formData.key.name);
-			return cb(null);
-		},
-		scrollDown : function(formData, extraArgs, cb) {
-			self.scrollHandler(formData.key.name);
-			return cb(null);
-		}
-	};
+            if('/quit' === inputData.toLowerCase()) {
+                self.chatConnection.end();
+            } else {
+                try {
+                    self.chatConnection.write(`${inputData}\r\n`);
+                } catch(e) {
+                    self.client.log.warn( { error : e.message }, 'ERC error');
+                }
+                inputAreaView.clearText();
+            }
+            return cb(null);
+        },
+        scrollUp : function(formData, extraArgs, cb) {
+            self.scrollHandler(formData.key.name);
+            return cb(null);
+        },
+        scrollDown : function(formData, extraArgs, cb) {
+            self.scrollHandler(formData.key.name);
+            return cb(null);
+        }
+    };
 }
 
 require('util').inherits(ErcClientModule, MenuModule);
 
 ErcClientModule.prototype.mciReady = function(mciData, cb) {
-	this.standardMCIReadyHandler(mciData, cb);
+    this.standardMCIReadyHandler(mciData, cb);
 };
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index e425d3bd..1465d42b 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -19,251 +19,251 @@ exports.getModule				= EventSchedulerModule;
 exports.EventSchedulerModule	= EventSchedulerModule;	//	allow for loadAndStart
 
 exports.moduleInfo = {
-	name	: 'Event Scheduler',
-	desc	: 'Support for scheduling arbritary events',
-	author	: 'NuSkooler',
+    name	: 'Event Scheduler',
+    desc	: 'Support for scheduling arbritary events',
+    author	: 'NuSkooler',
 };
 
 const SCHEDULE_REGEXP	= /(?:^|or )?(@watch:)([^\0]+)?$/;
 const ACTION_REGEXP		= /@(method|execute):([^\0]+)?$/;
 
 class ScheduledEvent {
-	constructor(events, name) {
-		this.name		= name;
-		this.schedule 	= this.parseScheduleString(events[name].schedule);
-		this.action		= this.parseActionSpec(events[name].action);
-		if(this.action) {
-			this.action.args = events[name].args || [];
-		}
-	}
+    constructor(events, name) {
+        this.name		= name;
+        this.schedule 	= this.parseScheduleString(events[name].schedule);
+        this.action		= this.parseActionSpec(events[name].action);
+        if(this.action) {
+            this.action.args = events[name].args || [];
+        }
+    }
 
-	get isValid() {
-		if((!this.schedule || (!this.schedule.sched && !this.schedule.watchFile)) || !this.action) {
-			return false;
-		}
+    get isValid() {
+        if((!this.schedule || (!this.schedule.sched && !this.schedule.watchFile)) || !this.action) {
+            return false;
+        }
 
-		if('method' === this.action.type && !this.action.location) {
-			return false;
-		}
+        if('method' === this.action.type && !this.action.location) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	parseScheduleString(schedStr) {
-		if(!schedStr) {
-			return false;
-		}
+    parseScheduleString(schedStr) {
+        if(!schedStr) {
+            return false;
+        }
 
-		let schedule = {};
+        let schedule = {};
 
-		const m = SCHEDULE_REGEXP.exec(schedStr);
-		if(m) {
-			schedStr = schedStr.substr(0, m.index).trim();
+        const m = SCHEDULE_REGEXP.exec(schedStr);
+        if(m) {
+            schedStr = schedStr.substr(0, m.index).trim();
 
-			if('@watch:' === m[1]) {
-				schedule.watchFile = m[2];
-			}
-		}
+            if('@watch:' === m[1]) {
+                schedule.watchFile = m[2];
+            }
+        }
 
-		if(schedStr.length > 0) {
-			const sched = later.parse.text(schedStr);
-			if(-1 === sched.error) {
-				schedule.sched = sched;
-			}
-		}
+        if(schedStr.length > 0) {
+            const sched = later.parse.text(schedStr);
+            if(-1 === sched.error) {
+                schedule.sched = sched;
+            }
+        }
 
-		//	return undefined if we couldn't parse out anything useful
-		if(!_.isEmpty(schedule)) {
-			return schedule;
-		}
-	}
+        //	return undefined if we couldn't parse out anything useful
+        if(!_.isEmpty(schedule)) {
+            return schedule;
+        }
+    }
 
-	parseActionSpec(actionSpec) {
-		if(actionSpec) {
-			if('@' === actionSpec[0]) {
-				const m = ACTION_REGEXP.exec(actionSpec);
-				if(m) {
-					if(m[2].indexOf(':') > -1) {
-						const parts = m[2].split(':');
-						return {
-							type		: m[1],
-							location	: parts[0],
-							what		: parts[1],
-						};
-					} else {
-						return {
-							type	: m[1],
-							what	: m[2],
-						};
-					}
-				}
-			} else {
-				return {
-					type	: 'execute',
-					what	: actionSpec,
-				};
-			}
-		}
-	}
+    parseActionSpec(actionSpec) {
+        if(actionSpec) {
+            if('@' === actionSpec[0]) {
+                const m = ACTION_REGEXP.exec(actionSpec);
+                if(m) {
+                    if(m[2].indexOf(':') > -1) {
+                        const parts = m[2].split(':');
+                        return {
+                            type		: m[1],
+                            location	: parts[0],
+                            what		: parts[1],
+                        };
+                    } else {
+                        return {
+                            type	: m[1],
+                            what	: m[2],
+                        };
+                    }
+                }
+            } else {
+                return {
+                    type	: 'execute',
+                    what	: actionSpec,
+                };
+            }
+        }
+    }
 
-	executeAction(reason, cb) {
-		Log.info( { eventName : this.name, action : this.action, reason : reason }, 'Executing scheduled event action...');
+    executeAction(reason, cb) {
+        Log.info( { eventName : this.name, action : this.action, reason : reason }, 'Executing scheduled event action...');
 
-		if('method' === this.action.type) {
-			const modulePath = path.join(__dirname, '../', this.action.location);	//	enigma-bbs base + supplied location (path/file.js')
-			try {
-				const methodModule = require(modulePath);
-				methodModule[this.action.what](this.action.args, err => {
-					if(err) {
-						Log.debug(
-							{ error : err.toString(), eventName : this.name, action : this.action },
-							'Error performing scheduled event action');
-					}
+        if('method' === this.action.type) {
+            const modulePath = path.join(__dirname, '../', this.action.location);	//	enigma-bbs base + supplied location (path/file.js')
+            try {
+                const methodModule = require(modulePath);
+                methodModule[this.action.what](this.action.args, err => {
+                    if(err) {
+                        Log.debug(
+                            { error : err.toString(), eventName : this.name, action : this.action },
+                            'Error performing scheduled event action');
+                    }
 
-					return cb(err);
-				});
-			} catch(e) {
-				Log.warn(
-					{ error : e.toString(), eventName : this.name, action : this.action },
-					'Failed to perform scheduled event action');
+                    return cb(err);
+                });
+            } catch(e) {
+                Log.warn(
+                    { error : e.toString(), eventName : this.name, action : this.action },
+                    'Failed to perform scheduled event action');
 
-				return cb(e);
-			}
-		} else if('execute' === this.action.type) {
-			const opts = {
-				//	:TODO: cwd
-				name	: this.name,
-				cols	: 80,
-				rows	: 24,
-				env		: process.env,
-			};
+                return cb(e);
+            }
+        } else if('execute' === this.action.type) {
+            const opts = {
+                //	:TODO: cwd
+                name	: this.name,
+                cols	: 80,
+                rows	: 24,
+                env		: process.env,
+            };
 
-			const proc = pty.spawn(this.action.what, this.action.args, opts);
+            const proc = pty.spawn(this.action.what, this.action.args, opts);
 
-			proc.once('exit', exitCode => {
-				if(exitCode) {
-					Log.warn(
-						{ eventName : this.name, action : this.action, exitCode : exitCode },
-						'Bad exit code while performing scheduled event action');
-				}
-				return cb(exitCode ? new Error(`Bad exit code while performing scheduled event action: ${exitCode}`) : null);
-			});
-		}
-	}
+            proc.once('exit', exitCode => {
+                if(exitCode) {
+                    Log.warn(
+                        { eventName : this.name, action : this.action, exitCode : exitCode },
+                        'Bad exit code while performing scheduled event action');
+                }
+                return cb(exitCode ? new Error(`Bad exit code while performing scheduled event action: ${exitCode}`) : null);
+            });
+        }
+    }
 }
 
 function EventSchedulerModule(options) {
-	PluginModule.call(this, options);
+    PluginModule.call(this, options);
 
-	const config = Config();
-	if(_.has(config, 'eventScheduler')) {
-		this.moduleConfig = config.eventScheduler;
-	}
+    const config = Config();
+    if(_.has(config, 'eventScheduler')) {
+        this.moduleConfig = config.eventScheduler;
+    }
 
-	const self = this;
-	this.runningActions = new Set();
+    const self = this;
+    this.runningActions = new Set();
 
-	this.performAction = function(schedEvent, reason) {
-		if(self.runningActions.has(schedEvent.name)) {
-			return;	//	already running
-		}
+    this.performAction = function(schedEvent, reason) {
+        if(self.runningActions.has(schedEvent.name)) {
+            return;	//	already running
+        }
 
-		self.runningActions.add(schedEvent.name);
+        self.runningActions.add(schedEvent.name);
 
-		schedEvent.executeAction(reason, () => {
-			self.runningActions.delete(schedEvent.name);
-		});
-	};
+        schedEvent.executeAction(reason, () => {
+            self.runningActions.delete(schedEvent.name);
+        });
+    };
 }
 
 //	convienence static method for direct load + start
 EventSchedulerModule.loadAndStart = function(cb) {
-	const loadModuleEx = require('./module_util.js').loadModuleEx;
+    const loadModuleEx = require('./module_util.js').loadModuleEx;
 
-	const loadOpts = {
-		name		: path.basename(__filename, '.js'),
-		path		: __dirname,
-	};
+    const loadOpts = {
+        name		: path.basename(__filename, '.js'),
+        path		: __dirname,
+    };
 
-	loadModuleEx(loadOpts, (err, mod) => {
-		if(err) {
-			return cb(err);
-		}
+    loadModuleEx(loadOpts, (err, mod) => {
+        if(err) {
+            return cb(err);
+        }
 
-		const modInst = new mod.getModule();
-		modInst.startup( err => {
-			return cb(err, modInst);
-		});
-	});
+        const modInst = new mod.getModule();
+        modInst.startup( err => {
+            return cb(err, modInst);
+        });
+    });
 };
 
 EventSchedulerModule.prototype.startup = function(cb) {
 
-	this.eventTimers	= [];
-	const self = this;
+    this.eventTimers	= [];
+    const self = this;
 
-	if(this.moduleConfig && _.has(this.moduleConfig, 'events')) {
-		const events = Object.keys(this.moduleConfig.events).map( name => {
-			return new ScheduledEvent(this.moduleConfig.events, name);
-		});
+    if(this.moduleConfig && _.has(this.moduleConfig, 'events')) {
+        const events = Object.keys(this.moduleConfig.events).map( name => {
+            return new ScheduledEvent(this.moduleConfig.events, name);
+        });
 
-		events.forEach( schedEvent => {
-			if(!schedEvent.isValid) {
-				Log.warn( { eventName : schedEvent.name }, 'Invalid scheduled event entry');
-				return;
-			}
+        events.forEach( schedEvent => {
+            if(!schedEvent.isValid) {
+                Log.warn( { eventName : schedEvent.name }, 'Invalid scheduled event entry');
+                return;
+            }
 
-			Log.debug(
-				{
-					eventName	: schedEvent.name,
-					schedule	: this.moduleConfig.events[schedEvent.name].schedule,
-					action		: schedEvent.action,
-					next		: schedEvent.schedule.sched ? moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
-				},
-				'Scheduled event loaded'
-			);
+            Log.debug(
+                {
+                    eventName	: schedEvent.name,
+                    schedule	: this.moduleConfig.events[schedEvent.name].schedule,
+                    action		: schedEvent.action,
+                    next		: schedEvent.schedule.sched ? moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
+                },
+                'Scheduled event loaded'
+            );
 
-			if(schedEvent.schedule.sched) {
-				this.eventTimers.push(later.setInterval( () => {
-					self.performAction(schedEvent, 'Schedule');
-				}, schedEvent.schedule.sched));
-			}
+            if(schedEvent.schedule.sched) {
+                this.eventTimers.push(later.setInterval( () => {
+                    self.performAction(schedEvent, 'Schedule');
+                }, schedEvent.schedule.sched));
+            }
 
-			if(schedEvent.schedule.watchFile) {
-				const watcher = sane(
-					paths.dirname(schedEvent.schedule.watchFile),
-					{
-						glob : `**/${paths.basename(schedEvent.schedule.watchFile)}`
-					}
-				);
+            if(schedEvent.schedule.watchFile) {
+                const watcher = sane(
+                    paths.dirname(schedEvent.schedule.watchFile),
+                    {
+                        glob : `**/${paths.basename(schedEvent.schedule.watchFile)}`
+                    }
+                );
 
-				//	:TODO: should track watched files & stop watching @ shutdown?
+                //	:TODO: should track watched files & stop watching @ shutdown?
 
-				[ 'change', 'add', 'delete' ].forEach(event => {
-					watcher.on(event, (fileName, fileRoot) => {
-						const eventPath = paths.join(fileRoot, fileName);
-						if(schedEvent.schedule.watchFile === eventPath) {
-							self.performAction(schedEvent, `Watch file: ${eventPath}`);
-						}
-					});
-				});
+                [ 'change', 'add', 'delete' ].forEach(event => {
+                    watcher.on(event, (fileName, fileRoot) => {
+                        const eventPath = paths.join(fileRoot, fileName);
+                        if(schedEvent.schedule.watchFile === eventPath) {
+                            self.performAction(schedEvent, `Watch file: ${eventPath}`);
+                        }
+                    });
+                });
 
-				fse.exists(schedEvent.schedule.watchFile, exists => {
-					if(exists) {
-						self.performAction(schedEvent, `Watch file: ${schedEvent.schedule.watchFile}`);
-					}
-				});
-			}
-		});
-	}
+                fse.exists(schedEvent.schedule.watchFile, exists => {
+                    if(exists) {
+                        self.performAction(schedEvent, `Watch file: ${schedEvent.schedule.watchFile}`);
+                    }
+                });
+            }
+        });
+    }
 
-	cb(null);
+    cb(null);
 };
 
 EventSchedulerModule.prototype.shutdown = function(cb) {
-	if(this.eventTimers) {
-		this.eventTimers.forEach( et => et.clear() );
-	}
+    if(this.eventTimers) {
+        this.eventTimers.forEach( et => et.clear() );
+    }
 
-	cb(null);
+    cb(null);
 };
diff --git a/core/events.js b/core/events.js
index 7bf307ad..aa75345f 100644
--- a/core/events.js
+++ b/core/events.js
@@ -12,68 +12,68 @@ const async				= require('async');
 const glob				= require('glob');
 
 module.exports = new class Events extends events.EventEmitter {
-	constructor() {
-		super();
-		this.setMaxListeners(32);	//	:TODO: play with this...
-	}
+    constructor() {
+        super();
+        this.setMaxListeners(32);	//	:TODO: play with this...
+    }
 
-	getSystemEvents() {
-		return SystemEvents;
-	}
+    getSystemEvents() {
+        return SystemEvents;
+    }
 
-	addListener(event, listener) {
-		Log.trace( { event : event }, 'Registering event listener');
-		return super.addListener(event, listener);
-	}
+    addListener(event, listener) {
+        Log.trace( { event : event }, 'Registering event listener');
+        return super.addListener(event, listener);
+    }
 
-	emit(event, ...args) {
-		Log.trace( { event : event }, 'Emitting event');
-		return super.emit(event, ...args);
-	}
+    emit(event, ...args) {
+        Log.trace( { event : event }, 'Emitting event');
+        return super.emit(event, ...args);
+    }
 
-	on(event, listener) {
-		Log.trace( { event : event }, 'Registering event listener');
-		return super.on(event, listener);
-	}
+    on(event, listener) {
+        Log.trace( { event : event }, 'Registering event listener');
+        return super.on(event, listener);
+    }
 
-	once(event, listener) {
-		Log.trace( { event : event }, 'Registering single use event listener');
-		return super.once(event, listener);
-	}
+    once(event, listener) {
+        Log.trace( { event : event }, 'Registering single use event listener');
+        return super.once(event, listener);
+    }
 
-	removeListener(event, listener) {
-		Log.trace( { event : event }, 'Removing listener');
-		return super.removeListener(event, listener);
-	}
+    removeListener(event, listener) {
+        Log.trace( { event : event }, 'Removing listener');
+        return super.removeListener(event, listener);
+    }
 
-	startup(cb) {
-		async.each(require('./module_util.js').getModulePaths(), (modulePath, nextPath) => {
-			glob('*{.js,/*.js}', { cwd : modulePath }, (err, files) => {
-				if(err) {
-					return nextPath(err);
-				}
+    startup(cb) {
+        async.each(require('./module_util.js').getModulePaths(), (modulePath, nextPath) => {
+            glob('*{.js,/*.js}', { cwd : modulePath }, (err, files) => {
+                if(err) {
+                    return nextPath(err);
+                }
 
-				async.each(files, (moduleName, nextModule) => {
-					const fullModulePath = paths.join(modulePath, moduleName);
+                async.each(files, (moduleName, nextModule) => {
+                    const fullModulePath = paths.join(modulePath, moduleName);
 
-					try {
-						const mod = require(fullModulePath);
+                    try {
+                        const mod = require(fullModulePath);
 
-						if(_.isFunction(mod.registerEvents)) {
-							//	:TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
-							mod.registerEvents(this);
-						}
-					} catch(e) {
-						Log.warn( { error : e }, 'Exception during module "registerEvents"');
-					}
+                        if(_.isFunction(mod.registerEvents)) {
+                            //	:TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
+                            mod.registerEvents(this);
+                        }
+                    } catch(e) {
+                        Log.warn( { error : e }, 'Exception during module "registerEvents"');
+                    }
 
-					return nextModule(null);
-				}, err => {
-					return nextPath(err);
-				});
-			});
-		}, err => {
-			return cb(err);
-		});
-	}
+                    return nextModule(null);
+                }, err => {
+                    return nextPath(err);
+                });
+            });
+        }, err => {
+            return cb(err);
+        });
+    }
 };
diff --git a/core/exodus.js b/core/exodus.js
index 409b5f2a..b20f18a1 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -49,183 +49,183 @@ const SSHClient		= require('ssh2').Client;
 */
 
 exports.moduleInfo = {
-	name	: 'Exodus',
-	desc	: 'Exodus Door Server Access Module - https://oddnetwork.org/exodus/',
-	author	: 'NuSkooler',
+    name	: 'Exodus',
+    desc	: 'Exodus Door Server Access Module - https://oddnetwork.org/exodus/',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class ExodusModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config						= options.menuConfig.config || {};
-		this.config.ticketHost			= this.config.ticketHost || 'oddnetwork.org';
-		this.config.ticketPort			= this.config.ticketPort || 1984,
-		this.config.ticketPath			= this.config.ticketPath || '/exodus';
-		this.config.rejectUnauthorized	= _.get(this.config, 'rejectUnauthorized', true);
-		this.config.sshHost				= this.config.sshHost || this.config.ticketHost;
-		this.config.sshPort				= this.config.sshPort || 22;
-		this.config.sshUser				= this.config.sshUser || 'exodus_server';
-		this.config.sshKeyPem			= this.config.sshKeyPem || joinPath(Config().paths.misc, 'exodus.id_rsa');
-	}
+        this.config						= options.menuConfig.config || {};
+        this.config.ticketHost			= this.config.ticketHost || 'oddnetwork.org';
+        this.config.ticketPort			= this.config.ticketPort || 1984,
+        this.config.ticketPath			= this.config.ticketPath || '/exodus';
+        this.config.rejectUnauthorized	= _.get(this.config, 'rejectUnauthorized', true);
+        this.config.sshHost				= this.config.sshHost || this.config.ticketHost;
+        this.config.sshPort				= this.config.sshPort || 22;
+        this.config.sshUser				= this.config.sshUser || 'exodus_server';
+        this.config.sshKeyPem			= this.config.sshKeyPem || joinPath(Config().paths.misc, 'exodus.id_rsa');
+    }
 
-	initSequence() {
+    initSequence() {
 
-		const self				= this;
-		let clientTerminated	= false;
+        const self				= this;
+        let clientTerminated	= false;
 
-		async.waterfall(
-			[
-				function validateConfig(callback) {
-					//	very basic validation on optionals
-					async.each( [ 'board', 'key', 'door' ], (key, next) => {
-						return _.isString(self.config[key]) ? next(null) : next(Errors.MissingConfig(`Config requires "${key}"!`));
-					}, callback);
-				},
-				function loadCertAuthorities(callback) {
-					if(!_.isString(self.config.caPem)) {
-						return callback(null, null);
-					}
+        async.waterfall(
+            [
+                function validateConfig(callback) {
+                    //	very basic validation on optionals
+                    async.each( [ 'board', 'key', 'door' ], (key, next) => {
+                        return _.isString(self.config[key]) ? next(null) : next(Errors.MissingConfig(`Config requires "${key}"!`));
+                    }, callback);
+                },
+                function loadCertAuthorities(callback) {
+                    if(!_.isString(self.config.caPem)) {
+                        return callback(null, null);
+                    }
 
-					fs.readFile(self.config.caPem, (err, certAuthorities) => {
-						return callback(err, certAuthorities);
-					});
-				},
-				function getTicket(certAuthorities, callback) {
-					const now		= moment.utc().unix();
-					const sha256	= crypto.createHash('sha256').update(`${self.config.key}${now}`).digest('hex');
-					const token		= `${sha256}|${now}`;
+                    fs.readFile(self.config.caPem, (err, certAuthorities) => {
+                        return callback(err, certAuthorities);
+                    });
+                },
+                function getTicket(certAuthorities, callback) {
+                    const now		= moment.utc().unix();
+                    const sha256	= crypto.createHash('sha256').update(`${self.config.key}${now}`).digest('hex');
+                    const token		= `${sha256}|${now}`;
 
-					const postData	= querystring.stringify({
-						token		: token,
-						board		: self.config.board,
-						user		: self.client.user.username,
-						door		: self.config.door,
-					});
+                    const postData	= querystring.stringify({
+                        token		: token,
+                        board		: self.config.board,
+                        user		: self.client.user.username,
+                        door		: self.config.door,
+                    });
 
-					const reqOptions = {
-						hostname			: self.config.ticketHost,
-						port				: self.config.ticketPort,
-						path				: self.config.ticketPath,
-						rejectUnauthorized	: self.config.rejectUnauthorized,
-						method				: 'POST',
-						headers				: {
-							'Content-Type'		: 'application/x-www-form-urlencoded',
-							'Content-Length'	: postData.length,
-							'User-Agent'		: getEnigmaUserAgent(),
-						}
-					};
+                    const reqOptions = {
+                        hostname			: self.config.ticketHost,
+                        port				: self.config.ticketPort,
+                        path				: self.config.ticketPath,
+                        rejectUnauthorized	: self.config.rejectUnauthorized,
+                        method				: 'POST',
+                        headers				: {
+                            'Content-Type'		: 'application/x-www-form-urlencoded',
+                            'Content-Length'	: postData.length,
+                            'User-Agent'		: getEnigmaUserAgent(),
+                        }
+                    };
 
-					if(certAuthorities) {
-						reqOptions.ca = certAuthorities;
-					}
+                    if(certAuthorities) {
+                        reqOptions.ca = certAuthorities;
+                    }
 
-					let ticket = '';
-					const req = https.request(reqOptions, res => {
-						res.on('data', data => {
-							ticket += data;
-						});
+                    let ticket = '';
+                    const req = https.request(reqOptions, res => {
+                        res.on('data', data => {
+                            ticket += data;
+                        });
 
-						res.on('end', () => {
-							if(ticket.length !== 36) {
-								return callback(Errors.Invalid(`Invalid Exodus ticket: ${ticket}`));
-							}
+                        res.on('end', () => {
+                            if(ticket.length !== 36) {
+                                return callback(Errors.Invalid(`Invalid Exodus ticket: ${ticket}`));
+                            }
 
-							return callback(null, ticket);
-						});
-					});
+                            return callback(null, ticket);
+                        });
+                    });
 
-					req.on('error', err => {
-						return callback(Errors.General(`Exodus error: ${err.message}`));
-					});
+                    req.on('error', err => {
+                        return callback(Errors.General(`Exodus error: ${err.message}`));
+                    });
 
-					req.write(postData);
-					req.end();
-				},
-				function loadPrivateKey(ticket, callback) {
-					fs.readFile(self.config.sshKeyPem, (err, privateKey) => {
-						return callback(err, ticket, privateKey);
-					});
-				},
-				function establishSecureConnection(ticket, privateKey, callback) {
+                    req.write(postData);
+                    req.end();
+                },
+                function loadPrivateKey(ticket, callback) {
+                    fs.readFile(self.config.sshKeyPem, (err, privateKey) => {
+                        return callback(err, ticket, privateKey);
+                    });
+                },
+                function establishSecureConnection(ticket, privateKey, callback) {
 
-					let pipeRestored = false;
-					let pipedStream;
+                    let pipeRestored = false;
+                    let pipedStream;
 
-					function restorePipe() {
-						if(pipedStream && !pipeRestored && !clientTerminated) {
-							self.client.term.output.unpipe(pipedStream);
-							self.client.term.output.resume();
-						}
-					}
+                    function restorePipe() {
+                        if(pipedStream && !pipeRestored && !clientTerminated) {
+                            self.client.term.output.unpipe(pipedStream);
+                            self.client.term.output.resume();
+                        }
+                    }
 
-					self.client.term.write(resetScreen());
-					self.client.term.write('Connecting to Exodus server, please wait...\n');
+                    self.client.term.write(resetScreen());
+                    self.client.term.write('Connecting to Exodus server, please wait...\n');
 
-					const sshClient = new SSHClient();
+                    const sshClient = new SSHClient();
 
-					const window = {
-						rows		: self.client.term.termHeight,
-						cols		: self.client.term.termWidth,
-						width		: 0,
-						height		: 0,
-						term		: 'vt100',	//	Want to pass |self.client.term.termClient| here, but we end up getting hung up on :(
-					};
+                    const window = {
+                        rows		: self.client.term.termHeight,
+                        cols		: self.client.term.termWidth,
+                        width		: 0,
+                        height		: 0,
+                        term		: 'vt100',	//	Want to pass |self.client.term.termClient| here, but we end up getting hung up on :(
+                    };
 
-					const options = {
-						env : {
-							exodus : ticket,
-						},
-					};
+                    const options = {
+                        env : {
+                            exodus : ticket,
+                        },
+                    };
 
-					sshClient.on('ready', () => {
-						self.client.once('end', () => {
-							self.client.log.info('Connection ended. Terminating Exodus connection');
-							clientTerminated = true;
-							return sshClient.end();
-						});
+                    sshClient.on('ready', () => {
+                        self.client.once('end', () => {
+                            self.client.log.info('Connection ended. Terminating Exodus connection');
+                            clientTerminated = true;
+                            return sshClient.end();
+                        });
 
-						sshClient.shell(window, options, (err, stream) => {
-							pipedStream = stream;	//	:TODO: ewwwwwwwww hack
-							self.client.term.output.pipe(stream);
+                        sshClient.shell(window, options, (err, stream) => {
+                            pipedStream = stream;	//	:TODO: ewwwwwwwww hack
+                            self.client.term.output.pipe(stream);
 
-							stream.on('data', d => {
-								return self.client.term.rawWrite(d);
-							});
+                            stream.on('data', d => {
+                                return self.client.term.rawWrite(d);
+                            });
 
-							stream.on('close', () => {
-								restorePipe();
-								return sshClient.end();
-							});
+                            stream.on('close', () => {
+                                restorePipe();
+                                return sshClient.end();
+                            });
 
-							stream.on('error', err => {
-								Log.warn( { error : err.message }, 'Exodus SSH client stream error');
-							});
-						});
-					});
+                            stream.on('error', err => {
+                                Log.warn( { error : err.message }, 'Exodus SSH client stream error');
+                            });
+                        });
+                    });
 
-					sshClient.on('close', () => {
-						restorePipe();
-						return callback(null);
-					});
+                    sshClient.on('close', () => {
+                        restorePipe();
+                        return callback(null);
+                    });
 
-					sshClient.connect({
-						host		: self.config.sshHost,
-						port		: self.config.sshPort,
-						username	: self.config.sshUser,
-						privateKey	: privateKey,
-					});
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'Exodus error');
-				}
+                    sshClient.connect({
+                        host		: self.config.sshHost,
+                        port		: self.config.sshPort,
+                        username	: self.config.sshUser,
+                        privateKey	: privateKey,
+                    });
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'Exodus error');
+                }
 
-				if(!clientTerminated) {
-					self.prevMenu();
-				}
-			}
-		);
-	}
+                if(!clientTerminated) {
+                    self.prevMenu();
+                }
+            }
+        );
+    }
 };
diff --git a/core/file_area_filter_edit.js b/core/file_area_filter_edit.js
index cc4c22c7..3cdeb68b 100644
--- a/core/file_area_filter_edit.js
+++ b/core/file_area_filter_edit.js
@@ -12,328 +12,328 @@ const stringFormat					= require('./string_format.js');
 const async				= require('async');
 
 exports.moduleInfo = {
-	name		: 'File Area Filter Editor',
-	desc		: 'Module for adding, deleting, and modifying file base filters',
-	author		: 'NuSkooler',
+    name		: 'File Area Filter Editor',
+    desc		: 'Module for adding, deleting, and modifying file base filters',
+    author		: 'NuSkooler',
 };
 
 const MciViewIds = {
-	editor : {
-		searchTerms			: 1,
-		tags				: 2,
-		area				: 3,
-		sort				: 4,
-		order				: 5,
-		filterName			: 6,
-		navMenu				: 7,
+    editor : {
+        searchTerms			: 1,
+        tags				: 2,
+        area				: 3,
+        sort				: 4,
+        order				: 5,
+        filterName			: 6,
+        navMenu				: 7,
 
-		//	:TODO: use the customs new standard thing - filter obj can have active/selected, etc.
-		selectedFilterInfo	: 10,	//	{ ...filter object ... }
-		activeFilterInfo	: 11,	//	{ ...filter object ... }
-		error				: 12,	//	validation errors
-	}
+        //	:TODO: use the customs new standard thing - filter obj can have active/selected, etc.
+        selectedFilterInfo	: 10,	//	{ ...filter object ... }
+        activeFilterInfo	: 11,	//	{ ...filter object ... }
+        error				: 12,	//	validation errors
+    }
 };
 
 exports.getModule = class FileAreaFilterEdit extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.filtersArray		= new FileBaseFilters(this.client).toArray();	//	ordered, such that we can index into them
-		this.currentFilterIndex	= 0;	//	into |filtersArray|
+        this.filtersArray		= new FileBaseFilters(this.client).toArray();	//	ordered, such that we can index into them
+        this.currentFilterIndex	= 0;	//	into |filtersArray|
 
-		//
-		//	Lexical sort + keep currently active filter (if any) as the first item in |filtersArray|
-		//
-		const activeFilter = FileBaseFilters.getActiveFilter(this.client);
-		this.filtersArray.sort( (filterA, filterB) => {
-			if(activeFilter) {
-				if(filterA.uuid === activeFilter.uuid) {
-					return -1;
-				}
-				if(filterB.uuid === activeFilter.uuid) {
-					return 1;
-				}
-			}
+        //
+        //	Lexical sort + keep currently active filter (if any) as the first item in |filtersArray|
+        //
+        const activeFilter = FileBaseFilters.getActiveFilter(this.client);
+        this.filtersArray.sort( (filterA, filterB) => {
+            if(activeFilter) {
+                if(filterA.uuid === activeFilter.uuid) {
+                    return -1;
+                }
+                if(filterB.uuid === activeFilter.uuid) {
+                    return 1;
+                }
+            }
 
-			return filterA.name.localeCompare(filterB.name, { sensitivity : false, numeric : true } );
-		});
+            return filterA.name.localeCompare(filterB.name, { sensitivity : false, numeric : true } );
+        });
 
-		this.menuMethods = {
-			saveFilter : (formData, extraArgs, cb) => {
-				return this.saveCurrentFilter(formData, cb);
-			},
-			prevFilter : (formData, extraArgs, cb) => {
-				this.currentFilterIndex -= 1;
-				if(this.currentFilterIndex < 0) {
-					this.currentFilterIndex = this.filtersArray.length - 1;
-				}
-				this.loadDataForFilter(this.currentFilterIndex);
-				return cb(null);
-			},
-			nextFilter : (formData, extraArgs, cb) => {
-				this.currentFilterIndex += 1;
-				if(this.currentFilterIndex >= this.filtersArray.length) {
-					this.currentFilterIndex = 0;
-				}
-				this.loadDataForFilter(this.currentFilterIndex);
-				return cb(null);
-			},
-			makeFilterActive : (formData, extraArgs, cb) => {
-				const filters = new FileBaseFilters(this.client);
-				filters.setActive(this.filtersArray[this.currentFilterIndex].uuid);
+        this.menuMethods = {
+            saveFilter : (formData, extraArgs, cb) => {
+                return this.saveCurrentFilter(formData, cb);
+            },
+            prevFilter : (formData, extraArgs, cb) => {
+                this.currentFilterIndex -= 1;
+                if(this.currentFilterIndex < 0) {
+                    this.currentFilterIndex = this.filtersArray.length - 1;
+                }
+                this.loadDataForFilter(this.currentFilterIndex);
+                return cb(null);
+            },
+            nextFilter : (formData, extraArgs, cb) => {
+                this.currentFilterIndex += 1;
+                if(this.currentFilterIndex >= this.filtersArray.length) {
+                    this.currentFilterIndex = 0;
+                }
+                this.loadDataForFilter(this.currentFilterIndex);
+                return cb(null);
+            },
+            makeFilterActive : (formData, extraArgs, cb) => {
+                const filters = new FileBaseFilters(this.client);
+                filters.setActive(this.filtersArray[this.currentFilterIndex].uuid);
 
-				this.updateActiveLabel();
+                this.updateActiveLabel();
 
-				return cb(null);
-			},
-			newFilter : (formData, extraArgs, cb) => {
-				this.currentFilterIndex = this.filtersArray.length;	//	next avail slot
-				this.clearForm(MciViewIds.editor.searchTerms);
-				return cb(null);
-			},
-			deleteFilter : (formData, extraArgs, cb) => {
-				const selectedFilter	= this.filtersArray[this.currentFilterIndex];
-				const filterUuid		= selectedFilter.uuid;
+                return cb(null);
+            },
+            newFilter : (formData, extraArgs, cb) => {
+                this.currentFilterIndex = this.filtersArray.length;	//	next avail slot
+                this.clearForm(MciViewIds.editor.searchTerms);
+                return cb(null);
+            },
+            deleteFilter : (formData, extraArgs, cb) => {
+                const selectedFilter	= this.filtersArray[this.currentFilterIndex];
+                const filterUuid		= selectedFilter.uuid;
 
-				//	cannot delete built-in/system filters
-				if(true === selectedFilter.system) {
-					this.showError('Cannot delete built in filters!');
-					return cb(null);
-				}
+                //	cannot delete built-in/system filters
+                if(true === selectedFilter.system) {
+                    this.showError('Cannot delete built in filters!');
+                    return cb(null);
+                }
 
-				this.filtersArray.splice(this.currentFilterIndex, 1);	//	remove selected entry
+                this.filtersArray.splice(this.currentFilterIndex, 1);	//	remove selected entry
 
-				//	remove from stored properties
-				const filters = new FileBaseFilters(this.client);
-				filters.remove(filterUuid);
-				filters.persist( () => {
+                //	remove from stored properties
+                const filters = new FileBaseFilters(this.client);
+                filters.remove(filterUuid);
+                filters.persist( () => {
 
-					//
-					//	If the item was also the active filter, we need to make a new one active
-					//
-					if(filterUuid === this.client.user.properties.file_base_filter_active_uuid) {
-						const newActive = this.filtersArray[this.currentFilterIndex];
-						if(newActive) {
-							filters.setActive(newActive.uuid);
-						} else {
-							//	nothing to set active to
-							this.client.user.removeProperty('file_base_filter_active_uuid');
-						}
-					}
+                    //
+                    //	If the item was also the active filter, we need to make a new one active
+                    //
+                    if(filterUuid === this.client.user.properties.file_base_filter_active_uuid) {
+                        const newActive = this.filtersArray[this.currentFilterIndex];
+                        if(newActive) {
+                            filters.setActive(newActive.uuid);
+                        } else {
+                            //	nothing to set active to
+                            this.client.user.removeProperty('file_base_filter_active_uuid');
+                        }
+                    }
 
-					//	update UI
-					this.updateActiveLabel();
+                    //	update UI
+                    this.updateActiveLabel();
 
-					if(this.filtersArray.length > 0) {
-						this.loadDataForFilter(this.currentFilterIndex);
-					} else {
-						this.clearForm();
-					}
-					return cb(null);
-				});
-			},
+                    if(this.filtersArray.length > 0) {
+                        this.loadDataForFilter(this.currentFilterIndex);
+                    } else {
+                        this.clearForm();
+                    }
+                    return cb(null);
+                });
+            },
 
-			viewValidationListener : (err, cb) => {
-				const errorView = this.viewControllers.editor.getView(MciViewIds.editor.error);
-				let newFocusId;
+            viewValidationListener : (err, cb) => {
+                const errorView = this.viewControllers.editor.getView(MciViewIds.editor.error);
+                let newFocusId;
 
-				if(errorView) {
-					if(err) {
-						errorView.setText(err.message);
-						err.view.clearText();	//	clear out the invalid data
-					} else {
-						errorView.clearText();
-					}
-				}
+                if(errorView) {
+                    if(err) {
+                        errorView.setText(err.message);
+                        err.view.clearText();	//	clear out the invalid data
+                    } else {
+                        errorView.clearText();
+                    }
+                }
 
-				return cb(newFocusId);
-			},
-		};
-	}
+                return cb(newFocusId);
+            },
+        };
+    }
 
-	showError(errMsg) {
-		const errorView = this.viewControllers.editor.getView(MciViewIds.editor.error);
-		if(errorView) {
-			if(errMsg) {
-				errorView.setText(errMsg);
-			} else {
-				errorView.clearText();
-			}
-		}
-	}
+    showError(errMsg) {
+        const errorView = this.viewControllers.editor.getView(MciViewIds.editor.error);
+        if(errorView) {
+            if(errMsg) {
+                errorView.setText(errMsg);
+            } else {
+                errorView.clearText();
+            }
+        }
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.addViewController( 'editor', new ViewController( { client : this.client } ) );
+            const self	= this;
+            const vc	= self.addViewController( 'editor', new ViewController( { client : this.client } ) );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
-					},
-					function populateAreas(callback) {
-						self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
+                    },
+                    function populateAreas(callback) {
+                        self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
 
-						const areasView = vc.getView(MciViewIds.editor.area);
-						if(areasView) {
-							areasView.setItems( self.availAreas.map( a => a.name ) );
-						}
+                        const areasView = vc.getView(MciViewIds.editor.area);
+                        if(areasView) {
+                            areasView.setItems( self.availAreas.map( a => a.name ) );
+                        }
 
-						self.updateActiveLabel();
-						self.loadDataForFilter(self.currentFilterIndex);
-						self.viewControllers.editor.resetInitialFocus();
-						return callback(null);
-					}
-				],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                        self.updateActiveLabel();
+                        self.loadDataForFilter(self.currentFilterIndex);
+                        self.viewControllers.editor.resetInitialFocus();
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	getCurrentFilter() {
-		return this.filtersArray[this.currentFilterIndex];
-	}
+    getCurrentFilter() {
+        return this.filtersArray[this.currentFilterIndex];
+    }
 
-	setText(mciId, text) {
-		const view = this.viewControllers.editor.getView(mciId);
-		if(view) {
-			view.setText(text);
-		}
-	}
+    setText(mciId, text) {
+        const view = this.viewControllers.editor.getView(mciId);
+        if(view) {
+            view.setText(text);
+        }
+    }
 
-	updateActiveLabel() {
-		const activeFilter = FileBaseFilters.getActiveFilter(this.client);
-		if(activeFilter) {
-			const activeFormat = this.menuConfig.config.activeFormat || '{name}';
-			this.setText(MciViewIds.editor.activeFilterInfo, stringFormat(activeFormat, activeFilter));
-		}
-	}
+    updateActiveLabel() {
+        const activeFilter = FileBaseFilters.getActiveFilter(this.client);
+        if(activeFilter) {
+            const activeFormat = this.menuConfig.config.activeFormat || '{name}';
+            this.setText(MciViewIds.editor.activeFilterInfo, stringFormat(activeFormat, activeFilter));
+        }
+    }
 
-	setFocusItemIndex(mciId, index) {
-		const view = this.viewControllers.editor.getView(mciId);
-		if(view) {
-			view.setFocusItemIndex(index);
-		}
-	}
+    setFocusItemIndex(mciId, index) {
+        const view = this.viewControllers.editor.getView(mciId);
+        if(view) {
+            view.setFocusItemIndex(index);
+        }
+    }
 
-	clearForm(newFocusId) {
-		[ MciViewIds.editor.searchTerms, MciViewIds.editor.tags, MciViewIds.editor.filterName ].forEach(mciId => {
-			this.setText(mciId, '');
-		});
+    clearForm(newFocusId) {
+        [ MciViewIds.editor.searchTerms, MciViewIds.editor.tags, MciViewIds.editor.filterName ].forEach(mciId => {
+            this.setText(mciId, '');
+        });
 
-		[ MciViewIds.editor.area, MciViewIds.editor.order, MciViewIds.editor.sort ].forEach(mciId => {
-			this.setFocusItemIndex(mciId, 0);
-		});
+        [ MciViewIds.editor.area, MciViewIds.editor.order, MciViewIds.editor.sort ].forEach(mciId => {
+            this.setFocusItemIndex(mciId, 0);
+        });
 
-		if(newFocusId) {
-			this.viewControllers.editor.switchFocus(newFocusId);
-		} else {
-			this.viewControllers.editor.resetInitialFocus();
-		}
-	}
+        if(newFocusId) {
+            this.viewControllers.editor.switchFocus(newFocusId);
+        } else {
+            this.viewControllers.editor.resetInitialFocus();
+        }
+    }
 
-	getSelectedAreaTag(index) {
-		if(0 === index) {
-			return '';	//	-ALL-
-		}
-		const area = this.availAreas[index];
-		if(!area) {
-			return '';
-		}
-		return area.areaTag;
-	}
+    getSelectedAreaTag(index) {
+        if(0 === index) {
+            return '';	//	-ALL-
+        }
+        const area = this.availAreas[index];
+        if(!area) {
+            return '';
+        }
+        return area.areaTag;
+    }
 
-	getOrderBy(index) {
-		return FileBaseFilters.OrderByValues[index] || FileBaseFilters.OrderByValues[0];
-	}
+    getOrderBy(index) {
+        return FileBaseFilters.OrderByValues[index] || FileBaseFilters.OrderByValues[0];
+    }
 
-	setAreaIndexFromCurrentFilter() {
-		let index;
-		const filter = this.getCurrentFilter();
-		if(filter) {
-			//	special treatment: areaTag saved as blank ("") if -ALL-
-			index = (filter.areaTag && this.availAreas.findIndex(area => filter.areaTag === area.areaTag)) || 0;
-		} else {
-			index = 0;
-		}
-		this.setFocusItemIndex(MciViewIds.editor.area, index);
-	}
+    setAreaIndexFromCurrentFilter() {
+        let index;
+        const filter = this.getCurrentFilter();
+        if(filter) {
+            //	special treatment: areaTag saved as blank ("") if -ALL-
+            index = (filter.areaTag && this.availAreas.findIndex(area => filter.areaTag === area.areaTag)) || 0;
+        } else {
+            index = 0;
+        }
+        this.setFocusItemIndex(MciViewIds.editor.area, index);
+    }
 
-	setOrderByFromCurrentFilter() {
-		let index;
-		const filter = this.getCurrentFilter();
-		if(filter) {
-			index = FileBaseFilters.OrderByValues.findIndex( ob => filter.order === ob ) || 0;
-		} else {
-			index = 0;
-		}
-		this.setFocusItemIndex(MciViewIds.editor.order, index);
-	}
+    setOrderByFromCurrentFilter() {
+        let index;
+        const filter = this.getCurrentFilter();
+        if(filter) {
+            index = FileBaseFilters.OrderByValues.findIndex( ob => filter.order === ob ) || 0;
+        } else {
+            index = 0;
+        }
+        this.setFocusItemIndex(MciViewIds.editor.order, index);
+    }
 
-	setSortByFromCurrentFilter() {
-		let index;
-		const filter = this.getCurrentFilter();
-		if(filter) {
-			index = FileBaseFilters.SortByValues.findIndex( sb => filter.sort === sb ) || 0;
-		} else {
-			index = 0;
-		}
-		this.setFocusItemIndex(MciViewIds.editor.sort, index);
-	}
+    setSortByFromCurrentFilter() {
+        let index;
+        const filter = this.getCurrentFilter();
+        if(filter) {
+            index = FileBaseFilters.SortByValues.findIndex( sb => filter.sort === sb ) || 0;
+        } else {
+            index = 0;
+        }
+        this.setFocusItemIndex(MciViewIds.editor.sort, index);
+    }
 
-	getSortBy(index) {
-		return FileBaseFilters.SortByValues[index] || FileBaseFilters.SortByValues[0];
-	}
+    getSortBy(index) {
+        return FileBaseFilters.SortByValues[index] || FileBaseFilters.SortByValues[0];
+    }
 
-	setFilterValuesFromFormData(filter, formData) {
-		filter.name		= formData.value.name;
-		filter.areaTag	= this.getSelectedAreaTag(formData.value.areaIndex);
-		filter.terms	= formData.value.searchTerms;
-		filter.tags		= formData.value.tags;
-		filter.order	= this.getOrderBy(formData.value.orderByIndex);
-		filter.sort		= this.getSortBy(formData.value.sortByIndex);
-	}
+    setFilterValuesFromFormData(filter, formData) {
+        filter.name		= formData.value.name;
+        filter.areaTag	= this.getSelectedAreaTag(formData.value.areaIndex);
+        filter.terms	= formData.value.searchTerms;
+        filter.tags		= formData.value.tags;
+        filter.order	= this.getOrderBy(formData.value.orderByIndex);
+        filter.sort		= this.getSortBy(formData.value.sortByIndex);
+    }
 
-	saveCurrentFilter(formData, cb) {
-		const filters			= new FileBaseFilters(this.client);
-		const selectedFilter	= this.filtersArray[this.currentFilterIndex];
+    saveCurrentFilter(formData, cb) {
+        const filters			= new FileBaseFilters(this.client);
+        const selectedFilter	= this.filtersArray[this.currentFilterIndex];
 
-		if(selectedFilter) {
-			//	*update* currently selected filter
-			this.setFilterValuesFromFormData(selectedFilter, formData);
-			filters.replace(selectedFilter.uuid, selectedFilter);
-		} else {
-			//	add a new entry; note that UUID will be generated
-			const newFilter = {};
-			this.setFilterValuesFromFormData(newFilter, formData);
+        if(selectedFilter) {
+            //	*update* currently selected filter
+            this.setFilterValuesFromFormData(selectedFilter, formData);
+            filters.replace(selectedFilter.uuid, selectedFilter);
+        } else {
+            //	add a new entry; note that UUID will be generated
+            const newFilter = {};
+            this.setFilterValuesFromFormData(newFilter, formData);
 
-			//	set current to what we just saved
-			newFilter.uuid = filters.add(newFilter);
+            //	set current to what we just saved
+            newFilter.uuid = filters.add(newFilter);
 
-			//	add to our array (at current index position)
-			this.filtersArray[this.currentFilterIndex] = newFilter;
-		}
+            //	add to our array (at current index position)
+            this.filtersArray[this.currentFilterIndex] = newFilter;
+        }
 
-		return filters.persist(cb);
-	}
+        return filters.persist(cb);
+    }
 
-	loadDataForFilter(filterIndex) {
-		const filter = this.filtersArray[filterIndex];
-		if(filter) {
-			this.setText(MciViewIds.editor.searchTerms,	filter.terms);
-			this.setText(MciViewIds.editor.tags,			filter.tags);
-			this.setText(MciViewIds.editor.filterName,		filter.name);
+    loadDataForFilter(filterIndex) {
+        const filter = this.filtersArray[filterIndex];
+        if(filter) {
+            this.setText(MciViewIds.editor.searchTerms,	filter.terms);
+            this.setText(MciViewIds.editor.tags,			filter.tags);
+            this.setText(MciViewIds.editor.filterName,		filter.name);
 
-			this.setAreaIndexFromCurrentFilter();
-			this.setSortByFromCurrentFilter();
-			this.setOrderByFromCurrentFilter();
-		}
-	}
+            this.setAreaIndexFromCurrentFilter();
+            this.setSortByFromCurrentFilter();
+            this.setOrderByFromCurrentFilter();
+        }
+    }
 };
diff --git a/core/file_area_list.js b/core/file_area_list.js
index ae03ee11..8b992f94 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -27,691 +27,691 @@ const moment			= require('moment');
 const paths				= require('path');
 
 exports.moduleInfo = {
-	name	: 'File Area List',
-	desc	: 'Lists contents of file an file area',
-	author	: 'NuSkooler',
+    name	: 'File Area List',
+    desc	: 'Lists contents of file an file area',
+    author	: 'NuSkooler',
 };
 
 const FormIds = {
-	browse			: 0,
-	details			: 1,
-	detailsGeneral	: 2,
-	detailsNfo		: 3,
-	detailsFileList	: 4,
+    browse			: 0,
+    details			: 1,
+    detailsGeneral	: 2,
+    detailsNfo		: 3,
+    detailsFileList	: 4,
 };
 
 const MciViewIds = {
-	browse	: {
-		desc				: 1,
-		navMenu				: 2,
+    browse	: {
+        desc				: 1,
+        navMenu				: 2,
 
-		customRangeStart	: 10,	//	10+ = customs
-	},
-	details	: {
-		navMenu				: 1,
-		infoXyTop			: 2,	//	%XY starting position for info area
-		infoXyBottom		: 3,
+        customRangeStart	: 10,	//	10+ = customs
+    },
+    details	: {
+        navMenu				: 1,
+        infoXyTop			: 2,	//	%XY starting position for info area
+        infoXyBottom		: 3,
 
-		customRangeStart	: 10,	//	10+ = customs
-	},
-	detailsGeneral : {
-		customRangeStart	: 10, //	10+ = customs
-	},
-	detailsNfo : {
-		nfo		: 1,
+        customRangeStart	: 10,	//	10+ = customs
+    },
+    detailsGeneral : {
+        customRangeStart	: 10, //	10+ = customs
+    },
+    detailsNfo : {
+        nfo		: 1,
 
-		customRangeStart	: 10,	//	10+ = customs
-	},
-	detailsFileList : {
-		fileList	: 1,
+        customRangeStart	: 10,	//	10+ = customs
+    },
+    detailsFileList : {
+        fileList	: 1,
 
-		customRangeStart	: 10,	//	10+ = customs
-	},
+        customRangeStart	: 10,	//	10+ = customs
+    },
 };
 
 exports.getModule = class FileAreaList extends MenuModule {
 
-	constructor(options) {
-		super(options);
-
-		this.filterCriteria		= _.get(options, 'extraArgs.filterCriteria');
-		this.fileList			= _.get(options, 'extraArgs.fileList');
-		this.lastFileNextExit	= _.get(options, 'extraArgs.lastFileNextExit', true);
-
-		if(this.fileList) {
-			//	we'll need to adjust position as well!
-			this.fileListPosition = 0;
-		}
-
-		this.dlQueue = new DownloadQueue(this.client);
-
-		if(!this.filterCriteria) {
-			this.filterCriteria = FileBaseFilters.getActiveFilter(this.client);
-		}
-
-		if(_.isString(this.filterCriteria)) {
-			this.filterCriteria = JSON.parse(this.filterCriteria);
-		}
-
-		if(_.has(options, 'lastMenuResult.value')) {
-			this.lastMenuResultValue = options.lastMenuResult.value;
-		}
-
-		this.menuMethods = {
-			nextFile : (formData, extraArgs, cb) => {
-				if(this.fileListPosition + 1 < this.fileList.length) {
-					this.fileListPosition += 1;
-
-					return this.displayBrowsePage(true, cb);	//	true=clerarScreen
-				}
-
-				if(this.lastFileNextExit) {
-					return this.prevMenu(cb);
-				}
-
-				return cb(null);
-			},
-			prevFile : (formData, extraArgs, cb) => {
-				if(this.fileListPosition > 0) {
-					--this.fileListPosition;
-
-					return this.displayBrowsePage(true, cb);	//	true=clearScreen
-				}
-
-				return cb(null);
-			},
-			viewDetails : (formData, extraArgs, cb) => {
-				this.viewControllers.browse.setFocus(false);
-				return this.displayDetailsPage(cb);
-			},
-			detailsQuit : (formData, extraArgs, cb) => {
-				[ 'detailsNfo', 'detailsFileList', 'details' ].forEach(n => {
-					const vc = this.viewControllers[n];
-					if(vc) {
-						vc.detachClientEvents();
-					}
-				});
-
-				return this.displayBrowsePage(true, cb);	//	true=clearScreen
-			},
-			toggleQueue : (formData, extraArgs, cb) => {
-				this.dlQueue.toggle(this.currentFileEntry);
-				this.updateQueueIndicator();
-				return cb(null);
-			},
-			showWebDownloadLink : (formData, extraArgs, cb) => {
-				return this.fetchAndDisplayWebDownloadLink(cb);
-			},
-			displayHelp : (formData, extraArgs, cb) => {
-				return this.displayHelpPage(cb);
-			}
-		};
-	}
-
-	enter() {
-		super.enter();
-	}
-
-	leave() {
-		super.leave();
-	}
-
-	getSaveState() {
-		return {
-			fileList			: this.fileList,
-			fileListPosition	: this.fileListPosition,
-		};
-	}
-
-	restoreSavedState(savedState) {
-		if(savedState) {
-			this.fileList			= savedState.fileList;
-			this.fileListPosition	= savedState.fileListPosition;
-		}
-	}
-
-	updateFileEntryWithMenuResult(cb) {
-		if(!this.lastMenuResultValue) {
-			return cb(null);
-		}
-
-		if(_.isNumber(this.lastMenuResultValue.rating)) {
-			const fileId = this.fileList[this.fileListPosition];
-			FileEntry.persistUserRating(fileId, this.client.user.userId, this.lastMenuResultValue.rating, err => {
-				if(err) {
-					this.client.log.warn( { error : err.message, fileId : fileId }, 'Failed to persist file rating' );
-				}
-				return cb(null);
-			});
-		} else {
-			return cb(null);
-		}
-	}
-
-	initSequence() {
-		const self = this;
-
-		async.series(
-			[
-				function preInit(callback) {
-					return self.updateFileEntryWithMenuResult(callback);
-				},
-				function beforeArt(callback) {
-					return self.beforeArt(callback);
-				},
-				function display(callback) {
-					return self.displayBrowsePage(false, err => {
-						if(err && 'NORESULTS' === err.reasonCode) {
-							self.gotoMenu(self.menuConfig.config.noResultsMenu || 'fileBaseListEntriesNoResults');
-						}
-						return callback(err);
-					});
-				}
-			],
-			() => {
-				self.finishedLoading();
-			}
-		);
-	}
-
-	populateCurrentEntryInfo(cb) {
-		const config		= this.menuConfig.config;
-		const currEntry		= this.currentFileEntry;
-
-		const uploadTimestampFormat = config.browseUploadTimestampFormat || config.uploadTimestampFormat || 'YYYY-MMM-DD';
-		const area					= FileArea.getFileAreaByTag(currEntry.areaTag);
-		const hashTagsSep			= config.hashTagsSep || ', ';
-		const isQueuedIndicator		= config.isQueuedIndicator || 'Y';
-		const isNotQueuedIndicator	= config.isNotQueuedIndicator || 'N';
-
-		const entryInfo = currEntry.entryInfo = {
-			fileId				: currEntry.fileId,
-			areaTag				: currEntry.areaTag,
-			areaName			: _.get(area, 'name') || 'N/A',
-			areaDesc			: _.get(area, 'desc') || 'N/A',
-			fileSha256			: currEntry.fileSha256,
-			fileName			: currEntry.fileName,
-			desc				: currEntry.desc || '',
-			descLong			: currEntry.descLong || '',
-			userRating			: currEntry.userRating,
-			uploadTimestamp		: moment(currEntry.uploadTimestamp).format(uploadTimestampFormat),
-			hashTags			: Array.from(currEntry.hashTags).join(hashTagsSep),
-			isQueued			: this.dlQueue.isQueued(currEntry) ? isQueuedIndicator : isNotQueuedIndicator,
-			webDlLink			: '',	//	:TODO: fetch web any existing web d/l link
-			webDlExpire			: '',	//	:TODO: fetch web d/l link expire time
-		};
-
-		//
-		//	We need the entry object to contain meta keys even if they are empty as
-		//	consumers may very likely attempt to use them
-		//
-		const metaValues = FileEntry.WellKnownMetaValues;
-		metaValues.forEach(name => {
-			const value = !_.isUndefined(currEntry.meta[name]) ? currEntry.meta[name] : 'N/A';
-			entryInfo[_.camelCase(name)] = value;
-		});
-
-		if(entryInfo.archiveType) {
-			const mimeType = resolveMimeType(entryInfo.archiveType);
-			let desc;
-			if(mimeType) {
-				let fileType = _.get(Config(), [ 'fileTypes', mimeType ] );
-
-				if(Array.isArray(fileType)) {
-					//	further refine by extention
-					fileType = fileType.find(ft => paths.extname(currEntry.fileName) === ft.ext);
-				}
-				desc = fileType && fileType.desc;
-			}
-			entryInfo.archiveTypeDesc = desc || mimeType || entryInfo.archiveType;
-		} else {
-			entryInfo.archiveTypeDesc = 'N/A';
-		}
-
-		entryInfo.uploadByUsername 	= entryInfo.uploadByUsername || 'N/A';	//	may be imported
-		entryInfo.hashTags			= entryInfo.hashTags || '(none)';
-
-		//	create a rating string, e.g. "**---"
-		const userRatingTicked		= config.userRatingTicked || '*';
-		const userRatingUnticked	= config.userRatingUnticked || '';
-		entryInfo.userRating		= ~~Math.round(entryInfo.userRating) || 0;	//	be safe!
-		entryInfo.userRatingString	= userRatingTicked.repeat(entryInfo.userRating);
-		if(entryInfo.userRating < 5) {
-			entryInfo.userRatingString += userRatingUnticked.repeat( (5 - entryInfo.userRating) );
-		}
-
-		FileAreaWeb.getExistingTempDownloadServeItem(this.client, this.currentFileEntry, (err, serveItem) => {
-			if(err) {
-				entryInfo.webDlExpire	= '';
-				if(ErrNotEnabled === err.reasonCode) {
-					entryInfo.webDlExpire	= config.webDlLinkNoWebserver || 'Web server is not enabled';
-				} else {
-					entryInfo.webDlLink 	= config.webDlLinkNeedsGenerated || 'Not yet generated';
-				}
-			} else {
-				const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
-
-				entryInfo.webDlLink		= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
-				entryInfo.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
-			}
-
-			return cb(null);
-		});
-	}
-
-	populateCustomLabels(category, startId) {
-		return this.updateCustomViewTextsWithFilter(category, startId, this.currentFileEntry.entryInfo);
-	}
-
-	displayArtAndPrepViewController(name, options, cb) {
-		const self		= this;
-		const config	= this.menuConfig.config;
-
-		async.waterfall(
-			[
-				function readyAndDisplayArt(callback) {
-					if(options.clearScreen) {
-						self.client.term.rawWrite(ansi.resetScreen());
-					}
-
-					theme.displayThemedAsset(
-						config.art[name],
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function prepeareViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers[name])) {
-						const vcOpts = {
-							client		: self.client,
-							formId		: FormIds[name],
-						};
-
-						if(!_.isUndefined(options.noInput)) {
-							vcOpts.noInput = options.noInput;
-						}
-
-						const vc = self.addViewController(name, new ViewController(vcOpts));
-
-						if('details' === name) {
-							try {
-								self.detailsInfoArea = {
-									top		: artData.mciMap.XY2.position,
-									bottom	: artData.mciMap.XY3.position,
-								};
-							} catch(e) {
-								return callback(Errors.DoesNotExist('Missing XY2 and XY3 position indicators!'));
-							}
-						}
-
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds[name],
-						};
-
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					}
-
-					self.viewControllers[name].setFocus(true);
-					return callback(null);
-
-				},
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
-
-	displayBrowsePage(clearScreen, cb) {
-		const self		= this;
-
-		async.series(
-			[
-				function fetchEntryData(callback) {
-					if(self.fileList) {
-						return callback(null);
-					}
-					return self.loadFileIds(false, callback);	//	false=do not force
-				},
-				function checkEmptyResults(callback) {
-					if(0 === self.fileList.length) {
-						return callback(Errors.General('No results for criteria', 'NORESULTS'));
-					}
-					return callback(null);
-				},
-				function prepArtAndViewController(callback) {
-					return self.displayArtAndPrepViewController('browse', { clearScreen : clearScreen }, callback);
-				},
-				function loadCurrentFileInfo(callback) {
-					self.currentFileEntry = new FileEntry();
-
-					self.currentFileEntry.load( self.fileList[ self.fileListPosition ], err => {
-						if(err) {
-							return callback(err);
-						}
-
-						return self.populateCurrentEntryInfo(callback);
-					});
-				},
-				function populateDesc(callback) {
-					if(_.isString(self.currentFileEntry.desc)) {
-						const descView = self.viewControllers.browse.getView(MciViewIds.browse.desc);
-						if(descView) {
-							//
-							//	For descriptions we want to support as many color code systems
-							//	as we can for coverage of what is found in the while (e.g. Renegade
-							//	pipes, PCB @X##, etc.)
-							//
-							//	MLTEV doesn't support all of this, so convert. If we produced ANSI
-							//	esc sequences, we'll proceed with specialization, else just treat
-							//	it as text.
-							//
-							const desc = controlCodesToAnsi(self.currentFileEntry.desc);
-							if(desc.length != self.currentFileEntry.desc.length || isAnsi(desc)) {
-								descView.setAnsi(
-									desc,
-									{
-										prepped			: false,
-										forceLineTerm	: true
-									},
-									() => {
-										return callback(null);
-									}
-								);
-							} else {
-								descView.setText(self.currentFileEntry.desc);
-								return callback(null);
-							}
-						}
-					} else {
-						return callback(null);
-					}
-				},
-				function populateAdditionalViews(callback) {
-					self.updateQueueIndicator();
-					self.populateCustomLabels('browse', MciViewIds.browse.customRangeStart);
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
-
-	displayDetailsPage(cb) {
-		const self		= this;
-
-		async.series(
-			[
-				function prepArtAndViewController(callback) {
-					return self.displayArtAndPrepViewController('details', { clearScreen : true }, callback);
-				},
-				function populateViews(callback) {
-					self.populateCustomLabels('details', MciViewIds.details.customRangeStart);
-					return callback(null);
-				},
-				function prepSection(callback) {
-					return self.displayDetailsSection('general', false, callback);
-				},
-				function listenNavChanges(callback) {
-					const navMenu = self.viewControllers.details.getView(MciViewIds.details.navMenu);
-					navMenu.setFocusItemIndex(0);
-
-					navMenu.on('index update', index => {
-						const sectionName = {
-							0	: 'general',
-							1	: 'nfo',
-							2	: 'fileList',
-						}[index];
-
-						if(sectionName) {
-							self.displayDetailsSection(sectionName, true);
-						}
-					});
-
-					return callback(null);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
-
-	displayHelpPage(cb) {
-		this.displayAsset(
-			this.menuConfig.config.art.help,
-			{ clearScreen : true },
-			() => {
-				this.client.waitForKeyPress( () => {
-					return this.displayBrowsePage(true, cb);
-				});
-			}
-		);
-	}
-
-	fetchAndDisplayWebDownloadLink(cb) {
-		const self = this;
-
-		async.series(
-			[
-				function generateLinkIfNeeded(callback) {
-
-					if(self.currentFileEntry.webDlExpireTime < moment()) {
-						return callback(null);
-					}
-
-					const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
-
-					FileAreaWeb.createAndServeTempDownload(
-						self.client,
-						self.currentFileEntry,
-						{ expireTime : expireTime },
-						(err, url) => {
-							if(err) {
-								return callback(err);
-							}
-
-							self.currentFileEntry.webDlExpireTime = expireTime;
-
-							const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
-
-							self.currentFileEntry.entryInfo.webDlLink 	= ansi.vtxHyperlink(self.client, url) + url;
-							self.currentFileEntry.entryInfo.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
-
-							return callback(null);
-						}
-					);
-				},
-				function updateActiveViews(callback) {
-					self.updateCustomViewTextsWithFilter(
-						'browse',
-						MciViewIds.browse.customRangeStart, self.currentFileEntry.entryInfo,
-						{ filter : [ '{webDlLink}', '{webDlExpire}' ] }
-					);
-					return callback(null);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
-
-	updateQueueIndicator() {
-		const isQueuedIndicator		= this.menuConfig.config.isQueuedIndicator || 'Y';
-		const isNotQueuedIndicator	= this.menuConfig.config.isNotQueuedIndicator || 'N';
-
-		this.currentFileEntry.entryInfo.isQueued = stringFormat(
-			this.dlQueue.isQueued(this.currentFileEntry) ?
-				isQueuedIndicator :
-				isNotQueuedIndicator
-		);
-
-		this.updateCustomViewTextsWithFilter(
-			'browse',
-			MciViewIds.browse.customRangeStart,
-			this.currentFileEntry.entryInfo,
-			{ filter : [ '{isQueued}' ] }
-		);
-	}
-
-	cacheArchiveEntries(cb) {
-		//	check cache
-		if(this.currentFileEntry.archiveEntries) {
-			return cb(null, 'cache');
-		}
-
-		const areaInfo = FileArea.getFileAreaByTag(this.currentFileEntry.areaTag);
-		if(!areaInfo) {
-			return cb(Errors.Invalid('Invalid area tag'));
-		}
-
-		const filePath		= this.currentFileEntry.filePath;
-		const archiveUtil	= ArchiveUtil.getInstance();
-
-		archiveUtil.listEntries(filePath, this.currentFileEntry.entryInfo.archiveType, (err, entries) => {
-			if(err) {
-				return cb(err);
-			}
-
-			this.currentFileEntry.archiveEntries = entries;
-			return cb(null, 're-cached');
-		});
-	}
-
-	populateFileListing() {
-		const fileListView = this.viewControllers.detailsFileList.getView(MciViewIds.detailsFileList.fileList);
-
-		if(this.currentFileEntry.entryInfo.archiveType) {
-			this.cacheArchiveEntries( (err, cacheStatus) => {
-				if(err) {
-					//	:TODO: Handle me!!!
-					fileListView.setItems( [ 'Failed getting file listing' ] );	//	:TODO: make this not suck
-					return;
-				}
-
-				if('re-cached' === cacheStatus) {
-					const fileListEntryFormat 		= this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';	//	:TODO: use byteSize here?
-					const focusFileListEntryFormat	= this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
-
-					fileListView.setItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(fileListEntryFormat, entry) ) );
-					fileListView.setFocusItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(focusFileListEntryFormat, entry) ) );
-
-					fileListView.redraw();
-				}
-			});
-		} else {
-			fileListView.setItems( [ stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } ) ] );
-		}
-	}
-
-	displayDetailsSection(sectionName, clearArea, cb) {
-		const self		= this;
-		const name		= `details${_.upperFirst(sectionName)}`;
-
-		async.series(
-			[
-				function detachPrevious(callback) {
-					if(self.lastDetailsViewController) {
-						self.lastDetailsViewController.detachClientEvents();
-					}
-					return callback(null);
-				},
-				function prepArtAndViewController(callback) {
-
-					function gotoTopPos() {
-						self.client.term.rawWrite(ansi.goto(self.detailsInfoArea.top[0], 1));
-					}
-
-					gotoTopPos();
-
-					if(clearArea) {
-						self.client.term.rawWrite(ansi.reset());
-
-						let pos 		= self.detailsInfoArea.top[0];
-						const bottom	= self.detailsInfoArea.bottom[0];
-
-						while(pos++ <= bottom) {
-							self.client.term.rawWrite(ansi.eraseLine() + ansi.down());
-						}
-
-						gotoTopPos();
-					}
-
-					return self.displayArtAndPrepViewController(name, { clearScreen : false, noInput : true }, callback);
-				},
-				function populateViews(callback) {
-					self.lastDetailsViewController = self.viewControllers[name];
-
-					switch(sectionName) {
-						case 'nfo' :
-							{
-								const nfoView = self.viewControllers.detailsNfo.getView(MciViewIds.detailsNfo.nfo);
-								if(!nfoView) {
-									return callback(null);
-								}
-
-								if(isAnsi(self.currentFileEntry.entryInfo.descLong)) {
-									nfoView.setAnsi(
-										self.currentFileEntry.entryInfo.descLong,
-										{
-											prepped			: false,
-											forceLineTerm	: true,
-										},
-										() => {
-											return callback(null);
-										}
-									);
-								} else {
-									nfoView.setText(self.currentFileEntry.entryInfo.descLong);
-									return callback(null);
-								}
-							}
-							break;
-
-						case 'fileList' :
-							self.populateFileListing();
-							return callback(null);
-
-						default :
-							return callback(null);
-					}
-				},
-				function setLabels(callback) {
-					self.populateCustomLabels(name, MciViewIds[name].customRangeStart);
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
-
-	loadFileIds(force, cb) {
-		if(force || (_.isUndefined(this.fileList) || _.isUndefined(this.fileListPosition))) {
-			this.fileListPosition	= 0;
-
-			const filterCriteria = Object.assign({}, this.filterCriteria);
-			if(!filterCriteria.areaTag) {
-				filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(this.client);
-			}
-
-			FileEntry.findFiles(filterCriteria, (err, fileIds) => {
-				this.fileList = fileIds;
-				return cb(err);
-			});
-		}
-	}
+    constructor(options) {
+        super(options);
+
+        this.filterCriteria		= _.get(options, 'extraArgs.filterCriteria');
+        this.fileList			= _.get(options, 'extraArgs.fileList');
+        this.lastFileNextExit	= _.get(options, 'extraArgs.lastFileNextExit', true);
+
+        if(this.fileList) {
+            //	we'll need to adjust position as well!
+            this.fileListPosition = 0;
+        }
+
+        this.dlQueue = new DownloadQueue(this.client);
+
+        if(!this.filterCriteria) {
+            this.filterCriteria = FileBaseFilters.getActiveFilter(this.client);
+        }
+
+        if(_.isString(this.filterCriteria)) {
+            this.filterCriteria = JSON.parse(this.filterCriteria);
+        }
+
+        if(_.has(options, 'lastMenuResult.value')) {
+            this.lastMenuResultValue = options.lastMenuResult.value;
+        }
+
+        this.menuMethods = {
+            nextFile : (formData, extraArgs, cb) => {
+                if(this.fileListPosition + 1 < this.fileList.length) {
+                    this.fileListPosition += 1;
+
+                    return this.displayBrowsePage(true, cb);	//	true=clerarScreen
+                }
+
+                if(this.lastFileNextExit) {
+                    return this.prevMenu(cb);
+                }
+
+                return cb(null);
+            },
+            prevFile : (formData, extraArgs, cb) => {
+                if(this.fileListPosition > 0) {
+                    --this.fileListPosition;
+
+                    return this.displayBrowsePage(true, cb);	//	true=clearScreen
+                }
+
+                return cb(null);
+            },
+            viewDetails : (formData, extraArgs, cb) => {
+                this.viewControllers.browse.setFocus(false);
+                return this.displayDetailsPage(cb);
+            },
+            detailsQuit : (formData, extraArgs, cb) => {
+                [ 'detailsNfo', 'detailsFileList', 'details' ].forEach(n => {
+                    const vc = this.viewControllers[n];
+                    if(vc) {
+                        vc.detachClientEvents();
+                    }
+                });
+
+                return this.displayBrowsePage(true, cb);	//	true=clearScreen
+            },
+            toggleQueue : (formData, extraArgs, cb) => {
+                this.dlQueue.toggle(this.currentFileEntry);
+                this.updateQueueIndicator();
+                return cb(null);
+            },
+            showWebDownloadLink : (formData, extraArgs, cb) => {
+                return this.fetchAndDisplayWebDownloadLink(cb);
+            },
+            displayHelp : (formData, extraArgs, cb) => {
+                return this.displayHelpPage(cb);
+            }
+        };
+    }
+
+    enter() {
+        super.enter();
+    }
+
+    leave() {
+        super.leave();
+    }
+
+    getSaveState() {
+        return {
+            fileList			: this.fileList,
+            fileListPosition	: this.fileListPosition,
+        };
+    }
+
+    restoreSavedState(savedState) {
+        if(savedState) {
+            this.fileList			= savedState.fileList;
+            this.fileListPosition	= savedState.fileListPosition;
+        }
+    }
+
+    updateFileEntryWithMenuResult(cb) {
+        if(!this.lastMenuResultValue) {
+            return cb(null);
+        }
+
+        if(_.isNumber(this.lastMenuResultValue.rating)) {
+            const fileId = this.fileList[this.fileListPosition];
+            FileEntry.persistUserRating(fileId, this.client.user.userId, this.lastMenuResultValue.rating, err => {
+                if(err) {
+                    this.client.log.warn( { error : err.message, fileId : fileId }, 'Failed to persist file rating' );
+                }
+                return cb(null);
+            });
+        } else {
+            return cb(null);
+        }
+    }
+
+    initSequence() {
+        const self = this;
+
+        async.series(
+            [
+                function preInit(callback) {
+                    return self.updateFileEntryWithMenuResult(callback);
+                },
+                function beforeArt(callback) {
+                    return self.beforeArt(callback);
+                },
+                function display(callback) {
+                    return self.displayBrowsePage(false, err => {
+                        if(err && 'NORESULTS' === err.reasonCode) {
+                            self.gotoMenu(self.menuConfig.config.noResultsMenu || 'fileBaseListEntriesNoResults');
+                        }
+                        return callback(err);
+                    });
+                }
+            ],
+            () => {
+                self.finishedLoading();
+            }
+        );
+    }
+
+    populateCurrentEntryInfo(cb) {
+        const config		= this.menuConfig.config;
+        const currEntry		= this.currentFileEntry;
+
+        const uploadTimestampFormat = config.browseUploadTimestampFormat || config.uploadTimestampFormat || 'YYYY-MMM-DD';
+        const area					= FileArea.getFileAreaByTag(currEntry.areaTag);
+        const hashTagsSep			= config.hashTagsSep || ', ';
+        const isQueuedIndicator		= config.isQueuedIndicator || 'Y';
+        const isNotQueuedIndicator	= config.isNotQueuedIndicator || 'N';
+
+        const entryInfo = currEntry.entryInfo = {
+            fileId				: currEntry.fileId,
+            areaTag				: currEntry.areaTag,
+            areaName			: _.get(area, 'name') || 'N/A',
+            areaDesc			: _.get(area, 'desc') || 'N/A',
+            fileSha256			: currEntry.fileSha256,
+            fileName			: currEntry.fileName,
+            desc				: currEntry.desc || '',
+            descLong			: currEntry.descLong || '',
+            userRating			: currEntry.userRating,
+            uploadTimestamp		: moment(currEntry.uploadTimestamp).format(uploadTimestampFormat),
+            hashTags			: Array.from(currEntry.hashTags).join(hashTagsSep),
+            isQueued			: this.dlQueue.isQueued(currEntry) ? isQueuedIndicator : isNotQueuedIndicator,
+            webDlLink			: '',	//	:TODO: fetch web any existing web d/l link
+            webDlExpire			: '',	//	:TODO: fetch web d/l link expire time
+        };
+
+        //
+        //	We need the entry object to contain meta keys even if they are empty as
+        //	consumers may very likely attempt to use them
+        //
+        const metaValues = FileEntry.WellKnownMetaValues;
+        metaValues.forEach(name => {
+            const value = !_.isUndefined(currEntry.meta[name]) ? currEntry.meta[name] : 'N/A';
+            entryInfo[_.camelCase(name)] = value;
+        });
+
+        if(entryInfo.archiveType) {
+            const mimeType = resolveMimeType(entryInfo.archiveType);
+            let desc;
+            if(mimeType) {
+                let fileType = _.get(Config(), [ 'fileTypes', mimeType ] );
+
+                if(Array.isArray(fileType)) {
+                    //	further refine by extention
+                    fileType = fileType.find(ft => paths.extname(currEntry.fileName) === ft.ext);
+                }
+                desc = fileType && fileType.desc;
+            }
+            entryInfo.archiveTypeDesc = desc || mimeType || entryInfo.archiveType;
+        } else {
+            entryInfo.archiveTypeDesc = 'N/A';
+        }
+
+        entryInfo.uploadByUsername 	= entryInfo.uploadByUsername || 'N/A';	//	may be imported
+        entryInfo.hashTags			= entryInfo.hashTags || '(none)';
+
+        //	create a rating string, e.g. "**---"
+        const userRatingTicked		= config.userRatingTicked || '*';
+        const userRatingUnticked	= config.userRatingUnticked || '';
+        entryInfo.userRating		= ~~Math.round(entryInfo.userRating) || 0;	//	be safe!
+        entryInfo.userRatingString	= userRatingTicked.repeat(entryInfo.userRating);
+        if(entryInfo.userRating < 5) {
+            entryInfo.userRatingString += userRatingUnticked.repeat( (5 - entryInfo.userRating) );
+        }
+
+        FileAreaWeb.getExistingTempDownloadServeItem(this.client, this.currentFileEntry, (err, serveItem) => {
+            if(err) {
+                entryInfo.webDlExpire	= '';
+                if(ErrNotEnabled === err.reasonCode) {
+                    entryInfo.webDlExpire	= config.webDlLinkNoWebserver || 'Web server is not enabled';
+                } else {
+                    entryInfo.webDlLink 	= config.webDlLinkNeedsGenerated || 'Not yet generated';
+                }
+            } else {
+                const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+
+                entryInfo.webDlLink		= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
+                entryInfo.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+            }
+
+            return cb(null);
+        });
+    }
+
+    populateCustomLabels(category, startId) {
+        return this.updateCustomViewTextsWithFilter(category, startId, this.currentFileEntry.entryInfo);
+    }
+
+    displayArtAndPrepViewController(name, options, cb) {
+        const self		= this;
+        const config	= this.menuConfig.config;
+
+        async.waterfall(
+            [
+                function readyAndDisplayArt(callback) {
+                    if(options.clearScreen) {
+                        self.client.term.rawWrite(ansi.resetScreen());
+                    }
+
+                    theme.displayThemedAsset(
+                        config.art[name],
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function prepeareViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers[name])) {
+                        const vcOpts = {
+                            client		: self.client,
+                            formId		: FormIds[name],
+                        };
+
+                        if(!_.isUndefined(options.noInput)) {
+                            vcOpts.noInput = options.noInput;
+                        }
+
+                        const vc = self.addViewController(name, new ViewController(vcOpts));
+
+                        if('details' === name) {
+                            try {
+                                self.detailsInfoArea = {
+                                    top		: artData.mciMap.XY2.position,
+                                    bottom	: artData.mciMap.XY3.position,
+                                };
+                            } catch(e) {
+                                return callback(Errors.DoesNotExist('Missing XY2 and XY3 position indicators!'));
+                            }
+                        }
+
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds[name],
+                        };
+
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    }
+
+                    self.viewControllers[name].setFocus(true);
+                    return callback(null);
+
+                },
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    displayBrowsePage(clearScreen, cb) {
+        const self		= this;
+
+        async.series(
+            [
+                function fetchEntryData(callback) {
+                    if(self.fileList) {
+                        return callback(null);
+                    }
+                    return self.loadFileIds(false, callback);	//	false=do not force
+                },
+                function checkEmptyResults(callback) {
+                    if(0 === self.fileList.length) {
+                        return callback(Errors.General('No results for criteria', 'NORESULTS'));
+                    }
+                    return callback(null);
+                },
+                function prepArtAndViewController(callback) {
+                    return self.displayArtAndPrepViewController('browse', { clearScreen : clearScreen }, callback);
+                },
+                function loadCurrentFileInfo(callback) {
+                    self.currentFileEntry = new FileEntry();
+
+                    self.currentFileEntry.load( self.fileList[ self.fileListPosition ], err => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        return self.populateCurrentEntryInfo(callback);
+                    });
+                },
+                function populateDesc(callback) {
+                    if(_.isString(self.currentFileEntry.desc)) {
+                        const descView = self.viewControllers.browse.getView(MciViewIds.browse.desc);
+                        if(descView) {
+                            //
+                            //	For descriptions we want to support as many color code systems
+                            //	as we can for coverage of what is found in the while (e.g. Renegade
+                            //	pipes, PCB @X##, etc.)
+                            //
+                            //	MLTEV doesn't support all of this, so convert. If we produced ANSI
+                            //	esc sequences, we'll proceed with specialization, else just treat
+                            //	it as text.
+                            //
+                            const desc = controlCodesToAnsi(self.currentFileEntry.desc);
+                            if(desc.length != self.currentFileEntry.desc.length || isAnsi(desc)) {
+                                descView.setAnsi(
+                                    desc,
+                                    {
+                                        prepped			: false,
+                                        forceLineTerm	: true
+                                    },
+                                    () => {
+                                        return callback(null);
+                                    }
+                                );
+                            } else {
+                                descView.setText(self.currentFileEntry.desc);
+                                return callback(null);
+                            }
+                        }
+                    } else {
+                        return callback(null);
+                    }
+                },
+                function populateAdditionalViews(callback) {
+                    self.updateQueueIndicator();
+                    self.populateCustomLabels('browse', MciViewIds.browse.customRangeStart);
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
+
+    displayDetailsPage(cb) {
+        const self		= this;
+
+        async.series(
+            [
+                function prepArtAndViewController(callback) {
+                    return self.displayArtAndPrepViewController('details', { clearScreen : true }, callback);
+                },
+                function populateViews(callback) {
+                    self.populateCustomLabels('details', MciViewIds.details.customRangeStart);
+                    return callback(null);
+                },
+                function prepSection(callback) {
+                    return self.displayDetailsSection('general', false, callback);
+                },
+                function listenNavChanges(callback) {
+                    const navMenu = self.viewControllers.details.getView(MciViewIds.details.navMenu);
+                    navMenu.setFocusItemIndex(0);
+
+                    navMenu.on('index update', index => {
+                        const sectionName = {
+                            0	: 'general',
+                            1	: 'nfo',
+                            2	: 'fileList',
+                        }[index];
+
+                        if(sectionName) {
+                            self.displayDetailsSection(sectionName, true);
+                        }
+                    });
+
+                    return callback(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    displayHelpPage(cb) {
+        this.displayAsset(
+            this.menuConfig.config.art.help,
+            { clearScreen : true },
+            () => {
+                this.client.waitForKeyPress( () => {
+                    return this.displayBrowsePage(true, cb);
+                });
+            }
+        );
+    }
+
+    fetchAndDisplayWebDownloadLink(cb) {
+        const self = this;
+
+        async.series(
+            [
+                function generateLinkIfNeeded(callback) {
+
+                    if(self.currentFileEntry.webDlExpireTime < moment()) {
+                        return callback(null);
+                    }
+
+                    const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
+
+                    FileAreaWeb.createAndServeTempDownload(
+                        self.client,
+                        self.currentFileEntry,
+                        { expireTime : expireTime },
+                        (err, url) => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            self.currentFileEntry.webDlExpireTime = expireTime;
+
+                            const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+
+                            self.currentFileEntry.entryInfo.webDlLink 	= ansi.vtxHyperlink(self.client, url) + url;
+                            self.currentFileEntry.entryInfo.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
+
+                            return callback(null);
+                        }
+                    );
+                },
+                function updateActiveViews(callback) {
+                    self.updateCustomViewTextsWithFilter(
+                        'browse',
+                        MciViewIds.browse.customRangeStart, self.currentFileEntry.entryInfo,
+                        { filter : [ '{webDlLink}', '{webDlExpire}' ] }
+                    );
+                    return callback(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    updateQueueIndicator() {
+        const isQueuedIndicator		= this.menuConfig.config.isQueuedIndicator || 'Y';
+        const isNotQueuedIndicator	= this.menuConfig.config.isNotQueuedIndicator || 'N';
+
+        this.currentFileEntry.entryInfo.isQueued = stringFormat(
+            this.dlQueue.isQueued(this.currentFileEntry) ?
+                isQueuedIndicator :
+                isNotQueuedIndicator
+        );
+
+        this.updateCustomViewTextsWithFilter(
+            'browse',
+            MciViewIds.browse.customRangeStart,
+            this.currentFileEntry.entryInfo,
+            { filter : [ '{isQueued}' ] }
+        );
+    }
+
+    cacheArchiveEntries(cb) {
+        //	check cache
+        if(this.currentFileEntry.archiveEntries) {
+            return cb(null, 'cache');
+        }
+
+        const areaInfo = FileArea.getFileAreaByTag(this.currentFileEntry.areaTag);
+        if(!areaInfo) {
+            return cb(Errors.Invalid('Invalid area tag'));
+        }
+
+        const filePath		= this.currentFileEntry.filePath;
+        const archiveUtil	= ArchiveUtil.getInstance();
+
+        archiveUtil.listEntries(filePath, this.currentFileEntry.entryInfo.archiveType, (err, entries) => {
+            if(err) {
+                return cb(err);
+            }
+
+            this.currentFileEntry.archiveEntries = entries;
+            return cb(null, 're-cached');
+        });
+    }
+
+    populateFileListing() {
+        const fileListView = this.viewControllers.detailsFileList.getView(MciViewIds.detailsFileList.fileList);
+
+        if(this.currentFileEntry.entryInfo.archiveType) {
+            this.cacheArchiveEntries( (err, cacheStatus) => {
+                if(err) {
+                    //	:TODO: Handle me!!!
+                    fileListView.setItems( [ 'Failed getting file listing' ] );	//	:TODO: make this not suck
+                    return;
+                }
+
+                if('re-cached' === cacheStatus) {
+                    const fileListEntryFormat 		= this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';	//	:TODO: use byteSize here?
+                    const focusFileListEntryFormat	= this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
+
+                    fileListView.setItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(fileListEntryFormat, entry) ) );
+                    fileListView.setFocusItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(focusFileListEntryFormat, entry) ) );
+
+                    fileListView.redraw();
+                }
+            });
+        } else {
+            fileListView.setItems( [ stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } ) ] );
+        }
+    }
+
+    displayDetailsSection(sectionName, clearArea, cb) {
+        const self		= this;
+        const name		= `details${_.upperFirst(sectionName)}`;
+
+        async.series(
+            [
+                function detachPrevious(callback) {
+                    if(self.lastDetailsViewController) {
+                        self.lastDetailsViewController.detachClientEvents();
+                    }
+                    return callback(null);
+                },
+                function prepArtAndViewController(callback) {
+
+                    function gotoTopPos() {
+                        self.client.term.rawWrite(ansi.goto(self.detailsInfoArea.top[0], 1));
+                    }
+
+                    gotoTopPos();
+
+                    if(clearArea) {
+                        self.client.term.rawWrite(ansi.reset());
+
+                        let pos 		= self.detailsInfoArea.top[0];
+                        const bottom	= self.detailsInfoArea.bottom[0];
+
+                        while(pos++ <= bottom) {
+                            self.client.term.rawWrite(ansi.eraseLine() + ansi.down());
+                        }
+
+                        gotoTopPos();
+                    }
+
+                    return self.displayArtAndPrepViewController(name, { clearScreen : false, noInput : true }, callback);
+                },
+                function populateViews(callback) {
+                    self.lastDetailsViewController = self.viewControllers[name];
+
+                    switch(sectionName) {
+                        case 'nfo' :
+                            {
+                                const nfoView = self.viewControllers.detailsNfo.getView(MciViewIds.detailsNfo.nfo);
+                                if(!nfoView) {
+                                    return callback(null);
+                                }
+
+                                if(isAnsi(self.currentFileEntry.entryInfo.descLong)) {
+                                    nfoView.setAnsi(
+                                        self.currentFileEntry.entryInfo.descLong,
+                                        {
+                                            prepped			: false,
+                                            forceLineTerm	: true,
+                                        },
+                                        () => {
+                                            return callback(null);
+                                        }
+                                    );
+                                } else {
+                                    nfoView.setText(self.currentFileEntry.entryInfo.descLong);
+                                    return callback(null);
+                                }
+                            }
+                            break;
+
+                        case 'fileList' :
+                            self.populateFileListing();
+                            return callback(null);
+
+                        default :
+                            return callback(null);
+                    }
+                },
+                function setLabels(callback) {
+                    self.populateCustomLabels(name, MciViewIds[name].customRangeStart);
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
+
+    loadFileIds(force, cb) {
+        if(force || (_.isUndefined(this.fileList) || _.isUndefined(this.fileListPosition))) {
+            this.fileListPosition	= 0;
+
+            const filterCriteria = Object.assign({}, this.filterCriteria);
+            if(!filterCriteria.areaTag) {
+                filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(this.client);
+            }
+
+            FileEntry.findFiles(filterCriteria, (err, fileIds) => {
+                this.fileList = fileIds;
+                return cb(err);
+            });
+        }
+    }
 };
diff --git a/core/file_area_web.js b/core/file_area_web.js
index 94a2a664..88c108f6 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -26,470 +26,470 @@ const mimeTypes		= require('mime-types');
 const yazl			= require('yazl');
 
 function notEnabledError() {
-	return Errors.General('Web server is not enabled', ErrNotEnabled);
+    return Errors.General('Web server is not enabled', ErrNotEnabled);
 }
 
 class FileAreaWebAccess {
-	constructor() {
-		this.hashids		= new hashids(Config().general.boardName);
-		this.expireTimers	= {};	//	hashId->timer
-	}
+    constructor() {
+        this.hashids		= new hashids(Config().general.boardName);
+        this.expireTimers	= {};	//	hashId->timer
+    }
 
-	startup(cb) {
-		const self = this;
+    startup(cb) {
+        const self = this;
 
-		async.series(
-			[
-				function initFromDb(callback) {
-					return self.load(callback);
-				},
-				function addWebRoute(callback) {
-					self.webServer = getServer(webServerPackageName);
-					if(!self.webServer) {
-						return callback(Errors.DoesNotExist(`Server with package name "${webServerPackageName}" does not exist`));
-					}
+        async.series(
+            [
+                function initFromDb(callback) {
+                    return self.load(callback);
+                },
+                function addWebRoute(callback) {
+                    self.webServer = getServer(webServerPackageName);
+                    if(!self.webServer) {
+                        return callback(Errors.DoesNotExist(`Server with package name "${webServerPackageName}" does not exist`));
+                    }
 
-					if(self.isEnabled()) {
-						const routeAdded = self.webServer.instance.addRoute({
-							method	: 'GET',
-							path	: Config().fileBase.web.routePath,
-							handler	: self.routeWebRequest.bind(self),
-						});
-						return callback(routeAdded ? null : Errors.General('Failed adding route'));
-					} else {
-						return callback(null);	//	not enabled, but no error
-					}
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                    if(self.isEnabled()) {
+                        const routeAdded = self.webServer.instance.addRoute({
+                            method	: 'GET',
+                            path	: Config().fileBase.web.routePath,
+                            handler	: self.routeWebRequest.bind(self),
+                        });
+                        return callback(routeAdded ? null : Errors.General('Failed adding route'));
+                    } else {
+                        return callback(null);	//	not enabled, but no error
+                    }
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	shutdown(cb) {
-		return cb(null);
-	}
+    shutdown(cb) {
+        return cb(null);
+    }
 
-	isEnabled() {
-		return this.webServer.instance.isEnabled();
-	}
+    isEnabled() {
+        return this.webServer.instance.isEnabled();
+    }
 
-	static getHashIdTypes() {
-		return {
-			SingleFile		: 0,
-			BatchArchive	: 1,
-		};
-	}
+    static getHashIdTypes() {
+        return {
+            SingleFile		: 0,
+            BatchArchive	: 1,
+        };
+    }
 
-	load(cb) {
-		//
-		//	Load entries, register expiration timers
-		//
-		FileDb.each(
-			`SELECT hash_id, expire_timestamp
+    load(cb) {
+        //
+        //	Load entries, register expiration timers
+        //
+        FileDb.each(
+            `SELECT hash_id, expire_timestamp
 			FROM file_web_serve;`,
-			(err, row) => {
-				if(row) {
-					this.scheduleExpire(row.hash_id, moment(row.expire_timestamp));
-				}
-			},
-			err => {
-				return cb(err);
-			}
-		);
-	}
+            (err, row) => {
+                if(row) {
+                    this.scheduleExpire(row.hash_id, moment(row.expire_timestamp));
+                }
+            },
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	removeEntry(hashId) {
-		//
-		//	Delete record from DB, and our timer
-		//
-		FileDb.run(
-			`DELETE FROM file_web_serve
+    removeEntry(hashId) {
+        //
+        //	Delete record from DB, and our timer
+        //
+        FileDb.run(
+            `DELETE FROM file_web_serve
 			WHERE hash_id = ?;`,
-			[ hashId ]
-		);
+            [ hashId ]
+        );
 
-		delete this.expireTimers[hashId];
-	}
+        delete this.expireTimers[hashId];
+    }
 
-	scheduleExpire(hashId, expireTime) {
+    scheduleExpire(hashId, expireTime) {
 
-		//	remove any previous entry for this hashId
-		const previous = this.expireTimers[hashId];
-		if(previous) {
-			clearTimeout(previous);
-			delete this.expireTimers[hashId];
-		}
+        //	remove any previous entry for this hashId
+        const previous = this.expireTimers[hashId];
+        if(previous) {
+            clearTimeout(previous);
+            delete this.expireTimers[hashId];
+        }
 
-		const timeoutMs = expireTime.diff(moment());
+        const timeoutMs = expireTime.diff(moment());
 
-		if(timeoutMs <= 0) {
-			setImmediate( () => {
-				this.removeEntry(hashId);
-			});
-		} else {
-			this.expireTimers[hashId] = setTimeout( () => {
-				this.removeEntry(hashId);
-			}, timeoutMs);
-		}
-	}
+        if(timeoutMs <= 0) {
+            setImmediate( () => {
+                this.removeEntry(hashId);
+            });
+        } else {
+            this.expireTimers[hashId] = setTimeout( () => {
+                this.removeEntry(hashId);
+            }, timeoutMs);
+        }
+    }
 
-	loadServedHashId(hashId, cb) {
-		FileDb.get(
-			`SELECT expire_timestamp FROM
+    loadServedHashId(hashId, cb) {
+        FileDb.get(
+            `SELECT expire_timestamp FROM
 			file_web_serve
 			WHERE hash_id = ?`,
-			[ hashId ],
-			(err, result) => {
-				if(err || !result) {
-					return cb(err ? err : Errors.DoesNotExist('Invalid or missing hash ID'));
-				}
+            [ hashId ],
+            (err, result) => {
+                if(err || !result) {
+                    return cb(err ? err : Errors.DoesNotExist('Invalid or missing hash ID'));
+                }
 
-				const decoded = this.hashids.decode(hashId);
+                const decoded = this.hashids.decode(hashId);
 
-				//	decode() should provide an array of [ userId, hashIdType, id, ... ]
-				if(!Array.isArray(decoded) || decoded.length < 3) {
-					return cb(Errors.Invalid('Invalid or unknown hash ID'));
-				}
+                //	decode() should provide an array of [ userId, hashIdType, id, ... ]
+                if(!Array.isArray(decoded) || decoded.length < 3) {
+                    return cb(Errors.Invalid('Invalid or unknown hash ID'));
+                }
 
-				const servedItem = {
-					hashId			: hashId,
-					userId			: decoded[0],
-					hashIdType		: decoded[1],
-					expireTimestamp	: moment(result.expire_timestamp),
-				};
+                const servedItem = {
+                    hashId			: hashId,
+                    userId			: decoded[0],
+                    hashIdType		: decoded[1],
+                    expireTimestamp	: moment(result.expire_timestamp),
+                };
 
-				if(FileAreaWebAccess.getHashIdTypes().SingleFile === servedItem.hashIdType) {
-					servedItem.fileIds = decoded.slice(2);
-				}
+                if(FileAreaWebAccess.getHashIdTypes().SingleFile === servedItem.hashIdType) {
+                    servedItem.fileIds = decoded.slice(2);
+                }
 
-				return cb(null, servedItem);
-			}
-		);
-	}
+                return cb(null, servedItem);
+            }
+        );
+    }
 
-	getSingleFileHashId(client, fileEntry) {
-		return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().SingleFile, [ fileEntry.fileId ] );
-	}
+    getSingleFileHashId(client, fileEntry) {
+        return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().SingleFile, [ fileEntry.fileId ] );
+    }
 
-	getBatchArchiveHashId(client, batchId) {
-		return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().BatchArchive, batchId);
-	}
+    getBatchArchiveHashId(client, batchId) {
+        return this.getHashId(client, FileAreaWebAccess.getHashIdTypes().BatchArchive, batchId);
+    }
 
-	getHashId(client, hashIdType, identifier) {
-		return this.hashids.encode(client.user.userId, hashIdType, identifier);
-	}
+    getHashId(client, hashIdType, identifier) {
+        return this.hashids.encode(client.user.userId, hashIdType, identifier);
+    }
 
-	buildSingleFileTempDownloadLink(client, fileEntry, hashId) {
-		hashId = hashId || this.getSingleFileHashId(client, fileEntry);
+    buildSingleFileTempDownloadLink(client, fileEntry, hashId) {
+        hashId = hashId || this.getSingleFileHashId(client, fileEntry);
 
-		return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
-	}
+        return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
+    }
 
-	buildBatchArchiveTempDownloadLink(client, hashId) {
-		return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
-	}
+    buildBatchArchiveTempDownloadLink(client, hashId) {
+        return this.webServer.instance.buildUrl(`${Config().fileBase.web.path}${hashId}`);
+    }
 
-	getExistingTempDownloadServeItem(client, fileEntry, cb) {
-		if(!this.isEnabled()) {
-			return cb(notEnabledError());
-		}
+    getExistingTempDownloadServeItem(client, fileEntry, cb) {
+        if(!this.isEnabled()) {
+            return cb(notEnabledError());
+        }
 
-		const hashId = this.getSingleFileHashId(client, fileEntry);
-		this.loadServedHashId(hashId, (err, servedItem) => {
-			if(err) {
-				return cb(err);
-			}
+        const hashId = this.getSingleFileHashId(client, fileEntry);
+        this.loadServedHashId(hashId, (err, servedItem) => {
+            if(err) {
+                return cb(err);
+            }
 
-			servedItem.url = this.buildSingleFileTempDownloadLink(client, fileEntry);
+            servedItem.url = this.buildSingleFileTempDownloadLink(client, fileEntry);
 
-			return cb(null, servedItem);
-		});
-	}
+            return cb(null, servedItem);
+        });
+    }
 
-	_addOrUpdateHashIdRecord(dbOrTrans, hashId, expireTime, cb) {
-		//	add/update rec with hash id and (latest) timestamp
-		dbOrTrans.run(
-			`REPLACE INTO file_web_serve (hash_id, expire_timestamp)
+    _addOrUpdateHashIdRecord(dbOrTrans, hashId, expireTime, cb) {
+        //	add/update rec with hash id and (latest) timestamp
+        dbOrTrans.run(
+            `REPLACE INTO file_web_serve (hash_id, expire_timestamp)
 			VALUES (?, ?);`,
-			[ hashId, getISOTimestampString(expireTime) ],
-			err => {
-				if(err) {
-					return cb(err);
-				}
+            [ hashId, getISOTimestampString(expireTime) ],
+            err => {
+                if(err) {
+                    return cb(err);
+                }
 
-				this.scheduleExpire(hashId, expireTime);
+                this.scheduleExpire(hashId, expireTime);
 
-				return cb(null);
-			}
-		);
-	}
+                return cb(null);
+            }
+        );
+    }
 
-	createAndServeTempDownload(client, fileEntry, options, cb) {
-		if(!this.isEnabled()) {
-			return cb(notEnabledError());
-		}
+    createAndServeTempDownload(client, fileEntry, options, cb) {
+        if(!this.isEnabled()) {
+            return cb(notEnabledError());
+        }
 
-		const hashId		= this.getSingleFileHashId(client, fileEntry);
-		const url			= this.buildSingleFileTempDownloadLink(client, fileEntry, hashId);
-		options.expireTime	= options.expireTime || moment().add(2, 'days');
+        const hashId		= this.getSingleFileHashId(client, fileEntry);
+        const url			= this.buildSingleFileTempDownloadLink(client, fileEntry, hashId);
+        options.expireTime	= options.expireTime || moment().add(2, 'days');
 
-		this._addOrUpdateHashIdRecord(FileDb, hashId, options.expireTime, err => {
-			return cb(err, url);
-		});
-	}
+        this._addOrUpdateHashIdRecord(FileDb, hashId, options.expireTime, err => {
+            return cb(err, url);
+        });
+    }
 
-	createAndServeTempBatchDownload(client, fileEntries, options, cb) {
-		if(!this.isEnabled()) {
-			return cb(notEnabledError());
-		}
+    createAndServeTempBatchDownload(client, fileEntries, options, cb) {
+        if(!this.isEnabled()) {
+            return cb(notEnabledError());
+        }
 
-		const batchId		= moment().utc().unix();
-		const hashId		= this.getBatchArchiveHashId(client, batchId);
-		const url			= this.buildBatchArchiveTempDownloadLink(client, hashId);
-		options.expireTime	= options.expireTime || moment().add(2, 'days');
+        const batchId		= moment().utc().unix();
+        const hashId		= this.getBatchArchiveHashId(client, batchId);
+        const url			= this.buildBatchArchiveTempDownloadLink(client, hashId);
+        options.expireTime	= options.expireTime || moment().add(2, 'days');
 
-		FileDb.beginTransaction( (err, trans) => {
-			if(err) {
-				return cb(err);
-			}
+        FileDb.beginTransaction( (err, trans) => {
+            if(err) {
+                return cb(err);
+            }
 
-			this._addOrUpdateHashIdRecord(trans, hashId, options.expireTime, err => {
-				if(err) {
-					return trans.rollback( () => {
-						return cb(err);
-					});
-				}
+            this._addOrUpdateHashIdRecord(trans, hashId, options.expireTime, err => {
+                if(err) {
+                    return trans.rollback( () => {
+                        return cb(err);
+                    });
+                }
 
-				async.eachSeries(fileEntries, (entry, nextEntry) => {
-					trans.run(
-						`INSERT INTO file_web_serve_batch (hash_id, file_id)
+                async.eachSeries(fileEntries, (entry, nextEntry) => {
+                    trans.run(
+                        `INSERT INTO file_web_serve_batch (hash_id, file_id)
 						VALUES (?, ?);`,
-						[ hashId, entry.fileId ],
-						err => {
-							return nextEntry(err);
-						}
-					);
-				}, err => {
-					trans[err ? 'rollback' : 'commit']( () => {
-						return cb(err, url);
-					});
-				});
-			});
-		});
-	}
+                        [ hashId, entry.fileId ],
+                        err => {
+                            return nextEntry(err);
+                        }
+                    );
+                }, err => {
+                    trans[err ? 'rollback' : 'commit']( () => {
+                        return cb(err, url);
+                    });
+                });
+            });
+        });
+    }
 
-	fileNotFound(resp) {
-		return this.webServer.instance.fileNotFound(resp);
-	}
+    fileNotFound(resp) {
+        return this.webServer.instance.fileNotFound(resp);
+    }
 
-	routeWebRequest(req, resp) {
-		const hashId = paths.basename(req.url);
+    routeWebRequest(req, resp) {
+        const hashId = paths.basename(req.url);
 
-		Log.debug( { hashId : hashId, url : req.url }, 'File area web request');
+        Log.debug( { hashId : hashId, url : req.url }, 'File area web request');
 
-		this.loadServedHashId(hashId, (err, servedItem) => {
+        this.loadServedHashId(hashId, (err, servedItem) => {
 
-			if(err) {
-				return this.fileNotFound(resp);
-			}
+            if(err) {
+                return this.fileNotFound(resp);
+            }
 
-			const hashIdTypes = FileAreaWebAccess.getHashIdTypes();
-			switch(servedItem.hashIdType) {
-				case hashIdTypes.SingleFile :
-					return this.routeWebRequestForSingleFile(servedItem, req, resp);
+            const hashIdTypes = FileAreaWebAccess.getHashIdTypes();
+            switch(servedItem.hashIdType) {
+                case hashIdTypes.SingleFile :
+                    return this.routeWebRequestForSingleFile(servedItem, req, resp);
 
-				case hashIdTypes.BatchArchive :
-					return this.routeWebRequestForBatchArchive(servedItem, req, resp);
+                case hashIdTypes.BatchArchive :
+                    return this.routeWebRequestForBatchArchive(servedItem, req, resp);
 
-				default :
-					return this.fileNotFound(resp);
-			}
-		});
-	}
+                default :
+                    return this.fileNotFound(resp);
+            }
+        });
+    }
 
-	routeWebRequestForSingleFile(servedItem, req, resp) {
-		Log.debug( { servedItem : servedItem }, 'Single file web request');
+    routeWebRequestForSingleFile(servedItem, req, resp) {
+        Log.debug( { servedItem : servedItem }, 'Single file web request');
 
-		const fileEntry = new FileEntry();
+        const fileEntry = new FileEntry();
 
-		servedItem.fileId = servedItem.fileIds[0];
+        servedItem.fileId = servedItem.fileIds[0];
 
-		fileEntry.load(servedItem.fileId, err => {
-			if(err) {
-				return this.fileNotFound(resp);
-			}
+        fileEntry.load(servedItem.fileId, err => {
+            if(err) {
+                return this.fileNotFound(resp);
+            }
 
-			const filePath = fileEntry.filePath;
-			if(!filePath) {
-				return this.fileNotFound(resp);
-			}
+            const filePath = fileEntry.filePath;
+            if(!filePath) {
+                return this.fileNotFound(resp);
+            }
 
-			fs.stat(filePath, (err, stats) => {
-				if(err) {
-					return this.fileNotFound(resp);
-				}
+            fs.stat(filePath, (err, stats) => {
+                if(err) {
+                    return this.fileNotFound(resp);
+                }
 
-				resp.on('close', () => {
-					//	connection closed *before* the response was fully sent
-					//	:TODO: Log and such
-				});
+                resp.on('close', () => {
+                    //	connection closed *before* the response was fully sent
+                    //	:TODO: Log and such
+                });
 
-				resp.on('finish', () => {
-					//	transfer completed fully
-					this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size, [ fileEntry ]);
-				});
+                resp.on('finish', () => {
+                    //	transfer completed fully
+                    this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size, [ fileEntry ]);
+                });
 
-				const headers = {
-					'Content-Type'			: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
-					'Content-Length'		: stats.size,
-					'Content-Disposition'	: `attachment; filename="${fileEntry.fileName}"`,
-				};
+                const headers = {
+                    'Content-Type'			: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
+                    'Content-Length'		: stats.size,
+                    'Content-Disposition'	: `attachment; filename="${fileEntry.fileName}"`,
+                };
 
-				const readStream = fs.createReadStream(filePath);
-				resp.writeHead(200, headers);
-				return readStream.pipe(resp);
-			});
-		});
-	}
+                const readStream = fs.createReadStream(filePath);
+                resp.writeHead(200, headers);
+                return readStream.pipe(resp);
+            });
+        });
+    }
 
-	routeWebRequestForBatchArchive(servedItem, req, resp) {
-		Log.debug( { servedItem : servedItem }, 'Batch file web request');
+    routeWebRequestForBatchArchive(servedItem, req, resp) {
+        Log.debug( { servedItem : servedItem }, 'Batch file web request');
 
-		//
-		//	We are going to build an on-the-fly zip file stream of 1:n
-		//	files in the batch.
-		//
-		//	First, collect all file IDs
-		//
-		const self = this;
+        //
+        //	We are going to build an on-the-fly zip file stream of 1:n
+        //	files in the batch.
+        //
+        //	First, collect all file IDs
+        //
+        const self = this;
 
-		async.waterfall(
-			[
-				function fetchFileIds(callback) {
-					FileDb.all(
-						`SELECT file_id
+        async.waterfall(
+            [
+                function fetchFileIds(callback) {
+                    FileDb.all(
+                        `SELECT file_id
 						FROM file_web_serve_batch
 						WHERE hash_id = ?;`,
-						[ servedItem.hashId ],
-						(err, fileIdRows) => {
-							if(err || !Array.isArray(fileIdRows) || 0 === fileIdRows.length) {
-								return callback(Errors.DoesNotExist('Could not get file IDs for batch'));
-							}
+                        [ servedItem.hashId ],
+                        (err, fileIdRows) => {
+                            if(err || !Array.isArray(fileIdRows) || 0 === fileIdRows.length) {
+                                return callback(Errors.DoesNotExist('Could not get file IDs for batch'));
+                            }
 
-							return callback(null, fileIdRows.map(r => r.file_id));
-						}
-					);
-				},
-				function loadFileEntries(fileIds, callback) {
-					async.map(fileIds, (fileId, nextFileId) => {
-						const fileEntry = new FileEntry();
-						fileEntry.load(fileId, err => {
-							return nextFileId(err, fileEntry);
-						});
-					}, (err, fileEntries) => {
-						if(err) {
-							return callback(Errors.DoesNotExist('Could not load file IDs for batch'));
-						}
+                            return callback(null, fileIdRows.map(r => r.file_id));
+                        }
+                    );
+                },
+                function loadFileEntries(fileIds, callback) {
+                    async.map(fileIds, (fileId, nextFileId) => {
+                        const fileEntry = new FileEntry();
+                        fileEntry.load(fileId, err => {
+                            return nextFileId(err, fileEntry);
+                        });
+                    }, (err, fileEntries) => {
+                        if(err) {
+                            return callback(Errors.DoesNotExist('Could not load file IDs for batch'));
+                        }
 
-						return callback(null, fileEntries);
-					});
-				},
-				function createAndServeStream(fileEntries, callback) {
-					const filePaths = fileEntries.map(fe => fe.filePath);
-					Log.trace( { filePaths : filePaths }, 'Creating zip archive for batch web request');
+                        return callback(null, fileEntries);
+                    });
+                },
+                function createAndServeStream(fileEntries, callback) {
+                    const filePaths = fileEntries.map(fe => fe.filePath);
+                    Log.trace( { filePaths : filePaths }, 'Creating zip archive for batch web request');
 
-					const zipFile = new yazl.ZipFile();
+                    const zipFile = new yazl.ZipFile();
 
-					zipFile.on('error', err => {
-						Log.warn( { error : err.message }, 'Error adding file to batch web request archive');
-					});
+                    zipFile.on('error', err => {
+                        Log.warn( { error : err.message }, 'Error adding file to batch web request archive');
+                    });
 
-					filePaths.forEach(fp => {
-						zipFile.addFile(
-							fp,					//	path to physical file
-							paths.basename(fp),	//	filename/path *stored in archive*
-							{
-								compress : false,	//	:TODO: do this smartly - if ext is in set = false, else true via isArchive() or such... mimeDB has this for us.
-							}
-						);
-					});
+                    filePaths.forEach(fp => {
+                        zipFile.addFile(
+                            fp,					//	path to physical file
+                            paths.basename(fp),	//	filename/path *stored in archive*
+                            {
+                                compress : false,	//	:TODO: do this smartly - if ext is in set = false, else true via isArchive() or such... mimeDB has this for us.
+                            }
+                        );
+                    });
 
-					zipFile.end( finalZipSize => {
-						if(-1 === finalZipSize) {
-							return callback(Errors.UnexpectedState('Unable to acquire final zip size'));
-						}
+                    zipFile.end( finalZipSize => {
+                        if(-1 === finalZipSize) {
+                            return callback(Errors.UnexpectedState('Unable to acquire final zip size'));
+                        }
 
-						resp.on('close', () => {
-							//	connection closed *before* the response was fully sent
-							//	:TODO: Log and such
-						});
+                        resp.on('close', () => {
+                            //	connection closed *before* the response was fully sent
+                            //	:TODO: Log and such
+                        });
 
-						resp.on('finish', () => {
-							//	transfer completed fully
-							self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize, fileEntries);
-						});
+                        resp.on('finish', () => {
+                            //	transfer completed fully
+                            self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize, fileEntries);
+                        });
 
-						const batchFileName = `batch_${servedItem.hashId}.zip`;
+                        const batchFileName = `batch_${servedItem.hashId}.zip`;
 
-						const headers = {
-							'Content-Type'			: mimeTypes.contentType(batchFileName) || mimeTypes.contentType('.bin'),
-							'Content-Length'		: finalZipSize,
-							'Content-Disposition'	: `attachment; filename="${batchFileName}"`,
-						};
+                        const headers = {
+                            'Content-Type'			: mimeTypes.contentType(batchFileName) || mimeTypes.contentType('.bin'),
+                            'Content-Length'		: finalZipSize,
+                            'Content-Disposition'	: `attachment; filename="${batchFileName}"`,
+                        };
 
-						resp.writeHead(200, headers);
-						return zipFile.outputStream.pipe(resp);
-					});
-				}
-			],
-			err => {
-				if(err) {
-					//	:TODO: Log me!
-					return this.fileNotFound(resp);
-				}
+                        resp.writeHead(200, headers);
+                        return zipFile.outputStream.pipe(resp);
+                    });
+                }
+            ],
+            err => {
+                if(err) {
+                    //	:TODO: Log me!
+                    return this.fileNotFound(resp);
+                }
 
-				//	...otherwise, we would have called resp() already.
-			}
-		);
-	}
+                //	...otherwise, we would have called resp() already.
+            }
+        );
+    }
 
-	updateDownloadStatsForUserIdAndSystem(userId, dlBytes, fileEntries) {
-		async.waterfall(
-			[
-				function fetchActiveUser(callback) {
-					const clientForUserId = getConnectionByUserId(userId);
-					if(clientForUserId) {
-						return callback(null, clientForUserId.user);
-					}
+    updateDownloadStatsForUserIdAndSystem(userId, dlBytes, fileEntries) {
+        async.waterfall(
+            [
+                function fetchActiveUser(callback) {
+                    const clientForUserId = getConnectionByUserId(userId);
+                    if(clientForUserId) {
+                        return callback(null, clientForUserId.user);
+                    }
 
-					//	not online now - look 'em up
-					User.getUser(userId, (err, assocUser) => {
-						return callback(err, assocUser);
-					});
-				},
-				function updateStats(user, callback) {
-					StatLog.incrementUserStat(user, 'dl_total_count', 1);
-					StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
-					StatLog.incrementSystemStat('dl_total_count', 1);
-					StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
+                    //	not online now - look 'em up
+                    User.getUser(userId, (err, assocUser) => {
+                        return callback(err, assocUser);
+                    });
+                },
+                function updateStats(user, callback) {
+                    StatLog.incrementUserStat(user, 'dl_total_count', 1);
+                    StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
+                    StatLog.incrementSystemStat('dl_total_count', 1);
+                    StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
 
-					return callback(null, user);
-				},
-				function sendEvent(user, callback) {
-					Events.emit(
-						Events.getSystemEvents().UserDownload,
-						{
-							user	: user,
-							files	: fileEntries,
-						}
-					);
-					return callback(null);
-				}
-			]
-		);
-	}
+                    return callback(null, user);
+                },
+                function sendEvent(user, callback) {
+                    Events.emit(
+                        Events.getSystemEvents().UserDownload,
+                        {
+                            user	: user,
+                            files	: fileEntries,
+                        }
+                    );
+                    return callback(null);
+                }
+            ]
+        );
+    }
 }
 
 module.exports = new FileAreaWebAccess();
\ No newline at end of file
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 6400ed6f..511e11af 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -49,862 +49,862 @@ exports.cleanUpTempSessionItems			= cleanUpTempSessionItems;
 exports.updateAreaStatsScheduledEvent	= updateAreaStatsScheduledEvent;
 
 const WellKnownAreaTags					= exports.WellKnownAreaTags = {
-	Invalid				: '',
-	MessageAreaAttach	: 'system_message_attachment',
-	TempDownloads		: 'system_temporary_download',
+    Invalid				: '',
+    MessageAreaAttach	: 'system_message_attachment',
+    TempDownloads		: 'system_temporary_download',
 };
 
 function startup(cb) {
-	return cleanUpTempSessionItems(cb);
+    return cleanUpTempSessionItems(cb);
 }
 
 function isInternalArea(areaTag) {
-	return [ WellKnownAreaTags.MessageAreaAttach, WellKnownAreaTags.TempDownloads ].includes(areaTag);
+    return [ WellKnownAreaTags.MessageAreaAttach, WellKnownAreaTags.TempDownloads ].includes(areaTag);
 }
 
 function getAvailableFileAreas(client, options) {
-	options = options || { };
+    options = options || { };
 
-	//	perform ACS check per conf & omit internal if desired
-	const allAreas = _.map(Config().fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
+    //	perform ACS check per conf & omit internal if desired
+    const allAreas = _.map(Config().fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
 
-	return _.omitBy(allAreas, areaInfo => {
-		if(!options.includeSystemInternal && isInternalArea(areaInfo.areaTag)) {
-			return true;
-		}
+    return _.omitBy(allAreas, areaInfo => {
+        if(!options.includeSystemInternal && isInternalArea(areaInfo.areaTag)) {
+            return true;
+        }
 
-		if(options.skipAcsCheck) {
-			return false;	//	no ACS checks (below)
-		}
+        if(options.skipAcsCheck) {
+            return false;	//	no ACS checks (below)
+        }
 
-		if(options.writeAcs && !client.acs.hasFileAreaWrite(areaInfo)) {
-			return true;	//	omit
-		}
+        if(options.writeAcs && !client.acs.hasFileAreaWrite(areaInfo)) {
+            return true;	//	omit
+        }
 
-		return !client.acs.hasFileAreaRead(areaInfo);
-	});
+        return !client.acs.hasFileAreaRead(areaInfo);
+    });
 }
 
 function getAvailableFileAreaTags(client, options) {
-	return _.map(getAvailableFileAreas(client, options), area => area.areaTag);
+    return _.map(getAvailableFileAreas(client, options), area => area.areaTag);
 }
 
 function getSortedAvailableFileAreas(client, options) {
-	const areas = _.map(getAvailableFileAreas(client, options), v => v);
-	sortAreasOrConfs(areas);
-	return areas;
+    const areas = _.map(getAvailableFileAreas(client, options), v => v);
+    sortAreasOrConfs(areas);
+    return areas;
 }
 
 function getDefaultFileAreaTag(client, disableAcsCheck) {
-	const config = Config();
-	let defaultArea = _.findKey(config.fileBase, o => o.default);
-	if(defaultArea) {
-		const area = config.fileBase.areas[defaultArea];
-		if(true === disableAcsCheck || client.acs.hasFileAreaRead(area)) {
-			return defaultArea;
-		}
-	}
+    const config = Config();
+    let defaultArea = _.findKey(config.fileBase, o => o.default);
+    if(defaultArea) {
+        const area = config.fileBase.areas[defaultArea];
+        if(true === disableAcsCheck || client.acs.hasFileAreaRead(area)) {
+            return defaultArea;
+        }
+    }
 
-	//  just use anything we can
-	defaultArea = _.findKey(config.fileBase.areas, (area, areaTag) => {
-		return WellKnownAreaTags.MessageAreaAttach !== areaTag && (true === disableAcsCheck || client.acs.hasFileAreaRead(area));
-	});
+    //  just use anything we can
+    defaultArea = _.findKey(config.fileBase.areas, (area, areaTag) => {
+        return WellKnownAreaTags.MessageAreaAttach !== areaTag && (true === disableAcsCheck || client.acs.hasFileAreaRead(area));
+    });
 
-	return defaultArea;
+    return defaultArea;
 }
 
 function getFileAreaByTag(areaTag) {
-	const areaInfo = Config().fileBase.areas[areaTag];
-	if(areaInfo) {
-		areaInfo.areaTag	= areaTag;	//	convienence!
-		areaInfo.storage	= getAreaStorageLocations(areaInfo);
-		return areaInfo;
-	}
+    const areaInfo = Config().fileBase.areas[areaTag];
+    if(areaInfo) {
+        areaInfo.areaTag	= areaTag;	//	convienence!
+        areaInfo.storage	= getAreaStorageLocations(areaInfo);
+        return areaInfo;
+    }
 }
 
 function changeFileAreaWithOptions(client, areaTag, options, cb) {
-	async.waterfall(
-		[
-			function getArea(callback) {
-				const area = getFileAreaByTag(areaTag);
-				return callback(area ? null : Errors.Invalid('Invalid file areaTag'), area);
-			},
-			function validateAccess(area, callback) {
-				if(!client.acs.hasFileAreaRead(area)) {
-					return callback(Errors.AccessDenied('No access to this area'));
-				}
-			},
-			function changeArea(area, callback) {
-				if(true === options.persist) {
-					client.user.persistProperty('file_area_tag', areaTag, err => {
-						return callback(err, area);
-					});
-				} else {
-					client.user.properties['file_area_tag'] = areaTag;
-					return callback(null, area);
-				}
-			}
-		],
-		(err, area) => {
-			if(!err) {
-				client.log.info( { areaTag : areaTag, area : area }, 'Current file area changed');
-			} else {
-				client.log.warn( { areaTag : areaTag, area : area, error : err.message }, 'Could not change file area');
-			}
+    async.waterfall(
+        [
+            function getArea(callback) {
+                const area = getFileAreaByTag(areaTag);
+                return callback(area ? null : Errors.Invalid('Invalid file areaTag'), area);
+            },
+            function validateAccess(area, callback) {
+                if(!client.acs.hasFileAreaRead(area)) {
+                    return callback(Errors.AccessDenied('No access to this area'));
+                }
+            },
+            function changeArea(area, callback) {
+                if(true === options.persist) {
+                    client.user.persistProperty('file_area_tag', areaTag, err => {
+                        return callback(err, area);
+                    });
+                } else {
+                    client.user.properties['file_area_tag'] = areaTag;
+                    return callback(null, area);
+                }
+            }
+        ],
+        (err, area) => {
+            if(!err) {
+                client.log.info( { areaTag : areaTag, area : area }, 'Current file area changed');
+            } else {
+                client.log.warn( { areaTag : areaTag, area : area, error : err.message }, 'Could not change file area');
+            }
 
-			return cb(err);
-		}
-	);
+            return cb(err);
+        }
+    );
 }
 
 function isValidStorageTag(storageTag) {
-	return storageTag in Config().fileBase.storageTags;
+    return storageTag in Config().fileBase.storageTags;
 }
 
 function getAreaStorageDirectoryByTag(storageTag) {
-	const config = Config();
-	const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
+    const config = Config();
+    const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
 
-	return paths.resolve(config.fileBase.areaStoragePrefix, storageLocation || '');
+    return paths.resolve(config.fileBase.areaStoragePrefix, storageLocation || '');
 }
 
 function getAreaDefaultStorageDirectory(areaInfo) {
-	return getAreaStorageDirectoryByTag(areaInfo.storageTags[0]);
+    return getAreaStorageDirectoryByTag(areaInfo.storageTags[0]);
 }
 
 function getAreaStorageLocations(areaInfo) {
 
-	const storageTags = Array.isArray(areaInfo.storageTags) ?
-		areaInfo.storageTags :
-		[ areaInfo.storageTags || '' ];
+    const storageTags = Array.isArray(areaInfo.storageTags) ?
+        areaInfo.storageTags :
+        [ areaInfo.storageTags || '' ];
 
-	const avail = Config().fileBase.storageTags;
+    const avail = Config().fileBase.storageTags;
 
-	return _.compact(storageTags.map(storageTag => {
-		if(avail[storageTag]) {
-			return {
-				storageTag	: storageTag,
-				dir			: getAreaStorageDirectoryByTag(storageTag),
-			};
-		}
-	}));
+    return _.compact(storageTags.map(storageTag => {
+        if(avail[storageTag]) {
+            return {
+                storageTag	: storageTag,
+                dir			: getAreaStorageDirectoryByTag(storageTag),
+            };
+        }
+    }));
 }
 
 function getFileEntryPath(fileEntry) {
-	const areaInfo = getFileAreaByTag(fileEntry.areaTag);
-	if(areaInfo) {
-		return paths.join(areaInfo.storageDirectory, fileEntry.fileName);
-	}
+    const areaInfo = getFileAreaByTag(fileEntry.areaTag);
+    if(areaInfo) {
+        return paths.join(areaInfo.storageDirectory, fileEntry.fileName);
+    }
 }
 
 function getExistingFileEntriesBySha256(sha256, cb) {
-	const entries = [];
+    const entries = [];
 
-	FileDb.each(
-		`SELECT file_id, area_tag
+    FileDb.each(
+        `SELECT file_id, area_tag
 		FROM file
 		WHERE file_sha256=?;`,
-		[ sha256 ],
-		(err, fileRow) => {
-			if(fileRow) {
-				entries.push({
-					fileId	: fileRow.file_id,
-					areaTag	: fileRow.area_tag,
-				});
-			}
-		},
-		err => {
-			return cb(err, entries);
-		}
-	);
+        [ sha256 ],
+        (err, fileRow) => {
+            if(fileRow) {
+                entries.push({
+                    fileId	: fileRow.file_id,
+                    areaTag	: fileRow.area_tag,
+                });
+            }
+        },
+        err => {
+            return cb(err, entries);
+        }
+    );
 }
 
 //	:TODO: This is bascially sliceAtEOF() from art.js .... DRY!
 function sliceAtSauceMarker(data) {
-	let eof			= data.length;
-	const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
+    let eof			= data.length;
+    const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
 
-	for(let i = eof - 1; i > stopPos; i--) {
-		if(0x1a === data[i]) {
-			eof = i;
-			break;
-		}
-	}
-	return data.slice(0, eof);
+    for(let i = eof - 1; i > stopPos; i--) {
+        if(0x1a === data[i]) {
+            eof = i;
+            break;
+        }
+    }
+    return data.slice(0, eof);
 }
 
 function attemptSetEstimatedReleaseDate(fileEntry) {
-	//	:TODO: yearEstPatterns RegExp's should be cached - we can do this @ Config (re)load time
-	const patterns	= Config().fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
+    //	:TODO: yearEstPatterns RegExp's should be cached - we can do this @ Config (re)load time
+    const patterns	= Config().fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
 
-	function getMatch(input) {
-		if(input) {
-			let m;
-			for(let i = 0; i < patterns.length; ++i) {
-				m = patterns[i].exec(input);
-				if(m) {
-					return m;
-				}
-			}
-		}
-	}
+    function getMatch(input) {
+        if(input) {
+            let m;
+            for(let i = 0; i < patterns.length; ++i) {
+                m = patterns[i].exec(input);
+                if(m) {
+                    return m;
+                }
+            }
+        }
+    }
 
-	//
-	//	We attempt detection in short -> long order
-	//
-	//	Throw out anything that is current_year + 2 (we give some leway)
-	//	with the assumption that must be wrong.
-	//
-	const maxYear = moment().add(2, 'year').year();
-	const match = getMatch(fileEntry.desc) || getMatch(fileEntry.descLong);
+    //
+    //	We attempt detection in short -> long order
+    //
+    //	Throw out anything that is current_year + 2 (we give some leway)
+    //	with the assumption that must be wrong.
+    //
+    const maxYear = moment().add(2, 'year').year();
+    const match = getMatch(fileEntry.desc) || getMatch(fileEntry.descLong);
 
-	if(match && match[1]) {
-		let year;
-		if(2 === match[1].length) {
-			year = parseInt(match[1]);
-			if(year) {
-				if(year > 70) {
-					year += 1900;
-				} else {
-					year += 2000;
-				}
-			}
-		} else {
-			year = parseInt(match[1]);
-		}
+    if(match && match[1]) {
+        let year;
+        if(2 === match[1].length) {
+            year = parseInt(match[1]);
+            if(year) {
+                if(year > 70) {
+                    year += 1900;
+                } else {
+                    year += 2000;
+                }
+            }
+        } else {
+            year = parseInt(match[1]);
+        }
 
-		if(year && year <= maxYear) {
-			fileEntry.meta.est_release_year = year;
-		}
-	}
+        if(year && year <= maxYear) {
+            fileEntry.meta.est_release_year = year;
+        }
+    }
 }
 
 //	a simple log proxy for when we call from oputil.js
 function logDebug(obj, msg) {
-	if(Log) {
-		Log.debug(obj, msg);
-	}
+    if(Log) {
+        Log.debug(obj, msg);
+    }
 }
 
 function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
-	async.waterfall(
-		[
-			function extractDescFiles(callback) {
-				//	:TODO: would be nice if these RegExp's were cached
-				//	:TODO: this is long winded...
-				const config = Config();
-				const extractList = [];
+    async.waterfall(
+        [
+            function extractDescFiles(callback) {
+                //	:TODO: would be nice if these RegExp's were cached
+                //	:TODO: this is long winded...
+                const config = Config();
+                const extractList = [];
 
-				const shortDescFile = archiveEntries.find( e => {
-					return config.fileBase.fileNamePatterns.desc.find( pat => new RegExp(pat, 'i').test(e.fileName) );
-				});
+                const shortDescFile = archiveEntries.find( e => {
+                    return config.fileBase.fileNamePatterns.desc.find( pat => new RegExp(pat, 'i').test(e.fileName) );
+                });
 
-				if(shortDescFile) {
-					extractList.push(shortDescFile.fileName);
-				}
+                if(shortDescFile) {
+                    extractList.push(shortDescFile.fileName);
+                }
 
-				const longDescFile = archiveEntries.find( e => {
-					return config.fileBase.fileNamePatterns.descLong.find( pat => new RegExp(pat, 'i').test(e.fileName) );
-				});
+                const longDescFile = archiveEntries.find( e => {
+                    return config.fileBase.fileNamePatterns.descLong.find( pat => new RegExp(pat, 'i').test(e.fileName) );
+                });
 
-				if(longDescFile) {
-					extractList.push(longDescFile.fileName);
-				}
+                if(longDescFile) {
+                    extractList.push(longDescFile.fileName);
+                }
 
-				if(0 === extractList.length) {
-					return callback(null, [] );
-				}
+                if(0 === extractList.length) {
+                    return callback(null, [] );
+                }
 
-				temptmp.mkdir( { prefix : 'enigextract-' }, (err, tempDir) => {
-					if(err) {
-						return callback(err);
-					}
+                temptmp.mkdir( { prefix : 'enigextract-' }, (err, tempDir) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					const archiveUtil = ArchiveUtil.getInstance();
-					archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
-						if(err) {
-							return callback(err);
-						}
+                    const archiveUtil = ArchiveUtil.getInstance();
+                    archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						const descFiles = {
-							desc		: shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
-							descLong	: longDescFile ? paths.join(tempDir, longDescFile.fileName) : null,
-						};
+                        const descFiles = {
+                            desc		: shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
+                            descLong	: longDescFile ? paths.join(tempDir, longDescFile.fileName) : null,
+                        };
 
-						return callback(null, descFiles);
-					});
-				});
-			},
-			function readDescFiles(descFiles, callback) {
-				const config = Config();
-				async.each(Object.keys(descFiles), (descType, next) => {
-					const path = descFiles[descType];
-					if(!path) {
-						return next(null);
-					}
+                        return callback(null, descFiles);
+                    });
+                });
+            },
+            function readDescFiles(descFiles, callback) {
+                const config = Config();
+                async.each(Object.keys(descFiles), (descType, next) => {
+                    const path = descFiles[descType];
+                    if(!path) {
+                        return next(null);
+                    }
 
-					fs.stat(path, (err, stats) => {
-						if(err) {
-							return next(null);
-						}
+                    fs.stat(path, (err, stats) => {
+                        if(err) {
+                            return next(null);
+                        }
 
-						//	skip entries that are too large
-						const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;						
-						if(config.fileBase[maxFileSizeKey] && stats.size > config.fileBase[maxFileSizeKey]) {
-							logDebug( { byteSize : stats.size, maxByteSize : config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
-							return next(null);
-						}
+                        //	skip entries that are too large
+                        const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;
+                        if(config.fileBase[maxFileSizeKey] && stats.size > config.fileBase[maxFileSizeKey]) {
+                            logDebug( { byteSize : stats.size, maxByteSize : config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
+                            return next(null);
+                        }
 
-						fs.readFile(path, (err, data) => {
-							if(err || !data) {
-								return next(null);
-							}
+                        fs.readFile(path, (err, data) => {
+                            if(err || !data) {
+                                return next(null);
+                            }
 
-							//
-							//	Assume FILE_ID.DIZ, NFO files, etc. are CP437.
-							//
-							//	:TODO: This isn't really always the case - how to handle this? We could do a quick detection...
-							fileEntry[descType]			= iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
-							fileEntry[`${descType}Src`]	= 'descFile';
-							return next(null);
-						});
-					});
-				}, () => {
-					//	cleanup but don't wait
-					temptmp.cleanup( paths => {
-						//	note: don't use client logger here - may not be avail
-						logDebug( { paths : paths, sessionId : temptmp.sessionId }, 'Cleaned up temporary files' );
-					});
-					return callback(null);
-				});
-			},
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                            //
+                            //	Assume FILE_ID.DIZ, NFO files, etc. are CP437.
+                            //
+                            //	:TODO: This isn't really always the case - how to handle this? We could do a quick detection...
+                            fileEntry[descType]			= iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
+                            fileEntry[`${descType}Src`]	= 'descFile';
+                            return next(null);
+                        });
+                    });
+                }, () => {
+                    //	cleanup but don't wait
+                    temptmp.cleanup( paths => {
+                        //	note: don't use client logger here - may not be avail
+                        logDebug( { paths : paths, sessionId : temptmp.sessionId }, 'Cleaned up temporary files' );
+                    });
+                    return callback(null);
+                });
+            },
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries, cb) {
 
-	async.waterfall(
-		[
-			function extractToTemp(callback) {
-				//	:TODO: we may want to skip this if the compressed file is too large...
-				temptmp.mkdir( { prefix : 'enigextract-' }, (err, tempDir) => {
-					if(err) {
-						return callback(err);
-					}
+    async.waterfall(
+        [
+            function extractToTemp(callback) {
+                //	:TODO: we may want to skip this if the compressed file is too large...
+                temptmp.mkdir( { prefix : 'enigextract-' }, (err, tempDir) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					const archiveUtil = ArchiveUtil.getInstance();
+                    const archiveUtil = ArchiveUtil.getInstance();
 
-					//	ensure we only extract one - there should only be one anyway -- we also just need the fileName
-					const extractList = archiveEntries.slice(0, 1).map(entry => entry.fileName);
+                    //	ensure we only extract one - there should only be one anyway -- we also just need the fileName
+                    const extractList = archiveEntries.slice(0, 1).map(entry => entry.fileName);
 
-					archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
-						if(err) {
-							return callback(err);
-						}
+                    archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						return callback(null, paths.join(tempDir, extractList[0]));
-					});
-				});
-			},
-			function processSingleExtractedFile(extractedFile, callback) {
-				populateFileEntryInfoFromFile(fileEntry, extractedFile, err => {
-					if(!fileEntry.desc) {
-						fileEntry.desc		= getDescFromFileName(filePath);
-						fileEntry.descSrc	= 'fileName';
-					}
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                        return callback(null, paths.join(tempDir, extractList[0]));
+                    });
+                });
+            },
+            function processSingleExtractedFile(extractedFile, callback) {
+                populateFileEntryInfoFromFile(fileEntry, extractedFile, err => {
+                    if(!fileEntry.desc) {
+                        fileEntry.desc		= getDescFromFileName(filePath);
+                        fileEntry.descSrc	= 'fileName';
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, cb) {
-	const archiveUtil 	= ArchiveUtil.getInstance();
-	const archiveType	= fileEntry.meta.archive_type;	//	we set this previous to populateFileEntryWithArchive()
+    const archiveUtil 	= ArchiveUtil.getInstance();
+    const archiveType	= fileEntry.meta.archive_type;	//	we set this previous to populateFileEntryWithArchive()
 
-	async.waterfall(
-		[
-			function getArchiveFileList(callback) {
-				stepInfo.step = 'archive_list_start';
+    async.waterfall(
+        [
+            function getArchiveFileList(callback) {
+                stepInfo.step = 'archive_list_start';
 
-				iterator(err => {
-					if(err) {
-						return callback(err);
-					}
+                iterator(err => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					archiveUtil.listEntries(filePath, archiveType, (err, entries) => {
-						if(err) {
-							stepInfo.step = 'archive_list_failed';
-						} else {
-							stepInfo.step = 'archive_list_finish';
-							stepInfo.archiveEntries = entries || [];
-						}
+                    archiveUtil.listEntries(filePath, archiveType, (err, entries) => {
+                        if(err) {
+                            stepInfo.step = 'archive_list_failed';
+                        } else {
+                            stepInfo.step = 'archive_list_finish';
+                            stepInfo.archiveEntries = entries || [];
+                        }
 
-						iterator(iterErr => {
-							return callback( iterErr, entries || [] );	//	ignore original |err| here
-						});
-					});
-				});
-			},
-			function processDescFilesStart(entries, callback) {
-				stepInfo.step = 'desc_files_start';
-				iterator(err => {
-					return callback(err, entries);
-				});
-			},
-			function extractDescFromArchive(entries, callback) {
-				//
-				//	If we have a -single- entry in the archive, extract that file
-				//	and try retrieving info in the non-archive manor. This should
-				//	work for things like zipped up .pdf files.
-				//
-				//	Otherwise, try to find particular desc files such as FILE_ID.DIZ
-				//	and README.1ST
-				//
-				const archDescHandler = (1 === entries.length) ? extractAndProcessSingleArchiveEntry : extractAndProcessDescFiles;
-				archDescHandler(fileEntry, filePath, entries, err => {
-					return callback(err);
-				});
-			},
-			function attemptReleaseYearEstimation(callback) {
-				attemptSetEstimatedReleaseDate(fileEntry);
-				return callback(null);
-			},
-			function processDescFilesFinish(callback) {
-				stepInfo.step = 'desc_files_finish';
-				return iterator(callback);
-			},
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                        iterator(iterErr => {
+                            return callback( iterErr, entries || [] );	//	ignore original |err| here
+                        });
+                    });
+                });
+            },
+            function processDescFilesStart(entries, callback) {
+                stepInfo.step = 'desc_files_start';
+                iterator(err => {
+                    return callback(err, entries);
+                });
+            },
+            function extractDescFromArchive(entries, callback) {
+                //
+                //	If we have a -single- entry in the archive, extract that file
+                //	and try retrieving info in the non-archive manor. This should
+                //	work for things like zipped up .pdf files.
+                //
+                //	Otherwise, try to find particular desc files such as FILE_ID.DIZ
+                //	and README.1ST
+                //
+                const archDescHandler = (1 === entries.length) ? extractAndProcessSingleArchiveEntry : extractAndProcessDescFiles;
+                archDescHandler(fileEntry, filePath, entries, err => {
+                    return callback(err);
+                });
+            },
+            function attemptReleaseYearEstimation(callback) {
+                attemptSetEstimatedReleaseDate(fileEntry);
+                return callback(null);
+            },
+            function processDescFilesFinish(callback) {
+                stepInfo.step = 'desc_files_finish';
+                return iterator(callback);
+            },
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function getInfoExtractUtilForDesc(mimeType, filePath, descType) {
-	const config = Config();
-	let fileType = _.get(config, [ 'fileTypes', mimeType ] );
+    const config = Config();
+    let fileType = _.get(config, [ 'fileTypes', mimeType ] );
 
-	if(Array.isArray(fileType)) {
-		//	further refine by extention
-		fileType = fileType.find(ft => paths.extname(filePath) === ft.ext);
-	}
+    if(Array.isArray(fileType)) {
+        //	further refine by extention
+        fileType = fileType.find(ft => paths.extname(filePath) === ft.ext);
+    }
 
-	if(!_.isObject(fileType)) {
-		return;
-	}
+    if(!_.isObject(fileType)) {
+        return;
+    }
 
-	let util = _.get(fileType, `${descType}DescUtil`);
-	if(!_.isString(util)) {
-		return;
-	}
+    let util = _.get(fileType, `${descType}DescUtil`);
+    if(!_.isString(util)) {
+        return;
+    }
 
-	util = _.get(config, [ 'infoExtractUtils', util ]);
-	if(!util || !_.isString(util.cmd)) {
-		return;
-	}
+    util = _.get(config, [ 'infoExtractUtils', util ]);
+    if(!util || !_.isString(util.cmd)) {
+        return;
+    }
 
-	return util;
+    return util;
 }
 
 function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
-	const mimeType = resolveMimeType(filePath);
-	if(!mimeType) {
-		return cb(null);
-	}
+    const mimeType = resolveMimeType(filePath);
+    if(!mimeType) {
+        return cb(null);
+    }
 
-	async.eachSeries( [ 'short', 'long' ], (descType, nextDesc) => {
-		const util = getInfoExtractUtilForDesc(mimeType, filePath, descType);
-		if(!util) {
-			return nextDesc(null);
-		}
+    async.eachSeries( [ 'short', 'long' ], (descType, nextDesc) => {
+        const util = getInfoExtractUtilForDesc(mimeType, filePath, descType);
+        if(!util) {
+            return nextDesc(null);
+        }
 
-		const args = (util.args || [ '{filePath}'] ).map( arg => stringFormat(arg, { filePath : filePath } ) );
+        const args = (util.args || [ '{filePath}'] ).map( arg => stringFormat(arg, { filePath : filePath } ) );
 
-		execFile(util.cmd, args, { timeout : 1000 * 30 }, (err, stdout) => {
-			if(err || !stdout) {
-				const reason = err ? err.message : 'No description produced';
-				logDebug(
-					{ reason : reason, cmd : util.cmd, args : args },
-					`${_.upperFirst(descType)} description command failed`
-				);
-			} else {
-				stdout = (stdout || '').trim();
-				if(stdout.length > 0) {
-					const key = 'short' === descType ? 'desc' : 'descLong';
-					if('desc' === key) {
-						//
-						//	Word wrap short descriptions to FILE_ID.DIZ spec
-						//
-						//	"...no more than 45 characters long"
-						//
-						//	See http://www.textfiles.com/computers/fileid.txt
-						//
-						stdout = (wordWrapText( stdout, { width : 45 } ).wrapped || []).join('\n');
-					}
+        execFile(util.cmd, args, { timeout : 1000 * 30 }, (err, stdout) => {
+            if(err || !stdout) {
+                const reason = err ? err.message : 'No description produced';
+                logDebug(
+                    { reason : reason, cmd : util.cmd, args : args },
+                    `${_.upperFirst(descType)} description command failed`
+                );
+            } else {
+                stdout = (stdout || '').trim();
+                if(stdout.length > 0) {
+                    const key = 'short' === descType ? 'desc' : 'descLong';
+                    if('desc' === key) {
+                        //
+                        //	Word wrap short descriptions to FILE_ID.DIZ spec
+                        //
+                        //	"...no more than 45 characters long"
+                        //
+                        //	See http://www.textfiles.com/computers/fileid.txt
+                        //
+                        stdout = (wordWrapText( stdout, { width : 45 } ).wrapped || []).join('\n');
+                    }
 
-					fileEntry[key]			= stdout;
-					fileEntry[`${key}Src`]	= 'infoTool';
-				}
-			}
+                    fileEntry[key]			= stdout;
+                    fileEntry[`${key}Src`]	= 'infoTool';
+                }
+            }
 
-			return nextDesc(null);
-		});
-	}, () => {
-		return cb(null);
-	});
+            return nextDesc(null);
+        });
+    }, () => {
+        return cb(null);
+    });
 }
 
 function populateFileEntryNonArchive(fileEntry, filePath, stepInfo, iterator, cb) {
 
-	async.series(
-		[
-			function processDescFilesStart(callback) {
-				stepInfo.step = 'desc_files_start';
-				return iterator(callback);
-			},
-			function getDescriptions(callback) {
-				populateFileEntryInfoFromFile(fileEntry, filePath, err => {
-					if(!fileEntry.desc) {
-						fileEntry.desc		= getDescFromFileName(filePath);
-						fileEntry.descSrc	= 'fileName';
-					}
-					return callback(err);
-				});
-			},
-			function processDescFilesFinish(callback) {
-				stepInfo.step = 'desc_files_finish';
-				return iterator(callback);
-			},
-		],
-		err => {
-			return cb(err);
-		}
-	);
+    async.series(
+        [
+            function processDescFilesStart(callback) {
+                stepInfo.step = 'desc_files_start';
+                return iterator(callback);
+            },
+            function getDescriptions(callback) {
+                populateFileEntryInfoFromFile(fileEntry, filePath, err => {
+                    if(!fileEntry.desc) {
+                        fileEntry.desc		= getDescFromFileName(filePath);
+                        fileEntry.descSrc	= 'fileName';
+                    }
+                    return callback(err);
+                });
+            },
+            function processDescFilesFinish(callback) {
+                stepInfo.step = 'desc_files_finish';
+                return iterator(callback);
+            },
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function addNewFileEntry(fileEntry, filePath, cb) {
-	//	:TODO: Use detectTypeWithBuf() once avail - we *just* read some file data
+    //	:TODO: Use detectTypeWithBuf() once avail - we *just* read some file data
 
-	async.series(
-		[
-			function addNewDbRecord(callback) {
-				return fileEntry.persist(callback);
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+    async.series(
+        [
+            function addNewDbRecord(callback) {
+                return fileEntry.persist(callback);
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 const HASH_NAMES =  [ 'sha1', 'sha256', 'md5', 'crc32' ];
 
 function scanFile(filePath, options, iterator, cb) {
 
-	if(3 === arguments.length && _.isFunction(iterator)) {
-		cb			= iterator;
-		iterator	= null;
-	} else if(2 === arguments.length && _.isFunction(options)) {
-		cb			= options;
-		iterator	= null;
-		options		= {};
-	}
+    if(3 === arguments.length && _.isFunction(iterator)) {
+        cb			= iterator;
+        iterator	= null;
+    } else if(2 === arguments.length && _.isFunction(options)) {
+        cb			= options;
+        iterator	= null;
+        options		= {};
+    }
 
-	const fileEntry = new FileEntry({
-		areaTag		: options.areaTag,
-		meta		: options.meta,
-		hashTags	: options.hashTags,	//	Set() or Array
-		fileName	: paths.basename(filePath),
-		storageTag	: options.storageTag,
-		fileSha256	: options.sha256,	//	caller may know this already
-	});
+    const fileEntry = new FileEntry({
+        areaTag		: options.areaTag,
+        meta		: options.meta,
+        hashTags	: options.hashTags,	//	Set() or Array
+        fileName	: paths.basename(filePath),
+        storageTag	: options.storageTag,
+        fileSha256	: options.sha256,	//	caller may know this already
+    });
 
-	const stepInfo = {
-		filePath	: filePath,
-		fileName	: paths.basename(filePath),
-	};
+    const stepInfo = {
+        filePath	: filePath,
+        fileName	: paths.basename(filePath),
+    };
 
-	const callIter = (next) => {
-		return iterator ? iterator(stepInfo, next) : next(null);
-	};
+    const callIter = (next) => {
+        return iterator ? iterator(stepInfo, next) : next(null);
+    };
 
-	const readErrorCallIter = (origError, next) => {
-		stepInfo.step	= 'read_error';
-		stepInfo.error	= origError.message;
+    const readErrorCallIter = (origError, next) => {
+        stepInfo.step	= 'read_error';
+        stepInfo.error	= origError.message;
 
-		callIter( () => {
-			return next(origError);
-		});
-	};
+        callIter( () => {
+            return next(origError);
+        });
+    };
 
-	let lastCalcHashPercent;
+    let lastCalcHashPercent;
 
-	//	don't re-calc hashes for any we already have in |options|
-	const hashesToCalc = HASH_NAMES.filter(hn =>  {
-		if('sha256' === hn && fileEntry.fileSha256) {
-			return false;
-		}
+    //	don't re-calc hashes for any we already have in |options|
+    const hashesToCalc = HASH_NAMES.filter(hn =>  {
+        if('sha256' === hn && fileEntry.fileSha256) {
+            return false;
+        }
 
-		if(`file_${hn}` in fileEntry.meta) {
-			return false;
-		}
+        if(`file_${hn}` in fileEntry.meta) {
+            return false;
+        }
 
-		return true;
-	});
+        return true;
+    });
 
-	async.waterfall(
-		[
-			function startScan(callback) {
-				fs.stat(filePath, (err, stats) => {
-					if(err) {
-						return readErrorCallIter(err, callback);
-					}
+    async.waterfall(
+        [
+            function startScan(callback) {
+                fs.stat(filePath, (err, stats) => {
+                    if(err) {
+                        return readErrorCallIter(err, callback);
+                    }
 
-					stepInfo.step		= 'start';
-					stepInfo.byteSize	= fileEntry.meta.byte_size = stats.size;
+                    stepInfo.step		= 'start';
+                    stepInfo.byteSize	= fileEntry.meta.byte_size = stats.size;
 
-					return callIter(callback);
-				});
-			},
-			function processPhysicalFileGeneric(callback) {
-				stepInfo.bytesProcessed = 0;
+                    return callIter(callback);
+                });
+            },
+            function processPhysicalFileGeneric(callback) {
+                stepInfo.bytesProcessed = 0;
 
-				const hashes = {};
-				hashesToCalc.forEach(hashName => {
-					if('crc32' === hashName) {
-						hashes.crc32 = new CRC32;
-					} else {
-						hashes[hashName] = crypto.createHash(hashName);
-					}
-				});
+                const hashes = {};
+                hashesToCalc.forEach(hashName => {
+                    if('crc32' === hashName) {
+                        hashes.crc32 = new CRC32;
+                    } else {
+                        hashes[hashName] = crypto.createHash(hashName);
+                    }
+                });
 
-				const updateHashes = (data) => {
-					for(let i = 0; i < hashesToCalc.length; ++i) {
-						hashes[hashesToCalc[i]].update(data);
-					}
-				};
+                const updateHashes = (data) => {
+                    for(let i = 0; i < hashesToCalc.length; ++i) {
+                        hashes[hashesToCalc[i]].update(data);
+                    }
+                };
 
-				//
-				//	Note that we are not using fs.createReadStream() here:
-				//	While convenient, it is quite a bit slower -- which adds
-				//	up to many seconds in time for larger files.
-				//
-				const chunkSize = 1024 * 64;
-				const buffer = new Buffer(chunkSize);
+                //
+                //	Note that we are not using fs.createReadStream() here:
+                //	While convenient, it is quite a bit slower -- which adds
+                //	up to many seconds in time for larger files.
+                //
+                const chunkSize = 1024 * 64;
+                const buffer = new Buffer(chunkSize);
 
-				fs.open(filePath, 'r', (err, fd) => {
-					if(err) {
-						return readErrorCallIter(err, callback);
-					}
+                fs.open(filePath, 'r', (err, fd) => {
+                    if(err) {
+                        return readErrorCallIter(err, callback);
+                    }
 
-					const nextChunk = () => {
-						fs.read(fd, buffer, 0, chunkSize, null, (err, bytesRead) => {
-							if(err) {
-								fs.close(fd);
-								return readErrorCallIter(err, callback);
-							}
+                    const nextChunk = () => {
+                        fs.read(fd, buffer, 0, chunkSize, null, (err, bytesRead) => {
+                            if(err) {
+                                fs.close(fd);
+                                return readErrorCallIter(err, callback);
+                            }
 
-							if(0 === bytesRead) {
-								//	done - finalize
-								fileEntry.meta.byte_size = stepInfo.bytesProcessed;
+                            if(0 === bytesRead) {
+                                //	done - finalize
+                                fileEntry.meta.byte_size = stepInfo.bytesProcessed;
 
-								for(let i = 0; i < hashesToCalc.length; ++i) {
-									const hashName = hashesToCalc[i];
-									if('sha256' === hashName) {
-										stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
-									} else if('sha1' === hashName || 'md5' === hashName) {
-										stepInfo[hashName] = fileEntry.meta[`file_${hashName}`] = hashes[hashName].digest('hex');
-									} else if('crc32' === hashName) {
-										stepInfo.crc32 = fileEntry.meta.file_crc32 = hashes.crc32.finalize().toString(16);
-									}
-								}
+                                for(let i = 0; i < hashesToCalc.length; ++i) {
+                                    const hashName = hashesToCalc[i];
+                                    if('sha256' === hashName) {
+                                        stepInfo.sha256 = fileEntry.fileSha256 = hashes.sha256.digest('hex');
+                                    } else if('sha1' === hashName || 'md5' === hashName) {
+                                        stepInfo[hashName] = fileEntry.meta[`file_${hashName}`] = hashes[hashName].digest('hex');
+                                    } else if('crc32' === hashName) {
+                                        stepInfo.crc32 = fileEntry.meta.file_crc32 = hashes.crc32.finalize().toString(16);
+                                    }
+                                }
 
-								stepInfo.step = 'hash_finish';
-								fs.close(fd);
-								return callIter(callback);
-							}
+                                stepInfo.step = 'hash_finish';
+                                fs.close(fd);
+                                return callIter(callback);
+                            }
 
-							stepInfo.bytesProcessed		+= bytesRead;
-							stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
+                            stepInfo.bytesProcessed		+= bytesRead;
+                            stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
 
-							//
-							//	Only send 'hash_update' step update if we have a noticable percentage change in progress
-							//
-							const data = bytesRead < chunkSize ? buffer.slice(0, bytesRead) : buffer;
-							if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
-								updateHashes(data);
-								return nextChunk();
-							} else {
-								lastCalcHashPercent = stepInfo.calcHashPercent;
-								stepInfo.step		= 'hash_update';
+                            //
+                            //	Only send 'hash_update' step update if we have a noticable percentage change in progress
+                            //
+                            const data = bytesRead < chunkSize ? buffer.slice(0, bytesRead) : buffer;
+                            if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
+                                updateHashes(data);
+                                return nextChunk();
+                            } else {
+                                lastCalcHashPercent = stepInfo.calcHashPercent;
+                                stepInfo.step		= 'hash_update';
 
-								callIter(err => {
-									if(err) {
-										return callback(err);
-									}
+                                callIter(err => {
+                                    if(err) {
+                                        return callback(err);
+                                    }
 
-									updateHashes(data);
-									return nextChunk();
-								});
-							}
-						});
-					};
+                                    updateHashes(data);
+                                    return nextChunk();
+                                });
+                            }
+                        });
+                    };
 
-					nextChunk();
-				});
-			},
-			function processPhysicalFileByType(callback) {
-				const archiveUtil = ArchiveUtil.getInstance();
+                    nextChunk();
+                });
+            },
+            function processPhysicalFileByType(callback) {
+                const archiveUtil = ArchiveUtil.getInstance();
 
-				archiveUtil.detectType(filePath, (err, archiveType) => {
-					if(archiveType) {
-						//	save this off
-						fileEntry.meta.archive_type = archiveType;
+                archiveUtil.detectType(filePath, (err, archiveType) => {
+                    if(archiveType) {
+                        //	save this off
+                        fileEntry.meta.archive_type = archiveType;
 
-						populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
-							if(err) {
-								populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-									if(err) {
-										logDebug( { error : err.message }, 'Non-archive file entry population failed');
-									}
-									return callback(null);	//	ignore err
-								});
-							} else {
-								return callback(null);
-							}
-						});
-					} else {
-						populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
-							if(err) {
-								logDebug( { error : err.message }, 'Non-archive file entry population failed');
-							}
-							return callback(null);	//	ignore err
-						});
-					}
-				});
-			},
-			function fetchExistingEntry(callback) {
-				getExistingFileEntriesBySha256(fileEntry.fileSha256, (err, dupeEntries) => {
-					return callback(err, dupeEntries);
-				});
-			},
-			function finished(dupeEntries, callback) {
-				stepInfo.step = 'finished';
-				callIter( () => {
-					return callback(null, dupeEntries);
-				});
-			}
-		],
-		(err, dupeEntries) => {
-			if(err) {
-				return cb(err);
-			}
+                        populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
+                            if(err) {
+                                populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
+                                    if(err) {
+                                        logDebug( { error : err.message }, 'Non-archive file entry population failed');
+                                    }
+                                    return callback(null);	//	ignore err
+                                });
+                            } else {
+                                return callback(null);
+                            }
+                        });
+                    } else {
+                        populateFileEntryNonArchive(fileEntry, filePath, stepInfo, callIter, err => {
+                            if(err) {
+                                logDebug( { error : err.message }, 'Non-archive file entry population failed');
+                            }
+                            return callback(null);	//	ignore err
+                        });
+                    }
+                });
+            },
+            function fetchExistingEntry(callback) {
+                getExistingFileEntriesBySha256(fileEntry.fileSha256, (err, dupeEntries) => {
+                    return callback(err, dupeEntries);
+                });
+            },
+            function finished(dupeEntries, callback) {
+                stepInfo.step = 'finished';
+                callIter( () => {
+                    return callback(null, dupeEntries);
+                });
+            }
+        ],
+        (err, dupeEntries) => {
+            if(err) {
+                return cb(err);
+            }
 
-			return cb(null, fileEntry, dupeEntries);
-		}
-	);
+            return cb(null, fileEntry, dupeEntries);
+        }
+    );
 }
 
 function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
-	if(3 === arguments.length && _.isFunction(iterator)) {
-		cb			= iterator;
-		iterator	= null;
-	} else if(2 === arguments.length && _.isFunction(options)) {
-		cb			= options;
-		iterator	= null;
-		options		= {};
-	}
+    if(3 === arguments.length && _.isFunction(iterator)) {
+        cb			= iterator;
+        iterator	= null;
+    } else if(2 === arguments.length && _.isFunction(options)) {
+        cb			= options;
+        iterator	= null;
+        options		= {};
+    }
 
-	const storageLocations = getAreaStorageLocations(areaInfo);
+    const storageLocations = getAreaStorageLocations(areaInfo);
 
-	async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
-		async.series(
-			[
-				function scanPhysFiles(callback) {
-					const physDir = storageLoc.dir;
+    async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
+        async.series(
+            [
+                function scanPhysFiles(callback) {
+                    const physDir = storageLoc.dir;
 
-					fs.readdir(physDir, (err, files) => {
-						if(err) {
-							return callback(err);
-						}
+                    fs.readdir(physDir, (err, files) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						async.eachSeries(files, (fileName, nextFile) => {
-							const fullPath = paths.join(physDir, fileName);
+                        async.eachSeries(files, (fileName, nextFile) => {
+                            const fullPath = paths.join(physDir, fileName);
 
-							fs.stat(fullPath, (err, stats) => {
-								if(err) {
-									//	:TODO: Log me!
-									return nextFile(null);	//	always try next file
-								}
+                            fs.stat(fullPath, (err, stats) => {
+                                if(err) {
+                                    //	:TODO: Log me!
+                                    return nextFile(null);	//	always try next file
+                                }
 
-								if(!stats.isFile()) {
-									return nextFile(null);
-								}
+                                if(!stats.isFile()) {
+                                    return nextFile(null);
+                                }
 
-								scanFile(
-									fullPath,
-									{
-										areaTag		: areaInfo.areaTag,
-										storageTag	: storageLoc.storageTag
-									},
-									iterator,
-									(err, fileEntry, dupeEntries) => {
-										if(err) {
-											//	:TODO: Log me!!!
-											return nextFile(null);	//	try next anyway
-										}
+                                scanFile(
+                                    fullPath,
+                                    {
+                                        areaTag		: areaInfo.areaTag,
+                                        storageTag	: storageLoc.storageTag
+                                    },
+                                    iterator,
+                                    (err, fileEntry, dupeEntries) => {
+                                        if(err) {
+                                            //	:TODO: Log me!!!
+                                            return nextFile(null);	//	try next anyway
+                                        }
 
-										if(dupeEntries.length > 0) {
-											//	:TODO: Handle duplidates -- what to do here???
-										} else {
-											if(Array.isArray(options.tags)) {
-												options.tags.forEach(tag => {
-													fileEntry.hashTags.add(tag);
-												});
-											}
-											addNewFileEntry(fileEntry, fullPath, err => {
-												//	pass along error; we failed to insert a record in our DB or something else bad
-												return nextFile(err);
-											});
-										}
-									}
-								);
-							});
-						}, err => {
-							return callback(err);
-						});
-					});
-				},
-				function scanDbEntries(callback) {
-					//	:TODO: Look @ db entries for area that were *not* processed above
-					return callback(null);
-				}
-			],
-			err => {
-				return nextLocation(err);
-			}
-		);
-	},
-	err => {
-		return cb(err);
-	});
+                                        if(dupeEntries.length > 0) {
+                                            //	:TODO: Handle duplidates -- what to do here???
+                                        } else {
+                                            if(Array.isArray(options.tags)) {
+                                                options.tags.forEach(tag => {
+                                                    fileEntry.hashTags.add(tag);
+                                                });
+                                            }
+                                            addNewFileEntry(fileEntry, fullPath, err => {
+                                                //	pass along error; we failed to insert a record in our DB or something else bad
+                                                return nextFile(err);
+                                            });
+                                        }
+                                    }
+                                );
+                            });
+                        }, err => {
+                            return callback(err);
+                        });
+                    });
+                },
+                function scanDbEntries(callback) {
+                    //	:TODO: Look @ db entries for area that were *not* processed above
+                    return callback(null);
+                }
+            ],
+            err => {
+                return nextLocation(err);
+            }
+        );
+    },
+    err => {
+        return cb(err);
+    });
 }
 
 function getDescFromFileName(fileName) {
-	//	:TODO: this method could use some more logic to really be nice.
-	const ext   = paths.extname(fileName);
-	const name  = paths.basename(fileName, ext);
+    //	:TODO: this method could use some more logic to really be nice.
+    const ext   = paths.extname(fileName);
+    const name  = paths.basename(fileName, ext);
 
-	return _.upperFirst(name.replace(/[-_.+]/g, ' ').replace(/\s+/g, ' '));
+    return _.upperFirst(name.replace(/[-_.+]/g, ' ').replace(/\s+/g, ' '));
 }
 
 //
@@ -923,84 +923,84 @@ function getDescFromFileName(fileName) {
 //	}
 //
 function getAreaStats(cb) {
-	FileDb.all(
-		`SELECT DISTINCT f.area_tag, COUNT(f.file_id) AS total_files, SUM(m.meta_value) AS total_byte_size
+    FileDb.all(
+        `SELECT DISTINCT f.area_tag, COUNT(f.file_id) AS total_files, SUM(m.meta_value) AS total_byte_size
 		FROM file f, file_meta m
 		WHERE f.file_id = m.file_id AND m.meta_name='byte_size'
 		GROUP BY f.area_tag;`,
-		(err, statRows) => {
-			if(err) {
-				return cb(err);
-			}
+        (err, statRows) => {
+            if(err) {
+                return cb(err);
+            }
 
-			if(!statRows || 0 === statRows.length) {
-				return cb(Errors.DoesNotExist('No file areas to acquire stats from'));
-			}
+            if(!statRows || 0 === statRows.length) {
+                return cb(Errors.DoesNotExist('No file areas to acquire stats from'));
+            }
 
-			return cb(
-				null,
-				statRows.reduce( (stats, v) => {
-					stats.totalFiles = (stats.totalFiles || 0) + v.total_files;
-					stats.totalBytes = (stats.totalBytes || 0) + v.total_byte_size;
+            return cb(
+                null,
+                statRows.reduce( (stats, v) => {
+                    stats.totalFiles = (stats.totalFiles || 0) + v.total_files;
+                    stats.totalBytes = (stats.totalBytes || 0) + v.total_byte_size;
 
-					stats.areas = stats.areas || {};
+                    stats.areas = stats.areas || {};
 
-					stats.areas[v.area_tag] = {
-						files 	: v.total_files,
-						bytes	: v.total_byte_size,
-					};
-					return stats;
-				}, {})
-			);
-		}
-	);
+                    stats.areas[v.area_tag] = {
+                        files 	: v.total_files,
+                        bytes	: v.total_byte_size,
+                    };
+                    return stats;
+                }, {})
+            );
+        }
+    );
 }
 
 //	method exposed for event scheduler
 function updateAreaStatsScheduledEvent(args, cb) {
-	getAreaStats( (err, stats) => {
-		if(!err) {
-			StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
-		}
+    getAreaStats( (err, stats) => {
+        if(!err) {
+            StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
+        }
 
-		return cb(err);
-	});
+        return cb(err);
+    });
 }
 
 function cleanUpTempSessionItems(cb) {
-	//	find (old) temporary session items and nuke 'em
-	const filter = {
-		areaTag 	: WellKnownAreaTags.TempDownloads,
-		metaPairs	: [
-			{
-				name	: 'session_temp_dl',
-				value	: 1
-			}
-		]
-	};
+    //	find (old) temporary session items and nuke 'em
+    const filter = {
+        areaTag 	: WellKnownAreaTags.TempDownloads,
+        metaPairs	: [
+            {
+                name	: 'session_temp_dl',
+                value	: 1
+            }
+        ]
+    };
 
-	FileEntry.findFiles(filter, (err, fileIds) => {
-		if(err) {
-			return cb(err);
-		}
+    FileEntry.findFiles(filter, (err, fileIds) => {
+        if(err) {
+            return cb(err);
+        }
 
-		async.each(fileIds, (fileId, nextFileId) => {
-			const fileEntry = new FileEntry();
-			fileEntry.load(fileId, err => {
-				if(err) {
-					Log.warn( { fileId }, 'Failed loading temporary session download item for cleanup');
-					return nextFileId(null);
-				}
+        async.each(fileIds, (fileId, nextFileId) => {
+            const fileEntry = new FileEntry();
+            fileEntry.load(fileId, err => {
+                if(err) {
+                    Log.warn( { fileId }, 'Failed loading temporary session download item for cleanup');
+                    return nextFileId(null);
+                }
 
-				FileEntry.removeEntry(fileEntry, { removePhysFile : true }, err => {
-					if(err) {
-						Log.warn( { fileId : fileEntry.fileId, filePath : fileEntry.filePath }, 'Failed to clean up temporary session download item');
-					}
-					return nextFileId(null);
-				});
-			});
-		}, () => {
-			return cb(null);
-		});
-	});
+                FileEntry.removeEntry(fileEntry, { removePhysFile : true }, err => {
+                    if(err) {
+                        Log.warn( { fileId : fileEntry.fileId, filePath : fileEntry.filePath }, 'Failed to clean up temporary session download item');
+                    }
+                    return nextFileId(null);
+                });
+            });
+        }, () => {
+            return cb(null);
+        });
+    });
 }
\ No newline at end of file
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index 6c45a5d1..bdca4e72 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -10,78 +10,78 @@ const StatLog							= require('./stat_log.js');
 const async								= require('async');
 
 exports.moduleInfo = {
-	name	: 'File Area Selector',
-	desc	: 'Select from available file areas',
-	author	: 'NuSkooler',
+    name	: 'File Area Selector',
+    desc	: 'Select from available file areas',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	areaList	: 1,
+    areaList	: 1,
 };
 
 exports.getModule = class FileAreaSelectModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.menuMethods = {
-			selectArea : (formData, extraArgs, cb) => {
-				const filterCriteria = {
-					areaTag		: formData.value.areaTag,
-				};
+        this.menuMethods = {
+            selectArea : (formData, extraArgs, cb) => {
+                const filterCriteria = {
+                    areaTag		: formData.value.areaTag,
+                };
 
-				const menuOpts = {
-					extraArgs	: {
-						filterCriteria	: filterCriteria,
-					},
-					menuFlags	: [ 'popParent', 'mergeFlags' ],
-				};
+                const menuOpts = {
+                    extraArgs	: {
+                        filterCriteria	: filterCriteria,
+                    },
+                    menuFlags	: [ 'popParent', 'mergeFlags' ],
+                };
 
-				return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
-			}
-		};
-	}
+                return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
+            }
+        };
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self = this;
+            const self = this;
 
-			async.waterfall(
-				[
-					function mergeAreaStats(callback) {
-						const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
+            async.waterfall(
+                [
+                    function mergeAreaStats(callback) {
+                        const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
 
-						//	we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
-						const availAreas = getSortedAvailableFileAreas(self.client);
-						availAreas.forEach(area => {
-							const stats = areaStats.areas[area.areaTag];
-							area.totalFiles = stats ? stats.files : 0;
-							area.totalBytes	= stats ? stats.bytes : 0;
-						});
+                        //	we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
+                        const availAreas = getSortedAvailableFileAreas(self.client);
+                        availAreas.forEach(area => {
+                            const stats = areaStats.areas[area.areaTag];
+                            area.totalFiles = stats ? stats.files : 0;
+                            area.totalBytes	= stats ? stats.bytes : 0;
+                        });
 
-						return callback(null, availAreas);
-					},
-					function prepView(availAreas, callback) {
-						self.prepViewController('allViews', 0, mciData.menu, (err, vc) => {
-							if(err) {
-								return callback(err);
-							}
+                        return callback(null, availAreas);
+                    },
+                    function prepView(availAreas, callback) {
+                        self.prepViewController('allViews', 0, mciData.menu, (err, vc) => {
+                            if(err) {
+                                return callback(err);
+                            }
 
-							const areaListView = vc.getView(MciViewIds.areaList);
-							areaListView.setItems(availAreas.map(area => Object.assign(area, { text : area.name, data : area.areaTag } )));
-							areaListView.redraw();
+                            const areaListView = vc.getView(MciViewIds.areaList);
+                            areaListView.setItems(availAreas.map(area => Object.assign(area, { text : area.name, data : area.areaTag } )));
+                            areaListView.redraw();
 
-							return callback(null);
-						});
-					}
-				],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                            return callback(null);
+                        });
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/file_base_download_manager.js b/core/file_base_download_manager.js
index 88ed2ddd..fc7672d0 100644
--- a/core/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -17,226 +17,226 @@ const _						= require('lodash');
 const moment				= require('moment');
 
 exports.moduleInfo = {
-	name		: 'File Base Download Queue Manager',
-	desc		: 'Module for interacting with download queue/batch',
-	author		: 'NuSkooler',
+    name		: 'File Base Download Queue Manager',
+    desc		: 'Module for interacting with download queue/batch',
+    author		: 'NuSkooler',
 };
 
 const FormIds = {
-	queueManager	: 0,
+    queueManager	: 0,
 };
 
 const MciViewIds = {
-	queueManager : {
-		queue				: 1,
-		navMenu				: 2,
+    queueManager : {
+        queue				: 1,
+        navMenu				: 2,
 
-		customRangeStart	: 10,
-	},
+        customRangeStart	: 10,
+    },
 };
 
 exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.dlQueue = new DownloadQueue(this.client);
+        this.dlQueue = new DownloadQueue(this.client);
 
-		if(_.has(options, 'lastMenuResult.sentFileIds')) {
-			this.sentFileIds = options.lastMenuResult.sentFileIds;
-		}
+        if(_.has(options, 'lastMenuResult.sentFileIds')) {
+            this.sentFileIds = options.lastMenuResult.sentFileIds;
+        }
 
-		this.fallbackOnly = options.lastMenuResult ? true : false;
+        this.fallbackOnly = options.lastMenuResult ? true : false;
 
-		this.menuMethods = {
-			downloadAll : (formData, extraArgs, cb) => {
-				const modOpts = {
-					extraArgs : {
-						sendQueue 	: this.dlQueue.items,
-						direction	: 'send',
-					}
-				};
+        this.menuMethods = {
+            downloadAll : (formData, extraArgs, cb) => {
+                const modOpts = {
+                    extraArgs : {
+                        sendQueue 	: this.dlQueue.items,
+                        direction	: 'send',
+                    }
+                };
 
-				return this.gotoMenu(this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection', modOpts, cb);
-			},
-			removeItem : (formData, extraArgs, cb) => {
-				const selectedItem = this.dlQueue.items[formData.value.queueItem];
-				if(!selectedItem) {
-					return cb(null);
-				}
+                return this.gotoMenu(this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection', modOpts, cb);
+            },
+            removeItem : (formData, extraArgs, cb) => {
+                const selectedItem = this.dlQueue.items[formData.value.queueItem];
+                if(!selectedItem) {
+                    return cb(null);
+                }
 
-				this.dlQueue.removeItems(selectedItem.fileId);
+                this.dlQueue.removeItems(selectedItem.fileId);
 
-				//	:TODO: broken: does not redraw menu properly - needs fixed!
-				return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
-			},
-			clearQueue : (formData, extraArgs, cb) => {
-				this.dlQueue.clear();
+                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
+            },
+            clearQueue : (formData, extraArgs, cb) => {
+                this.dlQueue.clear();
 
-				//	:TODO: broken: does not redraw menu properly - needs fixed!
-				return this.removeItemsFromDownloadQueueView('all', cb);
-			}
-		};
-	}
+                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                return this.removeItemsFromDownloadQueueView('all', cb);
+            }
+        };
+    }
 
-	initSequence() {
-		if(0 === this.dlQueue.items.length) {
-			if(this.sendFileIds) {
-				//	we've finished everything up - just fall back
-				return this.prevMenu();
-			}
+    initSequence() {
+        if(0 === this.dlQueue.items.length) {
+            if(this.sendFileIds) {
+                //	we've finished everything up - just fall back
+                return this.prevMenu();
+            }
 
-			//	Simply an empty D/L queue: Present a specialized "empty queue" page
-			return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
-		}
+            //	Simply an empty D/L queue: Present a specialized "empty queue" page
+            return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
+        }
 
-		const self = this;
+        const self = this;
 
-		async.series(
-			[
-				function beforeArt(callback) {
-					return self.beforeArt(callback);
-				},
-				function display(callback) {
-					return self.displayQueueManagerPage(false, callback);
-				}
-			],
-			() => {
-				return self.finishedLoading();
-			}
-		);
-	}
+        async.series(
+            [
+                function beforeArt(callback) {
+                    return self.beforeArt(callback);
+                },
+                function display(callback) {
+                    return self.displayQueueManagerPage(false, callback);
+                }
+            ],
+            () => {
+                return self.finishedLoading();
+            }
+        );
+    }
 
-	removeItemsFromDownloadQueueView(itemIndex, cb) {
-		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
-		if(!queueView) {
-			return cb(Errors.DoesNotExist('Queue view does not exist'));
-		}
+    removeItemsFromDownloadQueueView(itemIndex, cb) {
+        const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+        if(!queueView) {
+            return cb(Errors.DoesNotExist('Queue view does not exist'));
+        }
 
-		if('all' === itemIndex) {
-			queueView.setItems([]);
-			queueView.setFocusItems([]);
-		} else {
-			queueView.removeItem(itemIndex);
-		}
+        if('all' === itemIndex) {
+            queueView.setItems([]);
+            queueView.setFocusItems([]);
+        } else {
+            queueView.removeItem(itemIndex);
+        }
 
-		queueView.redraw();
-		return cb(null);
-	}
+        queueView.redraw();
+        return cb(null);
+    }
 
-	displayWebDownloadLinkForFileEntry(fileEntry) {
-		FileAreaWeb.getExistingTempDownloadServeItem(this.client, fileEntry, (err, serveItem) => {
-			if(serveItem && serveItem.url) {
-				const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+    displayWebDownloadLinkForFileEntry(fileEntry) {
+        FileAreaWeb.getExistingTempDownloadServeItem(this.client, fileEntry, (err, serveItem) => {
+            if(serveItem && serveItem.url) {
+                const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-				fileEntry.webDlLink 	= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
-				fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
-			} else {
-				fileEntry.webDlLink		= '';
-				fileEntry.webDlExpire	= '';
-			}
+                fileEntry.webDlLink 	= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
+                fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+            } else {
+                fileEntry.webDlLink		= '';
+                fileEntry.webDlExpire	= '';
+            }
 
-			this.updateCustomViewTextsWithFilter(
-				'queueManager',
-				MciViewIds.queueManager.customRangeStart, fileEntry,
-				{ filter : [ '{webDlLink}', '{webDlExpire}' ] }
-			);
-		});
-	}
+            this.updateCustomViewTextsWithFilter(
+                'queueManager',
+                MciViewIds.queueManager.customRangeStart, fileEntry,
+                { filter : [ '{webDlLink}', '{webDlExpire}' ] }
+            );
+        });
+    }
 
-	updateDownloadQueueView(cb) {
-		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
-		if(!queueView) {
-			return cb(Errors.DoesNotExist('Queue view does not exist'));
-		}
+    updateDownloadQueueView(cb) {
+        const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+        if(!queueView) {
+            return cb(Errors.DoesNotExist('Queue view does not exist'));
+        }
 
-		const queueListFormat		= this.menuConfig.config.queueListFormat || '{fileName} {byteSize}';
-		const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
+        const queueListFormat		= this.menuConfig.config.queueListFormat || '{fileName} {byteSize}';
+        const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
 
-		queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
-		queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
+        queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
+        queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
 
-		queueView.on('index update', idx => {
-			const fileEntry = this.dlQueue.items[idx];
-			this.displayWebDownloadLinkForFileEntry(fileEntry);
-		});
+        queueView.on('index update', idx => {
+            const fileEntry = this.dlQueue.items[idx];
+            this.displayWebDownloadLinkForFileEntry(fileEntry);
+        });
 
-		queueView.redraw();
-		this.displayWebDownloadLinkForFileEntry(this.dlQueue.items[0]);
+        queueView.redraw();
+        this.displayWebDownloadLinkForFileEntry(this.dlQueue.items[0]);
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 
-	displayQueueManagerPage(clearScreen, cb) {
-		const self = this;
+    displayQueueManagerPage(clearScreen, cb) {
+        const self = this;
 
-		async.series(
-			[
-				function prepArtAndViewController(callback) {
-					return self.displayArtAndPrepViewController('queueManager', { clearScreen : clearScreen }, callback);
-				},
-				function populateViews(callback) {
-					return self.updateDownloadQueueView(callback);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+        async.series(
+            [
+                function prepArtAndViewController(callback) {
+                    return self.displayArtAndPrepViewController('queueManager', { clearScreen : clearScreen }, callback);
+                },
+                function populateViews(callback) {
+                    return self.updateDownloadQueueView(callback);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	displayArtAndPrepViewController(name, options, cb) {
-		const self		= this;
-		const config	= this.menuConfig.config;
+    displayArtAndPrepViewController(name, options, cb) {
+        const self		= this;
+        const config	= this.menuConfig.config;
 
-		async.waterfall(
-			[
-				function readyAndDisplayArt(callback) {
-					if(options.clearScreen) {
-						self.client.term.rawWrite(ansi.resetScreen());
-					}
+        async.waterfall(
+            [
+                function readyAndDisplayArt(callback) {
+                    if(options.clearScreen) {
+                        self.client.term.rawWrite(ansi.resetScreen());
+                    }
 
-					theme.displayThemedAsset(
-						config.art[name],
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function prepeareViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers[name])) {
-						const vcOpts = {
-							client		: self.client,
-							formId		: FormIds[name],
-						};
+                    theme.displayThemedAsset(
+                        config.art[name],
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function prepeareViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers[name])) {
+                        const vcOpts = {
+                            client		: self.client,
+                            formId		: FormIds[name],
+                        };
 
-						if(!_.isUndefined(options.noInput)) {
-							vcOpts.noInput = options.noInput;
-						}
+                        if(!_.isUndefined(options.noInput)) {
+                            vcOpts.noInput = options.noInput;
+                        }
 
-						const vc = self.addViewController(name, new ViewController(vcOpts));
+                        const vc = self.addViewController(name, new ViewController(vcOpts));
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds[name],
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds[name],
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    }
 
-					self.viewControllers[name].setFocus(true);
-					return callback(null);
+                    self.viewControllers[name].setFocus(true);
+                    return callback(null);
 
-				},
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                },
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 };
diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index d8b566b7..9a22051f 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -6,150 +6,150 @@ const _						= require('lodash');
 const uuidV4				= require('uuid/v4');
 
 module.exports = class FileBaseFilters {
-	constructor(client) {
-		this.client	= client;
+    constructor(client) {
+        this.client	= client;
 
-		this.load();
-	}
+        this.load();
+    }
 
-	static get OrderByValues() {
-		return [ 'descending', 'ascending' ];
-	}
+    static get OrderByValues() {
+        return [ 'descending', 'ascending' ];
+    }
 
-	static get SortByValues() {
-		return [
-			'upload_timestamp',
-			'upload_by_username',
-			'dl_count',
-			'user_rating',
-			'est_release_year',
-			'byte_size',
-			'file_name',
-		];
-	}
+    static get SortByValues() {
+        return [
+            'upload_timestamp',
+            'upload_by_username',
+            'dl_count',
+            'user_rating',
+            'est_release_year',
+            'byte_size',
+            'file_name',
+        ];
+    }
 
-	toArray() {
-		return _.map(this.filters, (filter, uuid) => {
-			return Object.assign( { uuid : uuid }, filter );
-		});
-	}
+    toArray() {
+        return _.map(this.filters, (filter, uuid) => {
+            return Object.assign( { uuid : uuid }, filter );
+        });
+    }
 
-	get(filterUuid) {
-		return this.filters[filterUuid];
-	}
+    get(filterUuid) {
+        return this.filters[filterUuid];
+    }
 
-	add(filterInfo) {
-		const filterUuid = uuidV4();
+    add(filterInfo) {
+        const filterUuid = uuidV4();
 
-		filterInfo.tags = this.cleanTags(filterInfo.tags);
+        filterInfo.tags = this.cleanTags(filterInfo.tags);
 
-		this.filters[filterUuid] = filterInfo;
+        this.filters[filterUuid] = filterInfo;
 
-		return filterUuid;
-	}
+        return filterUuid;
+    }
 
-	replace(filterUuid, filterInfo) {
-		const filter = this.get(filterUuid);
-		if(!filter) {
-			return false;
-		}
+    replace(filterUuid, filterInfo) {
+        const filter = this.get(filterUuid);
+        if(!filter) {
+            return false;
+        }
 
-		filterInfo.tags = this.cleanTags(filterInfo.tags);
-		this.filters[filterUuid] = filterInfo;
-		return true;
-	}
+        filterInfo.tags = this.cleanTags(filterInfo.tags);
+        this.filters[filterUuid] = filterInfo;
+        return true;
+    }
 
-	remove(filterUuid) {
-		delete this.filters[filterUuid];
-	}
+    remove(filterUuid) {
+        delete this.filters[filterUuid];
+    }
 
-	load() {
-		let filtersProperty = this.client.user.properties.file_base_filters;
-		let defaulted;
-		if(!filtersProperty) {
-			filtersProperty = JSON.stringify(FileBaseFilters.getBuiltInSystemFilters());
-			defaulted = true;
-		}
+    load() {
+        let filtersProperty = this.client.user.properties.file_base_filters;
+        let defaulted;
+        if(!filtersProperty) {
+            filtersProperty = JSON.stringify(FileBaseFilters.getBuiltInSystemFilters());
+            defaulted = true;
+        }
 
-		try {
-			this.filters = JSON.parse(filtersProperty);
-		} catch(e) {
-			this.filters = FileBaseFilters.getBuiltInSystemFilters();	//	something bad happened; reset everything back to defaults :(
-			defaulted = true;
-			this.client.log.error( { error : e.message, property : filtersProperty }, 'Failed parsing file base filters property' );
-		}
+        try {
+            this.filters = JSON.parse(filtersProperty);
+        } catch(e) {
+            this.filters = FileBaseFilters.getBuiltInSystemFilters();	//	something bad happened; reset everything back to defaults :(
+            defaulted = true;
+            this.client.log.error( { error : e.message, property : filtersProperty }, 'Failed parsing file base filters property' );
+        }
 
-		if(defaulted) {
-			this.persist( err => {
-				if(!err) {
-					const defaultActiveUuid = this.toArray()[0].uuid;
-					this.setActive(defaultActiveUuid);
-				}
-			});
-		}
-	}
+        if(defaulted) {
+            this.persist( err => {
+                if(!err) {
+                    const defaultActiveUuid = this.toArray()[0].uuid;
+                    this.setActive(defaultActiveUuid);
+                }
+            });
+        }
+    }
 
-	persist(cb) {
-		return this.client.user.persistProperty('file_base_filters', JSON.stringify(this.filters), cb);
-	}
+    persist(cb) {
+        return this.client.user.persistProperty('file_base_filters', JSON.stringify(this.filters), cb);
+    }
 
-	cleanTags(tags) {
-		return tags.toLowerCase().replace(/,?\s+|,/g, ' ').trim();
-	}
+    cleanTags(tags) {
+        return tags.toLowerCase().replace(/,?\s+|,/g, ' ').trim();
+    }
 
-	setActive(filterUuid) {
-		const activeFilter = this.get(filterUuid);
+    setActive(filterUuid) {
+        const activeFilter = this.get(filterUuid);
 
-		if(activeFilter) {
-			this.activeFilter = activeFilter;
-			this.client.user.persistProperty('file_base_filter_active_uuid', filterUuid);
-			return true;
-		}
+        if(activeFilter) {
+            this.activeFilter = activeFilter;
+            this.client.user.persistProperty('file_base_filter_active_uuid', filterUuid);
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	static getBuiltInSystemFilters() {
-		const U_LATEST	= '7458b09d-40ab-4f9b-a0d7-0cf866646329';
+    static getBuiltInSystemFilters() {
+        const U_LATEST	= '7458b09d-40ab-4f9b-a0d7-0cf866646329';
 
-		const filters = {
-			[ U_LATEST ] : {
-				name	: 'By Date Added',
-				areaTag	: '',	//	all
-				terms	: '',	//	*
-				tags	: '',	//	*
-				order	: 'descending',
-				sort	: 'upload_timestamp',
-				uuid	: U_LATEST,
-				system	: true,
-			}
-		};
+        const filters = {
+            [ U_LATEST ] : {
+                name	: 'By Date Added',
+                areaTag	: '',	//	all
+                terms	: '',	//	*
+                tags	: '',	//	*
+                order	: 'descending',
+                sort	: 'upload_timestamp',
+                uuid	: U_LATEST,
+                system	: true,
+            }
+        };
 
-		return filters;
-	}
+        return filters;
+    }
 
-	static getActiveFilter(client) {
-		return new FileBaseFilters(client).get(client.user.properties.file_base_filter_active_uuid);
-	}
+    static getActiveFilter(client) {
+        return new FileBaseFilters(client).get(client.user.properties.file_base_filter_active_uuid);
+    }
 
-	static getFileBaseLastViewedFileIdByUser(user) {
-		return parseInt((user.properties.user_file_base_last_viewed || 0));
-	}
+    static getFileBaseLastViewedFileIdByUser(user) {
+        return parseInt((user.properties.user_file_base_last_viewed || 0));
+    }
 
-	static setFileBaseLastViewedFileIdForUser(user, fileId, allowOlder, cb) {
-		if(!cb && _.isFunction(allowOlder)) {
-			cb = allowOlder;
-			allowOlder = false;
-		}
+    static setFileBaseLastViewedFileIdForUser(user, fileId, allowOlder, cb) {
+        if(!cb && _.isFunction(allowOlder)) {
+            cb = allowOlder;
+            allowOlder = false;
+        }
 
-		const current = FileBaseFilters.getFileBaseLastViewedFileIdByUser(user);
-		if(!allowOlder && fileId < current) {
-			if(cb) {
-				cb(null);
-			}
-			return;
-		}
+        const current = FileBaseFilters.getFileBaseLastViewedFileIdByUser(user);
+        if(!allowOlder && fileId < current) {
+            if(cb) {
+                cb(null);
+            }
+            return;
+        }
 
-		return user.persistProperty('user_file_base_last_viewed', fileId, cb);
-	}
+        return user.persistProperty('user_file_base_last_viewed', fileId, cb);
+    }
 };
diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index 8b45da83..b66e04db 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -8,8 +8,8 @@ const FileArea			= require('./file_base_area.js');
 const Config			= require('./config.js').get;
 const { Errors }		= require('./enig_error.js');
 const {
-	splitTextAtTerms,
-	isAnsi,
+    splitTextAtTerms,
+    isAnsi,
 }						= require('./string_util.js');
 const AnsiPrep			= require('./ansi_prep.js');
 const Log				= require('./logger.js').log;
@@ -26,276 +26,276 @@ exports.exportFileList							= exportFileList;
 exports.updateFileBaseDescFilesScheduledEvent	= updateFileBaseDescFilesScheduledEvent;
 
 function exportFileList(filterCriteria, options, cb) {
-	options.templateEncoding	= options.templateEncoding || 'utf8';
-	options.entryTemplate		= options.entryTemplate || 'descript_ion_export_entry_template.asc';
-	options.tsFormat			= options.tsFormat || 'YYYY-MM-DD';
-	options.descWidth			= options.descWidth || 45;	//	FILE_ID.DIZ spec
-	options.escapeDesc			= _.get(options, 'escapeDesc', false);	//	escape \r and \n in desc?
+    options.templateEncoding	= options.templateEncoding || 'utf8';
+    options.entryTemplate		= options.entryTemplate || 'descript_ion_export_entry_template.asc';
+    options.tsFormat			= options.tsFormat || 'YYYY-MM-DD';
+    options.descWidth			= options.descWidth || 45;	//	FILE_ID.DIZ spec
+    options.escapeDesc			= _.get(options, 'escapeDesc', false);	//	escape \r and \n in desc?
 
-	if(true === options.escapeDesc) {
-		options.escapeDesc = '\\n';
-	}
+    if(true === options.escapeDesc) {
+        options.escapeDesc = '\\n';
+    }
 
-	const state = {
-		total	: 0,
-		current	: 0,
-		step	: 'preparing',
-		status	: 'Preparing',
-	};
+    const state = {
+        total	: 0,
+        current	: 0,
+        step	: 'preparing',
+        status	: 'Preparing',
+    };
 
-	const updateProgress = _.isFunction(options.progress) ?
-		progCb => {
-			return options.progress(state, progCb);
-		} :
-		progCb => {
-			return progCb(null);
-		}
+    const updateProgress = _.isFunction(options.progress) ?
+        progCb => {
+            return options.progress(state, progCb);
+        } :
+        progCb => {
+            return progCb(null);
+        }
 		;
 
-	async.waterfall(
-		[
-			function readTemplateFiles(callback) {
-				updateProgress(err => {
-					if(err) {
-						return callback(err);
-					}
+    async.waterfall(
+        [
+            function readTemplateFiles(callback) {
+                updateProgress(err => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					const templateFiles = [
-						{ name : options.headerTemplate,	req : false },
-						{ name : options.entryTemplate,		req : true }
-					];
+                    const templateFiles = [
+                        { name : options.headerTemplate,	req : false },
+                        { name : options.entryTemplate,		req : true }
+                    ];
 
-					const config = Config();
-					async.map(templateFiles, (template, nextTemplate) => {
-						if(!template.name && !template.req) {
-							return nextTemplate(null, Buffer.from([]));
-						}
+                    const config = Config();
+                    async.map(templateFiles, (template, nextTemplate) => {
+                        if(!template.name && !template.req) {
+                            return nextTemplate(null, Buffer.from([]));
+                        }
 
-						template.name = paths.isAbsolute(template.name) ? template.name : paths.join(config.paths.misc, template.name);
-						fs.readFile(template.name, (err, data) => {
-							return nextTemplate(err, data);
-						});
-					}, (err, templates) => {
-						if(err) {
-							return callback(Errors.General(err.message));
-						}
+                        template.name = paths.isAbsolute(template.name) ? template.name : paths.join(config.paths.misc, template.name);
+                        fs.readFile(template.name, (err, data) => {
+                            return nextTemplate(err, data);
+                        });
+                    }, (err, templates) => {
+                        if(err) {
+                            return callback(Errors.General(err.message));
+                        }
 
-						//	decode + ensure DOS style CRLF
-						templates = templates.map(tmp => iconv.decode(tmp, options.templateEncoding).replace(/\r?\n/g, '\r\n') );
+                        //	decode + ensure DOS style CRLF
+                        templates = templates.map(tmp => iconv.decode(tmp, options.templateEncoding).replace(/\r?\n/g, '\r\n') );
 
-						//	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
-						let descIndent = 0;
-						if(!options.escapeDesc) {
-							splitTextAtTerms(templates[1]).some(line => {
-								const pos = line.indexOf('{fileDesc}');
-								if(pos > -1) {
-									descIndent = pos;
-									return true;	//	found it!
-								}
-								return false;	//	keep looking
-							});
-						}
+                        //	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
+                        let descIndent = 0;
+                        if(!options.escapeDesc) {
+                            splitTextAtTerms(templates[1]).some(line => {
+                                const pos = line.indexOf('{fileDesc}');
+                                if(pos > -1) {
+                                    descIndent = pos;
+                                    return true;	//	found it!
+                                }
+                                return false;	//	keep looking
+                            });
+                        }
 
-						return callback(null, templates[0], templates[1], descIndent);
-					});
-				});
-			},
-			function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
-				state.step		= 'gathering';
-				state.status	= 'Gathering files for supplied criteria';
-				updateProgress(err => {
-					if(err) {
-						return callback(err);
-					}
+                        return callback(null, templates[0], templates[1], descIndent);
+                    });
+                });
+            },
+            function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
+                state.step		= 'gathering';
+                state.status	= 'Gathering files for supplied criteria';
+                updateProgress(err => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					FileEntry.findFiles(filterCriteria, (err, fileIds) => {
-						if(0 === fileIds.length) {
-							return callback(Errors.General('No results for criteria', 'NORESULTS'));
-						}
+                    FileEntry.findFiles(filterCriteria, (err, fileIds) => {
+                        if(0 === fileIds.length) {
+                            return callback(Errors.General('No results for criteria', 'NORESULTS'));
+                        }
 
-						return callback(err, headerTemplate, entryTemplate, descIndent, fileIds);
-					});
-				});
-			},
-			function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
-				const formatObj = {
-					totalFileCount	: fileIds.length,
-				};
+                        return callback(err, headerTemplate, entryTemplate, descIndent, fileIds);
+                    });
+                });
+            },
+            function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
+                const formatObj = {
+                    totalFileCount	: fileIds.length,
+                };
 
-				let current		= 0;
-				let listBody	= '';
-				const totals	= { fileCount : fileIds.length, bytes : 0 };
-				state.total		= fileIds.length;
+                let current		= 0;
+                let listBody	= '';
+                const totals	= { fileCount : fileIds.length, bytes : 0 };
+                state.total		= fileIds.length;
 
-				state.step		= 'file';
+                state.step		= 'file';
 
-				async.eachSeries(fileIds, (fileId, nextFileId) => {
-					const fileInfo = new FileEntry();
-					current += 1;
+                async.eachSeries(fileIds, (fileId, nextFileId) => {
+                    const fileInfo = new FileEntry();
+                    current += 1;
 
-					fileInfo.load(fileId, err => {
-						if(err) {
-							return nextFileId(null);	//	failed, but try the next
-						}
+                    fileInfo.load(fileId, err => {
+                        if(err) {
+                            return nextFileId(null);	//	failed, but try the next
+                        }
 
-						totals.bytes += fileInfo.meta.byte_size;
+                        totals.bytes += fileInfo.meta.byte_size;
 
-						const appendFileInfo = () => {
-							if(options.escapeDesc) {
-								formatObj.fileDesc = formatObj.fileDesc.replace(/\r?\n/g, options.escapeDesc);
-							}
+                        const appendFileInfo = () => {
+                            if(options.escapeDesc) {
+                                formatObj.fileDesc = formatObj.fileDesc.replace(/\r?\n/g, options.escapeDesc);
+                            }
 
-							if(options.maxDescLen) {
-								formatObj.fileDesc = formatObj.fileDesc.slice(0, options.maxDescLen);
-							}
+                            if(options.maxDescLen) {
+                                formatObj.fileDesc = formatObj.fileDesc.slice(0, options.maxDescLen);
+                            }
 
-							listBody += stringFormat(entryTemplate, formatObj);
+                            listBody += stringFormat(entryTemplate, formatObj);
 
-							state.current	= current;
-							state.status	= `Processing ${fileInfo.fileName}`;
-							state.fileInfo	= formatObj;
+                            state.current	= current;
+                            state.status	= `Processing ${fileInfo.fileName}`;
+                            state.fileInfo	= formatObj;
 
-							updateProgress(err => {
-								return nextFileId(err);
-							});
-						};
+                            updateProgress(err => {
+                                return nextFileId(err);
+                            });
+                        };
 
-						const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
+                        const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
 
-						formatObj.fileId		= fileId;
-						formatObj.areaName		= _.get(area, 'name') || 'N/A';
-						formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
-						formatObj.userRating	= fileInfo.userRating || 0;
-						formatObj.fileName		= fileInfo.fileName;
-						formatObj.fileSize		= fileInfo.meta.byte_size;
-						formatObj.fileDesc		= fileInfo.desc || '';
-						formatObj.fileDescShort	= formatObj.fileDesc.slice(0, options.descWidth);
-						formatObj.fileSha256	= fileInfo.fileSha256;
-						formatObj.fileCrc32		= fileInfo.meta.file_crc32;
-						formatObj.fileMd5		= fileInfo.meta.file_md5;
-						formatObj.fileSha1		= fileInfo.meta.file_sha1;
-						formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
-						formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(options.tsFormat);
-						formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
-						formatObj.currentFile	= current;
-						formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
+                        formatObj.fileId		= fileId;
+                        formatObj.areaName		= _.get(area, 'name') || 'N/A';
+                        formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
+                        formatObj.userRating	= fileInfo.userRating || 0;
+                        formatObj.fileName		= fileInfo.fileName;
+                        formatObj.fileSize		= fileInfo.meta.byte_size;
+                        formatObj.fileDesc		= fileInfo.desc || '';
+                        formatObj.fileDescShort	= formatObj.fileDesc.slice(0, options.descWidth);
+                        formatObj.fileSha256	= fileInfo.fileSha256;
+                        formatObj.fileCrc32		= fileInfo.meta.file_crc32;
+                        formatObj.fileMd5		= fileInfo.meta.file_md5;
+                        formatObj.fileSha1		= fileInfo.meta.file_sha1;
+                        formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
+                        formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(options.tsFormat);
+                        formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
+                        formatObj.currentFile	= current;
+                        formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
 
-						if(isAnsi(fileInfo.desc)) {
-							AnsiPrep(
-								fileInfo.desc,
-								{
-									cols			: Math.min(options.descWidth, 79 - descIndent),
-									forceLineTerm	: true,				//	ensure each line is term'd
-									asciiMode		: true,				//	export to ASCII
-									fillLines		: false,			//	don't fill up to |cols|
-									indent			: descIndent,
-								},
-								(err, desc) => {
-									if(desc) {
-										formatObj.fileDesc = desc;
-									}
-									return appendFileInfo();
-								}
-							);
-						} else {
-							const indentSpc = descIndent > 0 ? ' '.repeat(descIndent) : '';
-							formatObj.fileDesc = splitTextAtTerms(formatObj.fileDesc).join(`\r\n${indentSpc}`) + '\r\n';
-							return appendFileInfo();
-						}
-					});
-				}, err => {
-					return callback(err, listBody, headerTemplate, totals);
-				});
-			},
-			function buildHeader(listBody, headerTemplate, totals, callback) {
-				//	header is built last such that we can have totals/etc.
+                        if(isAnsi(fileInfo.desc)) {
+                            AnsiPrep(
+                                fileInfo.desc,
+                                {
+                                    cols			: Math.min(options.descWidth, 79 - descIndent),
+                                    forceLineTerm	: true,				//	ensure each line is term'd
+                                    asciiMode		: true,				//	export to ASCII
+                                    fillLines		: false,			//	don't fill up to |cols|
+                                    indent			: descIndent,
+                                },
+                                (err, desc) => {
+                                    if(desc) {
+                                        formatObj.fileDesc = desc;
+                                    }
+                                    return appendFileInfo();
+                                }
+                            );
+                        } else {
+                            const indentSpc = descIndent > 0 ? ' '.repeat(descIndent) : '';
+                            formatObj.fileDesc = splitTextAtTerms(formatObj.fileDesc).join(`\r\n${indentSpc}`) + '\r\n';
+                            return appendFileInfo();
+                        }
+                    });
+                }, err => {
+                    return callback(err, listBody, headerTemplate, totals);
+                });
+            },
+            function buildHeader(listBody, headerTemplate, totals, callback) {
+                //	header is built last such that we can have totals/etc.
 
-				let filterAreaName;
-				let filterAreaDesc;
-				if(filterCriteria.areaTag) {
-					const area 		= FileArea.getFileAreaByTag(filterCriteria.areaTag);
-					filterAreaName	= _.get(area, 'name') || 'N/A';
-					filterAreaDesc	= _.get(area, 'desc') || 'N/A';
-				} else {
-					filterAreaName	= '-ALL-';
-					filterAreaDesc	= 'All areas';
-				}
+                let filterAreaName;
+                let filterAreaDesc;
+                if(filterCriteria.areaTag) {
+                    const area 		= FileArea.getFileAreaByTag(filterCriteria.areaTag);
+                    filterAreaName	= _.get(area, 'name') || 'N/A';
+                    filterAreaDesc	= _.get(area, 'desc') || 'N/A';
+                } else {
+                    filterAreaName	= '-ALL-';
+                    filterAreaDesc	= 'All areas';
+                }
 
-				const headerFormatObj = {
-					nowTs			: moment().format(options.tsFormat),
-					boardName		: Config().general.boardName,
-					totalFileCount	: totals.fileCount,
-					totalFileSize	: totals.bytes,
-					filterAreaTag	: filterCriteria.areaTag || '-ALL-',
-					filterAreaName	: filterAreaName,
-					filterAreaDesc	: filterAreaDesc,
-					filterTerms		: filterCriteria.terms || '(none)',
-					filterHashTags	: filterCriteria.tags || '(none)',
-				};
+                const headerFormatObj = {
+                    nowTs			: moment().format(options.tsFormat),
+                    boardName		: Config().general.boardName,
+                    totalFileCount	: totals.fileCount,
+                    totalFileSize	: totals.bytes,
+                    filterAreaTag	: filterCriteria.areaTag || '-ALL-',
+                    filterAreaName	: filterAreaName,
+                    filterAreaDesc	: filterAreaDesc,
+                    filterTerms		: filterCriteria.terms || '(none)',
+                    filterHashTags	: filterCriteria.tags || '(none)',
+                };
 
-				listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
-				return callback(null, listBody);
-			},
-			function done(listBody, callback) {
-				delete state.fileInfo;
-				state.step 		= 'finished';
-				state.status	= 'Finished processing';
-				updateProgress( () => {
-					return callback(null, listBody);
-				});
-			}
-		], (err, listBody) => {
-			return cb(err, listBody);
-		}
-	);
+                listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
+                return callback(null, listBody);
+            },
+            function done(listBody, callback) {
+                delete state.fileInfo;
+                state.step 		= 'finished';
+                state.status	= 'Finished processing';
+                updateProgress( () => {
+                    return callback(null, listBody);
+                });
+            }
+        ], (err, listBody) => {
+            return cb(err, listBody);
+        }
+    );
 }
 
 function updateFileBaseDescFilesScheduledEvent(args, cb) {
-	//
-	//	For each area, loop over storage locations and build
-	//	DESCRIPT.ION file to store in the same directory.
-	//
-	//	Standard-ish 4DOS spec is as such:
-	//	* Entry: <QUOTED_LFN> <DESC>[0x04<AppData>]\r\n
-	//	* Multi line descriptions are stored with *escaped* \r\n pairs
-	//	* Default template uses 0x2c for <AppData> as per https://stackoverflow.com/questions/1810398/descript-ion-file-spec
-	//
-	const entryTemplate 	= args[0];
-	const headerTemplate	= args[1];
+    //
+    //	For each area, loop over storage locations and build
+    //	DESCRIPT.ION file to store in the same directory.
+    //
+    //	Standard-ish 4DOS spec is as such:
+    //	* Entry: <QUOTED_LFN> <DESC>[0x04<AppData>]\r\n
+    //	* Multi line descriptions are stored with *escaped* \r\n pairs
+    //	* Default template uses 0x2c for <AppData> as per https://stackoverflow.com/questions/1810398/descript-ion-file-spec
+    //
+    const entryTemplate 	= args[0];
+    const headerTemplate	= args[1];
 
-	const areas = FileArea.getAvailableFileAreas(null, { skipAcsCheck : true });
-	async.each(areas, (area, nextArea) => {
-		const storageLocations = FileArea.getAreaStorageLocations(area);
+    const areas = FileArea.getAvailableFileAreas(null, { skipAcsCheck : true });
+    async.each(areas, (area, nextArea) => {
+        const storageLocations = FileArea.getAreaStorageLocations(area);
 
-		async.each(storageLocations, (storageLoc, nextStorageLoc) => {
-			const filterCriteria = {
-				areaTag		: area.areaTag,
-				storageTag	: storageLoc.storageTag,
-			};
+        async.each(storageLocations, (storageLoc, nextStorageLoc) => {
+            const filterCriteria = {
+                areaTag		: area.areaTag,
+                storageTag	: storageLoc.storageTag,
+            };
 
-			const exportOpts = {
-				headerTemplate	: headerTemplate,
-				entryTemplate	: entryTemplate,
-				escapeDesc		: true,	//	escape CRLF's
-				maxDescLen		: 4096,	//	DESCRIPT.ION: "The line length limit is 4096 bytes"
-			};
+            const exportOpts = {
+                headerTemplate	: headerTemplate,
+                entryTemplate	: entryTemplate,
+                escapeDesc		: true,	//	escape CRLF's
+                maxDescLen		: 4096,	//	DESCRIPT.ION: "The line length limit is 4096 bytes"
+            };
 
-			exportFileList(filterCriteria, exportOpts, (err, listBody) => {
+            exportFileList(filterCriteria, exportOpts, (err, listBody) => {
 
-				const descIonPath = paths.join(storageLoc.dir, 'DESCRIPT.ION');
-				fs.writeFile(descIonPath, iconv.encode(listBody, 'cp437'), err => {
-					if(err) {
-						Log.warn( { error : err.message, path : descIonPath }, 'Failed (re)creating DESCRIPT.ION');
-					} else {
-						Log.debug( { path : descIonPath }, '(Re)generated DESCRIPT.ION');
-					}
-					return nextStorageLoc(null);
-				});
-			});
-		}, () => {
-			return nextArea(null);
-		});
-	}, () => {
-		return cb(null);
-	});
+                const descIonPath = paths.join(storageLoc.dir, 'DESCRIPT.ION');
+                fs.writeFile(descIonPath, iconv.encode(listBody, 'cp437'), err => {
+                    if(err) {
+                        Log.warn( { error : err.message, path : descIonPath }, 'Failed (re)creating DESCRIPT.ION');
+                    } else {
+                        Log.debug( { path : descIonPath }, '(Re)generated DESCRIPT.ION');
+                    }
+                    return nextStorageLoc(null);
+                });
+            });
+        }, () => {
+            return nextArea(null);
+        });
+    }, () => {
+        return cb(null);
+    });
 }
diff --git a/core/file_base_search.js b/core/file_base_search.js
index 06dac204..3e754b91 100644
--- a/core/file_base_search.js
+++ b/core/file_base_search.js
@@ -11,110 +11,110 @@ const FileBaseFilters				= require('./file_base_filter.js');
 const async							= require('async');
 
 exports.moduleInfo = {
-	name		: 'File Base Search',
-	desc		: 'Module for quickly searching the file base',
-	author		: 'NuSkooler',
+    name		: 'File Base Search',
+    desc		: 'Module for quickly searching the file base',
+    author		: 'NuSkooler',
 };
 
 const MciViewIds = {
-	search : {
-		searchTerms	: 1,
-		search		: 2,
-		tags		: 3,
-		area		: 4,
-		orderBy		: 5,
-		sort		: 6,
-		advSearch	: 7,
-	}
+    search : {
+        searchTerms	: 1,
+        search		: 2,
+        tags		: 3,
+        area		: 4,
+        orderBy		: 5,
+        sort		: 6,
+        advSearch	: 7,
+    }
 };
 
 exports.getModule = class FileBaseSearch extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.menuMethods = {
-			search : (formData, extraArgs, cb) => {
-				const isAdvanced = formData.submitId === MciViewIds.search.advSearch;
-				return this.searchNow(formData, isAdvanced, cb);
-			},
-		};
-	}
+        this.menuMethods = {
+            search : (formData, extraArgs, cb) => {
+                const isAdvanced = formData.submitId === MciViewIds.search.advSearch;
+                return this.searchNow(formData, isAdvanced, cb);
+            },
+        };
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.addViewController( 'search', new ViewController( { client : this.client } ) );
+            const self	= this;
+            const vc	= self.addViewController( 'search', new ViewController( { client : this.client } ) );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
-					},
-					function populateAreas(callback) {
-						self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
+                    },
+                    function populateAreas(callback) {
+                        self.availAreas = [ { name : '-ALL-' } ].concat(getSortedAvailableFileAreas(self.client) || []);
 
-						const areasView = vc.getView(MciViewIds.search.area);
-						areasView.setItems( self.availAreas.map( a => a.name ) );
-						areasView.redraw();
-						vc.switchFocus(MciViewIds.search.searchTerms);
+                        const areasView = vc.getView(MciViewIds.search.area);
+                        areasView.setItems( self.availAreas.map( a => a.name ) );
+                        areasView.redraw();
+                        vc.switchFocus(MciViewIds.search.searchTerms);
 
-						return callback(null);
-					}
-				],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	getSelectedAreaTag(index) {
-		if(0 === index) {
-			return '';	//	-ALL-
-		}
-		const area = this.availAreas[index];
-		if(!area) {
-			return '';
-		}
-		return area.areaTag;
-	}
+    getSelectedAreaTag(index) {
+        if(0 === index) {
+            return '';	//	-ALL-
+        }
+        const area = this.availAreas[index];
+        if(!area) {
+            return '';
+        }
+        return area.areaTag;
+    }
 
-	getOrderBy(index) {
-		return FileBaseFilters.OrderByValues[index] || FileBaseFilters.OrderByValues[0];
-	}
+    getOrderBy(index) {
+        return FileBaseFilters.OrderByValues[index] || FileBaseFilters.OrderByValues[0];
+    }
 
-	getSortBy(index) {
-		return FileBaseFilters.SortByValues[index] || FileBaseFilters.SortByValues[0];
-	}
+    getSortBy(index) {
+        return FileBaseFilters.SortByValues[index] || FileBaseFilters.SortByValues[0];
+    }
 
-	getFilterValuesFromFormData(formData, isAdvanced) {
-		const areaIndex		= isAdvanced ? formData.value.areaIndex : 0;
-		const orderByIndex	= isAdvanced ? formData.value.orderByIndex : 0;
-		const sortByIndex	= isAdvanced ? formData.value.sortByIndex : 0;
+    getFilterValuesFromFormData(formData, isAdvanced) {
+        const areaIndex		= isAdvanced ? formData.value.areaIndex : 0;
+        const orderByIndex	= isAdvanced ? formData.value.orderByIndex : 0;
+        const sortByIndex	= isAdvanced ? formData.value.sortByIndex : 0;
 
-		return {
-			areaTag		: this.getSelectedAreaTag(areaIndex),
-			terms		: formData.value.searchTerms,
-			tags		: isAdvanced ? formData.value.tags : '',
-			order		: this.getOrderBy(orderByIndex),
-			sort		: this.getSortBy(sortByIndex),
-		};
-	}
+        return {
+            areaTag		: this.getSelectedAreaTag(areaIndex),
+            terms		: formData.value.searchTerms,
+            tags		: isAdvanced ? formData.value.tags : '',
+            order		: this.getOrderBy(orderByIndex),
+            sort		: this.getSortBy(sortByIndex),
+        };
+    }
 
-	searchNow(formData, isAdvanced, cb) {
-		const filterCriteria = this.getFilterValuesFromFormData(formData, isAdvanced);
+    searchNow(formData, isAdvanced, cb) {
+        const filterCriteria = this.getFilterValuesFromFormData(formData, isAdvanced);
 
-		const menuOpts = {
-			extraArgs	: {
-				filterCriteria	: filterCriteria,
-			},
-			menuFlags	: [ 'popParent' ],
-		};
+        const menuOpts = {
+            extraArgs	: {
+                filterCriteria	: filterCriteria,
+            },
+            menuFlags	: [ 'popParent' ],
+        };
 
-		return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
-	}
+        return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
+    }
 };
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 0b30d582..8f691273 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -46,249 +46,249 @@ const yazl				= require('yazl');
 */
 
 exports.moduleInfo = {
-	name	: 'File Base List Export',
-	desc	: 'Exports file base listings for download',
-	author	: 'NuSkooler',
+    name	: 'File Base List Export',
+    desc	: 'Exports file base listings for download',
+    author	: 'NuSkooler',
 };
 
 const FormIds = {
-	main	: 0,
+    main	: 0,
 };
 
 const MciViewIds = {
-	main : {
-		status				: 1,
-		progressBar			: 2,
+    main : {
+        status				: 1,
+        progressBar			: 2,
 
-		customRangeStart	: 10,
-	}
+        customRangeStart	: 10,
+    }
 };
 
 exports.getModule = class FileBaseListExport extends MenuModule {
 
-	constructor(options) {
-		super(options);
-		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
-		this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
-		this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
-		this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
-		this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
-		this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
-	}
+        this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
+        this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
+        this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
+        this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
+        this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			async.series(
-				[
-					(callback) => this.prepViewController('main', FormIds.main, mciData.menu, callback),
-					(callback) => this.prepareList(callback),
-				],
-				err => {
-					if(err) {
-						if('NORESULTS' === err.reasonCode) {
-							return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'fileBaseExportListNoResults');
-						}
+            async.series(
+                [
+                    (callback) => this.prepViewController('main', FormIds.main, mciData.menu, callback),
+                    (callback) => this.prepareList(callback),
+                ],
+                err => {
+                    if(err) {
+                        if('NORESULTS' === err.reasonCode) {
+                            return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'fileBaseExportListNoResults');
+                        }
 
-						return this.prevMenu();
-					}
-					return cb(err);
-				}
-			);
-		});
-	}
+                        return this.prevMenu();
+                    }
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	finishedLoading() {
-		this.prevMenu();
-	}
+    finishedLoading() {
+        this.prevMenu();
+    }
 
-	prepareList(cb) {
-		const self = this;
+    prepareList(cb) {
+        const self = this;
 
-		const statusView = self.viewControllers.main.getView(MciViewIds.main.status);
-		const updateStatus = (status) => {
-			if(statusView) {
-				statusView.setText(status);
-			}
-		};
+        const statusView = self.viewControllers.main.getView(MciViewIds.main.status);
+        const updateStatus = (status) => {
+            if(statusView) {
+                statusView.setText(status);
+            }
+        };
 
-		const progBarView = self.viewControllers.main.getView(MciViewIds.main.progressBar);
-		const updateProgressBar = (curr, total) => {
-			if(progBarView) {
-				const prog = Math.floor( (curr / total) * progBarView.dimens.width );
-				progBarView.setText(self.config.progBarChar.repeat(prog));
-			}
-		};
+        const progBarView = self.viewControllers.main.getView(MciViewIds.main.progressBar);
+        const updateProgressBar = (curr, total) => {
+            if(progBarView) {
+                const prog = Math.floor( (curr / total) * progBarView.dimens.width );
+                progBarView.setText(self.config.progBarChar.repeat(prog));
+            }
+        };
 
-		let cancel = false;
+        let cancel = false;
 
-		const exportListProgress = (state, progNext) => {
-			switch(state.step) {
-				case 'preparing' :
-				case 'gathering' :
-					updateStatus(state.status);
-					break;
-				case 'file' :
-					updateStatus(state.status);
-					updateProgressBar(state.current, state.total);
-					self.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.fileInfo);
-					break;
-				default :
-					break;
-			}
+        const exportListProgress = (state, progNext) => {
+            switch(state.step) {
+                case 'preparing' :
+                case 'gathering' :
+                    updateStatus(state.status);
+                    break;
+                case 'file' :
+                    updateStatus(state.status);
+                    updateProgressBar(state.current, state.total);
+                    self.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.fileInfo);
+                    break;
+                default :
+                    break;
+            }
 
-			return progNext(cancel ? Errors.General('User canceled') : null);
-		};
+            return progNext(cancel ? Errors.General('User canceled') : null);
+        };
 
-		const keyPressHandler = (ch, key) => {
-			if('escape' === key.name) {
-				cancel = true;
-				self.client.removeListener('key press', keyPressHandler);
-			}
-		};
+        const keyPressHandler = (ch, key) => {
+            if('escape' === key.name) {
+                cancel = true;
+                self.client.removeListener('key press', keyPressHandler);
+            }
+        };
 
-		async.waterfall(
-			[
-				function buildList(callback) {
-					//	this may take quite a while; temp disable of idle monitor
-					self.client.stopIdleMonitor();
+        async.waterfall(
+            [
+                function buildList(callback) {
+                    //	this may take quite a while; temp disable of idle monitor
+                    self.client.stopIdleMonitor();
 
-					self.client.on('key press', keyPressHandler);
+                    self.client.on('key press', keyPressHandler);
 
-					const filterCriteria = Object.assign({}, self.config.filterCriteria);
-					if(!filterCriteria.areaTag) {
-						filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);
-					}
+                    const filterCriteria = Object.assign({}, self.config.filterCriteria);
+                    if(!filterCriteria.areaTag) {
+                        filterCriteria.areaTag = FileArea.getAvailableFileAreaTags(self.client);
+                    }
 
-					const opts = {
-						templateEncoding	: self.config.templateEncoding,
-						headerTemplate		: _.get(self.config, 'templates.header', 'file_list_header.asc'),
-						entryTemplate		: _.get(self.config, 'templates.entry', 'file_list_entry.asc'),
-						tsFormat			: self.config.tsFormat,
-						descWidth			: self.config.descWidth,
-						progress			: exportListProgress,
-					};
+                    const opts = {
+                        templateEncoding	: self.config.templateEncoding,
+                        headerTemplate		: _.get(self.config, 'templates.header', 'file_list_header.asc'),
+                        entryTemplate		: _.get(self.config, 'templates.entry', 'file_list_entry.asc'),
+                        tsFormat			: self.config.tsFormat,
+                        descWidth			: self.config.descWidth,
+                        progress			: exportListProgress,
+                    };
 
-					exportFileList(filterCriteria, opts, (err, listBody) => {
-						return callback(err, listBody);
-					});
-				},
-				function persistList(listBody, callback) {
-					updateStatus('Persisting list');
+                    exportFileList(filterCriteria, opts, (err, listBody) => {
+                        return callback(err, listBody);
+                    });
+                },
+                function persistList(listBody, callback) {
+                    updateStatus('Persisting list');
 
-					const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
-					const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
+                    const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
+                    const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
 
-					fse.mkdirs(sysTempDownloadDir, err => {
-						if(err) {
-							return callback(err);
-						}
+                    fse.mkdirs(sysTempDownloadDir, err => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						const outputFileName = paths.join(
-							sysTempDownloadDir,
-							`file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
-						);
+                        const outputFileName = paths.join(
+                            sysTempDownloadDir,
+                            `file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
+                        );
 
-						fs.writeFile(outputFileName, listBody, 'utf8', err => {
-							if(err) {
-								return callback(err);
-							}
+                        fs.writeFile(outputFileName, listBody, 'utf8', err => {
+                            if(err) {
+                                return callback(err);
+                            }
 
-							self.getSizeAndCompressIfMeetsSizeThreshold(outputFileName, (err, finalOutputFileName, fileSize) => {
-								return callback(err, finalOutputFileName, fileSize, sysTempDownloadArea);
-							});
-						});
-					});
-				},
-				function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
-					const newEntry = new FileEntry({
-						areaTag		: sysTempDownloadArea.areaTag,
-						fileName	: paths.basename(outputFileName),
-						storageTag	: sysTempDownloadArea.storageTags[0],
-						meta		: {
-							upload_by_username	: self.client.user.username,
-							upload_by_user_id	: self.client.user.userId,
-							byte_size			: fileSize,
-							session_temp_dl		: 1,	//	download is valid until session is over
-						}
-					});
+                            self.getSizeAndCompressIfMeetsSizeThreshold(outputFileName, (err, finalOutputFileName, fileSize) => {
+                                return callback(err, finalOutputFileName, fileSize, sysTempDownloadArea);
+                            });
+                        });
+                    });
+                },
+                function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
+                    const newEntry = new FileEntry({
+                        areaTag		: sysTempDownloadArea.areaTag,
+                        fileName	: paths.basename(outputFileName),
+                        storageTag	: sysTempDownloadArea.storageTags[0],
+                        meta		: {
+                            upload_by_username	: self.client.user.username,
+                            upload_by_user_id	: self.client.user.userId,
+                            byte_size			: fileSize,
+                            session_temp_dl		: 1,	//	download is valid until session is over
+                        }
+                    });
 
-					newEntry.desc = 'File List Export';
+                    newEntry.desc = 'File List Export';
 
-					newEntry.persist(err => {
-						if(!err) {
-							//	queue it!
-							const dlQueue = new DownloadQueue(self.client);
-							dlQueue.add(newEntry, true);	//	true=systemFile
+                    newEntry.persist(err => {
+                        if(!err) {
+                            //	queue it!
+                            const dlQueue = new DownloadQueue(self.client);
+                            dlQueue.add(newEntry, true);	//	true=systemFile
 
-							//	clean up after ourselves when the session ends
-							const thisClientId = self.client.session.id;
-							Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
-								if(thisClientId === _.get(evt, 'client.session.id')) {
-									FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
-										if(err) {
-											Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
-										} else {
-											Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
-										}
-									});
-								}
-							});
-						}
-						return callback(err);
-					});
-				},
-				function done(callback) {
-					//	re-enable idle monitor
-					self.client.startIdleMonitor();
+                            //	clean up after ourselves when the session ends
+                            const thisClientId = self.client.session.id;
+                            Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
+                                if(thisClientId === _.get(evt, 'client.session.id')) {
+                                    FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
+                                        if(err) {
+                                            Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+                                        } else {
+                                            Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                        return callback(err);
+                    });
+                },
+                function done(callback) {
+                    //	re-enable idle monitor
+                    self.client.startIdleMonitor();
 
-					updateStatus('Exported list has been added to your download queue');
-					return callback(null);
-				}
-			],
-			err => {
-				self.client.removeListener('key press', keyPressHandler);
-				return cb(err);
-			}
-		);
-	}
+                    updateStatus('Exported list has been added to your download queue');
+                    return callback(null);
+                }
+            ],
+            err => {
+                self.client.removeListener('key press', keyPressHandler);
+                return cb(err);
+            }
+        );
+    }
 
-	getSizeAndCompressIfMeetsSizeThreshold(filePath, cb) {
-		fse.stat(filePath, (err, stats) => {
-			if(err) {
-				return cb(err);
-			}
+    getSizeAndCompressIfMeetsSizeThreshold(filePath, cb) {
+        fse.stat(filePath, (err, stats) => {
+            if(err) {
+                return cb(err);
+            }
 
-			if(stats.size < this.config.compressThreshold) {
-				//	small enough, keep orig
-				return cb(null, filePath, stats.size);
-			}
+            if(stats.size < this.config.compressThreshold) {
+                //	small enough, keep orig
+                return cb(null, filePath, stats.size);
+            }
 
-			const zipFilePath = `${filePath}.zip`;
+            const zipFilePath = `${filePath}.zip`;
 
-			const zipFile = new yazl.ZipFile();
-			zipFile.addFile(filePath, paths.basename(filePath));
-			zipFile.end( () => {
-				const outZipFile = fs.createWriteStream(zipFilePath);
-				zipFile.outputStream.pipe(outZipFile);
-				zipFile.outputStream.on('finish', () => {
-					//	delete the original
-					fse.unlink(filePath, err => {
-						if(err) {
-							return cb(err);
-						}
+            const zipFile = new yazl.ZipFile();
+            zipFile.addFile(filePath, paths.basename(filePath));
+            zipFile.end( () => {
+                const outZipFile = fs.createWriteStream(zipFilePath);
+                zipFile.outputStream.pipe(outZipFile);
+                zipFile.outputStream.on('finish', () => {
+                    //	delete the original
+                    fse.unlink(filePath, err => {
+                        if(err) {
+                            return cb(err);
+                        }
 
-						//	finally stat the new output
-						fse.stat(zipFilePath, (err, stats) => {
-							return cb(err, zipFilePath, stats ? stats.size : 0);
-						});
-					});
-				});
-			});
-		});
-	}
+                        //	finally stat the new output
+                        fse.stat(zipFilePath, (err, stats) => {
+                            return cb(err, zipFilePath, stats ? stats.size : 0);
+                        });
+                    });
+                });
+            });
+        });
+    }
 };
\ No newline at end of file
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index f046de86..69c87ec8 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -19,269 +19,269 @@ const _						= require('lodash');
 const moment				= require('moment');
 
 exports.moduleInfo = {
-	name		: 'File Base Download Web Queue Manager',
-	desc		: 'Module for interacting with web backed download queue/batch',
-	author		: 'NuSkooler',
+    name		: 'File Base Download Web Queue Manager',
+    desc		: 'Module for interacting with web backed download queue/batch',
+    author		: 'NuSkooler',
 };
 
 const FormIds = {
-	queueManager	: 0
+    queueManager	: 0
 };
 
 const MciViewIds = {
-	queueManager : {
-		queue				: 1,
-		navMenu				: 2,
+    queueManager : {
+        queue				: 1,
+        navMenu				: 2,
 
-		customRangeStart	: 10,
-	}
+        customRangeStart	: 10,
+    }
 };
 
 exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.dlQueue = new DownloadQueue(this.client);
+        this.dlQueue = new DownloadQueue(this.client);
 
-		this.menuMethods = {
-			removeItem : (formData, extraArgs, cb) => {
-				const selectedItem = this.dlQueue.items[formData.value.queueItem];
-				if(!selectedItem) {
-					return cb(null);
-				}
+        this.menuMethods = {
+            removeItem : (formData, extraArgs, cb) => {
+                const selectedItem = this.dlQueue.items[formData.value.queueItem];
+                if(!selectedItem) {
+                    return cb(null);
+                }
 
-				this.dlQueue.removeItems(selectedItem.fileId);
+                this.dlQueue.removeItems(selectedItem.fileId);
 
-				//	:TODO: broken: does not redraw menu properly - needs fixed!
-				return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
-			},
-			clearQueue : (formData, extraArgs, cb) => {
-				this.dlQueue.clear();
+                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
+            },
+            clearQueue : (formData, extraArgs, cb) => {
+                this.dlQueue.clear();
 
-				//	:TODO: broken: does not redraw menu properly - needs fixed!
-				return this.removeItemsFromDownloadQueueView('all', cb);
-			},
-			getBatchLink : (formData, extraArgs, cb) => {
-				return this.generateAndDisplayBatchLink(cb);
-			}
-		};
-	}
+                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                return this.removeItemsFromDownloadQueueView('all', cb);
+            },
+            getBatchLink : (formData, extraArgs, cb) => {
+                return this.generateAndDisplayBatchLink(cb);
+            }
+        };
+    }
 
-	initSequence() {
-		if(0 === this.dlQueue.items.length) {
-			return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
-		}
+    initSequence() {
+        if(0 === this.dlQueue.items.length) {
+            return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
+        }
 
-		const self = this;
+        const self = this;
 
-		async.series(
-			[
-				function beforeArt(callback) {
-					return self.beforeArt(callback);
-				},
-				function display(callback) {
-					return self.displayQueueManagerPage(false, callback);
-				}
-			],
-			() => {
-				return self.finishedLoading();
-			}
-		);
-	}
+        async.series(
+            [
+                function beforeArt(callback) {
+                    return self.beforeArt(callback);
+                },
+                function display(callback) {
+                    return self.displayQueueManagerPage(false, callback);
+                }
+            ],
+            () => {
+                return self.finishedLoading();
+            }
+        );
+    }
 
-	removeItemsFromDownloadQueueView(itemIndex, cb) {
-		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
-		if(!queueView) {
-			return cb(Errors.DoesNotExist('Queue view does not exist'));
-		}
+    removeItemsFromDownloadQueueView(itemIndex, cb) {
+        const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+        if(!queueView) {
+            return cb(Errors.DoesNotExist('Queue view does not exist'));
+        }
 
-		if('all' === itemIndex) {
-			queueView.setItems([]);
-			queueView.setFocusItems([]);
-		} else {
-			queueView.removeItem(itemIndex);
-		}
+        if('all' === itemIndex) {
+            queueView.setItems([]);
+            queueView.setFocusItems([]);
+        } else {
+            queueView.removeItem(itemIndex);
+        }
 
-		queueView.redraw();
-		return cb(null);
-	}
+        queueView.redraw();
+        return cb(null);
+    }
 
-	displayFileInfoForFileEntry(fileEntry) {
-		this.updateCustomViewTextsWithFilter(
-			'queueManager',
-			MciViewIds.queueManager.customRangeStart, fileEntry,
-			{ filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }	//	:TODO: Others....
-		);
-	}
+    displayFileInfoForFileEntry(fileEntry) {
+        this.updateCustomViewTextsWithFilter(
+            'queueManager',
+            MciViewIds.queueManager.customRangeStart, fileEntry,
+            { filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }	//	:TODO: Others....
+        );
+    }
 
-	updateDownloadQueueView(cb) {
-		const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
-		if(!queueView) {
-			return cb(Errors.DoesNotExist('Queue view does not exist'));
-		}
+    updateDownloadQueueView(cb) {
+        const queueView = this.viewControllers.queueManager.getView(MciViewIds.queueManager.queue);
+        if(!queueView) {
+            return cb(Errors.DoesNotExist('Queue view does not exist'));
+        }
 
-		const queueListFormat		= this.menuConfig.config.queueListFormat || '{webDlLink}';
-		const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
+        const queueListFormat		= this.menuConfig.config.queueListFormat || '{webDlLink}';
+        const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
 
-		queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
-		queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
+        queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
+        queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
 
-		queueView.on('index update', idx => {
-			const fileEntry = this.dlQueue.items[idx];
-			this.displayFileInfoForFileEntry(fileEntry);
-		});
+        queueView.on('index update', idx => {
+            const fileEntry = this.dlQueue.items[idx];
+            this.displayFileInfoForFileEntry(fileEntry);
+        });
 
-		queueView.redraw();
-		this.displayFileInfoForFileEntry(this.dlQueue.items[0]);
+        queueView.redraw();
+        this.displayFileInfoForFileEntry(this.dlQueue.items[0]);
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 
-	generateAndDisplayBatchLink(cb) {
-		const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
+    generateAndDisplayBatchLink(cb) {
+        const expireTime = moment().add(Config().fileBase.web.expireMinutes, 'minutes');
 
-		FileAreaWeb.createAndServeTempBatchDownload(
-			this.client,
-			this.dlQueue.items,
-			{
-				expireTime : expireTime
-			},
-			(err, webBatchDlLink) => {
-				//	:TODO: handle not enabled -> display such
-				if(err) {
-					return cb(err);
-				}
+        FileAreaWeb.createAndServeTempBatchDownload(
+            this.client,
+            this.dlQueue.items,
+            {
+                expireTime : expireTime
+            },
+            (err, webBatchDlLink) => {
+                //	:TODO: handle not enabled -> display such
+                if(err) {
+                    return cb(err);
+                }
 
-				const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+                const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-				const formatObj = {
-					webBatchDlLink		: ansi.vtxHyperlink(this.client, webBatchDlLink) + webBatchDlLink,
-					webBatchDlExpire	: expireTime.format(webDlExpireTimeFormat),
-				};
+                const formatObj = {
+                    webBatchDlLink		: ansi.vtxHyperlink(this.client, webBatchDlLink) + webBatchDlLink,
+                    webBatchDlExpire	: expireTime.format(webDlExpireTimeFormat),
+                };
 
-				this.updateCustomViewTextsWithFilter(
-					'queueManager',
-					MciViewIds.queueManager.customRangeStart,
-					formatObj,
-					{ filter : Object.keys(formatObj).map(k => '{' + k + '}' ) }
-				);
+                this.updateCustomViewTextsWithFilter(
+                    'queueManager',
+                    MciViewIds.queueManager.customRangeStart,
+                    formatObj,
+                    { filter : Object.keys(formatObj).map(k => '{' + k + '}' ) }
+                );
 
-				return cb(null);
-			}
-		);
-	}
+                return cb(null);
+            }
+        );
+    }
 
-	displayQueueManagerPage(clearScreen, cb) {
-		const self = this;
+    displayQueueManagerPage(clearScreen, cb) {
+        const self = this;
 
-		async.series(
-			[
-				function prepArtAndViewController(callback) {
-					return self.displayArtAndPrepViewController('queueManager', { clearScreen : clearScreen }, callback);
-				},
-				function prepareQueueDownloadLinks(callback) {
-					const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+        async.series(
+            [
+                function prepArtAndViewController(callback) {
+                    return self.displayArtAndPrepViewController('queueManager', { clearScreen : clearScreen }, callback);
+                },
+                function prepareQueueDownloadLinks(callback) {
+                    const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-					const config = Config();
-					async.each(self.dlQueue.items, (fileEntry, nextFileEntry) => {
-						FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
-							if(err) {
-								if(ErrNotEnabled === err.reasonCode) {
-									return nextFileEntry(err);	//	we should have caught this prior
-								}
+                    const config = Config();
+                    async.each(self.dlQueue.items, (fileEntry, nextFileEntry) => {
+                        FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
+                            if(err) {
+                                if(ErrNotEnabled === err.reasonCode) {
+                                    return nextFileEntry(err);	//	we should have caught this prior
+                                }
 
-								const expireTime = moment().add(config.fileBase.web.expireMinutes, 'minutes');
+                                const expireTime = moment().add(config.fileBase.web.expireMinutes, 'minutes');
 
-								FileAreaWeb.createAndServeTempDownload(
-									self.client,
-									fileEntry,
-									{ expireTime : expireTime },
-									(err, url) => {
-										if(err) {
-											return nextFileEntry(err);
-										}
+                                FileAreaWeb.createAndServeTempDownload(
+                                    self.client,
+                                    fileEntry,
+                                    { expireTime : expireTime },
+                                    (err, url) => {
+                                        if(err) {
+                                            return nextFileEntry(err);
+                                        }
 
-										fileEntry.webDlLinkRaw	= url;
-										fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;
-										fileEntry.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
+                                        fileEntry.webDlLinkRaw	= url;
+                                        fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;
+                                        fileEntry.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
 
-										return nextFileEntry(null);
-									}
-								);
-							} else {
-								fileEntry.webDlLinkRaw	= serveItem.url;
-								fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
-								fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
-								return nextFileEntry(null);
-							}
-						});
-					}, err => {
-						return callback(err);
-					});
-				},
-				function populateViews(callback) {
-					return self.updateDownloadQueueView(callback);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                                        return nextFileEntry(null);
+                                    }
+                                );
+                            } else {
+                                fileEntry.webDlLinkRaw	= serveItem.url;
+                                fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
+                                fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+                                return nextFileEntry(null);
+                            }
+                        });
+                    }, err => {
+                        return callback(err);
+                    });
+                },
+                function populateViews(callback) {
+                    return self.updateDownloadQueueView(callback);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	displayArtAndPrepViewController(name, options, cb) {
-		const self		= this;
-		const config	= this.menuConfig.config;
+    displayArtAndPrepViewController(name, options, cb) {
+        const self		= this;
+        const config	= this.menuConfig.config;
 
-		async.waterfall(
-			[
-				function readyAndDisplayArt(callback) {
-					if(options.clearScreen) {
-						self.client.term.rawWrite(ansi.resetScreen());
-					}
+        async.waterfall(
+            [
+                function readyAndDisplayArt(callback) {
+                    if(options.clearScreen) {
+                        self.client.term.rawWrite(ansi.resetScreen());
+                    }
 
-					theme.displayThemedAsset(
-						config.art[name],
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function prepeareViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers[name])) {
-						const vcOpts = {
-							client		: self.client,
-							formId		: FormIds[name],
-						};
+                    theme.displayThemedAsset(
+                        config.art[name],
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function prepeareViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers[name])) {
+                        const vcOpts = {
+                            client		: self.client,
+                            formId		: FormIds[name],
+                        };
 
-						if(!_.isUndefined(options.noInput)) {
-							vcOpts.noInput = options.noInput;
-						}
+                        if(!_.isUndefined(options.noInput)) {
+                            vcOpts.noInput = options.noInput;
+                        }
 
-						const vc = self.addViewController(name, new ViewController(vcOpts));
+                        const vc = self.addViewController(name, new ViewController(vcOpts));
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds[name],
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds[name],
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    }
 
-					self.viewControllers[name].setFocus(true);
-					return callback(null);
+                    self.viewControllers[name].setFocus(true);
+                    return callback(null);
 
-				},
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                },
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 };
diff --git a/core/file_entry.js b/core/file_entry.js
index 1310d40a..75fafb29 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -4,8 +4,8 @@
 const fileDb				= require('./database.js').dbs.file;
 const Errors				= require('./enig_error.js').Errors;
 const {
-	getISOTimestampString,
-	sanatizeString
+    getISOTimestampString,
+    sanatizeString
 }							= require('./database.js');
 const Config				= require('./config.js').get;
 
@@ -19,461 +19,461 @@ const crypto				= require('crypto');
 const moment				= require('moment');
 
 const FILE_TABLE_MEMBERS	= [
-	'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
-	'desc', 'desc_long', 'upload_timestamp'
+    'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
+    'desc', 'desc_long', 'upload_timestamp'
 ];
 
 const FILE_WELL_KNOWN_META = {
-	//	name -> *read* converter, if any
-	upload_by_username	: null,
-	upload_by_user_id	: (u) => parseInt(u) || 0,
-	file_md5			: null,
-	file_sha1			: null,
-	file_crc32			: null,
-	est_release_year	: (y) => parseInt(y) || new Date().getFullYear(),
-	dl_count			: (d) => parseInt(d) || 0,
-	byte_size			: (b) => parseInt(b) || 0,
-	archive_type		: null,
-	short_file_name		: null,	//	e.g. DOS 8.3 filename, avail in some scenarios such as TIC import
-	tic_origin			: null,	//	TIC "Origin"
-	tic_desc			: null,	//	TIC "Desc"
-	tic_ldesc			: null,	//	TIC "Ldesc" joined by '\n'
-	session_temp_dl		: (v) => parseInt(v) ? true : false,
+    //	name -> *read* converter, if any
+    upload_by_username	: null,
+    upload_by_user_id	: (u) => parseInt(u) || 0,
+    file_md5			: null,
+    file_sha1			: null,
+    file_crc32			: null,
+    est_release_year	: (y) => parseInt(y) || new Date().getFullYear(),
+    dl_count			: (d) => parseInt(d) || 0,
+    byte_size			: (b) => parseInt(b) || 0,
+    archive_type		: null,
+    short_file_name		: null,	//	e.g. DOS 8.3 filename, avail in some scenarios such as TIC import
+    tic_origin			: null,	//	TIC "Origin"
+    tic_desc			: null,	//	TIC "Desc"
+    tic_ldesc			: null,	//	TIC "Ldesc" joined by '\n'
+    session_temp_dl		: (v) => parseInt(v) ? true : false,
 };
 
 module.exports = class FileEntry {
-	constructor(options) {
-		options			= options || {};
+    constructor(options) {
+        options			= options || {};
 
-		this.fileId		= options.fileId || 0;
-		this.areaTag	= options.areaTag || '';
-		this.meta		= Object.assign( { dl_count : 0 }, options.meta);
-		this.hashTags	= options.hashTags || new Set();
-		this.fileName	= options.fileName;
-		this.storageTag	= options.storageTag;
-		this.fileSha256	= options.fileSha256;
-	}
+        this.fileId		= options.fileId || 0;
+        this.areaTag	= options.areaTag || '';
+        this.meta		= Object.assign( { dl_count : 0 }, options.meta);
+        this.hashTags	= options.hashTags || new Set();
+        this.fileName	= options.fileName;
+        this.storageTag	= options.storageTag;
+        this.fileSha256	= options.fileSha256;
+    }
 
-	static loadBasicEntry(fileId, dest, cb) {
-		dest = dest || {};
+    static loadBasicEntry(fileId, dest, cb) {
+        dest = dest || {};
 
-		fileDb.get(
-			`SELECT ${FILE_TABLE_MEMBERS.join(', ')}
+        fileDb.get(
+            `SELECT ${FILE_TABLE_MEMBERS.join(', ')}
 			FROM file
 			WHERE file_id=?
 			LIMIT 1;`,
-			[ fileId ],
-			(err, file) => {
-				if(err) {
-					return cb(err);
-				}
+            [ fileId ],
+            (err, file) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(!file) {
-					return cb(Errors.DoesNotExist('No file is available by that ID'));
-				}
+                if(!file) {
+                    return cb(Errors.DoesNotExist('No file is available by that ID'));
+                }
 
-				//	assign props from |file|
-				FILE_TABLE_MEMBERS.forEach(prop => {
-					dest[_.camelCase(prop)] = file[prop];
-				});
+                //	assign props from |file|
+                FILE_TABLE_MEMBERS.forEach(prop => {
+                    dest[_.camelCase(prop)] = file[prop];
+                });
 
-				return cb(null, dest);
-			}
-		);
-	}
+                return cb(null, dest);
+            }
+        );
+    }
 
-	load(fileId, cb) {
-		const self = this;
+    load(fileId, cb) {
+        const self = this;
 
-		async.series(
-			[
-				function loadBasicEntry(callback) {
-					FileEntry.loadBasicEntry(fileId, self, callback);
-				},
-				function loadMeta(callback) {
-					return self.loadMeta(callback);
-				},
-				function loadHashTags(callback) {
-					return self.loadHashTags(callback);
-				},
-				function loadUserRating(callback) {
-					return self.loadRating(callback);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+        async.series(
+            [
+                function loadBasicEntry(callback) {
+                    FileEntry.loadBasicEntry(fileId, self, callback);
+                },
+                function loadMeta(callback) {
+                    return self.loadMeta(callback);
+                },
+                function loadHashTags(callback) {
+                    return self.loadHashTags(callback);
+                },
+                function loadUserRating(callback) {
+                    return self.loadRating(callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	persist(isUpdate, cb) {
-		if(!cb && _.isFunction(isUpdate)) {
-			cb = isUpdate;
-			isUpdate = false;
-		}
+    persist(isUpdate, cb) {
+        if(!cb && _.isFunction(isUpdate)) {
+            cb = isUpdate;
+            isUpdate = false;
+        }
 
-		const self = this;
+        const self = this;
 
-		async.waterfall(
-			[
-				function check(callback) {
-					if(isUpdate && !self.fileId) {
-						return callback(Errors.Invalid('Cannot update file entry without an existing "fileId" member'));
-					}
-					return callback(null);
-				},
-				function calcSha256IfNeeded(callback) {
-					if(self.fileSha256) {
-						return callback(null);
-					}
+        async.waterfall(
+            [
+                function check(callback) {
+                    if(isUpdate && !self.fileId) {
+                        return callback(Errors.Invalid('Cannot update file entry without an existing "fileId" member'));
+                    }
+                    return callback(null);
+                },
+                function calcSha256IfNeeded(callback) {
+                    if(self.fileSha256) {
+                        return callback(null);
+                    }
 
-					if(isUpdate) {
-						return callback(Errors.MissingParam('fileSha256 property must be set for updates!'));
-					}
+                    if(isUpdate) {
+                        return callback(Errors.MissingParam('fileSha256 property must be set for updates!'));
+                    }
 
-					readFile(self.filePath, (err, data) => {
-						if(err) {
-							return callback(err);
-						}
+                    readFile(self.filePath, (err, data) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						const sha256 = crypto.createHash('sha256');
-						sha256.update(data);
-						self.fileSha256 = sha256.digest('hex');
-						return callback(null);
-					});
-				},
-				function startTrans(callback) {
-					return fileDb.beginTransaction(callback);
-				},
-				function storeEntry(trans, callback) {
-					if(isUpdate) {
-						trans.run(
-							`REPLACE INTO file (file_id, area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
+                        const sha256 = crypto.createHash('sha256');
+                        sha256.update(data);
+                        self.fileSha256 = sha256.digest('hex');
+                        return callback(null);
+                    });
+                },
+                function startTrans(callback) {
+                    return fileDb.beginTransaction(callback);
+                },
+                function storeEntry(trans, callback) {
+                    if(isUpdate) {
+                        trans.run(
+                            `REPLACE INTO file (file_id, area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
 							VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
-							[ self.fileId, self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
-							err => {
-								return callback(err, trans);
-							}
-						);
-					} else {
-						trans.run(
-							`REPLACE INTO file (area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
+                            [ self.fileId, self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
+                            err => {
+                                return callback(err, trans);
+                            }
+                        );
+                    } else {
+                        trans.run(
+                            `REPLACE INTO file (area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
 							VALUES(?, ?, ?, ?, ?, ?, ?);`,
-							[ self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
-							function inserted(err) {	//	use non-arrow func for 'this' scope / lastID
-								if(!err) {
-									self.fileId = this.lastID;
-								}
-								return callback(err, trans);
-							}
-						);
-					}
-				},
-				function storeMeta(trans, callback) {
-					async.each(Object.keys(self.meta), (n, next) => {
-						const v = self.meta[n];
-						return FileEntry.persistMetaValue(self.fileId, n, v, trans, next);
-					},
-					err => {
-						return callback(err, trans);
-					});
-				},
-				function storeHashTags(trans, callback) {
-					const hashTagsArray = Array.from(self.hashTags);
-					async.each(hashTagsArray, (hashTag, next) => {
-						return FileEntry.persistHashTag(self.fileId, hashTag, trans, next);
-					},
-					err => {
-						return callback(err, trans);
-					});
-				}
-			],
-			(err, trans) => {
-				//	:TODO: Log orig err
-				if(trans) {
-					trans[err ? 'rollback' : 'commit'](transErr => {
-						return cb(transErr ? transErr : err);
-					});
-				} else {
-					return cb(err);
-				}
-			}
-		);
-	}
+                            [ self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
+                            function inserted(err) {	//	use non-arrow func for 'this' scope / lastID
+                                if(!err) {
+                                    self.fileId = this.lastID;
+                                }
+                                return callback(err, trans);
+                            }
+                        );
+                    }
+                },
+                function storeMeta(trans, callback) {
+                    async.each(Object.keys(self.meta), (n, next) => {
+                        const v = self.meta[n];
+                        return FileEntry.persistMetaValue(self.fileId, n, v, trans, next);
+                    },
+                    err => {
+                        return callback(err, trans);
+                    });
+                },
+                function storeHashTags(trans, callback) {
+                    const hashTagsArray = Array.from(self.hashTags);
+                    async.each(hashTagsArray, (hashTag, next) => {
+                        return FileEntry.persistHashTag(self.fileId, hashTag, trans, next);
+                    },
+                    err => {
+                        return callback(err, trans);
+                    });
+                }
+            ],
+            (err, trans) => {
+                //	:TODO: Log orig err
+                if(trans) {
+                    trans[err ? 'rollback' : 'commit'](transErr => {
+                        return cb(transErr ? transErr : err);
+                    });
+                } else {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	static getAreaStorageDirectoryByTag(storageTag) {
-		const config = Config();
-		const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
+    static getAreaStorageDirectoryByTag(storageTag) {
+        const config = Config();
+        const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
 
-		//	absolute paths as-is
-		if(storageLocation && '/' === storageLocation.charAt(0)) {
-			return storageLocation;
-		}
+        //	absolute paths as-is
+        if(storageLocation && '/' === storageLocation.charAt(0)) {
+            return storageLocation;
+        }
 
-		//	relative to |areaStoragePrefix|
-		return paths.join(config.fileBase.areaStoragePrefix, storageLocation || '');
-	}
+        //	relative to |areaStoragePrefix|
+        return paths.join(config.fileBase.areaStoragePrefix, storageLocation || '');
+    }
 
-	get filePath() {
-		const storageDir = FileEntry.getAreaStorageDirectoryByTag(this.storageTag);
-		return paths.join(storageDir, this.fileName);
-	}
+    get filePath() {
+        const storageDir = FileEntry.getAreaStorageDirectoryByTag(this.storageTag);
+        return paths.join(storageDir, this.fileName);
+    }
 
-	static quickCheckExistsByPath(fullPath, cb) {
-		fileDb.get(
-			`SELECT COUNT() AS count
+    static quickCheckExistsByPath(fullPath, cb) {
+        fileDb.get(
+            `SELECT COUNT() AS count
 			FROM file
 			WHERE file_name = ?
 			LIMIT 1;`,
-			[ paths.basename(fullPath) ],
-			(err, rows) => {
-				return err ? cb(err) : cb(null, rows.count > 0 ? true : false);
-			}
-		);
-	}
+            [ paths.basename(fullPath) ],
+            (err, rows) => {
+                return err ? cb(err) : cb(null, rows.count > 0 ? true : false);
+            }
+        );
+    }
 
-	static persistUserRating(fileId, userId, rating, cb) {
-		return fileDb.run(
-			`REPLACE INTO file_user_rating (file_id, user_id, rating)
+    static persistUserRating(fileId, userId, rating, cb) {
+        return fileDb.run(
+            `REPLACE INTO file_user_rating (file_id, user_id, rating)
 			VALUES (?, ?, ?);`,
-			[ fileId, userId, rating ],
-			cb
-		);
-	}
+            [ fileId, userId, rating ],
+            cb
+        );
+    }
 
-	static persistMetaValue(fileId, name, value, transOrDb, cb) {
-		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-			cb = transOrDb;
-			transOrDb = fileDb;
-		}
+    static persistMetaValue(fileId, name, value, transOrDb, cb) {
+        if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+            cb = transOrDb;
+            transOrDb = fileDb;
+        }
 
-		return transOrDb.run(
-			`REPLACE INTO file_meta (file_id, meta_name, meta_value)
+        return transOrDb.run(
+            `REPLACE INTO file_meta (file_id, meta_name, meta_value)
 			VALUES (?, ?, ?);`,
-			[ fileId, name, value ],
-			cb
-		);
-	}
+            [ fileId, name, value ],
+            cb
+        );
+    }
 
-	static incrementAndPersistMetaValue(fileId, name, incrementBy, cb) {
-		incrementBy = incrementBy || 1;
-		fileDb.run(
-			`UPDATE file_meta
+    static incrementAndPersistMetaValue(fileId, name, incrementBy, cb) {
+        incrementBy = incrementBy || 1;
+        fileDb.run(
+            `UPDATE file_meta
 			SET meta_value = meta_value + ?
 			WHERE file_id = ? AND meta_name = ?;`,
-			[ incrementBy, fileId, name ],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+            [ incrementBy, fileId, name ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	loadMeta(cb) {
-		fileDb.each(
-			`SELECT meta_name, meta_value
+    loadMeta(cb) {
+        fileDb.each(
+            `SELECT meta_name, meta_value
 			FROM file_meta
 			WHERE file_id=?;`,
-			[ this.fileId ],
-			(err, meta) => {
-				if(meta) {
-					const conv = FILE_WELL_KNOWN_META[meta.meta_name];
-					this.meta[meta.meta_name] = conv ? conv(meta.meta_value) : meta.meta_value;
-				}
-			},
-			err => {
-				return cb(err);
-			}
-		);
-	}
+            [ this.fileId ],
+            (err, meta) => {
+                if(meta) {
+                    const conv = FILE_WELL_KNOWN_META[meta.meta_name];
+                    this.meta[meta.meta_name] = conv ? conv(meta.meta_value) : meta.meta_value;
+                }
+            },
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	static persistHashTag(fileId, hashTag, transOrDb, cb) {
-		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-			cb = transOrDb;
-			transOrDb = fileDb;
-		}
+    static persistHashTag(fileId, hashTag, transOrDb, cb) {
+        if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+            cb = transOrDb;
+            transOrDb = fileDb;
+        }
 
-		transOrDb.serialize( () => {
-			transOrDb.run(
-				`INSERT OR IGNORE INTO hash_tag (hash_tag)
+        transOrDb.serialize( () => {
+            transOrDb.run(
+                `INSERT OR IGNORE INTO hash_tag (hash_tag)
 				VALUES (?);`,
-				[ hashTag ]
-			);
+                [ hashTag ]
+            );
 
-			transOrDb.run(
-				`REPLACE INTO file_hash_tag (hash_tag_id, file_id)
+            transOrDb.run(
+                `REPLACE INTO file_hash_tag (hash_tag_id, file_id)
 				VALUES (
 					(SELECT hash_tag_id
 					FROM hash_tag
 					WHERE hash_tag = ?),
 					?
 				);`,
-				[ hashTag, fileId ],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                [ hashTag, fileId ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	loadHashTags(cb) {
-		fileDb.each(
-			`SELECT ht.hash_tag_id, ht.hash_tag
+    loadHashTags(cb) {
+        fileDb.each(
+            `SELECT ht.hash_tag_id, ht.hash_tag
 			FROM hash_tag ht
 			WHERE ht.hash_tag_id IN (
 				SELECT hash_tag_id
 				FROM file_hash_tag
 				WHERE file_id=?
 			);`,
-			[ this.fileId ],
-			(err, hashTag) => {
-				if(hashTag) {
-					this.hashTags.add(hashTag.hash_tag);
-				}
-			},
-			err => {
-				return cb(err);
-			}
-		);
-	}
+            [ this.fileId ],
+            (err, hashTag) => {
+                if(hashTag) {
+                    this.hashTags.add(hashTag.hash_tag);
+                }
+            },
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	loadRating(cb) {
-		fileDb.get(
-			`SELECT AVG(fur.rating) AS avg_rating
+    loadRating(cb) {
+        fileDb.get(
+            `SELECT AVG(fur.rating) AS avg_rating
 			FROM file_user_rating fur
 			INNER JOIN file f
 				ON f.file_id = fur.file_id
 				AND f.file_id = ?`,
-			[ this.fileId ],
-			(err, result) => {
-				if(result) {
-					this.userRating = result.avg_rating;
-				}
-				return cb(err);
-			}
-		);
-	}
+            [ this.fileId ],
+            (err, result) => {
+                if(result) {
+                    this.userRating = result.avg_rating;
+                }
+                return cb(err);
+            }
+        );
+    }
 
-	setHashTags(hashTags) {
-		if(_.isString(hashTags)) {
-			this.hashTags = new Set(hashTags.split(/[\s,]+/));
-		} else if(Array.isArray(hashTags)) {
-			this.hashTags = new Set(hashTags);
-		} else if(hashTags instanceof Set) {
-			this.hashTags = hashTags;
-		}
-	}
+    setHashTags(hashTags) {
+        if(_.isString(hashTags)) {
+            this.hashTags = new Set(hashTags.split(/[\s,]+/));
+        } else if(Array.isArray(hashTags)) {
+            this.hashTags = new Set(hashTags);
+        } else if(hashTags instanceof Set) {
+            this.hashTags = hashTags;
+        }
+    }
 
-	static get WellKnownMetaValues()  {
-		return Object.keys(FILE_WELL_KNOWN_META);
-	}
+    static get WellKnownMetaValues()  {
+        return Object.keys(FILE_WELL_KNOWN_META);
+    }
 
-	static findFileBySha(sha, cb) {
-		//	full or partial SHA-256
-		fileDb.all(
-			`SELECT file_id
+    static findFileBySha(sha, cb) {
+        //	full or partial SHA-256
+        fileDb.all(
+            `SELECT file_id
 			FROM file
 			WHERE file_sha256 LIKE "${sha}%"
 			LIMIT 2;`,	//	limit 2 such that we can find if there are dupes
-			(err, fileIdRows) => {
-				if(err) {
-					return cb(err);
-				}
+            (err, fileIdRows) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(!fileIdRows || 0 === fileIdRows.length) {
-					return cb(Errors.DoesNotExist('No matches'));
-				}
+                if(!fileIdRows || 0 === fileIdRows.length) {
+                    return cb(Errors.DoesNotExist('No matches'));
+                }
 
-				if(fileIdRows.length > 1) {
-					return cb(Errors.Invalid('SHA is ambiguous'));
-				}
+                if(fileIdRows.length > 1) {
+                    return cb(Errors.Invalid('SHA is ambiguous'));
+                }
 
-				const fileEntry = new FileEntry();
-				return fileEntry.load(fileIdRows[0].file_id, err => {
-					return cb(err, fileEntry);
-				});
-			}
-		);
-	}
+                const fileEntry = new FileEntry();
+                return fileEntry.load(fileIdRows[0].file_id, err => {
+                    return cb(err, fileEntry);
+                });
+            }
+        );
+    }
 
-	static findByFileNameWildcard(wc, cb) {
-		//	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
-		wc = wc.replace(/\*/g, '%').replace(/\?/g, '_');
+    static findByFileNameWildcard(wc, cb) {
+        //	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
+        wc = wc.replace(/\*/g, '%').replace(/\?/g, '_');
 
-		fileDb.all(
-			`SELECT file_id
+        fileDb.all(
+            `SELECT file_id
 			FROM file
 			WHERE file_name LIKE "${wc}"
 			`,
-			(err, fileIdRows) => {
-				if(err) {
-					return cb(err);
-				}
+            (err, fileIdRows) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(!fileIdRows || 0 === fileIdRows.length) {
-					return cb(Errors.DoesNotExist('No matches'));
-				}
+                if(!fileIdRows || 0 === fileIdRows.length) {
+                    return cb(Errors.DoesNotExist('No matches'));
+                }
 
-				const entries = [];
-				async.each(fileIdRows, (row, nextRow) => {
-					const fileEntry = new FileEntry();
-					fileEntry.load(row.file_id, err => {
-						if(!err) {
-							entries.push(fileEntry);
-						}
-						return nextRow(err);
-					});
-				},
-				err => {
-					return cb(err, entries);
-				});
-			}
-		);
-	}
+                const entries = [];
+                async.each(fileIdRows, (row, nextRow) => {
+                    const fileEntry = new FileEntry();
+                    fileEntry.load(row.file_id, err => {
+                        if(!err) {
+                            entries.push(fileEntry);
+                        }
+                        return nextRow(err);
+                    });
+                },
+                err => {
+                    return cb(err, entries);
+                });
+            }
+        );
+    }
 
-	static findFiles(filter, cb) {
-		filter = filter || {};
+    static findFiles(filter, cb) {
+        filter = filter || {};
 
-		let sql;
-		let sqlWhere = '';
-		let sqlOrderBy;
-		const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
+        let sql;
+        let sqlWhere = '';
+        let sqlOrderBy;
+        const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
 
-		if(moment.isMoment(filter.newerThanTimestamp)) {
-			filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
-		}
+        if(moment.isMoment(filter.newerThanTimestamp)) {
+            filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
+        }
 
-		function getOrderByWithCast(ob) {
-			if( [ 'dl_count', 'est_release_year', 'byte_size' ].indexOf(filter.sort) > -1 ) {
-				return `ORDER BY CAST(${ob} AS INTEGER)`;
-			}
+        function getOrderByWithCast(ob) {
+            if( [ 'dl_count', 'est_release_year', 'byte_size' ].indexOf(filter.sort) > -1 ) {
+                return `ORDER BY CAST(${ob} AS INTEGER)`;
+            }
 
-			return `ORDER BY ${ob}`;
-		}
+            return `ORDER BY ${ob}`;
+        }
 
-		function appendWhereClause(clause) {
-			if(sqlWhere) {
-				sqlWhere += ' AND ';
-			} else {
-				sqlWhere += ' WHERE ';
-			}
-			sqlWhere += clause;
-		}
+        function appendWhereClause(clause) {
+            if(sqlWhere) {
+                sqlWhere += ' AND ';
+            } else {
+                sqlWhere += ' WHERE ';
+            }
+            sqlWhere += clause;
+        }
 
-		if(filter.sort && filter.sort.length > 0) {
-			if(Object.keys(FILE_WELL_KNOWN_META).indexOf(filter.sort) > -1) {	//	sorting via a meta value?
-				sql =
+        if(filter.sort && filter.sort.length > 0) {
+            if(Object.keys(FILE_WELL_KNOWN_META).indexOf(filter.sort) > -1) {	//	sorting via a meta value?
+                sql =
 					`SELECT DISTINCT f.file_id
 					FROM file f, file_meta m`;
 
-				appendWhereClause(`f.file_id = m.file_id AND m.meta_name = "${filter.sort}"`);
+                appendWhereClause(`f.file_id = m.file_id AND m.meta_name = "${filter.sort}"`);
 
-				sqlOrderBy = `${getOrderByWithCast('m.meta_value')} ${sqlOrderDir}`;
-			} else {
-				//	additional special treatment for user ratings: we need to average them
-				if('user_rating' === filter.sort) {
-					sql =
+                sqlOrderBy = `${getOrderByWithCast('m.meta_value')} ${sqlOrderDir}`;
+            } else {
+                //	additional special treatment for user ratings: we need to average them
+                if('user_rating' === filter.sort) {
+                    sql =
 						`SELECT DISTINCT f.file_id,
 							(SELECT IFNULL(AVG(rating), 0) rating 
 							FROM file_user_rating 
@@ -481,78 +481,78 @@ module.exports = class FileEntry {
 							AS avg_rating
 						FROM file f`;
 
-					sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
-				} else {
-					sql =
+                    sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
+                } else {
+                    sql =
 						`SELECT DISTINCT f.file_id
 						FROM file f`;
 
-					sqlOrderBy = getOrderByWithCast(`f.${filter.sort}`) +  ' ' + sqlOrderDir;
-				}
-			}
-		} else {
-			sql =
+                    sqlOrderBy = getOrderByWithCast(`f.${filter.sort}`) +  ' ' + sqlOrderDir;
+                }
+            }
+        } else {
+            sql =
 				`SELECT DISTINCT f.file_id
 				FROM file f`;
 
-			sqlOrderBy = `${getOrderByWithCast('f.file_id')} ${sqlOrderDir}`;
-		}
+            sqlOrderBy = `${getOrderByWithCast('f.file_id')} ${sqlOrderDir}`;
+        }
 
-		if(filter.areaTag && filter.areaTag.length > 0) {
-			if(Array.isArray(filter.areaTag)) {
-				const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
-				appendWhereClause(`f.area_tag IN(${areaList})`);
-			} else {
-				appendWhereClause(`f.area_tag = "${filter.areaTag}"`);
-			}
-		}
+        if(filter.areaTag && filter.areaTag.length > 0) {
+            if(Array.isArray(filter.areaTag)) {
+                const areaList = filter.areaTag.map(t => `"${t}"`).join(', ');
+                appendWhereClause(`f.area_tag IN(${areaList})`);
+            } else {
+                appendWhereClause(`f.area_tag = "${filter.areaTag}"`);
+            }
+        }
 
-		if(filter.metaPairs && filter.metaPairs.length > 0) {
+        if(filter.metaPairs && filter.metaPairs.length > 0) {
 
-			filter.metaPairs.forEach(mp => {
-				if(mp.wildcards) {
-					//	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
-					mp.value = mp.value.replace(/\*/g, '%').replace(/\?/g, '_');
-					appendWhereClause(
-						`f.file_id IN (
+            filter.metaPairs.forEach(mp => {
+                if(mp.wildcards) {
+                    //	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
+                    mp.value = mp.value.replace(/\*/g, '%').replace(/\?/g, '_');
+                    appendWhereClause(
+                        `f.file_id IN (
 							SELECT file_id 
 							FROM file_meta 
 							WHERE meta_name = "${mp.name}" AND meta_value LIKE "${mp.value}"
 						)`
-					);
-				} else {
-					appendWhereClause(
-						`f.file_id IN (
+                    );
+                } else {
+                    appendWhereClause(
+                        `f.file_id IN (
 							SELECT file_id 
 							FROM file_meta 
 							WHERE meta_name = "${mp.name}" AND meta_value = "${mp.value}"
 						)`
-					);
-				}
-			});
-		}
+                    );
+                }
+            });
+        }
 
-		if(filter.storageTag && filter.storageTag.length > 0) {
-			appendWhereClause(`f.storage_tag="${filter.storageTag}"`);
-		}
+        if(filter.storageTag && filter.storageTag.length > 0) {
+            appendWhereClause(`f.storage_tag="${filter.storageTag}"`);
+        }
 
-		if(filter.terms && filter.terms.length > 0) {
-			//	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
-			appendWhereClause(
-				`f.file_id IN (
+        if(filter.terms && filter.terms.length > 0) {
+            //	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
+            appendWhereClause(
+                `f.file_id IN (
 					SELECT rowid
 					FROM file_fts
 					WHERE file_fts MATCH ":${sanatizeString(filter.terms)}"
 				)`
-			);
-		}
+            );
+        }
 
-		if(filter.tags && filter.tags.length > 0) {
-			//	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
-			const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanatizeString(tag)}"` ).join(',');
+        if(filter.tags && filter.tags.length > 0) {
+            //	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
+            const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanatizeString(tag)}"` ).join(',');
 
-			appendWhereClause(
-				`f.file_id IN (
+            appendWhereClause(
+                `f.file_id IN (
 					SELECT file_id
 					FROM file_hash_tag
 					WHERE hash_tag_id IN (
@@ -561,111 +561,111 @@ module.exports = class FileEntry {
 						WHERE hash_tag IN (${tags})
 					)
 				)`
-			);
-		}
+            );
+        }
 
-		if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
-			appendWhereClause(`DATETIME(f.upload_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
-		}
+        if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
+            appendWhereClause(`DATETIME(f.upload_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
+        }
 
-		if(_.isNumber(filter.newerThanFileId)) {
-			appendWhereClause(`f.file_id > ${filter.newerThanFileId}`);
-		}
+        if(_.isNumber(filter.newerThanFileId)) {
+            appendWhereClause(`f.file_id > ${filter.newerThanFileId}`);
+        }
 
-		sql += `${sqlWhere} ${sqlOrderBy}`;
+        sql += `${sqlWhere} ${sqlOrderBy}`;
 
-		if(_.isNumber(filter.limit)) {
-			sql += ` LIMIT ${filter.limit}`;
-		}
+        if(_.isNumber(filter.limit)) {
+            sql += ` LIMIT ${filter.limit}`;
+        }
 
-		sql += ';';
+        sql += ';';
 
-		fileDb.all(sql, (err, rows) => {
-			if(err) {
-				return cb(err);
-			}
-			if(!rows || 0 === rows.length) {
-				return cb(null, []);	//	no matches
-			}
-			return cb(null, rows.map(r => r.file_id));
-		});
-	}
+        fileDb.all(sql, (err, rows) => {
+            if(err) {
+                return cb(err);
+            }
+            if(!rows || 0 === rows.length) {
+                return cb(null, []);	//	no matches
+            }
+            return cb(null, rows.map(r => r.file_id));
+        });
+    }
 
-	static removeEntry(srcFileEntry, options, cb) {
-		if(!_.isFunction(cb) && _.isFunction(options)) {
-			cb = options;
-			options = {};
-		}
+    static removeEntry(srcFileEntry, options, cb) {
+        if(!_.isFunction(cb) && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
 
-		async.series(
-			[
-				function removeFromDatabase(callback) {
-					fileDb.run(
-						`DELETE FROM file
+        async.series(
+            [
+                function removeFromDatabase(callback) {
+                    fileDb.run(
+                        `DELETE FROM file
 						WHERE file_id = ?;`,
-						[ srcFileEntry.fileId ],
-						err => {
-							return callback(err);
-						}
-					);
-				},
-				function optionallyRemovePhysicalFile(callback) {
-					if(true !== options.removePhysFile) {
-						return callback(null);
-					}
+                        [ srcFileEntry.fileId ],
+                        err => {
+                            return callback(err);
+                        }
+                    );
+                },
+                function optionallyRemovePhysicalFile(callback) {
+                    if(true !== options.removePhysFile) {
+                        return callback(null);
+                    }
 
-					unlink(srcFileEntry.filePath, err => {
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                    unlink(srcFileEntry.filePath, err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	static moveEntry(srcFileEntry, destAreaTag, destStorageTag, destFileName, cb) {
-		if(!cb && _.isFunction(destFileName)) {
-			cb = destFileName;
-			destFileName = srcFileEntry.fileName;
-		}
+    static moveEntry(srcFileEntry, destAreaTag, destStorageTag, destFileName, cb) {
+        if(!cb && _.isFunction(destFileName)) {
+            cb = destFileName;
+            destFileName = srcFileEntry.fileName;
+        }
 
-		const srcPath	= srcFileEntry.filePath;
-		const dstDir	= FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
+        const srcPath	= srcFileEntry.filePath;
+        const dstDir	= FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
 
-		if(!dstDir) {
-			return cb(Errors.Invalid('Invalid storage tag'));
-		}
+        if(!dstDir) {
+            return cb(Errors.Invalid('Invalid storage tag'));
+        }
 
-		const dstPath	= paths.join(dstDir, destFileName);
+        const dstPath	= paths.join(dstDir, destFileName);
 
-		async.series(
-			[
-				function movePhysFile(callback) {
-					if(srcPath === dstPath) {
-						return callback(null);	//	don't need to move file, but may change areas
-					}
+        async.series(
+            [
+                function movePhysFile(callback) {
+                    if(srcPath === dstPath) {
+                        return callback(null);	//	don't need to move file, but may change areas
+                    }
 
-					fse.move(srcPath, dstPath, err => {
-						return callback(err);
-					});
-				},
-				function updateDatabase(callback) {
-					fileDb.run(
-						`UPDATE file
+                    fse.move(srcPath, dstPath, err => {
+                        return callback(err);
+                    });
+                },
+                function updateDatabase(callback) {
+                    fileDb.run(
+                        `UPDATE file
 						SET area_tag = ?, file_name = ?, storage_tag = ?
 						WHERE file_id = ?;`,
-						[ destAreaTag, destFileName, destStorageTag, srcFileEntry.fileId ],
-						err => {
-							return callback(err);
-						}
-					);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                        [ destAreaTag, destFileName, destStorageTag, srcFileEntry.fileId ],
+                        err => {
+                            return callback(err);
+                        }
+                    );
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 };
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 456898c9..e66a98f7 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -42,113 +42,113 @@ const TEMP_SUFFIX	= 'enigtf-';	//	temp CWD/etc.
 */
 
 exports.moduleInfo = {
-	name	: 'Transfer file',
-	desc	: 'Sends or receives a file(s)',
-	author	: 'NuSkooler',
+    name	: 'Transfer file',
+    desc	: 'Sends or receives a file(s)',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class TransferFileModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config = this.menuConfig.config || {};
+        this.config = this.menuConfig.config || {};
 
-		//
-		//	Most options can be set via extraArgs or config block
-		//
-		const config = Config();
-		if(options.extraArgs) {
-			if(options.extraArgs.protocol) {
-				this.protocolConfig = config.fileTransferProtocols[options.extraArgs.protocol];
-			}
+        //
+        //	Most options can be set via extraArgs or config block
+        //
+        const config = Config();
+        if(options.extraArgs) {
+            if(options.extraArgs.protocol) {
+                this.protocolConfig = config.fileTransferProtocols[options.extraArgs.protocol];
+            }
 
-			if(options.extraArgs.direction) {
-				this.direction = options.extraArgs.direction;
-			}
+            if(options.extraArgs.direction) {
+                this.direction = options.extraArgs.direction;
+            }
 
-			if(options.extraArgs.sendQueue) {
-				this.sendQueue = options.extraArgs.sendQueue;
-			}
+            if(options.extraArgs.sendQueue) {
+                this.sendQueue = options.extraArgs.sendQueue;
+            }
 
-			if(options.extraArgs.recvFileName) {
-				this.recvFileName = options.extraArgs.recvFileName;
-			}
+            if(options.extraArgs.recvFileName) {
+                this.recvFileName = options.extraArgs.recvFileName;
+            }
 
-			if(options.extraArgs.recvDirectory) {
-				this.recvDirectory = options.extraArgs.recvDirectory;
-			}
-		} else {
-			if(this.config.protocol) {
-				this.protocolConfig = config.fileTransferProtocols[this.config.protocol];
-			}
+            if(options.extraArgs.recvDirectory) {
+                this.recvDirectory = options.extraArgs.recvDirectory;
+            }
+        } else {
+            if(this.config.protocol) {
+                this.protocolConfig = config.fileTransferProtocols[this.config.protocol];
+            }
 
-			if(this.config.direction) {
-				this.direction = this.config.direction;
-			}
+            if(this.config.direction) {
+                this.direction = this.config.direction;
+            }
 
-			if(this.config.sendQueue) {
-				this.sendQueue = this.config.sendQueue;
-			}
+            if(this.config.sendQueue) {
+                this.sendQueue = this.config.sendQueue;
+            }
 
-			if(this.config.recvFileName) {
-				this.recvFileName = this.config.recvFileName;
-			}
+            if(this.config.recvFileName) {
+                this.recvFileName = this.config.recvFileName;
+            }
 
-			if(this.config.recvDirectory) {
-				this.recvDirectory = this.config.recvDirectory;
-			}
-		}
+            if(this.config.recvDirectory) {
+                this.recvDirectory = this.config.recvDirectory;
+            }
+        }
 
-		this.protocolConfig = this.protocolConfig || config.fileTransferProtocols.zmodem8kSz;	//	try for *something*
-		this.direction		= this.direction || 'send';
-		this.sendQueue		= this.sendQueue || [];
+        this.protocolConfig = this.protocolConfig || config.fileTransferProtocols.zmodem8kSz;	//	try for *something*
+        this.direction		= this.direction || 'send';
+        this.sendQueue		= this.sendQueue || [];
 
-		//	Ensure sendQueue is an array of objects that contain at least a 'path' member
-		this.sendQueue = this.sendQueue.map(item => {
-			if(_.isString(item)) {
-				return { path : item };
-			} else {
-				return item;
-			}
-		});
+        //	Ensure sendQueue is an array of objects that contain at least a 'path' member
+        this.sendQueue = this.sendQueue.map(item => {
+            if(_.isString(item)) {
+                return { path : item };
+            } else {
+                return item;
+            }
+        });
 
-		this.sentFileIds = [];
-	}
+        this.sentFileIds = [];
+    }
 
-	isSending() {
-		return ('send' === this.direction);
-	}
+    isSending() {
+        return ('send' === this.direction);
+    }
 
-	restorePipeAfterExternalProc() {
-		if(!this.pipeRestored) {
-			this.pipeRestored = true;
+    restorePipeAfterExternalProc() {
+        if(!this.pipeRestored) {
+            this.pipeRestored = true;
 
-			this.client.restoreDataHandler();
-		}
-	}
+            this.client.restoreDataHandler();
+        }
+    }
 
-	sendFiles(cb) {
-		//	assume *sending* can always batch
-		//	:TODO: Look into this further
-		const allFiles = this.sendQueue.map(f => f.path);
-		this.executeExternalProtocolHandlerForSend(allFiles, err => {
-			if(err) {
-				this.client.log.warn( { files : allFiles, error : err.message }, 'Error sending file(s)' );
-			} else {
-				const sentFiles = [];
-				this.sendQueue.forEach(f => {
-					f.sent = true;
-					sentFiles.push(f.path);
+    sendFiles(cb) {
+        //	assume *sending* can always batch
+        //	:TODO: Look into this further
+        const allFiles = this.sendQueue.map(f => f.path);
+        this.executeExternalProtocolHandlerForSend(allFiles, err => {
+            if(err) {
+                this.client.log.warn( { files : allFiles, error : err.message }, 'Error sending file(s)' );
+            } else {
+                const sentFiles = [];
+                this.sendQueue.forEach(f => {
+                    f.sent = true;
+                    sentFiles.push(f.path);
 
-				});
+                });
 
-				this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
-			}
-			return cb(err);
-		});
-	}
+                this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
+            }
+            return cb(err);
+        });
+    }
 
-	/*
+    /*
 	sendFiles(cb) {
 		//	:TODO: built in/native protocol support
 
@@ -189,408 +189,408 @@ exports.getModule = class TransferFileModule extends MenuModule {
 	}
 	*/
 
-	moveFileWithCollisionHandling(src, dst, cb) {
-		//
-		//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
-		//	in the case of collisions.
-		//
-		const dstPath		= paths.dirname(dst);
-		const dstFileExt	= paths.extname(dst);
-		const dstFileSuffix	= paths.basename(dst, dstFileExt);
+    moveFileWithCollisionHandling(src, dst, cb) {
+        //
+        //	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
+        //	in the case of collisions.
+        //
+        const dstPath		= paths.dirname(dst);
+        const dstFileExt	= paths.extname(dst);
+        const dstFileSuffix	= paths.basename(dst, dstFileExt);
 
-		let renameIndex		= 0;
-		let movedOk			= false;
-		let tryDstPath;
+        let renameIndex		= 0;
+        let movedOk			= false;
+        let tryDstPath;
 
-		async.until(
-			() => movedOk,	//	until moved OK
-			(cb) => {
-				if(0 === renameIndex) {
-					//	try originally supplied path first
-					tryDstPath = dst;
-				} else {
-					tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
-				}
+        async.until(
+            () => movedOk,	//	until moved OK
+            (cb) => {
+                if(0 === renameIndex) {
+                    //	try originally supplied path first
+                    tryDstPath = dst;
+                } else {
+                    tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
+                }
 
-				fse.move(src, tryDstPath, err => {
-					if(err) {
-						if('EEXIST' === err.code) {
-							renameIndex += 1;
-							return cb(null);	//	keep trying
-						}
+                fse.move(src, tryDstPath, err => {
+                    if(err) {
+                        if('EEXIST' === err.code) {
+                            renameIndex += 1;
+                            return cb(null);	//	keep trying
+                        }
 
-						return cb(err);
-					}
+                        return cb(err);
+                    }
 
-					movedOk = true;
-					return cb(null, tryDstPath);
-				});
-			},
-			(err, finalPath) => {
-				return cb(err, finalPath);
-			}
-		);
-	}
+                    movedOk = true;
+                    return cb(null, tryDstPath);
+                });
+            },
+            (err, finalPath) => {
+                return cb(err, finalPath);
+            }
+        );
+    }
 
-	recvFiles(cb) {
-		this.executeExternalProtocolHandlerForRecv(err => {
-			if(err) {
-				return cb(err);
-			}
+    recvFiles(cb) {
+        this.executeExternalProtocolHandlerForRecv(err => {
+            if(err) {
+                return cb(err);
+            }
 
-			this.recvFilePaths = [];
+            this.recvFilePaths = [];
 
-			if(this.recvFileName) {
-				//
-				//	file name specified - we expect a single file in |this.recvDirectory|
-				//	by the name of |this.recvFileName|
-				//
-				const recvFullPath = paths.join(this.recvDirectory, this.recvFileName);
-				fs.stat(recvFullPath, (err, stats) => {
-					if(err) {
-						return cb(err);
-					}
+            if(this.recvFileName) {
+                //
+                //	file name specified - we expect a single file in |this.recvDirectory|
+                //	by the name of |this.recvFileName|
+                //
+                const recvFullPath = paths.join(this.recvDirectory, this.recvFileName);
+                fs.stat(recvFullPath, (err, stats) => {
+                    if(err) {
+                        return cb(err);
+                    }
 
-					if(!stats.isFile()) {
-						return cb(Errors.Invalid('Expected file entry in recv directory'));
-					}
+                    if(!stats.isFile()) {
+                        return cb(Errors.Invalid('Expected file entry in recv directory'));
+                    }
 
-					this.recvFilePaths.push(recvFullPath);
-					return cb(null);
-				});
-			} else {
-				//
-				//	Blind Upload (recv): files in |this.recvDirectory| should be named appropriately already
-				//
-				fs.readdir(this.recvDirectory, (err, files) => {
-					if(err) {
-						return cb(err);
-					}
+                    this.recvFilePaths.push(recvFullPath);
+                    return cb(null);
+                });
+            } else {
+                //
+                //	Blind Upload (recv): files in |this.recvDirectory| should be named appropriately already
+                //
+                fs.readdir(this.recvDirectory, (err, files) => {
+                    if(err) {
+                        return cb(err);
+                    }
 
-					//	stat each to grab files only
-					async.each(files, (fileName, nextFile) => {
-						const recvFullPath = paths.join(this.recvDirectory, fileName);
+                    //	stat each to grab files only
+                    async.each(files, (fileName, nextFile) => {
+                        const recvFullPath = paths.join(this.recvDirectory, fileName);
 
-						fs.stat(recvFullPath, (err, stats) => {
-							if(err) {
-								this.client.log.warn('Failed to stat file', { path : recvFullPath } );
-								return nextFile(null);	//	just try the next one
-							}
+                        fs.stat(recvFullPath, (err, stats) => {
+                            if(err) {
+                                this.client.log.warn('Failed to stat file', { path : recvFullPath } );
+                                return nextFile(null);	//	just try the next one
+                            }
 
-							if(stats.isFile()) {
-								this.recvFilePaths.push(recvFullPath);
-							}
+                            if(stats.isFile()) {
+                                this.recvFilePaths.push(recvFullPath);
+                            }
 
-							return nextFile(null);
-						});
-					}, () => {
-						return cb(null);
-					});
-				});
-			}
-		});
-	}
+                            return nextFile(null);
+                        });
+                    }, () => {
+                        return cb(null);
+                    });
+                });
+            }
+        });
+    }
 
-	pathWithTerminatingSeparator(path) {
-		if(path && paths.sep !== path.charAt(path.length - 1)) {
-			path = path + paths.sep;
-		}
-		return path;
-	}
+    pathWithTerminatingSeparator(path) {
+        if(path && paths.sep !== path.charAt(path.length - 1)) {
+            path = path + paths.sep;
+        }
+        return path;
+    }
 
-	prepAndBuildSendArgs(filePaths, cb) {
-		const externalArgs	= this.protocolConfig.external['sendArgs'];
+    prepAndBuildSendArgs(filePaths, cb) {
+        const externalArgs	= this.protocolConfig.external['sendArgs'];
 
-		async.waterfall(
-			[
-				function getTempFileListPath(callback) {
-					const hasFileList = externalArgs.find(ea => (ea.indexOf('{fileListPath}') > -1) );
-					if(!hasFileList) {
-						return callback(null, null);
-					}
+        async.waterfall(
+            [
+                function getTempFileListPath(callback) {
+                    const hasFileList = externalArgs.find(ea => (ea.indexOf('{fileListPath}') > -1) );
+                    if(!hasFileList) {
+                        return callback(null, null);
+                    }
 
-					temptmp.open( { prefix : TEMP_SUFFIX, suffix : '.txt' }, (err, tempFileInfo) => {
-						if(err) {
-							return callback(err);	//	failed to create it
-						}
+                    temptmp.open( { prefix : TEMP_SUFFIX, suffix : '.txt' }, (err, tempFileInfo) => {
+                        if(err) {
+                            return callback(err);	//	failed to create it
+                        }
 
-						fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL));
-						fs.close(tempFileInfo.fd, err => {
-							return callback(err, tempFileInfo.path);
-						});
-					});
-				},
-				function createArgs(tempFileListPath, callback) {
-					//	initial args: ignore {filePaths} as we must break that into it's own sep array items
-					const args = externalArgs.map(arg => {
-						return '{filePaths}' === arg ? arg : stringFormat(arg, {
-							fileListPath	: tempFileListPath || '',
-						});
-					});
+                        fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL));
+                        fs.close(tempFileInfo.fd, err => {
+                            return callback(err, tempFileInfo.path);
+                        });
+                    });
+                },
+                function createArgs(tempFileListPath, callback) {
+                    //	initial args: ignore {filePaths} as we must break that into it's own sep array items
+                    const args = externalArgs.map(arg => {
+                        return '{filePaths}' === arg ? arg : stringFormat(arg, {
+                            fileListPath	: tempFileListPath || '',
+                        });
+                    });
 
-					const filePathsPos = args.indexOf('{filePaths}');
-					if(filePathsPos > -1) {
-						//	replace {filePaths} with 0:n individual entries in |args|
-						args.splice.apply( args, [ filePathsPos, 1 ].concat(filePaths) );
-					}
+                    const filePathsPos = args.indexOf('{filePaths}');
+                    if(filePathsPos > -1) {
+                        //	replace {filePaths} with 0:n individual entries in |args|
+                        args.splice.apply( args, [ filePathsPos, 1 ].concat(filePaths) );
+                    }
 
-					return callback(null, args);
-				}
-			],
-			(err, args) => {
-				return cb(err, args);
-			}
-		);
-	}
+                    return callback(null, args);
+                }
+            ],
+            (err, args) => {
+                return cb(err, args);
+            }
+        );
+    }
 
-	prepAndBuildRecvArgs(cb) {
-		const argsKey		= this.recvFileName ? 'recvArgsNonBatch' : 'recvArgs';
-		const externalArgs	= this.protocolConfig.external[argsKey];
-		const args			= externalArgs.map(arg => stringFormat(arg, {
-			uploadDir		: this.recvDirectory,
-			fileName		: this.recvFileName || '',
-		}));
+    prepAndBuildRecvArgs(cb) {
+        const argsKey		= this.recvFileName ? 'recvArgsNonBatch' : 'recvArgs';
+        const externalArgs	= this.protocolConfig.external[argsKey];
+        const args			= externalArgs.map(arg => stringFormat(arg, {
+            uploadDir		: this.recvDirectory,
+            fileName		: this.recvFileName || '',
+        }));
 
-		return cb(null, args);
-	}
+        return cb(null, args);
+    }
 
-	executeExternalProtocolHandler(args, cb) {
-		const external	= this.protocolConfig.external;
-		const cmd		= external[`${this.direction}Cmd`];
+    executeExternalProtocolHandler(args, cb) {
+        const external	= this.protocolConfig.external;
+        const cmd		= external[`${this.direction}Cmd`];
 
-		this.client.log.debug(
-			{ cmd : cmd, args : args, tempDir : this.recvDirectory, direction : this.direction },
-			'Executing external protocol'
-		);
+        this.client.log.debug(
+            { cmd : cmd, args : args, tempDir : this.recvDirectory, direction : this.direction },
+            'Executing external protocol'
+        );
 
-		const spawnOpts = {
-			cols		: this.client.term.termWidth,
-			rows		: this.client.term.termHeight,
-			cwd			: this.recvDirectory,
-			encoding	: null,	//	don't bork our data!
-		};
+        const spawnOpts = {
+            cols		: this.client.term.termWidth,
+            rows		: this.client.term.termHeight,
+            cwd			: this.recvDirectory,
+            encoding	: null,	//	don't bork our data!
+        };
 
-		const externalProc = pty.spawn(cmd, args, spawnOpts);
+        const externalProc = pty.spawn(cmd, args, spawnOpts);
 
-		this.client.setTemporaryDirectDataHandler(data => {
-			//	needed for things like sz/rz
-			if(external.escapeTelnet) {
-				const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');	//	de-escape
-				externalProc.write(Buffer.from(tmp, 'binary'));
-			} else {
-				externalProc.write(data);
-			}
-		});
+        this.client.setTemporaryDirectDataHandler(data => {
+            //	needed for things like sz/rz
+            if(external.escapeTelnet) {
+                const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');	//	de-escape
+                externalProc.write(Buffer.from(tmp, 'binary'));
+            } else {
+                externalProc.write(data);
+            }
+        });
 
-		externalProc.on('data', data => {
-			//	needed for things like sz/rz
-			if(external.escapeTelnet) {
-				const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');	//	escape
-				this.client.term.rawWrite(Buffer.from(tmp, 'binary'));
-			} else {
-				this.client.term.rawWrite(data);
-			}
-		});
+        externalProc.on('data', data => {
+            //	needed for things like sz/rz
+            if(external.escapeTelnet) {
+                const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');	//	escape
+                this.client.term.rawWrite(Buffer.from(tmp, 'binary'));
+            } else {
+                this.client.term.rawWrite(data);
+            }
+        });
 
-		externalProc.once('close', () => {
-			return this.restorePipeAfterExternalProc();
-		});
+        externalProc.once('close', () => {
+            return this.restorePipeAfterExternalProc();
+        });
 
-		externalProc.once('exit', (exitCode) => {
-			this.client.log.debug( { cmd : cmd, args : args, exitCode : exitCode }, 'Process exited' );
+        externalProc.once('exit', (exitCode) => {
+            this.client.log.debug( { cmd : cmd, args : args, exitCode : exitCode }, 'Process exited' );
 
-			this.restorePipeAfterExternalProc();
-			externalProc.removeAllListeners();
+            this.restorePipeAfterExternalProc();
+            externalProc.removeAllListeners();
 
-			return cb(exitCode ? Errors.ExternalProcess(`Process exited with exit code ${exitCode}`, 'EBADEXIT') : null);
-		});
-	}
+            return cb(exitCode ? Errors.ExternalProcess(`Process exited with exit code ${exitCode}`, 'EBADEXIT') : null);
+        });
+    }
 
-	executeExternalProtocolHandlerForSend(filePaths, cb) {
-		if(!Array.isArray(filePaths)) {
-			filePaths = [ filePaths ];
-		}
+    executeExternalProtocolHandlerForSend(filePaths, cb) {
+        if(!Array.isArray(filePaths)) {
+            filePaths = [ filePaths ];
+        }
 
-		this.prepAndBuildSendArgs(filePaths, (err, args) => {
-			if(err) {
-				return cb(err);
-			}
+        this.prepAndBuildSendArgs(filePaths, (err, args) => {
+            if(err) {
+                return cb(err);
+            }
 
-			this.executeExternalProtocolHandler(args, err => {
-				return cb(err);
-			});
-		});
-	}
+            this.executeExternalProtocolHandler(args, err => {
+                return cb(err);
+            });
+        });
+    }
 
-	executeExternalProtocolHandlerForRecv(cb) {
-		this.prepAndBuildRecvArgs( (err, args) => {
-			if(err) {
-				return cb(err);
-			}
+    executeExternalProtocolHandlerForRecv(cb) {
+        this.prepAndBuildRecvArgs( (err, args) => {
+            if(err) {
+                return cb(err);
+            }
 
-			this.executeExternalProtocolHandler(args, err => {
-				return cb(err);
-			});
-		});
-	}
+            this.executeExternalProtocolHandler(args, err => {
+                return cb(err);
+            });
+        });
+    }
 
-	getMenuResult() {
-		if(this.isSending()) {
-			return { sentFileIds : this.sentFileIds };
-		} else {
-			return { recvFilePaths : this.recvFilePaths };
-		}
-	}
+    getMenuResult() {
+        if(this.isSending()) {
+            return { sentFileIds : this.sentFileIds };
+        } else {
+            return { recvFilePaths : this.recvFilePaths };
+        }
+    }
 
-	updateSendStats(cb) {
-		let downloadBytes 	= 0;
-		let downloadCount	= 0;
-		let fileIds			= [];
+    updateSendStats(cb) {
+        let downloadBytes 	= 0;
+        let downloadCount	= 0;
+        let fileIds			= [];
 
-		async.each(this.sendQueue, (queueItem, next) => {
-			if(!queueItem.sent) {
-				return next(null);
-			}
+        async.each(this.sendQueue, (queueItem, next) => {
+            if(!queueItem.sent) {
+                return next(null);
+            }
 
-			if(queueItem.fileId) {
-				fileIds.push(queueItem.fileId);
-			}
+            if(queueItem.fileId) {
+                fileIds.push(queueItem.fileId);
+            }
 
-			if(_.isNumber(queueItem.byteSize)) {
-				downloadCount += 1;
-				downloadBytes += queueItem.byteSize;
-				return next(null);
-			}
+            if(_.isNumber(queueItem.byteSize)) {
+                downloadCount += 1;
+                downloadBytes += queueItem.byteSize;
+                return next(null);
+            }
 
-			//	we just have a path - figure it out
-			fs.stat(queueItem.path, (err, stats) => {
-				if(err) {
-					this.client.log.warn( { error : err.message, path : queueItem.path }, 'File stat failed' );
-				} else {
-					downloadCount += 1;
-					downloadBytes += stats.size;
-				}
+            //	we just have a path - figure it out
+            fs.stat(queueItem.path, (err, stats) => {
+                if(err) {
+                    this.client.log.warn( { error : err.message, path : queueItem.path }, 'File stat failed' );
+                } else {
+                    downloadCount += 1;
+                    downloadBytes += stats.size;
+                }
 
-				return next(null);
-			});
-		}, () => {
-			//	All stats/meta currently updated via fire & forget - if this is ever a issue, we can wait for callbacks
-			StatLog.incrementUserStat(this.client.user, 'dl_total_count', downloadCount);
-			StatLog.incrementUserStat(this.client.user, 'dl_total_bytes', downloadBytes);
-			StatLog.incrementSystemStat('dl_total_count', downloadCount);
-			StatLog.incrementSystemStat('dl_total_bytes', downloadBytes);
+                return next(null);
+            });
+        }, () => {
+            //	All stats/meta currently updated via fire & forget - if this is ever a issue, we can wait for callbacks
+            StatLog.incrementUserStat(this.client.user, 'dl_total_count', downloadCount);
+            StatLog.incrementUserStat(this.client.user, 'dl_total_bytes', downloadBytes);
+            StatLog.incrementSystemStat('dl_total_count', downloadCount);
+            StatLog.incrementSystemStat('dl_total_bytes', downloadBytes);
 
-			fileIds.forEach(fileId => {
-				FileEntry.incrementAndPersistMetaValue(fileId, 'dl_count', 1);
-			});
+            fileIds.forEach(fileId => {
+                FileEntry.incrementAndPersistMetaValue(fileId, 'dl_count', 1);
+            });
 
-			return cb(null);
-		});
-	}
+            return cb(null);
+        });
+    }
 
-	updateRecvStats(cb) {
-		let uploadBytes	= 0;
-		let uploadCount	= 0;
+    updateRecvStats(cb) {
+        let uploadBytes	= 0;
+        let uploadCount	= 0;
 
-		async.each(this.recvFilePaths, (filePath, next) => {
-			//	we just have a path - figure it out
-			fs.stat(filePath, (err, stats) => {
-				if(err) {
-					this.client.log.warn( { error : err.message, path : filePath }, 'File stat failed' );
-				} else {
-					uploadCount	+= 1;
-					uploadBytes += stats.size;
-				}
+        async.each(this.recvFilePaths, (filePath, next) => {
+            //	we just have a path - figure it out
+            fs.stat(filePath, (err, stats) => {
+                if(err) {
+                    this.client.log.warn( { error : err.message, path : filePath }, 'File stat failed' );
+                } else {
+                    uploadCount	+= 1;
+                    uploadBytes += stats.size;
+                }
 
-				return next(null);
-			});
-		}, () => {
-			StatLog.incrementUserStat(this.client.user, 'ul_total_count', uploadCount);
-			StatLog.incrementUserStat(this.client.user, 'ul_total_bytes', uploadBytes);
-			StatLog.incrementSystemStat('ul_total_count', uploadCount);
-			StatLog.incrementSystemStat('ul_total_bytes', uploadBytes);
+                return next(null);
+            });
+        }, () => {
+            StatLog.incrementUserStat(this.client.user, 'ul_total_count', uploadCount);
+            StatLog.incrementUserStat(this.client.user, 'ul_total_bytes', uploadBytes);
+            StatLog.incrementSystemStat('ul_total_count', uploadCount);
+            StatLog.incrementSystemStat('ul_total_bytes', uploadBytes);
 
-			return cb(null);
-		});
-	}
+            return cb(null);
+        });
+    }
 
-	initSequence() {
-		const self = this;
+    initSequence() {
+        const self = this;
 
-		//	:TODO: break this up to send|recv
+        //	:TODO: break this up to send|recv
 
-		async.series(
-			[
-				function validateConfig(callback) {
-					if(self.isSending()) {
-						if(!Array.isArray(self.sendQueue)) {
-							self.sendQueue = [ self.sendQueue ];
-						}
-					}
+        async.series(
+            [
+                function validateConfig(callback) {
+                    if(self.isSending()) {
+                        if(!Array.isArray(self.sendQueue)) {
+                            self.sendQueue = [ self.sendQueue ];
+                        }
+                    }
 
-					return callback(null);
-				},
-				function transferFiles(callback) {
-					if(self.isSending()) {
-						self.sendFiles( err => {
-							if(err) {
-								return callback(err);
-							}
+                    return callback(null);
+                },
+                function transferFiles(callback) {
+                    if(self.isSending()) {
+                        self.sendFiles( err => {
+                            if(err) {
+                                return callback(err);
+                            }
 
-							const sentFileIds = [];
-							self.sendQueue.forEach(queueItem => {
-								if(queueItem.sent && queueItem.fileId) {
-									sentFileIds.push(queueItem.fileId);
-								}
-							});
+                            const sentFileIds = [];
+                            self.sendQueue.forEach(queueItem => {
+                                if(queueItem.sent && queueItem.fileId) {
+                                    sentFileIds.push(queueItem.fileId);
+                                }
+                            });
 
-							if(sentFileIds.length > 0) {
-								//	remove items we sent from the D/L queue
-								const dlQueue = new DownloadQueue(self.client);
-								const dlFileEntries = dlQueue.removeItems(sentFileIds);
+                            if(sentFileIds.length > 0) {
+                                //	remove items we sent from the D/L queue
+                                const dlQueue = new DownloadQueue(self.client);
+                                const dlFileEntries = dlQueue.removeItems(sentFileIds);
 
-								//	fire event for downloaded entries
-								Events.emit(
-									Events.getSystemEvents().UserDownload,
-									{
-										user	: self.client.user,
-										files	: dlFileEntries
-									}
-								);
+                                //	fire event for downloaded entries
+                                Events.emit(
+                                    Events.getSystemEvents().UserDownload,
+                                    {
+                                        user	: self.client.user,
+                                        files	: dlFileEntries
+                                    }
+                                );
 
-								self.sentFileIds = sentFileIds;
-							}
+                                self.sentFileIds = sentFileIds;
+                            }
 
-							return callback(null);
-						});
-					} else {
-						self.recvFiles( err => {
-							return callback(err);
-						});
-					}
-				},
-				function cleanupTempFiles(callback) {
-					temptmp.cleanup( paths => {
-						Log.debug( { paths : paths, sessionId : temptmp.sessionId }, 'Temporary files cleaned up' );
-					});
+                            return callback(null);
+                        });
+                    } else {
+                        self.recvFiles( err => {
+                            return callback(err);
+                        });
+                    }
+                },
+                function cleanupTempFiles(callback) {
+                    temptmp.cleanup( paths => {
+                        Log.debug( { paths : paths, sessionId : temptmp.sessionId }, 'Temporary files cleaned up' );
+                    });
 
-					return callback(null);
-				},
-				function updateUserAndSystemStats(callback) {
-					if(self.isSending()) {
-						return self.updateSendStats(callback);
-					} else {
-						return self.updateRecvStats(callback);
-					}
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'File transfer error');
-				}
+                    return callback(null);
+                },
+                function updateUserAndSystemStats(callback) {
+                    if(self.isSending()) {
+                        return self.updateSendStats(callback);
+                    } else {
+                        return self.updateRecvStats(callback);
+                    }
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'File transfer error');
+                }
 
-				return self.prevMenu();
-			}
-		);
-	}
+                return self.prevMenu();
+            }
+        );
+    }
 };
diff --git a/core/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
index 3d3bd37b..1fe1944b 100644
--- a/core/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -12,147 +12,147 @@ const async			= require('async');
 const _				= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'File transfer protocol selection',
-	desc	: 'Select protocol / method for file transfer',
-	author	: 'NuSkooler',
+    name	: 'File transfer protocol selection',
+    desc	: 'Select protocol / method for file transfer',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	protList	: 1,
+    protList	: 1,
 };
 
 exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config = this.menuConfig.config || {};
+        this.config = this.menuConfig.config || {};
 
-		if(options.extraArgs) {
-			if(options.extraArgs.direction) {
-				this.config.direction = options.extraArgs.direction;
-			}
-		}
+        if(options.extraArgs) {
+            if(options.extraArgs.direction) {
+                this.config.direction = options.extraArgs.direction;
+            }
+        }
 
-		this.config.direction = this.config.direction || 'send';
+        this.config.direction = this.config.direction || 'send';
 
-		this.extraArgs	= options.extraArgs;
+        this.extraArgs	= options.extraArgs;
 
-		if(_.has(options, 'lastMenuResult.sentFileIds')) {
-			this.sentFileIds = options.lastMenuResult.sentFileIds;
-		}
+        if(_.has(options, 'lastMenuResult.sentFileIds')) {
+            this.sentFileIds = options.lastMenuResult.sentFileIds;
+        }
 
-		if(_.has(options, 'lastMenuResult.recvFilePaths')) {
-			this.recvFilePaths = options.lastMenuResult.recvFilePaths;
-		}
+        if(_.has(options, 'lastMenuResult.recvFilePaths')) {
+            this.recvFilePaths = options.lastMenuResult.recvFilePaths;
+        }
 
-		this.fallbackOnly	= options.lastMenuResult ? true : false;
+        this.fallbackOnly	= options.lastMenuResult ? true : false;
 
-		this.loadAvailProtocols();
+        this.loadAvailProtocols();
 
-		this.menuMethods = {
-			selectProtocol : (formData, extraArgs, cb) => {
-				const protocol	= this.protocols[formData.value.protocol];
-				const finalExtraArgs = this.extraArgs || {};
-				Object.assign(finalExtraArgs, { protocol : protocol.protocol, direction : this.config.direction }, extraArgs );
+        this.menuMethods = {
+            selectProtocol : (formData, extraArgs, cb) => {
+                const protocol	= this.protocols[formData.value.protocol];
+                const finalExtraArgs = this.extraArgs || {};
+                Object.assign(finalExtraArgs, { protocol : protocol.protocol, direction : this.config.direction }, extraArgs );
 
-				const modOpts = {
-					extraArgs : finalExtraArgs,
-				};
+                const modOpts = {
+                    extraArgs : finalExtraArgs,
+                };
 
-				if('send' === this.config.direction) {
-					return this.gotoMenu(this.config.downloadFilesMenu || 'sendFilesToUser', modOpts, cb);
-				} else {
-					return this.gotoMenu(this.config.uploadFilesMenu || 'recvFilesFromUser', modOpts, cb);
-				}
-			},
-		};
-	}
+                if('send' === this.config.direction) {
+                    return this.gotoMenu(this.config.downloadFilesMenu || 'sendFilesToUser', modOpts, cb);
+                } else {
+                    return this.gotoMenu(this.config.uploadFilesMenu || 'recvFilesFromUser', modOpts, cb);
+                }
+            },
+        };
+    }
 
-	getMenuResult() {
-		if(this.sentFileIds) {
-			return { sentFileIds : this.sentFileIds };
-		}
+    getMenuResult() {
+        if(this.sentFileIds) {
+            return { sentFileIds : this.sentFileIds };
+        }
 
-		if(this.recvFilePaths) {
-			return { recvFilePaths : this.recvFilePaths };
-		}
-	}
+        if(this.recvFilePaths) {
+            return { recvFilePaths : this.recvFilePaths };
+        }
+    }
 
-	initSequence() {
-		if(this.sentFileIds || this.recvFilePaths) {
-			//	nothing to do here; move along (we're just falling through)
-			this.prevMenu();
-		} else {
-			super.initSequence();
-		}
-	}
+    initSequence() {
+        if(this.sentFileIds || this.recvFilePaths) {
+            //	nothing to do here; move along (we're just falling through)
+            this.prevMenu();
+        } else {
+            super.initSequence();
+        }
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self	= this;
+            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function populateList(callback) {
-						const protListView = vc.getView(MciViewIds.protList);
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function populateList(callback) {
+                        const protListView = vc.getView(MciViewIds.protList);
 
-						const protListFormat 		= self.config.protListFormat || '{name}';
-						const protListFocusFormat	= self.config.protListFocusFormat || protListFormat;
+                        const protListFormat 		= self.config.protListFormat || '{name}';
+                        const protListFocusFormat	= self.config.protListFocusFormat || protListFormat;
 
-						protListView.setItems(self.protocols.map(p => stringFormat(protListFormat, p) ) );
-						protListView.setFocusItems(self.protocols.map(p => stringFormat(protListFocusFormat, p) ) );
+                        protListView.setItems(self.protocols.map(p => stringFormat(protListFormat, p) ) );
+                        protListView.setFocusItems(self.protocols.map(p => stringFormat(protListFocusFormat, p) ) );
 
-						protListView.redraw();
+                        protListView.redraw();
 
-						return callback(null);
-					}
-				],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	loadAvailProtocols() {
-		this.protocols = _.map(Config().fileTransferProtocols, (protInfo, protocol) => {
-			return {
-				protocol	: protocol,
-				name		: protInfo.name,
-				hasBatch	: _.has(protInfo, 'external.recvArgs'),
-				hasNonBatch	: _.has(protInfo, 'external.recvArgsNonBatch'),
-				sort		: protInfo.sort,
-			};
-		});
+    loadAvailProtocols() {
+        this.protocols = _.map(Config().fileTransferProtocols, (protInfo, protocol) => {
+            return {
+                protocol	: protocol,
+                name		: protInfo.name,
+                hasBatch	: _.has(protInfo, 'external.recvArgs'),
+                hasNonBatch	: _.has(protInfo, 'external.recvArgsNonBatch'),
+                sort		: protInfo.sort,
+            };
+        });
 
-		//	Filter out batch vs non-batch only protocols
-		if(this.extraArgs.recvFileName) {	//	non-batch aka non-blind
-			this.protocols = this.protocols.filter( prot => prot.hasNonBatch );
-		} else {
-			this.protocols = this.protocols.filter( prot => prot.hasBatch );
-		}
+        //	Filter out batch vs non-batch only protocols
+        if(this.extraArgs.recvFileName) {	//	non-batch aka non-blind
+            this.protocols = this.protocols.filter( prot => prot.hasNonBatch );
+        } else {
+            this.protocols = this.protocols.filter( prot => prot.hasBatch );
+        }
 
-		//	natural sort taking explicit orders into consideration
-		this.protocols.sort( (a, b) => {
-			if(_.isNumber(a.sort) && _.isNumber(b.sort)) {
-				return a.sort - b.sort;
-			} else {
-				return a.name.localeCompare(b.name, { sensitivity : false, numeric : true } );
-			}
-		});
-	}
+        //	natural sort taking explicit orders into consideration
+        this.protocols.sort( (a, b) => {
+            if(_.isNumber(a.sort) && _.isNumber(b.sort)) {
+                return a.sort - b.sort;
+            } else {
+                return a.name.localeCompare(b.name, { sensitivity : false, numeric : true } );
+            }
+        });
+    }
 };
diff --git a/core/file_util.js b/core/file_util.js
index 0f91e71a..428622da 100644
--- a/core/file_util.js
+++ b/core/file_util.js
@@ -14,59 +14,59 @@ exports.copyFileWithCollisionHandling		= copyFileWithCollisionHandling;
 exports.pathWithTerminatingSeparator		= pathWithTerminatingSeparator;
 
 function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
-	operation			= operation || 'copy';
-	const dstPath		= paths.dirname(dst);
-	const dstFileExt	= paths.extname(dst);
-	const dstFileSuffix	= paths.basename(dst, dstFileExt);
+    operation			= operation || 'copy';
+    const dstPath		= paths.dirname(dst);
+    const dstFileExt	= paths.extname(dst);
+    const dstFileSuffix	= paths.basename(dst, dstFileExt);
 
-	EnigAssert('move' === operation || 'copy' === operation);
+    EnigAssert('move' === operation || 'copy' === operation);
 
-	let renameIndex		= 0;
-	let opOk			= false;
-	let tryDstPath;
+    let renameIndex		= 0;
+    let opOk			= false;
+    let tryDstPath;
 
-	function tryOperation(src, dst, callback) {
-		if('move' === operation) {
-			fse.move(src, tryDstPath, err => {
-				return callback(err);
-			});
-		} else if('copy' === operation) {
-			fse.copy(src, tryDstPath, { overwrite : false, errorOnExist : true }, err => {
-				return callback(err);
-			});
-		}
-	}
+    function tryOperation(src, dst, callback) {
+        if('move' === operation) {
+            fse.move(src, tryDstPath, err => {
+                return callback(err);
+            });
+        } else if('copy' === operation) {
+            fse.copy(src, tryDstPath, { overwrite : false, errorOnExist : true }, err => {
+                return callback(err);
+            });
+        }
+    }
 
-	async.until(
-		() => opOk,	//	until moved OK
-		(cb) => {
-			if(0 === renameIndex) {
-				//	try originally supplied path first
-				tryDstPath = dst;
-			} else {
-				tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
-			}
+    async.until(
+        () => opOk,	//	until moved OK
+        (cb) => {
+            if(0 === renameIndex) {
+                //	try originally supplied path first
+                tryDstPath = dst;
+            } else {
+                tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
+            }
 
-			tryOperation(src, tryDstPath, err => {
-				if(err) {
-					//	for some reason fs-extra copy doesn't pass err.code
-					//	:TODO: this is dangerous: submit a PR to fs-extra to set EEXIST
-					if('EEXIST' === err.code || 'copy' === operation) {
-						renameIndex += 1;
-						return cb(null);	//	keep trying
-					}
+            tryOperation(src, tryDstPath, err => {
+                if(err) {
+                    //	for some reason fs-extra copy doesn't pass err.code
+                    //	:TODO: this is dangerous: submit a PR to fs-extra to set EEXIST
+                    if('EEXIST' === err.code || 'copy' === operation) {
+                        renameIndex += 1;
+                        return cb(null);	//	keep trying
+                    }
 
-					return cb(err);
-				}
+                    return cb(err);
+                }
 
-				opOk = true;
-				return cb(null, tryDstPath);
-			});
-		},
-		(err, finalPath) => {
-			return cb(err, finalPath);
-		}
-	);
+                opOk = true;
+                return cb(null, tryDstPath);
+            });
+        },
+        (err, finalPath) => {
+            return cb(err, finalPath);
+        }
+    );
 }
 
 //
@@ -74,16 +74,16 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
 //	in the case of collisions.
 //
 function moveFileWithCollisionHandling(src, dst, cb) {
-	return moveOrCopyFileWithCollisionHandling(src, dst, 'move', cb);
+    return moveOrCopyFileWithCollisionHandling(src, dst, 'move', cb);
 }
 
 function copyFileWithCollisionHandling(src, dst, cb) {
-	return moveOrCopyFileWithCollisionHandling(src, dst, 'copy', cb);
+    return moveOrCopyFileWithCollisionHandling(src, dst, 'copy', cb);
 }
 
 function pathWithTerminatingSeparator(path) {
-	if(path && paths.sep !== path.charAt(path.length - 1)) {
-		path = path + paths.sep;
-	}
-	return path;
+    if(path && paths.sep !== path.charAt(path.length - 1)) {
+        path = path + paths.sep;
+    }
+    return path;
 }
diff --git a/core/fnv1a.js b/core/fnv1a.js
index 1b8ece32..53400a66 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -5,46 +5,46 @@ let _		= require('lodash');
 
 //	FNV-1a based on work here: https://github.com/wiedi/node-fnv
 module.exports = class FNV1a {
-	constructor(data) {
-		this.hash = 0x811c9dc5;
+    constructor(data) {
+        this.hash = 0x811c9dc5;
 
-		if(!_.isUndefined(data)) {
-			this.update(data);
-		}
-	}
+        if(!_.isUndefined(data)) {
+            this.update(data);
+        }
+    }
 
-	update(data) {
-		if(_.isNumber(data)) {
-			data = data.toString();
-		}
+    update(data) {
+        if(_.isNumber(data)) {
+            data = data.toString();
+        }
 
-		if(_.isString(data)) {
-			data = Buffer.from(data);
-		}
+        if(_.isString(data)) {
+            data = Buffer.from(data);
+        }
 
-		if(!Buffer.isBuffer(data)) {
-			throw new Error('data must be String or Buffer!');
-		}
+        if(!Buffer.isBuffer(data)) {
+            throw new Error('data must be String or Buffer!');
+        }
 
-		for(let b of data) {
-			this.hash = this.hash ^ b;
-			this.hash +=
+        for(let b of data) {
+            this.hash = this.hash ^ b;
+            this.hash +=
 				(this.hash << 24) + (this.hash << 8) + (this.hash << 7) +
 				(this.hash << 4) + (this.hash << 1);
-		}
+        }
 
-		return this;
-	}
+        return this;
+    }
 
-	digest(encoding) {
-		encoding = encoding || 'binary';
-		const buf = Buffer.alloc(4);
-		buf.writeInt32BE(this.hash & 0xffffffff, 0);
-		return buf.toString(encoding);
-	}
+    digest(encoding) {
+        encoding = encoding || 'binary';
+        const buf = Buffer.alloc(4);
+        buf.writeInt32BE(this.hash & 0xffffffff, 0);
+        return buf.toString(encoding);
+    }
 
-	get value() {
-		return this.hash & 0xffffffff;
-	}
+    get value() {
+        return this.hash & 0xffffffff;
+    }
 };
 
diff --git a/core/fse.js b/core/fse.js
index 736f735a..6dea6a1b 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -24,42 +24,42 @@ const _								= require('lodash');
 const moment						= require('moment');
 
 exports.moduleInfo = {
-	name	: 'Full Screen Editor (FSE)',
-	desc	: 'A full screen editor/viewer',
-	author	: 'NuSkooler',
+    name	: 'Full Screen Editor (FSE)',
+    desc	: 'A full screen editor/viewer',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	header : {
-		from 				: 1,
-		to					: 2,
-		subject				: 3,
-		errorMsg			: 4,
-		modTimestamp		: 5,
-		msgNum				: 6,
-		msgTotal			: 7,
+    header : {
+        from 				: 1,
+        to					: 2,
+        subject				: 3,
+        errorMsg			: 4,
+        modTimestamp		: 5,
+        msgNum				: 6,
+        msgTotal			: 7,
 
-		customRangeStart	: 10,	//	10+ = customs
-	},
+        customRangeStart	: 10,	//	10+ = customs
+    },
 
-	body : {
-		message	: 1,
-	},
+    body : {
+        message	: 1,
+    },
 
-	//	:TODO: quote builder MCIs - remove all magic #'s
+    //	:TODO: quote builder MCIs - remove all magic #'s
 
-	//	:TODO: consolidate all footer MCI's - remove all magic #'s
-	ViewModeFooter : {
-		MsgNum			: 6,
-		MsgTotal		: 7,
-		//	:TODO: Just use custom ranges
-	},
+    //	:TODO: consolidate all footer MCI's - remove all magic #'s
+    ViewModeFooter : {
+        MsgNum			: 6,
+        MsgTotal		: 7,
+        //	:TODO: Just use custom ranges
+    },
 
-	quoteBuilder : {
-		quotedMsg	: 1,
-		//	2 NYI
-		quoteLines	: 3,
-	}
+    quoteBuilder : {
+        quotedMsg	: 1,
+        //	2 NYI
+        quoteLines	: 3,
+    }
 };
 
 /*
@@ -84,693 +84,693 @@ const MciViewIds = {
 
 exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModule extends MessageAreaConfTempSwitcher(MenuModule) {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self		= this;
-		const config	= this.menuConfig.config;
+        const self		= this;
+        const config	= this.menuConfig.config;
 
-		//
-		//	menuConfig.config:
-		//		editorType				: email | area
-		//		editorMode				: view | edit | quote
-		//
-		//	menuConfig.config or extraArgs
-		//		messageAreaTag
-		//		messageIndex / messageTotal
-		//		toUserId
-		//
-		this.editorType			= config.editorType;
-		this.editorMode			= config.editorMode;
+        //
+        //	menuConfig.config:
+        //		editorType				: email | area
+        //		editorMode				: view | edit | quote
+        //
+        //	menuConfig.config or extraArgs
+        //		messageAreaTag
+        //		messageIndex / messageTotal
+        //		toUserId
+        //
+        this.editorType			= config.editorType;
+        this.editorMode			= config.editorMode;
 
-		if(config.messageAreaTag) {
-			//	:TODO: swtich to this.config.messageAreaTag so we can follow Object.assign pattern for config/extraArgs
-			this.messageAreaTag	= config.messageAreaTag;
-		}
+        if(config.messageAreaTag) {
+            //	:TODO: swtich to this.config.messageAreaTag so we can follow Object.assign pattern for config/extraArgs
+            this.messageAreaTag	= config.messageAreaTag;
+        }
 
-		this.messageIndex		= config.messageIndex || 0;
-		this.messageTotal		= config.messageTotal || 0;
-		this.toUserId			= config.toUserId || 0;
+        this.messageIndex		= config.messageIndex || 0;
+        this.messageTotal		= config.messageTotal || 0;
+        this.toUserId			= config.toUserId || 0;
 
-		//	extraArgs can override some config
-		if(_.isObject(options.extraArgs)) {
-			if(options.extraArgs.messageAreaTag) {
-				this.messageAreaTag = options.extraArgs.messageAreaTag;
-			}
-			if(options.extraArgs.messageIndex) {
-				this.messageIndex = options.extraArgs.messageIndex;
-			}
-			if(options.extraArgs.messageTotal) {
-				this.messageTotal = options.extraArgs.messageTotal;
-			}
-			if(options.extraArgs.toUserId) {
-				this.toUserId = options.extraArgs.toUserId;
-			}
-		}
+        //	extraArgs can override some config
+        if(_.isObject(options.extraArgs)) {
+            if(options.extraArgs.messageAreaTag) {
+                this.messageAreaTag = options.extraArgs.messageAreaTag;
+            }
+            if(options.extraArgs.messageIndex) {
+                this.messageIndex = options.extraArgs.messageIndex;
+            }
+            if(options.extraArgs.messageTotal) {
+                this.messageTotal = options.extraArgs.messageTotal;
+            }
+            if(options.extraArgs.toUserId) {
+                this.toUserId = options.extraArgs.toUserId;
+            }
+        }
 
-		this.noUpdateLastReadId = _.get(options, 'extraArgs.noUpdateLastReadId', config.noUpdateLastReadId) || false;
+        this.noUpdateLastReadId = _.get(options, 'extraArgs.noUpdateLastReadId', config.noUpdateLastReadId) || false;
 
-		this.isReady = false;
+        this.isReady = false;
 
-		if(_.has(options, 'extraArgs.message')) {
-			this.setMessage(options.extraArgs.message);
-		} else if(_.has(options, 'extraArgs.replyToMessage')) {
-			this.replyToMessage = options.extraArgs.replyToMessage;
-		}
+        if(_.has(options, 'extraArgs.message')) {
+            this.setMessage(options.extraArgs.message);
+        } else if(_.has(options, 'extraArgs.replyToMessage')) {
+            this.replyToMessage = options.extraArgs.replyToMessage;
+        }
 
-		this.menuMethods = {
-			//
-			//	Validation stuff
-			//
-			viewValidationListener : function(err, cb) {
-				var errMsgView = self.viewControllers.header.getView(MciViewIds.header.errorMsg);
-				var newFocusViewId;
-				if(errMsgView) {
-					if(err) {
-						errMsgView.setText(err.message);
+        this.menuMethods = {
+            //
+            //	Validation stuff
+            //
+            viewValidationListener : function(err, cb) {
+                var errMsgView = self.viewControllers.header.getView(MciViewIds.header.errorMsg);
+                var newFocusViewId;
+                if(errMsgView) {
+                    if(err) {
+                        errMsgView.setText(err.message);
 
-						if(MciViewIds.header.subject === err.view.getId()) {
-							//	:TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
-						}
-					} else {
-						errMsgView.clearText();
-					}
-				}
-				cb(newFocusViewId);
-			},
-			headerSubmit : function(formData, extraArgs, cb) {
-				self.switchToBody();
-				return cb(null);
-			},
-			editModeEscPressed : function(formData, extraArgs, cb) {
-				self.footerMode = 'editor' === self.footerMode ? 'editorMenu' : 'editor';
+                        if(MciViewIds.header.subject === err.view.getId()) {
+                            //	:TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
+                        }
+                    } else {
+                        errMsgView.clearText();
+                    }
+                }
+                cb(newFocusViewId);
+            },
+            headerSubmit : function(formData, extraArgs, cb) {
+                self.switchToBody();
+                return cb(null);
+            },
+            editModeEscPressed : function(formData, extraArgs, cb) {
+                self.footerMode = 'editor' === self.footerMode ? 'editorMenu' : 'editor';
 
-				self.switchFooter(function next(err) {
-					if(err) {
-						return cb(err);
-					}
+                self.switchFooter(function next(err) {
+                    if(err) {
+                        return cb(err);
+                    }
 
-					switch(self.footerMode) {
-						case 'editor' :
-							if(!_.isUndefined(self.viewControllers.footerEditorMenu)) {
-								self.viewControllers.footerEditorMenu.detachClientEvents();
-							}
-							self.viewControllers.body.switchFocus(1);
-							self.observeEditorEvents();
-							break;
+                    switch(self.footerMode) {
+                        case 'editor' :
+                            if(!_.isUndefined(self.viewControllers.footerEditorMenu)) {
+                                self.viewControllers.footerEditorMenu.detachClientEvents();
+                            }
+                            self.viewControllers.body.switchFocus(1);
+                            self.observeEditorEvents();
+                            break;
 
-						case 'editorMenu' :
-							self.viewControllers.body.setFocus(false);
-							self.viewControllers.footerEditorMenu.switchFocus(1);
-							break;
+                        case 'editorMenu' :
+                            self.viewControllers.body.setFocus(false);
+                            self.viewControllers.footerEditorMenu.switchFocus(1);
+                            break;
 
-						default : throw new Error('Unexpected mode');
-					}
+                        default : throw new Error('Unexpected mode');
+                    }
 
-					return cb(null);
-				});
-			},
-			editModeMenuQuote : function(formData, extraArgs, cb) {
-				self.viewControllers.footerEditorMenu.setFocus(false);
-				self.displayQuoteBuilder();
-				return cb(null);
-			},
-			appendQuoteEntry: function(formData, extraArgs, cb) {
-				const quoteMsgView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
+                    return cb(null);
+                });
+            },
+            editModeMenuQuote : function(formData, extraArgs, cb) {
+                self.viewControllers.footerEditorMenu.setFocus(false);
+                self.displayQuoteBuilder();
+                return cb(null);
+            },
+            appendQuoteEntry: function(formData, extraArgs, cb) {
+                const quoteMsgView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
 
-				if(self.newQuoteBlock) {
-					self.newQuoteBlock = false;
+                if(self.newQuoteBlock) {
+                    self.newQuoteBlock = false;
 
-					//	:TODO: If replying to ANSI, add a blank sepration line here
+                    //	:TODO: If replying to ANSI, add a blank sepration line here
 
-					quoteMsgView.addText(self.getQuoteByHeader());
-				}
+                    quoteMsgView.addText(self.getQuoteByHeader());
+                }
 
-				const quoteListView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
-				const quoteText		= quoteListView.getItem(formData.value.quote);
+                const quoteListView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
+                const quoteText		= quoteListView.getItem(formData.value.quote);
 
-				quoteMsgView.addText(quoteText);
+                quoteMsgView.addText(quoteText);
 
-				//
-				//	If this is *not* the last item, advance. Otherwise, do nothing as we
-				//	don't want to jump back to the top and repeat already quoted lines
-				//
-				
-				if(quoteListView.getData() !== quoteListView.getCount() - 1) {
-					quoteListView.focusNext();
-				} else {
-					self.quoteBuilderFinalize();
-				}
+                //
+                //	If this is *not* the last item, advance. Otherwise, do nothing as we
+                //	don't want to jump back to the top and repeat already quoted lines
+                //
 
-				return cb(null);
-			},
-			quoteBuilderEscPressed : function(formData, extraArgs, cb) {
-				self.quoteBuilderFinalize();
-				return cb(null);
-			},
-			/*
+                if(quoteListView.getData() !== quoteListView.getCount() - 1) {
+                    quoteListView.focusNext();
+                } else {
+                    self.quoteBuilderFinalize();
+                }
+
+                return cb(null);
+            },
+            quoteBuilderEscPressed : function(formData, extraArgs, cb) {
+                self.quoteBuilderFinalize();
+                return cb(null);
+            },
+            /*
 			replyDiscard : function(formData, extraArgs) {
 				//	:TODO: need to prompt yes/no
 				//	:TODO: @method for fallback would be better
 				self.prevMenu();
 			},
 			*/
-			editModeMenuHelp : function(formData, extraArgs, cb) {
-				self.viewControllers.footerEditorMenu.setFocus(false);
-				return self.displayHelp(cb);
-			},
-			///////////////////////////////////////////////////////////////////////
-			//	View Mode
-			///////////////////////////////////////////////////////////////////////
-			viewModeMenuHelp : function(formData, extraArgs, cb) {
-				self.viewControllers.footerView.setFocus(false);
-				return self.displayHelp(cb);
-			}
-		};
-	}
-
-	isEditMode() {
-		return 'edit' === this.editorMode;
-	}
-
-	isViewMode() {
-		return 'view' === this.editorMode;
-	}
-
-	isPrivateMail() {
-		return Message.WellKnownAreaTags.Private === this.messageAreaTag;
-	}
-
-	isReply() {
-		return !_.isUndefined(this.replyToMessage);
-	}
-
-	getFooterName() {
-		return 'footer' + _.upperFirst(this.footerMode);	//	e.g. 'footerEditor', 'footerEditorMenu', ...
-	}
-
-	getFormId(name) {
-		return {
-			header				: 0,
-			body				: 1,
-			footerEditor		: 2,
-			footerEditorMenu	: 3,
-			footerView			: 4,
-			quoteBuilder		: 5,
-
-			help				: 50,
-		}[name];
-	}
-
-	getHeaderFormatObj() {
-		const remoteUserNotAvail 	= this.menuConfig.config.remoteUserNotAvail || 'N/A';
-		const localUserIdNotAvail	= this.menuConfig.config.localUserIdNotAvail || 'N/A';
-		const modTimestampFormat	= this.menuConfig.config.modTimestampFormat || this.client.currentTheme.helpers.getDateTimeFormat();
-
-		return {
-			//	:TODO: ensure we show real names for form/to if they are enforced in the area
-			fromUserName		: this.message.fromUserName,
-			toUserName			: this.message.toUserName,
-			//	:TODO:
-			//fromRealName
-			//toRealName
-			fromUserId			: _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
-			toUserId			: _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
-			fromRemoteUser		: _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
-			toRemoteUser		: _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
-			subject				: this.message.subject,
-			modTimestamp		: this.message.modTimestamp.format(modTimestampFormat),
-			msgNum				: this.messageIndex + 1,
-			msgTotal			: this.messageTotal,
-			messageId			: this.message.messageId,
-		};
-	}
-
-	setInitialFooterMode() {
-		switch(this.editorMode) {
-			case 'edit' : this.footerMode = 'editor'; break;
-			case 'view' : this.footerMode = 'view'; break;
-		}
-	}
-
-	buildMessage(cb) {
-		const headerValues = this.viewControllers.header.getFormData().value;
-
-		const msgOpts = {
-			areaTag			: this.messageAreaTag,
-			toUserName		: headerValues.to,
-			fromUserName	: this.client.user.username,
-			subject			: headerValues.subject,
-			//	:TODO: don't hard code 1 here:
-			message			: this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
-		};
-
-		if(this.isReply()) {
-			msgOpts.replyToMsgId	= this.replyToMessage.messageId;
-
-			if(this.replyIsAnsi) {
-				//
-				//	Ensure first characters indicate ANSI for detection down
-				//	the line (other boards/etc.). We also set explicit_encoding
-				//	to packetAnsiMsgEncoding (generally cp437) as various boards
-				//	really don't like ANSI messages in UTF-8 encoding (they should!)
-				//
-				msgOpts.meta		= { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
-				msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
-			}
-		}
-
-		this.message = new Message(msgOpts);
-
-		return cb(null);
-	}
-
-	updateLastReadId(cb) {
-		if(this.noUpdateLastReadId) {
-			return cb(null);
-		}
-
-		return updateMessageAreaLastReadId(
-			this.client.user.userId, this.messageAreaTag, this.message.messageId, cb
-		);
-	}
-
-	setMessage(message) {
-		this.message = message;
-
-		this.updateLastReadId( () => {
-			if(this.isReady) {
-				this.initHeaderViewMode();
-				this.initFooterViewMode();
-
-				const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
-				let msg					= this.message.message;
-
-				if(bodyMessageView && _.has(this, 'message.message')) {
-					//
-					//	We handle ANSI messages differently than standard messages -- this is required as
-					//	we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
-					//	how the author wanted it
-					//
-					if(isAnsi(msg)) {
-						//
-						//	Find tearline - we want to color it differently.
-						//
-						const tearLinePos = this.message.getTearLinePosition(msg);
-
-						if(tearLinePos > -1) {
-							msg = insert(msg, tearLinePos, bodyMessageView.getSGRFor('text'));
-						}
-
-						bodyMessageView.setAnsi(
-							msg.replace(/\r?\n/g, '\r\n'),	//	messages are stored with CRLF -> LF
-							{
-								prepped				: false,
-								forceLineTerm		: true,
-							}
-						);
-					} else {
-						bodyMessageView.setText(cleanControlCodes(msg));
-					}
-				}
-			}
-		});
-	}
-
-	getMessage(cb) {
-		const self = this;
-
-		async.series(
-			[
-				function buildIfNecessary(callback) {
-					if(self.isEditMode()) {
-						return self.buildMessage(callback);	//	creates initial self.message
-					}
-
-					return callback(null);
-				},
-				function populateLocalUserInfo(callback) {					
-					self.message.setLocalFromUserId(self.client.user.userId);
-
-					if(!self.isPrivateMail()) {
-						return callback(null);
-					}
-
-					if(self.toUserId > 0) {
-						self.message.setLocalToUserId(self.toUserId);
-						return callback(null);
-					}
-
-					//
-					//	If the message we're replying to is from a remote user
-					//	don't try to look up the local user ID. Instead, mark the mail
-					//	for export with the remote to address.
-					//
-					if(self.replyToMessage && self.replyToMessage.isFromRemoteUser()) {
-						self.message.setRemoteToUser(self.replyToMessage.meta.System[Message.SystemMetaNames.RemoteFromUser]);
-						self.message.setExternalFlavor(self.replyToMessage.meta.System[Message.SystemMetaNames.ExternalFlavor]);
-						return callback(null);
-					}
-
-					//
-					//	Detect if the user is attempting to send to a remote mail type that we support
-					//
-					//	:TODO: how to plug in support without tying to various types here? isSupportedExteranlType() or such
-					const addressedToInfo = getAddressedToInfo(self.message.toUserName);
-					if(addressedToInfo.name && Message.AddressFlavor.FTN === addressedToInfo.flavor) {
-						self.message.setRemoteToUser(addressedToInfo.remote);
-						self.message.setExternalFlavor(addressedToInfo.flavor);
-						self.message.toUserName = addressedToInfo.name;
-						return callback(null);
-					}
-
-					//	we need to look it up
-					User.getUserIdAndNameByLookup(self.message.toUserName, (err, toUserId) => {
-						if(err) {
-							return callback(err);
-						}
-
-						self.message.setLocalToUserId(toUserId);
-						return callback(null);
-					});
-				}
-			],
-			err => {
-				return cb(err, self.message);
-			}
-		);
-	}
-
-	updateUserStats(cb) {
-		if(Message.isPrivateAreaTag(this.message.areaTag)) {
-			if(cb) {
-				cb(null);
-			}
-			return;	//	don't inc stats for private messages
-		}
-
-		return StatLog.incrementUserStat(this.client.user, 'post_count', 1, cb);
-	}
-
-	redrawFooter(options, cb) {
-		const self = this;
-
-		async.waterfall(
-			[
-				function moveToFooterPosition(callback) {
-					//
-					//	Calculate footer starting position
-					//
-					//	row = (header height + body height)
-					//
-					var footerRow = self.header.height + self.body.height;
-					self.client.term.rawWrite(ansi.goto(footerRow, 1));
-					callback(null);
-				},
-				function clearFooterArea(callback) {
-					if(options.clear) {
-						//	footer up to 3 rows in height
-
-						//	:TODO: We'd like to delete up to N rows, but this does not work
-						//	in NetRunner:
-						self.client.term.rawWrite(ansi.reset() + ansi.deleteLine(3));
-
-						self.client.term.rawWrite(ansi.reset() + ansi.eraseLine(2));
-					}
-					callback(null);
-				},
-				function displayFooterArt(callback) {
-					const footerArt = self.menuConfig.config.art[options.footerName];
-
-					theme.displayThemedAsset(
-						footerArt,
-						self.client,
-						{ font : self.menuConfig.font },
-						function displayed(err, artData) {
-							callback(err, artData);
-						}
-					);
-				}
-			],
-			function complete(err, artData) {
-				cb(err, artData);
-			}
-		);
-	}
-
-	redrawScreen(cb) {
-		var comps	= [ 'header', 'body' ];
-		const self	= this;
-		var art		= self.menuConfig.config.art;
-
-		self.client.term.rawWrite(ansi.resetScreen());
-
-		async.series(
-			[
-				function displayHeaderAndBody(callback) {
-					async.eachSeries( comps, function dispArt(n, next) {
-						theme.displayThemedAsset(
-							art[n],
-							self.client,
-							{ font : self.menuConfig.font, acsCondMember : 'art' },
-							function displayed(err) {
-								next(err);
-							}
-						);
-					}, function complete(err) {
-						//self.body.height = self.client.term.termHeight - self.header.height - 1;
-						callback(err);
-					});
-				},
-				function displayFooter(callback) {
-					//	we have to treat the footer special
-					self.redrawFooter( { clear : false, footerName : self.getFooterName() }, function footerDisplayed(err) {
-						callback(err);
-					});
-				},
-				function refreshViews(callback) {
-					comps.push(self.getFooterName());
-
-					comps.forEach(function artComp(n) {
-						self.viewControllers[n].redrawAll();
-					});
-
-					callback(null);
-				}
-			],
-			function complete(err) {
-				cb(err);
-			}
-		);
-	}
-
-	switchFooter(cb) {
-		var footerName = this.getFooterName();
-
-		this.redrawFooter( { footerName : footerName, clear : true }, (err, artData) => {
-			if(err) {
-				cb(err);
-				return;
-			}
-
-			var formId = this.getFormId(footerName);
-
-			if(_.isUndefined(this.viewControllers[footerName])) {
-				var menuLoadOpts = {
-					callingMenu	: this,
-					formId		: formId,
-					mciMap		: artData.mciMap
-				};
-
-				this.addViewController(
-					footerName,
-					new ViewController( { client : this.client, formId : formId } )
-				).loadFromMenuConfig(menuLoadOpts, err => {
-					cb(err);
-				});
-			} else {
-				this.viewControllers[footerName].redrawAll();
-				cb(null);
-			}
-		});
-	}
-
-	initSequence() {
-		var mciData = { };
-		const self	= this;
-		var art		= self.menuConfig.config.art;
-
-		assert(_.isObject(art));
-
-		async.series(
-			[
-				function beforeDisplayArt(callback) {
-					self.beforeArt(callback);
-				},
-				function displayHeaderAndBodyArt(callback) {
-					async.eachSeries( [ 'header', 'body' ], function dispArt(n, next) {
-						theme.displayThemedAsset(
-							art[n],
-							self.client,
-							{ font : self.menuConfig.font, acsCondMember : 'art' },
-							function displayed(err, artData) {
-								if(artData) {
-									mciData[n] = artData;
-									self[n] = { height : artData.height };
-								}
-
-								next(err);
-							}
-						);
-					}, function complete(err) {
-						callback(err);
-					});
-				},
-				function displayFooter(callback) {
-					self.setInitialFooterMode();
-
-					var footerName = self.getFooterName();
-
-					self.redrawFooter( { footerName : footerName }, function artDisplayed(err, artData) {
-						mciData[footerName] = artData;
-						callback(err);
-					});
-				},
-				function afterArtDisplayed(callback) {
-					self.mciReady(mciData, callback);
-				}
-			],
-			function complete(err) {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'FSE init error');
-				} else {
-					self.isReady = true;
-					self.finishedLoading();
-				}
-			}
-		);
-	}
-
-	createInitialViews(mciData, cb) {
-		const self = this;
-		var menuLoadOpts = { callingMenu : self };
-
-		async.series(
-			[
-				function header(callback) {
-					menuLoadOpts.formId = self.getFormId('header');
-					menuLoadOpts.mciMap	= mciData.header.mciMap;
-
-					self.addViewController(
-						'header',
-						new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
-					).loadFromMenuConfig(menuLoadOpts, function headerReady(err) {
-						callback(err);
-					});
-				},
-				function body(callback) {
-					menuLoadOpts.formId	= self.getFormId('body');
-					menuLoadOpts.mciMap	= mciData.body.mciMap;
-
-					self.addViewController(
-						'body',
-						new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
-					).loadFromMenuConfig(menuLoadOpts, function bodyReady(err) {
-						callback(err);
-					});
-				},
-				function footer(callback) {
-					var footerName = self.getFooterName();
-
-					menuLoadOpts.formId = self.getFormId(footerName);
-					menuLoadOpts.mciMap = mciData[footerName].mciMap;
-
-					self.addViewController(
-						footerName,
-						new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
-					).loadFromMenuConfig(menuLoadOpts, function footerReady(err) {
-						callback(err);
-					});
-				},
-				function prepareViewStates(callback) {
-					var header = self.viewControllers.header;
-					var from = header.getView(MciViewIds.header.from);
-					from.acceptsFocus = false;
-					//from.setText(self.client.user.username);
-
-					//	:TODO: make this a method
-					var body = self.viewControllers.body.getView(MciViewIds.body.message);
-					self.updateTextEditMode(body.getTextEditMode());
-					self.updateEditModePosition(body.getEditPosition());
-
-					//	:TODO: If view mode, set body to read only... which needs an impl...
-
-					callback(null);
-				},
-				function setInitialData(callback) {
-
-					switch(self.editorMode) {
-						case 'view' :
-							if(self.message) {
-								self.initHeaderViewMode();
-								self.initFooterViewMode();
-
-								var bodyMessageView = self.viewControllers.body.getView(MciViewIds.body.message);
-								if(bodyMessageView && _.has(self, 'message.message')) {
-									//self.setBodyMessageViewText();
-									bodyMessageView.setText(cleanControlCodes(self.message.message));
-								}
-							}
-							break;
-
-						case 'edit' :
-							{
-								const fromView = self.viewControllers.header.getView(MciViewIds.header.from);
-								const area = getMessageAreaByTag(self.messageAreaTag);
-								if(area && area.realNames) {
-									fromView.setText(self.client.user.properties.real_name || self.client.user.username);
-								} else {
-									fromView.setText(self.client.user.username);
-								}
-
-								if(self.replyToMessage) {
-									self.initHeaderReplyEditMode();
-								}
-							}
-							break;
-					}
-
-					callback(null);
-				},
-				function setInitialFocus(callback) {
-
-					switch(self.editorMode) {
-						case 'edit' :
-							self.switchToHeader();
-							break;
-
-						case 'view' :
-							self.switchToFooter();
-							//self.observeViewPosition();
-							break;
-					}
-
-					callback(null);
-				}
-			],
-			function complete(err) {
-				return cb(err);
-			}
-		);
-	}
-
-	mciReadyHandler(mciData, cb) {
-
-		this.createInitialViews(mciData, err => {
-			//	:TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in
-			//	place - if this is for existing usernames else validate spec
-
-			/*
+            editModeMenuHelp : function(formData, extraArgs, cb) {
+                self.viewControllers.footerEditorMenu.setFocus(false);
+                return self.displayHelp(cb);
+            },
+            ///////////////////////////////////////////////////////////////////////
+            //	View Mode
+            ///////////////////////////////////////////////////////////////////////
+            viewModeMenuHelp : function(formData, extraArgs, cb) {
+                self.viewControllers.footerView.setFocus(false);
+                return self.displayHelp(cb);
+            }
+        };
+    }
+
+    isEditMode() {
+        return 'edit' === this.editorMode;
+    }
+
+    isViewMode() {
+        return 'view' === this.editorMode;
+    }
+
+    isPrivateMail() {
+        return Message.WellKnownAreaTags.Private === this.messageAreaTag;
+    }
+
+    isReply() {
+        return !_.isUndefined(this.replyToMessage);
+    }
+
+    getFooterName() {
+        return 'footer' + _.upperFirst(this.footerMode);	//	e.g. 'footerEditor', 'footerEditorMenu', ...
+    }
+
+    getFormId(name) {
+        return {
+            header				: 0,
+            body				: 1,
+            footerEditor		: 2,
+            footerEditorMenu	: 3,
+            footerView			: 4,
+            quoteBuilder		: 5,
+
+            help				: 50,
+        }[name];
+    }
+
+    getHeaderFormatObj() {
+        const remoteUserNotAvail 	= this.menuConfig.config.remoteUserNotAvail || 'N/A';
+        const localUserIdNotAvail	= this.menuConfig.config.localUserIdNotAvail || 'N/A';
+        const modTimestampFormat	= this.menuConfig.config.modTimestampFormat || this.client.currentTheme.helpers.getDateTimeFormat();
+
+        return {
+            //	:TODO: ensure we show real names for form/to if they are enforced in the area
+            fromUserName		: this.message.fromUserName,
+            toUserName			: this.message.toUserName,
+            //	:TODO:
+            //fromRealName
+            //toRealName
+            fromUserId			: _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
+            toUserId			: _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
+            fromRemoteUser		: _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
+            toRemoteUser		: _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
+            subject				: this.message.subject,
+            modTimestamp		: this.message.modTimestamp.format(modTimestampFormat),
+            msgNum				: this.messageIndex + 1,
+            msgTotal			: this.messageTotal,
+            messageId			: this.message.messageId,
+        };
+    }
+
+    setInitialFooterMode() {
+        switch(this.editorMode) {
+            case 'edit' : this.footerMode = 'editor'; break;
+            case 'view' : this.footerMode = 'view'; break;
+        }
+    }
+
+    buildMessage(cb) {
+        const headerValues = this.viewControllers.header.getFormData().value;
+
+        const msgOpts = {
+            areaTag			: this.messageAreaTag,
+            toUserName		: headerValues.to,
+            fromUserName	: this.client.user.username,
+            subject			: headerValues.subject,
+            //	:TODO: don't hard code 1 here:
+            message			: this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
+        };
+
+        if(this.isReply()) {
+            msgOpts.replyToMsgId	= this.replyToMessage.messageId;
+
+            if(this.replyIsAnsi) {
+                //
+                //	Ensure first characters indicate ANSI for detection down
+                //	the line (other boards/etc.). We also set explicit_encoding
+                //	to packetAnsiMsgEncoding (generally cp437) as various boards
+                //	really don't like ANSI messages in UTF-8 encoding (they should!)
+                //
+                msgOpts.meta		= { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
+                msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
+            }
+        }
+
+        this.message = new Message(msgOpts);
+
+        return cb(null);
+    }
+
+    updateLastReadId(cb) {
+        if(this.noUpdateLastReadId) {
+            return cb(null);
+        }
+
+        return updateMessageAreaLastReadId(
+            this.client.user.userId, this.messageAreaTag, this.message.messageId, cb
+        );
+    }
+
+    setMessage(message) {
+        this.message = message;
+
+        this.updateLastReadId( () => {
+            if(this.isReady) {
+                this.initHeaderViewMode();
+                this.initFooterViewMode();
+
+                const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
+                let msg					= this.message.message;
+
+                if(bodyMessageView && _.has(this, 'message.message')) {
+                    //
+                    //	We handle ANSI messages differently than standard messages -- this is required as
+                    //	we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
+                    //	how the author wanted it
+                    //
+                    if(isAnsi(msg)) {
+                        //
+                        //	Find tearline - we want to color it differently.
+                        //
+                        const tearLinePos = this.message.getTearLinePosition(msg);
+
+                        if(tearLinePos > -1) {
+                            msg = insert(msg, tearLinePos, bodyMessageView.getSGRFor('text'));
+                        }
+
+                        bodyMessageView.setAnsi(
+                            msg.replace(/\r?\n/g, '\r\n'),	//	messages are stored with CRLF -> LF
+                            {
+                                prepped				: false,
+                                forceLineTerm		: true,
+                            }
+                        );
+                    } else {
+                        bodyMessageView.setText(cleanControlCodes(msg));
+                    }
+                }
+            }
+        });
+    }
+
+    getMessage(cb) {
+        const self = this;
+
+        async.series(
+            [
+                function buildIfNecessary(callback) {
+                    if(self.isEditMode()) {
+                        return self.buildMessage(callback);	//	creates initial self.message
+                    }
+
+                    return callback(null);
+                },
+                function populateLocalUserInfo(callback) {
+                    self.message.setLocalFromUserId(self.client.user.userId);
+
+                    if(!self.isPrivateMail()) {
+                        return callback(null);
+                    }
+
+                    if(self.toUserId > 0) {
+                        self.message.setLocalToUserId(self.toUserId);
+                        return callback(null);
+                    }
+
+                    //
+                    //	If the message we're replying to is from a remote user
+                    //	don't try to look up the local user ID. Instead, mark the mail
+                    //	for export with the remote to address.
+                    //
+                    if(self.replyToMessage && self.replyToMessage.isFromRemoteUser()) {
+                        self.message.setRemoteToUser(self.replyToMessage.meta.System[Message.SystemMetaNames.RemoteFromUser]);
+                        self.message.setExternalFlavor(self.replyToMessage.meta.System[Message.SystemMetaNames.ExternalFlavor]);
+                        return callback(null);
+                    }
+
+                    //
+                    //	Detect if the user is attempting to send to a remote mail type that we support
+                    //
+                    //	:TODO: how to plug in support without tying to various types here? isSupportedExteranlType() or such
+                    const addressedToInfo = getAddressedToInfo(self.message.toUserName);
+                    if(addressedToInfo.name && Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+                        self.message.setRemoteToUser(addressedToInfo.remote);
+                        self.message.setExternalFlavor(addressedToInfo.flavor);
+                        self.message.toUserName = addressedToInfo.name;
+                        return callback(null);
+                    }
+
+                    //	we need to look it up
+                    User.getUserIdAndNameByLookup(self.message.toUserName, (err, toUserId) => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        self.message.setLocalToUserId(toUserId);
+                        return callback(null);
+                    });
+                }
+            ],
+            err => {
+                return cb(err, self.message);
+            }
+        );
+    }
+
+    updateUserStats(cb) {
+        if(Message.isPrivateAreaTag(this.message.areaTag)) {
+            if(cb) {
+                cb(null);
+            }
+            return;	//	don't inc stats for private messages
+        }
+
+        return StatLog.incrementUserStat(this.client.user, 'post_count', 1, cb);
+    }
+
+    redrawFooter(options, cb) {
+        const self = this;
+
+        async.waterfall(
+            [
+                function moveToFooterPosition(callback) {
+                    //
+                    //	Calculate footer starting position
+                    //
+                    //	row = (header height + body height)
+                    //
+                    var footerRow = self.header.height + self.body.height;
+                    self.client.term.rawWrite(ansi.goto(footerRow, 1));
+                    callback(null);
+                },
+                function clearFooterArea(callback) {
+                    if(options.clear) {
+                        //	footer up to 3 rows in height
+
+                        //	:TODO: We'd like to delete up to N rows, but this does not work
+                        //	in NetRunner:
+                        self.client.term.rawWrite(ansi.reset() + ansi.deleteLine(3));
+
+                        self.client.term.rawWrite(ansi.reset() + ansi.eraseLine(2));
+                    }
+                    callback(null);
+                },
+                function displayFooterArt(callback) {
+                    const footerArt = self.menuConfig.config.art[options.footerName];
+
+                    theme.displayThemedAsset(
+                        footerArt,
+                        self.client,
+                        { font : self.menuConfig.font },
+                        function displayed(err, artData) {
+                            callback(err, artData);
+                        }
+                    );
+                }
+            ],
+            function complete(err, artData) {
+                cb(err, artData);
+            }
+        );
+    }
+
+    redrawScreen(cb) {
+        var comps	= [ 'header', 'body' ];
+        const self	= this;
+        var art		= self.menuConfig.config.art;
+
+        self.client.term.rawWrite(ansi.resetScreen());
+
+        async.series(
+            [
+                function displayHeaderAndBody(callback) {
+                    async.eachSeries( comps, function dispArt(n, next) {
+                        theme.displayThemedAsset(
+                            art[n],
+                            self.client,
+                            { font : self.menuConfig.font, acsCondMember : 'art' },
+                            function displayed(err) {
+                                next(err);
+                            }
+                        );
+                    }, function complete(err) {
+                        //self.body.height = self.client.term.termHeight - self.header.height - 1;
+                        callback(err);
+                    });
+                },
+                function displayFooter(callback) {
+                    //	we have to treat the footer special
+                    self.redrawFooter( { clear : false, footerName : self.getFooterName() }, function footerDisplayed(err) {
+                        callback(err);
+                    });
+                },
+                function refreshViews(callback) {
+                    comps.push(self.getFooterName());
+
+                    comps.forEach(function artComp(n) {
+                        self.viewControllers[n].redrawAll();
+                    });
+
+                    callback(null);
+                }
+            ],
+            function complete(err) {
+                cb(err);
+            }
+        );
+    }
+
+    switchFooter(cb) {
+        var footerName = this.getFooterName();
+
+        this.redrawFooter( { footerName : footerName, clear : true }, (err, artData) => {
+            if(err) {
+                cb(err);
+                return;
+            }
+
+            var formId = this.getFormId(footerName);
+
+            if(_.isUndefined(this.viewControllers[footerName])) {
+                var menuLoadOpts = {
+                    callingMenu	: this,
+                    formId		: formId,
+                    mciMap		: artData.mciMap
+                };
+
+                this.addViewController(
+                    footerName,
+                    new ViewController( { client : this.client, formId : formId } )
+                ).loadFromMenuConfig(menuLoadOpts, err => {
+                    cb(err);
+                });
+            } else {
+                this.viewControllers[footerName].redrawAll();
+                cb(null);
+            }
+        });
+    }
+
+    initSequence() {
+        var mciData = { };
+        const self	= this;
+        var art		= self.menuConfig.config.art;
+
+        assert(_.isObject(art));
+
+        async.series(
+            [
+                function beforeDisplayArt(callback) {
+                    self.beforeArt(callback);
+                },
+                function displayHeaderAndBodyArt(callback) {
+                    async.eachSeries( [ 'header', 'body' ], function dispArt(n, next) {
+                        theme.displayThemedAsset(
+                            art[n],
+                            self.client,
+                            { font : self.menuConfig.font, acsCondMember : 'art' },
+                            function displayed(err, artData) {
+                                if(artData) {
+                                    mciData[n] = artData;
+                                    self[n] = { height : artData.height };
+                                }
+
+                                next(err);
+                            }
+                        );
+                    }, function complete(err) {
+                        callback(err);
+                    });
+                },
+                function displayFooter(callback) {
+                    self.setInitialFooterMode();
+
+                    var footerName = self.getFooterName();
+
+                    self.redrawFooter( { footerName : footerName }, function artDisplayed(err, artData) {
+                        mciData[footerName] = artData;
+                        callback(err);
+                    });
+                },
+                function afterArtDisplayed(callback) {
+                    self.mciReady(mciData, callback);
+                }
+            ],
+            function complete(err) {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'FSE init error');
+                } else {
+                    self.isReady = true;
+                    self.finishedLoading();
+                }
+            }
+        );
+    }
+
+    createInitialViews(mciData, cb) {
+        const self = this;
+        var menuLoadOpts = { callingMenu : self };
+
+        async.series(
+            [
+                function header(callback) {
+                    menuLoadOpts.formId = self.getFormId('header');
+                    menuLoadOpts.mciMap	= mciData.header.mciMap;
+
+                    self.addViewController(
+                        'header',
+                        new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
+                    ).loadFromMenuConfig(menuLoadOpts, function headerReady(err) {
+                        callback(err);
+                    });
+                },
+                function body(callback) {
+                    menuLoadOpts.formId	= self.getFormId('body');
+                    menuLoadOpts.mciMap	= mciData.body.mciMap;
+
+                    self.addViewController(
+                        'body',
+                        new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
+                    ).loadFromMenuConfig(menuLoadOpts, function bodyReady(err) {
+                        callback(err);
+                    });
+                },
+                function footer(callback) {
+                    var footerName = self.getFooterName();
+
+                    menuLoadOpts.formId = self.getFormId(footerName);
+                    menuLoadOpts.mciMap = mciData[footerName].mciMap;
+
+                    self.addViewController(
+                        footerName,
+                        new ViewController( { client : self.client, formId : menuLoadOpts.formId } )
+                    ).loadFromMenuConfig(menuLoadOpts, function footerReady(err) {
+                        callback(err);
+                    });
+                },
+                function prepareViewStates(callback) {
+                    var header = self.viewControllers.header;
+                    var from = header.getView(MciViewIds.header.from);
+                    from.acceptsFocus = false;
+                    //from.setText(self.client.user.username);
+
+                    //	:TODO: make this a method
+                    var body = self.viewControllers.body.getView(MciViewIds.body.message);
+                    self.updateTextEditMode(body.getTextEditMode());
+                    self.updateEditModePosition(body.getEditPosition());
+
+                    //	:TODO: If view mode, set body to read only... which needs an impl...
+
+                    callback(null);
+                },
+                function setInitialData(callback) {
+
+                    switch(self.editorMode) {
+                        case 'view' :
+                            if(self.message) {
+                                self.initHeaderViewMode();
+                                self.initFooterViewMode();
+
+                                var bodyMessageView = self.viewControllers.body.getView(MciViewIds.body.message);
+                                if(bodyMessageView && _.has(self, 'message.message')) {
+                                    //self.setBodyMessageViewText();
+                                    bodyMessageView.setText(cleanControlCodes(self.message.message));
+                                }
+                            }
+                            break;
+
+                        case 'edit' :
+                            {
+                                const fromView = self.viewControllers.header.getView(MciViewIds.header.from);
+                                const area = getMessageAreaByTag(self.messageAreaTag);
+                                if(area && area.realNames) {
+                                    fromView.setText(self.client.user.properties.real_name || self.client.user.username);
+                                } else {
+                                    fromView.setText(self.client.user.username);
+                                }
+
+                                if(self.replyToMessage) {
+                                    self.initHeaderReplyEditMode();
+                                }
+                            }
+                            break;
+                    }
+
+                    callback(null);
+                },
+                function setInitialFocus(callback) {
+
+                    switch(self.editorMode) {
+                        case 'edit' :
+                            self.switchToHeader();
+                            break;
+
+                        case 'view' :
+                            self.switchToFooter();
+                            //self.observeViewPosition();
+                            break;
+                    }
+
+                    callback(null);
+                }
+            ],
+            function complete(err) {
+                return cb(err);
+            }
+        );
+    }
+
+    mciReadyHandler(mciData, cb) {
+
+        this.createInitialViews(mciData, err => {
+            //	:TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in
+            //	place - if this is for existing usernames else validate spec
+
+            /*
 			self.viewControllers.header.on('leave', function headerViewLeave(view) {
 
 				if(2 === view.id) {	//	"to" field
@@ -784,181 +784,181 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 				}
 			});*/
 
-			cb(err);
-		});
-	}
+            cb(err);
+        });
+    }
 
-	updateEditModePosition(pos) {
-		if(this.isEditMode()) {
-			var posView = this.viewControllers.footerEditor.getView(1);
-			if(posView) {
-				this.client.term.rawWrite(ansi.savePos());
-				//	:TODO: Use new formatting techniques here, e.g. state.cursorPositionRow, cursorPositionCol and cursorPositionFormat
-				posView.setText(_.padStart(String(pos.row + 1), 2, '0') + ',' + _.padEnd(String(pos.col + 1), 2, '0'));
-				this.client.term.rawWrite(ansi.restorePos());
-			}
-		}
-	}
+    updateEditModePosition(pos) {
+        if(this.isEditMode()) {
+            var posView = this.viewControllers.footerEditor.getView(1);
+            if(posView) {
+                this.client.term.rawWrite(ansi.savePos());
+                //	:TODO: Use new formatting techniques here, e.g. state.cursorPositionRow, cursorPositionCol and cursorPositionFormat
+                posView.setText(_.padStart(String(pos.row + 1), 2, '0') + ',' + _.padEnd(String(pos.col + 1), 2, '0'));
+                this.client.term.rawWrite(ansi.restorePos());
+            }
+        }
+    }
 
-	updateTextEditMode(mode) {
-		if(this.isEditMode()) {
-			var modeView = this.viewControllers.footerEditor.getView(2);
-			if(modeView) {
-				this.client.term.rawWrite(ansi.savePos());
-				modeView.setText('insert' === mode ? 'INS' : 'OVR');
-				this.client.term.rawWrite(ansi.restorePos());
-			}
-		}
-	}
+    updateTextEditMode(mode) {
+        if(this.isEditMode()) {
+            var modeView = this.viewControllers.footerEditor.getView(2);
+            if(modeView) {
+                this.client.term.rawWrite(ansi.savePos());
+                modeView.setText('insert' === mode ? 'INS' : 'OVR');
+                this.client.term.rawWrite(ansi.restorePos());
+            }
+        }
+    }
 
-	setHeaderText(id, text) {
-		this.setViewText('header', id, text);
-	}
+    setHeaderText(id, text) {
+        this.setViewText('header', id, text);
+    }
 
-	initHeaderViewMode() {
-		this.setHeaderText(MciViewIds.header.from,			this.message.fromUserName);
-		this.setHeaderText(MciViewIds.header.to,			this.message.toUserName);
-		this.setHeaderText(MciViewIds.header.subject,		this.message.subject);
-		this.setHeaderText(MciViewIds.header.modTimestamp,	moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
-		this.setHeaderText(MciViewIds.header.msgNum,		(this.messageIndex + 1).toString());
-		this.setHeaderText(MciViewIds.header.msgTotal,		this.messageTotal.toString());
+    initHeaderViewMode() {
+        this.setHeaderText(MciViewIds.header.from,			this.message.fromUserName);
+        this.setHeaderText(MciViewIds.header.to,			this.message.toUserName);
+        this.setHeaderText(MciViewIds.header.subject,		this.message.subject);
+        this.setHeaderText(MciViewIds.header.modTimestamp,	moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
+        this.setHeaderText(MciViewIds.header.msgNum,		(this.messageIndex + 1).toString());
+        this.setHeaderText(MciViewIds.header.msgTotal,		this.messageTotal.toString());
 
-		this.updateCustomViewTextsWithFilter('header', MciViewIds.header.customRangeStart, this.getHeaderFormatObj());
+        this.updateCustomViewTextsWithFilter('header', MciViewIds.header.customRangeStart, this.getHeaderFormatObj());
 
-		//	if we changed conf/area we need to update any related standard MCI view
-		this.refreshPredefinedMciViewsByCode('header', [ 'MA', 'MC', 'ML', 'CM' ] );
-	}
+        //	if we changed conf/area we need to update any related standard MCI view
+        this.refreshPredefinedMciViewsByCode('header', [ 'MA', 'MC', 'ML', 'CM' ] );
+    }
 
-	initHeaderReplyEditMode() {
-		assert(_.isObject(this.replyToMessage));
+    initHeaderReplyEditMode() {
+        assert(_.isObject(this.replyToMessage));
 
-		this.setHeaderText(MciViewIds.header.to, this.replyToMessage.fromUserName);
+        this.setHeaderText(MciViewIds.header.to, this.replyToMessage.fromUserName);
 
-		//
-		//	We want to prefix the subject with "RE: " only if it's not already
-		//	that way -- avoid RE: RE: RE: RE: ...
-		//
-		let newSubj = this.replyToMessage.subject;
-		if(false === /^RE:\s+/i.test(newSubj)) {
-			newSubj = `RE: ${newSubj}`;
-		}
+        //
+        //	We want to prefix the subject with "RE: " only if it's not already
+        //	that way -- avoid RE: RE: RE: RE: ...
+        //
+        let newSubj = this.replyToMessage.subject;
+        if(false === /^RE:\s+/i.test(newSubj)) {
+            newSubj = `RE: ${newSubj}`;
+        }
 
-		this.setHeaderText(MciViewIds.header.subject,	newSubj);
-	}
+        this.setHeaderText(MciViewIds.header.subject,	newSubj);
+    }
 
-	initFooterViewMode() {
-		this.setViewText('footerView', MciViewIds.ViewModeFooter.msgNum, (this.messageIndex + 1).toString() );
-		this.setViewText('footerView', MciViewIds.ViewModeFooter.msgTotal, this.messageTotal.toString() );
-	}
+    initFooterViewMode() {
+        this.setViewText('footerView', MciViewIds.ViewModeFooter.msgNum, (this.messageIndex + 1).toString() );
+        this.setViewText('footerView', MciViewIds.ViewModeFooter.msgTotal, this.messageTotal.toString() );
+    }
 
-	displayHelp(cb) {
-		this.client.term.rawWrite(ansi.resetScreen());
+    displayHelp(cb) {
+        this.client.term.rawWrite(ansi.resetScreen());
 
-		theme.displayThemeArt(
-			{ name : this.menuConfig.config.art.help, client : this.client },
-			() => {
-				this.client.waitForKeyPress( () => {
-					this.redrawScreen( () => {
-						this.viewControllers[this.getFooterName()].setFocus(true);
-						return cb(null);
-					});
-				});
-			}
-		);
-	}
+        theme.displayThemeArt(
+            { name : this.menuConfig.config.art.help, client : this.client },
+            () => {
+                this.client.waitForKeyPress( () => {
+                    this.redrawScreen( () => {
+                        this.viewControllers[this.getFooterName()].setFocus(true);
+                        return cb(null);
+                    });
+                });
+            }
+        );
+    }
 
-	displayQuoteBuilder() {
-		//
-		//	Clear body area
-		//
-		this.newQuoteBlock = true;
-		const self = this;
+    displayQuoteBuilder() {
+        //
+        //	Clear body area
+        //
+        this.newQuoteBlock = true;
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					//	:TODO: NetRunner does NOT support delete line, so this does not work:
-					self.client.term.rawWrite(
-						ansi.goto(self.header.height + 1, 1) +
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    //	:TODO: NetRunner does NOT support delete line, so this does not work:
+                    self.client.term.rawWrite(
+                        ansi.goto(self.header.height + 1, 1) +
 						ansi.deleteLine((self.client.term.termHeight - self.header.height) - 1));
 
-					theme.displayThemeArt( { name : self.menuConfig.config.art.quote, client : self.client }, function displayed(err, artData) {
-						callback(err, artData);
-					});
-				},
-				function createViewsIfNecessary(artData, callback) {
-					var formId = self.getFormId('quoteBuilder');
+                    theme.displayThemeArt( { name : self.menuConfig.config.art.quote, client : self.client }, function displayed(err, artData) {
+                        callback(err, artData);
+                    });
+                },
+                function createViewsIfNecessary(artData, callback) {
+                    var formId = self.getFormId('quoteBuilder');
 
-					if(_.isUndefined(self.viewControllers.quoteBuilder)) {
-						var menuLoadOpts = {
-							callingMenu	: self,
-							formId		: formId,
-							mciMap		: artData.mciMap,
-						};
+                    if(_.isUndefined(self.viewControllers.quoteBuilder)) {
+                        var menuLoadOpts = {
+                            callingMenu	: self,
+                            formId		: formId,
+                            mciMap		: artData.mciMap,
+                        };
 
-						self.addViewController(
-							'quoteBuilder',
-							new ViewController( { client : self.client, formId : formId } )
-						).loadFromMenuConfig(menuLoadOpts, function quoteViewsReady(err) {
-							callback(err);
-						});
-					} else {
-						self.viewControllers.quoteBuilder.redrawAll();
-						callback(null);
-					}
-				},
-				function loadQuoteLines(callback) {
-					const quoteView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
-					const bodyView	= self.viewControllers.body.getView(MciViewIds.body.message);
+                        self.addViewController(
+                            'quoteBuilder',
+                            new ViewController( { client : self.client, formId : formId } )
+                        ).loadFromMenuConfig(menuLoadOpts, function quoteViewsReady(err) {
+                            callback(err);
+                        });
+                    } else {
+                        self.viewControllers.quoteBuilder.redrawAll();
+                        callback(null);
+                    }
+                },
+                function loadQuoteLines(callback) {
+                    const quoteView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
+                    const bodyView	= self.viewControllers.body.getView(MciViewIds.body.message);
 
-					self.replyToMessage.getQuoteLines(
-						{
-							termWidth			: self.client.term.termWidth,
-							termHeight			: self.client.term.termHeight,
-							cols				: quoteView.dimens.width,
-							startCol			: quoteView.position.col,
-							ansiResetSgr		: bodyView.styleSGR1,
-							ansiFocusPrefixSgr	: quoteView.styleSGR2,
-						},
-						(err, quoteLines, focusQuoteLines, replyIsAnsi) => {
-							if(err) {
-								return callback(err);
-							}
+                    self.replyToMessage.getQuoteLines(
+                        {
+                            termWidth			: self.client.term.termWidth,
+                            termHeight			: self.client.term.termHeight,
+                            cols				: quoteView.dimens.width,
+                            startCol			: quoteView.position.col,
+                            ansiResetSgr		: bodyView.styleSGR1,
+                            ansiFocusPrefixSgr	: quoteView.styleSGR2,
+                        },
+                        (err, quoteLines, focusQuoteLines, replyIsAnsi) => {
+                            if(err) {
+                                return callback(err);
+                            }
 
-							self.replyIsAnsi = replyIsAnsi;
+                            self.replyIsAnsi = replyIsAnsi;
 
-							quoteView.setItems(quoteLines);
-							quoteView.setFocusItems(focusQuoteLines);
+                            quoteView.setItems(quoteLines);
+                            quoteView.setFocusItems(focusQuoteLines);
 
-							self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg).setFocus(false);
-							self.viewControllers.quoteBuilder.switchFocus(MciViewIds.quoteBuilder.quoteLines);
+                            self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg).setFocus(false);
+                            self.viewControllers.quoteBuilder.switchFocus(MciViewIds.quoteBuilder.quoteLines);
 
-							return callback(null);
-						}
-					);
-				},
-			],
-			function complete(err) {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'Error displaying quote builder');
-				}
-			}
-		);
-	}
+                            return callback(null);
+                        }
+                    );
+                },
+            ],
+            function complete(err) {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'Error displaying quote builder');
+                }
+            }
+        );
+    }
 
-	observeEditorEvents() {
-		const bodyView = this.viewControllers.body.getView(MciViewIds.body.message);
+    observeEditorEvents() {
+        const bodyView = this.viewControllers.body.getView(MciViewIds.body.message);
 
-		bodyView.on('edit position', pos => {
-			this.updateEditModePosition(pos);
-		});
+        bodyView.on('edit position', pos => {
+            this.updateEditModePosition(pos);
+        });
 
-		bodyView.on('text edit mode', mode => {
-			this.updateTextEditMode(mode);
-		});
-	}
+        bodyView.on('text edit mode', mode => {
+            this.updateTextEditMode(mode);
+        });
+    }
 
-	/*
+    /*
 	this.observeViewPosition = function() {
 		self.viewControllers.body.getView(MciViewIds.body.message).on('edit position', function positionUpdate(pos) {
 			console.log(pos.percent + ' / ' + pos.below)
@@ -966,93 +966,93 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 	};
 	*/
 
-	switchToHeader() {
-		this.viewControllers.body.setFocus(false);
-		this.viewControllers.header.switchFocus(2);	//	to
-	}
+    switchToHeader() {
+        this.viewControllers.body.setFocus(false);
+        this.viewControllers.header.switchFocus(2);	//	to
+    }
 
-	switchToBody() {
-		this.viewControllers.header.setFocus(false);
-		this.viewControllers.body.switchFocus(1);
+    switchToBody() {
+        this.viewControllers.header.setFocus(false);
+        this.viewControllers.body.switchFocus(1);
 
-		this.observeEditorEvents();
-	}
+        this.observeEditorEvents();
+    }
 
-	switchToFooter() {
-		this.viewControllers.header.setFocus(false);
-		this.viewControllers.body.setFocus(false);
+    switchToFooter() {
+        this.viewControllers.header.setFocus(false);
+        this.viewControllers.body.setFocus(false);
 
-		this.viewControllers[this.getFooterName()].switchFocus(1);	//	HM1
-	}
+        this.viewControllers[this.getFooterName()].switchFocus(1);	//	HM1
+    }
 
-	switchFromQuoteBuilderToBody() {
-		this.viewControllers.quoteBuilder.setFocus(false);
-		var body = this.viewControllers.body.getView(MciViewIds.body.message);
-		body.redraw();
-		this.viewControllers.body.switchFocus(1);
+    switchFromQuoteBuilderToBody() {
+        this.viewControllers.quoteBuilder.setFocus(false);
+        var body = this.viewControllers.body.getView(MciViewIds.body.message);
+        body.redraw();
+        this.viewControllers.body.switchFocus(1);
 
-		//	:TODO: create method (DRY)
+        //	:TODO: create method (DRY)
 
-		this.updateTextEditMode(body.getTextEditMode());
-		this.updateEditModePosition(body.getEditPosition());
+        this.updateTextEditMode(body.getTextEditMode());
+        this.updateEditModePosition(body.getEditPosition());
 
-		this.observeEditorEvents();
-	}
+        this.observeEditorEvents();
+    }
 
-	quoteBuilderFinalize() {
-		//	:TODO: fix magic #'s
-		const quoteMsgView	= this.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
-		const msgView		= this.viewControllers.body.getView(MciViewIds.body.message);
+    quoteBuilderFinalize() {
+        //	:TODO: fix magic #'s
+        const quoteMsgView	= this.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
+        const msgView		= this.viewControllers.body.getView(MciViewIds.body.message);
 
-		let quoteLines 		= quoteMsgView.getData().trim();
+        let quoteLines 		= quoteMsgView.getData().trim();
 
-		if(quoteLines.length > 0) {
-			if(this.replyIsAnsi) {
-				const bodyMessageView = this.viewControllers.body.getView(MciViewIds.body.message);
-				quoteLines += `${ansi.normal()}${bodyMessageView.getSGRFor('text')}`;
-			}
-			msgView.addText(`${quoteLines}\n\n`);
-		}
+        if(quoteLines.length > 0) {
+            if(this.replyIsAnsi) {
+                const bodyMessageView = this.viewControllers.body.getView(MciViewIds.body.message);
+                quoteLines += `${ansi.normal()}${bodyMessageView.getSGRFor('text')}`;
+            }
+            msgView.addText(`${quoteLines}\n\n`);
+        }
 
-		quoteMsgView.setText('');
+        quoteMsgView.setText('');
 
-		this.footerMode = 'editor';
+        this.footerMode = 'editor';
 
-		this.switchFooter( () => {
-			this.switchFromQuoteBuilderToBody();
-		});
-	}
+        this.switchFooter( () => {
+            this.switchFromQuoteBuilderToBody();
+        });
+    }
 
-	getQuoteByHeader() {
-		let quoteFormat = this.menuConfig.config.quoteFormats;
+    getQuoteByHeader() {
+        let quoteFormat = this.menuConfig.config.quoteFormats;
 
-		if(Array.isArray(quoteFormat)) {
-			quoteFormat =  quoteFormat[ Math.floor(Math.random() * quoteFormat.length) ];
-		} else if(!_.isString(quoteFormat)) {
-			quoteFormat = 'On {dateTime} {userName} said...';
-		}
+        if(Array.isArray(quoteFormat)) {
+            quoteFormat =  quoteFormat[ Math.floor(Math.random() * quoteFormat.length) ];
+        } else if(!_.isString(quoteFormat)) {
+            quoteFormat = 'On {dateTime} {userName} said...';
+        }
 
-		const dtFormat = this.menuConfig.config.quoteDateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();
-		return stringFormat(quoteFormat, {
-			dateTime	: moment(this.replyToMessage.modTimestamp).format(dtFormat),
-			userName	: this.replyToMessage.fromUserName,
-		});
-	}
+        const dtFormat = this.menuConfig.config.quoteDateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();
+        return stringFormat(quoteFormat, {
+            dateTime	: moment(this.replyToMessage.modTimestamp).format(dtFormat),
+            userName	: this.replyToMessage.fromUserName,
+        });
+    }
 
-	enter() {
-		if(this.messageAreaTag) {
-			this.tempMessageConfAndAreaSwitch(this.messageAreaTag);
-		}
+    enter() {
+        if(this.messageAreaTag) {
+            this.tempMessageConfAndAreaSwitch(this.messageAreaTag);
+        }
 
-		super.enter();
-	}
+        super.enter();
+    }
 
-	leave() {
-		this.tempMessageConfAndAreaRestore();
-		super.leave();
-	}
+    leave() {
+        this.tempMessageConfAndAreaRestore();
+        super.leave();
+    }
 
-	mciReady(mciData, cb) {
-		return this.mciReadyHandler(mciData, cb);
-	}
+    mciReady(mciData, cb) {
+        return this.mciReadyHandler(mciData, cb);
+    }
 };
diff --git a/core/ftn_address.js b/core/ftn_address.js
index 6b1e57e0..92c37557 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -7,94 +7,94 @@ const FTN_ADDRESS_REGEXP = /^([0-9]+:)?([0-9]+)(\/[0-9]+)?(\.[0-9]+)?(@[a-z0-9\-
 const FTN_PATTERN_REGEXP = /^([0-9*]+:)?([0-9*]+)(\/[0-9*]+)?(\.[0-9*]+)?(@[a-z0-9\-.*]+)?$/i;
 
 module.exports = class Address {
-	constructor(addr) {
-		if(addr) {
-			if(_.isObject(addr)) {
-				Object.assign(this, addr);
-			} else if(_.isString(addr)) {
-				const temp = Address.fromString(addr);
-				if(temp) {
-					Object.assign(this, temp);
-				}
-			}
-		}
-	}
+    constructor(addr) {
+        if(addr) {
+            if(_.isObject(addr)) {
+                Object.assign(this, addr);
+            } else if(_.isString(addr)) {
+                const temp = Address.fromString(addr);
+                if(temp) {
+                    Object.assign(this, temp);
+                }
+            }
+        }
+    }
 
-	static isValidAddress(addr) {
-		return addr && addr.isValid();
-	}
+    static isValidAddress(addr) {
+        return addr && addr.isValid();
+    }
 
-	isValid() {
-		//	FTN address is valid if we have at least a net/node
-		return _.isNumber(this.net) && _.isNumber(this.node);
-	}
+    isValid() {
+        //	FTN address is valid if we have at least a net/node
+        return _.isNumber(this.net) && _.isNumber(this.node);
+    }
 
-	isEqual(other) {
-		if(_.isString(other)) {
-			other = Address.fromString(other);
-		}
+    isEqual(other) {
+        if(_.isString(other)) {
+            other = Address.fromString(other);
+        }
 
-		return (
-			this.net === other.net &&
+        return (
+            this.net === other.net &&
 			this.node === other.node &&
 			this.zone === other.zone &&
 			this.point === other.point &&
 			this.domain === other.domain
-		);
-	}
+        );
+    }
 
-	getMatchAddr(pattern) {
-		const m = FTN_PATTERN_REGEXP.exec(pattern);
-		if(m) {
-			let addr = { };
+    getMatchAddr(pattern) {
+        const m = FTN_PATTERN_REGEXP.exec(pattern);
+        if(m) {
+            let addr = { };
 
-			if(m[1]) {
-				addr.zone = m[1].slice(0, -1);
-				if('*' !== addr.zone) {
-					addr.zone = parseInt(addr.zone);
-				}
-			} else {
-				addr.zone = '*';
-			}
+            if(m[1]) {
+                addr.zone = m[1].slice(0, -1);
+                if('*' !== addr.zone) {
+                    addr.zone = parseInt(addr.zone);
+                }
+            } else {
+                addr.zone = '*';
+            }
 
-			if(m[2]) {
-				addr.net = m[2];
-				if('*' !== addr.net) {
-					addr.net = parseInt(addr.net);
-				}
-			} else {
-				addr.net = '*';
-			}
+            if(m[2]) {
+                addr.net = m[2];
+                if('*' !== addr.net) {
+                    addr.net = parseInt(addr.net);
+                }
+            } else {
+                addr.net = '*';
+            }
 
-			if(m[3]) {
-				addr.node = m[3].substr(1);
-				if('*' !== addr.node) {
-					addr.node = parseInt(addr.node);
-				}
-			} else {
-				addr.node = '*';
-			}
+            if(m[3]) {
+                addr.node = m[3].substr(1);
+                if('*' !== addr.node) {
+                    addr.node = parseInt(addr.node);
+                }
+            } else {
+                addr.node = '*';
+            }
 
-			if(m[4]) {
-				addr.point = m[4].substr(1);
-				if('*' !== addr.point) {
-					addr.point = parseInt(addr.point);
-				}
-			} else {
-				addr.point = '*';
-			}
+            if(m[4]) {
+                addr.point = m[4].substr(1);
+                if('*' !== addr.point) {
+                    addr.point = parseInt(addr.point);
+                }
+            } else {
+                addr.point = '*';
+            }
 
-			if(m[5]) {
-				addr.domain = m[5].substr(1);
-			} else {
-				addr.domain = '*';
-			}
+            if(m[5]) {
+                addr.domain = m[5].substr(1);
+            } else {
+                addr.domain = '*';
+            }
 
-			return addr;
-		}
-	}
+            return addr;
+        }
+    }
 
-	/*
+    /*
 	getMatchScore(pattern) {
 		let score = 0;
 		const addr = this.getMatchAddr(pattern);
@@ -116,92 +116,92 @@ module.exports = class Address {
 	}
 	*/
 
-	isPatternMatch(pattern) {
-		const addr = this.getMatchAddr(pattern);
-		if(addr) {
-			return (
-				('*' === addr.net || this.net === addr.net) &&
+    isPatternMatch(pattern) {
+        const addr = this.getMatchAddr(pattern);
+        if(addr) {
+            return (
+                ('*' === addr.net || this.net === addr.net) &&
 				('*' === addr.node || this.node === addr.node) &&
 				('*' === addr.zone || this.zone === addr.zone) &&
 				('*' === addr.point || this.point === addr.point) &&
 				('*' === addr.domain || this.domain === addr.domain)
-			);
-		}
+            );
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	static fromString(addrStr) {
-		const m = FTN_ADDRESS_REGEXP.exec(addrStr);
+    static fromString(addrStr) {
+        const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-		if(m) {
-			//  start with a 2D
-			let addr = {
-				net		: parseInt(m[2]),
-				node	: parseInt(m[3].substr(1)),
-			};
+        if(m) {
+            //  start with a 2D
+            let addr = {
+                net		: parseInt(m[2]),
+                node	: parseInt(m[3].substr(1)),
+            };
 
-			//  3D: Addition of zone if present
-			if(m[1]) {
-				addr.zone = parseInt(m[1].slice(0, -1));
-			}
+            //  3D: Addition of zone if present
+            if(m[1]) {
+                addr.zone = parseInt(m[1].slice(0, -1));
+            }
 
-			//  4D if optional point is present
-			if(m[4]) {
-				addr.point = parseInt(m[4].substr(1));
-			}
+            //  4D if optional point is present
+            if(m[4]) {
+                addr.point = parseInt(m[4].substr(1));
+            }
 
-			//  5D with @domain
-			if(m[5]) {
-				addr.domain = m[5].substr(1);
-			}
+            //  5D with @domain
+            if(m[5]) {
+                addr.domain = m[5].substr(1);
+            }
 
-			return new Address(addr);
-		}
-	}
+            return new Address(addr);
+        }
+    }
 
-	toString(dimensions) {
-		dimensions = dimensions || '5D';
+    toString(dimensions) {
+        dimensions = dimensions || '5D';
 
-		let addrStr = `${this.zone}:${this.net}`;
+        let addrStr = `${this.zone}:${this.net}`;
 
-		//	allow for e.g. '4D' or 5
-		const dim = parseInt(dimensions.toString()[0]);
+        //	allow for e.g. '4D' or 5
+        const dim = parseInt(dimensions.toString()[0]);
 
-		if(dim >= 3) {
-			addrStr += `/${this.node}`;
-		}
+        if(dim >= 3) {
+            addrStr += `/${this.node}`;
+        }
 
-		//	missing & .0 are equiv for point
-		if(dim >= 4 && this.point) {
-			addrStr += `.${this.point}`;
-		}
+        //	missing & .0 are equiv for point
+        if(dim >= 4 && this.point) {
+            addrStr += `.${this.point}`;
+        }
 
-		if(5 === dim && this.domain) {
-			addrStr += `@${this.domain.toLowerCase()}`;
-		}
+        if(5 === dim && this.domain) {
+            addrStr += `@${this.domain.toLowerCase()}`;
+        }
 
-		return addrStr;
-	}
+        return addrStr;
+    }
 
-	static getComparator() {
-		return function(left, right) {
-			let c = (left.zone || 0) - (right.zone || 0);
-			if(0 !== c) {
-				return c;
-			}
+    static getComparator() {
+        return function(left, right) {
+            let c = (left.zone || 0) - (right.zone || 0);
+            if(0 !== c) {
+                return c;
+            }
 
-			c = (left.net || 0) - (right.net || 0);
-			if(0 !== c) {
-				return c;
-			}
+            c = (left.net || 0) - (right.net || 0);
+            if(0 !== c) {
+                return c;
+            }
 
-			c = (left.node || 0) - (right.node || 0);
-			if(0 !== c) {
-				return c;
-			}
+            c = (left.node || 0) - (right.node || 0);
+            if(0 !== c) {
+                return c;
+            }
 
-			return (left.domain || '').localeCompare(right.domain || '');
-		};
-	}
+            return (left.domain || '').localeCompare(right.domain || '');
+        };
+    }
 };
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index c42d859b..6c49c1c6 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -31,60 +31,60 @@ const FTN_MESSAGE_SAUCE_HEADER = Buffer.from('SAUCE00');
 const FTN_MESSAGE_KLUDGE_PREFIX	= '\x01';
 
 class PacketHeader {
-	constructor(origAddr, destAddr, version, createdMoment) {
-		const EMPTY_ADDRESS = {
-			node	: 0,
-			net		: 0,
-			zone	: 0,
-			point	: 0,
-		};
+    constructor(origAddr, destAddr, version, createdMoment) {
+        const EMPTY_ADDRESS = {
+            node	: 0,
+            net		: 0,
+            zone	: 0,
+            point	: 0,
+        };
 
-		this.version 		= version || '2+';
-		this.origAddress 	= origAddr || EMPTY_ADDRESS;
-		this.destAddress 	= destAddr || EMPTY_ADDRESS;
-		this.created		= createdMoment || moment();
+        this.version 		= version || '2+';
+        this.origAddress 	= origAddr || EMPTY_ADDRESS;
+        this.destAddress 	= destAddr || EMPTY_ADDRESS;
+        this.created		= createdMoment || moment();
 
-		//	uncommon to set the following explicitly
-		this.prodCodeLo			= 0xfe;	//	http://ftsc.org/docs/fta-1005.003
-		this.prodRevLo			= 0;
-		this.baud				= 0;
-		this.packetType			= FTN_PACKET_HEADER_TYPE;
-		this.password			= '';
-		this.prodData 			= 0x47694e45;	//	"ENiG"
+        //	uncommon to set the following explicitly
+        this.prodCodeLo			= 0xfe;	//	http://ftsc.org/docs/fta-1005.003
+        this.prodRevLo			= 0;
+        this.baud				= 0;
+        this.packetType			= FTN_PACKET_HEADER_TYPE;
+        this.password			= '';
+        this.prodData 			= 0x47694e45;	//	"ENiG"
 
-		this.capWord			= 0x0001;
-		this.capWordValidate	= ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);	//	swap
+        this.capWord			= 0x0001;
+        this.capWordValidate	= ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);	//	swap
 
-		this.prodCodeHi			= 0xfe;	//	see above
-		this.prodRevHi			= 0;
-	}
+        this.prodCodeHi			= 0xfe;	//	see above
+        this.prodRevHi			= 0;
+    }
 
-	get origAddress() {
-		let addr = new Address({
-			node	: this.origNode,
-			zone	: this.origZone,
-		});
+    get origAddress() {
+        let addr = new Address({
+            node	: this.origNode,
+            zone	: this.origZone,
+        });
 
-		if(this.origPoint) {
-			addr.point	= this.origPoint;
-			addr.net	= this.auxNet;
-		} else {
-			addr.net	= this.origNet;
-		}
+        if(this.origPoint) {
+            addr.point	= this.origPoint;
+            addr.net	= this.auxNet;
+        } else {
+            addr.net	= this.origNet;
+        }
 
-		return addr;
-	}
+        return addr;
+    }
 
-	set origAddress(address) {
-		if(_.isString(address)) {
-			address = Address.fromString(address);
-		}
+    set origAddress(address) {
+        if(_.isString(address)) {
+            address = Address.fromString(address);
+        }
 
-		this.origNode = address.node;
+        this.origNode = address.node;
 
-		//	See FSC-48
-		//	:TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
-		/*if(address.point) {
+        //	See FSC-48
+        //	:TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
+        /*if(address.point) {
 			this.auxNet		= address.origNet;
 			this.origNet	= -1;
 		} else {
@@ -92,63 +92,63 @@ class PacketHeader {
 			this.auxNet		= 0;
 		}
 		*/
-		this.origNet		= address.net;
-		this.auxNet			= 0;
+        this.origNet		= address.net;
+        this.auxNet			= 0;
 
-		this.origZone	= address.zone;
-		this.origZone2	= address.zone;
-		this.origPoint	= address.point || 0;
-	}
+        this.origZone	= address.zone;
+        this.origZone2	= address.zone;
+        this.origPoint	= address.point || 0;
+    }
 
-	get destAddress() {
-		let addr = new Address({
-			node	: this.destNode,
-			net		: this.destNet,
-			zone	: this.destZone,
-		});
+    get destAddress() {
+        let addr = new Address({
+            node	: this.destNode,
+            net		: this.destNet,
+            zone	: this.destZone,
+        });
 
-		if(this.destPoint) {
-			addr.point = this.destPoint;
-		}
+        if(this.destPoint) {
+            addr.point = this.destPoint;
+        }
 
-		return addr;
-	}
+        return addr;
+    }
 
-	set destAddress(address) {
-		if(_.isString(address)) {
-			address = Address.fromString(address);
-		}
+    set destAddress(address) {
+        if(_.isString(address)) {
+            address = Address.fromString(address);
+        }
 
-		this.destNode	= address.node;
-		this.destNet	= address.net;
-		this.destZone	= address.zone;
-		this.destZone2	= address.zone;
-		this.destPoint	= address.point || 0;
-	}
+        this.destNode	= address.node;
+        this.destNet	= address.net;
+        this.destZone	= address.zone;
+        this.destZone2	= address.zone;
+        this.destPoint	= address.point || 0;
+    }
 
-	get created() {
-		return moment({
-			year 	: this.year,
-			month	: this.month - 1,	//	moment uses 0 indexed months
-			date	: this.day,
-			hour	: this.hour,
-			minute	: this.minute,
-			second	: this.second
-		});
-	}
+    get created() {
+        return moment({
+            year 	: this.year,
+            month	: this.month - 1,	//	moment uses 0 indexed months
+            date	: this.day,
+            hour	: this.hour,
+            minute	: this.minute,
+            second	: this.second
+        });
+    }
 
-	set created(momentCreated) {
-		if(!moment.isMoment(momentCreated)) {
-			momentCreated = moment(momentCreated);
-		}
+    set created(momentCreated) {
+        if(!moment.isMoment(momentCreated)) {
+            momentCreated = moment(momentCreated);
+        }
 
-		this.year	= momentCreated.year();
-		this.month	= momentCreated.month() + 1;	//	moment uses 0 indexed months
-		this.day	= momentCreated.date();			//	day of month
-		this.hour	= momentCreated.hour();
-		this.minute	= momentCreated.minute();
-		this.second	= momentCreated.second();
-	}
+        this.year	= momentCreated.year();
+        this.month	= momentCreated.month() + 1;	//	moment uses 0 indexed months
+        this.day	= momentCreated.date();			//	day of month
+        this.hour	= momentCreated.hour();
+        this.minute	= momentCreated.minute();
+        this.second	= momentCreated.second();
+    }
 }
 
 exports.PacketHeader = PacketHeader;
@@ -166,501 +166,501 @@ exports.PacketHeader = PacketHeader;
 //		http://walon.org/pub/fidonet/FTSC-nodelists-etc./pkt-types.txt
 //
 function Packet(options) {
-	var self = this;
+    var self = this;
 
-	this.options = options || {};
+    this.options = options || {};
 
-	this.parsePacketHeader = function(packetBuffer, cb) {
-		assert(Buffer.isBuffer(packetBuffer));
+    this.parsePacketHeader = function(packetBuffer, cb) {
+        assert(Buffer.isBuffer(packetBuffer));
 
-		let packetHeader;
-		try {
-			packetHeader = new Parser()
-				.uint16le('origNode')
-				.uint16le('destNode')
-				.uint16le('year')
-				.uint16le('month')
-				.uint16le('day')
-				.uint16le('hour')
-				.uint16le('minute')
-				.uint16le('second')
-				.uint16le('baud')
-				.uint16le('packetType')
-				.uint16le('origNet')
-				.uint16le('destNet')
-				.int8('prodCodeLo')
-				.int8('prodRevLo')	//	aka serialNo
-				.buffer('password', { length : 8 })	//	can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
-				.uint16le('origZone')
-				.uint16le('destZone')
-				//
-				//	The following is "filler" in FTS-0001, specifics in
-				//	FSC-0045 and FSC-0048
-				//
-				.uint16le('auxNet')
-				.uint16le('capWordValidate')
-				.int8('prodCodeHi')
-				.int8('prodRevHi')
-				.uint16le('capWord')
-				.uint16le('origZone2')
-				.uint16le('destZone2')
-				.uint16le('origPoint')
-				.uint16le('destPoint')
-				.uint32le('prodData')
-				.parse(packetBuffer);
-		} catch(e) {
-			return Errors.Invalid(`Unable to parse FTN packet header: ${e.message}`);
-		}
+        let packetHeader;
+        try {
+            packetHeader = new Parser()
+                .uint16le('origNode')
+                .uint16le('destNode')
+                .uint16le('year')
+                .uint16le('month')
+                .uint16le('day')
+                .uint16le('hour')
+                .uint16le('minute')
+                .uint16le('second')
+                .uint16le('baud')
+                .uint16le('packetType')
+                .uint16le('origNet')
+                .uint16le('destNet')
+                .int8('prodCodeLo')
+                .int8('prodRevLo')	//	aka serialNo
+                .buffer('password', { length : 8 })	//	can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
+                .uint16le('origZone')
+                .uint16le('destZone')
+                //
+                //	The following is "filler" in FTS-0001, specifics in
+                //	FSC-0045 and FSC-0048
+                //
+                .uint16le('auxNet')
+                .uint16le('capWordValidate')
+                .int8('prodCodeHi')
+                .int8('prodRevHi')
+                .uint16le('capWord')
+                .uint16le('origZone2')
+                .uint16le('destZone2')
+                .uint16le('origPoint')
+                .uint16le('destPoint')
+                .uint32le('prodData')
+                .parse(packetBuffer);
+        } catch(e) {
+            return Errors.Invalid(`Unable to parse FTN packet header: ${e.message}`);
+        }
 
-		//	Convert password from NULL padded array to string
-		packetHeader.password = strUtil.stringFromNullTermBuffer(packetHeader.password, 'CP437');
+        //	Convert password from NULL padded array to string
+        packetHeader.password = strUtil.stringFromNullTermBuffer(packetHeader.password, 'CP437');
 
-		if(FTN_PACKET_HEADER_TYPE !== packetHeader.packetType) {
-			return cb(Errors.Invalid(`Unsupported FTN packet header type: ${packetHeader.packetType}`));
-		}
+        if(FTN_PACKET_HEADER_TYPE !== packetHeader.packetType) {
+            return cb(Errors.Invalid(`Unsupported FTN packet header type: ${packetHeader.packetType}`));
+        }
 
-		//
-		//	What kind of packet do we really have here?
-		//
-		//	:TODO: adjust values based on version discovered
-		if(FTN_PACKET_BAUD_TYPE_2_2 === packetHeader.baud) {
-			packetHeader.version = '2.2';
+        //
+        //	What kind of packet do we really have here?
+        //
+        //	:TODO: adjust values based on version discovered
+        if(FTN_PACKET_BAUD_TYPE_2_2 === packetHeader.baud) {
+            packetHeader.version = '2.2';
 
-			//	See FSC-0045
-			packetHeader.origPoint	= packetHeader.year;
-			packetHeader.destPoint	= packetHeader.month;
+            //	See FSC-0045
+            packetHeader.origPoint	= packetHeader.year;
+            packetHeader.destPoint	= packetHeader.month;
 
-			packetHeader.destDomain = packetHeader.origZone2;
-			packetHeader.origDomain	= packetHeader.auxNet;
-		} else {
-			//
-			//	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
-			//
-			const capWordValidateSwapped =
+            packetHeader.destDomain = packetHeader.origZone2;
+            packetHeader.origDomain	= packetHeader.auxNet;
+        } else {
+            //
+            //	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
+            //
+            const capWordValidateSwapped =
 				((packetHeader.capWordValidate & 0xff) << 8) |
 				((packetHeader.capWordValidate >> 8) & 0xff);
 
-			if(capWordValidateSwapped === packetHeader.capWord &&
+            if(capWordValidateSwapped === packetHeader.capWord &&
 				0 != packetHeader.capWord &&
 				packetHeader.capWord & 0x0001)
-			{
-				packetHeader.version = '2+';
+            {
+                packetHeader.version = '2+';
 
-				//	See FSC-0048
-				if(-1 === packetHeader.origNet) {
-					packetHeader.origNet = packetHeader.auxNet;
-				}
-			} else {
-				packetHeader.version = '2';
+                //	See FSC-0048
+                if(-1 === packetHeader.origNet) {
+                    packetHeader.origNet = packetHeader.auxNet;
+                }
+            } else {
+                packetHeader.version = '2';
 
-				//	:TODO: should fill bytes be 0?
-			}
-		}
+                //	:TODO: should fill bytes be 0?
+            }
+        }
 
-		packetHeader.created = moment({
-			year 	: packetHeader.year,
-			month	: packetHeader.month - 1,	//	moment uses 0 indexed months
-			date	: packetHeader.day,
-			hour	: packetHeader.hour,
-			minute	: packetHeader.minute,
-			second	: packetHeader.second
-		});
+        packetHeader.created = moment({
+            year 	: packetHeader.year,
+            month	: packetHeader.month - 1,	//	moment uses 0 indexed months
+            date	: packetHeader.day,
+            hour	: packetHeader.hour,
+            minute	: packetHeader.minute,
+            second	: packetHeader.second
+        });
 
-		const ph = new PacketHeader();
-		_.assign(ph, packetHeader);
+        const ph = new PacketHeader();
+        _.assign(ph, packetHeader);
 
-		return cb(null, ph);
-	};
+        return cb(null, ph);
+    };
 
-	this.getPacketHeaderBuffer = function(packetHeader) {
-		let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
+    this.getPacketHeaderBuffer = function(packetHeader) {
+        let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
 
-		buffer.writeUInt16LE(packetHeader.origNode, 0);
-		buffer.writeUInt16LE(packetHeader.destNode, 2);
-		buffer.writeUInt16LE(packetHeader.year, 4);
-		buffer.writeUInt16LE(packetHeader.month, 6);
-		buffer.writeUInt16LE(packetHeader.day, 8);
-		buffer.writeUInt16LE(packetHeader.hour, 10);
-		buffer.writeUInt16LE(packetHeader.minute, 12);
-		buffer.writeUInt16LE(packetHeader.second, 14);
+        buffer.writeUInt16LE(packetHeader.origNode, 0);
+        buffer.writeUInt16LE(packetHeader.destNode, 2);
+        buffer.writeUInt16LE(packetHeader.year, 4);
+        buffer.writeUInt16LE(packetHeader.month, 6);
+        buffer.writeUInt16LE(packetHeader.day, 8);
+        buffer.writeUInt16LE(packetHeader.hour, 10);
+        buffer.writeUInt16LE(packetHeader.minute, 12);
+        buffer.writeUInt16LE(packetHeader.second, 14);
 
-		buffer.writeUInt16LE(packetHeader.baud, 16);
-		buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
-		buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
-		buffer.writeUInt16LE(packetHeader.destNet, 22);
-		buffer.writeUInt8(packetHeader.prodCodeLo, 24);
-		buffer.writeUInt8(packetHeader.prodRevHi, 25);
+        buffer.writeUInt16LE(packetHeader.baud, 16);
+        buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
+        buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
+        buffer.writeUInt16LE(packetHeader.destNet, 22);
+        buffer.writeUInt8(packetHeader.prodCodeLo, 24);
+        buffer.writeUInt8(packetHeader.prodRevHi, 25);
 
-		const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
-		pass.copy(buffer, 26);
+        const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
+        pass.copy(buffer, 26);
 
-		buffer.writeUInt16LE(packetHeader.origZone, 34);
-		buffer.writeUInt16LE(packetHeader.destZone, 36);
-		buffer.writeUInt16LE(packetHeader.auxNet, 38);
-		buffer.writeUInt16LE(packetHeader.capWordValidate, 40);
-		buffer.writeUInt8(packetHeader.prodCodeHi, 42);
-		buffer.writeUInt8(packetHeader.prodRevLo, 43);
-		buffer.writeUInt16LE(packetHeader.capWord, 44);
-		buffer.writeUInt16LE(packetHeader.origZone2, 46);
-		buffer.writeUInt16LE(packetHeader.destZone2, 48);
-		buffer.writeUInt16LE(packetHeader.origPoint, 50);
-		buffer.writeUInt16LE(packetHeader.destPoint, 52);
-		buffer.writeUInt32LE(packetHeader.prodData, 54);
+        buffer.writeUInt16LE(packetHeader.origZone, 34);
+        buffer.writeUInt16LE(packetHeader.destZone, 36);
+        buffer.writeUInt16LE(packetHeader.auxNet, 38);
+        buffer.writeUInt16LE(packetHeader.capWordValidate, 40);
+        buffer.writeUInt8(packetHeader.prodCodeHi, 42);
+        buffer.writeUInt8(packetHeader.prodRevLo, 43);
+        buffer.writeUInt16LE(packetHeader.capWord, 44);
+        buffer.writeUInt16LE(packetHeader.origZone2, 46);
+        buffer.writeUInt16LE(packetHeader.destZone2, 48);
+        buffer.writeUInt16LE(packetHeader.origPoint, 50);
+        buffer.writeUInt16LE(packetHeader.destPoint, 52);
+        buffer.writeUInt32LE(packetHeader.prodData, 54);
 
-		return buffer;
-	};
+        return buffer;
+    };
 
-	this.writePacketHeader = function(packetHeader, ws) {
-		let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
+    this.writePacketHeader = function(packetHeader, ws) {
+        let buffer = Buffer.alloc(FTN_PACKET_HEADER_SIZE);
 
-		buffer.writeUInt16LE(packetHeader.origNode, 0);
-		buffer.writeUInt16LE(packetHeader.destNode, 2);
-		buffer.writeUInt16LE(packetHeader.year, 4);
-		buffer.writeUInt16LE(packetHeader.month, 6);
-		buffer.writeUInt16LE(packetHeader.day, 8);
-		buffer.writeUInt16LE(packetHeader.hour, 10);
-		buffer.writeUInt16LE(packetHeader.minute, 12);
-		buffer.writeUInt16LE(packetHeader.second, 14);
+        buffer.writeUInt16LE(packetHeader.origNode, 0);
+        buffer.writeUInt16LE(packetHeader.destNode, 2);
+        buffer.writeUInt16LE(packetHeader.year, 4);
+        buffer.writeUInt16LE(packetHeader.month, 6);
+        buffer.writeUInt16LE(packetHeader.day, 8);
+        buffer.writeUInt16LE(packetHeader.hour, 10);
+        buffer.writeUInt16LE(packetHeader.minute, 12);
+        buffer.writeUInt16LE(packetHeader.second, 14);
 
-		buffer.writeUInt16LE(packetHeader.baud, 16);
-		buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
-		buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
-		buffer.writeUInt16LE(packetHeader.destNet, 22);
-		buffer.writeUInt8(packetHeader.prodCodeLo, 24);
-		buffer.writeUInt8(packetHeader.prodRevHi, 25);
+        buffer.writeUInt16LE(packetHeader.baud, 16);
+        buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
+        buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
+        buffer.writeUInt16LE(packetHeader.destNet, 22);
+        buffer.writeUInt8(packetHeader.prodCodeLo, 24);
+        buffer.writeUInt8(packetHeader.prodRevHi, 25);
 
-		const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
-		pass.copy(buffer, 26);
+        const pass = ftn.stringToNullPaddedBuffer(packetHeader.password, 8);
+        pass.copy(buffer, 26);
 
-		buffer.writeUInt16LE(packetHeader.origZone, 34);
-		buffer.writeUInt16LE(packetHeader.destZone, 36);
-		buffer.writeUInt16LE(packetHeader.auxNet, 38);
-		buffer.writeUInt16LE(packetHeader.capWordValidate, 40);
-		buffer.writeUInt8(packetHeader.prodCodeHi, 42);
-		buffer.writeUInt8(packetHeader.prodRevLo, 43);
-		buffer.writeUInt16LE(packetHeader.capWord, 44);
-		buffer.writeUInt16LE(packetHeader.origZone2, 46);
-		buffer.writeUInt16LE(packetHeader.destZone2, 48);
-		buffer.writeUInt16LE(packetHeader.origPoint, 50);
-		buffer.writeUInt16LE(packetHeader.destPoint, 52);
-		buffer.writeUInt32LE(packetHeader.prodData, 54);
+        buffer.writeUInt16LE(packetHeader.origZone, 34);
+        buffer.writeUInt16LE(packetHeader.destZone, 36);
+        buffer.writeUInt16LE(packetHeader.auxNet, 38);
+        buffer.writeUInt16LE(packetHeader.capWordValidate, 40);
+        buffer.writeUInt8(packetHeader.prodCodeHi, 42);
+        buffer.writeUInt8(packetHeader.prodRevLo, 43);
+        buffer.writeUInt16LE(packetHeader.capWord, 44);
+        buffer.writeUInt16LE(packetHeader.origZone2, 46);
+        buffer.writeUInt16LE(packetHeader.destZone2, 48);
+        buffer.writeUInt16LE(packetHeader.origPoint, 50);
+        buffer.writeUInt16LE(packetHeader.destPoint, 52);
+        buffer.writeUInt32LE(packetHeader.prodData, 54);
 
-		ws.write(buffer);
+        ws.write(buffer);
 
-		return buffer.length;
-	};
+        return buffer.length;
+    };
 
-	this.processMessageBody = function(messageBodyBuffer, cb) {
-		//
-		//	From FTS-0001.16:
-		//		"Message text is unbounded and null terminated (note exception below).
-		//
-		//		A 'hard' carriage return, 0DH,  marks the end of a paragraph, and must
-		//		be preserved.
-		//
-		//		So   called  'soft'  carriage  returns,  8DH,  may  mark  a   previous
-		//		processor's  automatic line wrap, and should be ignored.  Beware  that
-		//		they may be followed by linefeeds, or may not.
-		//
-		//		All  linefeeds, 0AH, should be ignored.  Systems which display message
-		//		text should wrap long lines to suit their application."
-		//
-		//	This can be a bit tricky:
-		//	*	Decoding as CP437 converts 0x8d -> 0xec, so we'll need to correct for that
-		//	*	Many kludge lines specify an encoding. If we find one of such lines, we'll
-		//		likely need to re-decode as the specified encoding
-		//	*	SAUCE is binary-ish data, so we need to inspect for it before any
-		//		decoding occurs
-		//
-		let messageBodyData = {
-			message		: [],
-			kludgeLines	: {},	//	KLUDGE:[value1, value2, ...] map
-			seenBy		: [],
-		};
+    this.processMessageBody = function(messageBodyBuffer, cb) {
+        //
+        //	From FTS-0001.16:
+        //		"Message text is unbounded and null terminated (note exception below).
+        //
+        //		A 'hard' carriage return, 0DH,  marks the end of a paragraph, and must
+        //		be preserved.
+        //
+        //		So   called  'soft'  carriage  returns,  8DH,  may  mark  a   previous
+        //		processor's  automatic line wrap, and should be ignored.  Beware  that
+        //		they may be followed by linefeeds, or may not.
+        //
+        //		All  linefeeds, 0AH, should be ignored.  Systems which display message
+        //		text should wrap long lines to suit their application."
+        //
+        //	This can be a bit tricky:
+        //	*	Decoding as CP437 converts 0x8d -> 0xec, so we'll need to correct for that
+        //	*	Many kludge lines specify an encoding. If we find one of such lines, we'll
+        //		likely need to re-decode as the specified encoding
+        //	*	SAUCE is binary-ish data, so we need to inspect for it before any
+        //		decoding occurs
+        //
+        let messageBodyData = {
+            message		: [],
+            kludgeLines	: {},	//	KLUDGE:[value1, value2, ...] map
+            seenBy		: [],
+        };
 
-		function addKludgeLine(line) {
-			//
-			//	We have to special case INTL/TOPT/FMPT as they don't contain
-			//	a ':' name/value separator like the rest of the kludge lines... because stupdity.
-			//
-			let key = line.substr(0, 4).trim();
-			let value;
-			if( ['INTL', 'TOPT', 'FMPT', 'Via' ].includes(key)) {
-				value = line.substr(key.length).trim();
-			} else {
-				const sepIndex = line.indexOf(':');
-				key		= line.substr(0, sepIndex).toUpperCase();
-				value	= line.substr(sepIndex + 1).trim();
-			}
+        function addKludgeLine(line) {
+            //
+            //	We have to special case INTL/TOPT/FMPT as they don't contain
+            //	a ':' name/value separator like the rest of the kludge lines... because stupdity.
+            //
+            let key = line.substr(0, 4).trim();
+            let value;
+            if( ['INTL', 'TOPT', 'FMPT', 'Via' ].includes(key)) {
+                value = line.substr(key.length).trim();
+            } else {
+                const sepIndex = line.indexOf(':');
+                key		= line.substr(0, sepIndex).toUpperCase();
+                value	= line.substr(sepIndex + 1).trim();
+            }
 
-			//
-			//	Allow mapped value to be either a key:value if there is only
-			//	one entry, or key:[value1, value2,...] if there are more
-			//
-			if(messageBodyData.kludgeLines[key]) {
-				if(!_.isArray(messageBodyData.kludgeLines[key])) {
-					messageBodyData.kludgeLines[key] = [ messageBodyData.kludgeLines[key] ];
-				}
-				messageBodyData.kludgeLines[key].push(value);
-			} else {
-				messageBodyData.kludgeLines[key] = value;
-			}
-		}
+            //
+            //	Allow mapped value to be either a key:value if there is only
+            //	one entry, or key:[value1, value2,...] if there are more
+            //
+            if(messageBodyData.kludgeLines[key]) {
+                if(!_.isArray(messageBodyData.kludgeLines[key])) {
+                    messageBodyData.kludgeLines[key] = [ messageBodyData.kludgeLines[key] ];
+                }
+                messageBodyData.kludgeLines[key].push(value);
+            } else {
+                messageBodyData.kludgeLines[key] = value;
+            }
+        }
 
-		let encoding = 'cp437';
+        let encoding = 'cp437';
 
-		async.series(
-			[
-				function extractSauce(callback) {
-					//	:TODO: This is wrong: SAUCE may not have EOF marker for one, also if it's
-					//	present, we need to extract it but keep the rest of hte message intact as it likely
-					//	has SEEN-BY, PATH, and other kludge information *appended*
-					const sauceHeaderPosition = messageBodyBuffer.indexOf(FTN_MESSAGE_SAUCE_HEADER);
-					if(sauceHeaderPosition > -1) {
-						sauce.readSAUCE(messageBodyBuffer.slice(sauceHeaderPosition, sauceHeaderPosition + sauce.SAUCE_SIZE), (err, theSauce) => {
-							if(!err) {
-								//	we read some SAUCE - don't re-process that portion into the body
-								messageBodyBuffer		= messageBodyBuffer.slice(0, sauceHeaderPosition) + messageBodyBuffer.slice(sauceHeaderPosition + sauce.SAUCE_SIZE);
-								//								messageBodyBuffer 		= messageBodyBuffer.slice(0, sauceHeaderPosition);
-								messageBodyData.sauce	= theSauce;
-							} else {
-								Log.warn( { error : err.message }, 'Found what looks like to be a SAUCE record, but failed to read');
-							}
-							return callback(null);	//	failure to read SAUCE is OK
-						});
-					} else {
-						callback(null);
-					}
-				},
-				function extractChrsAndDetermineEncoding(callback) {
-					//
-					//	From FTS-5003.001:
-					//	"The CHRS control line is formatted as follows:
-					//
-					//	^ACHRS: <identifier> <level>
-					//
-					//	Where <identifier> is a character string of no more than eight (8)
-					//	ASCII characters identifying the character set or character encoding
-					//	scheme used, and level is a positive integer value describing what
-					//	level of CHRS the  message is written in."
-					//
-					//	Also according to the spec, the deprecated "CHARSET" value may be used
-					//	:TODO: Look into CHARSET more - should we bother supporting it?
-					//	:TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
-					const FTN_CHRS_PREFIX 	= Buffer.from( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
-					const FTN_CHRS_SUFFIX	= Buffer.from( [ 0x0d ] );
+        async.series(
+            [
+                function extractSauce(callback) {
+                    //	:TODO: This is wrong: SAUCE may not have EOF marker for one, also if it's
+                    //	present, we need to extract it but keep the rest of hte message intact as it likely
+                    //	has SEEN-BY, PATH, and other kludge information *appended*
+                    const sauceHeaderPosition = messageBodyBuffer.indexOf(FTN_MESSAGE_SAUCE_HEADER);
+                    if(sauceHeaderPosition > -1) {
+                        sauce.readSAUCE(messageBodyBuffer.slice(sauceHeaderPosition, sauceHeaderPosition + sauce.SAUCE_SIZE), (err, theSauce) => {
+                            if(!err) {
+                                //	we read some SAUCE - don't re-process that portion into the body
+                                messageBodyBuffer		= messageBodyBuffer.slice(0, sauceHeaderPosition) + messageBodyBuffer.slice(sauceHeaderPosition + sauce.SAUCE_SIZE);
+                                //								messageBodyBuffer 		= messageBodyBuffer.slice(0, sauceHeaderPosition);
+                                messageBodyData.sauce	= theSauce;
+                            } else {
+                                Log.warn( { error : err.message }, 'Found what looks like to be a SAUCE record, but failed to read');
+                            }
+                            return callback(null);	//	failure to read SAUCE is OK
+                        });
+                    } else {
+                        callback(null);
+                    }
+                },
+                function extractChrsAndDetermineEncoding(callback) {
+                    //
+                    //	From FTS-5003.001:
+                    //	"The CHRS control line is formatted as follows:
+                    //
+                    //	^ACHRS: <identifier> <level>
+                    //
+                    //	Where <identifier> is a character string of no more than eight (8)
+                    //	ASCII characters identifying the character set or character encoding
+                    //	scheme used, and level is a positive integer value describing what
+                    //	level of CHRS the  message is written in."
+                    //
+                    //	Also according to the spec, the deprecated "CHARSET" value may be used
+                    //	:TODO: Look into CHARSET more - should we bother supporting it?
+                    //	:TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
+                    const FTN_CHRS_PREFIX 	= Buffer.from( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
+                    const FTN_CHRS_SUFFIX	= Buffer.from( [ 0x0d ] );
 
-					let chrsPrefixIndex = messageBodyBuffer.indexOf(FTN_CHRS_PREFIX);
-					if(chrsPrefixIndex < 0) {
-						return callback(null);
-					}
+                    let chrsPrefixIndex = messageBodyBuffer.indexOf(FTN_CHRS_PREFIX);
+                    if(chrsPrefixIndex < 0) {
+                        return callback(null);
+                    }
 
-					chrsPrefixIndex += FTN_CHRS_PREFIX.length;
+                    chrsPrefixIndex += FTN_CHRS_PREFIX.length;
 
-					const chrsEndIndex = messageBodyBuffer.indexOf(FTN_CHRS_SUFFIX, chrsPrefixIndex);
-					if(chrsEndIndex < 0) {
-						return callback(null);
-					}
+                    const chrsEndIndex = messageBodyBuffer.indexOf(FTN_CHRS_SUFFIX, chrsPrefixIndex);
+                    if(chrsEndIndex < 0) {
+                        return callback(null);
+                    }
 
-					let chrsContent = messageBodyBuffer.slice(chrsPrefixIndex, chrsEndIndex);
-					if(0 === chrsContent.length) {
-						return callback(null);
-					}
+                    let chrsContent = messageBodyBuffer.slice(chrsPrefixIndex, chrsEndIndex);
+                    if(0 === chrsContent.length) {
+                        return callback(null);
+                    }
 
-					chrsContent = iconv.decode(chrsContent, 'CP437');
-					const chrsEncoding = ftn.getEncodingFromCharacterSetIdentifier(chrsContent);
-					if(chrsEncoding) {
-						encoding = chrsEncoding;
-					}
-					return callback(null);
-				},
-				function extractMessageData(callback) {
-					//
-					//	Decode |messageBodyBuffer| using |encoding| defaulted or detected above
-					//
-					//	:TODO: Look into \xec thing more - document
-					let decoded;
-					try {
-						decoded = iconv.decode(messageBodyBuffer, encoding);
-					} catch(e) {
-						Log.debug( { encoding : encoding, error : e.toString() }, 'Error decoding. Falling back to ASCII');
-						decoded = iconv.decode(messageBodyBuffer, 'ascii');
-					}
+                    chrsContent = iconv.decode(chrsContent, 'CP437');
+                    const chrsEncoding = ftn.getEncodingFromCharacterSetIdentifier(chrsContent);
+                    if(chrsEncoding) {
+                        encoding = chrsEncoding;
+                    }
+                    return callback(null);
+                },
+                function extractMessageData(callback) {
+                    //
+                    //	Decode |messageBodyBuffer| using |encoding| defaulted or detected above
+                    //
+                    //	:TODO: Look into \xec thing more - document
+                    let decoded;
+                    try {
+                        decoded = iconv.decode(messageBodyBuffer, encoding);
+                    } catch(e) {
+                        Log.debug( { encoding : encoding, error : e.toString() }, 'Error decoding. Falling back to ASCII');
+                        decoded = iconv.decode(messageBodyBuffer, 'ascii');
+                    }
 
-					const messageLines	= strUtil.splitTextAtTerms(decoded.replace(/\xec/g, ''));
-					let endOfMessage	= false;
+                    const messageLines	= strUtil.splitTextAtTerms(decoded.replace(/\xec/g, ''));
+                    let endOfMessage	= false;
 
-					messageLines.forEach(line => {
-						if(0 === line.length) {
-							messageBodyData.message.push('');
-							return;
-						}
+                    messageLines.forEach(line => {
+                        if(0 === line.length) {
+                            messageBodyData.message.push('');
+                            return;
+                        }
 
-						if(line.startsWith('AREA:')) {
-							messageBodyData.area = line.substring(line.indexOf(':') + 1).trim();
-						} else if(line.startsWith('--- ')) {
-							//	Tear Lines are tracked allowing for specialized display/etc.
-							messageBodyData.tearLine = line;
-						} else if(/^[ ]{1,2}\* Origin: /.test(line)) {	//	To spec is " * Origin: ..."
-							messageBodyData.originLine = line;
-							endOfMessage = true;	//	Anything past origin is not part of the message body
-						} else if(line.startsWith('SEEN-BY:')) {
-							endOfMessage = true;	//	Anything past the first SEEN-BY is not part of the message body
-							messageBodyData.seenBy.push(line.substring(line.indexOf(':') + 1).trim());
-						} else if(FTN_MESSAGE_KLUDGE_PREFIX === line.charAt(0)) {
-							if('PATH:' === line.slice(1, 6)) {
-								endOfMessage = true;	//	Anything pats the first PATH is not part of the message body
-							}
-							addKludgeLine(line.slice(1));
-						} else if(!endOfMessage) {
-							//	regular ol' message line
-							messageBodyData.message.push(line);
-						}
-					});
+                        if(line.startsWith('AREA:')) {
+                            messageBodyData.area = line.substring(line.indexOf(':') + 1).trim();
+                        } else if(line.startsWith('--- ')) {
+                            //	Tear Lines are tracked allowing for specialized display/etc.
+                            messageBodyData.tearLine = line;
+                        } else if(/^[ ]{1,2}\* Origin: /.test(line)) {	//	To spec is " * Origin: ..."
+                            messageBodyData.originLine = line;
+                            endOfMessage = true;	//	Anything past origin is not part of the message body
+                        } else if(line.startsWith('SEEN-BY:')) {
+                            endOfMessage = true;	//	Anything past the first SEEN-BY is not part of the message body
+                            messageBodyData.seenBy.push(line.substring(line.indexOf(':') + 1).trim());
+                        } else if(FTN_MESSAGE_KLUDGE_PREFIX === line.charAt(0)) {
+                            if('PATH:' === line.slice(1, 6)) {
+                                endOfMessage = true;	//	Anything pats the first PATH is not part of the message body
+                            }
+                            addKludgeLine(line.slice(1));
+                        } else if(!endOfMessage) {
+                            //	regular ol' message line
+                            messageBodyData.message.push(line);
+                        }
+                    });
 
-					return callback(null);
-				}
-			],
-			() => {
-				messageBodyData.message = messageBodyData.message.join('\n');
-				return cb(messageBodyData);
-			}
-		);
-	};
+                    return callback(null);
+                }
+            ],
+            () => {
+                messageBodyData.message = messageBodyData.message.join('\n');
+                return cb(messageBodyData);
+            }
+        );
+    };
 
-	this.parsePacketMessages = function(header, packetBuffer, iterator, cb) {
-		//
-		//	Check for end-of-messages marker up front before parse so we can easily
-		//	tell the difference between end and bad header
-		//
-		if(packetBuffer.length < 3) {
-			const peek = packetBuffer.slice(0, 2);
-			if(peek.equals(Buffer.from([ 0x00 ])) || peek.equals(Buffer.from( [ 0x00, 0x00 ]))) {
-				//	end marker - no more messages
-				return cb(null);
-			}
-			//	else fall through & hit exception below to log error
-		}
+    this.parsePacketMessages = function(header, packetBuffer, iterator, cb) {
+        //
+        //	Check for end-of-messages marker up front before parse so we can easily
+        //	tell the difference between end and bad header
+        //
+        if(packetBuffer.length < 3) {
+            const peek = packetBuffer.slice(0, 2);
+            if(peek.equals(Buffer.from([ 0x00 ])) || peek.equals(Buffer.from( [ 0x00, 0x00 ]))) {
+                //	end marker - no more messages
+                return cb(null);
+            }
+            //	else fall through & hit exception below to log error
+        }
 
-		let msgData;
-		try {
-			msgData = new Parser()
-				.uint16le('messageType')
-				.uint16le('ftn_msg_orig_node')
-				.uint16le('ftn_msg_dest_node')
-				.uint16le('ftn_msg_orig_net')
-				.uint16le('ftn_msg_dest_net')
-				.uint16le('ftn_attr_flags')
-				.uint16le('ftn_cost')
-				//	:TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
-				.array('modDateTime', {
-					type		: 'uint8',
-					readUntil	: b => 0x00 === b,
-				})
-				.array('toUserName', {
-					type		: 'uint8',
-					readUntil	: b => 0x00 === b,
-				})
-				.array('fromUserName', {
-					type		: 'uint8',
-					readUntil	: b => 0x00 === b,
-				})
-				.array('subject', {
-					type		: 'uint8',
-					readUntil	: b => 0x00 === b,
-				})
-				.array('message', {
-					type		: 'uint8',
-					readUntil	: b => 0x00 === b,
-				})
-				.parse(packetBuffer);
-		} catch(e) {
-			return cb(Errors.Invalid(`Failed to parse FTN message header: ${e.message}`));
-		}
+        let msgData;
+        try {
+            msgData = new Parser()
+                .uint16le('messageType')
+                .uint16le('ftn_msg_orig_node')
+                .uint16le('ftn_msg_dest_node')
+                .uint16le('ftn_msg_orig_net')
+                .uint16le('ftn_msg_dest_net')
+                .uint16le('ftn_attr_flags')
+                .uint16le('ftn_cost')
+                //	:TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
+                .array('modDateTime', {
+                    type		: 'uint8',
+                    readUntil	: b => 0x00 === b,
+                })
+                .array('toUserName', {
+                    type		: 'uint8',
+                    readUntil	: b => 0x00 === b,
+                })
+                .array('fromUserName', {
+                    type		: 'uint8',
+                    readUntil	: b => 0x00 === b,
+                })
+                .array('subject', {
+                    type		: 'uint8',
+                    readUntil	: b => 0x00 === b,
+                })
+                .array('message', {
+                    type		: 'uint8',
+                    readUntil	: b => 0x00 === b,
+                })
+                .parse(packetBuffer);
+        } catch(e) {
+            return cb(Errors.Invalid(`Failed to parse FTN message header: ${e.message}`));
+        }
 
-		if(FTN_PACKET_MESSAGE_TYPE != msgData.messageType) {
-			return cb(Errors.Invalid(`Unsupported FTN message type: ${msgData.messageType}`));
-		}
+        if(FTN_PACKET_MESSAGE_TYPE != msgData.messageType) {
+            return cb(Errors.Invalid(`Unsupported FTN message type: ${msgData.messageType}`));
+        }
 
-		//
-		//	Convert null terminated arrays to strings
-		//
-		[ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
-			msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
-		});
+        //
+        //	Convert null terminated arrays to strings
+        //
+        [ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
+            msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
+        });
 
-		//	Technically the following fields have length limits as per fts-0001.016:
-		//	* modDateTime	: 20 bytes
-		//	* toUserName	: 36 bytes
-		//	* fromUserName	: 36 bytes
-		//	* subject		: 72 bytes
+        //	Technically the following fields have length limits as per fts-0001.016:
+        //	* modDateTime	: 20 bytes
+        //	* toUserName	: 36 bytes
+        //	* fromUserName	: 36 bytes
+        //	* subject		: 72 bytes
 
-		//
-		//	The message body itself is a special beast as it may
-		//	contain an origin line, kludges, SAUCE in the case
-		//	of ANSI files, etc.
-		//				
-		const msg = new Message( {
-			toUserName		: msgData.toUserName,
-			fromUserName	: msgData.fromUserName,
-			subject			: msgData.subject,
-			modTimestamp	: ftn.getDateFromFtnDateTime(msgData.modDateTime),
-		});
+        //
+        //	The message body itself is a special beast as it may
+        //	contain an origin line, kludges, SAUCE in the case
+        //	of ANSI files, etc.
+        //
+        const msg = new Message( {
+            toUserName		: msgData.toUserName,
+            fromUserName	: msgData.fromUserName,
+            subject			: msgData.subject,
+            modTimestamp	: ftn.getDateFromFtnDateTime(msgData.modDateTime),
+        });
 
-		//	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
-		msg.meta.FtnProperty = {
-			ftn_orig_node		: header.origNode,
-			ftn_dest_node		: header.destNode,
-			ftn_orig_network	: header.origNet,
-			ftn_dest_network	: header.destNet,
+        //	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
+        msg.meta.FtnProperty = {
+            ftn_orig_node		: header.origNode,
+            ftn_dest_node		: header.destNode,
+            ftn_orig_network	: header.origNet,
+            ftn_dest_network	: header.destNet,
 
-			ftn_attr_flags		: msgData.ftn_attr_flags,
-			ftn_cost			: msgData.ftn_cost,
+            ftn_attr_flags		: msgData.ftn_attr_flags,
+            ftn_cost			: msgData.ftn_cost,
 
-			ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
-			ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
-			ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
-			ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
-		};
+            ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
+            ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
+            ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
+            ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
+        };
 
-		self.processMessageBody(msgData.message, messageBodyData => {
-			msg.message 		= messageBodyData.message;
-			msg.meta.FtnKludge	= messageBodyData.kludgeLines;
+        self.processMessageBody(msgData.message, messageBodyData => {
+            msg.message 		= messageBodyData.message;
+            msg.meta.FtnKludge	= messageBodyData.kludgeLines;
 
-			if(messageBodyData.tearLine) {
-				msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
+            if(messageBodyData.tearLine) {
+                msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
 
-				if(self.options.keepTearAndOrigin) {
-					msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
-				}
-			}
+                if(self.options.keepTearAndOrigin) {
+                    msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
+                }
+            }
 
-			if(messageBodyData.seenBy.length > 0) {
-				msg.meta.FtnProperty.ftn_seen_by = messageBodyData.seenBy;
-			}
+            if(messageBodyData.seenBy.length > 0) {
+                msg.meta.FtnProperty.ftn_seen_by = messageBodyData.seenBy;
+            }
 
-			if(messageBodyData.area) {
-				msg.meta.FtnProperty.ftn_area = messageBodyData.area;
-			}
+            if(messageBodyData.area) {
+                msg.meta.FtnProperty.ftn_area = messageBodyData.area;
+            }
 
-			if(messageBodyData.originLine) {
-				msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
+            if(messageBodyData.originLine) {
+                msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
 
-				if(self.options.keepTearAndOrigin) {
-					msg.message += `${messageBodyData.originLine}\r\n`;
-				}
-			}
+                if(self.options.keepTearAndOrigin) {
+                    msg.message += `${messageBodyData.originLine}\r\n`;
+                }
+            }
 
-			//
-			//	If we have a UTC offset kludge (e.g. TZUTC) then update
-			//	modDateTime with it
-			//
-			if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
-				msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
-			}
+            //
+            //	If we have a UTC offset kludge (e.g. TZUTC) then update
+            //	modDateTime with it
+            //
+            if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
+                msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
+            }
 
-			//	:TODO: Parser should give is this info:
-			const bytesRead =
+            //	:TODO: Parser should give is this info:
+            const bytesRead =
 				14 +								//	fixed header size
 				msgData.modDateTime.length + 1 +	//	+1 = NULL
 				msgData.toUserName.length + 1 +		//	+1 = NULL
@@ -668,322 +668,322 @@ function Packet(options) {
 				msgData.subject.length + 1 +		//	+1 = NULL
 				msgData.message.length;				//	includes NULL
 
-			const nextBuf = packetBuffer.slice(bytesRead);
-			if(nextBuf.length > 0) {
-				const next = function(e) {
-					if(e) {
-						cb(e);
-					} else {
-						self.parsePacketMessages(header, nextBuf, iterator, cb);
-					}
-				};
+            const nextBuf = packetBuffer.slice(bytesRead);
+            if(nextBuf.length > 0) {
+                const next = function(e) {
+                    if(e) {
+                        cb(e);
+                    } else {
+                        self.parsePacketMessages(header, nextBuf, iterator, cb);
+                    }
+                };
 
-				iterator('message', msg, next);
-			} else {
-				cb(null);
-			}
-		});
-	};
+                iterator('message', msg, next);
+            } else {
+                cb(null);
+            }
+        });
+    };
 
-	this.sanatizeFtnProperties = function(message) {
-		[
-			Message.FtnPropertyNames.FtnOrigNode,
-			Message.FtnPropertyNames.FtnDestNode,
-			Message.FtnPropertyNames.FtnOrigNetwork,
-			Message.FtnPropertyNames.FtnDestNetwork,
-			Message.FtnPropertyNames.FtnAttrFlags,
-			Message.FtnPropertyNames.FtnCost,
-			Message.FtnPropertyNames.FtnOrigZone,
-			Message.FtnPropertyNames.FtnDestZone,
-			Message.FtnPropertyNames.FtnOrigPoint,
-			Message.FtnPropertyNames.FtnDestPoint,
-			Message.FtnPropertyNames.FtnAttribute,
-			Message.FtnPropertyNames.FtnMsgOrigNode,
-			Message.FtnPropertyNames.FtnMsgDestNode,
-			Message.FtnPropertyNames.FtnMsgOrigNet,
-			Message.FtnPropertyNames.FtnMsgDestNet,
-		].forEach( propName => {
-			if(message.meta.FtnProperty[propName]) {
-				message.meta.FtnProperty[propName] = parseInt(message.meta.FtnProperty[propName]) || 0;
-			}
-		});
-	};
+    this.sanatizeFtnProperties = function(message) {
+        [
+            Message.FtnPropertyNames.FtnOrigNode,
+            Message.FtnPropertyNames.FtnDestNode,
+            Message.FtnPropertyNames.FtnOrigNetwork,
+            Message.FtnPropertyNames.FtnDestNetwork,
+            Message.FtnPropertyNames.FtnAttrFlags,
+            Message.FtnPropertyNames.FtnCost,
+            Message.FtnPropertyNames.FtnOrigZone,
+            Message.FtnPropertyNames.FtnDestZone,
+            Message.FtnPropertyNames.FtnOrigPoint,
+            Message.FtnPropertyNames.FtnDestPoint,
+            Message.FtnPropertyNames.FtnAttribute,
+            Message.FtnPropertyNames.FtnMsgOrigNode,
+            Message.FtnPropertyNames.FtnMsgDestNode,
+            Message.FtnPropertyNames.FtnMsgOrigNet,
+            Message.FtnPropertyNames.FtnMsgDestNet,
+        ].forEach( propName => {
+            if(message.meta.FtnProperty[propName]) {
+                message.meta.FtnProperty[propName] = parseInt(message.meta.FtnProperty[propName]) || 0;
+            }
+        });
+    };
 
-	this.writeMessageHeader = function(message, buf) {
-		//	ensure address FtnProperties are numbers
-		self.sanatizeFtnProperties(message);
+    this.writeMessageHeader = function(message, buf) {
+        //	ensure address FtnProperties are numbers
+        self.sanatizeFtnProperties(message);
 
-		const destNode	= message.meta.FtnProperty.ftn_msg_dest_node || message.meta.FtnProperty.ftn_dest_node;
-		const destNet	= message.meta.FtnProperty.ftn_msg_dest_net || message.meta.FtnProperty.ftn_dest_network;
+        const destNode	= message.meta.FtnProperty.ftn_msg_dest_node || message.meta.FtnProperty.ftn_dest_node;
+        const destNet	= message.meta.FtnProperty.ftn_msg_dest_net || message.meta.FtnProperty.ftn_dest_network;
 
-		buf.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
-		buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
-		buf.writeUInt16LE(destNode, 4);
-		buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_network, 6);
-		buf.writeUInt16LE(destNet, 8);
-		buf.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
-		buf.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
+        buf.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
+        buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
+        buf.writeUInt16LE(destNode, 4);
+        buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_network, 6);
+        buf.writeUInt16LE(destNet, 8);
+        buf.writeUInt16LE(message.meta.FtnProperty.ftn_attr_flags, 10);
+        buf.writeUInt16LE(message.meta.FtnProperty.ftn_cost, 12);
 
-		const dateTimeBuffer = Buffer.from(ftn.getDateTimeString(message.modTimestamp) + '\0');
-		dateTimeBuffer.copy(buf, 14);
-	};
+        const dateTimeBuffer = Buffer.from(ftn.getDateTimeString(message.modTimestamp) + '\0');
+        dateTimeBuffer.copy(buf, 14);
+    };
 
-	this.getMessageEntryBuffer = function(message, options, cb) {
+    this.getMessageEntryBuffer = function(message, options, cb) {
 
-		function getAppendMeta(k, m, sepChar=':') {
-			let append = '';
-			if(m) {
-				let a = m;
-				if(!_.isArray(a)) {
-					a = [ a ];
-				}
-				a.forEach(v => {
-					append += `${k}${sepChar} ${v}\r`;
-				});
-			}
-			return append;
-		}
+        function getAppendMeta(k, m, sepChar=':') {
+            let append = '';
+            if(m) {
+                let a = m;
+                if(!_.isArray(a)) {
+                    a = [ a ];
+                }
+                a.forEach(v => {
+                    append += `${k}${sepChar} ${v}\r`;
+                });
+            }
+            return append;
+        }
 
-		async.waterfall(
-			[
-				function prepareHeaderAndKludges(callback) {
-					const basicHeader = Buffer.alloc(34);
-					self.writeMessageHeader(message, basicHeader);			
+        async.waterfall(
+            [
+                function prepareHeaderAndKludges(callback) {
+                    const basicHeader = Buffer.alloc(34);
+                    self.writeMessageHeader(message, basicHeader);
 
-					//
-					//	To, from, and subject must be NULL term'd and have max lengths as per spec.
-					//
-					const toUserNameBuf 	= strUtil.stringToNullTermBuffer(message.toUserName, { encoding : 'cp437', maxBufLen : 36 } );
-					const fromUserNameBuf	= strUtil.stringToNullTermBuffer(message.fromUserName, { encoding : 'cp437', maxBufLen : 36 } );
-					const subjectBuf		= strUtil.stringToNullTermBuffer(message.subject, { encoding : 'cp437', maxBufLen : 72 } );
+                    //
+                    //	To, from, and subject must be NULL term'd and have max lengths as per spec.
+                    //
+                    const toUserNameBuf 	= strUtil.stringToNullTermBuffer(message.toUserName, { encoding : 'cp437', maxBufLen : 36 } );
+                    const fromUserNameBuf	= strUtil.stringToNullTermBuffer(message.fromUserName, { encoding : 'cp437', maxBufLen : 36 } );
+                    const subjectBuf		= strUtil.stringToNullTermBuffer(message.subject, { encoding : 'cp437', maxBufLen : 72 } );
 
-					//
-					//	message: unbound length, NULL term'd
-					//
-					//	We need to build in various special lines - kludges, area,
-					//	seen-by, etc.
-					//
-					let msgBody = '';
+                    //
+                    //	message: unbound length, NULL term'd
+                    //
+                    //	We need to build in various special lines - kludges, area,
+                    //	seen-by, etc.
+                    //
+                    let msgBody = '';
 
-					//
-					//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-					//	AREA:CONFERENCE
-					//	Should be first line in a message
-					//
-					if(message.meta.FtnProperty.ftn_area) {
-						msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
-					}
+                    //
+                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //	AREA:CONFERENCE
+                    //	Should be first line in a message
+                    //
+                    if(message.meta.FtnProperty.ftn_area) {
+                        msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
+                    }
 
-					//	:TODO: DRY with similar function in this file!
-					Object.keys(message.meta.FtnKludge).forEach(k => {
-						switch(k) {
-							case 'PATH' :
-								break;	//	skip & save for last
+                    //	:TODO: DRY with similar function in this file!
+                    Object.keys(message.meta.FtnKludge).forEach(k => {
+                        switch(k) {
+                            case 'PATH' :
+                                break;	//	skip & save for last
 
-							case 'Via' :
-							case 'FMPT' :
-							case 'TOPT' :
-							case 'INTL' :
-								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');	// no sepChar
-								break;
+                            case 'Via' :
+                            case 'FMPT' :
+                            case 'TOPT' :
+                            case 'INTL' :
+                                msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');	// no sepChar
+                                break;
 
-							default		:
-								msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
-								break;
-						}
-					});
+                            default		:
+                                msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
+                                break;
+                        }
+                    });
 
-					return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody);
-				},
-				function prepareAnsiMessageBody(basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, callback) {
-					if(!strUtil.isAnsi(message.message)) {
-						return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, message.message);
-					}
+                    return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody);
+                },
+                function prepareAnsiMessageBody(basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, callback) {
+                    if(!strUtil.isAnsi(message.message)) {
+                        return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, message.message);
+                    }
 
-					ansiPrep(
-						message.message,
-						{
-							cols				: 80,
-							rows				: 'auto',
-							forceLineTerm		: true,
-							exportMode			: true,
-						},
-						(err, preppedMsg) => {
-							return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, preppedMsg || message.message);
-						}
-					);
-				},
-				function addMessageBody(basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, preppedMsg, callback) {
-					msgBody += preppedMsg + '\r';
+                    ansiPrep(
+                        message.message,
+                        {
+                            cols				: 80,
+                            rows				: 'auto',
+                            forceLineTerm		: true,
+                            exportMode			: true,
+                        },
+                        (err, preppedMsg) => {
+                            return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, preppedMsg || message.message);
+                        }
+                    );
+                },
+                function addMessageBody(basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, preppedMsg, callback) {
+                    msgBody += preppedMsg + '\r';
 
-					//
-					//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-					//	Tear line should be near the bottom of a message
-					//
-					if(message.meta.FtnProperty.ftn_tear_line) {
-						msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
-					}
+                    //
+                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //	Tear line should be near the bottom of a message
+                    //
+                    if(message.meta.FtnProperty.ftn_tear_line) {
+                        msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
+                    }
 
-					//
-					//	Origin line should be near the bottom of a message
-					//
-					if(message.meta.FtnProperty.ftn_origin) {
-						msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
-					}
+                    //
+                    //	Origin line should be near the bottom of a message
+                    //
+                    if(message.meta.FtnProperty.ftn_origin) {
+                        msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
+                    }
 
-					//
-					//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-					//	SEEN-BY and PATH should be the last lines of a message
-					//
-					msgBody += getAppendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
-					msgBody += getAppendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
+                    //
+                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //	SEEN-BY and PATH should be the last lines of a message
+                    //
+                    msgBody += getAppendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
+                    msgBody += getAppendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
 
-					let msgBodyEncoded;
-					try {
-						msgBodyEncoded = iconv.encode(msgBody + '\0', options.encoding);
-					} catch(e) {
-						msgBodyEncoded = iconv.encode(msgBody + '\0', 'ascii');
-					}
+                    let msgBodyEncoded;
+                    try {
+                        msgBodyEncoded = iconv.encode(msgBody + '\0', options.encoding);
+                    } catch(e) {
+                        msgBodyEncoded = iconv.encode(msgBody + '\0', 'ascii');
+                    }
 
-					return callback(
-						null,
-						Buffer.concat( [
-							basicHeader,
-							toUserNameBuf,
-							fromUserNameBuf,
-							subjectBuf,
-							msgBodyEncoded
-						])
-					);
-				}
-			],
-			(err, msgEntryBuffer) => {
-				return cb(err, msgEntryBuffer);
-			}
-		);
-	};
+                    return callback(
+                        null,
+                        Buffer.concat( [
+                            basicHeader,
+                            toUserNameBuf,
+                            fromUserNameBuf,
+                            subjectBuf,
+                            msgBodyEncoded
+                        ])
+                    );
+                }
+            ],
+            (err, msgEntryBuffer) => {
+                return cb(err, msgEntryBuffer);
+            }
+        );
+    };
 
-	this.writeMessage = function(message, ws, options) {
-		const basicHeader = Buffer.alloc(34);
-		self.writeMessageHeader(message, basicHeader);
+    this.writeMessage = function(message, ws, options) {
+        const basicHeader = Buffer.alloc(34);
+        self.writeMessageHeader(message, basicHeader);
 
-		ws.write(basicHeader);
+        ws.write(basicHeader);
 
-		//	toUserName & fromUserName: up to 36 bytes in length, NULL term'd
-		//	:TODO: DRY...
-		let encBuf = iconv.encode(message.toUserName + '\0', 'CP437').slice(0, 36);
-		encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
-		ws.write(encBuf);
+        //	toUserName & fromUserName: up to 36 bytes in length, NULL term'd
+        //	:TODO: DRY...
+        let encBuf = iconv.encode(message.toUserName + '\0', 'CP437').slice(0, 36);
+        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        ws.write(encBuf);
 
-		encBuf = iconv.encode(message.fromUserName + '\0', 'CP437').slice(0, 36);
-		encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
-		ws.write(encBuf);
+        encBuf = iconv.encode(message.fromUserName + '\0', 'CP437').slice(0, 36);
+        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        ws.write(encBuf);
 
-		//	subject: up to 72 bytes in length, NULL term'd
-		encBuf = iconv.encode(message.subject + '\0', 'CP437').slice(0, 72);
-		encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
-		ws.write(encBuf);
+        //	subject: up to 72 bytes in length, NULL term'd
+        encBuf = iconv.encode(message.subject + '\0', 'CP437').slice(0, 72);
+        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        ws.write(encBuf);
 
-		//
-		//	message: unbound length, NULL term'd
-		//
-		//	We need to build in various special lines - kludges, area,
-		//	seen-by, etc.
-		//
-		//	:TODO: Put this in it's own method
-		let msgBody = '';
+        //
+        //	message: unbound length, NULL term'd
+        //
+        //	We need to build in various special lines - kludges, area,
+        //	seen-by, etc.
+        //
+        //	:TODO: Put this in it's own method
+        let msgBody = '';
 
-		function appendMeta(k, m, sepChar=':') {
-			if(m) {
-				let a = m;
-				if(!_.isArray(a)) {
-					a = [ a ];
-				}
-				a.forEach(v => {
-					msgBody += `${k}${sepChar} ${v}\r`;
-				});
-			}
-		}
+        function appendMeta(k, m, sepChar=':') {
+            if(m) {
+                let a = m;
+                if(!_.isArray(a)) {
+                    a = [ a ];
+                }
+                a.forEach(v => {
+                    msgBody += `${k}${sepChar} ${v}\r`;
+                });
+            }
+        }
 
-		//
-		//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-		//	AREA:CONFERENCE
-		//	Should be first line in a message
-		//
-		if(message.meta.FtnProperty.ftn_area) {
-			msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
-		}
+        //
+        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //	AREA:CONFERENCE
+        //	Should be first line in a message
+        //
+        if(message.meta.FtnProperty.ftn_area) {
+            msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
+        }
 
-		Object.keys(message.meta.FtnKludge).forEach(k => {
-			switch(k) {
-				case 'PATH' : break;	//	skip & save for last
+        Object.keys(message.meta.FtnKludge).forEach(k => {
+            switch(k) {
+                case 'PATH' : break;	//	skip & save for last
 
-				case 'Via' :
-				case 'FMPT' :
-				case 'TOPT' :
-				case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break;	//	no sepChar
+                case 'Via' :
+                case 'FMPT' :
+                case 'TOPT' :
+                case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break;	//	no sepChar
 
-				default		: appendMeta(`\x01${k}`, message.meta.FtnKludge[k]); break;
-			}
-		});
+                default		: appendMeta(`\x01${k}`, message.meta.FtnKludge[k]); break;
+            }
+        });
 
-		msgBody += message.message + '\r';
+        msgBody += message.message + '\r';
 
-		//
-		//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-		//	Tear line should be near the bottom of a message
-		//
-		if(message.meta.FtnProperty.ftn_tear_line) {
-			msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
-		}
+        //
+        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //	Tear line should be near the bottom of a message
+        //
+        if(message.meta.FtnProperty.ftn_tear_line) {
+            msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
+        }
 
-		//
-		//	Origin line should be near the bottom of a message
-		//
-		if(message.meta.FtnProperty.ftn_origin) {
-			msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
-		}
+        //
+        //	Origin line should be near the bottom of a message
+        //
+        if(message.meta.FtnProperty.ftn_origin) {
+            msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
+        }
 
-		//
-		//	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-		//	SEEN-BY and PATH should be the last lines of a message
-		//
-		appendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
+        //
+        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //	SEEN-BY and PATH should be the last lines of a message
+        //
+        appendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
 
-		appendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
+        appendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
 
-		//
-		//	:TODO: We should encode based on config and add the proper kludge here!
-		ws.write(iconv.encode(msgBody + '\0', options.encoding));
-	};
+        //
+        //	:TODO: We should encode based on config and add the proper kludge here!
+        ws.write(iconv.encode(msgBody + '\0', options.encoding));
+    };
 
-	this.parsePacketBuffer = function(packetBuffer, iterator, cb) {
-		async.waterfall(
-			[
-				function processHeader(callback) {
-					self.parsePacketHeader(packetBuffer, (err, header) => {
-						if(err) {
-							return callback(err);
-						}
+    this.parsePacketBuffer = function(packetBuffer, iterator, cb) {
+        async.waterfall(
+            [
+                function processHeader(callback) {
+                    self.parsePacketHeader(packetBuffer, (err, header) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						const next = function(e) {
-							return callback(e, header);
-						};
+                        const next = function(e) {
+                            return callback(e, header);
+                        };
 
-						iterator('header', header, next);
-					});
-				},
-				function processMessages(header, callback) {
-					self.parsePacketMessages(
-						header,
-						packetBuffer.slice(FTN_PACKET_HEADER_SIZE),
-						iterator,
-						callback);
-				}
-			],
-			cb	//	complete
-		);
-	};
+                        iterator('header', header, next);
+                    });
+                },
+                function processMessages(header, callback) {
+                    self.parsePacketMessages(
+                        header,
+                        packetBuffer.slice(FTN_PACKET_HEADER_SIZE),
+                        iterator,
+                        callback);
+                }
+            ],
+            cb	//	complete
+        );
+    };
 }
 
 //
@@ -994,100 +994,100 @@ function Packet(options) {
 //	* http://www.skepticfiles.org/aj/basics03.htm
 //
 Packet.Attribute = {
-	Private					: 0x0001,	//	Private message / NetMail
-	Crash					: 0x0002,
-	Received				: 0x0004,
-	Sent					: 0x0008,
-	FileAttached			: 0x0010,
-	InTransit				: 0x0020,
-	Orphan					: 0x0040,
-	KillSent				: 0x0080,
-	Local					: 0x0100,	//	Message is from *this* system
-	Hold					: 0x0200,
-	Reserved0				: 0x0400,
-	FileRequest				: 0x0800,
-	ReturnReceiptRequest	: 0x1000,
-	ReturnReceipt			: 0x2000,
-	AuditRequest			: 0x4000,
-	FileUpdateRequest		: 0x8000,
+    Private					: 0x0001,	//	Private message / NetMail
+    Crash					: 0x0002,
+    Received				: 0x0004,
+    Sent					: 0x0008,
+    FileAttached			: 0x0010,
+    InTransit				: 0x0020,
+    Orphan					: 0x0040,
+    KillSent				: 0x0080,
+    Local					: 0x0100,	//	Message is from *this* system
+    Hold					: 0x0200,
+    Reserved0				: 0x0400,
+    FileRequest				: 0x0800,
+    ReturnReceiptRequest	: 0x1000,
+    ReturnReceipt			: 0x2000,
+    AuditRequest			: 0x4000,
+    FileUpdateRequest		: 0x8000,
 };
 Object.freeze(Packet.Attribute);
 
 Packet.prototype.read = function(pathOrBuffer, iterator, cb) {
-	var self = this;
+    var self = this;
 
-	async.series(
-		[
-			function getBufferIfPath(callback) {
-				if(_.isString(pathOrBuffer)) {
-					fs.readFile(pathOrBuffer, (err, data) => {
-						pathOrBuffer = data;
-						callback(err);
-					});
-				} else {
-					callback(null);
-				}
-			},
-			function parseBuffer(callback) {
-				self.parsePacketBuffer(pathOrBuffer, iterator, err => {
-					callback(err);
-				});
-			}
-		],
-		err => {
-			cb(err);
-		}
-	);
+    async.series(
+        [
+            function getBufferIfPath(callback) {
+                if(_.isString(pathOrBuffer)) {
+                    fs.readFile(pathOrBuffer, (err, data) => {
+                        pathOrBuffer = data;
+                        callback(err);
+                    });
+                } else {
+                    callback(null);
+                }
+            },
+            function parseBuffer(callback) {
+                self.parsePacketBuffer(pathOrBuffer, iterator, err => {
+                    callback(err);
+                });
+            }
+        ],
+        err => {
+            cb(err);
+        }
+    );
 };
 
 Packet.prototype.writeHeader = function(ws, packetHeader) {
-	return this.writePacketHeader(packetHeader, ws);
+    return this.writePacketHeader(packetHeader, ws);
 };
 
 Packet.prototype.writeMessageEntry = function(ws, msgEntry) {
-	ws.write(msgEntry);
-	return msgEntry.length;
+    ws.write(msgEntry);
+    return msgEntry.length;
 };
 
 Packet.prototype.writeTerminator = function(ws) {
-	//
-	//	From FTS-0001.016:
-	//	"A  pseudo-message beginning with the word 0000H signifies the end of the packet."
-	//
-	ws.write(Buffer.from( [ 0x00, 0x00 ] ));	//	final extra null term
-	return 2;
+    //
+    //	From FTS-0001.016:
+    //	"A  pseudo-message beginning with the word 0000H signifies the end of the packet."
+    //
+    ws.write(Buffer.from( [ 0x00, 0x00 ] ));	//	final extra null term
+    return 2;
 };
 
 Packet.prototype.writeStream = function(ws, messages, options) {
-	if(!_.isBoolean(options.terminatePacket)) {
-		options.terminatePacket = true;
-	}
+    if(!_.isBoolean(options.terminatePacket)) {
+        options.terminatePacket = true;
+    }
 
-	if(_.isObject(options.packetHeader)) {
-		this.writePacketHeader(options.packetHeader, ws);
-	}
+    if(_.isObject(options.packetHeader)) {
+        this.writePacketHeader(options.packetHeader, ws);
+    }
 
-	options.encoding = options.encoding || 'utf8';
+    options.encoding = options.encoding || 'utf8';
 
-	messages.forEach(msg => {
-		this.writeMessage(msg, ws, options);
-	});
+    messages.forEach(msg => {
+        this.writeMessage(msg, ws, options);
+    });
 
-	if(true === options.terminatePacket) {
-		ws.write(Buffer.from( [ 0 ] ));	//	final extra null term
-	}
+    if(true === options.terminatePacket) {
+        ws.write(Buffer.from( [ 0 ] ));	//	final extra null term
+    }
 };
 
 Packet.prototype.write = function(path, packetHeader, messages, options) {
-	if(!_.isArray(messages)) {
-		messages = [ messages ];
-	}
+    if(!_.isArray(messages)) {
+        messages = [ messages ];
+    }
 
-	options = options || { encoding : 'utf8' };	//	utf-8 = 'CHRS UTF-8 4'
+    options = options || { encoding : 'utf8' };	//	utf-8 = 'CHRS UTF-8 4'
 
-	this.writeStream(
-		fs.createWriteStream(path),	//	:TODO: specify mode/etc.
-		messages,
-		Object.assign( { packetHeader : packetHeader, terminatePacket : true }, options)
-	);
+    this.writeStream(
+        fs.createWriteStream(path),	//	:TODO: specify mode/etc.
+        messages,
+        Object.assign( { packetHeader : packetHeader, terminatePacket : true }, options)
+    );
 };
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 3fc51cd3..0f65e127 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -45,12 +45,12 @@ exports.getQuotePrefix				= getQuotePrefix;
 //	See list here: https://github.com/Mithgol/node-fidonet-jam
 
 function stringToNullPaddedBuffer(s, bufLen) {
-	let buffer 	= Buffer.alloc(bufLen);
-	let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
-	for(let i = 0; i < enc.length; ++i) {
-		buffer[i] = enc[i];
-	}
-	return buffer;
+    let buffer 	= Buffer.alloc(bufLen);
+    let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
+    for(let i = 0; i < enc.length; ++i) {
+        buffer[i] = enc[i];
+    }
+    return buffer;
 }
 
 //
@@ -58,45 +58,45 @@ function stringToNullPaddedBuffer(s, bufLen) {
 //
 //	:TODO: Name the next couple methods better - for FTN *packets*
 function getDateFromFtnDateTime(dateTime) {
-	//
-	//	Examples seen in the wild (Working):
-	//		"12 Sep 88 18:17:59"
-	//		"Tue 01 Jan 80 00:00"
-	//		"27 Feb 15  00:00:03"
-	//
-	//	:TODO: Use moment.js here
-	return moment(Date.parse(dateTime));	//	Date.parse() allows funky formats
+    //
+    //	Examples seen in the wild (Working):
+    //		"12 Sep 88 18:17:59"
+    //		"Tue 01 Jan 80 00:00"
+    //		"27 Feb 15  00:00:03"
+    //
+    //	:TODO: Use moment.js here
+    return moment(Date.parse(dateTime));	//	Date.parse() allows funky formats
 //	return (new Date(Date.parse(dateTime))).toISOString();
 }
 
 function getDateTimeString(m) {
-	//
-	//	From http://ftsc.org/docs/fts-0001.016:
-	//	DateTime   = (* a character string 20 characters long *)
-	//  	(* 01 Jan 86  02:34:56 *)
-	//		DayOfMonth " " Month " " Year " "
-	//		" " HH ":" MM ":" SS
-	//		Null
-	//
-	//	DayOfMonth = "01" | "02" | "03" | ... | "31"   (* Fido 0 fills *)
-	//	Month      = "Jan" | "Feb" | "Mar" | "Apr" | "May" | "Jun" |
-	//	           "Jul" | "Aug" | "Sep" | "Oct" | "Nov" | "Dec"
-	//	Year       = "01" | "02" | .. | "85" | "86" | ... | "99" | "00"
-	//	HH         = "00" | .. | "23"
-	//	MM         = "00" | .. | "59"
-	//	SS         = "00" | .. | "59"
-	//
-	if(!moment.isMoment(m)) {
-		m = moment(m);
-	}
+    //
+    //	From http://ftsc.org/docs/fts-0001.016:
+    //	DateTime   = (* a character string 20 characters long *)
+    //  	(* 01 Jan 86  02:34:56 *)
+    //		DayOfMonth " " Month " " Year " "
+    //		" " HH ":" MM ":" SS
+    //		Null
+    //
+    //	DayOfMonth = "01" | "02" | "03" | ... | "31"   (* Fido 0 fills *)
+    //	Month      = "Jan" | "Feb" | "Mar" | "Apr" | "May" | "Jun" |
+    //	           "Jul" | "Aug" | "Sep" | "Oct" | "Nov" | "Dec"
+    //	Year       = "01" | "02" | .. | "85" | "86" | ... | "99" | "00"
+    //	HH         = "00" | .. | "23"
+    //	MM         = "00" | .. | "59"
+    //	SS         = "00" | .. | "59"
+    //
+    if(!moment.isMoment(m)) {
+        m = moment(m);
+    }
 
-	return m.format('DD MMM YY  HH:mm:ss');
+    return m.format('DD MMM YY  HH:mm:ss');
 }
 
 function getMessageSerialNumber(messageId) {
-	const msSinceEnigmaEpoc = (Date.now() - Date.UTC(2016, 1, 1));
-	const hash				= Math.abs(new FNV1a(msSinceEnigmaEpoc + messageId).value).toString(16);
-	return `00000000${hash}`.substr(-8);
+    const msSinceEnigmaEpoc = (Date.now() - Date.UTC(2016, 1, 1));
+    const hash				= Math.abs(new FNV1a(msSinceEnigmaEpoc + messageId).value).toString(16);
+    return `00000000${hash}`.substr(-8);
 }
 
 //
@@ -143,11 +143,11 @@ function getMessageSerialNumber(messageId) {
 //	format, but that will only help when using newer Mystic versions.
 //
 function getMessageIdentifier(message, address, isNetMail = false) {
-	const addrStr = new Address(address).toString('5D');
-	return isNetMail ?
-		`${addrStr} ${getMessageSerialNumber(message.messageId)}` :
-		`${message.messageId}.${message.areaTag.toLowerCase()}@${addrStr} ${getMessageSerialNumber(message.messageId)}`
-	;
+    const addrStr = new Address(address).toString('5D');
+    return isNetMail ?
+        `${addrStr} ${getMessageSerialNumber(message.messageId)}` :
+        `${message.messageId}.${message.areaTag.toLowerCase()}@${addrStr} ${getMessageSerialNumber(message.messageId)}`
+    ;
 }
 
 //
@@ -158,10 +158,10 @@ function getMessageIdentifier(message, address, isNetMail = false) {
 //	in which (<os>; <arch>; <nodeVer>) is used instead
 //
 function getProductIdentifier() {
-	const version = getCleanEnigmaVersion();
-	const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    const version = getCleanEnigmaVersion();
+    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
 
-	return `ENiGMA1/2 ${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
+    return `ENiGMA1/2 ${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
 
 //
@@ -171,7 +171,7 @@ function getProductIdentifier() {
 //	http://ftsc.org/docs/frl-1004.002
 //
 function getUTCTimeZoneOffset() {
-	return moment().format('ZZ').replace(/\+/, '');
+    return moment().format('ZZ').replace(/\+/, '');
 }
 
 //
@@ -179,18 +179,18 @@ function getUTCTimeZoneOffset() {
 //	http://ftsc.org/docs/fsc-0032.001
 //
 function getQuotePrefix(name) {
-	let initials;
+    let initials;
 
-	const parts = name.split(' ');
-	if(parts.length > 1) {
-		//	First & Last initials - (Bryan Ashby -> BA)
-		initials = `${parts[0].slice(0, 1)}${parts[parts.length - 1].slice(0, 1)}`.toUpperCase();
-	} else {
-		//	Just use the first two - (NuSkooler -> Nu)
-		initials = _.capitalize(name.slice(0, 2));
-	}
+    const parts = name.split(' ');
+    if(parts.length > 1) {
+        //	First & Last initials - (Bryan Ashby -> BA)
+        initials = `${parts[0].slice(0, 1)}${parts[parts.length - 1].slice(0, 1)}`.toUpperCase();
+    } else {
+        //	Just use the first two - (NuSkooler -> Nu)
+        initials = _.capitalize(name.slice(0, 2));
+    }
 
-	return ` ${initials}> `;
+    return ` ${initials}> `;
 }
 
 //
@@ -198,18 +198,18 @@ function getQuotePrefix(name) {
 //	http://ftsc.org/docs/fts-0004.001
 //
 function getOrigin(address) {
-	const config = Config();
-	const origin = _.has(config, 'messageNetworks.originLine') ?
-		config.messageNetworks.originLine :
-		config.general.boardName;
+    const config = Config();
+    const origin = _.has(config, 'messageNetworks.originLine') ?
+        config.messageNetworks.originLine :
+        config.general.boardName;
 
-	const addrStr = new Address(address).toString('5D');
-	return ` * Origin: ${origin} (${addrStr})`;
+    const addrStr = new Address(address).toString('5D');
+    return ` * Origin: ${origin} (${addrStr})`;
 }
 
 function getTearLine() {
-	const nodeVer = process.version.substr(1);	//	remove 'v' prefix
-	return `--- ENiGMA 1/2 v${packageJson.version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
+    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    return `--- ENiGMA 1/2 v${packageJson.version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
 
 //
@@ -217,17 +217,17 @@ function getTearLine() {
 //	http://ftsc.org/docs/frl-1005.001
 //
 function getVia(address) {
-	/*
+    /*
 		FRL-1005.001 states teh following format:
 
 		^AVia: <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone]
 	    <Program Name> <Version> [Serial Number]<CR>
 	*/
-	const addrStr	= new Address(address).toString('5D');
-	const dateTime	= moment().utc().format('YYYYMMDD.HHmmSS.SSSS.UTC');
-	const version	= getCleanEnigmaVersion();
+    const addrStr	= new Address(address).toString('5D');
+    const dateTime	= moment().utc().format('YYYYMMDD.HHmmSS.SSSS.UTC');
+    const version	= getCleanEnigmaVersion();
 
-	return `${addrStr} @${dateTime} ENiGMA1/2 ${version}`;
+    return `${addrStr} @${dateTime} ENiGMA1/2 ${version}`;
 }
 
 //
@@ -235,50 +235,50 @@ function getVia(address) {
 //	http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
 //
 function getIntl(toAddress, fromAddress) {
-	//
-	//	INTL differs from 'standard' kludges in that there is no ':' after "INTL"
-	//
-	//	"<SOH>"INTL "<destination address>" "<origin address><CR>"
-	//	"...These addresses shall be given on the form <zone>:<net>/<node>"
-	//
-	return `${toAddress.toString('3D')} ${fromAddress.toString('3D')}`;
+    //
+    //	INTL differs from 'standard' kludges in that there is no ':' after "INTL"
+    //
+    //	"<SOH>"INTL "<destination address>" "<origin address><CR>"
+    //	"...These addresses shall be given on the form <zone>:<net>/<node>"
+    //
+    return `${toAddress.toString('3D')} ${fromAddress.toString('3D')}`;
 }
 
 function getAbbreviatedNetNodeList(netNodes) {
-	let abbrList = '';
-	let currNet;
-	netNodes.forEach(netNode => {
-		if(_.isString(netNode)) {
-			netNode = Address.fromString(netNode);
-		}
-		if(currNet !== netNode.net) {
-			abbrList += `${netNode.net}/`;
-			currNet = netNode.net;
-		}
-		abbrList += `${netNode.node} `;
-	});
+    let abbrList = '';
+    let currNet;
+    netNodes.forEach(netNode => {
+        if(_.isString(netNode)) {
+            netNode = Address.fromString(netNode);
+        }
+        if(currNet !== netNode.net) {
+            abbrList += `${netNode.net}/`;
+            currNet = netNode.net;
+        }
+        abbrList += `${netNode.node} `;
+    });
 
-	return abbrList.trim();	//	remove trailing space
+    return abbrList.trim();	//	remove trailing space
 }
 
 //
 //	Parse an abbreviated net/node list commonly used for SEEN-BY and PATH
 //
 function parseAbbreviatedNetNodeList(netNodes) {
-	const re = /([0-9]+)\/([0-9]+)\s?|([0-9]+)\s?/g;
-	let net;
-	let m;
-	let results = [];
-	while(null !== (m = re.exec(netNodes))) {
-		if(m[1] && m[2]) {
-			net = parseInt(m[1]);
-			results.push(new Address( { net : net, node : parseInt(m[2]) } ));
-		} else if(net) {
-			results.push(new Address( { net : net, node : parseInt(m[3]) } ));
-		}
-	}
+    const re = /([0-9]+)\/([0-9]+)\s?|([0-9]+)\s?/g;
+    let net;
+    let m;
+    let results = [];
+    while(null !== (m = re.exec(netNodes))) {
+        if(m[1] && m[2]) {
+            net = parseInt(m[1]);
+            results.push(new Address( { net : net, node : parseInt(m[2]) } ));
+        } else if(net) {
+            results.push(new Address( { net : net, node : parseInt(m[3]) } ));
+        }
+    }
 
-	return results;
+    return results;
 }
 
 //
@@ -295,7 +295,7 @@ function parseAbbreviatedNetNodeList(netNodes) {
 //	not the "SEEN-BY" prefix itself
 //
 function getUpdatedSeenByEntries(existingEntries, additions) {
-	/*
+    /*
 		From FTS-0004:
 
 		"There can  be many  seen-by lines  at the  end of Conference
@@ -316,37 +316,37 @@ function getUpdatedSeenByEntries(existingEntries, additions) {
 		this field  is not put in place by other Echomail compatible
 		programs."
     */
-	existingEntries = existingEntries || [];
-	if(!_.isArray(existingEntries)) {
-		existingEntries = [ existingEntries ];
-	}
+    existingEntries = existingEntries || [];
+    if(!_.isArray(existingEntries)) {
+        existingEntries = [ existingEntries ];
+    }
 
-	if(!_.isString(additions)) {
-		additions = parseAbbreviatedNetNodeList(getAbbreviatedNetNodeList(additions));
-	}
+    if(!_.isString(additions)) {
+        additions = parseAbbreviatedNetNodeList(getAbbreviatedNetNodeList(additions));
+    }
 
-	additions = additions.sort(Address.getComparator());
+    additions = additions.sort(Address.getComparator());
 
-	//
-	//	For now, we'll just append a new SEEN-BY entry
-	//
-	//	:TODO: we should at least try and update what is already there in a smart way
-	existingEntries.push(getAbbreviatedNetNodeList(additions));
-	return existingEntries;
+    //
+    //	For now, we'll just append a new SEEN-BY entry
+    //
+    //	:TODO: we should at least try and update what is already there in a smart way
+    existingEntries.push(getAbbreviatedNetNodeList(additions));
+    return existingEntries;
 }
 
 function getUpdatedPathEntries(existingEntries, localAddress) {
-	//	:TODO: append to PATH in a smart way! We shoudl try to fit at least the last existing line
+    //	:TODO: append to PATH in a smart way! We shoudl try to fit at least the last existing line
 
-	existingEntries = existingEntries || [];
-	if(!_.isArray(existingEntries)) {
-		existingEntries = [ existingEntries ];
-	}
+    existingEntries = existingEntries || [];
+    if(!_.isArray(existingEntries)) {
+        existingEntries = [ existingEntries ];
+    }
 
-	existingEntries.push(getAbbreviatedNetNodeList(
-		parseAbbreviatedNetNodeList(localAddress)));
+    existingEntries.push(getAbbreviatedNetNodeList(
+        parseAbbreviatedNetNodeList(localAddress)));
 
-	return existingEntries;
+    return existingEntries;
 }
 
 //
@@ -354,71 +354,71 @@ function getUpdatedPathEntries(existingEntries, localAddress) {
 //	http://ftsc.org/docs/fts-5003.001
 //
 const ENCODING_TO_FTS_5003_001_CHARS = {
-	//	level 1 - generally should not be used
-	ascii		: [ 'ASCII', 1 ],
-	'us-ascii'	: [ 'ASCII', 1 ],
+    //	level 1 - generally should not be used
+    ascii		: [ 'ASCII', 1 ],
+    'us-ascii'	: [ 'ASCII', 1 ],
 
-	//	level 2 - 8 bit, ASCII based
-	cp437		: [ 'CP437', 2 ],
-	cp850		: [ 'CP850', 2 ],
+    //	level 2 - 8 bit, ASCII based
+    cp437		: [ 'CP437', 2 ],
+    cp850		: [ 'CP850', 2 ],
 
-	//	level 3 - reserved
+    //	level 3 - reserved
 
-	//	level 4
-	utf8		: [ 'UTF-8', 4 ],
-	'utf-8'		: [ 'UTF-8', 4 ],
+    //	level 4
+    utf8		: [ 'UTF-8', 4 ],
+    'utf-8'		: [ 'UTF-8', 4 ],
 };
 
 
 function getCharacterSetIdentifierByEncoding(encodingName) {
-	const value = ENCODING_TO_FTS_5003_001_CHARS[encodingName.toLowerCase()];
-	return value ? `${value[0]} ${value[1]}` : encodingName.toUpperCase();
+    const value = ENCODING_TO_FTS_5003_001_CHARS[encodingName.toLowerCase()];
+    return value ? `${value[0]} ${value[1]}` : encodingName.toUpperCase();
 }
 
 function getEncodingFromCharacterSetIdentifier(chrs) {
-	const ident = chrs.split(' ')[0].toUpperCase();
+    const ident = chrs.split(' ')[0].toUpperCase();
 
-	//	:TODO: fill in the rest!!!
-	return {
-		//	level 1
-		'ASCII'		: 'iso-646-1',
-		'DUTCH'		: 'iso-646',
-		'FINNISH'	: 'iso-646-10',
-		'FRENCH'	: 'iso-646',
-		'CANADIAN'	: 'iso-646',
-		'GERMAN'	: 'iso-646',
-		'ITALIAN'	: 'iso-646',
-		'NORWEIG'	: 'iso-646',
-		'PORTU'		: 'iso-646',
-		'SPANISH'	: 'iso-656',
-		'SWEDISH'	: 'iso-646-10',
-		'SWISS'		: 'iso-646',
-		'UK'		: 'iso-646',
-		'ISO-10'	: 'iso-646-10',
+    //	:TODO: fill in the rest!!!
+    return {
+        //	level 1
+        'ASCII'		: 'iso-646-1',
+        'DUTCH'		: 'iso-646',
+        'FINNISH'	: 'iso-646-10',
+        'FRENCH'	: 'iso-646',
+        'CANADIAN'	: 'iso-646',
+        'GERMAN'	: 'iso-646',
+        'ITALIAN'	: 'iso-646',
+        'NORWEIG'	: 'iso-646',
+        'PORTU'		: 'iso-646',
+        'SPANISH'	: 'iso-656',
+        'SWEDISH'	: 'iso-646-10',
+        'SWISS'		: 'iso-646',
+        'UK'		: 'iso-646',
+        'ISO-10'	: 'iso-646-10',
 
-		//	level 2
-		'CP437'		: 'cp437',
-		'CP850'		: 'cp850',
-		'CP852'		: 'cp852',
-		'CP866'		: 'cp866',
-		'CP848'		: 'cp848',
-		'CP1250'	: 'cp1250',
-		'CP1251'	: 'cp1251',
-		'CP1252'	: 'cp1252',
-		'CP10000'	: 'macroman',
-		'LATIN-1'	: 'iso-8859-1',
-		'LATIN-2'	: 'iso-8859-2',
-		'LATIN-5'	: 'iso-8859-9',
-		'LATIN-9'	: 'iso-8859-15',
+        //	level 2
+        'CP437'		: 'cp437',
+        'CP850'		: 'cp850',
+        'CP852'		: 'cp852',
+        'CP866'		: 'cp866',
+        'CP848'		: 'cp848',
+        'CP1250'	: 'cp1250',
+        'CP1251'	: 'cp1251',
+        'CP1252'	: 'cp1252',
+        'CP10000'	: 'macroman',
+        'LATIN-1'	: 'iso-8859-1',
+        'LATIN-2'	: 'iso-8859-2',
+        'LATIN-5'	: 'iso-8859-9',
+        'LATIN-9'	: 'iso-8859-15',
 
-		//	level 4
-		'UTF-8'		: 'utf8',
+        //	level 4
+        'UTF-8'		: 'utf8',
 
-		//	deprecated stuff
-		'IBMPC'		: 'cp1250',		//	:TODO: validate
-		'+7_FIDO'	: 'cp866',
-		'+7'		: 'cp866',
-		'MAC'		: 'macroman',	//	:TODO: validate
+        //	deprecated stuff
+        'IBMPC'		: 'cp1250',		//	:TODO: validate
+        '+7_FIDO'	: 'cp866',
+        '+7'		: 'cp866',
+        'MAC'		: 'macroman',	//	:TODO: validate
 
-	}[ident];
+    }[ident];
 }
\ No newline at end of file
diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index d9921c96..eb45d993 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -15,154 +15,154 @@ exports.HorizontalMenuView		= HorizontalMenuView;
 //	:TODO: Update this to allow scrolling if number of items cannot fit in width (similar to VerticalMenuView)
 
 function HorizontalMenuView(options) {
-	options.cursor	= options.cursor || 'hide';
+    options.cursor	= options.cursor || 'hide';
 
-	if(!_.isNumber(options.itemSpacing)) {
-		options.itemSpacing = 1;
-	}
+    if(!_.isNumber(options.itemSpacing)) {
+        options.itemSpacing = 1;
+    }
 
-	MenuView.call(this, options);
+    MenuView.call(this, options);
 
-	this.dimens.height = 1;	//	always the case
+    this.dimens.height = 1;	//	always the case
 
-	var self = this;
+    var self = this;
 
-	this.getSpacer = function() {
-		return new Array(self.itemSpacing + 1).join(' ');
-	};
+    this.getSpacer = function() {
+        return new Array(self.itemSpacing + 1).join(' ');
+    };
 
-	this.performAutoScale = function() {
-		if(self.autoScale.width) {
-			var spacer	= self.getSpacer();
-			var width	= self.items.join(spacer).length + (spacer.length * 2);
-			assert(width <= self.client.term.termWidth - self.position.col);
-			self.dimens.width = width;
-		}
-	};
+    this.performAutoScale = function() {
+        if(self.autoScale.width) {
+            var spacer	= self.getSpacer();
+            var width	= self.items.join(spacer).length + (spacer.length * 2);
+            assert(width <= self.client.term.termWidth - self.position.col);
+            self.dimens.width = width;
+        }
+    };
 
-	this.performAutoScale();
+    this.performAutoScale();
 
-	this.cachePositions = function() {
-		if(this.positionCacheExpired) {
-			var col		= self.position.col;
-			var spacer	= self.getSpacer();
+    this.cachePositions = function() {
+        if(this.positionCacheExpired) {
+            var col		= self.position.col;
+            var spacer	= self.getSpacer();
 
-			for(var i = 0; i < self.items.length; ++i) {
-				self.items[i].col = col;
-				col += spacer.length + self.items[i].text.length + spacer.length;
-			}
-		}
+            for(var i = 0; i < self.items.length; ++i) {
+                self.items[i].col = col;
+                col += spacer.length + self.items[i].text.length + spacer.length;
+            }
+        }
 
-		this.positionCacheExpired = false;
-	};
+        this.positionCacheExpired = false;
+    };
 
-	this.drawItem = function(index) {
-		assert(!this.positionCacheExpired);
+    this.drawItem = function(index) {
+        assert(!this.positionCacheExpired);
 
-		const item = self.items[index];
-		if(!item) {
-			return;
-		}
+        const item = self.items[index];
+        if(!item) {
+            return;
+        }
 
-		let text;
-		let sgr;
-		if(item.focused && self.hasFocusItems()) {
-			const focusItem = self.focusItems[index];
-			text = focusItem ? focusItem.text : item.text;
-			sgr = '';
-		} else if(this.complexItems) {
-			text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
-			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
-		} else {
-			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
-			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
-		}
+        let text;
+        let sgr;
+        if(item.focused && self.hasFocusItems()) {
+            const focusItem = self.focusItems[index];
+            text = focusItem ? focusItem.text : item.text;
+            sgr = '';
+        } else if(this.complexItems) {
+            text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
+            sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+        } else {
+            text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
+            sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+        }
 
-		const drawWidth = strUtil.renderStringLength(text) + (self.getSpacer().length * 2);
+        const drawWidth = strUtil.renderStringLength(text) + (self.getSpacer().length * 2);
 
-		self.client.term.write(
-			`${goto(self.position.row, item.col)}${sgr}${strUtil.pad(text, drawWidth, self.fillChar, 'center')}`
-		);
-	};
+        self.client.term.write(
+            `${goto(self.position.row, item.col)}${sgr}${strUtil.pad(text, drawWidth, self.fillChar, 'center')}`
+        );
+    };
 }
 
 require('util').inherits(HorizontalMenuView, MenuView);
 
 HorizontalMenuView.prototype.setHeight = function(height) {
-	height = parseInt(height, 10);
-	assert(1 === height);	//	nothing else allowed here
-	HorizontalMenuView.super_.prototype.setHeight(this, height);
+    height = parseInt(height, 10);
+    assert(1 === height);	//	nothing else allowed here
+    HorizontalMenuView.super_.prototype.setHeight(this, height);
 };
 
 HorizontalMenuView.prototype.redraw = function() {
-	HorizontalMenuView.super_.prototype.redraw.call(this);
+    HorizontalMenuView.super_.prototype.redraw.call(this);
 
-	this.cachePositions();
+    this.cachePositions();
 
-	for(var i = 0; i < this.items.length; ++i) {
-		this.items[i].focused = this.focusedItemIndex === i;
-		this.drawItem(i);
-	}
+    for(var i = 0; i < this.items.length; ++i) {
+        this.items[i].focused = this.focusedItemIndex === i;
+        this.drawItem(i);
+    }
 };
 
 HorizontalMenuView.prototype.setPosition = function(pos) {
-	HorizontalMenuView.super_.prototype.setPosition.call(this, pos);
+    HorizontalMenuView.super_.prototype.setPosition.call(this, pos);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 HorizontalMenuView.prototype.setFocus = function(focused) {
-	HorizontalMenuView.super_.prototype.setFocus.call(this, focused);
+    HorizontalMenuView.super_.prototype.setFocus.call(this, focused);
 
-	this.redraw();
+    this.redraw();
 };
 
 HorizontalMenuView.prototype.setItems = function(items) {
-	HorizontalMenuView.super_.prototype.setItems.call(this, items);
+    HorizontalMenuView.super_.prototype.setItems.call(this, items);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 HorizontalMenuView.prototype.focusNext = function() {
-	if(this.items.length - 1 === this.focusedItemIndex) {
-		this.focusedItemIndex = 0;
-	} else {
-		this.focusedItemIndex++;
-	}
+    if(this.items.length - 1 === this.focusedItemIndex) {
+        this.focusedItemIndex = 0;
+    } else {
+        this.focusedItemIndex++;
+    }
 
-	//	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
-	this.redraw();
+    //	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
+    this.redraw();
 
-	HorizontalMenuView.super_.prototype.focusNext.call(this);
+    HorizontalMenuView.super_.prototype.focusNext.call(this);
 };
 
 HorizontalMenuView.prototype.focusPrevious = function() {
 
-	if(0 === this.focusedItemIndex) {
-		this.focusedItemIndex = this.items.length - 1;
-	} else {
-		this.focusedItemIndex--;
-	}
+    if(0 === this.focusedItemIndex) {
+        this.focusedItemIndex = this.items.length - 1;
+    } else {
+        this.focusedItemIndex--;
+    }
 
-	//	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
-	this.redraw();
+    //	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
+    this.redraw();
 
-	HorizontalMenuView.super_.prototype.focusPrevious.call(this);
+    HorizontalMenuView.super_.prototype.focusPrevious.call(this);
 };
 
 HorizontalMenuView.prototype.onKeyPress = function(ch, key) {
-	if(key) {
-		if(this.isKeyMapped('left', key.name)) {
-			this.focusPrevious();
-		} else if(this.isKeyMapped('right', key.name)) {
-			this.focusNext();
-		}
-	}
+    if(key) {
+        if(this.isKeyMapped('left', key.name)) {
+            this.focusPrevious();
+        } else if(this.isKeyMapped('right', key.name)) {
+            this.focusNext();
+        }
+    }
 
-	HorizontalMenuView.super_.prototype.onKeyPress.call(this, ch, key);
+    HorizontalMenuView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 HorizontalMenuView.prototype.getData = function() {
-	const item = this.getItem(this.focusedItemIndex);
-	return _.isString(item.data) ? item.data : this.focusedItemIndex;
+    const item = this.getItem(this.focusedItemIndex);
+    return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
\ No newline at end of file
diff --git a/core/key_entry_view.js b/core/key_entry_view.js
index 304f8ef3..1d7ca905 100644
--- a/core/key_entry_view.js
+++ b/core/key_entry_view.js
@@ -9,69 +9,69 @@ const stylizeString		= require('./string_util.js').stylizeString;
 const _					= require('lodash');
 
 module.exports = class KeyEntryView extends View {
-	constructor(options) {
-		options.acceptsFocus = valueWithDefault(options.acceptsFocus, true);
-		options.acceptsInput = valueWithDefault(options.acceptsInput, true);
+    constructor(options) {
+        options.acceptsFocus = valueWithDefault(options.acceptsFocus, true);
+        options.acceptsInput = valueWithDefault(options.acceptsInput, true);
 
-		super(options);
+        super(options);
 
-		this.eatTabKey			= options.eatTabKey || true;
-		this.caseInsensitive	= options.caseInsensitive || true;
+        this.eatTabKey			= options.eatTabKey || true;
+        this.caseInsensitive	= options.caseInsensitive || true;
 
-		if(Array.isArray(options.keys)) {
-			if(this.caseInsensitive) {
-				this.keys = options.keys.map( k => k.toUpperCase() );
-			} else {
-				this.keys = options.keys;
-			}
-		}
-	}
+        if(Array.isArray(options.keys)) {
+            if(this.caseInsensitive) {
+                this.keys = options.keys.map( k => k.toUpperCase() );
+            } else {
+                this.keys = options.keys;
+            }
+        }
+    }
 
-	onKeyPress(ch, key) {
-		const drawKey = ch;
+    onKeyPress(ch, key) {
+        const drawKey = ch;
 
-		if(ch && this.caseInsensitive) {
-			ch = ch.toUpperCase();
-		}
+        if(ch && this.caseInsensitive) {
+            ch = ch.toUpperCase();
+        }
 
-		if(drawKey && isPrintable(drawKey) && (!this.keys || this.keys.indexOf(ch) > -1)) {
-			this.redraw();	//	sets position
-			this.client.term.write(stylizeString(ch, this.textStyle));
-		}
+        if(drawKey && isPrintable(drawKey) && (!this.keys || this.keys.indexOf(ch) > -1)) {
+            this.redraw();	//	sets position
+            this.client.term.write(stylizeString(ch, this.textStyle));
+        }
 
-		this.keyEntered = ch || key.name;
+        this.keyEntered = ch || key.name;
 
-		if(key && 'tab' === key.name && !this.eatTabKey) {
-			return this.emit('action', 'next', key);
-		}
+        if(key && 'tab' === key.name && !this.eatTabKey) {
+            return this.emit('action', 'next', key);
+        }
 
-		this.emit('action', 'accept');
-		//	NOTE: we don't call super here. KeyEntryView is a special snowflake.
-	}
+        this.emit('action', 'accept');
+        //	NOTE: we don't call super here. KeyEntryView is a special snowflake.
+    }
 
-	setPropertyValue(propName, propValue) {
-		switch(propName) {
-			case 'eatTabKey' :
-				if(_.isBoolean(propValue)) {
-					this.eatTabKey = propValue;
-				}
-				break;
+    setPropertyValue(propName, propValue) {
+        switch(propName) {
+            case 'eatTabKey' :
+                if(_.isBoolean(propValue)) {
+                    this.eatTabKey = propValue;
+                }
+                break;
 
-			case 'caseInsensitive' :
-				if(_.isBoolean(propValue)) {
-					this.caseInsensitive = propValue;
-				}
-				break;
+            case 'caseInsensitive' :
+                if(_.isBoolean(propValue)) {
+                    this.caseInsensitive = propValue;
+                }
+                break;
 
-			case 'keys' :
-				if(Array.isArray(propValue)) {
-					this.keys = propValue;
-				}
-				break;
-		}
+            case 'keys' :
+                if(Array.isArray(propValue)) {
+                    this.keys = propValue;
+                }
+                break;
+        }
 
-		super.setPropertyValue(propName, propValue);
-	}
+        super.setPropertyValue(propName, propValue);
+    }
 
-	getData() {	return this.keyEntered; }
+    getData() {	return this.keyEntered; }
 };
\ No newline at end of file
diff --git a/core/last_callers.js b/core/last_callers.js
index 1bc1f422..88b0b716 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -24,128 +24,128 @@ const _					= require('lodash');
 */
 
 exports.moduleInfo = {
-	name		: 'Last Callers',
-	desc		: 'Last callers to the system',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.lastcallers'
+    name		: 'Last Callers',
+    desc		: 'Last callers to the system',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.lastcallers'
 };
 
 const MciCodeIds = {
-	CallerList		: 1,
+    CallerList		: 1,
 };
 
 exports.getModule = class LastCallersModule extends MenuModule {
-	constructor(options) {
-		super(options);
-	}
+    constructor(options) {
+        super(options);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self		= this;
-			const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self		= this;
+            const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-			let loginHistory;
-			let callersView;
+            let loginHistory;
+            let callersView;
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu,
-							noInput			: true,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu,
+                            noInput			: true,
+                        };
 
-						vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function fetchHistory(callback) {
-						callersView = vc.getView(MciCodeIds.CallerList);
+                        vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function fetchHistory(callback) {
+                        callersView = vc.getView(MciCodeIds.CallerList);
 
-						//	fetch up
-						StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, 200, (err, lh) => {
-							loginHistory = lh;
+                        //	fetch up
+                        StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, 200, (err, lh) => {
+                            loginHistory = lh;
 
-							if(self.menuConfig.config.hideSysOpLogin) {
-								const noOpLoginHistory = loginHistory.filter(lh => {
-									return false === User.isRootUserId(parseInt(lh.log_value));	//	log_value=userId
-								});
+                            if(self.menuConfig.config.hideSysOpLogin) {
+                                const noOpLoginHistory = loginHistory.filter(lh => {
+                                    return false === User.isRootUserId(parseInt(lh.log_value));	//	log_value=userId
+                                });
 
-								//
-								//	If we have enough items to display, or hideSysOpLogin is set to 'always',
-								//	then set loginHistory to our filtered list. Else, we'll leave it be.
-								//
-								if(noOpLoginHistory.length >= callersView.dimens.height || 'always' === self.menuConfig.config.hideSysOpLogin) {
-									loginHistory = noOpLoginHistory;
-								}
-							}
+                                //
+                                //	If we have enough items to display, or hideSysOpLogin is set to 'always',
+                                //	then set loginHistory to our filtered list. Else, we'll leave it be.
+                                //
+                                if(noOpLoginHistory.length >= callersView.dimens.height || 'always' === self.menuConfig.config.hideSysOpLogin) {
+                                    loginHistory = noOpLoginHistory;
+                                }
+                            }
 
-							//
-							//	Finally, we need to trim up the list to the needed size
-							//
-							loginHistory = loginHistory.slice(0, callersView.dimens.height);
+                            //
+                            //	Finally, we need to trim up the list to the needed size
+                            //
+                            loginHistory = loginHistory.slice(0, callersView.dimens.height);
 
-							return callback(err);
-						});
-					},
-					function getUserNamesAndProperties(callback) {
-						const getPropOpts = {
-							names		: [ 'location', 'affiliation' ]
-						};
+                            return callback(err);
+                        });
+                    },
+                    function getUserNamesAndProperties(callback) {
+                        const getPropOpts = {
+                            names		: [ 'location', 'affiliation' ]
+                        };
 
-						const dateTimeFormat = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
+                        const dateTimeFormat = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
 
-						async.each(
-							loginHistory,
-							(item, next) => {
-								item.userId = parseInt(item.log_value);
-								item.ts		= moment(item.timestamp).format(dateTimeFormat);
+                        async.each(
+                            loginHistory,
+                            (item, next) => {
+                                item.userId = parseInt(item.log_value);
+                                item.ts		= moment(item.timestamp).format(dateTimeFormat);
 
-								User.getUserName(item.userId, (err, userName) => {
-									if(err) {
-										item.deleted = true;
-										return next(null);
-									} else {
-										item.userName = userName || 'N/A';
+                                User.getUserName(item.userId, (err, userName) => {
+                                    if(err) {
+                                        item.deleted = true;
+                                        return next(null);
+                                    } else {
+                                        item.userName = userName || 'N/A';
 
-										User.loadProperties(item.userId, getPropOpts, (err, props) => {
-											if(!err && props) {
-												item.location 		= props.location || 'N/A';
-												item.affiliation	= item.affils = (props.affiliation || 'N/A');
-											} else {
-												item.location		= 'N/A';
-												item.affiliation	= item.affils = 'N/A';
-											}
-											return next(null);
-										});
-									}
-								});
-							},
-							err => {
-								loginHistory = loginHistory.filter(lh => true !== lh.deleted);
-								return callback(err);
-							}
-						);
-					},
-					function populateList(callback) {
-						const listFormat = self.menuConfig.config.listFormat || '{userName} - {location} - {affiliation} - {ts}';
+                                        User.loadProperties(item.userId, getPropOpts, (err, props) => {
+                                            if(!err && props) {
+                                                item.location 		= props.location || 'N/A';
+                                                item.affiliation	= item.affils = (props.affiliation || 'N/A');
+                                            } else {
+                                                item.location		= 'N/A';
+                                                item.affiliation	= item.affils = 'N/A';
+                                            }
+                                            return next(null);
+                                        });
+                                    }
+                                });
+                            },
+                            err => {
+                                loginHistory = loginHistory.filter(lh => true !== lh.deleted);
+                                return callback(err);
+                            }
+                        );
+                    },
+                    function populateList(callback) {
+                        const listFormat = self.menuConfig.config.listFormat || '{userName} - {location} - {affiliation} - {ts}';
 
-						callersView.setItems(_.map(loginHistory, ce => stringFormat(listFormat, ce) ) );
+                        callersView.setItems(_.map(loginHistory, ce => stringFormat(listFormat, ce) ) );
 
-						callersView.redraw();
-						return callback(null);
-					}
-				],
-				(err) => {
-					if(err) {
-						self.client.log.error( { error : err.toString() }, 'Error loading last callers');
-					}
-					cb(err);
-				}
-			);
-		});
-	}
+                        callersView.redraw();
+                        return callback(null);
+                    }
+                ],
+                (err) => {
+                    if(err) {
+                        self.client.log.error( { error : err.toString() }, 'Error loading last callers');
+                    }
+                    cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/listening_server.js b/core/listening_server.js
index 94efd475..3678ff3f 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -14,51 +14,51 @@ exports.shutdown		= shutdown;
 exports.getServer		= getServer;
 
 function startup(cb) {
-	return startListening(cb);
+    return startListening(cb);
 }
 
 function shutdown(cb) {
-	return cb(null);
+    return cb(null);
 }
 
 function getServer(packageName) {
-	return listeningServers[packageName];
+    return listeningServers[packageName];
 }
 
 function startListening(cb) {
-	const moduleUtil = require('./module_util.js');	//	late load so we get Config
+    const moduleUtil = require('./module_util.js');	//	late load so we get Config
 
-	async.each( [ 'login', 'content' ], (category, next) => {
-		moduleUtil.loadModulesForCategory(`${category}Servers`, (err, module) => {
-			//	:TODO: use enig error here!
-			if(err) {
-				if('EENIGMODDISABLED' === err.code) {
-					logger.log.debug(err.message);
-				} else {
-					logger.log.info( { err : err }, 'Failed loading module');
-				}
-				return;
-			}
+    async.each( [ 'login', 'content' ], (category, next) => {
+        moduleUtil.loadModulesForCategory(`${category}Servers`, (err, module) => {
+            //	:TODO: use enig error here!
+            if(err) {
+                if('EENIGMODDISABLED' === err.code) {
+                    logger.log.debug(err.message);
+                } else {
+                    logger.log.info( { err : err }, 'Failed loading module');
+                }
+                return;
+            }
 
-			const moduleInst = new module.getModule();
-			try {
-				moduleInst.createServer();
-				if(!moduleInst.listen()) {
-					throw new Error('Failed listening');
-				}
+            const moduleInst = new module.getModule();
+            try {
+                moduleInst.createServer();
+                if(!moduleInst.listen()) {
+                    throw new Error('Failed listening');
+                }
 
-				listeningServers[module.moduleInfo.packageName] = {
-					instance	: moduleInst,
-					info		: module.moduleInfo,
-				};
+                listeningServers[module.moduleInfo.packageName] = {
+                    instance	: moduleInst,
+                    info		: module.moduleInfo,
+                };
 
-			} catch(e) {
-				logger.log.error(e, 'Exception caught creating server!');
-			}
-		}, err => {
-			return next(err);
-		});
-	}, err => {
-		return cb(err);
-	});
+            } catch(e) {
+                logger.log.error(e, 'Exception caught creating server!');
+            }
+        }, err => {
+            return next(err);
+        });
+    }, err => {
+        return cb(err);
+    });
 }
diff --git a/core/logger.js b/core/logger.js
index c9a75faf..8b95c821 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -9,66 +9,66 @@ const _			= require('lodash');
 
 module.exports = class Log {
 
-	static init() {
-		const Config	= require('./config.js').get();
-		const logPath	= Config.paths.logs;
+    static init() {
+        const Config	= require('./config.js').get();
+        const logPath	= Config.paths.logs;
 
-		const err = this.checkLogPath(logPath);
-		if(err) {
-			console.error(err.message);	//	eslint-disable-line no-console
-			return process.exit();
-		}
+        const err = this.checkLogPath(logPath);
+        if(err) {
+            console.error(err.message);	//	eslint-disable-line no-console
+            return process.exit();
+        }
 
-		const logStreams = [];
-		if(_.isObject(Config.logging.rotatingFile)) {
-			Config.logging.rotatingFile.path = paths.join(logPath, Config.logging.rotatingFile.fileName);
-			logStreams.push(Config.logging.rotatingFile);
-		}
+        const logStreams = [];
+        if(_.isObject(Config.logging.rotatingFile)) {
+            Config.logging.rotatingFile.path = paths.join(logPath, Config.logging.rotatingFile.fileName);
+            logStreams.push(Config.logging.rotatingFile);
+        }
 
-		const serializers = {
-			err	: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
-		};
+        const serializers = {
+            err	: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
+        };
 
-		//	try to remove sensitive info by default, e.g. 'password' fields
-		[ 'formData', 'formValue' ].forEach(keyName => {
-			serializers[keyName] = (fd) => Log.hideSensitive(fd);
-		});
+        //	try to remove sensitive info by default, e.g. 'password' fields
+        [ 'formData', 'formValue' ].forEach(keyName => {
+            serializers[keyName] = (fd) => Log.hideSensitive(fd);
+        });
 
-		this.log = bunyan.createLogger({
-			name			: 'ENiGMA½ BBS',
-			streams			: logStreams,
-			serializers		: serializers,
-		});
-	}
+        this.log = bunyan.createLogger({
+            name			: 'ENiGMA½ BBS',
+            streams			: logStreams,
+            serializers		: serializers,
+        });
+    }
 
-	static checkLogPath(logPath) {
-		try {
-			if(!fs.statSync(logPath).isDirectory()) {
-				return new Error(`${logPath} is not a directory`);
-			}
+    static checkLogPath(logPath) {
+        try {
+            if(!fs.statSync(logPath).isDirectory()) {
+                return new Error(`${logPath} is not a directory`);
+            }
 
-			return null;
-		} catch(e) {
-			if('ENOENT' === e.code) {
-				return new Error(`${logPath} does not exist`);
-			}
-			return e;
-		}
-	}
+            return null;
+        } catch(e) {
+            if('ENOENT' === e.code) {
+                return new Error(`${logPath} does not exist`);
+            }
+            return e;
+        }
+    }
 
-	static hideSensitive(obj) {
-		try {
-			//
-			//	Use a regexp -- we don't know how nested fields we want to seek and destroy may be
-			//
-			return JSON.parse(
-				JSON.stringify(obj).replace(/"(password|passwordConfirm|key|authCode)"\s?:\s?"([^"]+)"/, (match, valueName) => {
-					return `"${valueName}":"********"`;
-				})
-			);
-		} catch(e) {
-			//	be safe and return empty obj!
-			return {};
-		}
-	}
+    static hideSensitive(obj) {
+        try {
+            //
+            //	Use a regexp -- we don't know how nested fields we want to seek and destroy may be
+            //
+            return JSON.parse(
+                JSON.stringify(obj).replace(/"(password|passwordConfirm|key|authCode)"\s?:\s?"([^"]+)"/, (match, valueName) => {
+                    return `"${valueName}":"********"`;
+                })
+            );
+        } catch(e) {
+            //	be safe and return empty obj!
+            return {};
+        }
+    }
 };
diff --git a/core/login_server_module.js b/core/login_server_module.js
index 72958a0c..ef4e712e 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -11,77 +11,77 @@ const clientConns	= require('./client_connections.js');
 const _			= require('lodash');
 
 module.exports = class LoginServerModule extends ServerModule {
-	constructor() {
-		super();
-	}
+    constructor() {
+        super();
+    }
 
-	//	:TODO: we need to max connections -- e.g. from config 'maxConnections'
+    //	:TODO: we need to max connections -- e.g. from config 'maxConnections'
 
-	prepareClient(client, cb) {
-		const theme = require('./theme.js');
+    prepareClient(client, cb) {
+        const theme = require('./theme.js');
 
-		//
-		//	Choose initial theme before we have user context
-		//
-		if('*' === conf.config.preLoginTheme) {
-			client.user.properties.theme_id = theme.getRandomTheme() || '';
-		} else {
-			client.user.properties.theme_id = conf.config.preLoginTheme;
-		}
+        //
+        //	Choose initial theme before we have user context
+        //
+        if('*' === conf.config.preLoginTheme) {
+            client.user.properties.theme_id = theme.getRandomTheme() || '';
+        } else {
+            client.user.properties.theme_id = conf.config.preLoginTheme;
+        }
 
-		theme.setClientTheme(client, client.user.properties.theme_id);
-		return cb(null);   //  note: currently useless to use cb here - but this may change...again...
-	}
+        theme.setClientTheme(client, client.user.properties.theme_id);
+        return cb(null);   //  note: currently useless to use cb here - but this may change...again...
+    }
 
-	handleNewClient(client, clientSock, modInfo) {
-		//
-		//	Start tracking the client. We'll assign it an ID which is
-		//	just the index in our connections array.
-		//
-		if(_.isUndefined(client.session)) {
-			client.session = {};
-		}
+    handleNewClient(client, clientSock, modInfo) {
+        //
+        //	Start tracking the client. We'll assign it an ID which is
+        //	just the index in our connections array.
+        //
+        if(_.isUndefined(client.session)) {
+            client.session = {};
+        }
 
-		client.session.serverName 	= modInfo.name;
-		client.session.isSecure		= _.isBoolean(client.isSecure) ? client.isSecure : (modInfo.isSecure || false);
+        client.session.serverName 	= modInfo.name;
+        client.session.isSecure		= _.isBoolean(client.isSecure) ? client.isSecure : (modInfo.isSecure || false);
 
-		clientConns.addNewClient(client, clientSock);
+        clientConns.addNewClient(client, clientSock);
 
-		client.on('ready', readyOptions => {
+        client.on('ready', readyOptions => {
 
-			client.startIdleMonitor();
+            client.startIdleMonitor();
 
-			//	Go to module -- use default error handler
-			this.prepareClient(client, () => {
-				require('./connect.js').connectEntry(client, readyOptions.firstMenu);
-			});
-		});
+            //	Go to module -- use default error handler
+            this.prepareClient(client, () => {
+                require('./connect.js').connectEntry(client, readyOptions.firstMenu);
+            });
+        });
 
-		client.on('end', () => {
-			clientConns.removeClient(client);
-		});
+        client.on('end', () => {
+            clientConns.removeClient(client);
+        });
 
-		client.on('error', err => {
-			logger.log.info({ clientId : client.session.id }, 'Connection error: %s' % err.message);
-		});
+        client.on('error', err => {
+            logger.log.info({ clientId : client.session.id }, 'Connection error: %s' % err.message);
+        });
 
-		client.on('close', err => {
-			const logFunc = err ? logger.log.info : logger.log.debug;
-			logFunc( { clientId : client.session.id }, 'Connection closed');
+        client.on('close', err => {
+            const logFunc = err ? logger.log.info : logger.log.debug;
+            logFunc( { clientId : client.session.id }, 'Connection closed');
 
-			clientConns.removeClient(client);
-		});
+            clientConns.removeClient(client);
+        });
 
-		client.on('idle timeout', () => {
-			client.log.info('User idle timeout expired');
+        client.on('idle timeout', () => {
+            client.log.info('User idle timeout expired');
 
-			client.menuStack.goto('idleLogoff', err => {
-				if(err) {
-					//	likely just doesn't exist
-					client.term.write('\nIdle timeout expired. Goodbye!\n');
-					client.end();
-				}
-			});
-		});
-	}
+            client.menuStack.goto('idleLogoff', err => {
+                if(err) {
+                    //	likely just doesn't exist
+                    client.term.write('\nIdle timeout expired. Goodbye!\n');
+                    client.end();
+                }
+            });
+        });
+    }
 };
diff --git a/core/mail_packet.js b/core/mail_packet.js
index fbbb3e76..32b85a06 100644
--- a/core/mail_packet.js
+++ b/core/mail_packet.js
@@ -8,29 +8,29 @@ var _				= require('lodash');
 module.exports = MailPacket;
 
 function MailPacket(options) {
-	events.EventEmitter.call(this);
+    events.EventEmitter.call(this);
 
-	//	map of network name -> address obj ( { zone, net, node, point, domain } )
-	this.nodeAddresses = options.nodeAddresses || {};
+    //	map of network name -> address obj ( { zone, net, node, point, domain } )
+    this.nodeAddresses = options.nodeAddresses || {};
 }
 
 require('util').inherits(MailPacket, events.EventEmitter);
 
 MailPacket.prototype.read = function(options) {
-	//
-	//	options.packetPath | opts.packetBuffer: supplies a path-to-file
-	//	or a buffer containing packet data
-	//
-	//	emits 'message' event per message read
-	//
-	assert(_.isString(options.packetPath) || Buffer.isBuffer(options.packetBuffer));
+    //
+    //	options.packetPath | opts.packetBuffer: supplies a path-to-file
+    //	or a buffer containing packet data
+    //
+    //	emits 'message' event per message read
+    //
+    assert(_.isString(options.packetPath) || Buffer.isBuffer(options.packetBuffer));
 };
 
 MailPacket.prototype.write = function(options) {
-	//
-	//	options.messages[]: array of message(s) to create packets from
-	//
-	//	emits 'packet' event per packet constructed
-	//
-	assert(_.isArray(options.messages));
+    //
+    //	options.messages[]: array of message(s) to create packets from
+    //
+    //	emits 'packet' event per packet constructed
+    //
+    assert(_.isArray(options.messages));
 };
\ No newline at end of file
diff --git a/core/mail_util.js b/core/mail_util.js
index 4e959389..6822e78e 100644
--- a/core/mail_util.js
+++ b/core/mail_util.js
@@ -22,60 +22,60 @@ const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))
 	Bar <baz@foobar.net>               { name : 'Bar', flavor : 'email', remote : 'baz@foobar.com' }
 */
 function getAddressedToInfo(input) {
-	input = input.trim();
+    input = input.trim();
 
-	const firstAtPos = input.indexOf('@');
+    const firstAtPos = input.indexOf('@');
 
-	if(firstAtPos < 0) {
-		let addr = Address.fromString(input);
-		if(Address.isValidAddress(addr)) {
-			return { flavor : Message.AddressFlavor.FTN, remote : input };
-		}
+    if(firstAtPos < 0) {
+        let addr = Address.fromString(input);
+        if(Address.isValidAddress(addr)) {
+            return { flavor : Message.AddressFlavor.FTN, remote : input };
+        }
 
-		const lessThanPos = input.indexOf('<');
-		if(lessThanPos < 0) {
-			return { name : input, flavor : Message.AddressFlavor.Local };
-		}
+        const lessThanPos = input.indexOf('<');
+        if(lessThanPos < 0) {
+            return { name : input, flavor : Message.AddressFlavor.Local };
+        }
 
-		const greaterThanPos = input.indexOf('>');
-		if(greaterThanPos < lessThanPos) {
-			return { name : input, flavor : Message.AddressFlavor.Local };
-		}
+        const greaterThanPos = input.indexOf('>');
+        if(greaterThanPos < lessThanPos) {
+            return { name : input, flavor : Message.AddressFlavor.Local };
+        }
 
-		addr = Address.fromString(input.slice(lessThanPos + 1, greaterThanPos));
-		if(Address.isValidAddress(addr)) {
-			return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
-		}
+        addr = Address.fromString(input.slice(lessThanPos + 1, greaterThanPos));
+        if(Address.isValidAddress(addr)) {
+            return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
+        }
 
-		return { name : input, flavor : Message.AddressFlavor.Local };
-	}
+        return { name : input, flavor : Message.AddressFlavor.Local };
+    }
 
-	const lessThanPos		= input.indexOf('<');
-	const greaterThanPos	= input.indexOf('>');
-	if(lessThanPos > 0 && greaterThanPos > lessThanPos) {
-		const addr = input.slice(lessThanPos + 1, greaterThanPos);
-		const m = addr.match(EMAIL_REGEX);
-		if(m) {
-			return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.Email, remote : addr };
-		}
+    const lessThanPos		= input.indexOf('<');
+    const greaterThanPos	= input.indexOf('>');
+    if(lessThanPos > 0 && greaterThanPos > lessThanPos) {
+        const addr = input.slice(lessThanPos + 1, greaterThanPos);
+        const m = addr.match(EMAIL_REGEX);
+        if(m) {
+            return { name : input.slice(0, lessThanPos).trim(), flavor : Message.AddressFlavor.Email, remote : addr };
+        }
 
-		return { name : input, flavor : Message.AddressFlavor.Local };
-	}
+        return { name : input, flavor : Message.AddressFlavor.Local };
+    }
 
-	let m = input.match(EMAIL_REGEX);
-	if(m) {
-		return { name : input.slice(0, firstAtPos), flavor : Message.AddressFlavor.Email, remote : input };
-	}
+    let m = input.match(EMAIL_REGEX);
+    if(m) {
+        return { name : input.slice(0, firstAtPos), flavor : Message.AddressFlavor.Email, remote : input };
+    }
 
-	let addr = Address.fromString(input);	//	5D?
-	if(Address.isValidAddress(addr)) {
-		return { flavor : Message.AddressFlavor.FTN, remote : addr.toString() } ;
-	}
+    let addr = Address.fromString(input);	//	5D?
+    if(Address.isValidAddress(addr)) {
+        return { flavor : Message.AddressFlavor.FTN, remote : addr.toString() } ;
+    }
 
-	addr = Address.fromString(input.slice(firstAtPos + 1).trim());
-	if(Address.isValidAddress(addr)) {
-		return { name : input.slice(0, firstAtPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
-	}
+    addr = Address.fromString(input.slice(firstAtPos + 1).trim());
+    if(Address.isValidAddress(addr)) {
+        return { name : input.slice(0, firstAtPos).trim(), flavor : Message.AddressFlavor.FTN, remote : addr.toString() };
+    }
 
-	return { name : input, flavor : Message.AddressFlavor.Local };
+    return { name : input, flavor : Message.AddressFlavor.Local };
 }
diff --git a/core/mask_edit_text_view.js b/core/mask_edit_text_view.js
index 2c0b6021..417b7928 100644
--- a/core/mask_edit_text_view.js
+++ b/core/mask_edit_text_view.js
@@ -28,181 +28,181 @@ exports.MaskEditTextView	= MaskEditTextView;
 //
 
 function MaskEditTextView(options) {
-	options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-	options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-	options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
-	options.resizable		= false;
+    options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
+    options.resizable		= false;
 
-	TextView.call(this, options);
+    TextView.call(this, options);
 
-	this.cursorPos			= { x : 0 };
-	this.patternArrayPos	= 0;
+    this.cursorPos			= { x : 0 };
+    this.patternArrayPos	= 0;
 
-	var self = this;
+    var self = this;
 
-	this.maskPattern = options.maskPattern || '';
+    this.maskPattern = options.maskPattern || '';
 
-	this.clientBackspace = function() {
-		var fillCharSGR = this.getStyleSGR(3) || this.getSGR();
-		this.client.term.write('\b' + fillCharSGR + this.fillChar + '\b' + this.getFocusSGR());
-	};
+    this.clientBackspace = function() {
+        var fillCharSGR = this.getStyleSGR(3) || this.getSGR();
+        this.client.term.write('\b' + fillCharSGR + this.fillChar + '\b' + this.getFocusSGR());
+    };
 
-	this.drawText = function(s) {
-		var textToDraw = strUtil.stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
+    this.drawText = function(s) {
+        var textToDraw = strUtil.stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-		assert(textToDraw.length <= self.patternArray.length);
+        assert(textToDraw.length <= self.patternArray.length);
 
-		//	draw out the text we have so far
-		var i = 0;
-		var t = 0;
-		while(i < self.patternArray.length) {
-			if(_.isRegExp(self.patternArray[i])) {
-				if(t < textToDraw.length) {
-					self.client.term.write((self.hasFocus ? self.getFocusSGR() : self.getSGR()) + textToDraw[t]);
-					t++;
-				} else {
-					self.client.term.write((self.getStyleSGR(3) || '') + self.fillChar);
-				}
-			} else {
-				var styleSgr = this.hasFocus ? (self.getStyleSGR(2) || '') : (self.getStyleSGR(1) || '');
-				self.client.term.write(styleSgr + self.maskPattern[i]);
-			}
-			i++;
-		}
-	};
+        //	draw out the text we have so far
+        var i = 0;
+        var t = 0;
+        while(i < self.patternArray.length) {
+            if(_.isRegExp(self.patternArray[i])) {
+                if(t < textToDraw.length) {
+                    self.client.term.write((self.hasFocus ? self.getFocusSGR() : self.getSGR()) + textToDraw[t]);
+                    t++;
+                } else {
+                    self.client.term.write((self.getStyleSGR(3) || '') + self.fillChar);
+                }
+            } else {
+                var styleSgr = this.hasFocus ? (self.getStyleSGR(2) || '') : (self.getStyleSGR(1) || '');
+                self.client.term.write(styleSgr + self.maskPattern[i]);
+            }
+            i++;
+        }
+    };
 
-	this.buildPattern = function() {
-		self.patternArray	= [];
-		self.maxLength		= 0;
+    this.buildPattern = function() {
+        self.patternArray	= [];
+        self.maxLength		= 0;
 
-		for(var i = 0; i < self.maskPattern.length; i++) {
-			//	:TODO: support escaped characters, e.g. \#. Also allow \\ for a '\' mark!
-			if(self.maskPattern[i] in MaskEditTextView.maskPatternCharacterRegEx) {
-				self.patternArray.push(MaskEditTextView.maskPatternCharacterRegEx[self.maskPattern[i]]);
-				++self.maxLength;
-			} else {
-				self.patternArray.push(self.maskPattern[i]);
-			}
-		}
-	};
+        for(var i = 0; i < self.maskPattern.length; i++) {
+            //	:TODO: support escaped characters, e.g. \#. Also allow \\ for a '\' mark!
+            if(self.maskPattern[i] in MaskEditTextView.maskPatternCharacterRegEx) {
+                self.patternArray.push(MaskEditTextView.maskPatternCharacterRegEx[self.maskPattern[i]]);
+                ++self.maxLength;
+            } else {
+                self.patternArray.push(self.maskPattern[i]);
+            }
+        }
+    };
 
-	this.getEndOfTextColumn = function() {
-		return this.position.col + this.patternArrayPos;
-	};
+    this.getEndOfTextColumn = function() {
+        return this.position.col + this.patternArrayPos;
+    };
 
-	this.buildPattern();
+    this.buildPattern();
 
 }
 
 require('util').inherits(MaskEditTextView, TextView);
 
 MaskEditTextView.maskPatternCharacterRegEx = {
-	'#'				: /[0-9]/,				//	Numeric
-	'A'				: /[a-zA-Z]/,			//	Alpha
-	'@'				: /[0-9a-zA-Z]/,		//	Alphanumeric
-	'&'				: /[\w\d\s]/,			//	Any "printable" 32-126, 128-255
+    '#'				: /[0-9]/,				//	Numeric
+    'A'				: /[a-zA-Z]/,			//	Alpha
+    '@'				: /[0-9a-zA-Z]/,		//	Alphanumeric
+    '&'				: /[\w\d\s]/,			//	Any "printable" 32-126, 128-255
 };
 
 MaskEditTextView.prototype.setText = function(text) {
-	MaskEditTextView.super_.prototype.setText.call(this, text);
+    MaskEditTextView.super_.prototype.setText.call(this, text);
 
-	if(this.patternArray) {	//	:TODO: This is a hack - see TextView ctor note about setText()
-		this.patternArrayPos = this.patternArray.length;
-	}
+    if(this.patternArray) {	//	:TODO: This is a hack - see TextView ctor note about setText()
+        this.patternArrayPos = this.patternArray.length;
+    }
 };
 
 MaskEditTextView.prototype.setMaskPattern = function(pattern) {
-	this.dimens.width = pattern.length;
+    this.dimens.width = pattern.length;
 
-	this.maskPattern = pattern;
-	this.buildPattern();
+    this.maskPattern = pattern;
+    this.buildPattern();
 };
 
 MaskEditTextView.prototype.onKeyPress = function(ch, key) {
-	if(key) {
-		if(this.isKeyMapped('backspace', key.name)) {
-			if(this.text.length > 0) {
-				this.patternArrayPos--;
-				assert(this.patternArrayPos >= 0);
+    if(key) {
+        if(this.isKeyMapped('backspace', key.name)) {
+            if(this.text.length > 0) {
+                this.patternArrayPos--;
+                assert(this.patternArrayPos >= 0);
 
-				if(_.isRegExp(this.patternArray[this.patternArrayPos])) {
-					this.text = this.text.substr(0, this.text.length - 1);
-					this.clientBackspace();
-				} else {
-					while(this.patternArrayPos > 0) {
-						if(_.isRegExp(this.patternArray[this.patternArrayPos])) {
-							this.text = this.text.substr(0, this.text.length - 1);
-							this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn() + 1));
-							this.clientBackspace();
-							break;
-						}
-						this.patternArrayPos--;
-					}
-				}
-			}
+                if(_.isRegExp(this.patternArray[this.patternArrayPos])) {
+                    this.text = this.text.substr(0, this.text.length - 1);
+                    this.clientBackspace();
+                } else {
+                    while(this.patternArrayPos > 0) {
+                        if(_.isRegExp(this.patternArray[this.patternArrayPos])) {
+                            this.text = this.text.substr(0, this.text.length - 1);
+                            this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn() + 1));
+                            this.clientBackspace();
+                            break;
+                        }
+                        this.patternArrayPos--;
+                    }
+                }
+            }
 
-			return;
-		} else if(this.isKeyMapped('clearLine', key.name)) {
-			this.text				= '';
-			this.patternArrayPos	= 0;
-			this.setFocus(true);	//	redraw + adjust cursor
+            return;
+        } else if(this.isKeyMapped('clearLine', key.name)) {
+            this.text				= '';
+            this.patternArrayPos	= 0;
+            this.setFocus(true);	//	redraw + adjust cursor
 
-			return;
-		}
-	}
+            return;
+        }
+    }
 
-	if(ch && strUtil.isPrintable(ch)) {
-		if(this.text.length < this.maxLength) {
-			ch = strUtil.stylizeString(ch, this.textStyle);
+    if(ch && strUtil.isPrintable(ch)) {
+        if(this.text.length < this.maxLength) {
+            ch = strUtil.stylizeString(ch, this.textStyle);
 
-			if(!ch.match(this.patternArray[this.patternArrayPos])) {
-				return;
-			}
+            if(!ch.match(this.patternArray[this.patternArrayPos])) {
+                return;
+            }
 
-			this.text += ch;
-			this.patternArrayPos++;
+            this.text += ch;
+            this.patternArrayPos++;
 
-			while(this.patternArrayPos < this.patternArray.length &&
+            while(this.patternArrayPos < this.patternArray.length &&
 				!_.isRegExp(this.patternArray[this.patternArrayPos]))
-			{
-				this.patternArrayPos++;
-			}
+            {
+                this.patternArrayPos++;
+            }
 
-			this.redraw();
-			this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn()));
-		}
-	}
+            this.redraw();
+            this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn()));
+        }
+    }
 
-	MaskEditTextView.super_.prototype.onKeyPress.call(this, ch, key);
+    MaskEditTextView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 MaskEditTextView.prototype.setPropertyValue = function(propName, value) {
-	switch(propName) {
-		case 'maskPattern'	: this.setMaskPattern(value); break;
-	}
+    switch(propName) {
+        case 'maskPattern'	: this.setMaskPattern(value); break;
+    }
 
-	MaskEditTextView.super_.prototype.setPropertyValue.call(this, propName, value);
+    MaskEditTextView.super_.prototype.setPropertyValue.call(this, propName, value);
 };
 
 MaskEditTextView.prototype.getData = function() {
-	var rawData = MaskEditTextView.super_.prototype.getData.call(this);
+    var rawData = MaskEditTextView.super_.prototype.getData.call(this);
 
-	if(!rawData || 0 === rawData.length) {
-		return rawData;
-	}
+    if(!rawData || 0 === rawData.length) {
+        return rawData;
+    }
 
-	var data	= '';
+    var data	= '';
 
-	assert(rawData.length <= this.patternArray.length);
+    assert(rawData.length <= this.patternArray.length);
 
-	var p = 0;
-	for(var i = 0; i < this.patternArray.length; ++i) {
-		if(_.isRegExp(this.patternArray[i])) {
-			data += rawData[p++];
-		} else {
-			data += this.patternArray[i];
-		}
-	}
+    var p = 0;
+    for(var i = 0; i < this.patternArray.length; ++i) {
+        if(_.isRegExp(this.patternArray[i])) {
+            data += rawData[p++];
+        } else {
+            data += this.patternArray[i];
+        }
+    }
 
-	return data;
+    return data;
 };
diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index eab2787c..3bc333ae 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -22,186 +22,186 @@ const _						= require('lodash');
 exports.MCIViewFactory		= MCIViewFactory;
 
 function MCIViewFactory(client) {
-	this.client = client;
+    this.client = client;
 }
 
 MCIViewFactory.UserViewCodes = [
-	'TL', 'ET', 'ME', 'MT', 'PL', 'BT', 'VM', 'HM', 'SM', 'TM', 'KE',
+    'TL', 'ET', 'ME', 'MT', 'PL', 'BT', 'VM', 'HM', 'SM', 'TM', 'KE',
 
-	//
-	//	XY is a special MCI code that allows finding positions
-	//	and counts for key lookup, but does not explicitly
-	//	represent a visible View on it's own
-	//
-	'XY',
+    //
+    //	XY is a special MCI code that allows finding positions
+    //	and counts for key lookup, but does not explicitly
+    //	represent a visible View on it's own
+    //
+    'XY',
 ];
 
 MCIViewFactory.prototype.createFromMCI = function(mci) {
-	assert(mci.code);
-	assert(mci.id > 0);
-	assert(mci.position);
+    assert(mci.code);
+    assert(mci.id > 0);
+    assert(mci.position);
 
-	var view;
-	var options = {
-		client			: this.client,
-		id				: mci.id,
-		ansiSGR			: mci.SGR,
-		ansiFocusSGR	: mci.focusSGR,
-		position		: { row : mci.position[0], col : mci.position[1] },
-	};
+    var view;
+    var options = {
+        client			: this.client,
+        id				: mci.id,
+        ansiSGR			: mci.SGR,
+        ansiFocusSGR	: mci.focusSGR,
+        position		: { row : mci.position[0], col : mci.position[1] },
+    };
 
-	//	:TODO: These should use setPropertyValue()!
-	function setOption(pos, name) {
-		if(mci.args.length > pos && mci.args[pos].length > 0) {
-			options[name] = mci.args[pos];
-		}
-	}
+    //	:TODO: These should use setPropertyValue()!
+    function setOption(pos, name) {
+        if(mci.args.length > pos && mci.args[pos].length > 0) {
+            options[name] = mci.args[pos];
+        }
+    }
 
-	function setWidth(pos) {
-		if(mci.args.length > pos && mci.args[pos].length > 0) {
-			if(!_.isObject(options.dimens)) {
-				options.dimens = {};
-			}
-			options.dimens.width = parseInt(mci.args[pos], 10);
-		}
-	}
+    function setWidth(pos) {
+        if(mci.args.length > pos && mci.args[pos].length > 0) {
+            if(!_.isObject(options.dimens)) {
+                options.dimens = {};
+            }
+            options.dimens.width = parseInt(mci.args[pos], 10);
+        }
+    }
 
-	function setFocusOption(pos, name) {
-		if(mci.focusArgs && mci.focusArgs.length > pos && mci.focusArgs[pos].length > 0) {
-			options[name] = mci.focusArgs[pos];
-		}
-	}
+    function setFocusOption(pos, name) {
+        if(mci.focusArgs && mci.focusArgs.length > pos && mci.focusArgs[pos].length > 0) {
+            options[name] = mci.focusArgs[pos];
+        }
+    }
 
-	//
-	//	Note: Keep this in sync with UserViewCodes above!
-	//
-	switch(mci.code) {
-		//	Text Label (Text View)
-		case 'TL' :
-			setOption(0,	'textStyle');
-			setOption(1,	'justify');
-			setWidth(2);
+    //
+    //	Note: Keep this in sync with UserViewCodes above!
+    //
+    switch(mci.code) {
+        //	Text Label (Text View)
+        case 'TL' :
+            setOption(0,	'textStyle');
+            setOption(1,	'justify');
+            setWidth(2);
 
-			view = new TextView(options);
-			break;
+            view = new TextView(options);
+            break;
 
-		//	Edit Text
-		case 'ET' :
-			setWidth(0);
+            //	Edit Text
+        case 'ET' :
+            setWidth(0);
 
-			setOption(1, 		'textStyle');
-			setFocusOption(0,	'focusTextStyle');
+            setOption(1, 		'textStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new EditTextView(options);
-			break;
+            view = new EditTextView(options);
+            break;
 
-		//	Masked Edit Text
-		case 'ME' :
-			setOption(0,		'textStyle');
-			setFocusOption(0,	'focusTextStyle');
+            //	Masked Edit Text
+        case 'ME' :
+            setOption(0,		'textStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new MaskEditTextView(options);
-			break;
+            view = new MaskEditTextView(options);
+            break;
 
-		//	Multi Line Edit Text
-		case 'MT' :
-			//	:TODO: apply params
-			view = new MultiLineEditTextView(options);
-			break;
+            //	Multi Line Edit Text
+        case 'MT' :
+            //	:TODO: apply params
+            view = new MultiLineEditTextView(options);
+            break;
 
-		//	Pre-defined Label (Text View)
-		//	:TODO: Currently no real point of PL -- @method replaces this pretty much... probably remove
-		case 'PL' :
-			if(mci.args.length > 0) {
-				options.text = getPredefinedMCIValue(this.client, mci.args[0]);
-				if(options.text) {
-					setOption(1, 'textStyle');
-					setOption(2, 'justify');
-					setWidth(3);
+            //	Pre-defined Label (Text View)
+            //	:TODO: Currently no real point of PL -- @method replaces this pretty much... probably remove
+        case 'PL' :
+            if(mci.args.length > 0) {
+                options.text = getPredefinedMCIValue(this.client, mci.args[0]);
+                if(options.text) {
+                    setOption(1, 'textStyle');
+                    setOption(2, 'justify');
+                    setWidth(3);
 
-					view = new TextView(options);
-				}
-			}
-			break;
+                    view = new TextView(options);
+                }
+            }
+            break;
 
-		//	Button
-		case 'BT' :
-			if(mci.args.length > 0) {
-				options.dimens = { width : parseInt(mci.args[0], 10) };
-			}
+            //	Button
+        case 'BT' :
+            if(mci.args.length > 0) {
+                options.dimens = { width : parseInt(mci.args[0], 10) };
+            }
 
-			setOption(1, 'textStyle');
-			setOption(2, 'justify');
+            setOption(1, 'textStyle');
+            setOption(2, 'justify');
 
-			setFocusOption(0, 'focusTextStyle');
+            setFocusOption(0, 'focusTextStyle');
 
-			view = new ButtonView(options);
-			break;
+            view = new ButtonView(options);
+            break;
 
-		//	Vertial Menu
-		case 'VM' :
-			setOption(0,		'itemSpacing');
-			setOption(1, 		'justify');
-			setOption(2, 		'textStyle');
+            //	Vertial Menu
+        case 'VM' :
+            setOption(0,		'itemSpacing');
+            setOption(1, 		'justify');
+            setOption(2, 		'textStyle');
 
-			setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new VerticalMenuView(options);
-			break;
+            view = new VerticalMenuView(options);
+            break;
 
-		//	Horizontal Menu
-		case 'HM' :
-			setOption(0,		'itemSpacing');
-			setOption(1,		'textStyle');
+            //	Horizontal Menu
+        case 'HM' :
+            setOption(0,		'itemSpacing');
+            setOption(1,		'textStyle');
 
-			setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new HorizontalMenuView(options);
-			break;
+            view = new HorizontalMenuView(options);
+            break;
 
-		case 'SM' :
-			setOption(0,		'textStyle');
-			setOption(1, 		'justify');
+        case 'SM' :
+            setOption(0,		'textStyle');
+            setOption(1, 		'justify');
 
-			setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new SpinnerMenuView(options);
-			break;
+            view = new SpinnerMenuView(options);
+            break;
 
-		case 'TM' :
-			if(mci.args.length > 0) {
-				var styleSG1 = { fg : parseInt(mci.args[0], 10) };
-				if(mci.args.length > 1) {
-					styleSG1.bg = parseInt(mci.args[1], 10);
-				}
-				options.styleSG1 = ansi.getSGRFromGraphicRendition(styleSG1, true);
-			}
+        case 'TM' :
+            if(mci.args.length > 0) {
+                var styleSG1 = { fg : parseInt(mci.args[0], 10) };
+                if(mci.args.length > 1) {
+                    styleSG1.bg = parseInt(mci.args[1], 10);
+                }
+                options.styleSG1 = ansi.getSGRFromGraphicRendition(styleSG1, true);
+            }
 
-			setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,	'focusTextStyle');
 
-			view = new ToggleMenuView(options);
-			break;
+            view = new ToggleMenuView(options);
+            break;
 
-		case 'KE' :
-			view = new KeyEntryView(options);
-			break;
+        case 'KE' :
+            view = new KeyEntryView(options);
+            break;
 
-		default :
-			options.text = getPredefinedMCIValue(this.client, mci.code);
-			if(_.isString(options.text)) {
-				setWidth(0);
+        default :
+            options.text = getPredefinedMCIValue(this.client, mci.code);
+            if(_.isString(options.text)) {
+                setWidth(0);
 
-				setOption(1,	'textStyle');
-				setOption(2,	'justify');
+                setOption(1,	'textStyle');
+                setOption(2,	'justify');
 
-				view = new TextView(options);
-			}
-			break;
-	}
+                view = new TextView(options);
+            }
+            break;
+    }
 
-	if(view) {
-		view.mciCode = mci.code;
-	}
+    if(view) {
+        view.mciCode = mci.code;
+    }
 
-	return view;
+    return view;
 };
diff --git a/core/menu_module.js b/core/menu_module.js
index 20680354..520d30e9 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -19,358 +19,358 @@ const _						= require('lodash');
 
 exports.MenuModule = class MenuModule extends PluginModule {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.menuName			= options.menuName;
-		this.menuConfig			= options.menuConfig;
-		this.client				= options.client;
-		this.menuConfig.options	= options.menuConfig.options || {};
-		this.menuMethods		= {};	//	methods called from @method's
-		this.menuConfig.config	= this.menuConfig.config || {};
+        this.menuName			= options.menuName;
+        this.menuConfig			= options.menuConfig;
+        this.client				= options.client;
+        this.menuConfig.options	= options.menuConfig.options || {};
+        this.menuMethods		= {};	//	methods called from @method's
+        this.menuConfig.config	= this.menuConfig.config || {};
 
-		this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
+        this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
 
-		this.viewControllers	= {};
-	}
+        this.viewControllers	= {};
+    }
 
-	enter() {
-		this.initSequence();
-	}
+    enter() {
+        this.initSequence();
+    }
 
-	leave() {
-		this.detachViewControllers();
-	}
+    leave() {
+        this.detachViewControllers();
+    }
 
-	initSequence() {
-		const self		= this;
-		const mciData	= {};
-		let pausePosition;
+    initSequence() {
+        const self		= this;
+        const mciData	= {};
+        let pausePosition;
 
-		async.series(
-			[
-				function beforeDisplayArt(callback) {
-					self.beforeArt(callback);
-				},
-				function displayMenuArt(callback) {
-					if(!_.isString(self.menuConfig.art)) {
-						return callback(null);
-					}
+        async.series(
+            [
+                function beforeDisplayArt(callback) {
+                    self.beforeArt(callback);
+                },
+                function displayMenuArt(callback) {
+                    if(!_.isString(self.menuConfig.art)) {
+                        return callback(null);
+                    }
 
-					self.displayAsset(
-						self.menuConfig.art,
-						self.menuConfig.options,
-						(err, artData) => {
-							if(err) {
-								self.client.log.trace('Could not display art', { art : self.menuConfig.art, reason : err.message } );
-							} else {
-								mciData.menu = artData.mciMap;
-							}
+                    self.displayAsset(
+                        self.menuConfig.art,
+                        self.menuConfig.options,
+                        (err, artData) => {
+                            if(err) {
+                                self.client.log.trace('Could not display art', { art : self.menuConfig.art, reason : err.message } );
+                            } else {
+                                mciData.menu = artData.mciMap;
+                            }
 
-							return callback(null);	//	any errors are non-fatal
-						}
-					);
-				},
-				function moveToPromptLocation(callback) {
-					if(self.menuConfig.prompt) {
-						//	:TODO: fetch and move cursor to prompt location, if supplied. See notes/etc. on placements
-					}
+                            return callback(null);	//	any errors are non-fatal
+                        }
+                    );
+                },
+                function moveToPromptLocation(callback) {
+                    if(self.menuConfig.prompt) {
+                        //	:TODO: fetch and move cursor to prompt location, if supplied. See notes/etc. on placements
+                    }
 
-					return callback(null);
-				},
-				function displayPromptArt(callback) {
-					if(!_.isString(self.menuConfig.prompt)) {
-						return callback(null);
-					}
+                    return callback(null);
+                },
+                function displayPromptArt(callback) {
+                    if(!_.isString(self.menuConfig.prompt)) {
+                        return callback(null);
+                    }
 
-					if(!_.isObject(self.menuConfig.promptConfig)) {
-						return callback(Errors.MissingConfig('Prompt specified but no "promptConfig" block found'));
-					}
+                    if(!_.isObject(self.menuConfig.promptConfig)) {
+                        return callback(Errors.MissingConfig('Prompt specified but no "promptConfig" block found'));
+                    }
 
-					self.displayAsset(
-						self.menuConfig.promptConfig.art,
-						self.menuConfig.options,
-						(err, artData) => {
-							if(artData) {
-								mciData.prompt = artData.mciMap;
-							}
-							return callback(err);	//	pass err here; prompts *must* have art
-						}
-					);
-				},
-				function recordCursorPosition(callback) {
-					if(!self.shouldPause()) {
-						return callback(null);	//	cursor position not needed
-					}
+                    self.displayAsset(
+                        self.menuConfig.promptConfig.art,
+                        self.menuConfig.options,
+                        (err, artData) => {
+                            if(artData) {
+                                mciData.prompt = artData.mciMap;
+                            }
+                            return callback(err);	//	pass err here; prompts *must* have art
+                        }
+                    );
+                },
+                function recordCursorPosition(callback) {
+                    if(!self.shouldPause()) {
+                        return callback(null);	//	cursor position not needed
+                    }
 
-					self.client.once('cursor position report', pos => {
-						pausePosition = { row : pos[0], col : 1 };
-						self.client.log.trace('After art position recorded', pausePosition );
-						return callback(null);
-					});
+                    self.client.once('cursor position report', pos => {
+                        pausePosition = { row : pos[0], col : 1 };
+                        self.client.log.trace('After art position recorded', pausePosition );
+                        return callback(null);
+                    });
 
-					self.client.term.rawWrite(ansi.queryPos());
-				},
-				function afterArtDisplayed(callback) {
-					return self.mciReady(mciData, callback);
-				},
-				function displayPauseIfRequested(callback) {
-					if(!self.shouldPause()) {
-						return callback(null);
-					}
+                    self.client.term.rawWrite(ansi.queryPos());
+                },
+                function afterArtDisplayed(callback) {
+                    return self.mciReady(mciData, callback);
+                },
+                function displayPauseIfRequested(callback) {
+                    if(!self.shouldPause()) {
+                        return callback(null);
+                    }
 
-					return self.pausePrompt(pausePosition, callback);
-				},
-				function finishAndNext(callback) {
-					self.finishedLoading();
-					return self.autoNextMenu(callback);
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn('Error during init sequence', { error : err.message } );
+                    return self.pausePrompt(pausePosition, callback);
+                },
+                function finishAndNext(callback) {
+                    self.finishedLoading();
+                    return self.autoNextMenu(callback);
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn('Error during init sequence', { error : err.message } );
 
-					return self.prevMenu( () => { /* dummy */ } );
-				}
-			}
-		);
-	}
+                    return self.prevMenu( () => { /* dummy */ } );
+                }
+            }
+        );
+    }
 
-	beforeArt(cb) {
-		if(_.isNumber(this.menuConfig.options.baudRate)) {
-			//	:TODO: some terminals not supporting cterm style emulated baud rate end up displaying a broken ESC sequence or a single "r" here
-			this.client.term.rawWrite(ansi.setEmulatedBaudRate(this.menuConfig.options.baudRate));
-		}
+    beforeArt(cb) {
+        if(_.isNumber(this.menuConfig.options.baudRate)) {
+            //	:TODO: some terminals not supporting cterm style emulated baud rate end up displaying a broken ESC sequence or a single "r" here
+            this.client.term.rawWrite(ansi.setEmulatedBaudRate(this.menuConfig.options.baudRate));
+        }
 
-		if(this.cls) {
-			this.client.term.rawWrite(ansi.resetScreen());
-		}
+        if(this.cls) {
+            this.client.term.rawWrite(ansi.resetScreen());
+        }
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 
-	mciReady(mciData, cb) {
-		//	available for sub-classes
-		return cb(null);
-	}
+    mciReady(mciData, cb) {
+        //	available for sub-classes
+        return cb(null);
+    }
 
-	finishedLoading() {
-		//	nothing in base
-	}
+    finishedLoading() {
+        //	nothing in base
+    }
 
-	getSaveState() {
-		//	nothing in base
-	}
+    getSaveState() {
+        //	nothing in base
+    }
 
-	restoreSavedState(/*savedState*/) {
-		//	nothing in base
-	}
+    restoreSavedState(/*savedState*/) {
+        //	nothing in base
+    }
 
-	getMenuResult() {
-		//	default to the formData that was provided @ a submit, if any
-		return this.submitFormData;
-	}
+    getMenuResult() {
+        //	default to the formData that was provided @ a submit, if any
+        return this.submitFormData;
+    }
 
-	nextMenu(cb) {
-		if(!this.haveNext()) {
-			return this.prevMenu(cb);	//	no next, go to prev
-		}
+    nextMenu(cb) {
+        if(!this.haveNext()) {
+            return this.prevMenu(cb);	//	no next, go to prev
+        }
 
-		return this.client.menuStack.next(cb);
-	}
+        return this.client.menuStack.next(cb);
+    }
 
-	prevMenu(cb) {
-		return this.client.menuStack.prev(cb);
-	}
+    prevMenu(cb) {
+        return this.client.menuStack.prev(cb);
+    }
 
-	gotoMenu(name, options, cb) {
-		return this.client.menuStack.goto(name, options, cb);
-	}
+    gotoMenu(name, options, cb) {
+        return this.client.menuStack.goto(name, options, cb);
+    }
 
-	addViewController(name, vc) {
-		assert(!this.viewControllers[name], `ViewController by the name of "${name}" already exists!`);
+    addViewController(name, vc) {
+        assert(!this.viewControllers[name], `ViewController by the name of "${name}" already exists!`);
 
-		this.viewControllers[name] = vc;
-		return vc;
-	}
+        this.viewControllers[name] = vc;
+        return vc;
+    }
 
-	detachViewControllers() {
-		Object.keys(this.viewControllers).forEach( name => {
-			this.viewControllers[name].detachClientEvents();
-		});
-	}
+    detachViewControllers() {
+        Object.keys(this.viewControllers).forEach( name => {
+            this.viewControllers[name].detachClientEvents();
+        });
+    }
 
-	shouldPause() {
-		return ('end' === this.menuConfig.options.pause || true === this.menuConfig.options.pause);
-	}
+    shouldPause() {
+        return ('end' === this.menuConfig.options.pause || true === this.menuConfig.options.pause);
+    }
 
-	hasNextTimeout() {
-		return _.isNumber(this.menuConfig.options.nextTimeout);
-	}
+    hasNextTimeout() {
+        return _.isNumber(this.menuConfig.options.nextTimeout);
+    }
 
-	haveNext() {
-		return (_.isString(this.menuConfig.next) || _.isArray(this.menuConfig.next));
-	}
+    haveNext() {
+        return (_.isString(this.menuConfig.next) || _.isArray(this.menuConfig.next));
+    }
 
-	autoNextMenu(cb) {
-		const self = this;
+    autoNextMenu(cb) {
+        const self = this;
 
-		function gotoNextMenu() {
-			if(self.haveNext()) {
-				return menuUtil.handleNext(self.client, self.menuConfig.next, {}, cb);
-			} else {
-				return self.prevMenu(cb);
-			}
-		}
+        function gotoNextMenu() {
+            if(self.haveNext()) {
+                return menuUtil.handleNext(self.client, self.menuConfig.next, {}, cb);
+            } else {
+                return self.prevMenu(cb);
+            }
+        }
 
-		if(_.has(this.menuConfig, 'runtime.autoNext') && true === this.menuConfig.runtime.autoNext) {
-			if(this.hasNextTimeout()) {
-				setTimeout( () => {
-					return gotoNextMenu();
-				}, this.menuConfig.options.nextTimeout);
-			} else {
-				return gotoNextMenu();
-			}
-		}
-	}
+        if(_.has(this.menuConfig, 'runtime.autoNext') && true === this.menuConfig.runtime.autoNext) {
+            if(this.hasNextTimeout()) {
+                setTimeout( () => {
+                    return gotoNextMenu();
+                }, this.menuConfig.options.nextTimeout);
+            } else {
+                return gotoNextMenu();
+            }
+        }
+    }
 
-	standardMCIReadyHandler(mciData, cb) {
-		//
-		//	A quick rundown:
-		//	*	We may have mciData.menu, mciData.prompt, or both.
-		//	*	Prompt form is favored over menu form if both are present.
-		//	*	Standard/prefdefined MCI entries must load both (e.g. %BN is expected to resolve)
-		//
-		const self = this;
+    standardMCIReadyHandler(mciData, cb) {
+        //
+        //	A quick rundown:
+        //	*	We may have mciData.menu, mciData.prompt, or both.
+        //	*	Prompt form is favored over menu form if both are present.
+        //	*	Standard/prefdefined MCI entries must load both (e.g. %BN is expected to resolve)
+        //
+        const self = this;
 
-		async.series(
-			[
-				function addViewControllers(callback) {
-					_.forEach(mciData, (mciMap, name) => {
-						assert('menu' === name || 'prompt' === name);
-						self.addViewController(name, new ViewController( { client : self.client } ) );
-					});
+        async.series(
+            [
+                function addViewControllers(callback) {
+                    _.forEach(mciData, (mciMap, name) => {
+                        assert('menu' === name || 'prompt' === name);
+                        self.addViewController(name, new ViewController( { client : self.client } ) );
+                    });
 
-					return callback(null);
-				},
-				function createMenu(callback) {
-					if(!self.viewControllers.menu) {
-						return callback(null);
-					}
+                    return callback(null);
+                },
+                function createMenu(callback) {
+                    if(!self.viewControllers.menu) {
+                        return callback(null);
+                    }
 
-					const menuLoadOpts = {
-						mciMap		: mciData.menu,
-						callingMenu	: self,
-						withoutForm	: _.isObject(mciData.prompt),
-					};
+                    const menuLoadOpts = {
+                        mciMap		: mciData.menu,
+                        callingMenu	: self,
+                        withoutForm	: _.isObject(mciData.prompt),
+                    };
 
-					self.viewControllers.menu.loadFromMenuConfig(menuLoadOpts, err => {
-						return callback(err);
-					});
-				},
-				function createPrompt(callback) {
-					if(!self.viewControllers.prompt) {
-						return callback(null);
-					}
+                    self.viewControllers.menu.loadFromMenuConfig(menuLoadOpts, err => {
+                        return callback(err);
+                    });
+                },
+                function createPrompt(callback) {
+                    if(!self.viewControllers.prompt) {
+                        return callback(null);
+                    }
 
-					const promptLoadOpts = {
-						callingMenu		: self,
-						mciMap			: mciData.prompt,
-					};
+                    const promptLoadOpts = {
+                        callingMenu		: self,
+                        mciMap			: mciData.prompt,
+                    };
 
-					self.viewControllers.prompt.loadFromPromptConfig(promptLoadOpts, err => {
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                    self.viewControllers.prompt.loadFromPromptConfig(promptLoadOpts, err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	displayAsset(name, options, cb) {
-		if(_.isFunction(options)) {
-			cb = options;
-			options = {};
-		}
+    displayAsset(name, options, cb) {
+        if(_.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
 
-		if(options.clearScreen) {
-			this.client.term.rawWrite(ansi.resetScreen());
-		}
+        if(options.clearScreen) {
+            this.client.term.rawWrite(ansi.resetScreen());
+        }
 
-		return theme.displayThemedAsset(
-			name,
-			this.client,
-			Object.assign( { font : this.menuConfig.config.font }, options ),
-			(err, artData) => {
-				if(cb) {
-					return cb(err, artData);
-				}
-			}
-		);
-	}
+        return theme.displayThemedAsset(
+            name,
+            this.client,
+            Object.assign( { font : this.menuConfig.config.font }, options ),
+            (err, artData) => {
+                if(cb) {
+                    return cb(err, artData);
+                }
+            }
+        );
+    }
 
-	prepViewController(name, formId, mciMap, cb) {
-		if(_.isUndefined(this.viewControllers[name])) {
-			const vcOpts = {
-				client		: this.client,
-				formId		: formId,
-			};
+    prepViewController(name, formId, mciMap, cb) {
+        if(_.isUndefined(this.viewControllers[name])) {
+            const vcOpts = {
+                client		: this.client,
+                formId		: formId,
+            };
 
-			const vc = this.addViewController(name, new ViewController(vcOpts));
+            const vc = this.addViewController(name, new ViewController(vcOpts));
 
-			const loadOpts = {
-				callingMenu		: this,
-				mciMap			: mciMap,
-				formId			: formId,
-			};
+            const loadOpts = {
+                callingMenu		: this,
+                mciMap			: mciMap,
+                formId			: formId,
+            };
 
-			return vc.loadFromMenuConfig(loadOpts, err => {
-				return cb(err, vc);
-			});
-		}
+            return vc.loadFromMenuConfig(loadOpts, err => {
+                return cb(err, vc);
+            });
+        }
 
-		this.viewControllers[name].setFocus(true);
+        this.viewControllers[name].setFocus(true);
 
-		return cb(null, this.viewControllers[name]);
-	}
+        return cb(null, this.viewControllers[name]);
+    }
 
-	prepViewControllerWithArt(name, formId, options, cb) {
-		this.displayAsset(
-			this.menuConfig.config.art[name],
-			options,
-			(err, artData) => {
-				if(err) {
-					return cb(err);
-				}
+    prepViewControllerWithArt(name, formId, options, cb) {
+        this.displayAsset(
+            this.menuConfig.config.art[name],
+            options,
+            (err, artData) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				return this.prepViewController(name, formId, artData.mciMap, cb);
-			}
-		);
-	}
+                return this.prepViewController(name, formId, artData.mciMap, cb);
+            }
+        );
+    }
 
-	optionalMoveToPosition(position) {
-		if(position) {
-			position.x = position.row || position.x || 1;
-			position.y = position.col || position.y || 1;
+    optionalMoveToPosition(position) {
+        if(position) {
+            position.x = position.row || position.x || 1;
+            position.y = position.col || position.y || 1;
 
-			this.client.term.rawWrite(ansi.goto(position.x, position.y));
-		}
-	}
+            this.client.term.rawWrite(ansi.goto(position.x, position.y));
+        }
+    }
 
-	pausePrompt(position, cb) {
-		if(!cb && _.isFunction(position)) {
-			cb = position;
-			position = null;
-		}
+    pausePrompt(position, cb) {
+        if(!cb && _.isFunction(position)) {
+            cb = position;
+            position = null;
+        }
 
-		this.optionalMoveToPosition(position);
+        this.optionalMoveToPosition(position);
 
-		return theme.displayThemedPause(this.client, cb);
-	}
+        return theme.displayThemedPause(this.client, cb);
+    }
 
-	/*
+    /*
 	:TODO: this needs quite a bit of work - but would be nice: promptForInput(..., (err, formData) => ... )
 	promptForInput(formName, name, options, cb) {
 		if(!cb && _.isFunction(options)) {
@@ -386,55 +386,55 @@ exports.MenuModule = class MenuModule extends PluginModule {
 	}
 	*/
 
-	setViewText(formName, mciId, text, appendMultiLine) {
-		const view = this.viewControllers[formName].getView(mciId);
-		if(!view) {
-			return;
-		}
+    setViewText(formName, mciId, text, appendMultiLine) {
+        const view = this.viewControllers[formName].getView(mciId);
+        if(!view) {
+            return;
+        }
 
-		if(appendMultiLine && (view instanceof MultiLineEditTextView)) {
-			view.addText(text);
-		} else {
-			view.setText(text);
-		}
-	}
+        if(appendMultiLine && (view instanceof MultiLineEditTextView)) {
+            view.addText(text);
+        } else {
+            view.setText(text);
+        }
+    }
 
-	updateCustomViewTextsWithFilter(formName, startId, fmtObj, options) {
-		options = options || {};
+    updateCustomViewTextsWithFilter(formName, startId, fmtObj, options) {
+        options = options || {};
 
-		let textView;
-		let customMciId = startId;
-		const config	= this.menuConfig.config;
-		const endId		= options.endId || 99;	//	we'll fail to get a view before 99
+        let textView;
+        let customMciId = startId;
+        const config	= this.menuConfig.config;
+        const endId		= options.endId || 99;	//	we'll fail to get a view before 99
 
-		while(customMciId <= endId && (textView = this.viewControllers[formName].getView(customMciId)) ) {
-			const key		= `${formName}InfoFormat${customMciId}`;	//	e.g. "mainInfoFormat10"
-			const format	= config[key];
+        while(customMciId <= endId && (textView = this.viewControllers[formName].getView(customMciId)) ) {
+            const key		= `${formName}InfoFormat${customMciId}`;	//	e.g. "mainInfoFormat10"
+            const format	= config[key];
 
-			if(format && (!options.filter || options.filter.find(f => format.indexOf(f) > - 1))) {
-				const text = stringFormat(format, fmtObj);
+            if(format && (!options.filter || options.filter.find(f => format.indexOf(f) > - 1))) {
+                const text = stringFormat(format, fmtObj);
 
-				if(options.appendMultiLine && (textView instanceof MultiLineEditTextView)) {
-					textView.addText(text);
-				} else {
-					textView.setText(text);
-				}
-			}
+                if(options.appendMultiLine && (textView instanceof MultiLineEditTextView)) {
+                    textView.addText(text);
+                } else {
+                    textView.setText(text);
+                }
+            }
 
-			++customMciId;
-		}
-	}
+            ++customMciId;
+        }
+    }
 
-	refreshPredefinedMciViewsByCode(formName, mciCodes) {
-		const form = _.get(this, [ 'viewControllers', formName] );
-		if(form) {
-			form.getViewsByMciCode(mciCodes).forEach(v => {
-				if(!v.setText) {
-					return;
-				}
+    refreshPredefinedMciViewsByCode(formName, mciCodes) {
+        const form = _.get(this, [ 'viewControllers', formName] );
+        if(form) {
+            form.getViewsByMciCode(mciCodes).forEach(v => {
+                if(!v.setText) {
+                    return;
+                }
 
-				v.setText(getPredefinedMCIValue(this.client, v.mciCode));
-			});
-		}
-	}
+                v.setText(getPredefinedMCIValue(this.client, v.mciCode));
+            });
+        }
+    }
 };
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 3775c065..90269bcb 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -12,180 +12,180 @@ const assert	= require('assert');
 //	:TODO: Stack is backwards.... top should be most recent! :)
 
 module.exports = class MenuStack {
-	constructor(client) {
-		this.client	= client;
-		this.stack	= [];
-	}
+    constructor(client) {
+        this.client	= client;
+        this.stack	= [];
+    }
 
-	push(moduleInfo) {
-		return this.stack.push(moduleInfo);
-	}
+    push(moduleInfo) {
+        return this.stack.push(moduleInfo);
+    }
 
-	pop() {
-		return this.stack.pop();
-	}
+    pop() {
+        return this.stack.pop();
+    }
 
-	peekPrev() {
-		if(this.stackSize > 1) {
-			return this.stack[this.stack.length - 2];
-		}
-	}
+    peekPrev() {
+        if(this.stackSize > 1) {
+            return this.stack[this.stack.length - 2];
+        }
+    }
 
-	top() {
-		if(this.stackSize > 0) {
-			return this.stack[this.stack.length - 1];
-		}
-	}
+    top() {
+        if(this.stackSize > 0) {
+            return this.stack[this.stack.length - 1];
+        }
+    }
 
-	get stackSize() {
-		return this.stack.length;
-	}
+    get stackSize() {
+        return this.stack.length;
+    }
 
-	get currentModule() {
-		const top = this.top();
-		if(top) {
-			return top.instance;
-		}
-	}
+    get currentModule() {
+        const top = this.top();
+        if(top) {
+            return top.instance;
+        }
+    }
 
-	next(cb) {
-		const currentModuleInfo = this.top();
-		assert(currentModuleInfo, 'Empty menu stack!');
+    next(cb) {
+        const currentModuleInfo = this.top();
+        assert(currentModuleInfo, 'Empty menu stack!');
 
-		const menuConfig	= currentModuleInfo.instance.menuConfig;
-		const nextMenu		= this.client.acs.getConditionalValue(menuConfig.next, 'next');
-		if(!nextMenu) {
-			return cb(Array.isArray(menuConfig.next) ?
-				Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
-				Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT')
-			);
-		}
+        const menuConfig	= currentModuleInfo.instance.menuConfig;
+        const nextMenu		= this.client.acs.getConditionalValue(menuConfig.next, 'next');
+        if(!nextMenu) {
+            return cb(Array.isArray(menuConfig.next) ?
+                Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
+                Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT')
+            );
+        }
 
-		if(nextMenu === currentModuleInfo.name) {
-			return cb(Errors.MenuStack('Menu config "next" specifies current menu', 'ALREADYTHERE'));
-		}
+        if(nextMenu === currentModuleInfo.name) {
+            return cb(Errors.MenuStack('Menu config "next" specifies current menu', 'ALREADYTHERE'));
+        }
 
-		this.goto(nextMenu, { }, cb);
-	}
+        this.goto(nextMenu, { }, cb);
+    }
 
-	prev(cb) {
-		const menuResult = this.top().instance.getMenuResult();
+    prev(cb) {
+        const menuResult = this.top().instance.getMenuResult();
 
-		//	:TODO: leave() should really take a cb...
-		this.pop().instance.leave();	//	leave & remove current
+        //	:TODO: leave() should really take a cb...
+        this.pop().instance.leave();	//	leave & remove current
 
-		const previousModuleInfo = this.pop();	//	get previous
+        const previousModuleInfo = this.pop();	//	get previous
 
-		if(previousModuleInfo) {
-			const opts = {
-				extraArgs		: previousModuleInfo.extraArgs,
-				savedState		: previousModuleInfo.savedState,
-				lastMenuResult	: menuResult,
-			};
+        if(previousModuleInfo) {
+            const opts = {
+                extraArgs		: previousModuleInfo.extraArgs,
+                savedState		: previousModuleInfo.savedState,
+                lastMenuResult	: menuResult,
+            };
 
-			return this.goto(previousModuleInfo.name, opts, cb);
-		}
+            return this.goto(previousModuleInfo.name, opts, cb);
+        }
 
-		return cb(Errors.MenuStack('No previous menu available', 'NOPREV'));
-	}
+        return cb(Errors.MenuStack('No previous menu available', 'NOPREV'));
+    }
 
-	goto(name, options, cb) {
-		const currentModuleInfo = this.top();
+    goto(name, options, cb) {
+        const currentModuleInfo = this.top();
 
-		if(!cb && _.isFunction(options)) {
-			cb = options;
-			options = {};
-		}
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
 
-		options = options || {};
-		const self = this;
+        options = options || {};
+        const self = this;
 
-		if(currentModuleInfo && name === currentModuleInfo.name) {
-			if(cb) {
-				cb(Errors.MenuStack('Already at supplied menu', 'ALREADYTHERE'));
-			}
-			return;
-		}
+        if(currentModuleInfo && name === currentModuleInfo.name) {
+            if(cb) {
+                cb(Errors.MenuStack('Already at supplied menu', 'ALREADYTHERE'));
+            }
+            return;
+        }
 
-		const loadOpts = {
-			name		: name,
-			client		: self.client,
-		};
+        const loadOpts = {
+            name		: name,
+            client		: self.client,
+        };
 
-		if(currentModuleInfo && currentModuleInfo.menuFlags.includes('forwardArgs')) {
-			loadOpts.extraArgs = currentModuleInfo.extraArgs;
-		} else {
-			loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
-		}
-		loadOpts.lastMenuResult	= options.lastMenuResult;
+        if(currentModuleInfo && currentModuleInfo.menuFlags.includes('forwardArgs')) {
+            loadOpts.extraArgs = currentModuleInfo.extraArgs;
+        } else {
+            loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
+        }
+        loadOpts.lastMenuResult	= options.lastMenuResult;
 
-		loadMenu(loadOpts, (err, modInst) => {
-			if(err) {
-				//	:TODO: probably should just require a cb...
-				const errCb = cb || self.client.defaultHandlerMissingMod();
-				errCb(err);
-			} else {
-				self.client.log.debug( { menuName : name }, 'Goto menu module');
+        loadMenu(loadOpts, (err, modInst) => {
+            if(err) {
+                //	:TODO: probably should just require a cb...
+                const errCb = cb || self.client.defaultHandlerMissingMod();
+                errCb(err);
+            } else {
+                self.client.log.debug( { menuName : name }, 'Goto menu module');
 
-				//
-				//	If menuFlags were supplied in menu.hjson, they should win over
-				//	anything supplied in code.
-				//
-				let menuFlags;
-				if(0 === modInst.menuConfig.options.menuFlags.length) {
-					menuFlags = Array.isArray(options.menuFlags) ? options.menuFlags : [];
-				} else {
-					menuFlags = modInst.menuConfig.options.menuFlags;
+                //
+                //	If menuFlags were supplied in menu.hjson, they should win over
+                //	anything supplied in code.
+                //
+                let menuFlags;
+                if(0 === modInst.menuConfig.options.menuFlags.length) {
+                    menuFlags = Array.isArray(options.menuFlags) ? options.menuFlags : [];
+                } else {
+                    menuFlags = modInst.menuConfig.options.menuFlags;
 
-					//	in code we can ask to merge in
-					if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
-						menuFlags = _.uniq(menuFlags.concat(options.menuFlags));
-					}
-				}
+                    //	in code we can ask to merge in
+                    if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
+                        menuFlags = _.uniq(menuFlags.concat(options.menuFlags));
+                    }
+                }
 
-				if(currentModuleInfo) {
-					//	save stack state
-					currentModuleInfo.savedState = currentModuleInfo.instance.getSaveState();
+                if(currentModuleInfo) {
+                    //	save stack state
+                    currentModuleInfo.savedState = currentModuleInfo.instance.getSaveState();
 
-					currentModuleInfo.instance.leave();
+                    currentModuleInfo.instance.leave();
 
-					if(currentModuleInfo.menuFlags.includes('noHistory')) {
-						this.pop();
-					}
+                    if(currentModuleInfo.menuFlags.includes('noHistory')) {
+                        this.pop();
+                    }
 
-					if(menuFlags.includes('popParent')) {
-						this.pop().instance.leave();	//	leave & remove current
-					}
-				}
+                    if(menuFlags.includes('popParent')) {
+                        this.pop().instance.leave();	//	leave & remove current
+                    }
+                }
 
-				self.push({
-					name		: name,
-					instance	: modInst,
-					extraArgs	: loadOpts.extraArgs,
-					menuFlags	: menuFlags,
-				});
+                self.push({
+                    name		: name,
+                    instance	: modInst,
+                    extraArgs	: loadOpts.extraArgs,
+                    menuFlags	: menuFlags,
+                });
 
-				//	restore previous state if requested
-				if(options.savedState) {
-					modInst.restoreSavedState(options.savedState);
-				}
+                //	restore previous state if requested
+                if(options.savedState) {
+                    modInst.restoreSavedState(options.savedState);
+                }
 
-				const stackEntries = self.stack.map(stackEntry => {
-					let name = stackEntry.name;
-					if(stackEntry.instance.menuConfig.options.menuFlags.length > 0) {
-						name += ` (${stackEntry.instance.menuConfig.options.menuFlags.join(', ')})`;
-					}
-					return name;
-				});
+                const stackEntries = self.stack.map(stackEntry => {
+                    let name = stackEntry.name;
+                    if(stackEntry.instance.menuConfig.options.menuFlags.length > 0) {
+                        name += ` (${stackEntry.instance.menuConfig.options.menuFlags.join(', ')})`;
+                    }
+                    return name;
+                });
 
-				self.client.log.trace( { stack : stackEntries }, 'Updated menu stack' );
+                self.client.log.trace( { stack : stackEntries }, 'Updated menu stack' );
 
-				modInst.enter();
+                modInst.enter();
 
-				if(cb) {
-					cb(null);
-				}
-			}
-		});
-	}
+                if(cb) {
+                    cb(null);
+                }
+            }
+        });
+    }
 };
diff --git a/core/menu_util.js b/core/menu_util.js
index c6ad3a85..76205d3f 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -19,243 +19,243 @@ exports.handleAction					= handleAction;
 exports.handleNext						= handleNext;
 
 function getMenuConfig(client, name, cb) {
-	var menuConfig;
+    var menuConfig;
 
-	async.waterfall(
-		[
-			function locateMenuConfig(callback) {
-				if(_.has(client.currentTheme, [ 'menus', name ])) {
-					menuConfig = client.currentTheme.menus[name];
-					callback(null);
-				} else {
-					callback(new Error('No menu entry for \'' + name + '\''));
-				}
-			},
-			function locatePromptConfig(callback) {
-				if(_.isString(menuConfig.prompt)) {
-					if(_.has(client.currentTheme, [ 'prompts', menuConfig.prompt ])) {
-						menuConfig.promptConfig = client.currentTheme.prompts[menuConfig.prompt];
-						callback(null);
-					} else {
-						callback(new Error('No prompt entry for \'' + menuConfig.prompt + '\''));
-					}
-				} else {
-					callback(null);
-				}
-			}
-		],
-		function complete(err) {
-			cb(err, menuConfig);
-		}
-	);
+    async.waterfall(
+        [
+            function locateMenuConfig(callback) {
+                if(_.has(client.currentTheme, [ 'menus', name ])) {
+                    menuConfig = client.currentTheme.menus[name];
+                    callback(null);
+                } else {
+                    callback(new Error('No menu entry for \'' + name + '\''));
+                }
+            },
+            function locatePromptConfig(callback) {
+                if(_.isString(menuConfig.prompt)) {
+                    if(_.has(client.currentTheme, [ 'prompts', menuConfig.prompt ])) {
+                        menuConfig.promptConfig = client.currentTheme.prompts[menuConfig.prompt];
+                        callback(null);
+                    } else {
+                        callback(new Error('No prompt entry for \'' + menuConfig.prompt + '\''));
+                    }
+                } else {
+                    callback(null);
+                }
+            }
+        ],
+        function complete(err) {
+            cb(err, menuConfig);
+        }
+    );
 }
 
 function loadMenu(options, cb) {
-	assert(_.isObject(options));
-	assert(_.isString(options.name));
-	assert(_.isObject(options.client));
+    assert(_.isObject(options));
+    assert(_.isString(options.name));
+    assert(_.isObject(options.client));
 
-	async.waterfall(
-		[
-			function getMenuConfiguration(callback) {
-				getMenuConfig(options.client, options.name, (err, menuConfig) => {
-					return callback(err, menuConfig);
-				});
-			},
-			function loadMenuModule(menuConfig, callback) {
+    async.waterfall(
+        [
+            function getMenuConfiguration(callback) {
+                getMenuConfig(options.client, options.name, (err, menuConfig) => {
+                    return callback(err, menuConfig);
+                });
+            },
+            function loadMenuModule(menuConfig, callback) {
 
-				menuConfig.options = menuConfig.options || {};
-				menuConfig.options.menuFlags = menuConfig.options.menuFlags || [];
-				if(!Array.isArray(menuConfig.options.menuFlags)) {
-					menuConfig.options.menuFlags = [ menuConfig.options.menuFlags ];
-				}
+                menuConfig.options = menuConfig.options || {};
+                menuConfig.options.menuFlags = menuConfig.options.menuFlags || [];
+                if(!Array.isArray(menuConfig.options.menuFlags)) {
+                    menuConfig.options.menuFlags = [ menuConfig.options.menuFlags ];
+                }
 
-				const modAsset		= asset.getModuleAsset(menuConfig.module);
-				const modSupplied	= null !== modAsset;
+                const modAsset		= asset.getModuleAsset(menuConfig.module);
+                const modSupplied	= null !== modAsset;
 
-				const modLoadOpts = {
-					name		: modSupplied ? modAsset.asset : 'standard_menu',
-					path		: (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config().paths.mods,
-					category	: (!modSupplied || 'systemModule' === modAsset.type) ? null : 'mods',
-				};
+                const modLoadOpts = {
+                    name		: modSupplied ? modAsset.asset : 'standard_menu',
+                    path		: (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config().paths.mods,
+                    category	: (!modSupplied || 'systemModule' === modAsset.type) ? null : 'mods',
+                };
 
-				moduleUtil.loadModuleEx(modLoadOpts, (err, mod) => {
-					const modData = {
-						name	: modLoadOpts.name,
-						config	: menuConfig,
-						mod		: mod,
-					};
+                moduleUtil.loadModuleEx(modLoadOpts, (err, mod) => {
+                    const modData = {
+                        name	: modLoadOpts.name,
+                        config	: menuConfig,
+                        mod		: mod,
+                    };
 
-					return callback(err, modData);
-				});
-			},
-			function createModuleInstance(modData, callback) {
-				Log.trace(
-					{ moduleName : modData.name, extraArgs : options.extraArgs, config : modData.config, info : modData.mod.modInfo },
-					'Creating menu module instance');
+                    return callback(err, modData);
+                });
+            },
+            function createModuleInstance(modData, callback) {
+                Log.trace(
+                    { moduleName : modData.name, extraArgs : options.extraArgs, config : modData.config, info : modData.mod.modInfo },
+                    'Creating menu module instance');
 
-				let moduleInstance;
-				try {
-					moduleInstance = new modData.mod.getModule({
-						menuName		: options.name,
-						menuConfig		: modData.config,
-						extraArgs		: options.extraArgs,
-						client			: options.client,
-						lastMenuResult	: options.lastMenuResult,
-					});
-				} catch(e) {
-					return callback(e);
-				}
+                let moduleInstance;
+                try {
+                    moduleInstance = new modData.mod.getModule({
+                        menuName		: options.name,
+                        menuConfig		: modData.config,
+                        extraArgs		: options.extraArgs,
+                        client			: options.client,
+                        lastMenuResult	: options.lastMenuResult,
+                    });
+                } catch(e) {
+                    return callback(e);
+                }
 
-				return callback(null, moduleInstance);
-			}
-		],
-		(err, modInst) => {
-			return cb(err, modInst);
-		}
-	);
+                return callback(null, moduleInstance);
+            }
+        ],
+        (err, modInst) => {
+            return cb(err, modInst);
+        }
+    );
 }
 
 function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
-	assert(_.isObject(menuConfig));
+    assert(_.isObject(menuConfig));
 
-	if(!_.isObject(menuConfig.form)) {
-		cb(new Error('Invalid or missing \'form\' member for menu'));
-		return;
-	}
+    if(!_.isObject(menuConfig.form)) {
+        cb(new Error('Invalid or missing \'form\' member for menu'));
+        return;
+    }
 
-	if(!_.isObject(menuConfig.form[formId])) {
-		cb(new Error('No form found for formId ' + formId));
-		return;
-	}
+    if(!_.isObject(menuConfig.form[formId])) {
+        cb(new Error('No form found for formId ' + formId));
+        return;
+    }
 
-	const formForId = menuConfig.form[formId];
-	const mciReqKey = _.filter(_.map(_.sortBy(mciMap, 'code'), 'code'), (mci) => {
-		return MCIViewFactory.UserViewCodes.indexOf(mci) > -1;
-	}).join('');
+    const formForId = menuConfig.form[formId];
+    const mciReqKey = _.filter(_.map(_.sortBy(mciMap, 'code'), 'code'), (mci) => {
+        return MCIViewFactory.UserViewCodes.indexOf(mci) > -1;
+    }).join('');
 
-	Log.trace( { mciKey : mciReqKey }, 'Looking for MCI configuration key');
+    Log.trace( { mciKey : mciReqKey }, 'Looking for MCI configuration key');
 
-	//
-	//	Exact, explicit match?
-	//
-	if(_.isObject(formForId[mciReqKey])) {
-		Log.trace( { mciKey : mciReqKey }, 'Using exact configuration key match');
-		cb(null, formForId[mciReqKey]);
-		return;
-	}
+    //
+    //	Exact, explicit match?
+    //
+    if(_.isObject(formForId[mciReqKey])) {
+        Log.trace( { mciKey : mciReqKey }, 'Using exact configuration key match');
+        cb(null, formForId[mciReqKey]);
+        return;
+    }
 
-	//
-	//	Generic match
-	//
-	if(_.has(formForId, 'mci') || _.has(formForId, 'submit')) {
-		Log.trace('Using generic configuration');
-		return cb(null, formForId);
-	}
+    //
+    //	Generic match
+    //
+    if(_.has(formForId, 'mci') || _.has(formForId, 'submit')) {
+        Log.trace('Using generic configuration');
+        return cb(null, formForId);
+    }
 
-	cb(new Error('No matching form configuration found for key \'' + mciReqKey + '\''));
+    cb(new Error('No matching form configuration found for key \'' + mciReqKey + '\''));
 }
 
 //	:TODO: Most of this should be moved elsewhere .... DRY...
 function callModuleMenuMethod(client, asset, path, formData, extraArgs, cb) {
-	if('' === paths.extname(path)) {
-		path += '.js';
-	}
+    if('' === paths.extname(path)) {
+        path += '.js';
+    }
 
-	try {
-		client.log.trace(
-			{ path : path, methodName : asset.asset, formData : formData, extraArgs : extraArgs },
-			'Calling menu method');
+    try {
+        client.log.trace(
+            { path : path, methodName : asset.asset, formData : formData, extraArgs : extraArgs },
+            'Calling menu method');
 
-		const methodMod = require(path);
-		return methodMod[asset.asset](client.currentMenuModule, formData || { }, extraArgs, cb);
-	} catch(e) {
-		client.log.error( { error : e.toString(), methodName : asset.asset }, 'Failed to execute asset method');
-		return cb(e);
-	}
+        const methodMod = require(path);
+        return methodMod[asset.asset](client.currentMenuModule, formData || { }, extraArgs, cb);
+    } catch(e) {
+        client.log.error( { error : e.toString(), methodName : asset.asset }, 'Failed to execute asset method');
+        return cb(e);
+    }
 }
 
 function handleAction(client, formData, conf, cb) {
-	assert(_.isObject(conf));
-	assert(_.isString(conf.action));
+    assert(_.isObject(conf));
+    assert(_.isString(conf.action));
 
-	const actionAsset = asset.parseAsset(conf.action);
-	assert(_.isObject(actionAsset));
+    const actionAsset = asset.parseAsset(conf.action);
+    assert(_.isObject(actionAsset));
 
-	switch(actionAsset.type) {
-		case 'method' :
-		case 'systemMethod' :
-			if(_.isString(actionAsset.location)) {
-				return callModuleMenuMethod(
-					client,
-					actionAsset,
-					paths.join(Config().paths.mods, actionAsset.location),
-					formData,
-					conf.extraArgs,
-					cb);
-			} else if('systemMethod' === actionAsset.type) {
-				//	:TODO: Need to pass optional args here -- conf.extraArgs and args between e.g. ()
-				//	:TODO: Probably better as system_method.js
-				return callModuleMenuMethod(
-					client,
-					actionAsset,
-					paths.join(__dirname, 'system_menu_method.js'),
-					formData,
-					conf.extraArgs,
-					cb);
-			} else {
-				//	local to current module
-				const currentModule = client.currentMenuModule;
-				if(_.isFunction(currentModule.menuMethods[actionAsset.asset])) {
-					return currentModule.menuMethods[actionAsset.asset](formData, conf.extraArgs, cb);
-				}
+    switch(actionAsset.type) {
+        case 'method' :
+        case 'systemMethod' :
+            if(_.isString(actionAsset.location)) {
+                return callModuleMenuMethod(
+                    client,
+                    actionAsset,
+                    paths.join(Config().paths.mods, actionAsset.location),
+                    formData,
+                    conf.extraArgs,
+                    cb);
+            } else if('systemMethod' === actionAsset.type) {
+                //	:TODO: Need to pass optional args here -- conf.extraArgs and args between e.g. ()
+                //	:TODO: Probably better as system_method.js
+                return callModuleMenuMethod(
+                    client,
+                    actionAsset,
+                    paths.join(__dirname, 'system_menu_method.js'),
+                    formData,
+                    conf.extraArgs,
+                    cb);
+            } else {
+                //	local to current module
+                const currentModule = client.currentMenuModule;
+                if(_.isFunction(currentModule.menuMethods[actionAsset.asset])) {
+                    return currentModule.menuMethods[actionAsset.asset](formData, conf.extraArgs, cb);
+                }
 
-				const err = new Error('Method does not exist');
-				client.log.warn( { method : actionAsset.asset }, err.message);
-				return cb(err);
-			}
+                const err = new Error('Method does not exist');
+                client.log.warn( { method : actionAsset.asset }, err.message);
+                return cb(err);
+            }
 
-		case 'menu' :
-			return client.currentMenuModule.gotoMenu(actionAsset.asset, { formData : formData, extraArgs : conf.extraArgs }, cb );
-	}
+        case 'menu' :
+            return client.currentMenuModule.gotoMenu(actionAsset.asset, { formData : formData, extraArgs : conf.extraArgs }, cb );
+    }
 }
 
 function handleNext(client, nextSpec, conf, cb) {
-	nextSpec = client.acs.getConditionalValue(nextSpec, 'next');	//	handle any conditionals
+    nextSpec = client.acs.getConditionalValue(nextSpec, 'next');	//	handle any conditionals
 
-	const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
-	//	:TODO: getAssetWithShorthand() can return undefined - handle it!
+    const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
+    //	:TODO: getAssetWithShorthand() can return undefined - handle it!
 
-	conf = conf || {};
-	const extraArgs = conf.extraArgs || {};
+    conf = conf || {};
+    const extraArgs = conf.extraArgs || {};
 
-	//	:TODO: DRY this with handleAction()
-	switch(nextAsset.type) {
-		case 'method' :
-		case 'systemMethod' :
-			if(_.isString(nextAsset.location)) {
-				return callModuleMenuMethod(client, nextAsset, paths.join(Config().paths.mods, nextAsset.location), {}, extraArgs, cb);
-			} else if('systemMethod' === nextAsset.type) {
-				//	:TODO: see other notes about system_menu_method.js here
-				return callModuleMenuMethod(client, nextAsset, paths.join(__dirname, 'system_menu_method.js'), {}, extraArgs, cb);
-			} else {
-				//	local to current module
-				const currentModule = client.currentMenuModule;
-				if(_.isFunction(currentModule.menuMethods[nextAsset.asset])) {
-					const formData = {};	//	 we don't have any
-					return currentModule.menuMethods[nextAsset.asset]( formData, extraArgs, cb );
-				}
+    //	:TODO: DRY this with handleAction()
+    switch(nextAsset.type) {
+        case 'method' :
+        case 'systemMethod' :
+            if(_.isString(nextAsset.location)) {
+                return callModuleMenuMethod(client, nextAsset, paths.join(Config().paths.mods, nextAsset.location), {}, extraArgs, cb);
+            } else if('systemMethod' === nextAsset.type) {
+                //	:TODO: see other notes about system_menu_method.js here
+                return callModuleMenuMethod(client, nextAsset, paths.join(__dirname, 'system_menu_method.js'), {}, extraArgs, cb);
+            } else {
+                //	local to current module
+                const currentModule = client.currentMenuModule;
+                if(_.isFunction(currentModule.menuMethods[nextAsset.asset])) {
+                    const formData = {};	//	 we don't have any
+                    return currentModule.menuMethods[nextAsset.asset]( formData, extraArgs, cb );
+                }
 
-				const err = new Error('Method does not exist');
-				client.log.warn( { method : nextAsset.asset }, err.message);
-				return cb(err);
-			}
+                const err = new Error('Method does not exist');
+                client.log.warn( { method : nextAsset.asset }, err.message);
+                return cb(err);
+            }
 
-		case 'menu' :
-			return client.currentMenuModule.gotoMenu(nextAsset.asset, { extraArgs : extraArgs }, cb );
-	}
+        case 'menu' :
+            return client.currentMenuModule.gotoMenu(nextAsset.asset, { extraArgs : extraArgs }, cb );
+    }
 
-	const err = new Error('Invalid asset type for "next"');
-	client.log.error( { nextSpec : nextSpec }, err.message);
-	return cb(err);
+    const err = new Error('Invalid asset type for "next"');
+    client.log.error( { nextSpec : nextSpec }, err.message);
+    return cb(err);
 }
diff --git a/core/menu_view.js b/core/menu_view.js
index 598e04cd..78bf2c87 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -14,264 +14,264 @@ const _				= require('lodash');
 exports.MenuView	= MenuView;
 
 function MenuView(options) {
-	options.acceptsFocus = miscUtil.valueWithDefault(options.acceptsFocus, true);
-	options.acceptsInput = miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.acceptsFocus = miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput = miscUtil.valueWithDefault(options.acceptsInput, true);
 
-	View.call(this, options);
+    View.call(this, options);
 
-	this.disablePipe = options.disablePipe || false;
+    this.disablePipe = options.disablePipe || false;
 
-	const self = this;
+    const self = this;
 
-	if(options.items) {
-		this.setItems(options.items);
-	} else {
-		this.items = [];
-	}
+    if(options.items) {
+        this.setItems(options.items);
+    } else {
+        this.items = [];
+    }
 
-	this.renderCache = {};
+    this.renderCache = {};
 
-	this.caseInsensitiveHotKeys = miscUtil.valueWithDefault(options.caseInsensitiveHotKeys, true);
+    this.caseInsensitiveHotKeys = miscUtil.valueWithDefault(options.caseInsensitiveHotKeys, true);
 
-	this.setHotKeys(options.hotKeys);
+    this.setHotKeys(options.hotKeys);
 
-	this.focusedItemIndex = options.focusedItemIndex || 0;
-	this.focusedItemIndex = this.items.length >= this.focusedItemIndex ? this.focusedItemIndex : 0;
+    this.focusedItemIndex = options.focusedItemIndex || 0;
+    this.focusedItemIndex = this.items.length >= this.focusedItemIndex ? this.focusedItemIndex : 0;
 
-	this.itemSpacing	= _.isNumber(options.itemSpacing) ? options.itemSpacing : 0;
+    this.itemSpacing	= _.isNumber(options.itemSpacing) ? options.itemSpacing : 0;
 
-	//	:TODO: probably just replace this with owner draw / pipe codes / etc. more control, less specialization
-	this.focusPrefix	= options.focusPrefix || '';
-	this.focusSuffix	= options.focusSuffix || '';
+    //	:TODO: probably just replace this with owner draw / pipe codes / etc. more control, less specialization
+    this.focusPrefix	= options.focusPrefix || '';
+    this.focusSuffix	= options.focusSuffix || '';
 
-	this.fillChar		= miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
-	this.justify		= options.justify || 'none';
+    this.fillChar		= miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
+    this.justify		= options.justify || 'none';
 
-	this.hasFocusItems = function() {
-		return !_.isUndefined(self.focusItems);
-	};
+    this.hasFocusItems = function() {
+        return !_.isUndefined(self.focusItems);
+    };
 
-	this.getHotKeyItemIndex = function(ch) {
-		if(ch && self.hotKeys) {
-			const keyIndex = self.hotKeys[self.caseInsensitiveHotKeys ? ch.toLowerCase() : ch];
-			if(_.isNumber(keyIndex)) {
-				return keyIndex;
-			}
-		}
-		return -1;
-	};
+    this.getHotKeyItemIndex = function(ch) {
+        if(ch && self.hotKeys) {
+            const keyIndex = self.hotKeys[self.caseInsensitiveHotKeys ? ch.toLowerCase() : ch];
+            if(_.isNumber(keyIndex)) {
+                return keyIndex;
+            }
+        }
+        return -1;
+    };
 
-	this.emitIndexUpdate = function() {
-		self.emit('index update', self.focusedItemIndex);
-	}
+    this.emitIndexUpdate = function() {
+        self.emit('index update', self.focusedItemIndex);
+    };
 }
 
 util.inherits(MenuView, View);
 
 MenuView.prototype.setItems = function(items) {
-	if(Array.isArray(items)) {
-		this.sorted = false;
-		this.renderCache = {};
+    if(Array.isArray(items)) {
+        this.sorted = false;
+        this.renderCache = {};
 
-		//
-		//	Items can be an array of strings or an array of objects.
-		//
-		//	In the case of objects, items are considered complex and
-		//	may have one or more members that can later be formatted
-		//	against. The default member is 'text'. The member 'data'
-		//	may be overridden to provide a form value other than the
-		//	item's index.
-		//
-		//	Items can be formatted with 'itemFormat' and 'focusItemFormat'
-		//
-		let text;
-		let stringItem;
-		this.items = items.map(item => {
-			stringItem = _.isString(item);
-			if(stringItem) {
-				text = item;
-			} else {
-				text = item.text || '';
-				this.complexItems = true;
-			}
+        //
+        //	Items can be an array of strings or an array of objects.
+        //
+        //	In the case of objects, items are considered complex and
+        //	may have one or more members that can later be formatted
+        //	against. The default member is 'text'. The member 'data'
+        //	may be overridden to provide a form value other than the
+        //	item's index.
+        //
+        //	Items can be formatted with 'itemFormat' and 'focusItemFormat'
+        //
+        let text;
+        let stringItem;
+        this.items = items.map(item => {
+            stringItem = _.isString(item);
+            if(stringItem) {
+                text = item;
+            } else {
+                text = item.text || '';
+                this.complexItems = true;
+            }
 
-			text = this.disablePipe ? text : pipeToAnsi(text, this.client);
-			return Object.assign({ }, { text }, stringItem ? {} : item);	//	ensure we have a text member, plus any others
-		});
+            text = this.disablePipe ? text : pipeToAnsi(text, this.client);
+            return Object.assign({ }, { text }, stringItem ? {} : item);	//	ensure we have a text member, plus any others
+        });
 
-		if(this.complexItems) {
-			this.itemFormat = this.itemFormat || '{text}';
-		}
-	}
+        if(this.complexItems) {
+            this.itemFormat = this.itemFormat || '{text}';
+        }
+    }
 };
 
 MenuView.prototype.getRenderCacheItem = function(index, focusItem = false) {
-	const item = this.renderCache[index];
-	return item && item[focusItem ? 'focus' : 'standard'];
+    const item = this.renderCache[index];
+    return item && item[focusItem ? 'focus' : 'standard'];
 };
 
 MenuView.prototype.setRenderCacheItem = function(index, rendered, focusItem = false) {
-	this.renderCache[index] = this.renderCache[index] || {};
-	this.renderCache[index][focusItem ? 'focus' : 'standard'] = rendered;
+    this.renderCache[index] = this.renderCache[index] || {};
+    this.renderCache[index][focusItem ? 'focus' : 'standard'] = rendered;
 };
 
 MenuView.prototype.setSort = function(sort) {
-	if(this.sorted || !Array.isArray(this.items) || 0 === this.items.length) {
-		return;
-	}
+    if(this.sorted || !Array.isArray(this.items) || 0 === this.items.length) {
+        return;
+    }
 
-	const key = true === sort ? 'text' : sort;
-	if('text' !== sort && !this.complexItems) {
-		return;	//	need a valid sort key
-	}
+    const key = true === sort ? 'text' : sort;
+    if('text' !== sort && !this.complexItems) {
+        return;	//	need a valid sort key
+    }
 
-	this.items.sort( (a, b) => {
-		const a1 = a[key];
-		const b1 = b[key];
-		if(!a1) {
-			return -1;
-		}
-		if(!b1) {
-			return 1;
-		}
-		return a1.localeCompare( b1, { sensitivity : false, numeric : true } );
-	});
+    this.items.sort( (a, b) => {
+        const a1 = a[key];
+        const b1 = b[key];
+        if(!a1) {
+            return -1;
+        }
+        if(!b1) {
+            return 1;
+        }
+        return a1.localeCompare( b1, { sensitivity : false, numeric : true } );
+    });
 
-	this.sorted = true;
+    this.sorted = true;
 };
 
 MenuView.prototype.removeItem = function(index) {
-	this.sorted = false;
-	this.items.splice(index, 1);
+    this.sorted = false;
+    this.items.splice(index, 1);
 
-	if(this.focusItems) {
-		this.focusItems.splice(index, 1);
-	}
+    if(this.focusItems) {
+        this.focusItems.splice(index, 1);
+    }
 
-	if(this.focusedItemIndex >= index) {
-		this.focusedItemIndex = Math.max(this.focusedItemIndex - 1, 0);
-	}
+    if(this.focusedItemIndex >= index) {
+        this.focusedItemIndex = Math.max(this.focusedItemIndex - 1, 0);
+    }
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 MenuView.prototype.getCount = function() {
-	return this.items.length;
+    return this.items.length;
 };
 
 MenuView.prototype.getItems = function() {
-	if(this.complexItems) {
-		return this.items;
-	}
+    if(this.complexItems) {
+        return this.items;
+    }
 
-	return this.items.map( item => {
-		return item.text;
-	});
+    return this.items.map( item => {
+        return item.text;
+    });
 };
 
 MenuView.prototype.getItem = function(index) {
-	if(this.complexItems) {
-		return this.items[index];
-	}
+    if(this.complexItems) {
+        return this.items[index];
+    }
 
-	return this.items[index].text;
+    return this.items[index].text;
 };
 
 MenuView.prototype.focusNext = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusPrevious = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusNextPageItem = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusPreviousPageItem = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusFirst = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.focusLast = function() {
-	this.emitIndexUpdate();
+    this.emitIndexUpdate();
 };
 
 MenuView.prototype.setFocusItemIndex = function(index) {
-	this.focusedItemIndex = index;
+    this.focusedItemIndex = index;
 };
 
 MenuView.prototype.onKeyPress = function(ch, key) {
-	const itemIndex = this.getHotKeyItemIndex(ch);
-	if(itemIndex >= 0) {
-		this.setFocusItemIndex(itemIndex);
+    const itemIndex = this.getHotKeyItemIndex(ch);
+    if(itemIndex >= 0) {
+        this.setFocusItemIndex(itemIndex);
 
-		if(true === this.hotKeySubmit) {
-			this.emit('action', 'accept');
-		}
-	}
+        if(true === this.hotKeySubmit) {
+            this.emit('action', 'accept');
+        }
+    }
 
-	MenuView.super_.prototype.onKeyPress.call(this, ch, key);
+    MenuView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 MenuView.prototype.setFocusItems = function(items) {
-	const self = this;
+    const self = this;
 
-	if(items) {
-		this.focusItems = [];
-		items.forEach( itemText => {
-			this.focusItems.push(
-				{
-					text : self.disablePipe ? itemText : pipeToAnsi(itemText, self.client)
-				}
-			);
-		});
-	}
+    if(items) {
+        this.focusItems = [];
+        items.forEach( itemText => {
+            this.focusItems.push(
+                {
+                    text : self.disablePipe ? itemText : pipeToAnsi(itemText, self.client)
+                }
+            );
+        });
+    }
 };
 
 MenuView.prototype.setItemSpacing = function(itemSpacing) {
-	itemSpacing = parseInt(itemSpacing);
-	assert(_.isNumber(itemSpacing));
+    itemSpacing = parseInt(itemSpacing);
+    assert(_.isNumber(itemSpacing));
 
-	this.itemSpacing			= itemSpacing;
-	this.positionCacheExpired	= true;
+    this.itemSpacing			= itemSpacing;
+    this.positionCacheExpired	= true;
 };
 
 MenuView.prototype.setPropertyValue = function(propName, value) {
-	switch(propName) {
-		case 'itemSpacing' 		: this.setItemSpacing(value); break;
-		case 'items'			: this.setItems(value); break;
-		case 'focusItems'		: this.setFocusItems(value); break;
-		case 'hotKeys'			: this.setHotKeys(value); break;
-		case 'hotKeySubmit'		: this.hotKeySubmit = value; break;
-		case 'justify'			: this.justify = value; break;
-		case 'focusItemIndex'	: this.focusedItemIndex = value; break;
+    switch(propName) {
+        case 'itemSpacing' 		: this.setItemSpacing(value); break;
+        case 'items'			: this.setItems(value); break;
+        case 'focusItems'		: this.setFocusItems(value); break;
+        case 'hotKeys'			: this.setHotKeys(value); break;
+        case 'hotKeySubmit'		: this.hotKeySubmit = value; break;
+        case 'justify'			: this.justify = value; break;
+        case 'focusItemIndex'	: this.focusedItemIndex = value; break;
 
-		case 'itemFormat' :
-		case 'focusItemFormat' :
-			this[propName] = value;
-			break;
+        case 'itemFormat' :
+        case 'focusItemFormat' :
+            this[propName] = value;
+            break;
 
-		case 'sort' 			: this.setSort(value); break;
-	}
+        case 'sort' 			: this.setSort(value); break;
+    }
 
-	MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
+    MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
 };
 
 MenuView.prototype.setHotKeys = function(hotKeys) {
-	if(_.isObject(hotKeys)) {
-		if(this.caseInsensitiveHotKeys) {
-			this.hotKeys = {};
-			for(var key in hotKeys) {
-				this.hotKeys[key.toLowerCase()] = hotKeys[key];
-			}
-		} else {
-			this.hotKeys = hotKeys;
-		}
-	}
+    if(_.isObject(hotKeys)) {
+        if(this.caseInsensitiveHotKeys) {
+            this.hotKeys = {};
+            for(var key in hotKeys) {
+                this.hotKeys[key.toLowerCase()] = hotKeys[key];
+            }
+        } else {
+            this.hotKeys = hotKeys;
+        }
+    }
 };
 
diff --git a/core/message.js b/core/message.js
index f1fa2db8..277f5781 100644
--- a/core/message.js
+++ b/core/message.js
@@ -8,13 +8,13 @@ const createNamedUUID		= require('./uuid_util.js').createNamedUUID;
 const Errors				= require('./enig_error.js').Errors;
 const ANSI					= require('./ansi_term.js');
 const {
-	sanatizeString,
-	getISOTimestampString }	= require('./database.js');
+    sanatizeString,
+    getISOTimestampString }	= require('./database.js');
 
 const {
-	isAnsi, isFormattedLine,
-	splitTextAtTerms,
-	renderSubstr
+    isAnsi, isFormattedLine,
+    splitTextAtTerms,
+    renderSubstr
 }							= require('./string_util.js');
 
 const ansiPrep				= require('./ansi_prep.js');
@@ -30,182 +30,182 @@ const iconvEncode			= require('iconv-lite').encode;
 const ENIGMA_MESSAGE_UUID_NAMESPACE 	= uuidParse.parse('154506df-1df8-46b9-98f8-ebb5815baaf8');
 
 const WELL_KNOWN_AREA_TAGS = {
-	Invalid		: '',
-	Private		: 'private_mail',
-	Bulletin	: 'local_bulletin',
+    Invalid		: '',
+    Private		: 'private_mail',
+    Bulletin	: 'local_bulletin',
 };
 
 const SYSTEM_META_NAMES = {
-	LocalToUserID			: 'local_to_user_id',
-	LocalFromUserID			: 'local_from_user_id',
-	StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
-	ExplicitEncoding		: 'explicit_encoding',	//	Explicitly set encoding when exporting/etc.
-	ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.AddressFlavor
-	RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address
-	RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address
+    LocalToUserID			: 'local_to_user_id',
+    LocalFromUserID			: 'local_from_user_id',
+    StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
+    ExplicitEncoding		: 'explicit_encoding',	//	Explicitly set encoding when exporting/etc.
+    ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.AddressFlavor
+    RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address
+    RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address
 };
 
 //	Types for Message.SystemMetaNames.ExternalFlavor meta
 const ADDRESS_FLAVOR = {
-	Local		: 'local',	//	local / non-remote addressing
-	FTN			: 'ftn',	//	FTN style
-	Email		: 'email',
+    Local		: 'local',	//	local / non-remote addressing
+    FTN			: 'ftn',	//	FTN style
+    Email		: 'email',
 };
 
 const STATE_FLAGS0 = {
-	None		: 0x00000000,
-	Imported	: 0x00000001,	//	imported from foreign system
-	Exported	: 0x00000002,	//	exported to foreign system
+    None		: 0x00000000,
+    Imported	: 0x00000001,	//	imported from foreign system
+    Exported	: 0x00000002,	//	exported to foreign system
 };
 
 //	:TODO: these should really live elsewhere...
 const FTN_PROPERTY_NAMES = {
-	//	packet header oriented
-	FtnOrigNode			: 'ftn_orig_node',
-	FtnDestNode			: 'ftn_dest_node',
-	//	:TODO: rename these to ftn_*_net vs network - ensure things won't break, may need mapping
-	FtnOrigNetwork		: 'ftn_orig_network',
-	FtnDestNetwork		: 'ftn_dest_network',
-	FtnAttrFlags		: 'ftn_attr_flags',
-	FtnCost				: 'ftn_cost',
-	FtnOrigZone			: 'ftn_orig_zone',
-	FtnDestZone			: 'ftn_dest_zone',
-	FtnOrigPoint		: 'ftn_orig_point',
-	FtnDestPoint		: 'ftn_dest_point',
+    //	packet header oriented
+    FtnOrigNode			: 'ftn_orig_node',
+    FtnDestNode			: 'ftn_dest_node',
+    //	:TODO: rename these to ftn_*_net vs network - ensure things won't break, may need mapping
+    FtnOrigNetwork		: 'ftn_orig_network',
+    FtnDestNetwork		: 'ftn_dest_network',
+    FtnAttrFlags		: 'ftn_attr_flags',
+    FtnCost				: 'ftn_cost',
+    FtnOrigZone			: 'ftn_orig_zone',
+    FtnDestZone			: 'ftn_dest_zone',
+    FtnOrigPoint		: 'ftn_orig_point',
+    FtnDestPoint		: 'ftn_dest_point',
 
-	//	message header oriented
-	FtnMsgOrigNode		: 'ftn_msg_orig_node',
-	FtnMsgDestNode		: 'ftn_msg_dest_node',
-	FtnMsgOrigNet		: 'ftn_msg_orig_net',
-	FtnMsgDestNet		: 'ftn_msg_dest_net',
+    //	message header oriented
+    FtnMsgOrigNode		: 'ftn_msg_orig_node',
+    FtnMsgDestNode		: 'ftn_msg_dest_node',
+    FtnMsgOrigNet		: 'ftn_msg_orig_net',
+    FtnMsgDestNet		: 'ftn_msg_dest_net',
 
-	FtnAttribute		: 'ftn_attribute',
+    FtnAttribute		: 'ftn_attribute',
 
-	FtnTearLine			: 'ftn_tear_line',		//	http://ftsc.org/docs/fts-0004.001
-	FtnOrigin			: 'ftn_origin',			//	http://ftsc.org/docs/fts-0004.001
-	FtnArea				: 'ftn_area',			//	http://ftsc.org/docs/fts-0004.001
-	FtnSeenBy			: 'ftn_seen_by',		//	http://ftsc.org/docs/fts-0004.001
+    FtnTearLine			: 'ftn_tear_line',		//	http://ftsc.org/docs/fts-0004.001
+    FtnOrigin			: 'ftn_origin',			//	http://ftsc.org/docs/fts-0004.001
+    FtnArea				: 'ftn_area',			//	http://ftsc.org/docs/fts-0004.001
+    FtnSeenBy			: 'ftn_seen_by',		//	http://ftsc.org/docs/fts-0004.001
 };
 
 //	:TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
 const MESSAGE_ROW_MAP = {
-	reply_to_message_id	: 'replyToMsgId',
-	modified_timestamp	: 'modTimestamp'
+    reply_to_message_id	: 'replyToMsgId',
+    modified_timestamp	: 'modTimestamp'
 };
 
 module.exports = class Message {
-	constructor(
-		{
-			messageId = 0, areaTag = Message.WellKnownAreaTags.Invalid, uuid, replyToMsgId = 0,
-			toUserName = '', fromUserName = '', subject = '', message = '', modTimestamp = moment(),
-			meta, hashTags = [],
-		} = { }
-	)
-	{
-		this.messageId		= messageId;
-		this.areaTag		= areaTag;
-		this.uuid			= uuid;
-		this.replyToMsgId	= replyToMsgId;
-		this.toUserName		= toUserName;
-		this.fromUserName	= fromUserName;
-		this.subject		= subject;
-		this.message		= message;
+    constructor(
+        {
+            messageId = 0, areaTag = Message.WellKnownAreaTags.Invalid, uuid, replyToMsgId = 0,
+            toUserName = '', fromUserName = '', subject = '', message = '', modTimestamp = moment(),
+            meta, hashTags = [],
+        } = { }
+    )
+    {
+        this.messageId		= messageId;
+        this.areaTag		= areaTag;
+        this.uuid			= uuid;
+        this.replyToMsgId	= replyToMsgId;
+        this.toUserName		= toUserName;
+        this.fromUserName	= fromUserName;
+        this.subject		= subject;
+        this.message		= message;
 
-		if(_.isDate(modTimestamp) || _.isString(modTimestamp)) {
-			modTimestamp = moment(modTimestamp);
-		}
+        if(_.isDate(modTimestamp) || _.isString(modTimestamp)) {
+            modTimestamp = moment(modTimestamp);
+        }
 
-		this.modTimestamp	= modTimestamp;
+        this.modTimestamp	= modTimestamp;
 
-		this.meta = {};
-		_.defaultsDeep(this.meta, { System : {} }, meta);
+        this.meta = {};
+        _.defaultsDeep(this.meta, { System : {} }, meta);
 
-		this.hashTags		= hashTags;
-	}
+        this.hashTags		= hashTags;
+    }
 
-	isValid() { return true; }	//	:TODO: obviously useless; look into this or remove it
+    isValid() { return true; }	//	:TODO: obviously useless; look into this or remove it
 
-	static isPrivateAreaTag(areaTag) {
-		return areaTag.toLowerCase() === Message.WellKnownAreaTags.Private;
-	}
+    static isPrivateAreaTag(areaTag) {
+        return areaTag.toLowerCase() === Message.WellKnownAreaTags.Private;
+    }
 
-	isPrivate() {
-		return Message.isPrivateAreaTag(this.areaTag);
-	}
+    isPrivate() {
+        return Message.isPrivateAreaTag(this.areaTag);
+    }
 
-	isFromRemoteUser() {
-		return null !== _.get(this, 'meta.System.remote_from_user', null);
-	}
+    isFromRemoteUser() {
+        return null !== _.get(this, 'meta.System.remote_from_user', null);
+    }
 
-	static get WellKnownAreaTags() {
-		return WELL_KNOWN_AREA_TAGS;
-	}
+    static get WellKnownAreaTags() {
+        return WELL_KNOWN_AREA_TAGS;
+    }
 
-	static get SystemMetaNames() {
-		return SYSTEM_META_NAMES;
-	}
+    static get SystemMetaNames() {
+        return SYSTEM_META_NAMES;
+    }
 
-	static get AddressFlavor() {
-		return ADDRESS_FLAVOR;
-	}
+    static get AddressFlavor() {
+        return ADDRESS_FLAVOR;
+    }
 
-	static get StateFlags0() {
-		return STATE_FLAGS0;
-	}
+    static get StateFlags0() {
+        return STATE_FLAGS0;
+    }
 
-	static get FtnPropertyNames() {
-		return FTN_PROPERTY_NAMES;
-	}
+    static get FtnPropertyNames() {
+        return FTN_PROPERTY_NAMES;
+    }
 
-	setLocalToUserId(userId) {
-		this.meta.System = this.meta.System || {};
-		this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
-	}
+    setLocalToUserId(userId) {
+        this.meta.System = this.meta.System || {};
+        this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
+    }
 
-	setLocalFromUserId(userId) {
-		this.meta.System = this.meta.System || {};
-		this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
-	}
+    setLocalFromUserId(userId) {
+        this.meta.System = this.meta.System || {};
+        this.meta.System[Message.SystemMetaNames.LocalFromUserID] = userId;
+    }
 
-	setRemoteToUser(remoteTo) {
-		this.meta.System = this.meta.System || {};
-		this.meta.System[Message.SystemMetaNames.RemoteToUser] = remoteTo;
-	}
+    setRemoteToUser(remoteTo) {
+        this.meta.System = this.meta.System || {};
+        this.meta.System[Message.SystemMetaNames.RemoteToUser] = remoteTo;
+    }
 
-	setExternalFlavor(flavor) {
-		this.meta.System = this.meta.System || {};
-		this.meta.System[Message.SystemMetaNames.ExternalFlavor] = flavor;
-	}
+    setExternalFlavor(flavor) {
+        this.meta.System = this.meta.System || {};
+        this.meta.System[Message.SystemMetaNames.ExternalFlavor] = flavor;
+    }
 
-	static createMessageUUID(areaTag, modTimestamp, subject, body) {
-		assert(_.isString(areaTag));
-		assert(_.isDate(modTimestamp) || moment.isMoment(modTimestamp));
-		assert(_.isString(subject));
-		assert(_.isString(body));
+    static createMessageUUID(areaTag, modTimestamp, subject, body) {
+        assert(_.isString(areaTag));
+        assert(_.isDate(modTimestamp) || moment.isMoment(modTimestamp));
+        assert(_.isString(subject));
+        assert(_.isString(body));
 
-		if(!moment.isMoment(modTimestamp)) {
-			modTimestamp = moment(modTimestamp);
-		}
+        if(!moment.isMoment(modTimestamp)) {
+            modTimestamp = moment(modTimestamp);
+        }
 
-		areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
-		modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
-		subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
-		body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
+        areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
+        modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
+        subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
+        body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
 
-		return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
-	}
+        return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
+    }
 
-	static getMessageFromRow(row) {
-		const msg = {};
-		_.each(row, (v, k) => {
-			//	:TODO: see notes around MESSAGE_ROW_MAP -- clean this up so we can just _camelCase()!
-			k = MESSAGE_ROW_MAP[k] || _.camelCase(k);
-			msg[k] = v;
-		});
-		return msg;
-	}
+    static getMessageFromRow(row) {
+        const msg = {};
+        _.each(row, (v, k) => {
+            //	:TODO: see notes around MESSAGE_ROW_MAP -- clean this up so we can just _camelCase()!
+            k = MESSAGE_ROW_MAP[k] || _.camelCase(k);
+            msg[k] = v;
+        });
+        return msg;
+    }
 
-	/*
+    /*
 		Find message IDs or UUIDs by filter. Available filters/options:
 
 		filter.uuids - use with resultType='id'
@@ -229,237 +229,237 @@ module.exports = class Message {
 
 		filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
 		- any other areaTag or confTag filters will be ignored
-		- if NOT present, private areas are skipped	
+		- if NOT present, private areas are skipped
 
 		*=NYI
 	*/
-	static findMessages(filter, cb) {
-		filter = filter || {};
+    static findMessages(filter, cb) {
+        filter = filter || {};
 
-		filter.resultType	= filter.resultType || 'id';
-		filter.extraFields	= filter.extraFields || [];
+        filter.resultType	= filter.resultType || 'id';
+        filter.extraFields	= filter.extraFields || [];
 
-		if('messageList' === filter.resultType) {
-			filter.extraFields = _.uniq(filter.extraFields.concat(
-				[ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ]
-			));
-		}
+        if('messageList' === filter.resultType) {
+            filter.extraFields = _.uniq(filter.extraFields.concat(
+                [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ]
+            ));
+        }
 
-		const field = 'uuid' === filter.resultType ? 'message_uuid' : 'message_id';
+        const field = 'uuid' === filter.resultType ? 'message_uuid' : 'message_id';
 
-		if(moment.isMoment(filter.newerThanTimestamp)) {
-			filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
-		}
+        if(moment.isMoment(filter.newerThanTimestamp)) {
+            filter.newerThanTimestamp = getISOTimestampString(filter.newerThanTimestamp);
+        }
 
-		let sql;
-		if('count' === filter.resultType) {
-			sql =
+        let sql;
+        if('count' === filter.resultType) {
+            sql =
 				`SELECT COUNT() AS count
 				FROM message m`;
 
-		} else {
-			sql =
+        } else {
+            sql =
 				`SELECT DISTINCT m.${field}${filter.extraFields.length > 0 ? ', ' + filter.extraFields.map(f => `m.${f}`).join(', ') : ''}
 				FROM message m`;
-		}
+        }
 
-		const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
-		let sqlOrderBy;
-		let sqlWhere = '';
+        const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
+        let sqlOrderBy;
+        let sqlWhere = '';
 
-		function appendWhereClause(clause) {
-			if(sqlWhere) {
-				sqlWhere += ' AND ';
-			} else {
-				sqlWhere += ' WHERE ';
-			}
-			sqlWhere += clause;
-		}
+        function appendWhereClause(clause) {
+            if(sqlWhere) {
+                sqlWhere += ' AND ';
+            } else {
+                sqlWhere += ' WHERE ';
+            }
+            sqlWhere += clause;
+        }
 
-		//	currently only avail sort
-		if('modTimestamp' === filter.sort) {
-			sqlOrderBy = `ORDER BY m.modified_timestamp ${sqlOrderDir}`;
-		} else {
-			sqlOrderBy = `ORDER BY m.message_id ${sqlOrderDir}`;
-		}
+        //	currently only avail sort
+        if('modTimestamp' === filter.sort) {
+            sqlOrderBy = `ORDER BY m.modified_timestamp ${sqlOrderDir}`;
+        } else {
+            sqlOrderBy = `ORDER BY m.message_id ${sqlOrderDir}`;
+        }
 
-		if(Array.isArray(filter.ids)) {
-			appendWhereClause(`m.message_id IN (${filter.ids.join(', ')})`);
-		}
+        if(Array.isArray(filter.ids)) {
+            appendWhereClause(`m.message_id IN (${filter.ids.join(', ')})`);
+        }
 
-		if(Array.isArray(filter.uuids)) {
-			const uuidList = filter.uuids.map(u => `"${u}"`).join(', ');
-			appendWhereClause(`m.message_id IN (${uuidList})`);
-		}
+        if(Array.isArray(filter.uuids)) {
+            const uuidList = filter.uuids.map(u => `"${u}"`).join(', ');
+            appendWhereClause(`m.message_id IN (${uuidList})`);
+        }
 
 
-		if(_.isNumber(filter.privateTagUserId)) {
-			appendWhereClause(`m.area_tag = "${Message.WellKnownAreaTags.Private}"`);
-			appendWhereClause(
-				`m.message_id IN (
+        if(_.isNumber(filter.privateTagUserId)) {
+            appendWhereClause(`m.area_tag = "${Message.WellKnownAreaTags.Private}"`);
+            appendWhereClause(
+                `m.message_id IN (
 					SELECT message_id 
 					FROM message_meta 
 					WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
 				)`);
-		} else {
-			if(filter.areaTag && filter.areaTag.length > 0) {			
-				if(Array.isArray(filter.areaTag)) {
-					const areaList = filter.areaTag
-						.filter(t => t != Message.WellKnownAreaTags.Private)
-						.map(t => `"${t}"`).join(', ');
-					if(areaList.length > 0) {
-						appendWhereClause(`m.area_tag IN(${areaList})`);
-					}
-				} else if(_.isString(filter.areaTag) && Message.WellKnownAreaTags.Private !== filter.areaTag) {
-					appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
-				}
-			}
+        } else {
+            if(filter.areaTag && filter.areaTag.length > 0) {
+                if(Array.isArray(filter.areaTag)) {
+                    const areaList = filter.areaTag
+                        .filter(t => t != Message.WellKnownAreaTags.Private)
+                        .map(t => `"${t}"`).join(', ');
+                    if(areaList.length > 0) {
+                        appendWhereClause(`m.area_tag IN(${areaList})`);
+                    }
+                } else if(_.isString(filter.areaTag) && Message.WellKnownAreaTags.Private !== filter.areaTag) {
+                    appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
+                }
+            }
 
-			//	explicit exclude of Private
-			appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
-		}
+            //	explicit exclude of Private
+            appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
+        }
 
-		if(_.isNumber(filter.replyToMessageId)) {
-			appendWhereClause(`m.reply_to_message_id=${filter.replyToMessageId}`);
-		}		
+        if(_.isNumber(filter.replyToMessageId)) {
+            appendWhereClause(`m.reply_to_message_id=${filter.replyToMessageId}`);
+        }
 
-		[ 'toUserName', 'fromUserName' ].forEach(field => {
-			if(_.isString(filter[field]) && filter[field].length > 0) {
-				appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanatizeString(filter[field])}"`);
-			}
-		});
+        [ 'toUserName', 'fromUserName' ].forEach(field => {
+            if(_.isString(filter[field]) && filter[field].length > 0) {
+                appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanatizeString(filter[field])}"`);
+            }
+        });
 
-		if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
-			appendWhereClause(`DATETIME(m.modified_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
-		}
+        if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
+            appendWhereClause(`DATETIME(m.modified_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
+        }
 
-		if(_.isNumber(filter.newerThanMessageId)) {
-			appendWhereClause(`m.message_id > ${filter.newerThanMessageId}`);
-		}
+        if(_.isNumber(filter.newerThanMessageId)) {
+            appendWhereClause(`m.message_id > ${filter.newerThanMessageId}`);
+        }
 
-		if(filter.terms && filter.terms.length > 0) {
-			//	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
-			appendWhereClause(
-				`m.message_id IN (
+        if(filter.terms && filter.terms.length > 0) {
+            //	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
+            appendWhereClause(
+                `m.message_id IN (
 					SELECT rowid
 					FROM message_fts
 					WHERE message_fts MATCH ":${sanatizeString(filter.terms)}"
 				)`
-			);
-		}
+            );
+        }
 
-		sql += `${sqlWhere} ${sqlOrderBy}`;
+        sql += `${sqlWhere} ${sqlOrderBy}`;
 
-		if(_.isNumber(filter.limit)) {
-			sql += ` LIMIT ${filter.limit}`;
-		}
+        if(_.isNumber(filter.limit)) {
+            sql += ` LIMIT ${filter.limit}`;
+        }
 
-		sql += ';';
+        sql += ';';
 
-		if('count' === filter.resultType) {
-			msgDb.get(sql, (err, row) => {
-				return cb(err, row ? row.count : 0);
-			});
-		} else {
-			const matches = [];
-			const extra = filter.extraFields.length > 0;
+        if('count' === filter.resultType) {
+            msgDb.get(sql, (err, row) => {
+                return cb(err, row ? row.count : 0);
+            });
+        } else {
+            const matches = [];
+            const extra = filter.extraFields.length > 0;
 
-			const rowConv = 'messageList' === filter.resultType ? Message.getMessageFromRow : row => row;
+            const rowConv = 'messageList' === filter.resultType ? Message.getMessageFromRow : row => row;
 
-			msgDb.each(sql, (err, row) => {
-				if(_.isObject(row)) {
-					matches.push(extra ? rowConv(row) : row[field]);
-				}
-			}, err => {
-				return cb(err, matches);
-			});
-		}
-	}
+            msgDb.each(sql, (err, row) => {
+                if(_.isObject(row)) {
+                    matches.push(extra ? rowConv(row) : row[field]);
+                }
+            }, err => {
+                return cb(err, matches);
+            });
+        }
+    }
 
-	//	:TODO: use findMessages, by uuid, limit=1
-	static getMessageIdByUuid(uuid, cb) {
-		msgDb.get(
-			`SELECT message_id
+    //	:TODO: use findMessages, by uuid, limit=1
+    static getMessageIdByUuid(uuid, cb) {
+        msgDb.get(
+            `SELECT message_id
 			FROM message
 			WHERE message_uuid = ?
 			LIMIT 1;`,
-			[ uuid ],
-			(err, row) => {
-				if(err) {
-					return cb(err);
-				}
+            [ uuid ],
+            (err, row) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				const success = (row && row.message_id);
-				return cb(
-					success ? null : Errors.DoesNotExist(`No message for UUID ${uuid}`),
-					success ? row.message_id : null
-				);
-			}
-		);
-	}
+                const success = (row && row.message_id);
+                return cb(
+                    success ? null : Errors.DoesNotExist(`No message for UUID ${uuid}`),
+                    success ? row.message_id : null
+                );
+            }
+        );
+    }
 
-	//	:TODO: use findMessages
-	static getMessageIdsByMetaValue(category, name, value, cb) {
-		msgDb.all(
-			`SELECT message_id
+    //	:TODO: use findMessages
+    static getMessageIdsByMetaValue(category, name, value, cb) {
+        msgDb.all(
+            `SELECT message_id
 			FROM message_meta
 			WHERE meta_category = ? AND meta_name = ? AND meta_value = ?;`,
-			[ category, name, value ],
-			(err, rows) => {
-				if(err) {
-					return cb(err);
-				}
-				return cb(null, rows.map(r => parseInt(r.message_id)));	//	return array of ID(s)
-			}
-		);
-	}
+            [ category, name, value ],
+            (err, rows) => {
+                if(err) {
+                    return cb(err);
+                }
+                return cb(null, rows.map(r => parseInt(r.message_id)));	//	return array of ID(s)
+            }
+        );
+    }
 
-	static getMetaValuesByMessageId(messageId, category, name, cb) {
-		const sql =
+    static getMetaValuesByMessageId(messageId, category, name, cb) {
+        const sql =
 			`SELECT meta_value
 			FROM message_meta
 			WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
 
-		msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
-			if(err) {
-				return cb(err);
-			}
+        msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
+            if(err) {
+                return cb(err);
+            }
 
-			if(0 === rows.length) {
-				return cb(Errors.DoesNotExist('No value for category/name'));
-			}
+            if(0 === rows.length) {
+                return cb(Errors.DoesNotExist('No value for category/name'));
+            }
 
-			//	single values are returned without an array
-			if(1 === rows.length) {
-				return cb(null, rows[0].meta_value);
-			}
+            //	single values are returned without an array
+            if(1 === rows.length) {
+                return cb(null, rows[0].meta_value);
+            }
 
-			return cb(null, rows.map(r => r.meta_value));	//	map to array of values only
-		});
-	}
+            return cb(null, rows.map(r => r.meta_value));	//	map to array of values only
+        });
+    }
 
-	static getMetaValuesByMessageUuid(uuid, category, name, cb) {
-		async.waterfall(
-			[
-				function getMessageId(callback) {
-					Message.getMessageIdByUuid(uuid, (err, messageId) => {
-						return callback(err, messageId);
-					});
-				},
-				function getMetaValues(messageId, callback) {
-					Message.getMetaValuesByMessageId(messageId, category, name, (err, values) => {
-						return callback(err, values);
-					});
-				}
-			],
-			(err, values) => {
-				return cb(err, values);
-			}
-		);
-	}
+    static getMetaValuesByMessageUuid(uuid, category, name, cb) {
+        async.waterfall(
+            [
+                function getMessageId(callback) {
+                    Message.getMessageIdByUuid(uuid, (err, messageId) => {
+                        return callback(err, messageId);
+                    });
+                },
+                function getMetaValues(messageId, callback) {
+                    Message.getMetaValuesByMessageId(messageId, category, name, (err, values) => {
+                        return callback(err, values);
+                    });
+                }
+            ],
+            (err, values) => {
+                return cb(err, values);
+            }
+        );
+    }
 
-	loadMeta(cb) {
-		/*
+    loadMeta(cb) {
+        /*
 			Example of loaded this.meta:
 
 			meta: {
@@ -471,154 +471,154 @@ module.exports = class Message {
 				}
 			}
 		*/
-		const sql =
+        const sql =
 			`SELECT meta_category, meta_name, meta_value
 			FROM message_meta
 			WHERE message_id = ?;`;
 
-		const self = this;	//	:TODO: not required - arrow functions below:
-		msgDb.each(sql, [ this.messageId ], (err, row) => {
-			if(!(row.meta_category in self.meta)) {
-				self.meta[row.meta_category] = { };
-				self.meta[row.meta_category][row.meta_name] = row.meta_value;
-			} else {
-				if(!(row.meta_name in self.meta[row.meta_category])) {
-					self.meta[row.meta_category][row.meta_name] = row.meta_value;
-				} else {
-					if(_.isString(self.meta[row.meta_category][row.meta_name])) {
-						self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];
-					}
+        const self = this;	//	:TODO: not required - arrow functions below:
+        msgDb.each(sql, [ this.messageId ], (err, row) => {
+            if(!(row.meta_category in self.meta)) {
+                self.meta[row.meta_category] = { };
+                self.meta[row.meta_category][row.meta_name] = row.meta_value;
+            } else {
+                if(!(row.meta_name in self.meta[row.meta_category])) {
+                    self.meta[row.meta_category][row.meta_name] = row.meta_value;
+                } else {
+                    if(_.isString(self.meta[row.meta_category][row.meta_name])) {
+                        self.meta[row.meta_category][row.meta_name] = [ self.meta[row.meta_category][row.meta_name] ];
+                    }
 
-					self.meta[row.meta_category][row.meta_name].push(row.meta_value);
-				}
-			}
-		}, err => {
-			return cb(err);
-		});
-	}
+                    self.meta[row.meta_category][row.meta_name].push(row.meta_value);
+                }
+            }
+        }, err => {
+            return cb(err);
+        });
+    }
 
-	//	:TODO: this should only take a UUID...
-	load(options, cb) {
-		assert(_.isString(options.uuid));
+    //	:TODO: this should only take a UUID...
+    load(options, cb) {
+        assert(_.isString(options.uuid));
 
-		const self = this;
+        const self = this;
 
-		async.series(
-			[
-				function loadMessage(callback) {
-					msgDb.get(
-						`SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject,
+        async.series(
+            [
+                function loadMessage(callback) {
+                    msgDb.get(
+                        `SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject,
 						message, modified_timestamp, view_count
 						FROM message
 						WHERE message_uuid=?
 						LIMIT 1;`,
-						[ options.uuid ],
-						(err, msgRow) => {
-							if(err) {
-								return callback(err);
-							}
+                        [ options.uuid ],
+                        (err, msgRow) => {
+                            if(err) {
+                                return callback(err);
+                            }
 
-							if(!msgRow) {
-								return callback(Errors.DoesNotExist('Message (no longer) available'));
-							}
+                            if(!msgRow) {
+                                return callback(Errors.DoesNotExist('Message (no longer) available'));
+                            }
 
-							self.messageId		= msgRow.message_id;
-							self.areaTag		= msgRow.area_tag;
-							self.messageUuid	= msgRow.message_uuid;
-							self.replyToMsgId	= msgRow.reply_to_message_id;
-							self.toUserName		= msgRow.to_user_name;
-							self.fromUserName	= msgRow.from_user_name;
-							self.subject		= msgRow.subject;
-							self.message		= msgRow.message;
-							self.modTimestamp	= moment(msgRow.modified_timestamp);
+                            self.messageId		= msgRow.message_id;
+                            self.areaTag		= msgRow.area_tag;
+                            self.messageUuid	= msgRow.message_uuid;
+                            self.replyToMsgId	= msgRow.reply_to_message_id;
+                            self.toUserName		= msgRow.to_user_name;
+                            self.fromUserName	= msgRow.from_user_name;
+                            self.subject		= msgRow.subject;
+                            self.message		= msgRow.message;
+                            self.modTimestamp	= moment(msgRow.modified_timestamp);
 
-							return callback(err);
-						}
-					);
-				},
-				function loadMessageMeta(callback) {
-					self.loadMeta(err => {
-						return callback(err);
-					});
-				},
-				function loadHashTags(callback) {
-					//	:TODO:
-					return callback(null);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                            return callback(err);
+                        }
+                    );
+                },
+                function loadMessageMeta(callback) {
+                    self.loadMeta(err => {
+                        return callback(err);
+                    });
+                },
+                function loadHashTags(callback) {
+                    //	:TODO:
+                    return callback(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	persistMetaValue(category, name, value, transOrDb, cb) {
-		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-			cb = transOrDb;
-			transOrDb = msgDb;
-		}
+    persistMetaValue(category, name, value, transOrDb, cb) {
+        if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+            cb = transOrDb;
+            transOrDb = msgDb;
+        }
 
-		const metaStmt = transOrDb.prepare(
-			`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
+        const metaStmt = transOrDb.prepare(
+            `INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
 			VALUES (?, ?, ?, ?);`);
 
-		if(!_.isArray(value)) {
-			value = [ value ];
-		}
+        if(!_.isArray(value)) {
+            value = [ value ];
+        }
 
-		const self = this;
+        const self = this;
 
-		async.each(value, (v, next) => {
-			metaStmt.run(self.messageId, category, name, v, err => {
-				return next(err);
-			});
-		}, err => {
-			return cb(err);
-		});
-	}
+        async.each(value, (v, next) => {
+            metaStmt.run(self.messageId, category, name, v, err => {
+                return next(err);
+            });
+        }, err => {
+            return cb(err);
+        });
+    }
 
-	persist(cb) {
-		if(!this.isValid()) {
-			return cb(Errors.Invalid('Cannot persist invalid message!'));
-		}
+    persist(cb) {
+        if(!this.isValid()) {
+            return cb(Errors.Invalid('Cannot persist invalid message!'));
+        }
 
-		const self = this;
+        const self = this;
 
-		async.waterfall(
-			[
-				function beginTransaction(callback) {
-					return msgDb.beginTransaction(callback);
-				},
-				function storeMessage(trans, callback) {
-					//	generate a UUID for this message if required (general case)
-					const msgTimestamp = moment();
-					if(!self.uuid) {
-						self.uuid = Message.createMessageUUID(
-							self.areaTag,
-							msgTimestamp,
-							self.subject,
-							self.message
-						);
-					}
+        async.waterfall(
+            [
+                function beginTransaction(callback) {
+                    return msgDb.beginTransaction(callback);
+                },
+                function storeMessage(trans, callback) {
+                    //	generate a UUID for this message if required (general case)
+                    const msgTimestamp = moment();
+                    if(!self.uuid) {
+                        self.uuid = Message.createMessageUUID(
+                            self.areaTag,
+                            msgTimestamp,
+                            self.subject,
+                            self.message
+                        );
+                    }
 
-					trans.run(
-						`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
+                    trans.run(
+                        `INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
 						VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
-						[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
-						function inserted(err) {	//	use non-arrow function for 'this' scope
-							if(!err) {
-								self.messageId = this.lastID;
-							}
+                        [ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
+                        function inserted(err) {	//	use non-arrow function for 'this' scope
+                            if(!err) {
+                                self.messageId = this.lastID;
+                            }
 
-							return callback(err, trans);
-						}
-					);
-				},
-				function storeMeta(trans, callback) {
-					if(!self.meta) {
-						return callback(null, trans);
-					}
-					/*
+                            return callback(err, trans);
+                        }
+                    );
+                },
+                function storeMeta(trans, callback) {
+                    if(!self.meta) {
+                        return callback(null, trans);
+                    }
+                    /*
 						Example of self.meta:
 
 						meta: {
@@ -630,60 +630,60 @@ module.exports = class Message {
 							}
 						}
 					*/
-					async.each(Object.keys(self.meta), (category, nextCat) => {
-						async.each(Object.keys(self.meta[category]), (name, nextName) => {
-							self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
-								return nextName(err);
-							});
-						}, err => {
-							return nextCat(err);
-						});
+                    async.each(Object.keys(self.meta), (category, nextCat) => {
+                        async.each(Object.keys(self.meta[category]), (name, nextName) => {
+                            self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
+                                return nextName(err);
+                            });
+                        }, err => {
+                            return nextCat(err);
+                        });
 
-					}, err => {
-						return callback(err, trans);
-					});
-				},
-				function storeHashTags(trans, callback) {
-					//	:TODO: hash tag support
-					return callback(null, trans);
-				}
-			],
-			(err, trans) => {
-				if(trans) {
-					trans[err ? 'rollback' : 'commit'](transErr => {
-						return cb(err ? err : transErr, self.messageId);
-					});
-				} else {
-					return cb(err);
-				}
-			}
-		);
-	}
+                    }, err => {
+                        return callback(err, trans);
+                    });
+                },
+                function storeHashTags(trans, callback) {
+                    //	:TODO: hash tag support
+                    return callback(null, trans);
+                }
+            ],
+            (err, trans) => {
+                if(trans) {
+                    trans[err ? 'rollback' : 'commit'](transErr => {
+                        return cb(err ? err : transErr, self.messageId);
+                    });
+                } else {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	//	:TODO: FTN stuff doesn't have any business here
-	getFTNQuotePrefix(source) {
-		source = source || 'fromUserName';
+    //	:TODO: FTN stuff doesn't have any business here
+    getFTNQuotePrefix(source) {
+        source = source || 'fromUserName';
 
-		return ftnUtil.getQuotePrefix(this[source]);
-	}
+        return ftnUtil.getQuotePrefix(this[source]);
+    }
 
-	getTearLinePosition(input) {
-		const m = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m);
-		return m ? m.index : -1;
-	}
+    getTearLinePosition(input) {
+        const m = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m);
+        return m ? m.index : -1;
+    }
 
-	getQuoteLines(options, cb) {
-		if(!options.termWidth || !options.termHeight || !options.cols) {
-			return cb(Errors.MissingParam());
-		}
+    getQuoteLines(options, cb) {
+        if(!options.termWidth || !options.termHeight || !options.cols) {
+            return cb(Errors.MissingParam());
+        }
 
-		options.startCol			= options.startCol || 1;
-		options.includePrefix 		= _.get(options, 'includePrefix', true);
-		options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
-		options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
-		options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
+        options.startCol			= options.startCol || 1;
+        options.includePrefix 		= _.get(options, 'includePrefix', true);
+        options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
+        options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
+        options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
 
-		/*
+        /*
 			Some long text that needs to be wrapped and quoted should look right after
 			doing so, don't ya think? yeah I think so
 
@@ -694,166 +694,166 @@ module.exports = class Message {
 			Ot> Nu> right after doing so, don't ya think? yeah I think so
 
 		*/
-		const quotePrefix = options.includePrefix ? this.getFTNQuotePrefix(options.prefixSource || 'fromUserName') : '';
+        const quotePrefix = options.includePrefix ? this.getFTNQuotePrefix(options.prefixSource || 'fromUserName') : '';
 
-		function getWrapped(text, extraPrefix) {
-			extraPrefix = extraPrefix ? ` ${extraPrefix}` : '';
+        function getWrapped(text, extraPrefix) {
+            extraPrefix = extraPrefix ? ` ${extraPrefix}` : '';
 
-			const wrapOpts = {
-				width		: options.cols - (quotePrefix.length + extraPrefix.length),
-				tabHandling	: 'expand',
-				tabWidth	: 4,
-			};
+            const wrapOpts = {
+                width		: options.cols - (quotePrefix.length + extraPrefix.length),
+                tabHandling	: 'expand',
+                tabWidth	: 4,
+            };
 
-			return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
-				return i === 0 ? `${quotePrefix}${w}` : `${quotePrefix}${extraPrefix}${w}`;
-			});
-		}
+            return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
+                return i === 0 ? `${quotePrefix}${w}` : `${quotePrefix}${extraPrefix}${w}`;
+            });
+        }
 
-		function getFormattedLine(line) {
-			//	for pre-formatted text, we just append a line truncated to fit
-			let newLen;
-			const total = line.length + quotePrefix.length;
+        function getFormattedLine(line) {
+            //	for pre-formatted text, we just append a line truncated to fit
+            let newLen;
+            const total = line.length + quotePrefix.length;
 
-			if(total > options.cols) {
-				newLen = options.cols - total;
-			} else {
-				newLen = total;
-			}
+            if(total > options.cols) {
+                newLen = options.cols - total;
+            } else {
+                newLen = total;
+            }
 
-			return `${quotePrefix}${line.slice(0, newLen)}`;
-		}
+            return `${quotePrefix}${line.slice(0, newLen)}`;
+        }
 
-		if(options.isAnsi) {
-			ansiPrep(
-				this.message.replace(/\r?\n/g, '\r\n'),	//	normalized LF -> CRLF
-				{
-					termWidth		: options.termWidth,
-					termHeight		: options.termHeight,
-					cols			: options.cols,
-					rows			: 'auto',
-					startCol		: options.startCol,
-					forceLineTerm	: true,
-				},
-				(err, prepped) => {
-					prepped = prepped || this.message;
+        if(options.isAnsi) {
+            ansiPrep(
+                this.message.replace(/\r?\n/g, '\r\n'),	//	normalized LF -> CRLF
+                {
+                    termWidth		: options.termWidth,
+                    termHeight		: options.termHeight,
+                    cols			: options.cols,
+                    rows			: 'auto',
+                    startCol		: options.startCol,
+                    forceLineTerm	: true,
+                },
+                (err, prepped) => {
+                    prepped = prepped || this.message;
 
-					let lastSgr = '';
-					const split = splitTextAtTerms(prepped);
+                    let lastSgr = '';
+                    const split = splitTextAtTerms(prepped);
 
-					const quoteLines		= [];
-					const focusQuoteLines	= [];
+                    const quoteLines		= [];
+                    const focusQuoteLines	= [];
 
-					//
-					//	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
-					//	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
-					//	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
-					//	the trick and allow them to leave them alone!
-					//
-					split.forEach(l => {
-						quoteLines.push(`${lastSgr}${l}`);
+                    //
+                    //	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
+                    //	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
+                    //	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
+                    //	the trick and allow them to leave them alone!
+                    //
+                    split.forEach(l => {
+                        quoteLines.push(`${lastSgr}${l}`);
 
-						focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
-						lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
-					});
+                        focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
+                        lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
+                    });
 
-					quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
+                    quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
 
-					return cb(null, quoteLines, focusQuoteLines, true);
-				}
-			);
-		} else {
-			const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
-			const quoted	= [];
-			const input		= _.trimEnd(this.message).replace(/\b/g, '');
+                    return cb(null, quoteLines, focusQuoteLines, true);
+                }
+            );
+        } else {
+            const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
+            const quoted	= [];
+            const input		= _.trimEnd(this.message).replace(/\b/g, '');
 
-			//	find *last* tearline
-			let tearLinePos = this.getTearLinePosition(input);
-			tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
+            //	find *last* tearline
+            let tearLinePos = this.getTearLinePosition(input);
+            tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
 
-			input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
-				//
-				//	For each paragraph, a state machine:
-				//	- New line - line
-				//	- New (pre)quoted line - quote_line
-				//	- Continuation of new/quoted line
-				//
-				//	Also:
-				//	- Detect pre-formatted lines & try to keep them as-is
-				//
-				let state;
-				let buf = '';
-				let quoteMatch;
+            input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
+                //
+                //	For each paragraph, a state machine:
+                //	- New line - line
+                //	- New (pre)quoted line - quote_line
+                //	- Continuation of new/quoted line
+                //
+                //	Also:
+                //	- Detect pre-formatted lines & try to keep them as-is
+                //
+                let state;
+                let buf = '';
+                let quoteMatch;
 
-				if(quoted.length > 0) {
-					//
-					//	Preserve paragraph seperation.
-					//
-					//	FSC-0032 states something about leaving blank lines fully blank
-					//	(without a prefix) but it seems nicer (and more consistent with other systems)
-					//	to put 'em in.
-					//
-					quoted.push(quotePrefix);
-				}
+                if(quoted.length > 0) {
+                    //
+                    //	Preserve paragraph seperation.
+                    //
+                    //	FSC-0032 states something about leaving blank lines fully blank
+                    //	(without a prefix) but it seems nicer (and more consistent with other systems)
+                    //	to put 'em in.
+                    //
+                    quoted.push(quotePrefix);
+                }
 
-				paragraph.split(/\r?\n/).forEach(line => {
-					if(0 === line.trim().length) {
-						//	see blank line notes above
-						return quoted.push(quotePrefix);
-					}
+                paragraph.split(/\r?\n/).forEach(line => {
+                    if(0 === line.trim().length) {
+                        //	see blank line notes above
+                        return quoted.push(quotePrefix);
+                    }
 
-					quoteMatch = line.match(QUOTE_RE);
+                    quoteMatch = line.match(QUOTE_RE);
 
-					switch(state) {
-						case 'line' :
-							if(quoteMatch) {
-								if(isFormattedLine(line)) {
-									quoted.push(getFormattedLine(line.replace(/\s/, '')));
-								} else {
-									quoted.push(...getWrapped(buf, quoteMatch[1]));
-									state = 'quote_line';
-									buf = line;
-								}
-							} else {
-								buf += ` ${line}`;
-							}
-							break;
+                    switch(state) {
+                        case 'line' :
+                            if(quoteMatch) {
+                                if(isFormattedLine(line)) {
+                                    quoted.push(getFormattedLine(line.replace(/\s/, '')));
+                                } else {
+                                    quoted.push(...getWrapped(buf, quoteMatch[1]));
+                                    state = 'quote_line';
+                                    buf = line;
+                                }
+                            } else {
+                                buf += ` ${line}`;
+                            }
+                            break;
 
-						case 'quote_line' :
-							if(quoteMatch) {
-								const rem = line.slice(quoteMatch[0].length);
-								if(!buf.startsWith(quoteMatch[0])) {
-									quoted.push(...getWrapped(buf, quoteMatch[1]));
-									buf = rem;
-								} else {
-									buf += ` ${rem}`;
-								}
-							} else {
-								quoted.push(...getWrapped(buf));
-								buf = line;
-								state = 'line';
-							}
-							break;
+                        case 'quote_line' :
+                            if(quoteMatch) {
+                                const rem = line.slice(quoteMatch[0].length);
+                                if(!buf.startsWith(quoteMatch[0])) {
+                                    quoted.push(...getWrapped(buf, quoteMatch[1]));
+                                    buf = rem;
+                                } else {
+                                    buf += ` ${rem}`;
+                                }
+                            } else {
+                                quoted.push(...getWrapped(buf));
+                                buf = line;
+                                state = 'line';
+                            }
+                            break;
 
-						default :
-							if(isFormattedLine(line)) {
-								quoted.push(getFormattedLine(line));
-							} else {
-								state	= quoteMatch ? 'quote_line' : 'line';
-								buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
-							}
-							break;
-					}
-				});
+                        default :
+                            if(isFormattedLine(line)) {
+                                quoted.push(getFormattedLine(line));
+                            } else {
+                                state	= quoteMatch ? 'quote_line' : 'line';
+                                buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
+                            }
+                            break;
+                    }
+                });
 
-				quoted.push(...getWrapped(buf, quoteMatch ? quoteMatch[1] : null));
-			});
+                quoted.push(...getWrapped(buf, quoteMatch ? quoteMatch[1] : null));
+            });
 
-			input.slice(tearLinePos).split(/\r?\n/).forEach(l => {
-				quoted.push(...getWrapped(l));
-			});
+            input.slice(tearLinePos).split(/\r?\n/).forEach(l => {
+                quoted.push(...getWrapped(l));
+            });
 
-			return cb(null, quoted, null, false);
-		}
-	}
+            return cb(null, quoted, null, false);
+        }
+    }
 };
diff --git a/core/message_area.js b/core/message_area.js
index 44a94c9a..03cc914c 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -35,252 +35,252 @@ exports.persistMessage						= persistMessage;
 exports.trimMessageAreasScheduledEvent		= trimMessageAreasScheduledEvent;
 
 function getAvailableMessageConferences(client, options) {
-	options = options || { includeSystemInternal : false };
+    options = options || { includeSystemInternal : false };
 
-	assert(client || true === options.noClient);
+    assert(client || true === options.noClient);
 
-	//	perform ACS check per conf & omit system_internal if desired
-	return _.omitBy(Config().messageConferences, (conf, confTag) => {
-		if(!options.includeSystemInternal && 'system_internal' === confTag) {
-			return true;
-		}
+    //	perform ACS check per conf & omit system_internal if desired
+    return _.omitBy(Config().messageConferences, (conf, confTag) => {
+        if(!options.includeSystemInternal && 'system_internal' === confTag) {
+            return true;
+        }
 
-		return client && !client.acs.hasMessageConfRead(conf);
-	});
+        return client && !client.acs.hasMessageConfRead(conf);
+    });
 }
 
 function getSortedAvailMessageConferences(client, options) {
-	const confs = _.map(getAvailableMessageConferences(client, options), (v, k) => {
-		return {
-			confTag : k,
-			conf	: v,
-		};
-	});
+    const confs = _.map(getAvailableMessageConferences(client, options), (v, k) => {
+        return {
+            confTag : k,
+            conf	: v,
+        };
+    });
 
-	sortAreasOrConfs(confs, 'conf');
+    sortAreasOrConfs(confs, 'conf');
 
-	return confs;
+    return confs;
 }
 
 //  Return an *object* of available areas within |confTag|
 function getAvailableMessageAreasByConfTag(confTag, options) {
-	options = options || {};
+    options = options || {};
 
-	//  :TODO: confTag === "" then find default
+    //  :TODO: confTag === "" then find default
 
-	const config = Config();
-	if(_.has(config.messageConferences, [ confTag, 'areas' ])) {
-		const areas = config.messageConferences[confTag].areas;
+    const config = Config();
+    if(_.has(config.messageConferences, [ confTag, 'areas' ])) {
+        const areas = config.messageConferences[confTag].areas;
 
-		if(!options.client || true === options.noAcsCheck) {
-			//	everything - no ACS checks
-			return areas;
-		} else {
-			//	perform ACS check per area
-			return _.omitBy(areas, area => {
-				return !options.client.acs.hasMessageAreaRead(area);
-			});
-		}
-	}
+        if(!options.client || true === options.noAcsCheck) {
+            //	everything - no ACS checks
+            return areas;
+        } else {
+            //	perform ACS check per area
+            return _.omitBy(areas, area => {
+                return !options.client.acs.hasMessageAreaRead(area);
+            });
+        }
+    }
 }
 
 function getSortedAvailMessageAreasByConfTag(confTag, options) {
-	const areas = _.map(getAvailableMessageAreasByConfTag(confTag, options), (v, k) => {
-		return  {
-			areaTag	: k,
-			area	: v,
-		};
-	});
+    const areas = _.map(getAvailableMessageAreasByConfTag(confTag, options), (v, k) => {
+        return  {
+            areaTag	: k,
+            area	: v,
+        };
+    });
 
-	sortAreasOrConfs(areas, 'area');
+    sortAreasOrConfs(areas, 'area');
 
-	return areas;
+    return areas;
 }
 
 function getDefaultMessageConferenceTag(client, disableAcsCheck) {
-	//
-	//	Find the first conference marked 'default'. If found,
-	//	inspect |client| against *read* ACS using defaults if not
-	//	specified.
-	//
-	//	If the above fails, just go down the list until we get one
-	//	that passes.
-	//
-	//	It's possible that we end up with nothing here!
-	//
-	//	Note that built in 'system_internal' is always ommited here
-	//
-	const config = Config();
-	let defaultConf = _.findKey(config.messageConferences, o => o.default);
-	if(defaultConf) {
-		const conf = config.messageConferences[defaultConf];
-		if(true === disableAcsCheck || client.acs.hasMessageConfRead(conf)) {
-			return defaultConf;
-		}
-	}
+    //
+    //	Find the first conference marked 'default'. If found,
+    //	inspect |client| against *read* ACS using defaults if not
+    //	specified.
+    //
+    //	If the above fails, just go down the list until we get one
+    //	that passes.
+    //
+    //	It's possible that we end up with nothing here!
+    //
+    //	Note that built in 'system_internal' is always ommited here
+    //
+    const config = Config();
+    let defaultConf = _.findKey(config.messageConferences, o => o.default);
+    if(defaultConf) {
+        const conf = config.messageConferences[defaultConf];
+        if(true === disableAcsCheck || client.acs.hasMessageConfRead(conf)) {
+            return defaultConf;
+        }
+    }
 
-	//  just use anything we can
-	defaultConf = _.findKey(config.messageConferences, (conf, confTag) => {
-		return 'system_internal' !== confTag && (true === disableAcsCheck || client.acs.hasMessageConfRead(conf));
-	});
+    //  just use anything we can
+    defaultConf = _.findKey(config.messageConferences, (conf, confTag) => {
+        return 'system_internal' !== confTag && (true === disableAcsCheck || client.acs.hasMessageConfRead(conf));
+    });
 
-	return defaultConf;
+    return defaultConf;
 }
 
 function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
-	//
-	//  Similar to finding the default conference:
-	//  Find the first entry marked 'default', if any. If found, check | client| against
-	//  *read* ACS. If this fails, just find the first one we can that passes checks.
-	//
-	//  It's possible that we end up with nothing!
-	//
-	confTag = confTag || getDefaultMessageConferenceTag(client);
+    //
+    //  Similar to finding the default conference:
+    //  Find the first entry marked 'default', if any. If found, check | client| against
+    //  *read* ACS. If this fails, just find the first one we can that passes checks.
+    //
+    //  It's possible that we end up with nothing!
+    //
+    confTag = confTag || getDefaultMessageConferenceTag(client);
 
-	const config = Config();
-	if(confTag && _.has(config.messageConferences, [ confTag, 'areas' ])) {
-		const areaPool = config.messageConferences[confTag].areas;
-		let defaultArea = _.findKey(areaPool, o => o.default);
-		if(defaultArea) {
-			const area = areaPool[defaultArea];
-			if(true === disableAcsCheck || client.acs.hasMessageAreaRead(area)) {
-				return defaultArea;
-			}
-		}
+    const config = Config();
+    if(confTag && _.has(config.messageConferences, [ confTag, 'areas' ])) {
+        const areaPool = config.messageConferences[confTag].areas;
+        let defaultArea = _.findKey(areaPool, o => o.default);
+        if(defaultArea) {
+            const area = areaPool[defaultArea];
+            if(true === disableAcsCheck || client.acs.hasMessageAreaRead(area)) {
+                return defaultArea;
+            }
+        }
 
-		defaultArea = _.findKey(areaPool, (area) => {
-			return (true === disableAcsCheck || client.acs.hasMessageAreaRead(area));
-		});
+        defaultArea = _.findKey(areaPool, (area) => {
+            return (true === disableAcsCheck || client.acs.hasMessageAreaRead(area));
+        });
 
-		return defaultArea;
-	}
+        return defaultArea;
+    }
 }
 
 function getMessageConferenceByTag(confTag) {
-	return Config().messageConferences[confTag];
+    return Config().messageConferences[confTag];
 }
 
 function getMessageConfTagByAreaTag(areaTag) {
-	const confs = Config().messageConferences;
-	return Object.keys(confs).find( (confTag) => {
-		return _.has(confs, [ confTag, 'areas', areaTag]);
-	});
+    const confs = Config().messageConferences;
+    return Object.keys(confs).find( (confTag) => {
+        return _.has(confs, [ confTag, 'areas', areaTag]);
+    });
 }
 
 function getMessageAreaByTag(areaTag, optionalConfTag) {
-	const confs = Config().messageConferences;
+    const confs = Config().messageConferences;
 
-	//	:TODO: this could be cached
-	if(_.isString(optionalConfTag)) {
-		if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
-			return confs[optionalConfTag].areas[areaTag];
-		}
-	} else {
-		//
-		//  No confTag to work with - we'll have to search through them all
-		//
-		let area;
-		_.forEach(confs, (v) => {
-			if(_.has(v, [ 'areas', areaTag ])) {
-				area = v.areas[areaTag];
-				return false;   //  stop iteration
-			}
-		});
+    //	:TODO: this could be cached
+    if(_.isString(optionalConfTag)) {
+        if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
+            return confs[optionalConfTag].areas[areaTag];
+        }
+    } else {
+        //
+        //  No confTag to work with - we'll have to search through them all
+        //
+        let area;
+        _.forEach(confs, (v) => {
+            if(_.has(v, [ 'areas', areaTag ])) {
+                area = v.areas[areaTag];
+                return false;   //  stop iteration
+            }
+        });
 
-		return area;
-	}
+        return area;
+    }
 }
 
 function changeMessageConference(client, confTag, cb) {
-	async.waterfall(
-		[
-			function getConf(callback) {
-				const conf = getMessageConferenceByTag(confTag);
+    async.waterfall(
+        [
+            function getConf(callback) {
+                const conf = getMessageConferenceByTag(confTag);
 
-				if(conf) {
-					callback(null, conf);
-				} else {
-					callback(new Error('Invalid message conference tag'));
-				}
-			},
-			function getDefaultAreaInConf(conf, callback) {
-				const areaTag 	= getDefaultMessageAreaTagByConfTag(client, confTag);
-				const area		= getMessageAreaByTag(areaTag, confTag);
+                if(conf) {
+                    callback(null, conf);
+                } else {
+                    callback(new Error('Invalid message conference tag'));
+                }
+            },
+            function getDefaultAreaInConf(conf, callback) {
+                const areaTag 	= getDefaultMessageAreaTagByConfTag(client, confTag);
+                const area		= getMessageAreaByTag(areaTag, confTag);
 
-				if(area) {
-					callback(null, conf, { areaTag : areaTag, area : area } );
-				} else {
-					callback(new Error('No available areas for this user in conference'));
-				}
-			},
-			function validateAccess(conf, areaInfo, callback) {
-				if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(areaInfo.area)) {
-					return callback(new Error('Access denied to message area and/or conference'));
-				} else {
-					return callback(null, conf, areaInfo);
-				}
-			},
-			function changeConferenceAndArea(conf, areaInfo, callback) {
-				const newProps = {
-					message_conf_tag	: confTag,
-					message_area_tag	: areaInfo.areaTag,
-				};
-				client.user.persistProperties(newProps, err => {
-					callback(err, conf, areaInfo);
-				});
-			},
-		],
-		function complete(err, conf, areaInfo) {
-			if(!err) {
-				client.log.info( { confTag : confTag, confName : conf.name, areaTag : areaInfo.areaTag }, 'Current message conference changed');
-			} else {
-				client.log.warn( { confTag : confTag, error : err.message }, 'Could not change message conference');
-			}
-			cb(err);
-		}
-	);
+                if(area) {
+                    callback(null, conf, { areaTag : areaTag, area : area } );
+                } else {
+                    callback(new Error('No available areas for this user in conference'));
+                }
+            },
+            function validateAccess(conf, areaInfo, callback) {
+                if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(areaInfo.area)) {
+                    return callback(new Error('Access denied to message area and/or conference'));
+                } else {
+                    return callback(null, conf, areaInfo);
+                }
+            },
+            function changeConferenceAndArea(conf, areaInfo, callback) {
+                const newProps = {
+                    message_conf_tag	: confTag,
+                    message_area_tag	: areaInfo.areaTag,
+                };
+                client.user.persistProperties(newProps, err => {
+                    callback(err, conf, areaInfo);
+                });
+            },
+        ],
+        function complete(err, conf, areaInfo) {
+            if(!err) {
+                client.log.info( { confTag : confTag, confName : conf.name, areaTag : areaInfo.areaTag }, 'Current message conference changed');
+            } else {
+                client.log.warn( { confTag : confTag, error : err.message }, 'Could not change message conference');
+            }
+            cb(err);
+        }
+    );
 }
 
 function changeMessageAreaWithOptions(client, areaTag, options, cb) {
-	options = options || {};	//	:TODO: this is currently pointless... cb is required...
+    options = options || {};	//	:TODO: this is currently pointless... cb is required...
 
-	async.waterfall(
-		[
-			function getArea(callback) {
-				const area = getMessageAreaByTag(areaTag);
-				return callback(area ? null : new Error('Invalid message areaTag'), area);
-			},
-			function validateAccess(area, callback) {
-				//
-				//  Need at least *read* to access the area
-				//
-				if(!client.acs.hasMessageAreaRead(area)) {
-					return callback(new Error('Access denied to message area'));
-				} else {
-					return callback(null, area);
-				}
-			},
-			function changeArea(area, callback) {
-				if(true === options.persist) {
-					client.user.persistProperty('message_area_tag', areaTag, function persisted(err) {
-						return callback(err, area);
-					});
-				} else {
-					client.user.properties['message_area_tag'] = areaTag;
-					return callback(null, area);
-				}
-			}
-		],
-		function complete(err, area) {
-			if(!err) {
-				client.log.info( { areaTag : areaTag, area : area }, 'Current message area changed');
-			} else {
-				client.log.warn( { areaTag : areaTag, area : area, error : err.message }, 'Could not change message area');
-			}
+    async.waterfall(
+        [
+            function getArea(callback) {
+                const area = getMessageAreaByTag(areaTag);
+                return callback(area ? null : new Error('Invalid message areaTag'), area);
+            },
+            function validateAccess(area, callback) {
+                //
+                //  Need at least *read* to access the area
+                //
+                if(!client.acs.hasMessageAreaRead(area)) {
+                    return callback(new Error('Access denied to message area'));
+                } else {
+                    return callback(null, area);
+                }
+            },
+            function changeArea(area, callback) {
+                if(true === options.persist) {
+                    client.user.persistProperty('message_area_tag', areaTag, function persisted(err) {
+                        return callback(err, area);
+                    });
+                } else {
+                    client.user.properties['message_area_tag'] = areaTag;
+                    return callback(null, area);
+                }
+            }
+        ],
+        function complete(err, area) {
+            if(!err) {
+                client.log.info( { areaTag : areaTag, area : area }, 'Current message area changed');
+            } else {
+                client.log.warn( { areaTag : areaTag, area : area, error : err.message }, 'Could not change message area');
+            }
 
-			return cb(err);
-		}
-	);
+            return cb(err);
+        }
+    );
 }
 
 //
@@ -290,185 +290,185 @@ function changeMessageAreaWithOptions(client, areaTag, options, cb) {
 //	This is useful for example when doing a new scan
 //
 function tempChangeMessageConfAndArea(client, areaTag) {
-	const area		= getMessageAreaByTag(areaTag);
-	const confTag	= getMessageConfTagByAreaTag(areaTag);
+    const area		= getMessageAreaByTag(areaTag);
+    const confTag	= getMessageConfTagByAreaTag(areaTag);
 
-	if(!area || !confTag) {
-		return false;
-	}
+    if(!area || !confTag) {
+        return false;
+    }
 
-	const conf = getMessageConferenceByTag(confTag);
+    const conf = getMessageConferenceByTag(confTag);
 
-	if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
-		return false;
-	}
+    if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
+        return false;
+    }
 
-	client.user.properties.message_conf_tag	= confTag;
-	client.user.properties.message_area_tag = areaTag;
+    client.user.properties.message_conf_tag	= confTag;
+    client.user.properties.message_area_tag = areaTag;
 
-	return true;
+    return true;
 }
 
 function changeMessageArea(client, areaTag, cb) {
-	changeMessageAreaWithOptions(client, areaTag, { persist : true }, cb);
+    changeMessageAreaWithOptions(client, areaTag, { persist : true }, cb);
 }
 
 function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
-	getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
-		lastMessageId = lastMessageId || 0;
+    getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
+        lastMessageId = lastMessageId || 0;
 
-		const filter = {
-			areaTag,
-			newerThanMessageId	: lastMessageId,
-			resultType			: 'count',
-		};
+        const filter = {
+            areaTag,
+            newerThanMessageId	: lastMessageId,
+            resultType			: 'count',
+        };
 
-		if(Message.isPrivateAreaTag(areaTag)) {
-			filter.privateTagUserId = userId;
-		}
+        if(Message.isPrivateAreaTag(areaTag)) {
+            filter.privateTagUserId = userId;
+        }
 
-		Message.findMessages(filter, (err, count) => {
-			return cb(err, count);
-		});
-	});
+        Message.findMessages(filter, (err, count) => {
+            return cb(err, count);
+        });
+    });
 }
 
 function getNewMessagesInAreaForUser(userId, areaTag, cb) {
-	getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
-		lastMessageId = lastMessageId || 0;
+    getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
+        lastMessageId = lastMessageId || 0;
 
-		const filter = {
-			areaTag,
-			resultType			: 'messageList',
-			newerThanMessageId	: lastMessageId,
-			sort				: 'messageId',
-			order				: 'ascending',
-		};
+        const filter = {
+            areaTag,
+            resultType			: 'messageList',
+            newerThanMessageId	: lastMessageId,
+            sort				: 'messageId',
+            order				: 'ascending',
+        };
 
-		if(Message.isPrivateAreaTag(areaTag)) {
-			filter.privateTagUserId = userId;
-		}
+        if(Message.isPrivateAreaTag(areaTag)) {
+            filter.privateTagUserId = userId;
+        }
 
-		return Message.findMessages(filter, cb);
-	});
+        return Message.findMessages(filter, cb);
+    });
 }
 
 function getMessageListForArea(client, areaTag, cb) {
-	const filter = {
-		areaTag,
-		resultType	: 'messageList',
-		sort		: 'messageId',
-		order		: 'ascending',
-	};
+    const filter = {
+        areaTag,
+        resultType	: 'messageList',
+        sort		: 'messageId',
+        order		: 'ascending',
+    };
 
-	if(Message.isPrivateAreaTag(areaTag)) {
-		filter.privateTagUserId = client.user.userId;
-	}
+    if(Message.isPrivateAreaTag(areaTag)) {
+        filter.privateTagUserId = client.user.userId;
+    }
 
-	return Message.findMessages(filter, cb);
+    return Message.findMessages(filter, cb);
 }
 
 function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
-	Message.findMessages(
-		{
-			areaTag,
-			newerThanTimestamp,
-			sort 	: 'modTimestamp',
-			order	: 'ascending',
-			limit	: 1,
-		},
-		(err, id) => {
-			if(err) {
-				return cb(err);
-			}
-			return cb(null, id ? id[0] : null);
-		}
-	);
+    Message.findMessages(
+        {
+            areaTag,
+            newerThanTimestamp,
+            sort 	: 'modTimestamp',
+            order	: 'ascending',
+            limit	: 1,
+        },
+        (err, id) => {
+            if(err) {
+                return cb(err);
+            }
+            return cb(null, id ? id[0] : null);
+        }
+    );
 }
 
 function getMessageAreaLastReadId(userId, areaTag, cb) {
-	msgDb.get(
-		'SELECT message_id '					+
+    msgDb.get(
+        'SELECT message_id '					+
 		'FROM user_message_area_last_read '		+
 		'WHERE user_id = ? AND area_tag = ?;',
-		[ userId, areaTag.toLowerCase() ],
-		function complete(err, row) {
-			cb(err, row ? row.message_id : 0);
-		}
-	);
+        [ userId, areaTag.toLowerCase() ],
+        function complete(err, row) {
+            cb(err, row ? row.message_id : 0);
+        }
+    );
 }
 
 function updateMessageAreaLastReadId(userId, areaTag, messageId, allowOlder, cb) {
-	if(!cb && _.isFunction(allowOlder)) {
-		cb = allowOlder;
-		allowOlder = false;
-	}
+    if(!cb && _.isFunction(allowOlder)) {
+        cb = allowOlder;
+        allowOlder = false;
+    }
 
-	//	:TODO: likely a better way to do this...
-	async.waterfall(
-		[
-			function getCurrent(callback) {
-				getMessageAreaLastReadId(userId, areaTag, function result(err, lastId) {
-					lastId = lastId || 0;
-					callback(null, lastId);	//	ignore errors as we default to 0
-				});
-			},
-			function update(lastId, callback) {
-				if(allowOlder || messageId > lastId) {
-					msgDb.run(
-						'REPLACE INTO user_message_area_last_read (user_id, area_tag, message_id) '	+
+    //	:TODO: likely a better way to do this...
+    async.waterfall(
+        [
+            function getCurrent(callback) {
+                getMessageAreaLastReadId(userId, areaTag, function result(err, lastId) {
+                    lastId = lastId || 0;
+                    callback(null, lastId);	//	ignore errors as we default to 0
+                });
+            },
+            function update(lastId, callback) {
+                if(allowOlder || messageId > lastId) {
+                    msgDb.run(
+                        'REPLACE INTO user_message_area_last_read (user_id, area_tag, message_id) '	+
 						'VALUES (?, ?, ?);',
-						[ userId, areaTag, messageId ],
-						function written(err) {
-							callback(err, true);    //  true=didUpdate
-						}
-					);
-				} else {
-					callback(null);
-				}
-			}
-		],
-		function complete(err, didUpdate) {
-			if(err) {
-				Log.debug(
-					{ error : err.toString(), userId : userId, areaTag : areaTag, messageId : messageId },
-					'Failed updating area last read ID');
-			} else {
-				if(true === didUpdate) {
-					Log.trace(
-						{ userId : userId, areaTag : areaTag, messageId : messageId },
-						'Area last read ID updated');
-				}
-			}
-			cb(err);
-		}
-	);
+                        [ userId, areaTag, messageId ],
+                        function written(err) {
+                            callback(err, true);    //  true=didUpdate
+                        }
+                    );
+                } else {
+                    callback(null);
+                }
+            }
+        ],
+        function complete(err, didUpdate) {
+            if(err) {
+                Log.debug(
+                    { error : err.toString(), userId : userId, areaTag : areaTag, messageId : messageId },
+                    'Failed updating area last read ID');
+            } else {
+                if(true === didUpdate) {
+                    Log.trace(
+                        { userId : userId, areaTag : areaTag, messageId : messageId },
+                        'Area last read ID updated');
+                }
+            }
+            cb(err);
+        }
+    );
 }
 
 function persistMessage(message, cb) {
-	async.series(
-		[
-			function persistMessageToDisc(callback) {
-				return message.persist(callback);
-			},
-			function recordToMessageNetworks(callback) {
-				return msgNetRecord(message, callback);
-			}
-		],
-		cb
-	);
+    async.series(
+        [
+            function persistMessageToDisc(callback) {
+                return message.persist(callback);
+            },
+            function recordToMessageNetworks(callback) {
+                return msgNetRecord(message, callback);
+            }
+        ],
+        cb
+    );
 }
 
 //	method exposed for event scheduler
 function trimMessageAreasScheduledEvent(args, cb) {
 
-	function trimMessageAreaByMaxMessages(areaInfo, cb) {
-		if(0 === areaInfo.maxMessages) {
-			return cb(null);
-		}
+    function trimMessageAreaByMaxMessages(areaInfo, cb) {
+        if(0 === areaInfo.maxMessages) {
+            return cb(null);
+        }
 
-		msgDb.run(
-			`DELETE FROM message
+        msgDb.run(
+            `DELETE FROM message
 			WHERE message_id IN(
 				SELECT message_id
 				FROM message
@@ -476,124 +476,124 @@ function trimMessageAreasScheduledEvent(args, cb) {
 				ORDER BY message_id DESC
 				LIMIT -1 OFFSET ${areaInfo.maxMessages}
 			);`,
-			[ areaInfo.areaTag.toLowerCase() ],
-			function result(err) {	//	no arrow func; need this
-				if(err) {
-					Log.error( { areaInfo : areaInfo, error : err.message, type : 'maxMessages' }, 'Error trimming message area');
-				} else {
-					Log.debug( { areaInfo : areaInfo, type : 'maxMessages', count : this.changes }, 'Area trimmed successfully');
-				}
-				return cb(err);
-			}
-		);
-	}
+            [ areaInfo.areaTag.toLowerCase() ],
+            function result(err) {	//	no arrow func; need this
+                if(err) {
+                    Log.error( { areaInfo : areaInfo, error : err.message, type : 'maxMessages' }, 'Error trimming message area');
+                } else {
+                    Log.debug( { areaInfo : areaInfo, type : 'maxMessages', count : this.changes }, 'Area trimmed successfully');
+                }
+                return cb(err);
+            }
+        );
+    }
 
-	function trimMessageAreaByMaxAgeDays(areaInfo, cb) {
-		if(0 === areaInfo.maxAgeDays) {
-			return cb(null);
-		}
+    function trimMessageAreaByMaxAgeDays(areaInfo, cb) {
+        if(0 === areaInfo.maxAgeDays) {
+            return cb(null);
+        }
 
-		msgDb.run(
-			`DELETE FROM message
+        msgDb.run(
+            `DELETE FROM message
 			WHERE area_tag = ? AND modified_timestamp < date('now', '-${areaInfo.maxAgeDays} days');`,
-			[ areaInfo.areaTag ],
-			function result(err) {	//	no arrow func; need this
-				if(err) {
-					Log.warn( { areaInfo : areaInfo, error : err.message, type : 'maxAgeDays' }, 'Error trimming message area');
-				} else {
-					Log.debug( { areaInfo : areaInfo, type : 'maxAgeDays', count : this.changes }, 'Area trimmed successfully');
-				}
-				return cb(err);
-			}
-		);
-	}
+            [ areaInfo.areaTag ],
+            function result(err) {	//	no arrow func; need this
+                if(err) {
+                    Log.warn( { areaInfo : areaInfo, error : err.message, type : 'maxAgeDays' }, 'Error trimming message area');
+                } else {
+                    Log.debug( { areaInfo : areaInfo, type : 'maxAgeDays', count : this.changes }, 'Area trimmed successfully');
+                }
+                return cb(err);
+            }
+        );
+    }
 
-	async.waterfall(
-		[
-			function getAreaTags(callback) {
-				const areaTags = [];
+    async.waterfall(
+        [
+            function getAreaTags(callback) {
+                const areaTags = [];
 
-				//
-				//	We use SQL here vs API such that no-longer-used tags are picked up
-				//
-				msgDb.each(
-					`SELECT DISTINCT area_tag
+                //
+                //	We use SQL here vs API such that no-longer-used tags are picked up
+                //
+                msgDb.each(
+                    `SELECT DISTINCT area_tag
 					FROM message;`,
-					(err, row) => {
-						if(err) {
-							return callback(err);
-						}
+                    (err, row) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						//	We treat private mail special
-						if(!Message.isPrivateAreaTag(row.area_tag)) {
-							areaTags.push(row.area_tag);
-						}
-					},
-					err => {
-						return callback(err, areaTags);
-					}
-				);
-			},
-			function prepareAreaInfo(areaTags, callback) {
-				let areaInfos = [];
+                        //	We treat private mail special
+                        if(!Message.isPrivateAreaTag(row.area_tag)) {
+                            areaTags.push(row.area_tag);
+                        }
+                    },
+                    err => {
+                        return callback(err, areaTags);
+                    }
+                );
+            },
+            function prepareAreaInfo(areaTags, callback) {
+                let areaInfos = [];
 
-				//	determine maxMessages & maxAgeDays per area
-				const config = Config();
-				areaTags.forEach(areaTag => {
+                //	determine maxMessages & maxAgeDays per area
+                const config = Config();
+                areaTags.forEach(areaTag => {
 
-					let maxMessages = config.messageAreaDefaults.maxMessages;
-					let maxAgeDays	= config.messageAreaDefaults.maxAgeDays;
+                    let maxMessages = config.messageAreaDefaults.maxMessages;
+                    let maxAgeDays	= config.messageAreaDefaults.maxAgeDays;
 
-					const area = getMessageAreaByTag(areaTag);	//	note: we don't know the conf here
-					if(area) {
-						maxMessages = area.maxMessages || maxMessages;
-						maxAgeDays	= area.maxAgeDays || maxAgeDays;
-					}
+                    const area = getMessageAreaByTag(areaTag);	//	note: we don't know the conf here
+                    if(area) {
+                        maxMessages = area.maxMessages || maxMessages;
+                        maxAgeDays	= area.maxAgeDays || maxAgeDays;
+                    }
 
-					areaInfos.push( {
-						areaTag		: areaTag,
-						maxMessages	: maxMessages,
-						maxAgeDays	: maxAgeDays,
-					} );
-				});
+                    areaInfos.push( {
+                        areaTag		: areaTag,
+                        maxMessages	: maxMessages,
+                        maxAgeDays	: maxAgeDays,
+                    } );
+                });
 
-				return callback(null, areaInfos);
-			},
-			function trimGeneralAreas(areaInfos, callback) {
-				async.each(
-					areaInfos,
-					(areaInfo, next) => {
-						trimMessageAreaByMaxMessages(areaInfo, err => {
-							if(err) {
-								return next(err);
-							}
+                return callback(null, areaInfos);
+            },
+            function trimGeneralAreas(areaInfos, callback) {
+                async.each(
+                    areaInfos,
+                    (areaInfo, next) => {
+                        trimMessageAreaByMaxMessages(areaInfo, err => {
+                            if(err) {
+                                return next(err);
+                            }
 
-							trimMessageAreaByMaxAgeDays(areaInfo, err => {
-								return next(err);
-							});
-						});
-					},
-					callback
-				);
-			},
-			function trimExternalPrivateSentMail(callback) {
-				//
-				//	*External* (FTN, email, ...) outgoing is cleaned up *after export*
-				//	if it is older than the configured |maxExternalSentAgeDays| days
-				//
-				//	Outgoing externally exported private mail is:
-				//	- In the 'private_mail' area
-				//	- Marked exported (state_flags0 exported bit set)
-				//	- Marked with any external flavor (we don't mark local)
-				//
-				const maxExternalSentAgeDays = _.get(
-					Config,
-					'messageConferences.system_internal.areas.private_mail.maxExternalSentAgeDays',
-					30
-				);
+                            trimMessageAreaByMaxAgeDays(areaInfo, err => {
+                                return next(err);
+                            });
+                        });
+                    },
+                    callback
+                );
+            },
+            function trimExternalPrivateSentMail(callback) {
+                //
+                //	*External* (FTN, email, ...) outgoing is cleaned up *after export*
+                //	if it is older than the configured |maxExternalSentAgeDays| days
+                //
+                //	Outgoing externally exported private mail is:
+                //	- In the 'private_mail' area
+                //	- Marked exported (state_flags0 exported bit set)
+                //	- Marked with any external flavor (we don't mark local)
+                //
+                const maxExternalSentAgeDays = _.get(
+                    Config,
+                    'messageConferences.system_internal.areas.private_mail.maxExternalSentAgeDays',
+                    30
+                );
 
-				msgDb.run(
-					`DELETE FROM message
+                msgDb.run(
+                    `DELETE FROM message
 					WHERE message_id IN (
 						SELECT m.message_id
 						FROM message m
@@ -605,20 +605,20 @@ function trimMessageAreasScheduledEvent(args, cb) {
 							(mmf.meta_category='System' AND mmf.meta_name='${Message.SystemMetaNames.ExternalFlavor}')
 						WHERE m.area_tag='${Message.WellKnownAreaTags.Private}' AND	DATETIME('now') > DATETIME(m.modified_timestamp, '+${maxExternalSentAgeDays} days')
 					);`,
-					function results(err) {	//	no arrow func; need this
-						if(err) {
-							Log.warn( { error : err.message }, 'Error trimming private externally sent messages');
-						} else {
-							Log.debug( { count : this.changes }, 'Private externally sent messages trimmed successfully');
-						}
-					}
-				);
+                    function results(err) {	//	no arrow func; need this
+                        if(err) {
+                            Log.warn( { error : err.message }, 'Error trimming private externally sent messages');
+                        } else {
+                            Log.debug( { count : this.changes }, 'Private externally sent messages trimmed successfully');
+                        }
+                    }
+                );
 
-				return callback(null);
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                return callback(null);
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
\ No newline at end of file
diff --git a/core/message_base_search.js b/core/message_base_search.js
index fdb17859..98f78552 100644
--- a/core/message_base_search.js
+++ b/core/message_base_search.js
@@ -4,9 +4,9 @@
 //	ENiGMA½
 const MenuModule					= require('./menu_module.js').MenuModule;
 const {
-	getSortedAvailMessageConferences,
-	getAvailableMessageAreasByConfTag,
-	getSortedAvailMessageAreasByConfTag,
+    getSortedAvailMessageConferences,
+    getAvailableMessageAreasByConfTag,
+    getSortedAvailMessageAreasByConfTag,
 }									= require('./message_area.js');
 const Errors						= require('./enig_error.js').Errors;
 const Message						= require('./message.js');
@@ -15,134 +15,134 @@ const Message						= require('./message.js');
 const _								= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Message Base Search',
-	desc	: 'Module for quickly searching the message base',
-	author	: 'NuSkooler',
+    name	: 'Message Base Search',
+    desc	: 'Module for quickly searching the message base',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	search : {
-		searchTerms	: 1,
-		search		: 2,
-		conf		: 3,
-		area		: 4,
-		to			: 5,
-		from		: 6,
-		advSearch	: 7,
-	}
+    search : {
+        searchTerms	: 1,
+        search		: 2,
+        conf		: 3,
+        area		: 4,
+        to			: 5,
+        from		: 6,
+        advSearch	: 7,
+    }
 };
 
 exports.getModule = class MessageBaseSearch extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.menuMethods = {
-			search : (formData, extraArgs, cb) => {
-				return this.searchNow(formData, cb);
-			}
-		};
-	}
+        this.menuMethods = {
+            search : (formData, extraArgs, cb) => {
+                return this.searchNow(formData, cb);
+            }
+        };
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			this.prepViewController('search', 0, mciData.menu, (err, vc) => {
-				if(err) {
-					return cb(err);
-				}
+            this.prepViewController('search', 0, mciData.menu, (err, vc) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				const confView 	= vc.getView(MciViewIds.search.conf);
-				const areaView	= vc.getView(MciViewIds.search.area);
+                const confView 	= vc.getView(MciViewIds.search.conf);
+                const areaView	= vc.getView(MciViewIds.search.area);
 
-				if(!confView || !areaView) {
-					return cb(Errors.DoesNotExist('Missing one or more required views'));
-				}
+                if(!confView || !areaView) {
+                    return cb(Errors.DoesNotExist('Missing one or more required views'));
+                }
 
-				const availConfs = [ { text : '-ALL-', data : '' } ].concat(
-					getSortedAvailMessageConferences(this.client).map(conf => Object.assign(conf, { text : conf.conf.name, data : conf.confTag } )) || []
-				);
+                const availConfs = [ { text : '-ALL-', data : '' } ].concat(
+                    getSortedAvailMessageConferences(this.client).map(conf => Object.assign(conf, { text : conf.conf.name, data : conf.confTag } )) || []
+                );
 
-				let availAreas = [ { text : '-ALL-', data : '' } ];	//	note: will populate if conf changes from ALL
+                let availAreas = [ { text : '-ALL-', data : '' } ];	//	note: will populate if conf changes from ALL
 
-				confView.setItems(availConfs);
-				areaView.setItems(availAreas);
+                confView.setItems(availConfs);
+                areaView.setItems(availAreas);
 
-				confView.setFocusItemIndex(0);
-				areaView.setFocusItemIndex(0);
+                confView.setFocusItemIndex(0);
+                areaView.setFocusItemIndex(0);
 
-				confView.on('index update', idx => {
-					availAreas = [ { text : '-ALL-', data : '' } ].concat(
-						getSortedAvailMessageAreasByConfTag(availConfs[idx].confTag, { client : this.client }).map(
-							area => Object.assign(area, { text : area.area.name, data : area.areaTag } )
-						)
-					);
-					areaView.setItems(availAreas);
-					areaView.setFocusItemIndex(0);
-				});
+                confView.on('index update', idx => {
+                    availAreas = [ { text : '-ALL-', data : '' } ].concat(
+                        getSortedAvailMessageAreasByConfTag(availConfs[idx].confTag, { client : this.client }).map(
+                            area => Object.assign(area, { text : area.area.name, data : area.areaTag } )
+                        )
+                    );
+                    areaView.setItems(availAreas);
+                    areaView.setFocusItemIndex(0);
+                });
 
-				vc.switchFocus(MciViewIds.search.searchTerms);
-				return cb(null);
-			});
-		});
-	}
+                vc.switchFocus(MciViewIds.search.searchTerms);
+                return cb(null);
+            });
+        });
+    }
 
-	searchNow(formData, cb) {
-		const isAdvanced	= formData.submitId === MciViewIds.search.advSearch;
-		const value			= formData.value;
+    searchNow(formData, cb) {
+        const isAdvanced	= formData.submitId === MciViewIds.search.advSearch;
+        const value			= formData.value;
 
-		const filter = {
-			resultType		: 'messageList',
-			sort			: 'modTimestamp',
-			terms			: value.searchTerms,
-			//extraFields		: [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
-			limit			: 2048,	//	:TODO: best way to handle this? we should probably let the user know if some results are returned
-		};
+        const filter = {
+            resultType		: 'messageList',
+            sort			: 'modTimestamp',
+            terms			: value.searchTerms,
+            //extraFields		: [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
+            limit			: 2048,	//	:TODO: best way to handle this? we should probably let the user know if some results are returned
+        };
 
-		if(isAdvanced) {
-			filter.toUserName	= value.toUserName;
-			filter.fromUserName	= value.fromUserName;
+        if(isAdvanced) {
+            filter.toUserName	= value.toUserName;
+            filter.fromUserName	= value.fromUserName;
 
-			if(value.confTag && !value.areaTag) {
-				//	areaTag may be a string or array of strings
-				//	getAvailableMessageAreasByConfTag() returns a obj - we only need tags				
-				filter.areaTag = _.map(
-					getAvailableMessageAreasByConfTag(value.confTag, { client : this.client } ),
-					(area, areaTag) => areaTag
-				);
-			} else if(value.areaTag) {
-				filter.areaTag = value.areaTag;	//	specific conf + area
-			}
-		}
+            if(value.confTag && !value.areaTag) {
+                //	areaTag may be a string or array of strings
+                //	getAvailableMessageAreasByConfTag() returns a obj - we only need tags
+                filter.areaTag = _.map(
+                    getAvailableMessageAreasByConfTag(value.confTag, { client : this.client } ),
+                    (area, areaTag) => areaTag
+                );
+            } else if(value.areaTag) {
+                filter.areaTag = value.areaTag;	//	specific conf + area
+            }
+        }
 
-		Message.findMessages(filter, (err, messageList) => {
-			if(err) {
-				return cb(err);
-			}
+        Message.findMessages(filter, (err, messageList) => {
+            if(err) {
+                return cb(err);
+            }
 
-			if(0 === messageList.length) {
-				return this.gotoMenu(
-					this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
-					{ menuFlags : [ 'popParent' ] },
-					cb
-				);
-			}
+            if(0 === messageList.length) {
+                return this.gotoMenu(
+                    this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
+                    { menuFlags : [ 'popParent' ] },
+                    cb
+                );
+            }
 
-			const menuOpts = {
-				extraArgs : {
-					messageList,
-					noUpdateLastReadId	: true
-				},
-				menuFlags	: [ 'popParent' ],
-			};
+            const menuOpts = {
+                extraArgs : {
+                    messageList,
+                    noUpdateLastReadId	: true
+                },
+                menuFlags	: [ 'popParent' ],
+            };
 
-			return this.gotoMenu(
-				this.menuConfig.config.messageListMenu || 'messageAreaMessageList',
-				menuOpts,
-				cb
-			);
-		});
-	}
+            return this.gotoMenu(
+                this.menuConfig.config.messageListMenu || 'messageAreaMessageList',
+                menuOpts,
+                cb
+            );
+        });
+    }
 };
diff --git a/core/mime_util.js b/core/mime_util.js
index b9a7c5af..d6631077 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -10,33 +10,33 @@ exports.startup				= startup;
 exports.resolveMimeType		= resolveMimeType;
 
 function startup(cb) {
-	//
-	//	Add in types (not yet) supported by mime-db -- and therefor, mime-types
-	//
-	const ADDITIONAL_EXT_MIMETYPES = {
-		ans				: 'text/x-ansi',
-		gz				: 'application/gzip',	//	not in mime-types 2.1.15 :(
-		lzx				: 'application/x-lzx',	//	:TODO: submit to mime-types
-	};
+    //
+    //	Add in types (not yet) supported by mime-db -- and therefor, mime-types
+    //
+    const ADDITIONAL_EXT_MIMETYPES = {
+        ans				: 'text/x-ansi',
+        gz				: 'application/gzip',	//	not in mime-types 2.1.15 :(
+        lzx				: 'application/x-lzx',	//	:TODO: submit to mime-types
+    };
 
-	_.forEach(ADDITIONAL_EXT_MIMETYPES, (mimeType, ext) => {
-		//	don't override any entries
-		if(!_.isString(mimeTypes.types[ext])) {
-			mimeTypes[ext] = mimeType;
-		}
+    _.forEach(ADDITIONAL_EXT_MIMETYPES, (mimeType, ext) => {
+        //	don't override any entries
+        if(!_.isString(mimeTypes.types[ext])) {
+            mimeTypes[ext] = mimeType;
+        }
 
-		if(!mimeTypes.extensions[mimeType]) {
-			mimeTypes.extensions[mimeType] = [ ext ];
-		}
-	});
+        if(!mimeTypes.extensions[mimeType]) {
+            mimeTypes.extensions[mimeType] = [ ext ];
+        }
+    });
 
-	return cb(null);
+    return cb(null);
 }
 
 function resolveMimeType(query) {
-	if(mimeTypes.extensions[query]) {
-		return query;	//	alreaed a mime-type
-	}
+    if(mimeTypes.extensions[query]) {
+        return query;	//	alreaed a mime-type
+    }
 
-	return mimeTypes.lookup(query) || undefined;	//	lookup() returns false; we want undefined
+    return mimeTypes.lookup(query) || undefined;	//	lookup() returns false; we want undefined
 }
\ No newline at end of file
diff --git a/core/misc_util.js b/core/misc_util.js
index 70bbb5e2..3a75d065 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -14,39 +14,39 @@ exports.getCleanEnigmaVersion	= getCleanEnigmaVersion;
 exports.getEnigmaUserAgent		= getEnigmaUserAgent;
 
 function isProduction() {
-	var env = process.env.NODE_ENV || 'dev';
-	return 'production' === env;
+    var env = process.env.NODE_ENV || 'dev';
+    return 'production' === env;
 }
 
 function isDevelopment() {
-	return (!(isProduction()));
+    return (!(isProduction()));
 }
 
 function valueWithDefault(val, defVal) {
-	return (typeof val !== 'undefined' ? val : defVal);
+    return (typeof val !== 'undefined' ? val : defVal);
 }
 
 function resolvePath(path) {
-	if(path.substr(0, 2) === '~/') {
-		var mswCombined = process.env.HOMEDRIVE + process.env.HOMEPATH;
-		path = (process.env.HOME || mswCombined || process.env.HOMEPATH || process.env.HOMEDIR || process.cwd()) + path.substr(1);
-	}
-	return paths.resolve(path);
+    if(path.substr(0, 2) === '~/') {
+        var mswCombined = process.env.HOMEDRIVE + process.env.HOMEPATH;
+        path = (process.env.HOME || mswCombined || process.env.HOMEPATH || process.env.HOMEDIR || process.cwd()) + path.substr(1);
+    }
+    return paths.resolve(path);
 }
 
 function getCleanEnigmaVersion() {
-	return packageJson.version
-		.replace(/-/g, '.')
-		.replace(/alpha/,'a')
-		.replace(/beta/,'b')
-	;
+    return packageJson.version
+        .replace(/-/g, '.')
+        .replace(/alpha/,'a')
+        .replace(/beta/,'b')
+    ;
 }
 
 //	See also ftn_util.js getTearLine() & getProductIdentifier()
 function getEnigmaUserAgent() {
-	//	can't have 1/2 or ½ in User-Agent according to RFC 1945  :(
-	const version = getCleanEnigmaVersion();
-	const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    //	can't have 1/2 or ½ in User-Agent according to RFC 1945  :(
+    const version = getCleanEnigmaVersion();
+    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
 
-	return `ENiGMA-BBS/${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
+    return `ENiGMA-BBS/${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
\ No newline at end of file
diff --git a/core/mod_mixins.js b/core/mod_mixins.js
index c830813a..fd9db771 100644
--- a/core/mod_mixins.js
+++ b/core/mod_mixins.js
@@ -7,28 +7,28 @@ const { get }		= require('lodash');
 
 exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
-	tempMessageConfAndAreaSwitch(messageAreaTag, recordPrevious = true) {
-		messageAreaTag = messageAreaTag || get(this, 'config.messageAreaTag', this.messageAreaTag);
-		if(!messageAreaTag) {
-			return;	//	nothing to do!
-		}
+    tempMessageConfAndAreaSwitch(messageAreaTag, recordPrevious = true) {
+        messageAreaTag = messageAreaTag || get(this, 'config.messageAreaTag', this.messageAreaTag);
+        if(!messageAreaTag) {
+            return;	//	nothing to do!
+        }
 
-		if(recordPrevious) {
-			this.prevMessageConfAndArea = {
-				confTag	: this.client.user.properties.message_conf_tag,
-				areaTag	: this.client.user.properties.message_area_tag,
-			};
-		}
+        if(recordPrevious) {
+            this.prevMessageConfAndArea = {
+                confTag	: this.client.user.properties.message_conf_tag,
+                areaTag	: this.client.user.properties.message_area_tag,
+            };
+        }
 
-		if(!messageArea.tempChangeMessageConfAndArea(this.client, messageAreaTag)) {
-			this.client.log.warn( { messageAreaTag : messageArea }, 'Failed to perform temporary message area/conf switch');
-		}
-	}
+        if(!messageArea.tempChangeMessageConfAndArea(this.client, messageAreaTag)) {
+            this.client.log.warn( { messageAreaTag : messageArea }, 'Failed to perform temporary message area/conf switch');
+        }
+    }
 
-	tempMessageConfAndAreaRestore() {
-		if(this.prevMessageConfAndArea) {
-			this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
-			this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
-		}
-	}
+    tempMessageConfAndAreaRestore() {
+        if(this.prevMessageConfAndArea) {
+            this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
+            this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
+        }
+    }
 };
diff --git a/core/module_util.js b/core/module_util.js
index 3bfd88d2..26a1ec53 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -18,93 +18,93 @@ exports.loadModulesForCategory	= loadModulesForCategory;
 exports.getModulePaths			= getModulePaths;
 
 function loadModuleEx(options, cb) {
-	assert(_.isObject(options));
-	assert(_.isString(options.name));
-	assert(_.isString(options.path));
+    assert(_.isObject(options));
+    assert(_.isString(options.name));
+    assert(_.isString(options.path));
 
-	const modConfig = _.isObject(Config[options.category]) ? Config[options.category][options.name] : null;
+    const modConfig = _.isObject(Config[options.category]) ? Config[options.category][options.name] : null;
 
-	if(_.isObject(modConfig) && false === modConfig.enabled) {
-		const err	= new Error(`Module "${options.name}" is disabled`);
-		err.code	= 'EENIGMODDISABLED';
-		return cb(err);
-	}
+    if(_.isObject(modConfig) && false === modConfig.enabled) {
+        const err	= new Error(`Module "${options.name}" is disabled`);
+        err.code	= 'EENIGMODDISABLED';
+        return cb(err);
+    }
 
-	//
-	//	Modules are allowed to live in /path/to/<moduleName>/<moduleName>.js or
-	//	simply in /path/to/<moduleName>.js. This allows for more advanced modules
-	//	to have their own containing folder, package.json & dependencies, etc.
-	//
-	let mod;
-	let modPath = paths.join(options.path, `${options.name}.js`);	//	general case first
-	try {
-		mod = require(modPath);
-	} catch(e) {
-		if('MODULE_NOT_FOUND' === e.code) {
-			modPath = paths.join(options.path, options.name, `${options.name}.js`);
-			try {
-				mod = require(modPath);
-			} catch(e) {
-				return cb(e);
-			}
-		} else {
-			return cb(e);
-		}
-	}
+    //
+    //	Modules are allowed to live in /path/to/<moduleName>/<moduleName>.js or
+    //	simply in /path/to/<moduleName>.js. This allows for more advanced modules
+    //	to have their own containing folder, package.json & dependencies, etc.
+    //
+    let mod;
+    let modPath = paths.join(options.path, `${options.name}.js`);	//	general case first
+    try {
+        mod = require(modPath);
+    } catch(e) {
+        if('MODULE_NOT_FOUND' === e.code) {
+            modPath = paths.join(options.path, options.name, `${options.name}.js`);
+            try {
+                mod = require(modPath);
+            } catch(e) {
+                return cb(e);
+            }
+        } else {
+            return cb(e);
+        }
+    }
 
-	if(!_.isObject(mod.moduleInfo)) {
-		return cb(new Error('Module is missing "moduleInfo" section'));
-	}
+    if(!_.isObject(mod.moduleInfo)) {
+        return cb(new Error('Module is missing "moduleInfo" section'));
+    }
 
-	if(!_.isFunction(mod.getModule)) {
-		return cb(new Error('Invalid or missing "getModule" method for module!'));
-	}
+    if(!_.isFunction(mod.getModule)) {
+        return cb(new Error('Invalid or missing "getModule" method for module!'));
+    }
 
-	return cb(null, mod);
+    return cb(null, mod);
 }
 
 function loadModule(name, category, cb) {
-	const path = Config().paths[category];
+    const path = Config().paths[category];
 
-	if(!_.isString(path)) {
-		return cb(new Error(`Not sure where to look for "${name}" of category "${category}"`));
-	}
+    if(!_.isString(path)) {
+        return cb(new Error(`Not sure where to look for "${name}" of category "${category}"`));
+    }
 
-	loadModuleEx( { name : name, path : path, category : category }, function loaded(err, mod) {
-		return cb(err, mod);
-	});
+    loadModuleEx( { name : name, path : path, category : category }, function loaded(err, mod) {
+        return cb(err, mod);
+    });
 }
 
 function loadModulesForCategory(category, iterator, complete) {
 
-	fs.readdir(Config().paths[category], (err, files) => {
-		if(err) {
-			return iterator(err);
-		}
+    fs.readdir(Config().paths[category], (err, files) => {
+        if(err) {
+            return iterator(err);
+        }
 
-		const jsModules = files.filter(file => {
-			return '.js' === paths.extname(file);
-		});
+        const jsModules = files.filter(file => {
+            return '.js' === paths.extname(file);
+        });
 
-		async.each(jsModules, (file, next) => {
-			loadModule(paths.basename(file, '.js'), category, (err, mod) => {
-				iterator(err, mod);
-				return next();
-			});
-		}, err => {
-			if(complete) {
-				return complete(err);
-			}
-		});
-	});
+        async.each(jsModules, (file, next) => {
+            loadModule(paths.basename(file, '.js'), category, (err, mod) => {
+                iterator(err, mod);
+                return next();
+            });
+        }, err => {
+            if(complete) {
+                return complete(err);
+            }
+        });
+    });
 }
 
 function getModulePaths() {
-	const config = Config();
-	return [
-		config.paths.mods,
-		config.paths.loginServers,
-		config.paths.contentServers,
-		config.paths.scannerTossers,
-	];
+    const config = Config();
+    return [
+        config.paths.mods,
+        config.paths.loginServers,
+        config.paths.contentServers,
+        config.paths.scannerTossers,
+    ];
 }
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 8238e4b6..2d61044d 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -15,9 +15,9 @@ const async				= require('async');
 const _					= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Message Area List',
-	desc	: 'Module for listing / choosing message areas',
-	author	: 'NuSkooler',
+    name	: 'Message Area List',
+    desc	: 'Module for listing / choosing message areas',
+    author	: 'NuSkooler',
 };
 
 /*
@@ -35,73 +35,73 @@ exports.moduleInfo = {
 */
 
 const MciViewIds = {
-	AreaList		: 1,
-	SelAreaInfo1	: 2,
-	SelAreaInfo2	: 3,
+    AreaList		: 1,
+    SelAreaInfo1	: 2,
+    SelAreaInfo2	: 3,
 };
 
 exports.getModule = class MessageAreaListModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
-			this.client.user.properties.message_conf_tag,
-			{ client : this.client }
-		);
+        this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
+            this.client.user.properties.message_conf_tag,
+            { client : this.client }
+        );
 
-		const self = this;
-		this.menuMethods = {
-			changeArea : function(formData, extraArgs, cb) {
-				if(1 === formData.submitId) {
-					let area 		= self.messageAreas[formData.value.area];
-					const areaTag	=  area.areaTag;
-					area = area.area;	//	what we want is actually embedded
+        const self = this;
+        this.menuMethods = {
+            changeArea : function(formData, extraArgs, cb) {
+                if(1 === formData.submitId) {
+                    let area 		= self.messageAreas[formData.value.area];
+                    const areaTag	=  area.areaTag;
+                    area = area.area;	//	what we want is actually embedded
 
-					messageArea.changeMessageArea(self.client, areaTag, err => {
-						if(err) {
-							self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
+                    messageArea.changeMessageArea(self.client, areaTag, err => {
+                        if(err) {
+                            self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
 
-							self.prevMenuOnTimeout(1000, cb);
-						} else {
-							if(_.isString(area.art)) {
-								const dispOptions = {
-									client	: self.client,
-									name	: area.art,
-								};
+                            self.prevMenuOnTimeout(1000, cb);
+                        } else {
+                            if(_.isString(area.art)) {
+                                const dispOptions = {
+                                    client	: self.client,
+                                    name	: area.art,
+                                };
 
-								self.client.term.rawWrite(resetScreen());
+                                self.client.term.rawWrite(resetScreen());
 
-								displayThemeArt(dispOptions, () => {
-									//	pause by default, unless explicitly told not to
-									if(_.has(area, 'options.pause') && false === area.options.pause) {
-										return self.prevMenuOnTimeout(1000, cb);
-									} else {
-										self.pausePrompt( () => {
-											return self.prevMenu(cb);
-										});
-									}
-								});
-							} else {
-								return self.prevMenu(cb);
-							}
-						}
-					});
-				} else {
-					return cb(null);
-				}
-			}
-		};
-	}
+                                displayThemeArt(dispOptions, () => {
+                                    //	pause by default, unless explicitly told not to
+                                    if(_.has(area, 'options.pause') && false === area.options.pause) {
+                                        return self.prevMenuOnTimeout(1000, cb);
+                                    } else {
+                                        self.pausePrompt( () => {
+                                            return self.prevMenu(cb);
+                                        });
+                                    }
+                                });
+                            } else {
+                                return self.prevMenu(cb);
+                            }
+                        }
+                    });
+                } else {
+                    return cb(null);
+                }
+            }
+        };
+    }
 
-	prevMenuOnTimeout(timeout, cb) {
-		setTimeout( () => {
-			return this.prevMenu(cb);
-		}, timeout);
-	}
+    prevMenuOnTimeout(timeout, cb) {
+        setTimeout( () => {
+            return this.prevMenu(cb);
+        }, timeout);
+    }
 
-	//	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
-	updateGeneralAreaInfoViews(areaIndex) {
-		/*
+    //	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
+    updateGeneralAreaInfoViews(areaIndex) {
+        /*
 		const areaInfo = self.messageAreas[areaIndex];
 
 		[ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
@@ -111,71 +111,71 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
 			}
 		});
 		*/
-	}
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
+            const self	= this;
+            const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu	: self,
-							mciMap		: mciData.menu,
-							formId		: 0,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu	: self,
+                            mciMap		: mciData.menu,
+                            formId		: 0,
+                        };
 
-						vc.loadFromMenuConfig(loadOpts, function startingViewReady(err) {
-							callback(err);
-						});
-					},
-					function populateAreaListView(callback) {
-						const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
-						const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                        vc.loadFromMenuConfig(loadOpts, function startingViewReady(err) {
+                            callback(err);
+                        });
+                    },
+                    function populateAreaListView(callback) {
+                        const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
+                        const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
 
-						const areaListView = vc.getView(MciViewIds.AreaList);
-						if(!areaListView) {
-							return callback(Errors.MissingMci('A MenuView compatible MCI code is required'));
-						}
-						let i = 1;
-						areaListView.setItems(_.map(self.messageAreas, v => {
-							return stringFormat(listFormat, {
-								index   : i++,
-								areaTag : v.area.areaTag,
-								name    : v.area.name,
-								desc    : v.area.desc,
-							});
-						}));
+                        const areaListView = vc.getView(MciViewIds.AreaList);
+                        if(!areaListView) {
+                            return callback(Errors.MissingMci('A MenuView compatible MCI code is required'));
+                        }
+                        let i = 1;
+                        areaListView.setItems(_.map(self.messageAreas, v => {
+                            return stringFormat(listFormat, {
+                                index   : i++,
+                                areaTag : v.area.areaTag,
+                                name    : v.area.name,
+                                desc    : v.area.desc,
+                            });
+                        }));
 
-						i = 1;
-						areaListView.setFocusItems(_.map(self.messageAreas, v => {
-							return stringFormat(focusListFormat, {
-								index   : i++,
-								areaTag : v.area.areaTag,
-								name    : v.area.name,
-								desc    : v.area.desc,
-							});
-						}));
+                        i = 1;
+                        areaListView.setFocusItems(_.map(self.messageAreas, v => {
+                            return stringFormat(focusListFormat, {
+                                index   : i++,
+                                areaTag : v.area.areaTag,
+                                name    : v.area.name,
+                                desc    : v.area.desc,
+                            });
+                        }));
 
-						areaListView.on('index update', areaIndex => {
-							self.updateGeneralAreaInfoViews(areaIndex);
-						});
+                        areaListView.on('index update', areaIndex => {
+                            self.updateGeneralAreaInfoViews(areaIndex);
+                        });
 
-						areaListView.redraw();
+                        areaListView.redraw();
 
-						callback(null);
-					}
-				],
-				function complete(err) {
-					return cb(err);
-				}
-			);
-		});
-	}
+                        callback(null);
+                    }
+                ],
+                function complete(err) {
+                    return cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 3ffef698..8c2136c7 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -8,60 +8,60 @@ const _							= require('lodash');
 const async					 	= require('async');
 
 exports.moduleInfo = {
-	name	: 'Message Area Post',
-	desc	: 'Module for posting a new message to an area',
-	author	: 'NuSkooler',
+    name	: 'Message Area Post',
+    desc	: 'Module for posting a new message to an area',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self = this;
+        const self = this;
 
-		//	we're posting, so always start with 'edit' mode
-		this.editorMode = 'edit';
+        //	we're posting, so always start with 'edit' mode
+        this.editorMode = 'edit';
 
-		this.menuMethods.editModeMenuSave = function(formData, extraArgs, cb) {
+        this.menuMethods.editModeMenuSave = function(formData, extraArgs, cb) {
 
-			var msg;
-			async.series(
-				[
-					function getMessageObject(callback) {
-						self.getMessage(function gotMsg(err, msgObj) {
-							msg = msgObj;
-							return callback(err);
-						});
-					},
-					function saveMessage(callback) {
-						return persistMessage(msg, callback);
-					},
-					function updateStats(callback) {
-						self.updateUserStats(callback);
-					}
-				],
-				function complete(err) {
-					if(err) {
-						//	:TODO:... sooooo now what?
-					} else {
-						//	note: not logging 'from' here as it's part of client.log.xxxx()
-						self.client.log.info(
-							{ to : msg.toUserName, subject : msg.subject, uuid : msg.uuid },
-							'Message persisted'
-						);
-					}
+            var msg;
+            async.series(
+                [
+                    function getMessageObject(callback) {
+                        self.getMessage(function gotMsg(err, msgObj) {
+                            msg = msgObj;
+                            return callback(err);
+                        });
+                    },
+                    function saveMessage(callback) {
+                        return persistMessage(msg, callback);
+                    },
+                    function updateStats(callback) {
+                        self.updateUserStats(callback);
+                    }
+                ],
+                function complete(err) {
+                    if(err) {
+                        //	:TODO:... sooooo now what?
+                    } else {
+                        //	note: not logging 'from' here as it's part of client.log.xxxx()
+                        self.client.log.info(
+                            { to : msg.toUserName, subject : msg.subject, uuid : msg.uuid },
+                            'Message persisted'
+                        );
+                    }
 
-					return self.nextMenu(cb);
-				}
-			);
-		};
-	}
+                    return self.nextMenu(cb);
+                }
+            );
+        };
+    }
 
-	enter() {
-		if(_.isString(this.client.user.properties.message_area_tag) && !_.isString(this.messageAreaTag)) {
-			this.messageAreaTag = this.client.user.properties.message_area_tag;
-		}
+    enter() {
+        if(_.isString(this.client.user.properties.message_area_tag) && !_.isString(this.messageAreaTag)) {
+            this.messageAreaTag = this.client.user.properties.message_area_tag;
+        }
 
-		super.enter();
-	}
+        super.enter();
+    }
 };
\ No newline at end of file
diff --git a/core/msg_area_reply_fse.js b/core/msg_area_reply_fse.js
index 24ee5377..83cb99c7 100644
--- a/core/msg_area_reply_fse.js
+++ b/core/msg_area_reply_fse.js
@@ -6,13 +6,13 @@ var FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
 exports.getModule				= AreaReplyFSEModule;
 
 exports.moduleInfo = {
-	name	: 'Message Area Reply',
-	desc	: 'Module for replying to an area message',
-	author	: 'NuSkooler',
+    name	: 'Message Area Reply',
+    desc	: 'Module for replying to an area message',
+    author	: 'NuSkooler',
 };
 
 function AreaReplyFSEModule(options) {
-	FullScreenEditorModule.call(this, options);
+    FullScreenEditorModule.call(this, options);
 }
 
 require('util').inherits(AreaReplyFSEModule, FullScreenEditorModule);
diff --git a/core/msg_area_view_fse.js b/core/msg_area_view_fse.js
index 7452d9d2..af0cbb78 100644
--- a/core/msg_area_view_fse.js
+++ b/core/msg_area_view_fse.js
@@ -9,137 +9,137 @@ const Message						= require('./message.js');
 const _							= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Message Area View',
-	desc	: 'Module for viewing an area message',
-	author	: 'NuSkooler',
+    name	: 'Message Area View',
+    desc	: 'Module for viewing an area message',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.editorType			= 'area';
-		this.editorMode			= 'view';
+        this.editorType			= 'area';
+        this.editorMode			= 'view';
 
-		if(_.isObject(options.extraArgs)) {
-			this.messageList			= options.extraArgs.messageList;
-			this.messageIndex			= options.extraArgs.messageIndex;
-			this.lastMessageNextExit	= options.extraArgs.lastMessageNextExit;
-		}
+        if(_.isObject(options.extraArgs)) {
+            this.messageList			= options.extraArgs.messageList;
+            this.messageIndex			= options.extraArgs.messageIndex;
+            this.lastMessageNextExit	= options.extraArgs.lastMessageNextExit;
+        }
 
-		this.messageList	= this.messageList || [];
-		this.messageIndex	= this.messageIndex || 0;
-		this.messageTotal	= this.messageList.length;
+        this.messageList	= this.messageList || [];
+        this.messageIndex	= this.messageIndex || 0;
+        this.messageTotal	= this.messageList.length;
 
-		if(this.messageList.length > 0) {
-			this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
-		}
+        if(this.messageList.length > 0) {
+            this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+        }
 
-		const self = this;
+        const self = this;
 
-		//	assign *additional* menuMethods
-		Object.assign(this.menuMethods, {
-			nextMessage : (formData, extraArgs, cb) => {
-				if(self.messageIndex + 1 < self.messageList.length) {
-					self.messageIndex++;
+        //	assign *additional* menuMethods
+        Object.assign(this.menuMethods, {
+            nextMessage : (formData, extraArgs, cb) => {
+                if(self.messageIndex + 1 < self.messageList.length) {
+                    self.messageIndex++;
 
-					this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
-					this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+                    this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
 
-					return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
-				}
+                    return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
+                }
 
-				//	auto-exit if no more to go?
-				if(self.lastMessageNextExit) {
-					self.lastMessageReached = true;
-					return self.prevMenu(cb);
-				}
+                //	auto-exit if no more to go?
+                if(self.lastMessageNextExit) {
+                    self.lastMessageReached = true;
+                    return self.prevMenu(cb);
+                }
 
-				return cb(null);
-			},
+                return cb(null);
+            },
 
-			prevMessage : (formData, extraArgs, cb) => {
-				if(self.messageIndex > 0) {
-					self.messageIndex--;
+            prevMessage : (formData, extraArgs, cb) => {
+                if(self.messageIndex > 0) {
+                    self.messageIndex--;
 
-					this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
-					this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+                    this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
+                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
 
-					return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
-				}
+                    return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
+                }
 
-				return cb(null);
-			},
+                return cb(null);
+            },
 
-			movementKeyPressed : (formData, extraArgs, cb) => {
-				const bodyView = self.viewControllers.body.getView(1);	//	:TODO: use const here vs magic #
+            movementKeyPressed : (formData, extraArgs, cb) => {
+                const bodyView = self.viewControllers.body.getView(1);	//	:TODO: use const here vs magic #
 
-				//	:TODO: Create methods for up/down vs using keyPressXXXXX
-				switch(formData.key.name) {
-					case 'down arrow'	: bodyView.scrollDocumentUp(); break;
-					case 'up arrow'		: bodyView.scrollDocumentDown(); break;
-					case 'page up'		: bodyView.keyPressPageUp(); break;
-					case 'page down'	: bodyView.keyPressPageDown(); break;
-				}
+                //	:TODO: Create methods for up/down vs using keyPressXXXXX
+                switch(formData.key.name) {
+                    case 'down arrow'	: bodyView.scrollDocumentUp(); break;
+                    case 'up arrow'		: bodyView.scrollDocumentDown(); break;
+                    case 'page up'		: bodyView.keyPressPageUp(); break;
+                    case 'page down'	: bodyView.keyPressPageDown(); break;
+                }
 
-				//	:TODO: need to stop down/page down if doing so would push the last
-				//	visible page off the screen at all .... this should be handled by MLTEV though...
+                //	:TODO: need to stop down/page down if doing so would push the last
+                //	visible page off the screen at all .... this should be handled by MLTEV though...
 
-				return cb(null);
-			},
+                return cb(null);
+            },
 
-			replyMessage : (formData, extraArgs, cb) => {
-				if(_.isString(extraArgs.menu)) {
-					const modOpts = {
-						extraArgs : {
-							messageAreaTag		: self.messageAreaTag,
-							replyToMessage		: self.message,
-						}
-					};
+            replyMessage : (formData, extraArgs, cb) => {
+                if(_.isString(extraArgs.menu)) {
+                    const modOpts = {
+                        extraArgs : {
+                            messageAreaTag		: self.messageAreaTag,
+                            replyToMessage		: self.message,
+                        }
+                    };
 
-					return self.gotoMenu(extraArgs.menu, modOpts, cb);
-				}
+                    return self.gotoMenu(extraArgs.menu, modOpts, cb);
+                }
 
-				self.client.log(extraArgs, 'Missing extraArgs.menu');
-				return cb(null);
-			}
-		});
-	}
+                self.client.log(extraArgs, 'Missing extraArgs.menu');
+                return cb(null);
+            }
+        });
+    }
 
 
-	loadMessageByUuid(uuid, cb) {
-		const msg = new Message();
-		msg.load( { uuid : uuid, user : this.client.user }, () => {
-			this.setMessage(msg);
+    loadMessageByUuid(uuid, cb) {
+        const msg = new Message();
+        msg.load( { uuid : uuid, user : this.client.user }, () => {
+            this.setMessage(msg);
 
-			if(cb) {
-				return cb(null);
-			}
-		});
-	}
+            if(cb) {
+                return cb(null);
+            }
+        });
+    }
 
-	finishedLoading() {
-		this.loadMessageByUuid(this.messageList[this.messageIndex].messageUuid);
-	}
+    finishedLoading() {
+        this.loadMessageByUuid(this.messageList[this.messageIndex].messageUuid);
+    }
 
-	getSaveState() {
-		return {
-			messageList		: this.messageList,
-			messageIndex	: this.messageIndex,
-			messageTotal	: this.messageList.length,
-		};
-	}
+    getSaveState() {
+        return {
+            messageList		: this.messageList,
+            messageIndex	: this.messageIndex,
+            messageTotal	: this.messageList.length,
+        };
+    }
 
-	restoreSavedState(savedState) {
-		this.messageList	= savedState.messageList;
-		this.messageIndex	= savedState.messageIndex;
-		this.messageTotal	= savedState.messageTotal;
-	}
+    restoreSavedState(savedState) {
+        this.messageList	= savedState.messageList;
+        this.messageIndex	= savedState.messageIndex;
+        this.messageTotal	= savedState.messageTotal;
+    }
 
-	getMenuResult() {
-		return {
-			messageIndex 		: this.messageIndex,
-			lastMessageReached	: this.lastMessageReached,
-		};
-	}
+    getMenuResult() {
+        return {
+            messageIndex 		: this.messageIndex,
+            lastMessageReached	: this.lastMessageReached,
+        };
+    }
 };
diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index 43e57820..0876f89a 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -14,135 +14,135 @@ const async				= require('async');
 const _					= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Message Conference List',
-	desc	: 'Module for listing / choosing message conferences',
-	author	: 'NuSkooler',
+    name	: 'Message Conference List',
+    desc	: 'Module for listing / choosing message conferences',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	ConfList	: 1,
+    ConfList	: 1,
 
-	//	:TODO:
-	//	# areas in conf .... see Obv/2, iNiQ, ...
-	//
+    //	:TODO:
+    //	# areas in conf .... see Obv/2, iNiQ, ...
+    //
 };
 
 exports.getModule = class MessageConfListModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.messageConfs = messageArea.getSortedAvailMessageConferences(this.client);
-		const self = this;
+        this.messageConfs = messageArea.getSortedAvailMessageConferences(this.client);
+        const self = this;
 
-		this.menuMethods = {
-			changeConference : function(formData, extraArgs, cb) {
-				if(1 === formData.submitId) {
-					let conf		= self.messageConfs[formData.value.conf];
-					const confTag	= conf.confTag;
-					conf = conf.conf;	//	what we want is embedded
+        this.menuMethods = {
+            changeConference : function(formData, extraArgs, cb) {
+                if(1 === formData.submitId) {
+                    let conf		= self.messageConfs[formData.value.conf];
+                    const confTag	= conf.confTag;
+                    conf = conf.conf;	//	what we want is embedded
 
-					messageArea.changeMessageConference(self.client, confTag, err => {
-						if(err) {
-							self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
+                    messageArea.changeMessageConference(self.client, confTag, err => {
+                        if(err) {
+                            self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
 
-							setTimeout( () => {
-								return self.prevMenu(cb);
-							}, 1000);
-						} else {
-							if(_.isString(conf.art)) {
-								const dispOptions = {
-									client	: self.client,
-									name	: conf.art,
-								};
+                            setTimeout( () => {
+                                return self.prevMenu(cb);
+                            }, 1000);
+                        } else {
+                            if(_.isString(conf.art)) {
+                                const dispOptions = {
+                                    client	: self.client,
+                                    name	: conf.art,
+                                };
 
-								self.client.term.rawWrite(resetScreen());
+                                self.client.term.rawWrite(resetScreen());
 
-								displayThemeArt(dispOptions, () => {
-									//	pause by default, unless explicitly told not to
-									if(_.has(conf, 'options.pause') && false === conf.options.pause) {
-										return self.prevMenuOnTimeout(1000, cb);
-									} else {
-										self.pausePrompt( () => {
-											return self.prevMenu(cb);
-										});
-									}
-								});
-							} else {
-								return self.prevMenu(cb);
-							}
-						}
-					});
-				} else {
-					return cb(null);
-				}
-			}
-		};
-	}
+                                displayThemeArt(dispOptions, () => {
+                                    //	pause by default, unless explicitly told not to
+                                    if(_.has(conf, 'options.pause') && false === conf.options.pause) {
+                                        return self.prevMenuOnTimeout(1000, cb);
+                                    } else {
+                                        self.pausePrompt( () => {
+                                            return self.prevMenu(cb);
+                                        });
+                                    }
+                                });
+                            } else {
+                                return self.prevMenu(cb);
+                            }
+                        }
+                    });
+                } else {
+                    return cb(null);
+                }
+            }
+        };
+    }
 
-	prevMenuOnTimeout(timeout, cb) {
-		setTimeout( () => {
-			return this.prevMenu(cb);
-		}, timeout);
-	}
+    prevMenuOnTimeout(timeout, cb) {
+        setTimeout( () => {
+            return this.prevMenu(cb);
+        }, timeout);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
+            const self	= this;
+            const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						let loadOpts = {
-							callingMenu	: self,
-							mciMap		: mciData.menu,
-							formId		: 0,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        let loadOpts = {
+                            callingMenu	: self,
+                            mciMap		: mciData.menu,
+                            formId		: 0,
+                        };
 
-						vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function populateConfListView(callback) {
-						const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
-						const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                        vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function populateConfListView(callback) {
+                        const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
+                        const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
 
-						const confListView = vc.getView(MciViewIds.ConfList);
-						let i = 1;
-						confListView.setItems(_.map(self.messageConfs, v => {
-							return stringFormat(listFormat, {
-								index   : i++,
-								confTag : v.conf.confTag,
-								name    : v.conf.name,
-								desc    : v.conf.desc,
-							});
-						}));
+                        const confListView = vc.getView(MciViewIds.ConfList);
+                        let i = 1;
+                        confListView.setItems(_.map(self.messageConfs, v => {
+                            return stringFormat(listFormat, {
+                                index   : i++,
+                                confTag : v.conf.confTag,
+                                name    : v.conf.name,
+                                desc    : v.conf.desc,
+                            });
+                        }));
 
-						i = 1;
-						confListView.setFocusItems(_.map(self.messageConfs, v => {
-							return stringFormat(focusListFormat, {
-								index   : i++,
-								confTag : v.conf.confTag,
-								name    : v.conf.name,
-								desc    : v.conf.desc,
-							});
-						}));
+                        i = 1;
+                        confListView.setFocusItems(_.map(self.messageConfs, v => {
+                            return stringFormat(focusListFormat, {
+                                index   : i++,
+                                confTag : v.conf.confTag,
+                                name    : v.conf.name,
+                                desc    : v.conf.desc,
+                            });
+                        }));
 
-						confListView.redraw();
+                        confListView.redraw();
 
-						callback(null);
-					},
-					function populateTextViews(callback) {
-						//	:TODO: populate other avail MCI, e.g. current conf name
-						callback(null);
-					}
-				],
-				function complete(err) {
-					cb(err);
-				}
-			);
-		});
-	}
+                        callback(null);
+                    },
+                    function populateTextViews(callback) {
+                        //	:TODO: populate other avail MCI, e.g. current conf name
+                        callback(null);
+                    }
+                ],
+                function complete(err) {
+                    cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/msg_list.js b/core/msg_list.js
index 701542d6..5c8624ab 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -30,229 +30,229 @@ const moment			= require('moment');
 */
 
 exports.moduleInfo = {
-	name	: 'Message List',
-	desc	: 'Module for listing/browsing available messages',
-	author	: 'NuSkooler',
+    name	: 'Message List',
+    desc	: 'Module for listing/browsing available messages',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	msgList			: 1,	//	VM1
-	msgInfo1		: 2,	//	TL2
+    msgList			: 1,	//	VM1
+    msgInfo1		: 2,	//	TL2
 };
 
 exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(MenuModule) {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		//	:TODO: consider this pattern in base MenuModule - clean up code all over
-		this.config	= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+        //	:TODO: consider this pattern in base MenuModule - clean up code all over
+        this.config	= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
-		this.lastMessageReachedExit = _.get(options, 'lastMenuResult.lastMessageReached', false);
+        this.lastMessageReachedExit = _.get(options, 'lastMenuResult.lastMessageReached', false);
 
-		this.menuMethods = {
-			selectMessage : (formData, extraArgs, cb) => {
-				if(MciViewIds.msgList === formData.submitId) {
-					this.initialFocusIndex = formData.value.message;
+        this.menuMethods = {
+            selectMessage : (formData, extraArgs, cb) => {
+                if(MciViewIds.msgList === formData.submitId) {
+                    this.initialFocusIndex = formData.value.message;
 
-					const modOpts = {
-						extraArgs 	: {
-							messageAreaTag		: this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
-							messageList			: this.config.messageList,
-							messageIndex		: formData.value.message,
-							lastMessageNextExit	: true,	
-						}
-					};
+                    const modOpts = {
+                        extraArgs 	: {
+                            messageAreaTag		: this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
+                            messageList			: this.config.messageList,
+                            messageIndex		: formData.value.message,
+                            lastMessageNextExit	: true,
+                        }
+                    };
 
-					if(_.isBoolean(this.config.noUpdateLastReadId)) {
-						modOpts.extraArgs.noUpdateLastReadId = this.config.noUpdateLastReadId;
-					}
+                    if(_.isBoolean(this.config.noUpdateLastReadId)) {
+                        modOpts.extraArgs.noUpdateLastReadId = this.config.noUpdateLastReadId;
+                    }
 
-					//
-					//	Provide a serializer so we don't dump *huge* bits of information to the log
-					//	due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
-					//
-					const self = this;
-					modOpts.extraArgs.toJSON = function() {
-						const logMsgList = (self.config.messageList.length <= 4) ?
-							self.config.messageList :
-							self.config.messageList.slice(0, 2).concat(self.config.messageList.slice(-2));
+                    //
+                    //	Provide a serializer so we don't dump *huge* bits of information to the log
+                    //	due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
+                    //
+                    const self = this;
+                    modOpts.extraArgs.toJSON = function() {
+                        const logMsgList = (self.config.messageList.length <= 4) ?
+                            self.config.messageList :
+                            self.config.messageList.slice(0, 2).concat(self.config.messageList.slice(-2));
 
-						return {
-							//	note |this| is scope of toJSON()!
-							messageAreaTag		: this.messageAreaTag,
-							apprevMessageList	: logMsgList,
-							messageCount		: this.messageList.length,
-							messageIndex		: this.messageIndex,
-						};
-					};
+                        return {
+                            //	note |this| is scope of toJSON()!
+                            messageAreaTag		: this.messageAreaTag,
+                            apprevMessageList	: logMsgList,
+                            messageCount		: this.messageList.length,
+                            messageIndex		: this.messageIndex,
+                        };
+                    };
 
-					return this.gotoMenu(this.config.menuViewPost || 'messageAreaViewPost', modOpts, cb);
-				} else {
-					return cb(null);
-				}
-			},
+                    return this.gotoMenu(this.config.menuViewPost || 'messageAreaViewPost', modOpts, cb);
+                } else {
+                    return cb(null);
+                }
+            },
 
-			fullExit : (formData, extraArgs, cb) => {
-				this.menuResult = { fullExit : true };
-				return this.prevMenu(cb);
-			}
-		};
-	}
+            fullExit : (formData, extraArgs, cb) => {
+                this.menuResult = { fullExit : true };
+                return this.prevMenu(cb);
+            }
+        };
+    }
 
-	getSelectedAreaTag(listIndex) {
-		return this.config.messageList[listIndex].areaTag || this.config.messageAreaTag;
-	}
+    getSelectedAreaTag(listIndex) {
+        return this.config.messageList[listIndex].areaTag || this.config.messageAreaTag;
+    }
 
-	enter() {
-		if(this.lastMessageReachedExit) {
-			return this.prevMenu();
-		}
+    enter() {
+        if(this.lastMessageReachedExit) {
+            return this.prevMenu();
+        }
 
-		super.enter();
+        super.enter();
 
-		//
-		//	Config can specify |messageAreaTag| else it comes from
-		//	the user's current area. If |messageList| is supplied,
-		//	each item is expected to contain |areaTag|, so we use that
-		//	instead in those cases.
-		//
-		if(!Array.isArray(this.config.messageList)) {
-			if(this.config.messageAreaTag) {
-				this.tempMessageConfAndAreaSwitch(this.config.messageAreaTag);
-			} else {
-				this.config.messageAreaTag = this.client.user.properties.message_area_tag;
-			}
-		}
-	}
+        //
+        //	Config can specify |messageAreaTag| else it comes from
+        //	the user's current area. If |messageList| is supplied,
+        //	each item is expected to contain |areaTag|, so we use that
+        //	instead in those cases.
+        //
+        if(!Array.isArray(this.config.messageList)) {
+            if(this.config.messageAreaTag) {
+                this.tempMessageConfAndAreaSwitch(this.config.messageAreaTag);
+            } else {
+                this.config.messageAreaTag = this.client.user.properties.message_area_tag;
+            }
+        }
+    }
 
-	leave() {
-		this.tempMessageConfAndAreaRestore();
-		super.leave();
-	}
+    leave() {
+        this.tempMessageConfAndAreaRestore();
+        super.leave();
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
-			let configProvidedMessageList = false;
+            const self	= this;
+            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            let configProvidedMessageList = false;
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function fetchMessagesInArea(callback) {
-						//
-						//	Config can supply messages else we'll need to populate the list now
-						//
-						if(_.isArray(self.config.messageList)) {
-							configProvidedMessageList = true;
-							return callback(0 === self.config.messageList.length ? new Error('No messages in area') : null);
-						}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function fetchMessagesInArea(callback) {
+                        //
+                        //	Config can supply messages else we'll need to populate the list now
+                        //
+                        if(_.isArray(self.config.messageList)) {
+                            configProvidedMessageList = true;
+                            return callback(0 === self.config.messageList.length ? new Error('No messages in area') : null);
+                        }
 
-						messageArea.getMessageListForArea(self.client, self.config.messageAreaTag, function msgs(err, msgList) {
-							if(!msgList || 0 === msgList.length) {
-								return callback(new Error('No messages in area'));
-							}
+                        messageArea.getMessageListForArea(self.client, self.config.messageAreaTag, function msgs(err, msgList) {
+                            if(!msgList || 0 === msgList.length) {
+                                return callback(new Error('No messages in area'));
+                            }
 
-							self.config.messageList = msgList;
-							return callback(err);
-						});
-					},
-					function getLastReadMesageId(callback) {
-						//	messageList entries can contain |isNew| if they want to be considered new
-						if(configProvidedMessageList) {
-							self.lastReadId = 0;
-							return callback(null);
-						}
+                            self.config.messageList = msgList;
+                            return callback(err);
+                        });
+                    },
+                    function getLastReadMesageId(callback) {
+                        //	messageList entries can contain |isNew| if they want to be considered new
+                        if(configProvidedMessageList) {
+                            self.lastReadId = 0;
+                            return callback(null);
+                        }
 
-						messageArea.getMessageAreaLastReadId(self.client.user.userId, self.config.messageAreaTag, function lastRead(err, lastReadId) {
-							self.lastReadId = lastReadId || 0;
-							return callback(null);	//	ignore any errors, e.g. missing value
-						});
-					},
-					function updateMessageListObjects(callback) {
-						const dateTimeFormat	= self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
-						const newIndicator		= self.menuConfig.config.newIndicator || '*';
-						const regIndicator		= new Array(newIndicator.length + 1).join(' ');	//	fill with space to avoid draw issues
+                        messageArea.getMessageAreaLastReadId(self.client.user.userId, self.config.messageAreaTag, function lastRead(err, lastReadId) {
+                            self.lastReadId = lastReadId || 0;
+                            return callback(null);	//	ignore any errors, e.g. missing value
+                        });
+                    },
+                    function updateMessageListObjects(callback) {
+                        const dateTimeFormat	= self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
+                        const newIndicator		= self.menuConfig.config.newIndicator || '*';
+                        const regIndicator		= new Array(newIndicator.length + 1).join(' ');	//	fill with space to avoid draw issues
 
-						let msgNum = 1;
-						self.config.messageList.forEach( (listItem, index) => {							
-							listItem.msgNum			= msgNum++;
-							listItem.ts				= moment(listItem.modTimestamp).format(dateTimeFormat);
-							const isNew				= _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
-							listItem.newIndicator	=  isNew ? newIndicator : regIndicator;
+                        let msgNum = 1;
+                        self.config.messageList.forEach( (listItem, index) => {
+                            listItem.msgNum			= msgNum++;
+                            listItem.ts				= moment(listItem.modTimestamp).format(dateTimeFormat);
+                            const isNew				= _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
+                            listItem.newIndicator	=  isNew ? newIndicator : regIndicator;
 
-							if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
-								self.initialFocusIndex = index;
-							}
+                            if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
+                                self.initialFocusIndex = index;
+                            }
 
-							listItem.text			= `${listItem.msgNum} - ${listItem.subject} from ${listItem.fromUserName}`;	//	default text
-						});
-						return callback(null);
-					},
-					function populateList(callback) {
-						const msgListView			= vc.getView(MciViewIds.msgList);
-						//	:TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
-						const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
+                            listItem.text			= `${listItem.msgNum} - ${listItem.subject} from ${listItem.fromUserName}`;	//	default text
+                        });
+                        return callback(null);
+                    },
+                    function populateList(callback) {
+                        const msgListView			= vc.getView(MciViewIds.msgList);
+                        //	:TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
+                        const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 
-						msgListView.setItems(self.config.messageList);
+                        msgListView.setItems(self.config.messageList);
 
-						msgListView.on('index update', idx => {
-							self.setViewText(
-								'allViews',
-								MciViewIds.msgInfo1,
-								stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.config.messageList.length } ));
-						});
+                        msgListView.on('index update', idx => {
+                            self.setViewText(
+                                'allViews',
+                                MciViewIds.msgInfo1,
+                                stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.config.messageList.length } ));
+                        });
 
-						if(self.initialFocusIndex > 0) {
-							//	note: causes redraw()
-							msgListView.setFocusItemIndex(self.initialFocusIndex);
-						} else {
-							msgListView.redraw();
-						}
+                        if(self.initialFocusIndex > 0) {
+                            //	note: causes redraw()
+                            msgListView.setFocusItemIndex(self.initialFocusIndex);
+                        } else {
+                            msgListView.redraw();
+                        }
 
-						return callback(null);
-					},
-					function drawOtherViews(callback) {
-						const messageInfo1Format = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
-						self.setViewText(
-							'allViews',
-							MciViewIds.msgInfo1,
-							stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.config.messageList.length } ));
-						return callback(null);
-					},
-				],
-				err => {
-					if(err) {
-						self.client.log.error( { error : err.message }, 'Error loading message list');
-					}
-					return cb(err);
-				}
-			);
-		});
-	}
+                        return callback(null);
+                    },
+                    function drawOtherViews(callback) {
+                        const messageInfo1Format = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
+                        self.setViewText(
+                            'allViews',
+                            MciViewIds.msgInfo1,
+                            stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.config.messageList.length } ));
+                        return callback(null);
+                    },
+                ],
+                err => {
+                    if(err) {
+                        self.client.log.error( { error : err.message }, 'Error loading message list');
+                    }
+                    return cb(err);
+                }
+            );
+        });
+    }
 
-	getSaveState() {
-		return { initialFocusIndex : this.initialFocusIndex };
-	}
+    getSaveState() {
+        return { initialFocusIndex : this.initialFocusIndex };
+    }
 
-	restoreSavedState(savedState) {
-		if(savedState) {
-			this.initialFocusIndex = savedState.initialFocusIndex;
-		}
-	}
+    restoreSavedState(savedState) {
+        if(savedState) {
+            this.initialFocusIndex = savedState.initialFocusIndex;
+        }
+    }
 
-	getMenuResult() {
-		return this.menuResult;
-	}
+    getMenuResult() {
+        return this.menuResult;
+    }
 };
diff --git a/core/msg_network.js b/core/msg_network.js
index 890d1bcf..721ebba4 100644
--- a/core/msg_network.js
+++ b/core/msg_network.js
@@ -14,53 +14,53 @@ exports.recordMessage	= recordMessage;
 let msgNetworkModules = [];
 
 function startup(cb) {
-	async.series(
-		[
-			function loadModules(callback) {
-				loadModulesForCategory('scannerTossers', (err, module) => {
-					if(!err) {
-						const modInst = new module.getModule();
+    async.series(
+        [
+            function loadModules(callback) {
+                loadModulesForCategory('scannerTossers', (err, module) => {
+                    if(!err) {
+                        const modInst = new module.getModule();
 
-						modInst.startup(err => {
-							if(!err) {
-								msgNetworkModules.push(modInst);
-							}
-						});
-					}
-				}, err => {
-					callback(err);
-				});
-			}
-		],
-		cb
-	);
+                        modInst.startup(err => {
+                            if(!err) {
+                                msgNetworkModules.push(modInst);
+                            }
+                        });
+                    }
+                }, err => {
+                    callback(err);
+                });
+            }
+        ],
+        cb
+    );
 }
 
 function shutdown(cb) {
-	async.each(
-		msgNetworkModules,
-		(msgNetModule, next) => {
-			msgNetModule.shutdown( () => {
-				return next();
-			});
-		},
-		() => {
-			msgNetworkModules = [];
-			return cb(null);
-		}
-	);
+    async.each(
+        msgNetworkModules,
+        (msgNetModule, next) => {
+            msgNetModule.shutdown( () => {
+                return next();
+            });
+        },
+        () => {
+            msgNetworkModules = [];
+            return cb(null);
+        }
+    );
 }
 
 function recordMessage(message, cb) {
-	//
-	//	Give all message network modules (scanner/tossers)
-	//	a chance to do something with |message|. Any or all can
-	//	choose to ignore it.
-	//
-	async.each(msgNetworkModules, (modInst, next) => {
-		modInst.record(message);
-		next();
-	}, err => {
-		cb(err);
-	});
+    //
+    //	Give all message network modules (scanner/tossers)
+    //	a chance to do something with |message|. Any or all can
+    //	choose to ignore it.
+    //
+    async.each(msgNetworkModules, (modInst, next) => {
+        modInst.record(message);
+        next();
+    }, err => {
+        cb(err);
+    });
 }
\ No newline at end of file
diff --git a/core/msg_scan_toss_module.js b/core/msg_scan_toss_module.js
index 9b3598c1..002c2cc3 100644
--- a/core/msg_scan_toss_module.js
+++ b/core/msg_scan_toss_module.js
@@ -7,17 +7,17 @@ var PluginModule				= require('./plugin_module.js').PluginModule;
 exports.MessageScanTossModule	= MessageScanTossModule;
 
 function MessageScanTossModule() {
-	PluginModule.call(this);
+    PluginModule.call(this);
 }
 
 require('util').inherits(MessageScanTossModule, PluginModule);
 
 MessageScanTossModule.prototype.startup = function(cb) {
-	return cb(null);
+    return cb(null);
 };
 
 MessageScanTossModule.prototype.shutdown = function(cb) {
-	return cb(null);
+    return cb(null);
 };
 
 MessageScanTossModule.prototype.record = function(/*message*/) {
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 5757e708..3a7f29d9 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -63,155 +63,155 @@ const _				= require('lodash');
 
 
 const SPECIAL_KEY_MAP_DEFAULT = {
-	'line feed'		: [ 'return' ],
-	exit			: [ 'esc' ],
-	backspace		: [ 'backspace' ],
-	delete			: [ 'delete' ],
-	tab				: [ 'tab' ],
-	up				: [ 'up arrow' ],
-	down			: [ 'down arrow' ],
-	end				: [ 'end' ],
-	home			: [ 'home' ],
-	left			: [ 'left arrow' ],
-	right			: [ 'right arrow' ],
-	'delete line'	: [ 'ctrl + y' ],
-	'page up'		: [ 'page up' ],
-	'page down'		: [ 'page down' ],
-	insert			: [ 'insert', 'ctrl + v' ],
+    'line feed'		: [ 'return' ],
+    exit			: [ 'esc' ],
+    backspace		: [ 'backspace' ],
+    delete			: [ 'delete' ],
+    tab				: [ 'tab' ],
+    up				: [ 'up arrow' ],
+    down			: [ 'down arrow' ],
+    end				: [ 'end' ],
+    home			: [ 'home' ],
+    left			: [ 'left arrow' ],
+    right			: [ 'right arrow' ],
+    'delete line'	: [ 'ctrl + y' ],
+    'page up'		: [ 'page up' ],
+    'page down'		: [ 'page down' ],
+    insert			: [ 'insert', 'ctrl + v' ],
 };
 
 exports.MultiLineEditTextView	= MultiLineEditTextView;
 
 function MultiLineEditTextView(options) {
-	if(!_.isBoolean(options.acceptsFocus)) {
-		options.acceptsFocus = true;
-	}
+    if(!_.isBoolean(options.acceptsFocus)) {
+        options.acceptsFocus = true;
+    }
 
-	if(!_.isBoolean(this.acceptsInput)) {
-		options.acceptsInput = true;
-	}
+    if(!_.isBoolean(this.acceptsInput)) {
+        options.acceptsInput = true;
+    }
 
-	if(!_.isObject(options.specialKeyMap)) {
-		options.specialKeyMap = SPECIAL_KEY_MAP_DEFAULT;
-	}
+    if(!_.isObject(options.specialKeyMap)) {
+        options.specialKeyMap = SPECIAL_KEY_MAP_DEFAULT;
+    }
 
-	View.call(this, options);
+    View.call(this, options);
 
-	var self = this;
+    var self = this;
 
-	//
-	//	ANSI seems to want tabs to default to 8 characters. See the following:
-	//	* http://www.ansi-bbs.org/ansi-bbs2/control_chars/
-	//	* http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
-	//
-	//	This seems overkill though, so let's default to 4 :)
-	//	:TODO: what shoudl this really be? Maybe 8 is OK
-	//
-	this.tabWidth			= _.isNumber(options.tabWidth) ? options.tabWidth : 4;
+    //
+    //	ANSI seems to want tabs to default to 8 characters. See the following:
+    //	* http://www.ansi-bbs.org/ansi-bbs2/control_chars/
+    //	* http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
+    //
+    //	This seems overkill though, so let's default to 4 :)
+    //	:TODO: what shoudl this really be? Maybe 8 is OK
+    //
+    this.tabWidth			= _.isNumber(options.tabWidth) ? options.tabWidth : 4;
 
-	this.textLines			= [ ];
-	this.topVisibleIndex	= 0;
-	this.mode				= options.mode || 'edit';	//	edit | preview | read-only
+    this.textLines			= [ ];
+    this.topVisibleIndex	= 0;
+    this.mode				= options.mode || 'edit';	//	edit | preview | read-only
 
-	if ('preview' === this.mode) {
-		this.autoScroll = options.autoScroll || true;
-		this.tabSwitchesView = true;
-	} else {
-		this.autoScroll = options.autoScroll || false;
-		this.tabSwitchesView = options.tabSwitchesView || false;
-	}
-	//
-	//	cursorPos represents zero-based row, col positions
-	//	within the editor itself
-	//
-	this.cursorPos			= { col : 0, row : 0 };
+    if ('preview' === this.mode) {
+        this.autoScroll = options.autoScroll || true;
+        this.tabSwitchesView = true;
+    } else {
+        this.autoScroll = options.autoScroll || false;
+        this.tabSwitchesView = options.tabSwitchesView || false;
+    }
+    //
+    //	cursorPos represents zero-based row, col positions
+    //	within the editor itself
+    //
+    this.cursorPos			= { col : 0, row : 0 };
 
-	this.getSGRFor = function(sgrFor) {
-		return {
-			text : self.getSGR(),
-		}[sgrFor] || self.getSGR();
-	};
+    this.getSGRFor = function(sgrFor) {
+        return {
+            text : self.getSGR(),
+        }[sgrFor] || self.getSGR();
+    };
 
-	this.isEditMode = function() {
-		return 'edit' === self.mode;
-	};
+    this.isEditMode = function() {
+        return 'edit' === self.mode;
+    };
 
-	this.isPreviewMode = function() {
-		return 'preview' === self.mode;
-	};
+    this.isPreviewMode = function() {
+        return 'preview' === self.mode;
+    };
 
-	//	:TODO: Most of the calls to this could be avoided via incrementRow(), decrementRow() that keeps track or such
-	this.getTextLinesIndex = function(row) {
-		if(!_.isNumber(row)) {
-			row = self.cursorPos.row;
-		}
-		var index = self.topVisibleIndex + row;
-		return index;
-	};
+    //	:TODO: Most of the calls to this could be avoided via incrementRow(), decrementRow() that keeps track or such
+    this.getTextLinesIndex = function(row) {
+        if(!_.isNumber(row)) {
+            row = self.cursorPos.row;
+        }
+        var index = self.topVisibleIndex + row;
+        return index;
+    };
 
-	this.getRemainingLinesBelowRow = function(row) {
-		if(!_.isNumber(row)) {
-			row = self.cursorPos.row;
-		}
-		return self.textLines.length - (self.topVisibleIndex + row) - 1;
-	};
+    this.getRemainingLinesBelowRow = function(row) {
+        if(!_.isNumber(row)) {
+            row = self.cursorPos.row;
+        }
+        return self.textLines.length - (self.topVisibleIndex + row) - 1;
+    };
 
-	this.getNextEndOfLineIndex = function(startIndex) {
-		for(var i = startIndex; i < self.textLines.length; i++) {
-			if(self.textLines[i].eol) {
-				return i;
-			}
-		}
-		return self.textLines.length;
-	};
+    this.getNextEndOfLineIndex = function(startIndex) {
+        for(var i = startIndex; i < self.textLines.length; i++) {
+            if(self.textLines[i].eol) {
+                return i;
+            }
+        }
+        return self.textLines.length;
+    };
 
-	this.toggleTextCursor = function(action) {
-		self.client.term.rawWrite(`${self.getSGRFor('text')}${'hide' === action ? ansi.hideCursor() : ansi.showCursor()}`);
-	};
+    this.toggleTextCursor = function(action) {
+        self.client.term.rawWrite(`${self.getSGRFor('text')}${'hide' === action ? ansi.hideCursor() : ansi.showCursor()}`);
+    };
 
-	this.redrawRows = function(startRow, endRow) {
-		self.toggleTextCursor('hide');
+    this.redrawRows = function(startRow, endRow) {
+        self.toggleTextCursor('hide');
 
-		const startIndex	= self.getTextLinesIndex(startRow);
-		const endIndex		= Math.min(self.getTextLinesIndex(endRow), self.textLines.length);
-		const absPos		= self.getAbsolutePosition(startRow, 0);
+        const startIndex	= self.getTextLinesIndex(startRow);
+        const endIndex		= Math.min(self.getTextLinesIndex(endRow), self.textLines.length);
+        const absPos		= self.getAbsolutePosition(startRow, 0);
 
-		for(let i = startIndex; i < endIndex; ++i) {
-			//${self.getSGRFor('text')}
-			self.client.term.write(
-				`${ansi.goto(absPos.row++, absPos.col)}${self.getRenderText(i)}`,
-				false	//	convertLineFeeds
-			);
-		}
+        for(let i = startIndex; i < endIndex; ++i) {
+            //${self.getSGRFor('text')}
+            self.client.term.write(
+                `${ansi.goto(absPos.row++, absPos.col)}${self.getRenderText(i)}`,
+                false	//	convertLineFeeds
+            );
+        }
 
-		self.toggleTextCursor('show');
+        self.toggleTextCursor('show');
 
-		return absPos.row - self.position.row;	//	row we ended on
-	};
+        return absPos.row - self.position.row;	//	row we ended on
+    };
 
-	this.eraseRows = function(startRow, endRow) {
-		self.toggleTextCursor('hide');
+    this.eraseRows = function(startRow, endRow) {
+        self.toggleTextCursor('hide');
 
-		const absPos		= self.getAbsolutePosition(startRow, 0);
-		const absPosEnd		= self.getAbsolutePosition(endRow, 0);
-		const eraseFiller	= ' '.repeat(self.dimens.width);//new Array(self.dimens.width).join(' ');
+        const absPos		= self.getAbsolutePosition(startRow, 0);
+        const absPosEnd		= self.getAbsolutePosition(endRow, 0);
+        const eraseFiller	= ' '.repeat(self.dimens.width);//new Array(self.dimens.width).join(' ');
 
-		while(absPos.row < absPosEnd.row) {
-			self.client.term.write(
-				`${ansi.goto(absPos.row++, absPos.col)}${eraseFiller}`,
-				false	//	convertLineFeeds
-			);
-		}
+        while(absPos.row < absPosEnd.row) {
+            self.client.term.write(
+                `${ansi.goto(absPos.row++, absPos.col)}${eraseFiller}`,
+                false	//	convertLineFeeds
+            );
+        }
 
-		self.toggleTextCursor('show');
-	};
+        self.toggleTextCursor('show');
+    };
 
-	this.redrawVisibleArea = function() {
-		assert(self.topVisibleIndex <= self.textLines.length);
-		const lastRow = self.redrawRows(0, self.dimens.height);
+    this.redrawVisibleArea = function() {
+        assert(self.topVisibleIndex <= self.textLines.length);
+        const lastRow = self.redrawRows(0, self.dimens.height);
 
-		self.eraseRows(lastRow, self.dimens.height);
-		/*
+        self.eraseRows(lastRow, self.dimens.height);
+        /*
 
 		//	:TOOD: create eraseRows(startRow, endRow)
 		if(lastRow < self.dimens.height) {
@@ -223,100 +223,100 @@ function MultiLineEditTextView(options) {
 			}
 		}
 		*/
-	};
+    };
 
-	this.getVisibleText = function(index) {
-		if(!_.isNumber(index)) {
-			index = self.getTextLinesIndex();
-		}
-		return self.textLines[index].text.replace(/\t/g, ' ');
-	};
+    this.getVisibleText = function(index) {
+        if(!_.isNumber(index)) {
+            index = self.getTextLinesIndex();
+        }
+        return self.textLines[index].text.replace(/\t/g, ' ');
+    };
 
-	this.getText = function(index) {
-		if(!_.isNumber(index)) {
-			index = self.getTextLinesIndex();
-		}
-		return self.textLines.length > index ? self.textLines[index].text : '';
-	};
+    this.getText = function(index) {
+        if(!_.isNumber(index)) {
+            index = self.getTextLinesIndex();
+        }
+        return self.textLines.length > index ? self.textLines[index].text : '';
+    };
 
-	this.getTextLength = function(index) {
-		if(!_.isNumber(index)) {
-			index = self.getTextLinesIndex();
-		}
-		return self.textLines.length > index ? self.textLines[index].text.length : 0;
-	};
+    this.getTextLength = function(index) {
+        if(!_.isNumber(index)) {
+            index = self.getTextLinesIndex();
+        }
+        return self.textLines.length > index ? self.textLines[index].text.length : 0;
+    };
 
-	this.getCharacter = function(index, col) {
-		if(!_.isNumber(col)) {
-			col = self.cursorPos.col;
-		}
-		return self.getText(index).charAt(col);
-	};
+    this.getCharacter = function(index, col) {
+        if(!_.isNumber(col)) {
+            col = self.cursorPos.col;
+        }
+        return self.getText(index).charAt(col);
+    };
 
-	this.isTab = function(index, col) {
-		return '\t' === self.getCharacter(index, col);
-	};
+    this.isTab = function(index, col) {
+        return '\t' === self.getCharacter(index, col);
+    };
 
-	this.getTextEndOfLineColumn = function(index) {
-		return Math.max(0, self.getTextLength(index));
-	};
+    this.getTextEndOfLineColumn = function(index) {
+        return Math.max(0, self.getTextLength(index));
+    };
 
-	this.getRenderText = function(index) {
-		let text 		= self.getVisibleText(index);
-		const remain	= self.dimens.width - text.length;
+    this.getRenderText = function(index) {
+        let text 		= self.getVisibleText(index);
+        const remain	= self.dimens.width - text.length;
 
-		if(remain > 0) {
-			text += ' '.repeat(remain + 1);
-			//			text += new Array(remain + 1).join(' ');
-		}
+        if(remain > 0) {
+            text += ' '.repeat(remain + 1);
+            //			text += new Array(remain + 1).join(' ');
+        }
 
-		return text;
-	};
+        return text;
+    };
 
-	this.getTextLines = function(startIndex, endIndex) {
-		var lines;
-		if(startIndex === endIndex) {
-			lines = [ self.textLines[startIndex] ];
-		} else {
-			lines = self.textLines.slice(startIndex, endIndex + 1);	//	"slice extracts up to but not including end."
-		}
-		return lines;
-	};
+    this.getTextLines = function(startIndex, endIndex) {
+        var lines;
+        if(startIndex === endIndex) {
+            lines = [ self.textLines[startIndex] ];
+        } else {
+            lines = self.textLines.slice(startIndex, endIndex + 1);	//	"slice extracts up to but not including end."
+        }
+        return lines;
+    };
 
-	this.getOutputText = function(startIndex, endIndex, eolMarker, options) {
-		const lines	= self.getTextLines(startIndex, endIndex);
-		let text	= '';
-		const re	= new RegExp('\\t{1,' + (self.tabWidth) + '}', 'g');
+    this.getOutputText = function(startIndex, endIndex, eolMarker, options) {
+        const lines	= self.getTextLines(startIndex, endIndex);
+        let text	= '';
+        const re	= new RegExp('\\t{1,' + (self.tabWidth) + '}', 'g');
 
-		lines.forEach(line => {
-			text += line.text.replace(re, '\t');
+        lines.forEach(line => {
+            text += line.text.replace(re, '\t');
 
-			if(options.forceLineTerms || (eolMarker && line.eol)) {
-				text += eolMarker;
-			}
-		});
+            if(options.forceLineTerms || (eolMarker && line.eol)) {
+                text += eolMarker;
+            }
+        });
 
-		return text;
-	};
+        return text;
+    };
 
-	this.getContiguousText = function(startIndex, endIndex, includeEol) {
-		var lines = self.getTextLines(startIndex, endIndex);
-		var text = '';
-		for(var i = 0; i < lines.length; ++i) {
-			text += lines[i].text;
-			if(includeEol && lines[i].eol) {
-				text += '\n';
-			}
-		}
-		return text;
-	};
+    this.getContiguousText = function(startIndex, endIndex, includeEol) {
+        var lines = self.getTextLines(startIndex, endIndex);
+        var text = '';
+        for(var i = 0; i < lines.length; ++i) {
+            text += lines[i].text;
+            if(includeEol && lines[i].eol) {
+                text += '\n';
+            }
+        }
+        return text;
+    };
 
-	this.replaceCharacterInText = function(c, index, col) {
-		self.textLines[index].text = strUtil.replaceAt(
-			self.textLines[index].text, col, c);
-	};
+    this.replaceCharacterInText = function(c, index, col) {
+        self.textLines[index].text = strUtil.replaceAt(
+            self.textLines[index].text, col, c);
+    };
 
-	/*
+    /*
 	this.editTextAtPosition = function(editAction, text, index, col) {
 		switch(editAction) {
 			case 'insert' :
@@ -335,669 +335,669 @@ function MultiLineEditTextView(options) {
 	};
 	*/
 
-	this.updateTextWordWrap = function(index) {
-		const nextEolIndex	= self.getNextEndOfLineIndex(index);
-		const wrapped		= self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
-		const newLines		= wrapped.wrapped.map(l => { return { text : l }; } );
+    this.updateTextWordWrap = function(index) {
+        const nextEolIndex	= self.getNextEndOfLineIndex(index);
+        const wrapped		= self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
+        const newLines		= wrapped.wrapped.map(l => { return { text : l }; } );
 
-		newLines[newLines.length - 1].eol = true;
+        newLines[newLines.length - 1].eol = true;
 
-		Array.prototype.splice.apply(
-			self.textLines,
-			[ index, (nextEolIndex - index) + 1 ].concat(newLines));
+        Array.prototype.splice.apply(
+            self.textLines,
+            [ index, (nextEolIndex - index) + 1 ].concat(newLines));
 
-		return wrapped.firstWrapRange;
-	};
+        return wrapped.firstWrapRange;
+    };
 
-	this.removeCharactersFromText = function(index, col, operation, count) {
-		if('delete' === operation) {
-			self.textLines[index].text =
+    this.removeCharactersFromText = function(index, col, operation, count) {
+        if('delete' === operation) {
+            self.textLines[index].text =
 				self.textLines[index].text.slice(0, col) +
 				self.textLines[index].text.slice(col + count);
 
-			self.updateTextWordWrap(index);
-			self.redrawRows(self.cursorPos.row, self.dimens.height);
-			self.moveClientCursorToCursorPos();
-		} else if ('backspace' === operation) {
-			//	:TODO: method for splicing text
-			self.textLines[index].text =
+            self.updateTextWordWrap(index);
+            self.redrawRows(self.cursorPos.row, self.dimens.height);
+            self.moveClientCursorToCursorPos();
+        } else if ('backspace' === operation) {
+            //	:TODO: method for splicing text
+            self.textLines[index].text =
 				self.textLines[index].text.slice(0, col - (count - 1)) +
 				self.textLines[index].text.slice(col + 1);
 
-			self.cursorPos.col -= (count - 1);
-
-			self.updateTextWordWrap(index);
-			self.redrawRows(self.cursorPos.row, self.dimens.height);
-
-			self.moveClientCursorToCursorPos();
-		} else if('delete line' === operation) {
-			//
-			//	Delete a visible line. Note that this is *not* the "physical" line, or
-			//	1:n entries up to eol! This is to keep consistency with home/end, and
-			//	some other text editors such as nano. Sublime for example want to
-			//	treat all of these things using the physical approach, but this seems
-			//	a bit odd in this context.
-			//
-			var isLastLine	= (index === self.textLines.length - 1);
-			var hadEol		= self.textLines[index].eol;
-
-			self.textLines.splice(index, 1);
-			if(hadEol && self.textLines.length > index && !self.textLines[index].eol) {
-				self.textLines[index].eol = true;
-			}
-
-			//
-			//	Create a empty edit buffer if necessary
-			//	:TODO: Make this a method
-			if(self.textLines.length < 1) {
-				self.textLines = [ { text : '', eol : true } ];
-				isLastLine = false;	//	resetting
-			}
-
-			self.cursorPos.col = 0;
-
-			var lastRow = self.redrawRows(self.cursorPos.row, self.dimens.height);
-			self.eraseRows(lastRow, self.dimens.height);
-
-			//
-			//	If we just deleted the last line in the buffer, move up
-			//
-			if(isLastLine) {
-				self.cursorEndOfPreviousLine();
-			} else {
-				self.moveClientCursorToCursorPos();
-			}
-		}
-	};
-
-	this.insertCharactersInText = function(c, index, col) {
-		const prevTextLength	= self.getTextLength(index);
-		let editingEol			= self.cursorPos.col === prevTextLength;
-
-		self.textLines[index].text = [
-			self.textLines[index].text.slice(0, col),
-			c,
-			self.textLines[index].text.slice(col)
-		].join('');
-
-		self.cursorPos.col += c.length;
-
-		if(self.getTextLength(index) > self.dimens.width) {
-			//
-			//	Update word wrapping and |cursorOffset| if the cursor
-			//	was within the bounds of the wrapped text
-			//
-			let cursorOffset;
-			const lastCol			= self.cursorPos.col - c.length;
-			const firstWrapRange	= self.updateTextWordWrap(index);
-			if(lastCol >= firstWrapRange.start && lastCol <= firstWrapRange.end) {
-				cursorOffset = self.cursorPos.col - firstWrapRange.start;
-				editingEol = true; 	//override
-			} else {
-				cursorOffset = firstWrapRange.end;
-			}
-
-			//	redraw from current row to end of visible area
-			self.redrawRows(self.cursorPos.row, self.dimens.height);
-
-			//	If we're editing mid, we're done here. Else, we need to
-			//	move the cursor to the new editing position after a wrap
-			if(editingEol) {
-				self.cursorBeginOfNextLine();
-				self.cursorPos.col += cursorOffset;
-				self.client.term.rawWrite(ansi.right(cursorOffset));
-			} else {
-				//	adjust cursor after drawing new rows
-				const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
-				self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
-			}
-		} else {
-			//
-			//	We must only redraw from col -> end of current visible line
-			//
-			const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
-			const renderText = self.getRenderText(index).slice(self.cursorPos.col - c.length);
-
-			self.client.term.write(
-				`${ansi.hideCursor()}${self.getSGRFor('text')}${renderText}${ansi.goto(absPos.row, absPos.col)}${ansi.showCursor()}`,
-				false	//	convertLineFeeds
-			);
-		}
-	};
-
-	this.getRemainingTabWidth = function(col) {
-		if(!_.isNumber(col)) {
-			col = self.cursorPos.col;
-		}
-		return self.tabWidth - (col % self.tabWidth);
-	};
-
-	this.calculateTabStops = function() {
-		self.tabStops = [ 0 ];
-		var col = 0;
-		while(col < self.dimens.width) {
-			col += self.getRemainingTabWidth(col);
-			self.tabStops.push(col);
-		}
-	};
-
-	this.getNextTabStop = function(col) {
-		var i = self.tabStops.length;
-		while(self.tabStops[--i] > col);
-		return self.tabStops[++i];
-	};
-
-	this.getPrevTabStop = function(col) {
-		var i = self.tabStops.length;
-		while(self.tabStops[--i] >= col);
-		return self.tabStops[i];
-	};
-
-	this.expandTab = function(col, expandChar) {
-		expandChar = expandChar || ' ';
-		return new Array(self.getRemainingTabWidth(col)).join(expandChar);
-	};
-
-	this.wordWrapSingleLine = function(line, tabHandling = 'expand') {
-		return wordWrapText(
-			line,
-			{
-				width		: self.dimens.width,
-				tabHandling	: tabHandling,
-				tabWidth	: self.tabWidth,
-				tabChar		: '\t',
-			}
-		);
-	};
-
-	this.setTextLines = function(lines, index, termWithEol) {
-		if(0 === index && (0 === self.textLines.length || (self.textLines.length === 1 && '' === self.textLines[0].text) )) {
-			//	quick path: just set the things
-			self.textLines = lines.slice(0, -1).map(l => {
-				return { text : l };
-			}).concat( { text : lines[lines.length - 1], eol : termWithEol } );
-		} else {
-			//	insert somewhere in textLines...
-			if(index > self.textLines.length) {
-				//	fill with empty
-				self.textLines.splice(
-					self.textLines.length,
-					0,
-					...Array.from( { length : index - self.textLines.length } ).map( () => { return { text : '' }; } )
-				);
-			}
-
-			const newLines = lines.slice(0, -1).map(l => {
-				return { text : l };
-			}).concat( { text : lines[lines.length - 1], eol : termWithEol } );
-
-			self.textLines.splice(
-				index,
-				0,
-				...newLines
-			);
-		}
-	};
-
-	this.setAnsiWithOptions = function(ansi, options, cb) {
-
-		function setLines(text) {
-			text = strUtil.splitTextAtTerms(text);
-
-			let index = 0;
-
-			text.forEach(line => {
-				self.setTextLines( [ line ], index, true);	//	true=termWithEol
-				index += 1;
-			});
-
-			self.cursorStartOfDocument();
-
-			if(cb) {
-				return cb(null);
-			}
-		}
-
-		if(options.prepped) {
-			return setLines(ansi);
-		}
-
-		ansiPrep(
-			ansi,
-			{
-				termWidth			: this.client.term.termWidth,
-				termHeight			: this.client.term.termHeight,
-				cols				: this.dimens.width,
-				rows				: 'auto',
-				startCol			: this.position.col,
-				forceLineTerm		: options.forceLineTerm,
-			},
-			(err, preppedAnsi) => {
-				return setLines(err ? ansi : preppedAnsi);
-			}
-		);
-	};
-
-	this.insertRawText = function(text, index, col) {
-		//
-		//	Perform the following on |text|:
-		//	*	Normalize various line feed formats -> \n
-		//	*	Remove some control characters (e.g. \b)
-		//	*	Word wrap lines such that they fit in the visible workspace.
-		//		Each actual line will then take 1:n elements in textLines[].
-		//	*	Each tab will be appropriately expanded and take 1:n \t
-		//		characters. This allows us to know when we're in tab space
-		//		when doing cursor movement/etc.
-		//
-		//
-		//	Try to handle any possible newline that can be fed to us.
-		//	See http://stackoverflow.com/questions/5034781/js-regex-to-split-by-line
-		//
-		//	:TODO: support index/col insertion point
-
-		if(_.isNumber(index)) {
-			if(_.isNumber(col)) {
-				//
-				//	Modify text to have information from index
-				//	before and and after column
-				//
-				//	:TODO: Need to clean this string (e.g. collapse tabs)
-				text = self.textLines;
-
-				//	:TODO: Remove original line @ index
-			}
-		} else {
-			index = self.textLines.length;
-		}
-
-		text = strUtil.splitTextAtTerms(text);
-
-		let wrapped;
-		text.forEach(line => {
-			wrapped = self.wordWrapSingleLine(line, 'expand').wrapped;
-
-			self.setTextLines(wrapped, index, true);	//	true=termWithEol
-			index += wrapped.length;
-		});
-	};
-
-	this.getAbsolutePosition = function(row, col) {
-		return {
-			row : self.position.row + row,
-			col : self.position.col + col,
-		};
-	};
-
-	this.moveClientCursorToCursorPos = function() {
-		var absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
-		self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
-	};
-
-
-	this.keyPressCharacter = function(c) {
-		var index = self.getTextLinesIndex();
-
-		//
-		//	:TODO: stuff that needs to happen
-		//	* Break up into smaller methods
-		//	* Even in overtype mode, word wrapping must apply if past bounds
-		//	* A lot of this can be used for backspacing also
-		//	* See how Sublime treats tabs in *non* overtype mode... just overwrite them?
-		//
-		//
-
-		if(self.overtypeMode) {
-			//	:TODO: special handing for insert over eol mark?
-			self.replaceCharacterInText(c, index, self.cursorPos.col);
-			self.cursorPos.col++;
-			self.client.term.write(c);
-		} else {
-			self.insertCharactersInText(c, index, self.cursorPos.col);
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressUp = function() {
-		if(self.cursorPos.row > 0) {
-			self.cursorPos.row--;
-			self.client.term.rawWrite(ansi.up());
-
-			if(!self.adjustCursorToNextTab('up')) {
-				self.adjustCursorIfPastEndOfLine(false);
-			}
-		} else {
-			self.scrollDocumentDown();
-			self.adjustCursorIfPastEndOfLine(true);
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressDown = function() {
-		var lastVisibleRow = Math.min(
-			self.dimens.height,
-			(self.textLines.length - self.topVisibleIndex)) - 1;
-
-		if(self.cursorPos.row < lastVisibleRow) {
-			self.cursorPos.row++;
-			self.client.term.rawWrite(ansi.down());
-
-			if(!self.adjustCursorToNextTab('down')) {
-				self.adjustCursorIfPastEndOfLine(false);
-			}
-		} else {
-			self.scrollDocumentUp();
-			self.adjustCursorIfPastEndOfLine(true);
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressLeft = function() {
-		if(self.cursorPos.col > 0) {
-			var prevCharIsTab = self.isTab();
-
-			self.cursorPos.col--;
-			self.client.term.rawWrite(ansi.left());
-
-			if(prevCharIsTab) {
-				self.adjustCursorToNextTab('left');
-			}
-		} else {
-			self.cursorEndOfPreviousLine();
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressRight = function() {
-		var eolColumn = self.getTextEndOfLineColumn();
-		if(self.cursorPos.col < eolColumn) {
-			var prevCharIsTab = self.isTab();
-
-			self.cursorPos.col++;
-			self.client.term.rawWrite(ansi.right());
-
-			if(prevCharIsTab) {
-				self.adjustCursorToNextTab('right');
-			}
-		} else {
-			self.cursorBeginOfNextLine();
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressHome = function() {
-		var firstNonWhitespace = self.getVisibleText().search(/\S/);
-		if(-1 !== firstNonWhitespace) {
-			self.cursorPos.col = firstNonWhitespace;
-		} else {
-			self.cursorPos.col = 0;
-		}
-		self.moveClientCursorToCursorPos();
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressEnd = function() {
-		self.cursorPos.col = self.getTextEndOfLineColumn();
-		self.moveClientCursorToCursorPos();
-		self.emitEditPosition();
-	};
-
-	this.keyPressPageUp = function() {
-		if(self.topVisibleIndex > 0) {
-			self.topVisibleIndex = Math.max(0, self.topVisibleIndex - self.dimens.height);
-			self.redraw();
-			self.adjustCursorIfPastEndOfLine(true);
-		} else {
-			self.cursorPos.row = 0;
-			self.moveClientCursorToCursorPos();	//	:TODO: ajust if eol, etc.
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressPageDown = function() {
-		var linesBelow = self.getRemainingLinesBelowRow();
-		if(linesBelow > 0) {
-			self.topVisibleIndex += Math.min(linesBelow, self.dimens.height);
-			self.redraw();
-			self.adjustCursorIfPastEndOfLine(true);
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressLineFeed = function() {
-		//
-		//	Break up text from cursor position, redraw, and update cursor
-		//	position to start of next line
-		//
-		var index			= self.getTextLinesIndex();
-		var nextEolIndex	= self.getNextEndOfLineIndex(index);
-		var text			= self.getContiguousText(index, nextEolIndex);
-		const newLines		= self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
-
-		newLines.unshift( { text : text.slice(0, self.cursorPos.col), eol : true } );
-		for(var i = 1; i < newLines.length; ++i) {
-			newLines[i] = { text : newLines[i] };
-		}
-		newLines[newLines.length - 1].eol = true;
-
-		Array.prototype.splice.apply(
-			self.textLines,
-			[ index, (nextEolIndex - index) + 1 ].concat(newLines));
-
-		//	redraw from current row to end of visible area
-		self.redrawRows(self.cursorPos.row, self.dimens.height);
-		self.cursorBeginOfNextLine();
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressInsert = function() {
-		self.toggleTextEditMode();
-	};
-
-	this.keyPressTab = function() {
-		var index = self.getTextLinesIndex();
-		self.insertCharactersInText(self.expandTab(self.cursorPos.col, '\t') + '\t', index, self.cursorPos.col);
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressBackspace = function() {
-		if(self.cursorPos.col >= 1) {
-			//
-			//	Don't want to delete character at cursor, but rather the character
-			//	to the left of the cursor!
-			//
-			self.cursorPos.col -= 1;
-
-			var index = self.getTextLinesIndex();
-			var count;
-
-			if(self.isTab()) {
-				var col = self.cursorPos.col;
-				var prevTabStop = self.getPrevTabStop(self.cursorPos.col);
-				while(col >= prevTabStop) {
-					if(!self.isTab(index, col)) {
-						break;
-					}
-					--col;
-				}
-
-				count = (self.cursorPos.col - col);
-			} else {
-				count = 1;
-			}
-
-			self.removeCharactersFromText(
-				index,
-				self.cursorPos.col,
-				'backspace',
-				count);
-		} else {
-			//
-			//	Delete character at end of line previous.
-			//	* This may be a eol marker
-			//	* Word wrapping will need re-applied
-			//
-			//	:TODO: apply word wrapping such that text can be re-adjusted if it can now fit on prev
-			self.keyPressLeft();	//	same as hitting left - jump to previous line
-			//self.keyPressBackspace();
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressDelete = function() {
-		const lineIndex = self.getTextLinesIndex();
-
-		if(0 === self.cursorPos.col && 0 === self.textLines[lineIndex].text.length && self.textLines.length > 0) {
-			//
-			//	Start of line and nothing left. Just delete the line
-			//
-			self.removeCharactersFromText(
-				lineIndex,
-				0,
-				'delete line'
-			);
-		} else {
-			self.removeCharactersFromText(
-				lineIndex,
-				self.cursorPos.col,
-				'delete',
-				1
-			);
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.keyPressDeleteLine = function() {
-		if(self.textLines.length > 0) {
-			self.removeCharactersFromText(
-				self.getTextLinesIndex(),
-				0,
-				'delete line');
-		}
-
-		self.emitEditPosition();
-	};
-
-	this.adjustCursorIfPastEndOfLine = function(forceUpdate) {
-		var eolColumn = self.getTextEndOfLineColumn();
-		if(self.cursorPos.col > eolColumn) {
-			self.cursorPos.col = eolColumn;
-			forceUpdate = true;
-		}
-
-		if(forceUpdate) {
-			self.moveClientCursorToCursorPos();
-		}
-	};
-
-	this.adjustCursorToNextTab = function(direction) {
-		if(self.isTab()) {
-			var move;
-			switch(direction) {
-				//
-				//	Next tabstop to the right
-				//
-				case 'right' :
-					move = self.getNextTabStop(self.cursorPos.col) - self.cursorPos.col;
-					self.cursorPos.col += move;
-					self.client.term.rawWrite(ansi.right(move));
-					break;
-
-				//
-				//	Next tabstop to the left
-				//
-				case 'left' :
-					move = self.cursorPos.col - self.getPrevTabStop(self.cursorPos.col);
-					self.cursorPos.col -= move;
-					self.client.term.rawWrite(ansi.left(move));
-					break;
-
-				case 'up' :
-				case 'down' :
-					//
-					//	Jump to the tabstop nearest the cursor
-					//
-					var newCol = self.tabStops.reduce(function r(prev, curr) {
-						return (Math.abs(curr - self.cursorPos.col) < Math.abs(prev - self.cursorPos.col) ? curr : prev);
-					});
-
-					if(newCol > self.cursorPos.col) {
-						move = newCol - self.cursorPos.col;
-						self.cursorPos.col += move;
-						self.client.term.rawWrite(ansi.right(move));
-					} else if(newCol < self.cursorPos.col) {
-						move = self.cursorPos.col - newCol;
-						self.cursorPos.col -= move;
-						self.client.term.rawWrite(ansi.left(move));
-					}
-					break;
-			}
-
-			return true;
-		}
-		return false;	//	did not fall on a tab
-	};
-
-	this.cursorStartOfDocument = function() {
-		self.topVisibleIndex	= 0;
-		self.cursorPos			= { row : 0, col : 0 };
-
-		self.redraw();
-		self.moveClientCursorToCursorPos();
-	};
-
-	this.cursorEndOfDocument = function() {
-		self.topVisibleIndex	= Math.max(self.textLines.length - self.dimens.height, 0);
-		self.cursorPos.row		= (self.textLines.length - self.topVisibleIndex) - 1;
-		self.cursorPos.col		= self.getTextEndOfLineColumn();
-
-		self.redraw();
-		self.moveClientCursorToCursorPos();
-	};
-
-	this.cursorBeginOfNextLine = function() {
-		//	e.g. when scrolling right past eol
-		var linesBelow = self.getRemainingLinesBelowRow();
-
-		if(linesBelow > 0) {
-			var lastVisibleRow	= Math.min(self.dimens.height, self.textLines.length) - 1;
-			if(self.cursorPos.row < lastVisibleRow) {
-				self.cursorPos.row++;
-			} else {
-				self.scrollDocumentUp();
-			}
-			self.keyPressHome();	//	same as pressing 'home'
-		}
-	};
-
-	this.cursorEndOfPreviousLine = function() {
-		//	e.g. when scrolling left past start of line
-		var moveToEnd;
-		if(self.cursorPos.row > 0) {
-			self.cursorPos.row--;
-			moveToEnd = true;
-		} else if(self.topVisibleIndex > 0) {
-			self.scrollDocumentDown();
-			moveToEnd = true;
-		}
-
-		if(moveToEnd) {
-			self.keyPressEnd();	//	same as pressing 'end'
-		}
-	};
-
-	/*
+            self.cursorPos.col -= (count - 1);
+
+            self.updateTextWordWrap(index);
+            self.redrawRows(self.cursorPos.row, self.dimens.height);
+
+            self.moveClientCursorToCursorPos();
+        } else if('delete line' === operation) {
+            //
+            //	Delete a visible line. Note that this is *not* the "physical" line, or
+            //	1:n entries up to eol! This is to keep consistency with home/end, and
+            //	some other text editors such as nano. Sublime for example want to
+            //	treat all of these things using the physical approach, but this seems
+            //	a bit odd in this context.
+            //
+            var isLastLine	= (index === self.textLines.length - 1);
+            var hadEol		= self.textLines[index].eol;
+
+            self.textLines.splice(index, 1);
+            if(hadEol && self.textLines.length > index && !self.textLines[index].eol) {
+                self.textLines[index].eol = true;
+            }
+
+            //
+            //	Create a empty edit buffer if necessary
+            //	:TODO: Make this a method
+            if(self.textLines.length < 1) {
+                self.textLines = [ { text : '', eol : true } ];
+                isLastLine = false;	//	resetting
+            }
+
+            self.cursorPos.col = 0;
+
+            var lastRow = self.redrawRows(self.cursorPos.row, self.dimens.height);
+            self.eraseRows(lastRow, self.dimens.height);
+
+            //
+            //	If we just deleted the last line in the buffer, move up
+            //
+            if(isLastLine) {
+                self.cursorEndOfPreviousLine();
+            } else {
+                self.moveClientCursorToCursorPos();
+            }
+        }
+    };
+
+    this.insertCharactersInText = function(c, index, col) {
+        const prevTextLength	= self.getTextLength(index);
+        let editingEol			= self.cursorPos.col === prevTextLength;
+
+        self.textLines[index].text = [
+            self.textLines[index].text.slice(0, col),
+            c,
+            self.textLines[index].text.slice(col)
+        ].join('');
+
+        self.cursorPos.col += c.length;
+
+        if(self.getTextLength(index) > self.dimens.width) {
+            //
+            //	Update word wrapping and |cursorOffset| if the cursor
+            //	was within the bounds of the wrapped text
+            //
+            let cursorOffset;
+            const lastCol			= self.cursorPos.col - c.length;
+            const firstWrapRange	= self.updateTextWordWrap(index);
+            if(lastCol >= firstWrapRange.start && lastCol <= firstWrapRange.end) {
+                cursorOffset = self.cursorPos.col - firstWrapRange.start;
+                editingEol = true; 	//override
+            } else {
+                cursorOffset = firstWrapRange.end;
+            }
+
+            //	redraw from current row to end of visible area
+            self.redrawRows(self.cursorPos.row, self.dimens.height);
+
+            //	If we're editing mid, we're done here. Else, we need to
+            //	move the cursor to the new editing position after a wrap
+            if(editingEol) {
+                self.cursorBeginOfNextLine();
+                self.cursorPos.col += cursorOffset;
+                self.client.term.rawWrite(ansi.right(cursorOffset));
+            } else {
+                //	adjust cursor after drawing new rows
+                const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+                self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
+            }
+        } else {
+            //
+            //	We must only redraw from col -> end of current visible line
+            //
+            const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+            const renderText = self.getRenderText(index).slice(self.cursorPos.col - c.length);
+
+            self.client.term.write(
+                `${ansi.hideCursor()}${self.getSGRFor('text')}${renderText}${ansi.goto(absPos.row, absPos.col)}${ansi.showCursor()}`,
+                false	//	convertLineFeeds
+            );
+        }
+    };
+
+    this.getRemainingTabWidth = function(col) {
+        if(!_.isNumber(col)) {
+            col = self.cursorPos.col;
+        }
+        return self.tabWidth - (col % self.tabWidth);
+    };
+
+    this.calculateTabStops = function() {
+        self.tabStops = [ 0 ];
+        var col = 0;
+        while(col < self.dimens.width) {
+            col += self.getRemainingTabWidth(col);
+            self.tabStops.push(col);
+        }
+    };
+
+    this.getNextTabStop = function(col) {
+        var i = self.tabStops.length;
+        while(self.tabStops[--i] > col);
+        return self.tabStops[++i];
+    };
+
+    this.getPrevTabStop = function(col) {
+        var i = self.tabStops.length;
+        while(self.tabStops[--i] >= col);
+        return self.tabStops[i];
+    };
+
+    this.expandTab = function(col, expandChar) {
+        expandChar = expandChar || ' ';
+        return new Array(self.getRemainingTabWidth(col)).join(expandChar);
+    };
+
+    this.wordWrapSingleLine = function(line, tabHandling = 'expand') {
+        return wordWrapText(
+            line,
+            {
+                width		: self.dimens.width,
+                tabHandling	: tabHandling,
+                tabWidth	: self.tabWidth,
+                tabChar		: '\t',
+            }
+        );
+    };
+
+    this.setTextLines = function(lines, index, termWithEol) {
+        if(0 === index && (0 === self.textLines.length || (self.textLines.length === 1 && '' === self.textLines[0].text) )) {
+            //	quick path: just set the things
+            self.textLines = lines.slice(0, -1).map(l => {
+                return { text : l };
+            }).concat( { text : lines[lines.length - 1], eol : termWithEol } );
+        } else {
+            //	insert somewhere in textLines...
+            if(index > self.textLines.length) {
+                //	fill with empty
+                self.textLines.splice(
+                    self.textLines.length,
+                    0,
+                    ...Array.from( { length : index - self.textLines.length } ).map( () => { return { text : '' }; } )
+                );
+            }
+
+            const newLines = lines.slice(0, -1).map(l => {
+                return { text : l };
+            }).concat( { text : lines[lines.length - 1], eol : termWithEol } );
+
+            self.textLines.splice(
+                index,
+                0,
+                ...newLines
+            );
+        }
+    };
+
+    this.setAnsiWithOptions = function(ansi, options, cb) {
+
+        function setLines(text) {
+            text = strUtil.splitTextAtTerms(text);
+
+            let index = 0;
+
+            text.forEach(line => {
+                self.setTextLines( [ line ], index, true);	//	true=termWithEol
+                index += 1;
+            });
+
+            self.cursorStartOfDocument();
+
+            if(cb) {
+                return cb(null);
+            }
+        }
+
+        if(options.prepped) {
+            return setLines(ansi);
+        }
+
+        ansiPrep(
+            ansi,
+            {
+                termWidth			: this.client.term.termWidth,
+                termHeight			: this.client.term.termHeight,
+                cols				: this.dimens.width,
+                rows				: 'auto',
+                startCol			: this.position.col,
+                forceLineTerm		: options.forceLineTerm,
+            },
+            (err, preppedAnsi) => {
+                return setLines(err ? ansi : preppedAnsi);
+            }
+        );
+    };
+
+    this.insertRawText = function(text, index, col) {
+        //
+        //	Perform the following on |text|:
+        //	*	Normalize various line feed formats -> \n
+        //	*	Remove some control characters (e.g. \b)
+        //	*	Word wrap lines such that they fit in the visible workspace.
+        //		Each actual line will then take 1:n elements in textLines[].
+        //	*	Each tab will be appropriately expanded and take 1:n \t
+        //		characters. This allows us to know when we're in tab space
+        //		when doing cursor movement/etc.
+        //
+        //
+        //	Try to handle any possible newline that can be fed to us.
+        //	See http://stackoverflow.com/questions/5034781/js-regex-to-split-by-line
+        //
+        //	:TODO: support index/col insertion point
+
+        if(_.isNumber(index)) {
+            if(_.isNumber(col)) {
+                //
+                //	Modify text to have information from index
+                //	before and and after column
+                //
+                //	:TODO: Need to clean this string (e.g. collapse tabs)
+                text = self.textLines;
+
+                //	:TODO: Remove original line @ index
+            }
+        } else {
+            index = self.textLines.length;
+        }
+
+        text = strUtil.splitTextAtTerms(text);
+
+        let wrapped;
+        text.forEach(line => {
+            wrapped = self.wordWrapSingleLine(line, 'expand').wrapped;
+
+            self.setTextLines(wrapped, index, true);	//	true=termWithEol
+            index += wrapped.length;
+        });
+    };
+
+    this.getAbsolutePosition = function(row, col) {
+        return {
+            row : self.position.row + row,
+            col : self.position.col + col,
+        };
+    };
+
+    this.moveClientCursorToCursorPos = function() {
+        var absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
+        self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
+    };
+
+
+    this.keyPressCharacter = function(c) {
+        var index = self.getTextLinesIndex();
+
+        //
+        //	:TODO: stuff that needs to happen
+        //	* Break up into smaller methods
+        //	* Even in overtype mode, word wrapping must apply if past bounds
+        //	* A lot of this can be used for backspacing also
+        //	* See how Sublime treats tabs in *non* overtype mode... just overwrite them?
+        //
+        //
+
+        if(self.overtypeMode) {
+            //	:TODO: special handing for insert over eol mark?
+            self.replaceCharacterInText(c, index, self.cursorPos.col);
+            self.cursorPos.col++;
+            self.client.term.write(c);
+        } else {
+            self.insertCharactersInText(c, index, self.cursorPos.col);
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressUp = function() {
+        if(self.cursorPos.row > 0) {
+            self.cursorPos.row--;
+            self.client.term.rawWrite(ansi.up());
+
+            if(!self.adjustCursorToNextTab('up')) {
+                self.adjustCursorIfPastEndOfLine(false);
+            }
+        } else {
+            self.scrollDocumentDown();
+            self.adjustCursorIfPastEndOfLine(true);
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressDown = function() {
+        var lastVisibleRow = Math.min(
+            self.dimens.height,
+            (self.textLines.length - self.topVisibleIndex)) - 1;
+
+        if(self.cursorPos.row < lastVisibleRow) {
+            self.cursorPos.row++;
+            self.client.term.rawWrite(ansi.down());
+
+            if(!self.adjustCursorToNextTab('down')) {
+                self.adjustCursorIfPastEndOfLine(false);
+            }
+        } else {
+            self.scrollDocumentUp();
+            self.adjustCursorIfPastEndOfLine(true);
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressLeft = function() {
+        if(self.cursorPos.col > 0) {
+            var prevCharIsTab = self.isTab();
+
+            self.cursorPos.col--;
+            self.client.term.rawWrite(ansi.left());
+
+            if(prevCharIsTab) {
+                self.adjustCursorToNextTab('left');
+            }
+        } else {
+            self.cursorEndOfPreviousLine();
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressRight = function() {
+        var eolColumn = self.getTextEndOfLineColumn();
+        if(self.cursorPos.col < eolColumn) {
+            var prevCharIsTab = self.isTab();
+
+            self.cursorPos.col++;
+            self.client.term.rawWrite(ansi.right());
+
+            if(prevCharIsTab) {
+                self.adjustCursorToNextTab('right');
+            }
+        } else {
+            self.cursorBeginOfNextLine();
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressHome = function() {
+        var firstNonWhitespace = self.getVisibleText().search(/\S/);
+        if(-1 !== firstNonWhitespace) {
+            self.cursorPos.col = firstNonWhitespace;
+        } else {
+            self.cursorPos.col = 0;
+        }
+        self.moveClientCursorToCursorPos();
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressEnd = function() {
+        self.cursorPos.col = self.getTextEndOfLineColumn();
+        self.moveClientCursorToCursorPos();
+        self.emitEditPosition();
+    };
+
+    this.keyPressPageUp = function() {
+        if(self.topVisibleIndex > 0) {
+            self.topVisibleIndex = Math.max(0, self.topVisibleIndex - self.dimens.height);
+            self.redraw();
+            self.adjustCursorIfPastEndOfLine(true);
+        } else {
+            self.cursorPos.row = 0;
+            self.moveClientCursorToCursorPos();	//	:TODO: ajust if eol, etc.
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressPageDown = function() {
+        var linesBelow = self.getRemainingLinesBelowRow();
+        if(linesBelow > 0) {
+            self.topVisibleIndex += Math.min(linesBelow, self.dimens.height);
+            self.redraw();
+            self.adjustCursorIfPastEndOfLine(true);
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressLineFeed = function() {
+        //
+        //	Break up text from cursor position, redraw, and update cursor
+        //	position to start of next line
+        //
+        var index			= self.getTextLinesIndex();
+        var nextEolIndex	= self.getNextEndOfLineIndex(index);
+        var text			= self.getContiguousText(index, nextEolIndex);
+        const newLines		= self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
+
+        newLines.unshift( { text : text.slice(0, self.cursorPos.col), eol : true } );
+        for(var i = 1; i < newLines.length; ++i) {
+            newLines[i] = { text : newLines[i] };
+        }
+        newLines[newLines.length - 1].eol = true;
+
+        Array.prototype.splice.apply(
+            self.textLines,
+            [ index, (nextEolIndex - index) + 1 ].concat(newLines));
+
+        //	redraw from current row to end of visible area
+        self.redrawRows(self.cursorPos.row, self.dimens.height);
+        self.cursorBeginOfNextLine();
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressInsert = function() {
+        self.toggleTextEditMode();
+    };
+
+    this.keyPressTab = function() {
+        var index = self.getTextLinesIndex();
+        self.insertCharactersInText(self.expandTab(self.cursorPos.col, '\t') + '\t', index, self.cursorPos.col);
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressBackspace = function() {
+        if(self.cursorPos.col >= 1) {
+            //
+            //	Don't want to delete character at cursor, but rather the character
+            //	to the left of the cursor!
+            //
+            self.cursorPos.col -= 1;
+
+            var index = self.getTextLinesIndex();
+            var count;
+
+            if(self.isTab()) {
+                var col = self.cursorPos.col;
+                var prevTabStop = self.getPrevTabStop(self.cursorPos.col);
+                while(col >= prevTabStop) {
+                    if(!self.isTab(index, col)) {
+                        break;
+                    }
+                    --col;
+                }
+
+                count = (self.cursorPos.col - col);
+            } else {
+                count = 1;
+            }
+
+            self.removeCharactersFromText(
+                index,
+                self.cursorPos.col,
+                'backspace',
+                count);
+        } else {
+            //
+            //	Delete character at end of line previous.
+            //	* This may be a eol marker
+            //	* Word wrapping will need re-applied
+            //
+            //	:TODO: apply word wrapping such that text can be re-adjusted if it can now fit on prev
+            self.keyPressLeft();	//	same as hitting left - jump to previous line
+            //self.keyPressBackspace();
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressDelete = function() {
+        const lineIndex = self.getTextLinesIndex();
+
+        if(0 === self.cursorPos.col && 0 === self.textLines[lineIndex].text.length && self.textLines.length > 0) {
+            //
+            //	Start of line and nothing left. Just delete the line
+            //
+            self.removeCharactersFromText(
+                lineIndex,
+                0,
+                'delete line'
+            );
+        } else {
+            self.removeCharactersFromText(
+                lineIndex,
+                self.cursorPos.col,
+                'delete',
+                1
+            );
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.keyPressDeleteLine = function() {
+        if(self.textLines.length > 0) {
+            self.removeCharactersFromText(
+                self.getTextLinesIndex(),
+                0,
+                'delete line');
+        }
+
+        self.emitEditPosition();
+    };
+
+    this.adjustCursorIfPastEndOfLine = function(forceUpdate) {
+        var eolColumn = self.getTextEndOfLineColumn();
+        if(self.cursorPos.col > eolColumn) {
+            self.cursorPos.col = eolColumn;
+            forceUpdate = true;
+        }
+
+        if(forceUpdate) {
+            self.moveClientCursorToCursorPos();
+        }
+    };
+
+    this.adjustCursorToNextTab = function(direction) {
+        if(self.isTab()) {
+            var move;
+            switch(direction) {
+                //
+                //	Next tabstop to the right
+                //
+                case 'right' :
+                    move = self.getNextTabStop(self.cursorPos.col) - self.cursorPos.col;
+                    self.cursorPos.col += move;
+                    self.client.term.rawWrite(ansi.right(move));
+                    break;
+
+                    //
+                    //	Next tabstop to the left
+                    //
+                case 'left' :
+                    move = self.cursorPos.col - self.getPrevTabStop(self.cursorPos.col);
+                    self.cursorPos.col -= move;
+                    self.client.term.rawWrite(ansi.left(move));
+                    break;
+
+                case 'up' :
+                case 'down' :
+                    //
+                    //	Jump to the tabstop nearest the cursor
+                    //
+                    var newCol = self.tabStops.reduce(function r(prev, curr) {
+                        return (Math.abs(curr - self.cursorPos.col) < Math.abs(prev - self.cursorPos.col) ? curr : prev);
+                    });
+
+                    if(newCol > self.cursorPos.col) {
+                        move = newCol - self.cursorPos.col;
+                        self.cursorPos.col += move;
+                        self.client.term.rawWrite(ansi.right(move));
+                    } else if(newCol < self.cursorPos.col) {
+                        move = self.cursorPos.col - newCol;
+                        self.cursorPos.col -= move;
+                        self.client.term.rawWrite(ansi.left(move));
+                    }
+                    break;
+            }
+
+            return true;
+        }
+        return false;	//	did not fall on a tab
+    };
+
+    this.cursorStartOfDocument = function() {
+        self.topVisibleIndex	= 0;
+        self.cursorPos			= { row : 0, col : 0 };
+
+        self.redraw();
+        self.moveClientCursorToCursorPos();
+    };
+
+    this.cursorEndOfDocument = function() {
+        self.topVisibleIndex	= Math.max(self.textLines.length - self.dimens.height, 0);
+        self.cursorPos.row		= (self.textLines.length - self.topVisibleIndex) - 1;
+        self.cursorPos.col		= self.getTextEndOfLineColumn();
+
+        self.redraw();
+        self.moveClientCursorToCursorPos();
+    };
+
+    this.cursorBeginOfNextLine = function() {
+        //	e.g. when scrolling right past eol
+        var linesBelow = self.getRemainingLinesBelowRow();
+
+        if(linesBelow > 0) {
+            var lastVisibleRow	= Math.min(self.dimens.height, self.textLines.length) - 1;
+            if(self.cursorPos.row < lastVisibleRow) {
+                self.cursorPos.row++;
+            } else {
+                self.scrollDocumentUp();
+            }
+            self.keyPressHome();	//	same as pressing 'home'
+        }
+    };
+
+    this.cursorEndOfPreviousLine = function() {
+        //	e.g. when scrolling left past start of line
+        var moveToEnd;
+        if(self.cursorPos.row > 0) {
+            self.cursorPos.row--;
+            moveToEnd = true;
+        } else if(self.topVisibleIndex > 0) {
+            self.scrollDocumentDown();
+            moveToEnd = true;
+        }
+
+        if(moveToEnd) {
+            self.keyPressEnd();	//	same as pressing 'end'
+        }
+    };
+
+    /*
 	this.cusorEndOfNextLine = function() {
 		var linesBelow = self.getRemainingLinesBelowRow();
 
@@ -1013,66 +1013,66 @@ function MultiLineEditTextView(options) {
 	};
 	*/
 
-	this.scrollDocumentUp = function() {
-		//
-		//	Note: We scroll *up* when the cursor goes *down* beyond
-		//	the visible area!
-		//
-		var linesBelow = self.getRemainingLinesBelowRow();
-		if(linesBelow > 0) {
-			self.topVisibleIndex++;
-			self.redraw();
-		}
-	};
+    this.scrollDocumentUp = function() {
+        //
+        //	Note: We scroll *up* when the cursor goes *down* beyond
+        //	the visible area!
+        //
+        var linesBelow = self.getRemainingLinesBelowRow();
+        if(linesBelow > 0) {
+            self.topVisibleIndex++;
+            self.redraw();
+        }
+    };
 
-	this.scrollDocumentDown = function() {
-		//
-		//	Note: We scroll *down* when the cursor goes *up* beyond
-		//	the visible area!
-		//
-		if(self.topVisibleIndex > 0) {
-			self.topVisibleIndex--;
-			self.redraw();
-		}
-	};
+    this.scrollDocumentDown = function() {
+        //
+        //	Note: We scroll *down* when the cursor goes *up* beyond
+        //	the visible area!
+        //
+        if(self.topVisibleIndex > 0) {
+            self.topVisibleIndex--;
+            self.redraw();
+        }
+    };
 
-	this.emitEditPosition = function() {
-		self.emit('edit position', 	self.getEditPosition());
-	};
+    this.emitEditPosition = function() {
+        self.emit('edit position', 	self.getEditPosition());
+    };
 
-	this.toggleTextEditMode = function() {
-		self.overtypeMode = !self.overtypeMode;
-		self.emit('text edit mode', self.getTextEditMode());
-	};
+    this.toggleTextEditMode = function() {
+        self.overtypeMode = !self.overtypeMode;
+        self.emit('text edit mode', self.getTextEditMode());
+    };
 
-	this.insertRawText('');	//	init to blank/empty
+    this.insertRawText('');	//	init to blank/empty
 }
 
 require('util').inherits(MultiLineEditTextView, View);
 
 MultiLineEditTextView.prototype.setWidth = function(width) {
-	MultiLineEditTextView.super_.prototype.setWidth.call(this, width);
+    MultiLineEditTextView.super_.prototype.setWidth.call(this, width);
 
-	this.calculateTabStops();
+    this.calculateTabStops();
 };
 
 MultiLineEditTextView.prototype.redraw = function() {
-	MultiLineEditTextView.super_.prototype.redraw.call(this);
+    MultiLineEditTextView.super_.prototype.redraw.call(this);
 
-	this.redrawVisibleArea();
+    this.redrawVisibleArea();
 };
 
 MultiLineEditTextView.prototype.setFocus = function(focused) {
-	this.client.term.rawWrite(this.getSGRFor('text'));
-	this.moveClientCursorToCursorPos();
+    this.client.term.rawWrite(this.getSGRFor('text'));
+    this.moveClientCursorToCursorPos();
 
-	MultiLineEditTextView.super_.prototype.setFocus.call(this, focused);
+    MultiLineEditTextView.super_.prototype.setFocus.call(this, focused);
 };
 
 MultiLineEditTextView.prototype.setText = function(text, options = { scrollMode : 'default' } ) {
-	this.textLines = [ ];
-	this.addText(text, options);
-	/*this.insertRawText(text);
+    this.textLines = [ ];
+    this.addText(text, options);
+    /*this.insertRawText(text);
 
 	if(this.isEditMode()) {
 		this.cursorEndOfDocument();
@@ -1082,132 +1082,132 @@ MultiLineEditTextView.prototype.setText = function(text, options = { scrollMode
 };
 
 MultiLineEditTextView.prototype.setAnsi = function(ansi, options = { prepped : false }, cb) {
-	this.textLines = [ ];
-	return this.setAnsiWithOptions(ansi, options, cb);
+    this.textLines = [ ];
+    return this.setAnsiWithOptions(ansi, options, cb);
 };
 
 MultiLineEditTextView.prototype.addText = function(text, options = { scrollMode : 'default' }) {
-	this.insertRawText(text);
+    this.insertRawText(text);
 
-	switch(options.scrollMode) {
-		case 'default' :
-			if(this.isEditMode() || this.autoScroll) {
-				this.cursorEndOfDocument();
-			} else {
-				this.cursorStartOfDocument();
-			}
-			break;
+    switch(options.scrollMode) {
+        case 'default' :
+            if(this.isEditMode() || this.autoScroll) {
+                this.cursorEndOfDocument();
+            } else {
+                this.cursorStartOfDocument();
+            }
+            break;
 
-		case 'top' :
-		case 'start' :
-			this.cursorStartOfDocument();
-			break;
+        case 'top' :
+        case 'start' :
+            this.cursorStartOfDocument();
+            break;
 
-		case 'end' :
-		case 'bottom' :
-			this.cursorEndOfDocument();
-			break;
-	}
+        case 'end' :
+        case 'bottom' :
+            this.cursorEndOfDocument();
+            break;
+    }
 };
 
 MultiLineEditTextView.prototype.getData = function(options = { forceLineTerms : false } ) {
-	return this.getOutputText(0, this.textLines.length, '\r\n', options);
+    return this.getOutputText(0, this.textLines.length, '\r\n', options);
 };
 
 MultiLineEditTextView.prototype.setPropertyValue = function(propName, value) {
-	switch(propName) {
-		case 'mode'			:
-			this.mode = value;
-			if('preview' === value && !this.specialKeyMap.next) {
-				this.specialKeyMap.next = [ 'tab' ];
-			}
-			break;
+    switch(propName) {
+        case 'mode'			:
+            this.mode = value;
+            if('preview' === value && !this.specialKeyMap.next) {
+                this.specialKeyMap.next = [ 'tab' ];
+            }
+            break;
 
-		case 'autoScroll'	:
-			this.autoScroll = value;
-			break;
+        case 'autoScroll'	:
+            this.autoScroll = value;
+            break;
 
-		case 'tabSwitchesView' :
-			this.tabSwitchesView = value;
-			this.specialKeyMap.next = this.specialKeyMap.next || [];
-			this.specialKeyMap.next.push('tab');
-			break;
-	}
+        case 'tabSwitchesView' :
+            this.tabSwitchesView = value;
+            this.specialKeyMap.next = this.specialKeyMap.next || [];
+            this.specialKeyMap.next.push('tab');
+            break;
+    }
 
-	MultiLineEditTextView.super_.prototype.setPropertyValue.call(this, propName, value);
+    MultiLineEditTextView.super_.prototype.setPropertyValue.call(this, propName, value);
 };
 
 const HANDLED_SPECIAL_KEYS = [
-	'up', 'down', 'left', 'right',
-	'home', 'end',
-	'page up', 'page down',
-	'line feed',
-	'insert',
-	'tab',
-	'backspace', 'delete',
-	'delete line',
+    'up', 'down', 'left', 'right',
+    'home', 'end',
+    'page up', 'page down',
+    'line feed',
+    'insert',
+    'tab',
+    'backspace', 'delete',
+    'delete line',
 ];
 
 const PREVIEW_MODE_KEYS = [
-	'up', 'down', 'page up', 'page down'
+    'up', 'down', 'page up', 'page down'
 ];
 
 MultiLineEditTextView.prototype.onKeyPress = function(ch, key) {
-	const self = this;
-	let handled;
+    const self = this;
+    let handled;
 
-	if(key) {
-		HANDLED_SPECIAL_KEYS.forEach(function aKey(specialKey) {
-			if(self.isKeyMapped(specialKey, key.name)) {
+    if(key) {
+        HANDLED_SPECIAL_KEYS.forEach(function aKey(specialKey) {
+            if(self.isKeyMapped(specialKey, key.name)) {
 
-				if(self.isPreviewMode() && -1 === PREVIEW_MODE_KEYS.indexOf(specialKey)) {
-					return;
-				}
+                if(self.isPreviewMode() && -1 === PREVIEW_MODE_KEYS.indexOf(specialKey)) {
+                    return;
+                }
 
-				if('tab' !== key.name || !self.tabSwitchesView) {
-					self[_.camelCase('keyPress ' + specialKey)]();
-					handled = true;
-				}
-			}
-		});
-	}
+                if('tab' !== key.name || !self.tabSwitchesView) {
+                    self[_.camelCase('keyPress ' + specialKey)]();
+                    handled = true;
+                }
+            }
+        });
+    }
 
-	if(self.isEditMode() && ch && strUtil.isPrintable(ch)) {
-		this.keyPressCharacter(ch);
-	}
+    if(self.isEditMode() && ch && strUtil.isPrintable(ch)) {
+        this.keyPressCharacter(ch);
+    }
 
-	if(!handled) {
-		MultiLineEditTextView.super_.prototype.onKeyPress.call(this, ch, key);
-	}
+    if(!handled) {
+        MultiLineEditTextView.super_.prototype.onKeyPress.call(this, ch, key);
+    }
 };
 
 MultiLineEditTextView.prototype.scrollUp = function() {
-	this.scrollDocumentUp();
+    this.scrollDocumentUp();
 };
 
 MultiLineEditTextView.prototype.scrollDown = function() {
-	this.scrollDocumentDown();
+    this.scrollDocumentDown();
 };
 
 MultiLineEditTextView.prototype.deleteLine = function(line) {
-	this.textLines.splice(line, 1);
+    this.textLines.splice(line, 1);
 };
 
 MultiLineEditTextView.prototype.getLineCount = function() {
-	return this.textLines.length;
+    return this.textLines.length;
 };
 
 MultiLineEditTextView.prototype.getTextEditMode = function() {
-	return this.overtypeMode ? 'overtype' : 'insert';
+    return this.overtypeMode ? 'overtype' : 'insert';
 };
 
 MultiLineEditTextView.prototype.getEditPosition = function() {
-	var currentIndex = this.getTextLinesIndex() + 1;
+    var currentIndex = this.getTextLinesIndex() + 1;
 
-	return {
-		row		: this.getTextLinesIndex(this.cursorPos.row),
-		col 	: this.cursorPos.col,
-		percent	: Math.floor(((currentIndex / this.textLines.length) * 100)),
-		below	: this.getRemainingLinesBelowRow(),
-	};
+    return {
+        row		: this.getTextLinesIndex(this.cursorPos.row),
+        col 	: this.cursorPos.col,
+        percent	: Math.floor(((currentIndex / this.textLines.length) * 100)),
+        below	: this.getRemainingLinesBelowRow(),
+    };
 };
diff --git a/core/new_scan.js b/core/new_scan.js
index b088e47f..b84eab52 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -16,9 +16,9 @@ const _					= require('lodash');
 const async				= require('async');
 
 exports.moduleInfo = {
-	name		: 'New Scan',
-	desc		: 'Performs a new scan against various areas of the system',
-	author		: 'NuSkooler',
+    name		: 'New Scan',
+    desc		: 'Performs a new scan against various areas of the system',
+    author		: 'NuSkooler',
 };
 
 /*
@@ -30,239 +30,239 @@ exports.moduleInfo = {
 */
 
 const MciCodeIds = {
-	ScanStatusLabel	: 1,	//	TL1
-	ScanStatusList	: 2,	//	VM2 (appends)
+    ScanStatusLabel	: 1,	//	TL1
+    ScanStatusList	: 2,	//	VM2 (appends)
 };
 
 const Steps = {
-	MessageConfs	: 'messageConferences',
-	FileBase		: 'fileBase',
+    MessageConfs	: 'messageConferences',
+    FileBase		: 'fileBase',
 
-	Finished		: 'finished',
+    Finished		: 'finished',
 };
 
 exports.getModule = class NewScanModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
 
-		this.newScanFullExit	= _.get(options, 'lastMenuResult.fullExit', false);
+        this.newScanFullExit	= _.get(options, 'lastMenuResult.fullExit', false);
 
-		this.currentStep		= Steps.MessageConfs;
-		this.currentScanAux		= {};
+        this.currentStep		= Steps.MessageConfs;
+        this.currentScanAux		= {};
 
-		//  :TODO: Make this conf/area specific:
-		const config			= this.menuConfig.config;
-		this.scanStartFmt		= config.scanStartFmt || 'Scanning {confName} - {areaName}...';
-		this.scanFinishNoneFmt	= config.scanFinishNoneFmt || 'Nothing new';
-		this.scanFinishNewFmt	= config.scanFinishNewFmt || '{count} entries found';
-		this.scanCompleteMsg	= config.scanCompleteMsg || 'Finished newscan';
-	}
+        //  :TODO: Make this conf/area specific:
+        const config			= this.menuConfig.config;
+        this.scanStartFmt		= config.scanStartFmt || 'Scanning {confName} - {areaName}...';
+        this.scanFinishNoneFmt	= config.scanFinishNoneFmt || 'Nothing new';
+        this.scanFinishNewFmt	= config.scanFinishNewFmt || '{count} entries found';
+        this.scanCompleteMsg	= config.scanCompleteMsg || 'Finished newscan';
+    }
 
-	updateScanStatus(statusText) {
-		this.setViewText('allViews', MciCodeIds.ScanStatusLabel, statusText);
-	}
+    updateScanStatus(statusText) {
+        this.setViewText('allViews', MciCodeIds.ScanStatusLabel, statusText);
+    }
 
-	newScanMessageConference(cb) {
-		//  lazy init
-		if(!this.sortedMessageConfs) {
-			const getAvailOpts = { includeSystemInternal : true };      //  find new private messages, bulletins, etc.
+    newScanMessageConference(cb) {
+        //  lazy init
+        if(!this.sortedMessageConfs) {
+            const getAvailOpts = { includeSystemInternal : true };      //  find new private messages, bulletins, etc.
 
-			this.sortedMessageConfs = _.map(msgArea.getAvailableMessageConferences(this.client, getAvailOpts), (v, k) => {
-				return {
-					confTag : k,
-					conf    : v,
-				};
-			});
+            this.sortedMessageConfs = _.map(msgArea.getAvailableMessageConferences(this.client, getAvailOpts), (v, k) => {
+                return {
+                    confTag : k,
+                    conf    : v,
+                };
+            });
 
-			//
-			//	Sort conferences by name, other than 'system_internal' which should
-			//	always come first such that we display private mails/etc. before
-			//	other conferences & areas
-			//
-			this.sortedMessageConfs.sort((a, b) => {
-				if('system_internal' === a.confTag) {
-					return -1;
-				} else {
-					return a.conf.name.localeCompare(b.conf.name, { sensitivity : false, numeric : true } );
-				}
-			});
+            //
+            //	Sort conferences by name, other than 'system_internal' which should
+            //	always come first such that we display private mails/etc. before
+            //	other conferences & areas
+            //
+            this.sortedMessageConfs.sort((a, b) => {
+                if('system_internal' === a.confTag) {
+                    return -1;
+                } else {
+                    return a.conf.name.localeCompare(b.conf.name, { sensitivity : false, numeric : true } );
+                }
+            });
 
-			this.currentScanAux.conf = this.currentScanAux.conf || 0;
-			this.currentScanAux.area = this.currentScanAux.area || 0;
-		}
+            this.currentScanAux.conf = this.currentScanAux.conf || 0;
+            this.currentScanAux.area = this.currentScanAux.area || 0;
+        }
 
-		const currentConf = this.sortedMessageConfs[this.currentScanAux.conf];
+        const currentConf = this.sortedMessageConfs[this.currentScanAux.conf];
 
-		this.newScanMessageArea(currentConf, () => {
-			if(this.sortedMessageConfs.length > this.currentScanAux.conf + 1) {
-				this.currentScanAux.conf += 1;
-				this.currentScanAux.area = 0;
+        this.newScanMessageArea(currentConf, () => {
+            if(this.sortedMessageConfs.length > this.currentScanAux.conf + 1) {
+                this.currentScanAux.conf += 1;
+                this.currentScanAux.area = 0;
 
-				return this.newScanMessageConference(cb);  //  recursive to next conf
-			}
+                return this.newScanMessageConference(cb);  //  recursive to next conf
+            }
 
-			this.updateScanStatus(this.scanCompleteMsg);
-			return cb(Errors.DoesNotExist('No more conferences'));
-		});
-	}
+            this.updateScanStatus(this.scanCompleteMsg);
+            return cb(Errors.DoesNotExist('No more conferences'));
+        });
+    }
 
-	newScanMessageArea(conf, cb) {
-		//  :TODO: it would be nice to cache this - must be done by conf!
-		const sortedAreas   = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } );
-		const currentArea	= sortedAreas[this.currentScanAux.area];
+    newScanMessageArea(conf, cb) {
+        //  :TODO: it would be nice to cache this - must be done by conf!
+        const sortedAreas   = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } );
+        const currentArea	= sortedAreas[this.currentScanAux.area];
 
-		//
-		//	Scan and update index until we find something. If results are found,
-		//	we'll goto the list module & show them.
-		//
-		const self = this;
-		async.waterfall(
-			[
-				function checkAndUpdateIndex(callback) {
-					//	Advance to next area if possible
-					if(sortedAreas.length >= self.currentScanAux.area + 1) {
-						self.currentScanAux.area += 1;
-						return callback(null);
-					} else {
-						self.updateScanStatus(self.scanCompleteMsg);
-						return callback(Errors.DoesNotExist('No more areas'));	//	this will stop our scan
-					}
-				},
-				function updateStatusScanStarted(callback) {
-					self.updateScanStatus(stringFormat(self.scanStartFmt, {
-						confName    : conf.conf.name,
-						confDesc    : conf.conf.desc,
-						areaName    : currentArea.area.name,
-						areaDesc    : currentArea.area.desc
-					}));
-					return callback(null);
-				},
-				function getNewMessagesCountInArea(callback) {
-					msgArea.getNewMessageCountInAreaForUser(
-						self.client.user.userId, currentArea.areaTag, (err, newMessageCount) => {
-							callback(err, newMessageCount);
-						}
-					);
-				},
-				function displayMessageList(newMessageCount) {
-					if(newMessageCount <= 0) {
-						return self.newScanMessageArea(conf, cb);	//	next area, if any
-					}
+        //
+        //	Scan and update index until we find something. If results are found,
+        //	we'll goto the list module & show them.
+        //
+        const self = this;
+        async.waterfall(
+            [
+                function checkAndUpdateIndex(callback) {
+                    //	Advance to next area if possible
+                    if(sortedAreas.length >= self.currentScanAux.area + 1) {
+                        self.currentScanAux.area += 1;
+                        return callback(null);
+                    } else {
+                        self.updateScanStatus(self.scanCompleteMsg);
+                        return callback(Errors.DoesNotExist('No more areas'));	//	this will stop our scan
+                    }
+                },
+                function updateStatusScanStarted(callback) {
+                    self.updateScanStatus(stringFormat(self.scanStartFmt, {
+                        confName    : conf.conf.name,
+                        confDesc    : conf.conf.desc,
+                        areaName    : currentArea.area.name,
+                        areaDesc    : currentArea.area.desc
+                    }));
+                    return callback(null);
+                },
+                function getNewMessagesCountInArea(callback) {
+                    msgArea.getNewMessageCountInAreaForUser(
+                        self.client.user.userId, currentArea.areaTag, (err, newMessageCount) => {
+                            callback(err, newMessageCount);
+                        }
+                    );
+                },
+                function displayMessageList(newMessageCount) {
+                    if(newMessageCount <= 0) {
+                        return self.newScanMessageArea(conf, cb);	//	next area, if any
+                    }
 
-					const nextModuleOpts = {
-						extraArgs: {
-							messageAreaTag  : currentArea.areaTag,
-						}
-					};
+                    const nextModuleOpts = {
+                        extraArgs: {
+                            messageAreaTag  : currentArea.areaTag,
+                        }
+                    };
 
-					return self.gotoMenu(self.menuConfig.config.newScanMessageList || 'newScanMessageList', nextModuleOpts);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                    return self.gotoMenu(self.menuConfig.config.newScanMessageList || 'newScanMessageList', nextModuleOpts);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	newScanFileBase(cb) {
-		//	:TODO: add in steps
-		const filterCriteria = {
-			newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
-			areaTag			: getAvailableFileAreaTags(this.client),
-			order			: 'ascending',	//	oldest first
-		};
+    newScanFileBase(cb) {
+        //	:TODO: add in steps
+        const filterCriteria = {
+            newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
+            areaTag			: getAvailableFileAreaTags(this.client),
+            order			: 'ascending',	//	oldest first
+        };
 
-		FileEntry.findFiles(
-			filterCriteria,
-			(err, fileIds) => {
-				if(err || 0 === fileIds.length) {
-					return cb(err ? err : Errors.DoesNotExist('No more new files'));
-				}
+        FileEntry.findFiles(
+            filterCriteria,
+            (err, fileIds) => {
+                if(err || 0 === fileIds.length) {
+                    return cb(err ? err : Errors.DoesNotExist('No more new files'));
+                }
 
-				FileBaseFilters.setFileBaseLastViewedFileIdForUser( this.client.user, fileIds[fileIds.length - 1] );
+                FileBaseFilters.setFileBaseLastViewedFileIdForUser( this.client.user, fileIds[fileIds.length - 1] );
 
-				const menuOpts = {
-					extraArgs : {
-						fileList : fileIds,
-					},
-				};
+                const menuOpts = {
+                    extraArgs : {
+                        fileList : fileIds,
+                    },
+                };
 
-				return this.gotoMenu(this.menuConfig.config.newScanFileBaseList || 'newScanFileBaseList', menuOpts);
-			}
-		);
-	}
+                return this.gotoMenu(this.menuConfig.config.newScanFileBaseList || 'newScanFileBaseList', menuOpts);
+            }
+        );
+    }
 
-	getSaveState() {
-		return {
-			currentStep 	: this.currentStep,
-			currentScanAux	: this.currentScanAux,
-		};
-	}
+    getSaveState() {
+        return {
+            currentStep 	: this.currentStep,
+            currentScanAux	: this.currentScanAux,
+        };
+    }
 
-	restoreSavedState(savedState) {
-		this.currentStep 	= savedState.currentStep;
-		this.currentScanAux	= savedState.currentScanAux;
-	}
+    restoreSavedState(savedState) {
+        this.currentStep 	= savedState.currentStep;
+        this.currentScanAux	= savedState.currentScanAux;
+    }
 
-	performScanCurrentStep(cb) {
-		switch(this.currentStep) {
-			case Steps.MessageConfs :
-				this.newScanMessageConference( () => {
-					this.currentStep = Steps.FileBase;
-					return this.performScanCurrentStep(cb);
-				});
-				break;
+    performScanCurrentStep(cb) {
+        switch(this.currentStep) {
+            case Steps.MessageConfs :
+                this.newScanMessageConference( () => {
+                    this.currentStep = Steps.FileBase;
+                    return this.performScanCurrentStep(cb);
+                });
+                break;
 
-			case Steps.FileBase :
-				this.newScanFileBase( () => {
-					this.currentStep = Steps.Finished;
-					return this.performScanCurrentStep(cb);
-				});
-				break;
+            case Steps.FileBase :
+                this.newScanFileBase( () => {
+                    this.currentStep = Steps.Finished;
+                    return this.performScanCurrentStep(cb);
+                });
+                break;
 
-			default : return cb(null);
-		}
-	}
+            default : return cb(null);
+        }
+    }
 
-	mciReady(mciData, cb) {
-		if(this.newScanFullExit) {
-			//	user has canceled the entire scan @ message list view
-			return cb(null);
-		}
+    mciReady(mciData, cb) {
+        if(this.newScanFullExit) {
+            //	user has canceled the entire scan @ message list view
+            return cb(null);
+        }
 
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self	= this;
+            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-			//	:TODO: display scan step/etc.
+            //	:TODO: display scan step/etc.
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu,
-							noInput			: true,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu,
+                            noInput			: true,
+                        };
 
-						vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function performCurrentStepScan(callback) {
-						return self.performScanCurrentStep(callback);
-					}
-				],
-				err => {
-					if(err) {
-						self.client.log.error( { error : err.toString() }, 'Error during new scan');
-					}
-					return cb(err);
-				}
-			);
-		});
-	}
+                        vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function performCurrentStepScan(callback) {
+                        return self.performScanCurrentStep(callback);
+                    }
+                ],
+                err => {
+                    if(err) {
+                        self.client.log.error( { error : err.toString() }, 'Error during new scan');
+                    }
+                    return cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/nua.js b/core/nua.js
index cb7e16a7..011ad943 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -10,136 +10,136 @@ const Config		= require('./config.js').get;
 const messageArea	= require('./message_area.js');
 
 exports.moduleInfo = {
-	name	: 'NUA',
-	desc	: 'New User Application',
+    name	: 'NUA',
+    desc	: 'New User Application',
 };
 
 const MciViewIds = {
-	userName	: 1,
-	password	: 9,
-	confirm		: 10,
-	errMsg		: 11,
+    userName	: 1,
+    password	: 9,
+    confirm		: 10,
+    errMsg		: 11,
 };
 
 exports.getModule = class NewUserAppModule extends MenuModule {
 
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self = this;
+        const self = this;
 
-		this.menuMethods = {
-			//
-			//	Validation stuff
-			//
-			validatePassConfirmMatch : function(data, cb) {
-				const passwordView = self.viewControllers.menu.getView(MciViewIds.password);
-				return cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
-			},
+        this.menuMethods = {
+            //
+            //	Validation stuff
+            //
+            validatePassConfirmMatch : function(data, cb) {
+                const passwordView = self.viewControllers.menu.getView(MciViewIds.password);
+                return cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
+            },
 
-			viewValidationListener : function(err, cb) {
-				const errMsgView = self.viewControllers.menu.getView(MciViewIds.errMsg);
-				let newFocusId;
+            viewValidationListener : function(err, cb) {
+                const errMsgView = self.viewControllers.menu.getView(MciViewIds.errMsg);
+                let newFocusId;
 
-				if(err) {
-					errMsgView.setText(err.message);
-					err.view.clearText();
+                if(err) {
+                    errMsgView.setText(err.message);
+                    err.view.clearText();
 
-					if(err.view.getId() === MciViewIds.confirm) {
-						newFocusId = MciViewIds.password;
-						self.viewControllers.menu.getView(MciViewIds.password).clearText();
-					}
-				} else {
-					errMsgView.clearText();
-				}
+                    if(err.view.getId() === MciViewIds.confirm) {
+                        newFocusId = MciViewIds.password;
+                        self.viewControllers.menu.getView(MciViewIds.password).clearText();
+                    }
+                } else {
+                    errMsgView.clearText();
+                }
 
-				return cb(newFocusId);
-			},
+                return cb(newFocusId);
+            },
 
 
-			//
-			//	Submit handlers
-			//
-			submitApplication : function(formData, extraArgs, cb) {
-				const newUser = new User();
-				const config = Config();
+            //
+            //	Submit handlers
+            //
+            submitApplication : function(formData, extraArgs, cb) {
+                const newUser = new User();
+                const config = Config();
 
-				newUser.username = formData.value.username;
+                newUser.username = formData.value.username;
 
-				//
-				//	We have to disable ACS checks for initial default areas as the user is not yet ready
-				//
-				let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
-				let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
+                //
+                //	We have to disable ACS checks for initial default areas as the user is not yet ready
+                //
+                let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
+                let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
 
-				//  can't store undefined!
-				confTag = confTag || '';
-				areaTag = areaTag || '';
+                //  can't store undefined!
+                confTag = confTag || '';
+                areaTag = areaTag || '';
 
-				newUser.properties = {
-					real_name			: formData.value.realName,
-					birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(), 	//	:TODO: Use moment & explicit ISO string format
-					sex					: formData.value.sex,
-					location			: formData.value.location,
-					affiliation			: formData.value.affils,
-					email_address		: formData.value.email,
-					web_address			: formData.value.web,
-					account_created		: new Date().toISOString(),	//	:TODO: Use moment & explicit ISO string format
+                newUser.properties = {
+                    real_name			: formData.value.realName,
+                    birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(), 	//	:TODO: Use moment & explicit ISO string format
+                    sex					: formData.value.sex,
+                    location			: formData.value.location,
+                    affiliation			: formData.value.affils,
+                    email_address		: formData.value.email,
+                    web_address			: formData.value.web,
+                    account_created		: new Date().toISOString(),	//	:TODO: Use moment & explicit ISO string format
 
-					message_conf_tag    : confTag,
-					message_area_tag    : areaTag,
+                    message_conf_tag    : confTag,
+                    message_area_tag    : areaTag,
 
-					term_height			: self.client.term.termHeight,
-					term_width			: self.client.term.termWidth,
+                    term_height			: self.client.term.termHeight,
+                    term_width			: self.client.term.termWidth,
 
-					//	:TODO: Other defaults
-					//	:TODO: should probably have a place to create defaults/etc.
-				};
+                    //	:TODO: Other defaults
+                    //	:TODO: should probably have a place to create defaults/etc.
+                };
 
-				if('*' === config.defaults.theme) {
-					newUser.properties.theme_id = theme.getRandomTheme();
-				} else {
-					newUser.properties.theme_id = config.defaults.theme;
-				}
+                if('*' === config.defaults.theme) {
+                    newUser.properties.theme_id = theme.getRandomTheme();
+                } else {
+                    newUser.properties.theme_id = config.defaults.theme;
+                }
 
-				//	:TODO: User.create() should validate email uniqueness!
-				newUser.create(formData.value.password, err => {
-					if(err) {
-						self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
+                //	:TODO: User.create() should validate email uniqueness!
+                newUser.create(formData.value.password, err => {
+                    if(err) {
+                        self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
 
-						self.gotoMenu(extraArgs.error, err => {
-							if(err) {
-								return self.prevMenu(cb);
-							}
-							return cb(null);
-						});
-					} else {
-						self.client.log.info( { username : formData.value.username, userId : newUser.userId }, 'New user created');
+                        self.gotoMenu(extraArgs.error, err => {
+                            if(err) {
+                                return self.prevMenu(cb);
+                            }
+                            return cb(null);
+                        });
+                    } else {
+                        self.client.log.info( { username : formData.value.username, userId : newUser.userId }, 'New user created');
 
-						//	Cache SysOp information now
-						//	:TODO: Similar to bbs.js. DRY
-						if(newUser.isSysOp()) {
-							config.general.sysOp = {
-								username	: formData.value.username,
-								properties	: newUser.properties,
-							};
-						}
+                        //	Cache SysOp information now
+                        //	:TODO: Similar to bbs.js. DRY
+                        if(newUser.isSysOp()) {
+                            config.general.sysOp = {
+                                username	: formData.value.username,
+                                properties	: newUser.properties,
+                            };
+                        }
 
-						if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
-							return self.gotoMenu(extraArgs.inactive, cb);
-						} else {
-							//
-							//	If active now, we need to call login() to authenticate
-							//
-							return login(self, formData, extraArgs, cb);
-						}
-					}
-				});
-			},
-		};
-	}
+                        if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
+                            return self.gotoMenu(extraArgs.inactive, cb);
+                        } else {
+                            //
+                            //	If active now, we need to call login() to authenticate
+                            //
+                            return login(self, formData, extraArgs, cb);
+                        }
+                    }
+                });
+            },
+        };
+    }
 
-	mciReady(mciData, cb) {
-		return this.standardMCIReadyHandler(mciData, cb);
-	}
+    mciReady(mciData, cb) {
+        return this.standardMCIReadyHandler(mciData, cb);
+    }
 };
diff --git a/core/onelinerz.js b/core/onelinerz.js
index 65599ba9..d54d7f4f 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -5,8 +5,8 @@
 const MenuModule			= require('./menu_module.js').MenuModule;
 
 const {
-	getModDatabasePath,
-	getTransactionDatabase
+    getModDatabasePath,
+    getTransactionDatabase
 }							= require('./database.js');
 
 const ViewController		= require('./view_controller.js').ViewController;
@@ -30,136 +30,136 @@ const moment				= require('moment');
 
 
 exports.moduleInfo = {
-	name		: 'Onelinerz',
-	desc		: 'Standard local onelinerz',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.onelinerz',
+    name		: 'Onelinerz',
+    desc		: 'Standard local onelinerz',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.onelinerz',
 };
 
 const MciViewIds = {
-	ViewForm	:  {
-		Entries		: 1,
-		AddPrompt	: 2,
-	},
-	AddForm : {
-		NewEntry		: 1,
-		EntryPreview	: 2,
-		AddPrompt		: 3,
-	}
+    ViewForm	:  {
+        Entries		: 1,
+        AddPrompt	: 2,
+    },
+    AddForm : {
+        NewEntry		: 1,
+        EntryPreview	: 2,
+        AddPrompt		: 3,
+    }
 };
 
 const FormIds = {
-	View	: 0,
-	Add		: 1,
+    View	: 0,
+    Add		: 1,
 };
 
 exports.getModule = class OnelinerzModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self = this;
+        const self = this;
 
-		this.menuMethods = {
-			viewAddScreen : function(formData, extraArgs, cb) {
-				return self.displayAddScreen(cb);
-			},
+        this.menuMethods = {
+            viewAddScreen : function(formData, extraArgs, cb) {
+                return self.displayAddScreen(cb);
+            },
 
-			addEntry : function(formData, extraArgs, cb) {
-				if(_.isString(formData.value.oneliner) && formData.value.oneliner.length > 0) {
-					const oneliner = formData.value.oneliner.trim();	//	remove any trailing ws
+            addEntry : function(formData, extraArgs, cb) {
+                if(_.isString(formData.value.oneliner) && formData.value.oneliner.length > 0) {
+                    const oneliner = formData.value.oneliner.trim();	//	remove any trailing ws
 
-					self.storeNewOneliner(oneliner, err => {
-						if(err) {
-							self.client.log.warn( { error : err.message }, 'Failed saving oneliner');
-						}
+                    self.storeNewOneliner(oneliner, err => {
+                        if(err) {
+                            self.client.log.warn( { error : err.message }, 'Failed saving oneliner');
+                        }
 
-						self.clearAddForm();
-						return self.displayViewScreen(true, cb);	//	true=cls
-					});
+                        self.clearAddForm();
+                        return self.displayViewScreen(true, cb);	//	true=cls
+                    });
 
-				} else {
-					//	empty message - treat as if cancel was hit
-					return self.displayViewScreen(true, cb);	//	true=cls
-				}
-			},
+                } else {
+                    //	empty message - treat as if cancel was hit
+                    return self.displayViewScreen(true, cb);	//	true=cls
+                }
+            },
 
-			cancelAdd : function(formData, extraArgs, cb) {
-				self.clearAddForm();
-				return self.displayViewScreen(true, cb);	//	true=cls
-			}
-		};
-	}
+            cancelAdd : function(formData, extraArgs, cb) {
+                self.clearAddForm();
+                return self.displayViewScreen(true, cb);	//	true=cls
+            }
+        };
+    }
 
-	initSequence() {
-		const self = this;
-		async.series(
-			[
-				function beforeDisplayArt(callback) {
-					return self.beforeArt(callback);
-				},
-				function display(callback) {
-					return self.displayViewScreen(false, callback);
-				}
-			],
-			err => {
-				if(err) {
-					//	:TODO: Handle me -- initSequence() should really take a completion callback
-				}
-				self.finishedLoading();
-			}
-		);
-	}
+    initSequence() {
+        const self = this;
+        async.series(
+            [
+                function beforeDisplayArt(callback) {
+                    return self.beforeArt(callback);
+                },
+                function display(callback) {
+                    return self.displayViewScreen(false, callback);
+                }
+            ],
+            err => {
+                if(err) {
+                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                }
+                self.finishedLoading();
+            }
+        );
+    }
 
-	displayViewScreen(clearScreen, cb) {
-		const self = this;
+    displayViewScreen(clearScreen, cb) {
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					if(self.viewControllers.add) {
-						self.viewControllers.add.setFocus(false);
-					}
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    if(self.viewControllers.add) {
+                        self.viewControllers.add.setFocus(false);
+                    }
 
-					if(clearScreen) {
-						self.client.term.rawWrite(ansi.resetScreen());
-					}
+                    if(clearScreen) {
+                        self.client.term.rawWrite(ansi.resetScreen());
+                    }
 
-					theme.displayThemedAsset(
-						self.menuConfig.config.art.entries,
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'view',
-							new ViewController( { client : self.client, formId : FormIds.View } )
-						);
+                    theme.displayThemedAsset(
+                        self.menuConfig.config.art.entries,
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'view',
+                            new ViewController( { client : self.client, formId : FormIds.View } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.View,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.View,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.view.setFocus(true);
-						self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt).redraw();
-						return callback(null);
-					}
-				},
-				function fetchEntries(callback) {
-					const entriesView = self.viewControllers.view.getView(MciViewIds.ViewForm.Entries);
-					const limit = entriesView.dimens.height;
-					let entries = [];
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.view.setFocus(true);
+                        self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt).redraw();
+                        return callback(null);
+                    }
+                },
+                function fetchEntries(callback) {
+                    const entriesView = self.viewControllers.view.getView(MciViewIds.ViewForm.Entries);
+                    const limit = entriesView.dimens.height;
+                    let entries = [];
 
-					self.db.each(
-						`SELECT *
+                    self.db.each(
+                        `SELECT *
 						FROM (
 							SELECT * 
 							FROM onelinerz
@@ -167,172 +167,172 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 							LIMIT ${limit}
 							)
 						ORDER BY timestamp ASC;`,
-						(err, row) => {
-							if(!err) {
-								row.timestamp = moment(row.timestamp);	//	convert -> moment
-								entries.push(row);
-							}
-						},
-						err => {
-							return callback(err, entriesView, entries);
-						}
-					);
-				},
-				function populateEntries(entriesView, entries, callback) {
-					const listFormat	= self.menuConfig.config.listFormat || '{username}@{ts}: {oneliner}';//	:TODO: should be userName to be consistent
-					const tsFormat		= self.menuConfig.config.timestampFormat || 'ddd h:mma';
+                        (err, row) => {
+                            if(!err) {
+                                row.timestamp = moment(row.timestamp);	//	convert -> moment
+                                entries.push(row);
+                            }
+                        },
+                        err => {
+                            return callback(err, entriesView, entries);
+                        }
+                    );
+                },
+                function populateEntries(entriesView, entries, callback) {
+                    const listFormat	= self.menuConfig.config.listFormat || '{username}@{ts}: {oneliner}';//	:TODO: should be userName to be consistent
+                    const tsFormat		= self.menuConfig.config.timestampFormat || 'ddd h:mma';
 
-					entriesView.setItems(entries.map( e => {
-						return stringFormat(listFormat, {
-							userId		: e.user_id,
-							username	: e.user_name,
-							oneliner	: e.oneliner,
-							ts			: e.timestamp.format(tsFormat),
-						} );
-					}));
+                    entriesView.setItems(entries.map( e => {
+                        return stringFormat(listFormat, {
+                            userId		: e.user_id,
+                            username	: e.user_name,
+                            oneliner	: e.oneliner,
+                            ts			: e.timestamp.format(tsFormat),
+                        } );
+                    }));
 
-					entriesView.redraw();
+                    entriesView.redraw();
 
-					return callback(null);
-				},
-				function finalPrep(callback) {
-					const promptView = self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt);
-					promptView.setFocusItemIndex(1);	//	default to NO
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                    return callback(null);
+                },
+                function finalPrep(callback) {
+                    const promptView = self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt);
+                    promptView.setFocusItemIndex(1);	//	default to NO
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	displayAddScreen(cb) {
-		const self = this;
+    displayAddScreen(cb) {
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					self.viewControllers.view.setFocus(false);
-					self.client.term.rawWrite(ansi.resetScreen());
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    self.viewControllers.view.setFocus(false);
+                    self.client.term.rawWrite(ansi.resetScreen());
 
-					theme.displayThemedAsset(
-						self.menuConfig.config.art.add,
-						self.client,
-						{ font : self.menuConfig.font },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'add',
-							new ViewController( { client : self.client, formId : FormIds.Add } )
-						);
+                    theme.displayThemedAsset(
+                        self.menuConfig.config.art.add,
+                        self.client,
+                        { font : self.menuConfig.font },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'add',
+                            new ViewController( { client : self.client, formId : FormIds.Add } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.Add,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.Add,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.add.setFocus(true);
-						self.viewControllers.add.redrawAll();
-						self.viewControllers.add.switchFocus(MciViewIds.AddForm.NewEntry);
-						return callback(null);
-					}
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.add.setFocus(true);
+                        self.viewControllers.add.redrawAll();
+                        self.viewControllers.add.switchFocus(MciViewIds.AddForm.NewEntry);
+                        return callback(null);
+                    }
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	clearAddForm() {
-		this.setViewText('add', MciViewIds.AddForm.NewEntry, '');
-		this.setViewText('add', MciViewIds.AddForm.EntryPreview, '');
-	}
+    clearAddForm() {
+        this.setViewText('add', MciViewIds.AddForm.NewEntry, '');
+        this.setViewText('add', MciViewIds.AddForm.EntryPreview, '');
+    }
 
-	initDatabase(cb) {
-		const self = this;
+    initDatabase(cb) {
+        const self = this;
 
-		async.series(
-			[
-				function openDatabase(callback) {
-					self.db = getTransactionDatabase(new sqlite3.Database(
-						getModDatabasePath(exports.moduleInfo),
-						err => {
-							return callback(err);
-						}
-					));
-				},
-				function createTables(callback) {
-					self.db.run(
-						`CREATE TABLE IF NOT EXISTS onelinerz (
+        async.series(
+            [
+                function openDatabase(callback) {
+                    self.db = getTransactionDatabase(new sqlite3.Database(
+                        getModDatabasePath(exports.moduleInfo),
+                        err => {
+                            return callback(err);
+                        }
+                    ));
+                },
+                function createTables(callback) {
+                    self.db.run(
+                        `CREATE TABLE IF NOT EXISTS onelinerz (
 							id				INTEGER PRIMARY KEY,
 							user_id			INTEGER_NOT NULL,
 							user_name		VARCHAR NOT NULL,								
 							oneliner		VARCHAR NOT NULL,
 							timestamp		DATETIME NOT NULL
 						);`
-						,
-						err => {
-							return callback(err);
-						});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                        ,
+                        err => {
+                            return callback(err);
+                        });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	storeNewOneliner(oneliner, cb) {
-		const self	= this;
-		const ts	= moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+    storeNewOneliner(oneliner, cb) {
+        const self	= this;
+        const ts	= moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 
-		async.series(
-			[
-				function addRec(callback) {
-					self.db.run(
-						`INSERT INTO onelinerz (user_id, user_name, oneliner, timestamp)
+        async.series(
+            [
+                function addRec(callback) {
+                    self.db.run(
+                        `INSERT INTO onelinerz (user_id, user_name, oneliner, timestamp)
 						VALUES (?, ?, ?, ?);`,
-						[ self.client.user.userId, self.client.user.username, oneliner, ts ],
-						callback
-					);
-				},
-				function removeOld(callback) {
-					//	keep 25 max most recent items - remove the older ones
-					self.db.run(
-						`DELETE FROM onelinerz
+                        [ self.client.user.userId, self.client.user.username, oneliner, ts ],
+                        callback
+                    );
+                },
+                function removeOld(callback) {
+                    //	keep 25 max most recent items - remove the older ones
+                    self.db.run(
+                        `DELETE FROM onelinerz
 						WHERE id IN (
 							SELECT id
 							FROM onelinerz
 							ORDER BY id DESC
 							LIMIT -1 OFFSET 25
 						);`,
-						callback
-					);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                        callback
+                    );
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	beforeArt(cb) {
-		super.beforeArt(err => {
-			return err ? cb(err) : this.initDatabase(cb);
-		});
-	}
+    beforeArt(cb) {
+        super.beforeArt(err => {
+            return err ? cb(err) : this.initDatabase(cb);
+        });
+    }
 };
diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index 18546c98..13f9ec91 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -16,83 +16,83 @@ exports.getAreaAndStorage				= getAreaAndStorage;
 exports.looksLikePattern				= looksLikePattern;
 
 const exitCodes = exports.ExitCodes = {
-	SUCCESS		: 0,
-	ERROR		: -1,
-	BAD_COMMAND	: -2,
-	BAD_ARGS	: -3,
+    SUCCESS		: 0,
+    ERROR		: -1,
+    BAD_COMMAND	: -2,
+    BAD_ARGS	: -3,
 };
 
 const argv = exports.argv = require('minimist')(process.argv.slice(2), {
-	alias : {
-		h	 	: 'help',
-		v		: 'version',
-		c		: 'config',
-		n		: 'no-prompt',
-	}
+    alias : {
+        h	 	: 'help',
+        v		: 'version',
+        c		: 'config',
+        n		: 'no-prompt',
+    }
 });
 
 function printUsageAndSetExitCode(errMsg, exitCode) {
-	if(_.isUndefined(exitCode)) {
-		exitCode = exitCodes.ERROR;
-	}
+    if(_.isUndefined(exitCode)) {
+        exitCode = exitCodes.ERROR;
+    }
 
-	process.exitCode = exitCode;
+    process.exitCode = exitCode;
 
-	if(errMsg) {
-		console.error(errMsg);
-	}
+    if(errMsg) {
+        console.error(errMsg);
+    }
 }
 
 function getDefaultConfigPath() {
-	return './config/';
+    return './config/';
 }
 
 function getConfigPath() {
-	const baseConfigPath = argv.config ? argv.config : config.getDefaultPath();
-	return baseConfigPath + 'config.hjson';
+    const baseConfigPath = argv.config ? argv.config : config.getDefaultPath();
+    return baseConfigPath + 'config.hjson';
 }
 
 function initConfig(cb) {
-	const configPath = getConfigPath();
+    const configPath = getConfigPath();
 
-	config.init(configPath, { keepWsc : true, noWatch : true }, cb);
+    config.init(configPath, { keepWsc : true, noWatch : true }, cb);
 }
 
 function initConfigAndDatabases(cb) {
-	async.series(
-		[
-			function init(callback) {
-				initConfig(callback);
-			},
-			function initDb(callback) {
-				db.initializeDatabases(callback);
-			},
-		],
-		err => {
-			return cb(err);
-		}
-	);
+    async.series(
+        [
+            function init(callback) {
+                initConfig(callback);
+            },
+            function initDb(callback) {
+                db.initializeDatabases(callback);
+            },
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function getAreaAndStorage(tags) {
-	return tags.map(tag => {
-		const parts = tag.toString().split('@');
-		const entry = {
-			areaTag	: parts[0],
-		};
-		entry.pattern = entry.areaTag;	//	handy
-		if(parts[1]) {
-			entry.storageTag = parts[1];
-		}
-		return entry;
-	});
+    return tags.map(tag => {
+        const parts = tag.toString().split('@');
+        const entry = {
+            areaTag	: parts[0],
+        };
+        entry.pattern = entry.areaTag;	//	handy
+        if(parts[1]) {
+            entry.storageTag = parts[1];
+        }
+        return entry;
+    });
 }
 
 function looksLikePattern(tag) {
-	//	globs can start with @
-	if(tag.indexOf('@') > 0) {
-		return false;
-	}
+    //	globs can start with @
+    if(tag.indexOf('@') > 0) {
+        return false;
+    }
 
-	return /[*?[\]!()+|^]/.test(tag);
+    return /[*?[\]!()+|^]/.test(tag);
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 3edfc1f3..d28c977f 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -25,536 +25,536 @@ exports.handleConfigCommand				= handleConfigCommand;
 
 
 function getAnswers(questions, cb) {
-	inq.prompt(questions).then( answers => {
-		return cb(answers);
-	});
+    inq.prompt(questions).then( answers => {
+        return cb(answers);
+    });
 }
 
 const QUESTIONS = {
-	Intro		: [
-		{
-			name	: 'createNewConfig',
-			message	: 'Create a new configuration?',
-			type	: 'confirm',
-			default	: false,
-		},
-		{
-			name	: 'configPath',
-			message	: 'Configuration path:',
-			default	: getConfigPath(),
-			when	: answers => answers.createNewConfig
-		},	
-	],
-	
-	OverwriteConfig	: [
-		{
-			name	: 'overwriteConfig',
-			message	: 'Config file exists. Overwrite?',
-			type	: 'confirm',
-			default	: false,
-		}
-	],
-	
-	Basic			: [
-		{
-			name	: 'boardName',
-			message	: 'BBS name:',
-			default	: 'New ENiGMA½ BBS',
-		},
-	],
-	
-	Misc		: [
-		{
-			name	: 'loggingLevel',
-			message	: 'Logging level:',
-			type	: 'list',
-			choices	: [ 'Error', 'Warn', 'Info', 'Debug', 'Trace' ],
-			default	: 2,
-			filter	: s => s.toLowerCase(),
-		},
-		{
-			name	: 'sevenZipExe',
-			message	: '7-Zip executable:',
-			type	: 'list',
-			choices	: [ '7z', '7za', 'None' ]
-		}
-	],
-	
-	MessageConfAndArea	: [
-		{
-			name	: 'msgConfName',
-			message	: 'First message conference:',
-			default	: 'Local',
-		},
-		{
-			name	: 'msgConfDesc',
-			message	: 'Conference description:',
-			default	: 'Local Areas',	
-		},
-		{
-			name	: 'msgAreaName',
-			message	: 'First area in message conference:',
-			default	: 'General',
-		},
-		{
-			name	: 'msgAreaDesc',
-			message	: 'Area description:',
-			default	: 'General chit-chat',
-		}
-	]
+    Intro		: [
+        {
+            name	: 'createNewConfig',
+            message	: 'Create a new configuration?',
+            type	: 'confirm',
+            default	: false,
+        },
+        {
+            name	: 'configPath',
+            message	: 'Configuration path:',
+            default	: getConfigPath(),
+            when	: answers => answers.createNewConfig
+        },
+    ],
+
+    OverwriteConfig	: [
+        {
+            name	: 'overwriteConfig',
+            message	: 'Config file exists. Overwrite?',
+            type	: 'confirm',
+            default	: false,
+        }
+    ],
+
+    Basic			: [
+        {
+            name	: 'boardName',
+            message	: 'BBS name:',
+            default	: 'New ENiGMA½ BBS',
+        },
+    ],
+
+    Misc		: [
+        {
+            name	: 'loggingLevel',
+            message	: 'Logging level:',
+            type	: 'list',
+            choices	: [ 'Error', 'Warn', 'Info', 'Debug', 'Trace' ],
+            default	: 2,
+            filter	: s => s.toLowerCase(),
+        },
+        {
+            name	: 'sevenZipExe',
+            message	: '7-Zip executable:',
+            type	: 'list',
+            choices	: [ '7z', '7za', 'None' ]
+        }
+    ],
+
+    MessageConfAndArea	: [
+        {
+            name	: 'msgConfName',
+            message	: 'First message conference:',
+            default	: 'Local',
+        },
+        {
+            name	: 'msgConfDesc',
+            message	: 'Conference description:',
+            default	: 'Local Areas',
+        },
+        {
+            name	: 'msgAreaName',
+            message	: 'First area in message conference:',
+            default	: 'General',
+        },
+        {
+            name	: 'msgAreaDesc',
+            message	: 'Area description:',
+            default	: 'General chit-chat',
+        }
+    ]
 };
 
 function makeMsgConfAreaName(s) {
-	return s.toLowerCase().replace(/\s+/g, '_');
+    return s.toLowerCase().replace(/\s+/g, '_');
 }
 
 function askNewConfigQuestions(cb) {
-	
-	const ui = new inq.ui.BottomBar();
-	
-	let configPath;
-	let config;
-	
-	async.waterfall(
-		[
-			function intro(callback) {
-				getAnswers(QUESTIONS.Intro, answers => {
-					if(!answers.createNewConfig) {
-						return callback('exit');
-					}
-					
-					//	adjust for ~ and the like
-					configPath = resolvePath(answers.configPath);
-					
-					const configDir = paths.dirname(configPath);
-					mkdirsSync(configDir);
-					
-					//
-					//	Check if the file exists and can be written to
-					//
-					fs.access(configPath, fs.F_OK | fs.W_OK, err => {
-						if(err) {
-							if('EACCES' === err.code) {
-								ui.log.write(`${configPath} cannot be written to`);
-								callback('exit');
-							} else if('ENOENT' === err.code) {
-								callback(null, false);
-							}	
-						} else {
-							callback(null, true);	//	exists + writable
-						}
-					});
-				});
-			},
-			function promptOverwrite(needPrompt, callback) {		
-				if(needPrompt) {
-					getAnswers(QUESTIONS.OverwriteConfig, answers => {
-						callback(answers.overwriteConfig ? null : 'exit');
-					});
-				} else {
-					callback(null);
-				}
-			},
-			function basic(callback) {				
-				getAnswers(QUESTIONS.Basic, answers => {
-					config = {
-						general : {
-							boardName : answers.boardName,
-						},
-					};
-					
-					callback(null);
-				});
-			},
-			function msgConfAndArea(callback) {
-				getAnswers(QUESTIONS.MessageConfAndArea, answers => {
-					config.messageConferences = {};
-					
-					const confName	= makeMsgConfAreaName(answers.msgConfName);
-					const areaName	= makeMsgConfAreaName(answers.msgAreaName);
-					
-					config.messageConferences[confName] = {
-						name	: answers.msgConfName,
-						desc	: answers.msgConfDesc,
-						sort	: 1,
-						default	: true,
-					};
-					
-					config.messageConferences.another_sample_conf = {
-						name	: 'Another Sample Conference',
-						desc	: 'Another conference example. Change me!',
-						sort	: 2,	
-					};
-					
-					config.messageConferences[confName].areas = {};
-					config.messageConferences[confName].areas[areaName] = {
-						name	: answers.msgAreaName,
-						desc	: answers.msgAreaDesc,
-						sort	: 1,
-						default	: true,	
-					};
-					
-					config.messageConferences.another_sample_conf = {
-						name	: 'Another Sample Conference',
-						desc	: 'Another conf sample. Change me!',
 
-						areas :  {
-							another_sample_area : {
-								name	: 'Another Sample Area',
-								desc	: 'Another area example. Change me!',
-								sort	: 2
-							}
-						}
-					};
-					
-					callback(null);
-				});
-			},
-			function misc(callback) {
-				getAnswers(QUESTIONS.Misc, answers => {
-					if('None' !== answers.sevenZipExe) {
-						config.archivers = {
-							zip : {
-								compressCmd		: answers.sevenZipExe,
-								decompressCmd	: answers.sevenZipExe,
-							}
-						};
-					}
-					
-					config.logging = {
-						level : answers.loggingLevel,
-					};
-					
-					callback(null);
-				});
-			}
-		],
-		err => {
-			cb(err, configPath, config);
-		}
-	);
+    const ui = new inq.ui.BottomBar();
+
+    let configPath;
+    let config;
+
+    async.waterfall(
+        [
+            function intro(callback) {
+                getAnswers(QUESTIONS.Intro, answers => {
+                    if(!answers.createNewConfig) {
+                        return callback('exit');
+                    }
+
+                    //	adjust for ~ and the like
+                    configPath = resolvePath(answers.configPath);
+
+                    const configDir = paths.dirname(configPath);
+                    mkdirsSync(configDir);
+
+                    //
+                    //	Check if the file exists and can be written to
+                    //
+                    fs.access(configPath, fs.F_OK | fs.W_OK, err => {
+                        if(err) {
+                            if('EACCES' === err.code) {
+                                ui.log.write(`${configPath} cannot be written to`);
+                                callback('exit');
+                            } else if('ENOENT' === err.code) {
+                                callback(null, false);
+                            }
+                        } else {
+                            callback(null, true);	//	exists + writable
+                        }
+                    });
+                });
+            },
+            function promptOverwrite(needPrompt, callback) {
+                if(needPrompt) {
+                    getAnswers(QUESTIONS.OverwriteConfig, answers => {
+                        callback(answers.overwriteConfig ? null : 'exit');
+                    });
+                } else {
+                    callback(null);
+                }
+            },
+            function basic(callback) {
+                getAnswers(QUESTIONS.Basic, answers => {
+                    config = {
+                        general : {
+                            boardName : answers.boardName,
+                        },
+                    };
+
+                    callback(null);
+                });
+            },
+            function msgConfAndArea(callback) {
+                getAnswers(QUESTIONS.MessageConfAndArea, answers => {
+                    config.messageConferences = {};
+
+                    const confName	= makeMsgConfAreaName(answers.msgConfName);
+                    const areaName	= makeMsgConfAreaName(answers.msgAreaName);
+
+                    config.messageConferences[confName] = {
+                        name	: answers.msgConfName,
+                        desc	: answers.msgConfDesc,
+                        sort	: 1,
+                        default	: true,
+                    };
+
+                    config.messageConferences.another_sample_conf = {
+                        name	: 'Another Sample Conference',
+                        desc	: 'Another conference example. Change me!',
+                        sort	: 2,
+                    };
+
+                    config.messageConferences[confName].areas = {};
+                    config.messageConferences[confName].areas[areaName] = {
+                        name	: answers.msgAreaName,
+                        desc	: answers.msgAreaDesc,
+                        sort	: 1,
+                        default	: true,
+                    };
+
+                    config.messageConferences.another_sample_conf = {
+                        name	: 'Another Sample Conference',
+                        desc	: 'Another conf sample. Change me!',
+
+                        areas :  {
+                            another_sample_area : {
+                                name	: 'Another Sample Area',
+                                desc	: 'Another area example. Change me!',
+                                sort	: 2
+                            }
+                        }
+                    };
+
+                    callback(null);
+                });
+            },
+            function misc(callback) {
+                getAnswers(QUESTIONS.Misc, answers => {
+                    if('None' !== answers.sevenZipExe) {
+                        config.archivers = {
+                            zip : {
+                                compressCmd		: answers.sevenZipExe,
+                                decompressCmd	: answers.sevenZipExe,
+                            }
+                        };
+                    }
+
+                    config.logging = {
+                        level : answers.loggingLevel,
+                    };
+
+                    callback(null);
+                });
+            }
+        ],
+        err => {
+            cb(err, configPath, config);
+        }
+    );
 }
 
 function writeConfig(config, path) {
-	config = hjson.stringify(config, { bracesSameLine : true, spaces : '\t', keepWsc : true, quotes : 'strings' } );
-	
-	try {
-		fs.writeFileSync(path, config, 'utf8');
-		return true;
-	} catch(e) {
-		return false;
-	}	
+    config = hjson.stringify(config, { bracesSameLine : true, spaces : '\t', keepWsc : true, quotes : 'strings' } );
+
+    try {
+        fs.writeFileSync(path, config, 'utf8');
+        return true;
+    } catch(e) {
+        return false;
+    }
 }
 
 function buildNewConfig() {
-	askNewConfigQuestions( (err, configPath, config) => {
-		if(err) {								
-			return;
-		}
+    askNewConfigQuestions( (err, configPath, config) => {
+        if(err) {
+            return;
+        }
 
-		if(writeConfig(config, configPath)) {
-			console.info('Configuration generated');
-		} else {
-			console.error('Failed writing configuration');
-		}
-	});
+        if(writeConfig(config, configPath)) {
+            console.info('Configuration generated');
+        } else {
+            console.error('Failed writing configuration');
+        }
+    });
 }
 
 function validateUplinks(uplinks) {
-	const ftnAddress = require('../../core/ftn_address.js');
-	const valid = uplinks.every(ul => {
-		const addr = ftnAddress.fromString(ul);
-		return addr;
-	});
-	return valid;
+    const ftnAddress = require('../../core/ftn_address.js');
+    const valid = uplinks.every(ul => {
+        const addr = ftnAddress.fromString(ul);
+        return addr;
+    });
+    return valid;
 }
 
 function getMsgAreaImportType(path) {
-	if(argv.type) {
-		return argv.type.toLowerCase();
-	}
+    if(argv.type) {
+        return argv.type.toLowerCase();
+    }
 
-	const ext = paths.extname(path).toLowerCase().substr(1);
-	return ext;	//	.bbs|.na|...
+    const ext = paths.extname(path).toLowerCase().substr(1);
+    return ext;	//	.bbs|.na|...
 }
 
 function importAreas() {
-	const importPath = argv._[argv._.length - 1];
-	if(argv._.length < 3 || !importPath || 0 === importPath.length) {
-		return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
-	}
+    const importPath = argv._[argv._.length - 1];
+    if(argv._.length < 3 || !importPath || 0 === importPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
+    }
 
-	const importType = getMsgAreaImportType(importPath);
-	if('na' !== importType && 'bbs' !== importType) {
-		return console.error(`"${importType}" is not a recognized import file type`);
-	}
+    const importType = getMsgAreaImportType(importPath);
+    if('na' !== importType && 'bbs' !== importType) {
+        return console.error(`"${importType}" is not a recognized import file type`);
+    }
 
-	//	optional data - we'll prompt if for anything not found
-	let confTag		= argv.conf;
-	let networkName	= argv.network;
-	let uplinks		= argv.uplinks;
-	if(uplinks) {
-		uplinks = uplinks.split(/[\s,]+/);		
-	}
+    //	optional data - we'll prompt if for anything not found
+    let confTag		= argv.conf;
+    let networkName	= argv.network;
+    let uplinks		= argv.uplinks;
+    if(uplinks) {
+        uplinks = uplinks.split(/[\s,]+/);
+    }
 
-	let importEntries;
+    let importEntries;
 
-	async.waterfall(
-		[
-			function readImportFile(callback) {
-				fs.readFile(importPath, 'utf8', (err, importData) => {
-					if(err) {
-						return callback(err);
-					}
+    async.waterfall(
+        [
+            function readImportFile(callback) {
+                fs.readFile(importPath, 'utf8', (err, importData) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					importEntries = getImportEntries(importType, importData);
-					if(0 === importEntries.length) {
-						return callback(Errors.Invalid('Invalid or empty import file'));
-					}
+                    importEntries = getImportEntries(importType, importData);
+                    if(0 === importEntries.length) {
+                        return callback(Errors.Invalid('Invalid or empty import file'));
+                    }
 
-					//	We should have enough to validate uplinks
-					if('bbs' === importType) {
-						for(let i = 0; i < importEntries.length; ++i) {
-							if(!validateUplinks(importEntries[i].uplinks)) {
-								return callback(Errors.Invalid('Invalid uplink(s)'));	
-							}
-						}
-					} else {
-						if(!validateUplinks(uplinks)) {
-							return callback(Errors.Invalid('Invalid uplink(s)'));
-						}
-					}
+                    //	We should have enough to validate uplinks
+                    if('bbs' === importType) {
+                        for(let i = 0; i < importEntries.length; ++i) {
+                            if(!validateUplinks(importEntries[i].uplinks)) {
+                                return callback(Errors.Invalid('Invalid uplink(s)'));
+                            }
+                        }
+                    } else {
+                        if(!validateUplinks(uplinks)) {
+                            return callback(Errors.Invalid('Invalid uplink(s)'));
+                        }
+                    }
 
-					return callback(null);
-				});
-			},
-			function init(callback) {
-				return initConfigAndDatabases(callback);
-			},
-			function validateAndCollectInput(callback) {
-				const msgArea	= require('../../core/message_area.js');
-				const sysConfig	= require('../../core/config.js').get();
+                    return callback(null);
+                });
+            },
+            function init(callback) {
+                return initConfigAndDatabases(callback);
+            },
+            function validateAndCollectInput(callback) {
+                const msgArea	= require('../../core/message_area.js');
+                const sysConfig	= require('../../core/config.js').get();
 
-				let msgConfs = msgArea.getSortedAvailMessageConferences(null, { noClient : true } );
-				if(!msgConfs) {
-					return callback(Errors.DoesNotExist('No conferences exist in your configuration'));
-				}
+                let msgConfs = msgArea.getSortedAvailMessageConferences(null, { noClient : true } );
+                if(!msgConfs) {
+                    return callback(Errors.DoesNotExist('No conferences exist in your configuration'));
+                }
 
-				msgConfs = msgConfs.map(mc => {
-					return {
-						name	: mc.conf.name,
-						value	: mc.confTag,
-					};
-				});
+                msgConfs = msgConfs.map(mc => {
+                    return {
+                        name	: mc.conf.name,
+                        value	: mc.confTag,
+                    };
+                });
 
-				if(confTag && !msgConfs.find(mc => {
-					return confTag === mc.value;
-				}))
-				{
-					return callback(Errors.DoesNotExist(`Conference "${confTag}" does not exist`));
-				}
+                if(confTag && !msgConfs.find(mc => {
+                    return confTag === mc.value;
+                }))
+                {
+                    return callback(Errors.DoesNotExist(`Conference "${confTag}" does not exist`));
+                }
 
-				let existingNetworkNames = [];
-				if(_.has(sysConfig, 'messageNetworks.ftn.networks')) {
-					existingNetworkNames = Object.keys(sysConfig.messageNetworks.ftn.networks);
-				}
+                let existingNetworkNames = [];
+                if(_.has(sysConfig, 'messageNetworks.ftn.networks')) {
+                    existingNetworkNames = Object.keys(sysConfig.messageNetworks.ftn.networks);
+                }
 
-				if(0 === existingNetworkNames.length) {
-					return callback(Errors.DoesNotExist('No FTN style networks exist in your configuration'));
-				}
+                if(0 === existingNetworkNames.length) {
+                    return callback(Errors.DoesNotExist('No FTN style networks exist in your configuration'));
+                }
 
-				if(networkName && !existingNetworkNames.find(net => networkName === net)) {
-					return callback(Errors.DoesNotExist(`FTN style Network "${networkName}" does not exist`));
-				}
+                if(networkName && !existingNetworkNames.find(net => networkName === net)) {
+                    return callback(Errors.DoesNotExist(`FTN style Network "${networkName}" does not exist`));
+                }
 
-				getAnswers([
-					{
-						name		: 'confTag',
-						message		: 'Message conference:',
-						type		: 'list',
-						choices		: msgConfs,
-						pageSize	: 10,
-						when		: !confTag,
-					},
-					{
-						name		: 'networkName',
-						message		: 'Network name:',
-						type		: 'list',
-						choices		: existingNetworkNames,
-						when		: !networkName,
-					},
-					{
-						name		: 'uplinks',
-						message		: 'Uplink(s) (comma separated):',
-						type		: 'input',
-						validate	: (input) => {								
-							const inputUplinks = input.split(/[\s,]+/);
-							return validateUplinks(inputUplinks) ? true : 'Invalid uplink(s)';
-						},
-						when		: !uplinks && 'bbs' !== importType,
-					}
-				], 
-				answers => {
-					confTag			= confTag || answers.confTag;
-					networkName		= networkName || answers.networkName;
-					uplinks			= uplinks || answers.uplinks;
+                getAnswers([
+                    {
+                        name		: 'confTag',
+                        message		: 'Message conference:',
+                        type		: 'list',
+                        choices		: msgConfs,
+                        pageSize	: 10,
+                        when		: !confTag,
+                    },
+                    {
+                        name		: 'networkName',
+                        message		: 'Network name:',
+                        type		: 'list',
+                        choices		: existingNetworkNames,
+                        when		: !networkName,
+                    },
+                    {
+                        name		: 'uplinks',
+                        message		: 'Uplink(s) (comma separated):',
+                        type		: 'input',
+                        validate	: (input) => {
+                            const inputUplinks = input.split(/[\s,]+/);
+                            return validateUplinks(inputUplinks) ? true : 'Invalid uplink(s)';
+                        },
+                        when		: !uplinks && 'bbs' !== importType,
+                    }
+                ],
+                answers => {
+                    confTag			= confTag || answers.confTag;
+                    networkName		= networkName || answers.networkName;
+                    uplinks			= uplinks || answers.uplinks;
 
-					importEntries.forEach(ie => {
-						ie.areaTag = ie.ftnTag.toLowerCase();
-					});
+                    importEntries.forEach(ie => {
+                        ie.areaTag = ie.ftnTag.toLowerCase();
+                    });
 
-					return callback(null);
-				});
-			},
-			function confirmWithUser(callback) {
-				const sysConfig	= require('../../core/config.js').get();
+                    return callback(null);
+                });
+            },
+            function confirmWithUser(callback) {
+                const sysConfig	= require('../../core/config.js').get();
 
-				console.info(`Importing the following for "${confTag}" - (${sysConfig.messageConferences[confTag].name} - ${sysConfig.messageConferences[confTag].desc})`);
-				importEntries.forEach(ie => {
-					console.info(`  ${ie.ftnTag} - ${ie.name}`);
-				});
+                console.info(`Importing the following for "${confTag}" - (${sysConfig.messageConferences[confTag].name} - ${sysConfig.messageConferences[confTag].desc})`);
+                importEntries.forEach(ie => {
+                    console.info(`  ${ie.ftnTag} - ${ie.name}`);
+                });
 
-				console.info('');
-				console.info('Importing will NOT create required FTN network configurations.');
-				console.info('If you have not yet done this, you will need to complete additional steps after importing.');
-				console.info('See docs/msg_networks.md for details.');
-				console.info('');
+                console.info('');
+                console.info('Importing will NOT create required FTN network configurations.');
+                console.info('If you have not yet done this, you will need to complete additional steps after importing.');
+                console.info('See docs/msg_networks.md for details.');
+                console.info('');
 
-				getAnswers([
-					{
-						name	: 'proceed',
-						message	: 'Proceed?',
-						type	: 'confirm',
-					}
-				],
-				answers => {
-					return callback(answers.proceed ? null : Errors.General('User canceled'));
-				});
+                getAnswers([
+                    {
+                        name	: 'proceed',
+                        message	: 'Proceed?',
+                        type	: 'confirm',
+                    }
+                ],
+                answers => {
+                    return callback(answers.proceed ? null : Errors.General('User canceled'));
+                });
 
-			},
-			function loadConfigHjson(callback) {
-				const configPath = getConfigPath();
-				fs.readFile(configPath, 'utf8', (err, confData) => {
-					if(err) {
-						return callback(err);
-					}
+            },
+            function loadConfigHjson(callback) {
+                const configPath = getConfigPath();
+                fs.readFile(configPath, 'utf8', (err, confData) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					let config;
-					try {
-						config = hjson.parse(confData, { keepWsc : true } );
-					} catch(e) {
-						return callback(e);
-					}
-					return callback(null, config);
+                    let config;
+                    try {
+                        config = hjson.parse(confData, { keepWsc : true } );
+                    } catch(e) {
+                        return callback(e);
+                    }
+                    return callback(null, config);
 
-				});
-			},
-			function performImport(config, callback) {
-				const confAreas = { messageConferences : {} };
-				confAreas.messageConferences[confTag] = { areas : {} };
+                });
+            },
+            function performImport(config, callback) {
+                const confAreas = { messageConferences : {} };
+                confAreas.messageConferences[confTag] = { areas : {} };
 
-				const msgNetworks = { messageNetworks : { ftn : { areas : {} } } };
+                const msgNetworks = { messageNetworks : { ftn : { areas : {} } } };
 
-				importEntries.forEach(ie => {
-					const specificUplinks = ie.uplinks || uplinks;	//	AREAS.BBS has specific uplinks per area
+                importEntries.forEach(ie => {
+                    const specificUplinks = ie.uplinks || uplinks;	//	AREAS.BBS has specific uplinks per area
 
-					confAreas.messageConferences[confTag].areas[ie.areaTag] = {
-						name : ie.name,
-						desc : ie.name,
-					};
+                    confAreas.messageConferences[confTag].areas[ie.areaTag] = {
+                        name : ie.name,
+                        desc : ie.name,
+                    };
 
-					msgNetworks.messageNetworks.ftn.areas[ie.areaTag] = {
-						network	: networkName,
-						tag		: ie.ftnTag,
-						uplinks	: specificUplinks
-					};
-				});
-				
+                    msgNetworks.messageNetworks.ftn.areas[ie.areaTag] = {
+                        network	: networkName,
+                        tag		: ie.ftnTag,
+                        uplinks	: specificUplinks
+                    };
+                });
 
-				const newConfig = _.defaultsDeep(config, confAreas, msgNetworks);
-				const configPath = getConfigPath();
 
-				if(!writeConfig(newConfig, configPath)) {
-					return callback(Errors.UnexpectedState('Failed writing configuration'));
-				}
+                const newConfig = _.defaultsDeep(config, confAreas, msgNetworks);
+                const configPath = getConfigPath();
+
+                if(!writeConfig(newConfig, configPath)) {
+                    return callback(Errors.UnexpectedState('Failed writing configuration'));
+                }
+
+                return callback(null);
+            }
+        ],
+        err => {
+            if(err) {
+                console.error(err.reason ? err.reason : err.message);
+            } else {
+                const addFieldUpd = 'bbs' === importType ? '"name" and "desc"' : '"desc"';
+                console.info('Configuration generated.');
+                console.info(`You may wish to validate changes made to ${getConfigPath()}`);
+                console.info(`as well as update ${addFieldUpd} fields, sorting, etc.`);
+                console.info('');
+            }
+        }
+    );
 
-				return callback(null);
-			}
-		],
-		err => {
-			if(err) {
-				console.error(err.reason ? err.reason : err.message);
-			} else {
-				const addFieldUpd = 'bbs' === importType ? '"name" and "desc"' : '"desc"';
-				console.info('Configuration generated.');
-				console.info(`You may wish to validate changes made to ${getConfigPath()}`);
-				console.info(`as well as update ${addFieldUpd} fields, sorting, etc.`);
-				console.info('');
-			}
-		}
-	);
-	
 }
 
 function getImportEntries(importType, importData) {
-	let importEntries = [];
+    let importEntries = [];
 
-	if('na' === importType) {
-		//
-		//	parse out
-		//	TAG		DESC
-		//
-		const re = /^([^\s]+)\s+([^\r\n]+)/gm;
-		let m;
-		
-		while( (m = re.exec(importData) )) {
-			importEntries.push({
-				ftnTag		: m[1],
-				name		: m[2],
-			});
-		}
-	} else if ('bbs' === importType) {
-		//
-		//	Various formats for AREAS.BBS seem to exist. We want to support as much as possible.
-		//
-		//	SBBS http://www.synchro.net/docs/sbbsecho.html#AREAS.BBS
-		//	CODE	TAG		UPLINKS
-		//
-		//	VADV https://www.vadvbbs.com/products/vadv/support/docs/docs_vfido.php#AREAS.BBS
-		//	TAG		UPLINKS
-		//
-		//	Misc
-		//	PATH|OTHER	TAG		UPLINKS
-		//
-		//	Assume the second item is TAG and 1:n UPLINKS (space and/or comma sep) after (at the end)
-		//
-		const re = /^[^\s]+\s+([^\s]+)\s+([^\n]+)$/gm;
-		let m;
-		while ( (m = re.exec(importData) )) {
-			const tag = m[1];
+    if('na' === importType) {
+        //
+        //	parse out
+        //	TAG		DESC
+        //
+        const re = /^([^\s]+)\s+([^\r\n]+)/gm;
+        let m;
 
-			importEntries.push({
-				ftnTag		: tag,
-				name		: `Area: ${tag}`,
-				uplinks		: m[2].split(/[\s,]+/),
-			});
-		}
-	}
+        while( (m = re.exec(importData) )) {
+            importEntries.push({
+                ftnTag		: m[1],
+                name		: m[2],
+            });
+        }
+    } else if ('bbs' === importType) {
+        //
+        //	Various formats for AREAS.BBS seem to exist. We want to support as much as possible.
+        //
+        //	SBBS http://www.synchro.net/docs/sbbsecho.html#AREAS.BBS
+        //	CODE	TAG		UPLINKS
+        //
+        //	VADV https://www.vadvbbs.com/products/vadv/support/docs/docs_vfido.php#AREAS.BBS
+        //	TAG		UPLINKS
+        //
+        //	Misc
+        //	PATH|OTHER	TAG		UPLINKS
+        //
+        //	Assume the second item is TAG and 1:n UPLINKS (space and/or comma sep) after (at the end)
+        //
+        const re = /^[^\s]+\s+([^\s]+)\s+([^\n]+)$/gm;
+        let m;
+        while ( (m = re.exec(importData) )) {
+            const tag = m[1];
 
-	return importEntries;
+            importEntries.push({
+                ftnTag		: tag,
+                name		: `Area: ${tag}`,
+                uplinks		: m[2].split(/[\s,]+/),
+            });
+        }
+    }
+
+    return importEntries;
 }
 
 function handleConfigCommand() {
-	if(true === argv.help) {
-		return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
-	}
+    if(true === argv.help) {
+        return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
+    }
 
-	const action = argv._[1];
+    const action = argv._[1];
 
-	switch(action) {
-		case 'new' 			: return buildNewConfig();
-		case 'import-areas' : return importAreas();
+    switch(action) {
+        case 'new' 			: return buildNewConfig();
+        case 'import-areas' : return importAreas();
 
-		default : return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
-	}
+        default : return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
+    }
 }
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index b9ae8aeb..8568372c 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -8,8 +8,8 @@ const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const {
-	getAreaAndStorage,
-	looksLikePattern
+    getAreaAndStorage,
+    looksLikePattern
 }								= require('./oputil_common.js');
 const Errors					= require('../enig_error.js').Errors;
 
@@ -39,684 +39,684 @@ exports.handleFileBaseCommand			= handleFileBaseCommand;
 let fileArea;	//	required during init
 
 function finalizeEntryAndPersist(isUpdate, fileEntry, descHandler, cb) {
-	async.series(
-		[
-			function getDescFromHandlerIfNeeded(callback) {
-				if((fileEntry.desc && fileEntry.desc.length > 0 ) && !argv['desc-file']) {
-					return callback(null);	//	we have a desc already and are NOT overriding with desc file
-				}
+    async.series(
+        [
+            function getDescFromHandlerIfNeeded(callback) {
+                if((fileEntry.desc && fileEntry.desc.length > 0 ) && !argv['desc-file']) {
+                    return callback(null);	//	we have a desc already and are NOT overriding with desc file
+                }
 
-				if(!descHandler) {
-					return callback(null);	//	not much we can do!
-				}
+                if(!descHandler) {
+                    return callback(null);	//	not much we can do!
+                }
 
-				const desc = descHandler.getDescription(fileEntry.fileName);
-				if(desc) {
-					fileEntry.desc = desc;
-				}
-				return callback(null);
-			},
-			function getDescFromUserIfNeeded(callback) {
-				if(fileEntry.desc && fileEntry.desc.length > 0 ) {
-					return callback(null);
-				}
+                const desc = descHandler.getDescription(fileEntry.fileName);
+                if(desc) {
+                    fileEntry.desc = desc;
+                }
+                return callback(null);
+            },
+            function getDescFromUserIfNeeded(callback) {
+                if(fileEntry.desc && fileEntry.desc.length > 0 ) {
+                    return callback(null);
+                }
 
-				const getDescFromFileName	= require('../../core/file_base_area.js').getDescFromFileName;
-				const descFromFile			= getDescFromFileName(fileEntry.fileName);
+                const getDescFromFileName	= require('../../core/file_base_area.js').getDescFromFileName;
+                const descFromFile			= getDescFromFileName(fileEntry.fileName);
 
-				if(false === argv.prompt) {
-					fileEntry.desc = descFromFile;
-					return callback(null);
-				}
+                if(false === argv.prompt) {
+                    fileEntry.desc = descFromFile;
+                    return callback(null);
+                }
 
-				const questions = [
-					{
-						name	: 'desc',
-						message	: `Description for ${fileEntry.fileName}:`,
-						type	: 'input',
-						default	: descFromFile,
-					}
-				];
+                const questions = [
+                    {
+                        name	: 'desc',
+                        message	: `Description for ${fileEntry.fileName}:`,
+                        type	: 'input',
+                        default	: descFromFile,
+                    }
+                ];
 
-				inq.prompt(questions).then( answers => {
-					fileEntry.desc = answers.desc;
-					return callback(null);
-				});
-			},
-			function persist(callback) {
-				fileEntry.persist(isUpdate, err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                inq.prompt(questions).then( answers => {
+                    fileEntry.desc = answers.desc;
+                    return callback(null);
+                });
+            },
+            function persist(callback) {
+                fileEntry.persist(isUpdate, err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 const SCAN_EXCLUDE_FILENAMES = [ 'DESCRIPT.ION', 'FILES.BBS' ];
 
 function loadDescHandler(path, cb) {
-	const DescIon = require('../../core/descript_ion_file.js');
+    const DescIon = require('../../core/descript_ion_file.js');
 
-	//	:TODO: support FILES.BBS also
+    //	:TODO: support FILES.BBS also
 
-	DescIon.createFromFile(path, (err, descHandler) => {
-		return cb(err, descHandler);
-	});
+    DescIon.createFromFile(path, (err, descHandler) => {
+        return cb(err, descHandler);
+    });
 }
 
 function scanFileAreaForChanges(areaInfo, options, cb) {
 
-	const storageLocations = fileArea.getAreaStorageLocations(areaInfo).filter(sl => {
-		return options.areaAndStorageInfo.find(asi => {
-			return !asi.storageTag || sl.storageTag === asi.storageTag;
-		});
-	});
+    const storageLocations = fileArea.getAreaStorageLocations(areaInfo).filter(sl => {
+        return options.areaAndStorageInfo.find(asi => {
+            return !asi.storageTag || sl.storageTag === asi.storageTag;
+        });
+    });
 
-	function updateTags(fe) {
-		if(Array.isArray(options.tags)) {
-			fe.hashTags = new Set(options.tags);
-		}
-	}
+    function updateTags(fe) {
+        if(Array.isArray(options.tags)) {
+            fe.hashTags = new Set(options.tags);
+        }
+    }
 
-	const FileEntry = require('../file_entry.js');
+    const FileEntry = require('../file_entry.js');
 
-	const readDir = options.glob ?
-		(dir, next) => {
-			return glob(options.glob, { cwd : dir, nodir : true }, next);
-		} :
-		(dir, next) => {
-			return fs.readdir(dir, next);
-		};
+    const readDir = options.glob ?
+        (dir, next) => {
+            return glob(options.glob, { cwd : dir, nodir : true }, next);
+        } :
+        (dir, next) => {
+            return fs.readdir(dir, next);
+        };
 
-	async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
-		async.waterfall(
-			[
-				function initDescFile(callback) {
-					if(options.descFileHandler) {
-						return callback(null, options.descFileHandler);	//	we're going to use the global handler
-					}
+    async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
+        async.waterfall(
+            [
+                function initDescFile(callback) {
+                    if(options.descFileHandler) {
+                        return callback(null, options.descFileHandler);	//	we're going to use the global handler
+                    }
 
-					loadDescHandler(paths.join(storageLoc.dir, 'DESCRIPT.ION'), (err, descHandler) => {
-						return callback(null, descHandler);
-					});
-				},
-				function scanPhysFiles(descHandler, callback) {
-					const physDir = storageLoc.dir;
+                    loadDescHandler(paths.join(storageLoc.dir, 'DESCRIPT.ION'), (err, descHandler) => {
+                        return callback(null, descHandler);
+                    });
+                },
+                function scanPhysFiles(descHandler, callback) {
+                    const physDir = storageLoc.dir;
 
-					readDir(physDir, (err, files) => {
-						if(err) {
-							return callback(err);
-						}
+                    readDir(physDir, (err, files) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						async.eachSeries(files, (fileName, nextFile) => {
-							const fullPath = paths.join(physDir, fileName);
+                        async.eachSeries(files, (fileName, nextFile) => {
+                            const fullPath = paths.join(physDir, fileName);
 
-							if(SCAN_EXCLUDE_FILENAMES.includes(fileName.toUpperCase())) {
-								console.info(`Excluding ${fullPath}`);
-								return nextFile(null);
-							}
+                            if(SCAN_EXCLUDE_FILENAMES.includes(fileName.toUpperCase())) {
+                                console.info(`Excluding ${fullPath}`);
+                                return nextFile(null);
+                            }
 
-							fs.stat(fullPath, (err, stats) => {
-								if(err) {
-									//	:TODO: Log me!
-									return nextFile(null);	//	always try next file
-								}
+                            fs.stat(fullPath, (err, stats) => {
+                                if(err) {
+                                    //	:TODO: Log me!
+                                    return nextFile(null);	//	always try next file
+                                }
 
-								if(!stats.isFile()) {
-									return nextFile(null);
-								}
+                                if(!stats.isFile()) {
+                                    return nextFile(null);
+                                }
 
-								process.stdout.write(`Scanning ${fullPath}... `);
+                                process.stdout.write(`Scanning ${fullPath}... `);
 
-								async.series(
-									[
-										function quickCheck(next) {
-											if(!options.quick) {
-												return next(null);
-											}
+                                async.series(
+                                    [
+                                        function quickCheck(next) {
+                                            if(!options.quick) {
+                                                return next(null);
+                                            }
 
-											FileEntry.quickCheckExistsByPath(fullPath, (err, exists) => {
-												if(exists) {
-													console.info('Dupe');
-													return nextFile(null);
-												}
+                                            FileEntry.quickCheckExistsByPath(fullPath, (err, exists) => {
+                                                if(exists) {
+                                                    console.info('Dupe');
+                                                    return nextFile(null);
+                                                }
 
-												return next(null);
-											});
-										},
-										function fullScan() {
-											fileArea.scanFile(
-												fullPath,
-												{
-													areaTag		: areaInfo.areaTag,
-													storageTag	: storageLoc.storageTag
-												},
-												(err, fileEntry, dupeEntries) => {
-													if(err) {
-														console.info(`Error: ${err.message}`);
-														return nextFile(null);	//	try next anyway
-													}
+                                                return next(null);
+                                            });
+                                        },
+                                        function fullScan() {
+                                            fileArea.scanFile(
+                                                fullPath,
+                                                {
+                                                    areaTag		: areaInfo.areaTag,
+                                                    storageTag	: storageLoc.storageTag
+                                                },
+                                                (err, fileEntry, dupeEntries) => {
+                                                    if(err) {
+                                                        console.info(`Error: ${err.message}`);
+                                                        return nextFile(null);	//	try next anyway
+                                                    }
 
-													//
-													//	We'll update the entry if the following conditions are met:
-													//	* We have a single duplicate, and:
-													//	* --update was passed or the existing entry's desc,
-													//	  longDesc, or est_release_year meta are blank/empty
-													//
-													if(argv.update && 1 === dupeEntries.length) {
-														const FileEntry		= require('../../core/file_entry.js');
-														const existingEntry	= new FileEntry();
+                                                    //
+                                                    //	We'll update the entry if the following conditions are met:
+                                                    //	* We have a single duplicate, and:
+                                                    //	* --update was passed or the existing entry's desc,
+                                                    //	  longDesc, or est_release_year meta are blank/empty
+                                                    //
+                                                    if(argv.update && 1 === dupeEntries.length) {
+                                                        const FileEntry		= require('../../core/file_entry.js');
+                                                        const existingEntry	= new FileEntry();
 
-														return existingEntry.load(dupeEntries[0].fileId, err => {
-															if(err) {
-																console.info('Dupe (cannot update)');
-																return nextFile(null);
-															}
+                                                        return existingEntry.load(dupeEntries[0].fileId, err => {
+                                                            if(err) {
+                                                                console.info('Dupe (cannot update)');
+                                                                return nextFile(null);
+                                                            }
 
-															//
-															//	Update only if tags or desc changed
-															//
-															const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
-															const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
+                                                            //
+                                                            //	Update only if tags or desc changed
+                                                            //
+                                                            const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
+                                                            const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
 
-															if( tagsEq &&
+                                                            if( tagsEq &&
 																fileEntry.desc === existingEntry.desc &&
 																fileEntry.descLong == existingEntry.descLong &&
 																fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
-															{
-																console.info('Dupe');
-																return nextFile(null);
-															}
+                                                            {
+                                                                console.info('Dupe');
+                                                                return nextFile(null);
+                                                            }
 
-															console.info('Dupe (updating)');
+                                                            console.info('Dupe (updating)');
 
-															//	don't allow overwrite of values if new version is blank
-															existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
-															existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
+                                                            //	don't allow overwrite of values if new version is blank
+                                                            existingEntry.desc 					= fileEntry.desc || existingEntry.desc;
+                                                            existingEntry.descLong				= fileEntry.descLong || existingEntry.descLong;
 
-															if(fileEntry.meta.est_release_year) {
-																existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
-															}
+                                                            if(fileEntry.meta.est_release_year) {
+                                                                existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
+                                                            }
 
-															updateTags(existingEntry);
+                                                            updateTags(existingEntry);
 
-															finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
-																return nextFile(err);
-															});
-														});
-													} else if(dupeEntries.length > 0) {
-														console.info('Dupe');
-														return nextFile(null);
-													}
+                                                            finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
+                                                                return nextFile(err);
+                                                            });
+                                                        });
+                                                    } else if(dupeEntries.length > 0) {
+                                                        console.info('Dupe');
+                                                        return nextFile(null);
+                                                    }
 
-													console.info('Done!');
-													updateTags(fileEntry);
+                                                    console.info('Done!');
+                                                    updateTags(fileEntry);
 
-													finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
-														return nextFile(err);
-													});
-												}
-											);
-										}
-									]
-								);
-							});
-						}, err => {
-							return callback(err);
-						});
-					});
-				},
-				function scanDbEntries(callback) {
-					//	:TODO: Look @ db entries for area that were *not* processed above
-					return callback(null);
-				}
-			],
-			err => {
-				return nextLocation(err);
-			}
-		);
-	},
-	err => {
-		return cb(err);
-	});
+                                                    finalizeEntryAndPersist(false, fileEntry, descHandler, err => {
+                                                        return nextFile(err);
+                                                    });
+                                                }
+                                            );
+                                        }
+                                    ]
+                                );
+                            });
+                        }, err => {
+                            return callback(err);
+                        });
+                    });
+                },
+                function scanDbEntries(callback) {
+                    //	:TODO: Look @ db entries for area that were *not* processed above
+                    return callback(null);
+                }
+            ],
+            err => {
+                return nextLocation(err);
+            }
+        );
+    },
+    err => {
+        return cb(err);
+    });
 }
 
 function dumpAreaInfo(areaInfo, areaAndStorageInfo, cb) {
-	console.info(`areaTag: ${areaInfo.areaTag}`);
-	console.info(`name: ${areaInfo.name}`);
-	console.info(`desc: ${areaInfo.desc}`);
+    console.info(`areaTag: ${areaInfo.areaTag}`);
+    console.info(`name: ${areaInfo.name}`);
+    console.info(`desc: ${areaInfo.desc}`);
 
-	areaInfo.storage.forEach(si => {
-		console.info(`storageTag: ${si.storageTag} => ${si.dir}`);
-	});
-	console.info('');
+    areaInfo.storage.forEach(si => {
+        console.info(`storageTag: ${si.storageTag} => ${si.dir}`);
+    });
+    console.info('');
 
-	return cb(null);
+    return cb(null);
 }
 
 function getFileEntries(pattern, cb) {
-	//	spec: FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
-	const FileEntry = require('../../core/file_entry.js');
+    //	spec: FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
+    const FileEntry = require('../../core/file_entry.js');
 
-	async.waterfall(
-		[
-			function tryByFileId(callback) {
-				const fileId = parseInt(pattern);
-				if(!/^[0-9]+$/.test(pattern) || isNaN(fileId)) {
-					return callback(null, null);	//	try SHA
-				}
+    async.waterfall(
+        [
+            function tryByFileId(callback) {
+                const fileId = parseInt(pattern);
+                if(!/^[0-9]+$/.test(pattern) || isNaN(fileId)) {
+                    return callback(null, null);	//	try SHA
+                }
 
-				const fileEntry = new FileEntry();
-				fileEntry.load(fileId, err => {
-					return callback(null, err ? null : [ fileEntry ] );
-				});
-			},
-			function tryByShaOrPartialSha(entries, callback) {
-				if(entries) {
-					return callback(null, entries);	//	already got it by FILE_ID
-				}
+                const fileEntry = new FileEntry();
+                fileEntry.load(fileId, err => {
+                    return callback(null, err ? null : [ fileEntry ] );
+                });
+            },
+            function tryByShaOrPartialSha(entries, callback) {
+                if(entries) {
+                    return callback(null, entries);	//	already got it by FILE_ID
+                }
 
-				FileEntry.findFileBySha(pattern, (err, fileEntry) => {
-					return callback(null, fileEntry ? [ fileEntry ] : null );
-				});
-			},
-			function tryByFileNameWildcard(entries, callback) {
-				if(entries) {
-					return callback(null, entries);	//	already got by FILE_ID|SHA
-				}
+                FileEntry.findFileBySha(pattern, (err, fileEntry) => {
+                    return callback(null, fileEntry ? [ fileEntry ] : null );
+                });
+            },
+            function tryByFileNameWildcard(entries, callback) {
+                if(entries) {
+                    return callback(null, entries);	//	already got by FILE_ID|SHA
+                }
 
-				return FileEntry.findByFileNameWildcard(pattern, callback);
-			}
-		],
-		(err, entries) => {
-			return cb(err, entries);
-		}
-	);
+                return FileEntry.findByFileNameWildcard(pattern, callback);
+            }
+        ],
+        (err, entries) => {
+            return cb(err, entries);
+        }
+    );
 }
 
 function dumpFileInfo(shaOrFileId, cb) {
-	async.waterfall(
-		[
-			function getEntry(callback) {
-				getFileEntries(shaOrFileId, (err, entries) => {
-					if(err) {
-						return callback(err);
-					}
+    async.waterfall(
+        [
+            function getEntry(callback) {
+                getFileEntries(shaOrFileId, (err, entries) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					return callback(null, entries[0]);
-				});
-			},
-			function dumpInfo(fileEntry, callback) {
-				const fullPath = paths.join(fileArea.getAreaStorageDirectoryByTag(fileEntry.storageTag), fileEntry.fileName);
+                    return callback(null, entries[0]);
+                });
+            },
+            function dumpInfo(fileEntry, callback) {
+                const fullPath = paths.join(fileArea.getAreaStorageDirectoryByTag(fileEntry.storageTag), fileEntry.fileName);
 
-				console.info(`file_id: ${fileEntry.fileId}`);
-				console.info(`sha_256: ${fileEntry.fileSha256}`);
-				console.info(`area_tag: ${fileEntry.areaTag}`);
-				console.info(`storage_tag: ${fileEntry.storageTag}`);
-				console.info(`path: ${fullPath}`);
-				console.info(`hashTags: ${Array.from(fileEntry.hashTags).join(', ')}`);
-				console.info(`uploaded: ${moment(fileEntry.uploadTimestamp).format()}`);
+                console.info(`file_id: ${fileEntry.fileId}`);
+                console.info(`sha_256: ${fileEntry.fileSha256}`);
+                console.info(`area_tag: ${fileEntry.areaTag}`);
+                console.info(`storage_tag: ${fileEntry.storageTag}`);
+                console.info(`path: ${fullPath}`);
+                console.info(`hashTags: ${Array.from(fileEntry.hashTags).join(', ')}`);
+                console.info(`uploaded: ${moment(fileEntry.uploadTimestamp).format()}`);
 
-				_.each(fileEntry.meta, (metaValue, metaName) => {
-					console.info(`${metaName}: ${metaValue}`);
-				});
+                _.each(fileEntry.meta, (metaValue, metaName) => {
+                    console.info(`${metaName}: ${metaValue}`);
+                });
 
-				if(argv['show-desc']) {
-					console.info(`${fileEntry.desc}`);
-				}
-				console.info('');
+                if(argv['show-desc']) {
+                    console.info(`${fileEntry.desc}`);
+                }
+                console.info('');
 
-				return callback(null);
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                return callback(null);
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function displayFileAreaInfo() {
-	//	AREA_TAG[@STORAGE_TAG]
-	//	SHA256|PARTIAL
-	//	if sha: dump file info
-	//	if area/stoarge dump area(s) +
+    //	AREA_TAG[@STORAGE_TAG]
+    //	SHA256|PARTIAL
+    //	if sha: dump file info
+    //	if area/stoarge dump area(s) +
 
-	async.series(
-		[
-			function init(callback) {
-				return initConfigAndDatabases(callback);
-			},
-			function dumpInfo(callback) {
-				const sysConfig = require('../../core/config.js').get();
-				let suppliedAreas = argv._.slice(2);
-				if(!suppliedAreas || 0 === suppliedAreas.length) {
-					suppliedAreas = _.map(sysConfig.fileBase.areas, (areaInfo, areaTag) => areaTag);
-				}
+    async.series(
+        [
+            function init(callback) {
+                return initConfigAndDatabases(callback);
+            },
+            function dumpInfo(callback) {
+                const sysConfig = require('../../core/config.js').get();
+                let suppliedAreas = argv._.slice(2);
+                if(!suppliedAreas || 0 === suppliedAreas.length) {
+                    suppliedAreas = _.map(sysConfig.fileBase.areas, (areaInfo, areaTag) => areaTag);
+                }
 
-				const areaAndStorageInfo = getAreaAndStorage(suppliedAreas);
+                const areaAndStorageInfo = getAreaAndStorage(suppliedAreas);
 
-				fileArea = require('../../core/file_base_area.js');
+                fileArea = require('../../core/file_base_area.js');
 
-				async.eachSeries(areaAndStorageInfo, (areaAndStorage, nextArea) => {
-					const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
-					if(areaInfo) {
-						return dumpAreaInfo(areaInfo, areaAndStorageInfo, nextArea);
-					} else {
-						return dumpFileInfo(areaAndStorage.areaTag, nextArea);
-					}
-				},
-				err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				process.exitCode = ExitCodes.ERROR;
-				console.error(err.message);
-			}
-		}
-	);
+                async.eachSeries(areaAndStorageInfo, (areaAndStorage, nextArea) => {
+                    const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
+                    if(areaInfo) {
+                        return dumpAreaInfo(areaInfo, areaAndStorageInfo, nextArea);
+                    } else {
+                        return dumpFileInfo(areaAndStorage.areaTag, nextArea);
+                    }
+                },
+                err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            }
+        }
+    );
 }
 
 function scanFileAreas() {
-	const options = {};
+    const options = {};
 
-	const tags = argv.tags;
-	if(tags) {
-		options.tags = tags.split(',');
-	}
+    const tags = argv.tags;
+    if(tags) {
+        options.tags = tags.split(',');
+    }
 
-	options.descFile 	= argv['desc-file'];	//	--desc-file or --desc-file PATH
-	options.quick 		= argv.quick;
+    options.descFile 	= argv['desc-file'];	//	--desc-file or --desc-file PATH
+    options.quick 		= argv.quick;
 
-	options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
+    options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
 
-	const last = argv._[argv._.length - 1];
-	if(options.areaAndStorageInfo.length > 1 && looksLikePattern(last)) {
-		options.glob = last;
-		options.areaAndStorageInfo.length -= 1;
-	}
+    const last = argv._[argv._.length - 1];
+    if(options.areaAndStorageInfo.length > 1 && looksLikePattern(last)) {
+        options.glob = last;
+        options.areaAndStorageInfo.length -= 1;
+    }
 
-	async.series(
-		[
-			function init(callback) {
-				return initConfigAndDatabases(callback);
-			},
-			function initMime(callback) {
-				return require('../../core/mime_util.js').startup(callback);
-			},
-			function initGlobalDescHandler(callback) {
-				//
-				//	If options.descFile is a String, it represents a FILE|PATH. We'll init
-				//	the description handler now. Else, we'll attempt to look for a description
-				//	file in each storage location.
-				//
-				if(!_.isString(options.descFile)) {
-					return callback(null);
-				}
+    async.series(
+        [
+            function init(callback) {
+                return initConfigAndDatabases(callback);
+            },
+            function initMime(callback) {
+                return require('../../core/mime_util.js').startup(callback);
+            },
+            function initGlobalDescHandler(callback) {
+                //
+                //	If options.descFile is a String, it represents a FILE|PATH. We'll init
+                //	the description handler now. Else, we'll attempt to look for a description
+                //	file in each storage location.
+                //
+                if(!_.isString(options.descFile)) {
+                    return callback(null);
+                }
 
-				loadDescHandler(options.descFile, (err, descHandler) => {
-					options.descFileHandler = descHandler;
-					return callback(null);
-				});
-			},
-			function scanAreas(callback) {
-				fileArea = require('../../core/file_base_area.js');
+                loadDescHandler(options.descFile, (err, descHandler) => {
+                    options.descFileHandler = descHandler;
+                    return callback(null);
+                });
+            },
+            function scanAreas(callback) {
+                fileArea = require('../../core/file_base_area.js');
 
-				async.eachSeries(options.areaAndStorageInfo, (areaAndStorage, nextAreaTag) => {
-					const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
-					if(!areaInfo) {
-						return nextAreaTag(new Error(`Invalid file base area tag: ${areaAndStorage.areaTag}`));
-					}
+                async.eachSeries(options.areaAndStorageInfo, (areaAndStorage, nextAreaTag) => {
+                    const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
+                    if(!areaInfo) {
+                        return nextAreaTag(new Error(`Invalid file base area tag: ${areaAndStorage.areaTag}`));
+                    }
 
-					console.info(`Processing area "${areaInfo.name}":`);
+                    console.info(`Processing area "${areaInfo.name}":`);
 
-					scanFileAreaForChanges(areaInfo, options, err => {
-						return callback(err);
-					});
-				}, err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				process.exitCode = ExitCodes.ERROR;
-				console.error(err.message);
-			}
-		}
-	);
+                    scanFileAreaForChanges(areaInfo, options, err => {
+                        return callback(err);
+                    });
+                }, err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            }
+        }
+    );
 }
 
 function expandFileTargets(targets, cb) {
-	let entries = [];
+    let entries = [];
 
-	//	Each entry may be PATH|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
-	const FileEntry = require('../../core/file_entry.js');
+    //	Each entry may be PATH|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
+    const FileEntry = require('../../core/file_entry.js');
 
-	async.eachSeries(targets, (areaAndStorage, next) => {
-		const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
+    async.eachSeries(targets, (areaAndStorage, next) => {
+        const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
 
-		if(areaInfo) {
-			//	AREA_TAG[@STORAGE_TAG] - all files in area@tag
-			const findFilter = {
-				areaTag : areaAndStorage.areaTag,
-			};
+        if(areaInfo) {
+            //	AREA_TAG[@STORAGE_TAG] - all files in area@tag
+            const findFilter = {
+                areaTag : areaAndStorage.areaTag,
+            };
 
-			if(areaAndStorage.storageTag) {
-				findFilter.storageTag = areaAndStorage.storageTag;
-			}
+            if(areaAndStorage.storageTag) {
+                findFilter.storageTag = areaAndStorage.storageTag;
+            }
 
-			FileEntry.findFiles(findFilter, (err, fileIds) => {
-				if(err) {
-					return next(err);
-				}
+            FileEntry.findFiles(findFilter, (err, fileIds) => {
+                if(err) {
+                    return next(err);
+                }
 
-				async.each(fileIds, (fileId, nextFileId) => {
-					const fileEntry = new FileEntry();
-					fileEntry.load(fileId, err => {
-						if(!err) {
-							entries.push(fileEntry);
-						}
-						return nextFileId(err);
-					});
-				},
-				err => {
-					return next(err);
-				});
-			});
+                async.each(fileIds, (fileId, nextFileId) => {
+                    const fileEntry = new FileEntry();
+                    fileEntry.load(fileId, err => {
+                        if(!err) {
+                            entries.push(fileEntry);
+                        }
+                        return nextFileId(err);
+                    });
+                },
+                err => {
+                    return next(err);
+                });
+            });
 
-		} else {
-			//	FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
-			//	:TODO: FULL_PATH -> entries
-			getFileEntries(areaAndStorage.pattern, (err, fileEntries) => {
-				if(err) {
-					return next(err);
-				}
+        } else {
+            //	FILENAME_WC|FILE_ID|SHA|PARTIAL_SHA
+            //	:TODO: FULL_PATH -> entries
+            getFileEntries(areaAndStorage.pattern, (err, fileEntries) => {
+                if(err) {
+                    return next(err);
+                }
 
-				entries = entries.concat(fileEntries);
-				return next(null);
-			});
-		}
-	},
-	err => {
-		return cb(err, entries);
-	});
+                entries = entries.concat(fileEntries);
+                return next(null);
+            });
+        }
+    },
+    err => {
+        return cb(err, entries);
+    });
 }
 
 function moveFiles() {
-	//
-	//	oputil fb move SRC [SRC2 ...] DST
-	//
-	//	SRC: FILENAME_WC|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
-	//	DST: AREA_TAG[@STORAGE_TAG]
-	//
-	if(argv._.length < 4) {
-		return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
-	}
+    //
+    //	oputil fb move SRC [SRC2 ...] DST
+    //
+    //	SRC: FILENAME_WC|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
+    //	DST: AREA_TAG[@STORAGE_TAG]
+    //
+    if(argv._.length < 4) {
+        return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
+    }
 
-	const moveArgs = argv._.slice(2);
-	const src = getAreaAndStorage(moveArgs.slice(0, -1));
-	const dst = getAreaAndStorage(moveArgs.slice(-1))[0];
+    const moveArgs = argv._.slice(2);
+    const src = getAreaAndStorage(moveArgs.slice(0, -1));
+    const dst = getAreaAndStorage(moveArgs.slice(-1))[0];
 
-	let FileEntry;
+    let FileEntry;
 
-	async.waterfall(
-		[
-			function init(callback) {
-				return initConfigAndDatabases( err => {
-					if(!err) {
-						fileArea = require('../../core/file_base_area.js');
-					}
-					return callback(err);
-				});
-			},
-			function validateAndExpandSourceAndDest(callback) {
-				const areaInfo = fileArea.getFileAreaByTag(dst.areaTag);
-				if(areaInfo) {
-					dst.areaInfo = areaInfo;
-				} else {
-					return callback(Errors.DoesNotExist('Invalid or unknown destination area'));
-				}
+    async.waterfall(
+        [
+            function init(callback) {
+                return initConfigAndDatabases( err => {
+                    if(!err) {
+                        fileArea = require('../../core/file_base_area.js');
+                    }
+                    return callback(err);
+                });
+            },
+            function validateAndExpandSourceAndDest(callback) {
+                const areaInfo = fileArea.getFileAreaByTag(dst.areaTag);
+                if(areaInfo) {
+                    dst.areaInfo = areaInfo;
+                } else {
+                    return callback(Errors.DoesNotExist('Invalid or unknown destination area'));
+                }
 
-				FileEntry = require('../../core/file_entry.js');
+                FileEntry = require('../../core/file_entry.js');
 
-				expandFileTargets(src, (err, srcEntries) => {
-					return callback(err, srcEntries);
-				});
-			},
-			function moveEntries(srcEntries, callback) {
+                expandFileTargets(src, (err, srcEntries) => {
+                    return callback(err, srcEntries);
+                });
+            },
+            function moveEntries(srcEntries, callback) {
 
-				if(!dst.storageTag) {
-					dst.storageTag = dst.areaInfo.storageTags[0];
-				}
+                if(!dst.storageTag) {
+                    dst.storageTag = dst.areaInfo.storageTags[0];
+                }
 
-				const destDir = FileEntry.getAreaStorageDirectoryByTag(dst.storageTag);
+                const destDir = FileEntry.getAreaStorageDirectoryByTag(dst.storageTag);
 
-				async.eachSeries(srcEntries, (entry, nextEntry) => {
-					const srcPath 	= entry.filePath;
-					const dstPath	= paths.join(destDir, entry.fileName);
+                async.eachSeries(srcEntries, (entry, nextEntry) => {
+                    const srcPath 	= entry.filePath;
+                    const dstPath	= paths.join(destDir, entry.fileName);
 
-					process.stdout.write(`Moving ${srcPath} => ${dstPath}... `);
+                    process.stdout.write(`Moving ${srcPath} => ${dstPath}... `);
 
-					FileEntry.moveEntry(entry, dst.areaTag, dst.storageTag, err => {
-						if(err) {
-							console.info(`Failed: ${err.message}`);
-						} else {
-							console.info('Done');
-						}
-						return nextEntry(null);	//	always try next
-					});
-				},
-				err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				process.exitCode = ExitCodes.ERROR;
-				console.error(err.message);
-			}
-		}
-	);
+                    FileEntry.moveEntry(entry, dst.areaTag, dst.storageTag, err => {
+                        if(err) {
+                            console.info(`Failed: ${err.message}`);
+                        } else {
+                            console.info('Done');
+                        }
+                        return nextEntry(null);	//	always try next
+                    });
+                },
+                err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            }
+        }
+    );
 }
 
 function removeFiles() {
-	//
-	//	oputil fb rm|remove|del|delete SRC [SRC2 ...]
-	//
-	//	SRC: FILENAME_WC|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
-	//
-	//	AREA_TAG[@STORAGE_TAG] remove all entries matching
-	//	supplied area/storage tags
-	//
-	//	--phys-file removes backing physical file(s)
-	//
-	if(argv._.length < 3) {
-		return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
-	}
+    //
+    //	oputil fb rm|remove|del|delete SRC [SRC2 ...]
+    //
+    //	SRC: FILENAME_WC|FILE_ID|SHA|AREA_TAG[@STORAGE_TAG]
+    //
+    //	AREA_TAG[@STORAGE_TAG] remove all entries matching
+    //	supplied area/storage tags
+    //
+    //	--phys-file removes backing physical file(s)
+    //
+    if(argv._.length < 3) {
+        return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
+    }
 
-	const removePhysFile = argv['phys-file'];
+    const removePhysFile = argv['phys-file'];
 
-	const src =  getAreaAndStorage(argv._.slice(2));
+    const src =  getAreaAndStorage(argv._.slice(2));
 
-	async.waterfall(
-		[
-			function init(callback) {
-				return initConfigAndDatabases( err => {
-					if(!err) {
-						fileArea = require('../../core/file_base_area.js');
-					}
-					return callback(err);
-				});
-			},
-			function expandSources(callback) {
-				expandFileTargets(src, (err, srcEntries) => {
-					return callback(err, srcEntries);
-				});
-			},
-			function removeEntries(srcEntries, callback) {
-				const FileEntry = require('../../core/file_entry.js');
+    async.waterfall(
+        [
+            function init(callback) {
+                return initConfigAndDatabases( err => {
+                    if(!err) {
+                        fileArea = require('../../core/file_base_area.js');
+                    }
+                    return callback(err);
+                });
+            },
+            function expandSources(callback) {
+                expandFileTargets(src, (err, srcEntries) => {
+                    return callback(err, srcEntries);
+                });
+            },
+            function removeEntries(srcEntries, callback) {
+                const FileEntry = require('../../core/file_entry.js');
 
-				const extraOutput = removePhysFile ? ' (including physical file)' : '';
+                const extraOutput = removePhysFile ? ' (including physical file)' : '';
 
-				async.eachSeries(srcEntries, (entry, nextEntry) => {
+                async.eachSeries(srcEntries, (entry, nextEntry) => {
 
-					process.stdout.write(`Removing ${entry.filePath}${extraOutput}... `);
+                    process.stdout.write(`Removing ${entry.filePath}${extraOutput}... `);
 
-					FileEntry.removeEntry(entry, { removePhysFile }, err => {
-						if(err) {
-							console.info(`Failed: ${err.message}`);
-						} else {
-							console.info('Done');
-						}
+                    FileEntry.removeEntry(entry, { removePhysFile }, err => {
+                        if(err) {
+                            console.info(`Failed: ${err.message}`);
+                        } else {
+                            console.info('Done');
+                        }
 
-						return nextEntry(err);
-					});
-				}, err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				process.exitCode = ExitCodes.ERROR;
-				console.error(err.message);
-			}
-		}
-	);
+                        return nextEntry(err);
+                    });
+                }, err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            }
+        }
+    );
 }
 
 function handleFileBaseCommand() {
 
-	function errUsage()  {
-		return printUsageAndSetExitCode(
-			getHelpFor('FileBase') + getHelpFor('FileOpsInfo'),
-			ExitCodes.ERROR
-		);
-	}
+    function errUsage()  {
+        return printUsageAndSetExitCode(
+            getHelpFor('FileBase') + getHelpFor('FileOpsInfo'),
+            ExitCodes.ERROR
+        );
+    }
 
-	if(true === argv.help) {
-		return errUsage();
-	}
+    if(true === argv.help) {
+        return errUsage();
+    }
 
-	const action = argv._[1];
+    const action = argv._[1];
 
-	return ({
-		info	: displayFileAreaInfo,
-		scan	: scanFileAreas,
+    return ({
+        info	: displayFileAreaInfo,
+        scan	: scanFileAreas,
 
-		mv		: moveFiles,
-		move	: moveFiles,
+        mv		: moveFiles,
+        move	: moveFiles,
 
-		rm		: removeFiles,
-		remove	: removeFiles,
-		del		: removeFiles,
-		delete	: removeFiles,
-	}[action] || errUsage)();
+        rm		: removeFiles,
+        remove	: removeFiles,
+        del		: removeFiles,
+        delete	: removeFiles,
+    }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index a560b17e..6f86cdf0 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -7,7 +7,7 @@ const getDefaultConfigPath			= require('./oputil_common.js').getDefaultConfigPat
 exports.getHelpFor				= getHelpFor;
 
 const usageHelp = exports.USAGE_HELP = {
-	General :
+    General :
 `usage: optutil.js [--version] [--help]
                   <command> [<args>]
 
@@ -21,7 +21,7 @@ commands:
   fb                        file base management
   mb                        message base management
 `,
-	User :
+    User :
 `usage: optutil.js user <action> [<args>]
 
 actions:
@@ -33,7 +33,7 @@ actions:
   group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
 `,
 
-	Config :
+    Config :
 `usage: optutil.js config <action> [<args>]
 
 actions:
@@ -46,7 +46,7 @@ import-areas args:
   --uplinks UL1,UL2,...    specify one or more comma separated uplinks
   --type TYPE              specifies area import type. valid options are "bbs" and "na"
 `,
-	FileBase :
+    FileBase :
 `usage: oputil.js fb <action> [<args>]
 
 actions:
@@ -80,7 +80,7 @@ info args:
 remove args:
   --phys-file                  also remove underlying physical file
 `,
-  FileOpsInfo :
+    FileOpsInfo :
 `
 general information:
   AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
@@ -90,7 +90,7 @@ general information:
   SHA                          full or partial SHA-256
   FILE_ID                      a file identifier. see file.sqlite3
 `,
-  MessageBase :
+    MessageBase :
   `usage: oputil.js mb <action> [<args>]
 
   actions:
@@ -101,5 +101,5 @@ general information:
 };
 
 function getHelpFor(command) {
-	return usageHelp[command];
+    return usageHelp[command];
 }
diff --git a/core/oputil/oputil_main.js b/core/oputil/oputil_main.js
index aa373ef2..d9492c0d 100644
--- a/core/oputil/oputil_main.js
+++ b/core/oputil/oputil_main.js
@@ -14,23 +14,23 @@ const getHelpFor				= require('./oputil_help.js').getHelpFor;
 
 module.exports = function() {
 
-	process.exitCode = ExitCodes.SUCCESS;
+    process.exitCode = ExitCodes.SUCCESS;
 
-	if(true === argv.version) {
-		return console.info(require('../package.json').version);
-	}
+    if(true === argv.version) {
+        return console.info(require('../package.json').version);
+    }
 
-	if(0 === argv._.length ||
+    if(0 === argv._.length ||
 		'help' === argv._[0])
-	{
-		return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.SUCCESS);
-	}
+    {
+        return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.SUCCESS);
+    }
 
-	switch(argv._[0]) {
-		case 'user'		: return handleUserCommand();		
-		case 'config'	: return handleConfigCommand();
-		case 'fb'		: return handleFileBaseCommand();
-		case 'mb'		: return handleMessageBaseCommand();
-		default			: return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.BAD_COMMAND);
-	}
+    switch(argv._[0]) {
+        case 'user'		: return handleUserCommand();
+        case 'config'	: return handleConfigCommand();
+        case 'fb'		: return handleFileBaseCommand();
+        case 'mb'		: return handleMessageBaseCommand();
+        default			: return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.BAD_COMMAND);
+    }
 };
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 6e89cf73..60a99a2a 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -16,127 +16,127 @@ const async						= require('async');
 exports.handleMessageBaseCommand	= handleMessageBaseCommand;
 
 function areaFix() {
-	//
-	//	oputil mb areafix CMD1 CMD2 ... ADDR [--password PASS]
-	//
-	if(argv._.length < 3) {
-		return printUsageAndSetExitCode(
-			getHelpFor('MessageBase'),
-			ExitCodes.ERROR
-		);
-	}
+    //
+    //	oputil mb areafix CMD1 CMD2 ... ADDR [--password PASS]
+    //
+    if(argv._.length < 3) {
+        return printUsageAndSetExitCode(
+            getHelpFor('MessageBase'),
+            ExitCodes.ERROR
+        );
+    }
 
-	async.waterfall(
-		[
-			function init(callback) {
-				return initConfigAndDatabases(callback);
-			},
-			function validateAddress(callback) {
-				const addrArg = argv._.slice(-1)[0];
-				const ftnAddr = Address.fromString(addrArg);
+    async.waterfall(
+        [
+            function init(callback) {
+                return initConfigAndDatabases(callback);
+            },
+            function validateAddress(callback) {
+                const addrArg = argv._.slice(-1)[0];
+                const ftnAddr = Address.fromString(addrArg);
 
-				if(!ftnAddr) {
-					return callback(Errors.Invalid(`"${addrArg}" is not a valid FTN address`));
-				}
+                if(!ftnAddr) {
+                    return callback(Errors.Invalid(`"${addrArg}" is not a valid FTN address`));
+                }
 
-				//
-				//	We need to validate the address targets a system we know unless
-				//	the --force option is used
-				//
-				//	:TODO:
-				return callback(null, ftnAddr);
-			},
-			function fetchFromUser(ftnAddr, callback) {
-				//
-				//	--from USER || +op from system
-				//
-				//	If possible, we want the user ID of the supplied user as well
-				//
-				const User = require('../user.js');
+                //
+                //	We need to validate the address targets a system we know unless
+                //	the --force option is used
+                //
+                //	:TODO:
+                return callback(null, ftnAddr);
+            },
+            function fetchFromUser(ftnAddr, callback) {
+                //
+                //	--from USER || +op from system
+                //
+                //	If possible, we want the user ID of the supplied user as well
+                //
+                const User = require('../user.js');
 
-				if(argv.from) {
-					User.getUserIdAndNameByLookup(argv.from, (err, userId, fromName) => {
-						if(err) {
-							return callback(null, ftnAddr, argv.from, 0);
-						}
+                if(argv.from) {
+                    User.getUserIdAndNameByLookup(argv.from, (err, userId, fromName) => {
+                        if(err) {
+                            return callback(null, ftnAddr, argv.from, 0);
+                        }
 
-						//	fromName is the same as argv.from, but case may be differnet (yet correct)
-						return callback(null, ftnAddr, fromName, userId);
-					});
-				} else {
-					User.getUserName(User.RootUserID, (err, fromName) => {
-						return callback(null, ftnAddr, fromName || 'SysOp', err ? 0 : User.RootUserID);
-					});
-				}
-			},
-			function createMessage(ftnAddr, fromName, fromUserId, callback) {
-				//
-				//	Build message as commands separated by line feed
-				//
-				//	We need to remove quotes from arguments. These are required
-				//	in the case of e.g. removing an area: "-SOME_AREA" would end
-				//	up confusing minimist, therefor they must be quoted: "'-SOME_AREA'"
-				//
-				const messageBody = argv._.slice(2, -1).map(arg => {
-					return arg.replace(/["']/g, '');
-				}).join('\r\n') + '\n';
+                        //	fromName is the same as argv.from, but case may be differnet (yet correct)
+                        return callback(null, ftnAddr, fromName, userId);
+                    });
+                } else {
+                    User.getUserName(User.RootUserID, (err, fromName) => {
+                        return callback(null, ftnAddr, fromName || 'SysOp', err ? 0 : User.RootUserID);
+                    });
+                }
+            },
+            function createMessage(ftnAddr, fromName, fromUserId, callback) {
+                //
+                //	Build message as commands separated by line feed
+                //
+                //	We need to remove quotes from arguments. These are required
+                //	in the case of e.g. removing an area: "-SOME_AREA" would end
+                //	up confusing minimist, therefor they must be quoted: "'-SOME_AREA'"
+                //
+                const messageBody = argv._.slice(2, -1).map(arg => {
+                    return arg.replace(/["']/g, '');
+                }).join('\r\n') + '\n';
 
-				const Message = require('../message.js');
+                const Message = require('../message.js');
 
-				const message = new Message({
-					toUserName		: argv.to || 'AreaFix',
-					fromUserName	: fromName,
-					subject			: argv.password || '',
-					message			: messageBody,
-					areaTag			: Message.WellKnownAreaTags.Private,	//	mark private
-					meta			: {
-						System		: {
-							[ Message.SystemMetaNames.RemoteToUser ]	: ftnAddr.toString(),			//	where to send it
-							[ Message.SystemMetaNames.ExternalFlavor ]	: Message.AddressFlavor.FTN,	//	on FTN-style network
-						}
-					}
-				});
+                const message = new Message({
+                    toUserName		: argv.to || 'AreaFix',
+                    fromUserName	: fromName,
+                    subject			: argv.password || '',
+                    message			: messageBody,
+                    areaTag			: Message.WellKnownAreaTags.Private,	//	mark private
+                    meta			: {
+                        System		: {
+                            [ Message.SystemMetaNames.RemoteToUser ]	: ftnAddr.toString(),			//	where to send it
+                            [ Message.SystemMetaNames.ExternalFlavor ]	: Message.AddressFlavor.FTN,	//	on FTN-style network
+                        }
+                    }
+                });
 
-				if(0 !== fromUserId) {
-					message.setLocalFromUserId(fromUserId);
-				}
+                if(0 !== fromUserId) {
+                    message.setLocalFromUserId(fromUserId);
+                }
 
-				return callback(null, message);
-			},
-			function persistMessage(message, callback) {
-				message.persist(err => {
-					if(!err) {
-						console.log('AreaFix message persisted and will be exported at next scheduled scan');
-					}
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				process.exitCode = ExitCodes.ERROR;
-				console.error(`${err.message}${err.reason ? ': ' + err.reason : ''}`);
-			}
-		}
-	);
+                return callback(null, message);
+            },
+            function persistMessage(message, callback) {
+                message.persist(err => {
+                    if(!err) {
+                        console.log('AreaFix message persisted and will be exported at next scheduled scan');
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(`${err.message}${err.reason ? ': ' + err.reason : ''}`);
+            }
+        }
+    );
 }
 
 function handleMessageBaseCommand() {
 
-	function errUsage() {
-		return printUsageAndSetExitCode(
-			getHelpFor('MessageBase'),
-			ExitCodes.ERROR
-		);
-	}
+    function errUsage() {
+        return printUsageAndSetExitCode(
+            getHelpFor('MessageBase'),
+            ExitCodes.ERROR
+        );
+    }
 
-	if(true === argv.help) {
-		return errUsage();
-	}
+    if(true === argv.help) {
+        return errUsage();
+    }
 
-	const action = argv._[1];
+    const action = argv._[1];
 
-	return({
-		areafix	: areaFix,
-	}[action] || errUsage)();
+    return({
+        areafix	: areaFix,
+    }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 59813b3b..60d3888d 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -15,191 +15,191 @@ const _							= require('lodash');
 exports.handleUserCommand		= handleUserCommand;
 
 function getUser(userName, cb) {
-	const User = require('../../core/user.js');
-	User.getUserIdAndName(userName, (err, userId) => {
-		if(err) {
-			process.exitCode = ExitCodes.BAD_ARGS;
-			return cb(err);
-		}
-		const u = new User();
-		u.userId = userId;
-		return cb(null, u);
-	});	
+    const User = require('../../core/user.js');
+    User.getUserIdAndName(userName, (err, userId) => {
+        if(err) {
+            process.exitCode = ExitCodes.BAD_ARGS;
+            return cb(err);
+        }
+        const u = new User();
+        u.userId = userId;
+        return cb(null, u);
+    });
 }
 
 function initAndGetUser(userName, cb) {
-	async.waterfall(
-		[
-			function init(callback) {
-				initConfigAndDatabases(callback);
-			},
-			function getUserObject(callback) {
-				getUser(userName, (err, user) => {
-					if(err) {
-						process.exitCode = ExitCodes.BAD_ARGS;
-						return callback(err);
-					}
-					return callback(null, user);
-				});
-			}
-		],
-		(err, user) => {
-			return cb(err, user);
-		}
-	);
+    async.waterfall(
+        [
+            function init(callback) {
+                initConfigAndDatabases(callback);
+            },
+            function getUserObject(callback) {
+                getUser(userName, (err, user) => {
+                    if(err) {
+                        process.exitCode = ExitCodes.BAD_ARGS;
+                        return callback(err);
+                    }
+                    return callback(null, user);
+                });
+            }
+        ],
+        (err, user) => {
+            return cb(err, user);
+        }
+    );
 }
 
 function setAccountStatus(user, status) {
-	if(argv._.length < 3) {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
+    if(argv._.length < 3) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
 
-	const AccountStatus = require('../../core/user.js').AccountStatus;
-	const statusDesc = _.invert(AccountStatus)[status];
-	user.persistProperty('account_status', status, err => {
-		if(err) {
-			process.exitCode = ExitCodes.ERROR;
-			console.error(err.message);
-		} else {
-			console.info(`User status set to ${statusDesc}`);
-		}
-	});
+    const AccountStatus = require('../../core/user.js').AccountStatus;
+    const statusDesc = _.invert(AccountStatus)[status];
+    user.persistProperty('account_status', status, err => {
+        if(err) {
+            process.exitCode = ExitCodes.ERROR;
+            console.error(err.message);
+        } else {
+            console.info(`User status set to ${statusDesc}`);
+        }
+    });
 }
 
 function setUserPassword(user) {
-	if(argv._.length < 4) {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
+    if(argv._.length < 4) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
 
-	async.waterfall(
-		[
-			function validate(callback) {
-				//	:TODO: prompt if no password provided (more secure, no history, etc.)
-				const password = argv._[argv._.length - 1];
-				if(0 === password.length) {
-					return callback(Errors.Invalid('Invalid password'));
-				}
-				return callback(null, password);
-			},
-			function set(password, callback) {
-				user.setNewAuthCredentials(password, err => {
-					if(err) {
-						process.exitCode = ExitCodes.BAD_ARGS;
-					}
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			if(err) {
-				console.error(err.message);
-			} else {
-				console.info('New password set');
-			}
-		}
-	);
+    async.waterfall(
+        [
+            function validate(callback) {
+                //	:TODO: prompt if no password provided (more secure, no history, etc.)
+                const password = argv._[argv._.length - 1];
+                if(0 === password.length) {
+                    return callback(Errors.Invalid('Invalid password'));
+                }
+                return callback(null, password);
+            },
+            function set(password, callback) {
+                user.setNewAuthCredentials(password, err => {
+                    if(err) {
+                        process.exitCode = ExitCodes.BAD_ARGS;
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                console.error(err.message);
+            } else {
+                console.info('New password set');
+            }
+        }
+    );
 }
 
-function removeUser(user) {
-	console.error('NOT YET IMPLEMENTED');
+function removeUser() {
+    console.error('NOT YET IMPLEMENTED');
 }
 
 function modUserGroups(user) {
-	if(argv._.length < 3) {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
+    if(argv._.length < 3) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
 
-	let groupName = argv._[argv._.length - 1].toString().replace(/["']/g, '');	//	remove any quotes - necessary to allow "-foo"
-	let action = groupName[0];	//	+ or -
+    let groupName = argv._[argv._.length - 1].toString().replace(/["']/g, '');	//	remove any quotes - necessary to allow "-foo"
+    let action = groupName[0];	//	+ or -
 
-	if('-' === action || '+' === action) {
-		groupName = groupName.substr(1);
-	}
+    if('-' === action || '+' === action) {
+        groupName = groupName.substr(1);
+    }
 
-	action = action || '+';
+    action = action || '+';
 
-	if(0 === groupName.length) {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
+    if(0 === groupName.length) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
 
-	//
-	//	Groups are currently arbritary, so do a slight validation
-	//
-	if(!/[A-Za-z0-9]+/.test(groupName)) {
-		process.exitCode = ExitCodes.BAD_ARGS;
-		return console.error('Bad group name');
-	}
+    //
+    //	Groups are currently arbritary, so do a slight validation
+    //
+    if(!/[A-Za-z0-9]+/.test(groupName)) {
+        process.exitCode = ExitCodes.BAD_ARGS;
+        return console.error('Bad group name');
+    }
 
-	function done(err) {
-		if(err) {
-			process.exitCode = ExitCodes.BAD_ARGS;
-			console.error(err.message);
-		} else {
-			console.info('User groups modified');
-		}
-	}
+    function done(err) {
+        if(err) {
+            process.exitCode = ExitCodes.BAD_ARGS;
+            console.error(err.message);
+        } else {
+            console.info('User groups modified');
+        }
+    }
 
-	const UserGroup = require('../../core/user_group.js');
-	if('-' === action) {
-		UserGroup.removeUserFromGroup(user.userId, groupName, done);
-	} else {
-		UserGroup.addUserToGroup(user.userId, groupName, done);
-	}
+    const UserGroup = require('../../core/user_group.js');
+    if('-' === action) {
+        UserGroup.removeUserFromGroup(user.userId, groupName, done);
+    } else {
+        UserGroup.addUserToGroup(user.userId, groupName, done);
+    }
 }
 
 function activateUser(user) {
-	const AccountStatus = require('../../core/user.js').AccountStatus;
-	return setAccountStatus(user, AccountStatus.active);
+    const AccountStatus = require('../../core/user.js').AccountStatus;
+    return setAccountStatus(user, AccountStatus.active);
 }
 
 function deactivateUser(user) {
-	const AccountStatus = require('../../core/user.js').AccountStatus;
-	return setAccountStatus(user, AccountStatus.inactive);
+    const AccountStatus = require('../../core/user.js').AccountStatus;
+    return setAccountStatus(user, AccountStatus.inactive);
 }
 
 function disableUser(user) {
-	const AccountStatus = require('../../core/user.js').AccountStatus;
-	return setAccountStatus(user, AccountStatus.disabled);
+    const AccountStatus = require('../../core/user.js').AccountStatus;
+    return setAccountStatus(user, AccountStatus.disabled);
 }
 
 function handleUserCommand() {
-	function errUsage()  {
-		return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
-	}
+    function errUsage()  {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
 
-	if(true === argv.help) {
-		return errUsage();
-	}
+    if(true === argv.help) {
+        return errUsage();
+    }
 
-	const action		= argv._[1];
-	const usernameIdx	= [ 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
-	const userName		= argv._[usernameIdx];
+    const action		= argv._[1];
+    const usernameIdx	= [ 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
+    const userName		= argv._[usernameIdx];
 
-	if(!userName) {
-		return errUsage();
-	}
+    if(!userName) {
+        return errUsage();
+    }
 
-	initAndGetUser(userName, (err, user) => {
-		if(err) {
-			process.exitCode = ExitCodes.ERROR;
-			return console.error(err.message);
-		}
+    initAndGetUser(userName, (err, user) => {
+        if(err) {
+            process.exitCode = ExitCodes.ERROR;
+            return console.error(err.message);
+        }
 
-		return ({
-			pass		: setUserPassword,
-			passwd		: setUserPassword,
-			password	: setUserPassword,
+        return ({
+            pass		: setUserPassword,
+            passwd		: setUserPassword,
+            password	: setUserPassword,
 
-			rm			: removeUser,
-			remove		: removeUser,
-			del			: removeUser,
-			delete		: removeUser,
+            rm			: removeUser,
+            remove		: removeUser,
+            del			: removeUser,
+            delete		: removeUser,
 
-			activate	: activateUser,
-			deactivate	: deactivateUser,
-			disable		: disableUser,
+            activate	: activateUser,
+            deactivate	: deactivateUser,
+            disable		: disableUser,
 
-			group		: modUserGroups,
-		}[action] || errUsage)(user);
-	});
+            group		: modUserGroups,
+        }[action] || errUsage)(user);
+    });
 }
\ No newline at end of file
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index c1f7e9fb..584feffa 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -21,230 +21,230 @@ exports.getPredefinedMCIValue	= getPredefinedMCIValue;
 exports.init					= init;
 
 function init(cb) {
-	setNextRandomRumor(cb);
+    setNextRandomRumor(cb);
 }
 
 function setNextRandomRumor(cb) {
-	StatLog.getSystemLogEntries('system_rumorz', StatLog.Order.Random, 1, (err, entry) => {
-		if(entry) {
-			entry = entry[0];
-		}
-		const randRumor = entry && entry.log_value ? entry.log_value : '';
-		StatLog.setNonPeristentSystemStat('random_rumor', randRumor);
-		if(cb) {
-			return cb(null);
-		}
-	});
+    StatLog.getSystemLogEntries('system_rumorz', StatLog.Order.Random, 1, (err, entry) => {
+        if(entry) {
+            entry = entry[0];
+        }
+        const randRumor = entry && entry.log_value ? entry.log_value : '';
+        StatLog.setNonPeristentSystemStat('random_rumor', randRumor);
+        if(cb) {
+            return cb(null);
+        }
+    });
 }
 
 function getUserRatio(client, propA, propB) {
-	const a = StatLog.getUserStatNum(client.user, propA);
-	const b	= StatLog.getUserStatNum(client.user, propB);
-	const ratio	= ~~((a / b) * 100);
-	return `${ratio}%`;
+    const a = StatLog.getUserStatNum(client.user, propA);
+    const b	= StatLog.getUserStatNum(client.user, propB);
+    const ratio	= ~~((a / b) * 100);
+    return `${ratio}%`;
 }
 
 function userStatAsString(client, statName, defaultValue) {
-	return (StatLog.getUserStat(client.user, statName) || defaultValue).toLocaleString();
+    return (StatLog.getUserStat(client.user, statName) || defaultValue).toLocaleString();
 }
 
 function sysStatAsString(statName, defaultValue) {
-	return (StatLog.getSystemStat(statName) || defaultValue).toLocaleString();
+    return (StatLog.getSystemStat(statName) || defaultValue).toLocaleString();
 }
 
 const PREDEFINED_MCI_GENERATORS = {
-	//
-	//	Board
-	//
-	BN	: function boardName() { return Config().general.boardName; },
+    //
+    //	Board
+    //
+    BN	: function boardName() { return Config().general.boardName; },
 
-	//	ENiGMA
-	VL	: function versionLabel() { return 'ENiGMA½ v' + packageJson.version; },
-	VN	: function version() { return packageJson.version; },
+    //	ENiGMA
+    VL	: function versionLabel() { return 'ENiGMA½ v' + packageJson.version; },
+    VN	: function version() { return packageJson.version; },
 
-	//	+op info
-	SN	: function opUserName() { return StatLog.getSystemStat('sysop_username'); },
-	SR	: function opRealName() { return StatLog.getSystemStat('sysop_real_name'); },
-	SL	: function opLocation() { return StatLog.getSystemStat('sysop_location'); },
-	SA	: function opAffils() { return StatLog.getSystemStat('sysop_affiliation'); },
-	SS	: function opSex() { return StatLog.getSystemStat('sysop_sex'); },
-	SE	: function opEmail() { return StatLog.getSystemStat('sysop_email_address'); },
-	//	:TODO: op age, web, ?????
+    //	+op info
+    SN	: function opUserName() { return StatLog.getSystemStat('sysop_username'); },
+    SR	: function opRealName() { return StatLog.getSystemStat('sysop_real_name'); },
+    SL	: function opLocation() { return StatLog.getSystemStat('sysop_location'); },
+    SA	: function opAffils() { return StatLog.getSystemStat('sysop_affiliation'); },
+    SS	: function opSex() { return StatLog.getSystemStat('sysop_sex'); },
+    SE	: function opEmail() { return StatLog.getSystemStat('sysop_email_address'); },
+    //	:TODO: op age, web, ?????
 
-	//
-	//	Current user / session
-	//
-	UN	: function userName(client) { return client.user.username; },
-	UI	: function userId(client) { return client.user.userId.toString(); },
-	UG	: function groups(client) { return _.values(client.user.groups).join(', '); },
-	UR	: function realName(client) { return userStatAsString(client, 'real_name', ''); },
-	LO	: function location(client) { return userStatAsString(client, 'location', ''); },
-	UA	: function age(client) { return client.user.getAge().toString(); },
-	BD	: function birthdate(client) { return moment(client.user.properties.birthdate).format(client.currentTheme.helpers.getDateFormat()); },	//	iNiQUiTY
-	US	: function sex(client) { return userStatAsString(client, 'sex', ''); },
-	UE	: function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
-	UW	: function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
-	UF	: function affils(client) { return userStatAsString(client, 'affiliation', ''); },
-	UT	: function themeId(client) { return userStatAsString(client, 'theme_id', ''); },
-	UC	: function loginCount(client) { return userStatAsString(client, 'login_count', 0); },
-	ND	: function connectedNode(client) { return client.node.toString(); },
-	IP	: function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },	//	convert any :ffff: IPv4's to 32bit version
-	ST	: function serverName(client) { return client.session.serverName; },
-	FN	: function activeFileBaseFilterName(client) {
-		const activeFilter = FileBaseFilters.getActiveFilter(client);
-		return activeFilter ? activeFilter.name : '';
-	},
-	DN	: function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },		//	Obv/2
-	DK	: function userByteDownload(client) {	//	Obv/2 uses DK=downloaded Kbytes
-		const byteSize = StatLog.getUserStatNum(client.user, 'dl_total_bytes');
-		return formatByteSize(byteSize, true);	//	true=withAbbr
-	},
-	UP	: function userNumUploads(client) { return userStatAsString(client, 'ul_total_count', 0); },			//	Obv/2
-	UK	: function userByteUpload(client) { //	Obv/2 uses UK=uploaded Kbytes
-		const byteSize = StatLog.getUserStatNum(client.user, 'ul_total_bytes');
-		return formatByteSize(byteSize, true);	//	true=withAbbr
-	},
-	NR	: function userUpDownRatio(client) {	//	Obv/2
-		return getUserRatio(client, 'ul_total_count', 'dl_total_count');
-	},
-	KR	: function userUpDownByteRatio(client) {	//	Obv/2 uses KR=upload/download Kbyte ratio
-		return getUserRatio(client, 'ul_total_bytes', 'dl_total_bytes');
-	},
+    //
+    //	Current user / session
+    //
+    UN	: function userName(client) { return client.user.username; },
+    UI	: function userId(client) { return client.user.userId.toString(); },
+    UG	: function groups(client) { return _.values(client.user.groups).join(', '); },
+    UR	: function realName(client) { return userStatAsString(client, 'real_name', ''); },
+    LO	: function location(client) { return userStatAsString(client, 'location', ''); },
+    UA	: function age(client) { return client.user.getAge().toString(); },
+    BD	: function birthdate(client) { return moment(client.user.properties.birthdate).format(client.currentTheme.helpers.getDateFormat()); },	//	iNiQUiTY
+    US	: function sex(client) { return userStatAsString(client, 'sex', ''); },
+    UE	: function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
+    UW	: function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
+    UF	: function affils(client) { return userStatAsString(client, 'affiliation', ''); },
+    UT	: function themeId(client) { return userStatAsString(client, 'theme_id', ''); },
+    UC	: function loginCount(client) { return userStatAsString(client, 'login_count', 0); },
+    ND	: function connectedNode(client) { return client.node.toString(); },
+    IP	: function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },	//	convert any :ffff: IPv4's to 32bit version
+    ST	: function serverName(client) { return client.session.serverName; },
+    FN	: function activeFileBaseFilterName(client) {
+        const activeFilter = FileBaseFilters.getActiveFilter(client);
+        return activeFilter ? activeFilter.name : '';
+    },
+    DN	: function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },		//	Obv/2
+    DK	: function userByteDownload(client) {	//	Obv/2 uses DK=downloaded Kbytes
+        const byteSize = StatLog.getUserStatNum(client.user, 'dl_total_bytes');
+        return formatByteSize(byteSize, true);	//	true=withAbbr
+    },
+    UP	: function userNumUploads(client) { return userStatAsString(client, 'ul_total_count', 0); },			//	Obv/2
+    UK	: function userByteUpload(client) { //	Obv/2 uses UK=uploaded Kbytes
+        const byteSize = StatLog.getUserStatNum(client.user, 'ul_total_bytes');
+        return formatByteSize(byteSize, true);	//	true=withAbbr
+    },
+    NR	: function userUpDownRatio(client) {	//	Obv/2
+        return getUserRatio(client, 'ul_total_count', 'dl_total_count');
+    },
+    KR	: function userUpDownByteRatio(client) {	//	Obv/2 uses KR=upload/download Kbyte ratio
+        return getUserRatio(client, 'ul_total_bytes', 'dl_total_bytes');
+    },
 
-	MS	: function accountCreatedclient(client) { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
-	PS	: function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
-	PC	: function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
+    MS	: function accountCreatedclient(client) { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
+    PS	: function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
+    PC	: function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
 
-	MD	: function currentMenuDescription(client) {
-		return _.has(client, 'currentMenuModule.menuConfig.desc') ? client.currentMenuModule.menuConfig.desc : '';
-	},
+    MD	: function currentMenuDescription(client) {
+        return _.has(client, 'currentMenuModule.menuConfig.desc') ? client.currentMenuModule.menuConfig.desc : '';
+    },
 
-	MA	: function messageAreaName(client) {
-		const area = getMessageAreaByTag(client.user.properties.message_area_tag);
-		return area ? area.name : '';
-	},
-	MC  : function messageConfName(client) {
-		const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
-		return conf ? conf.name : '';
-	},
-	ML  : function messageAreaDescription(client) {
-		const area = getMessageAreaByTag(client.user.properties.message_area_tag);
-		return area ? area.desc : '';
-	},
-	CM	: function messageConfDescription(client) {
-		const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
-		return conf ? conf.desc : '';
-	},
+    MA	: function messageAreaName(client) {
+        const area = getMessageAreaByTag(client.user.properties.message_area_tag);
+        return area ? area.name : '';
+    },
+    MC  : function messageConfName(client) {
+        const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
+        return conf ? conf.name : '';
+    },
+    ML  : function messageAreaDescription(client) {
+        const area = getMessageAreaByTag(client.user.properties.message_area_tag);
+        return area ? area.desc : '';
+    },
+    CM	: function messageConfDescription(client) {
+        const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
+        return conf ? conf.desc : '';
+    },
 
-	SH	: function termHeight(client) { return client.term.termHeight.toString(); },
-	SW	: function termWidth(client) { return client.term.termWidth.toString(); },
+    SH	: function termHeight(client) { return client.term.termHeight.toString(); },
+    SW	: function termWidth(client) { return client.term.termWidth.toString(); },
 
-	//
-	//	Date/Time
-	//
-	//	:TODO: change to CD for 'Current Date'
-	DT	: function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
-	CT	: function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
+    //
+    //	Date/Time
+    //
+    //	:TODO: change to CD for 'Current Date'
+    DT	: function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
+    CT	: function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
 
-	//
-	//	OS/System Info
-	//
-	OS	: function operatingSystem() {
-		return {
-			linux	: 'Linux',
-			darwin	: 'Mac OS X',
-			win32	: 'Windows',
-			sunos	: 'SunOS',
-			freebsd	: 'FreeBSD',
-		}[os.platform()] || os.type();
-	},
+    //
+    //	OS/System Info
+    //
+    OS	: function operatingSystem() {
+        return {
+            linux	: 'Linux',
+            darwin	: 'Mac OS X',
+            win32	: 'Windows',
+            sunos	: 'SunOS',
+            freebsd	: 'FreeBSD',
+        }[os.platform()] || os.type();
+    },
 
-	OA	: function systemArchitecture() { return os.arch(); },
+    OA	: function systemArchitecture() { return os.arch(); },
 
-	SC	: function systemCpuModel() {
-		//
-		//	Clean up CPU strings a bit for better display
-		//
-		return os.cpus()[0].model
-			.replace(/\(R\)|\(TM\)|processor|CPU/g, '')
-			.replace(/\s+(?= )/g, '');
-	},
+    SC	: function systemCpuModel() {
+        //
+        //	Clean up CPU strings a bit for better display
+        //
+        return os.cpus()[0].model
+            .replace(/\(R\)|\(TM\)|processor|CPU/g, '')
+            .replace(/\s+(?= )/g, '');
+    },
 
-	//	:TODO: MCI for core count, e.g. os.cpus().length
+    //	:TODO: MCI for core count, e.g. os.cpus().length
 
-	//	:TODO: cpu load average (over N seconds): http://stackoverflow.com/questions/9565912/convert-the-output-of-os-cpus-in-node-js-to-percentage
-	NV	: function nodeVersion() { return process.version; },
+    //	:TODO: cpu load average (over N seconds): http://stackoverflow.com/questions/9565912/convert-the-output-of-os-cpus-in-node-js-to-percentage
+    NV	: function nodeVersion() { return process.version; },
 
-	AN	: function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
+    AN	: function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
 
-	TC	: function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
+    TC	: function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
 
-	RR	: function randomRumor() {
-		//	start the process of picking another random one
-		setNextRandomRumor();
+    RR	: function randomRumor() {
+        //	start the process of picking another random one
+        setNextRandomRumor();
 
-		return StatLog.getSystemStat('random_rumor');
-	},
+        return StatLog.getSystemStat('random_rumor');
+    },
 
-	//
-	//	System File Base, Up/Download Info
-	//
-	//	:TODO: DD - Today's # of downloads (iNiQUiTY)
-	//
-	SD	: function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
-	SO	: function systemByteDownload() {
-		const byteSize = StatLog.getSystemStatNum('dl_total_bytes');
-		return formatByteSize(byteSize, true);	//	true=withAbbr
-	},
-	SU	: function systemNumUploads() { return sysStatAsString('ul_total_count', 0); },
-	SP	: function systemByteUpload() {
-		const byteSize = StatLog.getSystemStatNum('ul_total_bytes');
-		return formatByteSize(byteSize, true);	//	true=withAbbr
-	},
-	TF	: function totalFilesOnSystem() {
-		const areaStats = StatLog.getSystemStat('file_base_area_stats');
-		return _.get(areaStats, 'totalFiles', 0).toLocaleString();
-	},
-	TB	: function totalBytesOnSystem() {
-		const areaStats		= StatLog.getSystemStat('file_base_area_stats');
-		const totalBytes	= parseInt(_.get(areaStats, 'totalBytes', 0));
-		return formatByteSize(totalBytes, true);	//	true=withAbbr
-	},
+    //
+    //	System File Base, Up/Download Info
+    //
+    //	:TODO: DD - Today's # of downloads (iNiQUiTY)
+    //
+    SD	: function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
+    SO	: function systemByteDownload() {
+        const byteSize = StatLog.getSystemStatNum('dl_total_bytes');
+        return formatByteSize(byteSize, true);	//	true=withAbbr
+    },
+    SU	: function systemNumUploads() { return sysStatAsString('ul_total_count', 0); },
+    SP	: function systemByteUpload() {
+        const byteSize = StatLog.getSystemStatNum('ul_total_bytes');
+        return formatByteSize(byteSize, true);	//	true=withAbbr
+    },
+    TF	: function totalFilesOnSystem() {
+        const areaStats = StatLog.getSystemStat('file_base_area_stats');
+        return _.get(areaStats, 'totalFiles', 0).toLocaleString();
+    },
+    TB	: function totalBytesOnSystem() {
+        const areaStats		= StatLog.getSystemStat('file_base_area_stats');
+        const totalBytes	= parseInt(_.get(areaStats, 'totalBytes', 0));
+        return formatByteSize(totalBytes, true);	//	true=withAbbr
+    },
 
-	//	:TODO: PT - Messages posted *today* (Obv/2)
-	//		-> Include FTN/etc.
-	//	:TODO: NT - New users today (Obv/2)
-	//	:TODO: CT - Calls *today* (Obv/2)
-	//	:TODO: FT - Files uploaded/added *today* (Obv/2)
-	//	:TODO: DD - Files downloaded *today* (iNiQUiTY)
-	//	:TODO: TP - total message/posts on the system (Obv/2)
-	//		-> Include FTN/etc.
-	//	:TODO: LC - name of last caller to system (Obv/2)
-	//	:TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
+    //	:TODO: PT - Messages posted *today* (Obv/2)
+    //		-> Include FTN/etc.
+    //	:TODO: NT - New users today (Obv/2)
+    //	:TODO: CT - Calls *today* (Obv/2)
+    //	:TODO: FT - Files uploaded/added *today* (Obv/2)
+    //	:TODO: DD - Files downloaded *today* (iNiQUiTY)
+    //	:TODO: TP - total message/posts on the system (Obv/2)
+    //		-> Include FTN/etc.
+    //	:TODO: LC - name of last caller to system (Obv/2)
+    //	:TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
 
 
-	//
-	//	Special handling for XY
-	//
-	XY	: function xyHack() { return; /* nothing */ },
+    //
+    //	Special handling for XY
+    //
+    XY	: function xyHack() { return; /* nothing */ },
 };
 
 function getPredefinedMCIValue(client, code) {
 
-	if(!client || !code) {
-		return;
-	}
+    if(!client || !code) {
+        return;
+    }
 
-	const generator = PREDEFINED_MCI_GENERATORS[code];
+    const generator = PREDEFINED_MCI_GENERATORS[code];
 
-	if(generator) {
-		let value;
-		try {
-			value = generator(client);
-		} catch(e) {
-			Log.error( { code : code, exception : e.message }, 'Exception caught generating predefined MCI value' );
-		}
+    if(generator) {
+        let value;
+        try {
+            value = generator(client);
+        } catch(e) {
+            Log.error( { code : code, exception : e.message }, 'Exception caught generating predefined MCI value' );
+        }
 
-		return value;
-	}
+        return value;
+    }
 }
diff --git a/core/rumorz.js b/core/rumorz.js
index da1ab5f6..d51e33e8 100644
--- a/core/rumorz.js
+++ b/core/rumorz.js
@@ -15,233 +15,233 @@ const async					= require('async');
 const _						= require('lodash');
 
 exports.moduleInfo = {
-	name		: 'Rumorz',
-	desc		: 'Standard local rumorz',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.rumorz',
+    name		: 'Rumorz',
+    desc		: 'Standard local rumorz',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.rumorz',
 };
 
 const STATLOG_KEY_RUMORZ	= 'system_rumorz';
 
 const FormIds = {
-	View	: 0,
-	Add		: 1,
+    View	: 0,
+    Add		: 1,
 };
 
 const MciCodeIds = {
-	ViewForm	:  {
-		Entries		: 1,
-		AddPrompt	: 2,
-	},
-	AddForm : {
-		NewEntry		: 1,
-		EntryPreview	: 2,
-		AddPrompt		: 3,
-	}
+    ViewForm	:  {
+        Entries		: 1,
+        AddPrompt	: 2,
+    },
+    AddForm : {
+        NewEntry		: 1,
+        EntryPreview	: 2,
+        AddPrompt		: 3,
+    }
 };
 
 exports.getModule = class RumorzModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.menuMethods =  {
-			viewAddScreen : (formData, extraArgs, cb) => {
-				return this.displayAddScreen(cb);
-			},
+        this.menuMethods =  {
+            viewAddScreen : (formData, extraArgs, cb) => {
+                return this.displayAddScreen(cb);
+            },
 
-			addEntry : (formData, extraArgs, cb) => {
-				if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
-					const rumor = formData.value.rumor.trim();	//	remove any trailing ws
+            addEntry : (formData, extraArgs, cb) => {
+                if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
+                    const rumor = formData.value.rumor.trim();	//	remove any trailing ws
 
-					StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
-						this.clearAddForm();
-						return this.displayViewScreen(true, cb);	//	true=cls
-					});
-				} else {
-					//	empty message - treat as if cancel was hit
-					return this.displayViewScreen(true, cb);	//	true=cls
-				}
-			},
+                    StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
+                        this.clearAddForm();
+                        return this.displayViewScreen(true, cb);	//	true=cls
+                    });
+                } else {
+                    //	empty message - treat as if cancel was hit
+                    return this.displayViewScreen(true, cb);	//	true=cls
+                }
+            },
 
-			cancelAdd : (formData, extraArgs, cb) => {
-				this.clearAddForm();
-				return this.displayViewScreen(true, cb);	//	true=cls
-			}
-		};
-	}
+            cancelAdd : (formData, extraArgs, cb) => {
+                this.clearAddForm();
+                return this.displayViewScreen(true, cb);	//	true=cls
+            }
+        };
+    }
 
-	get config() { return this.menuConfig.config; }
+    get config() { return this.menuConfig.config; }
 
-	clearAddForm() {
-		const newEntryView	= this.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
-		const previewView	= this.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
+    clearAddForm() {
+        const newEntryView	= this.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
+        const previewView	= this.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
 
-		newEntryView.setText('');
+        newEntryView.setText('');
 
-		//	preview is optional
-		if(previewView) {
-			previewView.setText('');
-		}
-	}
+        //	preview is optional
+        if(previewView) {
+            previewView.setText('');
+        }
+    }
 
-	initSequence() {
-		const self = this;
+    initSequence() {
+        const self = this;
 
-		async.series(
-			[
-				function beforeDisplayArt(callback) {
-					self.beforeArt(callback);
-				},
-				function display(callback) {
-					self.displayViewScreen(false, callback);
-				}
-			],
-			err => {
-				if(err) {
-					//	:TODO: Handle me -- initSequence() should really take a completion callback
-				}
-				self.finishedLoading();
-			}
-		);
-	}
+        async.series(
+            [
+                function beforeDisplayArt(callback) {
+                    self.beforeArt(callback);
+                },
+                function display(callback) {
+                    self.displayViewScreen(false, callback);
+                }
+            ],
+            err => {
+                if(err) {
+                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                }
+                self.finishedLoading();
+            }
+        );
+    }
 
-	displayViewScreen(clearScreen, cb) {
-		const self = this;
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					if(self.viewControllers.add) {
-						self.viewControllers.add.setFocus(false);
-					}
+    displayViewScreen(clearScreen, cb) {
+        const self = this;
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    if(self.viewControllers.add) {
+                        self.viewControllers.add.setFocus(false);
+                    }
 
-					if(clearScreen) {
-						self.client.term.rawWrite(resetScreen());
-					}
+                    if(clearScreen) {
+                        self.client.term.rawWrite(resetScreen());
+                    }
 
-					theme.displayThemedAsset(
-						self.config.art.entries,
-						self.client,
-						{ font : self.menuConfig.font, trailingLF : false },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'view',
-							new ViewController( { client : self.client, formId : FormIds.View } )
-						);
+                    theme.displayThemedAsset(
+                        self.config.art.entries,
+                        self.client,
+                        { font : self.menuConfig.font, trailingLF : false },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'view',
+                            new ViewController( { client : self.client, formId : FormIds.View } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.View,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.View,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.view.setFocus(true);
-						self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt).redraw();
-						return callback(null);
-					}
-				},
-				function fetchEntries(callback) {
-					const entriesView = self.viewControllers.view.getView(MciCodeIds.ViewForm.Entries);
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.view.setFocus(true);
+                        self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt).redraw();
+                        return callback(null);
+                    }
+                },
+                function fetchEntries(callback) {
+                    const entriesView = self.viewControllers.view.getView(MciCodeIds.ViewForm.Entries);
 
-					StatLog.getSystemLogEntries(STATLOG_KEY_RUMORZ, StatLog.Order.Timestamp, (err, entries) => {
-						return callback(err, entriesView, entries);
-					});
-				},
-				function populateEntries(entriesView, entries, callback) {
-					const config			= self.config;
-					const listFormat		= config.listFormat || '{rumor}';
-					const focusListFormat	= config.focusListFormat || listFormat;
+                    StatLog.getSystemLogEntries(STATLOG_KEY_RUMORZ, StatLog.Order.Timestamp, (err, entries) => {
+                        return callback(err, entriesView, entries);
+                    });
+                },
+                function populateEntries(entriesView, entries, callback) {
+                    const config			= self.config;
+                    const listFormat		= config.listFormat || '{rumor}';
+                    const focusListFormat	= config.focusListFormat || listFormat;
 
-					entriesView.setItems(entries.map( e => stringFormat(listFormat, { rumor : e.log_value } ) ) );
-					entriesView.setFocusItems(entries.map(e => stringFormat(focusListFormat, { rumor : e.log_value } ) ) );
-					entriesView.redraw();
+                    entriesView.setItems(entries.map( e => stringFormat(listFormat, { rumor : e.log_value } ) ) );
+                    entriesView.setFocusItems(entries.map(e => stringFormat(focusListFormat, { rumor : e.log_value } ) ) );
+                    entriesView.redraw();
 
-					return callback(null);
-				},
-				function finalPrep(callback) {
-					const promptView = self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt);
-					promptView.setFocusItemIndex(1);	//	default to NO
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                    return callback(null);
+                },
+                function finalPrep(callback) {
+                    const promptView = self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt);
+                    promptView.setFocusItemIndex(1);	//	default to NO
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	displayAddScreen(cb) {
-		const self = this;
+    displayAddScreen(cb) {
+        const self = this;
 
-		async.waterfall(
-			[
-				function clearAndDisplayArt(callback) {
-					self.viewControllers.view.setFocus(false);
-					self.client.term.rawWrite(resetScreen());
+        async.waterfall(
+            [
+                function clearAndDisplayArt(callback) {
+                    self.viewControllers.view.setFocus(false);
+                    self.client.term.rawWrite(resetScreen());
 
-					theme.displayThemedAsset(
-						self.config.art.add,
-						self.client,
-						{ font : self.menuConfig.font },
-						(err, artData) => {
-							return callback(err, artData);
-						}
-					);
-				},
-				function initOrRedrawViewController(artData, callback) {
-					if(_.isUndefined(self.viewControllers.add)) {
-						const vc = self.addViewController(
-							'add',
-							new ViewController( { client : self.client, formId : FormIds.Add } )
-						);
+                    theme.displayThemedAsset(
+                        self.config.art.add,
+                        self.client,
+                        { font : self.menuConfig.font },
+                        (err, artData) => {
+                            return callback(err, artData);
+                        }
+                    );
+                },
+                function initOrRedrawViewController(artData, callback) {
+                    if(_.isUndefined(self.viewControllers.add)) {
+                        const vc = self.addViewController(
+                            'add',
+                            new ViewController( { client : self.client, formId : FormIds.Add } )
+                        );
 
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: artData.mciMap,
-							formId			: FormIds.Add,
-						};
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: artData.mciMap,
+                            formId			: FormIds.Add,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					} else {
-						self.viewControllers.add.setFocus(true);
-						self.viewControllers.add.redrawAll();
-						self.viewControllers.add.switchFocus(MciCodeIds.AddForm.NewEntry);
-						return callback(null);
-					}
-				},
-				function initPreviewUpdates(callback) {
-					const previewView	= self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
-					const entryView		= self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
-					if(previewView) {
-						let timerId;
-						entryView.on('key press', () => {
-							clearTimeout(timerId);
-							timerId = setTimeout( () => {
-								const focused = self.viewControllers.add.getFocusedView();
-								if(focused === entryView) {
-									previewView.setText(entryView.getData());
-									focused.setFocus(true);
-								}
-							}, 500);
-						});
-					}
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    } else {
+                        self.viewControllers.add.setFocus(true);
+                        self.viewControllers.add.redrawAll();
+                        self.viewControllers.add.switchFocus(MciCodeIds.AddForm.NewEntry);
+                        return callback(null);
+                    }
+                },
+                function initPreviewUpdates(callback) {
+                    const previewView	= self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
+                    const entryView		= self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
+                    if(previewView) {
+                        let timerId;
+                        entryView.on('key press', () => {
+                            clearTimeout(timerId);
+                            timerId = setTimeout( () => {
+                                const focused = self.viewControllers.add.getFocusedView();
+                                if(focused === entryView) {
+                                    previewView.setText(entryView.getData());
+                                    focused.setFocus(true);
+                                }
+                            }, 500);
+                        });
+                    }
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 };
diff --git a/core/sauce.js b/core/sauce.js
index e0182ae7..29176d8d 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -27,100 +27,100 @@ exports.SAUCE_SIZE		= SAUCE_SIZE;
 const SAUCE_VALID_DATA_TYPES = [0, 1, 2, 3, 4, 5, 6, 7, 8 ];
 
 function readSAUCE(data, cb) {
-	if(data.length < SAUCE_SIZE) {
-		return cb(Errors.DoesNotExist('No SAUCE record present'));
-	}
+    if(data.length < SAUCE_SIZE) {
+        return cb(Errors.DoesNotExist('No SAUCE record present'));
+    }
 
-	let sauceRec;
-	try {
-		sauceRec = new Parser()
-			.buffer('id', { length : 5 } )
-			.buffer('version', { length : 2 } )
-			.buffer('title', { length: 35 } )
-			.buffer('author', { length : 20 } )
-			.buffer('group', { length: 20 } )
-			.buffer('date', { length: 8 } )
-			.uint32le('fileSize')
-			.int8('dataType')
-			.int8('fileType')
-			.uint16le('tinfo1')
-			.uint16le('tinfo2')
-			.uint16le('tinfo3')
-			.uint16le('tinfo4')
-			.int8('numComments')
-			.int8('flags')
-			//	:TODO: does this need to be optional?
-			.buffer('tinfos', { length: 22 } )	//	SAUCE 00.5
-			.parse(data.slice(data.length - SAUCE_SIZE));
-	} catch(e) {
-		return cb(Errors.Invalid('Invalid SAUCE record'));
-	}
+    let sauceRec;
+    try {
+        sauceRec = new Parser()
+            .buffer('id', { length : 5 } )
+            .buffer('version', { length : 2 } )
+            .buffer('title', { length: 35 } )
+            .buffer('author', { length : 20 } )
+            .buffer('group', { length: 20 } )
+            .buffer('date', { length: 8 } )
+            .uint32le('fileSize')
+            .int8('dataType')
+            .int8('fileType')
+            .uint16le('tinfo1')
+            .uint16le('tinfo2')
+            .uint16le('tinfo3')
+            .uint16le('tinfo4')
+            .int8('numComments')
+            .int8('flags')
+            //	:TODO: does this need to be optional?
+            .buffer('tinfos', { length: 22 } )	//	SAUCE 00.5
+            .parse(data.slice(data.length - SAUCE_SIZE));
+    } catch(e) {
+        return cb(Errors.Invalid('Invalid SAUCE record'));
+    }
 
 
-	if(!SAUCE_ID.equals(sauceRec.id)) {
-		return cb(Errors.DoesNotExist('No SAUCE record present'));
-	}
+    if(!SAUCE_ID.equals(sauceRec.id)) {
+        return cb(Errors.DoesNotExist('No SAUCE record present'));
+    }
 
-	const ver = iconv.decode(sauceRec.version, 'cp437');
+    const ver = iconv.decode(sauceRec.version, 'cp437');
 
-	if('00' !== ver) {
-		return cb(Errors.Invalid(`Unsupported SAUCE version: ${ver}`));
-	}
+    if('00' !== ver) {
+        return cb(Errors.Invalid(`Unsupported SAUCE version: ${ver}`));
+    }
 
-	if(-1 === SAUCE_VALID_DATA_TYPES.indexOf(sauceRec.dataType)) {
-		return cb(Errors.Invalid(`Unsupported SAUCE DataType: ${sauceRec.dataType}`));
-	}
+    if(-1 === SAUCE_VALID_DATA_TYPES.indexOf(sauceRec.dataType)) {
+        return cb(Errors.Invalid(`Unsupported SAUCE DataType: ${sauceRec.dataType}`));
+    }
 
-	const sauce = {
-		id 			: iconv.decode(sauceRec.id, 'cp437'),
-		version		: iconv.decode(sauceRec.version, 'cp437').trim(),
-		title		: iconv.decode(sauceRec.title, 'cp437').trim(),
-		author		: iconv.decode(sauceRec.author, 'cp437').trim(),
-		group		: iconv.decode(sauceRec.group, 'cp437').trim(),
-		date		: iconv.decode(sauceRec.date, 'cp437').trim(),
-		fileSize	: sauceRec.fileSize,
-		dataType	: sauceRec.dataType,
-		fileType	: sauceRec.fileType,
-		tinfo1		: sauceRec.tinfo1,
-		tinfo2		: sauceRec.tinfo2,
-		tinfo3		: sauceRec.tinfo3,
-		tinfo4		: sauceRec.tinfo4,
-		numComments	: sauceRec.numComments,
-		flags		: sauceRec.flags,
-		tinfos		: sauceRec.tinfos,
-	};
+    const sauce = {
+        id 			: iconv.decode(sauceRec.id, 'cp437'),
+        version		: iconv.decode(sauceRec.version, 'cp437').trim(),
+        title		: iconv.decode(sauceRec.title, 'cp437').trim(),
+        author		: iconv.decode(sauceRec.author, 'cp437').trim(),
+        group		: iconv.decode(sauceRec.group, 'cp437').trim(),
+        date		: iconv.decode(sauceRec.date, 'cp437').trim(),
+        fileSize	: sauceRec.fileSize,
+        dataType	: sauceRec.dataType,
+        fileType	: sauceRec.fileType,
+        tinfo1		: sauceRec.tinfo1,
+        tinfo2		: sauceRec.tinfo2,
+        tinfo3		: sauceRec.tinfo3,
+        tinfo4		: sauceRec.tinfo4,
+        numComments	: sauceRec.numComments,
+        flags		: sauceRec.flags,
+        tinfos		: sauceRec.tinfos,
+    };
 
-	const dt = SAUCE_DATA_TYPES[sauce.dataType];
-	if(dt && dt.parser) {
-		sauce[dt.name] = dt.parser(sauce);
-	}
+    const dt = SAUCE_DATA_TYPES[sauce.dataType];
+    if(dt && dt.parser) {
+        sauce[dt.name] = dt.parser(sauce);
+    }
 
-	return cb(null, sauce);
+    return cb(null, sauce);
 }
 
 //	:TODO: These need completed:
 const SAUCE_DATA_TYPES = {
-	0	: { name : 'None' },
-	1	: { name : 'Character', parser : parseCharacterSAUCE },
-	2 	: 'Bitmap',
-	3	: 'Vector',
-	4	: 'Audio',
-	5	: 'BinaryText',
-	6	: 'XBin',
-	7	: 'Archive',
-	8	: 'Executable',
+    0	: { name : 'None' },
+    1	: { name : 'Character', parser : parseCharacterSAUCE },
+    2 	: 'Bitmap',
+    3	: 'Vector',
+    4	: 'Audio',
+    5	: 'BinaryText',
+    6	: 'XBin',
+    7	: 'Archive',
+    8	: 'Executable',
 };
 
 const SAUCE_CHARACTER_FILE_TYPES = {
-	0	: 'ASCII',
-	1	: 'ANSi',
-	2	: 'ANSiMation',
-	3	: 'RIP script',
-	4	: 'PCBoard',
-	5	: 'Avatar',
-	6	: 'HTML',
-	7	: 'Source',
-	8	: 'TundraDraw',
+    0	: 'ASCII',
+    1	: 'ANSi',
+    2	: 'ANSiMation',
+    3	: 'RIP script',
+    4	: 'PCBoard',
+    5	: 'Avatar',
+    6	: 'HTML',
+    7	: 'Source',
+    8	: 'TundraDraw',
 };
 
 //
@@ -129,53 +129,53 @@ const SAUCE_CHARACTER_FILE_TYPES = {
 //	Note that this is the same mapping that x84 uses. Be compatible!
 //
 const SAUCE_FONT_TO_ENCODING_HINT = {
-	'Amiga MicroKnight'		: 'amiga',
-	'Amiga MicroKnight+'	: 'amiga',
-	'Amiga mOsOul'			: 'amiga',
-	'Amiga P0T-NOoDLE'		: 'amiga',
-	'Amiga Topaz 1'			: 'amiga',
-	'Amiga Topaz 1+'		: 'amiga',
-	'Amiga Topaz 2'			: 'amiga',
-	'Amiga Topaz 2+'		: 'amiga',
-	'Atari ATASCII'			: 'atari',
-	'IBM EGA43'				: 'cp437',
-	'IBM EGA'				: 'cp437',
-	'IBM VGA25G'			: 'cp437',
-	'IBM VGA50'				: 'cp437',
-	'IBM VGA'				: 'cp437',
+    'Amiga MicroKnight'		: 'amiga',
+    'Amiga MicroKnight+'	: 'amiga',
+    'Amiga mOsOul'			: 'amiga',
+    'Amiga P0T-NOoDLE'		: 'amiga',
+    'Amiga Topaz 1'			: 'amiga',
+    'Amiga Topaz 1+'		: 'amiga',
+    'Amiga Topaz 2'			: 'amiga',
+    'Amiga Topaz 2+'		: 'amiga',
+    'Atari ATASCII'			: 'atari',
+    'IBM EGA43'				: 'cp437',
+    'IBM EGA'				: 'cp437',
+    'IBM VGA25G'			: 'cp437',
+    'IBM VGA50'				: 'cp437',
+    'IBM VGA'				: 'cp437',
 };
 
 [
-	'437', '720', '737', '775', '819', '850', '852', '855', '857', '858',
-	'860', '861', '862', '863', '864', '865', '866', '869', '872'
+    '437', '720', '737', '775', '819', '850', '852', '855', '857', '858',
+    '860', '861', '862', '863', '864', '865', '866', '869', '872'
 ].forEach( page => {
-	const codec = 'cp' + page;
-	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]	= codec;
-	SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]		= codec;
-	SAUCE_FONT_TO_ENCODING_HINT['IBM VGA25g ' + page]	= codec;
-	SAUCE_FONT_TO_ENCODING_HINT['IBM VGA50 ' + page]	= codec;
-	SAUCE_FONT_TO_ENCODING_HINT['IBM VGA ' + page]		= codec;
+    const codec = 'cp' + page;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]	= codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]		= codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA25g ' + page]	= codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA50 ' + page]	= codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA ' + page]		= codec;
 });
 
 function parseCharacterSAUCE(sauce) {
-	const result = {};
+    const result = {};
 
-	result.fileType	= SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
+    result.fileType	= SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
 
-	if(sauce.fileType === 0 || sauce.fileType === 1 || sauce.fileType === 2) {
-		//	convience: create ansiFlags
-		sauce.ansiFlags = sauce.flags;
+    if(sauce.fileType === 0 || sauce.fileType === 1 || sauce.fileType === 2) {
+        //	convience: create ansiFlags
+        sauce.ansiFlags = sauce.flags;
 
-		let i = 0;
-		while(i < sauce.tinfos.length && sauce.tinfos[i] !== 0x00) {
-			++i;
-		}
+        let i = 0;
+        while(i < sauce.tinfos.length && sauce.tinfos[i] !== 0x00) {
+            ++i;
+        }
 
-		const fontName = iconv.decode(sauce.tinfos.slice(0, i), 'cp437');
-		if(fontName.length > 0) {
-			result.fontName = fontName;
-		}
-	}
+        const fontName = iconv.decode(sauce.tinfos.slice(0, i), 'cp437');
+        if(fontName.length > 0) {
+            result.fontName = fontName;
+        }
+    }
 
-	return result;
+    return result;
 }
\ No newline at end of file
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 2d978852..c5fa3f57 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -37,9 +37,9 @@ const iconv					= require('iconv-lite');
 const uuidV4				= require('uuid/v4');
 
 exports.moduleInfo = {
-	name	: 'FTN BSO',
-	desc	: 'BSO style message scanner/tosser for FTN networks',
-	author	: 'NuSkooler',
+    name	: 'FTN BSO',
+    desc	: 'BSO style message scanner/tosser for FTN networks',
+    author	: 'NuSkooler',
 };
 
 /*
@@ -54,75 +54,75 @@ exports.getModule = FTNMessageScanTossModule;
 const SCHEDULE_REGEXP	= /(?:^|or )?(@watch\:|@immediate)([^\0]+)?$/;
 
 function FTNMessageScanTossModule() {
-	MessageScanTossModule.call(this);
+    MessageScanTossModule.call(this);
 
-	const self = this;
+    const self = this;
 
-	this.archUtil = ArchiveUtil.getInstance();
+    this.archUtil = ArchiveUtil.getInstance();
 
-	const config = Config();
-	if(_.has(config, 'scannerTossers.ftn_bso')) {
-		this.moduleConfig = config.scannerTossers.ftn_bso;
-	}
+    const config = Config();
+    if(_.has(config, 'scannerTossers.ftn_bso')) {
+        this.moduleConfig = config.scannerTossers.ftn_bso;
+    }
 
-	this.getDefaultNetworkName = function() {
-		if(this.moduleConfig.defaultNetwork) {
-			return this.moduleConfig.defaultNetwork.toLowerCase();
-		}
+    this.getDefaultNetworkName = function() {
+        if(this.moduleConfig.defaultNetwork) {
+            return this.moduleConfig.defaultNetwork.toLowerCase();
+        }
 
-		const networkNames = Object.keys(config.messageNetworks.ftn.networks);
-		if(1 === networkNames.length) {
-			return networkNames[0].toLowerCase();
-		}
-	};
+        const networkNames = Object.keys(config.messageNetworks.ftn.networks);
+        if(1 === networkNames.length) {
+            return networkNames[0].toLowerCase();
+        }
+    };
 
-	this.getDefaultZone = function(networkName) {
-		const config = Config();
-		if(_.isNumber(config.messageNetworks.ftn.networks[networkName].defaultZone)) {
-			return config.messageNetworks.ftn.networks[networkName].defaultZone;
-		}
+    this.getDefaultZone = function(networkName) {
+        const config = Config();
+        if(_.isNumber(config.messageNetworks.ftn.networks[networkName].defaultZone)) {
+            return config.messageNetworks.ftn.networks[networkName].defaultZone;
+        }
 
-		//	non-explicit: default to local address zone
-		const networkLocalAddress = config.messageNetworks.ftn.networks[networkName].localAddress;
-		if(networkLocalAddress) {
-			const addr = Address.fromString(networkLocalAddress);
-			return addr.zone;
-		}
-	};
+        //	non-explicit: default to local address zone
+        const networkLocalAddress = config.messageNetworks.ftn.networks[networkName].localAddress;
+        if(networkLocalAddress) {
+            const addr = Address.fromString(networkLocalAddress);
+            return addr.zone;
+        }
+    };
 
-	/*
+    /*
 	this.isDefaultDomainZone = function(networkName, address) {
 		const defaultNetworkName 	= this.getDefaultNetworkName();
 		return(networkName === defaultNetworkName && address.zone === this.moduleConfig.defaultZone);
 	};
 	*/
 
-	this.getNetworkNameByAddress = function(remoteAddress) {
-		return _.findKey(Config().messageNetworks.ftn.networks, network => {
-			const localAddress = Address.fromString(network.localAddress);
-			return !_.isUndefined(localAddress) && localAddress.isEqual(remoteAddress);
-		});
-	};
+    this.getNetworkNameByAddress = function(remoteAddress) {
+        return _.findKey(Config().messageNetworks.ftn.networks, network => {
+            const localAddress = Address.fromString(network.localAddress);
+            return !_.isUndefined(localAddress) && localAddress.isEqual(remoteAddress);
+        });
+    };
 
-	this.getNetworkNameByAddressPattern = function(remoteAddressPattern) {
-		return _.findKey(Config().messageNetworks.ftn.networks, network => {
-			const localAddress = Address.fromString(network.localAddress);
-			return !_.isUndefined(localAddress) && localAddress.isPatternMatch(remoteAddressPattern);
-		});
-	};
+    this.getNetworkNameByAddressPattern = function(remoteAddressPattern) {
+        return _.findKey(Config().messageNetworks.ftn.networks, network => {
+            const localAddress = Address.fromString(network.localAddress);
+            return !_.isUndefined(localAddress) && localAddress.isPatternMatch(remoteAddressPattern);
+        });
+    };
 
-	this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
-		ftnAreaTag = ftnAreaTag.toUpperCase();	//	always compare upper
-		return _.findKey(Config().messageNetworks.ftn.areas, areaConf => {
-			return areaConf.tag.toUpperCase() === ftnAreaTag;
-		});
-	};
+    this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
+        ftnAreaTag = ftnAreaTag.toUpperCase();	//	always compare upper
+        return _.findKey(Config().messageNetworks.ftn.areas, areaConf => {
+            return areaConf.tag.toUpperCase() === ftnAreaTag;
+        });
+    };
 
-	this.getExportType = function(nodeConfig) {
-		return _.isString(nodeConfig.exportType) ? nodeConfig.exportType.toLowerCase() : 'crash';
-	};
+    this.getExportType = function(nodeConfig) {
+        return _.isString(nodeConfig.exportType) ? nodeConfig.exportType.toLowerCase() : 'crash';
+    };
 
-	/*
+    /*
 	this.getSeenByAddresses = function(messageSeenBy) {
 		if(!_.isArray(messageSeenBy)) {
 			messageSeenBy = [ messageSeenBy ];
@@ -136,11 +136,11 @@ function FTNMessageScanTossModule() {
 	};
 	*/
 
-	this.messageHasValidMSGID = function(msg) {
-		return _.isString(msg.meta.FtnKludge.MSGID) && msg.meta.FtnKludge.MSGID.length > 0;
-	};
+    this.messageHasValidMSGID = function(msg) {
+        return _.isString(msg.meta.FtnKludge.MSGID) && msg.meta.FtnKludge.MSGID.length > 0;
+    };
 
-	/*
+    /*
 	this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
 		let dir = this.moduleConfig.paths.outbound;
 		if(!this.isDefaultDomainZone(networkName, destAddress)) {
@@ -151,230 +151,230 @@ function FTNMessageScanTossModule() {
 	};
 	*/
 
-	this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
-		networkName = networkName.toLowerCase();
+    this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
+        networkName = networkName.toLowerCase();
 
-		let dir = this.moduleConfig.paths.outbound;
+        let dir = this.moduleConfig.paths.outbound;
 
-		const defaultNetworkName 	= this.getDefaultNetworkName();
-		const defaultZone			= this.getDefaultZone(networkName);
+        const defaultNetworkName 	= this.getDefaultNetworkName();
+        const defaultZone			= this.getDefaultZone(networkName);
 
-		let zoneExt;
-		if(defaultZone !== destAddress.zone) {
-			zoneExt = '.' + `000${destAddress.zone.toString(16)}`.substr(-3);
-		} else {
-			zoneExt = '';
-		}
+        let zoneExt;
+        if(defaultZone !== destAddress.zone) {
+            zoneExt = '.' + `000${destAddress.zone.toString(16)}`.substr(-3);
+        } else {
+            zoneExt = '';
+        }
 
-		if(defaultNetworkName === networkName) {
-			dir = paths.join(dir, `outbound${zoneExt}`);
-		} else {
-			dir = paths.join(dir, `${networkName}${zoneExt}`);
-		}
+        if(defaultNetworkName === networkName) {
+            dir = paths.join(dir, `outbound${zoneExt}`);
+        } else {
+            dir = paths.join(dir, `${networkName}${zoneExt}`);
+        }
 
-		return dir;
-	};
+        return dir;
+    };
 
-	this.getOutgoingPacketFileName = function(basePath, messageId, isTemp, fileCase) {
-		//
-		//	Generating an outgoing packet file name comes with a few issues:
-		//	*	We must use DOS 8.3 filenames due to legacy systems that receive
-		//		the packet not understanding LFNs
-		//	*	We need uniqueness; This is especially important with packets that
-		//		end up in bundles and on the receiving/remote system where conflicts
-		//		with other systems could also occur
-		//
-		//	There are a lot of systems in use here for the name:
-		//	*	HEX CRC16/32 of data
-		//	*	HEX UNIX timestamp
-		//	*	Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second)
-		//		See https://groups.google.com/forum/#!searchin/alt.bbs.mystic/netmail$20filename/alt.bbs.mystic/m1xLnY8i1pU/YnG2excdl6MJ
-		//	* 	SBBSEcho uses DDHHMMSS - see https://github.com/ftnapps/pkg-sbbs/blob/master/docs/fidonet.txt
-		//	*	We already have a system for 8-character serial number gernation that is
-		//		used for e.g. in FTS-0009.001 MSGIDs... let's use that!
-		//
-		const name		= ftnUtil.getMessageSerialNumber(messageId);
-		const ext		= (true === isTemp) ? 'pk_' : 'pkt';
+    this.getOutgoingPacketFileName = function(basePath, messageId, isTemp, fileCase) {
+        //
+        //	Generating an outgoing packet file name comes with a few issues:
+        //	*	We must use DOS 8.3 filenames due to legacy systems that receive
+        //		the packet not understanding LFNs
+        //	*	We need uniqueness; This is especially important with packets that
+        //		end up in bundles and on the receiving/remote system where conflicts
+        //		with other systems could also occur
+        //
+        //	There are a lot of systems in use here for the name:
+        //	*	HEX CRC16/32 of data
+        //	*	HEX UNIX timestamp
+        //	*	Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second)
+        //		See https://groups.google.com/forum/#!searchin/alt.bbs.mystic/netmail$20filename/alt.bbs.mystic/m1xLnY8i1pU/YnG2excdl6MJ
+        //	* 	SBBSEcho uses DDHHMMSS - see https://github.com/ftnapps/pkg-sbbs/blob/master/docs/fidonet.txt
+        //	*	We already have a system for 8-character serial number gernation that is
+        //		used for e.g. in FTS-0009.001 MSGIDs... let's use that!
+        //
+        const name		= ftnUtil.getMessageSerialNumber(messageId);
+        const ext		= (true === isTemp) ? 'pk_' : 'pkt';
 
-		let fileName = `${name}.${ext}`;
-		if('upper' === fileCase) {
-			fileName = fileName.toUpperCase();
-		}
+        let fileName = `${name}.${ext}`;
+        if('upper' === fileCase) {
+            fileName = fileName.toUpperCase();
+        }
 
-		return paths.join(basePath, fileName);
-	};
+        return paths.join(basePath, fileName);
+    };
 
-	this.getOutgoingFlowFileExtension = function(destAddress, flowType, exportType, fileCase) {
-		let ext;
+    this.getOutgoingFlowFileExtension = function(destAddress, flowType, exportType, fileCase) {
+        let ext;
 
-		switch(flowType) {
-			case 'mail'		: ext = `${exportType.toLowerCase()[0]}ut`; break;
-			case 'ref'		: ext = `${exportType.toLowerCase()[0]}lo`; break;
-			case 'busy'		: ext = 'bsy'; break;
-			case 'request'	: ext = 'req'; break;
-			case 'requests'	: ext = 'hrq'; break;
-		}
+        switch(flowType) {
+            case 'mail'		: ext = `${exportType.toLowerCase()[0]}ut`; break;
+            case 'ref'		: ext = `${exportType.toLowerCase()[0]}lo`; break;
+            case 'busy'		: ext = 'bsy'; break;
+            case 'request'	: ext = 'req'; break;
+            case 'requests'	: ext = 'hrq'; break;
+        }
 
-		if('upper' === fileCase) {
-			ext = ext.toUpperCase();
-		}
+        if('upper' === fileCase) {
+            ext = ext.toUpperCase();
+        }
 
-		return ext;
-	};
+        return ext;
+    };
 
-	this.getOutgoingFlowFileName = function(basePath, destAddress, flowType, exportType, fileCase) {
-		//
-		//	Refs
-		//	* http://ftsc.org/docs/fts-5005.003
-		//	* http://wiki.synchro.net/ref:fidonet_files#flow_files
-		//
-		let controlFileBaseName;
-		let pointDir;
+    this.getOutgoingFlowFileName = function(basePath, destAddress, flowType, exportType, fileCase) {
+        //
+        //	Refs
+        //	* http://ftsc.org/docs/fts-5005.003
+        //	* http://wiki.synchro.net/ref:fidonet_files#flow_files
+        //
+        let controlFileBaseName;
+        let pointDir;
 
-		const ext = self.getOutgoingFlowFileExtension(
-			destAddress,
-			flowType,
-			exportType,
-			fileCase
-		);
+        const ext = self.getOutgoingFlowFileExtension(
+            destAddress,
+            flowType,
+            exportType,
+            fileCase
+        );
 
-		const netComponent	= `0000${destAddress.net.toString(16)}`.substr(-4);
-		const nodeComponent	= `0000${destAddress.node.toString(16)}`.substr(-4);
+        const netComponent	= `0000${destAddress.net.toString(16)}`.substr(-4);
+        const nodeComponent	= `0000${destAddress.node.toString(16)}`.substr(-4);
 
-		if(destAddress.point) {
-			//	point's go in an extra subdir, e.g. outbound/NNNNnnnn.pnt/00000001.pnt (for a point of 1)
-			pointDir			= `${netComponent}${nodeComponent}.pnt`;
-			controlFileBaseName = `00000000${destAddress.point.toString(16)}`.substr(-8);
-		} else {
-			pointDir = '';
+        if(destAddress.point) {
+            //	point's go in an extra subdir, e.g. outbound/NNNNnnnn.pnt/00000001.pnt (for a point of 1)
+            pointDir			= `${netComponent}${nodeComponent}.pnt`;
+            controlFileBaseName = `00000000${destAddress.point.toString(16)}`.substr(-8);
+        } else {
+            pointDir = '';
 
-			//
-			//	Use |destAddress| nnnnNNNN.??? where nnnn is dest net and NNNN is dest
-			//	node. This seems to match what Mystic does
-			//
-			controlFileBaseName = `${netComponent}${nodeComponent}`;
-		}
+            //
+            //	Use |destAddress| nnnnNNNN.??? where nnnn is dest net and NNNN is dest
+            //	node. This seems to match what Mystic does
+            //
+            controlFileBaseName = `${netComponent}${nodeComponent}`;
+        }
 
-		//
-		//	From FTS-5005.003: "Lower case filenames are prefered if supported by the file system."
-		//	...but we let the user override.
-		//
-		if('upper' === fileCase) {
-			controlFileBaseName	= controlFileBaseName.toUpperCase();
-			pointDir			= pointDir.toUpperCase();
-		}
+        //
+        //	From FTS-5005.003: "Lower case filenames are prefered if supported by the file system."
+        //	...but we let the user override.
+        //
+        if('upper' === fileCase) {
+            controlFileBaseName	= controlFileBaseName.toUpperCase();
+            pointDir			= pointDir.toUpperCase();
+        }
 
-		return paths.join(basePath, pointDir, `${controlFileBaseName}.${ext}`);
-	};
+        return paths.join(basePath, pointDir, `${controlFileBaseName}.${ext}`);
+    };
 
-	this.flowFileAppendRefs = function(filePath, fileRefs, directive, cb) {
-		//
-		//	We have to ensure the *directory* of |filePath| exists here esp.
-		//	for cases such as point destinations where a subdir may be
-		//	present in the path that doesn't yet exist.
-		//
-		const flowFileDir = paths.dirname(filePath);
-		fse.mkdirs(flowFileDir, () => {	//	note not checking err; let's try appendFile
-			const appendLines = fileRefs.reduce( (content, ref) => {
-				return content + `${directive}${ref}\n`;
-			}, '');
+    this.flowFileAppendRefs = function(filePath, fileRefs, directive, cb) {
+        //
+        //	We have to ensure the *directory* of |filePath| exists here esp.
+        //	for cases such as point destinations where a subdir may be
+        //	present in the path that doesn't yet exist.
+        //
+        const flowFileDir = paths.dirname(filePath);
+        fse.mkdirs(flowFileDir, () => {	//	note not checking err; let's try appendFile
+            const appendLines = fileRefs.reduce( (content, ref) => {
+                return content + `${directive}${ref}\n`;
+            }, '');
 
-			fs.appendFile(filePath, appendLines, err => {
-				return cb(err);
-			});
-		});
-	};
+            fs.appendFile(filePath, appendLines, err => {
+                return cb(err);
+            });
+        });
+    };
 
-	this.getOutgoingBundleFileName = function(basePath, sourceAddress, destAddress, cb) {
-		//
-		//	Base filename is constructed as such:
-		//	*	If this |destAddress| is *not* a point address, we use NNNNnnnn where
-		//		NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded
-		//		hex of dest node - source node.
-		//	*	If |destAddress| is a point, NNNN becomes 0000 and nnnn becomes 'p' +
-		//		3 digit 0 padded hex point
-		//
-		//	Extension is dd? where dd is Su...Mo and ? is 0...Z as collisions arise
-		//
-		let basename;
-		if(destAddress.point) {
-			const pointHex = `000${destAddress.point}`.substr(-3);
-			basename = `0000p${pointHex}`;
-		} else {
-			basename =
+    this.getOutgoingBundleFileName = function(basePath, sourceAddress, destAddress, cb) {
+        //
+        //	Base filename is constructed as such:
+        //	*	If this |destAddress| is *not* a point address, we use NNNNnnnn where
+        //		NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded
+        //		hex of dest node - source node.
+        //	*	If |destAddress| is a point, NNNN becomes 0000 and nnnn becomes 'p' +
+        //		3 digit 0 padded hex point
+        //
+        //	Extension is dd? where dd is Su...Mo and ? is 0...Z as collisions arise
+        //
+        let basename;
+        if(destAddress.point) {
+            const pointHex = `000${destAddress.point}`.substr(-3);
+            basename = `0000p${pointHex}`;
+        } else {
+            basename =
 				`0000${Math.abs(sourceAddress.net - destAddress.net).toString(16)}`.substr(-4) +
 				`0000${Math.abs(sourceAddress.node - destAddress.node).toString(16)}`.substr(-4);
-		}
+        }
 
-		//
-		//	We need to now find the first entry that does not exist starting
-		//	with dd0 to ddz
-		//
-		const EXT_SUFFIXES = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
-		let fileName = `${basename}.${moment().format('dd').toLowerCase()}`;
-		async.detectSeries(EXT_SUFFIXES, (suffix, callback) => {
-			const checkFileName = fileName + suffix;
-			fs.stat(paths.join(basePath, checkFileName), err => {
-				callback(null, (err && 'ENOENT' === err.code) ? true : false);
-			});
-		}, (err, finalSuffix) => {
-			if(finalSuffix) {
-				return cb(null, paths.join(basePath, fileName + finalSuffix));
-			}
+        //
+        //	We need to now find the first entry that does not exist starting
+        //	with dd0 to ddz
+        //
+        const EXT_SUFFIXES = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
+        let fileName = `${basename}.${moment().format('dd').toLowerCase()}`;
+        async.detectSeries(EXT_SUFFIXES, (suffix, callback) => {
+            const checkFileName = fileName + suffix;
+            fs.stat(paths.join(basePath, checkFileName), err => {
+                callback(null, (err && 'ENOENT' === err.code) ? true : false);
+            });
+        }, (err, finalSuffix) => {
+            if(finalSuffix) {
+                return cb(null, paths.join(basePath, fileName + finalSuffix));
+            }
 
-			return cb(new Error('Could not acquire a bundle filename!'));
-		});
-	};
+            return cb(new Error('Could not acquire a bundle filename!'));
+        });
+    };
 
-	this.prepareMessage = function(message, options) {
-		//
-		//	Set various FTN kludges/etc.
-		//
-		const localAddress = new Address(options.network.localAddress);	//	ensure we have an Address obj not a string version
+    this.prepareMessage = function(message, options) {
+        //
+        //	Set various FTN kludges/etc.
+        //
+        const localAddress = new Address(options.network.localAddress);	//	ensure we have an Address obj not a string version
 
-		//	:TODO: create Address.toMeta() / similar
-		message.meta.FtnProperty = message.meta.FtnProperty || {};
-		message.meta.FtnKludge = message.meta.FtnKludge || {};
+        //	:TODO: create Address.toMeta() / similar
+        message.meta.FtnProperty = message.meta.FtnProperty || {};
+        message.meta.FtnKludge = message.meta.FtnKludge || {};
 
-		message.meta.FtnProperty.ftn_orig_node			= localAddress.node;
-		message.meta.FtnProperty.ftn_orig_network		= localAddress.net;
-		message.meta.FtnProperty.ftn_cost				= 0;
-		message.meta.FtnProperty.ftn_msg_orig_node		= localAddress.node;
-		message.meta.FtnProperty.ftn_msg_orig_net	= localAddress.net;
+        message.meta.FtnProperty.ftn_orig_node			= localAddress.node;
+        message.meta.FtnProperty.ftn_orig_network		= localAddress.net;
+        message.meta.FtnProperty.ftn_cost				= 0;
+        message.meta.FtnProperty.ftn_msg_orig_node		= localAddress.node;
+        message.meta.FtnProperty.ftn_msg_orig_net	= localAddress.net;
 
-		const destAddress = options.routeAddress || options.destAddress;
-		message.meta.FtnProperty.ftn_dest_node		= destAddress.node;
-		message.meta.FtnProperty.ftn_dest_network	= destAddress.net;
+        const destAddress = options.routeAddress || options.destAddress;
+        message.meta.FtnProperty.ftn_dest_node		= destAddress.node;
+        message.meta.FtnProperty.ftn_dest_network	= destAddress.net;
 
-		if(destAddress.zone) {
-			message.meta.FtnProperty.ftn_dest_zone	= destAddress.zone;
-		}
-		if(destAddress.point) {
-			message.meta.FtnProperty.ftn_dest_point	= destAddress.point;
-		}
+        if(destAddress.zone) {
+            message.meta.FtnProperty.ftn_dest_zone	= destAddress.zone;
+        }
+        if(destAddress.point) {
+            message.meta.FtnProperty.ftn_dest_point	= destAddress.point;
+        }
 
-		//	tear line and origin can both go in EchoMail & NetMail
-		message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
-		message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(localAddress);
+        //	tear line and origin can both go in EchoMail & NetMail
+        message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
+        message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(localAddress);
 
-		let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
+        let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
 
-		const config = Config();
-		if(self.isNetMailMessage(message)) {
-			//
-			//	Set route and message destination properties -- they may differ
-			//
-			message.meta.FtnProperty.ftn_msg_dest_node		= options.destAddress.node;
-			message.meta.FtnProperty.ftn_msg_dest_net	= options.destAddress.net;
+        const config = Config();
+        if(self.isNetMailMessage(message)) {
+            //
+            //	Set route and message destination properties -- they may differ
+            //
+            message.meta.FtnProperty.ftn_msg_dest_node		= options.destAddress.node;
+            message.meta.FtnProperty.ftn_msg_dest_net	= options.destAddress.net;
 
-			ftnAttribute |= ftnMailPacket.Packet.Attribute.Private;
+            ftnAttribute |= ftnMailPacket.Packet.Attribute.Private;
 
-			//
-			//	NetMail messages need a FRL-1005.001 "Via" line
-			//	http://ftsc.org/docs/frl-1005.001
-			//
-			//	:TODO: 	We need to do this when FORWARDING NetMail
-			/*
+            //
+            //	NetMail messages need a FRL-1005.001 "Via" line
+            //	http://ftsc.org/docs/frl-1005.001
+            //
+            //	:TODO: 	We need to do this when FORWARDING NetMail
+            /*
 			if(_.isString(message.meta.FtnKludge.Via)) {
 				message.meta.FtnKludge.Via = [ message.meta.FtnKludge.Via ];
 			}
@@ -382,1546 +382,1546 @@ function FTNMessageScanTossModule() {
 			message.meta.FtnKludge.Via.push(ftnUtil.getVia(options.network.localAddress));
 			*/
 
-			//
-			//	We need to set INTL, and possibly FMPT and/or TOPT
-			//	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
-			//
-			message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, localAddress);
+            //
+            //	We need to set INTL, and possibly FMPT and/or TOPT
+            //	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
+            //
+            message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, localAddress);
 
-			if(_.isNumber(localAddress.point) && localAddress.point > 0) {
-				message.meta.FtnKludge.FMPT = localAddress.point;
-			}
+            if(_.isNumber(localAddress.point) && localAddress.point > 0) {
+                message.meta.FtnKludge.FMPT = localAddress.point;
+            }
 
-			if(_.isNumber(options.destAddress.point) && options.destAddress.point > 0) {
-				message.meta.FtnKludge.TOPT = options.destAddress.point;
-			}
-		} else {
-			//
-			//	Set appropriate attribute flag for export type
-			//
-			switch(this.getExportType(options.nodeConfig)) {
-				case 'crash'	: ftnAttribute |= ftnMailPacket.Packet.Attribute.Crash; break;
-				case 'hold'		: ftnAttribute |= ftnMailPacket.Packet.Attribute.Hold; break;
+            if(_.isNumber(options.destAddress.point) && options.destAddress.point > 0) {
+                message.meta.FtnKludge.TOPT = options.destAddress.point;
+            }
+        } else {
+            //
+            //	Set appropriate attribute flag for export type
+            //
+            switch(this.getExportType(options.nodeConfig)) {
+                case 'crash'	: ftnAttribute |= ftnMailPacket.Packet.Attribute.Crash; break;
+                case 'hold'		: ftnAttribute |= ftnMailPacket.Packet.Attribute.Hold; break;
 				//	:TODO: Others?
-			}
+            }
 
-			//
-			//	EchoMail requires some additional properties & kludges
-			//
-			message.meta.FtnProperty.ftn_area = config.messageNetworks.ftn.areas[message.areaTag].tag;
+            //
+            //	EchoMail requires some additional properties & kludges
+            //
+            message.meta.FtnProperty.ftn_area = config.messageNetworks.ftn.areas[message.areaTag].tag;
 
-			//
-			//	When exporting messages, we should create/update SEEN-BY
-			//	with remote address(s) we are exporting to.
-			//
-			const seenByAdditions =
+            //
+            //	When exporting messages, we should create/update SEEN-BY
+            //	with remote address(s) we are exporting to.
+            //
+            const seenByAdditions =
 				[ `${localAddress.net}/${localAddress.node}` ].concat(config.messageNetworks.ftn.areas[message.areaTag].uplinks);
-			message.meta.FtnProperty.ftn_seen_by =
+            message.meta.FtnProperty.ftn_seen_by =
 				ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
 
-			//
-			//	And create/update PATH for ourself
-			//
-			message.meta.FtnKludge.PATH = ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, localAddress);
-		}
+            //
+            //	And create/update PATH for ourself
+            //
+            message.meta.FtnKludge.PATH = ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, localAddress);
+        }
 
-		message.meta.FtnProperty.ftn_attr_flags = ftnAttribute;
+        message.meta.FtnProperty.ftn_attr_flags = ftnAttribute;
 
-		//
-		//	Additional kludges
-		//
-		//	Check for existence of MSGID as we may already have stored it from a previous
-		//	export that failed to finish
-		//
-		if(!message.meta.FtnKludge.MSGID) {
-			message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(
-				message,
-				localAddress,
-				message.isPrivate()	// true = isNetMail
-			);
-		}
+        //
+        //	Additional kludges
+        //
+        //	Check for existence of MSGID as we may already have stored it from a previous
+        //	export that failed to finish
+        //
+        if(!message.meta.FtnKludge.MSGID) {
+            message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(
+                message,
+                localAddress,
+                message.isPrivate()	// true = isNetMail
+            );
+        }
 
-		message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();
+        message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();
 
-		//
-		//	According to FSC-0046:
-		//
-		//	"When a Conference Mail processor adds a TID to a message, it may not
-		//	add a PID. An existing TID should, however, be replaced. TIDs follow
-		//	the same format used for PIDs, as explained above."
-		//
-		message.meta.FtnKludge.TID = ftnUtil.getProductIdentifier();
+        //
+        //	According to FSC-0046:
+        //
+        //	"When a Conference Mail processor adds a TID to a message, it may not
+        //	add a PID. An existing TID should, however, be replaced. TIDs follow
+        //	the same format used for PIDs, as explained above."
+        //
+        message.meta.FtnKludge.TID = ftnUtil.getProductIdentifier();
 
-		//
-		//	Determine CHRS and actual internal encoding name. If the message has an
-		//	explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
-		//
-		let encoding = options.nodeConfig.encoding || config.scannerTossers.ftn_bso.packetMsgEncoding || 'utf8';
-		const explicitEncoding = _.get(message.meta, 'System.explicit_encoding');
-		if(explicitEncoding) {
-			encoding = explicitEncoding;
-		} else if(message.meta.FtnKludge.CHRS) {
-			const encFromChars = ftnUtil.getEncodingFromCharacterSetIdentifier(message.meta.FtnKludge.CHRS);
-			if(encFromChars) {
-				encoding = encFromChars;
-			}
-		}
+        //
+        //	Determine CHRS and actual internal encoding name. If the message has an
+        //	explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
+        //
+        let encoding = options.nodeConfig.encoding || config.scannerTossers.ftn_bso.packetMsgEncoding || 'utf8';
+        const explicitEncoding = _.get(message.meta, 'System.explicit_encoding');
+        if(explicitEncoding) {
+            encoding = explicitEncoding;
+        } else if(message.meta.FtnKludge.CHRS) {
+            const encFromChars = ftnUtil.getEncodingFromCharacterSetIdentifier(message.meta.FtnKludge.CHRS);
+            if(encFromChars) {
+                encoding = encFromChars;
+            }
+        }
 
-		//
-		//	Ensure we ended up with something useable. If not, back to utf8!
-		//
-		if(!iconv.encodingExists(encoding)) {
-			Log.debug( { encoding : encoding }, 'Unknown encoding. Falling back to utf8');
-			encoding = 'utf8';
-		}
+        //
+        //	Ensure we ended up with something useable. If not, back to utf8!
+        //
+        if(!iconv.encodingExists(encoding)) {
+            Log.debug( { encoding : encoding }, 'Unknown encoding. Falling back to utf8');
+            encoding = 'utf8';
+        }
 
-		options.encoding = encoding;	//	save for later
-		message.meta.FtnKludge.CHRS = ftnUtil.getCharacterSetIdentifierByEncoding(encoding);
-	};
+        options.encoding = encoding;	//	save for later
+        message.meta.FtnKludge.CHRS = ftnUtil.getCharacterSetIdentifierByEncoding(encoding);
+    };
 
-	this.setReplyKludgeFromReplyToMsgId = function(message, cb) {
-		//
-		//	Look up MSGID kludge for |message.replyToMsgId|, if any.
-		//	If found, we can create a REPLY kludge with the previously
-		//	discovered MSGID.
-		//
+    this.setReplyKludgeFromReplyToMsgId = function(message, cb) {
+        //
+        //	Look up MSGID kludge for |message.replyToMsgId|, if any.
+        //	If found, we can create a REPLY kludge with the previously
+        //	discovered MSGID.
+        //
 
-		if(0 === message.replyToMsgId) {
-			return cb(null);	//	nothing to do
-		}
+        if(0 === message.replyToMsgId) {
+            return cb(null);	//	nothing to do
+        }
 
-		Message.getMetaValuesByMessageId(message.replyToMsgId, 'FtnKludge', 'MSGID', (err, msgIdVal) => {
-			if(!err) {
-				assert(_.isString(msgIdVal), 'Expected string but got ' + (typeof msgIdVal) + ' (' + msgIdVal + ')');
-				//	got a MSGID - create a REPLY
-				message.meta.FtnKludge.REPLY = msgIdVal;
-			}
+        Message.getMetaValuesByMessageId(message.replyToMsgId, 'FtnKludge', 'MSGID', (err, msgIdVal) => {
+            if(!err) {
+                assert(_.isString(msgIdVal), 'Expected string but got ' + (typeof msgIdVal) + ' (' + msgIdVal + ')');
+                //	got a MSGID - create a REPLY
+                message.meta.FtnKludge.REPLY = msgIdVal;
+            }
 
-			cb(null);	//	this method always passes
-		});
-	};
+            cb(null);	//	this method always passes
+        });
+    };
 
-	//	check paths, Addresses, etc.
-	this.isAreaConfigValid = function(areaConfig) {
-		if(!areaConfig || !_.isString(areaConfig.tag) || !_.isString(areaConfig.network)) {
-			return false;
-		}
+    //	check paths, Addresses, etc.
+    this.isAreaConfigValid = function(areaConfig) {
+        if(!areaConfig || !_.isString(areaConfig.tag) || !_.isString(areaConfig.network)) {
+            return false;
+        }
 
-		if(_.isString(areaConfig.uplinks)) {
-			areaConfig.uplinks = areaConfig.uplinks.split(' ');
-		}
+        if(_.isString(areaConfig.uplinks)) {
+            areaConfig.uplinks = areaConfig.uplinks.split(' ');
+        }
 
-		return (_.isArray(areaConfig.uplinks));
-	};
+        return (_.isArray(areaConfig.uplinks));
+    };
 
 
-	this.hasValidConfiguration = function() {
-		if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config(), 'messageNetworks.ftn.areas')) {
-			return false;
-		}
+    this.hasValidConfiguration = function() {
+        if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config(), 'messageNetworks.ftn.areas')) {
+            return false;
+        }
 
-		//	:TODO: need to check more!
+        //	:TODO: need to check more!
 
-		return true;
-	};
+        return true;
+    };
 
-	this.parseScheduleString = function(schedStr) {
-		if(!schedStr) {
-			return;	//	nothing to parse!
-		}
+    this.parseScheduleString = function(schedStr) {
+        if(!schedStr) {
+            return;	//	nothing to parse!
+        }
 
-		let schedule = {};
+        let schedule = {};
 
-		const m = SCHEDULE_REGEXP.exec(schedStr);
-		if(m) {
-			schedStr = schedStr.substr(0, m.index).trim();
+        const m = SCHEDULE_REGEXP.exec(schedStr);
+        if(m) {
+            schedStr = schedStr.substr(0, m.index).trim();
 
-			if('@watch:' === m[1]) {
-				schedule.watchFile = m[2];
-			} else if('@immediate' === m[1]) {
-				schedule.immediate = true;
-			}
-		}
+            if('@watch:' === m[1]) {
+                schedule.watchFile = m[2];
+            } else if('@immediate' === m[1]) {
+                schedule.immediate = true;
+            }
+        }
 
-		if(schedStr.length > 0) {
-			const sched = later.parse.text(schedStr);
-			if(-1 === sched.error) {
-				schedule.sched = sched;
-			}
-		}
+        if(schedStr.length > 0) {
+            const sched = later.parse.text(schedStr);
+            if(-1 === sched.error) {
+                schedule.sched = sched;
+            }
+        }
 
-		//	return undefined if we couldn't parse out anything useful
-		if(!_.isEmpty(schedule)) {
-			return schedule;
-		}
-	};
+        //	return undefined if we couldn't parse out anything useful
+        if(!_.isEmpty(schedule)) {
+            return schedule;
+        }
+    };
 
-	this.getAreaLastScanId = function(areaTag, cb) {
-		const sql =
+    this.getAreaLastScanId = function(areaTag, cb) {
+        const sql =
 			`SELECT area_tag, message_id
 			FROM message_area_last_scan
 			WHERE scan_toss = "ftn_bso" AND area_tag = ?
 			LIMIT 1;`;
 
-		msgDb.get(sql, [ areaTag ], (err, row) => {
-			return cb(err, row ? row.message_id : 0);
-		});
-	};
+        msgDb.get(sql, [ areaTag ], (err, row) => {
+            return cb(err, row ? row.message_id : 0);
+        });
+    };
 
-	this.setAreaLastScanId = function(areaTag, lastScanId, cb) {
-		const sql =
+    this.setAreaLastScanId = function(areaTag, lastScanId, cb) {
+        const sql =
 			`REPLACE INTO message_area_last_scan (scan_toss, area_tag, message_id)
 			VALUES ("ftn_bso", ?, ?);`;
 
-		msgDb.run(sql, [ areaTag, lastScanId ], err => {
-			return cb(err);
-		});
-	};
-
-	this.getNodeConfigByAddress = function(addr) {
-		addr = _.isString(addr) ? Address.fromString(addr) : addr;
-
-		//	:TODO: sort wildcard nodes{} entries by most->least explicit according to FTN hierarchy
-		return _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
-			return addr.isPatternMatch(nodeAddrWildcard);
-		});
-	};
-
-	this.exportNetMailMessagePacket = function(message, exportOpts, cb) {
-		//
-		//	For NetMail, we always create a *single* packet per message.
-		//
-		async.series(
-			[
-				function generalPrep(callback) {
-					self.prepareMessage(message, exportOpts);
-
-					return self.setReplyKludgeFromReplyToMsgId(message, callback);
-				},
-				function createPacket(callback) {
-					const packet = new ftnMailPacket.Packet();
-
-					const packetHeader = new ftnMailPacket.PacketHeader(
-						exportOpts.network.localAddress,
-						exportOpts.routeAddress,
-						exportOpts.nodeConfig.packetType
-					);
-
-					packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
-
-					//	use current message ID for filename seed
-					exportOpts.pktFileName = self.getOutgoingPacketFileName(
-						self.exportTempDir,
-						message.messageId,
-						false,	//	createTempPacket=false
-						exportOpts.fileCase
-					);
-
-					const ws = fs.createWriteStream(exportOpts.pktFileName);
-
-					packet.writeHeader(ws, packetHeader);
-
-					packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
-						if(err) {
-							return callback(err);
-						}
-
-						ws.write(msgBuf);
-
-						packet.writeTerminator(ws);
-
-						ws.end();
-						ws.once('finish', () => {
-							return callback(null);
-						});
-					});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	};
-
-	this.exportMessagesByUuid = function(messageUuids, exportOpts, cb) {
-		//
-		//	This method has a lot of madness going on:
-		//	- Try to stuff messages into packets until we've hit the target size
-		//	- We need to wait for write streams to finish before proceeding in many cases
-		//	  or data will be cut off when closing and creating a new stream
-		//
-		let exportedFiles	= [];
-		let currPacketSize	= self.moduleConfig.packetTargetByteSize;
-		let packet;
-		let ws;
-		let remainMessageBuf;
-		let remainMessageId;
-		const createTempPacket = !_.isString(exportOpts.nodeConfig.archiveType) || 0 === exportOpts.nodeConfig.archiveType.length;
-
-		function finalizePacket(cb) {
-			packet.writeTerminator(ws);
-			ws.end();
-			ws.once('finish', () => {
-				return cb(null);
-			});
-		}
-
-		async.each(messageUuids, (msgUuid, nextUuid) => {
-			let message = new Message();
-
-			async.series(
-				[
-					function finalizePrevious(callback) {
-						if(packet && currPacketSize >= self.moduleConfig.packetTargetByteSize) {
-							return finalizePacket(callback);
-						} else {
-							callback(null);
-						}
-					},
-					function loadMessage(callback) {
-						message.load( { uuid : msgUuid }, err => {
-							if(err) {
-								return callback(err);
-							}
-
-							//	General preperation
-							self.prepareMessage(message, exportOpts);
-
-							self.setReplyKludgeFromReplyToMsgId(message, err => {
-								callback(err);
-							});
-						});
-					},
-					function createNewPacket(callback) {
-						if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
-							packet = new ftnMailPacket.Packet();
-
-							const packetHeader = new ftnMailPacket.PacketHeader(
-								exportOpts.network.localAddress,
-								exportOpts.destAddress,
-								exportOpts.nodeConfig.packetType);
-
-							packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
-
-							//	use current message ID for filename seed
-							const pktFileName = self.getOutgoingPacketFileName(
-								self.exportTempDir,
-								message.messageId,
-								createTempPacket,
-								exportOpts.fileCase
-							);
-
-							exportedFiles.push(pktFileName);
-
-							ws = fs.createWriteStream(pktFileName);
-
-							currPacketSize = packet.writeHeader(ws, packetHeader);
-
-							if(remainMessageBuf) {
-								currPacketSize += packet.writeMessageEntry(ws, remainMessageBuf);
-								remainMessageBuf = null;
-							}
-						}
-
-						callback(null);
-					},
-					function appendMessage(callback) {
-						packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
-							if(err) {
-								return callback(err);
-							}
-
-							currPacketSize	+= msgBuf.length;
-
-							if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
-								remainMessageBuf	= msgBuf;	//	save for next packet
-								remainMessageId 	= message.messageId;
-							} else {
-								ws.write(msgBuf);
-							}
-
-							return callback(null);
-						});
-					},
-					function storeStateFlags0Meta(callback) {
-						message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), err => {
-							callback(err);
-						});
-					},
-					function storeMsgIdMeta(callback) {
-						//
-						//	We want to store some meta as if we had imported
-						//	this message for later reference
-						//
-						if(message.meta.FtnKludge.MSGID) {
-							message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, err => {
-								callback(err);
-							});
-						} else {
-							callback(null);
-						}
-					}
-				],
-				err => {
-					nextUuid(err);
-				}
-			);
-		}, err => {
-			if(err) {
-				cb(err);
-			} else {
-				async.series(
-					[
-						function terminateLast(callback) {
-							if(packet) {
-								return finalizePacket(callback);
-							} else {
-								callback(null);
-							}
-						},
-						function writeRemainPacket(callback) {
-							if(remainMessageBuf) {
-								//	:TODO: DRY this with the code above -- they are basically identical
-								packet = new ftnMailPacket.Packet();
-
-								const packetHeader = new ftnMailPacket.PacketHeader(
-									exportOpts.network.localAddress,
-									exportOpts.destAddress,
-									exportOpts.nodeConfig.packetType);
-
-								packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
-
-								//	use current message ID for filename seed
-								const pktFileName = self.getOutgoingPacketFileName(
-									self.exportTempDir,
-									remainMessageId,
-									createTempPacket,
-									exportOpts.filleCase
-								);
-
-								exportedFiles.push(pktFileName);
-
-								ws = fs.createWriteStream(pktFileName);
-
-								packet.writeHeader(ws, packetHeader);
-								ws.write(remainMessageBuf);
-								return finalizePacket(callback);
-							} else {
-								callback(null);
-							}
-						}
-					],
-					err => {
-						cb(err, exportedFiles);
-					}
-				);
-			}
-		});
-	};
-
-	this.getNetMailRoute = function(dstAddr) {
-		//
-		//	Route full|wildcard -> full adddress/network lookup
-		//
-		const routes = _.get(Config(), 'scannerTossers.ftn_bso.netMail.routes');
-		if(!routes) {
-			return;
-		}
-
-		return _.find(routes, (route, addrWildcard) => {
-			return dstAddr.isPatternMatch(addrWildcard);
-		});
-	};
-
-	this.getNetMailRouteInfoFromAddress = function(destAddress, cb) {
-		//
-		//	Attempt to find route information for |destAddress|:
-		//
-		//	1) Routes: scannerTossers.ftn_bso.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send may not be where destAddress is (it's routed!)
-		//	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
-		//		- Where we send is direct to destAddress
-		//
-		//	In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
-		//	falling back to Config.scannerTossers.ftn_bso.defaultNetwork
-		//
-		const route = this.getNetMailRoute(destAddress);
-
-		let routeAddress;
-		let networkName;
-		let isRouted;
-		if(route) {
-			routeAddress	= Address.fromString(route.address);
-			networkName		= route.network;
-			isRouted		= true;
-		} else {
-			routeAddress	= destAddress;
-			isRouted		= false;
-		}
-
-		networkName = networkName || this.getNetworkNameByAddress(routeAddress);
-
-		const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
-			return routeAddress.isPatternMatch(nodeAddrWildcard);
-		}) || { packetType : '2+', encoding	: Config().scannerTossers.ftn_bso.packetMsgEncoding };
-
-		//	we should never be failing here; we may just be using defaults.
-		return cb(
-			networkName ? null : Errors.DoesNotExist(`No NetMail route for ${destAddress.toString()}`),
-			{ destAddress, routeAddress, networkName, config, isRouted }
-		);
-	};
-
-	this.exportNetMailMessagesToUplinks = function(messagesOrMessageUuids, cb) {
-		//	for each message/UUID, find where to send the thing
-		async.each(messagesOrMessageUuids, (msgOrUuid, nextMessageOrUuid) => {
-
-			const exportOpts = {};
-			const message = new Message();
-
-			async.series(
-				[
-					function loadMessage(callback) {
-						if(_.isString(msgOrUuid)) {
-							message.load( { uuid : msgOrUuid }, err => {
-								return callback(err, message);
-							});
-						} else {
-							return callback(null, msgOrUuid);
-						}
-					},
-					function discoverUplink(callback) {
-						const dstAddr = new Address(message.meta.System[Message.SystemMetaNames.RemoteToUser]);
-
-						self.getNetMailRouteInfoFromAddress(dstAddr, (err, routeInfo) => {
-							if(err) {
-								return callback(err);
-							}
-
-							exportOpts.nodeConfig	= routeInfo.config;
-							exportOpts.destAddress	= dstAddr;
-							exportOpts.routeAddress	= routeInfo.routeAddress;
-							exportOpts.fileCase		= routeInfo.config.fileCase || 'lower';
-							exportOpts.network		= Config().messageNetworks.ftn.networks[routeInfo.networkName];
-							exportOpts.networkName	= routeInfo.networkName;
-							exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
-							exportOpts.exportType	= self.getExportType(routeInfo.config);
-
-							if(!exportOpts.network) {
-								return callback(Errors.DoesNotExist(`No configuration found for network ${routeInfo.networkName}`));
-							}
-
-							return callback(null);
-						});
-					},
-					function createOutgoingDir(callback) {
-						//	ensure outgoing NetMail directory exists
-						return fse.mkdirs(exportOpts.outgoingDir, callback);
-					},
-					function exportPacket(callback) {
-						return self.exportNetMailMessagePacket(message, exportOpts, callback);
-					},
-					function moveToOutgoing(callback) {
-						const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
-						exportOpts.exportedToPath = paths.join(
-							exportOpts.outgoingDir,
-							`${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
-						);
-
-						return fse.move(exportOpts.pktFileName, exportOpts.exportedToPath, callback);
-					},
-					function prepareFloFile(callback) {
-						const flowFilePath = self.getOutgoingFlowFileName(
-							exportOpts.outgoingDir,
-							exportOpts.routeAddress,
-							'ref',
-							exportOpts.exportType,
-							exportOpts.fileCase
-						);
-
-						return self.flowFileAppendRefs(flowFilePath, [ exportOpts.exportedToPath ], '^', callback);
-					},
-					function storeStateFlags0Meta(callback) {
-						return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);
-					},
-					function storeMsgIdMeta(callback) {
-						//	Store meta as if we had imported this message -- for later reference
-						if(message.meta.FtnKludge.MSGID) {
-							return message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, callback);
-						}
-
-						return callback(null);
-					}
-				],
-				err => {
-					if(err) {
-						Log.warn( { error : err.message }, 'Error exporting message' );
-					}
-					return nextMessageOrUuid(null);
-				}
-			);
-		}, err => {
-			if(err) {
-				Log.warn( { error : err.message }, 'Error(s) during NetMail export');
-			}
-			return cb(err);
-		});
-	};
-
-	this.exportEchoMailMessagesToUplinks = function(messageUuids, areaConfig, cb) {
-		const config = Config();
-		async.each(areaConfig.uplinks, (uplink, nextUplink) => {
-			const nodeConfig = self.getNodeConfigByAddress(uplink);
-			if(!nodeConfig) {
-				return nextUplink();
-			}
-
-			const exportOpts = {
-				nodeConfig,
-				network			: config.messageNetworks.ftn.networks[areaConfig.network],
-				destAddress		: Address.fromString(uplink),
-				networkName		: areaConfig.network,
-				fileCase		: nodeConfig.fileCase || 'lower',
-			};
-
-			if(_.isString(exportOpts.network.localAddress)) {
-				exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
-			}
-
-			const outgoingDir 	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
-			const exportType	= self.getExportType(exportOpts.nodeConfig);
-
-			async.waterfall(
-				[
-					function createOutgoingDir(callback) {
-						fse.mkdirs(outgoingDir, err => {
-							callback(err);
-						});
-					},
-					function exportToTempArea(callback) {
-						self.exportMessagesByUuid(messageUuids, exportOpts, callback);
-					},
-					function createArcMailBundle(exportedFileNames, callback) {
-						if(self.archUtil.haveArchiver(exportOpts.nodeConfig.archiveType)) {
-							//	:TODO: support bundleTargetByteSize:
-							//
-							//	Compress to a temp location then we'll move it in the next step
-							//
-							//	Note that we must use the *final* output dir for getOutgoingBundleFileName()
-							//	as it checks for collisions in bundle names!
-							//
-							self.getOutgoingBundleFileName(outgoingDir, exportOpts.network.localAddress, exportOpts.destAddress, (err, bundlePath) => {
-								if(err) {
-									return callback(err);
-								}
-
-								//	adjust back to temp path
-								const tempBundlePath = paths.join(self.exportTempDir, paths.basename(bundlePath));
-
-								self.archUtil.compressTo(
-									exportOpts.nodeConfig.archiveType,
-									tempBundlePath,
-									exportedFileNames, err => {
-										callback(err, [ tempBundlePath ] );
-									}
-								);
-							});
-						} else {
-							callback(null, exportedFileNames);
-						}
-					},
-					function moveFilesToOutgoing(exportedFileNames, callback) {
-						async.each(exportedFileNames, (oldPath, nextFile) => {
-							const ext = paths.extname(oldPath).toLowerCase();
-							if('.pk_' === ext.toLowerCase()) {
-								//
-								//	For a given temporary .pk_ file, we need to move it to the outoing
-								//	directory with the appropriate BSO style filename.
-								//
-								const newExt = self.getOutgoingFlowFileExtension(
-									exportOpts.destAddress,
-									'mail',
-									exportType,
-									exportOpts.fileCase
-								);
-
-								const newPath = paths.join(
-									outgoingDir,
-									`${paths.basename(oldPath, ext)}${newExt}`);
-
-								fse.move(oldPath, newPath, nextFile);
-							} else {
-								const newPath = paths.join(outgoingDir, paths.basename(oldPath));
-								fse.move(oldPath, newPath, err => {
-									if(err) {
-										Log.warn(
-											{ oldPath : oldPath, newPath : newPath, error : err.toString() },
-											'Failed moving temporary bundle file!');
-
-										return nextFile();
-									}
-
-									//
-									//	For bundles, we need to append to the appropriate flow file
-									//
-									const flowFilePath = self.getOutgoingFlowFileName(
-										outgoingDir,
-										exportOpts.destAddress,
-										'ref',
-										exportType,
-										exportOpts.fileCase
-									);
-
-									//	directive of '^' = delete file after transfer
-									self.flowFileAppendRefs(flowFilePath, [ newPath ], '^', err => {
-										if(err) {
-											Log.warn( { path : flowFilePath }, 'Failed appending flow reference record!');
-										}
-										nextFile();
-									});
-								});
-							}
-						}, callback);
-					}
-				],
-				err => {
-					//	:TODO: do something with |err| ?
-					if(err) {
-						Log.warn(err.message);
-					}
-					nextUplink();
-				}
-			);
-		}, cb);	//	complete
-	};
-
-	this.setReplyToMsgIdFtnReplyKludge = function(message, cb) {
-		//
-		//	Given a FTN REPLY kludge, set |message.replyToMsgId|, if possible,
-		//	by looking up an associated MSGID kludge meta.
-		//
-		//	See also: http://ftsc.org/docs/fts-0009.001
-		//
-		if(!_.isString(message.meta.FtnKludge.REPLY)) {
-			//	nothing to do
-			return cb();
-		}
-
-		Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => {
-			if(msgIds && msgIds.length > 0) {
-				//	expect a single match, but dupe checking is not perfect - warn otherwise
-				if(1 === msgIds.length) {
-					message.replyToMsgId = msgIds[0];
-				} else {
-					Log.warn( { msgIds : msgIds, replyKludge :  message.meta.FtnKludge.REPLY }, 'Found 2:n MSGIDs matching REPLY kludge!');
-				}
-			}
-			cb();
-		});
-	};
-
-	this.getLocalUserNameFromAlias = function(lookup) {
-		lookup = lookup.toLowerCase();
-
-		const aliases = _.get(Config(), 'messageNetworks.ftn.netMail.aliases');
-		if(!aliases) {
-			return lookup;	//	keep orig
-		}
-
-		const alias = _.find(aliases, (localName, alias) => {
-			return alias.toLowerCase() === lookup;
-		});
-
-		return alias || lookup;
-	};
-
-	this.getAddressesFromNetMailMessage = function(message) {
-		const intlKludge = _.get(message, 'meta.FtnKludge.INTL');
-
-		if(!intlKludge) {
-			return {};
-		}
-
-		let [ to, from ] = intlKludge.split(' ');
-		if(!to || !from) {
-			return {};
-		}
-
-		const fromPoint = _.get(message, 'meta.FtnKludge.FMPT');
-		const toPoint	= _.get(message, 'meta.FtnKludge.TOPT');
-
-		if(fromPoint) {
-			from += `.${fromPoint}`;
-		}
-
-		if(toPoint) {
-			to += `.${toPoint}`;
-		}
-
-		return { to : Address.fromString(to), from : Address.fromString(from) };
-	};
-
-	this.importMailToArea = function(config, header, message, cb) {
-		async.series(
-			[
-				function validateDestinationAddress(callback) {
-					const localNetworkPattern = `${message.meta.FtnProperty.ftn_dest_network}/${message.meta.FtnProperty.ftn_dest_node}`;
-					const localNetworkName = self.getNetworkNameByAddressPattern(localNetworkPattern);
-
-					return callback(_.isString(localNetworkName) ? null : new Error('Packet destination is not us'));
-				},
-				function checkForDupeMSGID(callback) {
-					//
-					//	If we have a MSGID, don't allow a dupe
-					//
-					if(!_.has(message.meta, 'FtnKludge.MSGID')) {
-						return callback(null);
-					}
-
-					Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, (err, msgIds) => {
-						if(msgIds && msgIds.length > 0) {
-							const err = new Error('Duplicate MSGID');
-							err.code = 'DUPE_MSGID';
-							return callback(err);
-						}
-
-						return callback(null);
-					});
-				},
-				function basicSetup(callback) {
-					message.areaTag = config.localAreaTag;
-
-					//	indicate this was imported from FTN
-					message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.AddressFlavor.FTN;
-
-					//
-					//	If we *allow* dupes (disabled by default), then just generate
-					//	a random UUID. Otherwise, don't assign the UUID just yet. It will be
-					//	generated at persist() time and should be consistent across import/exports
-					//
-					if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
-						//	just generate a UUID & therefor always allow for dupes
-						message.uuid = uuidV4();
-					}
-
-					return callback(null);
-				},
-				function setReplyToMessageId(callback) {
-					self.setReplyToMsgIdFtnReplyKludge(message, () => {
-						return callback(null);
-					});
-				},
-				function setupPrivateMessage(callback) {
-					//
-					//	If this is a private message (e.g. NetMail) we set the local user ID
-					//
-					if(Message.WellKnownAreaTags.Private !== config.localAreaTag) {
-						return callback(null);
-					}
-
-					//
-					//	Create a meta value for the *remote* from user. In the case here with FTN,
-					//	their fully qualified FTN from address
-					//
-					const { from } = self.getAddressesFromNetMailMessage(message);
-
-					if(!from) {
-						return callback(Errors.Invalid('Cannot import FTN NetMail without valid INTL line'));
-					}
-
-					message.meta.System[Message.SystemMetaNames.RemoteFromUser] = from.toString();
-
-					const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
-
-					User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
-						if(err) {
-							//
-							//	Couldn't find a local username. If the toUserName itself is a FTN address
-							//	we can only assume the message is to the +op, else we'll have to fail.
-							//
-							const toUserNameAsAddress = Address.fromString(message.toUserName);
-							if(toUserNameAsAddress.isValid()) {
-
-								Log.info(
-									{ toUserName : message.toUserName, fromUserName : message.fromUserName },
-									'No local "to" username for FTN message. Appears to be a FTN address only; assuming addressed to SysOp'
-								);
-
-								User.getUserName(User.RootUserID, (err, sysOpUserName) => {
-									if(err) {
-										return callback(Errors.UnexpectedState('Failed to get SysOp user information'));
-									}
-
-									message.meta.System[Message.SystemMetaNames.LocalToUserID] = User.RootUserID;
-									message.toUserName = sysOpUserName;
-									return callback(null);
-								});
-							} else {
-								return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
-							}
-						}
-
-						//	we do this after such that error cases can be preseved above
-						if(lookupName !== message.toUserName) {
-							message.toUserName = localUserName;
-						}
-
-						//	set the meta information - used elsehwere for retrieval
-						message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
-						return callback(null);
-					});
-				},
-				function persistImport(callback) {
-					//	mark as imported
-					message.meta.System.state_flags0 = Message.StateFlags0.Imported.toString();
-
-					//	save to disc
-					message.persist(err => {
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				cb(err);
-			}
-		);
-	};
-
-	this.appendTearAndOrigin = function(message) {
-		if(message.meta.FtnProperty.ftn_tear_line) {
-			message.message += `\r\n${message.meta.FtnProperty.ftn_tear_line}\r\n`;
-		}
-
-		if(message.meta.FtnProperty.ftn_origin) {
-			message.message += `${message.meta.FtnProperty.ftn_origin}\r\n`;
-		}
-	};
-
-	//
-	//	Ref. implementations on import:
-	//	*	https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/pkt.c
-	//		https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/handle.c
-	//
-	this.importMessagesFromPacketFile = function(packetPath, password, cb) {
-		let packetHeader;
-
-		const packetOpts = { keepTearAndOrigin : false };	//	needed so we can calc message UUID without these; we'll add later
-
-		let importStats = {
-			areaSuccess	: {},	//	areaTag->count
-			areaFail	: {},	//	areaTag->count
-			otherFail	: 0,
-		};
-
-		new ftnMailPacket.Packet(packetOpts).read(packetPath, (entryType, entryData, next) => {
-			if('header' === entryType) {
-				packetHeader = entryData;
-
-				const localNetworkName = self.getNetworkNameByAddress(packetHeader.destAddress);
-				if(!_.isString(localNetworkName)) {
-					const addrString = new Address(packetHeader.destAddress).toString();
-					return next(new Error(`No local configuration for packet addressed to ${addrString}`));
-				} else {
-
-					//	:TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!
-					return next(null);
-				}
-
-			} else if('message' === entryType) {
-				const message = entryData;
-				const areaTag = message.meta.FtnProperty.ftn_area;
-
-				let localAreaTag;
-				if(areaTag) {
-					localAreaTag = self.getLocalAreaTagByFtnAreaTag(areaTag);
-
-					if(!localAreaTag) {
-						//
-						//	No local area configured for this import
-						//
-						//	:TODO: Handle the "catch all" area bucket case if configured
-						Log.warn( { areaTag : areaTag }, 'No local area configured for this packet file!');
-
-						//	bump generic failure
-						importStats.otherFail += 1;
-
-						return next(null);
-					}
-				} else {
-					//
-					//	No area tag: If marked private in attributes, this is a NetMail
-					//
-					if(message.meta.FtnProperty.ftn_attr_flags & ftnMailPacket.Packet.Attribute.Private) {
-						localAreaTag = Message.WellKnownAreaTags.Private;
-					} else {
-						Log.warn('Non-private message without area tag');
-						importStats.otherFail += 1;
-						return next(null);
-					}
-				}
-
-				message.uuid = Message.createMessageUUID(
-					localAreaTag,
-					message.modTimestamp,
-					message.subject,
-					message.message);
-
-				self.appendTearAndOrigin(message);
-
-				const importConfig = {
-					localAreaTag	: localAreaTag,
-				};
-
-				self.importMailToArea(importConfig, packetHeader, message, err => {
-					if(err) {
-						//	bump area fail stats
-						importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
-
-						if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
-							const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
-							Log.info(
-								{ area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
-								'Not importing non-unique message');
-
-							return next(null);
-						}
-					} else {
-						//	bump area success
-						importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
-					}
-
-					return next(err);
-				});
-			}
-		}, err => {
-			//
-			//	try to produce something helpful in the log
-			//
-			const finalStats = Object.assign(importStats, { packetPath : packetPath } );
-			if(err || Object.keys(finalStats.areaFail).length > 0) {
-				if(err) {
-					Object.assign(finalStats, { error : err.message } );
-				}
-
-				Log.warn(finalStats, 'Import completed with error(s)');
-			} else {
-				Log.info(finalStats, 'Import complete');
-			}
-
-			cb(err);
-		});
-	};
-
-	this.maybeArchiveImportFile = function(origPath, type, status, cb) {
-		//
-		//	type	: pkt|tic|bundle
-		//	status	: good|reject
-		//
-		//	Status of "good" is only applied to pkt files & placed
-		//	in |retain| if set. This is generally used for debugging only.
-		//
-		let archivePath;
-		const ts = moment().format('YYYY-MM-DDTHH.mm.ss.SSS');
-		const fn = paths.basename(origPath);
-
-		if('good' === status && type === 'pkt') {
-			if(!_.isString(self.moduleConfig.paths.retain)) {
-				return cb(null);
-			}
-
-			archivePath = paths.join(self.moduleConfig.paths.retain, `good-pkt-${ts}--${fn}`);
-		} else if('good' !== status) {
-			archivePath = paths.join(self.moduleConfig.paths.reject, `${status}-${type}--${ts}-${fn}`);
-		} else {
-			return cb(null);	//	don't archive non-good/pkt files
-		}
-
-		Log.debug( { origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Archiving import file');
-
-		fse.copy(origPath, archivePath, err => {
-			if(err) {
-				Log.warn( { error : err.message, origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Failed to archive packet file');
-			}
-
-			return cb(null);	//	never fatal
-		});
-	};
-
-	this.importPacketFilesFromDirectory = function(importDir, password, cb) {
-		async.waterfall(
-			[
-				function getPacketFiles(callback) {
-					fs.readdir(importDir, (err, files) => {
-						if(err) {
-							return callback(err);
-						}
-						callback(null, files.filter(f => '.pkt' === paths.extname(f).toLowerCase()));
-					});
-				},
-				function importPacketFiles(packetFiles, callback) {
-					let rejects = [];
-					async.eachSeries(packetFiles, (packetFile, nextFile) => {
-						self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => {
-							if(err) {
-								Log.debug(
-									{ path : paths.join(importDir, packetFile), error : err.toString() },
-									'Failed to import packet file');
-
-								rejects.push(packetFile);
-							}
-							nextFile();
-						});
-					}, err => {
-						//	:TODO: Handle err! we should try to keep going though...
-						callback(err, packetFiles, rejects);
-					});
-				},
-				function handleProcessedFiles(packetFiles, rejects, callback) {
-					async.each(packetFiles, (packetFile, nextFile) => {
-						//	possibly archive, then remove original
-						const fullPath = paths.join(importDir, packetFile);
-						self.maybeArchiveImportFile(
-							fullPath,
-							'pkt',
-							rejects.includes(packetFile) ? 'reject' : 'good',
-							() => {
-								fs.unlink(fullPath, () => {
-									return nextFile(null);
-								});
-							}
-						);
-					}, err => {
-						callback(err);
-					});
-				}
-			],
-			err => {
-				cb(err);
-			}
-		);
-	};
-
-	this.importFromDirectory = function(inboundType, importDir, cb) {
-		async.waterfall(
-			[
-				//	start with .pkt files
-				function importPacketFiles(callback) {
-					self.importPacketFilesFromDirectory(importDir, '', err => {
-						callback(err);
-					});
-				},
-				function discoverBundles(callback) {
-					fs.readdir(importDir, (err, files) => {
-						//	:TODO: if we do much more of this, probably just use the glob module
-						const bundleRegExp = /\.(su|mo|tu|we|th|fr|sa)[0-9a-z]/i;
-						files = files.filter(f => {
-							const fext = paths.extname(f);
-							return bundleRegExp.test(fext);
-						});
-
-						async.map(files, (file, transform) => {
-							const fullPath = paths.join(importDir, file);
-							self.archUtil.detectType(fullPath, (err, archName) => {
-								transform(null, { path : fullPath, archName : archName } );
-							});
-						}, (err, bundleFiles) => {
-							callback(err, bundleFiles);
-						});
-					});
-				},
-				function importBundles(bundleFiles, callback) {
-					let rejects = [];
-
-					async.each(bundleFiles, (bundleFile, nextFile) => {
-						if(_.isUndefined(bundleFile.archName)) {
-							Log.warn(
-								{ fileName : bundleFile.path },
-								'Unknown bundle archive type');
-
-							rejects.push(bundleFile.path);
-
-							return nextFile();	//	unknown archive type
-						}
-
-						Log.debug( { bundleFile : bundleFile }, 'Processing bundle' );
-
-						self.archUtil.extractTo(
-							bundleFile.path,
-							self.importTempDir,
-							bundleFile.archName,
-							err => {
-								if(err) {
-									Log.warn(
-										{ path : bundleFile.path, error : err.message },
-										'Failed to extract bundle');
-
-									rejects.push(bundleFile.path);
-								}
-
-								nextFile();
-							}
-						);
-					}, err => {
-						if(err) {
-							return callback(err);
-						}
-
-						//
-						//	All extracted - import .pkt's
-						//
-						self.importPacketFilesFromDirectory(self.importTempDir, '', err => {
-							//	:TODO: handle |err|
-							callback(null, bundleFiles, rejects);
-						});
-					});
-				},
-				function handleProcessedBundleFiles(bundleFiles, rejects, callback) {
-					async.each(bundleFiles, (bundleFile, nextFile) => {
-						self.maybeArchiveImportFile(
-							bundleFile.path,
-							'bundle',
-							rejects.includes(bundleFile.path) ? 'reject' : 'good',
-							() => {
-								fs.unlink(bundleFile.path, err => {
-									if(err) {
-										Log.error( { path : bundleFile.path, error : err.message }, 'Failed unlinking bundle');
-									}
-									return nextFile(null);
-								});
-							}
-						);
-					}, err => {
-						callback(err);
-					});
-				},
-				function importTicFiles(callback) {
-					self.processTicFilesInDirectory(importDir, err => {
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				cb(err);
-			}
-		);
-	};
-
-	this.createTempDirectories = function(cb) {
-		temptmp.mkdir( { prefix : 'enigftnexport-' }, (err, tempDir) => {
-			if(err) {
-				return cb(err);
-			}
-
-			self.exportTempDir = tempDir;
-
-			temptmp.mkdir( { prefix : 'enigftnimport-' }, (err, tempDir) => {
-				self.importTempDir = tempDir;
-
-				cb(err);
-			});
-		});
-	};
-
-	//	Starts an export block - returns true if we can proceed
-	this.exportingStart = function() {
-		if(!this.exportRunning) {
-			this.exportRunning = true;
-			return true;
-		}
-
-		return false;
-	};
-
-	//	ends an export block
-	this.exportingEnd = function(cb) {
-		this.exportRunning = false;
-
-		if(cb) {
-			return cb(null);
-		}
-	};
-
-	this.copyTicAttachment = function(src, dst, isUpdate, cb) {
-		if(isUpdate) {
-			fse.copy(src, dst, { overwrite : true }, err => {
-				return cb(err, dst);
-			});
-		} else {
-			copyFileWithCollisionHandling(src, dst, (err, finalPath) => {
-				return cb(err, finalPath);
-			});
-		}
-	};
-
-	this.getLocalAreaTagsForTic = function() {
-		const config = Config();
-		return _.union(Object.keys(config.scannerTossers.ftn_bso.ticAreas || {} ), Object.keys(config.fileBase.areas));
-	};
-
-	this.processSingleTicFile = function(ticFileInfo, cb) {
-		Log.debug( { tic : ticFileInfo.path, file : ticFileInfo.getAsString('File') }, 'Processing TIC file');
-
-		async.waterfall(
-			[
-				function generalValidation(callback) {
-					const sysConfig = Config();
-					const config = {
-						nodes			: sysConfig.scannerTossers.ftn_bso.nodes,
-						defaultPassword	: sysConfig.scannerTossers.ftn_bso.tic.password,
-						localAreaTags	: self.getLocalAreaTagsForTic(),
-					};
-
-					return ticFileInfo.validate(config, (err, localInfo) => {
-						if(err) {
-							Log.trace( { reason : err.message }, 'Validation failure');
-							return callback(err);
-						}
-
-						//	We may need to map |localAreaTag| back to real areaTag if it's a mapping/alias
-						const mappedLocalAreaTag = _.get(Config().scannerTossers.ftn_bso, [ 'ticAreas', localInfo.areaTag ]);
-
-						if(mappedLocalAreaTag) {
-							if(_.isString(mappedLocalAreaTag.areaTag)) {
-								localInfo.areaTag		= mappedLocalAreaTag.areaTag;
-								localInfo.hashTags		= mappedLocalAreaTag.hashTags;		//	override default for node
-								localInfo.storageTag	= mappedLocalAreaTag.storageTag;	//	override default
-							} else if(_.isString(mappedLocalAreaTag)) {
-								localInfo.areaTag = mappedLocalAreaTag;
-							}
-						}
-
-						return callback(null, localInfo);
-					});
-				},
-				function findExistingItem(localInfo, callback) {
-					//
-					//	We will need to look for an existing item to replace/update if:
-					//	a) The TIC file has a "Replaces" field
-					//	b) The general or node specific |allowReplace| is true
-					//
-					//	Replace specifies a DOS 8.3 *pattern* which is allowed to have
-					//	? and * characters. For example, RETRONET.*
-					//
-					//	Lastly, we will only replace if the item is in the same/specified area
-					//	and that come from the same origin as a previous entry.
-					//
-					const allowReplace	= _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config().scannerTossers.ftn_bso.tic.allowReplace);
-					const replaces		= ticFileInfo.getAsString('Replaces');
-
-					if(!allowReplace || !replaces) {
-						return callback(null, localInfo);
-					}
-
-					const metaPairs = [
-						{
-							name		: 'short_file_name',
-							value		: replaces.toUpperCase(),	//	we store upper as well
-							wildcards	: true,	//	value may contain wildcards
-						},
-						{
-							name	: 'tic_origin',
-							value	: ticFileInfo.getAsString('Origin'),
-						}
-					];
-
-					FileEntry.findFiles( { metaPairs : metaPairs, areaTag : localInfo.areaTag }, (err, fileIds) => {
-						if(err) {
-							return callback(err);
-						}
-
-						//	0:1 allowed
-						if(1 === fileIds.length) {
-							localInfo.existingFileId = fileIds[0];
-
-							//	fetch old filename - we may need to remove it if replacing with a new name
-							FileEntry.loadBasicEntry(localInfo.existingFileId, {}, (err, info) => {
-								if(info) {
-									Log.trace(
-										{ fileId : localInfo.existingFileId, oldFileName : info.fileName, oldStorageTag : info.storageTag },
-										'Existing TIC file target to be replaced'
-									);
-
-									localInfo.oldFileName 	= info.fileName;
-									localInfo.oldStorageTag	= info.storageTag;
-								}
-								return callback(null, localInfo);	//	continue even if we couldn't find an old match
-							});
-						} else if(fileIds.legnth > 1) {
-							return callback(Errors.General(`More than one existing entry for TIC in ${localInfo.areaTag} ([${fileIds.join(', ')}])`));
-						} else {
-							return callback(null, localInfo);
-						}
-					});
-				},
-				function scan(localInfo, callback) {
-					const scanOpts = {
-						sha256		: localInfo.sha256,	//	*may* have already been calculated
-						meta		: {
-							//	some TIC-related metadata we always want
-							short_file_name		: ticFileInfo.getAsString('File').toUpperCase(),	//	upper to ensure no case issues later; this should be a DOS 8.3 name
-							tic_origin			: ticFileInfo.getAsString('Origin'),
-							tic_desc			: ticFileInfo.getAsString('Desc'),
-							upload_by_username	: _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config().scannerTossers.ftn_bso.tic.uploadBy),
-						}
-					};
-
-					const ldesc = ticFileInfo.getAsString('Ldesc', '\n');
-					if(ldesc) {
-						scanOpts.meta.tic_ldesc = ldesc;
-					}
-
-					//
-					//	We may have TIC auto-tagging for this node and/or specific (remote) area
-					//
-					const hashTags =
+        msgDb.run(sql, [ areaTag, lastScanId ], err => {
+            return cb(err);
+        });
+    };
+
+    this.getNodeConfigByAddress = function(addr) {
+        addr = _.isString(addr) ? Address.fromString(addr) : addr;
+
+        //	:TODO: sort wildcard nodes{} entries by most->least explicit according to FTN hierarchy
+        return _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
+            return addr.isPatternMatch(nodeAddrWildcard);
+        });
+    };
+
+    this.exportNetMailMessagePacket = function(message, exportOpts, cb) {
+        //
+        //	For NetMail, we always create a *single* packet per message.
+        //
+        async.series(
+            [
+                function generalPrep(callback) {
+                    self.prepareMessage(message, exportOpts);
+
+                    return self.setReplyKludgeFromReplyToMsgId(message, callback);
+                },
+                function createPacket(callback) {
+                    const packet = new ftnMailPacket.Packet();
+
+                    const packetHeader = new ftnMailPacket.PacketHeader(
+                        exportOpts.network.localAddress,
+                        exportOpts.routeAddress,
+                        exportOpts.nodeConfig.packetType
+                    );
+
+                    packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
+
+                    //	use current message ID for filename seed
+                    exportOpts.pktFileName = self.getOutgoingPacketFileName(
+                        self.exportTempDir,
+                        message.messageId,
+                        false,	//	createTempPacket=false
+                        exportOpts.fileCase
+                    );
+
+                    const ws = fs.createWriteStream(exportOpts.pktFileName);
+
+                    packet.writeHeader(ws, packetHeader);
+
+                    packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        ws.write(msgBuf);
+
+                        packet.writeTerminator(ws);
+
+                        ws.end();
+                        ws.once('finish', () => {
+                            return callback(null);
+                        });
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    };
+
+    this.exportMessagesByUuid = function(messageUuids, exportOpts, cb) {
+        //
+        //	This method has a lot of madness going on:
+        //	- Try to stuff messages into packets until we've hit the target size
+        //	- We need to wait for write streams to finish before proceeding in many cases
+        //	  or data will be cut off when closing and creating a new stream
+        //
+        let exportedFiles	= [];
+        let currPacketSize	= self.moduleConfig.packetTargetByteSize;
+        let packet;
+        let ws;
+        let remainMessageBuf;
+        let remainMessageId;
+        const createTempPacket = !_.isString(exportOpts.nodeConfig.archiveType) || 0 === exportOpts.nodeConfig.archiveType.length;
+
+        function finalizePacket(cb) {
+            packet.writeTerminator(ws);
+            ws.end();
+            ws.once('finish', () => {
+                return cb(null);
+            });
+        }
+
+        async.each(messageUuids, (msgUuid, nextUuid) => {
+            let message = new Message();
+
+            async.series(
+                [
+                    function finalizePrevious(callback) {
+                        if(packet && currPacketSize >= self.moduleConfig.packetTargetByteSize) {
+                            return finalizePacket(callback);
+                        } else {
+                            callback(null);
+                        }
+                    },
+                    function loadMessage(callback) {
+                        message.load( { uuid : msgUuid }, err => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            //	General preperation
+                            self.prepareMessage(message, exportOpts);
+
+                            self.setReplyKludgeFromReplyToMsgId(message, err => {
+                                callback(err);
+                            });
+                        });
+                    },
+                    function createNewPacket(callback) {
+                        if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
+                            packet = new ftnMailPacket.Packet();
+
+                            const packetHeader = new ftnMailPacket.PacketHeader(
+                                exportOpts.network.localAddress,
+                                exportOpts.destAddress,
+                                exportOpts.nodeConfig.packetType);
+
+                            packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
+
+                            //	use current message ID for filename seed
+                            const pktFileName = self.getOutgoingPacketFileName(
+                                self.exportTempDir,
+                                message.messageId,
+                                createTempPacket,
+                                exportOpts.fileCase
+                            );
+
+                            exportedFiles.push(pktFileName);
+
+                            ws = fs.createWriteStream(pktFileName);
+
+                            currPacketSize = packet.writeHeader(ws, packetHeader);
+
+                            if(remainMessageBuf) {
+                                currPacketSize += packet.writeMessageEntry(ws, remainMessageBuf);
+                                remainMessageBuf = null;
+                            }
+                        }
+
+                        callback(null);
+                    },
+                    function appendMessage(callback) {
+                        packet.getMessageEntryBuffer(message, exportOpts, (err, msgBuf) => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            currPacketSize	+= msgBuf.length;
+
+                            if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
+                                remainMessageBuf	= msgBuf;	//	save for next packet
+                                remainMessageId 	= message.messageId;
+                            } else {
+                                ws.write(msgBuf);
+                            }
+
+                            return callback(null);
+                        });
+                    },
+                    function storeStateFlags0Meta(callback) {
+                        message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), err => {
+                            callback(err);
+                        });
+                    },
+                    function storeMsgIdMeta(callback) {
+                        //
+                        //	We want to store some meta as if we had imported
+                        //	this message for later reference
+                        //
+                        if(message.meta.FtnKludge.MSGID) {
+                            message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, err => {
+                                callback(err);
+                            });
+                        } else {
+                            callback(null);
+                        }
+                    }
+                ],
+                err => {
+                    nextUuid(err);
+                }
+            );
+        }, err => {
+            if(err) {
+                cb(err);
+            } else {
+                async.series(
+                    [
+                        function terminateLast(callback) {
+                            if(packet) {
+                                return finalizePacket(callback);
+                            } else {
+                                callback(null);
+                            }
+                        },
+                        function writeRemainPacket(callback) {
+                            if(remainMessageBuf) {
+                                //	:TODO: DRY this with the code above -- they are basically identical
+                                packet = new ftnMailPacket.Packet();
+
+                                const packetHeader = new ftnMailPacket.PacketHeader(
+                                    exportOpts.network.localAddress,
+                                    exportOpts.destAddress,
+                                    exportOpts.nodeConfig.packetType);
+
+                                packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
+
+                                //	use current message ID for filename seed
+                                const pktFileName = self.getOutgoingPacketFileName(
+                                    self.exportTempDir,
+                                    remainMessageId,
+                                    createTempPacket,
+                                    exportOpts.filleCase
+                                );
+
+                                exportedFiles.push(pktFileName);
+
+                                ws = fs.createWriteStream(pktFileName);
+
+                                packet.writeHeader(ws, packetHeader);
+                                ws.write(remainMessageBuf);
+                                return finalizePacket(callback);
+                            } else {
+                                callback(null);
+                            }
+                        }
+                    ],
+                    err => {
+                        cb(err, exportedFiles);
+                    }
+                );
+            }
+        });
+    };
+
+    this.getNetMailRoute = function(dstAddr) {
+        //
+        //	Route full|wildcard -> full adddress/network lookup
+        //
+        const routes = _.get(Config(), 'scannerTossers.ftn_bso.netMail.routes');
+        if(!routes) {
+            return;
+        }
+
+        return _.find(routes, (route, addrWildcard) => {
+            return dstAddr.isPatternMatch(addrWildcard);
+        });
+    };
+
+    this.getNetMailRouteInfoFromAddress = function(destAddress, cb) {
+        //
+        //	Attempt to find route information for |destAddress|:
+        //
+        //	1) Routes: scannerTossers.ftn_bso.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
+        //		- Where we send may not be where destAddress is (it's routed!)
+        //	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
+        //		- Where we send is direct to destAddress
+        //
+        //	In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
+        //	falling back to Config.scannerTossers.ftn_bso.defaultNetwork
+        //
+        const route = this.getNetMailRoute(destAddress);
+
+        let routeAddress;
+        let networkName;
+        let isRouted;
+        if(route) {
+            routeAddress	= Address.fromString(route.address);
+            networkName		= route.network;
+            isRouted		= true;
+        } else {
+            routeAddress	= destAddress;
+            isRouted		= false;
+        }
+
+        networkName = networkName || this.getNetworkNameByAddress(routeAddress);
+
+        const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
+            return routeAddress.isPatternMatch(nodeAddrWildcard);
+        }) || { packetType : '2+', encoding	: Config().scannerTossers.ftn_bso.packetMsgEncoding };
+
+        //	we should never be failing here; we may just be using defaults.
+        return cb(
+            networkName ? null : Errors.DoesNotExist(`No NetMail route for ${destAddress.toString()}`),
+            { destAddress, routeAddress, networkName, config, isRouted }
+        );
+    };
+
+    this.exportNetMailMessagesToUplinks = function(messagesOrMessageUuids, cb) {
+        //	for each message/UUID, find where to send the thing
+        async.each(messagesOrMessageUuids, (msgOrUuid, nextMessageOrUuid) => {
+
+            const exportOpts = {};
+            const message = new Message();
+
+            async.series(
+                [
+                    function loadMessage(callback) {
+                        if(_.isString(msgOrUuid)) {
+                            message.load( { uuid : msgOrUuid }, err => {
+                                return callback(err, message);
+                            });
+                        } else {
+                            return callback(null, msgOrUuid);
+                        }
+                    },
+                    function discoverUplink(callback) {
+                        const dstAddr = new Address(message.meta.System[Message.SystemMetaNames.RemoteToUser]);
+
+                        self.getNetMailRouteInfoFromAddress(dstAddr, (err, routeInfo) => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            exportOpts.nodeConfig	= routeInfo.config;
+                            exportOpts.destAddress	= dstAddr;
+                            exportOpts.routeAddress	= routeInfo.routeAddress;
+                            exportOpts.fileCase		= routeInfo.config.fileCase || 'lower';
+                            exportOpts.network		= Config().messageNetworks.ftn.networks[routeInfo.networkName];
+                            exportOpts.networkName	= routeInfo.networkName;
+                            exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
+                            exportOpts.exportType	= self.getExportType(routeInfo.config);
+
+                            if(!exportOpts.network) {
+                                return callback(Errors.DoesNotExist(`No configuration found for network ${routeInfo.networkName}`));
+                            }
+
+                            return callback(null);
+                        });
+                    },
+                    function createOutgoingDir(callback) {
+                        //	ensure outgoing NetMail directory exists
+                        return fse.mkdirs(exportOpts.outgoingDir, callback);
+                    },
+                    function exportPacket(callback) {
+                        return self.exportNetMailMessagePacket(message, exportOpts, callback);
+                    },
+                    function moveToOutgoing(callback) {
+                        const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
+                        exportOpts.exportedToPath = paths.join(
+                            exportOpts.outgoingDir,
+                            `${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
+                        );
+
+                        return fse.move(exportOpts.pktFileName, exportOpts.exportedToPath, callback);
+                    },
+                    function prepareFloFile(callback) {
+                        const flowFilePath = self.getOutgoingFlowFileName(
+                            exportOpts.outgoingDir,
+                            exportOpts.routeAddress,
+                            'ref',
+                            exportOpts.exportType,
+                            exportOpts.fileCase
+                        );
+
+                        return self.flowFileAppendRefs(flowFilePath, [ exportOpts.exportedToPath ], '^', callback);
+                    },
+                    function storeStateFlags0Meta(callback) {
+                        return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);
+                    },
+                    function storeMsgIdMeta(callback) {
+                        //	Store meta as if we had imported this message -- for later reference
+                        if(message.meta.FtnKludge.MSGID) {
+                            return message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, callback);
+                        }
+
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    if(err) {
+                        Log.warn( { error : err.message }, 'Error exporting message' );
+                    }
+                    return nextMessageOrUuid(null);
+                }
+            );
+        }, err => {
+            if(err) {
+                Log.warn( { error : err.message }, 'Error(s) during NetMail export');
+            }
+            return cb(err);
+        });
+    };
+
+    this.exportEchoMailMessagesToUplinks = function(messageUuids, areaConfig, cb) {
+        const config = Config();
+        async.each(areaConfig.uplinks, (uplink, nextUplink) => {
+            const nodeConfig = self.getNodeConfigByAddress(uplink);
+            if(!nodeConfig) {
+                return nextUplink();
+            }
+
+            const exportOpts = {
+                nodeConfig,
+                network			: config.messageNetworks.ftn.networks[areaConfig.network],
+                destAddress		: Address.fromString(uplink),
+                networkName		: areaConfig.network,
+                fileCase		: nodeConfig.fileCase || 'lower',
+            };
+
+            if(_.isString(exportOpts.network.localAddress)) {
+                exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
+            }
+
+            const outgoingDir 	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
+            const exportType	= self.getExportType(exportOpts.nodeConfig);
+
+            async.waterfall(
+                [
+                    function createOutgoingDir(callback) {
+                        fse.mkdirs(outgoingDir, err => {
+                            callback(err);
+                        });
+                    },
+                    function exportToTempArea(callback) {
+                        self.exportMessagesByUuid(messageUuids, exportOpts, callback);
+                    },
+                    function createArcMailBundle(exportedFileNames, callback) {
+                        if(self.archUtil.haveArchiver(exportOpts.nodeConfig.archiveType)) {
+                            //	:TODO: support bundleTargetByteSize:
+                            //
+                            //	Compress to a temp location then we'll move it in the next step
+                            //
+                            //	Note that we must use the *final* output dir for getOutgoingBundleFileName()
+                            //	as it checks for collisions in bundle names!
+                            //
+                            self.getOutgoingBundleFileName(outgoingDir, exportOpts.network.localAddress, exportOpts.destAddress, (err, bundlePath) => {
+                                if(err) {
+                                    return callback(err);
+                                }
+
+                                //	adjust back to temp path
+                                const tempBundlePath = paths.join(self.exportTempDir, paths.basename(bundlePath));
+
+                                self.archUtil.compressTo(
+                                    exportOpts.nodeConfig.archiveType,
+                                    tempBundlePath,
+                                    exportedFileNames, err => {
+                                        callback(err, [ tempBundlePath ] );
+                                    }
+                                );
+                            });
+                        } else {
+                            callback(null, exportedFileNames);
+                        }
+                    },
+                    function moveFilesToOutgoing(exportedFileNames, callback) {
+                        async.each(exportedFileNames, (oldPath, nextFile) => {
+                            const ext = paths.extname(oldPath).toLowerCase();
+                            if('.pk_' === ext.toLowerCase()) {
+                                //
+                                //	For a given temporary .pk_ file, we need to move it to the outoing
+                                //	directory with the appropriate BSO style filename.
+                                //
+                                const newExt = self.getOutgoingFlowFileExtension(
+                                    exportOpts.destAddress,
+                                    'mail',
+                                    exportType,
+                                    exportOpts.fileCase
+                                );
+
+                                const newPath = paths.join(
+                                    outgoingDir,
+                                    `${paths.basename(oldPath, ext)}${newExt}`);
+
+                                fse.move(oldPath, newPath, nextFile);
+                            } else {
+                                const newPath = paths.join(outgoingDir, paths.basename(oldPath));
+                                fse.move(oldPath, newPath, err => {
+                                    if(err) {
+                                        Log.warn(
+                                            { oldPath : oldPath, newPath : newPath, error : err.toString() },
+                                            'Failed moving temporary bundle file!');
+
+                                        return nextFile();
+                                    }
+
+                                    //
+                                    //	For bundles, we need to append to the appropriate flow file
+                                    //
+                                    const flowFilePath = self.getOutgoingFlowFileName(
+                                        outgoingDir,
+                                        exportOpts.destAddress,
+                                        'ref',
+                                        exportType,
+                                        exportOpts.fileCase
+                                    );
+
+                                    //	directive of '^' = delete file after transfer
+                                    self.flowFileAppendRefs(flowFilePath, [ newPath ], '^', err => {
+                                        if(err) {
+                                            Log.warn( { path : flowFilePath }, 'Failed appending flow reference record!');
+                                        }
+                                        nextFile();
+                                    });
+                                });
+                            }
+                        }, callback);
+                    }
+                ],
+                err => {
+                    //	:TODO: do something with |err| ?
+                    if(err) {
+                        Log.warn(err.message);
+                    }
+                    nextUplink();
+                }
+            );
+        }, cb);	//	complete
+    };
+
+    this.setReplyToMsgIdFtnReplyKludge = function(message, cb) {
+        //
+        //	Given a FTN REPLY kludge, set |message.replyToMsgId|, if possible,
+        //	by looking up an associated MSGID kludge meta.
+        //
+        //	See also: http://ftsc.org/docs/fts-0009.001
+        //
+        if(!_.isString(message.meta.FtnKludge.REPLY)) {
+            //	nothing to do
+            return cb();
+        }
+
+        Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => {
+            if(msgIds && msgIds.length > 0) {
+                //	expect a single match, but dupe checking is not perfect - warn otherwise
+                if(1 === msgIds.length) {
+                    message.replyToMsgId = msgIds[0];
+                } else {
+                    Log.warn( { msgIds : msgIds, replyKludge :  message.meta.FtnKludge.REPLY }, 'Found 2:n MSGIDs matching REPLY kludge!');
+                }
+            }
+            cb();
+        });
+    };
+
+    this.getLocalUserNameFromAlias = function(lookup) {
+        lookup = lookup.toLowerCase();
+
+        const aliases = _.get(Config(), 'messageNetworks.ftn.netMail.aliases');
+        if(!aliases) {
+            return lookup;	//	keep orig
+        }
+
+        const alias = _.find(aliases, (localName, alias) => {
+            return alias.toLowerCase() === lookup;
+        });
+
+        return alias || lookup;
+    };
+
+    this.getAddressesFromNetMailMessage = function(message) {
+        const intlKludge = _.get(message, 'meta.FtnKludge.INTL');
+
+        if(!intlKludge) {
+            return {};
+        }
+
+        let [ to, from ] = intlKludge.split(' ');
+        if(!to || !from) {
+            return {};
+        }
+
+        const fromPoint = _.get(message, 'meta.FtnKludge.FMPT');
+        const toPoint	= _.get(message, 'meta.FtnKludge.TOPT');
+
+        if(fromPoint) {
+            from += `.${fromPoint}`;
+        }
+
+        if(toPoint) {
+            to += `.${toPoint}`;
+        }
+
+        return { to : Address.fromString(to), from : Address.fromString(from) };
+    };
+
+    this.importMailToArea = function(config, header, message, cb) {
+        async.series(
+            [
+                function validateDestinationAddress(callback) {
+                    const localNetworkPattern = `${message.meta.FtnProperty.ftn_dest_network}/${message.meta.FtnProperty.ftn_dest_node}`;
+                    const localNetworkName = self.getNetworkNameByAddressPattern(localNetworkPattern);
+
+                    return callback(_.isString(localNetworkName) ? null : new Error('Packet destination is not us'));
+                },
+                function checkForDupeMSGID(callback) {
+                    //
+                    //	If we have a MSGID, don't allow a dupe
+                    //
+                    if(!_.has(message.meta, 'FtnKludge.MSGID')) {
+                        return callback(null);
+                    }
+
+                    Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, (err, msgIds) => {
+                        if(msgIds && msgIds.length > 0) {
+                            const err = new Error('Duplicate MSGID');
+                            err.code = 'DUPE_MSGID';
+                            return callback(err);
+                        }
+
+                        return callback(null);
+                    });
+                },
+                function basicSetup(callback) {
+                    message.areaTag = config.localAreaTag;
+
+                    //	indicate this was imported from FTN
+                    message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.AddressFlavor.FTN;
+
+                    //
+                    //	If we *allow* dupes (disabled by default), then just generate
+                    //	a random UUID. Otherwise, don't assign the UUID just yet. It will be
+                    //	generated at persist() time and should be consistent across import/exports
+                    //
+                    if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
+                        //	just generate a UUID & therefor always allow for dupes
+                        message.uuid = uuidV4();
+                    }
+
+                    return callback(null);
+                },
+                function setReplyToMessageId(callback) {
+                    self.setReplyToMsgIdFtnReplyKludge(message, () => {
+                        return callback(null);
+                    });
+                },
+                function setupPrivateMessage(callback) {
+                    //
+                    //	If this is a private message (e.g. NetMail) we set the local user ID
+                    //
+                    if(Message.WellKnownAreaTags.Private !== config.localAreaTag) {
+                        return callback(null);
+                    }
+
+                    //
+                    //	Create a meta value for the *remote* from user. In the case here with FTN,
+                    //	their fully qualified FTN from address
+                    //
+                    const { from } = self.getAddressesFromNetMailMessage(message);
+
+                    if(!from) {
+                        return callback(Errors.Invalid('Cannot import FTN NetMail without valid INTL line'));
+                    }
+
+                    message.meta.System[Message.SystemMetaNames.RemoteFromUser] = from.toString();
+
+                    const lookupName = self.getLocalUserNameFromAlias(message.toUserName);
+
+                    User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
+                        if(err) {
+                            //
+                            //	Couldn't find a local username. If the toUserName itself is a FTN address
+                            //	we can only assume the message is to the +op, else we'll have to fail.
+                            //
+                            const toUserNameAsAddress = Address.fromString(message.toUserName);
+                            if(toUserNameAsAddress.isValid()) {
+
+                                Log.info(
+                                    { toUserName : message.toUserName, fromUserName : message.fromUserName },
+                                    'No local "to" username for FTN message. Appears to be a FTN address only; assuming addressed to SysOp'
+                                );
+
+                                User.getUserName(User.RootUserID, (err, sysOpUserName) => {
+                                    if(err) {
+                                        return callback(Errors.UnexpectedState('Failed to get SysOp user information'));
+                                    }
+
+                                    message.meta.System[Message.SystemMetaNames.LocalToUserID] = User.RootUserID;
+                                    message.toUserName = sysOpUserName;
+                                    return callback(null);
+                                });
+                            } else {
+                                return callback(Errors.DoesNotExist(`Could not get local user ID for "${message.toUserName}": ${err.message}`));
+                            }
+                        }
+
+                        //	we do this after such that error cases can be preseved above
+                        if(lookupName !== message.toUserName) {
+                            message.toUserName = localUserName;
+                        }
+
+                        //	set the meta information - used elsehwere for retrieval
+                        message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
+                        return callback(null);
+                    });
+                },
+                function persistImport(callback) {
+                    //	mark as imported
+                    message.meta.System.state_flags0 = Message.StateFlags0.Imported.toString();
+
+                    //	save to disc
+                    message.persist(err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                cb(err);
+            }
+        );
+    };
+
+    this.appendTearAndOrigin = function(message) {
+        if(message.meta.FtnProperty.ftn_tear_line) {
+            message.message += `\r\n${message.meta.FtnProperty.ftn_tear_line}\r\n`;
+        }
+
+        if(message.meta.FtnProperty.ftn_origin) {
+            message.message += `${message.meta.FtnProperty.ftn_origin}\r\n`;
+        }
+    };
+
+    //
+    //	Ref. implementations on import:
+    //	*	https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/pkt.c
+    //		https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/handle.c
+    //
+    this.importMessagesFromPacketFile = function(packetPath, password, cb) {
+        let packetHeader;
+
+        const packetOpts = { keepTearAndOrigin : false };	//	needed so we can calc message UUID without these; we'll add later
+
+        let importStats = {
+            areaSuccess	: {},	//	areaTag->count
+            areaFail	: {},	//	areaTag->count
+            otherFail	: 0,
+        };
+
+        new ftnMailPacket.Packet(packetOpts).read(packetPath, (entryType, entryData, next) => {
+            if('header' === entryType) {
+                packetHeader = entryData;
+
+                const localNetworkName = self.getNetworkNameByAddress(packetHeader.destAddress);
+                if(!_.isString(localNetworkName)) {
+                    const addrString = new Address(packetHeader.destAddress).toString();
+                    return next(new Error(`No local configuration for packet addressed to ${addrString}`));
+                } else {
+
+                    //	:TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!
+                    return next(null);
+                }
+
+            } else if('message' === entryType) {
+                const message = entryData;
+                const areaTag = message.meta.FtnProperty.ftn_area;
+
+                let localAreaTag;
+                if(areaTag) {
+                    localAreaTag = self.getLocalAreaTagByFtnAreaTag(areaTag);
+
+                    if(!localAreaTag) {
+                        //
+                        //	No local area configured for this import
+                        //
+                        //	:TODO: Handle the "catch all" area bucket case if configured
+                        Log.warn( { areaTag : areaTag }, 'No local area configured for this packet file!');
+
+                        //	bump generic failure
+                        importStats.otherFail += 1;
+
+                        return next(null);
+                    }
+                } else {
+                    //
+                    //	No area tag: If marked private in attributes, this is a NetMail
+                    //
+                    if(message.meta.FtnProperty.ftn_attr_flags & ftnMailPacket.Packet.Attribute.Private) {
+                        localAreaTag = Message.WellKnownAreaTags.Private;
+                    } else {
+                        Log.warn('Non-private message without area tag');
+                        importStats.otherFail += 1;
+                        return next(null);
+                    }
+                }
+
+                message.uuid = Message.createMessageUUID(
+                    localAreaTag,
+                    message.modTimestamp,
+                    message.subject,
+                    message.message);
+
+                self.appendTearAndOrigin(message);
+
+                const importConfig = {
+                    localAreaTag	: localAreaTag,
+                };
+
+                self.importMailToArea(importConfig, packetHeader, message, err => {
+                    if(err) {
+                        //	bump area fail stats
+                        importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
+
+                        if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
+                            const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
+                            Log.info(
+                                { area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
+                                'Not importing non-unique message');
+
+                            return next(null);
+                        }
+                    } else {
+                        //	bump area success
+                        importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
+                    }
+
+                    return next(err);
+                });
+            }
+        }, err => {
+            //
+            //	try to produce something helpful in the log
+            //
+            const finalStats = Object.assign(importStats, { packetPath : packetPath } );
+            if(err || Object.keys(finalStats.areaFail).length > 0) {
+                if(err) {
+                    Object.assign(finalStats, { error : err.message } );
+                }
+
+                Log.warn(finalStats, 'Import completed with error(s)');
+            } else {
+                Log.info(finalStats, 'Import complete');
+            }
+
+            cb(err);
+        });
+    };
+
+    this.maybeArchiveImportFile = function(origPath, type, status, cb) {
+        //
+        //	type	: pkt|tic|bundle
+        //	status	: good|reject
+        //
+        //	Status of "good" is only applied to pkt files & placed
+        //	in |retain| if set. This is generally used for debugging only.
+        //
+        let archivePath;
+        const ts = moment().format('YYYY-MM-DDTHH.mm.ss.SSS');
+        const fn = paths.basename(origPath);
+
+        if('good' === status && type === 'pkt') {
+            if(!_.isString(self.moduleConfig.paths.retain)) {
+                return cb(null);
+            }
+
+            archivePath = paths.join(self.moduleConfig.paths.retain, `good-pkt-${ts}--${fn}`);
+        } else if('good' !== status) {
+            archivePath = paths.join(self.moduleConfig.paths.reject, `${status}-${type}--${ts}-${fn}`);
+        } else {
+            return cb(null);	//	don't archive non-good/pkt files
+        }
+
+        Log.debug( { origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Archiving import file');
+
+        fse.copy(origPath, archivePath, err => {
+            if(err) {
+                Log.warn( { error : err.message, origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Failed to archive packet file');
+            }
+
+            return cb(null);	//	never fatal
+        });
+    };
+
+    this.importPacketFilesFromDirectory = function(importDir, password, cb) {
+        async.waterfall(
+            [
+                function getPacketFiles(callback) {
+                    fs.readdir(importDir, (err, files) => {
+                        if(err) {
+                            return callback(err);
+                        }
+                        callback(null, files.filter(f => '.pkt' === paths.extname(f).toLowerCase()));
+                    });
+                },
+                function importPacketFiles(packetFiles, callback) {
+                    let rejects = [];
+                    async.eachSeries(packetFiles, (packetFile, nextFile) => {
+                        self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => {
+                            if(err) {
+                                Log.debug(
+                                    { path : paths.join(importDir, packetFile), error : err.toString() },
+                                    'Failed to import packet file');
+
+                                rejects.push(packetFile);
+                            }
+                            nextFile();
+                        });
+                    }, err => {
+                        //	:TODO: Handle err! we should try to keep going though...
+                        callback(err, packetFiles, rejects);
+                    });
+                },
+                function handleProcessedFiles(packetFiles, rejects, callback) {
+                    async.each(packetFiles, (packetFile, nextFile) => {
+                        //	possibly archive, then remove original
+                        const fullPath = paths.join(importDir, packetFile);
+                        self.maybeArchiveImportFile(
+                            fullPath,
+                            'pkt',
+                            rejects.includes(packetFile) ? 'reject' : 'good',
+                            () => {
+                                fs.unlink(fullPath, () => {
+                                    return nextFile(null);
+                                });
+                            }
+                        );
+                    }, err => {
+                        callback(err);
+                    });
+                }
+            ],
+            err => {
+                cb(err);
+            }
+        );
+    };
+
+    this.importFromDirectory = function(inboundType, importDir, cb) {
+        async.waterfall(
+            [
+                //	start with .pkt files
+                function importPacketFiles(callback) {
+                    self.importPacketFilesFromDirectory(importDir, '', err => {
+                        callback(err);
+                    });
+                },
+                function discoverBundles(callback) {
+                    fs.readdir(importDir, (err, files) => {
+                        //	:TODO: if we do much more of this, probably just use the glob module
+                        const bundleRegExp = /\.(su|mo|tu|we|th|fr|sa)[0-9a-z]/i;
+                        files = files.filter(f => {
+                            const fext = paths.extname(f);
+                            return bundleRegExp.test(fext);
+                        });
+
+                        async.map(files, (file, transform) => {
+                            const fullPath = paths.join(importDir, file);
+                            self.archUtil.detectType(fullPath, (err, archName) => {
+                                transform(null, { path : fullPath, archName : archName } );
+                            });
+                        }, (err, bundleFiles) => {
+                            callback(err, bundleFiles);
+                        });
+                    });
+                },
+                function importBundles(bundleFiles, callback) {
+                    let rejects = [];
+
+                    async.each(bundleFiles, (bundleFile, nextFile) => {
+                        if(_.isUndefined(bundleFile.archName)) {
+                            Log.warn(
+                                { fileName : bundleFile.path },
+                                'Unknown bundle archive type');
+
+                            rejects.push(bundleFile.path);
+
+                            return nextFile();	//	unknown archive type
+                        }
+
+                        Log.debug( { bundleFile : bundleFile }, 'Processing bundle' );
+
+                        self.archUtil.extractTo(
+                            bundleFile.path,
+                            self.importTempDir,
+                            bundleFile.archName,
+                            err => {
+                                if(err) {
+                                    Log.warn(
+                                        { path : bundleFile.path, error : err.message },
+                                        'Failed to extract bundle');
+
+                                    rejects.push(bundleFile.path);
+                                }
+
+                                nextFile();
+                            }
+                        );
+                    }, err => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        //
+                        //	All extracted - import .pkt's
+                        //
+                        self.importPacketFilesFromDirectory(self.importTempDir, '', err => {
+                            //	:TODO: handle |err|
+                            callback(null, bundleFiles, rejects);
+                        });
+                    });
+                },
+                function handleProcessedBundleFiles(bundleFiles, rejects, callback) {
+                    async.each(bundleFiles, (bundleFile, nextFile) => {
+                        self.maybeArchiveImportFile(
+                            bundleFile.path,
+                            'bundle',
+                            rejects.includes(bundleFile.path) ? 'reject' : 'good',
+                            () => {
+                                fs.unlink(bundleFile.path, err => {
+                                    if(err) {
+                                        Log.error( { path : bundleFile.path, error : err.message }, 'Failed unlinking bundle');
+                                    }
+                                    return nextFile(null);
+                                });
+                            }
+                        );
+                    }, err => {
+                        callback(err);
+                    });
+                },
+                function importTicFiles(callback) {
+                    self.processTicFilesInDirectory(importDir, err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                cb(err);
+            }
+        );
+    };
+
+    this.createTempDirectories = function(cb) {
+        temptmp.mkdir( { prefix : 'enigftnexport-' }, (err, tempDir) => {
+            if(err) {
+                return cb(err);
+            }
+
+            self.exportTempDir = tempDir;
+
+            temptmp.mkdir( { prefix : 'enigftnimport-' }, (err, tempDir) => {
+                self.importTempDir = tempDir;
+
+                cb(err);
+            });
+        });
+    };
+
+    //	Starts an export block - returns true if we can proceed
+    this.exportingStart = function() {
+        if(!this.exportRunning) {
+            this.exportRunning = true;
+            return true;
+        }
+
+        return false;
+    };
+
+    //	ends an export block
+    this.exportingEnd = function(cb) {
+        this.exportRunning = false;
+
+        if(cb) {
+            return cb(null);
+        }
+    };
+
+    this.copyTicAttachment = function(src, dst, isUpdate, cb) {
+        if(isUpdate) {
+            fse.copy(src, dst, { overwrite : true }, err => {
+                return cb(err, dst);
+            });
+        } else {
+            copyFileWithCollisionHandling(src, dst, (err, finalPath) => {
+                return cb(err, finalPath);
+            });
+        }
+    };
+
+    this.getLocalAreaTagsForTic = function() {
+        const config = Config();
+        return _.union(Object.keys(config.scannerTossers.ftn_bso.ticAreas || {} ), Object.keys(config.fileBase.areas));
+    };
+
+    this.processSingleTicFile = function(ticFileInfo, cb) {
+        Log.debug( { tic : ticFileInfo.path, file : ticFileInfo.getAsString('File') }, 'Processing TIC file');
+
+        async.waterfall(
+            [
+                function generalValidation(callback) {
+                    const sysConfig = Config();
+                    const config = {
+                        nodes			: sysConfig.scannerTossers.ftn_bso.nodes,
+                        defaultPassword	: sysConfig.scannerTossers.ftn_bso.tic.password,
+                        localAreaTags	: self.getLocalAreaTagsForTic(),
+                    };
+
+                    return ticFileInfo.validate(config, (err, localInfo) => {
+                        if(err) {
+                            Log.trace( { reason : err.message }, 'Validation failure');
+                            return callback(err);
+                        }
+
+                        //	We may need to map |localAreaTag| back to real areaTag if it's a mapping/alias
+                        const mappedLocalAreaTag = _.get(Config().scannerTossers.ftn_bso, [ 'ticAreas', localInfo.areaTag ]);
+
+                        if(mappedLocalAreaTag) {
+                            if(_.isString(mappedLocalAreaTag.areaTag)) {
+                                localInfo.areaTag		= mappedLocalAreaTag.areaTag;
+                                localInfo.hashTags		= mappedLocalAreaTag.hashTags;		//	override default for node
+                                localInfo.storageTag	= mappedLocalAreaTag.storageTag;	//	override default
+                            } else if(_.isString(mappedLocalAreaTag)) {
+                                localInfo.areaTag = mappedLocalAreaTag;
+                            }
+                        }
+
+                        return callback(null, localInfo);
+                    });
+                },
+                function findExistingItem(localInfo, callback) {
+                    //
+                    //	We will need to look for an existing item to replace/update if:
+                    //	a) The TIC file has a "Replaces" field
+                    //	b) The general or node specific |allowReplace| is true
+                    //
+                    //	Replace specifies a DOS 8.3 *pattern* which is allowed to have
+                    //	? and * characters. For example, RETRONET.*
+                    //
+                    //	Lastly, we will only replace if the item is in the same/specified area
+                    //	and that come from the same origin as a previous entry.
+                    //
+                    const allowReplace	= _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config().scannerTossers.ftn_bso.tic.allowReplace);
+                    const replaces		= ticFileInfo.getAsString('Replaces');
+
+                    if(!allowReplace || !replaces) {
+                        return callback(null, localInfo);
+                    }
+
+                    const metaPairs = [
+                        {
+                            name		: 'short_file_name',
+                            value		: replaces.toUpperCase(),	//	we store upper as well
+                            wildcards	: true,	//	value may contain wildcards
+                        },
+                        {
+                            name	: 'tic_origin',
+                            value	: ticFileInfo.getAsString('Origin'),
+                        }
+                    ];
+
+                    FileEntry.findFiles( { metaPairs : metaPairs, areaTag : localInfo.areaTag }, (err, fileIds) => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        //	0:1 allowed
+                        if(1 === fileIds.length) {
+                            localInfo.existingFileId = fileIds[0];
+
+                            //	fetch old filename - we may need to remove it if replacing with a new name
+                            FileEntry.loadBasicEntry(localInfo.existingFileId, {}, (err, info) => {
+                                if(info) {
+                                    Log.trace(
+                                        { fileId : localInfo.existingFileId, oldFileName : info.fileName, oldStorageTag : info.storageTag },
+                                        'Existing TIC file target to be replaced'
+                                    );
+
+                                    localInfo.oldFileName 	= info.fileName;
+                                    localInfo.oldStorageTag	= info.storageTag;
+                                }
+                                return callback(null, localInfo);	//	continue even if we couldn't find an old match
+                            });
+                        } else if(fileIds.legnth > 1) {
+                            return callback(Errors.General(`More than one existing entry for TIC in ${localInfo.areaTag} ([${fileIds.join(', ')}])`));
+                        } else {
+                            return callback(null, localInfo);
+                        }
+                    });
+                },
+                function scan(localInfo, callback) {
+                    const scanOpts = {
+                        sha256		: localInfo.sha256,	//	*may* have already been calculated
+                        meta		: {
+                            //	some TIC-related metadata we always want
+                            short_file_name		: ticFileInfo.getAsString('File').toUpperCase(),	//	upper to ensure no case issues later; this should be a DOS 8.3 name
+                            tic_origin			: ticFileInfo.getAsString('Origin'),
+                            tic_desc			: ticFileInfo.getAsString('Desc'),
+                            upload_by_username	: _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config().scannerTossers.ftn_bso.tic.uploadBy),
+                        }
+                    };
+
+                    const ldesc = ticFileInfo.getAsString('Ldesc', '\n');
+                    if(ldesc) {
+                        scanOpts.meta.tic_ldesc = ldesc;
+                    }
+
+                    //
+                    //	We may have TIC auto-tagging for this node and/or specific (remote) area
+                    //
+                    const hashTags =
 						localInfo.hashTags ||
 						_.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );		//	catch-all*/
 
-					if(hashTags) {
-						scanOpts.hashTags = new Set(hashTags.split(/[\s,]+/));
-					}
+                    if(hashTags) {
+                        scanOpts.hashTags = new Set(hashTags.split(/[\s,]+/));
+                    }
 
-					if(localInfo.crc32) {
-						scanOpts.meta.file_crc32 = localInfo.crc32.toString(16);	//	again, *may* have already been calculated
-					}
+                    if(localInfo.crc32) {
+                        scanOpts.meta.file_crc32 = localInfo.crc32.toString(16);	//	again, *may* have already been calculated
+                    }
 
-					scanFile(
-						ticFileInfo.filePath,
-						scanOpts,
-						(err, fileEntry) => {
-							if(err) {
-								Log.trace( { reason : err.message }, 'Scanning failed');
-							}
+                    scanFile(
+                        ticFileInfo.filePath,
+                        scanOpts,
+                        (err, fileEntry) => {
+                            if(err) {
+                                Log.trace( { reason : err.message }, 'Scanning failed');
+                            }
 
-							localInfo.fileEntry = fileEntry;
-							return callback(err, localInfo);
-						}
-					);
-				},
-				function store(localInfo, callback) {
-					//
-					//	Move file to final area storage and persist to DB
-					//
-					const areaInfo = getFileAreaByTag(localInfo.areaTag);
-					if(!areaInfo) {
-						return callback(Errors.UnexpectedState(`Could not get area for tag ${localInfo.areaTag}`));
-					}
+                            localInfo.fileEntry = fileEntry;
+                            return callback(err, localInfo);
+                        }
+                    );
+                },
+                function store(localInfo, callback) {
+                    //
+                    //	Move file to final area storage and persist to DB
+                    //
+                    const areaInfo = getFileAreaByTag(localInfo.areaTag);
+                    if(!areaInfo) {
+                        return callback(Errors.UnexpectedState(`Could not get area for tag ${localInfo.areaTag}`));
+                    }
 
-					const storageTag = localInfo.storageTag || areaInfo.storageTags[0];
-					if(!isValidStorageTag(storageTag)) {
-						return callback(Errors.Invalid(`Invalid storage tag: ${storageTag}`));
-					}
+                    const storageTag = localInfo.storageTag || areaInfo.storageTags[0];
+                    if(!isValidStorageTag(storageTag)) {
+                        return callback(Errors.Invalid(`Invalid storage tag: ${storageTag}`));
+                    }
 
-					localInfo.fileEntry.storageTag	= storageTag;
-					localInfo.fileEntry.areaTag		= localInfo.areaTag;
-					localInfo.fileEntry.fileName	= ticFileInfo.longFileName;
+                    localInfo.fileEntry.storageTag	= storageTag;
+                    localInfo.fileEntry.areaTag		= localInfo.areaTag;
+                    localInfo.fileEntry.fileName	= ticFileInfo.longFileName;
 
-					//
-					//	We may now have two descriptions: from .DIZ/etc. or the TIC itself.
-					//	Determine which one to use using |descPriority| and availability.
-					//
-					//	We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
-					//
-					const descPriority = _.get(
-						Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
-						Config().scannerTossers.ftn_bso.tic.descPriority
-					);
+                    //
+                    //	We may now have two descriptions: from .DIZ/etc. or the TIC itself.
+                    //	Determine which one to use using |descPriority| and availability.
+                    //
+                    //	We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
+                    //
+                    const descPriority = _.get(
+                        Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
+                        Config().scannerTossers.ftn_bso.tic.descPriority
+                    );
 
-					if('tic' === descPriority) {
-						const origDesc = localInfo.fileEntry.desc;
-						localInfo.fileEntry.desc = ticFileInfo.getAsString('Ldesc') || origDesc || getDescFromFileName(ticFileInfo.filePath);
-					} else {
-						//	see if we got desc from .DIZ/etc.
-						const fromDescFile = 'descFile' === localInfo.fileEntry.descSrc;
-						localInfo.fileEntry.desc = fromDescFile ? localInfo.fileEntry.desc : ticFileInfo.getAsString('Ldesc');
-						localInfo.fileEntry.desc = localInfo.fileEntry.desc || getDescFromFileName(ticFileInfo.filePath);
-					}
+                    if('tic' === descPriority) {
+                        const origDesc = localInfo.fileEntry.desc;
+                        localInfo.fileEntry.desc = ticFileInfo.getAsString('Ldesc') || origDesc || getDescFromFileName(ticFileInfo.filePath);
+                    } else {
+                        //	see if we got desc from .DIZ/etc.
+                        const fromDescFile = 'descFile' === localInfo.fileEntry.descSrc;
+                        localInfo.fileEntry.desc = fromDescFile ? localInfo.fileEntry.desc : ticFileInfo.getAsString('Ldesc');
+                        localInfo.fileEntry.desc = localInfo.fileEntry.desc || getDescFromFileName(ticFileInfo.filePath);
+                    }
 
-					const areaStorageDir = getAreaStorageDirectoryByTag(storageTag);
-					if(!areaStorageDir) {
-						return callback(Errors.UnexpectedState(`Could not get storage directory for tag ${localInfo.areaTag}`));
-					}
+                    const areaStorageDir = getAreaStorageDirectoryByTag(storageTag);
+                    if(!areaStorageDir) {
+                        return callback(Errors.UnexpectedState(`Could not get storage directory for tag ${localInfo.areaTag}`));
+                    }
 
-					const isUpdate = localInfo.existingFileId ? true : false;
+                    const isUpdate = localInfo.existingFileId ? true : false;
 
-					if(isUpdate) {
-						//	we need to *update* an existing record/file
-						localInfo.fileEntry.fileId = localInfo.existingFileId;
-					}
+                    if(isUpdate) {
+                        //	we need to *update* an existing record/file
+                        localInfo.fileEntry.fileId = localInfo.existingFileId;
+                    }
 
-					const dst = paths.join(areaStorageDir, localInfo.fileEntry.fileName);
+                    const dst = paths.join(areaStorageDir, localInfo.fileEntry.fileName);
 
-					self.copyTicAttachment(ticFileInfo.filePath, dst, isUpdate, (err, finalPath) => {
-						if(err) {
-							Log.info( { reason : err.message }, 'Failed to copy TIC attachment');
-							return callback(err);
-						}
+                    self.copyTicAttachment(ticFileInfo.filePath, dst, isUpdate, (err, finalPath) => {
+                        if(err) {
+                            Log.info( { reason : err.message }, 'Failed to copy TIC attachment');
+                            return callback(err);
+                        }
 
-						if(dst !== finalPath) {
-							localInfo.fileEntry.fileName = paths.basename(finalPath);
-						}
+                        if(dst !== finalPath) {
+                            localInfo.fileEntry.fileName = paths.basename(finalPath);
+                        }
 
-						localInfo.fileEntry.persist(isUpdate, err => {
-							return callback(err, localInfo);
-						});
-					});
-				},
-				//	:TODO: from here, we need to re-toss files if needed, before they are removed
-				function cleanupOldFile(localInfo, callback) {
-					if(!localInfo.existingFileId) {
-						return callback(null, localInfo);
-					}
+                        localInfo.fileEntry.persist(isUpdate, err => {
+                            return callback(err, localInfo);
+                        });
+                    });
+                },
+                //	:TODO: from here, we need to re-toss files if needed, before they are removed
+                function cleanupOldFile(localInfo, callback) {
+                    if(!localInfo.existingFileId) {
+                        return callback(null, localInfo);
+                    }
 
-					const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
-					const oldPath 		= paths.join(oldStorageDir, localInfo.oldFileName);
+                    const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
+                    const oldPath 		= paths.join(oldStorageDir, localInfo.oldFileName);
 
-					fs.unlink(oldPath, err => {
-						if(err) {
-							Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
-						} else {
-							Log.debug( { oldPath : oldPath }, 'Removed old physical file during TIC replacement');
-						}
-						return callback(null, localInfo);	//	continue even if err
-					});
-				},
-			],
-			(err, localInfo) => {
-				if(err) {
-					Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed import/update TIC record' );
-				} else {
-					Log.debug(
-						{ tic : ticFileInfo.path, file : ticFileInfo.filePath, area : localInfo.areaTag },
-						'TIC imported successfully'
-					);
-				}
-				return cb(err);
-			}
-		);
-	};
+                    fs.unlink(oldPath, err => {
+                        if(err) {
+                            Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
+                        } else {
+                            Log.debug( { oldPath : oldPath }, 'Removed old physical file during TIC replacement');
+                        }
+                        return callback(null, localInfo);	//	continue even if err
+                    });
+                },
+            ],
+            (err, localInfo) => {
+                if(err) {
+                    Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed import/update TIC record' );
+                } else {
+                    Log.debug(
+                        { tic : ticFileInfo.path, file : ticFileInfo.filePath, area : localInfo.areaTag },
+                        'TIC imported successfully'
+                    );
+                }
+                return cb(err);
+            }
+        );
+    };
 
-	this.removeAssocTicFiles = function(ticFileInfo, cb) {
-		async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
-			fs.unlink(path, err => {
-				if(err && 'ENOENT' !== err.code) {	//	don't log when the file doesn't exist
-					Log.warn( { error : err.message, path : path }, 'Failed unlinking TIC file');
-				}
-				return nextPath(null);
-			});
-		}, err => {
-			return cb(err);
-		});
-	};
+    this.removeAssocTicFiles = function(ticFileInfo, cb) {
+        async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
+            fs.unlink(path, err => {
+                if(err && 'ENOENT' !== err.code) {	//	don't log when the file doesn't exist
+                    Log.warn( { error : err.message, path : path }, 'Failed unlinking TIC file');
+                }
+                return nextPath(null);
+            });
+        }, err => {
+            return cb(err);
+        });
+    };
 
 
-	this.performEchoMailExport = function(cb) {
-		//
-		//	Select all messages with a |message_id| > |lastScanId|.
-		//	Additionally exclude messages with the System state_flags0 which will be present for
-		//	imported or already exported messages
-		//
-		//	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
-		//
-		const getNewUuidsSql =
+    this.performEchoMailExport = function(cb) {
+        //
+        //	Select all messages with a |message_id| > |lastScanId|.
+        //	Additionally exclude messages with the System state_flags0 which will be present for
+        //	imported or already exported messages
+        //
+        //	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
+        //
+        const getNewUuidsSql =
 			`SELECT message_id, message_uuid
 			FROM message m
 			WHERE area_tag = ? AND message_id > ? AND
@@ -1931,79 +1931,79 @@ function FTNMessageScanTossModule() {
 			ORDER BY message_id;`
 			;
 
-		//	we shouldn't, but be sure we don't try to pick up private mail here
-		const config = Config();
-		const areaTags = Object.keys(config.messageNetworks.ftn.areas)
-			.filter(areaTag => Message.WellKnownAreaTags.Private !== areaTag);
+        //	we shouldn't, but be sure we don't try to pick up private mail here
+        const config = Config();
+        const areaTags = Object.keys(config.messageNetworks.ftn.areas)
+            .filter(areaTag => Message.WellKnownAreaTags.Private !== areaTag);
 
-		async.each(areaTags, (areaTag, nextArea) => {
-			const areaConfig = config.messageNetworks.ftn.areas[areaTag];
-			if(!this.isAreaConfigValid(areaConfig)) {
-				return nextArea();
-			}
+        async.each(areaTags, (areaTag, nextArea) => {
+            const areaConfig = config.messageNetworks.ftn.areas[areaTag];
+            if(!this.isAreaConfigValid(areaConfig)) {
+                return nextArea();
+            }
 
-			//
-			//	For each message that is newer than that of the last scan
-			//	we need to export to each configured associated uplink(s)
-			//
-			async.waterfall(
-				[
-					function getLastScanId(callback) {
-						self.getAreaLastScanId(areaTag, callback);
-					},
-					function getNewUuids(lastScanId, callback) {
-						msgDb.all(getNewUuidsSql, [ areaTag, lastScanId ], (err, rows) => {
-							if(err) {
-								callback(err);
-							} else {
-								if(0 === rows.length) {
-									let nothingToDoErr = new Error('Nothing to do!');
-									nothingToDoErr.noRows = true;
-									callback(nothingToDoErr);
-								} else {
-									callback(null, rows);
-								}
-							}
-						});
-					},
-					function exportToConfiguredUplinks(msgRows, callback) {
-						const uuidsOnly = msgRows.map(r => r.message_uuid);	//	convert to array of UUIDs only
-						self.exportEchoMailMessagesToUplinks(uuidsOnly, areaConfig, err => {
-							const newLastScanId = msgRows[msgRows.length - 1].message_id;
+            //
+            //	For each message that is newer than that of the last scan
+            //	we need to export to each configured associated uplink(s)
+            //
+            async.waterfall(
+                [
+                    function getLastScanId(callback) {
+                        self.getAreaLastScanId(areaTag, callback);
+                    },
+                    function getNewUuids(lastScanId, callback) {
+                        msgDb.all(getNewUuidsSql, [ areaTag, lastScanId ], (err, rows) => {
+                            if(err) {
+                                callback(err);
+                            } else {
+                                if(0 === rows.length) {
+                                    let nothingToDoErr = new Error('Nothing to do!');
+                                    nothingToDoErr.noRows = true;
+                                    callback(nothingToDoErr);
+                                } else {
+                                    callback(null, rows);
+                                }
+                            }
+                        });
+                    },
+                    function exportToConfiguredUplinks(msgRows, callback) {
+                        const uuidsOnly = msgRows.map(r => r.message_uuid);	//	convert to array of UUIDs only
+                        self.exportEchoMailMessagesToUplinks(uuidsOnly, areaConfig, err => {
+                            const newLastScanId = msgRows[msgRows.length - 1].message_id;
 
-							Log.info(
-								{ areaTag : areaTag, messagesExported : msgRows.length, newLastScanId : newLastScanId },
-								'Export complete');
+                            Log.info(
+                                { areaTag : areaTag, messagesExported : msgRows.length, newLastScanId : newLastScanId },
+                                'Export complete');
 
-							callback(err, newLastScanId);
-						});
-					},
-					function updateLastScanId(newLastScanId, callback) {
-						self.setAreaLastScanId(areaTag, newLastScanId, callback);
-					}
-				],
-				() => {
-					return nextArea();
-				}
-			);
-		},
-		err => {
-			return cb(err);
-		});
-	};
+                            callback(err, newLastScanId);
+                        });
+                    },
+                    function updateLastScanId(newLastScanId, callback) {
+                        self.setAreaLastScanId(areaTag, newLastScanId, callback);
+                    }
+                ],
+                () => {
+                    return nextArea();
+                }
+            );
+        },
+        err => {
+            return cb(err);
+        });
+    };
 
-	this.performNetMailExport = function(cb) {
-		//
-		//	Select all messages with a |message_id| > |lastScanId| in the private area
-		//	that are schedule for export to FTN-style networks.
-		//
-		//	Just like EchoMail, we additionally exclude messages with the System state_flags0
-		//	which will be present for imported or already exported messages
-		//
-		//
-		//	:TODO: fill out the rest of the consts here
-		//	:TODO: this statement is crazy ugly -- use JOIN / NOT EXISTS for state_flags & 0x02
-		const getNewUuidsSql =
+    this.performNetMailExport = function(cb) {
+        //
+        //	Select all messages with a |message_id| > |lastScanId| in the private area
+        //	that are schedule for export to FTN-style networks.
+        //
+        //	Just like EchoMail, we additionally exclude messages with the System state_flags0
+        //	which will be present for imported or already exported messages
+        //
+        //
+        //	:TODO: fill out the rest of the consts here
+        //	:TODO: this statement is crazy ugly -- use JOIN / NOT EXISTS for state_flags & 0x02
+        const getNewUuidsSql =
 			`SELECT message_id, message_uuid
 			FROM message m
 			WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
@@ -2024,40 +2024,40 @@ function FTNMessageScanTossModule() {
 			ORDER BY message_id;
 			`;
 
-		async.waterfall(
-			[
-				function getLastScanId(callback) {
-					return self.getAreaLastScanId(Message.WellKnownAreaTags.Private, callback);
-				},
-				function getNewUuids(lastScanId, callback) {
-					msgDb.all(getNewUuidsSql, [ lastScanId ], (err, rows) => {
-						if(err) {
-							return callback(err);
-						}
+        async.waterfall(
+            [
+                function getLastScanId(callback) {
+                    return self.getAreaLastScanId(Message.WellKnownAreaTags.Private, callback);
+                },
+                function getNewUuids(lastScanId, callback) {
+                    msgDb.all(getNewUuidsSql, [ lastScanId ], (err, rows) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						if(0 === rows.length) {
-							return cb(null);	//	note |cb| -- early bail out!
-						}
+                        if(0 === rows.length) {
+                            return cb(null);	//	note |cb| -- early bail out!
+                        }
 
-						return callback(null, rows);
-					});
-				},
-				function exportMessages(rows, callback) {
-					const messageUuids = rows.map(r => r.message_uuid);
-					return self.exportNetMailMessagesToUplinks(messageUuids, callback);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	};
+                        return callback(null, rows);
+                    });
+                },
+                function exportMessages(rows, callback) {
+                    const messageUuids = rows.map(r => r.message_uuid);
+                    return self.exportNetMailMessagesToUplinks(messageUuids, callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    };
 
-	this.isNetMailMessage = function(message) {
-		return message.isPrivate() &&
+    this.isNetMailMessage = function(message) {
+        return message.isPrivate() &&
 			null === _.get(message, 'meta.System.LocalToUserID', null) &&
 			Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null);
-	};
+    };
 }
 
 require('util').inherits(FTNMessageScanTossModule, MessageScanTossModule);
@@ -2065,293 +2065,293 @@ require('util').inherits(FTNMessageScanTossModule, MessageScanTossModule);
 //	:TODO: *scheduled* portion of this stuff should probably use event_scheduler - @immediate would still use record().
 
 FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importDir, cb) {
-	//	:TODO: pass in 'inbound' vs 'secInbound' -- pass along to processSingleTicFile() where password will be checked
+    //	:TODO: pass in 'inbound' vs 'secInbound' -- pass along to processSingleTicFile() where password will be checked
 
-	const self = this;
-	async.waterfall(
-		[
-			function findTicFiles(callback) {
-				fs.readdir(importDir, (err, files) => {
-					if(err) {
-						return callback(err);
-					}
+    const self = this;
+    async.waterfall(
+        [
+            function findTicFiles(callback) {
+                fs.readdir(importDir, (err, files) => {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					return callback(null, files.filter(f => '.tic' === paths.extname(f).toLowerCase()));
-				});
-			},
-			function gatherInfo(ticFiles, callback) {
-				const ticFilesInfo = [];
+                    return callback(null, files.filter(f => '.tic' === paths.extname(f).toLowerCase()));
+                });
+            },
+            function gatherInfo(ticFiles, callback) {
+                const ticFilesInfo = [];
 
-				async.each(ticFiles, (fileName, nextFile) => {
-					const fullPath = paths.join(importDir, fileName);
+                async.each(ticFiles, (fileName, nextFile) => {
+                    const fullPath = paths.join(importDir, fileName);
 
-					TicFileInfo.createFromFile(fullPath, (err, ticInfo) => {
-						if(err) {
-							Log.warn( { error : err.message, path : fullPath }, 'Failed reading TIC file');
-						} else {
-							ticFilesInfo.push(ticInfo);
-						}
+                    TicFileInfo.createFromFile(fullPath, (err, ticInfo) => {
+                        if(err) {
+                            Log.warn( { error : err.message, path : fullPath }, 'Failed reading TIC file');
+                        } else {
+                            ticFilesInfo.push(ticInfo);
+                        }
 
-						return nextFile(null);
-					});
-				},
-				err => {
-					return callback(err, ticFilesInfo);
-				});
-			},
-			function process(ticFilesInfo, callback) {
-				async.eachSeries(ticFilesInfo, (ticFileInfo, nextTicInfo) => {
-					self.processSingleTicFile(ticFileInfo, err => {
-						if(err) {
-							//	archive rejected TIC stuff (.TIC + attach)
-							async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
-								if(!path) {	//	possibly rejected due to "File" not existing/etc.
-									return nextPath(null);
-								}
+                        return nextFile(null);
+                    });
+                },
+                err => {
+                    return callback(err, ticFilesInfo);
+                });
+            },
+            function process(ticFilesInfo, callback) {
+                async.eachSeries(ticFilesInfo, (ticFileInfo, nextTicInfo) => {
+                    self.processSingleTicFile(ticFileInfo, err => {
+                        if(err) {
+                            //	archive rejected TIC stuff (.TIC + attach)
+                            async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
+                                if(!path) {	//	possibly rejected due to "File" not existing/etc.
+                                    return nextPath(null);
+                                }
 
-								self.maybeArchiveImportFile(
-									path,
-									'tic',
-									'reject',
-									() => {
-										return nextPath(null);
-									}
-								);
-							},
-							() => {
-								self.removeAssocTicFiles(ticFileInfo, () => {
-									return nextTicInfo(null);
-								});
-							});
-						} else {
-							self.removeAssocTicFiles(ticFileInfo, () => {
-								return nextTicInfo(null);
-							});
-						}
-					});
-				}, err => {
-					return callback(err);
-				});
-			}
-		],
-		err => {
-			return cb(err);
-		}
-	);
+                                self.maybeArchiveImportFile(
+                                    path,
+                                    'tic',
+                                    'reject',
+                                    () => {
+                                        return nextPath(null);
+                                    }
+                                );
+                            },
+                            () => {
+                                self.removeAssocTicFiles(ticFileInfo, () => {
+                                    return nextTicInfo(null);
+                                });
+                            });
+                        } else {
+                            self.removeAssocTicFiles(ticFileInfo, () => {
+                                return nextTicInfo(null);
+                            });
+                        }
+                    });
+                }, err => {
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 };
 
 FTNMessageScanTossModule.prototype.startup = function(cb) {
-	Log.info(`${exports.moduleInfo.name} Scanner/Tosser starting up`);
+    Log.info(`${exports.moduleInfo.name} Scanner/Tosser starting up`);
 
-	let importing = false;
+    let importing = false;
 
-	let self = this;
+    let self = this;
 
-	function tryImportNow(reasonDesc, extraInfo) {
-		if(!importing) {
-			importing = true;
+    function tryImportNow(reasonDesc, extraInfo) {
+        if(!importing) {
+            importing = true;
 
-			Log.info( Object.assign({ module : exports.moduleInfo.name }, extraInfo), reasonDesc);
+            Log.info( Object.assign({ module : exports.moduleInfo.name }, extraInfo), reasonDesc);
 
-			self.performImport( () => {
-				importing = false;
-			});
-		}
-	}
+            self.performImport( () => {
+                importing = false;
+            });
+        }
+    }
 
-	this.createTempDirectories(err => {
-		if(err) {
-			Log.warn( { error : err.toStrong() }, 'Failed creating temporary directories!');
-			return cb(err);
-		}
+    this.createTempDirectories(err => {
+        if(err) {
+            Log.warn( { error : err.toStrong() }, 'Failed creating temporary directories!');
+            return cb(err);
+        }
 
-		if(_.isObject(this.moduleConfig.schedule)) {
-			const exportSchedule = this.parseScheduleString(this.moduleConfig.schedule.export);
-			if(exportSchedule) {
-				Log.debug(
-					{
-						schedule	: this.moduleConfig.schedule.export,
-						schedOK		: -1 === exportSchedule.sched.error,
-						next		: moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
-						immediate	: exportSchedule.immediate ? true : false,
-					},
-					'Export schedule loaded'
-				);
+        if(_.isObject(this.moduleConfig.schedule)) {
+            const exportSchedule = this.parseScheduleString(this.moduleConfig.schedule.export);
+            if(exportSchedule) {
+                Log.debug(
+                    {
+                        schedule	: this.moduleConfig.schedule.export,
+                        schedOK		: -1 === exportSchedule.sched.error,
+                        next		: moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        immediate	: exportSchedule.immediate ? true : false,
+                    },
+                    'Export schedule loaded'
+                );
 
-				if(exportSchedule.sched) {
-					this.exportTimer = later.setInterval( () => {
-						if(this.exportingStart()) {
-							Log.info( { module : exports.moduleInfo.name }, 'Performing scheduled message scan/export...');
+                if(exportSchedule.sched) {
+                    this.exportTimer = later.setInterval( () => {
+                        if(this.exportingStart()) {
+                            Log.info( { module : exports.moduleInfo.name }, 'Performing scheduled message scan/export...');
 
-							this.performExport( () => {
-								this.exportingEnd();
-							});
-						}
-					}, exportSchedule.sched);
-				}
+                            this.performExport( () => {
+                                this.exportingEnd();
+                            });
+                        }
+                    }, exportSchedule.sched);
+                }
 
-				if(_.isBoolean(exportSchedule.immediate)) {
-					this.exportImmediate = exportSchedule.immediate;
-				}
-			}
+                if(_.isBoolean(exportSchedule.immediate)) {
+                    this.exportImmediate = exportSchedule.immediate;
+                }
+            }
 
-			const importSchedule = this.parseScheduleString(this.moduleConfig.schedule.import);
-			if(importSchedule) {
-				Log.debug(
-					{
-						schedule	: this.moduleConfig.schedule.import,
-						schedOK		: -1 === importSchedule.sched.error,
-						next		: moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
-						watchFile	: _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
-					},
-					'Import schedule loaded'
-				);
+            const importSchedule = this.parseScheduleString(this.moduleConfig.schedule.import);
+            if(importSchedule) {
+                Log.debug(
+                    {
+                        schedule	: this.moduleConfig.schedule.import,
+                        schedOK		: -1 === importSchedule.sched.error,
+                        next		: moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        watchFile	: _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
+                    },
+                    'Import schedule loaded'
+                );
 
-				if(importSchedule.sched) {
-					this.importTimer = later.setInterval( () => {
-						tryImportNow('Performing scheduled message import/toss...');
-					}, importSchedule.sched);
-				}
+                if(importSchedule.sched) {
+                    this.importTimer = later.setInterval( () => {
+                        tryImportNow('Performing scheduled message import/toss...');
+                    }, importSchedule.sched);
+                }
 
-				if(_.isString(importSchedule.watchFile)) {
-					const watcher = sane(
-						paths.dirname(importSchedule.watchFile),
-						{
-							glob : `**/${paths.basename(importSchedule.watchFile)}`
-						}
-					);
+                if(_.isString(importSchedule.watchFile)) {
+                    const watcher = sane(
+                        paths.dirname(importSchedule.watchFile),
+                        {
+                            glob : `**/${paths.basename(importSchedule.watchFile)}`
+                        }
+                    );
 
-					[ 'change', 'add', 'delete' ].forEach(event => {
-						watcher.on(event, (fileName, fileRoot) => {
-							const eventPath = paths.join(fileRoot, fileName);
-							if(paths.join(fileRoot, fileName) === importSchedule.watchFile) {
-								tryImportNow('Performing import/toss due to @watch', { eventPath, event } );
-							}
-						});
-					});
+                    [ 'change', 'add', 'delete' ].forEach(event => {
+                        watcher.on(event, (fileName, fileRoot) => {
+                            const eventPath = paths.join(fileRoot, fileName);
+                            if(paths.join(fileRoot, fileName) === importSchedule.watchFile) {
+                                tryImportNow('Performing import/toss due to @watch', { eventPath, event } );
+                            }
+                        });
+                    });
 
-					//
-					//	If the watch file already exists, kick off now
-					//	https://github.com/NuSkooler/enigma-bbs/issues/122
-					//
-					fse.exists(importSchedule.watchFile, exists => {
-						if(exists) {
-							tryImportNow('Performing import/toss due to @watch', { eventPath : importSchedule.watchFile, event : 'initial exists' } );
-						}
-					});
-				}
-			}
-		}
+                    //
+                    //	If the watch file already exists, kick off now
+                    //	https://github.com/NuSkooler/enigma-bbs/issues/122
+                    //
+                    fse.exists(importSchedule.watchFile, exists => {
+                        if(exists) {
+                            tryImportNow('Performing import/toss due to @watch', { eventPath : importSchedule.watchFile, event : 'initial exists' } );
+                        }
+                    });
+                }
+            }
+        }
 
-		FTNMessageScanTossModule.super_.prototype.startup.call(this, cb);
-	});
+        FTNMessageScanTossModule.super_.prototype.startup.call(this, cb);
+    });
 };
 
 FTNMessageScanTossModule.prototype.shutdown = function(cb) {
-	Log.info('FidoNet Scanner/Tosser shutting down');
+    Log.info('FidoNet Scanner/Tosser shutting down');
 
-	if(this.exportTimer) {
-		this.exportTimer.clear();
-	}
+    if(this.exportTimer) {
+        this.exportTimer.clear();
+    }
 
-	if(this.importTimer) {
-		this.importTimer.clear();
-	}
+    if(this.importTimer) {
+        this.importTimer.clear();
+    }
 
-	//
-	//	Clean up temp dir/files we created
-	//
-	temptmp.cleanup( paths => {
-		const fullStats = {
-			exportDir	: this.exportTempDir,
-			importTemp	: this.importTempDir,
-			paths		: paths,
-			sessionId	: temptmp.sessionId,
-		};
+    //
+    //	Clean up temp dir/files we created
+    //
+    temptmp.cleanup( paths => {
+        const fullStats = {
+            exportDir	: this.exportTempDir,
+            importTemp	: this.importTempDir,
+            paths		: paths,
+            sessionId	: temptmp.sessionId,
+        };
 
-		Log.trace(fullStats, 'Temporary directories cleaned up');
+        Log.trace(fullStats, 'Temporary directories cleaned up');
 
-		FTNMessageScanTossModule.super_.prototype.shutdown.call(this, cb);
-	});
+        FTNMessageScanTossModule.super_.prototype.shutdown.call(this, cb);
+    });
 
-	FTNMessageScanTossModule.super_.prototype.shutdown.call(this, cb);
+    FTNMessageScanTossModule.super_.prototype.shutdown.call(this, cb);
 };
 
 FTNMessageScanTossModule.prototype.performImport = function(cb) {
-	if(!this.hasValidConfiguration()) {
-		return cb(new Error('Missing or invalid configuration'));
-	}
+    if(!this.hasValidConfiguration()) {
+        return cb(new Error('Missing or invalid configuration'));
+    }
 
-	const self = this;
+    const self = this;
 
-	async.each( [ 'inbound', 'secInbound' ], (inboundType, nextDir) => {
-		self.importFromDirectory(inboundType, self.moduleConfig.paths[inboundType], () => {
-			return nextDir(null);
-		});
-	}, cb);
+    async.each( [ 'inbound', 'secInbound' ], (inboundType, nextDir) => {
+        self.importFromDirectory(inboundType, self.moduleConfig.paths[inboundType], () => {
+            return nextDir(null);
+        });
+    }, cb);
 };
 
 FTNMessageScanTossModule.prototype.performExport = function(cb) {
-	//
-	//	We're only concerned with areas related to FTN. For each area, loop though
-	//	and let's find out what messages need exported.
-	//
-	if(!this.hasValidConfiguration()) {
-		return cb(new Error('Missing or invalid configuration'));
-	}
+    //
+    //	We're only concerned with areas related to FTN. For each area, loop though
+    //	and let's find out what messages need exported.
+    //
+    if(!this.hasValidConfiguration()) {
+        return cb(new Error('Missing or invalid configuration'));
+    }
 
-	const self = this;
+    const self = this;
 
-	async.eachSeries( [ 'EchoMail', 'NetMail' ], (type, nextType) => {
-		self[`perform${type}Export`]( err => {
-			if(err) {
-				Log.warn( { error : err.message, type : type }, 'Error(s) during export' );
-			}
-			return nextType(null);	//	try next, always
-		});
-	}, () => {
-		return cb(null);
-	});
+    async.eachSeries( [ 'EchoMail', 'NetMail' ], (type, nextType) => {
+        self[`perform${type}Export`]( err => {
+            if(err) {
+                Log.warn( { error : err.message, type : type }, 'Error(s) during export' );
+            }
+            return nextType(null);	//	try next, always
+        });
+    }, () => {
+        return cb(null);
+    });
 };
 
 FTNMessageScanTossModule.prototype.record = function(message) {
-	//
-	//	This module works off schedules, but we do support @immediate for export
-	//
-	if(true !== this.exportImmediate || !this.hasValidConfiguration()) {
-		return;
-	}
+    //
+    //	This module works off schedules, but we do support @immediate for export
+    //
+    if(true !== this.exportImmediate || !this.hasValidConfiguration()) {
+        return;
+    }
 
-	const info = { uuid : message.uuid, subject : message.subject };
+    const info = { uuid : message.uuid, subject : message.subject };
 
-	function exportLog(err) {
-		if(err) {
-			Log.warn(info, 'Failed exporting message');
-		} else {
-			Log.info(info, 'Message exported');
-		}
-	}
+    function exportLog(err) {
+        if(err) {
+            Log.warn(info, 'Failed exporting message');
+        } else {
+            Log.info(info, 'Message exported');
+        }
+    }
 
-	if(this.isNetMailMessage(message)) {
-		Object.assign(info, { type : 'NetMail' } );
+    if(this.isNetMailMessage(message)) {
+        Object.assign(info, { type : 'NetMail' } );
 
-		if(this.exportingStart()) {
-			this.exportNetMailMessagesToUplinks( [ message.uuid ], err => {
-				this.exportingEnd( () => exportLog(err) );
-			});
-		}
-	} else if(message.areaTag) {
-		Object.assign(info, { type : 'EchoMail' } );
+        if(this.exportingStart()) {
+            this.exportNetMailMessagesToUplinks( [ message.uuid ], err => {
+                this.exportingEnd( () => exportLog(err) );
+            });
+        }
+    } else if(message.areaTag) {
+        Object.assign(info, { type : 'EchoMail' } );
 
-		const areaConfig = Config().messageNetworks.ftn.areas[message.areaTag];
-		if(!this.isAreaConfigValid(areaConfig)) {
-			return;
-		}
+        const areaConfig = Config().messageNetworks.ftn.areas[message.areaTag];
+        if(!this.isAreaConfigValid(areaConfig)) {
+            return;
+        }
 
-		if(this.exportingStart()) {
-			this.exportEchoMailMessagesToUplinks( [ message.uuid ], areaConfig, err => {
-				this.exportingEnd( () => exportLog(err) );
-			});
-		}
-	}
+        if(this.exportingStart()) {
+            this.exportEchoMailMessagesToUplinks( [ message.uuid ], areaConfig, err => {
+                this.exportingEnd( () => exportLog(err) );
+            });
+        }
+    }
 };
diff --git a/core/server_module.js b/core/server_module.js
index d1b8ccc6..26000c1b 100644
--- a/core/server_module.js
+++ b/core/server_module.js
@@ -6,7 +6,7 @@ var PluginModule		= require('./plugin_module.js').PluginModule;
 exports.ServerModule	= ServerModule;
 
 function ServerModule() {
-	PluginModule.call(this);
+    PluginModule.call(this);
 }
 
 require('util').inherits(ServerModule, PluginModule);
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index d613052a..bc221b84 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -6,14 +6,14 @@ const Log					= require('../../logger.js').log;
 const { ServerModule }		= require('../../server_module.js');
 const Config				= require('../../config.js').get;
 const {
-	splitTextAtTerms,
-	isAnsi,
-	cleanControlCodes
+    splitTextAtTerms,
+    isAnsi,
+    cleanControlCodes
 }							= require('../../string_util.js');
 const {
-	getMessageConferenceByTag,
-	getMessageAreaByTag,
-	getMessageListForArea,
+    getMessageConferenceByTag,
+    getMessageAreaByTag,
+    getMessageListForArea,
 }							= require('../../message_area.js');
 const { sortAreasOrConfs }	= require('../../conf_area_util.js');
 const AnsiPrep				= require('../../ansi_prep.js');
@@ -26,221 +26,221 @@ const paths					= require('path');
 const moment				= require('moment');
 
 const ModuleInfo = exports.moduleInfo = {
-	name		: 'Gopher',
-	desc		: 'Gopher Server',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.gopher.server',
+    name		: 'Gopher',
+    desc		: 'Gopher Server',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.gopher.server',
 };
 
 const Message				= require('../../message.js');
 
 const ItemTypes = {
-	Invalid				: '',	//	not really a type, of course!
+    Invalid				: '',	//	not really a type, of course!
 
-	//	Canonical, RFC-1436
-	TextFile			: '0',
-	SubMenu				: '1',
-	CCSONameserver		: '2',
-	Error				: '3',
-	BinHexFile			: '4',
-	DOSFile				: '5',
-	UuEncodedFile		: '6',
-	FullTextSearch		: '7',
-	Telnet				: '8',
-	BinaryFile			: '9',
-	AltServer			: '+',
-	GIFFile				: 'g',
-	ImageFile			: 'I',
-	Telnet3270			: 'T',
+    //	Canonical, RFC-1436
+    TextFile			: '0',
+    SubMenu				: '1',
+    CCSONameserver		: '2',
+    Error				: '3',
+    BinHexFile			: '4',
+    DOSFile				: '5',
+    UuEncodedFile		: '6',
+    FullTextSearch		: '7',
+    Telnet				: '8',
+    BinaryFile			: '9',
+    AltServer			: '+',
+    GIFFile				: 'g',
+    ImageFile			: 'I',
+    Telnet3270			: 'T',
 
-	//	Non-canonical
-	HtmlFile			: 'h',
-	InfoMessage			: 'i',
-	SoundFile			: 's',
+    //	Non-canonical
+    HtmlFile			: 'h',
+    InfoMessage			: 'i',
+    SoundFile			: 's',
 };
 
 exports.getModule = class GopherModule extends ServerModule {
 
-	constructor() {
-		super();
+    constructor() {
+        super();
 
-		this.routes = new Map();	//	selector->generator => gopher item
-		this.log = Log.child( { server : 'Gopher' } );
-	}
+        this.routes = new Map();	//	selector->generator => gopher item
+        this.log = Log.child( { server : 'Gopher' } );
+    }
 
-	createServer() {
-		if(!this.enabled) {
-			return;
-		}
+    createServer() {
+        if(!this.enabled) {
+            return;
+        }
 
-		const config = Config();
-		this.publicHostname = config.contentServers.gopher.publicHostname;
-		this.publicPort		= config.contentServers.gopher.publicPort;
+        const config = Config();
+        this.publicHostname = config.contentServers.gopher.publicHostname;
+        this.publicPort		= config.contentServers.gopher.publicPort;
 
-		this.addRoute(/^\/?\r\n$/, this.defaultGenerator);
-		this.addRoute(/^\/msgarea(\/[a-z0-9_-]+(\/[a-z0-9_-]+)?(\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(_raw)?)?)?\/?\r\n$/, this.messageAreaGenerator);
+        this.addRoute(/^\/?\r\n$/, this.defaultGenerator);
+        this.addRoute(/^\/msgarea(\/[a-z0-9_-]+(\/[a-z0-9_-]+)?(\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(_raw)?)?)?\/?\r\n$/, this.messageAreaGenerator);
 
-		this.server = net.createServer( socket => {
-			socket.setEncoding('ascii');
+        this.server = net.createServer( socket => {
+            socket.setEncoding('ascii');
 
-			socket.on('data', data => {
-				this.routeRequest(data, socket);
-			});
+            socket.on('data', data => {
+                this.routeRequest(data, socket);
+            });
 
-			socket.on('error', err => {
-				if('ECONNRESET' !== err.code) {	//	normal
-					this.log.trace( { error : err.message }, 'Socket error');
-				}
-			});
-		});
-	}
+            socket.on('error', err => {
+                if('ECONNRESET' !== err.code) {	//	normal
+                    this.log.trace( { error : err.message }, 'Socket error');
+                }
+            });
+        });
+    }
 
-	listen() {
-		if(!this.enabled) {
-			return true;	//	nothing to do, but not an error
-		}
+    listen() {
+        if(!this.enabled) {
+            return true;	//	nothing to do, but not an error
+        }
 
-		const config = Config();
-		const port = parseInt(config.contentServers.gopher.port);
-		if(isNaN(port)) {
-			this.log.warn( { port : config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
-			return false;
-		}
+        const config = Config();
+        const port = parseInt(config.contentServers.gopher.port);
+        if(isNaN(port)) {
+            this.log.warn( { port : config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
+            return false;
+        }
 
-		return this.server.listen(port);
-	}
+        return this.server.listen(port);
+    }
 
-	get enabled() {
-		return _.get(Config(), 'contentServers.gopher.enabled', false) && this.isConfigured();
-	}
+    get enabled() {
+        return _.get(Config(), 'contentServers.gopher.enabled', false) && this.isConfigured();
+    }
 
-	isConfigured() {
-		//	public hostname & port must be set; responses contain them!
-		const config = Config();
-		return _.isString(_.get(config, 'contentServers.gopher.publicHostname')) &&
+    isConfigured() {
+        //	public hostname & port must be set; responses contain them!
+        const config = Config();
+        return _.isString(_.get(config, 'contentServers.gopher.publicHostname')) &&
 			_.isNumber(_.get(config, 'contentServers.gopher.publicPort'));
-	}
+    }
 
-	addRoute(selectorRegExp, generatorHandler) {
-		if(_.isString(selectorRegExp)) {
-			try {
-				selectorRegExp = new RegExp(`${selectorRegExp}\r\n`);
-			} catch(e) {
-				this.log.warn( { pattern : selectorRegExp }, 'Invalid RegExp for selector' );
-				return false;
-			}
-		}
-		this.routes.set(selectorRegExp, generatorHandler.bind(this));
-	}
+    addRoute(selectorRegExp, generatorHandler) {
+        if(_.isString(selectorRegExp)) {
+            try {
+                selectorRegExp = new RegExp(`${selectorRegExp}\r\n`);
+            } catch(e) {
+                this.log.warn( { pattern : selectorRegExp }, 'Invalid RegExp for selector' );
+                return false;
+            }
+        }
+        this.routes.set(selectorRegExp, generatorHandler.bind(this));
+    }
 
-	routeRequest(selector, socket) {
-		let match;
-		for(let [regex, gen] of this.routes) {
-			match = selector.match(regex);
-			if(match) {
-				return gen(match, res => {
-					return socket.end(`${res}`);
-				});
-			}
-		}
-		this.notFoundGenerator(selector, res => {
-			return socket.end(`${res}`);
-		});
-	}
+    routeRequest(selector, socket) {
+        let match;
+        for(let [regex, gen] of this.routes) {
+            match = selector.match(regex);
+            if(match) {
+                return gen(match, res => {
+                    return socket.end(`${res}`);
+                });
+            }
+        }
+        this.notFoundGenerator(selector, res => {
+            return socket.end(`${res}`);
+        });
+    }
 
-	makeItem(itemType, text, selector, hostname, port) {
-		selector = selector || '';	//	e.g. for info
-		hostname = hostname || this.publicHostname;
-		port = port || this.publicPort;
-		return `${itemType}${text}\t${selector}\t${hostname}\t${port}\r\n`;
-	}
+    makeItem(itemType, text, selector, hostname, port) {
+        selector = selector || '';	//	e.g. for info
+        hostname = hostname || this.publicHostname;
+        port = port || this.publicPort;
+        return `${itemType}${text}\t${selector}\t${hostname}\t${port}\r\n`;
+    }
 
-	defaultGenerator(selectorMatch, cb) {
-		this.log.trace( { selector : selectorMatch[0] }, 'Serving default content');
+    defaultGenerator(selectorMatch, cb) {
+        this.log.trace( { selector : selectorMatch[0] }, 'Serving default content');
 
-		let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'startup_banner.asc');
-		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
-		fs.readFile(bannerFile, 'utf8', (err, banner) => {
-			if(err) {
-				return cb('You have reached an ENiGMA½ Gopher server!');
-			}
+        let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'startup_banner.asc');
+        bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
+        fs.readFile(bannerFile, 'utf8', (err, banner) => {
+            if(err) {
+                return cb('You have reached an ENiGMA½ Gopher server!');
+            }
 
-			banner = splitTextAtTerms(banner).map(l => this.makeItem(ItemTypes.InfoMessage, l)).join('');
-			banner += this.makeItem(ItemTypes.SubMenu, 'Public Message Area', '/msgarea');
-			return cb(banner);
-		});
-	}
+            banner = splitTextAtTerms(banner).map(l => this.makeItem(ItemTypes.InfoMessage, l)).join('');
+            banner += this.makeItem(ItemTypes.SubMenu, 'Public Message Area', '/msgarea');
+            return cb(banner);
+        });
+    }
 
-	notFoundGenerator(selector, cb) {
-		this.log.trace( { selector }, 'Serving not found content');
-		return cb('Not found');
-	}
+    notFoundGenerator(selector, cb) {
+        this.log.trace( { selector }, 'Serving not found content');
+        return cb('Not found');
+    }
 
-	isAreaAndConfExposed(confTag, areaTag) {
-		const conf = _.get(Config(), [ 'contentServers', 'gopher', 'messageConferences', confTag ]);
-		return Array.isArray(conf) && conf.includes(areaTag);
-	}
+    isAreaAndConfExposed(confTag, areaTag) {
+        const conf = _.get(Config(), [ 'contentServers', 'gopher', 'messageConferences', confTag ]);
+        return Array.isArray(conf) && conf.includes(areaTag);
+    }
 
-	prepareMessageBody(body, cb) {
-		if(isAnsi(body)) {
-			AnsiPrep(
-				body,
-				{
-					cols			: 79,				//	Gopher std. wants 70, but we'll have to deal with it.
-					forceLineTerm	: true,				//	ensure each line is term'd
-					asciiMode		: true,				//	export to ASCII
-					fillLines		: false,			//	don't fill up to |cols|
-				},
-				(err, prepped) => {
-					return cb(prepped || body);
-				}
-			);
-		} else {
-			return cb(cleanControlCodes(body, { all : true } ));
-		}
-	}
+    prepareMessageBody(body, cb) {
+        if(isAnsi(body)) {
+            AnsiPrep(
+                body,
+                {
+                    cols			: 79,				//	Gopher std. wants 70, but we'll have to deal with it.
+                    forceLineTerm	: true,				//	ensure each line is term'd
+                    asciiMode		: true,				//	export to ASCII
+                    fillLines		: false,			//	don't fill up to |cols|
+                },
+                (err, prepped) => {
+                    return cb(prepped || body);
+                }
+            );
+        } else {
+            return cb(cleanControlCodes(body, { all : true } ));
+        }
+    }
 
-	shortenSubject(subject) {
-		return _.truncate(subject, { length : 30 } );
-	}
+    shortenSubject(subject) {
+        return _.truncate(subject, { length : 30 } );
+    }
 
-	messageAreaGenerator(selectorMatch, cb) {
-		this.log.trace( { selector : selectorMatch[0] }, 'Serving message area content');
-		//
-		//	Selector should be:
-		//	/msgarea - list confs
-		//	/msgarea/conftag - list areas in conf
-		//	/msgarea/conftag/areatag - list messages in area
-		//	/msgarea/conftag/areatag/<UUID> - message as text
-		//	/msgarea/conftag/areatag/<UUID>_raw - full message as text + headers
-		//
-		if(selectorMatch[3] || selectorMatch[4]) {
-			//	message
-			//const raw = selectorMatch[4] ? true : false;
-			//	:TODO: support 'raw'
-			const msgUuid	= selectorMatch[3].replace(/\r\n|\//g, '');
-			const confTag	= selectorMatch[1].substr(1).split('/')[0];
-			const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
-			const message 	= new Message();
+    messageAreaGenerator(selectorMatch, cb) {
+        this.log.trace( { selector : selectorMatch[0] }, 'Serving message area content');
+        //
+        //	Selector should be:
+        //	/msgarea - list confs
+        //	/msgarea/conftag - list areas in conf
+        //	/msgarea/conftag/areatag - list messages in area
+        //	/msgarea/conftag/areatag/<UUID> - message as text
+        //	/msgarea/conftag/areatag/<UUID>_raw - full message as text + headers
+        //
+        if(selectorMatch[3] || selectorMatch[4]) {
+            //	message
+            //const raw = selectorMatch[4] ? true : false;
+            //	:TODO: support 'raw'
+            const msgUuid	= selectorMatch[3].replace(/\r\n|\//g, '');
+            const confTag	= selectorMatch[1].substr(1).split('/')[0];
+            const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
+            const message 	= new Message();
 
-			return message.load( { uuid : msgUuid }, err => {
-				if(err) {
-					this.log.debug( { uuid : msgUuid }, 'Attempted access to non-existant message UUID!');
-					return this.notFoundGenerator(selectorMatch, cb);
-				}
+            return message.load( { uuid : msgUuid }, err => {
+                if(err) {
+                    this.log.debug( { uuid : msgUuid }, 'Attempted access to non-existant message UUID!');
+                    return this.notFoundGenerator(selectorMatch, cb);
+                }
 
-				if(message.areaTag !== areaTag || !this.isAreaAndConfExposed(confTag, areaTag)) {
-					this.log.warn( { areaTag }, 'Attempted access to non-exposed conference and/or area!');
-					return this.notFoundGenerator(selectorMatch, cb);
-				}
+                if(message.areaTag !== areaTag || !this.isAreaAndConfExposed(confTag, areaTag)) {
+                    this.log.warn( { areaTag }, 'Attempted access to non-exposed conference and/or area!');
+                    return this.notFoundGenerator(selectorMatch, cb);
+                }
 
-				if(Message.isPrivateAreaTag(areaTag)) {
-					this.log.warn( { areaTag }, 'Attempted access to message in private area!');
-					return this.notFoundGenerator(selectorMatch, cb);
-				}
+                if(Message.isPrivateAreaTag(areaTag)) {
+                    this.log.warn( { areaTag }, 'Attempted access to message in private area!');
+                    return this.notFoundGenerator(selectorMatch, cb);
+                }
 
-				this.prepareMessageBody(message.message, msgBody => {
-					const response = `${'-'.repeat(70)}
+                this.prepareMessageBody(message.message, msgBody => {
+                    const response = `${'-'.repeat(70)}
 To     : ${message.toUserName}
 From   : ${message.fromUserName}
 When   : ${moment(message.modTimestamp).format('dddd, MMMM Do YYYY, h:mm:ss a (UTCZ)')}
@@ -249,87 +249,87 @@ ID     : ${message.messageUuid} (${message.messageId})
 ${'-'.repeat(70)}
 ${msgBody}
 	`;
-					return cb(response);
-				});
-			});
-		} else if(selectorMatch[2]) {
-			//	list messages in area
-			const confTag	= selectorMatch[1].substr(1).split('/')[0];
-			const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
-			const area		= getMessageAreaByTag(areaTag);
+                    return cb(response);
+                });
+            });
+        } else if(selectorMatch[2]) {
+            //	list messages in area
+            const confTag	= selectorMatch[1].substr(1).split('/')[0];
+            const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
+            const area		= getMessageAreaByTag(areaTag);
 
-			if(Message.isPrivateAreaTag(areaTag)) {
-				this.log.warn( { areaTag }, 'Attempted access to private area!');
-				return cb(this.makeItem(ItemTypes.InfoMessage, 'Area is private'));
-			}
+            if(Message.isPrivateAreaTag(areaTag)) {
+                this.log.warn( { areaTag }, 'Attempted access to private area!');
+                return cb(this.makeItem(ItemTypes.InfoMessage, 'Area is private'));
+            }
 
-			if(!area || !this.isAreaAndConfExposed(confTag, areaTag)) {
-				this.log.warn( { confTag, areaTag }, 'Attempted access to non-exposed conference and/or area!');
-				return this.notFoundGenerator(selectorMatch, cb);
-			}
+            if(!area || !this.isAreaAndConfExposed(confTag, areaTag)) {
+                this.log.warn( { confTag, areaTag }, 'Attempted access to non-exposed conference and/or area!');
+                return this.notFoundGenerator(selectorMatch, cb);
+            }
 
-			return getMessageListForArea(null, areaTag, (err, msgList) => {
-				const response = [
-					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-					this.makeItem(ItemTypes.InfoMessage, `Messages in ${area.name}`),
-					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-					...msgList.map(msg => this.makeItem(
-						ItemTypes.TextFile,
-						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}: ${this.shortenSubject(msg.subject)}  (${msg.fromUserName} to ${msg.toUserName})`,
-						`/msgarea/${confTag}/${areaTag}/${msg.messageUuid}`
-					))
-				].join('');
+            return getMessageListForArea(null, areaTag, (err, msgList) => {
+                const response = [
+                    this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                    this.makeItem(ItemTypes.InfoMessage, `Messages in ${area.name}`),
+                    this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                    ...msgList.map(msg => this.makeItem(
+                        ItemTypes.TextFile,
+                        `${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}: ${this.shortenSubject(msg.subject)}  (${msg.fromUserName} to ${msg.toUserName})`,
+                        `/msgarea/${confTag}/${areaTag}/${msg.messageUuid}`
+                    ))
+                ].join('');
 
-				return cb(response);
-			});
-		} else if(selectorMatch[1]) {
-			//	list areas in conf
-			const sysConfig = Config();
-			const confTag	= selectorMatch[1].replace(/\r\n|\//g, '');
-			const conf		= _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
-			if(!conf) {
-				return this.notFoundGenerator(selectorMatch, cb);
-			}
+                return cb(response);
+            });
+        } else if(selectorMatch[1]) {
+            //	list areas in conf
+            const sysConfig = Config();
+            const confTag	= selectorMatch[1].replace(/\r\n|\//g, '');
+            const conf		= _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
+            if(!conf) {
+                return this.notFoundGenerator(selectorMatch, cb);
+            }
 
-			const areas = _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ], {})
-				.map(areaTag => Object.assign( { areaTag }, getMessageAreaByTag(areaTag)))
-				.filter(area => area && !Message.isPrivateAreaTag(area.areaTag));
+            const areas = _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ], {})
+                .map(areaTag => Object.assign( { areaTag }, getMessageAreaByTag(areaTag)))
+                .filter(area => area && !Message.isPrivateAreaTag(area.areaTag));
 
-			if(0 === areas.length) {
-				return cb(this.makeItem(ItemTypes.InfoMessage, 'No message areas available'));
-			}
+            if(0 === areas.length) {
+                return cb(this.makeItem(ItemTypes.InfoMessage, 'No message areas available'));
+            }
 
-			sortAreasOrConfs(areas);
+            sortAreasOrConfs(areas);
 
-			const response = [
-				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-				this.makeItem(ItemTypes.InfoMessage, `Message areas in ${conf.name}`),
-				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-				...areas.map(area => this.makeItem(ItemTypes.SubMenu, area.name, `/msgarea/${confTag}/${area.areaTag}`))
-			].join('');
+            const response = [
+                this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                this.makeItem(ItemTypes.InfoMessage, `Message areas in ${conf.name}`),
+                this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                ...areas.map(area => this.makeItem(ItemTypes.SubMenu, area.name, `/msgarea/${confTag}/${area.areaTag}`))
+            ].join('');
 
-			return cb(response);
-		} else {
-			//	message area base (list confs)
-			const confs = Object.keys(_.get(Config(), 'contentServers.gopher.messageConferences', {}))
-				.map(confTag => Object.assign( { confTag }, getMessageConferenceByTag(confTag)))
-				.filter(conf => conf);	//	remove any baddies
+            return cb(response);
+        } else {
+            //	message area base (list confs)
+            const confs = Object.keys(_.get(Config(), 'contentServers.gopher.messageConferences', {}))
+                .map(confTag => Object.assign( { confTag }, getMessageConferenceByTag(confTag)))
+                .filter(conf => conf);	//	remove any baddies
 
-			if(0 === confs.length) {
-				return cb(this.makeItem(ItemTypes.InfoMessage, 'No message conferences available'));
-			}
+            if(0 === confs.length) {
+                return cb(this.makeItem(ItemTypes.InfoMessage, 'No message conferences available'));
+            }
 
-			sortAreasOrConfs(confs);
+            sortAreasOrConfs(confs);
 
-			const response = [
-				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-				this.makeItem(ItemTypes.InfoMessage, 'Available Message Conferences'),
-				this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-				this.makeItem(ItemTypes.InfoMessage, ''),
-				...confs.map(conf => this.makeItem(ItemTypes.SubMenu, conf.name, `/msgarea/${conf.confTag}`))
-			].join('');
+            const response = [
+                this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                this.makeItem(ItemTypes.InfoMessage, 'Available Message Conferences'),
+                this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
+                this.makeItem(ItemTypes.InfoMessage, ''),
+                ...confs.map(conf => this.makeItem(ItemTypes.SubMenu, conf.name, `/msgarea/${conf.confTag}`))
+            ].join('');
 
-			return cb(response);
-		}
-	}
+            return cb(response);
+        }
+    }
 };
\ No newline at end of file
diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 47e0661f..c31a3720 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -15,169 +15,169 @@ const paths			= require('path');
 const mimeTypes		= require('mime-types');
 
 const ModuleInfo = exports.moduleInfo = {
-	name		: 'Web',
-	desc		: 'Web Server',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.web.server',
+    name		: 'Web',
+    desc		: 'Web Server',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.web.server',
 };
 
 class Route {
-	constructor(route) {
-		Object.assign(this, route);
-		
-		if(this.method) {
-			this.method = this.method.toUpperCase();
-		}
+    constructor(route) {
+        Object.assign(this, route);
 
-		try {
-			this.pathRegExp = new RegExp(this.path);
-		} catch(e) {
-			Log.debug( { route : route }, 'Invalid regular expression for route path' );
-		}
-	}
+        if(this.method) {
+            this.method = this.method.toUpperCase();
+        }
 
-	isValid() {
-		return (
-			this.pathRegExp instanceof RegExp && 
-			( -1 !== [ 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE',  ].indexOf(this.method) ) || 
+        try {
+            this.pathRegExp = new RegExp(this.path);
+        } catch(e) {
+            Log.debug( { route : route }, 'Invalid regular expression for route path' );
+        }
+    }
+
+    isValid() {
+        return (
+            this.pathRegExp instanceof RegExp &&
+			( -1 !== [ 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE',  ].indexOf(this.method) ) ||
 			!_.isFunction(this.handler)
-		);
-	}
+        );
+    }
 
-	matchesRequest(req) {
-		return req.method === this.method && this.pathRegExp.test(req.url);
-	}
+    matchesRequest(req) {
+        return req.method === this.method && this.pathRegExp.test(req.url);
+    }
 
-	getRouteKey() { return `${this.method}:${this.path}`; }
+    getRouteKey() { return `${this.method}:${this.path}`; }
 }
 
 exports.getModule = class WebServerModule extends ServerModule {
-	constructor() {
-		super();
+    constructor() {
+        super();
 
-		const config 		= Config();
-		this.enableHttp		= config.contentServers.web.http.enabled || false;
-		this.enableHttps	= config.contentServers.web.https.enabled || false;
+        const config 		= Config();
+        this.enableHttp		= config.contentServers.web.http.enabled || false;
+        this.enableHttps	= config.contentServers.web.https.enabled || false;
 
-		this.routes = {};
+        this.routes = {};
 
-		if(this.isEnabled() && config.contentServers.web.staticRoot) {
-			this.addRoute({
-				method		: 'GET',
-				path		: '/static/.*$',
-				handler		: this.routeStaticFile.bind(this),
-			});
-		}
-	}
+        if(this.isEnabled() && config.contentServers.web.staticRoot) {
+            this.addRoute({
+                method		: 'GET',
+                path		: '/static/.*$',
+                handler		: this.routeStaticFile.bind(this),
+            });
+        }
+    }
 
-	buildUrl(pathAndQuery) {
-		//
-		//	Create a URL such as
-		//	https://l33t.codes:44512/ + |pathAndQuery|
-		//
-		//	Prefer HTTPS over HTTP. Be explicit about the port
-		//	only if non-standard. Allow users to override full prefix in config.
-		//
-		const config = Config();
-		if(_.isString(config.contentServers.web.overrideUrlPrefix)) {
-			return `${config.contentServers.web.overrideUrlPrefix}${pathAndQuery}`;
-		}
+    buildUrl(pathAndQuery) {
+        //
+        //	Create a URL such as
+        //	https://l33t.codes:44512/ + |pathAndQuery|
+        //
+        //	Prefer HTTPS over HTTP. Be explicit about the port
+        //	only if non-standard. Allow users to override full prefix in config.
+        //
+        const config = Config();
+        if(_.isString(config.contentServers.web.overrideUrlPrefix)) {
+            return `${config.contentServers.web.overrideUrlPrefix}${pathAndQuery}`;
+        }
 
-		let schema;
-		let port;
-		if(config.contentServers.web.https.enabled) {
-			schema	= 'https://';
-			port	=  (443 === config.contentServers.web.https.port) ?
-				'' :
-				`:${config.contentServers.web.https.port}`;
-		} else {
-			schema	= 'http://';
-			port	= (80 === config.contentServers.web.http.port) ?
-				'' :
-				`:${config.contentServers.web.http.port}`;
-		}
-		
-		return `${schema}${config.contentServers.web.domain}${port}${pathAndQuery}`;
-	}
+        let schema;
+        let port;
+        if(config.contentServers.web.https.enabled) {
+            schema	= 'https://';
+            port	=  (443 === config.contentServers.web.https.port) ?
+                '' :
+                `:${config.contentServers.web.https.port}`;
+        } else {
+            schema	= 'http://';
+            port	= (80 === config.contentServers.web.http.port) ?
+                '' :
+                `:${config.contentServers.web.http.port}`;
+        }
 
-	isEnabled() {
-		return this.enableHttp || this.enableHttps;
-	}
+        return `${schema}${config.contentServers.web.domain}${port}${pathAndQuery}`;
+    }
 
-	createServer() {
-		if(this.enableHttp) {
-			this.httpServer = http.createServer( (req, resp) => this.routeRequest(req, resp) );
-		}
+    isEnabled() {
+        return this.enableHttp || this.enableHttps;
+    }
 
-		const config = Config();
-		if(this.enableHttps) {
-			const options = {
-				cert	: fs.readFileSync(config.contentServers.web.https.certPem),
-				key		: fs.readFileSync(config.contentServers.web.https.keyPem),
-			};
+    createServer() {
+        if(this.enableHttp) {
+            this.httpServer = http.createServer( (req, resp) => this.routeRequest(req, resp) );
+        }
 
-			//	additional options
-			Object.assign(options, config.contentServers.web.https.options || {} );
+        const config = Config();
+        if(this.enableHttps) {
+            const options = {
+                cert	: fs.readFileSync(config.contentServers.web.https.certPem),
+                key		: fs.readFileSync(config.contentServers.web.https.keyPem),
+            };
 
-			this.httpsServer = https.createServer(options, (req, resp) => this.routeRequest(req, resp) );			
-		}
-	}
+            //	additional options
+            Object.assign(options, config.contentServers.web.https.options || {} );
 
-	listen() {
-		let ok = true;
+            this.httpsServer = https.createServer(options, (req, resp) => this.routeRequest(req, resp) );
+        }
+    }
 
-		const config = Config();
-		[ 'http', 'https' ].forEach(service => {
-			const name = `${service}Server`;
-			if(this[name]) {
-				const port = parseInt(config.contentServers.web[service].port);
-				if(isNaN(port)) {
-					ok = false;
-					return Log.warn( { port : config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
-				}
-				return this[name].listen(port);
-			} 
-		});
+    listen() {
+        let ok = true;
 
-		return ok;
-	}
+        const config = Config();
+        [ 'http', 'https' ].forEach(service => {
+            const name = `${service}Server`;
+            if(this[name]) {
+                const port = parseInt(config.contentServers.web[service].port);
+                if(isNaN(port)) {
+                    ok = false;
+                    return Log.warn( { port : config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
+                }
+                return this[name].listen(port);
+            }
+        });
 
-	addRoute(route) {
-		route = new Route(route);
+        return ok;
+    }
 
-		if(!route.isValid()) {
-			Log.warn( { route : route }, 'Cannot add route: missing or invalid required members' );
-			return false;
-		}
+    addRoute(route) {
+        route = new Route(route);
 
-		const routeKey = route.getRouteKey();
-		if(routeKey in this.routes) {
-			Log.warn( { route : route, routeKey : routeKey }, 'Cannot add route: duplicate method/path combination exists' );
-			return false;
-		}
+        if(!route.isValid()) {
+            Log.warn( { route : route }, 'Cannot add route: missing or invalid required members' );
+            return false;
+        }
 
-		this.routes[routeKey] = route;
-		return true;
-	}
+        const routeKey = route.getRouteKey();
+        if(routeKey in this.routes) {
+            Log.warn( { route : route, routeKey : routeKey }, 'Cannot add route: duplicate method/path combination exists' );
+            return false;
+        }
 
-	routeRequest(req, resp) {
-		const route = _.find(this.routes, r => r.matchesRequest(req) );
+        this.routes[routeKey] = route;
+        return true;
+    }
 
-		if(!route && '/' === req.url) {
-			return this.routeIndex(req, resp);
-		}
+    routeRequest(req, resp) {
+        const route = _.find(this.routes, r => r.matchesRequest(req) );
 
-		return route ? route.handler(req, resp) : this.accessDenied(resp);
-	}
+        if(!route && '/' === req.url) {
+            return this.routeIndex(req, resp);
+        }
 
-	respondWithError(resp, code, bodyText, title) {
-		const customErrorPage = paths.join(Config().contentServers.web.staticRoot, `${code}.html`);
+        return route ? route.handler(req, resp) : this.accessDenied(resp);
+    }
 
-		fs.readFile(customErrorPage, 'utf8', (err, data) => {
-			resp.writeHead(code, { 'Content-Type' : 'text/html' } );
+    respondWithError(resp, code, bodyText, title) {
+        const customErrorPage = paths.join(Config().contentServers.web.staticRoot, `${code}.html`);
 
-			if(err) {
-				return resp.end(`<!doctype html>
+        fs.readFile(customErrorPage, 'utf8', (err, data) => {
+            resp.writeHead(code, { 'Content-Type' : 'text/html' } );
+
+            if(err) {
+                return resp.end(`<!doctype html>
 					<html lang="en">
 						<head>
 						<meta charset="utf-8">
@@ -190,74 +190,74 @@ exports.getModule = class WebServerModule extends ServerModule {
 							</article>
 						</body>
 					</html>`
-				);
-			}
+                );
+            }
 
-			return resp.end(data);
-		});
-	}
+            return resp.end(data);
+        });
+    }
 
-	accessDenied(resp) {
-		return this.respondWithError(resp, 401, 'Access denied.', 'Access Denied');
-	}
+    accessDenied(resp) {
+        return this.respondWithError(resp, 401, 'Access denied.', 'Access Denied');
+    }
 
-	fileNotFound(resp) {
-		return this.respondWithError(resp, 404, 'File not found.', 'File Not Found');
-	}
+    fileNotFound(resp) {
+        return this.respondWithError(resp, 404, 'File not found.', 'File Not Found');
+    }
 
-	routeIndex(req, resp) {
-		const filePath = paths.join(Config().contentServers.web.staticRoot, 'index.html');
+    routeIndex(req, resp) {
+        const filePath = paths.join(Config().contentServers.web.staticRoot, 'index.html');
 
-		return this.returnStaticPage(filePath, resp);
-	}
+        return this.returnStaticPage(filePath, resp);
+    }
 
-	routeStaticFile(req, resp) {
-		const fileName = req.url.substr(req.url.indexOf('/', 1));
-		const filePath = paths.join(Config().contentServers.web.staticRoot, fileName);
+    routeStaticFile(req, resp) {
+        const fileName = req.url.substr(req.url.indexOf('/', 1));
+        const filePath = paths.join(Config().contentServers.web.staticRoot, fileName);
 
-		return this.returnStaticPage(filePath, resp);
-	}
+        return this.returnStaticPage(filePath, resp);
+    }
 
-	returnStaticPage(filePath, resp) {
-		const self = this;
+    returnStaticPage(filePath, resp) {
+        const self = this;
 
-		fs.stat(filePath, (err, stats) => {
-			if(err || !stats.isFile()) {
-				return self.fileNotFound(resp);
-			}
+        fs.stat(filePath, (err, stats) => {
+            if(err || !stats.isFile()) {
+                return self.fileNotFound(resp);
+            }
 
-			const headers = {
-				'Content-Type'		: mimeTypes.contentType(paths.basename(filePath)) || mimeTypes.contentType('.bin'),
-				'Content-Length'	: stats.size,
-			};
+            const headers = {
+                'Content-Type'		: mimeTypes.contentType(paths.basename(filePath)) || mimeTypes.contentType('.bin'),
+                'Content-Length'	: stats.size,
+            };
 
-			const readStream = fs.createReadStream(filePath);
-			resp.writeHead(200, headers);
-			return readStream.pipe(resp);
-		});
-	}
+            const readStream = fs.createReadStream(filePath);
+            resp.writeHead(200, headers);
+            return readStream.pipe(resp);
+        });
+    }
 
-	routeTemplateFilePage(templatePath, preprocessCallback, resp) {
-		const self = this;
+    routeTemplateFilePage(templatePath, preprocessCallback, resp) {
+        const self = this;
 
-		fs.readFile(templatePath, 'utf8', (err, templateData) => {
-			if(err) {
-				return self.fileNotFound(resp);
-			}
+        fs.readFile(templatePath, 'utf8', (err, templateData) => {
+            if(err) {
+                return self.fileNotFound(resp);
+            }
 
-			preprocessCallback(templateData, (err, finalPage, contentType) => {
-				if(err || !finalPage) {
-					return self.respondWithError(resp, 500, 'Internal Server Error.', 'Internal Server Error');
-				}
+            preprocessCallback(templateData, (err, finalPage, contentType) => {
+                if(err || !finalPage) {
+                    return self.respondWithError(resp, 500, 'Internal Server Error.', 'Internal Server Error');
+                }
 
-				const headers = {
-					'Content-Type'		: contentType || mimeTypes.contentType('.html'),
-					'Content-Length'	: finalPage.length,
-				};
+                const headers = {
+                    'Content-Type'		: contentType || mimeTypes.contentType('.html'),
+                    'Content-Length'	: finalPage.length,
+                };
 
-				resp.writeHead(200, headers);
-				return resp.end(finalPage);
-			});
-		});		
-	}
+                resp.writeHead(200, headers);
+                return resp.end(finalPage);
+            });
+        });
+    }
 };
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 0b8e3082..982ab0a1 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -19,215 +19,215 @@ const _				= require('lodash');
 const assert		= require('assert');
 
 const ModuleInfo = exports.moduleInfo = {
-	name		: 'SSH',
-	desc		: 'SSH Server',
-	author		: 'NuSkooler',
-	isSecure	: true,
-	packageName	: 'codes.l33t.enigma.ssh.server',
+    name		: 'SSH',
+    desc		: 'SSH Server',
+    author		: 'NuSkooler',
+    isSecure	: true,
+    packageName	: 'codes.l33t.enigma.ssh.server',
 };
 
 function SSHClient(clientConn) {
-	baseClient.Client.apply(this, arguments);
+    baseClient.Client.apply(this, arguments);
 
-	//
-	//	WARNING: Until we have emit 'ready', self.input, and self.output and
-	//	not yet defined!
-	//
+    //
+    //	WARNING: Until we have emit 'ready', self.input, and self.output and
+    //	not yet defined!
+    //
 
-	const self = this;
+    const self = this;
 
-	let loginAttempts = 0;
+    let loginAttempts = 0;
 
-	clientConn.on('authentication', function authAttempt(ctx) {
-		const username	= ctx.username || '';
-		const password	= ctx.password || '';
+    clientConn.on('authentication', function authAttempt(ctx) {
+        const username	= ctx.username || '';
+        const password	= ctx.password || '';
 
-		const config	= Config();
-		self.isNewUser	= (config.users.newUserNames || []).indexOf(username) > -1;
+        const config	= Config();
+        self.isNewUser	= (config.users.newUserNames || []).indexOf(username) > -1;
 
-		self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
+        self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
 
-		function terminateConnection() {
-			ctx.reject();
-			return clientConn.end();
-		}
+        function terminateConnection() {
+            ctx.reject();
+            return clientConn.end();
+        }
 
-		function alreadyLoggedIn(username) {
-			ctx.prompt(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
-			return terminateConnection();
-		}
+        function alreadyLoggedIn(username) {
+            ctx.prompt(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
+            return terminateConnection();
+        }
 
-		//
-		//	If the system is open and |isNewUser| is true, the login
-		//	sequence is hijacked in order to start the applicaiton process.
-		//
-		if(false === config.general.closedSystem && self.isNewUser) {
-			return ctx.accept();
-		}
+        //
+        //	If the system is open and |isNewUser| is true, the login
+        //	sequence is hijacked in order to start the applicaiton process.
+        //
+        if(false === config.general.closedSystem && self.isNewUser) {
+            return ctx.accept();
+        }
 
-		if(username.length > 0 && password.length > 0) {
-			loginAttempts += 1;
+        if(username.length > 0 && password.length > 0) {
+            loginAttempts += 1;
 
-			userLogin(self, ctx.username, ctx.password, function authResult(err) {
-				if(err) {
-					if(err.existingConn) {
-						return alreadyLoggedIn(username);
-					}
+            userLogin(self, ctx.username, ctx.password, function authResult(err) {
+                if(err) {
+                    if(err.existingConn) {
+                        return alreadyLoggedIn(username);
+                    }
 
-					return ctx.reject(SSHClient.ValidAuthMethods);
-				}
+                    return ctx.reject(SSHClient.ValidAuthMethods);
+                }
 
-				ctx.accept();
-			});
-		} else {
-			if(-1 === SSHClient.ValidAuthMethods.indexOf(ctx.method)) {
-				return ctx.reject(SSHClient.ValidAuthMethods);
-			}
+                ctx.accept();
+            });
+        } else {
+            if(-1 === SSHClient.ValidAuthMethods.indexOf(ctx.method)) {
+                return ctx.reject(SSHClient.ValidAuthMethods);
+            }
 
-			if(0 === username.length) {
-				//	:TODO: can we display something here?
-				return ctx.reject();
-			}
+            if(0 === username.length) {
+                //	:TODO: can we display something here?
+                return ctx.reject();
+            }
 
-			const interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };
+            const interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };
 
-			ctx.prompt(interactivePrompt, function retryPrompt(answers) {
-				loginAttempts += 1;
+            ctx.prompt(interactivePrompt, function retryPrompt(answers) {
+                loginAttempts += 1;
 
-				userLogin(self, username, (answers[0] || ''), err => {
-					if(err) {
-						if(err.existingConn) {
-							return alreadyLoggedIn(username);
-						}
+                userLogin(self, username, (answers[0] || ''), err => {
+                    if(err) {
+                        if(err.existingConn) {
+                            return alreadyLoggedIn(username);
+                        }
 
-						if(loginAttempts >= config.general.loginAttempts) {
-							return terminateConnection();
-						}
+                        if(loginAttempts >= config.general.loginAttempts) {
+                            return terminateConnection();
+                        }
 
-						const artOpts = {
-							client		: self,
-							name 		: 'SSHPMPT.ASC',
-							readSauce	: false,
-						};
+                        const artOpts = {
+                            client		: self,
+                            name 		: 'SSHPMPT.ASC',
+                            readSauce	: false,
+                        };
 
-						theme.getThemeArt(artOpts, (err, artInfo) => {
-							if(err) {
-								interactivePrompt.prompt = `Access denied\n${ctx.username}'s password: `;
-							} else {
-								const newUserNameList = _.has(config, 'users.newUserNames') && config.users.newUserNames.length > 0 ?
-									config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
-									'(No new user names enabled!)';
+                        theme.getThemeArt(artOpts, (err, artInfo) => {
+                            if(err) {
+                                interactivePrompt.prompt = `Access denied\n${ctx.username}'s password: `;
+                            } else {
+                                const newUserNameList = _.has(config, 'users.newUserNames') && config.users.newUserNames.length > 0 ?
+                                    config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
+                                    '(No new user names enabled!)';
 
-								interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
-							}
-							return ctx.prompt(interactivePrompt, retryPrompt);
-						});
-					} else {
-						ctx.accept();
-					}
-				});
-			});
-		}
-	});
+                                interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
+                            }
+                            return ctx.prompt(interactivePrompt, retryPrompt);
+                        });
+                    } else {
+                        ctx.accept();
+                    }
+                });
+            });
+        }
+    });
 
-	this.dataHandler = function(data) {
-		self.emit('data', data);
-	};
+    this.dataHandler = function(data) {
+        self.emit('data', data);
+    };
 
-	this.updateTermInfo = function(info) {
-		//
-		//	From ssh2 docs:
-		//	"rows and cols override width and height when rows and cols are non-zero."
-		//
-		let termHeight;
-		let termWidth;
+    this.updateTermInfo = function(info) {
+        //
+        //	From ssh2 docs:
+        //	"rows and cols override width and height when rows and cols are non-zero."
+        //
+        let termHeight;
+        let termWidth;
 
-		if(info.rows > 0 && info.cols > 0) {
-			termHeight 	= info.rows;
-			termWidth	= info.cols;
-		} else if(info.width > 0 && info.height > 0) {
-			termHeight	= info.height;
-			termWidth	= info.width;
-		}
+        if(info.rows > 0 && info.cols > 0) {
+            termHeight 	= info.rows;
+            termWidth	= info.cols;
+        } else if(info.width > 0 && info.height > 0) {
+            termHeight	= info.height;
+            termWidth	= info.width;
+        }
 
-		assert(_.isObject(self.term));
+        assert(_.isObject(self.term));
 
-		//
-		//	Note that if we fail here, connect.js attempts some non-standard
-		//	queries/etc., and ultimately will default to 80x24 if all else fails
-		//
-		if(termHeight > 0 && termWidth > 0) {
-			self.term.termHeight = termHeight;
-			self.term.termWidth	= termWidth;
+        //
+        //	Note that if we fail here, connect.js attempts some non-standard
+        //	queries/etc., and ultimately will default to 80x24 if all else fails
+        //
+        if(termHeight > 0 && termWidth > 0) {
+            self.term.termHeight = termHeight;
+            self.term.termWidth	= termWidth;
 
-			self.clearMciCache();	//	term size changes = invalidate cache
-		}
+            self.clearMciCache();	//	term size changes = invalidate cache
+        }
 
-		if(_.isString(info.term) && info.term.length > 0 && 'unknown' === self.term.termType) {
-			self.setTermType(info.term);
-		}
-	};
+        if(_.isString(info.term) && info.term.length > 0 && 'unknown' === self.term.termType) {
+            self.setTermType(info.term);
+        }
+    };
 
-	clientConn.once('ready', function clientReady() {
-		self.log.info('SSH authentication success');
+    clientConn.once('ready', function clientReady() {
+        self.log.info('SSH authentication success');
 
-		clientConn.on('session', accept => {
+        clientConn.on('session', accept => {
 
-			const session = accept();
+            const session = accept();
 
-			session.on('pty', function pty(accept, reject, info) {
-				self.log.debug(info, 'SSH pty event');
+            session.on('pty', function pty(accept, reject, info) {
+                self.log.debug(info, 'SSH pty event');
 
-				if(_.isFunction(accept)) {
-					accept();
-				}
+                if(_.isFunction(accept)) {
+                    accept();
+                }
 
-				if(self.input) {	//	do we have I/O?
-					self.updateTermInfo(info);
-				} else {
-					self.cachedTermInfo = info;
-				}
-			});
+                if(self.input) {	//	do we have I/O?
+                    self.updateTermInfo(info);
+                } else {
+                    self.cachedTermInfo = info;
+                }
+            });
 
-			session.on('shell', accept => {
-				self.log.debug('SSH shell event');
+            session.on('shell', accept => {
+                self.log.debug('SSH shell event');
 
-				const channel = accept();
+                const channel = accept();
 
-				self.setInputOutput(channel.stdin, channel.stdout);
+                self.setInputOutput(channel.stdin, channel.stdout);
 
-				channel.stdin.on('data', self.dataHandler);
+                channel.stdin.on('data', self.dataHandler);
 
-				if(self.cachedTermInfo) {
-					self.updateTermInfo(self.cachedTermInfo);
-					delete self.cachedTermInfo;
-				}
+                if(self.cachedTermInfo) {
+                    self.updateTermInfo(self.cachedTermInfo);
+                    delete self.cachedTermInfo;
+                }
 
-				//	we're ready!
-				const firstMenu = self.isNewUser ? Config().loginServers.ssh.firstMenuNewUser : Config().loginServers.ssh.firstMenu;
-				self.emit('ready', { firstMenu : firstMenu } );
-			});
+                //	we're ready!
+                const firstMenu = self.isNewUser ? Config().loginServers.ssh.firstMenuNewUser : Config().loginServers.ssh.firstMenu;
+                self.emit('ready', { firstMenu : firstMenu } );
+            });
 
-			session.on('window-change', (accept, reject, info) => {
-				self.log.debug(info, 'SSH window-change event');
+            session.on('window-change', (accept, reject, info) => {
+                self.log.debug(info, 'SSH window-change event');
 
-				if(self.input) {
-					self.updateTermInfo(info);
-				} else {
-					self.cachedTermInfo = info;
-				}
-			});
+                if(self.input) {
+                    self.updateTermInfo(info);
+                } else {
+                    self.cachedTermInfo = info;
+                }
+            });
 
-		});
-	});
+        });
+    });
 
-	clientConn.on('end', () => {
-		self.emit('end');	//	remove client connection/tracking
-	});
+    clientConn.on('end', () => {
+        self.emit('end');	//	remove client connection/tracking
+    });
 
-	clientConn.on('error', err => {
-		self.log.warn( { error : err.message, code : err.code }, 'SSH connection error');
-	});
+    clientConn.on('error', err => {
+        self.log.warn( { error : err.message, code : err.code }, 'SSH connection error');
+    });
 }
 
 util.inherits(SSHClient, baseClient.Client);
@@ -235,47 +235,47 @@ util.inherits(SSHClient, baseClient.Client);
 SSHClient.ValidAuthMethods = [ 'password', 'keyboard-interactive' ];
 
 exports.getModule = class SSHServerModule extends LoginServerModule {
-	constructor() {
-		super();
-	}
+    constructor() {
+        super();
+    }
 
-	createServer() {
-		const config = Config();
-		const serverConf = {
-			hostKeys : [
-				{
-					key			: fs.readFileSync(config.loginServers.ssh.privateKeyPem),
-					passphrase	: config.loginServers.ssh.privateKeyPass,
-				}
-			],
-			ident : 'enigma-bbs-' + enigVersion + '-srv',
+    createServer() {
+        const config = Config();
+        const serverConf = {
+            hostKeys : [
+                {
+                    key			: fs.readFileSync(config.loginServers.ssh.privateKeyPem),
+                    passphrase	: config.loginServers.ssh.privateKeyPass,
+                }
+            ],
+            ident : 'enigma-bbs-' + enigVersion + '-srv',
 
-			//	Note that sending 'banner' breaks at least EtherTerm!
-			debug : (sshDebugLine) => {
-				if(true === config.loginServers.ssh.traceConnections) {
-					Log.trace(`SSH: ${sshDebugLine}`);
-				}
-			},
-			algorithms: { compress: ['none'] },
-		};
+            //	Note that sending 'banner' breaks at least EtherTerm!
+            debug : (sshDebugLine) => {
+                if(true === config.loginServers.ssh.traceConnections) {
+                    Log.trace(`SSH: ${sshDebugLine}`);
+                }
+            },
+            algorithms: { compress: ['none'] },
+        };
 
-		this.server = ssh2.Server(serverConf);
-		this.server.on('connection', (conn, info) => {
-			Log.info(info, 'New SSH connection');
-			this.handleNewClient(new SSHClient(conn), conn._sock, ModuleInfo);
-		});
-	}
+        this.server = ssh2.Server(serverConf);
+        this.server.on('connection', (conn, info) => {
+            Log.info(info, 'New SSH connection');
+            this.handleNewClient(new SSHClient(conn), conn._sock, ModuleInfo);
+        });
+    }
 
-	listen() {
-		const config = Config();
-		const port = parseInt(config.loginServers.ssh.port);
-		if(isNaN(port)) {
-			Log.error( { server : ModuleInfo.name, port : config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );
-			return false;
-		}
+    listen() {
+        const config = Config();
+        const port = parseInt(config.loginServers.ssh.port);
+        if(isNaN(port)) {
+            Log.error( { server : ModuleInfo.name, port : config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );
+            return false;
+        }
 
-		this.server.listen(port);
-		Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
-		return true;
-	}
+        this.server.listen(port);
+        Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
+        return true;
+    }
 };
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 3a58ae4e..ce854013 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -18,11 +18,11 @@ const util			= require('util');
 //var debug	= require('debug')('telnet');
 
 const ModuleInfo = exports.moduleInfo = {
-	name		: 'Telnet',
-	desc		: 'Telnet Server',
-	author		: 'NuSkooler',
-	isSecure	: false,
-	packageName	: 'codes.l33t.enigma.telnet.server',
+    name		: 'Telnet',
+    desc		: 'Telnet Server',
+    author		: 'NuSkooler',
+    isSecure	: false,
+    packageName	: 'codes.l33t.enigma.telnet.server',
 };
 
 exports.TelnetClient	= TelnetClient;
@@ -56,22 +56,22 @@ exports.TelnetClient	= TelnetClient;
 */
 
 const COMMANDS = {
-	SE		: 240,	//	End of Sub-Negotation Parameters
-	NOP		: 241,	//	No Operation
-	DM		: 242,	//	Data Mark
-	BRK		: 243,	//	Break
-	IP		: 244,	//	Interrupt Process
-	AO		: 245,	//	Abort Output
-	AYT		: 246,	//	Are You There?
-	EC		: 247,	//	Erase Character
-	EL		: 248,	//	Erase Line
-	GA		: 249,	//	Go Ahead
-	SB		: 250,	//	Start Sub-Negotiation Parameters
-	WILL	: 251,	//
-	WONT	: 252,
-	DO		: 253,
-	DONT	: 254,
-	IAC		: 255,	//	(Data Byte)
+    SE		: 240,	//	End of Sub-Negotation Parameters
+    NOP		: 241,	//	No Operation
+    DM		: 242,	//	Data Mark
+    BRK		: 243,	//	Break
+    IP		: 244,	//	Interrupt Process
+    AO		: 245,	//	Abort Output
+    AYT		: 246,	//	Are You There?
+    EC		: 247,	//	Erase Character
+    EL		: 248,	//	Erase Line
+    GA		: 249,	//	Go Ahead
+    SB		: 250,	//	Start Sub-Negotiation Parameters
+    WILL	: 251,	//
+    WONT	: 252,
+    DO		: 253,
+    DONT	: 254,
+    IAC		: 255,	//	(Data Byte)
 };
 
 //
@@ -79,9 +79,9 @@ const COMMANDS = {
 //		* http://www.faqs.org/rfcs/rfc1572.html
 //
 const SB_COMMANDS = {
-	IS		: 0,
-	SEND	: 1,
-	INFO	: 2,
+    IS		: 0,
+    SEND	: 1,
+    INFO	: 2,
 };
 
 //
@@ -92,104 +92,104 @@ const SB_COMMANDS = {
 //		* http://www.networksorcery.com/enp/protocol/telnet.htm
 //
 const OPTIONS = {
-	TRANSMIT_BINARY			: 0,	// http://tools.ietf.org/html/rfc856
-	ECHO					: 1,	//	http://tools.ietf.org/html/rfc857
-	//	RECONNECTION : 2
-	SUPPRESS_GO_AHEAD		: 3,	// aka 'SGA': RFC 858 @ http://tools.ietf.org/html/rfc858
-	//APPROX_MESSAGE_SIZE 	: 4
-	STATUS					: 5,	// http://tools.ietf.org/html/rfc859
-	TIMING_MARK				: 6, // http://tools.ietf.org/html/rfc860
-	//RC_TRANS_AND_ECHO		: 7,	//	aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
-	//OUPUT_LINE_WIDTH		: 8,
-	//OUTPUT_PAGE_SIZE		: 9,	//
-	//OUTPUT_CARRIAGE_RETURN_DISP	: 10,	//	RFC 652
-	//OUTPUT_HORIZ_TABSTOPS	: 11,	//	RFC 653
-	//OUTPUT_HORIZ_TAB_DISP	: 12,	//	RFC 654
-	//OUTPUT_FORMFEED_DISP	: 13,	//	RFC 655
-	//OUTPUT_VERT_TABSTOPS	: 14,	//	RFC 656
-	//OUTPUT_VERT_TAB_DISP	: 15,	//	RFC 657
-	//OUTPUT_LF_DISP		: 16,	//	RFC 658
-	//EXTENDED_ASCII		: 17,	//	RFC 659
-	//LOGOUT				: 18,	//	RFC 727
-	//BYTE_MACRO			: 19,	//	RFC 753
-	//DATA_ENTRY_TERMINAL	: 20,	//	RFC 1043
-	//SUPDUP				: 21,	//	RFC 736
-	//SUPDUP_OUTPUT			: 22,	//	RFC 749
-	SEND_LOCATION			: 23,	//	RFC 779
-	TERMINAL_TYPE			: 24,	//	aka 'TTYPE': RFC 1091 @ http://tools.ietf.org/html/rfc1091
-	//END_OF_RECORD			: 25,	//	RFC 885
-	//TACACS_USER_ID		: 26,	//	RFC 927
-	//OUTPUT_MARKING		: 27,	//	RFC 933
-	//TERMINCAL_LOCATION_NUMBER	: 28,	//	RFC 946
-	//TELNET_3270_REGIME	: 29,	//	RFC 1041
-	WINDOW_SIZE				: 31,	//	aka 'NAWS': RFC 1073 @ http://tools.ietf.org/html/rfc1073
-	TERMINAL_SPEED			: 32,	//	RFC 1079 @ http://tools.ietf.org/html/rfc1079
-	REMOTE_FLOW_CONTROL		: 33,	//	RFC 1072 @ http://tools.ietf.org/html/rfc1372
-	LINEMODE				: 34,	//	RFC 1184 @ http://tools.ietf.org/html/rfc1184
-	X_DISPLAY_LOCATION		: 35,	//	aka 'XDISPLOC': RFC 1096 @ http://tools.ietf.org/html/rfc1096
-	NEW_ENVIRONMENT_DEP		: 36,	//	aka 'NEW-ENVIRON': RFC 1408 @ http://tools.ietf.org/html/rfc1408 (note: RFC 1572 is an update to this)
-	AUTHENTICATION			: 37,	//	RFC 2941 @ http://tools.ietf.org/html/rfc2941
-	ENCRYPT					: 38,	//	RFC 2946 @ http://tools.ietf.org/html/rfc2946
-	NEW_ENVIRONMENT			: 39,	//	aka 'NEW-ENVIRON': RFC 1572 @ http://tools.ietf.org/html/rfc1572 (note: update to RFC 1408)
-	//TN3270E					: 40,	//	RFC 2355
-	//XAUTH					: 41,
-	//CHARSET				: 42,	//	RFC 2066
-	//REMOTE_SERIAL_PORT	: 43,
-	//COM_PORT_CONTROL		: 44,	//	RFC 2217
-	//SUPRESS_LOCAL_ECHO	: 45,
-	//START_TLS				: 46,
-	//KERMIT				: 47,	//	RFC 2840
-	//SEND_URL				: 48,
-	//FORWARD_X				: 49,
+    TRANSMIT_BINARY			: 0,	// http://tools.ietf.org/html/rfc856
+    ECHO					: 1,	//	http://tools.ietf.org/html/rfc857
+    //	RECONNECTION : 2
+    SUPPRESS_GO_AHEAD		: 3,	// aka 'SGA': RFC 858 @ http://tools.ietf.org/html/rfc858
+    //APPROX_MESSAGE_SIZE 	: 4
+    STATUS					: 5,	// http://tools.ietf.org/html/rfc859
+    TIMING_MARK				: 6, // http://tools.ietf.org/html/rfc860
+    //RC_TRANS_AND_ECHO		: 7,	//	aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
+    //OUPUT_LINE_WIDTH		: 8,
+    //OUTPUT_PAGE_SIZE		: 9,	//
+    //OUTPUT_CARRIAGE_RETURN_DISP	: 10,	//	RFC 652
+    //OUTPUT_HORIZ_TABSTOPS	: 11,	//	RFC 653
+    //OUTPUT_HORIZ_TAB_DISP	: 12,	//	RFC 654
+    //OUTPUT_FORMFEED_DISP	: 13,	//	RFC 655
+    //OUTPUT_VERT_TABSTOPS	: 14,	//	RFC 656
+    //OUTPUT_VERT_TAB_DISP	: 15,	//	RFC 657
+    //OUTPUT_LF_DISP		: 16,	//	RFC 658
+    //EXTENDED_ASCII		: 17,	//	RFC 659
+    //LOGOUT				: 18,	//	RFC 727
+    //BYTE_MACRO			: 19,	//	RFC 753
+    //DATA_ENTRY_TERMINAL	: 20,	//	RFC 1043
+    //SUPDUP				: 21,	//	RFC 736
+    //SUPDUP_OUTPUT			: 22,	//	RFC 749
+    SEND_LOCATION			: 23,	//	RFC 779
+    TERMINAL_TYPE			: 24,	//	aka 'TTYPE': RFC 1091 @ http://tools.ietf.org/html/rfc1091
+    //END_OF_RECORD			: 25,	//	RFC 885
+    //TACACS_USER_ID		: 26,	//	RFC 927
+    //OUTPUT_MARKING		: 27,	//	RFC 933
+    //TERMINCAL_LOCATION_NUMBER	: 28,	//	RFC 946
+    //TELNET_3270_REGIME	: 29,	//	RFC 1041
+    WINDOW_SIZE				: 31,	//	aka 'NAWS': RFC 1073 @ http://tools.ietf.org/html/rfc1073
+    TERMINAL_SPEED			: 32,	//	RFC 1079 @ http://tools.ietf.org/html/rfc1079
+    REMOTE_FLOW_CONTROL		: 33,	//	RFC 1072 @ http://tools.ietf.org/html/rfc1372
+    LINEMODE				: 34,	//	RFC 1184 @ http://tools.ietf.org/html/rfc1184
+    X_DISPLAY_LOCATION		: 35,	//	aka 'XDISPLOC': RFC 1096 @ http://tools.ietf.org/html/rfc1096
+    NEW_ENVIRONMENT_DEP		: 36,	//	aka 'NEW-ENVIRON': RFC 1408 @ http://tools.ietf.org/html/rfc1408 (note: RFC 1572 is an update to this)
+    AUTHENTICATION			: 37,	//	RFC 2941 @ http://tools.ietf.org/html/rfc2941
+    ENCRYPT					: 38,	//	RFC 2946 @ http://tools.ietf.org/html/rfc2946
+    NEW_ENVIRONMENT			: 39,	//	aka 'NEW-ENVIRON': RFC 1572 @ http://tools.ietf.org/html/rfc1572 (note: update to RFC 1408)
+    //TN3270E					: 40,	//	RFC 2355
+    //XAUTH					: 41,
+    //CHARSET				: 42,	//	RFC 2066
+    //REMOTE_SERIAL_PORT	: 43,
+    //COM_PORT_CONTROL		: 44,	//	RFC 2217
+    //SUPRESS_LOCAL_ECHO	: 45,
+    //START_TLS				: 46,
+    //KERMIT				: 47,	//	RFC 2840
+    //SEND_URL				: 48,
+    //FORWARD_X				: 49,
 
-	//PRAGMA_LOGON			: 138,
-	//SSPI_LOGON			: 139,
-	//PRAGMA_HEARTBEAT		: 140
+    //PRAGMA_LOGON			: 138,
+    //SSPI_LOGON			: 139,
+    //PRAGMA_HEARTBEAT		: 140
 
-	ARE_YOU_THERE			: 246,	//	aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
+    ARE_YOU_THERE			: 246,	//	aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
 
-	EXTENDED_OPTIONS_LIST	: 255,	//	RFC 861 (STD 32)
+    EXTENDED_OPTIONS_LIST	: 255,	//	RFC 861 (STD 32)
 };
 
 //	Commands used within NEW_ENVIRONMENT[_DEP]
 const NEW_ENVIRONMENT_COMMANDS = {
-	VAR		: 0,
-	VALUE	: 1,
-	ESC		: 2,
-	USERVAR	: 3,
+    VAR		: 0,
+    VALUE	: 1,
+    ESC		: 2,
+    USERVAR	: 3,
 };
 
 const IAC_BUF 		= Buffer.from([ COMMANDS.IAC ]);
 const IAC_SE_BUF	= Buffer.from([ COMMANDS.IAC, COMMANDS.SE ]);
 
 const COMMAND_NAMES = Object.keys(COMMANDS).reduce(function(names, name) {
-	names[COMMANDS[name]] = name.toLowerCase();
-	return names;
+    names[COMMANDS[name]] = name.toLowerCase();
+    return names;
 }, {});
 
 const COMMAND_IMPLS = {};
 [ 'do', 'dont', 'will', 'wont', 'sb' ].forEach(function(command) {
-	const code = COMMANDS[command.toUpperCase()];
-	COMMAND_IMPLS[code] = function(bufs, i, event) {
-		if(bufs.length < (i + 1)) {
-			return MORE_DATA_REQUIRED;
-		}
-		return parseOption(bufs, i, event);
-	};
+    const code = COMMANDS[command.toUpperCase()];
+    COMMAND_IMPLS[code] = function(bufs, i, event) {
+        if(bufs.length < (i + 1)) {
+            return MORE_DATA_REQUIRED;
+        }
+        return parseOption(bufs, i, event);
+    };
 });
 
 //	:TODO: See TooTallNate's telnet.js: Handle COMMAND_IMPL for IAC in binary mode
 
 //	Create option names such as 'transmit binary' -> OPTIONS.TRANSMIT_BINARY
 const OPTION_NAMES = Object.keys(OPTIONS).reduce(function(names, name) {
-	names[OPTIONS[name]] = name.toLowerCase().replace(/_/g, ' ');
-	return names;
+    names[OPTIONS[name]] = name.toLowerCase().replace(/_/g, ' ');
+    return names;
 }, {});
 
 function unknownOption(bufs, i, event) {
-	Log.warn( { bufs : bufs, i : i, event : event }, 'Unknown Telnet option');
-	event.buf = bufs.splice(0, i).toBuffer();
-	return event;
+    Log.warn( { bufs : bufs, i : i, event : event }, 'Unknown Telnet option');
+    event.buf = bufs.splice(0, i).toBuffer();
+    return event;
 }
 
 const OPTION_IMPLS = {};
@@ -206,371 +206,371 @@ OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION]	=
 OPTION_IMPLS[OPTIONS.SEND_LOCATION]			=
 OPTION_IMPLS[OPTIONS.ARE_YOU_THERE]			=
 OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]		= function(bufs, i, event) {
-	event.buf = bufs.splice(0, i).toBuffer();
-	return event;
+    event.buf = bufs.splice(0, i).toBuffer();
+    return event;
 };
 
 OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
-	if(event.commandCode !== COMMANDS.SB) {
-		OPTION_IMPLS.NO_ARGS(bufs, i, event);
-	} else {
-		//	We need 4 bytes header + data + IAC SE
-		if(bufs.length < 7) {
-			return MORE_DATA_REQUIRED;
-		}
+    if(event.commandCode !== COMMANDS.SB) {
+        OPTION_IMPLS.NO_ARGS(bufs, i, event);
+    } else {
+        //	We need 4 bytes header + data + IAC SE
+        if(bufs.length < 7) {
+            return MORE_DATA_REQUIRED;
+        }
 
-		const end = bufs.indexOf(IAC_SE_BUF, 5);	//	look past header bytes
-		if(-1 === end) {
-			return MORE_DATA_REQUIRED;
-		}
+        const end = bufs.indexOf(IAC_SE_BUF, 5);	//	look past header bytes
+        if(-1 === end) {
+            return MORE_DATA_REQUIRED;
+        }
 
-		let ttypeCmd;
-		try {
-			ttypeCmd = new Parser()
-				.uint8('iac1')
-				.uint8('sb')
-				.uint8('opt')
-				.uint8('is')
-				.array('ttype', {
-					type		: 'uint8',
-					readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
-				})
-				//	note we read iac2 above
-				.uint8('se')
-				.parse(bufs.toBuffer());
-		} catch(e) {
-			Log.debug( { error : e }, 'Failed parsing TTYP telnet command');
-			return event;
-		}
+        let ttypeCmd;
+        try {
+            ttypeCmd = new Parser()
+                .uint8('iac1')
+                .uint8('sb')
+                .uint8('opt')
+                .uint8('is')
+                .array('ttype', {
+                    type		: 'uint8',
+                    readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+                })
+                //	note we read iac2 above
+                .uint8('se')
+                .parse(bufs.toBuffer());
+        } catch(e) {
+            Log.debug( { error : e }, 'Failed parsing TTYP telnet command');
+            return event;
+        }
 
-		EnigAssert(COMMANDS.IAC === ttypeCmd.iac1);
-		EnigAssert(COMMANDS.SB === ttypeCmd.sb);
-		EnigAssert(OPTIONS.TERMINAL_TYPE === ttypeCmd.opt);
-		EnigAssert(SB_COMMANDS.IS === ttypeCmd.is);
-		EnigAssert(ttypeCmd.ttype.length > 0);
-		//	note we found IAC_SE above
+        EnigAssert(COMMANDS.IAC === ttypeCmd.iac1);
+        EnigAssert(COMMANDS.SB === ttypeCmd.sb);
+        EnigAssert(OPTIONS.TERMINAL_TYPE === ttypeCmd.opt);
+        EnigAssert(SB_COMMANDS.IS === ttypeCmd.is);
+        EnigAssert(ttypeCmd.ttype.length > 0);
+        //	note we found IAC_SE above
 
-		//	some terminals such as NetRunner provide a NULL-terminated buffer
-		//	slice to remove IAC
-		event.ttype = stringFromNullTermBuffer(ttypeCmd.ttype.slice(0, -1), 'ascii');
+        //	some terminals such as NetRunner provide a NULL-terminated buffer
+        //	slice to remove IAC
+        event.ttype = stringFromNullTermBuffer(ttypeCmd.ttype.slice(0, -1), 'ascii');
 
-		bufs.splice(0, end);
-	}
+        bufs.splice(0, end);
+    }
 
-	return event;
+    return event;
 };
 
 OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
-	if(event.commandCode !== COMMANDS.SB) {
-		OPTION_IMPLS.NO_ARGS(bufs, i, event);
-	} else {
-		//	we need 9 bytes
-		if(bufs.length < 9) {
-			return MORE_DATA_REQUIRED;
-		}
+    if(event.commandCode !== COMMANDS.SB) {
+        OPTION_IMPLS.NO_ARGS(bufs, i, event);
+    } else {
+        //	we need 9 bytes
+        if(bufs.length < 9) {
+            return MORE_DATA_REQUIRED;
+        }
 
-		let nawsCmd;
-		try {
-			nawsCmd = new Parser()
-				.uint8('iac1')
-				.uint8('sb')
-				.uint8('opt')
-				.uint16be('width')
-				.uint16be('height')
-				.uint8('iac2')
-				.uint8('se')
-				.parse(bufs.splice(0, 9).toBuffer());
-		} catch(e) {
-			Log.debug( { error : e }, 'Failed parsing NAWS telnet command');
-			return event;
-		}
+        let nawsCmd;
+        try {
+            nawsCmd = new Parser()
+                .uint8('iac1')
+                .uint8('sb')
+                .uint8('opt')
+                .uint16be('width')
+                .uint16be('height')
+                .uint8('iac2')
+                .uint8('se')
+                .parse(bufs.splice(0, 9).toBuffer());
+        } catch(e) {
+            Log.debug( { error : e }, 'Failed parsing NAWS telnet command');
+            return event;
+        }
 
-		EnigAssert(COMMANDS.IAC === nawsCmd.iac1);
-		EnigAssert(COMMANDS.SB === nawsCmd.sb);
-		EnigAssert(OPTIONS.WINDOW_SIZE === nawsCmd.opt);
-		EnigAssert(COMMANDS.IAC === nawsCmd.iac2);
-		EnigAssert(COMMANDS.SE === nawsCmd.se);
+        EnigAssert(COMMANDS.IAC === nawsCmd.iac1);
+        EnigAssert(COMMANDS.SB === nawsCmd.sb);
+        EnigAssert(OPTIONS.WINDOW_SIZE === nawsCmd.opt);
+        EnigAssert(COMMANDS.IAC === nawsCmd.iac2);
+        EnigAssert(COMMANDS.SE === nawsCmd.se);
 
-		event.cols	= event.columns	= event.width = nawsCmd.width;
-		event.rows	= event.height = nawsCmd.height;
-	}
-	return event;
+        event.cols	= event.columns	= event.width = nawsCmd.width;
+        event.rows	= event.height = nawsCmd.height;
+    }
+    return event;
 };
 
 //	Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
 const NEW_ENVIRONMENT_DELIMITERS = [];
 Object.keys(NEW_ENVIRONMENT_COMMANDS).forEach(function onKey(k) {
-	NEW_ENVIRONMENT_DELIMITERS.push(NEW_ENVIRONMENT_COMMANDS[k]);
+    NEW_ENVIRONMENT_DELIMITERS.push(NEW_ENVIRONMENT_COMMANDS[k]);
 });
 
 //	Handle the deprecated RFC 1408 & the updated RFC 1572:
 OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]	=
 OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
-	if(event.commandCode !== COMMANDS.SB) {
-		OPTION_IMPLS.NO_ARGS(bufs, i, event);
-	} else {
-		//
-		//	We need 4 bytes header + <optional payload> + IAC SE
-		//	Many terminals send a empty list:
-		//		IAC SB NEW-ENVIRON IS IAC SE
-		//
-		if(bufs.length < 6) {
-			return MORE_DATA_REQUIRED;
-		}
+    if(event.commandCode !== COMMANDS.SB) {
+        OPTION_IMPLS.NO_ARGS(bufs, i, event);
+    } else {
+        //
+        //	We need 4 bytes header + <optional payload> + IAC SE
+        //	Many terminals send a empty list:
+        //		IAC SB NEW-ENVIRON IS IAC SE
+        //
+        if(bufs.length < 6) {
+            return MORE_DATA_REQUIRED;
+        }
 
-		let end = bufs.indexOf(IAC_SE_BUF, 4);	//	look past header bytes
-		if(-1 === end) {
-			return MORE_DATA_REQUIRED;
-		}
+        let end = bufs.indexOf(IAC_SE_BUF, 4);	//	look past header bytes
+        if(-1 === end) {
+            return MORE_DATA_REQUIRED;
+        }
 
-		//	:TODO: It's likely that we could do all the env name/value parsing directly in Parser.
+        //	:TODO: It's likely that we could do all the env name/value parsing directly in Parser.
 
-		let envCmd;
-		try {
-			envCmd = new Parser()
-				.uint8('iac1')
-				.uint8('sb')
-				.uint8('opt')
-				.uint8('isOrInfo')	//	IS=initial, INFO=updates
-				.array('envBlock', {
-					type : 'uint8',
-					readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
-				})
-				//	note we consume IAC above
-				.uint8('se')
-				.parse(bufs.splice(0, bufs.length).toBuffer());
-		} catch(e) {
-			Log.debug( { error : e }, 'Failed parsing NEW-ENVIRON telnet command');
-			return event;
-		}
+        let envCmd;
+        try {
+            envCmd = new Parser()
+                .uint8('iac1')
+                .uint8('sb')
+                .uint8('opt')
+                .uint8('isOrInfo')	//	IS=initial, INFO=updates
+                .array('envBlock', {
+                    type : 'uint8',
+                    readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+                })
+                //	note we consume IAC above
+                .uint8('se')
+                .parse(bufs.splice(0, bufs.length).toBuffer());
+        } catch(e) {
+            Log.debug( { error : e }, 'Failed parsing NEW-ENVIRON telnet command');
+            return event;
+        }
 
-		EnigAssert(COMMANDS.IAC === envCmd.iac1);
-		EnigAssert(COMMANDS.SB === envCmd.sb);
-		EnigAssert(OPTIONS.NEW_ENVIRONMENT === envCmd.opt || OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt);
-		EnigAssert(SB_COMMANDS.IS === envCmd.isOrInfo || SB_COMMANDS.INFO === envCmd.isOrInfo);
+        EnigAssert(COMMANDS.IAC === envCmd.iac1);
+        EnigAssert(COMMANDS.SB === envCmd.sb);
+        EnigAssert(OPTIONS.NEW_ENVIRONMENT === envCmd.opt || OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt);
+        EnigAssert(SB_COMMANDS.IS === envCmd.isOrInfo || SB_COMMANDS.INFO === envCmd.isOrInfo);
 
-		if(OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt) {
-			//	:TODO: we should probably support this for legacy clients?
-			Log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
-		}
+        if(OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt) {
+            //	:TODO: we should probably support this for legacy clients?
+            Log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
+        }
 
-		const envBuf = envCmd.envBlock.slice(0, -1);	//	remove IAC
+        const envBuf = envCmd.envBlock.slice(0, -1);	//	remove IAC
 
-		if(envBuf.length < 4) {	//	TYPE + single char name + sep + single char value
-			//	empty env block
-			return event;
-		}
+        if(envBuf.length < 4) {	//	TYPE + single char name + sep + single char value
+            //	empty env block
+            return event;
+        }
 
-		const States = {
-			Name		: 1,
-			Value		: 2,
-		};
+        const States = {
+            Name		: 1,
+            Value		: 2,
+        };
 
-		let state = States.Name;
-		const setVars = {};
-		const delVars = [];
-		let varName;
-		//	:TODO: handle ESC type!!!
-		while(envBuf.length) {
-			switch(state) {
-				case States.Name :
-					{
-						const type = parseInt(envBuf.splice(0, 1));
-						if(![ NEW_ENVIRONMENT_COMMANDS.VAR, NEW_ENVIRONMENT_COMMANDS.USERVAR, NEW_ENVIRONMENT_COMMANDS.ESC ].includes(type)) {
-							return event;	//	fail :(
-						}
+        let state = States.Name;
+        const setVars = {};
+        const delVars = [];
+        let varName;
+        //	:TODO: handle ESC type!!!
+        while(envBuf.length) {
+            switch(state) {
+                case States.Name :
+                    {
+                        const type = parseInt(envBuf.splice(0, 1));
+                        if(![ NEW_ENVIRONMENT_COMMANDS.VAR, NEW_ENVIRONMENT_COMMANDS.USERVAR, NEW_ENVIRONMENT_COMMANDS.ESC ].includes(type)) {
+                            return event;	//	fail :(
+                        }
 
-						let nameEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VALUE);
-						if(-1 === nameEnd) {
-							nameEnd = envBuf.length;
-						}
+                        let nameEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VALUE);
+                        if(-1 === nameEnd) {
+                            nameEnd = envBuf.length;
+                        }
 
-						varName = envBuf.splice(0, nameEnd);
-						if(!varName) {
-							return event;	//	something is wrong.
-						}
+                        varName = envBuf.splice(0, nameEnd);
+                        if(!varName) {
+                            return event;	//	something is wrong.
+                        }
 
-						varName = Buffer.from(varName).toString('ascii');
+                        varName = Buffer.from(varName).toString('ascii');
 
-						const next = parseInt(envBuf.splice(0, 1));
-						if(NEW_ENVIRONMENT_COMMANDS.VALUE === next) {
-							state = States.Value;
-						} else {
-							state = States.Name;
-							delVars.push(varName);	//	no value; del this var
-						}
-					}
-					break;
+                        const next = parseInt(envBuf.splice(0, 1));
+                        if(NEW_ENVIRONMENT_COMMANDS.VALUE === next) {
+                            state = States.Value;
+                        } else {
+                            state = States.Name;
+                            delVars.push(varName);	//	no value; del this var
+                        }
+                    }
+                    break;
 
-				case States.Value :
-					{
-						let valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VAR);
-						if(-1 === valueEnd) {
-							valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.USERVAR);
-						}
-						if(-1 === valueEnd) {
-							valueEnd = envBuf.length;
-						}
+                case States.Value :
+                    {
+                        let valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VAR);
+                        if(-1 === valueEnd) {
+                            valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.USERVAR);
+                        }
+                        if(-1 === valueEnd) {
+                            valueEnd = envBuf.length;
+                        }
 
-						let value = envBuf.splice(0, valueEnd);
-						if(value) {
-							value = Buffer.from(value).toString('ascii');
-							setVars[varName] = value;
-						}
-						state = States.Name;
-					}
-					break;
-			}
-		}
+                        let value = envBuf.splice(0, valueEnd);
+                        if(value) {
+                            value = Buffer.from(value).toString('ascii');
+                            setVars[varName] = value;
+                        }
+                        state = States.Name;
+                    }
+                    break;
+            }
+        }
 
-		//	:TODO: Handle deleting previously set vars via delVars
-		event.type		= envCmd.isOrInfo;
-		event.envVars	= setVars;
-	}
+        //	:TODO: Handle deleting previously set vars via delVars
+        event.type		= envCmd.isOrInfo;
+        event.envVars	= setVars;
+    }
 
-	return event;
+    return event;
 };
 
 const MORE_DATA_REQUIRED	= 0xfeedface;
 
 function parseBufs(bufs) {
-	EnigAssert(bufs.length >= 2);
-	EnigAssert(bufs.get(0) === COMMANDS.IAC);
-	return parseCommand(bufs, 1, {});
+    EnigAssert(bufs.length >= 2);
+    EnigAssert(bufs.get(0) === COMMANDS.IAC);
+    return parseCommand(bufs, 1, {});
 }
 
 function parseCommand(bufs, i, event) {
-	const command		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
-	event.commandCode	= command;
-	event.command		= COMMAND_NAMES[command];
+    const command		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
+    event.commandCode	= command;
+    event.command		= COMMAND_NAMES[command];
 
-	const handler = COMMAND_IMPLS[command];
-	if(handler) {
-		return handler(bufs, i + 1, event);
-	} else {
-		if(2 !== bufs.length) {
-			Log.warn( { bufsLength : bufs.length }, 'Expected bufs length of 2');	//	expected: IAC + COMMAND
-		}
+    const handler = COMMAND_IMPLS[command];
+    if(handler) {
+        return handler(bufs, i + 1, event);
+    } else {
+        if(2 !== bufs.length) {
+            Log.warn( { bufsLength : bufs.length }, 'Expected bufs length of 2');	//	expected: IAC + COMMAND
+        }
 
-		event.buf = bufs.splice(0, 2).toBuffer();
-		return event;
-	}
+        event.buf = bufs.splice(0, 2).toBuffer();
+        return event;
+    }
 }
 
 function parseOption(bufs, i, event) {
-	const option		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
-	event.optionCode	= option;
-	event.option		= OPTION_NAMES[option];
+    const option		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
+    event.optionCode	= option;
+    event.option		= OPTION_NAMES[option];
 
-	const handler = OPTION_IMPLS[option];
-	return handler ? handler(bufs, i + 1, event) : unknownOption(bufs, i + 1, event);
+    const handler = OPTION_IMPLS[option];
+    return handler ? handler(bufs, i + 1, event) : unknownOption(bufs, i + 1, event);
 }
 
 
 function TelnetClient(input, output) {
-	baseClient.Client.apply(this, arguments);
+    baseClient.Client.apply(this, arguments);
 
-	const self	= this;
+    const self	= this;
 
-	let bufs	= buffers();
-	this.bufs	= bufs;
+    let bufs	= buffers();
+    this.bufs	= bufs;
 
-	this.sentDont = {};	//	DON'T's we've already sent
+    this.sentDont = {};	//	DON'T's we've already sent
 
-	this.setInputOutput(input, output);
+    this.setInputOutput(input, output);
 
-	this.negotiationsComplete	= false;	//	are we in the 'negotiation' phase?
-	this.didReady				= false;	//	have we emit the 'ready' event?
+    this.negotiationsComplete	= false;	//	are we in the 'negotiation' phase?
+    this.didReady				= false;	//	have we emit the 'ready' event?
 
-	this.subNegotiationState = {
-		newEnvironRequested	: false,
-	};
+    this.subNegotiationState = {
+        newEnvironRequested	: false,
+    };
 
-	this.dataHandler = function(b) {
-		if(!Buffer.isBuffer(b)) {
-			EnigAssert(false, `Cannot push non-buffer ${typeof b}`);
-			return;
-		}
+    this.dataHandler = function(b) {
+        if(!Buffer.isBuffer(b)) {
+            EnigAssert(false, `Cannot push non-buffer ${typeof b}`);
+            return;
+        }
 
-		bufs.push(b);
+        bufs.push(b);
 
-		let i;
-		while((i = bufs.indexOf(IAC_BUF)) >= 0) {
+        let i;
+        while((i = bufs.indexOf(IAC_BUF)) >= 0) {
 
-			//
-			//	Some clients will send even IAC separate from data
-			//
-			if(bufs.length <= (i + 1)) {
-				i = MORE_DATA_REQUIRED;
-				break;
-			}
+            //
+            //	Some clients will send even IAC separate from data
+            //
+            if(bufs.length <= (i + 1)) {
+                i = MORE_DATA_REQUIRED;
+                break;
+            }
 
-			EnigAssert(bufs.length > (i + 1));
+            EnigAssert(bufs.length > (i + 1));
 
-			if(i > 0) {
-				self.emit('data', bufs.splice(0, i).toBuffer());
-			}
+            if(i > 0) {
+                self.emit('data', bufs.splice(0, i).toBuffer());
+            }
 
-			i = parseBufs(bufs);
+            i = parseBufs(bufs);
 
-			if(MORE_DATA_REQUIRED === i) {
-				break;
-			} else if(i) {
-				if(i.option) {
-					self.emit(i.option, i);	//	"transmit binary", "echo", ...
-				}
+            if(MORE_DATA_REQUIRED === i) {
+                break;
+            } else if(i) {
+                if(i.option) {
+                    self.emit(i.option, i);	//	"transmit binary", "echo", ...
+                }
 
-				self.handleTelnetEvent(i);
+                self.handleTelnetEvent(i);
 
-				if(i.data) {
-					self.emit('data', i.data);
-				}
-			}
-		}
+                if(i.data) {
+                    self.emit('data', i.data);
+                }
+            }
+        }
 
-		if(MORE_DATA_REQUIRED !== i && bufs.length > 0) {
-			//
-			//	Standard data payload. This can still be "non-user" data
-			//	such as ANSI control, but we don't handle that here.
-			//
-			self.emit('data', bufs.splice(0).toBuffer());
-		}
-	};
+        if(MORE_DATA_REQUIRED !== i && bufs.length > 0) {
+            //
+            //	Standard data payload. This can still be "non-user" data
+            //	such as ANSI control, but we don't handle that here.
+            //
+            self.emit('data', bufs.splice(0).toBuffer());
+        }
+    };
 
-	this.input.on('data', this.dataHandler);
+    this.input.on('data', this.dataHandler);
 
-	this.input.on('end', () => {
-		self.emit('end');
-	});
+    this.input.on('end', () => {
+        self.emit('end');
+    });
 
-	this.input.on('error', err => {
-		this.connectionDebug( { err : err }, 'Socket error' );
-		return self.emit('end');
-	});
+    this.input.on('error', err => {
+        this.connectionDebug( { err : err }, 'Socket error' );
+        return self.emit('end');
+    });
 
-	this.connectionTrace = (info, msg) => {
-		if(Config().loginServers.telnet.traceConnections) {
-			const logger = self.log || Log;
-			return logger.trace(info, `Telnet: ${msg}`);
-		}
-	};
+    this.connectionTrace = (info, msg) => {
+        if(Config().loginServers.telnet.traceConnections) {
+            const logger = self.log || Log;
+            return logger.trace(info, `Telnet: ${msg}`);
+        }
+    };
 
-	this.connectionDebug = (info, msg) => {
-		const logger = self.log || Log;
-		return logger.debug(info, `Telnet: ${msg}`);
-	};
+    this.connectionDebug = (info, msg) => {
+        const logger = self.log || Log;
+        return logger.debug(info, `Telnet: ${msg}`);
+    };
 
-	this.connectionWarn = (info, msg) => {
-		const logger = self.log || Log;
-		return logger.warn(info, `Telnet: ${msg}`);
-	};
+    this.connectionWarn = (info, msg) => {
+        const logger = self.log || Log;
+        return logger.warn(info, `Telnet: ${msg}`);
+    };
 
-	this.readyNow = () => {
-		if(!this.didReady) {
-			this.didReady = true;
-			this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
-		}
-	};
+    this.readyNow = () => {
+        if(!this.didReady) {
+            this.didReady = true;
+            this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
+        }
+    };
 }
 
 util.inherits(TelnetClient, baseClient.Client);
@@ -580,314 +580,314 @@ util.inherits(TelnetClient, baseClient.Client);
 ///////////////////////////////////////////////////////////////////////////////
 TelnetClient.prototype.handleTelnetEvent = function(evt) {
 
-	if(!evt.command) {
-		return this.connectionWarn( { evt : evt }, 'No command for event');
-	}
+    if(!evt.command) {
+        return this.connectionWarn( { evt : evt }, 'No command for event');
+    }
 
-	//	handler name e.g. 'handleWontCommand'
-	const handlerName = `handle${evt.command.charAt(0).toUpperCase()}${evt.command.substr(1)}Command`;
+    //	handler name e.g. 'handleWontCommand'
+    const handlerName = `handle${evt.command.charAt(0).toUpperCase()}${evt.command.substr(1)}Command`;
 
-	if(this[handlerName]) {
-		//	specialized
-		this[handlerName](evt);
-	} else {
-		//	generic-ish
-		this.handleMiscCommand(evt);
-	}
+    if(this[handlerName]) {
+        //	specialized
+        this[handlerName](evt);
+    } else {
+        //	generic-ish
+        this.handleMiscCommand(evt);
+    }
 };
 
 TelnetClient.prototype.handleWillCommand = function(evt) {
-	if('terminal type' === evt.option) {
-		//
-		//	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-		//
-		this.requestTerminalType();
-	} else if('new environment' === evt.option) {
-		//
-		//	See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
-		//
-		this.requestNewEnvironment();
-	} else {
-		//	:TODO: temporary:
-		this.connectionTrace(evt, 'WILL');
-	}
+    if('terminal type' === evt.option) {
+        //
+        //	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //
+        this.requestTerminalType();
+    } else if('new environment' === evt.option) {
+        //
+        //	See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
+        //
+        this.requestNewEnvironment();
+    } else {
+        //	:TODO: temporary:
+        this.connectionTrace(evt, 'WILL');
+    }
 };
 
 TelnetClient.prototype.handleWontCommand = function(evt) {
-	if(this.sentDont[evt.option]) {
-		return this.connectionTrace(evt, 'WONT - DON\'T already sent');
-	}
+    if(this.sentDont[evt.option]) {
+        return this.connectionTrace(evt, 'WONT - DON\'T already sent');
+    }
 
-	this.sentDont[evt.option] = true;
+    this.sentDont[evt.option] = true;
 
-	if('new environment' === evt.option) {
-		this.dont.new_environment();
-	} else {
-		this.connectionTrace(evt, 'WONT');
-	}
+    if('new environment' === evt.option) {
+        this.dont.new_environment();
+    } else {
+        this.connectionTrace(evt, 'WONT');
+    }
 };
 
 TelnetClient.prototype.handleDoCommand = function(evt) {
-	//	:TODO: handle the rest, e.g. echo nd the like
+    //	:TODO: handle the rest, e.g. echo nd the like
 
-	if('linemode' === evt.option) {
-		//
-		//	Client wants to enable linemode editing. Denied.
-		//
-		this.wont.linemode();
-	} else if('encrypt' === evt.option) {
-		//
-		//	Client wants to enable encryption. Denied.
-		//
-		this.wont.encrypt();
-	} else {
-		//	:TODO: temporary:
-		this.connectionTrace(evt, 'DO');
-	}
+    if('linemode' === evt.option) {
+        //
+        //	Client wants to enable linemode editing. Denied.
+        //
+        this.wont.linemode();
+    } else if('encrypt' === evt.option) {
+        //
+        //	Client wants to enable encryption. Denied.
+        //
+        this.wont.encrypt();
+    } else {
+        //	:TODO: temporary:
+        this.connectionTrace(evt, 'DO');
+    }
 };
 
 TelnetClient.prototype.handleDontCommand = function(evt) {
-	this.connectionTrace(evt, 'DONT');
+    this.connectionTrace(evt, 'DONT');
 };
 
 TelnetClient.prototype.handleSbCommand = function(evt) {
-	const self = this;
+    const self = this;
 
-	if('terminal type' === evt.option) {
-		//
-		//	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-		//
-		//	:TODO: According to RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-		//	We should keep asking until we see a repeat. From there, determine the best type/etc.
-		self.setTermType(evt.ttype);
+    if('terminal type' === evt.option) {
+        //
+        //	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //
+        //	:TODO: According to RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //	We should keep asking until we see a repeat. From there, determine the best type/etc.
+        self.setTermType(evt.ttype);
 
-		self.negotiationsComplete = true;	//	:TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
+        self.negotiationsComplete = true;	//	:TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
 
-		self.readyNow();
-	} else if('new environment' === evt.option) {
-		//
-		//	Handling is as follows:
-		//	* Map 'TERM' -> 'termType' and only update if ours is 'unknown'
-		//	* Map COLUMNS -> 'termWidth' and only update if ours is 0
-		//	* Map ROWS -> 'termHeight' and only update if ours is 0
-		//	* Add any new variables, ignore any existing
-		//
-		Object.keys(evt.envVars || {} ).forEach(function onEnv(name) {
-			if('TERM' === name && 'unknown' === self.term.termType) {
-				self.setTermType(evt.envVars[name]);
-			} else if('COLUMNS' === name && 0 === self.term.termWidth) {
-				self.term.termWidth = parseInt(evt.envVars[name]);
-				self.clearMciCache();	//	term size changes = invalidate cache
-				self.connectionDebug({ termWidth : self.term.termWidth, source : 'NEW-ENVIRON'}, 'Window width updated');
-			} else if('ROWS' === name && 0 === self.term.termHeight) {
-				self.term.termHeight = parseInt(evt.envVars[name]);
-				self.clearMciCache();	//	term size changes = invalidate cache
-				self.connectionDebug({ termHeight : self.term.termHeight, source : 'NEW-ENVIRON'}, 'Window height updated');
-			} else {
-				if(name in self.term.env) {
+        self.readyNow();
+    } else if('new environment' === evt.option) {
+        //
+        //	Handling is as follows:
+        //	* Map 'TERM' -> 'termType' and only update if ours is 'unknown'
+        //	* Map COLUMNS -> 'termWidth' and only update if ours is 0
+        //	* Map ROWS -> 'termHeight' and only update if ours is 0
+        //	* Add any new variables, ignore any existing
+        //
+        Object.keys(evt.envVars || {} ).forEach(function onEnv(name) {
+            if('TERM' === name && 'unknown' === self.term.termType) {
+                self.setTermType(evt.envVars[name]);
+            } else if('COLUMNS' === name && 0 === self.term.termWidth) {
+                self.term.termWidth = parseInt(evt.envVars[name]);
+                self.clearMciCache();	//	term size changes = invalidate cache
+                self.connectionDebug({ termWidth : self.term.termWidth, source : 'NEW-ENVIRON'}, 'Window width updated');
+            } else if('ROWS' === name && 0 === self.term.termHeight) {
+                self.term.termHeight = parseInt(evt.envVars[name]);
+                self.clearMciCache();	//	term size changes = invalidate cache
+                self.connectionDebug({ termHeight : self.term.termHeight, source : 'NEW-ENVIRON'}, 'Window height updated');
+            } else {
+                if(name in self.term.env) {
 
-					EnigAssert(
-						SB_COMMANDS.INFO === evt.type || SB_COMMANDS.IS === evt.type,
-						'Unexpected type: ' + evt.type
-					);
+                    EnigAssert(
+                        SB_COMMANDS.INFO === evt.type || SB_COMMANDS.IS === evt.type,
+                        'Unexpected type: ' + evt.type
+                    );
 
-					self.connectionWarn(
-						{ varName : name, value : evt.envVars[name], existingValue : self.term.env[name] },
-						'Environment variable already exists'
-					);
-				} else {
-					self.term.env[name] = evt.envVars[name];
-					self.connectionDebug( { varName : name, value : evt.envVars[name] }, 'New environment variable' );
-				}
-			}
-		});
+                    self.connectionWarn(
+                        { varName : name, value : evt.envVars[name], existingValue : self.term.env[name] },
+                        'Environment variable already exists'
+                    );
+                } else {
+                    self.term.env[name] = evt.envVars[name];
+                    self.connectionDebug( { varName : name, value : evt.envVars[name] }, 'New environment variable' );
+                }
+            }
+        });
 
-	} else if('window size' === evt.option) {
-		//
-		//	Update termWidth & termHeight.
-		//	Set LINES and COLUMNS environment variables as well.
-		//
-		self.term.termWidth		= evt.width;
-		self.term.termHeight	= evt.height;
+    } else if('window size' === evt.option) {
+        //
+        //	Update termWidth & termHeight.
+        //	Set LINES and COLUMNS environment variables as well.
+        //
+        self.term.termWidth		= evt.width;
+        self.term.termHeight	= evt.height;
 
-		if(evt.width > 0) {
-			self.term.env.COLUMNS = evt.height;
-		}
+        if(evt.width > 0) {
+            self.term.env.COLUMNS = evt.height;
+        }
 
-		if(evt.height > 0) {
-			self.term.env.ROWS = evt.height;
-		}
+        if(evt.height > 0) {
+            self.term.env.ROWS = evt.height;
+        }
 
-		self.clearMciCache();	//	term size changes = invalidate cache
+        self.clearMciCache();	//	term size changes = invalidate cache
 
-		self.connectionDebug({ termWidth : evt.width , termHeight : evt.height, source : 'NAWS' }, 'Window size updated');
-	} else {
-		self.connectionDebug(evt, 'SB');
-	}
+        self.connectionDebug({ termWidth : evt.width , termHeight : evt.height, source : 'NAWS' }, 'Window size updated');
+    } else {
+        self.connectionDebug(evt, 'SB');
+    }
 };
 
 const IGNORED_COMMANDS = [];
 [ COMMANDS.EL, COMMANDS.GA, COMMANDS.NOP, COMMANDS.DM, COMMANDS.BRK ].forEach(function onCommandCode(cc) {
-	IGNORED_COMMANDS.push(cc);
+    IGNORED_COMMANDS.push(cc);
 });
 
 
 TelnetClient.prototype.handleMiscCommand = function(evt) {
-	EnigAssert(evt.command !== 'undefined' && evt.command.length > 0);
+    EnigAssert(evt.command !== 'undefined' && evt.command.length > 0);
 
-	//
-	//	See:
-	//	* RFC 854 @ http://tools.ietf.org/html/rfc854
-	//
-	if('ip' === evt.command) {
-		//	Interrupt Process (IP)
-		this.log.debug('Interrupt Process (IP) - Ending');
+    //
+    //	See:
+    //	* RFC 854 @ http://tools.ietf.org/html/rfc854
+    //
+    if('ip' === evt.command) {
+        //	Interrupt Process (IP)
+        this.log.debug('Interrupt Process (IP) - Ending');
 
-		this.input.end();
-	} else if('ayt' === evt.command) {
-		this.output.write('\b');
+        this.input.end();
+    } else if('ayt' === evt.command) {
+        this.output.write('\b');
 
-		this.log.debug('Are You There (AYT) - Replied "\\b"');
-	} else if(IGNORED_COMMANDS.indexOf(evt.commandCode)) {
-		this.log.debug({ evt : evt }, 'Ignoring command');
-	} else {
-		this.log.warn({ evt : evt }, 'Unknown command');
-	}
+        this.log.debug('Are You There (AYT) - Replied "\\b"');
+    } else if(IGNORED_COMMANDS.indexOf(evt.commandCode)) {
+        this.log.debug({ evt : evt }, 'Ignoring command');
+    } else {
+        this.log.warn({ evt : evt }, 'Unknown command');
+    }
 };
 
 TelnetClient.prototype.requestTerminalType = function() {
-	const buf = Buffer.from( [
-		COMMANDS.IAC,
-		COMMANDS.SB,
-		OPTIONS.TERMINAL_TYPE,
-		SB_COMMANDS.SEND,
-		COMMANDS.IAC,
-		COMMANDS.SE ]);
-	this.output.write(buf);
+    const buf = Buffer.from( [
+        COMMANDS.IAC,
+        COMMANDS.SB,
+        OPTIONS.TERMINAL_TYPE,
+        SB_COMMANDS.SEND,
+        COMMANDS.IAC,
+        COMMANDS.SE ]);
+    this.output.write(buf);
 };
 
 const WANTED_ENVIRONMENT_VAR_BUFS = [
-	Buffer.from( 'LINES' ),
-	Buffer.from( 'COLUMNS' ),
-	Buffer.from( 'TERM' ),
-	Buffer.from( 'TERM_PROGRAM' )
+    Buffer.from( 'LINES' ),
+    Buffer.from( 'COLUMNS' ),
+    Buffer.from( 'TERM' ),
+    Buffer.from( 'TERM_PROGRAM' )
 ];
 
 TelnetClient.prototype.requestNewEnvironment = function() {
 
-	if(this.subNegotiationState.newEnvironRequested) {
-		this.log.debug('New environment already requested');
-		return;
-	}
+    if(this.subNegotiationState.newEnvironRequested) {
+        this.log.debug('New environment already requested');
+        return;
+    }
 
-	const self = this;
+    const self = this;
 
-	const bufs = buffers();
-	bufs.push(Buffer.from( [
-		COMMANDS.IAC,
-		COMMANDS.SB,
-		OPTIONS.NEW_ENVIRONMENT,
-		SB_COMMANDS.SEND ]
-	));
+    const bufs = buffers();
+    bufs.push(Buffer.from( [
+        COMMANDS.IAC,
+        COMMANDS.SB,
+        OPTIONS.NEW_ENVIRONMENT,
+        SB_COMMANDS.SEND ]
+    ));
 
-	for(let i = 0; i < WANTED_ENVIRONMENT_VAR_BUFS.length; ++i) {
-		bufs.push(Buffer.from( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
-	}
+    for(let i = 0; i < WANTED_ENVIRONMENT_VAR_BUFS.length; ++i) {
+        bufs.push(Buffer.from( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
+    }
 
-	bufs.push(Buffer.from([ NEW_ENVIRONMENT_COMMANDS.USERVAR, COMMANDS.IAC, COMMANDS.SE ]));
+    bufs.push(Buffer.from([ NEW_ENVIRONMENT_COMMANDS.USERVAR, COMMANDS.IAC, COMMANDS.SE ]));
 
-	self.output.write(bufs.toBuffer());
+    self.output.write(bufs.toBuffer());
 
-	this.subNegotiationState.newEnvironRequested = true;
+    this.subNegotiationState.newEnvironRequested = true;
 };
 
 TelnetClient.prototype.banner = function() {
-	this.will.echo();
+    this.will.echo();
 
-	this.will.suppress_go_ahead();
-	this.do.suppress_go_ahead();
+    this.will.suppress_go_ahead();
+    this.do.suppress_go_ahead();
 
-	this.do.transmit_binary();
-	this.will.transmit_binary();
+    this.do.transmit_binary();
+    this.will.transmit_binary();
 
-	this.do.terminal_type();
+    this.do.terminal_type();
 
-	this.do.window_size();
-	this.do.new_environment();
+    this.do.window_size();
+    this.do.new_environment();
 };
 
 function Command(command, client) {
-	this.command	= COMMANDS[command.toUpperCase()];
-	this.client		= client;
+    this.command	= COMMANDS[command.toUpperCase()];
+    this.client		= client;
 }
 
 //	Create Command objects with echo, transmit_binary, ...
 Object.keys(OPTIONS).forEach(function(name) {
-	const code = OPTIONS[name];
+    const code = OPTIONS[name];
 
-	Command.prototype[name.toLowerCase()] = function() {
-		const buf = Buffer.alloc(3);
-		buf[0]	= COMMANDS.IAC;
-		buf[1]	= this.command;
-		buf[2]	= code;
-		return this.client.output.write(buf);
-	};
+    Command.prototype[name.toLowerCase()] = function() {
+        const buf = Buffer.alloc(3);
+        buf[0]	= COMMANDS.IAC;
+        buf[1]	= this.command;
+        buf[2]	= code;
+        return this.client.output.write(buf);
+    };
 });
 
 //	Create do, dont, etc. methods on Client
 ['do', 'dont', 'will', 'wont'].forEach(function(command) {
-	const get = function() {
-		return new Command(command, this);
-	};
+    const get = function() {
+        return new Command(command, this);
+    };
 
-	Object.defineProperty(TelnetClient.prototype, command, {
-		get				: get,
-		enumerable		: true,
-		configurable	: true
-	});
+    Object.defineProperty(TelnetClient.prototype, command, {
+        get				: get,
+        enumerable		: true,
+        configurable	: true
+    });
 });
 
 exports.getModule = class TelnetServerModule extends LoginServerModule {
-	constructor() {
-		super();
-	}
+    constructor() {
+        super();
+    }
 
-	createServer() {
-		this.server = net.createServer( sock => {
-			const client = new TelnetClient(sock, sock);
+    createServer() {
+        this.server = net.createServer( sock => {
+            const client = new TelnetClient(sock, sock);
 
-			client.banner();
+            client.banner();
 
-			this.handleNewClient(client, sock, ModuleInfo);
+            this.handleNewClient(client, sock, ModuleInfo);
 
-			//
-			//	Set a timeout and attempt to proceed even if we don't know
-			//	the term type yet, which is the preferred trigger
-			//	for moving along
-			//
-			setTimeout( () => {
-				if(!client.didReady) {
-					Log.info('Proceeding after 3s without knowing term type');
-					client.readyNow();
-				}
-			}, 3000);
-		});
+            //
+            //	Set a timeout and attempt to proceed even if we don't know
+            //	the term type yet, which is the preferred trigger
+            //	for moving along
+            //
+            setTimeout( () => {
+                if(!client.didReady) {
+                    Log.info('Proceeding after 3s without knowing term type');
+                    client.readyNow();
+                }
+            }, 3000);
+        });
 
-		this.server.on('error', err => {
-			Log.info( { error : err.message }, 'Telnet server error');
-		});
-	}
+        this.server.on('error', err => {
+            Log.info( { error : err.message }, 'Telnet server error');
+        });
+    }
 
-	listen() {
-		const config = Config();
-		const port = parseInt(config.loginServers.telnet.port);
-		if(isNaN(port)) {
-			Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
-			return false;
-		}
+    listen() {
+        const config = Config();
+        const port = parseInt(config.loginServers.telnet.port);
+        if(isNaN(port)) {
+            Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
+            return false;
+        }
 
-		this.server.listen(port);
-		Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
-		return true;
-	}
+        this.server.listen(port);
+        Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
+        return true;
+    }
 };
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index e30d0303..f7dac07d 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -16,93 +16,93 @@ const fs				= require('graceful-fs');
 const Writable			= require('stream');
 
 const ModuleInfo = exports.moduleInfo = {
-	name		: 'WebSocket',
-	desc		: 'WebSocket Server',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.websocket.server',
+    name		: 'WebSocket',
+    desc		: 'WebSocket Server',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.websocket.server',
 };
 
 function WebSocketClient(ws, req, serverType) {
 
-	Object.defineProperty(this, 'isSecure', {
-		get : () => ('secure' === serverType || true === this.proxied) ? true : false,
-	});
+    Object.defineProperty(this, 'isSecure', {
+        get : () => ('secure' === serverType || true === this.proxied) ? true : false,
+    });
 
-	const self = this;
+    const self = this;
 
-	this.dataHandler = function(data) {
-		self.socketBridge.emit('data', data);
-	};
+    this.dataHandler = function(data) {
+        self.socketBridge.emit('data', data);
+    };
 
-	//
-	//	This bridge makes accessible various calls that client sub classes
-	//	want to access on I/O socket
-	//
-	this.socketBridge = new class SocketBridge extends Writable {
-		constructor(ws) {
-			super();
-			this.ws = ws;
-		}
+    //
+    //	This bridge makes accessible various calls that client sub classes
+    //	want to access on I/O socket
+    //
+    this.socketBridge = new class SocketBridge extends Writable {
+        constructor(ws) {
+            super();
+            this.ws = ws;
+        }
 
-		end() {
-			return ws.close();
-		}
+        end() {
+            return ws.close();
+        }
 
-		write(data, cb) {
-			cb = cb || ( () => { /* eat it up */} );	//	handle data writes after close
+        write(data, cb) {
+            cb = cb || ( () => { /* eat it up */} );	//	handle data writes after close
 
-			return this.ws.send(data, { binary : true }, cb);
-		}
+            return this.ws.send(data, { binary : true }, cb);
+        }
 
-		//	we need to fake some streaming work
-		unpipe() {
-			Log.trace('WebSocket SocketBridge unpipe()');
-		}
+        //	we need to fake some streaming work
+        unpipe() {
+            Log.trace('WebSocket SocketBridge unpipe()');
+        }
 
-		resume() {
-			Log.trace('WebSocket SocketBridge resume()');
-		}
+        resume() {
+            Log.trace('WebSocket SocketBridge resume()');
+        }
 
-		get remoteAddress() {
-			//	Support X-Forwarded-For and X-Real-IP headers for proxied connections
-			return (self.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
-		}
-	}(ws);
+        get remoteAddress() {
+            //	Support X-Forwarded-For and X-Real-IP headers for proxied connections
+            return (self.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
+        }
+    }(ws);
 
-	ws.on('message', this.dataHandler);
+    ws.on('message', this.dataHandler);
 
-	ws.on('close', () => {
-		//	we'll remove client connection which will in turn end() via our SocketBridge above
-		return this.emit('end');
-	});
+    ws.on('close', () => {
+        //	we'll remove client connection which will in turn end() via our SocketBridge above
+        return this.emit('end');
+    });
 
-	//
-	//	Montior connection status with ping/pong
-	//
-	ws.on('pong', () => {
-		Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
-		ws.isConnectionAlive = true;
-	});
+    //
+    //	Montior connection status with ping/pong
+    //
+    ws.on('pong', () => {
+        Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
+        ws.isConnectionAlive = true;
+    });
 
-	TelnetClient.call(this, this.socketBridge, this.socketBridge);
+    TelnetClient.call(this, this.socketBridge, this.socketBridge);
 
-	Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
+    Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
 
-	//
-	//	If the config allows it, look for 'x-forwarded-proto' as "https"
-	//	to override |isSecure|
-	//
-	if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
+    //
+    //	If the config allows it, look for 'x-forwarded-proto' as "https"
+    //	to override |isSecure|
+    //
+    if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
 		'https' === req.headers['x-forwarded-proto'])
-	{
-		Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
-		this.proxied = true;
-	} else {
-		this.proxied = false;
-	}
+    {
+        Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
+        this.proxied = true;
+    } else {
+        this.proxied = false;
+    }
 
-	//	start handshake process
-	this.banner();
+    //	start handshake process
+    this.banner();
 }
 
 require('util').inherits(WebSocketClient, TelnetClient);
@@ -110,101 +110,101 @@ require('util').inherits(WebSocketClient, TelnetClient);
 const WSS_SERVER_TYPES = [ 'insecure', 'secure' ];
 
 exports.getModule = class WebSocketLoginServer extends LoginServerModule {
-	constructor() {
-		super();
-	}
+    constructor() {
+        super();
+    }
 
-	createServer() {
-		//
-		//	We will actually create up to two servers:
-		//	* insecure websocket (ws://)
-		//	* secure (tls) websocket (wss://)
-		//
-		const config = _.get(Config(), 'loginServers.webSocket');
-		if(!_.isObject(config)) {
-			return;
-		}
+    createServer() {
+        //
+        //	We will actually create up to two servers:
+        //	* insecure websocket (ws://)
+        //	* secure (tls) websocket (wss://)
+        //
+        const config = _.get(Config(), 'loginServers.webSocket');
+        if(!_.isObject(config)) {
+            return;
+        }
 
-		const wsPort 	= _.get(config, 'ws.port');
-		const wssPort	= _.get(config, 'wss.port');
+        const wsPort 	= _.get(config, 'ws.port');
+        const wssPort	= _.get(config, 'wss.port');
 
-		if(true === _.get(config, 'ws.enabled') && _.isNumber(wsPort)) {
-			const httpServer = http.createServer( (req, resp) => {
-				//	dummy handler
-				resp.writeHead(200);
-				return resp.end('ENiGMA½ BBS WebSocket Server!');
-			});
+        if(true === _.get(config, 'ws.enabled') && _.isNumber(wsPort)) {
+            const httpServer = http.createServer( (req, resp) => {
+                //	dummy handler
+                resp.writeHead(200);
+                return resp.end('ENiGMA½ BBS WebSocket Server!');
+            });
 
-			this.insecure = {
-				httpServer	: httpServer,
-				wsServer	: new WebSocketServer( { server : httpServer } ),
-			};
-		}
+            this.insecure = {
+                httpServer	: httpServer,
+                wsServer	: new WebSocketServer( { server : httpServer } ),
+            };
+        }
 
-		if(_.isObject(config, 'wss') && true === _.get(config, 'wss.enabled') && _.isNumber(wssPort)) {
-			const httpServer = https.createServer({
-				key		: fs.readFileSync(config.wss.keyPem),
-				cert	: fs.readFileSync(config.wss.certPem),
-			});
+        if(_.isObject(config, 'wss') && true === _.get(config, 'wss.enabled') && _.isNumber(wssPort)) {
+            const httpServer = https.createServer({
+                key		: fs.readFileSync(config.wss.keyPem),
+                cert	: fs.readFileSync(config.wss.certPem),
+            });
 
-			this.secure = {
-				httpServer	: httpServer,
-				wsServer	: new WebSocketServer( { server : httpServer } ),
-			};
-		}
-	}
+            this.secure = {
+                httpServer	: httpServer,
+                wsServer	: new WebSocketServer( { server : httpServer } ),
+            };
+        }
+    }
 
-	listen() {
-		WSS_SERVER_TYPES.forEach(serverType => {
-			const server = this[serverType];
-			if(!server) {
-				return;
-			}
+    listen() {
+        WSS_SERVER_TYPES.forEach(serverType => {
+            const server = this[serverType];
+            if(!server) {
+                return;
+            }
 
-			const serverName 	= `${ModuleInfo.name} (${serverType})`;
-			const port			= parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
+            const serverName 	= `${ModuleInfo.name} (${serverType})`;
+            const port			= parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
 
-			if(isNaN(port)) {
-				Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
-				return;
-			}
+            if(isNaN(port)) {
+                Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
+                return;
+            }
 
-			server.httpServer.listen(port);
+            server.httpServer.listen(port);
 
-			server.wsServer.on('connection', (ws, req) => {
-				const webSocketClient = new WebSocketClient(ws, req, serverType);
-				this.handleNewClient(webSocketClient, webSocketClient.socketBridge, ModuleInfo);
-			});
+            server.wsServer.on('connection', (ws, req) => {
+                const webSocketClient = new WebSocketClient(ws, req, serverType);
+                this.handleNewClient(webSocketClient, webSocketClient.socketBridge, ModuleInfo);
+            });
 
-			Log.info( { server : serverName, port : port }, 'Listening for connections' );
-		});
+            Log.info( { server : serverName, port : port }, 'Listening for connections' );
+        });
 
-		//
-		//	Send pings every 30s
-		//
-		setInterval( () => {
-			WSS_SERVER_TYPES.forEach(serverType => {
-				if(this[serverType]) {
-					this[serverType].wsServer.clients.forEach(ws => {
-						if(false === ws.isConnectionAlive) {
-							Log.debug('WebSocket connection seems inactive. Terminating.');
-							return ws.terminate();
-						}
+        //
+        //	Send pings every 30s
+        //
+        setInterval( () => {
+            WSS_SERVER_TYPES.forEach(serverType => {
+                if(this[serverType]) {
+                    this[serverType].wsServer.clients.forEach(ws => {
+                        if(false === ws.isConnectionAlive) {
+                            Log.debug('WebSocket connection seems inactive. Terminating.');
+                            return ws.terminate();
+                        }
 
-						ws.isConnectionAlive = false;	//	pong will reset this
+                        ws.isConnectionAlive = false;	//	pong will reset this
 
-						Log.trace('Ping to remote WebSocket client');
-						return ws.ping('', false);	//	false=don't mask
-					});
-				}
-			});
-		}, 30000);
+                        Log.trace('Ping to remote WebSocket client');
+                        return ws.ping('', false);	//	false=don't mask
+                    });
+                }
+            });
+        }, 30000);
 
-		return true;
-	}
+        return true;
+    }
 
-	webSocketConnection(conn) {
-		const webSocketClient = new WebSocketClient(conn);
-		this.handleNewClient(webSocketClient, webSocketClient.socketShim, ModuleInfo);
-	}
+    webSocketConnection(conn) {
+        const webSocketClient = new WebSocketClient(conn);
+        this.handleNewClient(webSocketClient, webSocketClient.socketShim, ModuleInfo);
+    }
 };
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
index efcb1f19..85b9cfcd 100644
--- a/core/set_newscan_date.js
+++ b/core/set_newscan_date.js
@@ -9,10 +9,10 @@ const FileEntry						= require('./file_entry.js');
 const FileBaseFilters				= require('./file_base_filter.js');
 const { getAvailableFileAreaTags }	= require('./file_base_area.js');
 const {
-	getSortedAvailMessageConferences,
-	getSortedAvailMessageAreasByConfTag,
-	updateMessageAreaLastReadId,
-	getMessageIdNewerThanTimestampByArea
+    getSortedAvailMessageConferences,
+    getSortedAvailMessageAreasByConfTag,
+    updateMessageAreaLastReadId,
+    getMessageIdNewerThanTimestampByArea
 }									= require('./message_area.js');
 const stringFormat					= require('./string_format.js');
 
@@ -22,240 +22,240 @@ const moment				= require('moment');
 const _						= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Set New Scan Date',
-	desc	: 'Sets new scan date for applicable scans',
-	author	: 'NuSkooler',
+    name	: 'Set New Scan Date',
+    desc	: 'Sets new scan date for applicable scans',
+    author	: 'NuSkooler',
 };
 
 const MciViewIds = {
-	main : {
-		scanDate		: 1,
-		targetSelection	: 2,
-	}
+    main : {
+        scanDate		: 1,
+        targetSelection	: 2,
+    }
 };
 
 //	:TODO: for messages, we could insert "conf - all areas" into targets, and allow such
 
 exports.getModule = class SetNewScanDate extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const config = this.menuConfig.config;
+        const config = this.menuConfig.config;
 
-		this.target			= config.target || 'message';
-		this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';
+        this.target			= config.target || 'message';
+        this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';
 
-		this.menuMethods = {
-			scanDateSubmit : (formData, extraArgs, cb) => {
-				let scanDate = _.get(formData, 'value.scanDate');
-				if(!scanDate) {
-					return cb(Errors.MissingParam('"scanDate" missing from form data'));
-				}
+        this.menuMethods = {
+            scanDateSubmit : (formData, extraArgs, cb) => {
+                let scanDate = _.get(formData, 'value.scanDate');
+                if(!scanDate) {
+                    return cb(Errors.MissingParam('"scanDate" missing from form data'));
+                }
 
-				scanDate = moment(scanDate, this.scanDateFormat);
-				if(!scanDate.isValid()) {
-					return cb(Errors.Invalid(`"${_.get(formData, 'value.scanDate')}" is not a valid date`));
-				}
+                scanDate = moment(scanDate, this.scanDateFormat);
+                if(!scanDate.isValid()) {
+                    return cb(Errors.Invalid(`"${_.get(formData, 'value.scanDate')}" is not a valid date`));
+                }
 
-				const targetSelection = _.get(formData, 'value.targetSelection');	//	may be undefined if N/A
+                const targetSelection = _.get(formData, 'value.targetSelection');	//	may be undefined if N/A
 
-				this[`setNewScanDateFor${_.capitalize(this.target)}Base`](targetSelection, scanDate, () => {
-					return this.prevMenu(cb);
-				});
-			},
-		};
-	}
+                this[`setNewScanDateFor${_.capitalize(this.target)}Base`](targetSelection, scanDate, () => {
+                    return this.prevMenu(cb);
+                });
+            },
+        };
+    }
 
-	setNewScanDateForMessageBase(targetSelection, scanDate, cb) {
-		const target = this.targetSelections[targetSelection];
-		if(!target) {
-			return cb(Errors.UnexpectedState('Unable to get target in which to set new scan'));
-		}
+    setNewScanDateForMessageBase(targetSelection, scanDate, cb) {
+        const target = this.targetSelections[targetSelection];
+        if(!target) {
+            return cb(Errors.UnexpectedState('Unable to get target in which to set new scan'));
+        }
 
-		//	selected area, or all of 'em
-		let updateAreaTags;
-		if('' === target.area.areaTag) {
-			updateAreaTags = this.targetSelections
-				.map( targetSelection => targetSelection.area.areaTag )
-				.filter( areaTag => areaTag );	//	remove the blank 'all' entry
-		} else {
-			updateAreaTags = [ target.area.areaTag ];
-		}
+        //	selected area, or all of 'em
+        let updateAreaTags;
+        if('' === target.area.areaTag) {
+            updateAreaTags = this.targetSelections
+                .map( targetSelection => targetSelection.area.areaTag )
+                .filter( areaTag => areaTag );	//	remove the blank 'all' entry
+        } else {
+            updateAreaTags = [ target.area.areaTag ];
+        }
 
-		async.each(updateAreaTags, (areaTag, nextAreaTag) => {
-			getMessageIdNewerThanTimestampByArea(areaTag, scanDate, (err, messageId) => {
-				if(err) {
-					return nextAreaTag(err);
-				}
+        async.each(updateAreaTags, (areaTag, nextAreaTag) => {
+            getMessageIdNewerThanTimestampByArea(areaTag, scanDate, (err, messageId) => {
+                if(err) {
+                    return nextAreaTag(err);
+                }
 
-				if(!messageId) {
-					return nextAreaTag(null);	//	nothing to do
-				}
+                if(!messageId) {
+                    return nextAreaTag(null);	//	nothing to do
+                }
 
-				messageId = Math.max(messageId - 1, 0);
+                messageId = Math.max(messageId - 1, 0);
 
-				return updateMessageAreaLastReadId(
-					this.client.user.userId,
-					areaTag,
-					messageId,
-					true,	//	allowOlder
-					nextAreaTag
-				);
-			});
-		}, err => {
-			return cb(err);
-		});
-	}
+                return updateMessageAreaLastReadId(
+                    this.client.user.userId,
+                    areaTag,
+                    messageId,
+                    true,	//	allowOlder
+                    nextAreaTag
+                );
+            });
+        }, err => {
+            return cb(err);
+        });
+    }
 
-	setNewScanDateForFileBase(targetSelection, scanDate, cb) {
-		//
-		//	ENiGMA doesn't currently have the concept of per-area
-		//	scan pointers for users, so we use all areas avail
-		//	to the user.
-		//
-		const filterCriteria = {
-			areaTag				: getAvailableFileAreaTags(this.client),
-			newerThanTimestamp	: scanDate,
-			limit				: 1,
-			orderBy				: 'upload_timestamp',
-			order				: 'ascending',
-		};
+    setNewScanDateForFileBase(targetSelection, scanDate, cb) {
+        //
+        //	ENiGMA doesn't currently have the concept of per-area
+        //	scan pointers for users, so we use all areas avail
+        //	to the user.
+        //
+        const filterCriteria = {
+            areaTag				: getAvailableFileAreaTags(this.client),
+            newerThanTimestamp	: scanDate,
+            limit				: 1,
+            orderBy				: 'upload_timestamp',
+            order				: 'ascending',
+        };
 
-		FileEntry.findFiles(filterCriteria, (err, fileIds) => {
-			if(err) {
-				return cb(err);
-			}
+        FileEntry.findFiles(filterCriteria, (err, fileIds) => {
+            if(err) {
+                return cb(err);
+            }
 
-			if(!fileIds || 0 === fileIds.length) {
-				//	nothing to do
-				return cb(null);
-			}
+            if(!fileIds || 0 === fileIds.length) {
+                //	nothing to do
+                return cb(null);
+            }
 
-			const pointerFileId = Math.max(fileIds[0] - 1, 0);
+            const pointerFileId = Math.max(fileIds[0] - 1, 0);
 
-			return FileBaseFilters.setFileBaseLastViewedFileIdForUser(
-				this.client.user,
-				pointerFileId,
-				true,	//	allowOlder
-				cb
-			);
-		});
-	}
+            return FileBaseFilters.setFileBaseLastViewedFileIdForUser(
+                this.client.user,
+                pointerFileId,
+                true,	//	allowOlder
+                cb
+            );
+        });
+    }
 
-	loadAvailMessageBaseSelections(cb) {
-		//
-		//	Create an array of objects with conf/area information per entry,
-		//	sorted naturally or via the 'sort' member in config
-		//
-		const selections = [];
-		getSortedAvailMessageConferences(this.client).forEach(conf => {
-			getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).forEach(area => {
-				selections.push({
-					conf	: {
-						confTag : conf.confTag,
-						name	: conf.conf.name,
-						desc	: conf.conf.desc,
-					},
-					area	: {
-						areaTag	: area.areaTag,
-						name	: area.area.name,
-						desc	: area.area.desc,
-					}
-				});
-			});
-		});
+    loadAvailMessageBaseSelections(cb) {
+        //
+        //	Create an array of objects with conf/area information per entry,
+        //	sorted naturally or via the 'sort' member in config
+        //
+        const selections = [];
+        getSortedAvailMessageConferences(this.client).forEach(conf => {
+            getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).forEach(area => {
+                selections.push({
+                    conf	: {
+                        confTag : conf.confTag,
+                        name	: conf.conf.name,
+                        desc	: conf.conf.desc,
+                    },
+                    area	: {
+                        areaTag	: area.areaTag,
+                        name	: area.area.name,
+                        desc	: area.area.desc,
+                    }
+                });
+            });
+        });
 
-		selections.unshift({
-			conf : {
-				confTag	: '',
-				name	: 'All conferences',
-				desc	: 'All conferences',
-			},
-			area	: {
-				areaTag	: '',
-				name	: 'All areas',
-				desc	: 'All areas',
-			}
-		});
+        selections.unshift({
+            conf : {
+                confTag	: '',
+                name	: 'All conferences',
+                desc	: 'All conferences',
+            },
+            area	: {
+                areaTag	: '',
+                name	: 'All areas',
+                desc	: 'All areas',
+            }
+        });
 
-		//	Find current conf/area & move it directly under "All"
-		const currConfTag 	= this.client.user.properties.message_conf_tag;
-		const currAreaTag	= this.client.user.properties.message_area_tag;
-		if(currConfTag && currAreaTag) {
-			const confAreaIndex = selections.findIndex( confArea => {
-				return confArea.conf.confTag === currConfTag && confArea.area.areaTag === currAreaTag;
-			});
+        //	Find current conf/area & move it directly under "All"
+        const currConfTag 	= this.client.user.properties.message_conf_tag;
+        const currAreaTag	= this.client.user.properties.message_area_tag;
+        if(currConfTag && currAreaTag) {
+            const confAreaIndex = selections.findIndex( confArea => {
+                return confArea.conf.confTag === currConfTag && confArea.area.areaTag === currAreaTag;
+            });
 
-			if(confAreaIndex > -1) {
-				selections.splice(1, 0, selections.splice(confAreaIndex, 1)[0]);
-			}
-		}
+            if(confAreaIndex > -1) {
+                selections.splice(1, 0, selections.splice(confAreaIndex, 1)[0]);
+            }
+        }
 
-		this.targetSelections = selections;
+        this.targetSelections = selections;
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.addViewController( 'main', new ViewController( { client : this.client } ) );
+            const self	= this;
+            const vc	= self.addViewController( 'main', new ViewController( { client : this.client } ) );
 
-			async.series(
-				[
-					function validateConfig(callback) {
-						if(![ 'message', 'file' ].includes(self.target)) {
-							return callback(Errors.Invalid(`Invalid "target" in config: ${self.target}`));
-						}
-						//	:TOD0: validate scanDateFormat
-						return callback(null);
-					},
-					function loadFromConfig(callback) {
-						return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
-					},
-					function loadAvailSelections(callback) {
-						switch(self.target) {
-							case 'message' :
-								return self.loadAvailMessageBaseSelections(callback);
+            async.series(
+                [
+                    function validateConfig(callback) {
+                        if(![ 'message', 'file' ].includes(self.target)) {
+                            return callback(Errors.Invalid(`Invalid "target" in config: ${self.target}`));
+                        }
+                        //	:TOD0: validate scanDateFormat
+                        return callback(null);
+                    },
+                    function loadFromConfig(callback) {
+                        return vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
+                    },
+                    function loadAvailSelections(callback) {
+                        switch(self.target) {
+                            case 'message' :
+                                return self.loadAvailMessageBaseSelections(callback);
 
-							default :
-								return callback(null);
-						}
-					},
-					function populateForm(callback) {
-						const today = moment();
+                            default :
+                                return callback(null);
+                        }
+                    },
+                    function populateForm(callback) {
+                        const today = moment();
 
-						const scanDateView = vc.getView(MciViewIds.main.scanDate);
+                        const scanDateView = vc.getView(MciViewIds.main.scanDate);
 
-						//	:TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
-						const scanDateFormat = self.scanDateFormat.replace(/[/\-. ]/g, '');
-						scanDateView.setText(today.format(scanDateFormat));
+                        //	:TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
+                        const scanDateFormat = self.scanDateFormat.replace(/[/\-. ]/g, '');
+                        scanDateView.setText(today.format(scanDateFormat));
 
-						if('message' === self.target) {
-							const messageSelectionsFormat		= self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
-							const messageSelectionFocusFormat	= self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
+                        if('message' === self.target) {
+                            const messageSelectionsFormat		= self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
+                            const messageSelectionFocusFormat	= self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
 
-							const targetSelectionView = vc.getView(MciViewIds.main.targetSelection);
+                            const targetSelectionView = vc.getView(MciViewIds.main.targetSelection);
 
-							targetSelectionView.setItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
-							targetSelectionView.setFocusItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
+                            targetSelectionView.setItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
+                            targetSelectionView.setFocusItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
 
-							targetSelectionView.setFocusItemIndex(0);
-						}
+                            targetSelectionView.setFocusItemIndex(0);
+                        }
 
-						self.viewControllers.main.resetInitialFocus();
-						//vc.switchFocus(MciViewIds.main.scanDate);
-						return callback(null);
-					}
-				],
-				err => {
-					return cb(err);
-				}
-			);
-		});
-	}
+                        self.viewControllers.main.resetInitialFocus();
+                        //vc.switchFocus(MciViewIds.main.scanDate);
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/show_art.js b/core/show_art.js
index 6fb8d01b..bb917e91 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -12,159 +12,159 @@ const async			= require('async');
 const _				= require('lodash');
 
 exports.moduleInfo = {
-	name	: 'Show Art',
-	desc	: 'Module for more advanced methods of displaying art',
-	author	: 'NuSkooler',
+    name	: 'Show Art',
+    desc	: 'Module for more advanced methods of displaying art',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class ShowArtModule extends MenuModule {
-	constructor(options) {
-		super(options);
-		this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
 
-		this.config.method = this.config.method || 'random';
-		this.config.optional = _.get(this.config, 'optional', true);
-	}
+        this.config.method = this.config.method || 'random';
+        this.config.optional = _.get(this.config, 'optional', true);
+    }
 
-	initSequence() {
-		const self = this;
+    initSequence() {
+        const self = this;
 
-		async.series(
-			[
-				function before(callback) {
-					return self.beforeArt(callback);
-				},
-				function showArt(callback) {
-					//
-					//	How we show art depends on our configuration
-					//
-					let handler = {
-						extraArgs		: self.showByExtraArgs,
-						sequence		: self.showBySequence,
-						random			: self.showByRandom,
-						fileBaseArea	: self.showByFileBaseArea,
-					}[self.config.method] || self.showRandomArt;
+        async.series(
+            [
+                function before(callback) {
+                    return self.beforeArt(callback);
+                },
+                function showArt(callback) {
+                    //
+                    //	How we show art depends on our configuration
+                    //
+                    let handler = {
+                        extraArgs		: self.showByExtraArgs,
+                        sequence		: self.showBySequence,
+                        random			: self.showByRandom,
+                        fileBaseArea	: self.showByFileBaseArea,
+                    }[self.config.method] || self.showRandomArt;
 
-					handler = handler.bind(self);
+                    handler = handler.bind(self);
 
-					return handler(callback);
-				}
-			],
-			err => {
-				if(err && !self.config.optional) {
-					self.client.log.warn('Error during init sequence', { error : err.message } );
-					return self.prevMenu( () => { /* dummy */ } );
-				}
+                    return handler(callback);
+                }
+            ],
+            err => {
+                if(err && !self.config.optional) {
+                    self.client.log.warn('Error during init sequence', { error : err.message } );
+                    return self.prevMenu( () => { /* dummy */ } );
+                }
 
-				self.finishedLoading();
-				return self.autoNextMenu( () => { /* dummy */ } );
-			}
-		);
-	}
+                self.finishedLoading();
+                return self.autoNextMenu( () => { /* dummy */ } );
+            }
+        );
+    }
 
-	showByExtraArgs(cb) {
-		this.getArtKeyValue( (err, artSpec) => {
-			if(err) {
-				return cb(err);
-			}
-			const options = {
-				pause 	: this.shouldPause(),
-				desc	: 'extraArgs',
-			};
-			return this.displaySingleArtWithOptions(artSpec, options, cb);
-		});
-	}
+    showByExtraArgs(cb) {
+        this.getArtKeyValue( (err, artSpec) => {
+            if(err) {
+                return cb(err);
+            }
+            const options = {
+                pause 	: this.shouldPause(),
+                desc	: 'extraArgs',
+            };
+            return this.displaySingleArtWithOptions(artSpec, options, cb);
+        });
+    }
 
-	showBySequence(cb) {
-		return cb(null);
-	}
+    showBySequence(cb) {
+        return cb(null);
+    }
 
-	showByRandom(cb) {
-		return cb(null);
-	}
+    showByRandom(cb) {
+        return cb(null);
+    }
 
-	showByFileBaseArea(cb) {
-		this.getArtKeyValue( (err, key) => {
-			if(err) {
-				return cb(err);
-			}
+    showByFileBaseArea(cb) {
+        this.getArtKeyValue( (err, key) => {
+            if(err) {
+                return cb(err);
+            }
 
-			//	further resolve key -> file base area art
-			const artSpec = _.get(Config(), [ 'fileBase', 'areas', key, 'art' ]);
-			if(!artSpec) {
-				return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
-			}
-			const options = {
-				pause 	: this.shouldPause(),
-				desc	: 'fileBaseArea',
-			};
-			return this.displaySingleArtWithOptions(artSpec, options, cb);
-		});
-	}
+            //	further resolve key -> file base area art
+            const artSpec = _.get(Config(), [ 'fileBase', 'areas', key, 'art' ]);
+            if(!artSpec) {
+                return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
+            }
+            const options = {
+                pause 	: this.shouldPause(),
+                desc	: 'fileBaseArea',
+            };
+            return this.displaySingleArtWithOptions(artSpec, options, cb);
+        });
+    }
 
-	getArtKeyValue(cb) {
-		const key = this.config.key;
-		if(!_.isString(key)) {
-			return cb(Errors.MissingConfig('Config option "key" is required for method "extraArgs"'));
-		}
+    getArtKeyValue(cb) {
+        const key = this.config.key;
+        if(!_.isString(key)) {
+            return cb(Errors.MissingConfig('Config option "key" is required for method "extraArgs"'));
+        }
 
-		const path = key.split('.');
-		const artKey = _.get(this.config, [ 'extraArgs' ].concat(path) );
-		if(!_.isString(artKey)) {
-			return cb(Errors.MissingParam(`Invalid or missing "extraArgs.${key}" value`));
-		}
+        const path = key.split('.');
+        const artKey = _.get(this.config, [ 'extraArgs' ].concat(path) );
+        if(!_.isString(artKey)) {
+            return cb(Errors.MissingParam(`Invalid or missing "extraArgs.${key}" value`));
+        }
 
-		return cb(null, artKey);
-	}
+        return cb(null, artKey);
+    }
 
-	displaySingleArtWithOptions(artSpec, options, cb) {
-		const self = this;
-		async.waterfall(
-			[
-				function art(callback) {
-					//	:TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
-					self.displayAsset(
-						artSpec,
-						self.menuConfig.options,
-						(err, artData) => {
-							if(err) {
-								return callback(err);
-							}
-							const mciData = { menu : artData.mciMap };
-							return callback(null, mciData);
-						}
-					);
-				},
-				function recordCursorPosition(mciData, callback) {
-					if(!options.pause) {
-						return callback(null, mciData, null);	//	cursor position not needed
-					}
+    displaySingleArtWithOptions(artSpec, options, cb) {
+        const self = this;
+        async.waterfall(
+            [
+                function art(callback) {
+                    //	:TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
+                    self.displayAsset(
+                        artSpec,
+                        self.menuConfig.options,
+                        (err, artData) => {
+                            if(err) {
+                                return callback(err);
+                            }
+                            const mciData = { menu : artData.mciMap };
+                            return callback(null, mciData);
+                        }
+                    );
+                },
+                function recordCursorPosition(mciData, callback) {
+                    if(!options.pause) {
+                        return callback(null, mciData, null);	//	cursor position not needed
+                    }
 
-					self.client.once('cursor position report', pos => {
-						const pausePosition = { row : pos[0], col : 1 };
-						return callback(null, mciData, pausePosition);
-					});
+                    self.client.once('cursor position report', pos => {
+                        const pausePosition = { row : pos[0], col : 1 };
+                        return callback(null, mciData, pausePosition);
+                    });
 
-					self.client.term.rawWrite(ANSI.queryPos());
-				},
-				function afterArtDisplayed(mciData, pausePosition, callback) {
-					self.mciReady(mciData, err => {
-						return callback(err, pausePosition);
-					});
-				},
-				function displayPauseIfRequested(pausePosition, callback) {
-					if(!options.pause) {
-						return callback(null);
-					}
-					return self.pausePrompt(pausePosition, callback);
-				},
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { artSpec, error : err.message }, `Failed to display "${options.desc}" art`);
-				}
-				return cb(err);
-			}
-		);
-	}
+                    self.client.term.rawWrite(ANSI.queryPos());
+                },
+                function afterArtDisplayed(mciData, pausePosition, callback) {
+                    self.mciReady(mciData, err => {
+                        return callback(err, pausePosition);
+                    });
+                },
+                function displayPauseIfRequested(pausePosition, callback) {
+                    if(!options.pause) {
+                        return callback(null);
+                    }
+                    return self.pausePrompt(pausePosition, callback);
+                },
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { artSpec, error : err.message }, `Failed to display "${options.desc}" art`);
+                }
+                return cb(err);
+            }
+        );
+    }
 };
diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index 829255ca..b46dda51 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -12,105 +12,105 @@ const _				= require('lodash');
 exports.SpinnerMenuView	= SpinnerMenuView;
 
 function SpinnerMenuView(options) {
-	options.justify	= options.justify || 'left';
-	options.cursor	= options.cursor || 'hide';
+    options.justify	= options.justify || 'left';
+    options.cursor	= options.cursor || 'hide';
 
-	MenuView.call(this, options);
+    MenuView.call(this, options);
 
-	var self = this;
+    var self = this;
 
-	/*
+    /*
 	this.cachePositions = function() {
 		self.positionCacheExpired = false;
 	};
 	*/
 
-	this.updateSelection = function() {
-		//assert(!self.positionCacheExpired);
+    this.updateSelection = function() {
+        //assert(!self.positionCacheExpired);
 
-		assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
+        assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
 
-		this.drawItem(this.focusedItemIndex);
-		this.emit('index update', this.focusedItemIndex);
-	};
+        this.drawItem(this.focusedItemIndex);
+        this.emit('index update', this.focusedItemIndex);
+    };
 
-	this.drawItem = function() {
-		var item = self.items[this.focusedItemIndex];
-		if(!item) {
-			return;
-		}
+    this.drawItem = function() {
+        var item = self.items[this.focusedItemIndex];
+        if(!item) {
+            return;
+        }
 
-		this.client.term.write(ansi.goto(this.position.row, this.position.col));
-		this.client.term.write(self.hasFocus ? self.getFocusSGR() : self.getSGR());
+        this.client.term.write(ansi.goto(this.position.row, this.position.col));
+        this.client.term.write(self.hasFocus ? self.getFocusSGR() : self.getSGR());
 
-		var text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
+        var text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
 
-		self.client.term.write(
-			strUtil.pad(text, this.dimens.width + 1, this.fillChar, this.justify));
-	};
+        self.client.term.write(
+            strUtil.pad(text, this.dimens.width + 1, this.fillChar, this.justify));
+    };
 }
 
 util.inherits(SpinnerMenuView, MenuView);
 
 SpinnerMenuView.prototype.redraw = function() {
-	SpinnerMenuView.super_.prototype.redraw.call(this);
+    SpinnerMenuView.super_.prototype.redraw.call(this);
 
-	//this.cachePositions();
-	this.drawItem(this.focusedItemIndex);
+    //this.cachePositions();
+    this.drawItem(this.focusedItemIndex);
 };
 
 SpinnerMenuView.prototype.setFocus = function(focused) {
-	SpinnerMenuView.super_.prototype.setFocus.call(this, focused);
+    SpinnerMenuView.super_.prototype.setFocus.call(this, focused);
 
-	this.redraw();
+    this.redraw();
 };
 
 SpinnerMenuView.prototype.setFocusItemIndex = function(index) {
-	SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
 
-	this.updateSelection();	//	will redraw
+    this.updateSelection();	//	will redraw
 };
 
 SpinnerMenuView.prototype.onKeyPress = function(ch, key) {
-	if(key) {
-		if(this.isKeyMapped('up', key.name)) {
-			if(0 === this.focusedItemIndex) {
-				this.focusedItemIndex = this.items.length - 1;
-			} else {
-				this.focusedItemIndex--;
-			}
+    if(key) {
+        if(this.isKeyMapped('up', key.name)) {
+            if(0 === this.focusedItemIndex) {
+                this.focusedItemIndex = this.items.length - 1;
+            } else {
+                this.focusedItemIndex--;
+            }
 
-			this.updateSelection();
-			return;
-		} else if(this.isKeyMapped('down', key.name)) {
-			if(this.items.length - 1 === this.focusedItemIndex) {
-				this.focusedItemIndex = 0;
-			} else {
-				this.focusedItemIndex++;
-			}
+            this.updateSelection();
+            return;
+        } else if(this.isKeyMapped('down', key.name)) {
+            if(this.items.length - 1 === this.focusedItemIndex) {
+                this.focusedItemIndex = 0;
+            } else {
+                this.focusedItemIndex++;
+            }
 
-			this.updateSelection();
-			return;
-		}
-	}
+            this.updateSelection();
+            return;
+        }
+    }
 
-	SpinnerMenuView.super_.prototype.onKeyPress.call(this, ch, key);
+    SpinnerMenuView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 SpinnerMenuView.prototype.getData = function() {
-	const item = this.getItem(this.focusedItemIndex);
-	return _.isString(item.data) ? item.data : this.focusedItemIndex;
+    const item = this.getItem(this.focusedItemIndex);
+    return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
 
 SpinnerMenuView.prototype.setItems = function(items) {
-	SpinnerMenuView.super_.prototype.setItems.call(this, items);
+    SpinnerMenuView.super_.prototype.setItems.call(this, items);
 
-	var longest = 0;
-	for(var i = 0; i < this.items.length; ++i) {
-		if(longest < this.items[i].text.length) {
-			longest = this.items[i].text.length;
-		}
-	}
+    var longest = 0;
+    for(var i = 0; i < this.items.length; ++i) {
+        if(longest < this.items[i].text.length) {
+            longest = this.items[i].text.length;
+        }
+    }
 
-	this.dimens.width = longest;
+    this.dimens.width = longest;
 };
\ No newline at end of file
diff --git a/core/standard_menu.js b/core/standard_menu.js
index ddaebff3..f22153b2 100644
--- a/core/standard_menu.js
+++ b/core/standard_menu.js
@@ -4,24 +4,24 @@
 const MenuModule	= require('./menu_module.js').MenuModule;
 
 exports.moduleInfo = {
-	name	: 'Standard Menu Module',
-	desc	: 'A Menu Module capable of handing standard configurations',
-	author	: 'NuSkooler',
+    name	: 'Standard Menu Module',
+    desc	: 'A Menu Module capable of handing standard configurations',
+    author	: 'NuSkooler',
 };
 
 exports.getModule = class StandardMenuModule extends MenuModule {
-	constructor(options) {
-		super(options);
-	}
+    constructor(options) {
+        super(options);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			//	 we do this so other modules can be both customized and still perform standard tasks
-			return this.standardMCIReadyHandler(mciData, cb);
-		});
-	}
+            //	 we do this so other modules can be both customized and still perform standard tasks
+            return this.standardMCIReadyHandler(mciData, cb);
+        });
+    }
 };
diff --git a/core/stat_log.js b/core/stat_log.js
index edb2d98c..849404c2 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -20,173 +20,173 @@ const moment	= require('moment');
 	making them easily available for MCI codes for example.
 */
 class StatLog {
-	constructor() {
-		this.systemStats = {};
-	}
+    constructor() {
+        this.systemStats = {};
+    }
 
-	init(cb) {
-		//
-		//	Load previous state/values of |this.systemStats|
-		//
-		const self = this;
+    init(cb) {
+        //
+        //	Load previous state/values of |this.systemStats|
+        //
+        const self = this;
 
-		sysDb.each(
-			`SELECT stat_name, stat_value
+        sysDb.each(
+            `SELECT stat_name, stat_value
 			FROM system_stat;`,
-			(err, row) => {
-				if(row) {
-					self.systemStats[row.stat_name] = row.stat_value;
-				}
-			},
-			err => {
-				return cb(err);
-			}
-		);
-	}
+            (err, row) => {
+                if(row) {
+                    self.systemStats[row.stat_name] = row.stat_value;
+                }
+            },
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	get KeepDays() {
-		return {
-			Forever : -1,
-		};
-	}
+    get KeepDays() {
+        return {
+            Forever : -1,
+        };
+    }
 
-	get KeepType() {
-		return {
-			Forever	: 'forever',
-			Days	: 'days',
-			Max		: 'max',
-			Count	: 'max',
-		};
-	}
+    get KeepType() {
+        return {
+            Forever	: 'forever',
+            Days	: 'days',
+            Max		: 'max',
+            Count	: 'max',
+        };
+    }
 
-	get Order() {
-		return {
-			Timestamp		: 'timestamp_asc',
-			TimestampAsc	: 'timestamp_asc',
-			TimestampDesc	: 'timestamp_desc',
-			Random			: 'random',
-		};
-	}
+    get Order() {
+        return {
+            Timestamp		: 'timestamp_asc',
+            TimestampAsc	: 'timestamp_asc',
+            TimestampDesc	: 'timestamp_desc',
+            Random			: 'random',
+        };
+    }
 
-	setNonPeristentSystemStat(statName, statValue) {
-		this.systemStats[statName] = statValue;
-	}
+    setNonPeristentSystemStat(statName, statValue) {
+        this.systemStats[statName] = statValue;
+    }
 
-	setSystemStat(statName, statValue, cb) {
-		//	live stats
-		this.systemStats[statName] = statValue;
+    setSystemStat(statName, statValue, cb) {
+        //	live stats
+        this.systemStats[statName] = statValue;
 
-		//	persisted stats
-		sysDb.run(
-			`REPLACE INTO system_stat (stat_name, stat_value)
+        //	persisted stats
+        sysDb.run(
+            `REPLACE INTO system_stat (stat_name, stat_value)
 			VALUES (?, ?);`,
-			[ statName, statValue ],
-			err => {
-				//	cb optional - callers may fire & forget
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+            [ statName, statValue ],
+            err => {
+                //	cb optional - callers may fire & forget
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	getSystemStat(statName) { return this.systemStats[statName]; }
+    getSystemStat(statName) { return this.systemStats[statName]; }
 
-	getSystemStatNum(statName) {
-		return parseInt(this.getSystemStat(statName)) || 0;
-	}
+    getSystemStatNum(statName) {
+        return parseInt(this.getSystemStat(statName)) || 0;
+    }
 
-	incrementSystemStat(statName, incrementBy, cb) {
-		incrementBy = incrementBy || 1;
+    incrementSystemStat(statName, incrementBy, cb) {
+        incrementBy = incrementBy || 1;
 
-		let newValue = parseInt(this.systemStats[statName]);
-		if(newValue) {
-			if(!_.isNumber(newValue)) {
-				return cb(new Error(`Value for ${statName} is not a number!`));
-			}
+        let newValue = parseInt(this.systemStats[statName]);
+        if(newValue) {
+            if(!_.isNumber(newValue)) {
+                return cb(new Error(`Value for ${statName} is not a number!`));
+            }
 
-			newValue += incrementBy;
-		} else {
-			newValue = incrementBy;
-		}
+            newValue += incrementBy;
+        } else {
+            newValue = incrementBy;
+        }
 
-		return this.setSystemStat(statName, newValue, cb);
-	}
+        return this.setSystemStat(statName, newValue, cb);
+    }
 
-	//
-	//	User specific stats
-	//	These are simply convience methods to the user's properties
-	//
-	setUserStat(user, statName, statValue, cb) {
-		//	note: cb is optional in PersistUserProperty
-		return user.persistProperty(statName, statValue, cb);
-	}
+    //
+    //	User specific stats
+    //	These are simply convience methods to the user's properties
+    //
+    setUserStat(user, statName, statValue, cb) {
+        //	note: cb is optional in PersistUserProperty
+        return user.persistProperty(statName, statValue, cb);
+    }
 
-	getUserStat(user, statName) {
-		return user.properties[statName];
-	}
+    getUserStat(user, statName) {
+        return user.properties[statName];
+    }
 
-	getUserStatNum(user, statName) {
-		return parseInt(this.getUserStat(user, statName)) || 0;
-	}
+    getUserStatNum(user, statName) {
+        return parseInt(this.getUserStat(user, statName)) || 0;
+    }
 
-	incrementUserStat(user, statName, incrementBy, cb) {
-		incrementBy = incrementBy || 1;
+    incrementUserStat(user, statName, incrementBy, cb) {
+        incrementBy = incrementBy || 1;
 
-		let newValue = parseInt(user.properties[statName]);
-		if(newValue) {
-			if(!_.isNumber(newValue)) {
-				return cb(new Error(`Value for ${statName} is not a number!`));
-			}
+        let newValue = parseInt(user.properties[statName]);
+        if(newValue) {
+            if(!_.isNumber(newValue)) {
+                return cb(new Error(`Value for ${statName} is not a number!`));
+            }
 
-			newValue += incrementBy;
-		} else {
-			newValue = incrementBy;
-		}
+            newValue += incrementBy;
+        } else {
+            newValue = incrementBy;
+        }
 
-		return this.setUserStat(user, statName, newValue, cb);
-	}
+        return this.setUserStat(user, statName, newValue, cb);
+    }
 
-	//	the time "now" in the ISO format we use and love :)
-	get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); }
+    //	the time "now" in the ISO format we use and love :)
+    get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); }
 
-	appendSystemLogEntry(logName, logValue, keep, keepType, cb) {
-		sysDb.run(
-			`INSERT INTO system_event_log (timestamp, log_name, log_value)
+    appendSystemLogEntry(logName, logValue, keep, keepType, cb) {
+        sysDb.run(
+            `INSERT INTO system_event_log (timestamp, log_name, log_value)
 			VALUES (?, ?, ?);`,
-			[ this.now, logName, logValue ],
-			() => {
-				//
-				//	Handle keep
-				//
-				if(-1 === keep) {
-					if(cb) {
-						return cb(null);
-					}
-					return;
-				}
+            [ this.now, logName, logValue ],
+            () => {
+                //
+                //	Handle keep
+                //
+                if(-1 === keep) {
+                    if(cb) {
+                        return cb(null);
+                    }
+                    return;
+                }
 
-				switch(keepType) {
-					//	keep # of days
-					case 'days' :
-						sysDb.run(
-							`DELETE FROM system_event_log
+                switch(keepType) {
+                    //	keep # of days
+                    case 'days' :
+                        sysDb.run(
+                            `DELETE FROM system_event_log
 							WHERE log_name = ? AND timestamp <= DATETIME("now", "-${keep} day");`,
-							[ logName ],
-							err => {
-								//	cb optional - callers may fire & forget
-								if(cb) {
-									return cb(err);
-								}
-							}
-						);
-						break;
+                            [ logName ],
+                            err => {
+                                //	cb optional - callers may fire & forget
+                                if(cb) {
+                                    return cb(err);
+                                }
+                            }
+                        );
+                        break;
 
-					case 'count':
-					case 'max' :
-						//	keep max of N/count
-						sysDb.run(
-							`DELETE FROM system_event_log
+                    case 'count':
+                    case 'max' :
+                        //	keep max of N/count
+                        sysDb.run(
+                            `DELETE FROM system_event_log
 							WHERE id IN(
 								SELECT id 
 								FROM system_event_log
@@ -194,92 +194,92 @@ class StatLog {
 								ORDER BY id DESC
 								LIMIT -1 OFFSET ${keep}
 							);`,
-							[ logName ],
-							err => {
-								if(cb) {
-									return cb(err);
-								}
-							}
-						);
-						break;
+                            [ logName ],
+                            err => {
+                                if(cb) {
+                                    return cb(err);
+                                }
+                            }
+                        );
+                        break;
 
-					case 'forever' :
-					default :
-						//	nop
-						break;
-				}
-			}
-		);
-	}
+                    case 'forever' :
+                    default :
+                        //	nop
+                        break;
+                }
+            }
+        );
+    }
 
-	getSystemLogEntries(logName, order, limit, cb) {
-		let sql =
+    getSystemLogEntries(logName, order, limit, cb) {
+        let sql =
 			`SELECT timestamp, log_value
 			FROM system_event_log
 			WHERE log_name = ?`;
 
-		switch(order) {
-			case 'timestamp' :
-			case 'timestamp_asc' :
-				sql += ' ORDER BY timestamp ASC';
-				break;
+        switch(order) {
+            case 'timestamp' :
+            case 'timestamp_asc' :
+                sql += ' ORDER BY timestamp ASC';
+                break;
 
-			case 'timestamp_desc' :
-				sql += ' ORDER BY timestamp DESC';
-				break;
+            case 'timestamp_desc' :
+                sql += ' ORDER BY timestamp DESC';
+                break;
 
-			case 'random'	:
-				sql += ' ORDER BY RANDOM()';
-		}
+            case 'random'	:
+                sql += ' ORDER BY RANDOM()';
+        }
 
-		if(!cb && _.isFunction(limit)) {
-			cb		= limit;
-			limit	= 0;
-		} else {
-			limit = limit || 0;
-		}
+        if(!cb && _.isFunction(limit)) {
+            cb		= limit;
+            limit	= 0;
+        } else {
+            limit = limit || 0;
+        }
 
-		if(0 !== limit) {
-			sql += ` LIMIT ${limit}`;
-		}
+        if(0 !== limit) {
+            sql += ` LIMIT ${limit}`;
+        }
 
-		sql += ';';
+        sql += ';';
 
-		sysDb.all(sql, [ logName ], (err, rows) => {
-			return cb(err, rows);
-		});
-	}
+        sysDb.all(sql, [ logName ], (err, rows) => {
+            return cb(err, rows);
+        });
+    }
 
-	appendUserLogEntry(user, logName, logValue, keepDays, cb) {
-		sysDb.run(
-			`INSERT INTO user_event_log (timestamp, user_id, log_name, log_value)
+    appendUserLogEntry(user, logName, logValue, keepDays, cb) {
+        sysDb.run(
+            `INSERT INTO user_event_log (timestamp, user_id, log_name, log_value)
 			VALUES (?, ?, ?, ?);`,
-			[ this.now, user.userId, logName, logValue ],
-			() => {
-				//
-				//	Handle keepDays
-				//
-				if(-1 === keepDays) {
-					if(cb) {
-						return cb(null);
-					}
-					return;
-				}
+            [ this.now, user.userId, logName, logValue ],
+            () => {
+                //
+                //	Handle keepDays
+                //
+                if(-1 === keepDays) {
+                    if(cb) {
+                        return cb(null);
+                    }
+                    return;
+                }
 
-				sysDb.run(
-					`DELETE FROM user_event_log
+                sysDb.run(
+                    `DELETE FROM user_event_log
 					WHERE user_id = ? AND log_name = ? AND timestamp <= DATETIME("now", "-${keepDays} day");`,
-					[ user.userId, logName ],
-					err => {
-						//	cb optional - callers may fire & forget
-						if(cb) {
-							return cb(err);
-						}
-					}
-				);
-			}
-		);
-	}
+                    [ user.userId, logName ],
+                    err => {
+                        //	cb optional - callers may fire & forget
+                        if(cb) {
+                            return cb(err);
+                        }
+                    }
+                );
+            }
+        );
+    }
 }
 
 module.exports = new StatLog();
diff --git a/core/string_format.js b/core/string_format.js
index 38c2047f..7857f2b3 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -4,12 +4,12 @@
 const EnigError				= require('./enig_error.js').EnigError;
 
 const {
-	pad,
-	stylizeString,
-	renderStringLength,
-	renderSubstr,
-	formatByteSize, formatByteSizeAbbr,
-	formatCount, formatCountAbbr,
+    pad,
+    stylizeString,
+    renderStringLength,
+    renderSubstr,
+    formatByteSize, formatByteSizeAbbr,
+    formatCount, formatCountAbbr,
 }							= require('./string_util.js');
 
 //	deps
@@ -28,329 +28,329 @@ class ValueError extends EnigError { }
 class KeyError extends EnigError { }
 
 const SpecRegExp = {
-	FillAlign	: /^(.)?([<>=^])/,
-	Sign		: /^[ +-]/,
-	Width		: /^\d*/,
-	Precision	: /^\d+/,
+    FillAlign	: /^(.)?([<>=^])/,
+    Sign		: /^[ +-]/,
+    Width		: /^\d*/,
+    Precision	: /^\d+/,
 };
 
 function tokenizeFormatSpec(spec) {
-	const tokens = {
-		fill		: '',
-		align		: '',
-		sign		: '',
-		'#'			: false,
-		'0'			: false,
-		width		: '',
-		','			: false,
-		precision	: '',
-		type		: '',
-	};
+    const tokens = {
+        fill		: '',
+        align		: '',
+        sign		: '',
+        '#'			: false,
+        '0'			: false,
+        width		: '',
+        ','			: false,
+        precision	: '',
+        type		: '',
+    };
 
-	let index = 0;
-	let match;
+    let index = 0;
+    let match;
 
-	function incIndexByMatch() {
-		index += match[0].length;
-	}
+    function incIndexByMatch() {
+        index += match[0].length;
+    }
 
-	match = SpecRegExp.FillAlign.exec(spec);
-	if(match) {
-		if(match[1]) {
-			tokens.fill = match[1];
-		}
-		tokens.align = match[2];
-		incIndexByMatch();
-	}
+    match = SpecRegExp.FillAlign.exec(spec);
+    if(match) {
+        if(match[1]) {
+            tokens.fill = match[1];
+        }
+        tokens.align = match[2];
+        incIndexByMatch();
+    }
 
-	match = SpecRegExp.Sign.exec(spec.slice(index));
-	if(match) {
-		tokens.sign = match[0];
-		incIndexByMatch();
-	}
+    match = SpecRegExp.Sign.exec(spec.slice(index));
+    if(match) {
+        tokens.sign = match[0];
+        incIndexByMatch();
+    }
 
-	if('#' === spec.charAt(index)) {
-		tokens['#'] = true;
-		++index;
-	}
+    if('#' === spec.charAt(index)) {
+        tokens['#'] = true;
+        ++index;
+    }
 
-	if('0' === spec.charAt(index)) {
-		tokens['0'] = true;
-		++index;
-	}
+    if('0' === spec.charAt(index)) {
+        tokens['0'] = true;
+        ++index;
+    }
 
-	match = SpecRegExp.Width.exec(spec.slice(index));
-	tokens.width = match[0];
-	incIndexByMatch();
+    match = SpecRegExp.Width.exec(spec.slice(index));
+    tokens.width = match[0];
+    incIndexByMatch();
 
-	if(',' === spec.charAt(index)) {
-		tokens[','] = true;
-		++index;
-	}
+    if(',' === spec.charAt(index)) {
+        tokens[','] = true;
+        ++index;
+    }
 
-	if('.' === spec.charAt(index)) {
-		++index;
+    if('.' === spec.charAt(index)) {
+        ++index;
 
-		match = SpecRegExp.Precision.exec(spec.slice(index));
-		if(!match) {
-			throw new ValueError('Format specifier missing precision');
-		}
+        match = SpecRegExp.Precision.exec(spec.slice(index));
+        if(!match) {
+            throw new ValueError('Format specifier missing precision');
+        }
 
-		tokens.precision = match[0];
-		incIndexByMatch();
-	}
+        tokens.precision = match[0];
+        incIndexByMatch();
+    }
 
-	if(index < spec.length) {
-		tokens.type = spec.charAt(index);
-		++index;
-	}
+    if(index < spec.length) {
+        tokens.type = spec.charAt(index);
+        ++index;
+    }
 
-	if(index < spec.length) {
-		throw new ValueError('Invalid conversion specification');
-	}
+    if(index < spec.length) {
+        throw new ValueError('Invalid conversion specification');
+    }
 
-	if(tokens[','] && 's' === tokens.type) {
-		throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
-	}
+    if(tokens[','] && 's' === tokens.type) {
+        throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
+    }
 
-	return tokens;
+    return tokens;
 }
 
 function quote(s) {
-	return `"${s.replace(/"/g, '\\"')}"`;
+    return `"${s.replace(/"/g, '\\"')}"`;
 }
 
 function getPadAlign(align) {
-	return {
-		'<' : 'left',
-		'>' : 'right',
-		'^' : 'center',
-	}[align] || '>';
+    return {
+        '<' : 'left',
+        '>' : 'right',
+        '^' : 'center',
+    }[align] || '>';
 }
 
 function formatString(value, tokens) {
-	const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
-	const align		= tokens.align || (tokens['0'] ? '=' : '<');
-	const precision	= Number(tokens.precision || renderStringLength(value) + 1);
+    const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
+    const align		= tokens.align || (tokens['0'] ? '=' : '<');
+    const precision	= Number(tokens.precision || renderStringLength(value) + 1);
 
-	if('' !== tokens.type && 's' !== tokens.type) {
-		throw new ValueError(`Unknown format code "${tokens.type}" for String object`);
-	}
+    if('' !== tokens.type && 's' !== tokens.type) {
+        throw new ValueError(`Unknown format code "${tokens.type}" for String object`);
+    }
 
-	if(tokens[',']) {
-		throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
-	}
+    if(tokens[',']) {
+        throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
+    }
 
-	if(tokens.sign) {
-		throw new ValueError('Sign not allowed in string format specifier');
-	}
+    if(tokens.sign) {
+        throw new ValueError('Sign not allowed in string format specifier');
+    }
 
-	if(tokens['#']) {
-		throw new ValueError('Alternate form (#) not allowed in string format specifier');
-	}
+    if(tokens['#']) {
+        throw new ValueError('Alternate form (#) not allowed in string format specifier');
+    }
 
-	if('=' === align) {
-		throw new ValueError('"=" alignment not allowed in string format specifier');
-	}
+    if('=' === align) {
+        throw new ValueError('"=" alignment not allowed in string format specifier');
+    }
 
-	return pad(renderSubstr(value, 0, precision), Number(tokens.width), fill, getPadAlign(align));
+    return pad(renderSubstr(value, 0, precision), Number(tokens.width), fill, getPadAlign(align));
 }
 
 const FormatNumRegExp = {
-	UpperType	: /[A-Z]/,
-	ExponentRep	: /e[+-](?=\d$)/,
+    UpperType	: /[A-Z]/,
+    ExponentRep	: /e[+-](?=\d$)/,
 };
 
 function formatNumberHelper(n, precision, type) {
-	if(FormatNumRegExp.UpperType.test(type)) {
-		return formatNumberHelper(n, precision, type.toLowerCase()).toUpperCase();
-	}
+    if(FormatNumRegExp.UpperType.test(type)) {
+        return formatNumberHelper(n, precision, type.toLowerCase()).toUpperCase();
+    }
 
-	switch(type) {
-		case 'c' : return String.fromCharCode(n);
-		case 'd' : return n.toString(10);
-		case 'b' : return n.toString(2);
-		case 'o' : return n.toString(8);
-		case 'x' : return n.toString(16);
-		case 'e' : return n.toExponential(precision).replace(FormatNumRegExp.ExponentRep, '$&0');
-		case 'f' : return n.toFixed(precision);
-		case 'g' :
-			//	we don't want useless trailing zeros. parseFloat -> back to string fixes this for us
-			return parseFloat(n.toPrecision(precision || 1)).toString();
+    switch(type) {
+        case 'c' : return String.fromCharCode(n);
+        case 'd' : return n.toString(10);
+        case 'b' : return n.toString(2);
+        case 'o' : return n.toString(8);
+        case 'x' : return n.toString(16);
+        case 'e' : return n.toExponential(precision).replace(FormatNumRegExp.ExponentRep, '$&0');
+        case 'f' : return n.toFixed(precision);
+        case 'g' :
+            //	we don't want useless trailing zeros. parseFloat -> back to string fixes this for us
+            return parseFloat(n.toPrecision(precision || 1)).toString();
 
-		case '%' : return formatNumberHelper(n * 100, precision, 'f') + '%';
-		case ''  : return formatNumberHelper(n, precision, 'd');
+        case '%' : return formatNumberHelper(n * 100, precision, 'f') + '%';
+        case ''  : return formatNumberHelper(n, precision, 'd');
 
-		default :
-			throw new ValueError(`Unknown format code "${type}" for object of type 'float'`);
-	}
+        default :
+            throw new ValueError(`Unknown format code "${type}" for object of type 'float'`);
+    }
 }
 
 function formatNumber(value, tokens) {
-	const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
-	const align		= tokens.align || (tokens['0'] ? '=' : '>');
-	const width		= Number(tokens.width);
-	const type		= tokens.type || (tokens.precision ? 'g' : '');
+    const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
+    const align		= tokens.align || (tokens['0'] ? '=' : '>');
+    const width		= Number(tokens.width);
+    const type		= tokens.type || (tokens.precision ? 'g' : '');
 
-	if( [ 'c', 'd', 'b', 'o', 'x', 'X' ].indexOf(type) > -1) {
-		if(0 !== value % 1) {
-			throw new ValueError(`Cannot format non-integer with format specifier "${type}"`);
-		}
+    if( [ 'c', 'd', 'b', 'o', 'x', 'X' ].indexOf(type) > -1) {
+        if(0 !== value % 1) {
+            throw new ValueError(`Cannot format non-integer with format specifier "${type}"`);
+        }
 
-		if('' !== tokens.sign && 'c' !== type) {
-			throw new ValueError(`Sign not allowed with integer format specifier 'c'`);	//	eslint-disable-line quotes
-		}
+        if('' !== tokens.sign && 'c' !== type) {
+            throw new ValueError(`Sign not allowed with integer format specifier 'c'`);	//	eslint-disable-line quotes
+        }
 
-		if(tokens[','] && 'd' !== type) {
-			throw new ValueError(`Cannot specify ',' with '${type}'`);
-		}
+        if(tokens[','] && 'd' !== type) {
+            throw new ValueError(`Cannot specify ',' with '${type}'`);
+        }
 
-		if('' !== tokens.precision) {
-			throw new ValueError('Precision not allowed in integer format specifier');
-		}
-	} else if( [ 'e', 'E', 'f', 'F', 'g', 'G', '%' ].indexOf(type) > - 1) {
-		if(tokens['#']) {
-			throw new ValueError('Alternate form (#) not allowed in float format specifier');
-		}
-	}
+        if('' !== tokens.precision) {
+            throw new ValueError('Precision not allowed in integer format specifier');
+        }
+    } else if( [ 'e', 'E', 'f', 'F', 'g', 'G', '%' ].indexOf(type) > - 1) {
+        if(tokens['#']) {
+            throw new ValueError('Alternate form (#) not allowed in float format specifier');
+        }
+    }
 
-	const s			= formatNumberHelper(Math.abs(value), Number(tokens.precision || 6), type);
-	const sign		= value < 0 || 1 / value < 0 ?
-		'-' :
-		'-' === tokens.sign ? '' : tokens.sign;
+    const s			= formatNumberHelper(Math.abs(value), Number(tokens.precision || 6), type);
+    const sign		= value < 0 || 1 / value < 0 ?
+        '-' :
+        '-' === tokens.sign ? '' : tokens.sign;
 
-	const prefix	= tokens['#'] && ( [ 'b', 'o', 'x', 'X' ].indexOf(type) > -1 ) ? '0' + type : '';
+    const prefix	= tokens['#'] && ( [ 'b', 'o', 'x', 'X' ].indexOf(type) > -1 ) ? '0' + type : '';
 
-	if(tokens[',']) {
-		const match 	= /^(\d*)(.*)$/.exec(s);
-		const separated	= match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2];
+    if(tokens[',']) {
+        const match 	= /^(\d*)(.*)$/.exec(s);
+        const separated	= match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2];
 
-		if('=' !== align) {
-			return pad(sign + separated, width, fill, getPadAlign(align));
-		}
+        if('=' !== align) {
+            return pad(sign + separated, width, fill, getPadAlign(align));
+        }
 
-		if('0' === fill) {
-			const shortfall = Math.max(0, width - sign.length - separated.length);
-			const digits	= /^\d*/.exec(separated)[0].length;
-			let padding 	= '';
-			//	:TODO: do this differntly...
-			for(let n = 0; n < shortfall; n++) {
-				padding = ((digits + n) % 4 === 3 ? ',' : '0') + padding;
-			}
+        if('0' === fill) {
+            const shortfall = Math.max(0, width - sign.length - separated.length);
+            const digits	= /^\d*/.exec(separated)[0].length;
+            let padding 	= '';
+            //	:TODO: do this differntly...
+            for(let n = 0; n < shortfall; n++) {
+                padding = ((digits + n) % 4 === 3 ? ',' : '0') + padding;
+            }
 
-			return sign + (/^,/.test(padding) ? '0' : '') + padding + separated;
-		}
+            return sign + (/^,/.test(padding) ? '0' : '') + padding + separated;
+        }
 
-		return sign + pad(separated, width - sign.length, fill, getPadAlign('>'));
-	}
+        return sign + pad(separated, width - sign.length, fill, getPadAlign('>'));
+    }
 
-	if(0 === width) {
-		return sign + prefix + s;
-	}
+    if(0 === width) {
+        return sign + prefix + s;
+    }
 
-	if('=' === align) {
-		return sign + prefix + pad(s, width - sign.length - prefix.length, fill, getPadAlign('>'));
-	}
+    if('=' === align) {
+        return sign + prefix + pad(s, width - sign.length - prefix.length, fill, getPadAlign('>'));
+    }
 
-	return pad(sign + prefix + s, width, fill, getPadAlign(align));
+    return pad(sign + prefix + s, width, fill, getPadAlign(align));
 }
 
 const transformers = {
-	//	String standard
-	toUpperCase			: String.prototype.toUpperCase,
-	toLowerCase			: String.prototype.toLowerCase,
+    //	String standard
+    toUpperCase			: String.prototype.toUpperCase,
+    toLowerCase			: String.prototype.toLowerCase,
 
-	//	some super l33b BBS styles!!
-	styleUpper			: (s) => stylizeString(s, 'upper'),
-	styleLower			: (s) => stylizeString(s, 'lower'),
-	styleTitle			: (s) => stylizeString(s, 'title'),
-	styleFirstLower		: (s) => stylizeString(s, 'first lower'),
-	styleSmallVowels	: (s) => stylizeString(s, 'small vowels'),
-	styleBigVowels		: (s) => stylizeString(s, 'big vowels'),
-	styleSmallI			: (s) => stylizeString(s, 'small i'),
-	styleMixed			: (s) => stylizeString(s, 'mixed'),
-	styleL33t			: (s) => stylizeString(s, 'l33t'),
+    //	some super l33b BBS styles!!
+    styleUpper			: (s) => stylizeString(s, 'upper'),
+    styleLower			: (s) => stylizeString(s, 'lower'),
+    styleTitle			: (s) => stylizeString(s, 'title'),
+    styleFirstLower		: (s) => stylizeString(s, 'first lower'),
+    styleSmallVowels	: (s) => stylizeString(s, 'small vowels'),
+    styleBigVowels		: (s) => stylizeString(s, 'big vowels'),
+    styleSmallI			: (s) => stylizeString(s, 'small i'),
+    styleMixed			: (s) => stylizeString(s, 'mixed'),
+    styleL33t			: (s) => stylizeString(s, 'l33t'),
 
-	//	:TODO:
-	//	toMegs(), toKilobytes(), ...
-	//	toList(), toCommaList(),
+    //	:TODO:
+    //	toMegs(), toKilobytes(), ...
+    //	toList(), toCommaList(),
 
-	sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
-	sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
-	sizeAbbr			: (n) => formatByteSizeAbbr(n),
-	countWithAbbr		: (n) => formatCount(n, true, 0),
-	countWithoutAbbr	: (n) => formatCount(n, false, 0),
-	countAbbr			: (n) => formatCountAbbr(n),
+    sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
+    sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
+    sizeAbbr			: (n) => formatByteSizeAbbr(n),
+    countWithAbbr		: (n) => formatCount(n, true, 0),
+    countWithoutAbbr	: (n) => formatCount(n, false, 0),
+    countAbbr			: (n) => formatCountAbbr(n),
 };
 
 function transformValue(transformerName, value) {
-	if(transformerName in transformers) {
-		const transformer = transformers[transformerName];
-		value = transformer.apply(value, [ value ] );
-	}
+    if(transformerName in transformers) {
+        const transformer = transformers[transformerName];
+        value = transformer.apply(value, [ value ] );
+    }
 
-	return value;
+    return value;
 }
 
 //	:TODO: Use explicit set of chars for paths & function/transforms such that } is allowed as fill/etc.
 const REGEXP_BASIC_FORMAT	= /{([^.!:}]+(?:\.[^.!:}]+)*)(?:!([^:}]+))?(?::([^}]+))?}/g;
 
 function getValue(obj, path) {
-	const value = _.get(obj, path);
-	if(!_.isUndefined(value)) {
-		return _.isFunction(value) ? value() : value;
-	}
+    const value = _.get(obj, path);
+    if(!_.isUndefined(value)) {
+        return _.isFunction(value) ? value() : value;
+    }
 
-	throw new KeyError(quote(path));
+    throw new KeyError(quote(path));
 }
 
 module.exports = function format(fmt, obj) {
 
-	const re = REGEXP_BASIC_FORMAT;
-	re.lastIndex = 0;	//	reset from prev
+    const re = REGEXP_BASIC_FORMAT;
+    re.lastIndex = 0;	//	reset from prev
 
-	let match;
-	let pos;
-	let out = '';
-	let objPath ;
-	let transformer;
-	let formatSpec;
-	let value;
-	let tokens;
+    let match;
+    let pos;
+    let out = '';
+    let objPath ;
+    let transformer;
+    let formatSpec;
+    let value;
+    let tokens;
 
-	do {
-		pos		= re.lastIndex;
-		match	= re.exec(fmt);
+    do {
+        pos		= re.lastIndex;
+        match	= re.exec(fmt);
 
-		if(match) {
-			if(match.index > pos) {
-				out += fmt.slice(pos, match.index);
-			}
+        if(match) {
+            if(match.index > pos) {
+                out += fmt.slice(pos, match.index);
+            }
 
-			objPath		= match[1];
-			transformer	= match[2];
-			formatSpec	= match[3];
+            objPath		= match[1];
+            transformer	= match[2];
+            formatSpec	= match[3];
 
-			value = getValue(obj,  objPath);
-			if(transformer) {
-				value = transformValue(transformer, value);
-			}
+            value = getValue(obj,  objPath);
+            if(transformer) {
+                value = transformValue(transformer, value);
+            }
 
-			tokens = tokenizeFormatSpec(formatSpec || '');
+            tokens = tokenizeFormatSpec(formatSpec || '');
 
-			if(_.isNumber(value)) {
-				out += formatNumber(value, tokens);
-			} else {
-				out += formatString(value, tokens);
-			}
-		}
+            if(_.isNumber(value)) {
+                out += formatNumber(value, tokens);
+            } else {
+                out += formatString(value, tokens);
+            }
+        }
 
-	} while(0 !== re.lastIndex);
+    } while(0 !== re.lastIndex);
 
-	//	remainder
-	if(pos < fmt.length) {
-		out += fmt.slice(pos);
-	}
+    //	remainder
+    if(pos < fmt.length) {
+        out += fmt.slice(pos);
+    }
 
-	return out;
+    return out;
 };
diff --git a/core/string_util.js b/core/string_util.js
index 4539ea38..88f0e57e 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -34,187 +34,187 @@ const VOWELS = [ 'a', 'e', 'i', 'o', 'u' ];
 VOWELS.concat(VOWELS.map(l => l.toUpperCase()));
 
 const SIMPLE_ELITE_MAP = {
-	'a' : '4',
-	'e' : '3',
-	'i' : '1',
-	'o' : '0',
-	's' : '5',
-	't' : '7'
+    'a' : '4',
+    'e' : '3',
+    'i' : '1',
+    'o' : '0',
+    's' : '5',
+    't' : '7'
 };
 
 function stylizeString(s, style) {
-	var len = s.length;
-	var c;
-	var i;
-	var stylized = '';
+    var len = s.length;
+    var c;
+    var i;
+    var stylized = '';
 
-	switch(style) {
-		//	None/normal
-		case 'normal' :
-		case 'N' :
-			return s;
+    switch(style) {
+        //	None/normal
+        case 'normal' :
+        case 'N' :
+            return s;
 
-		//	UPPERCASE
-		case 'upper' :
-		case 'U' :
-			return s.toUpperCase();
+            //	UPPERCASE
+        case 'upper' :
+        case 'U' :
+            return s.toUpperCase();
 
-		//	lowercase
-		case 'lower' :
-		case 'l' :
-			return s.toLowerCase();
+            //	lowercase
+        case 'lower' :
+        case 'l' :
+            return s.toLowerCase();
 
-		//	Title Case
-		case 'title' :
-		case 'T' :
-			return s.replace(/\w\S*/g, function onProperCaseChar(t) {
-				return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase();
-			});
+            //	Title Case
+        case 'title' :
+        case 'T' :
+            return s.replace(/\w\S*/g, function onProperCaseChar(t) {
+                return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase();
+            });
 
-		//	fIRST lOWER
-		case 'first lower' :
-		case 'f' :
-			return s.replace(/\w\S*/g, function onFirstLowerChar(t) {
-				return t.charAt(0).toLowerCase() + t.substr(1).toUpperCase();
-			});
+            //	fIRST lOWER
+        case 'first lower' :
+        case 'f' :
+            return s.replace(/\w\S*/g, function onFirstLowerChar(t) {
+                return t.charAt(0).toLowerCase() + t.substr(1).toUpperCase();
+            });
 
-		//	SMaLL VoWeLS
-		case 'small vowels' :
-		case 'v' :
-			for(i = 0; i < len; ++i) {
-				c = s[i];
-				if(-1 !== VOWELS.indexOf(c)) {
-					stylized += c.toLowerCase();
-				} else {
-					stylized += c.toUpperCase();
-				}
-			}
-			return stylized;
+            //	SMaLL VoWeLS
+        case 'small vowels' :
+        case 'v' :
+            for(i = 0; i < len; ++i) {
+                c = s[i];
+                if(-1 !== VOWELS.indexOf(c)) {
+                    stylized += c.toLowerCase();
+                } else {
+                    stylized += c.toUpperCase();
+                }
+            }
+            return stylized;
 
-		//	bIg vOwELS
-		case 'big vowels' :
-		case 'V' :
-			for(i = 0; i < len; ++i) {
-				c = s[i];
-				if(-1 !== VOWELS.indexOf(c)) {
-					stylized += c.toUpperCase();
-				} else {
-					stylized += c.toLowerCase();
-				}
-			}
-			return stylized;
+            //	bIg vOwELS
+        case 'big vowels' :
+        case 'V' :
+            for(i = 0; i < len; ++i) {
+                c = s[i];
+                if(-1 !== VOWELS.indexOf(c)) {
+                    stylized += c.toUpperCase();
+                } else {
+                    stylized += c.toLowerCase();
+                }
+            }
+            return stylized;
 
-		//	Small i's: DEMENTiA
-		case 'small i' :
-		case 'i' :
-			return s.toUpperCase().replace(/I/g, 'i');
+            //	Small i's: DEMENTiA
+        case 'small i' :
+        case 'i' :
+            return s.toUpperCase().replace(/I/g, 'i');
 
-		//	mIxeD CaSE (random upper/lower)
-		case 'mixed' :
-		case 'M' :
-			for(i = 0; i < len; i++) {
-				if(Math.random() < 0.5) {
-					stylized += s[i].toUpperCase();
-				} else {
-					stylized += s[i].toLowerCase();
-				}
-			}
-			return stylized;
+            //	mIxeD CaSE (random upper/lower)
+        case 'mixed' :
+        case 'M' :
+            for(i = 0; i < len; i++) {
+                if(Math.random() < 0.5) {
+                    stylized += s[i].toUpperCase();
+                } else {
+                    stylized += s[i].toLowerCase();
+                }
+            }
+            return stylized;
 
-		//	l337 5p34k
-		case 'l33t' :
-		case '3' :
-			for(i = 0; i < len; ++i) {
-				c = SIMPLE_ELITE_MAP[s[i].toLowerCase()];
-				stylized += c || s[i];
-			}
-			return stylized;
-	}
+            //	l337 5p34k
+        case 'l33t' :
+        case '3' :
+            for(i = 0; i < len; ++i) {
+                c = SIMPLE_ELITE_MAP[s[i].toLowerCase()];
+                stylized += c || s[i];
+            }
+            return stylized;
+    }
 
-	return s;
+    return s;
 }
 
 function pad(s, len, padChar, justify, stringSGR, padSGR, useRenderLen) {
-	len				= len || 0;
-	padChar			= padChar || ' ';
-	justify			= justify || 'left';
-	stringSGR		= stringSGR || '';
-	padSGR			= padSGR || '';
-	useRenderLen 	= _.isUndefined(useRenderLen) ? true : useRenderLen;
+    len				= len || 0;
+    padChar			= padChar || ' ';
+    justify			= justify || 'left';
+    stringSGR		= stringSGR || '';
+    padSGR			= padSGR || '';
+    useRenderLen 	= _.isUndefined(useRenderLen) ? true : useRenderLen;
 
-	const renderLen	= useRenderLen ? renderStringLength(s) : s.length;
-	const padlen	= len >= renderLen ? len - renderLen : 0;
+    const renderLen	= useRenderLen ? renderStringLength(s) : s.length;
+    const padlen	= len >= renderLen ? len - renderLen : 0;
 
-	switch(justify) {
-		case 'L' :
-		case 'left' :
-			s = `${stringSGR}${s}${padSGR}${Array(padlen).join(padChar)}`;
-			break;
+    switch(justify) {
+        case 'L' :
+        case 'left' :
+            s = `${stringSGR}${s}${padSGR}${Array(padlen).join(padChar)}`;
+            break;
 
-		case 'C' :
-		case 'center' :
-		case 'both' :
-			{
-				const right	= Math.ceil(padlen / 2);
-				const left	= padlen - right;
-				s			= `${padSGR}${Array(left + 1).join(padChar)}${stringSGR}${s}${padSGR}${Array(right + 1).join(padChar)}`;
-			}
-			break;
+        case 'C' :
+        case 'center' :
+        case 'both' :
+            {
+                const right	= Math.ceil(padlen / 2);
+                const left	= padlen - right;
+                s			= `${padSGR}${Array(left + 1).join(padChar)}${stringSGR}${s}${padSGR}${Array(right + 1).join(padChar)}`;
+            }
+            break;
 
-		case 'R' :
-		case 'right' :
-			s = `${padSGR}${Array(padlen).join(padChar)}${stringSGR}${s}`;
-			break;
+        case 'R' :
+        case 'right' :
+            s = `${padSGR}${Array(padlen).join(padChar)}${stringSGR}${s}`;
+            break;
 
-		default : break;
-	}
+        default : break;
+    }
 
-	return stringSGR + s;
+    return stringSGR + s;
 }
 
 function insert(s, index, substr) {
-	return `${s.slice(0, index)}${substr}${s.slice(index)}`;
+    return `${s.slice(0, index)}${substr}${s.slice(index)}`;
 }
 
 function replaceAt(s, n, t) {
-	return s.substring(0, n) + t + s.substring(n + 1);
+    return s.substring(0, n) + t + s.substring(n + 1);
 }
 
 const RE_NON_PRINTABLE =
 	/[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;	//	eslint-disable-line no-control-regex
 
 function isPrintable(s) {
-	//
-	//	See the following:
-	//		https://mathiasbynens.be/notes/javascript-unicode
-	//		http://stackoverflow.com/questions/11598786/how-to-replace-non-printable-unicode-characters-javascript
-	//		http://stackoverflow.com/questions/12052825/regular-expression-for-all-printable-characters-in-javascript
-	//
-	//	:TODO: Probably need somthing better here.
-	return !RE_NON_PRINTABLE.test(s);
+    //
+    //	See the following:
+    //		https://mathiasbynens.be/notes/javascript-unicode
+    //		http://stackoverflow.com/questions/11598786/how-to-replace-non-printable-unicode-characters-javascript
+    //		http://stackoverflow.com/questions/12052825/regular-expression-for-all-printable-characters-in-javascript
+    //
+    //	:TODO: Probably need somthing better here.
+    return !RE_NON_PRINTABLE.test(s);
 }
 
 function stripAllLineFeeds(s) {
-	return s.replace(/\r?\n|[\r\u2028\u2029]/g, '');
+    return s.replace(/\r?\n|[\r\u2028\u2029]/g, '');
 }
 
 function debugEscapedString(s) {
-	return JSON.stringify(s).slice(1, -1);
+    return JSON.stringify(s).slice(1, -1);
 }
 
 function stringFromNullTermBuffer(buf, encoding) {
-	let nullPos = buf.indexOf( 0x00 );
-	if(-1 === nullPos) {
-		nullPos = buf.length;
-	}
+    let nullPos = buf.indexOf( 0x00 );
+    if(-1 === nullPos) {
+        nullPos = buf.length;
+    }
 
-	return iconv.decode(buf.slice(0, nullPos), encoding || 'utf-8');
+    return iconv.decode(buf.slice(0, nullPos), encoding || 'utf-8');
 }
 
 function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1 } ) {
-	let buf = iconv.encode( `${s}\0`, options.encoding ).slice(0, options.maxBufLen);
-	buf[buf.length - 1] = '\0';	//	make abs sure we null term even if truncated
-	return buf;
+    let buf = iconv.encode( `${s}\0`, options.encoding ).slice(0, options.maxBufLen);
+    buf[buf.length - 1] = '\0';	//	make abs sure we null term even if truncated
+    return buf;
 }
 
 const PIPE_REGEXP			= /(\|[A-Z\d]{2})/g;
@@ -226,45 +226,45 @@ const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMa
 //	Similar to substr() but works with ANSI/Pipe code strings
 //
 function renderSubstr(str, start, length) {
-	//	shortcut for empty strings
-	if(0 === str.length) {
-		return str;
-	}
+    //	shortcut for empty strings
+    if(0 === str.length) {
+        return str;
+    }
 
-	start	= start || 0;
-	length	= length || str.length - start;
+    start	= start || 0;
+    length	= length || str.length - start;
 
-	const re = ANSI_OR_PIPE_REGEXP;
-	re.lastIndex	 = 0;	//	we recycle the obj; must reset!
+    const re = ANSI_OR_PIPE_REGEXP;
+    re.lastIndex	 = 0;	//	we recycle the obj; must reset!
 
-	let pos = 0;
-	let match;
-	let out = '';
-	let renderLen = 0;
-	let s;
-	do {
-		pos		= re.lastIndex;
-		match	= re.exec(str);
+    let pos = 0;
+    let match;
+    let out = '';
+    let renderLen = 0;
+    let s;
+    do {
+        pos		= re.lastIndex;
+        match	= re.exec(str);
 
-		if(match) {
-			if(match.index > pos) {
-				s = str.slice(pos + start, Math.min(match.index, pos + (length - renderLen)));
-				start		= 0;	//	start offset applies only once
-				out			+= s;
-				renderLen	+= s.length;
-			}
+        if(match) {
+            if(match.index > pos) {
+                s = str.slice(pos + start, Math.min(match.index, pos + (length - renderLen)));
+                start		= 0;	//	start offset applies only once
+                out			+= s;
+                renderLen	+= s.length;
+            }
 
-			out += match[0];
-		}
-	} while(renderLen < length && 0 !== re.lastIndex);
+            out += match[0];
+        }
+    } while(renderLen < length && 0 !== re.lastIndex);
 
-	//	remainder
-	if(pos + start < str.length && renderLen < length) {
-		out += str.slice(pos + start, (pos + start + (length - renderLen)));
-		//out += str.slice(pos + start, Math.max(1, pos + (length - renderLen - 1)));
-	}
+    //	remainder
+    if(pos + start < str.length && renderLen < length) {
+        out += str.slice(pos + start, (pos + start + (length - renderLen)));
+        //out += str.slice(pos + start, Math.max(1, pos + (length - renderLen - 1)));
+    }
 
-	return out;
+    return out;
 }
 
 //
@@ -276,75 +276,75 @@ function renderSubstr(str, start, length) {
 //	See also https://github.com/chalk/ansi-regex/blob/master/index.js
 //
 function renderStringLength(s) {
-	let m;
-	let pos;
-	let len = 0;
+    let m;
+    let pos;
+    let len = 0;
 
-	const re = ANSI_OR_PIPE_REGEXP;
-	re.lastIndex = 0;	//	we recycle the rege; reset
+    const re = ANSI_OR_PIPE_REGEXP;
+    re.lastIndex = 0;	//	we recycle the rege; reset
 
-	//
-	//	Loop counting only literal (non-control) sequences
-	//	paying special attention to ESC[<N>C which means forward <N>
-	//
-	do {
-		pos	= re.lastIndex;
-		m	= re.exec(s);
+    //
+    //	Loop counting only literal (non-control) sequences
+    //	paying special attention to ESC[<N>C which means forward <N>
+    //
+    do {
+        pos	= re.lastIndex;
+        m	= re.exec(s);
 
-		if(m) {
-			if(m.index > pos) {
-				len += s.slice(pos, m.index).length;
-			}
+        if(m) {
+            if(m.index > pos) {
+                len += s.slice(pos, m.index).length;
+            }
 
-			if('C' === m[3]) {	//	ESC[<N>C is foward/right
-				len += parseInt(m[2], 10) || 0;
-			}
-		}
-	} while(0 !== re.lastIndex);
+            if('C' === m[3]) {	//	ESC[<N>C is foward/right
+                len += parseInt(m[2], 10) || 0;
+            }
+        }
+    } while(0 !== re.lastIndex);
 
-	if(pos < s.length) {
-		len += s.slice(pos).length;
-	}
+    if(pos < s.length) {
+        len += s.slice(pos).length;
+    }
 
-	return len;
+    return len;
 }
 
 const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:)
 
 function formatByteSizeAbbr(byteSize) {
-	if(0 === byteSize) {
-		return BYTE_SIZE_ABBRS[0];	//	B
-	}
+    if(0 === byteSize) {
+        return BYTE_SIZE_ABBRS[0];	//	B
+    }
 
-	return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
+    return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
 }
 
 function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
-	const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
-	let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
-	if(withAbbr) {
-		result += ` ${BYTE_SIZE_ABBRS[i]}`;
-	}
-	return result;
+    const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
+    let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
+    if(withAbbr) {
+        result += ` ${BYTE_SIZE_ABBRS[i]}`;
+    }
+    return result;
 }
 
 const COUNT_ABBRS = [ '', 'K', 'M', 'B', 'T', 'P', 'E', 'Z', 'Y' ];
 
 function formatCountAbbr(count) {
-	if(count < 1000) {
-		return '';
-	}
+    if(count < 1000) {
+        return '';
+    }
 
-	return COUNT_ABBRS[Math.floor(Math.log(count) / Math.log(1000))];
+    return COUNT_ABBRS[Math.floor(Math.log(count) / Math.log(1000))];
 }
 
 function formatCount(count, withAbbr = false, decimals = 2) {
-	const i		= 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
-	let result	= parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
-	if(withAbbr) {
-		result += `${COUNT_ABBRS[i]}`;
-	}
-	return result;
+    const i		= 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
+    let result	= parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
+    if(withAbbr) {
+        result += `${COUNT_ABBRS[i]}`;
+    }
+    return result;
 }
 
 
@@ -352,52 +352,52 @@ function formatCount(count, withAbbr = false, decimals = 2) {
 //const REGEXP_ANSI_CONTROL_CODES		= /(\x1b\x5b)([\?=;0-9]*?)([0-9A-ORZcf-npsu=><])/g;
 const REGEXP_ANSI_CONTROL_CODES		= /(?:\x1b\x5b)([?=;0-9]*?)([A-ORZcf-npsu=><])/g;	//	eslint-disable-line no-control-regex
 const ANSI_OPCODES_ALLOWED_CLEAN	= [
-	//'A', 'B',	//	up, down
-	//'C', 'D',	//	right, left
-	'm',		//	color
+    //'A', 'B',	//	up, down
+    //'C', 'D',	//	right, left
+    'm',		//	color
 ];
 
 function cleanControlCodes(input, options) {
-	let m;
-	let pos;
-	let cleaned = '';
+    let m;
+    let pos;
+    let cleaned = '';
 
-	options = options || {};
+    options = options || {};
 
-	//
-	//	Loop through |input| adding only allowed ESC
-	//	sequences and literals to |cleaned|
-	//
-	do {
-		pos	= REGEXP_ANSI_CONTROL_CODES.lastIndex;
-		m	= REGEXP_ANSI_CONTROL_CODES.exec(input);
+    //
+    //	Loop through |input| adding only allowed ESC
+    //	sequences and literals to |cleaned|
+    //
+    do {
+        pos	= REGEXP_ANSI_CONTROL_CODES.lastIndex;
+        m	= REGEXP_ANSI_CONTROL_CODES.exec(input);
 
-		if(m) {
-			if(m.index > pos) {
-				cleaned += input.slice(pos, m.index);
-			}
+        if(m) {
+            if(m.index > pos) {
+                cleaned += input.slice(pos, m.index);
+            }
 
-			if(options.all) {
-				continue;
-			}
+            if(options.all) {
+                continue;
+            }
 
-			if(ANSI_OPCODES_ALLOWED_CLEAN.indexOf(m[2].charAt(0)) > -1) {
-				cleaned += m[0];
-			}
-		}
+            if(ANSI_OPCODES_ALLOWED_CLEAN.indexOf(m[2].charAt(0)) > -1) {
+                cleaned += m[0];
+            }
+        }
 
-	} while(0 !== REGEXP_ANSI_CONTROL_CODES.lastIndex);
+    } while(0 !== REGEXP_ANSI_CONTROL_CODES.lastIndex);
 
-	//	remainder
-	if(pos < input.length) {
-		cleaned += input.slice(pos);
-	}
+    //	remainder
+    if(pos < input.length) {
+        cleaned += input.slice(pos);
+    }
 
-	return cleaned;
+    return cleaned;
 }
 
 function isAnsiLine(line) {
-	return isAnsi(line);// || renderStringLength(line) < line.length;
+    return isAnsi(line);// || renderStringLength(line) < line.length;
 }
 
 //
@@ -410,39 +410,39 @@ function isAnsiLine(line) {
 //	* Contigous 3+ spaces before the end of the line
 //
 function isFormattedLine(line) {
-	if(renderStringLength(line) < line.length) {
-		return true;	//	ANSI or Pipe Codes
-	}
+    if(renderStringLength(line) < line.length) {
+        return true;	//	ANSI or Pipe Codes
+    }
 
-	if(line.match(/[\t\x00-\x1f\x80-\xff]/)) {	//	eslint-disable-line no-control-regex
-		return true;
-	}
+    if(line.match(/[\t\x00-\x1f\x80-\xff]/)) {	//	eslint-disable-line no-control-regex
+        return true;
+    }
 
-	if(_.trimEnd(line).match(/[ ]{3,}/)) {
-		return true;
-	}
+    if(_.trimEnd(line).match(/[ ]{3,}/)) {
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 //	:TODO: rename to containsAnsi()
 function isAnsi(input) {
-	if(!input || 0 === input.length) {
-		return false;
-	}
+    if(!input || 0 === input.length) {
+        return false;
+    }
 
-	//
-	//	* ANSI found - limited, just colors
-	//	* Full ANSI art
-	//	*
-	//
-	//	FULL ANSI art:
-	//	* SAUCE present & reports as ANSI art
-	//	* ANSI clear screen within first 2-3 codes
-	//	* ANSI movement codes (goto, right, left, etc.)
-	//
-	//	*
-	/*
+    //
+    //	* ANSI found - limited, just colors
+    //	* Full ANSI art
+    //	*
+    //
+    //	FULL ANSI art:
+    //	* SAUCE present & reports as ANSI art
+    //	* ANSI clear screen within first 2-3 codes
+    //	* ANSI movement codes (goto, right, left, etc.)
+    //
+    //	*
+    /*
 	readSAUCE(input, (err, sauce) => {
 		if(!err && ('ANSi' === sauce.fileType || 'ANSiMation' === sauce.fileType)) {
 			return cb(null, 'ansi');
@@ -450,12 +450,12 @@ function isAnsi(input) {
 	});
 	*/
 
-	//	:TODO: if a similar method is kept, use exec() until threshold
-	const ANSI_DET_REGEXP = /(?:\x1b\x5b)[?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g;	//	eslint-disable-line no-control-regex
-	const m = input.match(ANSI_DET_REGEXP) || [];
-	return m.length >= 4;	//	:TODO: do this reasonably, e.g. a percent or soemthing
+    //	:TODO: if a similar method is kept, use exec() until threshold
+    const ANSI_DET_REGEXP = /(?:\x1b\x5b)[?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g;	//	eslint-disable-line no-control-regex
+    const m = input.match(ANSI_DET_REGEXP) || [];
+    return m.length >= 4;	//	:TODO: do this reasonably, e.g. a percent or soemthing
 }
 
 function splitTextAtTerms(s) {
-	return s.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
+    return s.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
 }
diff --git a/core/system_events.js b/core/system_events.js
index a5e94cc1..e471c712 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -2,24 +2,24 @@
 'use strict';
 
 module.exports = {
-	ClientConnected		: 'codes.l33t.enigma.system.connected',			//	{ client, connectionCount }
-	ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',		//	{ client, connectionCount }
-	TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
+    ClientConnected		: 'codes.l33t.enigma.system.connected',			//	{ client, connectionCount }
+    ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',		//	{ client, connectionCount }
+    TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
 
-	ThemeChanged		: 'codes.l33t.enigma.system.theme_changed',		//	{ themeId }
-	ConfigChanged		: 'codes.l33t.enigma.system.config_changed',
-	MenusChanged		: 'codes.l33t.enigma.system.menus_changed',
-	PromptsChanged		: 'codes.l33t.enigma.system.prompts_changed',
+    ThemeChanged		: 'codes.l33t.enigma.system.theme_changed',		//	{ themeId }
+    ConfigChanged		: 'codes.l33t.enigma.system.config_changed',
+    MenusChanged		: 'codes.l33t.enigma.system.menus_changed',
+    PromptsChanged		: 'codes.l33t.enigma.system.prompts_changed',
 
-	//	User - includes { user, ...}
-	NewUser				: 'codes.l33t.enigma.system.new_user',
-	UserLogin			: 'codes.l33t.enigma.system.user_login',
-	UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
-	UserUpload			: 'codes.l33t.enigma.system.user_upload',		//	{..., files[ fileEntry, ...] }
-	UserDownload		: 'codes.l33t.enigma.system.user_download',		//	{..., files[ fileEntry, ...] }
+    //	User - includes { user, ...}
+    NewUser				: 'codes.l33t.enigma.system.new_user',
+    UserLogin			: 'codes.l33t.enigma.system.user_login',
+    UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
+    UserUpload			: 'codes.l33t.enigma.system.user_upload',		//	{..., files[ fileEntry, ...] }
+    UserDownload		: 'codes.l33t.enigma.system.user_download',		//	{..., files[ fileEntry, ...] }
 
-	//	NYI below here:
-	UserPostMessage		: 'codes.l33t.enigma.system.user_post_msg',
-	UserSendMail		: 'codes.l33t.enigma.system.user_send_mail',
-	UserSendRunDoor		: 'codes.l33t.enigma.system.user_run_door',
+    //	NYI below here:
+    UserPostMessage		: 'codes.l33t.enigma.system.user_post_msg',
+    UserSendMail		: 'codes.l33t.enigma.system.user_send_mail',
+    UserSendRunDoor		: 'codes.l33t.enigma.system.user_run_door',
 };
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 8a20af02..55da7430 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -23,151 +23,151 @@ exports.sendForgotPasswordEmail	= sendForgotPasswordEmail;
 
 function login(callingMenu, formData, extraArgs, cb) {
 
-	userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
-		if(err) {
-			//	login failure
-			if(err.existingConn && _.has(callingMenu, 'menuConfig.config.tooNodeMenu')) {
-				return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
-			} else {
-				//	Other error
-				return callingMenu.prevMenu(cb);
-			}
-		}
+    userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
+        if(err) {
+            //	login failure
+            if(err.existingConn && _.has(callingMenu, 'menuConfig.config.tooNodeMenu')) {
+                return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
+            } else {
+                //	Other error
+                return callingMenu.prevMenu(cb);
+            }
+        }
 
-		//	success!
-		return callingMenu.nextMenu(cb);
-	});
+        //	success!
+        return callingMenu.nextMenu(cb);
+    });
 }
 
 function logoff(callingMenu, formData, extraArgs, cb) {
-	//
-	//	Simple logoff. Note that recording of @ logoff properties/stats
-	//	occurs elsewhere!
-	//
-	const client = callingMenu.client;
+    //
+    //	Simple logoff. Note that recording of @ logoff properties/stats
+    //	occurs elsewhere!
+    //
+    const client = callingMenu.client;
 
-	setTimeout( () => {
-		//
-		//	For giggles...
-		//
-		client.term.write(
-			ansiNormal() +	'\n' +
+    setTimeout( () => {
+        //
+        //	For giggles...
+        //
+        client.term.write(
+            ansiNormal() +	'\n' +
 			iconv.decode(require('crypto').randomBytes(Math.floor(Math.random() * 65) + 20), client.term.outputEncoding) +
 			'NO CARRIER', null, () => {
 
-				//	after data is written, disconnect & remove the client
-				removeClient(client);
-				return cb(null);
-			}
-		);
-	}, 500);
+                //	after data is written, disconnect & remove the client
+                removeClient(client);
+                return cb(null);
+            }
+        );
+    }, 500);
 }
 
 function prevMenu(callingMenu, formData, extraArgs, cb) {
 
-	//	:TODO: this is a pretty big hack -- need the whole key map concep there like other places
-	if(formData.key && 'return' === formData.key.name) {
-		callingMenu.submitFormData = formData;
-	}
+    //	:TODO: this is a pretty big hack -- need the whole key map concep there like other places
+    if(formData.key && 'return' === formData.key.name) {
+        callingMenu.submitFormData = formData;
+    }
 
-	callingMenu.prevMenu( err => {
-		if(err) {
-			callingMenu.client.log.error( { error : err.message }, 'Error attempting to fallback!');
-		}
-		return cb(err);
-	});
+    callingMenu.prevMenu( err => {
+        if(err) {
+            callingMenu.client.log.error( { error : err.message }, 'Error attempting to fallback!');
+        }
+        return cb(err);
+    });
 }
 
 function nextMenu(callingMenu, formData, extraArgs, cb) {
-	callingMenu.nextMenu( err => {
-		if(err) {
-			callingMenu.client.log.error( { error : err.message}, 'Error attempting to go to next menu!');
-		}
-		return cb(err);
-	});
+    callingMenu.nextMenu( err => {
+        if(err) {
+            callingMenu.client.log.error( { error : err.message}, 'Error attempting to go to next menu!');
+        }
+        return cb(err);
+    });
 }
 
 //	:TODO: prev/nextConf, prev/nextArea should use a NYI MenuModule.redraw() or such -- avoid pop/goto() hack!
 function reloadMenu(menu, cb) {
-	const prevMenu = menu.client.menuStack.pop();
-	prevMenu.instance.leave();
-	menu.client.menuStack.goto(prevMenu.name, cb);
+    const prevMenu = menu.client.menuStack.pop();
+    prevMenu.instance.leave();
+    menu.client.menuStack.goto(prevMenu.name, cb);
 }
 
 function prevConf(callingMenu, formData, extraArgs, cb) {
-	const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
-	const currIndex = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag) || confs.length;
+    const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
+    const currIndex = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag) || confs.length;
 
-	messageArea.changeMessageConference(callingMenu.client, confs[currIndex - 1].confTag, err => {
-		if(err) {
-			return cb(err);	//	logged within changeMessageConference()
-		}
+    messageArea.changeMessageConference(callingMenu.client, confs[currIndex - 1].confTag, err => {
+        if(err) {
+            return cb(err);	//	logged within changeMessageConference()
+        }
 
-		return reloadMenu(callingMenu, cb);
-	});
+        return reloadMenu(callingMenu, cb);
+    });
 }
 
 function nextConf(callingMenu, formData, extraArgs, cb) {
-	const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
-	let currIndex	= confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag);
+    const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
+    let currIndex	= confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag);
 
-	if(currIndex === confs.length - 1) {
-		currIndex = -1;
-	}
+    if(currIndex === confs.length - 1) {
+        currIndex = -1;
+    }
 
-	messageArea.changeMessageConference(callingMenu.client, confs[currIndex + 1].confTag, err => {
-		if(err) {
-			return cb(err);	//	logged within changeMessageConference()
-		}
+    messageArea.changeMessageConference(callingMenu.client, confs[currIndex + 1].confTag, err => {
+        if(err) {
+            return cb(err);	//	logged within changeMessageConference()
+        }
 
-		return reloadMenu(callingMenu, cb);
-	});
+        return reloadMenu(callingMenu, cb);
+    });
 }
 
 function prevArea(callingMenu, formData, extraArgs, cb) {
-	const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
-	const currIndex = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag) || areas.length;
+    const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
+    const currIndex = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag) || areas.length;
 
-	messageArea.changeMessageArea(callingMenu.client, areas[currIndex - 1].areaTag, err => {
-		if(err) {
-			return cb(err);	//	logged within changeMessageArea()
-		}
+    messageArea.changeMessageArea(callingMenu.client, areas[currIndex - 1].areaTag, err => {
+        if(err) {
+            return cb(err);	//	logged within changeMessageArea()
+        }
 
-		return reloadMenu(callingMenu, cb);
-	});
+        return reloadMenu(callingMenu, cb);
+    });
 }
 
 function nextArea(callingMenu, formData, extraArgs, cb) {
-	const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
-	let currIndex	= areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag);
+    const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
+    let currIndex	= areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag);
 
-	if(currIndex === areas.length - 1) {
-		currIndex = -1;
-	}
+    if(currIndex === areas.length - 1) {
+        currIndex = -1;
+    }
 
-	messageArea.changeMessageArea(callingMenu.client, areas[currIndex + 1].areaTag, err => {
-		if(err) {
-			return cb(err);	//	logged within changeMessageArea()
-		}
+    messageArea.changeMessageArea(callingMenu.client, areas[currIndex + 1].areaTag, err => {
+        if(err) {
+            return cb(err);	//	logged within changeMessageArea()
+        }
 
-		return reloadMenu(callingMenu, cb);
-	});
+        return reloadMenu(callingMenu, cb);
+    });
 }
 
 function sendForgotPasswordEmail(callingMenu, formData, extraArgs, cb) {
-	const username = formData.value.username || callingMenu.client.user.username;
+    const username = formData.value.username || callingMenu.client.user.username;
 
-	const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
+    const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
 
-	WebPasswordReset.sendForgotPasswordEmail(username, err => {
-		if(err) {
-			callingMenu.client.log.warn( { err : err.message }, 'Failed sending forgot password email');
-		}
+    WebPasswordReset.sendForgotPasswordEmail(username, err => {
+        if(err) {
+            callingMenu.client.log.warn( { err : err.message }, 'Failed sending forgot password email');
+        }
 
-		if(extraArgs.next) {
-			return callingMenu.gotoMenu(extraArgs.next, cb);
-		}
+        if(extraArgs.next) {
+            return callingMenu.gotoMenu(extraArgs.next, cb);
+        }
 
-		return logoff(callingMenu, formData, extraArgs, cb);
-	});
+        return logoff(callingMenu, formData, extraArgs, cb);
+    });
 }
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index e2d01a89..397f08c0 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -22,135 +22,135 @@ exports.validateBirthdate					= validateBirthdate;
 exports.validatePasswordSpec				= validatePasswordSpec;
 
 function validateNonEmpty(data, cb) {
-	return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
+    return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
 }
 
 function validateMessageSubject(data, cb) {
-	return cb(data && data.length > 1 ? null : new Error('Subject too short'));
+    return cb(data && data.length > 1 ? null : new Error('Subject too short'));
 }
 
 function validateUserNameAvail(data, cb) {
-	const config = Config();
-	if(!data || data.length < config.users.usernameMin) {
-		cb(new Error('Username too short'));
-	} else if(data.length > config.users.usernameMax) {
-		//	generally should be unreached due to view restraints
-		return cb(new Error('Username too long'));
-	} else {
-		const usernameRegExp	= new RegExp(config.users.usernamePattern);
-		const invalidNames		= config.users.newUserNames + config.users.badUserNames;
+    const config = Config();
+    if(!data || data.length < config.users.usernameMin) {
+        cb(new Error('Username too short'));
+    } else if(data.length > config.users.usernameMax) {
+        //	generally should be unreached due to view restraints
+        return cb(new Error('Username too long'));
+    } else {
+        const usernameRegExp	= new RegExp(config.users.usernamePattern);
+        const invalidNames		= config.users.newUserNames + config.users.badUserNames;
 
-		if(!usernameRegExp.test(data)) {
-			return cb(new Error('Username contains invalid characters'));
-		} else if(invalidNames.indexOf(data.toLowerCase()) > -1) {
-			return cb(new Error('Username is blacklisted'));
-		} else if(/^[0-9]+$/.test(data)) {
-			return cb(new Error('Username cannot be a number'));
-		} else {
-			//	a new user name cannot be an existing user name or an existing real name
-			User.getUserIdAndNameByLookup(data, function userIdAndName(err) {
-				if(!err) {	//	err is null if we succeeded -- meaning this user exists already
-					return cb(new Error('Username unavailable'));
-				}
+        if(!usernameRegExp.test(data)) {
+            return cb(new Error('Username contains invalid characters'));
+        } else if(invalidNames.indexOf(data.toLowerCase()) > -1) {
+            return cb(new Error('Username is blacklisted'));
+        } else if(/^[0-9]+$/.test(data)) {
+            return cb(new Error('Username cannot be a number'));
+        } else {
+            //	a new user name cannot be an existing user name or an existing real name
+            User.getUserIdAndNameByLookup(data, function userIdAndName(err) {
+                if(!err) {	//	err is null if we succeeded -- meaning this user exists already
+                    return cb(new Error('Username unavailable'));
+                }
 
-				return cb(null);
-			});
-		}
-	}
+                return cb(null);
+            });
+        }
+    }
 }
 
 const invalidUserNameError = () => new Error('Invalid username');
 
 function validateUserNameExists(data, cb) {
-	if(0 === data.length) {
-		return cb(invalidUserNameError());
-	}
+    if(0 === data.length) {
+        return cb(invalidUserNameError());
+    }
 
-	User.getUserIdAndName(data, (err) => {
-		return cb(err ? invalidUserNameError() : null);
-	});
+    User.getUserIdAndName(data, (err) => {
+        return cb(err ? invalidUserNameError() : null);
+    });
 }
 
 function validateUserNameOrRealNameExists(data, cb) {
-	if(0 === data.length) {
-		return cb(invalidUserNameError());
-	}
+    if(0 === data.length) {
+        return cb(invalidUserNameError());
+    }
 
-	User.getUserIdAndNameByLookup(data, err => {
-		return cb(err ? invalidUserNameError() : null);
-	});
+    User.getUserIdAndNameByLookup(data, err => {
+        return cb(err ? invalidUserNameError() : null);
+    });
 }
 
 function validateGeneralMailAddressedTo(data, cb) {
-	//
-	//	Allow any supported addressing:
-	//	- Local username or real name
-	//	- Supported remote flavors such as FTN, email, ...
-	//
-	//	:TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
-	const addressedToInfo = getAddressedToInfo(data);
+    //
+    //	Allow any supported addressing:
+    //	- Local username or real name
+    //	- Supported remote flavors such as FTN, email, ...
+    //
+    //	:TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
+    const addressedToInfo = getAddressedToInfo(data);
 
-	if(Message.AddressFlavor.FTN === addressedToInfo.flavor) {
-		return cb(null);
-	}
+    if(Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+        return cb(null);
+    }
 
-	return validateUserNameOrRealNameExists(data, cb);
+    return validateUserNameOrRealNameExists(data, cb);
 }
 
 function validateEmailAvail(data, cb) {
-	//
-	//	This particular method allows empty data - e.g. no email entered
-	//
-	if(!data || 0 === data.length) {
-		return cb(null);
-	}
+    //
+    //	This particular method allows empty data - e.g. no email entered
+    //
+    if(!data || 0 === data.length) {
+        return cb(null);
+    }
 
-	//
-	//	Otherwise, it must be a valid email. We'll be pretty lose here, like
-	//	the HTML5 spec.
-	//
-	//	See http://stackoverflow.com/questions/7786058/find-the-regex-used-by-html5-forms-for-validation
-	//
-	const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
-	if(!emailRegExp.test(data)) {
-		return cb(new Error('Invalid email address'));
-	}
+    //
+    //	Otherwise, it must be a valid email. We'll be pretty lose here, like
+    //	the HTML5 spec.
+    //
+    //	See http://stackoverflow.com/questions/7786058/find-the-regex-used-by-html5-forms-for-validation
+    //
+    const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
+    if(!emailRegExp.test(data)) {
+        return cb(new Error('Invalid email address'));
+    }
 
-	User.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
-		if(err) {
-			return cb(new Error('Internal system error'));
-		} else if(uids.length > 0) {
-			return cb(new Error('Email address not unique'));
-		}
+    User.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
+        if(err) {
+            return cb(new Error('Internal system error'));
+        } else if(uids.length > 0) {
+            return cb(new Error('Email address not unique'));
+        }
 
-		return cb(null);
-	});
+        return cb(null);
+    });
 }
 
 
 function validateBirthdate(data, cb) {
-	//	:TODO: check for dates in the future, or > reasonable values
-	return cb(isNaN(Date.parse(data)) ? new Error('Invalid birthdate') : null);
+    //	:TODO: check for dates in the future, or > reasonable values
+    return cb(isNaN(Date.parse(data)) ? new Error('Invalid birthdate') : null);
 }
 
 function validatePasswordSpec(data, cb) {
-	const config = Config();
-	if(!data || data.length < config.users.passwordMin) {
-		return cb(new Error('Password too short'));
-	}
+    const config = Config();
+    if(!data || data.length < config.users.passwordMin) {
+        return cb(new Error('Password too short'));
+    }
 
-	//	check badpass, if avail
-	fs.readFile(config.users.badPassFile, 'utf8', (err, passwords) => {
-		if(err) {
-			Log.warn( { error : err.message }, 'Cannot read bad pass file');
-			return cb(null);
-		}
+    //	check badpass, if avail
+    fs.readFile(config.users.badPassFile, 'utf8', (err, passwords) => {
+        if(err) {
+            Log.warn( { error : err.message }, 'Cannot read bad pass file');
+            return cb(null);
+        }
 
-		passwords = passwords.toString().split(/\r\n|\n/g);
-		if(passwords.includes(data)) {
-			return cb(new Error('Password is too common'));
-		}
+        passwords = passwords.toString().split(/\r\n|\n/g);
+        if(passwords.includes(data)) {
+            return cb(new Error('Password is too common'));
+        }
 
-		return cb(null);
-	});
+        return cb(null);
+    });
 }
diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 36d12f5d..5276ebb0 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -28,191 +28,191 @@ const buffers		= require('buffers');
 
 //	:TODO: ENH: Support nodeMax and tooManyArt
 exports.moduleInfo = {
-	name	: 'Telnet Bridge',
-	desc	: 'Connect to other Telnet Systems',
-	author	: 'Andrew Pamment',
+    name	: 'Telnet Bridge',
+    desc	: 'Connect to other Telnet Systems',
+    author	: 'Andrew Pamment',
 };
 
 const IAC_DO_TERM_TYPE = Buffer.from( [ 255, 253, 24 ] );
 
 class TelnetClientConnection extends EventEmitter {
-	constructor(client) {
-		super();
+    constructor(client) {
+        super();
 
-		this.client		= client;
-	}
+        this.client		= client;
+    }
 
 
-	restorePipe() {
-		if(!this.pipeRestored) {
-			this.pipeRestored = true;
+    restorePipe() {
+        if(!this.pipeRestored) {
+            this.pipeRestored = true;
 
-			//	client may have bailed
-			if(null !== _.get(this, 'client.term.output', null)) {
-				if(this.bridgeConnection) {
-					this.client.term.output.unpipe(this.bridgeConnection);
-				}
-				this.client.term.output.resume();
-			}
-		}
-	}
+            //	client may have bailed
+            if(null !== _.get(this, 'client.term.output', null)) {
+                if(this.bridgeConnection) {
+                    this.client.term.output.unpipe(this.bridgeConnection);
+                }
+                this.client.term.output.resume();
+            }
+        }
+    }
 
-	connect(connectOpts) {
-		this.bridgeConnection = net.createConnection(connectOpts, () => {
-			this.emit('connected');
+    connect(connectOpts) {
+        this.bridgeConnection = net.createConnection(connectOpts, () => {
+            this.emit('connected');
 
-			this.pipeRestored = false;
-			this.client.term.output.pipe(this.bridgeConnection);
-		});
+            this.pipeRestored = false;
+            this.client.term.output.pipe(this.bridgeConnection);
+        });
 
-		this.bridgeConnection.on('data', data => {
-			this.client.term.rawWrite(data);
+        this.bridgeConnection.on('data', data => {
+            this.client.term.rawWrite(data);
 
-			//
-			//	Wait for a terminal type request, and send it eactly once.
-			//	This is enough (in additional to other negotiations handled in telnet.js)
-			//	to get us in on most systems
-			//
-			if(!this.termSent && data.indexOf(IAC_DO_TERM_TYPE) > -1) {
-				this.termSent = true;
-				this.bridgeConnection.write(this.getTermTypeNegotiationBuffer());
-			}
-		});
+            //
+            //	Wait for a terminal type request, and send it eactly once.
+            //	This is enough (in additional to other negotiations handled in telnet.js)
+            //	to get us in on most systems
+            //
+            if(!this.termSent && data.indexOf(IAC_DO_TERM_TYPE) > -1) {
+                this.termSent = true;
+                this.bridgeConnection.write(this.getTermTypeNegotiationBuffer());
+            }
+        });
 
-		this.bridgeConnection.once('end', () => {
-			this.restorePipe();
-			this.emit('end');
-		});
+        this.bridgeConnection.once('end', () => {
+            this.restorePipe();
+            this.emit('end');
+        });
 
-		this.bridgeConnection.once('error', err => {
-			this.restorePipe();
-			this.emit('end', err);
-		});
-	}
+        this.bridgeConnection.once('error', err => {
+            this.restorePipe();
+            this.emit('end', err);
+        });
+    }
 
-	disconnect() {
-		if(this.bridgeConnection) {
-			this.bridgeConnection.end();
-		}
-	}
+    disconnect() {
+        if(this.bridgeConnection) {
+            this.bridgeConnection.end();
+        }
+    }
 
-	destroy() {
-		if(this.bridgeConnection) {
-			this.bridgeConnection.destroy();
-			this.bridgeConnection.removeAllListeners();
-			this.restorePipe();
-			this.emit('end');
-		}
-	}
+    destroy() {
+        if(this.bridgeConnection) {
+            this.bridgeConnection.destroy();
+            this.bridgeConnection.removeAllListeners();
+            this.restorePipe();
+            this.emit('end');
+        }
+    }
 
-	getTermTypeNegotiationBuffer() {
-		//
-		//	Create a TERMINAL-TYPE sub negotiation buffer using the
-		//	actual/current terminal type.
-		//
-		let bufs = buffers();
+    getTermTypeNegotiationBuffer() {
+        //
+        //	Create a TERMINAL-TYPE sub negotiation buffer using the
+        //	actual/current terminal type.
+        //
+        let bufs = buffers();
 
-		bufs.push(Buffer.from(
-			[
-				255,	//	IAC
-				250,	//	SB
-				24,		//	TERMINAL-TYPE
-				0,		//	IS
-			]
-		));
+        bufs.push(Buffer.from(
+            [
+                255,	//	IAC
+                250,	//	SB
+                24,		//	TERMINAL-TYPE
+                0,		//	IS
+            ]
+        ));
 
-		bufs.push(
-			Buffer.from(this.client.term.termType),	//	e.g. "ansi"
-			Buffer.from( [ 255, 240 ] )				//	IAC, SE
-		);
+        bufs.push(
+            Buffer.from(this.client.term.termType),	//	e.g. "ansi"
+            Buffer.from( [ 255, 240 ] )				//	IAC, SE
+        );
 
-		return bufs.toBuffer();
-	}
+        return bufs.toBuffer();
+    }
 
 }
 
 exports.getModule = class TelnetBridgeModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		this.config			= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
-		this.config.port	= this.config.port || 23;
-	}
+        this.config			= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+        this.config.port	= this.config.port || 23;
+    }
 
-	initSequence() {
-		let clientTerminated;
-		const self = this;
+    initSequence() {
+        let clientTerminated;
+        const self = this;
 
-		async.series(
-			[
-				function validateConfig(callback) {
-					if(_.isString(self.config.host) &&
+        async.series(
+            [
+                function validateConfig(callback) {
+                    if(_.isString(self.config.host) &&
 						_.isNumber(self.config.port))
-					{
-						callback(null);
-					} else {
-						callback(new Error('Configuration is missing required option(s)'));
-					}
-				},
-				function createTelnetBridge(callback) {
-					const connectOpts = {
-						port	: self.config.port,
-						host	: self.config.host,
-					};
+                    {
+                        callback(null);
+                    } else {
+                        callback(new Error('Configuration is missing required option(s)'));
+                    }
+                },
+                function createTelnetBridge(callback) {
+                    const connectOpts = {
+                        port	: self.config.port,
+                        host	: self.config.host,
+                    };
 
-					self.client.term.write(resetScreen());
-					self.client.term.write(
-						`  Connecting to ${connectOpts.host}, please wait...\n  (Press ESC to cancel)\n`
-					);
+                    self.client.term.write(resetScreen());
+                    self.client.term.write(
+                        `  Connecting to ${connectOpts.host}, please wait...\n  (Press ESC to cancel)\n`
+                    );
 
-					const telnetConnection = new TelnetClientConnection(self.client);
+                    const telnetConnection = new TelnetClientConnection(self.client);
 
-					const connectionKeyPressHandler = (ch, key) => {
-						if('escape' === key.name) {
-							self.client.removeListener('key press', connectionKeyPressHandler);
-							telnetConnection.destroy();
-						}
-					};
+                    const connectionKeyPressHandler = (ch, key) => {
+                        if('escape' === key.name) {
+                            self.client.removeListener('key press', connectionKeyPressHandler);
+                            telnetConnection.destroy();
+                        }
+                    };
 
-					self.client.on('key press', connectionKeyPressHandler);
+                    self.client.on('key press', connectionKeyPressHandler);
 
-					telnetConnection.on('connected', () => {
-						self.client.removeListener('key press', connectionKeyPressHandler);
-						self.client.log.info(connectOpts, 'Telnet bridge connection established');
+                    telnetConnection.on('connected', () => {
+                        self.client.removeListener('key press', connectionKeyPressHandler);
+                        self.client.log.info(connectOpts, 'Telnet bridge connection established');
 
-						if(self.config.font) {
-							self.client.term.rawWrite(setSyncTermFontWithAlias(self.config.font));
-						}
+                        if(self.config.font) {
+                            self.client.term.rawWrite(setSyncTermFontWithAlias(self.config.font));
+                        }
 
-						self.client.once('end', () => {
-							self.client.log.info('Connection ended. Terminating connection');
-							clientTerminated = true;
-							telnetConnection.disconnect();
-						});
-					});
+                        self.client.once('end', () => {
+                            self.client.log.info('Connection ended. Terminating connection');
+                            clientTerminated = true;
+                            telnetConnection.disconnect();
+                        });
+                    });
 
-					telnetConnection.on('end', err => {
-						self.client.removeListener('key press', connectionKeyPressHandler);
+                    telnetConnection.on('end', err => {
+                        self.client.removeListener('key press', connectionKeyPressHandler);
 
-						if(err) {
-							self.client.log.info(`Telnet bridge connection error: ${err.message}`);
-						}
+                        if(err) {
+                            self.client.log.info(`Telnet bridge connection error: ${err.message}`);
+                        }
 
-						callback(clientTerminated ? new Error('Client connection terminated') : null);
-					});
+                        callback(clientTerminated ? new Error('Client connection terminated') : null);
+                    });
 
-					telnetConnection.connect(connectOpts);
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn( { error : err.message }, 'Telnet connection error');
-				}
+                    telnetConnection.connect(connectOpts);
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'Telnet connection error');
+                }
 
-				if(!clientTerminated) {
-					self.prevMenu();
-				}
-			}
-		);
-	}
+                if(!clientTerminated) {
+                    self.prevMenu();
+                }
+            }
+        );
+    }
 };
diff --git a/core/text_view.js b/core/text_view.js
index 9497a16b..69908e50 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -19,32 +19,32 @@ const _				= require('lodash');
 exports.TextView			= TextView;
 
 function TextView(options) {
-	if(options.dimens) {
-		options.dimens.height = 1;	//	force height of 1 for TextView's & sub classes
-	}
+    if(options.dimens) {
+        options.dimens.height = 1;	//	force height of 1 for TextView's & sub classes
+    }
 
-	View.call(this, options);
+    View.call(this, options);
 
-	if(options.maxLength) {
-		this.maxLength = options.maxLength;
-	} else {
-		this.maxLength = this.client.term.termWidth - this.position.col;
-	}
+    if(options.maxLength) {
+        this.maxLength = options.maxLength;
+    } else {
+        this.maxLength = this.client.term.termWidth - this.position.col;
+    }
 
-	this.fillChar			= renderSubstr(miscUtil.valueWithDefault(options.fillChar, ' '), 0, 1);
-	this.justify			= options.justify || 'left';
-	this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
-	this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
+    this.fillChar			= renderSubstr(miscUtil.valueWithDefault(options.fillChar, ' '), 0, 1);
+    this.justify			= options.justify || 'left';
+    this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
+    this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
 
-	if(_.isString(options.textOverflow)) {
-		this.textOverflow = options.textOverflow;
-	}
+    if(_.isString(options.textOverflow)) {
+        this.textOverflow = options.textOverflow;
+    }
 
-	if(_.isString(options.textMaskChar) && 1 === options.textMaskChar.length) {
-		this.textMaskChar = options.textMaskChar;
-	}
+    if(_.isString(options.textMaskChar) && 1 === options.textMaskChar.length) {
+        this.textMaskChar = options.textMaskChar;
+    }
 
-	/*
+    /*
 	this.drawText = function(s) {
 
 		//
@@ -87,130 +87,130 @@ function TextView(options) {
 	};
 */
 
-	this.drawText = function(s) {
+    this.drawText = function(s) {
 
-		//
-		//                     |<- this.maxLength
-		//	 ABCDEFGHIJK
-		//	|ABCDEFG|  ^_ this.text.length
-		//	        ^-- this.dimens.width
-		//
-		let renderLength = renderStringLength(s);	//	initial; may be adjusted below:
+        //
+        //                     |<- this.maxLength
+        //	 ABCDEFGHIJK
+        //	|ABCDEFG|  ^_ this.text.length
+        //	        ^-- this.dimens.width
+        //
+        let renderLength = renderStringLength(s);	//	initial; may be adjusted below:
 
-		let textToDraw = _.isString(this.textMaskChar) ?
-			new Array(renderLength + 1).join(this.textMaskChar) :
-			stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
+        let textToDraw = _.isString(this.textMaskChar) ?
+            new Array(renderLength + 1).join(this.textMaskChar) :
+            stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-		renderLength = renderStringLength(textToDraw);
+        renderLength = renderStringLength(textToDraw);
 
-		if(renderLength >= this.dimens.width) {
-			if(this.hasFocus) {
-				if(this.horizScroll) {
-					textToDraw = renderSubstr(textToDraw, renderLength - this.dimens.width, renderLength);
-				}
-			} else {
-				if(this.textOverflow &&
+        if(renderLength >= this.dimens.width) {
+            if(this.hasFocus) {
+                if(this.horizScroll) {
+                    textToDraw = renderSubstr(textToDraw, renderLength - this.dimens.width, renderLength);
+                }
+            } else {
+                if(this.textOverflow &&
 					this.dimens.width > this.textOverflow.length &&
 					renderLength - this.textOverflow.length >= this.textOverflow.length)
-				{
-					textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
-				} else {
-					textToDraw = renderSubstr(textToDraw, 0, this.dimens.width);
-				}
-			}
-		}
+                {
+                    textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
+                } else {
+                    textToDraw = renderSubstr(textToDraw, 0, this.dimens.width);
+                }
+            }
+        }
 
-		const renderedFillChar = pipeToAnsi(this.fillChar);
+        const renderedFillChar = pipeToAnsi(this.fillChar);
 
-		this.client.term.write(
-			padStr(
-				textToDraw,
-				this.dimens.width + 1,
-				renderedFillChar, //this.fillChar,
-				this.justify,
-				this.hasFocus ? this.getFocusSGR() : this.getSGR(),
-				this.getStyleSGR(1) || this.getSGR(),
-				true	//	use render len
-			),
-			false	//	no converting CRLF needed
-		);
-	};
+        this.client.term.write(
+            padStr(
+                textToDraw,
+                this.dimens.width + 1,
+                renderedFillChar, //this.fillChar,
+                this.justify,
+                this.hasFocus ? this.getFocusSGR() : this.getSGR(),
+                this.getStyleSGR(1) || this.getSGR(),
+                true	//	use render len
+            ),
+            false	//	no converting CRLF needed
+        );
+    };
 
 
-	this.getEndOfTextColumn = function() {
-		var offset = Math.min(this.text.length, this.dimens.width);
-		return this.position.col + offset;
-	};
+    this.getEndOfTextColumn = function() {
+        var offset = Math.min(this.text.length, this.dimens.width);
+        return this.position.col + offset;
+    };
 
-	this.setText(options.text || '', false);	//	false=do not redraw now
+    this.setText(options.text || '', false);	//	false=do not redraw now
 }
 
 util.inherits(TextView, View);
 
 TextView.prototype.redraw = function() {
-	//
-	//	A lot of views will get an initial redraw() with empty text (''). We can short
-	//	circuit this by NOT doing any of the work if this is the initial drawText
-	//	and there is no actual text (e.g. save SGR's and processing)
-	//
-	if(!this.hasDrawnOnce) {
-		if(_.isUndefined(this.text)) {
-			return;
-		}
-	}
-	this.hasDrawnOnce = true;
+    //
+    //	A lot of views will get an initial redraw() with empty text (''). We can short
+    //	circuit this by NOT doing any of the work if this is the initial drawText
+    //	and there is no actual text (e.g. save SGR's and processing)
+    //
+    if(!this.hasDrawnOnce) {
+        if(_.isUndefined(this.text)) {
+            return;
+        }
+    }
+    this.hasDrawnOnce = true;
 
-	TextView.super_.prototype.redraw.call(this);
+    TextView.super_.prototype.redraw.call(this);
 
-	if(_.isString(this.text)) {
-		this.drawText(this.text);
-	}
+    if(_.isString(this.text)) {
+        this.drawText(this.text);
+    }
 };
 
 TextView.prototype.setFocus = function(focused) {
-	TextView.super_.prototype.setFocus.call(this, focused);
+    TextView.super_.prototype.setFocus.call(this, focused);
 
-	this.redraw();
+    this.redraw();
 
-	this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn()));
-	this.client.term.write(this.getFocusSGR());
+    this.client.term.write(ansi.goto(this.position.row, this.getEndOfTextColumn()));
+    this.client.term.write(this.getFocusSGR());
 };
 
 TextView.prototype.getData = function() {
-	return this.text;
+    return this.text;
 };
 
 TextView.prototype.setText = function(text, redraw) {
-	redraw = _.isBoolean(redraw) ? redraw : true;
+    redraw = _.isBoolean(redraw) ? redraw : true;
 
-	if(!_.isString(text)) {
-		text = text.toString();
-	}
+    if(!_.isString(text)) {
+        text = text.toString();
+    }
 
-	text = pipeToAnsi(stripAllLineFeeds(text), this.client);	//	expand MCI/etc.
+    text = pipeToAnsi(stripAllLineFeeds(text), this.client);	//	expand MCI/etc.
 
-	var widthDelta = 0;
-	if(this.text && this.text !== text) {
-		widthDelta = Math.abs(renderStringLength(this.text) - renderStringLength(text));
-	}
+    var widthDelta = 0;
+    if(this.text && this.text !== text) {
+        widthDelta = Math.abs(renderStringLength(this.text) - renderStringLength(text));
+    }
 
-	this.text = text;
+    this.text = text;
 
-	if(this.maxLength > 0) {
-		this.text = renderSubstr(this.text, 0, this.maxLength);
-		//this.text = this.text.substr(0, this.maxLength);
-	}
+    if(this.maxLength > 0) {
+        this.text = renderSubstr(this.text, 0, this.maxLength);
+        //this.text = this.text.substr(0, this.maxLength);
+    }
 
-	//	:TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
-	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
+    //	:TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
+    this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-	if(this.autoScale.width) {
-		this.dimens.width = renderStringLength(this.text) + widthDelta;
-	}
+    if(this.autoScale.width) {
+        this.dimens.width = renderStringLength(this.text) + widthDelta;
+    }
 
-	if(redraw) {
-		this.redraw();
-	}
+    if(redraw) {
+        this.redraw();
+    }
 };
 
 /*
@@ -245,21 +245,21 @@ TextView.prototype.setText = function(text) {
 */
 
 TextView.prototype.clearText = function() {
-	this.setText('');
+    this.setText('');
 };
 
 TextView.prototype.setPropertyValue = function(propName, value) {
-	switch(propName) {
-		case 'textMaskChar' : this.textMaskChar = value.substr(0, 1); break;
-		case 'textOverflow'	: this.textOverflow = value; break;
-		case 'maxLength'	: this.maxLength = parseInt(value, 10); break;
-		case 'password'		:
-			if(true === value) {
-				this.textMaskChar = this.client.currentTheme.helpers.getPasswordChar();
-			}
-			break;
-	}
+    switch(propName) {
+        case 'textMaskChar' : this.textMaskChar = value.substr(0, 1); break;
+        case 'textOverflow'	: this.textOverflow = value; break;
+        case 'maxLength'	: this.maxLength = parseInt(value, 10); break;
+        case 'password'		:
+            if(true === value) {
+                this.textMaskChar = this.client.currentTheme.helpers.getPasswordChar();
+            }
+            break;
+    }
 
 
-	TextView.super_.prototype.setPropertyValue.call(this, propName, value);
+    TextView.super_.prototype.setPropertyValue.call(this, propName, value);
 };
diff --git a/core/theme.js b/core/theme.js
index 5545fad3..aca8ca2c 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -30,604 +30,604 @@ exports.displayThemedPrompt		= displayThemedPrompt;
 exports.displayThemedAsset		= displayThemedAsset;
 
 function refreshThemeHelpers(theme) {
-	//
-	//	Create some handy helpers
-	//
-	theme.helpers = {
-		getPasswordChar : function() {
-			let pwChar = _.get(
-				theme,
-				'customization.defaults.general.passwordChar',
-				Config().defaults.passwordChar
-			);
+    //
+    //	Create some handy helpers
+    //
+    theme.helpers = {
+        getPasswordChar : function() {
+            let pwChar = _.get(
+                theme,
+                'customization.defaults.general.passwordChar',
+                Config().defaults.passwordChar
+            );
 
-			if(_.isString(pwChar)) {
-				pwChar = pwChar.substr(0, 1);
-			} else if(_.isNumber(pwChar)) {
-				pwChar = String.fromCharCode(pwChar);
-			}
+            if(_.isString(pwChar)) {
+                pwChar = pwChar.substr(0, 1);
+            } else if(_.isNumber(pwChar)) {
+                pwChar = String.fromCharCode(pwChar);
+            }
 
-			return pwChar;
-		},
-		getDateFormat : function(style = 'short') {
-			const format = Config().defaults.dateFormat[style] || 'MM/DD/YYYY';
-			return _.get(theme, `customization.defaults.dateFormat.${style}`, format);
-		},
-		getTimeFormat : function(style = 'short') {
-			const format = Config().defaults.timeFormat[style] || 'h:mm a';
-			return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
-		},
-		getDateTimeFormat : function(style = 'short') {
-			const format = Config().defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
-			return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
-		}
-	};
+            return pwChar;
+        },
+        getDateFormat : function(style = 'short') {
+            const format = Config().defaults.dateFormat[style] || 'MM/DD/YYYY';
+            return _.get(theme, `customization.defaults.dateFormat.${style}`, format);
+        },
+        getTimeFormat : function(style = 'short') {
+            const format = Config().defaults.timeFormat[style] || 'h:mm a';
+            return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
+        },
+        getDateTimeFormat : function(style = 'short') {
+            const format = Config().defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
+            return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
+        }
+    };
 }
 
 function loadTheme(themeId, cb) {
-	const path = paths.join(Config().paths.themes, themeId, 'theme.hjson');
+    const path = paths.join(Config().paths.themes, themeId, 'theme.hjson');
 
-	const changed = ( { fileName, fileRoot } ) => {
-		const reCachedPath = paths.join(fileRoot, fileName);
-		if(reCachedPath === path) {
-			reloadTheme(themeId);
-		}
-	};
+    const changed = ( { fileName, fileRoot } ) => {
+        const reCachedPath = paths.join(fileRoot, fileName);
+        if(reCachedPath === path) {
+            reloadTheme(themeId);
+        }
+    };
 
-	const getOpts = {
-		filePath 		: path,
-		forceReCache	: true,
-		callback		: changed,
-	};
+    const getOpts = {
+        filePath 		: path,
+        forceReCache	: true,
+        callback		: changed,
+    };
 
-	ConfigCache.getConfigWithOptions(getOpts, (err, theme) => {
-		if(err) {
-			return cb(err);
-		}
+    ConfigCache.getConfigWithOptions(getOpts, (err, theme) => {
+        if(err) {
+            return cb(err);
+        }
 
-		if(!_.isObject(theme.info) ||
+        if(!_.isObject(theme.info) ||
 			!_.isString(theme.info.name) ||
 			!_.isString(theme.info.author))
-		{
-			return cb(Errors.Invalid('Invalid or missing "info" section'));
-		}
+        {
+            return cb(Errors.Invalid('Invalid or missing "info" section'));
+        }
 
-		if(false === _.get(theme, 'info.enabled')) {
-			return cb(Errors.General('Theme is not enalbed', ErrorReasons.ErrNotEnabled));
-		}
+        if(false === _.get(theme, 'info.enabled')) {
+            return cb(Errors.General('Theme is not enalbed', ErrorReasons.ErrNotEnabled));
+        }
 
-		refreshThemeHelpers(theme);
+        refreshThemeHelpers(theme);
 
-		return cb(null, theme, path);
-	});
+        return cb(null, theme, path);
+    });
 }
 
 const availableThemes = new Map();
 
 const IMMUTABLE_MCI_PROPERTIES = [
-	'maxLength', 'argName', 'submit', 'validate'
+    'maxLength', 'argName', 'submit', 'validate'
 ];
 
 function getMergedTheme(menuConfig, promptConfig, theme) {
-	assert(_.isObject(menuConfig));
-	assert(_.isObject(theme));
+    assert(_.isObject(menuConfig));
+    assert(_.isObject(theme));
 
-	//  :TODO: merge in defaults (customization.defaults{} )
-	//	:TODO: apply generic stuff, e.g. "VM" (vs "VM1")
+    //  :TODO: merge in defaults (customization.defaults{} )
+    //	:TODO: apply generic stuff, e.g. "VM" (vs "VM1")
 
-	//
-	//  Create a *clone* of menuConfig (menu.hjson) then bring in
-	//  promptConfig (prompt.hjson)
-	//
-	const mergedTheme = _.cloneDeep(menuConfig);
+    //
+    //  Create a *clone* of menuConfig (menu.hjson) then bring in
+    //  promptConfig (prompt.hjson)
+    //
+    const mergedTheme = _.cloneDeep(menuConfig);
 
-	if(_.isObject(promptConfig.prompts)) {
-		mergedTheme.prompts = _.cloneDeep(promptConfig.prompts);
-	}
+    if(_.isObject(promptConfig.prompts)) {
+        mergedTheme.prompts = _.cloneDeep(promptConfig.prompts);
+    }
 
-	//
-	//  Add in data we won't be altering directly from the theme
-	//
-	mergedTheme.info    = theme.info;
-	mergedTheme.helpers = theme.helpers;
+    //
+    //  Add in data we won't be altering directly from the theme
+    //
+    mergedTheme.info    = theme.info;
+    mergedTheme.helpers = theme.helpers;
 
-	//
-	//  merge customizer to disallow immutable MCI properties
-	//
-	const mciCustomizer = function(objVal, srcVal, key) {
-		return IMMUTABLE_MCI_PROPERTIES.indexOf(key) > -1 ? objVal : srcVal;
-	};
+    //
+    //  merge customizer to disallow immutable MCI properties
+    //
+    const mciCustomizer = function(objVal, srcVal, key) {
+        return IMMUTABLE_MCI_PROPERTIES.indexOf(key) > -1 ? objVal : srcVal;
+    };
 
-	function getFormKeys(fromObj) {
-		return _.remove(_.keys(fromObj), function pred(k) {
-			return !isNaN(k);    //  remove all non-numbers
-		});
-	}
+    function getFormKeys(fromObj) {
+        return _.remove(_.keys(fromObj), function pred(k) {
+            return !isNaN(k);    //  remove all non-numbers
+        });
+    }
 
-	function mergeMciProperties(dest, src) {
-		Object.keys(src).forEach(function mciEntry(mci) {
-			_.mergeWith(dest[mci], src[mci], mciCustomizer);
-		});
-	}
+    function mergeMciProperties(dest, src) {
+        Object.keys(src).forEach(function mciEntry(mci) {
+            _.mergeWith(dest[mci], src[mci], mciCustomizer);
+        });
+    }
 
-	function applyThemeMciBlock(dest, src, formKey) {
-		if(_.isObject(src.mci)) {
-			mergeMciProperties(dest, src.mci);
-		} else {
-			if(_.has(src, [ formKey, 'mci' ])) {
-				mergeMciProperties(dest, src[formKey].mci);
-			}
-		}
-	}
+    function applyThemeMciBlock(dest, src, formKey) {
+        if(_.isObject(src.mci)) {
+            mergeMciProperties(dest, src.mci);
+        } else {
+            if(_.has(src, [ formKey, 'mci' ])) {
+                mergeMciProperties(dest, src[formKey].mci);
+            }
+        }
+    }
 
-	//
-	//  menu.hjson can have a couple different structures:
-	//  1)  Explicit declaration of expected MCI code(s) under 'form:<id>' before a 'mci' block
-	//      (this allows multiple layout types defined by one menu for example)
-	//
-	//  2)  Non-explicit declaration: 'mci' directly under 'form:<id>'
-	//
-	//  theme.hjson has it's own mix:
-	//  1)  Explicit: Form ID before 'mci' (generally used where there are > 1 forms)
-	//
-	//  2)  Non-explicit: 'mci' directly under an entry
-	//
-	//  Additionally, #1 or #2 may be under an explicit key of MCI code(s) to match up
-	//  with menu.hjson in #1.
-	//
-	//  *   When theming an explicit menu.hjson entry (1), we will use a matching explicit
-	//      entry with a matching MCI code(s) key in theme.hjson (e.g. menu="ETVM"/theme="ETVM"
-	//      and fall back to generic if a match is not found.
-	//
-	//  *   If theme.hjson provides form ID's, use them. Otherwise, we'll apply directly assuming
-	//      there is a generic 'mci' block.
-	//
-	function applyToForm(form, menuTheme, formKey) {
-		if(_.isObject(form.mci)) {
-			//   non-explicit: no MCI code(s) key assumed since we found 'mci' directly under form ID
-			applyThemeMciBlock(form.mci, menuTheme, formKey);
+    //
+    //  menu.hjson can have a couple different structures:
+    //  1)  Explicit declaration of expected MCI code(s) under 'form:<id>' before a 'mci' block
+    //      (this allows multiple layout types defined by one menu for example)
+    //
+    //  2)  Non-explicit declaration: 'mci' directly under 'form:<id>'
+    //
+    //  theme.hjson has it's own mix:
+    //  1)  Explicit: Form ID before 'mci' (generally used where there are > 1 forms)
+    //
+    //  2)  Non-explicit: 'mci' directly under an entry
+    //
+    //  Additionally, #1 or #2 may be under an explicit key of MCI code(s) to match up
+    //  with menu.hjson in #1.
+    //
+    //  *   When theming an explicit menu.hjson entry (1), we will use a matching explicit
+    //      entry with a matching MCI code(s) key in theme.hjson (e.g. menu="ETVM"/theme="ETVM"
+    //      and fall back to generic if a match is not found.
+    //
+    //  *   If theme.hjson provides form ID's, use them. Otherwise, we'll apply directly assuming
+    //      there is a generic 'mci' block.
+    //
+    function applyToForm(form, menuTheme, formKey) {
+        if(_.isObject(form.mci)) {
+            //   non-explicit: no MCI code(s) key assumed since we found 'mci' directly under form ID
+            applyThemeMciBlock(form.mci, menuTheme, formKey);
 
-		} else {
-			const menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
-				return k === k.toUpperCase(); //  remove anything not uppercase
-			});
+        } else {
+            const menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
+                return k === k.toUpperCase(); //  remove anything not uppercase
+            });
 
-			menuMciCodeKeys.forEach(function mciKeyEntry(mciKey) {
-				let applyFrom;
-				if(_.has(menuTheme, [ mciKey, 'mci' ])) {
-					applyFrom = menuTheme[mciKey];
-				} else {
-					applyFrom = menuTheme;
-				}
+            menuMciCodeKeys.forEach(function mciKeyEntry(mciKey) {
+                let applyFrom;
+                if(_.has(menuTheme, [ mciKey, 'mci' ])) {
+                    applyFrom = menuTheme[mciKey];
+                } else {
+                    applyFrom = menuTheme;
+                }
 
-				applyThemeMciBlock(form[mciKey].mci, applyFrom, formKey);
-			});
-		}
-	}
+                applyThemeMciBlock(form[mciKey].mci, applyFrom, formKey);
+            });
+        }
+    }
 
-	[ 'menus', 'prompts' ].forEach(function areaEntry(sectionName) {
-		_.keys(mergedTheme[sectionName]).forEach(function menuEntry(menuName) {
-			let createdFormSection = false;
-			const mergedThemeMenu = mergedTheme[sectionName][menuName];
+    [ 'menus', 'prompts' ].forEach(function areaEntry(sectionName) {
+        _.keys(mergedTheme[sectionName]).forEach(function menuEntry(menuName) {
+            let createdFormSection = false;
+            const mergedThemeMenu = mergedTheme[sectionName][menuName];
 
-			if(_.has(theme, [ 'customization', sectionName, menuName ])) {
-				const menuTheme = theme.customization[sectionName][menuName];
+            if(_.has(theme, [ 'customization', sectionName, menuName ])) {
+                const menuTheme = theme.customization[sectionName][menuName];
 
-				//	config block is direct assign/overwrite
-				//  :TODO: should probably be _.merge()
-				if(menuTheme.config) {
-					mergedThemeMenu.config = _.assign(mergedThemeMenu.config || {}, menuTheme.config);
-				}
+                //	config block is direct assign/overwrite
+                //  :TODO: should probably be _.merge()
+                if(menuTheme.config) {
+                    mergedThemeMenu.config = _.assign(mergedThemeMenu.config || {}, menuTheme.config);
+                }
 
-				if('menus' === sectionName) {
-					if(_.isObject(mergedThemeMenu.form)) {
-						getFormKeys(mergedThemeMenu.form).forEach(function formKeyEntry(formKey) {
-							applyToForm(mergedThemeMenu.form[formKey], menuTheme, formKey);
-						});
-					} else {
-						if(_.isObject(menuTheme.mci)) {
-							//
-							//  Not specified at menu level means we apply anything from the
-							//  theme to form.0.mci{}
-							//
-							mergedThemeMenu.form = { 0 : { mci : { } } };
-							mergeMciProperties(mergedThemeMenu.form[0], menuTheme);
-							createdFormSection = true;
-						}
-					}
-				} else if('prompts' === sectionName) {
-					//  no 'form' or form keys for prompts -- direct to mci
-					applyToForm(mergedThemeMenu, menuTheme);
-				}
-			}
+                if('menus' === sectionName) {
+                    if(_.isObject(mergedThemeMenu.form)) {
+                        getFormKeys(mergedThemeMenu.form).forEach(function formKeyEntry(formKey) {
+                            applyToForm(mergedThemeMenu.form[formKey], menuTheme, formKey);
+                        });
+                    } else {
+                        if(_.isObject(menuTheme.mci)) {
+                            //
+                            //  Not specified at menu level means we apply anything from the
+                            //  theme to form.0.mci{}
+                            //
+                            mergedThemeMenu.form = { 0 : { mci : { } } };
+                            mergeMciProperties(mergedThemeMenu.form[0], menuTheme);
+                            createdFormSection = true;
+                        }
+                    }
+                } else if('prompts' === sectionName) {
+                    //  no 'form' or form keys for prompts -- direct to mci
+                    applyToForm(mergedThemeMenu, menuTheme);
+                }
+            }
 
-			//
-			//  Finished merging for this menu/prompt
-			//
-			//  If the following conditions are true, set runtime.autoNext to true:
-			//  *   This is a menu
-			//  *   There is/was no explicit 'form' section
-			//  *   There is no 'prompt' specified
-			//
-			if('menus' === sectionName && !_.isString(mergedThemeMenu.prompt) &&
+            //
+            //  Finished merging for this menu/prompt
+            //
+            //  If the following conditions are true, set runtime.autoNext to true:
+            //  *   This is a menu
+            //  *   There is/was no explicit 'form' section
+            //  *   There is no 'prompt' specified
+            //
+            if('menus' === sectionName && !_.isString(mergedThemeMenu.prompt) &&
 				(createdFormSection || !_.isObject(mergedThemeMenu.form)))
-			{
-				mergedThemeMenu.runtime = _.merge(mergedThemeMenu.runtime || {}, { autoNext : true } );
-			}
-		});
-	});
+            {
+                mergedThemeMenu.runtime = _.merge(mergedThemeMenu.runtime || {}, { autoNext : true } );
+            }
+        });
+    });
 
 
-	return mergedTheme;
+    return mergedTheme;
 }
 
 function reloadTheme(themeId) {
-	const config = Config();
-	async.waterfall(
-		[
-			function loadMenuConfig(callback) {
-				getFullConfig(config.general.menuFile, (err, menuConfig) => {
-					return callback(err, menuConfig);
-				});
-			},
-			function loadPromptConfig(menuConfig, callback) {
-				getFullConfig(config.general.promptFile, (err, promptConfig) => {
-					return callback(err, menuConfig, promptConfig);
-				});
-			},
-			function loadIt(menuConfig, promptConfig, callback) {
-				loadTheme(themeId, (err, theme) => {
-					if(err) {
-						if(ErrorReasons.NotEnabled !== err.reasonCode) {
-							Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
-							return;
-						}
-						return callback(err);
-					}
+    const config = Config();
+    async.waterfall(
+        [
+            function loadMenuConfig(callback) {
+                getFullConfig(config.general.menuFile, (err, menuConfig) => {
+                    return callback(err, menuConfig);
+                });
+            },
+            function loadPromptConfig(menuConfig, callback) {
+                getFullConfig(config.general.promptFile, (err, promptConfig) => {
+                    return callback(err, menuConfig, promptConfig);
+                });
+            },
+            function loadIt(menuConfig, promptConfig, callback) {
+                loadTheme(themeId, (err, theme) => {
+                    if(err) {
+                        if(ErrorReasons.NotEnabled !== err.reasonCode) {
+                            Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
+                            return;
+                        }
+                        return callback(err);
+                    }
 
-					Object.assign(theme.info, { themeId } );
-					availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
+                    Object.assign(theme.info, { themeId } );
+                    availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
 
-					Events.emit(
-						Events.getSystemEvents().ThemeChanged,
-						{ themeId }
-					);
+                    Events.emit(
+                        Events.getSystemEvents().ThemeChanged,
+                        { themeId }
+                    );
 
-					return callback(null, theme);
-				});
-			}
-		],
-		(err, theme) => {
-			if(err) {
-				Log.warn( { themeId, error : err.message }, 'Failed to reload theme');
-			} else {
-				Log.debug( { info : theme.info }, 'Theme recached' );
-			}
-		}
-	);
+                    return callback(null, theme);
+                });
+            }
+        ],
+        (err, theme) => {
+            if(err) {
+                Log.warn( { themeId, error : err.message }, 'Failed to reload theme');
+            } else {
+                Log.debug( { info : theme.info }, 'Theme recached' );
+            }
+        }
+    );
 }
 
 function reloadAllThemes()
 {
-	async.each([ ...availableThemes.keys() ], themeId => reloadTheme(themeId));
+    async.each([ ...availableThemes.keys() ], themeId => reloadTheme(themeId));
 }
 
 function initAvailableThemes(cb) {
-	const config = Config();
-	async.waterfall(
-		[
-			function loadMenuConfig(callback) {
-				getFullConfig(config.general.menuFile, (err, menuConfig) => {
-					return callback(err, menuConfig);
-				});
-			},
-			function loadPromptConfig(menuConfig, callback) {
-				getFullConfig(config.general.promptFile, (err, promptConfig) => {
-					return callback(err, menuConfig, promptConfig);
-				});
-			},
-			function getThemeDirectories(menuConfig, promptConfig, callback) {
-				fs.readdir(config.paths.themes, (err, files) =>  {
-					if(err) {
-						return callback(err);
-					}
+    const config = Config();
+    async.waterfall(
+        [
+            function loadMenuConfig(callback) {
+                getFullConfig(config.general.menuFile, (err, menuConfig) => {
+                    return callback(err, menuConfig);
+                });
+            },
+            function loadPromptConfig(menuConfig, callback) {
+                getFullConfig(config.general.promptFile, (err, promptConfig) => {
+                    return callback(err, menuConfig, promptConfig);
+                });
+            },
+            function getThemeDirectories(menuConfig, promptConfig, callback) {
+                fs.readdir(config.paths.themes, (err, files) =>  {
+                    if(err) {
+                        return callback(err);
+                    }
 
-					return callback(
-						null,
-						menuConfig,
-						promptConfig,
-						files.filter( f => {
-							//	sync normally not allowed -- initAvailableThemes() is a startup-only method, however
-							return fs.statSync(paths.join(config.paths.themes, f)).isDirectory();
-						})
-					);
-				});
-			},
-			function populateAvailable(menuConfig, promptConfig, themeDirectories, callback) {
-				async.each(themeDirectories, (themeId, nextThemeDir) => {	//	theme dir = theme ID
-					loadTheme(themeId, (err, theme) => {
-						if(err) {
-							if(ErrorReasons.NotEnabled !== err.reasonCode) {
-								Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
-							}
+                    return callback(
+                        null,
+                        menuConfig,
+                        promptConfig,
+                        files.filter( f => {
+                            //	sync normally not allowed -- initAvailableThemes() is a startup-only method, however
+                            return fs.statSync(paths.join(config.paths.themes, f)).isDirectory();
+                        })
+                    );
+                });
+            },
+            function populateAvailable(menuConfig, promptConfig, themeDirectories, callback) {
+                async.each(themeDirectories, (themeId, nextThemeDir) => {	//	theme dir = theme ID
+                    loadTheme(themeId, (err, theme) => {
+                        if(err) {
+                            if(ErrorReasons.NotEnabled !== err.reasonCode) {
+                                Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
+                            }
 
-							return nextThemeDir(null);	//	try next
-						}
+                            return nextThemeDir(null);	//	try next
+                        }
 
-						Object.assign(theme.info, { themeId } );
-						availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
-						return nextThemeDir(null);
-					});
-				}, err => {
-					return callback(err);
-				});
-			},
-			function initEvents(callback) {
-				Events.on(Events.getSystemEvents().MenusChanged, () => {
-					return reloadAllThemes();
-				});
-				Events.on(Events.getSystemEvents().PromptsChanged, () => {
-					return reloadAllThemes();
-				});
+                        Object.assign(theme.info, { themeId } );
+                        availableThemes.set(themeId, getMergedTheme(menuConfig, promptConfig, theme));
+                        return nextThemeDir(null);
+                    });
+                }, err => {
+                    return callback(err);
+                });
+            },
+            function initEvents(callback) {
+                Events.on(Events.getSystemEvents().MenusChanged, () => {
+                    return reloadAllThemes();
+                });
+                Events.on(Events.getSystemEvents().PromptsChanged, () => {
+                    return reloadAllThemes();
+                });
 
-				return callback(null);
-			}
-		],
-		err => {
-			return cb(err, availableThemes.size);
-		}
-	);
+                return callback(null);
+            }
+        ],
+        err => {
+            return cb(err, availableThemes.size);
+        }
+    );
 }
 
 function getAvailableThemes() {
-	return availableThemes;
+    return availableThemes;
 }
 
 function getRandomTheme() {
-	if(availableThemes.size > 0) {
-		const themeIds = [ ...availableThemes.keys() ];
-		return themeIds[Math.floor(Math.random() * themeIds.length)];
-	}
+    if(availableThemes.size > 0) {
+        const themeIds = [ ...availableThemes.keys() ];
+        return themeIds[Math.floor(Math.random() * themeIds.length)];
+    }
 }
 
 function setClientTheme(client, themeId) {
-	const availThemes = getAvailableThemes();
+    const availThemes = getAvailableThemes();
 
-	let msg;
-	let setThemeId;
-	const config = Config();
-	if(availThemes.has(themeId)) {
-		msg = 'Set client theme';
-		setThemeId = themeId;
-	} else if(availThemes.has(config.defaults.theme)) {
-		msg = 'Failed setting theme by supplied ID; Using default';
-		setThemeId = config.defaults.theme;
-	} else {
-		msg = 'Failed setting theme by system default ID; Using the first one we can find';
-		setThemeId = availThemes.keys().next().value;
-	}
+    let msg;
+    let setThemeId;
+    const config = Config();
+    if(availThemes.has(themeId)) {
+        msg = 'Set client theme';
+        setThemeId = themeId;
+    } else if(availThemes.has(config.defaults.theme)) {
+        msg = 'Failed setting theme by supplied ID; Using default';
+        setThemeId = config.defaults.theme;
+    } else {
+        msg = 'Failed setting theme by system default ID; Using the first one we can find';
+        setThemeId = availThemes.keys().next().value;
+    }
 
-	client.currentTheme = availThemes.get(setThemeId);
-	client.log.debug( { setThemeId, requestedThemeId : themeId, info : client.currentTheme.info }, msg);
+    client.currentTheme = availThemes.get(setThemeId);
+    client.log.debug( { setThemeId, requestedThemeId : themeId, info : client.currentTheme.info }, msg);
 }
 
 function getThemeArt(options, cb) {
-	//
-	//	options - required:
-	//		name
-	//
-	//	options - optional
-	//		client - needed for user's theme/etc.
-	//		themeId
-	//		asAnsi
-	//		readSauce
-	//		random
-	//
-	const config = Config();
-	if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
-		options.themeId = options.client.user.properties.theme_id;
-	} else {
-		options.themeId = config.defaults.theme;
-	}
+    //
+    //	options - required:
+    //		name
+    //
+    //	options - optional
+    //		client - needed for user's theme/etc.
+    //		themeId
+    //		asAnsi
+    //		readSauce
+    //		random
+    //
+    const config = Config();
+    if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
+        options.themeId = options.client.user.properties.theme_id;
+    } else {
+        options.themeId = config.defaults.theme;
+    }
 
-	//	:TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
-	//	:TODO: Some of these options should only be set if not provided!
-	options.asAnsi		= true;	//	always convert to ANSI
-	options.readSauce	= true;	//	read SAUCE, if avail
-	options.random		= _.get(options, 'random', true);	//	FILENAME<n>.EXT support
+    //	:TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
+    //	:TODO: Some of these options should only be set if not provided!
+    options.asAnsi		= true;	//	always convert to ANSI
+    options.readSauce	= true;	//	read SAUCE, if avail
+    options.random		= _.get(options, 'random', true);	//	FILENAME<n>.EXT support
 
-	//
-	//	We look for themed art in the following order:
-	//	1)	Direct/relative path
-	//	2)	Via theme supplied by |themeId|
-	//	3)	Via default theme
-	//	4)	General art directory
-	//
-	async.waterfall(
-		[
-			function fromPath(callback) {
-				//
-				//	We allow relative (to enigma-bbs) or full paths
-				//
-				if('/' === options.name.charAt(0)) {
-					//	just take the path as-is
-					options.basePath = paths.dirname(options.name);
-				} else if(options.name.indexOf('/') > -1) {
-					//	make relative to base BBS dir
-					options.basePath = paths.join(__dirname, '../', paths.dirname(options.name));
-				} else {
-					return callback(null, null);
-				}
+    //
+    //	We look for themed art in the following order:
+    //	1)	Direct/relative path
+    //	2)	Via theme supplied by |themeId|
+    //	3)	Via default theme
+    //	4)	General art directory
+    //
+    async.waterfall(
+        [
+            function fromPath(callback) {
+                //
+                //	We allow relative (to enigma-bbs) or full paths
+                //
+                if('/' === options.name.charAt(0)) {
+                    //	just take the path as-is
+                    options.basePath = paths.dirname(options.name);
+                } else if(options.name.indexOf('/') > -1) {
+                    //	make relative to base BBS dir
+                    options.basePath = paths.join(__dirname, '../', paths.dirname(options.name));
+                } else {
+                    return callback(null, null);
+                }
 
-				art.getArt(options.name, options, (err, artInfo) => {
-					return callback(null, artInfo);
-				});
-			},
-			function fromSuppliedTheme(artInfo, callback) {
-				if(artInfo) {
-					return callback(null, artInfo);
-				}
+                art.getArt(options.name, options, (err, artInfo) => {
+                    return callback(null, artInfo);
+                });
+            },
+            function fromSuppliedTheme(artInfo, callback) {
+                if(artInfo) {
+                    return callback(null, artInfo);
+                }
 
-				options.basePath = paths.join(config.paths.themes, options.themeId);
-				art.getArt(options.name, options, (err, artInfo) => {
-					return callback(null, artInfo);
-				});
-			},
-			function fromDefaultTheme(artInfo, callback) {
-				if(artInfo || config.defaults.theme === options.themeId) {
-					return callback(null, artInfo);
-				}
+                options.basePath = paths.join(config.paths.themes, options.themeId);
+                art.getArt(options.name, options, (err, artInfo) => {
+                    return callback(null, artInfo);
+                });
+            },
+            function fromDefaultTheme(artInfo, callback) {
+                if(artInfo || config.defaults.theme === options.themeId) {
+                    return callback(null, artInfo);
+                }
 
-				options.basePath = paths.join(config.paths.themes, config.defaults.theme);
-				art.getArt(options.name, options, (err, artInfo) => {
-					return callback(null, artInfo);
-				});
-			},
-			function fromGeneralArtDir(artInfo, callback) {
-				if(artInfo) {
-					return callback(null, artInfo);
-				}
+                options.basePath = paths.join(config.paths.themes, config.defaults.theme);
+                art.getArt(options.name, options, (err, artInfo) => {
+                    return callback(null, artInfo);
+                });
+            },
+            function fromGeneralArtDir(artInfo, callback) {
+                if(artInfo) {
+                    return callback(null, artInfo);
+                }
 
-				options.basePath = config.paths.art;
-				art.getArt(options.name, options, (err, artInfo) => {
-					return callback(err, artInfo);
-				});
-			}
-		],
-		function complete(err, artInfo) {
-			if(err) {
-				const logger = _.get(options, 'client.log') || Log;
-				logger.debug( { reason : err.message }, 'Cannot find theme art');
-			}
-			return cb(err, artInfo);
-		}
-	);
+                options.basePath = config.paths.art;
+                art.getArt(options.name, options, (err, artInfo) => {
+                    return callback(err, artInfo);
+                });
+            }
+        ],
+        function complete(err, artInfo) {
+            if(err) {
+                const logger = _.get(options, 'client.log') || Log;
+                logger.debug( { reason : err.message }, 'Cannot find theme art');
+            }
+            return cb(err, artInfo);
+        }
+    );
 }
 
 function displayThemeArt(options, cb) {
-	assert(_.isObject(options));
-	assert(_.isObject(options.client));
-	assert(_.isString(options.name));
+    assert(_.isObject(options));
+    assert(_.isObject(options.client));
+    assert(_.isString(options.name));
 
-	getThemeArt(options, (err, artInfo) => {
-		if(err) {
-			return cb(err);
-		}
-		//	:TODO: just use simple merge of options -> displayOptions
-		const displayOpts = {
-			sauce		: artInfo.sauce,
-			font		: options.font,
-			trailingLF	: options.trailingLF,
-		};
+    getThemeArt(options, (err, artInfo) => {
+        if(err) {
+            return cb(err);
+        }
+        //	:TODO: just use simple merge of options -> displayOptions
+        const displayOpts = {
+            sauce		: artInfo.sauce,
+            font		: options.font,
+            trailingLF	: options.trailingLF,
+        };
 
-		art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
-			return cb(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
-		});
-	});
+        art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
+            return cb(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
+        });
+    });
 }
 
 function displayThemedPrompt(name, client, options, cb) {
 
-	const useTempViewController = _.isUndefined(options.viewController);
+    const useTempViewController = _.isUndefined(options.viewController);
 
-	async.waterfall(
-		[
-			function display(callback) {
-				const promptConfig = client.currentTheme.prompts[name];
-				if(!promptConfig) {
-					return callback(Errors.DoesNotExist(`Missing "${name}" prompt configuration!`));
-				}
+    async.waterfall(
+        [
+            function display(callback) {
+                const promptConfig = client.currentTheme.prompts[name];
+                if(!promptConfig) {
+                    return callback(Errors.DoesNotExist(`Missing "${name}" prompt configuration!`));
+                }
 
-				if(options.clearScreen) {
-					client.term.rawWrite(ansi.resetScreen());
-				}
+                if(options.clearScreen) {
+                    client.term.rawWrite(ansi.resetScreen());
+                }
 
-				//
-				//	If we did *not* clear the screen, don't let the font change
-				//	doing so messes things up -- most terminals that support font
-				//	changing can only display a single font at at time.
-				//
-				//	:TODO: We can use term detection to do nifty things like avoid this kind of kludge:
-				const dispOptions = Object.assign( {}, promptConfig.options );
-				if(!options.clearScreen) {
-					dispOptions.font = 'not_really_a_font!';	//	kludge :)
-				}
+                //
+                //	If we did *not* clear the screen, don't let the font change
+                //	doing so messes things up -- most terminals that support font
+                //	changing can only display a single font at at time.
+                //
+                //	:TODO: We can use term detection to do nifty things like avoid this kind of kludge:
+                const dispOptions = Object.assign( {}, promptConfig.options );
+                if(!options.clearScreen) {
+                    dispOptions.font = 'not_really_a_font!';	//	kludge :)
+                }
 
-				displayThemedAsset(
-					promptConfig.art,
-					client,
-					dispOptions,
-					(err, artInfo) => {
-						if(err) {
-							return callback(err);
-						}
+                displayThemedAsset(
+                    promptConfig.art,
+                    client,
+                    dispOptions,
+                    (err, artInfo) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						return callback(null, promptConfig, artInfo);
-					}
-				);
-			},
-			function discoverCursorPosition(promptConfig, artInfo, callback) {
-				if(!options.clearPrompt) {
-					//	no need to query cursor - we're not gonna use it
-					return callback(null, promptConfig, artInfo);
-				}
+                        return callback(null, promptConfig, artInfo);
+                    }
+                );
+            },
+            function discoverCursorPosition(promptConfig, artInfo, callback) {
+                if(!options.clearPrompt) {
+                    //	no need to query cursor - we're not gonna use it
+                    return callback(null, promptConfig, artInfo);
+                }
 
-				client.once('cursor position report', pos => {
-					artInfo.startRow = pos[0] - artInfo.height;
-					return callback(null, promptConfig, artInfo);
-				});
+                client.once('cursor position report', pos => {
+                    artInfo.startRow = pos[0] - artInfo.height;
+                    return callback(null, promptConfig, artInfo);
+                });
 
-				client.term.rawWrite(ansi.queryPos());
-			},
-			function createMCIViews(promptConfig, artInfo, callback) {
-				const tempViewController = useTempViewController ? new ViewController( { client : client } ) : options.viewController;
+                client.term.rawWrite(ansi.queryPos());
+            },
+            function createMCIViews(promptConfig, artInfo, callback) {
+                const tempViewController = useTempViewController ? new ViewController( { client : client } ) : options.viewController;
 
-				const loadOpts = {
-					promptName	: name,
-					mciMap		: artInfo.mciMap,
-					config		: promptConfig,
-				};
+                const loadOpts = {
+                    promptName	: name,
+                    mciMap		: artInfo.mciMap,
+                    config		: promptConfig,
+                };
 
-				tempViewController.loadFromPromptConfig(loadOpts, () => {
-					return callback(null, artInfo, tempViewController);
-				});
-			},
-			function pauseForUserInput(artInfo, tempViewController, callback) {
-				if(!options.pause) {
-					return callback(null, artInfo, tempViewController);
-				}
+                tempViewController.loadFromPromptConfig(loadOpts, () => {
+                    return callback(null, artInfo, tempViewController);
+                });
+            },
+            function pauseForUserInput(artInfo, tempViewController, callback) {
+                if(!options.pause) {
+                    return callback(null, artInfo, tempViewController);
+                }
 
-				client.waitForKeyPress( () => {
-					return callback(null, artInfo, tempViewController);
-				});
-			},
-			function clearPauseArt(artInfo, tempViewController, callback) {
-				if(options.clearPrompt) {
-					if(artInfo.startRow && artInfo.height) {
-						client.term.rawWrite(ansi.goto(artInfo.startRow, 1));
+                client.waitForKeyPress( () => {
+                    return callback(null, artInfo, tempViewController);
+                });
+            },
+            function clearPauseArt(artInfo, tempViewController, callback) {
+                if(options.clearPrompt) {
+                    if(artInfo.startRow && artInfo.height) {
+                        client.term.rawWrite(ansi.goto(artInfo.startRow, 1));
 
-						//	Note: Does not work properly in NetRunner < 2.0b17:
-						client.term.rawWrite(ansi.deleteLine(artInfo.height));
-					} else {
-						client.term.rawWrite(ansi.eraseLine(1));
-					}
-				}
+                        //	Note: Does not work properly in NetRunner < 2.0b17:
+                        client.term.rawWrite(ansi.deleteLine(artInfo.height));
+                    } else {
+                        client.term.rawWrite(ansi.eraseLine(1));
+                    }
+                }
 
-				return callback(null, tempViewController);
-			}
-		],
-		(err, tempViewController) => {
-			if(err) {
-				client.log.warn( { error : err.message }, `Failed displaying "${name}" prompt` );
-			}
+                return callback(null, tempViewController);
+            }
+        ],
+        (err, tempViewController) => {
+            if(err) {
+                client.log.warn( { error : err.message }, `Failed displaying "${name}" prompt` );
+            }
 
-			if(tempViewController && useTempViewController) {
-				tempViewController.detachClientEvents();
-			}
+            if(tempViewController && useTempViewController) {
+                tempViewController.detachClientEvents();
+            }
 
-			return cb(null);
-		}
-	);
+            return cb(null);
+        }
+    );
 }
 
 //
@@ -635,63 +635,63 @@ function displayThemedPrompt(name, client, options, cb) {
 //
 function displayThemedPause(client, options, cb) {
 
-	if(!cb && _.isFunction(options)) {
-		cb = options;
-		options = {};
-	}
+    if(!cb && _.isFunction(options)) {
+        cb = options;
+        options = {};
+    }
 
-	if(!_.isBoolean(options.clearPrompt)) {
-		options.clearPrompt = true;
-	}
+    if(!_.isBoolean(options.clearPrompt)) {
+        options.clearPrompt = true;
+    }
 
-	const promptOptions = Object.assign( {}, options, { pause : true } );
-	return displayThemedPrompt('pause', client, promptOptions, cb);
+    const promptOptions = Object.assign( {}, options, { pause : true } );
+    return displayThemedPrompt('pause', client, promptOptions, cb);
 }
 
 function displayThemedAsset(assetSpec, client, options, cb) {
-	assert(_.isObject(client));
+    assert(_.isObject(client));
 
-	//	options are... optional
-	if(3 === arguments.length) {
-		cb = options;
-		options = {};
-	}
+    //	options are... optional
+    if(3 === arguments.length) {
+        cb = options;
+        options = {};
+    }
 
-	if(Array.isArray(assetSpec) && _.isString(options.acsCondMember)) {
-		assetSpec = client.acs.getConditionalValue(assetSpec, options.acsCondMember);
-	}
+    if(Array.isArray(assetSpec) && _.isString(options.acsCondMember)) {
+        assetSpec = client.acs.getConditionalValue(assetSpec, options.acsCondMember);
+    }
 
-	const artAsset = asset.getArtAsset(assetSpec);
-	if(!artAsset) {
-		return cb(new Error('Asset not found: ' + assetSpec));
-	}
+    const artAsset = asset.getArtAsset(assetSpec);
+    if(!artAsset) {
+        return cb(new Error('Asset not found: ' + assetSpec));
+    }
 
-	//	:TODO: just use simple merge of options -> displayOptions
-	var dispOpts = {
-		name			: artAsset.asset,
-		client			: client,
-		font			: options.font,
-		trailingLF		: options.trailingLF,
-	};
+    //	:TODO: just use simple merge of options -> displayOptions
+    var dispOpts = {
+        name			: artAsset.asset,
+        client			: client,
+        font			: options.font,
+        trailingLF		: options.trailingLF,
+    };
 
-	switch(artAsset.type) {
-		case 'art' :
-			displayThemeArt(dispOpts, function displayed(err, artData) {
-				return cb(err, err ? null : { mciMap : artData.mciMap, height : artData.extraInfo.height } );
-			});
-			break;
+    switch(artAsset.type) {
+        case 'art' :
+            displayThemeArt(dispOpts, function displayed(err, artData) {
+                return cb(err, err ? null : { mciMap : artData.mciMap, height : artData.extraInfo.height } );
+            });
+            break;
 
-		case 'method' :
-			//	:TODO: fetch & render via method
-			break;
+        case 'method' :
+            //	:TODO: fetch & render via method
+            break;
 
-		case 'inline ' :
-			//	:TODO: think about this more in relation to themes, etc. How can this come
-			//	from a theme (with override from menu.json) ???
-			//	look @ client.currentTheme.inlineArt[name] -> menu/prompt[name]
-			break;
+        case 'inline ' :
+            //	:TODO: think about this more in relation to themes, etc. How can this come
+            //	from a theme (with override from menu.json) ???
+            //	look @ client.currentTheme.inlineArt[name] -> menu/prompt[name]
+            break;
 
-		default :
-			return cb(new Error('Unsupported art asset type: ' + artAsset.type));
-	}
+        default :
+            return cb(new Error('Unsupported art asset type: ' + artAsset.type));
+    }
 }
\ No newline at end of file
diff --git a/core/tic_file_info.js b/core/tic_file_info.js
index 124bbca1..37aec134 100644
--- a/core/tic_file_info.js
+++ b/core/tic_file_info.js
@@ -22,264 +22,264 @@ const crypto		= require('crypto');
 //	* FSC-0087.001 @ http://ftsc.org/docs/fsc-0087.001
 //
 module.exports = class TicFileInfo {
-	constructor() {
-		this.entries = new Map();
-	}
+    constructor() {
+        this.entries = new Map();
+    }
 
-	static get requiredFields() {
-		return [
-			'Area', 'Origin', 'From', 'File', 'Crc',
-			//	:TODO: validate this:
-			//'Path', 'Seenby'	//	these two are questionable; some systems don't send them?
-		];
-	}
+    static get requiredFields() {
+        return [
+            'Area', 'Origin', 'From', 'File', 'Crc',
+            //	:TODO: validate this:
+            //'Path', 'Seenby'	//	these two are questionable; some systems don't send them?
+        ];
+    }
 
-	get(key) {
-		return this.entries.get(key.toLowerCase());
-	}
+    get(key) {
+        return this.entries.get(key.toLowerCase());
+    }
 
-	getAsString(key, joinWith) {
-		const value = this.get(key);
-		if(value) {
-			//
-			//	We call toString() on values to ensure numbers, addresses, etc. are converted
-			//
-			joinWith = joinWith || '';
-			if(Array.isArray(value)) {
-				return value.map(v => v.toString() ).join(joinWith);
-			}
+    getAsString(key, joinWith) {
+        const value = this.get(key);
+        if(value) {
+            //
+            //	We call toString() on values to ensure numbers, addresses, etc. are converted
+            //
+            joinWith = joinWith || '';
+            if(Array.isArray(value)) {
+                return value.map(v => v.toString() ).join(joinWith);
+            }
 
-			return value.toString();
-		}
-	}
+            return value.toString();
+        }
+    }
 
-	get filePath() {
-		return paths.join(paths.dirname(this.path), this.getAsString('File'));
-	}
+    get filePath() {
+        return paths.join(paths.dirname(this.path), this.getAsString('File'));
+    }
 
-	get longFileName() {
-		return this.getAsString('Lfile') || this.getAsString('Fullname') || this.getAsString('File');
-	}
+    get longFileName() {
+        return this.getAsString('Lfile') || this.getAsString('Fullname') || this.getAsString('File');
+    }
 
-	hasRequiredFields() {
-		const req = TicFileInfo.requiredFields;
-		return req.every( f => this.get(f) );
-	}
+    hasRequiredFields() {
+        const req = TicFileInfo.requiredFields;
+        return req.every( f => this.get(f) );
+    }
 
-	validate(config, cb) {
-		//	config.nodes
-		//	config.defaultPassword (optional)
-		//	config.localAreaTags
-		EnigAssert(config.nodes && config.localAreaTags);
+    validate(config, cb) {
+        //	config.nodes
+        //	config.defaultPassword (optional)
+        //	config.localAreaTags
+        EnigAssert(config.nodes && config.localAreaTags);
 
-		const self = this;
+        const self = this;
 
-		async.waterfall(
-			[
-				function initial(callback) {
-					if(!self.hasRequiredFields()) {
-						return callback(Errors.Invalid('One or more required fields missing from TIC'));
-					}
+        async.waterfall(
+            [
+                function initial(callback) {
+                    if(!self.hasRequiredFields()) {
+                        return callback(Errors.Invalid('One or more required fields missing from TIC'));
+                    }
 
-					const area = self.getAsString('Area').toUpperCase();
+                    const area = self.getAsString('Area').toUpperCase();
 
-					const localInfo = {
-						areaTag	: config.localAreaTags.find( areaTag => areaTag.toUpperCase() === area ),
-					};
+                    const localInfo = {
+                        areaTag	: config.localAreaTags.find( areaTag => areaTag.toUpperCase() === area ),
+                    };
 
-					if(!localInfo.areaTag) {
-						return callback(Errors.Invalid(`No local area for "Area" of ${area}`));
-					}
+                    if(!localInfo.areaTag) {
+                        return callback(Errors.Invalid(`No local area for "Area" of ${area}`));
+                    }
 
-					const from = Address.fromString(self.getAsString('From'));
-					if(!from.isValid()) {
-						return callback(Errors.Invalid(`Invalid "From" address: ${self.getAsString('From')}`));
-					}
+                    const from = Address.fromString(self.getAsString('From'));
+                    if(!from.isValid()) {
+                        return callback(Errors.Invalid(`Invalid "From" address: ${self.getAsString('From')}`));
+                    }
 
-					//	note that our config may have wildcards, such as "80:774/*"
-					localInfo.node = Object.keys(config.nodes).find( nodeAddrWildcard => from.isPatternMatch(nodeAddrWildcard) );
+                    //	note that our config may have wildcards, such as "80:774/*"
+                    localInfo.node = Object.keys(config.nodes).find( nodeAddrWildcard => from.isPatternMatch(nodeAddrWildcard) );
 
-					if(!localInfo.node) {
-						return callback(Errors.Invalid('TIC is not from a known node'));
-					}
+                    if(!localInfo.node) {
+                        return callback(Errors.Invalid('TIC is not from a known node'));
+                    }
 
-					//	if we require a password, "PW" must match
-					const passActual = _.get(config.nodes, [ localInfo.node, 'tic', 'password' ] ) || config.defaultPassword;
-					if(!passActual) {
-						return callback(null, localInfo);	//	no pw validation
-					}
+                    //	if we require a password, "PW" must match
+                    const passActual = _.get(config.nodes, [ localInfo.node, 'tic', 'password' ] ) || config.defaultPassword;
+                    if(!passActual) {
+                        return callback(null, localInfo);	//	no pw validation
+                    }
 
-					const passTic = self.getAsString('Pw');
-					if(passTic !== passActual) {
-						return callback(Errors.Invalid('Bad TIC password'));
-					}
+                    const passTic = self.getAsString('Pw');
+                    if(passTic !== passActual) {
+                        return callback(Errors.Invalid('Bad TIC password'));
+                    }
 
-					return callback(null, localInfo);
-				},
-				function checksumAndSize(localInfo, callback) {
-					const crcTic	= self.get('Crc');
-					const stream	= fs.createReadStream(self.filePath);
-					const crc		= new CRC32();
-					let sizeActual	= 0;
+                    return callback(null, localInfo);
+                },
+                function checksumAndSize(localInfo, callback) {
+                    const crcTic	= self.get('Crc');
+                    const stream	= fs.createReadStream(self.filePath);
+                    const crc		= new CRC32();
+                    let sizeActual	= 0;
 
-					let sha256Tic	= self.getAsString('Sha256');
-					let sha256;
-					if(sha256Tic) {
-						sha256Tic	= sha256Tic.toLowerCase();
-						sha256		= crypto.createHash('sha256');
-					}
+                    let sha256Tic	= self.getAsString('Sha256');
+                    let sha256;
+                    if(sha256Tic) {
+                        sha256Tic	= sha256Tic.toLowerCase();
+                        sha256		= crypto.createHash('sha256');
+                    }
 
-					stream.on('data', data => {
-						sizeActual += data.length;
+                    stream.on('data', data => {
+                        sizeActual += data.length;
 
-						//	sha256 if possible, else crc32
-						if(sha256) {
-							sha256.update(data);
-						} else {
-							crc.update(data);
-						}
-					});
+                        //	sha256 if possible, else crc32
+                        if(sha256) {
+                            sha256.update(data);
+                        } else {
+                            crc.update(data);
+                        }
+                    });
 
-					stream.on('end', () => {
-						//	again, use sha256 if possible
-						if(sha256) {
-							const sha256Actual = sha256.digest('hex');
-							if(sha256Tic != sha256Actual) {
-								return callback(Errors.Invalid(`TIC "Sha256" of ${sha256Tic} does not match actual SHA-256 of ${sha256Actual}`));
-							}
+                    stream.on('end', () => {
+                        //	again, use sha256 if possible
+                        if(sha256) {
+                            const sha256Actual = sha256.digest('hex');
+                            if(sha256Tic != sha256Actual) {
+                                return callback(Errors.Invalid(`TIC "Sha256" of ${sha256Tic} does not match actual SHA-256 of ${sha256Actual}`));
+                            }
 
-							localInfo.sha256 = sha256Actual;
-						} else {
-							const crcActual = crc.finalize();
-							if(crcActual !== crcTic) {
-								return callback(Errors.Invalid(`TIC "Crc" of ${crcTic} does not match actual CRC-32 of ${crcActual}`));
-							}
-							localInfo.crc32 = crcActual;
-						}
+                            localInfo.sha256 = sha256Actual;
+                        } else {
+                            const crcActual = crc.finalize();
+                            if(crcActual !== crcTic) {
+                                return callback(Errors.Invalid(`TIC "Crc" of ${crcTic} does not match actual CRC-32 of ${crcActual}`));
+                            }
+                            localInfo.crc32 = crcActual;
+                        }
 
-						const sizeTic = self.get('Size');
-						if(_.isUndefined(sizeTic)) {
-							return callback(null, localInfo);
-						}
+                        const sizeTic = self.get('Size');
+                        if(_.isUndefined(sizeTic)) {
+                            return callback(null, localInfo);
+                        }
 
-						if(sizeTic !== sizeActual) {
-							return callback(Errors.Invalid(`TIC "Size" of ${sizeTic} does not match actual size of ${sizeActual}`));
-						}
+                        if(sizeTic !== sizeActual) {
+                            return callback(Errors.Invalid(`TIC "Size" of ${sizeTic} does not match actual size of ${sizeActual}`));
+                        }
 
-						return callback(null, localInfo);
-					});
+                        return callback(null, localInfo);
+                    });
 
-					stream.on('error', err => {
-						return callback(err);
-					});
-				}
-			],
-			(err, localInfo) => {
-				return cb(err, localInfo);
-			}
-		);
-	}
+                    stream.on('error', err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            (err, localInfo) => {
+                return cb(err, localInfo);
+            }
+        );
+    }
 
-	isToAddress(address, allowNonExplicit) {
-		//
-		//	FSP-1039.001:
-		//	"This keyword specifies the FTN address of the system where to
-		//	send the file to be distributed and the accompanying TIC file.
-		//	Some File processors (Allfix) only insert a line with this
-		//	keyword when the file and the associated TIC file are to be
-		//	file routed through a third sysem instead of being processed
-		//	by a file processor on that system. Others always insert it.
-		//	Note that the To keyword may cause problems when the TIC file
-		//	is proecessed by software that does not recognise it and
-		//	passes the line "as is" to other systems.
-		//
-		//	Example:  To 292/854
-		//
-		//	This is an optional keyword."
-		//
-		const to = this.get('To');
+    isToAddress(address, allowNonExplicit) {
+        //
+        //	FSP-1039.001:
+        //	"This keyword specifies the FTN address of the system where to
+        //	send the file to be distributed and the accompanying TIC file.
+        //	Some File processors (Allfix) only insert a line with this
+        //	keyword when the file and the associated TIC file are to be
+        //	file routed through a third sysem instead of being processed
+        //	by a file processor on that system. Others always insert it.
+        //	Note that the To keyword may cause problems when the TIC file
+        //	is proecessed by software that does not recognise it and
+        //	passes the line "as is" to other systems.
+        //
+        //	Example:  To 292/854
+        //
+        //	This is an optional keyword."
+        //
+        const to = this.get('To');
 
-		if(!to) {
-			return allowNonExplicit;
-		}
+        if(!to) {
+            return allowNonExplicit;
+        }
 
-		return address.isEqual(to);
-	}
+        return address.isEqual(to);
+    }
 
-	static createFromFile(path, cb) {
-		fs.readFile(path, 'utf8', (err, ticData) => {
-			if(err) {
-				return cb(err);
-			}
+    static createFromFile(path, cb) {
+        fs.readFile(path, 'utf8', (err, ticData) => {
+            if(err) {
+                return cb(err);
+            }
 
-			const ticFileInfo	= new TicFileInfo();
-			ticFileInfo.path	= path;
+            const ticFileInfo	= new TicFileInfo();
+            ticFileInfo.path	= path;
 
-			//
-			//	Lines in a TIC file should be separated by CRLF (DOS)
-			//	may be separated by LF (UNIX)
-			//
-			const lines = ticData.split(/\r\n|\n/g);
-			let keyEnd;
-			let key;
-			let value;
-			let entry;
+            //
+            //	Lines in a TIC file should be separated by CRLF (DOS)
+            //	may be separated by LF (UNIX)
+            //
+            const lines = ticData.split(/\r\n|\n/g);
+            let keyEnd;
+            let key;
+            let value;
+            let entry;
 
-			lines.forEach(line => {
-				keyEnd	= line.search(/\s/);
+            lines.forEach(line => {
+                keyEnd	= line.search(/\s/);
 
-				if(keyEnd < 0) {
-					keyEnd = line.length;
-				}
+                if(keyEnd < 0) {
+                    keyEnd = line.length;
+                }
 
-				key = line.substr(0, keyEnd).toLowerCase();
+                key = line.substr(0, keyEnd).toLowerCase();
 
-				if(0 === key.length) {
-					return;
-				}
+                if(0 === key.length) {
+                    return;
+                }
 
-				value = line.substr(keyEnd + 1);
+                value = line.substr(keyEnd + 1);
 
-				//	don't trim Ldesc; may mess with FILE_ID.DIZ type descriptions
-				if('ldesc' !== key) {
-					value = value.trim();
-				}
+                //	don't trim Ldesc; may mess with FILE_ID.DIZ type descriptions
+                if('ldesc' !== key) {
+                    value = value.trim();
+                }
 
-				//	convert well known keys to a more reasonable format
-				switch(key) {
-					case 'origin' :
-					case 'from' :
-					case 'seenby' :
-					case 'to' :
-						value = Address.fromString(value);
-						break;
+                //	convert well known keys to a more reasonable format
+                switch(key) {
+                    case 'origin' :
+                    case 'from' :
+                    case 'seenby' :
+                    case 'to' :
+                        value = Address.fromString(value);
+                        break;
 
-					case 'crc' :
-						value = parseInt(value, 16);
-						break;
+                    case 'crc' :
+                        value = parseInt(value, 16);
+                        break;
 
-					case 'size' :
-						value = parseInt(value, 10);
-						break;
+                    case 'size' :
+                        value = parseInt(value, 10);
+                        break;
 
-					default :
-						break;
-				}
+                    default :
+                        break;
+                }
 
-				entry = ticFileInfo.entries.get(key);
+                entry = ticFileInfo.entries.get(key);
 
-				if(entry) {
-					if(!Array.isArray(entry)) {
-						entry = [ entry ];
-						ticFileInfo.entries.set(key, entry);
-					}
-					entry.push(value);
-				} else {
-					ticFileInfo.entries.set(key, value);
-				}
-			});
+                if(entry) {
+                    if(!Array.isArray(entry)) {
+                        entry = [ entry ];
+                        ticFileInfo.entries.set(key, entry);
+                    }
+                    entry.push(value);
+                } else {
+                    ticFileInfo.entries.set(key, value);
+                }
+            });
 
-			return cb(null, ticFileInfo);
-		});
-	}
+            return cb(null, ticFileInfo);
+        });
+    }
 };
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index 39d7ef95..28818189 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -10,112 +10,112 @@ const assert		= require('assert');
 exports.ToggleMenuView		= ToggleMenuView;
 
 function ToggleMenuView (options) {
-	options.cursor = options.cursor || 'hide';
+    options.cursor = options.cursor || 'hide';
 
-	MenuView.call(this, options);
+    MenuView.call(this, options);
 
-	var self = this;
+    var self = this;
 
-	/*
+    /*
 	this.cachePositions = function() {
 		self.positionCacheExpired = false;
 	};
 	*/
 
-	this.updateSelection = function() {
-		assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
-		self.redraw();
-	};
+    this.updateSelection = function() {
+        assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
+        self.redraw();
+    };
 }
 
 util.inherits(ToggleMenuView, MenuView);
 
 ToggleMenuView.prototype.redraw = function() {
-	ToggleMenuView.super_.prototype.redraw.call(this);
+    ToggleMenuView.super_.prototype.redraw.call(this);
 
-	//this.cachePositions();
+    //this.cachePositions();
 
-	this.client.term.write(this.hasFocus ? this.getFocusSGR() : this.getSGR());
+    this.client.term.write(this.hasFocus ? this.getFocusSGR() : this.getSGR());
 
-	assert(this.items.length === 2);
-	for(var i = 0; i < 2; i++) {
-		var item = this.items[i];
-		var text = strUtil.stylizeString(
-			item.text, i === this.focusedItemIndex && this.hasFocus ? this.focusTextStyle : this.textStyle);
+    assert(this.items.length === 2);
+    for(var i = 0; i < 2; i++) {
+        var item = this.items[i];
+        var text = strUtil.stylizeString(
+            item.text, i === this.focusedItemIndex && this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-		if(1 === i) {
-			//console.log(this.styleColor1)
-			//var sepColor = this.getANSIColor(this.styleColor1 || this.getColor());
-			//console.log(sepColor.substr(1))
-			//var sepColor = '\u001b[0m\u001b[1;30m';	//	:TODO: FIX ME!!!
-			//	:TODO: sepChar needs to be configurable!!!
-			this.client.term.write(this.styleSGR1 + ' / ');
-			//this.client.term.write(sepColor + ' / ');
-		}
+        if(1 === i) {
+            //console.log(this.styleColor1)
+            //var sepColor = this.getANSIColor(this.styleColor1 || this.getColor());
+            //console.log(sepColor.substr(1))
+            //var sepColor = '\u001b[0m\u001b[1;30m';	//	:TODO: FIX ME!!!
+            //	:TODO: sepChar needs to be configurable!!!
+            this.client.term.write(this.styleSGR1 + ' / ');
+            //this.client.term.write(sepColor + ' / ');
+        }
 
-		this.client.term.write(i === this.focusedItemIndex ? this.getFocusSGR() : this.getSGR());
-		this.client.term.write(text);
-	}
+        this.client.term.write(i === this.focusedItemIndex ? this.getFocusSGR() : this.getSGR());
+        this.client.term.write(text);
+    }
 };
 
 ToggleMenuView.prototype.setFocusItemIndex = function(index) {
-	ToggleMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    ToggleMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
 
-	this.updateSelection();
+    this.updateSelection();
 };
 
 ToggleMenuView.prototype.setFocus = function(focused) {
-	ToggleMenuView.super_.prototype.setFocus.call(this, focused);
+    ToggleMenuView.super_.prototype.setFocus.call(this, focused);
 
-	this.redraw();
+    this.redraw();
 };
 
 ToggleMenuView.prototype.focusNext = function() {
-	if(this.items.length - 1 === this.focusedItemIndex) {
-		this.focusedItemIndex = 0;
-	} else {
-		this.focusedItemIndex++;
-	}
+    if(this.items.length - 1 === this.focusedItemIndex) {
+        this.focusedItemIndex = 0;
+    } else {
+        this.focusedItemIndex++;
+    }
 
-	this.updateSelection();
+    this.updateSelection();
 
-	ToggleMenuView.super_.prototype.focusNext.call(this);
+    ToggleMenuView.super_.prototype.focusNext.call(this);
 };
 
 ToggleMenuView.prototype.focusPrevious = function() {
 
-	if(0 === this.focusedItemIndex) {
-		this.focusedItemIndex = this.items.length - 1;
-	} else {
-		this.focusedItemIndex--;
-	}
+    if(0 === this.focusedItemIndex) {
+        this.focusedItemIndex = this.items.length - 1;
+    } else {
+        this.focusedItemIndex--;
+    }
 
-	this.updateSelection();
+    this.updateSelection();
 
-	ToggleMenuView.super_.prototype.focusPrevious.call(this);
+    ToggleMenuView.super_.prototype.focusPrevious.call(this);
 };
 
 ToggleMenuView.prototype.onKeyPress = function(ch, key) {
 
-	if(key) {
-		if(this.isKeyMapped('right', key.name) || this.isKeyMapped('down', key.name)) {
-			this.focusNext();
-		} else if(this.isKeyMapped('left', key.name) || this.isKeyMapped('up', key.nam4e)) {
-			this.focusPrevious();
-		}
-	}
+    if(key) {
+        if(this.isKeyMapped('right', key.name) || this.isKeyMapped('down', key.name)) {
+            this.focusNext();
+        } else if(this.isKeyMapped('left', key.name) || this.isKeyMapped('up', key.nam4e)) {
+            this.focusPrevious();
+        }
+    }
 
-	ToggleMenuView.super_.prototype.onKeyPress.call(this, ch, key);
+    ToggleMenuView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 ToggleMenuView.prototype.getData = function() {
-	return this.focusedItemIndex;
+    return this.focusedItemIndex;
 };
 
 ToggleMenuView.prototype.setItems = function(items) {
-	items = items.slice(0, 2);	//	switch/toggle only works with two elements
+    items = items.slice(0, 2);	//	switch/toggle only works with two elements
 
-	ToggleMenuView.super_.prototype.setItems.call(this, items);
+    ToggleMenuView.super_.prototype.setItems.call(this, items);
 
-	this.dimens.width = items.join(' / ').length;	//	:TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
+    this.dimens.width = items.join(' / ').length;	//	:TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
 };
diff --git a/core/upload.js b/core/upload.js
index 4ff6b3fb..2279e6b4 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -26,713 +26,713 @@ const paths								= require('path');
 const sanatizeFilename					= require('sanitize-filename');
 
 exports.moduleInfo = {
-	name		: 'Upload',
-	desc		: 'Module for classic file uploads',
-	author		: 'NuSkooler',
+    name		: 'Upload',
+    desc		: 'Module for classic file uploads',
+    author		: 'NuSkooler',
 };
 
 const FormIds = {
-	options		: 0,
-	processing	: 1,
-	fileDetails	: 2,
-	dupes		: 3,
+    options		: 0,
+    processing	: 1,
+    fileDetails	: 2,
+    dupes		: 3,
 };
 
 const MciViewIds = {
-	options : {
-		area		: 1,	//	area selection
-		uploadType	: 2,	//	blind vs specify filename
-		fileName	: 3,	//	for non-blind; not editable for blind
-		navMenu		: 4,	//	next/cancel/etc.
-		errMsg		: 5,	//	errors (e.g. filename cannot be blank)
-	},
+    options : {
+        area		: 1,	//	area selection
+        uploadType	: 2,	//	blind vs specify filename
+        fileName	: 3,	//	for non-blind; not editable for blind
+        navMenu		: 4,	//	next/cancel/etc.
+        errMsg		: 5,	//	errors (e.g. filename cannot be blank)
+    },
 
-	processing : {
-		calcHashIndicator		: 1,
-		archiveListIndicator	: 2,
-		descFileIndicator		: 3,
-		logStep					: 4,
-		customRangeStart		: 10,	//	10+ = customs
-	},
+    processing : {
+        calcHashIndicator		: 1,
+        archiveListIndicator	: 2,
+        descFileIndicator		: 3,
+        logStep					: 4,
+        customRangeStart		: 10,	//	10+ = customs
+    },
 
-	fileDetails : {
-		desc				: 1,	//	defaults to 'desc' (e.g. from FILE_ID.DIZ)
-		tags				: 2,	//	tag(s) for item
-		estYear				: 3,
-		accept				: 4,	//	accept fields & continue
-		customRangeStart	: 10,	//	10+ = customs
-	},
+    fileDetails : {
+        desc				: 1,	//	defaults to 'desc' (e.g. from FILE_ID.DIZ)
+        tags				: 2,	//	tag(s) for item
+        estYear				: 3,
+        accept				: 4,	//	accept fields & continue
+        customRangeStart	: 10,	//	10+ = customs
+    },
 
-	dupes : {
-		dupeList			: 1,
-	}
+    dupes : {
+        dupeList			: 1,
+    }
 };
 
 exports.getModule = class UploadModule extends MenuModule {
 
-	constructor(options) {
-		super(options);
-
-		if(_.has(options, 'lastMenuResult.recvFilePaths')) {
-			this.recvFilePaths = options.lastMenuResult.recvFilePaths;
-		}
-
-		this.availAreas = getSortedAvailableFileAreas(this.client, { writeAcs : true } );
-
-		this.menuMethods = {
-			optionsNavContinue : (formData, extraArgs, cb) => {
-				return this.performUpload(cb);
-			},
-
-			fileDetailsContinue : (formData, extraArgs, cb) => {
-				//	see displayFileDetailsPageForUploadEntry() for this hackery:
-				cb(null);
-				return this.fileDetailsCurrentEntrySubmitCallback(null, formData.value);	//	move on to the next entry, if any
-			},
-
-			//	validation
-			validateNonBlindFileName : (fileName, cb) => {
-				fileName = sanatizeFilename(fileName);	//	remove unsafe chars, path info, etc.
-				if(0 === fileName.length) {
-					return cb(new Error('Invalid filename'));
-				}
-
-				if(0 === fileName.length) {
-					return cb(new Error('Filename cannot be empty'));
-				}
-
-				//	At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused
-				if(/^[0-9].*$/.test(fileName)) {
-					return cb(new Error('Invalid filename'));
-				}
-
-				return cb(null);
-			},
-			viewValidationListener : (err, cb) => {
-				const errView = this.viewControllers.options.getView(MciViewIds.options.errMsg);
-				if(errView) {
-					if(err) {
-						errView.setText(err.message);
-					} else {
-						errView.clearText();
-					}
-				}
-
-				return cb(null);
-			}
-		};
-	}
-
-	getSaveState() {
-		//	if no areas, we're falling back due to lack of access/areas avail to upload to
-		if(this.availAreas.length > 0) {
-			return {
-				uploadType			: this.uploadType,
-				tempRecvDirectory	: this.tempRecvDirectory,
-				areaInfo			: this.availAreas[ this.viewControllers.options.getView(MciViewIds.options.area).getData() ],
-			};
-		}
-	}
-
-	restoreSavedState(savedState) {
-		if(savedState.areaInfo) {
-			this.uploadType			= savedState.uploadType;
-			this.areaInfo			= savedState.areaInfo;
-			this.tempRecvDirectory	= savedState.tempRecvDirectory;
-		}
-	}
-
-	isBlindUpload() { return 'blind' === this.uploadType; }
-	isFileTransferComplete() { return !_.isUndefined(this.recvFilePaths); }
-
-	initSequence() {
-		const self = this;
-
-		if(0 === this.availAreas.length) {
-			//
-			return this.gotoMenu(this.menuConfig.config.noUploadAreasAvailMenu || 'fileBaseNoUploadAreasAvail');
-		}
-
-		async.series(
-			[
-				function before(callback) {
-					return self.beforeArt(callback);
-				},
-				function display(callback) {
-					if(self.isFileTransferComplete()) {
-						return self.displayProcessingPage(callback);
-					} else {
-						return self.displayOptionsPage(callback);
-					}
-				}
-			],
-			() => {
-				return self.finishedLoading();
-			}
-		);
-	}
-
-	finishedLoading() {
-		if(this.isFileTransferComplete()) {
-			return this.processUploadedFiles();
-		}
-	}
-
-	performUpload(cb) {
-		temptmp.mkdir( { prefix : 'enigul-' }, (err, tempRecvDirectory) => {
-			if(err) {
-				return cb(err);
-			}
-
-			//	need a terminator for various external protocols
-			this.tempRecvDirectory = pathWithTerminatingSeparator(tempRecvDirectory);
-
-			const modOpts = {
-				extraArgs : {
-					recvDirectory	: this.tempRecvDirectory,	//	we'll move files from here to their area container once processed/confirmed
-					direction		: 'recv',
-				}
-			};
-
-			if(!this.isBlindUpload()) {
-				//	data has been sanatized at this point
-				modOpts.extraArgs.recvFileName = this.viewControllers.options.getView(MciViewIds.options.fileName).getData();
-			}
-
-			//
-			//	Move along to protocol selection -> file transfer
-			//	Upon completion, we'll re-enter the module with some file paths handed to us
-			//
-			return this.gotoMenu(
-				this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection',
-				modOpts,
-				cb
-			);
-		});
-	}
-
-	continueNonBlindUpload(cb) {
-		return cb(null);
-	}
-
-	updateScanStepInfoViews(stepInfo) {
-		//	:TODO: add some blinking (e.g. toggle items) indicators - see OBV.DOC
-
-		const fmtObj = Object.assign( {}, stepInfo);
-		let stepIndicatorFmt = '';
-		let logStepFmt;
-
-		const fmtConfig = this.menuConfig.config;
-
-		const indicatorStates 	= fmtConfig.indicatorStates || [ '|', '/', '-', '\\' ];
-		const indicatorFinished	= fmtConfig.indicatorFinished || '√';
-
-		const indicator = { };
-		const self = this;
-
-		function updateIndicator(mci, isFinished) {
-			indicator.mci = mci;
-
-			if(isFinished) {
-				indicator.text = indicatorFinished;
-			} else {
-				self.scanStatus.indicatorPos += 1;
-				if(self.scanStatus.indicatorPos >= indicatorStates.length) {
-					self.scanStatus.indicatorPos = 0;
-				}
-				indicator.text = indicatorStates[self.scanStatus.indicatorPos];
-			}
-		}
-
-		switch(stepInfo.step) {
-			case 'start' :
-				logStepFmt = stepIndicatorFmt = fmtConfig.scanningStartFormat || 'Scanning {fileName}';
-				break;
-
-			case 'hash_update' :
-				stepIndicatorFmt = fmtConfig.calcHashFormat || 'Calculating hash/checksums: {calcHashPercent}%';
-				updateIndicator(MciViewIds.processing.calcHashIndicator);
-				break;
-
-			case 'hash_finish' :
-				stepIndicatorFmt = fmtConfig.calcHashCompleteFormat || 'Finished calculating hash/checksums';
-				updateIndicator(MciViewIds.processing.calcHashIndicator, true);
-				break;
-
-			case 'archive_list_start' :
-				stepIndicatorFmt = fmtConfig.extractArchiveListFormat || 'Extracting archive list';
-				updateIndicator(MciViewIds.processing.archiveListIndicator);
-				break;
-
-			case 'archive_list_finish' :
-				fmtObj.archivedFileCount = stepInfo.archiveEntries.length;
-				stepIndicatorFmt = fmtConfig.extractArchiveListFinishFormat || 'Archive list extracted ({archivedFileCount} files)';
-				updateIndicator(MciViewIds.processing.archiveListIndicator, true);
-				break;
-
-			case 'archive_list_failed' :
-				stepIndicatorFmt = fmtConfig.extractArchiveListFailedFormat || 'Archive list extraction failed';
-				break;
-
-			case 'desc_files_start' :
-				stepIndicatorFmt = fmtConfig.processingDescFilesFormat || 'Processing description files';
-				updateIndicator(MciViewIds.processing.descFileIndicator);
-				break;
-
-			case 'desc_files_finish' :
-				stepIndicatorFmt = fmtConfig.processingDescFilesFinishFormat || 'Finished processing description files';
-				updateIndicator(MciViewIds.processing.descFileIndicator, true);
-				break;
-
-			case 'finished' :
-				logStepFmt = stepIndicatorFmt = fmtConfig.scanningStartFormat || 'Finished';
-				break;
-		}
-
-		fmtObj.stepIndicatorText = stringFormat(stepIndicatorFmt, fmtObj);
-
-		if(this.hasProcessingArt) {
-			this.updateCustomViewTextsWithFilter('processing', MciViewIds.processing.customRangeStart, fmtObj, { appendMultiLine : true } );
-
-			if(indicator.mci && indicator.text) {
-				this.setViewText('processing', indicator.mci, indicator.text);
-			}
-
-			if(logStepFmt) {
-				this.setViewText('processing', MciViewIds.processing.logStep, stringFormat(logStepFmt, fmtObj),  { appendMultiLine : true } );
-			}
-		} else {
-			this.client.term.pipeWrite(fmtObj.stepIndicatorText);
-		}
-	}
-
-	scanFiles(cb) {
-		const self = this;
-
-		const results = {
-			newEntries	: [],
-			dupes		: [],
-		};
-
-		self.client.log.debug('Scanning upload(s)', { paths : this.recvFilePaths } );
-
-		let currentFileNum = 0;
-
-		async.eachSeries(this.recvFilePaths, (filePath, nextFilePath) => {
-			//	:TODO: virus scanning/etc. should occur around here
-
-			currentFileNum += 1;
-
-			self.scanStatus = {
-				indicatorPos	: 0,
-			};
-
-			const scanOpts = {
-				areaTag		: self.areaInfo.areaTag,
-				storageTag	: self.areaInfo.storageTags[0],
-			};
-
-			function handleScanStep(stepInfo, nextScanStep) {
-				stepInfo.totalFileNum		= self.recvFilePaths.length;
-				stepInfo.currentFileNum		= currentFileNum;
-
-				self.updateScanStepInfoViews(stepInfo);
-				return nextScanStep(null);
-			}
-
-			self.client.log.debug('Scanning file', { filePath : filePath } );
-
-			scanFile(filePath, scanOpts, handleScanStep, (err, fileEntry, dupeEntries) => {
-				if(err) {
-					return nextFilePath(err);
-				}
-
-				//	new or dupe?
-				if(dupeEntries.length > 0) {
-					//	1:n dupes found
-					self.client.log.debug('Duplicate file(s) found', { dupeEntries : dupeEntries } );
-
-					results.dupes = results.dupes.concat(dupeEntries);
-				} else {
-					//	new one
-					results.newEntries.push(fileEntry);
-				}
-
-				return nextFilePath(null);
-			});
-		}, err => {
-			return cb(err, results);
-		});
-	}
-
-	cleanupTempFiles() {
-		temptmp.cleanup( paths => {
-			Log.debug( { paths : paths, sessionId : temptmp.sessionId }, 'Temporary files cleaned up' );
-		});
-	}
-
-	moveAndPersistUploadsToDatabase(newEntries) {
-
-		const areaStorageDir = getAreaDefaultStorageDirectory(this.areaInfo);
-		const self = this;
-
-		async.eachSeries(newEntries, (newEntry, nextEntry) => {
-			const src 	= paths.join(self.tempRecvDirectory, newEntry.fileName);
-			const dst	= paths.join(areaStorageDir, newEntry.fileName);
-
-			moveFileWithCollisionHandling(src, dst,	(err, finalPath) => {
-				if(err) {
-					self.client.log.error(
-						'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
-					);
-
-					if(dst !== finalPath) {
-						//	name changed; ajust before persist
-						newEntry.fileName = paths.basename(finalPath);
-					}
-
-					return nextEntry(null);	//	still try next file
-				}
-
-				self.client.log.debug('Moved upload to area', { path : finalPath } );
-
-				//	persist to DB
-				newEntry.persist(err => {
-					if(err) {
-						self.client.log.error('Failed persisting upload to database', { path : finalPath, error : err.message } );
-					}
-
-					return nextEntry(null);	//	still try next file
-				});
-			});
-		}, () => {
-			//
-			//	Finally, we can remove any temp files that we may have created
-			//
-			self.cleanupTempFiles();
-		});
-	}
-
-	prepDetailsForUpload(scanResults, cb) {
-		async.eachSeries(scanResults.newEntries, (newEntry, nextEntry) => {
-			newEntry.meta.upload_by_username 	= this.client.user.username;
-			newEntry.meta.upload_by_user_id		= this.client.user.userId;
-
-			this.displayFileDetailsPageForUploadEntry(newEntry, (err, newValues) => {
-				if(err) {
-					return nextEntry(err);
-				}
-
-				if(!newEntry.descIsAnsi) {
-					newEntry.desc = _.trimEnd(newValues.shortDesc);
-				}
-
-				if(newValues.estYear.length > 0) {
-					newEntry.meta.est_release_year = newValues.estYear;
-				}
-
-				if(newValues.tags.length > 0) {
-					newEntry.setHashTags(newValues.tags);
-				}
-
-				return nextEntry(err);
-			});
-		}, err => {
-			delete this.fileDetailsCurrentEntrySubmitCallback;
-			return cb(err, scanResults);
-		});
-	}
-
-	displayDupesPage(dupes, cb) {
-		//
-		//	If we have custom art to show, use it - else just dump basic info.
-		//	Pause at the end in either case.
-		//
-		const self = this;
-
-		async.waterfall(
-			[
-				function prepArtAndViewController(callback) {
-					self.prepViewControllerWithArt(
-						'dupes',
-						FormIds.dupes,
-						{ clearScreen : true, trailingLF : false },
-						err => {
-							if(err) {
-								self.client.term.pipeWrite('|00|07Duplicate upload(s) found:\n');
-								return callback(null, null);
-							}
-
-							const dupeListView = self.viewControllers.dupes.getView(MciViewIds.dupes.dupeList);
-							return callback(null, dupeListView);
-						}
-					);
-				},
-				function prepDupeObjects(dupeListView, callback) {
-					//	update dupe objects with additional info that can be used for formatString() and the like
-					async.each(dupes, (dupe, nextDupe) => {
-						FileEntry.loadBasicEntry(dupe.fileId, dupe, err => {
-							if(err) {
-								return nextDupe(err);
-							}
-
-							const areaInfo = getFileAreaByTag(dupe.areaTag);
-							if(areaInfo) {
-								dupe.areaName 	= areaInfo.name;
-								dupe.areaDesc	= areaInfo.desc;
-							}
-							return nextDupe(null);
-						});
-					}, err => {
-						return callback(err, dupeListView);
-					});
-				},
-				function populateDupeInfo(dupeListView, callback) {
-					const dupeInfoFormat = self.menuConfig.config.dupeInfoFormat || '{fileName} @ {areaName}';
-
-					if(dupeListView) {
-						dupeListView.setItems(dupes.map(dupe => stringFormat(dupeInfoFormat, dupe) ) );
-						dupeListView.redraw();
-					} else {
-						dupes.forEach(dupe => {
-							self.client.term.pipeWrite(`${stringFormat(dupeInfoFormat, dupe)}\n`);
-						});
-					}
-
-					return callback(null);
-				},
-				function pause(callback) {
-					return self.pausePrompt( { row : self.client.term.termHeight }, callback);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
-
-	processUploadedFiles() {
-		//
-		//	For each file uploaded, we need to process & gather information
-		//
-		const self = this;
-
-		async.waterfall(
-			[
-				function prepNonBlind(callback) {
-					if(self.isBlindUpload()) {
-						return callback(null);
-					}
-
-					//
-					//	For non-blind uploads, batch is not supported, we expect a single file
-					//	in |recvFilePaths|. If not, it's an error (we don't want to process the wrong thing)
-					//
-					if(self.recvFilePaths.length > 1) {
-						self.client.log.warn( { recvFilePaths : self.recvFilePaths }, 'Non-blind upload received 2:n files' );
-						return callback(Errors.UnexpectedState(`Non-blind upload expected single file but got received ${self.recvFilePaths.length}`));
-					}
-
-					return callback(null);
-				},
-				function scan(callback) {
-					return self.scanFiles(callback);
-				},
-				function pause(scanResults, callback) {
-					if(self.hasProcessingArt) {
-						self.client.term.rawWrite(ansiGoto(self.client.term.termHeight, 1));
-					} else {
-						self.client.term.write('\n');
-					}
-
-					self.pausePrompt( () => {
-						return callback(null, scanResults);
-					});
-				},
-				function displayDupes(scanResults, callback) {
-					if(0 === scanResults.dupes.length) {
-						return callback(null, scanResults);
-					}
-
-					return self.displayDupesPage(scanResults.dupes, () => {
-						return callback(null, scanResults);
-					});
-				},
-				function prepDetails(scanResults, callback) {
-					return self.prepDetailsForUpload(scanResults, callback);
-				},
-				function startMovingAndPersistingToDatabase(scanResults, callback) {
-					//
-					//	*Start* the process of moving files from their current |tempRecvDirectory|
-					//	locations -> their final area destinations. Don't make the user wait
-					//	here as I/O can take quite a bit of time. Log any failures.
-					//
-					self.moveAndPersistUploadsToDatabase(scanResults.newEntries);
-					return callback(null, scanResults.newEntries);
-				},
-				function sendEvent(uploadedEntries, callback) {
-					Events.emit(
-						Events.getSystemEvents().UserUpload,
-						{
-							user	: self.client.user,
-							files	: uploadedEntries,
-						}
-					);
-					return callback(null);
-				}
-			],
-			err => {
-				if(err) {
-					self.client.log.warn('File upload error encountered', { error : err.message } );
-					self.cleanupTempFiles();	//	normally called after moveAndPersistUploadsToDatabase() is completed.
-				}
-
-				return self.prevMenu();
-			}
-		);
-	}
-
-	displayOptionsPage(cb) {
-		const self = this;
-
-		async.series(
-			[
-				function prepArtAndViewController(callback) {
-					return self.prepViewControllerWithArt(
-						'options',
-						FormIds.options,
-						{ clearScreen : true, trailingLF : false },
-						callback
-					);
-				},
-				function populateViews(callback) {
-					const areaSelectView = self.viewControllers.options.getView(MciViewIds.options.area);
-					areaSelectView.setItems( self.availAreas.map(areaInfo => areaInfo.name ) );
-
-					const uploadTypeView 	= self.viewControllers.options.getView(MciViewIds.options.uploadType);
-					const fileNameView		= self.viewControllers.options.getView(MciViewIds.options.fileName);
-
-					const blindFileNameText = self.menuConfig.config.blindFileNameText || '(blind - filename ignored)';
-
-					uploadTypeView.on('index update', idx => {
-						self.uploadType = (0 === idx) ? 'blind' : 'non-blind';
-
-						if(self.isBlindUpload()) {
-							fileNameView.setText(blindFileNameText);
-							fileNameView.acceptsFocus = false;
-						} else  {
-							fileNameView.clearText();
-							fileNameView.acceptsFocus = true;
-						}
-					});
-
-					//	sanatize filename for display when leaving the view
-					self.viewControllers.options.on('leave', prevView => {
-						if(prevView.id === MciViewIds.options.fileName) {
-							fileNameView.setText(sanatizeFilename(fileNameView.getData()));
-						}
-					});
-
-					self.uploadType = 'blind';
-					uploadTypeView.setFocusItemIndex(0);	//	default to blind
-					fileNameView.setText(blindFileNameText);
-					areaSelectView.redraw();
-
-					return callback(null);
-				}
-			],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
-
-	displayProcessingPage(cb) {
-		return this.prepViewControllerWithArt(
-			'processing',
-			FormIds.processing,
-			{ clearScreen : true, trailingLF : false },
-			err => {
-				//	note: this art is not required
-				this.hasProcessingArt = !err;
-
-				return cb(null);
-			}
-		);
-	}
-
-	fileEntryHasDetectedDesc(fileEntry) {
-		return (fileEntry.desc && fileEntry.desc.length > 0);
-	}
-
-	displayFileDetailsPageForUploadEntry(fileEntry, cb) {
-		const self = this;
-
-		async.waterfall(
-			[
-				function prepArtAndViewController(callback) {
-					return self.prepViewControllerWithArt(
-						'fileDetails',
-						FormIds.fileDetails,
-						{ clearScreen : true, trailingLF : false },
-						err => {
-							return callback(err);
-						}
-					);
-				},
-				function populateViews(callback) {
-					const descView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.desc);
-					const tagsView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.tags);
-					const yearView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.estYear);
-
-					self.updateCustomViewTextsWithFilter('fileDetails', MciViewIds.fileDetails.customRangeStart, fileEntry );
-
-					tagsView.setText( Array.from(fileEntry.hashTags).join(',') );	//	:TODO: optional 'hashTagsSep' like file list/browse
-					yearView.setText(fileEntry.meta.est_release_year || '');
-
-					if(isAnsi(fileEntry.desc)) {
-						fileEntry.descIsAnsi = true;
-
-						return descView.setAnsi(
-							fileEntry.desc,
-							{
-								prepped			: false,
-								forceLineTerm	: true,
-							},
-							() => {
-								return callback(null, descView, 'preview', MciViewIds.fileDetails.tags);
-							}
-						);
-					} else {
-						const hasDesc = self.fileEntryHasDetectedDesc(fileEntry);
-						descView.setText(
-							hasDesc ? fileEntry.desc : getDescFromFileName(fileEntry.fileName),
-							{ scrollMode : 'top' }	//	override scroll mode; we want to be @ top
-						);
-						return callback(null, descView, 'edit', hasDesc ? MciViewIds.fileDetails.tags : MciViewIds.fileDetails.desc);
-					}
-				},
-				function finalizeViews(descView, descViewMode, focusId, callback) {
-					descView.setPropertyValue('mode', descViewMode);
-					descView.acceptsFocus	= 'preview' === descViewMode ? false : true;
-					self.viewControllers.fileDetails.switchFocus(focusId);
-					return callback(null);
-				}
-			],
-			err => {
-				//
-				//	we only call |cb| here if there is an error
-				//	else, wait for the current from to be submit - then call -
-				//	this way we'll move on to the next file entry when ready
-				//
-				if(err) {
-					return cb(err);
-				}
-
-				self.fileDetailsCurrentEntrySubmitCallback = cb;	//	stash for moduleMethods.fileDetailsContinue
-			}
-		);
-	}
+    constructor(options) {
+        super(options);
+
+        if(_.has(options, 'lastMenuResult.recvFilePaths')) {
+            this.recvFilePaths = options.lastMenuResult.recvFilePaths;
+        }
+
+        this.availAreas = getSortedAvailableFileAreas(this.client, { writeAcs : true } );
+
+        this.menuMethods = {
+            optionsNavContinue : (formData, extraArgs, cb) => {
+                return this.performUpload(cb);
+            },
+
+            fileDetailsContinue : (formData, extraArgs, cb) => {
+                //	see displayFileDetailsPageForUploadEntry() for this hackery:
+                cb(null);
+                return this.fileDetailsCurrentEntrySubmitCallback(null, formData.value);	//	move on to the next entry, if any
+            },
+
+            //	validation
+            validateNonBlindFileName : (fileName, cb) => {
+                fileName = sanatizeFilename(fileName);	//	remove unsafe chars, path info, etc.
+                if(0 === fileName.length) {
+                    return cb(new Error('Invalid filename'));
+                }
+
+                if(0 === fileName.length) {
+                    return cb(new Error('Filename cannot be empty'));
+                }
+
+                //	At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused
+                if(/^[0-9].*$/.test(fileName)) {
+                    return cb(new Error('Invalid filename'));
+                }
+
+                return cb(null);
+            },
+            viewValidationListener : (err, cb) => {
+                const errView = this.viewControllers.options.getView(MciViewIds.options.errMsg);
+                if(errView) {
+                    if(err) {
+                        errView.setText(err.message);
+                    } else {
+                        errView.clearText();
+                    }
+                }
+
+                return cb(null);
+            }
+        };
+    }
+
+    getSaveState() {
+        //	if no areas, we're falling back due to lack of access/areas avail to upload to
+        if(this.availAreas.length > 0) {
+            return {
+                uploadType			: this.uploadType,
+                tempRecvDirectory	: this.tempRecvDirectory,
+                areaInfo			: this.availAreas[ this.viewControllers.options.getView(MciViewIds.options.area).getData() ],
+            };
+        }
+    }
+
+    restoreSavedState(savedState) {
+        if(savedState.areaInfo) {
+            this.uploadType			= savedState.uploadType;
+            this.areaInfo			= savedState.areaInfo;
+            this.tempRecvDirectory	= savedState.tempRecvDirectory;
+        }
+    }
+
+    isBlindUpload() { return 'blind' === this.uploadType; }
+    isFileTransferComplete() { return !_.isUndefined(this.recvFilePaths); }
+
+    initSequence() {
+        const self = this;
+
+        if(0 === this.availAreas.length) {
+            //
+            return this.gotoMenu(this.menuConfig.config.noUploadAreasAvailMenu || 'fileBaseNoUploadAreasAvail');
+        }
+
+        async.series(
+            [
+                function before(callback) {
+                    return self.beforeArt(callback);
+                },
+                function display(callback) {
+                    if(self.isFileTransferComplete()) {
+                        return self.displayProcessingPage(callback);
+                    } else {
+                        return self.displayOptionsPage(callback);
+                    }
+                }
+            ],
+            () => {
+                return self.finishedLoading();
+            }
+        );
+    }
+
+    finishedLoading() {
+        if(this.isFileTransferComplete()) {
+            return this.processUploadedFiles();
+        }
+    }
+
+    performUpload(cb) {
+        temptmp.mkdir( { prefix : 'enigul-' }, (err, tempRecvDirectory) => {
+            if(err) {
+                return cb(err);
+            }
+
+            //	need a terminator for various external protocols
+            this.tempRecvDirectory = pathWithTerminatingSeparator(tempRecvDirectory);
+
+            const modOpts = {
+                extraArgs : {
+                    recvDirectory	: this.tempRecvDirectory,	//	we'll move files from here to their area container once processed/confirmed
+                    direction		: 'recv',
+                }
+            };
+
+            if(!this.isBlindUpload()) {
+                //	data has been sanatized at this point
+                modOpts.extraArgs.recvFileName = this.viewControllers.options.getView(MciViewIds.options.fileName).getData();
+            }
+
+            //
+            //	Move along to protocol selection -> file transfer
+            //	Upon completion, we'll re-enter the module with some file paths handed to us
+            //
+            return this.gotoMenu(
+                this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection',
+                modOpts,
+                cb
+            );
+        });
+    }
+
+    continueNonBlindUpload(cb) {
+        return cb(null);
+    }
+
+    updateScanStepInfoViews(stepInfo) {
+        //	:TODO: add some blinking (e.g. toggle items) indicators - see OBV.DOC
+
+        const fmtObj = Object.assign( {}, stepInfo);
+        let stepIndicatorFmt = '';
+        let logStepFmt;
+
+        const fmtConfig = this.menuConfig.config;
+
+        const indicatorStates 	= fmtConfig.indicatorStates || [ '|', '/', '-', '\\' ];
+        const indicatorFinished	= fmtConfig.indicatorFinished || '√';
+
+        const indicator = { };
+        const self = this;
+
+        function updateIndicator(mci, isFinished) {
+            indicator.mci = mci;
+
+            if(isFinished) {
+                indicator.text = indicatorFinished;
+            } else {
+                self.scanStatus.indicatorPos += 1;
+                if(self.scanStatus.indicatorPos >= indicatorStates.length) {
+                    self.scanStatus.indicatorPos = 0;
+                }
+                indicator.text = indicatorStates[self.scanStatus.indicatorPos];
+            }
+        }
+
+        switch(stepInfo.step) {
+            case 'start' :
+                logStepFmt = stepIndicatorFmt = fmtConfig.scanningStartFormat || 'Scanning {fileName}';
+                break;
+
+            case 'hash_update' :
+                stepIndicatorFmt = fmtConfig.calcHashFormat || 'Calculating hash/checksums: {calcHashPercent}%';
+                updateIndicator(MciViewIds.processing.calcHashIndicator);
+                break;
+
+            case 'hash_finish' :
+                stepIndicatorFmt = fmtConfig.calcHashCompleteFormat || 'Finished calculating hash/checksums';
+                updateIndicator(MciViewIds.processing.calcHashIndicator, true);
+                break;
+
+            case 'archive_list_start' :
+                stepIndicatorFmt = fmtConfig.extractArchiveListFormat || 'Extracting archive list';
+                updateIndicator(MciViewIds.processing.archiveListIndicator);
+                break;
+
+            case 'archive_list_finish' :
+                fmtObj.archivedFileCount = stepInfo.archiveEntries.length;
+                stepIndicatorFmt = fmtConfig.extractArchiveListFinishFormat || 'Archive list extracted ({archivedFileCount} files)';
+                updateIndicator(MciViewIds.processing.archiveListIndicator, true);
+                break;
+
+            case 'archive_list_failed' :
+                stepIndicatorFmt = fmtConfig.extractArchiveListFailedFormat || 'Archive list extraction failed';
+                break;
+
+            case 'desc_files_start' :
+                stepIndicatorFmt = fmtConfig.processingDescFilesFormat || 'Processing description files';
+                updateIndicator(MciViewIds.processing.descFileIndicator);
+                break;
+
+            case 'desc_files_finish' :
+                stepIndicatorFmt = fmtConfig.processingDescFilesFinishFormat || 'Finished processing description files';
+                updateIndicator(MciViewIds.processing.descFileIndicator, true);
+                break;
+
+            case 'finished' :
+                logStepFmt = stepIndicatorFmt = fmtConfig.scanningStartFormat || 'Finished';
+                break;
+        }
+
+        fmtObj.stepIndicatorText = stringFormat(stepIndicatorFmt, fmtObj);
+
+        if(this.hasProcessingArt) {
+            this.updateCustomViewTextsWithFilter('processing', MciViewIds.processing.customRangeStart, fmtObj, { appendMultiLine : true } );
+
+            if(indicator.mci && indicator.text) {
+                this.setViewText('processing', indicator.mci, indicator.text);
+            }
+
+            if(logStepFmt) {
+                this.setViewText('processing', MciViewIds.processing.logStep, stringFormat(logStepFmt, fmtObj),  { appendMultiLine : true } );
+            }
+        } else {
+            this.client.term.pipeWrite(fmtObj.stepIndicatorText);
+        }
+    }
+
+    scanFiles(cb) {
+        const self = this;
+
+        const results = {
+            newEntries	: [],
+            dupes		: [],
+        };
+
+        self.client.log.debug('Scanning upload(s)', { paths : this.recvFilePaths } );
+
+        let currentFileNum = 0;
+
+        async.eachSeries(this.recvFilePaths, (filePath, nextFilePath) => {
+            //	:TODO: virus scanning/etc. should occur around here
+
+            currentFileNum += 1;
+
+            self.scanStatus = {
+                indicatorPos	: 0,
+            };
+
+            const scanOpts = {
+                areaTag		: self.areaInfo.areaTag,
+                storageTag	: self.areaInfo.storageTags[0],
+            };
+
+            function handleScanStep(stepInfo, nextScanStep) {
+                stepInfo.totalFileNum		= self.recvFilePaths.length;
+                stepInfo.currentFileNum		= currentFileNum;
+
+                self.updateScanStepInfoViews(stepInfo);
+                return nextScanStep(null);
+            }
+
+            self.client.log.debug('Scanning file', { filePath : filePath } );
+
+            scanFile(filePath, scanOpts, handleScanStep, (err, fileEntry, dupeEntries) => {
+                if(err) {
+                    return nextFilePath(err);
+                }
+
+                //	new or dupe?
+                if(dupeEntries.length > 0) {
+                    //	1:n dupes found
+                    self.client.log.debug('Duplicate file(s) found', { dupeEntries : dupeEntries } );
+
+                    results.dupes = results.dupes.concat(dupeEntries);
+                } else {
+                    //	new one
+                    results.newEntries.push(fileEntry);
+                }
+
+                return nextFilePath(null);
+            });
+        }, err => {
+            return cb(err, results);
+        });
+    }
+
+    cleanupTempFiles() {
+        temptmp.cleanup( paths => {
+            Log.debug( { paths : paths, sessionId : temptmp.sessionId }, 'Temporary files cleaned up' );
+        });
+    }
+
+    moveAndPersistUploadsToDatabase(newEntries) {
+
+        const areaStorageDir = getAreaDefaultStorageDirectory(this.areaInfo);
+        const self = this;
+
+        async.eachSeries(newEntries, (newEntry, nextEntry) => {
+            const src 	= paths.join(self.tempRecvDirectory, newEntry.fileName);
+            const dst	= paths.join(areaStorageDir, newEntry.fileName);
+
+            moveFileWithCollisionHandling(src, dst,	(err, finalPath) => {
+                if(err) {
+                    self.client.log.error(
+                        'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
+                    );
+
+                    if(dst !== finalPath) {
+                        //	name changed; ajust before persist
+                        newEntry.fileName = paths.basename(finalPath);
+                    }
+
+                    return nextEntry(null);	//	still try next file
+                }
+
+                self.client.log.debug('Moved upload to area', { path : finalPath } );
+
+                //	persist to DB
+                newEntry.persist(err => {
+                    if(err) {
+                        self.client.log.error('Failed persisting upload to database', { path : finalPath, error : err.message } );
+                    }
+
+                    return nextEntry(null);	//	still try next file
+                });
+            });
+        }, () => {
+            //
+            //	Finally, we can remove any temp files that we may have created
+            //
+            self.cleanupTempFiles();
+        });
+    }
+
+    prepDetailsForUpload(scanResults, cb) {
+        async.eachSeries(scanResults.newEntries, (newEntry, nextEntry) => {
+            newEntry.meta.upload_by_username 	= this.client.user.username;
+            newEntry.meta.upload_by_user_id		= this.client.user.userId;
+
+            this.displayFileDetailsPageForUploadEntry(newEntry, (err, newValues) => {
+                if(err) {
+                    return nextEntry(err);
+                }
+
+                if(!newEntry.descIsAnsi) {
+                    newEntry.desc = _.trimEnd(newValues.shortDesc);
+                }
+
+                if(newValues.estYear.length > 0) {
+                    newEntry.meta.est_release_year = newValues.estYear;
+                }
+
+                if(newValues.tags.length > 0) {
+                    newEntry.setHashTags(newValues.tags);
+                }
+
+                return nextEntry(err);
+            });
+        }, err => {
+            delete this.fileDetailsCurrentEntrySubmitCallback;
+            return cb(err, scanResults);
+        });
+    }
+
+    displayDupesPage(dupes, cb) {
+        //
+        //	If we have custom art to show, use it - else just dump basic info.
+        //	Pause at the end in either case.
+        //
+        const self = this;
+
+        async.waterfall(
+            [
+                function prepArtAndViewController(callback) {
+                    self.prepViewControllerWithArt(
+                        'dupes',
+                        FormIds.dupes,
+                        { clearScreen : true, trailingLF : false },
+                        err => {
+                            if(err) {
+                                self.client.term.pipeWrite('|00|07Duplicate upload(s) found:\n');
+                                return callback(null, null);
+                            }
+
+                            const dupeListView = self.viewControllers.dupes.getView(MciViewIds.dupes.dupeList);
+                            return callback(null, dupeListView);
+                        }
+                    );
+                },
+                function prepDupeObjects(dupeListView, callback) {
+                    //	update dupe objects with additional info that can be used for formatString() and the like
+                    async.each(dupes, (dupe, nextDupe) => {
+                        FileEntry.loadBasicEntry(dupe.fileId, dupe, err => {
+                            if(err) {
+                                return nextDupe(err);
+                            }
+
+                            const areaInfo = getFileAreaByTag(dupe.areaTag);
+                            if(areaInfo) {
+                                dupe.areaName 	= areaInfo.name;
+                                dupe.areaDesc	= areaInfo.desc;
+                            }
+                            return nextDupe(null);
+                        });
+                    }, err => {
+                        return callback(err, dupeListView);
+                    });
+                },
+                function populateDupeInfo(dupeListView, callback) {
+                    const dupeInfoFormat = self.menuConfig.config.dupeInfoFormat || '{fileName} @ {areaName}';
+
+                    if(dupeListView) {
+                        dupeListView.setItems(dupes.map(dupe => stringFormat(dupeInfoFormat, dupe) ) );
+                        dupeListView.redraw();
+                    } else {
+                        dupes.forEach(dupe => {
+                            self.client.term.pipeWrite(`${stringFormat(dupeInfoFormat, dupe)}\n`);
+                        });
+                    }
+
+                    return callback(null);
+                },
+                function pause(callback) {
+                    return self.pausePrompt( { row : self.client.term.termHeight }, callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    processUploadedFiles() {
+        //
+        //	For each file uploaded, we need to process & gather information
+        //
+        const self = this;
+
+        async.waterfall(
+            [
+                function prepNonBlind(callback) {
+                    if(self.isBlindUpload()) {
+                        return callback(null);
+                    }
+
+                    //
+                    //	For non-blind uploads, batch is not supported, we expect a single file
+                    //	in |recvFilePaths|. If not, it's an error (we don't want to process the wrong thing)
+                    //
+                    if(self.recvFilePaths.length > 1) {
+                        self.client.log.warn( { recvFilePaths : self.recvFilePaths }, 'Non-blind upload received 2:n files' );
+                        return callback(Errors.UnexpectedState(`Non-blind upload expected single file but got received ${self.recvFilePaths.length}`));
+                    }
+
+                    return callback(null);
+                },
+                function scan(callback) {
+                    return self.scanFiles(callback);
+                },
+                function pause(scanResults, callback) {
+                    if(self.hasProcessingArt) {
+                        self.client.term.rawWrite(ansiGoto(self.client.term.termHeight, 1));
+                    } else {
+                        self.client.term.write('\n');
+                    }
+
+                    self.pausePrompt( () => {
+                        return callback(null, scanResults);
+                    });
+                },
+                function displayDupes(scanResults, callback) {
+                    if(0 === scanResults.dupes.length) {
+                        return callback(null, scanResults);
+                    }
+
+                    return self.displayDupesPage(scanResults.dupes, () => {
+                        return callback(null, scanResults);
+                    });
+                },
+                function prepDetails(scanResults, callback) {
+                    return self.prepDetailsForUpload(scanResults, callback);
+                },
+                function startMovingAndPersistingToDatabase(scanResults, callback) {
+                    //
+                    //	*Start* the process of moving files from their current |tempRecvDirectory|
+                    //	locations -> their final area destinations. Don't make the user wait
+                    //	here as I/O can take quite a bit of time. Log any failures.
+                    //
+                    self.moveAndPersistUploadsToDatabase(scanResults.newEntries);
+                    return callback(null, scanResults.newEntries);
+                },
+                function sendEvent(uploadedEntries, callback) {
+                    Events.emit(
+                        Events.getSystemEvents().UserUpload,
+                        {
+                            user	: self.client.user,
+                            files	: uploadedEntries,
+                        }
+                    );
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn('File upload error encountered', { error : err.message } );
+                    self.cleanupTempFiles();	//	normally called after moveAndPersistUploadsToDatabase() is completed.
+                }
+
+                return self.prevMenu();
+            }
+        );
+    }
+
+    displayOptionsPage(cb) {
+        const self = this;
+
+        async.series(
+            [
+                function prepArtAndViewController(callback) {
+                    return self.prepViewControllerWithArt(
+                        'options',
+                        FormIds.options,
+                        { clearScreen : true, trailingLF : false },
+                        callback
+                    );
+                },
+                function populateViews(callback) {
+                    const areaSelectView = self.viewControllers.options.getView(MciViewIds.options.area);
+                    areaSelectView.setItems( self.availAreas.map(areaInfo => areaInfo.name ) );
+
+                    const uploadTypeView 	= self.viewControllers.options.getView(MciViewIds.options.uploadType);
+                    const fileNameView		= self.viewControllers.options.getView(MciViewIds.options.fileName);
+
+                    const blindFileNameText = self.menuConfig.config.blindFileNameText || '(blind - filename ignored)';
+
+                    uploadTypeView.on('index update', idx => {
+                        self.uploadType = (0 === idx) ? 'blind' : 'non-blind';
+
+                        if(self.isBlindUpload()) {
+                            fileNameView.setText(blindFileNameText);
+                            fileNameView.acceptsFocus = false;
+                        } else  {
+                            fileNameView.clearText();
+                            fileNameView.acceptsFocus = true;
+                        }
+                    });
+
+                    //	sanatize filename for display when leaving the view
+                    self.viewControllers.options.on('leave', prevView => {
+                        if(prevView.id === MciViewIds.options.fileName) {
+                            fileNameView.setText(sanatizeFilename(fileNameView.getData()));
+                        }
+                    });
+
+                    self.uploadType = 'blind';
+                    uploadTypeView.setFocusItemIndex(0);	//	default to blind
+                    fileNameView.setText(blindFileNameText);
+                    areaSelectView.redraw();
+
+                    return callback(null);
+                }
+            ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
+
+    displayProcessingPage(cb) {
+        return this.prepViewControllerWithArt(
+            'processing',
+            FormIds.processing,
+            { clearScreen : true, trailingLF : false },
+            err => {
+                //	note: this art is not required
+                this.hasProcessingArt = !err;
+
+                return cb(null);
+            }
+        );
+    }
+
+    fileEntryHasDetectedDesc(fileEntry) {
+        return (fileEntry.desc && fileEntry.desc.length > 0);
+    }
+
+    displayFileDetailsPageForUploadEntry(fileEntry, cb) {
+        const self = this;
+
+        async.waterfall(
+            [
+                function prepArtAndViewController(callback) {
+                    return self.prepViewControllerWithArt(
+                        'fileDetails',
+                        FormIds.fileDetails,
+                        { clearScreen : true, trailingLF : false },
+                        err => {
+                            return callback(err);
+                        }
+                    );
+                },
+                function populateViews(callback) {
+                    const descView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.desc);
+                    const tagsView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.tags);
+                    const yearView = self.viewControllers.fileDetails.getView(MciViewIds.fileDetails.estYear);
+
+                    self.updateCustomViewTextsWithFilter('fileDetails', MciViewIds.fileDetails.customRangeStart, fileEntry );
+
+                    tagsView.setText( Array.from(fileEntry.hashTags).join(',') );	//	:TODO: optional 'hashTagsSep' like file list/browse
+                    yearView.setText(fileEntry.meta.est_release_year || '');
+
+                    if(isAnsi(fileEntry.desc)) {
+                        fileEntry.descIsAnsi = true;
+
+                        return descView.setAnsi(
+                            fileEntry.desc,
+                            {
+                                prepped			: false,
+                                forceLineTerm	: true,
+                            },
+                            () => {
+                                return callback(null, descView, 'preview', MciViewIds.fileDetails.tags);
+                            }
+                        );
+                    } else {
+                        const hasDesc = self.fileEntryHasDetectedDesc(fileEntry);
+                        descView.setText(
+                            hasDesc ? fileEntry.desc : getDescFromFileName(fileEntry.fileName),
+                            { scrollMode : 'top' }	//	override scroll mode; we want to be @ top
+                        );
+                        return callback(null, descView, 'edit', hasDesc ? MciViewIds.fileDetails.tags : MciViewIds.fileDetails.desc);
+                    }
+                },
+                function finalizeViews(descView, descViewMode, focusId, callback) {
+                    descView.setPropertyValue('mode', descViewMode);
+                    descView.acceptsFocus	= 'preview' === descViewMode ? false : true;
+                    self.viewControllers.fileDetails.switchFocus(focusId);
+                    return callback(null);
+                }
+            ],
+            err => {
+                //
+                //	we only call |cb| here if there is an error
+                //	else, wait for the current from to be submit - then call -
+                //	this way we'll move on to the next file entry when ready
+                //
+                if(err) {
+                    return cb(err);
+                }
+
+                self.fileDetailsCurrentEntrySubmitCallback = cb;	//	stash for moduleMethods.fileDetailsContinue
+            }
+        );
+    }
 };
diff --git a/core/user.js b/core/user.js
index 457604b3..72808f00 100644
--- a/core/user.js
+++ b/core/user.js
@@ -17,599 +17,599 @@ const moment		= require('moment');
 exports.isRootUserId = function(id) { return 1 === id; };
 
 module.exports = class User {
-	constructor() {
-		this.userId		= 0;
-		this.username	= '';
-		this.properties	= {};	//	name:value
-		this.groups		= [];	//	group membership(s)
-	}
+    constructor() {
+        this.userId		= 0;
+        this.username	= '';
+        this.properties	= {};	//	name:value
+        this.groups		= [];	//	group membership(s)
+    }
 
-	//	static property accessors
-	static get RootUserID() {
-		return 1;
-	}
+    //	static property accessors
+    static get RootUserID() {
+        return 1;
+    }
 
-	static get PBKDF2() {
-		return {
-			iterations	: 1000,
-			keyLen		: 128,
-			saltLen		: 32,
-		};
-	}
+    static get PBKDF2() {
+        return {
+            iterations	: 1000,
+            keyLen		: 128,
+            saltLen		: 32,
+        };
+    }
 
-	static get StandardPropertyGroups() {
-		return {
-			password	: [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
-		};
-	}
+    static get StandardPropertyGroups() {
+        return {
+            password	: [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
+        };
+    }
 
-	static get AccountStatus() {
-		return {
-			disabled	: 0,
-			inactive	: 1,
-			active		: 2,
-		};
-	}
+    static get AccountStatus() {
+        return {
+            disabled	: 0,
+            inactive	: 1,
+            active		: 2,
+        };
+    }
 
-	isAuthenticated() {
-		return true === this.authenticated;
-	}
+    isAuthenticated() {
+        return true === this.authenticated;
+    }
 
-	isValid() {
-		if(this.userId <= 0 || this.username.length < Config().users.usernameMin) {
-			return false;
-		}
+    isValid() {
+        if(this.userId <= 0 || this.username.length < Config().users.usernameMin) {
+            return false;
+        }
 
-		return this.hasValidPassword();
-	}
+        return this.hasValidPassword();
+    }
 
-	hasValidPassword() {
-		if(!this.properties || !this.properties.pw_pbkdf2_salt || !this.properties.pw_pbkdf2_dk) {
-			return false;
-		}
+    hasValidPassword() {
+        if(!this.properties || !this.properties.pw_pbkdf2_salt || !this.properties.pw_pbkdf2_dk) {
+            return false;
+        }
 
-		return ((this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2) &&
+        return ((this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2) &&
 			(this.properties.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2));
-	}
+    }
 
-	isRoot() {
-		return User.isRootUserId(this.userId);
-	}
+    isRoot() {
+        return User.isRootUserId(this.userId);
+    }
 
-	isSysOp() {	//	alias to isRoot()
-		return this.isRoot();
-	}
+    isSysOp() {	//	alias to isRoot()
+        return this.isRoot();
+    }
 
-	isGroupMember(groupNames) {
-		if(_.isString(groupNames)) {
-			groupNames = [ groupNames ];
-		}
+    isGroupMember(groupNames) {
+        if(_.isString(groupNames)) {
+            groupNames = [ groupNames ];
+        }
 
-		const isMember = groupNames.some(gn => (-1 !== this.groups.indexOf(gn)));
-		return isMember;
-	}
+        const isMember = groupNames.some(gn => (-1 !== this.groups.indexOf(gn)));
+        return isMember;
+    }
 
-	getLegacySecurityLevel() {
-		if(this.isRoot() || this.isGroupMember('sysops')) {
-			return 100;
-		}
+    getLegacySecurityLevel() {
+        if(this.isRoot() || this.isGroupMember('sysops')) {
+            return 100;
+        }
 
-		if(this.isGroupMember('users')) {
-			return 30;
-		}
+        if(this.isGroupMember('users')) {
+            return 30;
+        }
 
-		return 10;	//	:TODO: Is this what we want?
-	}
+        return 10;	//	:TODO: Is this what we want?
+    }
 
-	authenticate(username, password, cb) {
-		const self = this;
-		const cachedInfo = {};
+    authenticate(username, password, cb) {
+        const self = this;
+        const cachedInfo = {};
 
-		async.waterfall(
-			[
-				function fetchUserId(callback) {
-					//	get user ID
-					User.getUserIdAndName(username, (err, uid, un) => {
-						cachedInfo.userId	= uid;
-						cachedInfo.username	= un;
+        async.waterfall(
+            [
+                function fetchUserId(callback) {
+                    //	get user ID
+                    User.getUserIdAndName(username, (err, uid, un) => {
+                        cachedInfo.userId	= uid;
+                        cachedInfo.username	= un;
 
-						return callback(err);
-					});
-				},
-				function getRequiredAuthProperties(callback) {
-					//	fetch properties required for authentication
-					User.loadProperties(cachedInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
-						return callback(err, props);
-					});
-				},
-				function getDkWithSalt(props, callback) {
-					//	get DK from stored salt and password provided
-					User.generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, (err, dk) => {
-						return callback(err, dk, props.pw_pbkdf2_dk);
-					});
-				},
-				function validateAuth(passDk, propsDk, callback) {
-					//
-					//	Use constant time comparison here for security feel-goods
-					//
-					const passDkBuf		= Buffer.from(passDk,	'hex');
-					const propsDkBuf	= Buffer.from(propsDk,	'hex');
+                        return callback(err);
+                    });
+                },
+                function getRequiredAuthProperties(callback) {
+                    //	fetch properties required for authentication
+                    User.loadProperties(cachedInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
+                        return callback(err, props);
+                    });
+                },
+                function getDkWithSalt(props, callback) {
+                    //	get DK from stored salt and password provided
+                    User.generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, (err, dk) => {
+                        return callback(err, dk, props.pw_pbkdf2_dk);
+                    });
+                },
+                function validateAuth(passDk, propsDk, callback) {
+                    //
+                    //	Use constant time comparison here for security feel-goods
+                    //
+                    const passDkBuf		= Buffer.from(passDk,	'hex');
+                    const propsDkBuf	= Buffer.from(propsDk,	'hex');
 
-					if(passDkBuf.length !== propsDkBuf.length) {
-						return callback(Errors.AccessDenied('Invalid password'));
-					}
+                    if(passDkBuf.length !== propsDkBuf.length) {
+                        return callback(Errors.AccessDenied('Invalid password'));
+                    }
 
-					let c = 0;
-					for(let i = 0; i < passDkBuf.length; i++) {
-						c |= passDkBuf[i] ^ propsDkBuf[i];
-					}
+                    let c = 0;
+                    for(let i = 0; i < passDkBuf.length; i++) {
+                        c |= passDkBuf[i] ^ propsDkBuf[i];
+                    }
 
-					return callback(0 === c ? null : Errors.AccessDenied('Invalid password'));
-				},
-				function initProps(callback) {
-					User.loadProperties(cachedInfo.userId, (err, allProps) => {
-						if(!err) {
-							cachedInfo.properties = allProps;
-						}
+                    return callback(0 === c ? null : Errors.AccessDenied('Invalid password'));
+                },
+                function initProps(callback) {
+                    User.loadProperties(cachedInfo.userId, (err, allProps) => {
+                        if(!err) {
+                            cachedInfo.properties = allProps;
+                        }
 
-						return callback(err);
-					});
-				},
-				function initGroups(callback) {
-					userGroup.getGroupsForUser(cachedInfo.userId, (err, groups) => {
-						if(!err) {
-							cachedInfo.groups = groups;
-						}
+                        return callback(err);
+                    });
+                },
+                function initGroups(callback) {
+                    userGroup.getGroupsForUser(cachedInfo.userId, (err, groups) => {
+                        if(!err) {
+                            cachedInfo.groups = groups;
+                        }
 
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				if(!err) {
-					self.userId			= cachedInfo.userId;
-					self.username		= cachedInfo.username;
-					self.properties		= cachedInfo.properties;
-					self.groups			= cachedInfo.groups;
-					self.authenticated	= true;
-				}
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                if(!err) {
+                    self.userId			= cachedInfo.userId;
+                    self.username		= cachedInfo.username;
+                    self.properties		= cachedInfo.properties;
+                    self.groups			= cachedInfo.groups;
+                    self.authenticated	= true;
+                }
 
-				return cb(err);
-			}
-		);
-	}
+                return cb(err);
+            }
+        );
+    }
 
-	create(password, cb) {
-		assert(0 === this.userId);
-		const config = Config();
+    create(password, cb) {
+        assert(0 === this.userId);
+        const config = Config();
 
-		if(this.username.length < config.users.usernameMin || this.username.length > config.users.usernameMax) {
-			return cb(Errors.Invalid('Invalid username length'));
-		}
+        if(this.username.length < config.users.usernameMin || this.username.length > config.users.usernameMax) {
+            return cb(Errors.Invalid('Invalid username length'));
+        }
 
-		const self = this;
+        const self = this;
 
-		//	:TODO: set various defaults, e.g. default activation status, etc.
-		self.properties.account_status = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
+        //	:TODO: set various defaults, e.g. default activation status, etc.
+        self.properties.account_status = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
 
-		async.waterfall(
-			[
-				function beginTransaction(callback) {
-					return userDb.beginTransaction(callback);
-				},
-				function createUserRec(trans, callback) {
-					trans.run(
-						`INSERT INTO user (user_name)
+        async.waterfall(
+            [
+                function beginTransaction(callback) {
+                    return userDb.beginTransaction(callback);
+                },
+                function createUserRec(trans, callback) {
+                    trans.run(
+                        `INSERT INTO user (user_name)
 						VALUES (?);`,
-						[ self.username ],
-						function inserted(err) {	//	use classic function for |this|
-							if(err) {
-								return callback(err);
-							}
+                        [ self.username ],
+                        function inserted(err) {	//	use classic function for |this|
+                            if(err) {
+                                return callback(err);
+                            }
 
-							self.userId = this.lastID;
+                            self.userId = this.lastID;
 
-							//	Do not require activation for userId 1 (root/admin)
-							if(User.RootUserID === self.userId) {
-								self.properties.account_status = User.AccountStatus.active;
-							}
+                            //	Do not require activation for userId 1 (root/admin)
+                            if(User.RootUserID === self.userId) {
+                                self.properties.account_status = User.AccountStatus.active;
+                            }
 
-							return callback(null, trans);
-						}
-					);
-				},
-				function genAuthCredentials(trans, callback) {
-					User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
-						if(err) {
-							return callback(err);
-						}
+                            return callback(null, trans);
+                        }
+                    );
+                },
+                function genAuthCredentials(trans, callback) {
+                    User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						self.properties.pw_pbkdf2_salt	= info.salt;
-						self.properties.pw_pbkdf2_dk	= info.dk;
-						return callback(null, trans);
-					});
-				},
-				function setInitialGroupMembership(trans, callback) {
-					self.groups = config.users.defaultGroups;
+                        self.properties.pw_pbkdf2_salt	= info.salt;
+                        self.properties.pw_pbkdf2_dk	= info.dk;
+                        return callback(null, trans);
+                    });
+                },
+                function setInitialGroupMembership(trans, callback) {
+                    self.groups = config.users.defaultGroups;
 
-					if(User.RootUserID === self.userId) {	//	root/SysOp?
-						self.groups.push('sysops');
-					}
+                    if(User.RootUserID === self.userId) {	//	root/SysOp?
+                        self.groups.push('sysops');
+                    }
 
-					return callback(null, trans);
-				},
-				function saveAll(trans, callback) {
-					self.persistWithTransaction(trans, err => {
-						return callback(err, trans);
-					});
-				},
-				function sendEvent(trans, callback) {
-					Events.emit(Events.getSystemEvents().NewUser, { user : self });
-					return callback(null, trans);
-				}
-			],
-			(err, trans) => {
-				if(trans) {
-					trans[err ? 'rollback' : 'commit'](transErr => {
-						return cb(err ? err : transErr);
-					});
-				} else {
-					return cb(err);
-				}
-			}
-		);
-	}
+                    return callback(null, trans);
+                },
+                function saveAll(trans, callback) {
+                    self.persistWithTransaction(trans, err => {
+                        return callback(err, trans);
+                    });
+                },
+                function sendEvent(trans, callback) {
+                    Events.emit(Events.getSystemEvents().NewUser, { user : self });
+                    return callback(null, trans);
+                }
+            ],
+            (err, trans) => {
+                if(trans) {
+                    trans[err ? 'rollback' : 'commit'](transErr => {
+                        return cb(err ? err : transErr);
+                    });
+                } else {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	persistWithTransaction(trans, cb) {
-		assert(this.userId > 0);
+    persistWithTransaction(trans, cb) {
+        assert(this.userId > 0);
 
-		const self = this;
+        const self = this;
 
-		async.series(
-			[
-				function saveProps(callback) {
-					self.persistProperties(self.properties, trans, err => {
-						return callback(err);
-					});
-				},
-				function saveGroups(callback) {
-					userGroup.addUserToGroups(self.userId, self.groups, trans, err => {
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+        async.series(
+            [
+                function saveProps(callback) {
+                    self.persistProperties(self.properties, trans, err => {
+                        return callback(err);
+                    });
+                },
+                function saveGroups(callback) {
+                    userGroup.addUserToGroups(self.userId, self.groups, trans, err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	persistProperty(propName, propValue, cb) {
-		//	update live props
-		this.properties[propName] = propValue;
+    persistProperty(propName, propValue, cb) {
+        //	update live props
+        this.properties[propName] = propValue;
 
-		userDb.run(
-			`REPLACE INTO user_property (user_id, prop_name, prop_value)
+        userDb.run(
+            `REPLACE INTO user_property (user_id, prop_name, prop_value)
 			VALUES (?, ?, ?);`,
-			[ this.userId, propName, propValue ],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+            [ this.userId, propName, propValue ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	removeProperty(propName, cb) {
-		//	update live
-		delete this.properties[propName];
+    removeProperty(propName, cb) {
+        //	update live
+        delete this.properties[propName];
 
-		userDb.run(
-			`DELETE FROM user_property
+        userDb.run(
+            `DELETE FROM user_property
 			WHERE user_id = ? AND prop_name = ?;`,
-			[ this.userId, propName ],
-			err => {
-				if(cb) {
-					return cb(err);
-				}
-			}
-		);
-	}
+            [ this.userId, propName ],
+            err => {
+                if(cb) {
+                    return cb(err);
+                }
+            }
+        );
+    }
 
-	persistProperties(properties, transOrDb, cb) {
-		if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-			cb = transOrDb;
-			transOrDb = userDb;
-		}
+    persistProperties(properties, transOrDb, cb) {
+        if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+            cb = transOrDb;
+            transOrDb = userDb;
+        }
 
-		const self = this;
+        const self = this;
 
-		//	update live props
-		_.merge(this.properties, properties);
+        //	update live props
+        _.merge(this.properties, properties);
 
-		const stmt = transOrDb.prepare(
-			`REPLACE INTO user_property (user_id, prop_name, prop_value)
+        const stmt = transOrDb.prepare(
+            `REPLACE INTO user_property (user_id, prop_name, prop_value)
 			VALUES (?, ?, ?);`
-		);
+        );
 
-		async.each(Object.keys(properties), (propName, nextProp) => {
-			stmt.run(self.userId, propName, properties[propName], err => {
-				return nextProp(err);
-			});
-		},
-		err => {
-			if(err) {
-				return cb(err);
-			}
+        async.each(Object.keys(properties), (propName, nextProp) => {
+            stmt.run(self.userId, propName, properties[propName], err => {
+                return nextProp(err);
+            });
+        },
+        err => {
+            if(err) {
+                return cb(err);
+            }
 
-			stmt.finalize( () => {
-				return cb(null);
-			});
-		});
-	}
+            stmt.finalize( () => {
+                return cb(null);
+            });
+        });
+    }
 
-	setNewAuthCredentials(password, cb) {
-		User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
-			if(err) {
-				return cb(err);
-			}
+    setNewAuthCredentials(password, cb) {
+        User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
+            if(err) {
+                return cb(err);
+            }
 
-			const newProperties = {
-				pw_pbkdf2_salt	: info.salt,
-				pw_pbkdf2_dk	: info.dk,
-			};
+            const newProperties = {
+                pw_pbkdf2_salt	: info.salt,
+                pw_pbkdf2_dk	: info.dk,
+            };
 
-			this.persistProperties(newProperties, err => {
-				return cb(err);
-			});
-		});
-	}
+            this.persistProperties(newProperties, err => {
+                return cb(err);
+            });
+        });
+    }
 
-	getAge() {
-		if(_.has(this.properties, 'birthdate')) {
-			return moment().diff(this.properties.birthdate, 'years');
-		}
-	}
+    getAge() {
+        if(_.has(this.properties, 'birthdate')) {
+            return moment().diff(this.properties.birthdate, 'years');
+        }
+    }
 
-	static getUser(userId, cb) {
-		async.waterfall(
-			[
-				function fetchUserId(callback) {
-					User.getUserName(userId, (err, userName) => {
-						return callback(null, userName);
-					});
-				},
-				function initProps(userName, callback) {
-					User.loadProperties(userId, (err, properties) => {
-						return callback(err, userName, properties);
-					});
-				},
-				function initGroups(userName, properties, callback) {
-					userGroup.getGroupsForUser(userId, (err, groups) => {
-						return callback(null, userName, properties, groups);
-					});
-				}
-			],
-			(err, userName, properties, groups) => {
-				const user = new User();
-				user.userId			= userId;
-				user.username		= userName;
-				user.properties		= properties;
-				user.groups			= groups;
-				user.authenticated	= false;	//	this is NOT an authenticated user!
+    static getUser(userId, cb) {
+        async.waterfall(
+            [
+                function fetchUserId(callback) {
+                    User.getUserName(userId, (err, userName) => {
+                        return callback(null, userName);
+                    });
+                },
+                function initProps(userName, callback) {
+                    User.loadProperties(userId, (err, properties) => {
+                        return callback(err, userName, properties);
+                    });
+                },
+                function initGroups(userName, properties, callback) {
+                    userGroup.getGroupsForUser(userId, (err, groups) => {
+                        return callback(null, userName, properties, groups);
+                    });
+                }
+            ],
+            (err, userName, properties, groups) => {
+                const user = new User();
+                user.userId			= userId;
+                user.username		= userName;
+                user.properties		= properties;
+                user.groups			= groups;
+                user.authenticated	= false;	//	this is NOT an authenticated user!
 
-				return cb(err, user);
-			}
-		);
-	}
+                return cb(err, user);
+            }
+        );
+    }
 
-	static isRootUserId(userId) {
-		return (User.RootUserID === userId);
-	}
+    static isRootUserId(userId) {
+        return (User.RootUserID === userId);
+    }
 
-	static getUserIdAndName(username, cb) {
-		userDb.get(
-			`SELECT id, user_name
+    static getUserIdAndName(username, cb) {
+        userDb.get(
+            `SELECT id, user_name
 			FROM user
 			WHERE user_name LIKE ?;`,
-			[ username ],
-			(err, row) => {
-				if(err) {
-					return cb(err);
-				}
+            [ username ],
+            (err, row) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(row) {
-					return cb(null, row.id, row.user_name);
-				}
+                if(row) {
+                    return cb(null, row.id, row.user_name);
+                }
 
-				return cb(Errors.DoesNotExist('No matching username'));
-			}
-		);
-	}
+                return cb(Errors.DoesNotExist('No matching username'));
+            }
+        );
+    }
 
-	static getUserIdAndNameByRealName(realName, cb) {
-		userDb.get(
-			`SELECT id, user_name
+    static getUserIdAndNameByRealName(realName, cb) {
+        userDb.get(
+            `SELECT id, user_name
 			FROM user
 			WHERE id = (
 				SELECT user_id
 				FROM user_property
 				WHERE prop_name='real_name' AND prop_value LIKE ?
 			);`,
-			[ realName ],
-			(err, row) => {
-				if(err) {
-					return cb(err);
-				}
+            [ realName ],
+            (err, row) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(row) {
-					return cb(null, row.id, row.user_name);
-				}
+                if(row) {
+                    return cb(null, row.id, row.user_name);
+                }
 
-				return cb(Errors.DoesNotExist('No matching real name'));
-			}
-		);
-	}
+                return cb(Errors.DoesNotExist('No matching real name'));
+            }
+        );
+    }
 
-	static getUserIdAndNameByLookup(lookup, cb) {
-		User.getUserIdAndName(lookup, (err, userId, userName) => {
-			if(err) {
-				User.getUserIdAndNameByRealName(lookup, (err, userId, userName) => {
-					return cb(err, userId, userName);
-				});
-			} else {
-				return cb(null, userId, userName);
-			}
-		});
-	}
+    static getUserIdAndNameByLookup(lookup, cb) {
+        User.getUserIdAndName(lookup, (err, userId, userName) => {
+            if(err) {
+                User.getUserIdAndNameByRealName(lookup, (err, userId, userName) => {
+                    return cb(err, userId, userName);
+                });
+            } else {
+                return cb(null, userId, userName);
+            }
+        });
+    }
 
-	static getUserName(userId, cb) {
-		userDb.get(
-			`SELECT user_name
+    static getUserName(userId, cb) {
+        userDb.get(
+            `SELECT user_name
 			FROM user
 			WHERE id = ?;`,
-			[ userId ],
-			(err, row) => {
-				if(err) {
-					return cb(err);
-				}
+            [ userId ],
+            (err, row) => {
+                if(err) {
+                    return cb(err);
+                }
 
-				if(row) {
-					return cb(null, row.user_name);
-				}
+                if(row) {
+                    return cb(null, row.user_name);
+                }
 
-				return cb(Errors.DoesNotExist('No matching user ID'));
-			}
-		);
-	}
+                return cb(Errors.DoesNotExist('No matching user ID'));
+            }
+        );
+    }
 
-	static loadProperties(userId, options, cb) {
-		if(!cb && _.isFunction(options)) {
-			cb = options;
-			options = {};
-		}
+    static loadProperties(userId, options, cb) {
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
 
-		let sql =
+        let sql =
 			`SELECT prop_name, prop_value
 			FROM user_property
 			WHERE user_id = ?`;
 
-		if(options.names) {
-			sql += ` AND prop_name IN("${options.names.join('","')}");`;
-		} else {
-			sql += ';';
-		}
+        if(options.names) {
+            sql += ` AND prop_name IN("${options.names.join('","')}");`;
+        } else {
+            sql += ';';
+        }
 
-		let properties = {};
-		userDb.each(sql, [ userId ], (err, row) => {
-			if(err) {
-				return cb(err);
-			}
-			properties[row.prop_name] = row.prop_value;
-		}, (err) => {
-			return cb(err, err ? null : properties);
-		});
-	}
+        let properties = {};
+        userDb.each(sql, [ userId ], (err, row) => {
+            if(err) {
+                return cb(err);
+            }
+            properties[row.prop_name] = row.prop_value;
+        }, (err) => {
+            return cb(err, err ? null : properties);
+        });
+    }
 
-	//	:TODO: make this much more flexible - propValue should allow for case-insensitive compare, etc.
-	static getUserIdsWithProperty(propName, propValue, cb) {
-		let userIds = [];
+    //	:TODO: make this much more flexible - propValue should allow for case-insensitive compare, etc.
+    static getUserIdsWithProperty(propName, propValue, cb) {
+        let userIds = [];
 
-		userDb.each(
-			`SELECT user_id
+        userDb.each(
+            `SELECT user_id
 			FROM user_property
 			WHERE prop_name = ? AND prop_value = ?;`,
-			[ propName, propValue ],
-			(err, row) => {
-				if(row) {
-					userIds.push(row.user_id);
-				}
-			},
-			() => {
-				return cb(null, userIds);
-			}
-		);
-	}
+            [ propName, propValue ],
+            (err, row) => {
+                if(row) {
+                    userIds.push(row.user_id);
+                }
+            },
+            () => {
+                return cb(null, userIds);
+            }
+        );
+    }
 
-	static getUserList(options, cb) {
-		let userList = [];
-		let orderClause = 'ORDER BY ' + (options.order || 'user_name');
+    static getUserList(options, cb) {
+        let userList = [];
+        let orderClause = 'ORDER BY ' + (options.order || 'user_name');
 
-		userDb.each(
-			`SELECT id, user_name
+        userDb.each(
+            `SELECT id, user_name
 			FROM user
 			${orderClause};`,
-			(err, row) => {
-				if(row) {
-					userList.push({
-						userId		: row.id,
-						userName	: row.user_name,
-					});
-				}
-			},
-			() => {
-				options.properties = options.properties || [];
-				async.map(userList, (user, nextUser) => {
-					userDb.each(
-						`SELECT prop_name, prop_value
+            (err, row) => {
+                if(row) {
+                    userList.push({
+                        userId		: row.id,
+                        userName	: row.user_name,
+                    });
+                }
+            },
+            () => {
+                options.properties = options.properties || [];
+                async.map(userList, (user, nextUser) => {
+                    userDb.each(
+                        `SELECT prop_name, prop_value
 						FROM user_property
 						WHERE user_id = ? AND prop_name IN ("${options.properties.join('","')}");`,
-						[ user.userId ],
-						(err, row) => {
-							if(row) {
-								user[row.prop_name] = row.prop_value;
-							}
-						},
-						err => {
-							return nextUser(err, user);
-						}
-					);
-				},
-				(err, transformed) => {
-					return cb(err, transformed);
-				});
-			}
-		);
-	}
+                        [ user.userId ],
+                        (err, row) => {
+                            if(row) {
+                                user[row.prop_name] = row.prop_value;
+                            }
+                        },
+                        err => {
+                            return nextUser(err, user);
+                        }
+                    );
+                },
+                (err, transformed) => {
+                    return cb(err, transformed);
+                });
+            }
+        );
+    }
 
-	static generatePasswordDerivedKeyAndSalt(password, cb) {
-		async.waterfall(
-			[
-				function getSalt(callback) {
-					User.generatePasswordDerivedKeySalt( (err, salt) => {
-						return callback(err, salt);
-					});
-				},
-				function getDk(salt, callback) {
-					User.generatePasswordDerivedKey(password, salt, (err, dk) => {
-						return callback(err, salt, dk);
-					});
-				}
-			],
-			(err, salt, dk) => {
-				return cb(err, { salt : salt, dk : dk } );
-			}
-		);
-	}
+    static generatePasswordDerivedKeyAndSalt(password, cb) {
+        async.waterfall(
+            [
+                function getSalt(callback) {
+                    User.generatePasswordDerivedKeySalt( (err, salt) => {
+                        return callback(err, salt);
+                    });
+                },
+                function getDk(salt, callback) {
+                    User.generatePasswordDerivedKey(password, salt, (err, dk) => {
+                        return callback(err, salt, dk);
+                    });
+                }
+            ],
+            (err, salt, dk) => {
+                return cb(err, { salt : salt, dk : dk } );
+            }
+        );
+    }
 
-	static generatePasswordDerivedKeySalt(cb) {
-		crypto.randomBytes(User.PBKDF2.saltLen, (err, salt) => {
-			if(err) {
-				return cb(err);
-			}
-			return cb(null, salt.toString('hex'));
-		});
-	}
+    static generatePasswordDerivedKeySalt(cb) {
+        crypto.randomBytes(User.PBKDF2.saltLen, (err, salt) => {
+            if(err) {
+                return cb(err);
+            }
+            return cb(null, salt.toString('hex'));
+        });
+    }
 
-	static generatePasswordDerivedKey(password, salt, cb) {
-		password = Buffer.from(password).toString('hex');
+    static generatePasswordDerivedKey(password, salt, cb) {
+        password = Buffer.from(password).toString('hex');
 
-		crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', (err, dk) => {
-			if(err) {
-				return cb(err);
-			}
+        crypto.pbkdf2(password, salt, User.PBKDF2.iterations, User.PBKDF2.keyLen, 'sha1', (err, dk) => {
+            if(err) {
+                return cb(err);
+            }
 
-			return cb(null, dk.toString('hex'));
-		});
-	}
+            return cb(null, dk.toString('hex'));
+        });
+    }
 };
diff --git a/core/user_config.js b/core/user_config.js
index 6a51a36b..b5e124b6 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -12,211 +12,211 @@ const _					= require('lodash');
 const moment			= require('moment');
 
 exports.moduleInfo = {
-	name		: 'User Configuration',
-	desc		: 'Module for user configuration',
-	author		: 'NuSkooler',
+    name		: 'User Configuration',
+    desc		: 'Module for user configuration',
+    author		: 'NuSkooler',
 };
 
 const MciCodeIds = {
-	RealName	: 1,
-	BirthDate	: 2,
-	Sex			: 3,
-	Loc			: 4,
-	Affils		: 5,
-	Email		: 6,
-	Web			: 7,
-	TermHeight	: 8,
-	Theme		: 9,
-	Password	: 10,
-	PassConfirm	: 11,
-	ThemeInfo	: 20,
-	ErrorMsg	: 21,
+    RealName	: 1,
+    BirthDate	: 2,
+    Sex			: 3,
+    Loc			: 4,
+    Affils		: 5,
+    Email		: 6,
+    Web			: 7,
+    TermHeight	: 8,
+    Theme		: 9,
+    Password	: 10,
+    PassConfirm	: 11,
+    ThemeInfo	: 20,
+    ErrorMsg	: 21,
 
-	SaveCancel	: 25,
+    SaveCancel	: 25,
 };
 
 exports.getModule = class UserConfigModule extends MenuModule {
-	constructor(options) {
-		super(options);
+    constructor(options) {
+        super(options);
 
-		const self = this;
+        const self = this;
 
-		this.menuMethods = {
-			//
-			//	Validation support
-			//
-			validateEmailAvail : function(data, cb) {
-				//
-				//	If nothing changed, we know it's OK
-				//
-				if(self.client.user.properties.email_address.toLowerCase() === data.toLowerCase()) {
-					return cb(null);
-				}
+        this.menuMethods = {
+            //
+            //	Validation support
+            //
+            validateEmailAvail : function(data, cb) {
+                //
+                //	If nothing changed, we know it's OK
+                //
+                if(self.client.user.properties.email_address.toLowerCase() === data.toLowerCase()) {
+                    return cb(null);
+                }
 
-				//	Otherwise we can use the standard system method
-				return sysValidate.validateEmailAvail(data, cb);
-			},
+                //	Otherwise we can use the standard system method
+                return sysValidate.validateEmailAvail(data, cb);
+            },
 
-			validatePassword : function(data, cb) {
-				//
-				//	Blank is OK - this means we won't be changing it
-				//
-				if(!data || 0 === data.length) {
-					return cb(null);
-				}
+            validatePassword : function(data, cb) {
+                //
+                //	Blank is OK - this means we won't be changing it
+                //
+                if(!data || 0 === data.length) {
+                    return cb(null);
+                }
 
-				//	Otherwise we can use the standard system method
-				return sysValidate.validatePasswordSpec(data, cb);
-			},
+                //	Otherwise we can use the standard system method
+                return sysValidate.validatePasswordSpec(data, cb);
+            },
 
-			validatePassConfirmMatch : function(data, cb) {
-				var passwordView = self.getView(MciCodeIds.Password);
-				cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
-			},
+            validatePassConfirmMatch : function(data, cb) {
+                var passwordView = self.getView(MciCodeIds.Password);
+                cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
+            },
 
-			viewValidationListener : function(err, cb) {
-				var errMsgView = self.getView(MciCodeIds.ErrorMsg);
-				var newFocusId;
-				if(errMsgView) {
-					if(err) {
-						errMsgView.setText(err.message);
+            viewValidationListener : function(err, cb) {
+                var errMsgView = self.getView(MciCodeIds.ErrorMsg);
+                var newFocusId;
+                if(errMsgView) {
+                    if(err) {
+                        errMsgView.setText(err.message);
 
-						if(err.view.getId() === MciCodeIds.PassConfirm) {
-							newFocusId = MciCodeIds.Password;
-							var passwordView = self.getView(MciCodeIds.Password);
-							passwordView.clearText();
-							err.view.clearText();
-						}
-					} else {
-						errMsgView.clearText();
-					}
-				}
-				cb(newFocusId);
-			},
+                        if(err.view.getId() === MciCodeIds.PassConfirm) {
+                            newFocusId = MciCodeIds.Password;
+                            var passwordView = self.getView(MciCodeIds.Password);
+                            passwordView.clearText();
+                            err.view.clearText();
+                        }
+                    } else {
+                        errMsgView.clearText();
+                    }
+                }
+                cb(newFocusId);
+            },
 
-			//
-			//	Handlers
-			//
-			saveChanges : function(formData, extraArgs, cb) {
-				assert(formData.value.password === formData.value.passwordConfirm);
+            //
+            //	Handlers
+            //
+            saveChanges : function(formData, extraArgs, cb) {
+                assert(formData.value.password === formData.value.passwordConfirm);
 
-				const newProperties = {
-					real_name			: formData.value.realName,
-					birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(),
-					sex					: formData.value.sex,
-					location			: formData.value.location,
-					affiliation			: formData.value.affils,
-					email_address		: formData.value.email,
-					web_address			: formData.value.web,
-					term_height			: formData.value.termHeight.toString(),
-					theme_id			: self.availThemeInfo[formData.value.theme].themeId,
-				};
+                const newProperties = {
+                    real_name			: formData.value.realName,
+                    birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(),
+                    sex					: formData.value.sex,
+                    location			: formData.value.location,
+                    affiliation			: formData.value.affils,
+                    email_address		: formData.value.email,
+                    web_address			: formData.value.web,
+                    term_height			: formData.value.termHeight.toString(),
+                    theme_id			: self.availThemeInfo[formData.value.theme].themeId,
+                };
 
-				//  runtime set theme
-				theme.setClientTheme(self.client, newProperties.theme_id);
+                //  runtime set theme
+                theme.setClientTheme(self.client, newProperties.theme_id);
 
-				//  persist all changes
-				self.client.user.persistProperties(newProperties, err => {
-					if(err) {
-						self.client.log.warn( { error : err.toString() }, 'Failed persisting updated properties');
-						//	:TODO: warn end user!
-						return self.prevMenu(cb);
-					}
-					//
-					//	New password if it's not empty
-					//
-					self.client.log.info('User updated properties');
+                //  persist all changes
+                self.client.user.persistProperties(newProperties, err => {
+                    if(err) {
+                        self.client.log.warn( { error : err.toString() }, 'Failed persisting updated properties');
+                        //	:TODO: warn end user!
+                        return self.prevMenu(cb);
+                    }
+                    //
+                    //	New password if it's not empty
+                    //
+                    self.client.log.info('User updated properties');
 
-					if(formData.value.password.length > 0) {
-						self.client.user.setNewAuthCredentials(formData.value.password, err => {
-							if(err) {
-								self.client.log.error( { err : err }, 'Failed storing new authentication credentials');
-							} else {
-								self.client.log.info('User changed authentication credentials');
-							}
-							return self.prevMenu(cb);
-						});
-					} else {
-						return self.prevMenu(cb);
-					}
-				});
-			},
-		};
-	}
+                    if(formData.value.password.length > 0) {
+                        self.client.user.setNewAuthCredentials(formData.value.password, err => {
+                            if(err) {
+                                self.client.log.error( { err : err }, 'Failed storing new authentication credentials');
+                            } else {
+                                self.client.log.info('User changed authentication credentials');
+                            }
+                            return self.prevMenu(cb);
+                        });
+                    } else {
+                        return self.prevMenu(cb);
+                    }
+                });
+            },
+        };
+    }
 
-	getView(viewId) {
-		return this.viewControllers.menu.getView(viewId);
-	}
+    getView(viewId) {
+        return this.viewControllers.menu.getView(viewId);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self 				= this;
-			const vc				= self.viewControllers.menu = new ViewController( { client : self.client} );
-			let currentThemeIdIndex = 0;
+            const self 				= this;
+            const vc				= self.viewControllers.menu = new ViewController( { client : self.client} );
+            let currentThemeIdIndex = 0;
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
-					},
-					function prepareAvailableThemes(callback) {
-						self.availThemeInfo = _.sortBy([...theme.getAvailableThemes()].map(entry => {
-							const theme = entry[1];
-							return {
-								themeId		: theme.info.themeId,
-								name		: theme.info.name,
-								author		: theme.info.author,
-								desc		: _.isString(theme.info.desc) ? theme.info.desc : '',
-								group		: _.isString(theme.info.group) ? theme.info.group : '',
-							};
-						}), 'name');
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        vc.loadFromMenuConfig( { callingMenu : self, mciMap : mciData.menu }, callback);
+                    },
+                    function prepareAvailableThemes(callback) {
+                        self.availThemeInfo = _.sortBy([...theme.getAvailableThemes()].map(entry => {
+                            const theme = entry[1];
+                            return {
+                                themeId		: theme.info.themeId,
+                                name		: theme.info.name,
+                                author		: theme.info.author,
+                                desc		: _.isString(theme.info.desc) ? theme.info.desc : '',
+                                group		: _.isString(theme.info.group) ? theme.info.group : '',
+                            };
+                        }), 'name');
 
-						currentThemeIdIndex = Math.max(0, _.findIndex(self.availThemeInfo, function cmp(ti) {
-							return ti.themeId === self.client.user.properties.theme_id;
-						}));
+                        currentThemeIdIndex = Math.max(0, _.findIndex(self.availThemeInfo, function cmp(ti) {
+                            return ti.themeId === self.client.user.properties.theme_id;
+                        }));
 
-						callback(null);
-					},
-					function populateViews(callback) {
-						var user = self.client.user;
+                        callback(null);
+                    },
+                    function populateViews(callback) {
+                        var user = self.client.user;
 
-						self.setViewText('menu', MciCodeIds.RealName, user.properties.real_name);
-						self.setViewText('menu', MciCodeIds.BirthDate, moment(user.properties.birthdate).format('YYYYMMDD'));
-						self.setViewText('menu', MciCodeIds.Sex, user.properties.sex);
-						self.setViewText('menu', MciCodeIds.Loc, user.properties.location);
-						self.setViewText('menu', MciCodeIds.Affils, user.properties.affiliation);
-						self.setViewText('menu', MciCodeIds.Email, user.properties.email_address);
-						self.setViewText('menu', MciCodeIds.Web, user.properties.web_address);
-						self.setViewText('menu', MciCodeIds.TermHeight, user.properties.term_height.toString());
+                        self.setViewText('menu', MciCodeIds.RealName, user.properties.real_name);
+                        self.setViewText('menu', MciCodeIds.BirthDate, moment(user.properties.birthdate).format('YYYYMMDD'));
+                        self.setViewText('menu', MciCodeIds.Sex, user.properties.sex);
+                        self.setViewText('menu', MciCodeIds.Loc, user.properties.location);
+                        self.setViewText('menu', MciCodeIds.Affils, user.properties.affiliation);
+                        self.setViewText('menu', MciCodeIds.Email, user.properties.email_address);
+                        self.setViewText('menu', MciCodeIds.Web, user.properties.web_address);
+                        self.setViewText('menu', MciCodeIds.TermHeight, user.properties.term_height.toString());
 
 
-						var themeView = self.getView(MciCodeIds.Theme);
-						if(themeView) {
-							themeView.setItems(_.map(self.availThemeInfo, 'name'));
-							themeView.setFocusItemIndex(currentThemeIdIndex);
-						}
+                        var themeView = self.getView(MciCodeIds.Theme);
+                        if(themeView) {
+                            themeView.setItems(_.map(self.availThemeInfo, 'name'));
+                            themeView.setFocusItemIndex(currentThemeIdIndex);
+                        }
 
-						var realNameView = self.getView(MciCodeIds.RealName);
-						if(realNameView) {
-							realNameView.setFocus(true);	//	:TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
-						}
+                        var realNameView = self.getView(MciCodeIds.RealName);
+                        if(realNameView) {
+                            realNameView.setFocus(true);	//	:TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
+                        }
 
-						callback(null);
-					}
-				],
-				function complete(err) {
-					if(err) {
-						self.client.log.warn( { error : err.toString() }, 'User configuration failed to init');
-						self.prevMenu();
-					} else {
-						cb(null);
-					}
-				}
-			);
-		});
-	}
+                        callback(null);
+                    }
+                ],
+                function complete(err) {
+                    if(err) {
+                        self.client.log.warn( { error : err.toString() }, 'User configuration failed to init');
+                        self.prevMenu();
+                    } else {
+                        cb(null);
+                    }
+                }
+            );
+        });
+    }
 };
diff --git a/core/user_group.js b/core/user_group.js
index db444296..a350e5b2 100644
--- a/core/user_group.js
+++ b/core/user_group.js
@@ -12,57 +12,57 @@ exports.addUserToGroups			= addUserToGroups;
 exports.removeUserFromGroup		= removeUserFromGroup;
 
 function getGroupsForUser(userId, cb) {
-	const sql =
+    const sql =
 		`SELECT group_name
 		FROM user_group_member
 		WHERE user_id=?;`;
 
-	const groups = [];
+    const groups = [];
 
-	userDb.each(sql, [ userId ], (err, row) => {
-		if(err) {
-			return cb(err);
-		}
+    userDb.each(sql, [ userId ], (err, row) => {
+        if(err) {
+            return cb(err);
+        }
 
-		groups.push(row.group_name);
-	},
-	() => {
-		return cb(null, groups);
-	});
+        groups.push(row.group_name);
+    },
+    () => {
+        return cb(null, groups);
+    });
 }
 
 function addUserToGroup(userId, groupName, transOrDb, cb) {
-	if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
-		cb = transOrDb;
-		transOrDb = userDb;
-	}
+    if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
+        cb = transOrDb;
+        transOrDb = userDb;
+    }
 
-	transOrDb.run(
-		`REPLACE INTO user_group_member (group_name, user_id)
+    transOrDb.run(
+        `REPLACE INTO user_group_member (group_name, user_id)
 		VALUES(?, ?);`,
-		[ groupName, userId ],
-		err => {
-			return cb(err);
-		}
-	);
+        [ groupName, userId ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function addUserToGroups(userId, groups, transOrDb, cb) {
 
-	async.each(groups, (groupName, nextGroupName) => {
-		return addUserToGroup(userId, groupName, transOrDb, nextGroupName);
-	}, err => {
-		return cb(err);
-	});
+    async.each(groups, (groupName, nextGroupName) => {
+        return addUserToGroup(userId, groupName, transOrDb, nextGroupName);
+    }, err => {
+        return cb(err);
+    });
 }
 
 function removeUserFromGroup(userId, groupName, cb) {
-	userDb.run(
-		`DELETE FROM user_group_member
+    userDb.run(
+        `DELETE FROM user_group_member
 		WHERE group_name=? AND user_id=?;`,
-		[ groupName, userId ],
-		err => {
-			return cb(err);
-		}
-	);
+        [ groupName, userId ],
+        err => {
+            return cb(err);
+        }
+    );
 }
diff --git a/core/user_list.js b/core/user_list.js
index 30313a28..212eb9ea 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -23,90 +23,90 @@ const _					= require('lodash');
 */
 
 exports.moduleInfo = {
-	name		: 'User List',
-	desc		: 'Lists all system users',
-	author		: 'NuSkooler',
+    name		: 'User List',
+    desc		: 'Lists all system users',
+    author		: 'NuSkooler',
 };
 
 const MciViewIds = {
-	UserList	: 1,
+    UserList	: 1,
 };
 
 exports.getModule = class UserListModule extends MenuModule {
-	constructor(options) {
-		super(options);
-	}
+    constructor(options) {
+        super(options);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self		= this;
-			const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self		= this;
+            const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-			let userList = [];
+            let userList = [];
 
-			const USER_LIST_OPTS = {
-				properties : [ 'location', 'affiliation', 'last_login_timestamp' ],
-			};
+            const USER_LIST_OPTS = {
+                properties : [ 'location', 'affiliation', 'last_login_timestamp' ],
+            };
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						var loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        var loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu,
+                        };
 
-						vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function fetchUserList(callback) {
-						//	:TODO: Currently fetching all users - probably always OK, but this could be paged
-						User.getUserList(USER_LIST_OPTS, function got(err, ul) {
-							userList = ul;
-							callback(err);
-						});
-					},
-					function populateList(callback) {
-						var userListView = vc.getView(MciViewIds.UserList);
+                        vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function fetchUserList(callback) {
+                        //	:TODO: Currently fetching all users - probably always OK, but this could be paged
+                        User.getUserList(USER_LIST_OPTS, function got(err, ul) {
+                            userList = ul;
+                            callback(err);
+                        });
+                    },
+                    function populateList(callback) {
+                        var userListView = vc.getView(MciViewIds.UserList);
 
-						var listFormat 		= self.menuConfig.config.listFormat || '{userName} - {affils}';
-						var focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default changed color!
-						var dateTimeFormat	= self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
+                        var listFormat 		= self.menuConfig.config.listFormat || '{userName} - {affils}';
+                        var focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default changed color!
+                        var dateTimeFormat	= self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
 
-						function getUserFmtObj(ue) {
-							return {
-								userId		: ue.userId,
-								userName	: ue.userName,
-								affils		: ue.affiliation,
-								location	: ue.location,
-								//	:TODO: the rest!
-								note		: ue.note || '',
-								lastLoginTs	: moment(ue.last_login_timestamp).format(dateTimeFormat),
-							};
-						}
+                        function getUserFmtObj(ue) {
+                            return {
+                                userId		: ue.userId,
+                                userName	: ue.userName,
+                                affils		: ue.affiliation,
+                                location	: ue.location,
+                                //	:TODO: the rest!
+                                note		: ue.note || '',
+                                lastLoginTs	: moment(ue.last_login_timestamp).format(dateTimeFormat),
+                            };
+                        }
 
-						userListView.setItems(_.map(userList, function formatUserEntry(ue) {
-							return stringFormat(listFormat, getUserFmtObj(ue));
-						}));
+                        userListView.setItems(_.map(userList, function formatUserEntry(ue) {
+                            return stringFormat(listFormat, getUserFmtObj(ue));
+                        }));
 
-						userListView.setFocusItems(_.map(userList, function formatUserEntry(ue) {
-							return stringFormat(focusListFormat, getUserFmtObj(ue));
-						}));
+                        userListView.setFocusItems(_.map(userList, function formatUserEntry(ue) {
+                            return stringFormat(focusListFormat, getUserFmtObj(ue));
+                        }));
 
-						userListView.redraw();
-						callback(null);
-					}
-				],
-				function complete(err) {
-					if(err) {
-						self.client.log.error( { error : err.toString() }, 'Error loading user list');
-					}
-					cb(err);
-				}
-			);
-		});
-	}
+                        userListView.redraw();
+                        callback(null);
+                    }
+                ],
+                function complete(err) {
+                    if(err) {
+                        self.client.log.error( { error : err.toString() }, 'Error loading user list');
+                    }
+                    cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/user_login.js b/core/user_login.js
index 80d832e0..aa3cfe7b 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -14,85 +14,85 @@ const async				= require('async');
 exports.userLogin		= userLogin;
 
 function userLogin(client, username, password, cb) {
-	client.user.authenticate(username, password, function authenticated(err) {
-		if(err) {
-			client.log.info( { username : username, error : err.message }, 'Failed login attempt');
+    client.user.authenticate(username, password, function authenticated(err) {
+        if(err) {
+            client.log.info( { username : username, error : err.message }, 'Failed login attempt');
 
-			//	:TODO: if username exists, record failed login attempt to properties
-			//	:TODO: check Config max failed logon attempts/etc. - set err.maxAttempts = true
+            //	:TODO: if username exists, record failed login attempt to properties
+            //	:TODO: check Config max failed logon attempts/etc. - set err.maxAttempts = true
 
-			return cb(err);
-		}
-		const user	= client.user;
+            return cb(err);
+        }
+        const user	= client.user;
 
-		//
-		//	Ensure this user is not already logged in.
-		//	Loop through active connections -- which includes the current --
-		//	and check for matching user ID. If the count is > 1, disallow.
-		//
-		let existingClientConnection;
-		clientConnections.forEach(function connEntry(cc) {
-			if(cc.user !== user && cc.user.userId === user.userId) {
-				existingClientConnection = cc;
-			}
-		});
+        //
+        //	Ensure this user is not already logged in.
+        //	Loop through active connections -- which includes the current --
+        //	and check for matching user ID. If the count is > 1, disallow.
+        //
+        let existingClientConnection;
+        clientConnections.forEach(function connEntry(cc) {
+            if(cc.user !== user && cc.user.userId === user.userId) {
+                existingClientConnection = cc;
+            }
+        });
 
-		if(existingClientConnection) {
-			client.log.info(
-				{
-					existingClientId	: existingClientConnection.session.id,
-					username			: user.username,
-					userId				: user.userId
-				},
-				'Already logged in'
-			);
+        if(existingClientConnection) {
+            client.log.info(
+                {
+                    existingClientId	: existingClientConnection.session.id,
+                    username			: user.username,
+                    userId				: user.userId
+                },
+                'Already logged in'
+            );
 
-			const existingConnError = new Error('Already logged in as supplied user');
-			existingConnError.existingConn = true;
+            const existingConnError = new Error('Already logged in as supplied user');
+            existingConnError.existingConn = true;
 
-			//	:TODO: We should use EnigError & pass existing connection as second param
+            //	:TODO: We should use EnigError & pass existing connection as second param
 
-			return cb(existingConnError);
-		}
+            return cb(existingConnError);
+        }
 
-		//	update client logger with addition of username
-		client.log = logger.log.child(
-			{
-				clientId	: client.log.fields.clientId,
-				sessionId	: client.log.fields.sessionId,
-				username	: user.username,
-			}
-		);
-		client.log.info('Successful login');
+        //	update client logger with addition of username
+        client.log = logger.log.child(
+            {
+                clientId	: client.log.fields.clientId,
+                sessionId	: client.log.fields.sessionId,
+                username	: user.username,
+            }
+        );
+        client.log.info('Successful login');
 
-		//	User's unique session identifier is the same as the connection itself
-		user.sessionId = client.session.uniqueId;	//	convienence
+        //	User's unique session identifier is the same as the connection itself
+        user.sessionId = client.session.uniqueId;	//	convienence
 
-		Events.emit(Events.getSystemEvents().UserLogin, { user } );
+        Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
-		async.parallel(
-			[
-				function setTheme(callback) {
-					setClientTheme(client, user.properties.theme_id);
-					return callback(null);
-				},
-				function updateSystemLoginCount(callback) {
-					return StatLog.incrementSystemStat('login_count', 1, callback);
-				},
-				function recordLastLogin(callback) {
-					return StatLog.setUserStat(user, 'last_login_timestamp', StatLog.now, callback);
-				},
-				function updateUserLoginCount(callback) {
-					return StatLog.incrementUserStat(user, 'login_count', 1, callback);
-				},
-				function recordLoginHistory(callback) {
-					const LOGIN_HISTORY_MAX	= 200;	//	history of up to last 200 callers
-					return StatLog.appendSystemLogEntry('user_login_history', user.userId, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	});
+        async.parallel(
+            [
+                function setTheme(callback) {
+                    setClientTheme(client, user.properties.theme_id);
+                    return callback(null);
+                },
+                function updateSystemLoginCount(callback) {
+                    return StatLog.incrementSystemStat('login_count', 1, callback);
+                },
+                function recordLastLogin(callback) {
+                    return StatLog.setUserStat(user, 'last_login_timestamp', StatLog.now, callback);
+                },
+                function updateUserLoginCount(callback) {
+                    return StatLog.incrementUserStat(user, 'login_count', 1, callback);
+                },
+                function recordLoginHistory(callback) {
+                    const LOGIN_HISTORY_MAX	= 200;	//	history of up to last 200 callers
+                    return StatLog.appendSystemLogEntry('user_login_history', user.userId, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    });
 }
\ No newline at end of file
diff --git a/core/uuid_util.js b/core/uuid_util.js
index 9af449dd..7cf582f5 100644
--- a/core/uuid_util.js
+++ b/core/uuid_util.js
@@ -6,33 +6,33 @@ const createHash	= require('crypto').createHash;
 exports.createNamedUUID	= createNamedUUID;
 
 function createNamedUUID(namespaceUuid, key) {
-	//
-	//	v5 UUID generation code based on the work here:
-	//	https://github.com/download13/uuidv5/blob/master/uuid.js
-	//
-	if(!Buffer.isBuffer(namespaceUuid)) {
-		namespaceUuid = Buffer.from(namespaceUuid);
-	}
+    //
+    //	v5 UUID generation code based on the work here:
+    //	https://github.com/download13/uuidv5/blob/master/uuid.js
+    //
+    if(!Buffer.isBuffer(namespaceUuid)) {
+        namespaceUuid = Buffer.from(namespaceUuid);
+    }
 
-	if(!Buffer.isBuffer(key)) {
-		key = Buffer.from(key);
-	}
+    if(!Buffer.isBuffer(key)) {
+        key = Buffer.from(key);
+    }
 
-	let digest = createHash('sha1').update(
-		Buffer.concat( [ namespaceUuid, key ] )).digest();
+    let digest = createHash('sha1').update(
+        Buffer.concat( [ namespaceUuid, key ] )).digest();
 
-	let u = Buffer.alloc(16);
+    let u = Buffer.alloc(16);
 
-	// bbbb - bb - bb - bb - bbbbbb
-	digest.copy(u, 0, 0, 4);			// time_low
-	digest.copy(u, 4, 4, 6);			// time_mid
-	digest.copy(u, 6, 6, 8);			// time_hi_and_version
+    // bbbb - bb - bb - bb - bbbbbb
+    digest.copy(u, 0, 0, 4);			// time_low
+    digest.copy(u, 4, 4, 6);			// time_mid
+    digest.copy(u, 6, 6, 8);			// time_hi_and_version
 
-	u[6] = (u[6] & 0x0f) | 0x50;		// version, 4 most significant bits are set to version 5 (0101)
-	u[8] = (digest[8] & 0x3f) | 0x80;	// clock_seq_hi_and_reserved, 2msb are set to 10
-	u[9] = digest[9];
+    u[6] = (u[6] & 0x0f) | 0x50;		// version, 4 most significant bits are set to version 5 (0101)
+    u[8] = (digest[8] & 0x3f) | 0x80;	// clock_seq_hi_and_reserved, 2msb are set to 10
+    u[9] = digest[9];
 
-	digest.copy(u, 10, 10, 16);
+    digest.copy(u, 10, 10, 16);
 
-	return u;
+    return u;
 }
\ No newline at end of file
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index 7e8fc808..e56207a2 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -15,339 +15,339 @@ const _				= require('lodash');
 exports.VerticalMenuView		= VerticalMenuView;
 
 function VerticalMenuView(options) {
-	options.cursor	= options.cursor || 'hide';
-	options.justify = options.justify || 'left';
+    options.cursor	= options.cursor || 'hide';
+    options.justify = options.justify || 'left';
 
-	MenuView.call(this, options);
+    MenuView.call(this, options);
 
-	const self = this;
+    const self = this;
 
-	//	we want page up/page down by default
-	if(!_.isObject(options.specialKeyMap)) {
-		Object.assign(this.specialKeyMap, {
-			'page up'		: [ 'page up' ],
-			'page down'		: [ 'page down' ],
-		});
-	}
+    //	we want page up/page down by default
+    if(!_.isObject(options.specialKeyMap)) {
+        Object.assign(this.specialKeyMap, {
+            'page up'		: [ 'page up' ],
+            'page down'		: [ 'page down' ],
+        });
+    }
 
-	this.performAutoScale = function() {
-		if(this.autoScale.height) {
-			this.dimens.height = (self.items.length * (self.itemSpacing + 1)) - (self.itemSpacing);
-			this.dimens.height = Math.min(self.dimens.height, self.client.term.termHeight - self.position.row);
-		}
+    this.performAutoScale = function() {
+        if(this.autoScale.height) {
+            this.dimens.height = (self.items.length * (self.itemSpacing + 1)) - (self.itemSpacing);
+            this.dimens.height = Math.min(self.dimens.height, self.client.term.termHeight - self.position.row);
+        }
 
-		if(self.autoScale.width) {
-			let maxLen = 0;
-			self.items.forEach( item => {
-				if(item.text.length > maxLen) {
-					maxLen = Math.min(item.text.length, self.client.term.termWidth - self.position.col);
-				}
-			});
-			self.dimens.width = maxLen + 1;
-		}
-	};
+        if(self.autoScale.width) {
+            let maxLen = 0;
+            self.items.forEach( item => {
+                if(item.text.length > maxLen) {
+                    maxLen = Math.min(item.text.length, self.client.term.termWidth - self.position.col);
+                }
+            });
+            self.dimens.width = maxLen + 1;
+        }
+    };
 
-	this.performAutoScale();
+    this.performAutoScale();
 
-	this.updateViewVisibleItems = function() {
-		self.maxVisibleItems = Math.ceil(self.dimens.height / (self.itemSpacing + 1));
+    this.updateViewVisibleItems = function() {
+        self.maxVisibleItems = Math.ceil(self.dimens.height / (self.itemSpacing + 1));
 
-		self.viewWindow = {
-			top		: self.focusedItemIndex,
-			bottom	: Math.min(self.focusedItemIndex + self.maxVisibleItems, self.items.length) - 1,
-		};
-	};
+        self.viewWindow = {
+            top		: self.focusedItemIndex,
+            bottom	: Math.min(self.focusedItemIndex + self.maxVisibleItems, self.items.length) - 1,
+        };
+    };
 
-	this.drawItem = function(index) {
-		const item = self.items[index];
-		if(!item) {
-			return;
-		}
+    this.drawItem = function(index) {
+        const item = self.items[index];
+        if(!item) {
+            return;
+        }
 
-		const cached = this.getRenderCacheItem(index, item.focused);
-		if(cached) {
-			return self.client.term.write(`${ansi.goto(item.row, self.position.col)}${cached}`);
-		}
+        const cached = this.getRenderCacheItem(index, item.focused);
+        if(cached) {
+            return self.client.term.write(`${ansi.goto(item.row, self.position.col)}${cached}`);
+        }
 
-		let text;
-		let sgr;
-		if(item.focused && self.hasFocusItems()) {
-			const focusItem = self.focusItems[index];
-			text = focusItem ? focusItem.text : item.text;
-			sgr = '';
-		} else if(this.complexItems) {
-			text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
-			sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
-		} else {
-			text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
-			sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
-		}
+        let text;
+        let sgr;
+        if(item.focused && self.hasFocusItems()) {
+            const focusItem = self.focusItems[index];
+            text = focusItem ? focusItem.text : item.text;
+            sgr = '';
+        } else if(this.complexItems) {
+            text = pipeToAnsi(formatString(item.focused && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
+            sgr = this.focusItemFormat ? '' : (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+        } else {
+            text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
+            sgr = (index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
+        }
 
-		text = `${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`;
-		self.client.term.write(`${ansi.goto(item.row, self.position.col)}${text}`);
-		this.setRenderCacheItem(index, text, item.focused);
-	};
+        text = `${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`;
+        self.client.term.write(`${ansi.goto(item.row, self.position.col)}${text}`);
+        this.setRenderCacheItem(index, text, item.focused);
+    };
 }
 
 util.inherits(VerticalMenuView, MenuView);
 
 VerticalMenuView.prototype.redraw = function() {
-	VerticalMenuView.super_.prototype.redraw.call(this);
+    VerticalMenuView.super_.prototype.redraw.call(this);
 
-	//	:TODO: rename positionCacheExpired to something that makese sense; combine methods for such
-	if(this.positionCacheExpired) {
-		this.performAutoScale();
-		this.updateViewVisibleItems();
+    //	:TODO: rename positionCacheExpired to something that makese sense; combine methods for such
+    if(this.positionCacheExpired) {
+        this.performAutoScale();
+        this.updateViewVisibleItems();
 
-		this.positionCacheExpired = false;
-	}
+        this.positionCacheExpired = false;
+    }
 
-	//	erase old items
-	//	:TODO: optimize this: only needed if a item is removed or new max width < old.
-	if(this.oldDimens) {
-		const blank 	= new Array(Math.max(this.oldDimens.width, this.dimens.width)).join(' ');
-		let seq			= ansi.goto(this.position.row, this.position.col) + this.getSGR() + blank;
-		let row			= this.position.row + 1;
-		const endRow	= (row + this.oldDimens.height) - 2;
+    //	erase old items
+    //	:TODO: optimize this: only needed if a item is removed or new max width < old.
+    if(this.oldDimens) {
+        const blank 	= new Array(Math.max(this.oldDimens.width, this.dimens.width)).join(' ');
+        let seq			= ansi.goto(this.position.row, this.position.col) + this.getSGR() + blank;
+        let row			= this.position.row + 1;
+        const endRow	= (row + this.oldDimens.height) - 2;
 
-		while(row <= endRow) {
-			seq += ansi.goto(row, this.position.col) + blank;
-			row += 1;
-		}
-		this.client.term.write(seq);
-		delete this.oldDimens;
-	}
+        while(row <= endRow) {
+            seq += ansi.goto(row, this.position.col) + blank;
+            row += 1;
+        }
+        this.client.term.write(seq);
+        delete this.oldDimens;
+    }
 
-	if(this.items.length) {
-		let row = this.position.row;
-		for(let i = this.viewWindow.top; i <= this.viewWindow.bottom; ++i) {
-			this.items[i].row = row;
-			row += this.itemSpacing + 1;
-			this.items[i].focused = this.focusedItemIndex === i;
-			this.drawItem(i);
-		}
-	}
+    if(this.items.length) {
+        let row = this.position.row;
+        for(let i = this.viewWindow.top; i <= this.viewWindow.bottom; ++i) {
+            this.items[i].row = row;
+            row += this.itemSpacing + 1;
+            this.items[i].focused = this.focusedItemIndex === i;
+            this.drawItem(i);
+        }
+    }
 };
 
 VerticalMenuView.prototype.setHeight = function(height) {
-	VerticalMenuView.super_.prototype.setHeight.call(this, height);
+    VerticalMenuView.super_.prototype.setHeight.call(this, height);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 VerticalMenuView.prototype.setPosition = function(pos) {
-	VerticalMenuView.super_.prototype.setPosition.call(this, pos);
+    VerticalMenuView.super_.prototype.setPosition.call(this, pos);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 VerticalMenuView.prototype.setFocus = function(focused) {
-	VerticalMenuView.super_.prototype.setFocus.call(this, focused);
+    VerticalMenuView.super_.prototype.setFocus.call(this, focused);
 
-	this.redraw();
+    this.redraw();
 };
 
 VerticalMenuView.prototype.setFocusItemIndex = function(index) {
-	VerticalMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    VerticalMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
 
-	const remainAfterFocus = this.items.length - index;
-	if(remainAfterFocus >= this.maxVisibleItems) {
-		this.viewWindow = {
-			top		: this.focusedItemIndex,
-			bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
-		};
+    const remainAfterFocus = this.items.length - index;
+    if(remainAfterFocus >= this.maxVisibleItems) {
+        this.viewWindow = {
+            top		: this.focusedItemIndex,
+            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+        };
 
-		this.positionCacheExpired = false;	//	skip standard behavior
-		this.performAutoScale();
-	}
+        this.positionCacheExpired = false;	//	skip standard behavior
+        this.performAutoScale();
+    }
 
-	this.redraw();
+    this.redraw();
 };
 
 VerticalMenuView.prototype.onKeyPress = function(ch, key) {
-	if(key) {
-		if(this.isKeyMapped('up', key.name)) {
-			this.focusPrevious();
-		} else if(this.isKeyMapped('down', key.name)) {
-			this.focusNext();
-		} else if(this.isKeyMapped('page up', key.name)) {
-			this.focusPreviousPageItem();
-		} else if(this.isKeyMapped('page down', key.name)) {
-			this.focusNextPageItem();
-		} else if(this.isKeyMapped('home', key.name)) {
-			this.focusFirst();
-		} else if(this.isKeyMapped('end', key.name)) {
-			this.focusLast();
-		}
-	}
+    if(key) {
+        if(this.isKeyMapped('up', key.name)) {
+            this.focusPrevious();
+        } else if(this.isKeyMapped('down', key.name)) {
+            this.focusNext();
+        } else if(this.isKeyMapped('page up', key.name)) {
+            this.focusPreviousPageItem();
+        } else if(this.isKeyMapped('page down', key.name)) {
+            this.focusNextPageItem();
+        } else if(this.isKeyMapped('home', key.name)) {
+            this.focusFirst();
+        } else if(this.isKeyMapped('end', key.name)) {
+            this.focusLast();
+        }
+    }
 
-	VerticalMenuView.super_.prototype.onKeyPress.call(this, ch, key);
+    VerticalMenuView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 
 VerticalMenuView.prototype.getData = function() {
-	const item = this.getItem(this.focusedItemIndex);
-	return _.isString(item.data) ? item.data : this.focusedItemIndex;
+    const item = this.getItem(this.focusedItemIndex);
+    return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
 
 VerticalMenuView.prototype.setItems = function(items) {
-	//	if we have items already, save off their drawing area so we don't leave fragments at redraw
-	if(this.items && this.items.length) {
-		this.oldDimens = Object.assign({}, this.dimens);
-	}
+    //	if we have items already, save off their drawing area so we don't leave fragments at redraw
+    if(this.items && this.items.length) {
+        this.oldDimens = Object.assign({}, this.dimens);
+    }
 
-	VerticalMenuView.super_.prototype.setItems.call(this, items);
+    VerticalMenuView.super_.prototype.setItems.call(this, items);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 VerticalMenuView.prototype.removeItem = function(index) {
-	if(this.items && this.items.length) {
-		this.oldDimens = Object.assign({}, this.dimens);
-	}
+    if(this.items && this.items.length) {
+        this.oldDimens = Object.assign({}, this.dimens);
+    }
 
-	VerticalMenuView.super_.prototype.removeItem.call(this, index);
+    VerticalMenuView.super_.prototype.removeItem.call(this, index);
 };
 
 //	:TODO: Apply draw optimizaitons when only two items need drawn vs entire view!
 
 VerticalMenuView.prototype.focusNext = function() {
-	if(this.items.length - 1 === this.focusedItemIndex) {
-		this.focusedItemIndex = 0;
+    if(this.items.length - 1 === this.focusedItemIndex) {
+        this.focusedItemIndex = 0;
 
-		this.viewWindow = {
-			top		: 0,
-			bottom	: Math.min(this.maxVisibleItems, this.items.length) - 1
-		};
-	} else {
-		this.focusedItemIndex++;
+        this.viewWindow = {
+            top		: 0,
+            bottom	: Math.min(this.maxVisibleItems, this.items.length) - 1
+        };
+    } else {
+        this.focusedItemIndex++;
 
-		if(this.focusedItemIndex > this.viewWindow.bottom) {
-			this.viewWindow.top++;
-			this.viewWindow.bottom++;
-		}
-	}
+        if(this.focusedItemIndex > this.viewWindow.bottom) {
+            this.viewWindow.top++;
+            this.viewWindow.bottom++;
+        }
+    }
 
-	this.redraw();
+    this.redraw();
 
-	VerticalMenuView.super_.prototype.focusNext.call(this);
+    VerticalMenuView.super_.prototype.focusNext.call(this);
 };
 
 VerticalMenuView.prototype.focusPrevious = function() {
-	if(0 === this.focusedItemIndex) {
-		this.focusedItemIndex = this.items.length - 1;
+    if(0 === this.focusedItemIndex) {
+        this.focusedItemIndex = this.items.length - 1;
 
-		this.viewWindow = {
-			//top		: this.items.length - this.maxVisibleItems,
-			top		: Math.max(this.items.length - this.maxVisibleItems, 0),
-			bottom	: this.items.length - 1
-		};
+        this.viewWindow = {
+            //top		: this.items.length - this.maxVisibleItems,
+            top		: Math.max(this.items.length - this.maxVisibleItems, 0),
+            bottom	: this.items.length - 1
+        };
 
-	} else {
-		this.focusedItemIndex--;
+    } else {
+        this.focusedItemIndex--;
 
-		if(this.focusedItemIndex < this.viewWindow.top) {
-			this.viewWindow.top--;
-			this.viewWindow.bottom--;
+        if(this.focusedItemIndex < this.viewWindow.top) {
+            this.viewWindow.top--;
+            this.viewWindow.bottom--;
 
-			//	adjust for focus index being set & window needing expansion as we scroll up
-			const rem = (this.viewWindow.bottom - this.viewWindow.top) + 1;
-			if(rem < this.maxVisibleItems && (this.items.length - 1) > this.focusedItemIndex) {
-				this.viewWindow.bottom = this.items.length - 1;
-			}
-		}
-	}
+            //	adjust for focus index being set & window needing expansion as we scroll up
+            const rem = (this.viewWindow.bottom - this.viewWindow.top) + 1;
+            if(rem < this.maxVisibleItems && (this.items.length - 1) > this.focusedItemIndex) {
+                this.viewWindow.bottom = this.items.length - 1;
+            }
+        }
+    }
 
-	this.redraw();
+    this.redraw();
 
-	VerticalMenuView.super_.prototype.focusPrevious.call(this);
+    VerticalMenuView.super_.prototype.focusPrevious.call(this);
 };
 
 VerticalMenuView.prototype.focusPreviousPageItem = function() {
-	//
-	//	Jump to current - up to page size or top
-	//	If already at the top, jump to bottom
-	//
-	if(0 === this.focusedItemIndex) {
-		return this.focusPrevious();	//	will jump to bottom
-	}
+    //
+    //	Jump to current - up to page size or top
+    //	If already at the top, jump to bottom
+    //
+    if(0 === this.focusedItemIndex) {
+        return this.focusPrevious();	//	will jump to bottom
+    }
 
-	const index = Math.max(this.focusedItemIndex - this.dimens.height, 0);
+    const index = Math.max(this.focusedItemIndex - this.dimens.height, 0);
 
-	if(index < this.viewWindow.top) {
-		this.oldDimens = Object.assign({}, this.dimens);
-	}
+    if(index < this.viewWindow.top) {
+        this.oldDimens = Object.assign({}, this.dimens);
+    }
 
-	this.setFocusItemIndex(index);
+    this.setFocusItemIndex(index);
 
-	return VerticalMenuView.super_.prototype.focusPreviousPageItem.call(this);
+    return VerticalMenuView.super_.prototype.focusPreviousPageItem.call(this);
 };
 
 VerticalMenuView.prototype.focusNextPageItem = function() {
-	//
-	//	Jump to current + up to page size or bottom
-	//	If already at the bottom, jump to top
-	//
-	if(this.items.length - 1 === this.focusedItemIndex) {
-		return this.focusNext();	//	will jump to top
-	}
+    //
+    //	Jump to current + up to page size or bottom
+    //	If already at the bottom, jump to top
+    //
+    if(this.items.length - 1 === this.focusedItemIndex) {
+        return this.focusNext();	//	will jump to top
+    }
 
-	const index = Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length - 1);
+    const index = Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length - 1);
 
-	if(index > this.viewWindow.bottom) {
-		this.oldDimens = Object.assign({}, this.dimens);
+    if(index > this.viewWindow.bottom) {
+        this.oldDimens = Object.assign({}, this.dimens);
 
-		this.focusedItemIndex = index;
+        this.focusedItemIndex = index;
 
-		this.viewWindow = {
-			top		: this.focusedItemIndex,
-			bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
-		};
+        this.viewWindow = {
+            top		: this.focusedItemIndex,
+            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+        };
 
-		this.redraw();
-	} else {
-		this.setFocusItemIndex(index);
-	}
+        this.redraw();
+    } else {
+        this.setFocusItemIndex(index);
+    }
 
-	return VerticalMenuView.super_.prototype.focusNextPageItem.call(this);
+    return VerticalMenuView.super_.prototype.focusNextPageItem.call(this);
 };
 
 VerticalMenuView.prototype.focusFirst = function() {
-	if(0 < this.viewWindow.top) {
-		this.oldDimens = Object.assign({}, this.dimens);
-	}
-	this.setFocusItemIndex(0);
-	return VerticalMenuView.super_.prototype.focusFirst.call(this);
+    if(0 < this.viewWindow.top) {
+        this.oldDimens = Object.assign({}, this.dimens);
+    }
+    this.setFocusItemIndex(0);
+    return VerticalMenuView.super_.prototype.focusFirst.call(this);
 };
 
 VerticalMenuView.prototype.focusLast = function() {
-	const index = this.items.length - 1;
+    const index = this.items.length - 1;
 
-	if(index > this.viewWindow.bottom) {
-		this.oldDimens = Object.assign({}, this.dimens);
+    if(index > this.viewWindow.bottom) {
+        this.oldDimens = Object.assign({}, this.dimens);
 
-		this.focusedItemIndex = index;
+        this.focusedItemIndex = index;
 
-		this.viewWindow = {
-			top		: this.focusedItemIndex,
-			bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
-		};
+        this.viewWindow = {
+            top		: this.focusedItemIndex,
+            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+        };
 
-		this.redraw();
-	} else {
-		this.setFocusItemIndex(index);
-	}
+        this.redraw();
+    } else {
+        this.setFocusItemIndex(index);
+    }
 
-	return VerticalMenuView.super_.prototype.focusLast.call(this);
+    return VerticalMenuView.super_.prototype.focusLast.call(this);
 };
 
 VerticalMenuView.prototype.setFocusItems = function(items) {
-	VerticalMenuView.super_.prototype.setFocusItems.call(this, items);
+    VerticalMenuView.super_.prototype.setFocusItems.call(this, items);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
 
 VerticalMenuView.prototype.setItemSpacing = function(itemSpacing) {
-	VerticalMenuView.super_.prototype.setItemSpacing.call(this, itemSpacing);
+    VerticalMenuView.super_.prototype.setItemSpacing.call(this, itemSpacing);
 
-	this.positionCacheExpired = true;
+    this.positionCacheExpired = true;
 };
\ No newline at end of file
diff --git a/core/view.js b/core/view.js
index 1333ca24..fd46428f 100644
--- a/core/view.js
+++ b/core/view.js
@@ -15,271 +15,271 @@ const _				= require('lodash');
 exports.View							= View;
 
 const VIEW_SPECIAL_KEY_MAP_DEFAULT = {
-	accept		: [ 'return' ],
-	exit		: [ 'esc' ],
-	backspace	: [ 'backspace', 'del' ],
-	del			: [ 'del' ],
-	next		: [ 'tab' ],
-	up			: [ 'up arrow' ],
-	down		: [ 'down arrow' ],
-	end			: [ 'end' ],
-	home		: [ 'home' ],
-	left		: [ 'left arrow' ],
-	right		: [ 'right arrow' ],
-	clearLine	: [ 'ctrl + y' ],
+    accept		: [ 'return' ],
+    exit		: [ 'esc' ],
+    backspace	: [ 'backspace', 'del' ],
+    del			: [ 'del' ],
+    next		: [ 'tab' ],
+    up			: [ 'up arrow' ],
+    down		: [ 'down arrow' ],
+    end			: [ 'end' ],
+    home		: [ 'home' ],
+    left		: [ 'left arrow' ],
+    right		: [ 'right arrow' ],
+    clearLine	: [ 'ctrl + y' ],
 };
 
 exports.VIEW_SPECIAL_KEY_MAP_DEFAULT	= VIEW_SPECIAL_KEY_MAP_DEFAULT;
 
 function View(options) {
-	events.EventEmitter.call(this);
+    events.EventEmitter.call(this);
 
-	enigAssert(_.isObject(options));
-	enigAssert(_.isObject(options.client));
+    enigAssert(_.isObject(options));
+    enigAssert(_.isObject(options.client));
 
-	var self			= this;
+    var self			= this;
 
-	this.client			= options.client;
+    this.client			= options.client;
 
-	this.cursor			= options.cursor || 'show';
-	this.cursorStyle	= options.cursorStyle || 'default';
+    this.cursor			= options.cursor || 'show';
+    this.cursorStyle	= options.cursorStyle || 'default';
 
-	this.acceptsFocus	= options.acceptsFocus || false;
-	this.acceptsInput	= options.acceptsInput || false;
+    this.acceptsFocus	= options.acceptsFocus || false;
+    this.acceptsInput	= options.acceptsInput || false;
 
-	this.position 		= { x : 0, y : 0 };
-	this.dimens			= { height : 1, width : 0 };
+    this.position 		= { x : 0, y : 0 };
+    this.dimens			= { height : 1, width : 0 };
 
-	this.textStyle		= options.textStyle || 'normal';
-	this.focusTextStyle	= options.focusTextStyle || this.textStyle;
+    this.textStyle		= options.textStyle || 'normal';
+    this.focusTextStyle	= options.focusTextStyle || this.textStyle;
 
-	if(options.id) {
-		this.setId(options.id);
-	}
+    if(options.id) {
+        this.setId(options.id);
+    }
 
-	if(options.position) {
-		this.setPosition(options.position);
-	}
+    if(options.position) {
+        this.setPosition(options.position);
+    }
 
-	if(_.isObject(options.autoScale)) {
-		this.autoScale = options.autoScale;
-	} else {
-		this.autoScale = { height : true, width : true };
-	}
+    if(_.isObject(options.autoScale)) {
+        this.autoScale = options.autoScale;
+    } else {
+        this.autoScale = { height : true, width : true };
+    }
 
-	if(options.dimens) {
-		this.setDimension(options.dimens);
-		this.autoScale = { height : false, width : false };
-	} else {
-		this.dimens = {
-			width	: options.width || 0,
-			height	: 0
-		};
-	}
+    if(options.dimens) {
+        this.setDimension(options.dimens);
+        this.autoScale = { height : false, width : false };
+    } else {
+        this.dimens = {
+            width	: options.width || 0,
+            height	: 0
+        };
+    }
 
-	//	:TODO: Just use styleSGRx for these, e.g. styleSGR0, styleSGR1 = norm/focus
-	this.ansiSGR		= options.ansiSGR || ansi.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
-	this.ansiFocusSGR	= options.ansiFocusSGR || this.ansiSGR;
+    //	:TODO: Just use styleSGRx for these, e.g. styleSGR0, styleSGR1 = norm/focus
+    this.ansiSGR		= options.ansiSGR || ansi.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
+    this.ansiFocusSGR	= options.ansiFocusSGR || this.ansiSGR;
 
-	this.styleSGR1		= options.styleSGR1 || this.ansiSGR;
-	this.styleSGR2		= options.styleSGR2 || this.ansiFocusSGR;
+    this.styleSGR1		= options.styleSGR1 || this.ansiSGR;
+    this.styleSGR2		= options.styleSGR2 || this.ansiFocusSGR;
 
-	if(this.acceptsInput) {
-		this.specialKeyMap = options.specialKeyMap || VIEW_SPECIAL_KEY_MAP_DEFAULT;
+    if(this.acceptsInput) {
+        this.specialKeyMap = options.specialKeyMap || VIEW_SPECIAL_KEY_MAP_DEFAULT;
 
-		if(_.isObject(options.specialKeyMapOverride)) {
-			this.setSpecialKeyMapOverride(options.specialKeyMapOverride);
-		}
-	}
+        if(_.isObject(options.specialKeyMapOverride)) {
+            this.setSpecialKeyMapOverride(options.specialKeyMapOverride);
+        }
+    }
 
-	this.isKeyMapped = function(keySet, keyName) {
-		return _.has(this.specialKeyMap, keySet) && this.specialKeyMap[keySet].indexOf(keyName) > -1;
-	};
+    this.isKeyMapped = function(keySet, keyName) {
+        return _.has(this.specialKeyMap, keySet) && this.specialKeyMap[keySet].indexOf(keyName) > -1;
+    };
 
-	this.getANSIColor = function(color) {
-		var sgr = [ color.flags, color.fg ];
-		if(color.bg !== color.flags) {
-			sgr.push(color.bg);
-		}
-		return ansi.sgr(sgr);
-	};
+    this.getANSIColor = function(color) {
+        var sgr = [ color.flags, color.fg ];
+        if(color.bg !== color.flags) {
+            sgr.push(color.bg);
+        }
+        return ansi.sgr(sgr);
+    };
 
-	this.hideCusor = function() {
-		self.client.term.rawWrite(ansi.hideCursor());
-	};
+    this.hideCusor = function() {
+        self.client.term.rawWrite(ansi.hideCursor());
+    };
 
-	this.restoreCursor = function() {
-		//this.client.term.write(ansi.setCursorStyle(this.cursorStyle));
-		this.client.term.rawWrite('show' === this.cursor ? ansi.showCursor() : ansi.hideCursor());
-	};
+    this.restoreCursor = function() {
+        //this.client.term.write(ansi.setCursorStyle(this.cursorStyle));
+        this.client.term.rawWrite('show' === this.cursor ? ansi.showCursor() : ansi.hideCursor());
+    };
 }
 
 util.inherits(View, events.EventEmitter);
 
 View.prototype.setId = function(id) {
-	this.id = id;
+    this.id = id;
 };
 
 View.prototype.getId = function() {
-	return this.id;
+    return this.id;
 };
 
 View.prototype.setPosition = function(pos) {
-	//
-	//	Allow the following forms: [row, col], { row : r, col : c }, or (row, col)
-	//
-	if(util.isArray(pos)) {
-		this.position.row = pos[0];
-		this.position.col = pos[1];
-	} else if(_.isNumber(pos.row) && _.isNumber(pos.col)) {
-		this.position.row = pos.row;
-		this.position.col = pos.col;
-	} else if(2 === arguments.length) {
-		this.position.row = parseInt(arguments[0], 10);
-		this.position.col = parseInt(arguments[1], 10);
-	}
+    //
+    //	Allow the following forms: [row, col], { row : r, col : c }, or (row, col)
+    //
+    if(util.isArray(pos)) {
+        this.position.row = pos[0];
+        this.position.col = pos[1];
+    } else if(_.isNumber(pos.row) && _.isNumber(pos.col)) {
+        this.position.row = pos.row;
+        this.position.col = pos.col;
+    } else if(2 === arguments.length) {
+        this.position.row = parseInt(arguments[0], 10);
+        this.position.col = parseInt(arguments[1], 10);
+    }
 
-	//	sanatize
-	this.position.row	= Math.max(this.position.row, 1);
-	this.position.col	= Math.max(this.position.col, 1);
-	this.position.row	= Math.min(this.position.row, this.client.term.termHeight);
-	this.position.col	= Math.min(this.position.col, this.client.term.termWidth);
+    //	sanatize
+    this.position.row	= Math.max(this.position.row, 1);
+    this.position.col	= Math.max(this.position.col, 1);
+    this.position.row	= Math.min(this.position.row, this.client.term.termHeight);
+    this.position.col	= Math.min(this.position.col, this.client.term.termWidth);
 };
 
 View.prototype.setDimension = function(dimens) {
-	enigAssert(_.isObject(dimens) && _.isNumber(dimens.height) && _.isNumber(dimens.width));
+    enigAssert(_.isObject(dimens) && _.isNumber(dimens.height) && _.isNumber(dimens.width));
 
-	this.dimens		= dimens;
-	this.autoScale	= { height : false, width : false };
+    this.dimens		= dimens;
+    this.autoScale	= { height : false, width : false };
 };
 
 View.prototype.setHeight = function(height) {
-	height	= parseInt(height) || 1;
-	height	= Math.min(height, this.client.term.termHeight);
+    height	= parseInt(height) || 1;
+    height	= Math.min(height, this.client.term.termHeight);
 
-	this.dimens.height		= height;
-	this.autoScale.height	= false;
+    this.dimens.height		= height;
+    this.autoScale.height	= false;
 };
 
 View.prototype.setWidth = function(width) {
-	width	= parseInt(width) || 1;
-	width	= Math.min(width, this.client.term.termWidth);
+    width	= parseInt(width) || 1;
+    width	= Math.min(width, this.client.term.termWidth);
 
-	this.dimens.width		= width;
-	this.autoScale.width	= false;
+    this.dimens.width		= width;
+    this.autoScale.width	= false;
 };
 
 View.prototype.getSGR = function() {
-	return this.ansiSGR;
+    return this.ansiSGR;
 };
 
 View.prototype.getStyleSGR = function(n) {
-	n = parseInt(n) || 0;
-	return this['styleSGR' + n];
+    n = parseInt(n) || 0;
+    return this['styleSGR' + n];
 };
 
 View.prototype.getFocusSGR = function() {
-	return this.ansiFocusSGR;
+    return this.ansiFocusSGR;
 };
 
 View.prototype.setSpecialKeyMapOverride = function(specialKeyMapOverride) {
-	this.specialKeyMap = Object.assign(this.specialKeyMap, specialKeyMapOverride);
+    this.specialKeyMap = Object.assign(this.specialKeyMap, specialKeyMapOverride);
 };
 
 View.prototype.setPropertyValue = function(propName, value) {
-	switch(propName) {
-		case 'height'	: this.setHeight(value); break;
-		case 'width'	: this.setWidth(value); break;
-		case 'focus'	: this.setFocus(value); break;
+    switch(propName) {
+        case 'height'	: this.setHeight(value); break;
+        case 'width'	: this.setWidth(value); break;
+        case 'focus'	: this.setFocus(value); break;
 
-		case 'text'		:
-			if('setText' in this) {
-				this.setText(value);
-			}
-			break;
+        case 'text'		:
+            if('setText' in this) {
+                this.setText(value);
+            }
+            break;
 
-		case 'textStyle'		: this.textStyle = value; break;
-		case 'focusTextStyle'	: this.focusTextStyle = value; break;
+        case 'textStyle'		: this.textStyle = value; break;
+        case 'focusTextStyle'	: this.focusTextStyle = value; break;
 
-		case 'justify'	: this.justify = value; break;
+        case 'justify'	: this.justify = value; break;
 
-		case 'fillChar' :
-			if('fillChar' in this) {
-				if(_.isNumber(value)) {
-					this.fillChar = String.fromCharCode(value);
-				} else if(_.isString(value)) {
-					this.fillChar = renderSubstr(value, 0, 1);
-				}
-			}
-			break;
+        case 'fillChar' :
+            if('fillChar' in this) {
+                if(_.isNumber(value)) {
+                    this.fillChar = String.fromCharCode(value);
+                } else if(_.isString(value)) {
+                    this.fillChar = renderSubstr(value, 0, 1);
+                }
+            }
+            break;
 
-		case 'submit' :
-			if(_.isBoolean(value)) {
-				this.submit = value;
-			}/* else {
+        case 'submit' :
+            if(_.isBoolean(value)) {
+                this.submit = value;
+            }/* else {
 				this.submit = _.isArray(value) && value.length > 0;
 			}
 			*/
-			break;
+            break;
 
-		case 'resizable' :
-			if(_.isBoolean(value)) {
-				this.resizable = value;
-			}
-			break;
+        case 'resizable' :
+            if(_.isBoolean(value)) {
+                this.resizable = value;
+            }
+            break;
 
-		case 'argName' : this.submitArgName = value; break;
+        case 'argName' : this.submitArgName = value; break;
 
-		case 'validate' :
-			if(_.isFunction(value)) {
-				this.validate = value;
-			}
-			break;
-	}
+        case 'validate' :
+            if(_.isFunction(value)) {
+                this.validate = value;
+            }
+            break;
+    }
 
-	if(/styleSGR[0-9]{1,2}/.test(propName)) {
-		if(_.isObject(value)) {
-			this[propName] = ansi.getSGRFromGraphicRendition(value, true);
-		} else if(_.isString(value)) {
-			this[propName] = colorCodes.pipeToAnsi(value);
-		}
-	}
+    if(/styleSGR[0-9]{1,2}/.test(propName)) {
+        if(_.isObject(value)) {
+            this[propName] = ansi.getSGRFromGraphicRendition(value, true);
+        } else if(_.isString(value)) {
+            this[propName] = colorCodes.pipeToAnsi(value);
+        }
+    }
 };
 
 View.prototype.redraw = function() {
-	this.client.term.write(ansi.goto(this.position.row, this.position.col));
+    this.client.term.write(ansi.goto(this.position.row, this.position.col));
 };
 
 View.prototype.setFocus = function(focused) {
-	enigAssert(this.acceptsFocus, 'View does not accept focus');
+    enigAssert(this.acceptsFocus, 'View does not accept focus');
 
-	this.hasFocus = focused;
-	this.restoreCursor();
+    this.hasFocus = focused;
+    this.restoreCursor();
 };
 
 View.prototype.onKeyPress = function(ch, key) {
-	enigAssert(this.hasFocus,		'View does not have focus');
-	enigAssert(this.acceptsInput,	'View does not accept input');
+    enigAssert(this.hasFocus,		'View does not have focus');
+    enigAssert(this.acceptsInput,	'View does not accept input');
 
-	if(!this.hasFocus || !this.acceptsInput) {
-		return;
-	}
+    if(!this.hasFocus || !this.acceptsInput) {
+        return;
+    }
 
-	if(key) {
-		enigAssert(this.specialKeyMap, 'No special key map defined');
+    if(key) {
+        enigAssert(this.specialKeyMap, 'No special key map defined');
 
-		if(this.isKeyMapped('accept', key.name)) {
-			this.emit('action', 'accept', key);
-		} else if(this.isKeyMapped('next', key.name)) {
-			this.emit('action', 'next', key);
-		}
-	}
+        if(this.isKeyMapped('accept', key.name)) {
+            this.emit('action', 'accept', key);
+        } else if(this.isKeyMapped('next', key.name)) {
+            this.emit('action', 'next', key);
+        }
+    }
 
-	if(ch) {
-		enigAssert(1 === ch.length);
-	}
+    if(ch) {
+        enigAssert(1 === ch.length);
+    }
 
-	this.emit('key press', ch, key);
+    this.emit('key press', ch, key);
 };
 
 View.prototype.getData = function() {
diff --git a/core/view_controller.js b/core/view_controller.js
index 65a5a1b3..f6a2bc2b 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -20,672 +20,672 @@ exports.ViewController		= ViewController;
 var MCI_REGEXP	= /([A-Z]{2})([0-9]{1,2})/;
 
 function ViewController(options) {
-	assert(_.isObject(options));
-	assert(_.isObject(options.client));
+    assert(_.isObject(options));
+    assert(_.isObject(options.client));
 
-	events.EventEmitter.call(this);
+    events.EventEmitter.call(this);
 
-	var self			= this;
+    var self			= this;
 
-	this.client			= options.client;
-	this.views			= {};	//	map of ID -> view
-	this.formId			= options.formId || 0;
-	this.mciViewFactory	= new MCIViewFactory(this.client);	//	:TODO: can this not be a singleton?
-	this.noInput		= _.isBoolean(options.noInput) ? options.noInput : false;
+    this.client			= options.client;
+    this.views			= {};	//	map of ID -> view
+    this.formId			= options.formId || 0;
+    this.mciViewFactory	= new MCIViewFactory(this.client);	//	:TODO: can this not be a singleton?
+    this.noInput		= _.isBoolean(options.noInput) ? options.noInput : false;
 
-	this.actionKeyMap	= {};
+    this.actionKeyMap	= {};
 
-	//
-	//	Small wrapper/proxy around handleAction() to ensure we do not allow
-	//	input/additional actions queued while performing an action
-	//
-	this.handleActionWrapper = function(formData, actionBlock) {
-		if(self.waitActionCompletion) {
-			return;	//	ignore until this is finished!
-		}
+    //
+    //	Small wrapper/proxy around handleAction() to ensure we do not allow
+    //	input/additional actions queued while performing an action
+    //
+    this.handleActionWrapper = function(formData, actionBlock) {
+        if(self.waitActionCompletion) {
+            return;	//	ignore until this is finished!
+        }
 
-		self.waitActionCompletion = true;
-		menuUtil.handleAction(self.client, formData, actionBlock, (err) => {
-			if(err) {
-				//	:TODO: What can we really do here?
-				if('ALREADYTHERE' === err.reasonCode) {
-					self.client.log.trace( err.reason );
-				} else {
-					self.client.log.warn( { err : err }, 'Error during handleAction()');
-				}
-			}
+        self.waitActionCompletion = true;
+        menuUtil.handleAction(self.client, formData, actionBlock, (err) => {
+            if(err) {
+                //	:TODO: What can we really do here?
+                if('ALREADYTHERE' === err.reasonCode) {
+                    self.client.log.trace( err.reason );
+                } else {
+                    self.client.log.warn( { err : err }, 'Error during handleAction()');
+                }
+            }
 
-			self.waitActionCompletion = false;
-		});
-	};
+            self.waitActionCompletion = false;
+        });
+    };
 
-	this.clientKeyPressHandler = function(ch, key) {
-		//
-		//	Process key presses treating form submit mapped	keys special.
-		//	Everything else is forwarded on to the focused View, if any.
-		//
-		var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
-		if(actionForKey) {
-			if(_.isNumber(actionForKey.viewId)) {
-				//
-				//	Key works on behalf of a view -- switch focus & submit
-				//
-				self.switchFocus(actionForKey.viewId);
-				self.submitForm(key);
-			} else if(_.isString(actionForKey.action)) {
-				const formData = self.getFocusedView() ? self.getFormData() : { };
-				self.handleActionWrapper(
-					Object.assign( { ch : ch, key : key }, formData ),	//	formData + key info
-					actionForKey);			//	actionBlock
-			}
-		} else {
-			if(self.focusedView && self.focusedView.acceptsInput) {
-				self.focusedView.onKeyPress(ch, key);
-			}
-		}
-	};
+    this.clientKeyPressHandler = function(ch, key) {
+        //
+        //	Process key presses treating form submit mapped	keys special.
+        //	Everything else is forwarded on to the focused View, if any.
+        //
+        var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
+        if(actionForKey) {
+            if(_.isNumber(actionForKey.viewId)) {
+                //
+                //	Key works on behalf of a view -- switch focus & submit
+                //
+                self.switchFocus(actionForKey.viewId);
+                self.submitForm(key);
+            } else if(_.isString(actionForKey.action)) {
+                const formData = self.getFocusedView() ? self.getFormData() : { };
+                self.handleActionWrapper(
+                    Object.assign( { ch : ch, key : key }, formData ),	//	formData + key info
+                    actionForKey);			//	actionBlock
+            }
+        } else {
+            if(self.focusedView && self.focusedView.acceptsInput) {
+                self.focusedView.onKeyPress(ch, key);
+            }
+        }
+    };
 
-	this.viewActionListener = function(action, key) {
-		switch(action) {
-			case 'next' :
-				self.emit('action', { view : this, action : action, key : key });
-				self.nextFocus();
-				break;
+    this.viewActionListener = function(action, key) {
+        switch(action) {
+            case 'next' :
+                self.emit('action', { view : this, action : action, key : key });
+                self.nextFocus();
+                break;
 
-			case 'accept' :
-				if(self.focusedView && self.focusedView.submit) {
-					//	:TODO: need to do validation here!!!
-					var focusedView = self.focusedView;
-					self.validateView(focusedView, function validated(err, newFocusedViewId) {
-						if(err) {
-							var newFocusedView = self.getView(newFocusedViewId) || focusedView;
-							self.setViewFocusWithEvents(newFocusedView, true);
-						} else {
-							self.submitForm(key);
-						}
-					});
-					//self.submitForm(key);
-				} else {
-					self.nextFocus();
-				}
-				break;
-		}
-	};
+            case 'accept' :
+                if(self.focusedView && self.focusedView.submit) {
+                    //	:TODO: need to do validation here!!!
+                    var focusedView = self.focusedView;
+                    self.validateView(focusedView, function validated(err, newFocusedViewId) {
+                        if(err) {
+                            var newFocusedView = self.getView(newFocusedViewId) || focusedView;
+                            self.setViewFocusWithEvents(newFocusedView, true);
+                        } else {
+                            self.submitForm(key);
+                        }
+                    });
+                    //self.submitForm(key);
+                } else {
+                    self.nextFocus();
+                }
+                break;
+        }
+    };
 
-	this.submitForm = function(key) {
-		self.emit('submit', this.getFormData(key));
-	};
+    this.submitForm = function(key) {
+        self.emit('submit', this.getFormData(key));
+    };
 
-	//	:TODO: replace this in favor of overriding toJSON() for various things such that logging will *never* output them
-	this.getLogFriendlyFormData = function(formData) {
-		//	:TODO: these fields should be part of menu.json sensitiveMembers[]
-		var safeFormData = _.cloneDeep(formData);
-		if(safeFormData.value.password) {
-			safeFormData.value.password = '*****';
-		}
-		if(safeFormData.value.passwordConfirm) {
-			safeFormData.value.passwordConfirm = '*****';
-		}
-		return safeFormData;
-	};
+    //	:TODO: replace this in favor of overriding toJSON() for various things such that logging will *never* output them
+    this.getLogFriendlyFormData = function(formData) {
+        //	:TODO: these fields should be part of menu.json sensitiveMembers[]
+        var safeFormData = _.cloneDeep(formData);
+        if(safeFormData.value.password) {
+            safeFormData.value.password = '*****';
+        }
+        if(safeFormData.value.passwordConfirm) {
+            safeFormData.value.passwordConfirm = '*****';
+        }
+        return safeFormData;
+    };
 
-	this.switchFocusEvent = function(event, view) {
-		if(self.emitSwitchFocus) {
-			return;
-		}
+    this.switchFocusEvent = function(event, view) {
+        if(self.emitSwitchFocus) {
+            return;
+        }
 
-		self.emitSwitchFocus = true;
-		self.emit(event, view);
-		self.emitSwitchFocus = false;
-	};
+        self.emitSwitchFocus = true;
+        self.emit(event, view);
+        self.emitSwitchFocus = false;
+    };
 
-	this.createViewsFromMCI = function(mciMap, cb) {
-		async.each(Object.keys(mciMap), (name, nextItem) => {
-			const mci	= mciMap[name];
-			const view	= self.mciViewFactory.createFromMCI(mci);
+    this.createViewsFromMCI = function(mciMap, cb) {
+        async.each(Object.keys(mciMap), (name, nextItem) => {
+            const mci	= mciMap[name];
+            const view	= self.mciViewFactory.createFromMCI(mci);
 
-			if(view) {
-				if(false === self.noInput) {
-					view.on('action', self.viewActionListener);
-				}
+            if(view) {
+                if(false === self.noInput) {
+                    view.on('action', self.viewActionListener);
+                }
 
-				self.addView(view);
-			}
+                self.addView(view);
+            }
 
-			return nextItem(null);
-		},
-		err => {
-			self.setViewOrder();
-			return cb(err);
-		});
-	};
+            return nextItem(null);
+        },
+        err => {
+            self.setViewOrder();
+            return cb(err);
+        });
+    };
 
-	//	:TODO: move this elsewhere
-	this.setViewPropertiesFromMCIConf = function(view, conf) {
+    //	:TODO: move this elsewhere
+    this.setViewPropertiesFromMCIConf = function(view, conf) {
 
-		var propAsset;
-		var propValue;
+        var propAsset;
+        var propValue;
 
-		for(var propName in conf) {
-			propAsset = asset.getViewPropertyAsset(conf[propName]);
-			if(propAsset) {
-				switch(propAsset.type) {
-					case 'config' :
-						propValue = asset.resolveConfigAsset(conf[propName]);
-						break;
+        for(var propName in conf) {
+            propAsset = asset.getViewPropertyAsset(conf[propName]);
+            if(propAsset) {
+                switch(propAsset.type) {
+                    case 'config' :
+                        propValue = asset.resolveConfigAsset(conf[propName]);
+                        break;
 
-					case 'sysStat' :
-						propValue = asset.resolveSystemStatAsset(conf[propName]);
-						break;
+                    case 'sysStat' :
+                        propValue = asset.resolveSystemStatAsset(conf[propName]);
+                        break;
 
-						//	:TODO: handle @art (e.g. text : @art ...)
+                        //	:TODO: handle @art (e.g. text : @art ...)
 
-					case 'method' :
-					case 'systemMethod' :
-						if('validate' === propName) {
-							//	:TODO: handle propAsset.location for @method script specification
-							if('systemMethod' === propAsset.type) {
-								//	:TODO: implementation validation @systemMethod handling!
-								var methodModule = require(paths.join(__dirname, 'system_view_validate.js'));
-								if(_.isFunction(methodModule[propAsset.asset])) {
-									propValue = methodModule[propAsset.asset];
-								}
-							} else {
-								if(_.isFunction(self.client.currentMenuModule.menuMethods[propAsset.asset])) {
-									propValue = self.client.currentMenuModule.menuMethods[propAsset.asset];
-								}
-							}
-						} else {
-							if(_.isString(propAsset.location)) {
-								// :TODO: clean this code up!
-							} else {
-								if('systemMethod' === propAsset.type) {
-									//	:TODO:
-								} else {
-									//	local to current module
-									var currentModule = self.client.currentMenuModule;
-									if(_.isFunction(currentModule.menuMethods[propAsset.asset])) {
-										//	:TODO: Fix formData & extraArgs... this all needs general processing
-										propValue = currentModule.menuMethods[propAsset.asset]({}, {});//formData, conf.extraArgs);
-									}
-								}
-							}
-						}
-						break;
+                    case 'method' :
+                    case 'systemMethod' :
+                        if('validate' === propName) {
+                            //	:TODO: handle propAsset.location for @method script specification
+                            if('systemMethod' === propAsset.type) {
+                                //	:TODO: implementation validation @systemMethod handling!
+                                var methodModule = require(paths.join(__dirname, 'system_view_validate.js'));
+                                if(_.isFunction(methodModule[propAsset.asset])) {
+                                    propValue = methodModule[propAsset.asset];
+                                }
+                            } else {
+                                if(_.isFunction(self.client.currentMenuModule.menuMethods[propAsset.asset])) {
+                                    propValue = self.client.currentMenuModule.menuMethods[propAsset.asset];
+                                }
+                            }
+                        } else {
+                            if(_.isString(propAsset.location)) {
+                                // :TODO: clean this code up!
+                            } else {
+                                if('systemMethod' === propAsset.type) {
+                                    //	:TODO:
+                                } else {
+                                    //	local to current module
+                                    var currentModule = self.client.currentMenuModule;
+                                    if(_.isFunction(currentModule.menuMethods[propAsset.asset])) {
+                                        //	:TODO: Fix formData & extraArgs... this all needs general processing
+                                        propValue = currentModule.menuMethods[propAsset.asset]({}, {});//formData, conf.extraArgs);
+                                    }
+                                }
+                            }
+                        }
+                        break;
 
-					default :
-						propValue = propValue = conf[propName];
-						break;
-				}
-			} else {
-				propValue = conf[propName];
-			}
+                    default :
+                        propValue = propValue = conf[propName];
+                        break;
+                }
+            } else {
+                propValue = conf[propName];
+            }
 
-			if(!_.isUndefined(propValue)) {
-				view.setPropertyValue(propName, propValue);
-			}
-		}
-	};
+            if(!_.isUndefined(propValue)) {
+                view.setPropertyValue(propName, propValue);
+            }
+        }
+    };
 
-	this.applyViewConfig = function(config, cb) {
-		let highestId = 1;
-		let submitId;
-		let initialFocusId = 1;
+    this.applyViewConfig = function(config, cb) {
+        let highestId = 1;
+        let submitId;
+        let initialFocusId = 1;
 
-		async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
-			const mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
-			if(null === mciMatch) {
-				self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
-				return;
-			}
+        async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
+            const mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
+            if(null === mciMatch) {
+                self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
+                return;
+            }
 
-			const viewId = parseInt(mciMatch[2]);
-			assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]);	//	shouldn't be possible with RegExp used
+            const viewId = parseInt(mciMatch[2]);
+            assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]);	//	shouldn't be possible with RegExp used
 
-			if(viewId > highestId) {
-				highestId = viewId;
-			}
+            if(viewId > highestId) {
+                highestId = viewId;
+            }
 
-			const view = self.getView(viewId);
+            const view = self.getView(viewId);
 
-			if(!view) {
-				self.client.log.warn( { viewId : viewId }, 'Cannot find view');
-				nextItem(null);
-				return;
-			}
+            if(!view) {
+                self.client.log.warn( { viewId : viewId }, 'Cannot find view');
+                nextItem(null);
+                return;
+            }
 
-			const mciConf = config.mci[mci];
+            const mciConf = config.mci[mci];
 
-			self.setViewPropertiesFromMCIConf(view, mciConf);
+            self.setViewPropertiesFromMCIConf(view, mciConf);
 
-			if(mciConf.focus) {
-				initialFocusId = viewId;
-			}
+            if(mciConf.focus) {
+                initialFocusId = viewId;
+            }
 
-			if(true === view.submit) {
-				submitId = viewId;
-			}
+            if(true === view.submit) {
+                submitId = viewId;
+            }
 
-			nextItem(null);
-		},
-		err => {
-			//	default to highest ID if no 'submit' entry present
-			if(!submitId) {
-				var highestIdView = self.getView(highestId);
-				if(highestIdView) {
-					highestIdView.submit = true;
-				} else {
-					self.client.log.warn( { highestId : highestId }, 'View does not exist');
-				}
-			}
+            nextItem(null);
+        },
+        err => {
+            //	default to highest ID if no 'submit' entry present
+            if(!submitId) {
+                var highestIdView = self.getView(highestId);
+                if(highestIdView) {
+                    highestIdView.submit = true;
+                } else {
+                    self.client.log.warn( { highestId : highestId }, 'View does not exist');
+                }
+            }
 
-			return cb(err, { initialFocusId : initialFocusId } );
-		});
-	};
+            return cb(err, { initialFocusId : initialFocusId } );
+        });
+    };
 
-	//	method for comparing submitted form data to configuration entries
-	this.actionBlockValueComparator = function(formValue, actionValue) {
-		//
-		//	For a match to occur, one of the following must be true:
-		//
-		//	*	actionValue is a Object:
-		//		a)	All key/values must exactly match
-		//		b)	value is null; The key (view ID or "argName") must be present
-		//			in formValue. This is a wildcard/any match.
-		//	*	actionValue is a Number: This represents a view ID that
-		//		must be present in formValue.
-		//	* 	actionValue is a string: This represents a view with
-		//		"argName" set that must be present in formValue.
-		//
-		if(_.isUndefined(actionValue)) {
-			return false;
-		}
+    //	method for comparing submitted form data to configuration entries
+    this.actionBlockValueComparator = function(formValue, actionValue) {
+        //
+        //	For a match to occur, one of the following must be true:
+        //
+        //	*	actionValue is a Object:
+        //		a)	All key/values must exactly match
+        //		b)	value is null; The key (view ID or "argName") must be present
+        //			in formValue. This is a wildcard/any match.
+        //	*	actionValue is a Number: This represents a view ID that
+        //		must be present in formValue.
+        //	* 	actionValue is a string: This represents a view with
+        //		"argName" set that must be present in formValue.
+        //
+        if(_.isUndefined(actionValue)) {
+            return false;
+        }
 
-		if(_.isNumber(actionValue) || _.isString(actionValue)) {
-			if(_.isUndefined(formValue[actionValue])) {
-				return false;
-			}
-		} else {
-			/*
+        if(_.isNumber(actionValue) || _.isString(actionValue)) {
+            if(_.isUndefined(formValue[actionValue])) {
+                return false;
+            }
+        } else {
+            /*
 				:TODO: support:
 				value: {
 					someArgName: [ "key1", "key2", ... ],
 					someOtherArg: [ "key1, ... ]
 				}
 			*/
-			var actionValueKeys = Object.keys(actionValue);
-			for(var i = 0; i < actionValueKeys.length; ++i) {
-				var viewId = actionValueKeys[i];
-				if(!_.has(formValue, viewId)) {
-					return false;
-				}
+            var actionValueKeys = Object.keys(actionValue);
+            for(var i = 0; i < actionValueKeys.length; ++i) {
+                var viewId = actionValueKeys[i];
+                if(!_.has(formValue, viewId)) {
+                    return false;
+                }
 
-				if(null !== actionValue[viewId] && actionValue[viewId] !== formValue[viewId]) {
-					return false;
-				}
-			}
-		}
+                if(null !== actionValue[viewId] && actionValue[viewId] !== formValue[viewId]) {
+                    return false;
+                }
+            }
+        }
 
-		self.client.log.trace(
-			{
-				formValue	: formValue,
-				actionValue	: actionValue
-			},
-			'Action match'
-		);
+        self.client.log.trace(
+            {
+                formValue	: formValue,
+                actionValue	: actionValue
+            },
+            'Action match'
+        );
 
-		return true;
-	};
+        return true;
+    };
 
-	if(!options.detached) {
-		this.attachClientEvents();
-	}
+    if(!options.detached) {
+        this.attachClientEvents();
+    }
 
-	this.setViewFocusWithEvents = function(view, focused) {
-		if(!view || !view.acceptsFocus) {
-			return;
-		}
+    this.setViewFocusWithEvents = function(view, focused) {
+        if(!view || !view.acceptsFocus) {
+            return;
+        }
 
-		if(focused) {
-			self.switchFocusEvent('return', view);
-			self.focusedView = view;
-		} else {
-			self.switchFocusEvent('leave', view);
-		}
+        if(focused) {
+            self.switchFocusEvent('return', view);
+            self.focusedView = view;
+        } else {
+            self.switchFocusEvent('leave', view);
+        }
 
-		view.setFocus(focused);
-	};
+        view.setFocus(focused);
+    };
 
-	this.validateView = function(view, cb) {
-		if(view && _.isFunction(view.validate)) {
-			view.validate(view.getData(), function validateResult(err) {
-				var viewValidationListener = self.client.currentMenuModule.menuMethods.viewValidationListener;
-				if(_.isFunction(viewValidationListener)) {
-					if(err) {
-						err.view = view;	//	pass along the view that failed
-					}
+    this.validateView = function(view, cb) {
+        if(view && _.isFunction(view.validate)) {
+            view.validate(view.getData(), function validateResult(err) {
+                var viewValidationListener = self.client.currentMenuModule.menuMethods.viewValidationListener;
+                if(_.isFunction(viewValidationListener)) {
+                    if(err) {
+                        err.view = view;	//	pass along the view that failed
+                    }
 
-					viewValidationListener(err, function validationComplete(newViewFocusId) {
-						cb(err, newViewFocusId);
-					});
-				} else {
-					cb(err);
-				}
-			});
-		} else {
-			cb(null);
-		}
-	};
+                    viewValidationListener(err, function validationComplete(newViewFocusId) {
+                        cb(err, newViewFocusId);
+                    });
+                } else {
+                    cb(err);
+                }
+            });
+        } else {
+            cb(null);
+        }
+    };
 }
 
 util.inherits(ViewController, events.EventEmitter);
 
 ViewController.prototype.attachClientEvents = function() {
-	if(this.attached) {
-		return;
-	}
+    if(this.attached) {
+        return;
+    }
 
-	var self = this;
+    var self = this;
 
-	this.client.on('key press', this.clientKeyPressHandler);
+    this.client.on('key press', this.clientKeyPressHandler);
 
-	Object.keys(this.views).forEach(function vid(i) {
-		//	remove, then add to ensure we only have one listener
-		self.views[i].removeListener('action', self.viewActionListener);
-		self.views[i].on('action', self.viewActionListener);
-	});
+    Object.keys(this.views).forEach(function vid(i) {
+        //	remove, then add to ensure we only have one listener
+        self.views[i].removeListener('action', self.viewActionListener);
+        self.views[i].on('action', self.viewActionListener);
+    });
 
-	this.attached = true;
+    this.attached = true;
 };
 
 ViewController.prototype.detachClientEvents = function() {
-	if(!this.attached) {
-		return;
-	}
+    if(!this.attached) {
+        return;
+    }
 
-	this.client.removeListener('key press', this.clientKeyPressHandler);
+    this.client.removeListener('key press', this.clientKeyPressHandler);
 
-	for(var id in this.views) {
-		this.views[id].removeAllListeners();
-	}
+    for(var id in this.views) {
+        this.views[id].removeAllListeners();
+    }
 
-	this.attached = false;
+    this.attached = false;
 };
 
 ViewController.prototype.viewExists = function(id) {
-	return id in this.views;
+    return id in this.views;
 };
 
 ViewController.prototype.addView = function(view) {
-	assert(!this.viewExists(view.id), 'View with ID ' + view.id + ' already exists');
+    assert(!this.viewExists(view.id), 'View with ID ' + view.id + ' already exists');
 
-	this.views[view.id] = view;
+    this.views[view.id] = view;
 };
 
 ViewController.prototype.getView = function(id) {
-	return this.views[id];
+    return this.views[id];
 };
 
 ViewController.prototype.getViewsByMciCode = function(mciCode) {
-	if(!Array.isArray(mciCode)) {
-		mciCode = [ mciCode ];
-	}
+    if(!Array.isArray(mciCode)) {
+        mciCode = [ mciCode ];
+    }
 
-	const views = [];
-	_.each(this.views, v => {
-		if(mciCode.includes(v.mciCode)) {
-			views.push(v);
-		}
-	});
-	return views;
+    const views = [];
+    _.each(this.views, v => {
+        if(mciCode.includes(v.mciCode)) {
+            views.push(v);
+        }
+    });
+    return views;
 };
 
 ViewController.prototype.getFocusedView = function() {
-	return this.focusedView;
+    return this.focusedView;
 };
 
 ViewController.prototype.setFocus = function(focused) {
-	if(focused) {
-		this.attachClientEvents();
-	} else {
-		this.detachClientEvents();
-	}
+    if(focused) {
+        this.attachClientEvents();
+    } else {
+        this.detachClientEvents();
+    }
 
-	this.setViewFocusWithEvents(this.focusedView, focused);
+    this.setViewFocusWithEvents(this.focusedView, focused);
 };
 
 ViewController.prototype.resetInitialFocus = function() {
-	if(this.formInitialFocusId) {
-		return this.switchFocus(this.formInitialFocusId);
-	}
+    if(this.formInitialFocusId) {
+        return this.switchFocus(this.formInitialFocusId);
+    }
 };
 
 ViewController.prototype.switchFocus = function(id) {
-	//
-	//	Perform focus switching validation now
-	//
-	var self 		= this;
-	var focusedView	= self.focusedView;
+    //
+    //	Perform focus switching validation now
+    //
+    var self 		= this;
+    var focusedView	= self.focusedView;
 
-	self.validateView(focusedView, function validated(err, newFocusedViewId) {
-		if(err) {
-			var newFocusedView = self.getView(newFocusedViewId) || focusedView;
-			self.setViewFocusWithEvents(newFocusedView, true);
-		} else {
-			self.attachClientEvents();
+    self.validateView(focusedView, function validated(err, newFocusedViewId) {
+        if(err) {
+            var newFocusedView = self.getView(newFocusedViewId) || focusedView;
+            self.setViewFocusWithEvents(newFocusedView, true);
+        } else {
+            self.attachClientEvents();
 
-			//	remove from old
-			self.setViewFocusWithEvents(focusedView, false);
+            //	remove from old
+            self.setViewFocusWithEvents(focusedView, false);
 
-			//	set to new
-			self.setViewFocusWithEvents(self.getView(id), true);
-		}
-	});
+            //	set to new
+            self.setViewFocusWithEvents(self.getView(id), true);
+        }
+    });
 };
 
 ViewController.prototype.nextFocus = function() {
-	let nextFocusView = this.focusedView ? this.focusedView : this.views[this.firstId];
+    let nextFocusView = this.focusedView ? this.focusedView : this.views[this.firstId];
 
-	//	find the next view that accepts focus
-	while(nextFocusView && nextFocusView.nextId) {
-		nextFocusView = this.getView(nextFocusView.nextId);
-		if(!nextFocusView || nextFocusView.acceptsFocus) {
-			break;
-		}
-	}
+    //	find the next view that accepts focus
+    while(nextFocusView && nextFocusView.nextId) {
+        nextFocusView = this.getView(nextFocusView.nextId);
+        if(!nextFocusView || nextFocusView.acceptsFocus) {
+            break;
+        }
+    }
 
-	if(nextFocusView && this.focusedView !== nextFocusView) {
-		this.switchFocus(nextFocusView.id);
-	}
+    if(nextFocusView && this.focusedView !== nextFocusView) {
+        this.switchFocus(nextFocusView.id);
+    }
 };
 
 ViewController.prototype.setViewOrder = function(order) {
-	var viewIdOrder = order || [];
+    var viewIdOrder = order || [];
 
-	if(0 === viewIdOrder.length) {
-		for(var id in this.views) {
-			if(this.views[id].acceptsFocus) {
-				viewIdOrder.push(id);
-			}
-		}
+    if(0 === viewIdOrder.length) {
+        for(var id in this.views) {
+            if(this.views[id].acceptsFocus) {
+                viewIdOrder.push(id);
+            }
+        }
 
-		viewIdOrder.sort(function intSort(a, b) {
-			return a - b;
-		});
-	}
+        viewIdOrder.sort(function intSort(a, b) {
+            return a - b;
+        });
+    }
 
-	if(viewIdOrder.length > 0) {
-		var count = viewIdOrder.length - 1;
-		for(var i = 0; i < count; ++i) {
-			this.views[viewIdOrder[i]].nextId = viewIdOrder[i + 1];
-		}
+    if(viewIdOrder.length > 0) {
+        var count = viewIdOrder.length - 1;
+        for(var i = 0; i < count; ++i) {
+            this.views[viewIdOrder[i]].nextId = viewIdOrder[i + 1];
+        }
 
-		this.firstId = viewIdOrder[0];
-		var lastId = viewIdOrder.length > 1 ? viewIdOrder[viewIdOrder.length - 1] : this.firstId;
-		this.views[lastId].nextId = this.firstId;
-	}
+        this.firstId = viewIdOrder[0];
+        var lastId = viewIdOrder.length > 1 ? viewIdOrder[viewIdOrder.length - 1] : this.firstId;
+        this.views[lastId].nextId = this.firstId;
+    }
 };
 
 ViewController.prototype.redrawAll = function(initialFocusId) {
-	this.client.term.rawWrite(ansi.hideCursor());
+    this.client.term.rawWrite(ansi.hideCursor());
 
-	for(var id in this.views) {
-		if(initialFocusId === id) {
-			continue;	//	will draw @ focus
-		}
-		this.views[id].redraw();
-	}
+    for(var id in this.views) {
+        if(initialFocusId === id) {
+            continue;	//	will draw @ focus
+        }
+        this.views[id].redraw();
+    }
 
-	this.client.term.rawWrite(ansi.showCursor());
+    this.client.term.rawWrite(ansi.showCursor());
 };
 
 ViewController.prototype.loadFromPromptConfig = function(options, cb) {
-	assert(_.isObject(options));
-	assert(_.isObject(options.mciMap));
+    assert(_.isObject(options));
+    assert(_.isObject(options.mciMap));
 
-	var self			= this;
-	var promptConfig	= _.isObject(options.config) ? options.config : self.client.currentMenuModule.menuConfig.promptConfig;
-	var initialFocusId	= 1;	//	default to first
+    var self			= this;
+    var promptConfig	= _.isObject(options.config) ? options.config : self.client.currentMenuModule.menuConfig.promptConfig;
+    var initialFocusId	= 1;	//	default to first
 
-	async.waterfall(
-		[
-			function createViewsFromMCI(callback) {
-				self.createViewsFromMCI(options.mciMap, function viewsCreated(err) {
-					callback(err);
-				});
-			},
-			function applyViewConfiguration(callback) {
-				if(_.isObject(promptConfig.mci)) {
-					self.applyViewConfig(promptConfig, function configApplied(err, info) {
-						initialFocusId = info.initialFocusId;
-						callback(err);
-					});
-				} else {
-					callback(null);
-				}
-			},
-			function prepareFormSubmission(callback) {
-				if(false === self.noInput) {
+    async.waterfall(
+        [
+            function createViewsFromMCI(callback) {
+                self.createViewsFromMCI(options.mciMap, function viewsCreated(err) {
+                    callback(err);
+                });
+            },
+            function applyViewConfiguration(callback) {
+                if(_.isObject(promptConfig.mci)) {
+                    self.applyViewConfig(promptConfig, function configApplied(err, info) {
+                        initialFocusId = info.initialFocusId;
+                        callback(err);
+                    });
+                } else {
+                    callback(null);
+                }
+            },
+            function prepareFormSubmission(callback) {
+                if(false === self.noInput) {
 
-					self.on('submit', function promptSubmit(formData) {
-						self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Prompt submit');
+                    self.on('submit', function promptSubmit(formData) {
+                        self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Prompt submit');
 
-						if(_.isString(self.client.currentMenuModule.menuConfig.action)) {
-							self.handleActionWrapper(formData, self.client.currentMenuModule.menuConfig);
-						} else {
-							//
-							//	Menus that reference prompts can have a sepcial "submit" block without the
-							//	hassle of by-form-id configurations, etc.
-							//
-							//	"submit" : [
-							//		{ ... }
-							//	]
-							//
-							var menuSubmit = self.client.currentMenuModule.menuConfig.submit;
-							if(!_.isArray(menuSubmit)) {
-								self.client.log.debug('No configuration to handle submit');
-								return;
-							}
+                        if(_.isString(self.client.currentMenuModule.menuConfig.action)) {
+                            self.handleActionWrapper(formData, self.client.currentMenuModule.menuConfig);
+                        } else {
+                            //
+                            //	Menus that reference prompts can have a sepcial "submit" block without the
+                            //	hassle of by-form-id configurations, etc.
+                            //
+                            //	"submit" : [
+                            //		{ ... }
+                            //	]
+                            //
+                            var menuSubmit = self.client.currentMenuModule.menuConfig.submit;
+                            if(!_.isArray(menuSubmit)) {
+                                self.client.log.debug('No configuration to handle submit');
+                                return;
+                            }
 
-							//
-							//	Locate matching action block
-							//
-							//	:TODO: this is basically the same as for menus -- DRY it up!
-							for(var c = 0; c < menuSubmit.length; ++c) {
-								var actionBlock = menuSubmit[c];
+                            //
+                            //	Locate matching action block
+                            //
+                            //	:TODO: this is basically the same as for menus -- DRY it up!
+                            for(var c = 0; c < menuSubmit.length; ++c) {
+                                var actionBlock = menuSubmit[c];
 
-								if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
-									self.handleActionWrapper(formData, actionBlock);
-									break;	//	there an only be one...
-								}
-							}
-						}
-					});
-				}
+                                if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
+                                    self.handleActionWrapper(formData, actionBlock);
+                                    break;	//	there an only be one...
+                                }
+                            }
+                        }
+                    });
+                }
 
-				callback(null);
-			},
-			function loadActionKeys(callback) {
-				if(!_.isObject(promptConfig) || !_.isArray(promptConfig.actionKeys)) {
-					return callback(null);
-				}
+                callback(null);
+            },
+            function loadActionKeys(callback) {
+                if(!_.isObject(promptConfig) || !_.isArray(promptConfig.actionKeys)) {
+                    return callback(null);
+                }
 
-				promptConfig.actionKeys.forEach(ak => {
-					//
-					//	*	'keys' must be present and be an array of key names
-					//	*	If 'viewId' is present, key(s) will focus & submit on behalf
-					//		of the specified view.
-					//	*	If 'action' is present, that action will be procesed when
-					//		triggered by key(s)
-					//
-					//	Ultimately, create a map of key -> { action block }
-					//
-					if(!_.isArray(ak.keys)) {
-						return;
-					}
+                promptConfig.actionKeys.forEach(ak => {
+                    //
+                    //	*	'keys' must be present and be an array of key names
+                    //	*	If 'viewId' is present, key(s) will focus & submit on behalf
+                    //		of the specified view.
+                    //	*	If 'action' is present, that action will be procesed when
+                    //		triggered by key(s)
+                    //
+                    //	Ultimately, create a map of key -> { action block }
+                    //
+                    if(!_.isArray(ak.keys)) {
+                        return;
+                    }
 
-					ak.keys.forEach(kn => {
-						self.actionKeyMap[kn] = ak;
-					});
+                    ak.keys.forEach(kn => {
+                        self.actionKeyMap[kn] = ak;
+                    });
 
-				});
+                });
 
-				return callback(null);
-			},
-			function drawAllViews(callback) {
-				self.redrawAll(initialFocusId);
-				callback(null);
-			},
-			function setInitialViewFocus(callback) {
-				if(initialFocusId) {
-					self.switchFocus(initialFocusId);
-				}
-				callback(null);
-			}
-		],
-		function complete(err) {
-			cb(err);
-		}
-	);
+                return callback(null);
+            },
+            function drawAllViews(callback) {
+                self.redrawAll(initialFocusId);
+                callback(null);
+            },
+            function setInitialViewFocus(callback) {
+                if(initialFocusId) {
+                    self.switchFocus(initialFocusId);
+                }
+                callback(null);
+            }
+        ],
+        function complete(err) {
+            cb(err);
+        }
+    );
 };
 
 ViewController.prototype.loadFromMenuConfig = function(options, cb) {
-	assert(_.isObject(options));
+    assert(_.isObject(options));
 
-	if(!_.isObject(options.mciMap)) {
-		cb(new Error('Missing option: mciMap'));
-		return;
-	}
+    if(!_.isObject(options.mciMap)) {
+        cb(new Error('Missing option: mciMap'));
+        return;
+    }
 
-	var self			= this;
-	var formIdKey		= options.formId ? options.formId.toString() : '0';
-	this.formInitialFocusId	 = 1;	//	default to first
-	var formConfig;
+    var self			= this;
+    var formIdKey		= options.formId ? options.formId.toString() : '0';
+    this.formInitialFocusId	 = 1;	//	default to first
+    var formConfig;
 
-	//	:TODO: honor options.withoutForm
+    //	:TODO: honor options.withoutForm
 
-	async.waterfall(
-		[
-			function findMatchingFormConfig(callback) {
-				menuUtil.getFormConfigByIDAndMap(self.client.currentMenuModule.menuConfig, formIdKey, options.mciMap, function matchingConfig(err, fc) {
-					formConfig = fc;
+    async.waterfall(
+        [
+            function findMatchingFormConfig(callback) {
+                menuUtil.getFormConfigByIDAndMap(self.client.currentMenuModule.menuConfig, formIdKey, options.mciMap, function matchingConfig(err, fc) {
+                    formConfig = fc;
 
-					if(err) {
-						//	non-fatal
-						self.client.log.trace(
-							{ reason : err.message, mci : Object.keys(options.mciMap), formId : formIdKey },
-							'Unable to find matching form configuration');
-					}
+                    if(err) {
+                        //	non-fatal
+                        self.client.log.trace(
+                            { reason : err.message, mci : Object.keys(options.mciMap), formId : formIdKey },
+                            'Unable to find matching form configuration');
+                    }
 
-					callback(null);
-				});
-			},
-			function createViews(callback) {
-				self.createViewsFromMCI(options.mciMap, function viewsCreated(err) {
-					callback(err);
-				});
-			},
-			/*
+                    callback(null);
+                });
+            },
+            function createViews(callback) {
+                self.createViewsFromMCI(options.mciMap, function viewsCreated(err) {
+                    callback(err);
+                });
+            },
+            /*
 			function applyThemeCustomization(callback) {
 				formConfig = formConfig || {};
 				formConfig.mci = formConfig.mci || {};
@@ -709,119 +709,119 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 				callback(null);
 			},
             */
-			function applyViewConfiguration(callback) {
-				if(_.isObject(formConfig)) {
-					self.applyViewConfig(formConfig, function configApplied(err, info) {
-						self.formInitialFocusId = info.initialFocusId;
-						callback(err);
-					});
-				} else {
-					callback(null);
-				}
-			},
-			function prepareFormSubmission(callback) {
-				if(!_.isObject(formConfig) || !_.isObject(formConfig.submit)) {
-					callback(null);
-					return;
-				}
+            function applyViewConfiguration(callback) {
+                if(_.isObject(formConfig)) {
+                    self.applyViewConfig(formConfig, function configApplied(err, info) {
+                        self.formInitialFocusId = info.initialFocusId;
+                        callback(err);
+                    });
+                } else {
+                    callback(null);
+                }
+            },
+            function prepareFormSubmission(callback) {
+                if(!_.isObject(formConfig) || !_.isObject(formConfig.submit)) {
+                    callback(null);
+                    return;
+                }
 
-				self.on('submit', function formSubmit(formData) {
+                self.on('submit', function formSubmit(formData) {
 
-					self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Form submit');
+                    self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Form submit');
 
-					//
-					//	Locate configuration for this form ID
-					//
-					var confForFormId;
-					if(_.isObject(formConfig.submit[formData.submitId])) {
-						confForFormId = formConfig.submit[formData.submitId];
-					} else if(_.isObject(formConfig.submit['*'])) {
-						confForFormId = formConfig.submit['*'];
-					} else {
-						//	no configuration for this submitId
-						self.client.log.debug( { formId : formData.submitId }, 'No configuration for form ID');
-						return;
-					}
+                    //
+                    //	Locate configuration for this form ID
+                    //
+                    var confForFormId;
+                    if(_.isObject(formConfig.submit[formData.submitId])) {
+                        confForFormId = formConfig.submit[formData.submitId];
+                    } else if(_.isObject(formConfig.submit['*'])) {
+                        confForFormId = formConfig.submit['*'];
+                    } else {
+                        //	no configuration for this submitId
+                        self.client.log.debug( { formId : formData.submitId }, 'No configuration for form ID');
+                        return;
+                    }
 
-					//
-					//	Locate a matching action block based on the submitted data
-					//
-					for(var c = 0; c < confForFormId.length; ++c) {
-						var actionBlock = confForFormId[c];
+                    //
+                    //	Locate a matching action block based on the submitted data
+                    //
+                    for(var c = 0; c < confForFormId.length; ++c) {
+                        var actionBlock = confForFormId[c];
 
-						if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
-							self.handleActionWrapper(formData, actionBlock);
-							break;	//	there an only be one...
-						}
-					}
-				});
+                        if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
+                            self.handleActionWrapper(formData, actionBlock);
+                            break;	//	there an only be one...
+                        }
+                    }
+                });
 
-				callback(null);
-			},
-			function loadActionKeys(callback) {
-				if(!_.isObject(formConfig) || !_.isArray(formConfig.actionKeys)) {
-					callback(null);
-					return;
-				}
+                callback(null);
+            },
+            function loadActionKeys(callback) {
+                if(!_.isObject(formConfig) || !_.isArray(formConfig.actionKeys)) {
+                    callback(null);
+                    return;
+                }
 
-				formConfig.actionKeys.forEach(function akEntry(ak) {
-					//
-					//	*	'keys' must be present and be an array of key names
-					//	*	If 'viewId' is present, key(s) will focus & submit on behalf
-					//		of the specified view.
-					//	*	If 'action' is present, that action will be procesed when
-					//		triggered by key(s)
-					//
-					//	Ultimately, create a map of key -> { action block }
-					//
-					if(!_.isArray(ak.keys)) {
-						return;
-					}
+                formConfig.actionKeys.forEach(function akEntry(ak) {
+                    //
+                    //	*	'keys' must be present and be an array of key names
+                    //	*	If 'viewId' is present, key(s) will focus & submit on behalf
+                    //		of the specified view.
+                    //	*	If 'action' is present, that action will be procesed when
+                    //		triggered by key(s)
+                    //
+                    //	Ultimately, create a map of key -> { action block }
+                    //
+                    if(!_.isArray(ak.keys)) {
+                        return;
+                    }
 
-					ak.keys.forEach(function actionKeyName(kn) {
-						self.actionKeyMap[kn] = ak;
-					});
+                    ak.keys.forEach(function actionKeyName(kn) {
+                        self.actionKeyMap[kn] = ak;
+                    });
 
-				});
+                });
 
-				callback(null);
-			},
-			function drawAllViews(callback) {
-				self.redrawAll(self.formInitialFocusId);
-				callback(null);
-			},
-			function setInitialViewFocus(callback) {
-				if(self.formInitialFocusId) {
-					self.switchFocus(self.formInitialFocusId);
-				}
-				callback(null);
-			}
-		],
-		function complete(err) {
-			if(_.isFunction(cb)) {
-				cb(err);
-			}
-		}
-	);
+                callback(null);
+            },
+            function drawAllViews(callback) {
+                self.redrawAll(self.formInitialFocusId);
+                callback(null);
+            },
+            function setInitialViewFocus(callback) {
+                if(self.formInitialFocusId) {
+                    self.switchFocus(self.formInitialFocusId);
+                }
+                callback(null);
+            }
+        ],
+        function complete(err) {
+            if(_.isFunction(cb)) {
+                cb(err);
+            }
+        }
+    );
 };
 
 ViewController.prototype.formatMCIString = function(format) {
-	var self = this;
-	var view;
+    var self = this;
+    var view;
 
-	return format.replace(/{(\d+)}/g, function replacer(match, number) {
-		view = self.getView(number);
+    return format.replace(/{(\d+)}/g, function replacer(match, number) {
+        view = self.getView(number);
 
-		if(!view) {
-			return match;
-		}
+        if(!view) {
+            return match;
+        }
 
-		return view.getData();
-	});
+        return view.getData();
+    });
 };
 
 ViewController.prototype.getFormData = function(key) {
-	/*
+    /*
 		Example form data:
 		{
 			id : 0,
@@ -835,34 +835,34 @@ ViewController.prototype.getFormData = function(key) {
 
 		}
 	*/
-	const formData = {
-		id			: this.formId,
-		submitId	: this.focusedView.id,
-		value		: {},
-	};
+    const formData = {
+        id			: this.formId,
+        submitId	: this.focusedView.id,
+        value		: {},
+    };
 
-	if(key) {
-		formData.key = key;
-	}
+    if(key) {
+        formData.key = key;
+    }
 
-	let viewData;
-	_.each(this.views, view => {
-		try {
-			//	don't fill forms with static, non user-editable data data
-			if(!view.acceptsInput) {
-				return;
-			}
+    let viewData;
+    _.each(this.views, view => {
+        try {
+            //	don't fill forms with static, non user-editable data data
+            if(!view.acceptsInput) {
+                return;
+            }
 
-			viewData = view.getData();
-			if(_.isUndefined(viewData)) {
-				return;
-			}
+            viewData = view.getData();
+            if(_.isUndefined(viewData)) {
+                return;
+            }
 
-			formData.value[ view.submitArgName ? view.submitArgName : view.id ] = viewData;
-		} catch(e) {
-			this.client.log.error( { error : e.message }, 'Exception caught gathering form data' );
-		}
-	});
+            formData.value[ view.submitArgName ? view.submitArgName : view.id ] = viewData;
+        } catch(e) {
+            this.client.log.error( { error : e.message }, 'Exception caught gathering form data' );
+        }
+    });
 
-	return formData;
+    return formData;
 };
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 2f98823c..7f30425f 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -27,293 +27,293 @@ a password reset has been requested for your account on %BOARDNAME%.
 `;
 
 function getWebServer() {
-	return getServer(webServerPackageName);
+    return getServer(webServerPackageName);
 }
 
 class WebPasswordReset {
 
-	static startup(cb) {
-		WebPasswordReset.registerRoutes( err => {
-			return cb(err);
-		});
-	}
+    static startup(cb) {
+        WebPasswordReset.registerRoutes( err => {
+            return cb(err);
+        });
+    }
 
-	static sendForgotPasswordEmail(username, cb) {
-		const webServer = getServer(webServerPackageName);
-		if(!webServer || !webServer.instance.isEnabled()) {
-			return cb(Errors.General('Web server is not enabled'));
-		}
+    static sendForgotPasswordEmail(username, cb) {
+        const webServer = getServer(webServerPackageName);
+        if(!webServer || !webServer.instance.isEnabled()) {
+            return cb(Errors.General('Web server is not enabled'));
+        }
 
-		async.waterfall(
-			[
-				function getEmailAddress(callback) {
-					if(!username) {
-						return callback(Errors.MissingParam('Missing "username"'));
-					}
+        async.waterfall(
+            [
+                function getEmailAddress(callback) {
+                    if(!username) {
+                        return callback(Errors.MissingParam('Missing "username"'));
+                    }
 
-					User.getUserIdAndName(username, (err, userId) => {
-						if(err) {
-							return callback(err);
-						}
+                    User.getUserIdAndName(username, (err, userId) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						User.getUser(userId, (err, user) => {
-							if(err || !user.properties.email_address) {
-								return callback(Errors.DoesNotExist('No email address associated with this user'));
-							}
+                        User.getUser(userId, (err, user) => {
+                            if(err || !user.properties.email_address) {
+                                return callback(Errors.DoesNotExist('No email address associated with this user'));
+                            }
 
-							return callback(null, user);
-						});
-					});
-				},
-				function generateAndStoreResetToken(user, callback) {
-					//
-					//	Reset "token" is simply HEX encoded cryptographically generated bytes
-					//
-					crypto.randomBytes(256, (err, token) => {
-						if(err) {
-							return callback(err);
-						}
+                            return callback(null, user);
+                        });
+                    });
+                },
+                function generateAndStoreResetToken(user, callback) {
+                    //
+                    //	Reset "token" is simply HEX encoded cryptographically generated bytes
+                    //
+                    crypto.randomBytes(256, (err, token) => {
+                        if(err) {
+                            return callback(err);
+                        }
 
-						token = token.toString('hex');
+                        token = token.toString('hex');
 
-						const newProperties = {
-							email_password_reset_token		: token,
-							email_password_reset_token_ts	: getISOTimestampString(),
-						};
+                        const newProperties = {
+                            email_password_reset_token		: token,
+                            email_password_reset_token_ts	: getISOTimestampString(),
+                        };
 
-						//	we simply place the reset token in the user's properties
-						user.persistProperties(newProperties, err => {
-							return callback(err, user);
-						});
-					});
+                        //	we simply place the reset token in the user's properties
+                        user.persistProperties(newProperties, err => {
+                            return callback(err, user);
+                        });
+                    });
 
-				},
-				function getEmailTemplates(user, callback) {
-					const config = Config();
-					fs.readFile(config.contentServers.web.resetPassword.resetPassEmailText, 'utf8', (err, textTemplate) => {
-						if(err) {
-							textTemplate = PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT;
-						}
+                },
+                function getEmailTemplates(user, callback) {
+                    const config = Config();
+                    fs.readFile(config.contentServers.web.resetPassword.resetPassEmailText, 'utf8', (err, textTemplate) => {
+                        if(err) {
+                            textTemplate = PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT;
+                        }
 
-						fs.readFile(config.contentServers.web.resetPassword.resetPassEmailHtml, 'utf8', (err, htmlTemplate) => {
-							return callback(null, user, textTemplate, htmlTemplate);
-						});
-					});
-				},
-				function buildAndSendEmail(user, textTemplate, htmlTemplate, callback) {
-					const sendMail = require('./email.js').sendMail;
+                        fs.readFile(config.contentServers.web.resetPassword.resetPassEmailHtml, 'utf8', (err, htmlTemplate) => {
+                            return callback(null, user, textTemplate, htmlTemplate);
+                        });
+                    });
+                },
+                function buildAndSendEmail(user, textTemplate, htmlTemplate, callback) {
+                    const sendMail = require('./email.js').sendMail;
 
-					const resetUrl = webServer.instance.buildUrl(`/reset_password?token=${user.properties.email_password_reset_token}`);
+                    const resetUrl = webServer.instance.buildUrl(`/reset_password?token=${user.properties.email_password_reset_token}`);
 
-					function replaceTokens(s) {
-						return s
-							.replace(/%BOARDNAME%/g,	Config().general.boardName)
-							.replace(/%USERNAME%/g, 	user.username)
-							.replace(/%TOKEN%/g,		user.properties.email_password_reset_token)
-							.replace(/%RESET_URL%/g,	resetUrl)
-						;
-					}
+                    function replaceTokens(s) {
+                        return s
+                            .replace(/%BOARDNAME%/g,	Config().general.boardName)
+                            .replace(/%USERNAME%/g, 	user.username)
+                            .replace(/%TOKEN%/g,		user.properties.email_password_reset_token)
+                            .replace(/%RESET_URL%/g,	resetUrl)
+                        ;
+                    }
 
-					textTemplate = replaceTokens(textTemplate);
-					if(htmlTemplate) {
-						htmlTemplate = replaceTokens(htmlTemplate);
-					}
+                    textTemplate = replaceTokens(textTemplate);
+                    if(htmlTemplate) {
+                        htmlTemplate = replaceTokens(htmlTemplate);
+                    }
 
-					const message = {
-						to		: `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
-						//	from will be filled in
-						subject	: 'Forgot Password',
-						text	: textTemplate,
-						html	: htmlTemplate,
-					};
+                    const message = {
+                        to		: `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
+                        //	from will be filled in
+                        subject	: 'Forgot Password',
+                        text	: textTemplate,
+                        html	: htmlTemplate,
+                    };
 
-					sendMail(message, (err, info) => {
-						if(err) {
-							Log.warn( { error : err.message }, 'Failed sending password reset email' );
-						} else {
-							Log.debug( { info : info }, 'Successfully sent password reset email');
-						}
+                    sendMail(message, (err, info) => {
+                        if(err) {
+                            Log.warn( { error : err.message }, 'Failed sending password reset email' );
+                        } else {
+                            Log.debug( { info : info }, 'Successfully sent password reset email');
+                        }
 
-						return callback(err);
-					});
-				}
-			],
-			err => {
-				return cb(err);
-			}
-		);
-	}
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
 
-	static scheduleEvents(cb) {
-		//	:TODO: schedule ~daily cleanup task
-		return cb(null);
-	}
+    static scheduleEvents(cb) {
+        //	:TODO: schedule ~daily cleanup task
+        return cb(null);
+    }
 
-	static registerRoutes(cb) {
-		const webServer = getWebServer();
-		if(!webServer) {
-			return cb(null);	//	no webserver enabled
-		}
+    static registerRoutes(cb) {
+        const webServer = getWebServer();
+        if(!webServer) {
+            return cb(null);	//	no webserver enabled
+        }
 
-		if(!webServer.instance.isEnabled()) {
-			return cb(null);	//	no error, but we're not serving web stuff
-		}
+        if(!webServer.instance.isEnabled()) {
+            return cb(null);	//	no error, but we're not serving web stuff
+        }
 
-		[
-			{
-				//	this is the page displayed to user when they GET it
-				method		: 'GET',
-				path		: '^\\/reset_password\\?token\\=[a-f0-9]+$',	//	Config.contentServers.web.forgotPasswordPageTemplate
-				handler		: WebPasswordReset.routeResetPasswordGet,
-			},
-			//	POST handler for performing the actual reset
-			{
-				method		: 'POST',
-				path		: '^\\/reset_password$',
-				handler		: WebPasswordReset.routeResetPasswordPost,
-			}
-		].forEach(r => {
-			webServer.instance.addRoute(r);
-		});
+        [
+            {
+                //	this is the page displayed to user when they GET it
+                method		: 'GET',
+                path		: '^\\/reset_password\\?token\\=[a-f0-9]+$',	//	Config.contentServers.web.forgotPasswordPageTemplate
+                handler		: WebPasswordReset.routeResetPasswordGet,
+            },
+            //	POST handler for performing the actual reset
+            {
+                method		: 'POST',
+                path		: '^\\/reset_password$',
+                handler		: WebPasswordReset.routeResetPasswordPost,
+            }
+        ].forEach(r => {
+            webServer.instance.addRoute(r);
+        });
 
-		return cb(null);
-	}
+        return cb(null);
+    }
 
 
-	static fileNotFound(webServer, resp) {
-		return webServer.instance.fileNotFound(resp);
-	}
+    static fileNotFound(webServer, resp) {
+        return webServer.instance.fileNotFound(resp);
+    }
 
-	static accessDenied(webServer, resp) {
-		return webServer.instance.accessDenied(resp);
-	}
+    static accessDenied(webServer, resp) {
+        return webServer.instance.accessDenied(resp);
+    }
 
-	static getUserByToken(token, cb) {
-		async.waterfall(
-			[
-				function validateToken(callback) {
-					User.getUserIdsWithProperty('email_password_reset_token', token, (err, userIds) => {
-						if(userIds && userIds.length === 1) {
-							return callback(null, userIds[0]);
-						}
+    static getUserByToken(token, cb) {
+        async.waterfall(
+            [
+                function validateToken(callback) {
+                    User.getUserIdsWithProperty('email_password_reset_token', token, (err, userIds) => {
+                        if(userIds && userIds.length === 1) {
+                            return callback(null, userIds[0]);
+                        }
 
-						return callback(Errors.Invalid('Invalid password reset token'));
-					});
-				},
-				function getUser(userId, callback) {
-					User.getUser(userId, (err, user) => {
-						return callback(null, user);
-					});
-				},
-			],
-			(err, user) => {
-				return cb(err, user);
-			}
-		);
-	}
+                        return callback(Errors.Invalid('Invalid password reset token'));
+                    });
+                },
+                function getUser(userId, callback) {
+                    User.getUser(userId, (err, user) => {
+                        return callback(null, user);
+                    });
+                },
+            ],
+            (err, user) => {
+                return cb(err, user);
+            }
+        );
+    }
 
-	static routeResetPasswordGet(req, resp) {
-		const webServer = getWebServer();	//	must be valid, we just got a req!
+    static routeResetPasswordGet(req, resp) {
+        const webServer = getWebServer();	//	must be valid, we just got a req!
 
-		const urlParts	= url.parse(req.url, true);
-		const token		= urlParts.query && urlParts.query.token;
+        const urlParts	= url.parse(req.url, true);
+        const token		= urlParts.query && urlParts.query.token;
 
-		if(!token) {
-			return WebPasswordReset.accessDenied(webServer, resp);
-		}
+        if(!token) {
+            return WebPasswordReset.accessDenied(webServer, resp);
+        }
 
-		WebPasswordReset.getUserByToken(token, (err, user) => {
-			if(err) {
-				//	assume it's expired
-				return webServer.instance.respondWithError(resp, 410, 'Invalid or expired reset link.', 'Expired Link');
-			}
+        WebPasswordReset.getUserByToken(token, (err, user) => {
+            if(err) {
+                //	assume it's expired
+                return webServer.instance.respondWithError(resp, 410, 'Invalid or expired reset link.', 'Expired Link');
+            }
 
-			const postResetUrl = webServer.instance.buildUrl('/reset_password');
+            const postResetUrl = webServer.instance.buildUrl('/reset_password');
 
-			const config = Config();
-			return webServer.instance.routeTemplateFilePage(
-				config.contentServers.web.resetPassword.resetPageTemplate,
-				(templateData, preprocessFinished) => {
+            const config = Config();
+            return webServer.instance.routeTemplateFilePage(
+                config.contentServers.web.resetPassword.resetPageTemplate,
+                (templateData, preprocessFinished) => {
 
-					const finalPage = templateData
-						.replace(/%BOARDNAME%/g,	config.general.boardName)
-						.replace(/%USERNAME%/g,		user.username)
-						.replace(/%TOKEN%/g,		token)
-						.replace(/%RESET_URL%/g,	postResetUrl)
+                    const finalPage = templateData
+                        .replace(/%BOARDNAME%/g,	config.general.boardName)
+                        .replace(/%USERNAME%/g,		user.username)
+                        .replace(/%TOKEN%/g,		token)
+                        .replace(/%RESET_URL%/g,	postResetUrl)
 						;
 
-					return preprocessFinished(null, finalPage);
-				},
-				resp
-			);
-		});
-	}
+                    return preprocessFinished(null, finalPage);
+                },
+                resp
+            );
+        });
+    }
 
-	static routeResetPasswordPost(req, resp) {
-		const webServer = getWebServer();	//	must be valid, we just got a req!
+    static routeResetPasswordPost(req, resp) {
+        const webServer = getWebServer();	//	must be valid, we just got a req!
 
-		let bodyData = '';
-		req.on('data', data => {
-			bodyData += data;
-		});
+        let bodyData = '';
+        req.on('data', data => {
+            bodyData += data;
+        });
 
-		function badRequest() {
-			return webServer.instance.respondWithError(resp, 400, 'Bad Request.', 'Bad Request');
-		}
+        function badRequest() {
+            return webServer.instance.respondWithError(resp, 400, 'Bad Request.', 'Bad Request');
+        }
 
-		req.on('end', () => {
-			const formData = querystring.parse(bodyData);
+        req.on('end', () => {
+            const formData = querystring.parse(bodyData);
 
-			const config = Config();
-			if(!formData.token || !formData.password || !formData.confirm_password ||
+            const config = Config();
+            if(!formData.token || !formData.password || !formData.confirm_password ||
 				formData.password !== formData.confirm_password ||
 				formData.password.length < config.users.passwordMin || formData.password.length > config.users.passwordMax)
-			{
-				return badRequest();
-			}
+            {
+                return badRequest();
+            }
 
-			WebPasswordReset.getUserByToken(formData.token, (err, user) => {
-				if(err) {
-					return badRequest();
-				}
+            WebPasswordReset.getUserByToken(formData.token, (err, user) => {
+                if(err) {
+                    return badRequest();
+                }
 
-				user.setNewAuthCredentials(formData.password, err => {
-					if(err) {
-						return badRequest();
-					}
+                user.setNewAuthCredentials(formData.password, err => {
+                    if(err) {
+                        return badRequest();
+                    }
 
-					//	delete assoc properties - no need to wait for completion
-					user.removeProperty('email_password_reset_token');
-					user.removeProperty('email_password_reset_token_ts');
+                    //	delete assoc properties - no need to wait for completion
+                    user.removeProperty('email_password_reset_token');
+                    user.removeProperty('email_password_reset_token_ts');
 
-					resp.writeHead(200);
-					return resp.end('Password changed successfully');
-				});
-			});
-		});
-	}
+                    resp.writeHead(200);
+                    return resp.end('Password changed successfully');
+                });
+            });
+        });
+    }
 }
 
 function performMaintenanceTask(args, cb) {
 
-	const forgotPassExpireTime = args[0] || '24 hours';
+    const forgotPassExpireTime = args[0] || '24 hours';
 
-	//	remove all reset token associated properties older than |forgotPassExpireTime|
-	userDb.run(
-		`DELETE FROM user_property
+    //	remove all reset token associated properties older than |forgotPassExpireTime|
+    userDb.run(
+        `DELETE FROM user_property
 		WHERE user_id IN (
 			SELECT user_id
 			FROM user_property
 			WHERE prop_name = "email_password_reset_token_ts"
 			AND DATETIME("now") >= DATETIME(prop_value, "+${forgotPassExpireTime}")
 		) AND prop_name IN ("email_password_reset_token_ts", "email_password_reset_token");`,
-		err => {
-			if(err) {
-				Log.warn( { error : err.message }, 'Failed deleting old email reset tokens');
-			}
-			return cb(err);
-		}
-	);
+        err => {
+            if(err) {
+                Log.warn( { error : err.message }, 'Failed deleting old email reset tokens');
+            }
+            return cb(err);
+        }
+    );
 }
 
 exports.WebPasswordReset		= WebPasswordReset;
diff --git a/core/whos_online.js b/core/whos_online.js
index f832bc10..edda6c20 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -12,73 +12,73 @@ const async					= require('async');
 const _						= require('lodash');
 
 exports.moduleInfo = {
-	name		: 'Who\'s Online',
-	desc		: 'Who is currently online',
-	author		: 'NuSkooler',
-	packageName	: 'codes.l33t.enigma.whosonline'
+    name		: 'Who\'s Online',
+    desc		: 'Who is currently online',
+    author		: 'NuSkooler',
+    packageName	: 'codes.l33t.enigma.whosonline'
 };
 
 const MciViewIds = {
-	OnlineList		: 1,
+    OnlineList		: 1,
 };
 
 exports.getModule = class WhosOnlineModule extends MenuModule {
-	constructor(options) {
-		super(options);
-	}
+    constructor(options) {
+        super(options);
+    }
 
-	mciReady(mciData, cb) {
-		super.mciReady(mciData, err => {
-			if(err) {
-				return cb(err);
-			}
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
 
-			const self	= this;
-			const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self	= this;
+            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-			async.series(
-				[
-					function loadFromConfig(callback) {
-						const loadOpts = {
-							callingMenu		: self,
-							mciMap			: mciData.menu,
-							noInput			: true,
-						};
+            async.series(
+                [
+                    function loadFromConfig(callback) {
+                        const loadOpts = {
+                            callingMenu		: self,
+                            mciMap			: mciData.menu,
+                            noInput			: true,
+                        };
 
-						return vc.loadFromMenuConfig(loadOpts, callback);
-					},
-					function populateList(callback) {
-						const onlineListView	= vc.getView(MciViewIds.OnlineList);
-						const listFormat		= self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
-						const nonAuthUser		= self.menuConfig.config.nonAuthUser || 'Logging In';
-						const otherUnknown		= self.menuConfig.config.otherUnknown || 'N/A';
-						const onlineList 		= getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
+                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    },
+                    function populateList(callback) {
+                        const onlineListView	= vc.getView(MciViewIds.OnlineList);
+                        const listFormat		= self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
+                        const nonAuthUser		= self.menuConfig.config.nonAuthUser || 'Logging In';
+                        const otherUnknown		= self.menuConfig.config.otherUnknown || 'N/A';
+                        const onlineList 		= getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
 
-						onlineListView.setItems(_.map(onlineList, oe => {
-							if(oe.authenticated) {
-								oe.timeOn = _.upperFirst(oe.timeOn.humanize());
-							} else {
-								[ 'realName', 'location', 'affils', 'timeOn' ].forEach(m => {
-									oe[m] = otherUnknown;
-								});
-								oe.userName = nonAuthUser;
-							}
-							return stringFormat(listFormat, oe);
-						}));
+                        onlineListView.setItems(_.map(onlineList, oe => {
+                            if(oe.authenticated) {
+                                oe.timeOn = _.upperFirst(oe.timeOn.humanize());
+                            } else {
+                                [ 'realName', 'location', 'affils', 'timeOn' ].forEach(m => {
+                                    oe[m] = otherUnknown;
+                                });
+                                oe.userName = nonAuthUser;
+                            }
+                            return stringFormat(listFormat, oe);
+                        }));
 
-						onlineListView.focusItems = onlineListView.items;
-						onlineListView.redraw();
+                        onlineListView.focusItems = onlineListView.items;
+                        onlineListView.redraw();
 
-						return callback(null);
-					}
-				],
-				function complete(err) {
-					if(err) {
-						self.client.log.error( { error : err.message }, 'Error loading who\'s online');
-					}
-					return cb(err);
-				}
-			);
-		});
-	}
+                        return callback(null);
+                    }
+                ],
+                function complete(err) {
+                    if(err) {
+                        self.client.log.error( { error : err.message }, 'Error loading who\'s online');
+                    }
+                    return cb(err);
+                }
+            );
+        });
+    }
 };
diff --git a/core/word_wrap.js b/core/word_wrap.js
index ecb728a5..a42dd2ea 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -10,94 +10,94 @@ const _						= require('lodash');
 exports.wordWrapText	= wordWrapText;
 
 const SPACE_CHARS		= [
-	' ', '\f', '\n', '\r', '\v',
-	'​\u00a0', '\u1680', '​\u180e', '\u2000​', '\u2001', '\u2002', '​\u2003', '\u2004',
-	'\u2005', '\u2006​', '\u2007', '\u2008​', '\u2009', '\u200a​', '\u2028', '\u2029​',
-	'\u202f', '\u205f​', '\u3000',
+    ' ', '\f', '\n', '\r', '\v',
+    '​\u00a0', '\u1680', '​\u180e', '\u2000​', '\u2001', '\u2002', '​\u2003', '\u2004',
+    '\u2005', '\u2006​', '\u2007', '\u2008​', '\u2009', '\u200a​', '\u2028', '\u2029​',
+    '\u202f', '\u205f​', '\u3000',
 ];
 
 const REGEXP_WORD_WRAP = new RegExp(`\t|[${SPACE_CHARS.join('')}]`, 'g');
 
 function wordWrapText(text, options) {
-	assert(_.isObject(options));
-	assert(_.isNumber(options.width));
+    assert(_.isObject(options));
+    assert(_.isNumber(options.width));
 
-	options.tabHandling	= options.tabHandling || 'expand';
-	options.tabWidth	= options.tabWidth || 4;
-	options.tabChar		= options.tabChar || ' ';
+    options.tabHandling	= options.tabHandling || 'expand';
+    options.tabWidth	= options.tabWidth || 4;
+    options.tabChar		= options.tabChar || ' ';
 
-	//const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}`, 'g');
-	//
-	//	For a given word, match 0->options.width chars -- alwasy include a full trailing ESC
-	//	sequence if present!
-	//
-	//	:TODO: Need to create ansi.getMatchRegex or something - this is used all over
-	const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}\\x1b\\[[\\?=;0-9]*[ABCDEFGHJKLMSTfhlmnprsu]|.{0,${options.width}}`, 'g');
+    //const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}`, 'g');
+    //
+    //	For a given word, match 0->options.width chars -- alwasy include a full trailing ESC
+    //	sequence if present!
+    //
+    //	:TODO: Need to create ansi.getMatchRegex or something - this is used all over
+    const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}\\x1b\\[[\\?=;0-9]*[ABCDEFGHJKLMSTfhlmnprsu]|.{0,${options.width}}`, 'g');
 
-	let m;
-	let word;
-	let c;
-	let renderLen;
-	let i			= 0;
-	let wordStart	= 0;
-	let result		= { wrapped : [ '' ], renderLen : [ 0 ] };
+    let m;
+    let word;
+    let c;
+    let renderLen;
+    let i			= 0;
+    let wordStart	= 0;
+    let result		= { wrapped : [ '' ], renderLen : [ 0 ] };
 
-	function expandTab(column) {
-		const remainWidth = options.tabWidth - (column % options.tabWidth);
-		return new Array(remainWidth).join(options.tabChar);
-	}
+    function expandTab(column) {
+        const remainWidth = options.tabWidth - (column % options.tabWidth);
+        return new Array(remainWidth).join(options.tabChar);
+    }
 
-	function appendWord() {
-		word.match(REGEXP_GOBBLE).forEach( w => {
-			renderLen = renderStringLength(w);
+    function appendWord() {
+        word.match(REGEXP_GOBBLE).forEach( w => {
+            renderLen = renderStringLength(w);
 
-			if(result.renderLen[i] + renderLen > options.width) {
-				if(0 === i) {
-					result.firstWrapRange = { start : wordStart, end : wordStart + w.length };
-				}
+            if(result.renderLen[i] + renderLen > options.width) {
+                if(0 === i) {
+                    result.firstWrapRange = { start : wordStart, end : wordStart + w.length };
+                }
 
-				result.wrapped[++i]	= w;
-				result.renderLen[i]	= renderLen;
-			} else {
-				result.wrapped[i] 	+= w;
-				result.renderLen[i] = (result.renderLen[i] || 0) + renderLen;
-			}
-		});
-	}
+                result.wrapped[++i]	= w;
+                result.renderLen[i]	= renderLen;
+            } else {
+                result.wrapped[i] 	+= w;
+                result.renderLen[i] = (result.renderLen[i] || 0) + renderLen;
+            }
+        });
+    }
 
-	//
-	//	Some of the way we word wrap is modeled after Sublime Test 3:
-	//
-	//	*	Sublime Text 3 for example considers spaces after a word
-	//		part of said word. For example, "word    " would be wraped
-	//		in it's entirity.
-	//
-	//	*	Tabs in Sublime Text 3 are also treated as a word, so, e.g.
-	//		"\t" may resolve to "      " and must fit within the space.
-	//
-	//	*	If a word is ultimately too long to fit, break it up until it does.
-	//
-	while(null !== (m = REGEXP_WORD_WRAP.exec(text))) {
-		word = text.substring(wordStart, REGEXP_WORD_WRAP.lastIndex - 1);
+    //
+    //	Some of the way we word wrap is modeled after Sublime Test 3:
+    //
+    //	*	Sublime Text 3 for example considers spaces after a word
+    //		part of said word. For example, "word    " would be wraped
+    //		in it's entirity.
+    //
+    //	*	Tabs in Sublime Text 3 are also treated as a word, so, e.g.
+    //		"\t" may resolve to "      " and must fit within the space.
+    //
+    //	*	If a word is ultimately too long to fit, break it up until it does.
+    //
+    while(null !== (m = REGEXP_WORD_WRAP.exec(text))) {
+        word = text.substring(wordStart, REGEXP_WORD_WRAP.lastIndex - 1);
 
-		c = m[0].charAt(0);
-		if(SPACE_CHARS.indexOf(c) > -1) {
-			word += m[0];
-		} else if('\t' === c) {
-			if('expand' === options.tabHandling) {
-				//	Good info here: http://c-for-dummies.com/blog/?p=424
-				word += expandTab(result.wrapped[i].length + word.length) + options.tabChar;
-			} else {
-				word += m[0];
-			}
-		}
+        c = m[0].charAt(0);
+        if(SPACE_CHARS.indexOf(c) > -1) {
+            word += m[0];
+        } else if('\t' === c) {
+            if('expand' === options.tabHandling) {
+                //	Good info here: http://c-for-dummies.com/blog/?p=424
+                word += expandTab(result.wrapped[i].length + word.length) + options.tabChar;
+            } else {
+                word += m[0];
+            }
+        }
 
-		appendWord();
-		wordStart = REGEXP_WORD_WRAP.lastIndex + m[0].length - 1;
-	}
+        appendWord();
+        wordStart = REGEXP_WORD_WRAP.lastIndex + m[0].length - 1;
+    }
 
-	word = text.substring(wordStart);
-	appendWord();
+    word = text.substring(wordStart);
+    appendWord();
 
-	return result;
+    return result;
 }

From a4e10f5ba5d746ad42eada126fd0782f109e0481 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 Jun 2018 23:35:52 -0600
Subject: [PATCH 0335/1013] Add .eslintignore, tidy up a bit

---
 .eslintignore                   | 2 ++
 core/scanner_tossers/ftn_bso.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 .eslintignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..b1342397
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+# ACS parser is generated
+core/acs_parser.js
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index c5fa3f57..98fece9b 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -51,7 +51,7 @@ exports.moduleInfo = {
 
 exports.getModule = FTNMessageScanTossModule;
 
-const SCHEDULE_REGEXP	= /(?:^|or )?(@watch\:|@immediate)([^\0]+)?$/;
+const SCHEDULE_REGEXP	= /(?:^|or )?(@watch:|@immediate)([^\0]+)?$/;
 
 function FTNMessageScanTossModule() {
     MessageScanTossModule.call(this);
@@ -1569,7 +1569,7 @@ function FTNMessageScanTossModule() {
                         //
                         //	All extracted - import .pkt's
                         //
-                        self.importPacketFilesFromDirectory(self.importTempDir, '', err => {
+                        self.importPacketFilesFromDirectory(self.importTempDir, '', () => {
                             //	:TODO: handle |err|
                             callback(null, bundleFiles, rejects);
                         });

From c3635bb26b50c40f57557fe5a6eb652d2361b34e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Jun 2018 20:48:36 -0600
Subject: [PATCH 0336/1013] More tabs to spaces..

---
 core/bbs.js | 62 ++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 597a0b97..86134c38 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -5,30 +5,30 @@
 //var SegfaultHandler = require('segfault-handler');
 //SegfaultHandler.registerHandler('enigma-bbs-segfault.log');
 
-//	ENiGMA½
-const conf			= require('./config.js');
-const logger		= require('./logger.js');
-const database		= require('./database.js');
-const resolvePath	= require('./misc_util.js').resolvePath;
+//  ENiGMA½
+const conf          = require('./config.js');
+const logger        = require('./logger.js');
+const database      = require('./database.js');
+const resolvePath   = require('./misc_util.js').resolvePath;
 
-//	deps
-const async			= require('async');
-const util			= require('util');
-const _				= require('lodash');
-const mkdirs		= require('fs-extra').mkdirs;
-const fs			= require('graceful-fs');
-const paths			= require('path');
+//  deps
+const async         = require('async');
+const util          = require('util');
+const _             = require('lodash');
+const mkdirs        = require('fs-extra').mkdirs;
+const fs            = require('graceful-fs');
+const paths         = require('path');
 
-//	our main entry point
-exports.main	= main;
+//  our main entry point
+exports.main    = main;
 
-//	object with various services we want to de-init/shutdown cleanly if possible
+//  object with various services we want to de-init/shutdown cleanly if possible
 const initServices = {};
 
-//	only include bbs.js once @ startup; this should be fine
+//  only include bbs.js once @ startup; this should be fine
 const COPYRIGHT = fs.readFileSync(paths.join(__dirname, '../LICENSE.TXT'), 'utf8').split(/\r?\n/g)[0];
 
-const FULL_COPYRIGHT	= `ENiGMA½ ${COPYRIGHT}`;
+const FULL_COPYRIGHT    = `ENiGMA½ ${COPYRIGHT}`;
 const HELP =
 `${FULL_COPYRIGHT}
 usage: main.js <args>
@@ -64,15 +64,15 @@ function main() {
                 conf.init(resolvePath(configFile), function configInit(err) {
 
                     //
-                    //	If the user supplied a path and we can't read/parse it
-                    //	then it's a fatal error
+                    //  If the user supplied a path and we can't read/parse it
+                    //  then it's a fatal error
                     //
                     if(err) {
                         if('ENOENT' === err.code)  {
                             if(configPathSupplied) {
                                 console.error('Configuration file does not exist: ' + configFile);
                             } else {
-                                configPathSupplied = null;	//	make non-fatal; we'll go with defaults
+                                configPathSupplied = null;  //  make non-fatal; we'll go with defaults
                             }
                         } else {
                             console.error(err.toString());
@@ -91,7 +91,7 @@ function main() {
             }
         ],
         function complete(err) {
-            //	note this is escaped:
+            //  note this is escaped:
             fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
                 console.info(FULL_COPYRIGHT);
                 if(!err) {
@@ -129,13 +129,13 @@ function shutdownSystem() {
             },
             function stopListeningServers(callback) {
                 return require('./listening_server.js').shutdown( () => {
-                    return callback(null);	//	ignore err
+                    return callback(null);  //  ignore err
                 });
             },
             function stopEventScheduler(callback) {
                 if(initServices.eventScheduler) {
                     return initServices.eventScheduler.shutdown( () => {
-                        return callback(null);	// ignore err
+                        return callback(null);  // ignore err
                     });
                 } else {
                     return callback(null);
@@ -143,7 +143,7 @@ function shutdownSystem() {
             },
             function stopFileAreaWeb(callback) {
                 require('./file_area_web.js').startup( () => {
-                    return callback(null);	// ignore err
+                    return callback(null);  // ignore err
                 });
             },
             function stopMsgNetwork(callback) {
@@ -180,7 +180,7 @@ function initialize(cb) {
 
                 process.on('SIGINT', shutdownSystem);
 
-                require('later').date.localTime();	//	use local times for later.js/scheduling
+                require('later').date.localTime();  //  use local times for later.js/scheduling
 
                 return callback(null);
             },
@@ -197,7 +197,7 @@ function initialize(cb) {
                 return require('./config_util.js').init(callback);
             },
             function initThemes(callback) {
-                //	Have to pull in here so it's after Config init
+                //  Have to pull in here so it's after Config init
                 require('./theme.js').initAvailableThemes( (err, themeCount) => {
                     logger.log.info({ themeCount }, 'Themes initialized');
                     return callback(err);
@@ -205,10 +205,10 @@ function initialize(cb) {
             },
             function loadSysOpInformation(callback) {
                 //
-                //	Copy over some +op information from the user DB -> system propertys.
-                //	* Makes this accessible for MCI codes, easy non-blocking access, etc.
-                //	* We do this every time as the op is free to change this information just
-                //	  like any other user
+                //  Copy over some +op information from the user DB -> system propertys.
+                //  * Makes this accessible for MCI codes, easy non-blocking access, etc.
+                //  * We do this every time as the op is free to change this information just
+                //    like any other user
                 //
                 const User = require('./user.js');
 
@@ -219,7 +219,7 @@ function initialize(cb) {
                         },
                         function getOpProps(opUserName, next) {
                             const propLoadOpts = {
-                                names	: [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
+                                names   : [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
                             };
                             User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
                                 return next(err, opUserName, opProps);

From 1d8be6b014cd7ee71336e98f6af2f7a79cb2b9e5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Jun 2018 21:26:46 -0600
Subject: [PATCH 0337/1013] Pardon the noise. More tab to space conversion!

---
 core/abracadabra.js                    | 148 ++---
 core/acs.js                            |  30 +-
 core/ansi_escape_parser.js             | 304 ++++-----
 core/ansi_prep.js                      |  76 +--
 core/ansi_term.js                      | 458 +++++++-------
 core/archive_util.js                   |  98 +--
 core/art.js                            | 172 ++---
 core/asset.js                          |  38 +-
 core/bbs_link.js                       | 110 ++--
 core/bbs_list.js                       | 162 ++---
 core/button_view.js                    |  26 +-
 core/client.js                         | 414 ++++++------
 core/client_connections.js             |  70 +--
 core/client_term.js                    | 100 +--
 core/color_codes.js                    | 244 +++----
 core/combatnet.js                      |  34 +-
 core/conf_area_util.js                 |  14 +-
 core/config.js                         | 824 ++++++++++++------------
 core/config_cache.js                   |  12 +-
 core/config_util.js                    |  20 +-
 core/connect.js                        |  68 +-
 core/crc.js                            |   8 +-
 core/database.js                       | 350 +++++------
 core/descript_ion_file.js              |  32 +-
 core/door.js                           |  72 +--
 core/door_party.js                     |  56 +-
 core/download_queue.js                 |  20 +-
 core/dropfile.js                       | 246 ++++----
 core/edit_text_view.js                 |  34 +-
 core/email.js                          |  18 +-
 core/enig_error.js                     |  40 +-
 core/enigma_assert.js                  |  10 +-
 core/erc_client.js                     |  66 +-
 core/event_scheduler.js                |  92 +--
 core/events.js                         |  20 +-
 core/exodus.js                         | 160 ++---
 core/file_area_filter_edit.js          | 108 ++--
 core/file_area_list.js                 | 264 ++++----
 core/file_area_web.js                  | 154 ++---
 core/file_base_area.js                 | 330 +++++-----
 core/file_base_area_select.js          |  32 +-
 core/file_base_download_manager.js     |  78 +--
 core/file_base_filter.js               |  28 +-
 core/file_base_list_export.js          | 198 +++---
 core/file_base_search.js               |  62 +-
 core/file_base_user_list_export.js     | 146 ++---
 core/file_base_web_download_manager.js |  88 +--
 core/file_entry.js                     | 250 ++++----
 core/file_transfer.js                  | 246 ++++----
 core/file_transfer_protocol_select.js  |  60 +-
 core/file_util.js                      |  44 +-
 core/fnv1a.js                          |   8 +-
 core/fse.js                            | 418 ++++++------
 core/ftn_address.js                    |  66 +-
 core/ftn_mail_packet.js                | 590 ++++++++---------
 core/ftn_util.js                       | 392 ++++++------
 core/horizontal_menu_view.js           |  36 +-
 core/key_entry_view.js                 |  20 +-
 core/last_callers.js                   |  74 +--
 core/listening_server.js               |  24 +-
 core/logger.js                         |  30 +-
 core/login_server_module.js            |  30 +-
 core/mail_packet.js                    |  18 +-
 core/mail_util.js                      |  34 +-
 core/mask_edit_text_view.js            |  78 +--
 core/mci_view_factory.js               | 112 ++--
 core/menu_module.js                    | 126 ++--
 core/menu_stack.js                     |  62 +-
 core/menu_util.js                      |  78 +--
 core/menu_view.js                      |  68 +-
 core/message.js                        | 440 ++++++-------
 core/message_area.js                   | 216 +++----
 core/message_base_search.js            |  68 +-
 core/mime_util.js                      |  24 +-
 core/misc_util.js                      |  24 +-
 core/mod_mixins.js                     |  10 +-
 core/module_util.js                    |  38 +-
 core/msg_area_list.js                  |  84 +--
 core/msg_area_post_fse.js              |  20 +-
 core/msg_area_reply_fse.js             |  10 +-
 core/msg_area_view_fse.js              |  76 +--
 core/msg_conf_list.js                  |  60 +-
 core/msg_list.js                       | 124 ++--
 core/msg_network.js                    |  20 +-
 core/msg_scan_toss_module.js           |   6 +-
 core/multi_line_edit_text_view.js      | 462 +++++++-------
 core/new_scan.js                       | 102 +--
 core/nua.js                            |  72 +--
 core/onelinerz.js                      | 144 ++---
 core/plugin_module.js                  |   2 +-
 core/predefined_mci.js                 | 222 +++----
 core/rumorz.js                         |  90 +--
 core/sauce.js                          | 150 ++---
 core/scanner_tossers/ftn_bso.js        | 838 ++++++++++++-------------
 core/server_module.js                  |   4 +-
 core/servers/content/gopher.js         | 144 ++---
 core/servers/content/web.js            | 100 +--
 core/servers/login/ssh.js              |  96 +--
 core/servers/login/telnet.js           | 468 +++++++-------
 core/servers/login/websocket.js        |  88 +--
 core/set_newscan_date.js               | 122 ++--
 core/show_art.js                       |  46 +-
 core/spinner_menu_view.js              |  30 +-
 core/standard_menu.js                  |  10 +-
 core/stat_log.js                       | 108 ++--
 core/string_format.js                  | 148 ++---
 core/string_util.js                    | 248 ++++----
 core/system_events.js                  |  34 +-
 core/system_menu_method.js             |  78 +--
 core/system_view_validate.js           |  64 +-
 core/telnet_bridge.js                  |  82 +--
 core/text_view.js                      | 184 +++---
 core/theme.js                          | 164 ++---
 core/tic_file_info.js                  | 106 ++--
 core/toggle_menu_view.js               |  28 +-
 core/upload.js                         | 230 +++----
 core/user.js                           | 162 ++---
 core/user_config.js                    | 100 +--
 core/user_group.js                     |  24 +-
 core/user_list.js                      |  68 +-
 core/user_login.js                     |  52 +-
 core/uuid_util.js                      |  18 +-
 core/vertical_menu_view.js             |  90 +--
 core/view.js                           | 136 ++--
 core/view_controller.js                | 276 ++++----
 core/web_password_reset.js             | 128 ++--
 core/whos_online.js                    |  46 +-
 core/word_wrap.js                      |  52 +-
 128 files changed, 8017 insertions(+), 8017 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 77a5e4c3..3a1507b6 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -1,62 +1,62 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('./menu_module.js').MenuModule;
-const DropFile			= require('./dropfile.js').DropFile;
-const door				= require('./door.js');
-const theme				= require('./theme.js');
-const ansi				= require('./ansi_term.js');
+const MenuModule        = require('./menu_module.js').MenuModule;
+const DropFile          = require('./dropfile.js').DropFile;
+const door              = require('./door.js');
+const theme             = require('./theme.js');
+const ansi              = require('./ansi_term.js');
 
-const async				= require('async');
-const assert			= require('assert');
-const paths				= require('path');
-const _					= require('lodash');
-const mkdirs			= require('fs-extra').mkdirs;
+const async             = require('async');
+const assert            = require('assert');
+const paths             = require('path');
+const _                 = require('lodash');
+const mkdirs            = require('fs-extra').mkdirs;
 
-//	:TODO: This should really be a system module... needs a little work to allow for such
+//  :TODO: This should really be a system module... needs a little work to allow for such
 
 const activeDoorNodeInstances = {};
 
 exports.moduleInfo = {
-    name	: 'Abracadabra',
-    desc	: 'External BBS Door Module',
-    author	: 'NuSkooler',
+    name    : 'Abracadabra',
+    desc    : 'External BBS Door Module',
+    author  : 'NuSkooler',
 };
 
 /*
-	Example configuration for LORD under DOSEMU:
+    Example configuration for LORD under DOSEMU:
 
-	{
-		config: {
-			name: PimpWars
-			dropFileType: DORINFO
-			cmd: qemu-system-i386
-			args: [
-				"-localtime",
-				"freedos.img",
-				"-chardev",
-				"socket,port={srvPort},nowait,host=localhost,id=s0",
-				"-device",
-				"isa-serial,chardev=s0"
-			]
-			io: socket
-		}
-	}
+    {
+        config: {
+            name: PimpWars
+            dropFileType: DORINFO
+            cmd: qemu-system-i386
+            args: [
+                "-localtime",
+                "freedos.img",
+                "-chardev",
+                "socket,port={srvPort},nowait,host=localhost,id=s0",
+                "-device",
+                "isa-serial,chardev=s0"
+            ]
+            io: socket
+        }
+    }
 
-	listen: socket | stdio
+    listen: socket | stdio
 
-	{
-		"config" : {
-			"name"			: "LORD",
-			"dropFileType"	: "DOOR",
-			"cmd"			: "/usr/bin/dosemu",
-			"args"			: [ "-quiet", "-f", "/etc/dosemu/dosemu.conf", "X:\\PW\\START.BAT {dropfile} {node}" ] ],
-			"nodeMax"		: 32,
-			"tooManyArt"	: "toomany-lord.ans"
-		}
-	}
+    {
+        "config" : {
+            "name"          : "LORD",
+            "dropFileType"  : "DOOR",
+            "cmd"           : "/usr/bin/dosemu",
+            "args"          : [ "-quiet", "-f", "/etc/dosemu/dosemu.conf", "X:\\PW\\START.BAT {dropfile} {node}" ] ],
+            "nodeMax"       : 32,
+            "tooManyArt"    : "toomany-lord.ans"
+        }
+    }
 
-	:TODO: See Mystic & others for other arg options that we may need to support
+    :TODO: See Mystic & others for other arg options that we may need to support
 */
 
 exports.getModule = class AbracadabraModule extends MenuModule {
@@ -64,21 +64,21 @@ exports.getModule = class AbracadabraModule extends MenuModule {
         super(options);
 
         this.config = options.menuConfig.config;
-        //	:TODO: MenuModule.validateConfig(cb) -- validate config section gracefully instead of asserts! -- { key : type, key2 : type2, ... }
-        assert(_.isString(this.config.name, 		'Config \'name\' is required'));
-        assert(_.isString(this.config.dropFileType,	'Config \'dropFileType\' is required'));
-        assert(_.isString(this.config.cmd,			'Config \'cmd\' is required'));
+        //  :TODO: MenuModule.validateConfig(cb) -- validate config section gracefully instead of asserts! -- { key : type, key2 : type2, ... }
+        assert(_.isString(this.config.name,         'Config \'name\' is required'));
+        assert(_.isString(this.config.dropFileType, 'Config \'dropFileType\' is required'));
+        assert(_.isString(this.config.cmd,          'Config \'cmd\' is required'));
 
-        this.config.nodeMax		= this.config.nodeMax || 0;
-        this.config.args		= this.config.args || [];
+        this.config.nodeMax     = this.config.nodeMax || 0;
+        this.config.args        = this.config.args || [];
     }
 
     /*
-		:TODO:
-		* disconnecting wile door is open leaves dosemu
-		* http://bbslink.net/sysop.php support
-		* Font support ala all other menus... or does this just work?
-	*/
+        :TODO:
+        * disconnecting wile door is open leaves dosemu
+        * http://bbslink.net/sysop.php support
+        * Font support ala all other menus... or does this just work?
+    */
 
     initSequence() {
         const self = this;
@@ -87,12 +87,12 @@ exports.getModule = class AbracadabraModule extends MenuModule {
             [
                 function validateNodeCount(callback) {
                     if(self.config.nodeMax > 0 &&
-						_.isNumber(activeDoorNodeInstances[self.config.name]) &&
-						activeDoorNodeInstances[self.config.name] + 1 > self.config.nodeMax)
+                        _.isNumber(activeDoorNodeInstances[self.config.name]) &&
+                        activeDoorNodeInstances[self.config.name] + 1 > self.config.nodeMax)
                     {
                         self.client.log.info(
                             {
-                                name		: self.config.name,
+                                name        : self.config.name,
                                 activeCount : activeDoorNodeInstances[self.config.name]
                             },
                             'Too many active instances');
@@ -106,13 +106,13 @@ exports.getModule = class AbracadabraModule extends MenuModule {
                         } else {
                             self.client.term.write('\nToo many active instances. Try again later.\n');
 
-                            //	:TODO: Use MenuModule.pausePrompt()
+                            //  :TODO: Use MenuModule.pausePrompt()
                             self.pausePrompt( () => {
                                 callback(new Error('Too many active instances'));
                             });
                         }
                     } else {
-                        //	:TODO: JS elegant way to do this?
+                        //  :TODO: JS elegant way to do this?
                         if(activeDoorNodeInstances[self.config.name]) {
                             activeDoorNodeInstances[self.config.name] += 1;
                         } else {
@@ -123,8 +123,8 @@ exports.getModule = class AbracadabraModule extends MenuModule {
                     }
                 },
                 function generateDropfile(callback) {
-                    self.dropFile	= new DropFile(self.client, self.config.dropFileType);
-                    var fullPath	= self.dropFile.fullPath;
+                    self.dropFile   = new DropFile(self.client, self.config.dropFileType);
+                    var fullPath    = self.dropFile.fullPath;
 
                     mkdirs(paths.dirname(fullPath), function dirCreated(err) {
                         if(err) {
@@ -152,28 +152,28 @@ exports.getModule = class AbracadabraModule extends MenuModule {
     runDoor() {
 
         const exeInfo = {
-            cmd			: this.config.cmd,
-            args		: this.config.args,
-            io			: this.config.io || 'stdio',
-            encoding	: this.config.encoding || this.client.term.outputEncoding,
-            dropFile	: this.dropFile.fileName,
-            node		: this.client.node,
-            //inhSocket	: this.client.output._handle.fd,
+            cmd         : this.config.cmd,
+            args        : this.config.args,
+            io          : this.config.io || 'stdio',
+            encoding    : this.config.encoding || this.client.term.outputEncoding,
+            dropFile    : this.dropFile.fileName,
+            node        : this.client.node,
+            //inhSocket : this.client.output._handle.fd,
         };
 
         const doorInstance = new door.Door(this.client, exeInfo);
 
         doorInstance.once('finished', () => {
             //
-            //	Try to clean up various settings such as scroll regions that may
-            //	have been set within the door
+            //  Try to clean up various settings such as scroll regions that may
+            //  have been set within the door
             //
             this.client.term.rawWrite(
                 ansi.normal() +
-				ansi.goto(this.client.term.termHeight, this.client.term.termWidth) +
-				ansi.setScrollRegion() +
-				ansi.goto(this.client.term.termHeight, 0) +
-				'\r\n\r\n'
+                ansi.goto(this.client.term.termHeight, this.client.term.termWidth) +
+                ansi.setScrollRegion() +
+                ansi.goto(this.client.term.termHeight, 0) +
+                '\r\n\r\n'
             );
 
             this.prevMenu();
diff --git a/core/acs.js b/core/acs.js
index b1461400..66f13a08 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -1,13 +1,13 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const checkAcs	= require('./acs_parser.js').parse;
-const Log		= require('./logger.js').log;
+//  ENiGMA½
+const checkAcs  = require('./acs_parser.js').parse;
+const Log       = require('./logger.js').log;
 
-//	deps
-const assert	= require('assert');
-const _			= require('lodash');
+//  deps
+const assert    = require('assert');
+const _         = require('lodash');
 
 class ACS {
     constructor(client) {
@@ -26,7 +26,7 @@ class ACS {
     }
 
     //
-    //	Message Conferences & Areas
+    //  Message Conferences & Areas
     //
     hasMessageConfRead(conf) {
         return this.check(conf.acs, 'read', ACS.Defaults.MessageConfRead);
@@ -37,7 +37,7 @@ class ACS {
     }
 
     //
-    //	File Base / Areas
+    //  File Base / Areas
     //
     hasFileAreaRead(area) {
         return this.check(area.acs, 'read', ACS.Defaults.FileAreaRead);
@@ -53,7 +53,7 @@ class ACS {
 
     getConditionalValue(condArray, memberName) {
         if(!Array.isArray(condArray)) {
-            //	no cond array, just use the value
+            //  no cond array, just use the value
             return condArray;
         }
 
@@ -68,7 +68,7 @@ class ACS {
                     return false;
                 }
             } else {
-                return true;	//	no acs check req.
+                return true;    //  no acs check req.
             }
         });
 
@@ -79,12 +79,12 @@ class ACS {
 }
 
 ACS.Defaults = {
-    MessageAreaRead		: 'GM[users]',
-    MessageConfRead		: 'GM[users]',
+    MessageAreaRead     : 'GM[users]',
+    MessageConfRead     : 'GM[users]',
 
-    FileAreaRead		: 'GM[users]',
-    FileAreaWrite		: 'GM[sysops]',
-    FileAreaDownload	: 'GM[users]',
+    FileAreaRead        : 'GM[users]',
+    FileAreaWrite       : 'GM[sysops]',
+    FileAreaDownload    : 'GM[users]',
 };
 
 module.exports = ACS;
diff --git a/core/ansi_escape_parser.js b/core/ansi_escape_parser.js
index 49001363..9786ea4c 100644
--- a/core/ansi_escape_parser.js
+++ b/core/ansi_escape_parser.js
@@ -1,16 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-const miscUtil	= require('./misc_util.js');
-const ansi		= require('./ansi_term.js');
-const Log		= require('./logger.js').log;
+const miscUtil  = require('./misc_util.js');
+const ansi      = require('./ansi_term.js');
+const Log       = require('./logger.js').log;
 
-//	deps
-const events	= require('events');
-const util		= require('util');
-const _			= require('lodash');
+//  deps
+const events    = require('events');
+const util      = require('util');
+const _         = require('lodash');
 
-exports.ANSIEscapeParser		= ANSIEscapeParser;
+exports.ANSIEscapeParser        = ANSIEscapeParser;
 
 const CR = 0x0d;
 const LF = 0x0a;
@@ -20,76 +20,76 @@ function ANSIEscapeParser(options) {
 
     events.EventEmitter.call(this);
 
-    this.column				= 1;
-    this.row				= 1;
-    this.scrollBack			= 0;
-    this.graphicRendition	= {};
+    this.column             = 1;
+    this.row                = 1;
+    this.scrollBack         = 0;
+    this.graphicRendition   = {};
 
     this.parseState = {
-        re	: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
+        re  : /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,   //  eslint-disable-line no-control-regex
     };
 
     options = miscUtil.valueWithDefault(options, {
-        mciReplaceChar		: '',
-        termHeight			: 25,
-        termWidth			: 80,
-        trailingLF			: 'default',	//	default|omit|no|yes, ...
+        mciReplaceChar      : '',
+        termHeight          : 25,
+        termWidth           : 80,
+        trailingLF          : 'default',    //  default|omit|no|yes, ...
     });
 
-    this.mciReplaceChar		= miscUtil.valueWithDefault(options.mciReplaceChar, '');
-    this.termHeight			= miscUtil.valueWithDefault(options.termHeight, 25);
-    this.termWidth			= miscUtil.valueWithDefault(options.termWidth, 80);
-    this.trailingLF			= miscUtil.valueWithDefault(options.trailingLF, 'default');
+    this.mciReplaceChar     = miscUtil.valueWithDefault(options.mciReplaceChar, '');
+    this.termHeight         = miscUtil.valueWithDefault(options.termHeight, 25);
+    this.termWidth          = miscUtil.valueWithDefault(options.termWidth, 80);
+    this.trailingLF         = miscUtil.valueWithDefault(options.trailingLF, 'default');
 
     self.moveCursor = function(cols, rows) {
-        self.column	+= cols;
-        self.row	+= rows;
+        self.column += cols;
+        self.row    += rows;
 
-        self.column	= Math.max(self.column, 1);
-        self.column	= Math.min(self.column, self.termWidth);	//	can't move past term width
-        self.row	= Math.max(self.row, 1);
+        self.column = Math.max(self.column, 1);
+        self.column = Math.min(self.column, self.termWidth);    //  can't move past term width
+        self.row    = Math.max(self.row, 1);
 
         self.positionUpdated();
     };
 
     self.saveCursorPosition = function() {
         self.savedPosition = {
-            row		: self.row,
-            column	: self.column
+            row     : self.row,
+            column  : self.column
         };
     };
 
     self.restoreCursorPosition = function() {
-        self.row	= self.savedPosition.row;
-        self.column	= self.savedPosition.column;
+        self.row    = self.savedPosition.row;
+        self.column = self.savedPosition.column;
         delete self.savedPosition;
 
         self.positionUpdated();
-        //		self.rowUpdated();
+        //      self.rowUpdated();
     };
 
     self.clearScreen = function() {
-        //	:TODO: should be doing something with row/column?
+        //  :TODO: should be doing something with row/column?
         self.emit('clear screen');
     };
 
     /*
-	self.rowUpdated = function() {
-		self.emit('row update', self.row + self.scrollBack);
-	};*/
+    self.rowUpdated = function() {
+        self.emit('row update', self.row + self.scrollBack);
+    };*/
 
     self.positionUpdated = function() {
         self.emit('position update', self.row, self.column);
     };
 
     function literal(text) {
-        const len	= text.length;
-        let pos		= 0;
-        let start	= 0;
+        const len   = text.length;
+        let pos     = 0;
+        let start   = 0;
         let charCode;
 
         while(pos < len) {
-            charCode = text.charCodeAt(pos) & 0xff;	//	8bit clean
+            charCode = text.charCodeAt(pos) & 0xff; //  8bit clean
 
             switch(charCode) {
                 case CR :
@@ -116,7 +116,7 @@ function ANSIEscapeParser(options) {
                         start = pos + 1;
 
                         self.column = 1;
-                        self.row	+= 1;
+                        self.row    += 1;
 
                         self.positionUpdated();
                     } else {
@@ -129,11 +129,11 @@ function ANSIEscapeParser(options) {
         }
 
         //
-        //	Finalize this chunk
+        //  Finalize this chunk
         //
         if(self.column > self.termWidth) {
             self.column = 1;
-            self.row	+= 1;
+            self.row    += 1;
 
             self.positionUpdated();
         }
@@ -145,7 +145,7 @@ function ANSIEscapeParser(options) {
     }
 
     function parseMCI(buffer) {
-        //	:TODO: move this to "constants" seciton @ top
+        //  :TODO: move this to "constants" seciton @ top
         var mciRe = /%([A-Z]{2})([0-9]{1,2})?(?:\(([0-9A-Za-z,]+)\))*/g;
         var pos = 0;
         var match;
@@ -154,16 +154,16 @@ function ANSIEscapeParser(options) {
         var id;
 
         do {
-            pos		= mciRe.lastIndex;
-            match	= mciRe.exec(buffer);
+            pos     = mciRe.lastIndex;
+            match   = mciRe.exec(buffer);
 
             if(null !== match) {
                 if(match.index > pos) {
                     literal(buffer.slice(pos, match.index));
                 }
 
-                mciCode	= match[1];
-                id		= match[2] || null;
+                mciCode = match[1];
+                id      = match[2] || null;
 
                 if(match[3]) {
                     args = match[3].split(',');
@@ -171,7 +171,7 @@ function ANSIEscapeParser(options) {
                     args = [];
                 }
 
-                //	if MCI codes are changing, save off the current color
+                //  if MCI codes are changing, save off the current color
                 var fullMciCode = mciCode + (id || '');
                 if(self.lastMciCode !== fullMciCode) {
 
@@ -182,10 +182,10 @@ function ANSIEscapeParser(options) {
 
 
                 self.emit('mci', {
-                    mci		: mciCode,
-                    id		: id ? parseInt(id, 10) : null,
-                    args	: args,
-                    SGR		: ansi.getSGRFromGraphicRendition(self.graphicRendition, true)
+                    mci     : mciCode,
+                    id      : id ? parseInt(id, 10) : null,
+                    args    : args,
+                    SGR     : ansi.getSGRFromGraphicRendition(self.graphicRendition, true)
                 });
 
                 if(self.mciReplaceChar.length > 0) {
@@ -208,10 +208,10 @@ function ANSIEscapeParser(options) {
 
     self.reset = function(input) {
         self.parseState = {
-            //	ignore anything past EOF marker, if any
-            buffer	: input.split(String.fromCharCode(0x1a), 1)[0],
-            re		: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,	//	eslint-disable-line no-control-regex
-            stop	: false,
+            //  ignore anything past EOF marker, if any
+            buffer  : input.split(String.fromCharCode(0x1a), 1)[0],
+            re      : /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g,   //  eslint-disable-line no-control-regex
+            stop    : false,
         };
     };
 
@@ -224,13 +224,13 @@ function ANSIEscapeParser(options) {
             self.reset(input);
         }
 
-        //	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
+        //  :TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
         var pos;
         var match;
         var opCode;
         var args;
-        var re		= self.parseState.re;
-        var buffer	= self.parseState.buffer;
+        var re      = self.parseState.re;
+        var buffer  = self.parseState.buffer;
 
         self.parseState.stop = false;
 
@@ -239,16 +239,16 @@ function ANSIEscapeParser(options) {
                 return;
             }
 
-            pos		= re.lastIndex;
-            match	= re.exec(buffer);
+            pos     = re.lastIndex;
+            match   = re.exec(buffer);
 
             if(null !== match) {
                 if(match.index > pos) {
                     parseMCI(buffer.slice(pos, match.index));
                 }
 
-                opCode	= match[2];
-                args	= match[1].split(';').map(v => parseInt(v, 10));	//	convert to array of ints
+                opCode  = match[2];
+                args    = match[1].split(';').map(v => parseInt(v, 10));    //  convert to array of ints
 
                 escape(opCode, args);
 
@@ -260,13 +260,13 @@ function ANSIEscapeParser(options) {
         if(pos < buffer.length) {
             var lastBit = buffer.slice(pos);
 
-            //	:TODO: check for various ending LF's, not just DOS \r\n
+            //  :TODO: check for various ending LF's, not just DOS \r\n
             if('\r\n' === lastBit.slice(-2).toString()) {
                 switch(self.trailingLF) {
                     case 'default' :
                         //
-                        //	Default is to *not* omit the trailing LF
-                        //	if we're going to end on termHeight
+                        //  Default is to *not* omit the trailing LF
+                        //  if we're going to end on termHeight
                         //
                         if(this.termHeight === self.row) {
                             lastBit = lastBit.slice(0, -2);
@@ -288,100 +288,100 @@ function ANSIEscapeParser(options) {
     };
 
     /*
-	self.parse = function(buffer, savedRe) {
-		//	:TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
-		//	:TODO: move this to "constants" section @ top
-		var re	= /(?:\x1b\x5b)([\?=;0-9]*?)([ABCDHJKfhlmnpsu])/g;
-		var pos = 0;
-		var match;
-		var opCode;
-		var args;
+    self.parse = function(buffer, savedRe) {
+        //  :TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
+        //  :TODO: move this to "constants" section @ top
+        var re  = /(?:\x1b\x5b)([\?=;0-9]*?)([ABCDHJKfhlmnpsu])/g;
+        var pos = 0;
+        var match;
+        var opCode;
+        var args;
 
-		//	ignore anything past EOF marker, if any
-		buffer = buffer.split(String.fromCharCode(0x1a), 1)[0];
+        //  ignore anything past EOF marker, if any
+        buffer = buffer.split(String.fromCharCode(0x1a), 1)[0];
 
-		do {
-			pos		= re.lastIndex;
-			match	= re.exec(buffer);
+        do {
+            pos     = re.lastIndex;
+            match   = re.exec(buffer);
 
-			if(null !== match) {
-				if(match.index > pos) {
-					parseMCI(buffer.slice(pos, match.index));
-				}
+            if(null !== match) {
+                if(match.index > pos) {
+                    parseMCI(buffer.slice(pos, match.index));
+                }
 
-				opCode	= match[2];
-				args	= getArgArray(match[1].split(';'));
+                opCode  = match[2];
+                args    = getArgArray(match[1].split(';'));
 
-				escape(opCode, args);
+                escape(opCode, args);
 
-				self.emit('chunk', match[0]);
-			}
+                self.emit('chunk', match[0]);
+            }
 
 
 
-		} while(0 !== re.lastIndex);
+        } while(0 !== re.lastIndex);
 
-		if(pos < buffer.length) {
-			parseMCI(buffer.slice(pos));
-		}
+        if(pos < buffer.length) {
+            parseMCI(buffer.slice(pos));
+        }
 
-		self.emit('complete');
-	};
-	*/
+        self.emit('complete');
+    };
+    */
 
     function escape(opCode, args) {
         let arg;
 
         switch(opCode) {
-            //	cursor up
+            //  cursor up
             case 'A' :
                 //arg = args[0] || 1;
                 arg = isNaN(args[0]) ? 1 : args[0];
                 self.moveCursor(0, -arg);
                 break;
 
-                //	cursor down
+                //  cursor down
             case 'B' :
                 //arg = args[0] || 1;
                 arg = isNaN(args[0]) ? 1 : args[0];
                 self.moveCursor(0, arg);
                 break;
 
-                //	cursor forward/right
+                //  cursor forward/right
             case 'C' :
                 //arg = args[0] || 1;
                 arg = isNaN(args[0]) ? 1 : args[0];
                 self.moveCursor(arg, 0);
                 break;
 
-                //	cursor back/left
+                //  cursor back/left
             case 'D' :
                 //arg = args[0] || 1;
                 arg = isNaN(args[0]) ? 1 : args[0];
                 self.moveCursor(-arg, 0);
                 break;
 
-            case 'f' :	//	horiz & vertical
-            case 'H' :	//	cursor position
-                //self.row	= args[0] || 1;
-                //self.column	= args[1] || 1;
-                self.row	= isNaN(args[0]) ? 1 : args[0];
-                self.column	= isNaN(args[1]) ? 1 : args[1];
+            case 'f' :  //  horiz & vertical
+            case 'H' :  //  cursor position
+                //self.row  = args[0] || 1;
+                //self.column   = args[1] || 1;
+                self.row    = isNaN(args[0]) ? 1 : args[0];
+                self.column = isNaN(args[1]) ? 1 : args[1];
                 //self.rowUpdated();
                 self.positionUpdated();
                 break;
 
-                //	save position
+                //  save position
             case 's' :
                 self.saveCursorPosition();
                 break;
 
-                //	restore position
+                //  restore position
             case 'u' :
                 self.restoreCursorPosition();
                 break;
 
-                //	set graphic rendition
+                //  set graphic rendition
             case 'm' :
                 self.graphicRendition.reset = false;
 
@@ -395,7 +395,7 @@ function ANSIEscapeParser(options) {
                     } else if(ANSIEscapeParser.styles[arg]) {
                         switch(arg) {
                             case 0 :
-                                //	clear out everything
+                                //  clear out everything
                                 delete self.graphicRendition.intensity;
                                 delete self.graphicRendition.underline;
                                 delete self.graphicRendition.blink;
@@ -445,13 +445,13 @@ function ANSIEscapeParser(options) {
                 }
 
                 self.emit('sgr update', self.graphicRendition);
-                break;	//	m
+                break;  //  m
 
-                //	:TODO: s, u, K
+                //  :TODO: s, u, K
 
-                //	erase display/screen
+                //  erase display/screen
             case 'J' :
-                //	:TODO: Handle other 'J' types!
+                //  :TODO: Handle other 'J' types!
                 if(2 === args[0]) {
                     self.clearScreen();
                 }
@@ -463,62 +463,62 @@ function ANSIEscapeParser(options) {
 util.inherits(ANSIEscapeParser, events.EventEmitter);
 
 ANSIEscapeParser.foregroundColors = {
-    30	: 'black',
-    31	: 'red',
-    32	: 'green',
-    33	: 'yellow',
-    34	: 'blue',
-    35	: 'magenta',
-    36	: 'cyan',
-    37	: 'white',
-    39	: 'default',	//	same as white for most implementations
+    30  : 'black',
+    31  : 'red',
+    32  : 'green',
+    33  : 'yellow',
+    34  : 'blue',
+    35  : 'magenta',
+    36  : 'cyan',
+    37  : 'white',
+    39  : 'default',    //  same as white for most implementations
 
-    90	: 'grey'
+    90  : 'grey'
 };
 Object.freeze(ANSIEscapeParser.foregroundColors);
 
 ANSIEscapeParser.backgroundColors = {
-    40	: 'black',
-    41	: 'red',
-    42	: 'green',
-    43	: 'yellow',
-    44	: 'blue',
-    45	: 'magenta',
-    46	: 'cyan',
-    47	: 'white',
-    49	: 'default',	//	same as black for most implementations
+    40  : 'black',
+    41  : 'red',
+    42  : 'green',
+    43  : 'yellow',
+    44  : 'blue',
+    45  : 'magenta',
+    46  : 'cyan',
+    47  : 'white',
+    49  : 'default',    //  same as black for most implementations
 };
 Object.freeze(ANSIEscapeParser.backgroundColors);
 
-//	:TODO: ensure these names all align with that of ansi_term.js
+//  :TODO: ensure these names all align with that of ansi_term.js
 //
-//	See the following specs:
-//	* http://www.ansi-bbs.org/ansi-bbs-core-server.html
-//	* http://www.vt100.net/docs/vt510-rm/SGR
-//	* https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+//  See the following specs:
+//  * http://www.ansi-bbs.org/ansi-bbs-core-server.html
+//  * http://www.vt100.net/docs/vt510-rm/SGR
+//  * https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
 //
-//	Note that these are intentionally not in order such that they
-//	can be grouped by concept here in code.
+//  Note that these are intentionally not in order such that they
+//  can be grouped by concept here in code.
 //
 ANSIEscapeParser.styles = {
-    0		: 'default',			//	Everything disabled
+    0       : 'default',            //  Everything disabled
 
-    1		: 'intensityBright',	//	aka bold
-    2		: 'intensityDim',
-    22		: 'intensityNormal',
+    1       : 'intensityBright',    //  aka bold
+    2       : 'intensityDim',
+    22      : 'intensityNormal',
 
-    4		: 'underlineOn',		//	Not supported by most BBS-like terminals
-    24		: 'underlineOff',		//	Not supported by most BBS-like terminals
+    4       : 'underlineOn',        //  Not supported by most BBS-like terminals
+    24      : 'underlineOff',       //  Not supported by most BBS-like terminals
 
-    5		: 'blinkSlow',			//	blinkSlow & blinkFast are generally treated the same
-    6		: 'blinkFast',			//	blinkSlow & blinkFast are generally treated the same
-    25		: 'blinkOff',
+    5       : 'blinkSlow',          //  blinkSlow & blinkFast are generally treated the same
+    6       : 'blinkFast',          //  blinkSlow & blinkFast are generally treated the same
+    25      : 'blinkOff',
 
-    7		: 'negativeImageOn',	//	Generally not supported or treated as "reverse FG & BG"
-    27		: 'negativeImageOff',	//	Generally not supported or treated as "reverse FG & BG"
+    7       : 'negativeImageOn',    //  Generally not supported or treated as "reverse FG & BG"
+    27      : 'negativeImageOff',   //  Generally not supported or treated as "reverse FG & BG"
 
-    8		: 'invisibleOn',		//	FG set to BG
-    28		: 'invisibleOff',		//	Not supported by most BBS-like terminals
+    8       : 'invisibleOn',        //  FG set to BG
+    28      : 'invisibleOff',       //  Not supported by most BBS-like terminals
 };
 Object.freeze(ANSIEscapeParser.styles);
 
diff --git a/core/ansi_prep.js b/core/ansi_prep.js
index 3eb05b08..09c9bbf6 100644
--- a/core/ansi_prep.js
+++ b/core/ansi_prep.js
@@ -1,38 +1,38 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const ANSIEscapeParser	= require('./ansi_escape_parser.js').ANSIEscapeParser;
-const ANSI				= require('./ansi_term.js');
+//  ENiGMA½
+const ANSIEscapeParser  = require('./ansi_escape_parser.js').ANSIEscapeParser;
+const ANSI              = require('./ansi_term.js');
 const {
     splitTextAtTerms,
     renderStringLength
-}						= require('./string_util.js');
+}                       = require('./string_util.js');
 
-//	deps
-const _					= require('lodash');
+//  deps
+const _                 = require('lodash');
 
 module.exports = function ansiPrep(input, options, cb) {
     if(!input) {
         return cb(null, '');
     }
 
-    options.termWidth			= options.termWidth 	|| 80;
-    options.termHeight			= options.termHeight	|| 25;
-    options.cols				= options.cols || options.termWidth		|| 80;
-    options.rows				= options.rows || options.termHeight	|| 'auto';
-    options.startCol			= options.startCol || 1;
-    options.exportMode			= options.exportMode || false;
-    options.fillLines			= _.get(options, 'fillLines', true);
-    options.indent				= options.indent || 0;
+    options.termWidth           = options.termWidth     || 80;
+    options.termHeight          = options.termHeight    || 25;
+    options.cols                = options.cols || options.termWidth     || 80;
+    options.rows                = options.rows || options.termHeight    || 'auto';
+    options.startCol            = options.startCol || 1;
+    options.exportMode          = options.exportMode || false;
+    options.fillLines           = _.get(options, 'fillLines', true);
+    options.indent              = options.indent || 0;
 
-    //	in auto we start out at 25 rows, but can always expand for more
+    //  in auto we start out at 25 rows, but can always expand for more
     const canvas = Array.from( { length : 'auto' === options.rows ? 25 : options.rows }, () => Array.from( { length : options.cols}, () => new Object() ) );
     const parser = new ANSIEscapeParser( { termHeight : options.termHeight, termWidth : options.termWidth } );
 
     const state = {
-        row	: 0,
-        col	: 0,
+        row : 0,
+        col : 0,
     };
 
     let lastRow = 0;
@@ -46,19 +46,19 @@ module.exports = function ansiPrep(input, options, cb) {
     }
 
     parser.on('position update', (row, col) => {
-        state.row	= row - 1;
-        state.col	= col - 1;
+        state.row   = row - 1;
+        state.col   = col - 1;
 
         if(0 === state.col) {
             state.initialSgr = state.lastSgr;
         }
 
-        lastRow		= Math.max(state.row, lastRow);
+        lastRow     = Math.max(state.row, lastRow);
     });
 
     parser.on('literal', literal => {
         //
-        //	CR/LF are handled for 'position update'; we don't need the chars themselves
+        //  CR/LF are handled for 'position update'; we don't need the chars themselves
         //
         literal = literal.replace(/\r?\n|[\r\u2028\u2029]/g, '');
 
@@ -73,9 +73,9 @@ module.exports = function ansiPrep(input, options, cb) {
                 canvas[state.row][state.col].char = c;
 
                 if(state.sgr) {
-                    canvas[state.row][state.col].sgr	= _.clone(state.sgr);
-                    state.lastSgr						= canvas[state.row][state.col].sgr;
-                    state.sgr							= null;
+                    canvas[state.row][state.col].sgr    = _.clone(state.sgr);
+                    state.lastSgr                       = canvas[state.row][state.col].sgr;
+                    state.sgr                           = null;
                 }
             }
 
@@ -87,8 +87,8 @@ module.exports = function ansiPrep(input, options, cb) {
         ensureRow(state.row);
 
         if(state.col < options.cols) {
-            canvas[state.row][state.col].sgr	= _.clone(sgr);
-            state.lastSgr						= canvas[state.row][state.col].sgr;
+            canvas[state.row][state.col].sgr    = _.clone(sgr);
+            state.lastSgr                       = canvas[state.row][state.col].sgr;
         } else {
             state.sgr = sgr;
         }
@@ -147,16 +147,16 @@ module.exports = function ansiPrep(input, options, cb) {
 
         if(options.exportMode) {
             //
-            //	If we're in export mode, we do some additional hackery:
+            //  If we're in export mode, we do some additional hackery:
             //
-            //	* Hard wrap ALL lines at <= 79 *characters* (not visible columns)
-            //	  if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
-            //	  represents chars to get back to the position we were previously at
+            //  * Hard wrap ALL lines at <= 79 *characters* (not visible columns)
+            //    if a line must wrap early, we'll place a ESC[A ESC[<N>C where <N>
+            //    represents chars to get back to the position we were previously at
             //
-            //	* Replace contig spaces with ESC[<N>C as well to save... space.
+            //  * Replace contig spaces with ESC[<N>C as well to save... space.
             //
-            //	:TODO: this would be better to do as part of the processing above, but this will do for now
-            const MAX_CHARS	= 79 - 8;	//	79 max, - 8 for max ESC seq's we may prefix a line with
+            //  :TODO: this would be better to do as part of the processing above, but this will do for now
+            const MAX_CHARS = 79 - 8;   //  79 max, - 8 for max ESC seq's we may prefix a line with
             let exportOutput = '';
 
             let m;
@@ -176,16 +176,16 @@ module.exports = function ansiPrep(input, options, cb) {
                         afterSeq = m.index + m[0].length;
 
                         if(afterSeq < MAX_CHARS) {
-                            //	after current seq
+                            //  after current seq
                             splitAt = afterSeq;
                         } else {
                             if(m.index < MAX_CHARS) {
-                                //	before last found seq
+                                //  before last found seq
                                 splitAt = m.index;
-                                wantMore = false;	//	can't eat up any more
+                                wantMore = false;   //  can't eat up any more
                             }
 
-                            break;	//	seq's beyond this point are >= MAX_CHARS
+                            break;  //  seq's beyond this point are >= MAX_CHARS
                         }
                     }
 
@@ -202,7 +202,7 @@ module.exports = function ansiPrep(input, options, cb) {
                     renderStart += renderStringLength(part);
                     exportOutput += `${part}\r\n`;
 
-                    if(fullLine.length > 0) {	//	more to go for this line?
+                    if(fullLine.length > 0) {   //  more to go for this line?
                         exportOutput += `${ANSI.up()}${ANSI.right(renderStart)}`;
                     } else {
                         exportOutput += ANSI.up();
diff --git a/core/ansi_term.js b/core/ansi_term.js
index dc3399a6..44c82464 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -2,191 +2,191 @@
 'use strict';
 
 //
-//	ANSI Terminal Support Resources
+//  ANSI Terminal Support Resources
 //
-//	ANSI-BBS
-//		* http://ansi-bbs.org/
+//  ANSI-BBS
+//      * http://ansi-bbs.org/
 //
-//	CTerm / SyncTERM
-//		* https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+//  CTerm / SyncTERM
+//      * https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
 //
-//	BananaCom
-//		* http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
+//  BananaCom
+//      * http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
 //
-//	ANSI.SYS
-//		* http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/ansisys.txt
-//		* http://academic.evergreen.edu/projects/biophysics/technotes/program/ansi_esc.htm
+//  ANSI.SYS
+//      * http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/ansisys.txt
+//      * http://academic.evergreen.edu/projects/biophysics/technotes/program/ansi_esc.htm
 //
-//	VTX
-//		* https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
+//  VTX
+//      * https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
 //
-//	General
-//		* http://en.wikipedia.org/wiki/ANSI_escape_code
-//		* http://www.inwap.com/pdp10/ansicode.txt
+//  General
+//      * http://en.wikipedia.org/wiki/ANSI_escape_code
+//      * http://www.inwap.com/pdp10/ansicode.txt
 //
-//	Other Implementations
-//		* https://github.com/chjj/term.js/blob/master/src/term.js
+//  Other Implementations
+//      * https://github.com/chjj/term.js/blob/master/src/term.js
 //
 //
-//	For a board, we need to support the semi-standard ANSI-BBS "spec" which
-//	is bastardized mix of DOS ANSI.SYS, cterm.txt, bansi.txt and a little other.
-//	This gives us NetRunner, SyncTERM, EtherTerm, most *nix terminals, compatibilitiy
-//	with legit oldschool DOS terminals, and so on.
+//  For a board, we need to support the semi-standard ANSI-BBS "spec" which
+//  is bastardized mix of DOS ANSI.SYS, cterm.txt, bansi.txt and a little other.
+//  This gives us NetRunner, SyncTERM, EtherTerm, most *nix terminals, compatibilitiy
+//  with legit oldschool DOS terminals, and so on.
 //
 
-//	ENiGMA½
-const miscUtil	= require('./misc_util.js');
+//  ENiGMA½
+const miscUtil  = require('./misc_util.js');
 
-//	deps
-const assert	= require('assert');
-const _			= require('lodash');
+//  deps
+const assert    = require('assert');
+const _         = require('lodash');
 
-exports.getFullMatchRegExp			= getFullMatchRegExp;
-exports.getFGColorValue				= getFGColorValue;
-exports.getBGColorValue				= getBGColorValue;
-exports.sgr							= sgr;
-exports.getSGRFromGraphicRendition	= getSGRFromGraphicRendition;
-exports.clearScreen					= clearScreen;
-exports.resetScreen					= resetScreen;
-exports.normal						= normal;
-exports.goHome						= goHome;
-exports.disableVT100LineWrapping	= disableVT100LineWrapping;
-exports.setSyncTERMFont				= setSyncTERMFont;
-exports.getSyncTERMFontFromAlias	= getSyncTERMFontFromAlias;
-exports.setSyncTermFontWithAlias	= setSyncTermFontWithAlias;
-exports.setCursorStyle				= setCursorStyle;
-exports.setEmulatedBaudRate			= setEmulatedBaudRate;
-exports.vtxHyperlink		= vtxHyperlink;
+exports.getFullMatchRegExp          = getFullMatchRegExp;
+exports.getFGColorValue             = getFGColorValue;
+exports.getBGColorValue             = getBGColorValue;
+exports.sgr                         = sgr;
+exports.getSGRFromGraphicRendition  = getSGRFromGraphicRendition;
+exports.clearScreen                 = clearScreen;
+exports.resetScreen                 = resetScreen;
+exports.normal                      = normal;
+exports.goHome                      = goHome;
+exports.disableVT100LineWrapping    = disableVT100LineWrapping;
+exports.setSyncTERMFont             = setSyncTERMFont;
+exports.getSyncTERMFontFromAlias    = getSyncTERMFontFromAlias;
+exports.setSyncTermFontWithAlias    = setSyncTermFontWithAlias;
+exports.setCursorStyle              = setCursorStyle;
+exports.setEmulatedBaudRate         = setEmulatedBaudRate;
+exports.vtxHyperlink        = vtxHyperlink;
 
 //
-//	See also
-//	https://github.com/TooTallNate/ansi.js/blob/master/lib/ansi.js
+//  See also
+//  https://github.com/TooTallNate/ansi.js/blob/master/lib/ansi.js
 
-const ESC_CSI 	= '\u001b[';
+const ESC_CSI   = '\u001b[';
 
 const CONTROL = {
-    up				: 'A',
-    down			: 'B',
+    up              : 'A',
+    down            : 'B',
 
-    forward			: 'C',
-    right			: 'C',
+    forward         : 'C',
+    right           : 'C',
 
-    back			: 'D',
-    left			: 'D',
+    back            : 'D',
+    left            : 'D',
 
-    nextLine		: 'E',
-    prevLine		: 'F',
-    horizAbsolute	: 'G',
+    nextLine        : 'E',
+    prevLine        : 'F',
+    horizAbsolute   : 'G',
 
     //
-    //	CSI [ p1 ] J
-    //	Erase in Page / Erase Data
-    //	Defaults: p1 = 0
-    //	Erases from the current screen according to the value of p1
-    //	0 - Erase from the current position to the end of the screen.
-    //	1 - Erase from the current position to the start of the screen.
-    //	2 - Erase entire screen.  As a violation of ECMA-048, also moves
-    //	    the cursor to position 1/1 as a number of BBS programs assume
-    //		this behaviour.
-    //	Erased characters are set to the current attribute.
+    //  CSI [ p1 ] J
+    //  Erase in Page / Erase Data
+    //  Defaults: p1 = 0
+    //  Erases from the current screen according to the value of p1
+    //  0 - Erase from the current position to the end of the screen.
+    //  1 - Erase from the current position to the start of the screen.
+    //  2 - Erase entire screen.  As a violation of ECMA-048, also moves
+    //      the cursor to position 1/1 as a number of BBS programs assume
+    //      this behaviour.
+    //  Erased characters are set to the current attribute.
     //
-    //	Support:
-    //	* SyncTERM: Works as expected
-    //	* NetRunner: Always clears a screen *height* (e.g. 25) regardless of p1
-    //	  and screen remainder
+    //  Support:
+    //  * SyncTERM: Works as expected
+    //  * NetRunner: Always clears a screen *height* (e.g. 25) regardless of p1
+    //    and screen remainder
     //
-    eraseData		: 'J',
+    eraseData       : 'J',
 
-    eraseLine		: 'K',
-    insertLine		: 'L',
+    eraseLine       : 'K',
+    insertLine      : 'L',
 
     //
-    //	CSI [ p1 ] M
-    //	Delete Line(s) / "ANSI" Music
-    //	Defaults: p1 = 1
-    //	Deletes the current line and the p1 - 1 lines after it scrolling the
-    //	first non-deleted line up to the current line and filling the newly
-    //	empty lines at the end of the screen with the current attribute.
-    //	If "ANSI" Music is fully enabled (CSI = 2 M), performs "ANSI" music
-    //	instead.
-    //	See "ANSI" MUSIC section for more details.
+    //  CSI [ p1 ] M
+    //  Delete Line(s) / "ANSI" Music
+    //  Defaults: p1 = 1
+    //  Deletes the current line and the p1 - 1 lines after it scrolling the
+    //  first non-deleted line up to the current line and filling the newly
+    //  empty lines at the end of the screen with the current attribute.
+    //  If "ANSI" Music is fully enabled (CSI = 2 M), performs "ANSI" music
+    //  instead.
+    //  See "ANSI" MUSIC section for more details.
     //
-    //	Support:
-    //	* SyncTERM: Works as expected
-    //	* NetRunner:
+    //  Support:
+    //  * SyncTERM: Works as expected
+    //  * NetRunner:
     //
-    //	General Notes:
-    //	See also notes in bansi.txt and cterm.txt about the various
-    //	incompatibilities & oddities around this sequence. ANSI-BBS
-    //	states that it *should* work with any value of p1.
+    //  General Notes:
+    //  See also notes in bansi.txt and cterm.txt about the various
+    //  incompatibilities & oddities around this sequence. ANSI-BBS
+    //  states that it *should* work with any value of p1.
     //
-    deleteLine		: 'M',
-    ansiMusic		: 'M',
+    deleteLine      : 'M',
+    ansiMusic       : 'M',
 
-    scrollUp		: 'S',
-    scrollDown		: 'T',
-    setScrollRegion	: 'r',
-    savePos			: 's',
-    restorePos		: 'u',
-    queryPos		: '6n',
-    queryScreenSize	: '255n',	//	See bansi.txt
-    goto			: 'H',	//	row Pr, column Pc -- same as f
-    gotoAlt			: 'f',	//	same as H
+    scrollUp        : 'S',
+    scrollDown      : 'T',
+    setScrollRegion : 'r',
+    savePos         : 's',
+    restorePos      : 'u',
+    queryPos        : '6n',
+    queryScreenSize : '255n',   //  See bansi.txt
+    goto            : 'H',  //  row Pr, column Pc -- same as f
+    gotoAlt         : 'f',  //  same as H
 
     blinkToBrightIntensity : '?33h',
-    blinkNormal				: '?33l',
+    blinkNormal             : '?33l',
 
-    emulationSpeed	: '*r',	//	Set output emulation speed. See cterm.txt
+    emulationSpeed  : '*r', //  Set output emulation speed. See cterm.txt
 
-    hideCursor		: '?25l',	//	Nonstandard - cterm.txt
-    showCursor		: '?25h',	//	Nonstandard - cterm.txt
+    hideCursor      : '?25l',   //  Nonstandard - cterm.txt
+    showCursor      : '?25h',   //  Nonstandard - cterm.txt
 
-    queryDeviceAttributes	: 'c',	//	Nonstandard - cterm.txt
+    queryDeviceAttributes   : 'c',  //  Nonstandard - cterm.txt
 
-    //	:TODO: see https://code.google.com/p/conemu-maximus5/wiki/AnsiEscapeCodes
-    //	apparently some terms can report screen size and text area via 18t and 19t
+    //  :TODO: see https://code.google.com/p/conemu-maximus5/wiki/AnsiEscapeCodes
+    //  apparently some terms can report screen size and text area via 18t and 19t
 };
 
 //
-//	Select Graphics Rendition
-//	See http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt
+//  Select Graphics Rendition
+//  See http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt
 //
 const SGRValues = {
-    reset			: 0,
-    bold			: 1,
-    dim				: 2,
-    blink			: 5,
-    fastBlink		: 6,
-    negative		: 7,
-    hidden			: 8,
+    reset           : 0,
+    bold            : 1,
+    dim             : 2,
+    blink           : 5,
+    fastBlink       : 6,
+    negative        : 7,
+    hidden          : 8,
 
-    normal			: 22,	//
-    steady			: 25,
-    positive		: 27,
+    normal          : 22,   //
+    steady          : 25,
+    positive        : 27,
 
-    black			: 30,
-    red				: 31,
-    green			: 32,
-    yellow			: 33,
-    blue			: 34,
-    magenta			: 35,
-    cyan			: 36,
-    white			: 37,
+    black           : 30,
+    red             : 31,
+    green           : 32,
+    yellow          : 33,
+    blue            : 34,
+    magenta         : 35,
+    cyan            : 36,
+    white           : 37,
 
-    blackBG			: 40,
-    redBG			: 41,
-    greenBG			: 42,
-    yellowBG		: 43,
-    blueBG			: 44,
-    magentaBG		: 45,
-    cyanBG			: 46,
-    whiteBG			: 47,
+    blackBG         : 40,
+    redBG           : 41,
+    greenBG         : 42,
+    yellowBG        : 43,
+    blueBG          : 44,
+    magentaBG       : 45,
+    cyanBG          : 46,
+    whiteBG         : 47,
 };
 
 function getFullMatchRegExp(flags = 'g') {
-    //	:TODO: expand this a bit - see strip-ansi/etc.
-    //	:TODO: \u009b ?
-    return new RegExp(/[\u001b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/, flags);	//	eslint-disable-line no-control-regex
+    //  :TODO: expand this a bit - see strip-ansi/etc.
+    //  :TODO: \u009b ?
+    return new RegExp(/[\u001b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/, flags);    //  eslint-disable-line no-control-regex
 }
 
 function getFGColorValue(name) {
@@ -198,20 +198,20 @@ function getBGColorValue(name) {
 }
 
 
-//	See http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt
-//	:TODO: document
-//	:TODO: Create mappings for aliases... maybe make this a map to values instead
-//	:TODO: Break this up in to two parts:
-//	1) FONT_AND_CODE_PAGES (e.g. SyncTERM/cterm)
-//	2) SAUCE_FONT_MAP: Sauce name(s) -> items in FONT_AND_CODE_PAGES.
-//	...we can then have getFontFromSAUCEName(sauceFontName)
-//	Also, create a SAUCE_ENCODING_MAP: SAUCE font name -> encodings
+//  See http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt
+//  :TODO: document
+//  :TODO: Create mappings for aliases... maybe make this a map to values instead
+//  :TODO: Break this up in to two parts:
+//  1) FONT_AND_CODE_PAGES (e.g. SyncTERM/cterm)
+//  2) SAUCE_FONT_MAP: Sauce name(s) -> items in FONT_AND_CODE_PAGES.
+//  ...we can then have getFontFromSAUCEName(sauceFontName)
+//  Also, create a SAUCE_ENCODING_MAP: SAUCE font name -> encodings
 
 //
-//	An array of CTerm/SyncTERM font/encoding values. Each entry's index
-//	corresponds to it's escape sequence value (e.g. cp437 = 0)
+//  An array of CTerm/SyncTERM font/encoding values. Each entry's index
+//  corresponds to it's escape sequence value (e.g. cp437 = 0)
 //
-//	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+//  See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
 //
 const SYNCTERM_FONT_AND_ENCODING_TABLE = [
     'cp437',
@@ -260,54 +260,54 @@ const SYNCTERM_FONT_AND_ENCODING_TABLE = [
 ];
 
 //
-//	A map of various font name/aliases such as those used
-//	in SAUCE records to SyncTERM/CTerm names
+//  A map of various font name/aliases such as those used
+//  in SAUCE records to SyncTERM/CTerm names
 //
-//	This table contains lowercased entries with any spaces
-//	replaced with '_' for lookup purposes.
+//  This table contains lowercased entries with any spaces
+//  replaced with '_' for lookup purposes.
 //
 const FONT_ALIAS_TO_SYNCTERM_MAP = {
-    'cp437'					: 'cp437',
-    'ibm_vga'				: 'cp437',
-    'ibmpc'					: 'cp437',
-    'ibm_pc'				: 'cp437',
-    'pc'					: 'cp437',
-    'cp437_art'	 			: 'cp437',
-    'ibmpcart'				: 'cp437',
-    'ibmpc_art'				: 'cp437',
-    'ibm_pc_art'			: 'cp437',
-    'msdos_art'				: 'cp437',
-    'msdosart'				: 'cp437',
-    'pc_art'				: 'cp437',
-    'pcart'					: 'cp437',
+    'cp437'                 : 'cp437',
+    'ibm_vga'               : 'cp437',
+    'ibmpc'                 : 'cp437',
+    'ibm_pc'                : 'cp437',
+    'pc'                    : 'cp437',
+    'cp437_art'             : 'cp437',
+    'ibmpcart'              : 'cp437',
+    'ibmpc_art'             : 'cp437',
+    'ibm_pc_art'            : 'cp437',
+    'msdos_art'             : 'cp437',
+    'msdosart'              : 'cp437',
+    'pc_art'                : 'cp437',
+    'pcart'                 : 'cp437',
 
-    'ibm_vga50'				: 'cp437',
-    'ibm_vga25g'			: 'cp437',
-    'ibm_ega'				: 'cp437',
-    'ibm_ega43'				: 'cp437',
+    'ibm_vga50'             : 'cp437',
+    'ibm_vga25g'            : 'cp437',
+    'ibm_ega'               : 'cp437',
+    'ibm_ega43'             : 'cp437',
 
-    'topaz'					: 'topaz',
-    'amiga_topaz_1'			: 'topaz',
-    'amiga_topaz_1+'		: 'topaz_plus',
-    'topazplus'				: 'topaz_plus',
-    'topaz_plus'			: 'topaz_plus',
-    'amiga_topaz_2'			: 'topaz',
-    'amiga_topaz_2+'		: 'topaz_plus',
-    'topaz2plus'			: 'topaz_plus',
+    'topaz'                 : 'topaz',
+    'amiga_topaz_1'         : 'topaz',
+    'amiga_topaz_1+'        : 'topaz_plus',
+    'topazplus'             : 'topaz_plus',
+    'topaz_plus'            : 'topaz_plus',
+    'amiga_topaz_2'         : 'topaz',
+    'amiga_topaz_2+'        : 'topaz_plus',
+    'topaz2plus'            : 'topaz_plus',
 
-    'pot_noodle'			: 'pot_noodle',
-    'p0tnoodle'				: 'pot_noodle',
-    'amiga_p0t-noodle'		: 'pot_noodle',
+    'pot_noodle'            : 'pot_noodle',
+    'p0tnoodle'             : 'pot_noodle',
+    'amiga_p0t-noodle'      : 'pot_noodle',
 
-    'mo_soul'				: 'mo_soul',
-    'mosoul'				: 'mo_soul',
-    'mO\'sOul'				: 'mo_soul',
+    'mo_soul'               : 'mo_soul',
+    'mosoul'                : 'mo_soul',
+    'mO\'sOul'              : 'mo_soul',
 
-    'amiga_microknight'		: 'microknight',
-    'amiga_microknight+'	: 'microknight_plus',
+    'amiga_microknight'     : 'microknight',
+    'amiga_microknight+'    : 'microknight_plus',
 
-    'atari'					: 'atari',
-    'atarist'				: 'atari',
+    'atari'                 : 'atari',
+    'atarist'               : 'atari',
 
 };
 
@@ -334,13 +334,13 @@ function setSyncTermFontWithAlias(nameOrAlias) {
 }
 
 const DEC_CURSOR_STYLE = {
-    'blinking block'		: 0,
-    'default'				: 1,
-    'steady block'			: 2,
-    'blinking underline'	: 3,
-    'steady underline'		: 4,
-    'blinking bar'			: 5,
-    'steady bar'			: 6,
+    'blinking block'        : 0,
+    'default'               : 1,
+    'steady block'          : 2,
+    'blinking underline'    : 3,
+    'steady underline'      : 4,
+    'blinking bar'          : 5,
+    'steady bar'            : 6,
 };
 
 function setCursorStyle(cursorStyle) {
@@ -352,21 +352,21 @@ function setCursorStyle(cursorStyle) {
 
 }
 
-//	Create methods such as up(), nextLine(),...
+//  Create methods such as up(), nextLine(),...
 Object.keys(CONTROL).forEach(function onControlName(name) {
     const code = CONTROL[name];
 
     exports[name] = function() {
         let c = code;
         if(arguments.length > 0) {
-            //	arguments are array like -- we want an array
+            //  arguments are array like -- we want an array
             c = Array.prototype.slice.call(arguments).map(Math.round).join(';') + code;
         }
         return `${ESC_CSI}${c}`;
     };
 });
 
-//	Create various color methods such as white(), yellowBG(), reset(), ...
+//  Create various color methods such as white(), yellowBG(), reset(), ...
 Object.keys(SGRValues).forEach( name => {
     const code = SGRValues[name];
 
@@ -377,16 +377,16 @@ Object.keys(SGRValues).forEach( name => {
 
 function sgr() {
     //
-    //	- Allow an single array or variable number of arguments
-    //	- Each element can be either a integer or string found in SGRValues
-    //	  which in turn maps to a integer
+    //  - Allow an single array or variable number of arguments
+    //  - Each element can be either a integer or string found in SGRValues
+    //    which in turn maps to a integer
     //
     if(arguments.length <= 0) {
         return '';
     }
 
-    let result	= [];
-    const args	= Array.isArray(arguments[0]) ? arguments[0] : arguments;
+    let result  = [];
+    const args  = Array.isArray(arguments[0]) ? arguments[0] : arguments;
 
     for(let i = 0; i < args.length; ++i) {
         const arg = args[i];
@@ -401,12 +401,12 @@ function sgr() {
 }
 
 //
-//	Converts a Graphic Rendition object used elsewhere
-//	to a ANSI SGR sequence.
+//  Converts a Graphic Rendition object used elsewhere
+//  to a ANSI SGR sequence.
 //
 function getSGRFromGraphicRendition(graphicRendition, initialReset) {
-    let sgrSeq		= [];
-    let styleCount	= 0;
+    let sgrSeq      = [];
+    let styleCount  = 0;
 
     [ 'intensity', 'underline', 'blink', 'negative', 'invisible' ].forEach( s => {
         if(graphicRendition[s]) {
@@ -431,7 +431,7 @@ function getSGRFromGraphicRendition(graphicRendition, initialReset) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-//	Shortcuts for common functions
+//  Shortcuts for common functions
 ///////////////////////////////////////////////////////////////////////////////
 
 function clearScreen() {
@@ -447,20 +447,20 @@ function normal() {
 }
 
 function goHome() {
-    return exports.goto();	//	no params = home = 1,1
+    return exports.goto();  //  no params = home = 1,1
 }
 
 //
-//	Disable auto line wraping @ termWidth
+//  Disable auto line wraping @ termWidth
 //
-//	See:
-//	http://stjarnhimlen.se/snippets/vt100.txt
-//	https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+//  See:
+//  http://stjarnhimlen.se/snippets/vt100.txt
+//  https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
 //
-//	WARNING:
-//	* Not honored by all clients
-//	* If it is honored, ANSI's that rely on this (e.g. do not have \r\n endings
-//	  and use term width -- generally 80 columns -- will display garbled!
+//  WARNING:
+//  * Not honored by all clients
+//  * If it is honored, ANSI's that rely on this (e.g. do not have \r\n endings
+//    and use term width -- generally 80 columns -- will display garbled!
 //
 function disableVT100LineWrapping() {
     return `${ESC_CSI}?7l`;
@@ -468,20 +468,20 @@ function disableVT100LineWrapping() {
 
 function setEmulatedBaudRate(rate) {
     const speed = {
-        unlimited	: 0,
-        off			: 0,
-        0			: 0,
-        300			: 1,
-        600			: 2,
-        1200		: 3,
-        2400		: 4,
-        4800		: 5,
-        9600		: 6,
-        19200		: 7,
-        38400		: 8,
-        57600		: 9,
-        76800		: 10,
-        115200		: 11,
+        unlimited   : 0,
+        off         : 0,
+        0           : 0,
+        300         : 1,
+        600         : 2,
+        1200        : 3,
+        2400        : 4,
+        4800        : 5,
+        9600        : 6,
+        19200       : 7,
+        38400       : 8,
+        57600       : 9,
+        76800       : 10,
+        115200      : 11,
     }[rate] || 0;
     return 0 === speed ? exports.emulationSpeed() : exports.emulationSpeed(1, speed);
 }
diff --git a/core/archive_util.js b/core/archive_util.js
index d59a2609..c0076dba 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -1,26 +1,26 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config			= require('./config.js').get;
-const stringFormat		= require('./string_format.js');
-const Errors			= require('./enig_error.js').Errors;
-const resolveMimeType	= require('./mime_util.js').resolveMimeType;
+//  ENiGMA½
+const Config            = require('./config.js').get;
+const stringFormat      = require('./string_format.js');
+const Errors            = require('./enig_error.js').Errors;
+const resolveMimeType   = require('./mime_util.js').resolveMimeType;
 
-//	base/modules
-const fs		= require('graceful-fs');
-const _			= require('lodash');
-const pty		= require('node-pty');
-const paths		= require('path');
+//  base/modules
+const fs        = require('graceful-fs');
+const _         = require('lodash');
+const pty       = require('node-pty');
+const paths     = require('path');
 
 let archiveUtil;
 
 class Archiver {
     constructor(config) {
-        this.compress	= config.compress;
-        this.decompress	= config.decompress;
-        this.list		= config.list;
-        this.extract	= config.extract;
+        this.compress   = config.compress;
+        this.decompress = config.decompress;
+        this.list       = config.list;
+        this.extract    = config.extract;
     }
 
     ok() {
@@ -37,7 +37,7 @@ class Archiver {
 
     canCompress() { return this.can('compress'); }
     canDecompress() { return this.can('decompress'); }
-    canList() { return this.can('list'); }	//	:TODO: validate entryMatch
+    canList() { return this.can('list'); }  //  :TODO: validate entryMatch
     canExtract() { return this.can('extract'); }
 }
 
@@ -48,7 +48,7 @@ module.exports = class ArchiveUtil {
         this.longestSignature = 0;
     }
 
-    //	singleton access
+    //  singleton access
     static getInstance() {
         if(!archiveUtil) {
             archiveUtil = new ArchiveUtil();
@@ -59,17 +59,17 @@ module.exports = class ArchiveUtil {
 
     init() {
         //
-        //	Load configuration
+        //  Load configuration
         //
         const config = Config();
         if(_.has(config, 'archives.archivers')) {
             Object.keys(config.archives.archivers).forEach(archKey => {
 
-                const archConfig 	= config.archives.archivers[archKey];
-                const archiver		= new Archiver(archConfig);
+                const archConfig    = config.archives.archivers[archKey];
+                const archiver      = new Archiver(archConfig);
 
                 if(!archiver.ok()) {
-                    //	:TODO: Log warning - bad archiver/config
+                    //  :TODO: Log warning - bad archiver/config
                 }
 
                 this.archivers[archKey] = archiver;
@@ -78,10 +78,10 @@ module.exports = class ArchiveUtil {
 
         if(_.isObject(config.fileTypes)) {
             const updateSig = (ft) => {
-                ft.sig 		= Buffer.from(ft.sig, 'hex');
-                ft.offset	= ft.offset || 0;
+                ft.sig      = Buffer.from(ft.sig, 'hex');
+                ft.offset   = ft.offset || 0;
 
-                //	:TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
+                //  :TODO: this is broken: sig is NOT this long, it's sig.length long; offset needs to allow for -negative values as well
                 const sigLen = ft.offset + ft.sig.length;
                 if(sigLen > this.longestSignature) {
                     this.longestSignature = sigLen;
@@ -106,7 +106,7 @@ module.exports = class ArchiveUtil {
     getArchiver(mimeTypeOrExtension, justExtention) {
         const mimeType = resolveMimeType(mimeTypeOrExtension);
 
-        if(!mimeType) {	//	lookup returns false on failure
+        if(!mimeType) { //  lookup returns false on failure
             return;
         }
 
@@ -115,10 +115,10 @@ module.exports = class ArchiveUtil {
 
         if(Array.isArray(fileType)) {
             if(!justExtention) {
-                //	need extention for lookup; ambiguous as-is :(
+                //  need extention for lookup; ambiguous as-is :(
                 return;
             }
-            //	further refine by extention
+            //  further refine by extention
             fileType = fileType.find(ft => justExtention === ft.ext);
         }
 
@@ -135,11 +135,11 @@ module.exports = class ArchiveUtil {
         return this.getArchiver(archType) ? true : false;
     }
 
-    //	:TODO: implement me:
+    //  :TODO: implement me:
     /*
-	detectTypeWithBuf(buf, cb) {
-	}
-	*/
+    detectTypeWithBuf(buf, cb) {
+    }
+    */
 
     detectType(path, cb) {
         fs.open(path, 'r', (err, fd) => {
@@ -177,8 +177,8 @@ module.exports = class ArchiveUtil {
     }
 
     spawnHandler(proc, action, cb) {
-        //	pty.js doesn't currently give us a error when things fail,
-        //	so we have this horrible, horrible hack:
+        //  pty.js doesn't currently give us a error when things fail,
+        //  so we have this horrible, horrible hack:
         let err;
         proc.once('data', d => {
             if(_.isString(d) && d.startsWith('execvp(3) failed.')) {
@@ -199,8 +199,8 @@ module.exports = class ArchiveUtil {
         }
 
         const fmtObj = {
-            archivePath	: archivePath,
-            fileList	: files.join(' '),	//	:TODO: probably need same hack as extractTo here!
+            archivePath : archivePath,
+            fileList    : files.join(' '),  //  :TODO: probably need same hack as extractTo here!
         };
 
         const args = archiver.compress.args.map( arg => stringFormat(arg, fmtObj) );
@@ -233,25 +233,25 @@ module.exports = class ArchiveUtil {
         }
 
         const fmtObj = {
-            archivePath		: archivePath,
-            extractPath		: extractPath,
+            archivePath     : archivePath,
+            extractPath     : extractPath,
         };
 
         let action = haveFileList ? 'extract' : 'decompress';
         if('extract' === action && !_.isObject(archiver[action])) {
-            //	we're forced to do a full decompress
+            //  we're forced to do a full decompress
             action = 'decompress';
             haveFileList = false;
         }
 
-        //	we need to treat {fileList} special in that it should be broken up to 0:n args
+        //  we need to treat {fileList} special in that it should be broken up to 0:n args
         const args = archiver[action].args.map( arg => {
             return '{fileList}' === arg ? arg : stringFormat(arg, fmtObj);
         });
 
         const fileListPos = args.indexOf('{fileList}');
         if(fileListPos > -1) {
-            //	replace {fileList} with 0:n sep file list arguments
+            //  replace {fileList} with 0:n sep file list arguments
             args.splice.apply(args, [fileListPos, 1].concat(fileList));
         }
 
@@ -273,10 +273,10 @@ module.exports = class ArchiveUtil {
         }
 
         const fmtObj = {
-            archivePath		: archivePath,
+            archivePath     : archivePath,
         };
 
-        const args	= archiver.list.args.map( arg => stringFormat(arg, fmtObj) );
+        const args  = archiver.list.args.map( arg => stringFormat(arg, fmtObj) );
 
         let proc;
         try {
@@ -287,7 +287,7 @@ module.exports = class ArchiveUtil {
 
         let output = '';
         proc.on('data', data => {
-            //	:TODO: hack for: execvp(3) failed.: No such file or directory
+            //  :TODO: hack for: execvp(3) failed.: No such file or directory
 
             output += data;
         });
@@ -304,8 +304,8 @@ module.exports = class ArchiveUtil {
             let m;
             while((m = entryMatchRe.exec(output))) {
                 entries.push({
-                    byteSize	: parseInt(m[entryGroupOrder.byteSize]),
-                    fileName	: m[entryGroupOrder.fileName].trim(),
+                    byteSize    : parseInt(m[entryGroupOrder.byteSize]),
+                    fileName    : m[entryGroupOrder.fileName].trim(),
                 });
             }
 
@@ -315,15 +315,15 @@ module.exports = class ArchiveUtil {
 
     getPtyOpts(extractPath) {
         const opts = {
-            name	: 'enigma-archiver',
-            cols	: 80,
-            rows	: 24,
-            env		: process.env,
+            name    : 'enigma-archiver',
+            cols    : 80,
+            rows    : 24,
+            env     : process.env,
         };
         if(extractPath) {
             opts.cwd = extractPath;
         }
-        //	:TODO: set cwd to supplied temp path if not sepcific extract
+        //  :TODO: set cwd to supplied temp path if not sepcific extract
         return opts;
     }
 };
diff --git a/core/art.js b/core/art.js
index 3a1949b1..315950e1 100644
--- a/core/art.js
+++ b/core/art.js
@@ -1,43 +1,43 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config	= require('./config.js').get;
-const miscUtil	= require('./misc_util.js');
-const ansi		= require('./ansi_term.js');
-const aep		= require('./ansi_escape_parser.js');
-const sauce		= require('./sauce.js');
+//  ENiGMA½
+const Config    = require('./config.js').get;
+const miscUtil  = require('./misc_util.js');
+const ansi      = require('./ansi_term.js');
+const aep       = require('./ansi_escape_parser.js');
+const sauce     = require('./sauce.js');
 
-//	deps
-const fs		= require('graceful-fs');
-const paths		= require('path');
-const assert	= require('assert');
-const iconv		= require('iconv-lite');
-const _			= require('lodash');
-const xxhash	= require('xxhash');
+//  deps
+const fs        = require('graceful-fs');
+const paths     = require('path');
+const assert    = require('assert');
+const iconv     = require('iconv-lite');
+const _         = require('lodash');
+const xxhash    = require('xxhash');
 
-exports.getArt							= getArt;
-exports.getArtFromPath					= getArtFromPath;
-exports.display							= display;
-exports.defaultEncodingFromExtension	= defaultEncodingFromExtension;
+exports.getArt                          = getArt;
+exports.getArtFromPath                  = getArtFromPath;
+exports.display                         = display;
+exports.defaultEncodingFromExtension    = defaultEncodingFromExtension;
 
-//	:TODO: Return MCI code information
-//	:TODO: process SAUCE comments
-//	:TODO: return font + font mapped information from SAUCE
+//  :TODO: Return MCI code information
+//  :TODO: process SAUCE comments
+//  :TODO: return font + font mapped information from SAUCE
 
 const SUPPORTED_ART_TYPES = {
-    //	:TODO: the defualt encoding are really useless if they are all the same ...
-    //	perhaps .ansamiga and .ascamiga could be supported as well as overrides via conf
-    '.ans'	: { name : 'ANSI',		defaultEncoding : 'cp437',	eof : 0x1a	},
-    '.asc'	: { name : 'ASCII',		defaultEncoding : 'cp437',	eof : 0x1a  },
-    '.pcb'	: { name : 'PCBoard',	defaultEncoding : 'cp437',	eof : 0x1a  },
-    '.bbs'	: { name : 'Wildcat',	defaultEncoding : 'cp437',	eof : 0x1a  },
+    //  :TODO: the defualt encoding are really useless if they are all the same ...
+    //  perhaps .ansamiga and .ascamiga could be supported as well as overrides via conf
+    '.ans'  : { name : 'ANSI',      defaultEncoding : 'cp437',  eof : 0x1a  },
+    '.asc'  : { name : 'ASCII',     defaultEncoding : 'cp437',  eof : 0x1a  },
+    '.pcb'  : { name : 'PCBoard',   defaultEncoding : 'cp437',  eof : 0x1a  },
+    '.bbs'  : { name : 'Wildcat',   defaultEncoding : 'cp437',  eof : 0x1a  },
 
-    '.amiga'	: { name : 'Amiga',			defaultEncoding	: 'amiga',	eof : 0x1a },
-    '.txt'		: { name : 'Amiga Text',	defaultEncoding : 'cp437',	eof : 0x1a  },
-    //	:TODO: extentions for wwiv, renegade, celerity, syncronet, ...
-    //	:TODO: extension for atari
-    //	:TODO: extension for topaz ansi/ascii.
+    '.amiga'    : { name : 'Amiga',         defaultEncoding : 'amiga',  eof : 0x1a },
+    '.txt'      : { name : 'Amiga Text',    defaultEncoding : 'cp437',  eof : 0x1a  },
+    //  :TODO: extentions for wwiv, renegade, celerity, syncronet, ...
+    //  :TODO: extension for atari
+    //  :TODO: extension for topaz ansi/ascii.
 };
 
 function getFontNameFromSAUCE(sauce) {
@@ -47,8 +47,8 @@ function getFontNameFromSAUCE(sauce) {
 }
 
 function sliceAtEOF(data, eofMarker) {
-    let eof			= data.length;
-    const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
+    let eof         = data.length;
+    const stopPos   = Math.max(data.length - (256), 0); //  256 = 2 * sizeof(SAUCE)
 
     for(let i = eof - 1; i > stopPos; i--) {
         if(eofMarker === data[i]) {
@@ -66,12 +66,12 @@ function getArtFromPath(path, options, cb) {
         }
 
         //
-        //	Convert from encodedAs -> j
+        //  Convert from encodedAs -> j
         //
-        const ext		= paths.extname(path).toLowerCase();
-        const encoding	= options.encodedAs || defaultEncodingFromExtension(ext);
+        const ext       = paths.extname(path).toLowerCase();
+        const encoding  = options.encodedAs || defaultEncodingFromExtension(ext);
 
-        //	:TODO: how are BOM's currently handled if present? Are they removed? Do we need to?
+        //  :TODO: how are BOM's currently handled if present? Are they removed? Do we need to?
 
         function sliceOfData() {
             if(options.fullFile === true) {
@@ -84,8 +84,8 @@ function getArtFromPath(path, options, cb) {
 
         function getResult(sauce) {
             const result = {
-                data		: sliceOfData(),
-                fromPath	: path,
+                data        : sliceOfData(),
+                fromPath    : path,
             };
 
             if(sauce) {
@@ -102,18 +102,18 @@ function getArtFromPath(path, options, cb) {
                 }
 
                 //
-                //	If a encoding was not provided & we have a mapping from
-                //	the information provided by SAUCE, use that.
+                //  If a encoding was not provided & we have a mapping from
+                //  the information provided by SAUCE, use that.
                 //
                 if(!options.encodedAs) {
                     /*
-					if(sauce.Character && sauce.Character.fontName) {
-						var enc = SAUCE_FONT_TO_ENCODING_HINT[sauce.Character.fontName];
-						if(enc) {
-							encoding = enc;
-						}
-					}
-					*/
+                    if(sauce.Character && sauce.Character.fontName) {
+                        var enc = SAUCE_FONT_TO_ENCODING_HINT[sauce.Character.fontName];
+                        if(enc) {
+                            encoding = enc;
+                        }
+                    }
+                    */
                 }
                 return cb(null, getResult(sauce));
             });
@@ -126,10 +126,10 @@ function getArtFromPath(path, options, cb) {
 function getArt(name, options, cb) {
     const ext = paths.extname(name);
 
-    options.basePath	= miscUtil.valueWithDefault(options.basePath, Config().paths.art);
-    options.asAnsi		= miscUtil.valueWithDefault(options.asAnsi, true);
+    options.basePath    = miscUtil.valueWithDefault(options.basePath, Config().paths.art);
+    options.asAnsi      = miscUtil.valueWithDefault(options.asAnsi, true);
 
-    //	:TODO: make use of asAnsi option and convert from supported -> ansi
+    //  :TODO: make use of asAnsi option and convert from supported -> ansi
 
     if('' !== ext) {
         options.types = [ ext.toLowerCase() ];
@@ -141,7 +141,7 @@ function getArt(name, options, cb) {
         }
     }
 
-    //	If an extension is provided, just read the file now
+    //  If an extension is provided, just read the file now
     if('' !== ext) {
         const directPath = paths.join(options.basePath, name);
         return getArtFromPath(directPath, options, cb);
@@ -225,10 +225,10 @@ function defaultEofFromExtension(ext) {
     }
 }
 
-//	:TODO: Implement the following
-//	* Pause (disabled | termHeight | keyPress )
-//	* Cancel (disabled | <keys> )
-//	* Resume from pause -> continous (disabled | <keys>)
+//  :TODO: Implement the following
+//  * Pause (disabled | termHeight | keyPress )
+//  * Cancel (disabled | <keys> )
+//  * Resume from pause -> continous (disabled | <keys>)
 function display(client, art, options, cb) {
     if(_.isFunction(options) && !cb) {
         cb = options;
@@ -239,25 +239,25 @@ function display(client, art, options, cb) {
         return cb(new Error('Empty art'));
     }
 
-    options.mciReplaceChar 	= options.mciReplaceChar || ' ';
-    options.disableMciCache	= options.disableMciCache || false;
+    options.mciReplaceChar  = options.mciReplaceChar || ' ';
+    options.disableMciCache = options.disableMciCache || false;
 
-    //	:TODO: this is going to be broken into two approaches controlled via options:
-    //	1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
-    //	2) CPR driven
+    //  :TODO: this is going to be broken into two approaches controlled via options:
+    //  1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
+    //  2) CPR driven
 
     if(!_.isBoolean(options.iceColors)) {
-        //	try to detect from SAUCE
+        //  try to detect from SAUCE
         if(_.has(options, 'sauce.ansiFlags') && (options.sauce.ansiFlags & (1 << 0))) {
             options.iceColors = true;
         }
     }
 
     const ansiParser = new aep.ANSIEscapeParser({
-        mciReplaceChar	: options.mciReplaceChar,
-        termHeight		: client.term.termHeight,
-        termWidth		: client.term.termWidth,
-        trailingLF		: options.trailingLF,
+        mciReplaceChar  : options.mciReplaceChar,
+        termHeight      : client.term.termHeight,
+        termWidth       : client.term.termWidth,
+        trailingLF      : options.trailingLF,
     });
 
     let parseComplete = false;
@@ -273,12 +273,12 @@ function display(client, art, options, cb) {
         }
 
         if(!options.disableMciCache && !mciMapFromCache) {
-            //	cache our MCI findings...
+            //  cache our MCI findings...
             client.mciCache[artHash] = mciMap;
             client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Added MCI map to cache');
         }
 
-        ansiParser.removeAllListeners();	//	:TODO: Necessary???
+        ansiParser.removeAllListeners();    //  :TODO: Necessary???
 
         const extraInfo = {
             height : ansiParser.row - 1,
@@ -288,11 +288,11 @@ function display(client, art, options, cb) {
     }
 
     if(!options.disableMciCache) {
-        artHash	= xxhash.hash(Buffer.from(art), 0xCAFEBABE);
+        artHash = xxhash.hash(Buffer.from(art), 0xCAFEBABE);
 
-        //	see if we have a mciMap cached for this art
+        //  see if we have a mciMap cached for this art
         if(client.mciCache) {
-            mciMap	= client.mciCache[artHash];
+            mciMap  = client.mciCache[artHash];
         }
     }
 
@@ -300,7 +300,7 @@ function display(client, art, options, cb) {
         mciMapFromCache = true;
         client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Loaded MCI map from cache');
     } else {
-        //	no cached MCI info
+        //  no cached MCI info
         mciMap = {};
 
         cprListener = function(pos) {
@@ -318,20 +318,20 @@ function display(client, art, options, cb) {
         let generatedId = 100;
 
         ansiParser.on('mci', mciInfo => {
-            //	:TODO: ensure generatedId's do not conflict with any existing |id|
-            const id		= _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
-            const mapKey	= `${mciInfo.mci}${id}`;
-            const mapEntry	= mciMap[mapKey];
+            //  :TODO: ensure generatedId's do not conflict with any existing |id|
+            const id        = _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
+            const mapKey    = `${mciInfo.mci}${id}`;
+            const mapEntry  = mciMap[mapKey];
 
             if(mapEntry) {
-                mapEntry.focusSGR	= mciInfo.SGR;
-                mapEntry.focusArgs	= mciInfo.args;
+                mapEntry.focusSGR   = mciInfo.SGR;
+                mapEntry.focusArgs  = mciInfo.args;
             } else {
                 mciMap[mapKey] = {
-                    args	: mciInfo.args,
-                    SGR		: mciInfo.SGR,
-                    code	: mciInfo.mci,
-                    id		: id,
+                    args    : mciInfo.args,
+                    SGR     : mciInfo.SGR,
+                    code    : mciInfo.mci,
+                    id      : id,
                 };
 
                 if(!mciInfo.id) {
@@ -366,10 +366,10 @@ function display(client, art, options, cb) {
         }
 
         //
-        //	Set SyncTERM font if we're switching only. Most terminals
-        //	that support this ESC sequence can only show *one* font
-        //	at a time. This applies to detection only (e.g. SAUCE).
-        //	If explicit, we'll set it no matter what (above)
+        //  Set SyncTERM font if we're switching only. Most terminals
+        //  that support this ESC sequence can only show *one* font
+        //  at a time. This applies to detection only (e.g. SAUCE).
+        //  If explicit, we'll set it no matter what (above)
         //
         if(fontName && client.term.currentSyncFont != fontName) {
             client.term.currentSyncFont = fontName;
diff --git a/core/asset.js b/core/asset.js
index ece05cfc..2204b1da 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config	= require('./config.js').get;
-const StatLog	= require('./stat_log.js');
+//  ENiGMA½
+const Config    = require('./config.js').get;
+const StatLog   = require('./stat_log.js');
 
-//	deps
-const _			= require('lodash');
-const assert	= require('assert');
+//  deps
+const _         = require('lodash');
+const assert    = require('assert');
 
-exports.parseAsset				= parseAsset;
-exports.getAssetWithShorthand	= getAssetWithShorthand;
-exports.getArtAsset				= getArtAsset;
-exports.getModuleAsset			= getModuleAsset;
-exports.resolveConfigAsset		= resolveConfigAsset;
-exports.resolveSystemStatAsset	= resolveSystemStatAsset;
-exports.getViewPropertyAsset	= getViewPropertyAsset;
+exports.parseAsset              = parseAsset;
+exports.getAssetWithShorthand   = getAssetWithShorthand;
+exports.getArtAsset             = getArtAsset;
+exports.getModuleAsset          = getModuleAsset;
+exports.resolveConfigAsset      = resolveConfigAsset;
+exports.resolveSystemStatAsset  = resolveSystemStatAsset;
+exports.getViewPropertyAsset    = getViewPropertyAsset;
 
 const ALL_ASSETS = [
     'art',
@@ -39,9 +39,9 @@ function parseAsset(s) {
 
         if(m[3]) {
             result.location = m[2];
-            result.asset	= m[3];
+            result.asset    = m[3];
         } else {
-            result.asset	= m[2];
+            result.asset    = m[2];
         }
 
         return result;
@@ -61,8 +61,8 @@ function getAssetWithShorthand(spec, defaultType) {
     }
 
     return {
-        type	: defaultType,
-        asset	: spec,
+        type    : defaultType,
+        asset   : spec,
     };
 }
 
@@ -94,8 +94,8 @@ function resolveConfigAsset(spec) {
     if(asset) {
         assert('config' === asset.type);
 
-        const path	= asset.asset.split('.');
-        let conf	= Config();
+        const path  = asset.asset.split('.');
+        let conf    = Config();
         for(let i = 0; i < path.length; ++i) {
             if(_.isUndefined(conf[path[i]])) {
                 return spec;
diff --git a/core/bbs_link.js b/core/bbs_link.js
index 4034b383..cbb7c036 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -1,54 +1,54 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('./menu_module.js').MenuModule;
-const resetScreen	= require('./ansi_term.js').resetScreen;
+const MenuModule    = require('./menu_module.js').MenuModule;
+const resetScreen   = require('./ansi_term.js').resetScreen;
 
-const async			= require('async');
-const _				= require('lodash');
-const http			= require('http');
-const net			= require('net');
-const crypto		= require('crypto');
+const async         = require('async');
+const _             = require('lodash');
+const http          = require('http');
+const net           = require('net');
+const crypto        = require('crypto');
 
-const packageJson 	= require('../package.json');
+const packageJson   = require('../package.json');
 
 /*
-	Expected configuration block:
+    Expected configuration block:
 
-	{
-		module: bbs_link
-		...
-		config: {
-			sysCode: XXXXX
-			authCode: XXXXX
-			schemeCode: XXXX
-			door: lord
+    {
+        module: bbs_link
+        ...
+        config: {
+            sysCode: XXXXX
+            authCode: XXXXX
+            schemeCode: XXXX
+            door: lord
 
-			//	default hoss: games.bbslink.net
-			host: games.bbslink.net
+            //  default hoss: games.bbslink.net
+            host: games.bbslink.net
 
-			//	defualt port: 23
-			port: 23
-		}
-	}
+            //  defualt port: 23
+            port: 23
+        }
+    }
 */
 
-//	:TODO: BUG: When a client disconnects, it's not handled very well -- the log is spammed with tons of errors
-//	:TODO: ENH: Support nodeMax and tooManyArt
+//  :TODO: BUG: When a client disconnects, it's not handled very well -- the log is spammed with tons of errors
+//  :TODO: ENH: Support nodeMax and tooManyArt
 
 exports.moduleInfo = {
-    name	: 'BBSLink',
-    desc	: 'BBSLink Access Module',
-    author	: 'NuSkooler',
+    name    : 'BBSLink',
+    desc    : 'BBSLink Access Module',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class BBSLinkModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.config			= options.menuConfig.config;
-        this.config.host	= this.config.host || 'games.bbslink.net';
-        this.config.port	= this.config.port || 23;
+        this.config         = options.menuConfig.config;
+        this.config.host    = this.config.host || 'games.bbslink.net';
+        this.config.port    = this.config.port || 23;
     }
 
     initSequence() {
@@ -61,9 +61,9 @@ exports.getModule = class BBSLinkModule extends MenuModule {
             [
                 function validateConfig(callback) {
                     if(_.isString(self.config.sysCode) &&
-						_.isString(self.config.authCode) &&
-						_.isString(self.config.schemeCode) &&
-						_.isString(self.config.door))
+                        _.isString(self.config.authCode) &&
+                        _.isString(self.config.schemeCode) &&
+                        _.isString(self.config.door))
                     {
                         callback(null);
                     } else {
@@ -72,7 +72,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                 },
                 function acquireToken(callback) {
                     //
-                    //	Acquire an authentication token
+                    //  Acquire an authentication token
                     //
                     crypto.randomBytes(16, function rand(ex, buf) {
                         if(ex) {
@@ -93,19 +93,19 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                 },
                 function authenticateToken(callback) {
                     //
-                    //	Authenticate the token we acquired previously
+                    //  Authenticate the token we acquired previously
                     //
                     var headers = {
-                        'X-User'	: self.client.user.userId.toString(),
-                        'X-System'	: self.config.sysCode,
-                        'X-Auth'	: crypto.createHash('md5').update(self.config.authCode + token).digest('hex'),
-                        'X-Code'	: crypto.createHash('md5').update(self.config.schemeCode + token).digest('hex'),
-                        'X-Rows'	: self.client.term.termHeight.toString(),
-                        'X-Key'		: randomKey,
-                        'X-Door'	: self.config.door,
-                        'X-Token'	: token,
-                        'X-Type'	: 'enigma-bbs',
-                        'X-Version'	: packageJson.version,
+                        'X-User'    : self.client.user.userId.toString(),
+                        'X-System'  : self.config.sysCode,
+                        'X-Auth'    : crypto.createHash('md5').update(self.config.authCode + token).digest('hex'),
+                        'X-Code'    : crypto.createHash('md5').update(self.config.schemeCode + token).digest('hex'),
+                        'X-Rows'    : self.client.term.termHeight.toString(),
+                        'X-Key'     : randomKey,
+                        'X-Door'    : self.config.door,
+                        'X-Token'   : token,
+                        'X-Type'    : 'enigma-bbs',
+                        'X-Version' : packageJson.version,
                     };
 
                     self.simpleHttpRequest('/auth.php?key=' + randomKey, headers, function resp(err, body) {
@@ -120,12 +120,12 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                 },
                 function createTelnetBridge(callback) {
                     //
-                    //	Authentication with BBSLink successful. Now, we need to create a telnet
-                    //	bridge from us to them
+                    //  Authentication with BBSLink successful. Now, we need to create a telnet
+                    //  bridge from us to them
                     //
                     var connectOpts = {
-                        port	: self.config.port,
-                        host	: self.config.host,
+                        port    : self.config.port,
+                        host    : self.config.host,
                     };
 
                     var clientTerminated;
@@ -151,8 +151,8 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     };
 
                     bridgeConnection.on('data', function incomingData(data) {
-                        //	pass along
-                        //	:TODO: just pipe this as well
+                        //  pass along
+                        //  :TODO: just pipe this as well
                         self.client.term.rawWrite(data);
                     });
 
@@ -182,9 +182,9 @@ exports.getModule = class BBSLinkModule extends MenuModule {
 
     simpleHttpRequest(path, headers, cb) {
         const getOpts = {
-            host	: this.config.host,
-            path	: path,
-            headers	: headers,
+            host    : this.config.host,
+            path    : path,
+            headers : headers,
         };
 
         const req = http.get(getOpts, function response(resp) {
diff --git a/core/bbs_list.js b/core/bbs_list.js
index b0da3dbb..2f9b6084 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -1,73 +1,73 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
 
 const {
     getModDatabasePath,
     getTransactionDatabase
-}							= require('./database.js');
+}                           = require('./database.js');
 
-const ViewController		= require('./view_controller.js').ViewController;
-const ansi					= require('./ansi_term.js');
-const theme					= require('./theme.js');
-const User					= require('./user.js');
-const stringFormat			= require('./string_format.js');
+const ViewController        = require('./view_controller.js').ViewController;
+const ansi                  = require('./ansi_term.js');
+const theme                 = require('./theme.js');
+const User                  = require('./user.js');
+const stringFormat          = require('./string_format.js');
 
-//	deps
-const async 				= require('async');
-const sqlite3				= require('sqlite3');
-const _						= require('lodash');
+//  deps
+const async                 = require('async');
+const sqlite3               = require('sqlite3');
+const _                     = require('lodash');
 
-//	:TODO: add notes field
+//  :TODO: add notes field
 
 const moduleInfo = exports.moduleInfo = {
-    name		: 'BBS List',
-    desc		: 'List of other BBSes',
-    author		: 'Andrew Pamment',
-    packageName	: 'com.magickabbs.enigma.bbslist'
+    name        : 'BBS List',
+    desc        : 'List of other BBSes',
+    author      : 'Andrew Pamment',
+    packageName : 'com.magickabbs.enigma.bbslist'
 };
 
 const MciViewIds = {
     view : {
-        BBSList					: 1,
-        SelectedBBSName			: 2,
-        SelectedBBSSysOp		: 3,
-        SelectedBBSTelnet		: 4,
-        SelectedBBSWww			: 5,
-        SelectedBBSLoc			: 6,
-        SelectedBBSSoftware		: 7,
-        SelectedBBSNotes		: 8,
-        SelectedBBSSubmitter	: 9,
+        BBSList                 : 1,
+        SelectedBBSName         : 2,
+        SelectedBBSSysOp        : 3,
+        SelectedBBSTelnet       : 4,
+        SelectedBBSWww          : 5,
+        SelectedBBSLoc          : 6,
+        SelectedBBSSoftware     : 7,
+        SelectedBBSNotes        : 8,
+        SelectedBBSSubmitter    : 9,
     },
     add : {
-        BBSName		: 1,
-        Sysop		: 2,
-        Telnet		: 3,
-        Www			: 4,
-        Location	: 5,
-        Software	: 6,
-        Notes		: 7,
-        Error		: 8,
+        BBSName     : 1,
+        Sysop       : 2,
+        Telnet      : 3,
+        Www         : 4,
+        Location    : 5,
+        Software    : 6,
+        Notes       : 7,
+        Error       : 8,
     }
 };
 
 const FormIds = {
-    View	: 0,
-    Add		: 1,
+    View    : 0,
+    Add     : 1,
 };
 
 const SELECTED_MCI_NAME_TO_ENTRY = {
-    SelectedBBSName			: 'bbsName',
-    SelectedBBSSysOp		: 'sysOp',
-    SelectedBBSTelnet		: 'telnet',
-    SelectedBBSWww			: 'www',
-    SelectedBBSLoc			: 'location',
-    SelectedBBSSoftware		: 'software',
-    SelectedBBSSubmitter	: 'submitter',
-    SelectedBBSSubmitterId	: 'submitterUserId',
-    SelectedBBSNotes		: 'notes',
+    SelectedBBSName         : 'bbsName',
+    SelectedBBSSysOp        : 'sysOp',
+    SelectedBBSTelnet       : 'telnet',
+    SelectedBBSWww          : 'www',
+    SelectedBBSLoc          : 'location',
+    SelectedBBSSoftware     : 'software',
+    SelectedBBSSubmitter    : 'submitter',
+    SelectedBBSSubmitterId  : 'submitterUserId',
+    SelectedBBSNotes        : 'notes',
 };
 
 exports.getModule = class BBSListModule extends MenuModule {
@@ -77,7 +77,7 @@ exports.getModule = class BBSListModule extends MenuModule {
         const self = this;
         this.menuMethods = {
             //
-            //	Validators
+            //  Validators
             //
             viewValidationListener : function(err, cb) {
                 const errMsgView = self.viewControllers.add.getView(MciViewIds.add.Error);
@@ -93,7 +93,7 @@ exports.getModule = class BBSListModule extends MenuModule {
             },
 
             //
-            //	Key & submit handlers
+            //  Key & submit handlers
             //
             addBBS : function(formData, extraArgs, cb) {
                 self.displayAddScreen(cb);
@@ -106,7 +106,7 @@ exports.getModule = class BBSListModule extends MenuModule {
                 const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
 
                 if(self.entries[self.selectedBBS].submitterUserId !== self.client.user.userId && !self.client.user.isSysOp()) {
-                    //	must be owner or +op
+                    //  must be owner or +op
                     return cb(null);
                 }
 
@@ -117,7 +117,7 @@ exports.getModule = class BBSListModule extends MenuModule {
 
                 self.database.run(
                     `DELETE FROM bbs_list 
-					WHERE id=?;`,
+                    WHERE id=?;`,
                     [ entry.id ],
                     err => {
                         if (err) {
@@ -147,13 +147,13 @@ exports.getModule = class BBSListModule extends MenuModule {
                     }
                 });
                 if(!ok) {
-                    //	validators should prevent this!
+                    //  validators should prevent this!
                     return cb(null);
                 }
 
                 self.database.run(
                     `INSERT INTO bbs_list (bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes) 
-					VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
+                    VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
                     [
                         formData.value.name, formData.value.sysop, formData.value.telnet, formData.value.www,
                         formData.value.location, formData.value.software, self.client.user.userId, formData.value.notes
@@ -188,7 +188,7 @@ exports.getModule = class BBSListModule extends MenuModule {
             ],
             err => {
                 if(err) {
-                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                    //  :TODO: Handle me -- initSequence() should really take a completion callback
                 }
                 self.finishedLoading();
             }
@@ -218,9 +218,9 @@ exports.getModule = class BBSListModule extends MenuModule {
     }
 
     setEntries(entriesView) {
-        const config			= this.menuConfig.config;
-        const listFormat		= config.listFormat || '{bbsName}';
-        const focusListFormat	= config.focusListFormat || '{bbsName}';
+        const config            = this.menuConfig.config;
+        const listFormat        = config.listFormat || '{bbsName}';
+        const focusListFormat   = config.focusListFormat || '{bbsName}';
 
         entriesView.setItems(this.entries.map( e => stringFormat(listFormat, e) ) );
         entriesView.setFocusItems(this.entries.map( e => stringFormat(focusListFormat, e) ) );
@@ -255,9 +255,9 @@ exports.getModule = class BBSListModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.View,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.View,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -273,19 +273,19 @@ exports.getModule = class BBSListModule extends MenuModule {
 
                     self.database.each(
                         `SELECT id, bbs_name, sysop, telnet, www, location, software, submitter_user_id, notes
-						FROM bbs_list;`,
+                        FROM bbs_list;`,
                         (err, row) => {
                             if (!err) {
                                 self.entries.push({
-                                    id				: row.id,
-                                    bbsName			: row.bbs_name,
-                                    sysOp			: row.sysop,
-                                    telnet			: row.telnet,
-                                    www				: row.www,
-                                    location		: row.location,
-                                    software		: row.software,
-                                    submitterUserId	: row.submitter_user_id,
-                                    notes			: row.notes,
+                                    id              : row.id,
+                                    bbsName         : row.bbs_name,
+                                    sysOp           : row.sysop,
+                                    telnet          : row.telnet,
+                                    www             : row.www,
+                                    location        : row.location,
+                                    software        : row.software,
+                                    submitterUserId : row.submitter_user_id,
+                                    notes           : row.notes,
                                 });
                             }
                         },
@@ -371,9 +371,9 @@ exports.getModule = class BBSListModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.Add,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.Add,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -414,16 +414,16 @@ exports.getModule = class BBSListModule extends MenuModule {
                     self.database.serialize( () => {
                         self.database.run(
                             `CREATE TABLE IF NOT EXISTS bbs_list (
-								id					INTEGER PRIMARY KEY,
-								bbs_name			VARCHAR NOT NULL,
-								sysop				VARCHAR NOT NULL,
-								telnet				VARCHAR NOT NULL,
-								www					VARCHAR,
-								location			VARCHAR,
-								software			VARCHAR,
-								submitter_user_id	INTEGER NOT NULL,
-								notes				VARCHAR
-							);`
+                                id                  INTEGER PRIMARY KEY,
+                                bbs_name            VARCHAR NOT NULL,
+                                sysop               VARCHAR NOT NULL,
+                                telnet              VARCHAR NOT NULL,
+                                www                 VARCHAR,
+                                location            VARCHAR,
+                                software            VARCHAR,
+                                submitter_user_id   INTEGER NOT NULL,
+                                notes               VARCHAR
+                            );`
                         );
                     });
                     callback(null);
diff --git a/core/button_view.js b/core/button_view.js
index 6c86b5c3..63de435a 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -1,17 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-const TextView		= require('./text_view.js').TextView;
-const miscUtil		= require('./misc_util.js');
-const util			= require('util');
+const TextView      = require('./text_view.js').TextView;
+const miscUtil      = require('./misc_util.js');
+const util          = require('util');
 
-exports.ButtonView			= ButtonView;
+exports.ButtonView          = ButtonView;
 
 function ButtonView(options) {
-    options.acceptsFocus	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-    options.justify			= miscUtil.valueWithDefault(options.justify, 'center');
-    options.cursor 			= miscUtil.valueWithDefault(options.cursor, 'hide');
+    options.acceptsFocus    = miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput    = miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.justify         = miscUtil.valueWithDefault(options.justify, 'center');
+    options.cursor          = miscUtil.valueWithDefault(options.cursor, 'hide');
 
     TextView.call(this, options);
 }
@@ -29,12 +29,12 @@ ButtonView.prototype.onKeyPress = function(ch, key) {
 };
 /*
 ButtonView.prototype.onKeyPress = function(ch, key) {
-	//	allow space = submit
-	if(' ' === ch) {
-		this.emit('action', 'accept');
-	}
+    //  allow space = submit
+    if(' ' === ch) {
+        this.emit('action', 'accept');
+    }
 
-	ButtonView.super_.prototype.onKeyPress.call(this, ch, key);
+    ButtonView.super_.prototype.onKeyPress.call(this, ch, key);
 };
 */
 
diff --git a/core/client.js b/core/client.js
index 4347c0b2..a2eb4bc3 100644
--- a/core/client.js
+++ b/core/client.js
@@ -2,69 +2,69 @@
 'use strict';
 
 /*
-	Portions of this code for key handling heavily inspired from the following:
-	https://github.com/chjj/blessed/blob/master/lib/keys.js
+    Portions of this code for key handling heavily inspired from the following:
+    https://github.com/chjj/blessed/blob/master/lib/keys.js
 
-	chji's blessed is MIT licensed:
+    chji's blessed is MIT licensed:
 
-	----/snip/----------------------
-	The MIT License (MIT)
+    ----/snip/----------------------
+    The MIT License (MIT)
 
-	Copyright (c) <year> <copyright holders>
+    Copyright (c) <year> <copyright holders>
 
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
 
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-	----/snip/----------------------
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+    ----/snip/----------------------
 */
-//	ENiGMA½
-const term		= require('./client_term.js');
-const ansi		= require('./ansi_term.js');
-const User		= require('./user.js');
-const Config	= require('./config.js').get;
-const MenuStack	= require('./menu_stack.js');
-const ACS		= require('./acs.js');
-const Events	= require('./events.js');
+//  ENiGMA½
+const term      = require('./client_term.js');
+const ansi      = require('./ansi_term.js');
+const User      = require('./user.js');
+const Config    = require('./config.js').get;
+const MenuStack = require('./menu_stack.js');
+const ACS       = require('./acs.js');
+const Events    = require('./events.js');
 
-//	deps
-const stream	= require('stream');
-const assert	= require('assert');
-const _			= require('lodash');
+//  deps
+const stream    = require('stream');
+const assert    = require('assert');
+const _         = require('lodash');
 
-exports.Client	= Client;
+exports.Client  = Client;
 
-//	:TODO: Move all of the key stuff to it's own module
+//  :TODO: Move all of the key stuff to it's own module
 
 //
-//	Resources & Standards:
-//	* http://www.ansi-bbs.org/ansi-bbs-core-server.html
+//  Resources & Standards:
+//  * http://www.ansi-bbs.org/ansi-bbs-core-server.html
 //
-const RE_DSR_RESPONSE_ANYWHERE		= /(?:\u001b\[)([0-9;]+)(R)/;
-const RE_DEV_ATTR_RESPONSE_ANYWHERE	= /(?:\u001b\[)[=?]([0-9a-zA-Z;]+)(c)/;
-const RE_META_KEYCODE_ANYWHERE		= /(?:\u001b)([a-zA-Z0-9])/;
-const RE_META_KEYCODE				= new RegExp('^' + RE_META_KEYCODE_ANYWHERE.source + '$');
-const RE_FUNCTION_KEYCODE_ANYWHERE	= new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:' + [
+const RE_DSR_RESPONSE_ANYWHERE      = /(?:\u001b\[)([0-9;]+)(R)/;
+const RE_DEV_ATTR_RESPONSE_ANYWHERE = /(?:\u001b\[)[=?]([0-9a-zA-Z;]+)(c)/;
+const RE_META_KEYCODE_ANYWHERE      = /(?:\u001b)([a-zA-Z0-9])/;
+const RE_META_KEYCODE               = new RegExp('^' + RE_META_KEYCODE_ANYWHERE.source + '$');
+const RE_FUNCTION_KEYCODE_ANYWHERE  = new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:' + [
     '(\\d+)(?:;(\\d+))?([~^$])',
-    '(?:M([@ #!a`])(.)(.))',		// mouse stuff
+    '(?:M([@ #!a`])(.)(.))',        // mouse stuff
     '(?:1;)?(\\d+)?([a-zA-Z@])'
 ].join('|') + ')');
 
-const RE_FUNCTION_KEYCODE			= new RegExp('^' + RE_FUNCTION_KEYCODE_ANYWHERE.source);
-const RE_ESC_CODE_ANYWHERE			= new RegExp( [
+const RE_FUNCTION_KEYCODE           = new RegExp('^' + RE_FUNCTION_KEYCODE_ANYWHERE.source);
+const RE_ESC_CODE_ANYWHERE          = new RegExp( [
     RE_FUNCTION_KEYCODE_ANYWHERE.source,
     RE_META_KEYCODE_ANYWHERE.source,
     RE_DSR_RESPONSE_ANYWHERE.source,
@@ -76,14 +76,14 @@ const RE_ESC_CODE_ANYWHERE			= new RegExp( [
 function Client(/*input, output*/) {
     stream.call(this);
 
-    const self	= this;
+    const self  = this;
 
-    this.user				= new User();
-    this.currentTheme		= { info : { name : 'N/A', description : 'None' } };
-    this.lastKeyPressMs		= Date.now();
-    this.menuStack			= new MenuStack(this);
-    this.acs				= new ACS(this);
-    this.mciCache			= {};
+    this.user               = new User();
+    this.currentTheme       = { info : { name : 'N/A', description : 'None' } };
+    this.lastKeyPressMs     = Date.now();
+    this.menuStack          = new MenuStack(this);
+    this.acs                = new ACS(this);
+    this.mciCache           = {};
 
     this.clearMciCache = function() {
         this.mciCache = {};
@@ -119,34 +119,34 @@ function Client(/*input, output*/) {
 
 
     //
-    //	Peek at incoming |data| and emit events for any special
-    //	handling that may include:
-    //	*	Keyboard input
-    //	*	ANSI CSR's and the like
+    //  Peek at incoming |data| and emit events for any special
+    //  handling that may include:
+    //  *   Keyboard input
+    //  *   ANSI CSR's and the like
     //
-    //	References:
-    //	*	http://www.ansi-bbs.org/ansi-bbs-core-server.html
-    //	*	Christopher Jeffrey's Blessed library @ https://github.com/chjj/blessed/
+    //  References:
+    //  *   http://www.ansi-bbs.org/ansi-bbs-core-server.html
+    //  *   Christopher Jeffrey's Blessed library @ https://github.com/chjj/blessed/
     //
     this.getTermClient = function(deviceAttr) {
         let termClient = {
             //
-            //	See http://www.fbl.cz/arctel/download/techman.pdf
+            //  See http://www.fbl.cz/arctel/download/techman.pdf
             //
-            //	Known clients:
-            //	* Irssi ConnectBot (Android)
+            //  Known clients:
+            //  * Irssi ConnectBot (Android)
             //
-            '63;1;2'		: 'arctel',
-            '50;86;84;88'	: 'vtx',
+            '63;1;2'        : 'arctel',
+            '50;86;84;88'   : 'vtx',
         }[deviceAttr];
 
         if(!termClient) {
             if(_.startsWith(deviceAttr, '67;84;101;114;109')) {
                 //
-                //	See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
+                //  See https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt
                 //
-                //	Known clients:
-                //	* SyncTERM
+                //  Known clients:
+                //  * SyncTERM
                 //
                 termClient = 'cterm';
             }
@@ -156,18 +156,18 @@ function Client(/*input, output*/) {
     };
 
     this.isMouseInput = function(data) {
-        return /\x1b\[M/.test(data) ||							//	eslint-disable-line no-control-regex
-			/\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||	//	eslint-disable-line no-control-regex
-			/\u001b\[(\d+;\d+;\d+)M/.test(data) ||
-			/\u001b\[<(\d+;\d+;\d+)([mM])/.test(data) ||
-			/\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) ||
-			/\u001b\[24([0135])~\[(\d+),(\d+)\]\r/.test(data) ||
-			/\u001b\[(O|I)/.test(data);
+        return /\x1b\[M/.test(data) ||                          //  eslint-disable-line no-control-regex
+            /\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||   //  eslint-disable-line no-control-regex
+            /\u001b\[(\d+;\d+;\d+)M/.test(data) ||
+            /\u001b\[<(\d+;\d+;\d+)([mM])/.test(data) ||
+            /\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) ||
+            /\u001b\[24([0135])~\[(\d+),(\d+)\]\r/.test(data) ||
+            /\u001b\[(O|I)/.test(data);
     };
 
     this.getKeyComponentsFromCode = function(code) {
         return {
-            //	xterm/gnome
+            //  xterm/gnome
             'OP' : { name : 'f1' },
             'OQ' : { name : 'f2' },
             'OR' : { name : 'f3' },
@@ -181,93 +181,93 @@ function Client(/*input, output*/) {
             'OF' : { name : 'end' },
             'OH' : { name : 'home' },
 
-            //	xterm/rxvt
-            '[11~'	: { name : 'f1' },
-            '[12~'	: { name : 'f2' },
-            '[13~'	: { name : 'f3' },
-            '[14~'	: { name : 'f4' },
+            //  xterm/rxvt
+            '[11~'  : { name : 'f1' },
+            '[12~'  : { name : 'f2' },
+            '[13~'  : { name : 'f3' },
+            '[14~'  : { name : 'f4' },
 
-            '[1~'	: { name : 'home' },
-            '[2~'	: { name : 'insert' },
-            '[3~'	: { name : 'delete' },
-            '[4~'	: { name : 'end' },
-            '[5~'	: { name : 'page up' },
-            '[6~'	: { name : 'page down' },
+            '[1~'   : { name : 'home' },
+            '[2~'   : { name : 'insert' },
+            '[3~'   : { name : 'delete' },
+            '[4~'   : { name : 'end' },
+            '[5~'   : { name : 'page up' },
+            '[6~'   : { name : 'page down' },
 
-            //	Cygwin & libuv
-            '[[A'	: { name : 'f1' },
-            '[[B'	: { name : 'f2' },
-            '[[C'	: { name : 'f3' },
-            '[[D'	: { name : 'f4' },
-            '[[E'	: { name : 'f5' },
+            //  Cygwin & libuv
+            '[[A'   : { name : 'f1' },
+            '[[B'   : { name : 'f2' },
+            '[[C'   : { name : 'f3' },
+            '[[D'   : { name : 'f4' },
+            '[[E'   : { name : 'f5' },
 
-            //	Common impls
-            '[15~'	: { name : 'f5' },
-            '[17~'	: { name : 'f6' },
-            '[18~'	: { name : 'f7' },
-            '[19~'	: { name : 'f8' },
-            '[20~'	: { name : 'f9' },
-            '[21~'	: { name : 'f10' },
-            '[23~'	: { name : 'f11' },
-            '[24~'	: { name : 'f12' },
+            //  Common impls
+            '[15~'  : { name : 'f5' },
+            '[17~'  : { name : 'f6' },
+            '[18~'  : { name : 'f7' },
+            '[19~'  : { name : 'f8' },
+            '[20~'  : { name : 'f9' },
+            '[21~'  : { name : 'f10' },
+            '[23~'  : { name : 'f11' },
+            '[24~'  : { name : 'f12' },
 
-            //	xterm
-            '[A'	: { name : 'up arrow' },
-            '[B'	: { name : 'down arrow' },
-            '[C'	: { name : 'right arrow' },
-            '[D'	: { name : 'left arrow' },
-            '[E'	: { name : 'clear' },
-            '[F'	: { name : 'end' },
-            '[H'	: { name : 'home' },
+            //  xterm
+            '[A'    : { name : 'up arrow' },
+            '[B'    : { name : 'down arrow' },
+            '[C'    : { name : 'right arrow' },
+            '[D'    : { name : 'left arrow' },
+            '[E'    : { name : 'clear' },
+            '[F'    : { name : 'end' },
+            '[H'    : { name : 'home' },
 
-            //	PuTTY
-            '[[5~'	: { name : 'page up' },
-            '[[6~'	: { name : 'page down' },
+            //  PuTTY
+            '[[5~'  : { name : 'page up' },
+            '[[6~'  : { name : 'page down' },
 
-            //	rvxt
-            '[7~'	: { name : 'home' },
-            '[8~'	: { name : 'end' },
+            //  rvxt
+            '[7~'   : { name : 'home' },
+            '[8~'   : { name : 'end' },
 
-            //	rxvt with modifiers
-            '[a'	: { name : 'up arrow', shift : true },
-            '[b'	: { name : 'down arrow', shift : true },
-            '[c'	: { name : 'right arrow', shift : true },
-            '[d'	: { name : 'left arrow', shift : true },
-            '[e'	: { name : 'clear', shift : true },
+            //  rxvt with modifiers
+            '[a'    : { name : 'up arrow', shift : true },
+            '[b'    : { name : 'down arrow', shift : true },
+            '[c'    : { name : 'right arrow', shift : true },
+            '[d'    : { name : 'left arrow', shift : true },
+            '[e'    : { name : 'clear', shift : true },
 
-            '[2$'	: { name : 'insert', shift : true },
-            '[3$'	: { name : 'delete', shift : true },
-            '[5$'	: { name : 'page up', shift : true },
-            '[6$'	: { name : 'page down', shift : true },
-            '[7$'	: { name : 'home', shift : true },
-            '[8$'	: { name : 'end', shift : true },
+            '[2$'   : { name : 'insert', shift : true },
+            '[3$'   : { name : 'delete', shift : true },
+            '[5$'   : { name : 'page up', shift : true },
+            '[6$'   : { name : 'page down', shift : true },
+            '[7$'   : { name : 'home', shift : true },
+            '[8$'   : { name : 'end', shift : true },
 
-            'Oa'	: { name : 'up arrow', ctrl :  true },
-            'Ob'	: { name : 'down arrow', ctrl :  true },
-            'Oc'	: { name : 'right arrow', ctrl :  true },
-            'Od'	: { name : 'left arrow', ctrl :  true },
-            'Oe'	: { name : 'clear', ctrl :  true },
+            'Oa'    : { name : 'up arrow', ctrl :  true },
+            'Ob'    : { name : 'down arrow', ctrl :  true },
+            'Oc'    : { name : 'right arrow', ctrl :  true },
+            'Od'    : { name : 'left arrow', ctrl :  true },
+            'Oe'    : { name : 'clear', ctrl :  true },
 
-            '[2^'	: { name : 'insert', ctrl :  true },
-            '[3^'	: { name : 'delete', ctrl :  true },
-            '[5^'	: { name : 'page up', ctrl :  true },
-            '[6^'	: { name : 'page down', ctrl :  true },
-            '[7^'	: { name : 'home', ctrl :  true },
-            '[8^'	: { name : 'end', ctrl :  true },
+            '[2^'   : { name : 'insert', ctrl :  true },
+            '[3^'   : { name : 'delete', ctrl :  true },
+            '[5^'   : { name : 'page up', ctrl :  true },
+            '[6^'   : { name : 'page down', ctrl :  true },
+            '[7^'   : { name : 'home', ctrl :  true },
+            '[8^'   : { name : 'end', ctrl :  true },
 
-            //	SyncTERM / EtherTerm
-            '[K'	: { name : 'end' },
-            '[@'	: { name : 'insert' },
-            '[V'	: { name : 'page up' },
-            '[U'	: { name : 'page down' },
+            //  SyncTERM / EtherTerm
+            '[K'    : { name : 'end' },
+            '[@'    : { name : 'insert' },
+            '[V'    : { name : 'page up' },
+            '[U'    : { name : 'page down' },
 
-            //	other
-            '[Z'	: { name : 'tab', shift : true },
+            //  other
+            '[Z'    : { name : 'tab', shift : true },
         }[code];
     };
 
     this.on('data', function clientData(data) {
-        //	create a uniform format that can be parsed below
+        //  create a uniform format that can be parsed below
         if(data[0] > 127 && undefined === data[1]) {
             data[0] -= 128;
             data = '\u001b' + data.toString('utf-8');
@@ -287,15 +287,15 @@ function Client(/*input, output*/) {
             data = data.slice(m.index + m[0].length);
         }
 
-        buf = buf.concat(data.split(''));	//	remainder
+        buf = buf.concat(data.split(''));   //  remainder
 
         buf.forEach(function bufPart(s) {
             var key = {
-                seq			: s,
-                name		: undefined,
-                ctrl		: false,
-                meta		: false,
-                shift		: false,
+                seq         : s,
+                name        : undefined,
+                ctrl        : false,
+                meta        : false,
+                shift       : false,
             };
 
             var parts;
@@ -325,55 +325,55 @@ function Client(/*input, output*/) {
                 key.name = 'tab';
             } else if('\x7f' === s) {
                 //
-                //	Backspace vs delete is a crazy thing, especially in *nix.
-                //	- ANSI-BBS uses 0x7f for DEL
-                //	- xterm et. al clients send 0x7f for backspace... ugg.
+                //  Backspace vs delete is a crazy thing, especially in *nix.
+                //  - ANSI-BBS uses 0x7f for DEL
+                //  - xterm et. al clients send 0x7f for backspace... ugg.
                 //
-                //	See http://www.hypexr.org/linux_ruboff.php
-                //	And a great discussion @ https://lists.debian.org/debian-i18n/1998/04/msg00015.html
+                //  See http://www.hypexr.org/linux_ruboff.php
+                //  And a great discussion @ https://lists.debian.org/debian-i18n/1998/04/msg00015.html
                 //
                 if(self.term.isNixTerm()) {
-                    key.name	= 'backspace';
+                    key.name    = 'backspace';
                 } else {
-                    key.name	= 'delete';
+                    key.name    = 'delete';
                 }
             } else if ('\b' === s || '\x1b\x7f' === s || '\x1b\b' === s) {
-                //	backspace, CTRL-H
-                key.name	= 'backspace';
-                key.meta	= ('\x1b' === s.charAt(0));
+                //  backspace, CTRL-H
+                key.name    = 'backspace';
+                key.meta    = ('\x1b' === s.charAt(0));
             } else if('\x1b' === s || '\x1b\x1b' === s) {
-                key.name	= 'escape';
-                key.meta	= (2 === s.length);
+                key.name    = 'escape';
+                key.meta    = (2 === s.length);
             } else if (' ' === s || '\x1b ' === s) {
-                //	rather annoying that space can come in other than just " "
-                key.name	= 'space';
-                key.meta	= (2 === s.length);
+                //  rather annoying that space can come in other than just " "
+                key.name    = 'space';
+                key.meta    = (2 === s.length);
             } else if(1 === s.length && s <= '\x1a') {
-                //	CTRL-<letter>
-                key.name	= String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
-                key.ctrl	= true;
+                //  CTRL-<letter>
+                key.name    = String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
+                key.ctrl    = true;
             } else if(1 === s.length && s >= 'a' && s <= 'z') {
-                //	normal, lowercased letter
-                key.name	= s;
+                //  normal, lowercased letter
+                key.name    = s;
             } else if(1 === s.length && s >= 'A' && s <= 'Z') {
-                key.name	= s.toLowerCase();
-                key.shift	= true;
+                key.name    = s.toLowerCase();
+                key.shift   = true;
             } else if ((parts = RE_META_KEYCODE.exec(s))) {
-                //	meta with character key
-                key.name	= parts[1].toLowerCase();
-                key.meta	= true;
-                key.shift	= /^[A-Z]$/.test(parts[1]);
+                //  meta with character key
+                key.name    = parts[1].toLowerCase();
+                key.meta    = true;
+                key.shift   = /^[A-Z]$/.test(parts[1]);
             } else if((parts = RE_FUNCTION_KEYCODE.exec(s))) {
                 var code =
-					(parts[1] || '') + (parts[2] || '') +
-					(parts[4] || '') + (parts[9] || '');
+                    (parts[1] || '') + (parts[2] || '') +
+                    (parts[4] || '') + (parts[9] || '');
 
                 var modifier = (parts[3] || parts[8] || 1) - 1;
 
-                key.ctrl	= !!(modifier & 4);
-                key.meta	= !!(modifier & 10);
-                key.shift	= !!(modifier & 1);
-                key.code	= code;
+                key.ctrl    = !!(modifier & 4);
+                key.meta    = !!(modifier & 10);
+                key.shift   = !!(modifier & 1);
+                key.code    = code;
 
                 _.assign(key, self.getKeyComponentsFromCode(code));
             }
@@ -382,7 +382,7 @@ function Client(/*input, output*/) {
             if(1 === s.length) {
                 ch = s;
             } else if('space' === key.name) {
-                //	stupid hack to always get space as a regular char
+                //  stupid hack to always get space as a regular char
                 ch = ' ';
             }
 
@@ -390,18 +390,18 @@ function Client(/*input, output*/) {
                 key = undefined;
             } else {
                 //
-                //	Adjust name for CTRL/Shift/Meta modifiers
+                //  Adjust name for CTRL/Shift/Meta modifiers
                 //
                 key.name =
-					(key.ctrl ? 'ctrl + ' : '') +
-					(key.meta ? 'meta + ' : '') +
-					(key.shift ? 'shift + ' : '') +
-					key.name;
+                    (key.ctrl ? 'ctrl + ' : '') +
+                    (key.meta ? 'meta + ' : '') +
+                    (key.shift ? 'shift + ' : '') +
+                    key.name;
             }
 
             if(key || ch) {
                 if(Config().logging.traceUserKeyboardInput) {
-                    self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input');	// jshint ignore:line
+                    self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input'); // jshint ignore:line
                 }
 
                 self.lastKeyPressMs = Date.now();
@@ -417,15 +417,15 @@ function Client(/*input, output*/) {
 require('util').inherits(Client, stream);
 
 Client.prototype.setInputOutput = function(input, output) {
-    this.input	= input;
-    this.output	= output;
+    this.input  = input;
+    this.output = output;
 
-    this.term	= new term.ClientTerminal(this.output);
+    this.term   = new term.ClientTerminal(this.output);
 };
 
 Client.prototype.setTermType = function(termType) {
-    this.term.env.TERM		= termType;
-    this.term.termType		= termType;
+    this.term.env.TERM      = termType;
+    this.term.termType      = termType;
 
     this.log.debug( { termType : termType }, 'Set terminal type');
 };
@@ -434,10 +434,10 @@ Client.prototype.startIdleMonitor = function() {
     this.lastKeyPressMs = Date.now();
 
     //
-    //	Every 1m, check for idle.
+    //  Every 1m, check for idle.
     //
     this.idleCheck = setInterval( () => {
-        const nowMs	= Date.now();
+        const nowMs = Date.now();
 
         const idleLogoutSeconds = this.user.isAuthenticated() ?
             Config().misc.idleLogoutSeconds :
@@ -468,12 +468,12 @@ Client.prototype.end = function () {
 
     try {
         //
-        //	We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
+        //  We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
         //
-        //	:TODO: is this OK?
+        //  :TODO: is this OK?
         return this.output.end.apply(this.output, arguments);
     } catch(e) {
-        //	TypeError
+        //  TypeError
     }
 };
 
@@ -492,15 +492,15 @@ Client.prototype.waitForKeyPress = function(cb) {
 };
 
 Client.prototype.isLocal = function() {
-    //	:TODO: Handle ipv6 better
+    //  :TODO: Handle ipv6 better
     return [ '127.0.0.1', '::ffff:127.0.0.1' ].includes(this.remoteAddress);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-//	Default error handlers
+//  Default error handlers
 ///////////////////////////////////////////////////////////////////////////////
 
-//	:TODO: getDefaultHandler(name) -- handlers in default_handlers.js or something
+//  :TODO: getDefaultHandler(name) -- handlers in default_handlers.js or something
 Client.prototype.defaultHandlerMissingMod = function() {
     var self = this;
 
@@ -516,7 +516,7 @@ Client.prototype.defaultHandlerMissingMod = function() {
         //self.term.write(err);
 
         //if(miscUtil.isDevelopment() && err.stack) {
-        //	self.term.write('\n' + err.stack + '\n');
+        //  self.term.write('\n' + err.stack + '\n');
         //}
 
         self.end();
@@ -530,7 +530,7 @@ Client.prototype.terminalSupports = function(query) {
 
     switch(query) {
         case 'vtx_audio' :
-            //	https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
+            //  https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
             return 'vtx' === termClient;
 
         case 'vtx_hyperlink' :
diff --git a/core/client_connections.js b/core/client_connections.js
index bdeb4539..4c16d610 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -1,23 +1,23 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const logger			= require('./logger.js');
+//  ENiGMA½
+const logger            = require('./logger.js');
 const Events            = require('./events.js');
 
-//	deps
-const _					= require('lodash');
-const moment			= require('moment');
-const hashids			= require('hashids');
+//  deps
+const _                 = require('lodash');
+const moment            = require('moment');
+const hashids           = require('hashids');
 
-exports.getActiveConnections	= getActiveConnections;
-exports.getActiveNodeList		= getActiveNodeList;
-exports.addNewClient			= addNewClient;
-exports.removeClient			= removeClient;
-exports.getConnectionByUserId	= getConnectionByUserId;
+exports.getActiveConnections    = getActiveConnections;
+exports.getActiveNodeList       = getActiveNodeList;
+exports.addNewClient            = addNewClient;
+exports.removeClient            = removeClient;
+exports.getConnectionByUserId   = getConnectionByUserId;
 
 const clientConnections = [];
-exports.clientConnections		= clientConnections;
+exports.clientConnections       = clientConnections;
 
 function getActiveConnections() { return clientConnections; }
 
@@ -35,48 +35,48 @@ function getActiveNodeList(authUsersOnly) {
 
     return _.map(activeConnections, ac => {
         const entry = {
-            node			: ac.node,
-            authenticated	: ac.user.isAuthenticated(),
-            userId			: ac.user.userId,
-            action			: _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
+            node            : ac.node,
+            authenticated   : ac.user.isAuthenticated(),
+            userId          : ac.user.userId,
+            action          : _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
         };
 
         //
-        //	There may be a connection, but not a logged in user as of yet
+        //  There may be a connection, but not a logged in user as of yet
         //
         if(ac.user.isAuthenticated()) {
-            entry.userName	= ac.user.username;
-            entry.realName	= ac.user.properties.real_name;
-            entry.location	= ac.user.properties.location;
-            entry.affils	= ac.user.properties.affiliation;
+            entry.userName  = ac.user.username;
+            entry.realName  = ac.user.properties.real_name;
+            entry.location  = ac.user.properties.location;
+            entry.affils    = ac.user.properties.affiliation;
 
-            const diff 		= now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
-            entry.timeOn	= moment.duration(diff, 'minutes');
+            const diff      = now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
+            entry.timeOn    = moment.duration(diff, 'minutes');
         }
         return entry;
     });
 }
 
 function addNewClient(client, clientSock) {
-    const id			= client.session.id		= clientConnections.push(client) - 1;
-    const remoteAddress = client.remoteAddress	= clientSock.remoteAddress;
+    const id            = client.session.id     = clientConnections.push(client) - 1;
+    const remoteAddress = client.remoteAddress  = clientSock.remoteAddress;
 
-    //	create a uniqe identifier one-time ID for this session
+    //  create a uniqe identifier one-time ID for this session
     client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
 
-    //	Create a client specific logger
-    //	Note that this will be updated @ login with additional information
+    //  Create a client specific logger
+    //  Note that this will be updated @ login with additional information
     client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );
 
     const connInfo = {
-        remoteAddress	: remoteAddress,
-        serverName		: client.session.serverName,
-        isSecure		: client.session.isSecure,
+        remoteAddress   : remoteAddress,
+        serverName      : client.session.serverName,
+        isSecure        : client.session.isSecure,
     };
 
     if(client.log.debug()) {
-        connInfo.port		= clientSock.localPort;
-        connInfo.family		= clientSock.localFamily;
+        connInfo.port       = clientSock.localPort;
+        connInfo.family     = clientSock.localFamily;
     }
 
     client.log.info(connInfo, 'Client connected');
@@ -98,8 +98,8 @@ function removeClient(client) {
 
         logger.log.info(
             {
-                connectionCount	: clientConnections.length,
-                clientId		: client.session.id
+                connectionCount : clientConnections.length,
+                clientId        : client.session.id
             },
             'Client disconnected'
         );
diff --git a/core/client_term.js b/core/client_term.js
index 77196586..eb1ee4f9 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -1,39 +1,39 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-var Log				= require('./logger.js').log;
-var enigmaToAnsi	= require('./color_codes.js').enigmaToAnsi;
-var renegadeToAnsi	= require('./color_codes.js').renegadeToAnsi;
+//  ENiGMA½
+var Log             = require('./logger.js').log;
+var enigmaToAnsi    = require('./color_codes.js').enigmaToAnsi;
+var renegadeToAnsi  = require('./color_codes.js').renegadeToAnsi;
 
-var iconv			= require('iconv-lite');
-var assert			= require('assert');
-var _				= require('lodash');
+var iconv           = require('iconv-lite');
+var assert          = require('assert');
+var _               = require('lodash');
 
-exports.ClientTerminal	= ClientTerminal;
+exports.ClientTerminal  = ClientTerminal;
 
 function ClientTerminal(output) {
-    this.output		= output;
+    this.output     = output;
 
     var outputEncoding = 'cp437';
     assert(iconv.encodingExists(outputEncoding));
 
-    //	convert line feeds such as \n -> \r\n
-    this.convertLF		= true;
+    //  convert line feeds such as \n -> \r\n
+    this.convertLF      = true;
 
     //
-    //	Some terminal we handle specially
-    //	They can also be found in this.env{}
+    //  Some terminal we handle specially
+    //  They can also be found in this.env{}
     //
-    var termType		= 'unknown';
-    var termHeight		= 0;
-    var termWidth		= 0;
-    var termClient		= 'unknown';
+    var termType        = 'unknown';
+    var termHeight      = 0;
+    var termWidth       = 0;
+    var termClient      = 'unknown';
 
-    this.currentSyncFont	= 'not_set';
+    this.currentSyncFont    = 'not_set';
 
-    //	Raw values set by e.g. telnet NAWS, ENVIRONMENT, etc.
-    this.env			= {};
+    //  Raw values set by e.g. telnet NAWS, ENVIRONMENT, etc.
+    this.env            = {};
 
     Object.defineProperty(this, 'outputEncoding', {
         get : function() {
@@ -58,13 +58,13 @@ function ClientTerminal(output) {
             if(this.isANSI()) {
                 this.outputEncoding = 'cp437';
             } else {
-                //	:TODO: See how x84 does this -- only set if local/remote are binary
+                //  :TODO: See how x84 does this -- only set if local/remote are binary
                 this.outputEncoding = 'utf8';
             }
 
-            //	:TODO: according to this: http://mud-dev.wikidot.com/article:telnet-client-identification
-            //	Windows telnet will send "VTNT". If so, set termClient='windows'
-            //	there are some others on the page as well
+            //  :TODO: according to this: http://mud-dev.wikidot.com/article:telnet-client-identification
+            //  Windows telnet will send "VTNT". If so, set termClient='windows'
+            //  there are some others on the page as well
 
             Log.debug( { encoding : this.outputEncoding }, 'Set output encoding due to terminal type change');
         }
@@ -110,7 +110,7 @@ ClientTerminal.prototype.disconnect = function() {
 
 ClientTerminal.prototype.isNixTerm = function() {
     //
-    //	Standard *nix type terminals
+    //  Standard *nix type terminals
     //
     if(this.termType.startsWith('xterm')) {
         return true;
@@ -121,40 +121,40 @@ ClientTerminal.prototype.isNixTerm = function() {
 
 ClientTerminal.prototype.isANSI = function() {
     //
-    //	ANSI terminals should be encoded to CP437
+    //  ANSI terminals should be encoded to CP437
     //
-    //	Some terminal types provided by Mercyful Fate / Enthral:
-    //		ANSI-BBS
-    //		PC-ANSI
-    //		QANSI
-    //		SCOANSI
-    //		VT100
-    //		QNX
+    //  Some terminal types provided by Mercyful Fate / Enthral:
+    //      ANSI-BBS
+    //      PC-ANSI
+    //      QANSI
+    //      SCOANSI
+    //      VT100
+    //      QNX
     //
-    //	Reports from various terminals
+    //  Reports from various terminals
     //
-    //	syncterm:
-    //		* SyncTERM
+    //  syncterm:
+    //      * SyncTERM
     //
-    //	xterm:
-    //		* PuTTY
+    //  xterm:
+    //      * PuTTY
     //
-    //	ansi-bbs:
-    //		* fTelnet
+    //  ansi-bbs:
+    //      * fTelnet
     //
-    //	pcansi:
-    //		* ZOC
+    //  pcansi:
+    //      * ZOC
     //
-    //	screen:
-    //		* ConnectBot (Android)
+    //  screen:
+    //      * ConnectBot (Android)
     //
-    //	linux:
-    //		* JuiceSSH (note: TERM=linux also)
+    //  linux:
+    //      * JuiceSSH (note: TERM=linux also)
     //
     return [ 'ansi', 'pcansi', 'pc-ansi', 'ansi-bbs', 'qansi', 'scoansi', 'syncterm' ].includes(this.termType);
 };
 
-//	:TODO: probably need to update these to convert IAC (0xff) -> IACIAC (escape it)
+//  :TODO: probably need to update these to convert IAC (0xff) -> IACIAC (escape it)
 
 ClientTerminal.prototype.write = function(s, convertLineFeeds, cb) {
     this.rawWrite(this.encode(s, convertLineFeeds), cb);
@@ -178,11 +178,11 @@ ClientTerminal.prototype.pipeWrite = function(s, spec, cb) {
     spec = spec || 'renegade';
 
     var conv = {
-        enigma		: enigmaToAnsi,
-        renegade	: renegadeToAnsi,
+        enigma      : enigmaToAnsi,
+        renegade    : renegadeToAnsi,
     }[spec] || renegadeToAnsi;
 
-    this.write(conv(s, this), null, cb);	//	null = use default for |convertLineFeeds|
+    this.write(conv(s, this), null, cb);    //  null = use default for |convertLineFeeds|
 };
 
 ClientTerminal.prototype.encode = function(s, convertLineFeeds) {
diff --git a/core/color_codes.js b/core/color_codes.js
index b04d2c0b..272b611a 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -1,39 +1,39 @@
 /* jslint node: true */
 'use strict';
 
-var ansi					= require('./ansi_term.js');
-var getPredefinedMCIValue	= require('./predefined_mci.js').getPredefinedMCIValue;
+var ansi                    = require('./ansi_term.js');
+var getPredefinedMCIValue   = require('./predefined_mci.js').getPredefinedMCIValue;
 
-var assert					= require('assert');
-var _						= require('lodash');
+var assert                  = require('assert');
+var _                       = require('lodash');
 
-exports.enigmaToAnsi		= enigmaToAnsi;
-exports.stripPipeCodes		= exports.stripEnigmaCodes		= stripEnigmaCodes;
-exports.pipeStrLen			= exports.enigmaStrLen			= enigmaStrLen;
-exports.pipeToAnsi			= exports.renegadeToAnsi		= renegadeToAnsi;
-exports.controlCodesToAnsi	= controlCodesToAnsi;
+exports.enigmaToAnsi        = enigmaToAnsi;
+exports.stripPipeCodes      = exports.stripEnigmaCodes      = stripEnigmaCodes;
+exports.pipeStrLen          = exports.enigmaStrLen          = enigmaStrLen;
+exports.pipeToAnsi          = exports.renegadeToAnsi        = renegadeToAnsi;
+exports.controlCodesToAnsi  = controlCodesToAnsi;
 
-//	:TODO: Not really happy with the module name of "color_codes". Would like something better
+//  :TODO: Not really happy with the module name of "color_codes". Would like something better
 
 
 
 
-//	Also add:
-//	* fromCelerity(): |<case sensitive letter>
-//	* fromPCBoard(): (@X<bg><fg>)
-//	* fromWildcat(): (@<bg><fg>@ (same as PCBoard without 'X' prefix and '@' suffix)
-//	* fromWWIV(): <ctrl-c><0-7>
-//	* fromSyncronet(): <ctrl-a><colorCode>
-//	See http://wiki.synchro.net/custom:colors
+//  Also add:
+//  * fromCelerity(): |<case sensitive letter>
+//  * fromPCBoard(): (@X<bg><fg>)
+//  * fromWildcat(): (@<bg><fg>@ (same as PCBoard without 'X' prefix and '@' suffix)
+//  * fromWWIV(): <ctrl-c><0-7>
+//  * fromSyncronet(): <ctrl-a><colorCode>
+//  See http://wiki.synchro.net/custom:colors
 
-//	:TODO: rid of enigmaToAnsi() -- never really use. Instead, create bbsToAnsi() that supports renegade, PCB, WWIV, etc...
+//  :TODO: rid of enigmaToAnsi() -- never really use. Instead, create bbsToAnsi() that supports renegade, PCB, WWIV, etc...
 function enigmaToAnsi(s, client) {
     if(-1 == s.indexOf('|')) {
-        return s;	//	no pipe codes present
+        return s;   //  no pipe codes present
     }
 
-    var result	= '';
-    var re		= /\|([A-Z\d]{2}|\|)/g;
+    var result  = '';
+    var re      = /\|([A-Z\d]{2}|\|)/g;
     var m;
     var lastIndex = 0;
     while((m = re.exec(s))) {
@@ -44,14 +44,14 @@ function enigmaToAnsi(s, client) {
             continue;
         }
 
-        //	convert to number
+        //  convert to number
         val = parseInt(val, 10);
         if(isNaN(val)) {
             //
-            //	ENiGMA MCI code? Only available if |client|
-            //	is supplied.
+            //  ENiGMA MCI code? Only available if |client|
+            //  is supplied.
             //
-            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
+            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);  //  value itself or literal
         }
 
         if(_.isString(val)) {
@@ -89,51 +89,51 @@ function enigmaStrLen(s) {
 
 function ansiSgrFromRenegadeColorCode(cc) {
     return ansi.sgr({
-        0	: [ 'reset', 'black' ],
-        1	: [ 'reset', 'blue' ],
-        2	: [ 'reset', 'green' ],
-        3	: [ 'reset', 'cyan' ],
-        4	: [ 'reset', 'red' ],
-        5	: [ 'reset', 'magenta' ],
-        6	: [ 'reset', 'yellow' ],
-        7	: [ 'reset', 'white' ],
+        0   : [ 'reset', 'black' ],
+        1   : [ 'reset', 'blue' ],
+        2   : [ 'reset', 'green' ],
+        3   : [ 'reset', 'cyan' ],
+        4   : [ 'reset', 'red' ],
+        5   : [ 'reset', 'magenta' ],
+        6   : [ 'reset', 'yellow' ],
+        7   : [ 'reset', 'white' ],
 
-        8	: [ 'bold', 'black' ],
-        9	: [ 'bold', 'blue' ],
-        10	: [ 'bold', 'green' ],
-        11	: [ 'bold', 'cyan' ],
-        12	: [ 'bold', 'red' ],
-        13	: [ 'bold', 'magenta' ],
-        14	: [ 'bold', 'yellow' ],
-        15	: [ 'bold', 'white' ],
+        8   : [ 'bold', 'black' ],
+        9   : [ 'bold', 'blue' ],
+        10  : [ 'bold', 'green' ],
+        11  : [ 'bold', 'cyan' ],
+        12  : [ 'bold', 'red' ],
+        13  : [ 'bold', 'magenta' ],
+        14  : [ 'bold', 'yellow' ],
+        15  : [ 'bold', 'white' ],
 
-        16	: [ 'blackBG' ],
-        17 	: [ 'blueBG' ],
-        18	: [ 'greenBG' ],
-        19	: [ 'cyanBG' ],
-        20	: [ 'redBG' ],
-        21	: [ 'magentaBG' ],
-        22	: [ 'yellowBG' ],
-        23	: [ 'whiteBG' ],
+        16  : [ 'blackBG' ],
+        17  : [ 'blueBG' ],
+        18  : [ 'greenBG' ],
+        19  : [ 'cyanBG' ],
+        20  : [ 'redBG' ],
+        21  : [ 'magentaBG' ],
+        22  : [ 'yellowBG' ],
+        23  : [ 'whiteBG' ],
 
-        24	: [ 'blink', 'blackBG' ],
-        25	: [ 'blink', 'blueBG' ],
-        26	: [ 'blink', 'greenBG' ],
-        27	: [ 'blink', 'cyanBG' ],
-        28	: [ 'blink', 'redBG' ],
-        29	: [ 'blink', 'magentaBG' ],
-        30	: [ 'blink', 'yellowBG' ],
-        31	: [ 'blink', 'whiteBG' ],
+        24  : [ 'blink', 'blackBG' ],
+        25  : [ 'blink', 'blueBG' ],
+        26  : [ 'blink', 'greenBG' ],
+        27  : [ 'blink', 'cyanBG' ],
+        28  : [ 'blink', 'redBG' ],
+        29  : [ 'blink', 'magentaBG' ],
+        30  : [ 'blink', 'yellowBG' ],
+        31  : [ 'blink', 'whiteBG' ],
     }[cc] || 'normal');
 }
 
 function renegadeToAnsi(s, client) {
     if(-1 == s.indexOf('|')) {
-        return s;	//	no pipe codes present
+        return s;   //  no pipe codes present
     }
 
-    var result	= '';
-    var re		= /\|([A-Z\d]{2}|\|)/g;
+    var result  = '';
+    var re      = /\|([A-Z\d]{2}|\|)/g;
     var m;
     var lastIndex = 0;
     while((m = re.exec(s))) {
@@ -144,10 +144,10 @@ function renegadeToAnsi(s, client) {
             continue;
         }
 
-        //	convert to number
+        //  convert to number
         val = parseInt(val, 10);
         if(isNaN(val)) {
-            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);	//	value itself or literal
+            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);  //  value itself or literal
         }
 
         if(_.isString(val)) {
@@ -164,27 +164,27 @@ function renegadeToAnsi(s, client) {
 }
 
 //
-//	Converts various control codes popular in BBS packages
-//	to ANSI escape sequences. Additionaly supports ENiGMA style
-//	MCI codes.
+//  Converts various control codes popular in BBS packages
+//  to ANSI escape sequences. Additionaly supports ENiGMA style
+//  MCI codes.
 //
-//	Supported control code formats:
-//	* Renegade	: |##
-//	* PCBoard	: @X## where the first number/char is FG color, and second is BG
-//	* WildCat!	: @##@ the same as PCBoard without the X prefix, but with a @ suffix
-//	* WWIV		: ^#
+//  Supported control code formats:
+//  * Renegade  : |##
+//  * PCBoard   : @X## where the first number/char is FG color, and second is BG
+//  * WildCat!  : @##@ the same as PCBoard without the X prefix, but with a @ suffix
+//  * WWIV      : ^#
 //
-//	TODO: Add Synchronet and Celerity format support
+//  TODO: Add Synchronet and Celerity format support
 //
-//	Resources:
-//	* http://wiki.synchro.net/custom:colors
+//  Resources:
+//  * http://wiki.synchro.net/custom:colors
 //
 function controlCodesToAnsi(s, client) {
-    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;	//	eslint-disable-line no-control-regex
+    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;    //  eslint-disable-line no-control-regex
 
     let m;
-    let result		= '';
-    let lastIndex	= 0;
+    let result      = '';
+    let lastIndex   = 0;
     let v;
     let fg;
     let bg;
@@ -192,11 +192,11 @@ function controlCodesToAnsi(s, client) {
     while((m = RE.exec(s))) {
         switch(m[0].charAt(0)) {
             case '|' :
-                //	Renegade or ENiGMA MCI
+                //  Renegade or ENiGMA MCI
                 v = parseInt(m[2], 10);
 
                 if(isNaN(v)) {
-                    v = getPredefinedMCIValue(client, m[2]) || m[0];	//	value itself or literal
+                    v = getPredefinedMCIValue(client, m[2]) || m[0];    //  value itself or literal
                 }
 
                 if(_.isString(v)) {
@@ -208,52 +208,52 @@ function controlCodesToAnsi(s, client) {
                 break;
 
             case '@' :
-                //	PCBoard @X## or Wildcat! @##@
+                //  PCBoard @X## or Wildcat! @##@
                 if('@' === m[0].substr(-1)) {
-                    //	Wildcat!
+                    //  Wildcat!
                     v = m[6];
                 } else {
                     v = m[4];
                 }
 
                 fg = {
-                    0	: [ 'reset', 'black' ],
-                    1	: [ 'reset', 'blue' ],
-                    2	: [ 'reset', 'green' ],
-                    3	: [ 'reset', 'cyan' ],
-                    4	: [ 'reset', 'red' ],
-                    5	: [ 'reset', 'magenta' ],
-                    6	: [ 'reset', 'yellow' ],
-                    7	: [ 'reset', 'white' ],
+                    0   : [ 'reset', 'black' ],
+                    1   : [ 'reset', 'blue' ],
+                    2   : [ 'reset', 'green' ],
+                    3   : [ 'reset', 'cyan' ],
+                    4   : [ 'reset', 'red' ],
+                    5   : [ 'reset', 'magenta' ],
+                    6   : [ 'reset', 'yellow' ],
+                    7   : [ 'reset', 'white' ],
 
-                    8	: [ 'blink', 'black' ],
-                    9	: [ 'blink', 'blue' ],
-                    A	: [ 'blink', 'green' ],
-                    B	: [ 'blink', 'cyan' ],
-                    C	: [ 'blink', 'red' ],
-                    D	: [ 'blink', 'magenta' ],
-                    E	: [ 'blink', 'yellow' ],
-                    F	: [ 'blink', 'white' ],
+                    8   : [ 'blink', 'black' ],
+                    9   : [ 'blink', 'blue' ],
+                    A   : [ 'blink', 'green' ],
+                    B   : [ 'blink', 'cyan' ],
+                    C   : [ 'blink', 'red' ],
+                    D   : [ 'blink', 'magenta' ],
+                    E   : [ 'blink', 'yellow' ],
+                    F   : [ 'blink', 'white' ],
                 }[v.charAt(0)] || ['normal'];
 
                 bg = {
-                    0	: [ 'blackBG' ],
-                    1 	: [ 'blueBG' ],
-                    2	: [ 'greenBG' ],
-                    3	: [ 'cyanBG' ],
-                    4	: [ 'redBG' ],
-                    5	: [ 'magentaBG' ],
-                    6	: [ 'yellowBG' ],
-                    7	: [ 'whiteBG' ],
+                    0   : [ 'blackBG' ],
+                    1   : [ 'blueBG' ],
+                    2   : [ 'greenBG' ],
+                    3   : [ 'cyanBG' ],
+                    4   : [ 'redBG' ],
+                    5   : [ 'magentaBG' ],
+                    6   : [ 'yellowBG' ],
+                    7   : [ 'whiteBG' ],
 
-                    8	: [ 'bold', 'blackBG' ],
-                    9	: [ 'bold', 'blueBG' ],
-                    A	: [ 'bold', 'greenBG' ],
-                    B	: [ 'bold', 'cyanBG' ],
-                    C	: [ 'bold', 'redBG' ],
-                    D	: [ 'bold', 'magentaBG' ],
-                    E	: [ 'bold', 'yellowBG' ],
-                    F	: [ 'bold', 'whiteBG' ],
+                    8   : [ 'bold', 'blackBG' ],
+                    9   : [ 'bold', 'blueBG' ],
+                    A   : [ 'bold', 'greenBG' ],
+                    B   : [ 'bold', 'cyanBG' ],
+                    C   : [ 'bold', 'redBG' ],
+                    D   : [ 'bold', 'magentaBG' ],
+                    E   : [ 'bold', 'yellowBG' ],
+                    F   : [ 'bold', 'whiteBG' ],
                 }[v.charAt(1)] || [ 'normal' ];
 
                 v = ansi.sgr(fg.concat(bg));
@@ -267,16 +267,16 @@ function controlCodesToAnsi(s, client) {
                     v += m[0];
                 } else {
                     v = ansi.sgr({
-                        0	: [ 'reset', 'black' ],
-                        1	: [ 'bold', 'cyan' ],
-                        2	: [ 'bold', 'yellow' ],
-                        3	: [ 'reset', 'magenta' ],
-                        4	: [ 'bold', 'white', 'blueBG' ],
-                        5	: [ 'reset', 'green' ],
-                        6	: [ 'bold', 'blink', 'red' ],
-                        7	: [ 'bold', 'blue' ],
-                        8	: [ 'reset', 'blue' ],
-                        9	: [ 'reset', 'cyan' ],
+                        0   : [ 'reset', 'black' ],
+                        1   : [ 'bold', 'cyan' ],
+                        2   : [ 'bold', 'yellow' ],
+                        3   : [ 'reset', 'magenta' ],
+                        4   : [ 'bold', 'white', 'blueBG' ],
+                        5   : [ 'reset', 'green' ],
+                        6   : [ 'bold', 'blink', 'red' ],
+                        7   : [ 'bold', 'blue' ],
+                        8   : [ 'reset', 'blue' ],
+                        9   : [ 'reset', 'cyan' ],
                     }[v] || 'normal');
                 }
 
diff --git a/core/combatnet.js b/core/combatnet.js
index d6616449..1b53a153 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -1,29 +1,29 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule	= require('../core/menu_module.js').MenuModule;
-const resetScreen	= require('../core/ansi_term.js').resetScreen;
+//  enigma-bbs
+const MenuModule    = require('../core/menu_module.js').MenuModule;
+const resetScreen   = require('../core/ansi_term.js').resetScreen;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
 const RLogin        = require('rlogin');
 
 exports.moduleInfo = {
-    name	: 'CombatNet',
-    desc	: 'CombatNet Access Module',
-    author	: 'Dave Stephens',
+    name    : 'CombatNet',
+    desc    : 'CombatNet Access Module',
+    author  : 'Dave Stephens',
 };
 
 exports.getModule = class CombatNetModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        //	establish defaults
-        this.config				= options.menuConfig.config;
-        this.config.host		= this.config.host || 'bbs.combatnet.us';
-        this.config.rloginPort	= this.config.rloginPort || 4513;
+        //  establish defaults
+        this.config             = options.menuConfig.config;
+        this.config.host        = this.config.host || 'bbs.combatnet.us';
+        this.config.rloginPort  = this.config.rloginPort || 4513;
     }
 
     initSequence() {
@@ -51,7 +51,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     };
 
                     const rlogin = new RLogin(
-                        {	'clientUsername' : self.config.password,
+                        {   'clientUsername' : self.config.password,
                             'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
                             'host' : self.config.host,
                             'port' : self.config.rloginPort,
@@ -79,7 +79,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     }
 
                     rlogin.on('connect',
-                        /*	The 'connect' event handler will be supplied with one argument,
+                        /*  The 'connect' event handler will be supplied with one argument,
                             a boolean indicating whether or not the connection was established. */
 
                         function(state) {
@@ -101,7 +101,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     // connect...
                     rlogin.connect();
 
-                    //	note: no explicit callback() until we're finished!
+                    //  note: no explicit callback() until we're finished!
                 }
             ],
             err => {
@@ -109,7 +109,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     self.client.log.warn( { error : err.message }, 'CombatNet error');
                 }
 
-                //	if the client is still here, go to previous
+                //  if the client is still here, go to previous
                 self.prevMenu();
             }
         );
diff --git a/core/conf_area_util.js b/core/conf_area_util.js
index 7c4bf5bb..1c0b65c4 100644
--- a/core/conf_area_util.js
+++ b/core/conf_area_util.js
@@ -1,15 +1,15 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const _			= require('lodash');
+//  deps
+const _         = require('lodash');
 
-exports.sortAreasOrConfs	= sortAreasOrConfs;
+exports.sortAreasOrConfs    = sortAreasOrConfs;
 
 //
-//	Method for sorting message, file, etc. areas and confs
-//	If the sort key is present and is a number, sort in numerical order;
-//	Otherwise, use a locale comparison on the sort key or name as a fallback
+//  Method for sorting message, file, etc. areas and confs
+//  If the sort key is present and is a number, sort in numerical order;
+//  Otherwise, use a locale comparison on the sort key or name as a fallback
 //
 function sortAreasOrConfs(areasOrConfs, type) {
     let entryA;
@@ -24,7 +24,7 @@ function sortAreasOrConfs(areasOrConfs, type) {
         } else {
             const keyA = entryA.sort ? entryA.sort.toString() : entryA.name;
             const keyB = entryB.sort ? entryB.sort.toString() : entryB.name;
-            return keyA.localeCompare(keyB, { sensitivity : false, numeric : true } );	//	"natural" compare
+            return keyA.localeCompare(keyB, { sensitivity : false, numeric : true } );  //  "natural" compare
         }
     });
 }
\ No newline at end of file
diff --git a/core/config.js b/core/config.js
index 3a1359d7..f85ffe2a 100644
--- a/core/config.js
+++ b/core/config.js
@@ -1,17 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Errors			= require('./enig_error.js').Errors;
+//  ENiGMA½
+const Errors            = require('./enig_error.js').Errors;
 
-//	deps
-const paths				= require('path');
-const async				= require('async');
-const _					= require('lodash');
-const assert			= require('assert');
+//  deps
+const paths             = require('path');
+const async             = require('async');
+const _                 = require('lodash');
+const assert            = require('assert');
 
-exports.init			= init;
-exports.getDefaultPath	= getDefaultPath;
+exports.init            = init;
+exports.getDefaultPath  = getDefaultPath;
 
 let currentConfiguration = {};
 
@@ -31,7 +31,7 @@ function hasMessageConferenceAndArea(config) {
     let result = false;
     _.forEach(nonInternalConfs, confTag => {
         if(_.has(config.messageConferences[confTag], 'areas') &&
-			Object.keys(config.messageConferences[confTag].areas) > 0)
+            Object.keys(config.messageConferences[confTag].areas) > 0)
         {
             result = true;
             return false;   //  stop iteration
@@ -48,9 +48,9 @@ function mergeValidateAndFinalize(config, cb) {
                 const mergedConfig = _.mergeWith(
                     getDefaultConfig(),
                     config, (conf1, conf2) => {
-                        //	Arrays should always concat
+                        //  Arrays should always concat
                         if(_.isArray(conf1)) {
-                            //	:TODO: look for collisions & override dupes
+                            //  :TODO: look for collisions & override dupes
                             return conf1.concat(conf2);
                         }
                     }
@@ -60,16 +60,16 @@ function mergeValidateAndFinalize(config, cb) {
             },
             function validate(mergedConfig, callback) {
                 //
-                //	Various sections must now exist in config
+                //  Various sections must now exist in config
                 //
-                //	:TODO: Logic is broken here:
+                //  :TODO: Logic is broken here:
                 if(hasMessageConferenceAndArea(mergedConfig)) {
                     return callback(Errors.MissingConfig('Please create at least one message conference and area!'));
                 }
                 return callback(null, mergedConfig);
             },
             function setIt(mergedConfig, callback) {
-                //	:TODO: .config property is to be deprecated once conversions are done
+                //  :TODO: .config property is to be deprecated once conversions are done
                 exports.config = currentConfiguration = mergedConfig;
 
                 exports.get = () => currentConfiguration;
@@ -101,8 +101,8 @@ function init(configPath, options, cb) {
 
     const ConfigCache = require('./config_cache.js');
     const getConfigOptions = {
-        filePath	: configPath,
-        noWatch		: options.noWatch,
+        filePath    : configPath,
+        noWatch     : options.noWatch,
     };
     if(!options.noWatch) {
         getConfigOptions.callback = changed;
@@ -117,138 +117,138 @@ function init(configPath, options, cb) {
 }
 
 function getDefaultPath() {
-    //	e.g. /enigma-bbs-install-path/config/
+    //  e.g. /enigma-bbs-install-path/config/
     return './config/';
 }
 
 function getDefaultConfig() {
     return {
         general : {
-            boardName		: 'Another Fine ENiGMA½ BBS',
+            boardName       : 'Another Fine ENiGMA½ BBS',
 
-            closedSystem	: false,					//	is the system closed to new users?
+            closedSystem    : false,                    //  is the system closed to new users?
 
-            loginAttempts	: 3,
+            loginAttempts   : 3,
 
-            menuFile		: 'menu.hjson',				//	Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
-            promptFile		: 'prompt.hjson',			//	Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
+            menuFile        : 'menu.hjson',             //  Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
+            promptFile      : 'prompt.hjson',           //  Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
         },
 
-        //	:TODO: see notes below about 'theme' section - move this!
+        //  :TODO: see notes below about 'theme' section - move this!
         preLoginTheme : 'luciano_blocktronics',
 
         users : {
-            usernameMin			: 2,
-            usernameMax			: 16,	//	Note that FidoNet wants 36 max
-            usernamePattern		: '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ ]+$',
+            usernameMin         : 2,
+            usernameMax         : 16,   //  Note that FidoNet wants 36 max
+            usernamePattern     : '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ ]+$',
 
-            passwordMin			: 6,
-            passwordMax			: 128,
-            badPassFile			: paths.join(__dirname, '../misc/10_million_password_list_top_10000.txt'),	//	https://github.com/danielmiessler/SecLists
+            passwordMin         : 6,
+            passwordMax         : 128,
+            badPassFile         : paths.join(__dirname, '../misc/10_million_password_list_top_10000.txt'),  //  https://github.com/danielmiessler/SecLists
 
-            realNameMax			: 32,
-            locationMax			: 32,
-            affilsMax			: 32,
-            emailMax			: 255,
-            webMax				: 255,
+            realNameMax         : 32,
+            locationMax         : 32,
+            affilsMax           : 32,
+            emailMax            : 255,
+            webMax              : 255,
 
-            requireActivation	: false,	//	require SysOp activation? false = auto-activate
+            requireActivation   : false,    //  require SysOp activation? false = auto-activate
 
-            groups				: [ 'users', 'sysops' ],		//	built in groups
-            defaultGroups		: [ 'users' ],					//	default groups new users belong to
+            groups              : [ 'users', 'sysops' ],        //  built in groups
+            defaultGroups       : [ 'users' ],                  //  default groups new users belong to
 
-            newUserNames		: [ 'new', 'apply' ],			//	Names reserved for applying
+            newUserNames        : [ 'new', 'apply' ],           //  Names reserved for applying
 
-            badUserNames		: [
+            badUserNames        : [
                 'sysop', 'admin', 'administrator', 'root', 'all',
                 'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
             ],
         },
 
-        //	:TODO: better name for "defaults"... which is redundant here!
+        //  :TODO: better name for "defaults"... which is redundant here!
         /*
-		Concept
-		"theme" : {
-			"default" : "defaultThemeName", // or "*"
-			"preLogin" : "*",
-			"passwordChar" : "*",
-			...
-		}
-		*/
+        Concept
+        "theme" : {
+            "default" : "defaultThemeName", // or "*"
+            "preLogin" : "*",
+            "passwordChar" : "*",
+            ...
+        }
+        */
         defaults : {
-            theme			: 'luciano_blocktronics',
-            passwordChar	: '*',		//	TODO: move to user ?
-            dateFormat	: {
-                short	: 'MM/DD/YYYY',
-                long	: 'ddd, MMMM Do, YYYY',
+            theme           : 'luciano_blocktronics',
+            passwordChar    : '*',      //  TODO: move to user ?
+            dateFormat  : {
+                short   : 'MM/DD/YYYY',
+                long    : 'ddd, MMMM Do, YYYY',
             },
             timeFormat : {
-                short	: 'h:mm a',
+                short   : 'h:mm a',
             },
             dateTimeFormat : {
-                short	: 'MM/DD/YYYY h:mm a',
-                long	: 'ddd, MMMM Do, YYYY, h:mm a',
+                short   : 'MM/DD/YYYY h:mm a',
+                long    : 'ddd, MMMM Do, YYYY, h:mm a',
             }
         },
 
         menus : {
-            cls		: true,	//	Clear screen before each menu by default?
+            cls     : true, //  Clear screen before each menu by default?
         },
 
-        paths		: {
-            config				: paths.join(__dirname, './../config/'),
-            mods				: paths.join(__dirname, './../mods/'),
-            loginServers		: paths.join(__dirname, './servers/login/'),
-            contentServers		: paths.join(__dirname, './servers/content/'),
+        paths       : {
+            config              : paths.join(__dirname, './../config/'),
+            mods                : paths.join(__dirname, './../mods/'),
+            loginServers        : paths.join(__dirname, './servers/login/'),
+            contentServers      : paths.join(__dirname, './servers/content/'),
 
-            scannerTossers		: paths.join(__dirname, './scanner_tossers/'),
-            mailers				: paths.join(__dirname, './mailers/')		,
+            scannerTossers      : paths.join(__dirname, './scanner_tossers/'),
+            mailers             : paths.join(__dirname, './mailers/')       ,
 
-            art					: paths.join(__dirname, './../art/general/'),
-            themes				: paths.join(__dirname, './../art/themes/'),
-            logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
-            db					: paths.join(__dirname, './../db/'),
-            modsDb				: paths.join(__dirname, './../db/mods/'),
-            dropFiles			: paths.join(__dirname, './../dropfiles/'),	//	+ "/node<x>/
-            misc				: paths.join(__dirname, './../misc/'),
+            art                 : paths.join(__dirname, './../art/general/'),
+            themes              : paths.join(__dirname, './../art/themes/'),
+            logs                : paths.join(__dirname, './../logs/'),  //  :TODO: set up based on system, e.g. /var/logs/enigmabbs or such
+            db                  : paths.join(__dirname, './../db/'),
+            modsDb              : paths.join(__dirname, './../db/mods/'),
+            dropFiles           : paths.join(__dirname, './../dropfiles/'), //  + "/node<x>/
+            misc                : paths.join(__dirname, './../misc/'),
         },
 
         loginServers : {
             telnet : {
-                port			: 8888,
-                enabled			: true,
-                firstMenu		: 'telnetConnected',
+                port            : 8888,
+                enabled         : true,
+                firstMenu       : 'telnetConnected',
             },
             ssh : {
-                port				: 8889,
-                enabled				: false,    //  default to false as PK/pass in config.hjson are required
+                port                : 8889,
+                enabled             : false,    //  default to false as PK/pass in config.hjson are required
 
                 //
-                //	Private key in PEM format
+                //  Private key in PEM format
                 //
-                //	Generating your PK:
-                //	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+                //  Generating your PK:
+                //  > openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
                 //
-                //	Then, set servers.ssh.privateKeyPass to the password you use above
-                //	in your config.hjson
+                //  Then, set servers.ssh.privateKeyPass to the password you use above
+                //  in your config.hjson
                 //
-                privateKeyPem		: paths.join(__dirname, './../config/ssh_private_key.pem'),
-                firstMenu			: 'sshConnected',
-                firstMenuNewUser	: 'sshConnectedNewUser',
+                privateKeyPem       : paths.join(__dirname, './../config/ssh_private_key.pem'),
+                firstMenu           : 'sshConnected',
+                firstMenuNewUser    : 'sshConnectedNewUser',
             },
             webSocket : {
                 ws : {
-                    //	non-secure ws://
-                    enabled			: false,
-                    port			: 8810,
+                    //  non-secure ws://
+                    enabled         : false,
+                    port            : 8810,
                 },
                 wss : {
-                    //	secure ws://
-                    //	must provide valid certPem and keyPem
-                    enabled			: false,
-                    port			: 8811,
-                    certPem			: paths.join(__dirname, './../config/https_cert.pem'),
-                    keyPem			: paths.join(__dirname, './../config/https_cert_key.pem'),
+                    //  secure ws://
+                    //  must provide valid certPem and keyPem
+                    enabled         : false,
+                    port            : 8811,
+                    certPem         : paths.join(__dirname, './../config/https_cert.pem'),
+                    keyPem          : paths.join(__dirname, './../config/https_cert_key.pem'),
                 },
             },
         },
@@ -261,200 +261,200 @@ function getDefaultConfig() {
 
                 resetPassword : {
                     //
-                    //	The following templates have these variables available to them:
+                    //  The following templates have these variables available to them:
                     //
-                    //	* %BOARDNAME%		: Name of BBS
-                    //	* %USERNAME%		: Username of whom to reset password
-                    //	* %TOKEN%			: Reset token
-                    //	* %RESET_URL%		: In case of email, the link to follow for reset. In case of landing page,
-                    //						  URL to POST submit reset form.
+                    //  * %BOARDNAME%       : Name of BBS
+                    //  * %USERNAME%        : Username of whom to reset password
+                    //  * %TOKEN%           : Reset token
+                    //  * %RESET_URL%       : In case of email, the link to follow for reset. In case of landing page,
+                    //                        URL to POST submit reset form.
 
-                    //	templates for pw reset *email*
-                    resetPassEmailText	: paths.join(__dirname, '../misc/reset_password_email.template.txt'),	//	plain text version
-                    resetPassEmailHtml	: paths.join(__dirname, '../misc/reset_password_email.template.html'),	//	HTML version
+                    //  templates for pw reset *email*
+                    resetPassEmailText  : paths.join(__dirname, '../misc/reset_password_email.template.txt'),   //  plain text version
+                    resetPassEmailHtml  : paths.join(__dirname, '../misc/reset_password_email.template.html'),  //  HTML version
 
-                    //	tempalte for pw reset *landing page*
+                    //  tempalte for pw reset *landing page*
                     //
-                    resetPageTemplate	: paths.join(__dirname, './../www/reset_password.template.html'),
+                    resetPageTemplate   : paths.join(__dirname, './../www/reset_password.template.html'),
                 },
 
                 http : {
                     enabled : false,
-                    port	: 8080,
+                    port    : 8080,
                 },
                 https : {
-                    enabled	: false,
-                    port	: 8443,
-                    certPem	: paths.join(__dirname, './../config/https_cert.pem'),
-                    keyPem	: paths.join(__dirname, './../config/https_cert_key.pem'),
+                    enabled : false,
+                    port    : 8443,
+                    certPem : paths.join(__dirname, './../config/https_cert.pem'),
+                    keyPem  : paths.join(__dirname, './../config/https_cert_key.pem'),
                 }
             }
         },
 
         infoExtractUtils : {
             Exiftool2Desc :  {
-                cmd			: `${__dirname}/../util/exiftool2desc.js`,	//	ensure chmod +x
+                cmd         : `${__dirname}/../util/exiftool2desc.js`,  //  ensure chmod +x
             },
             Exiftool : {
-                cmd			: 'exiftool',
-                args		: [
+                cmd         : 'exiftool',
+                args        : [
                     '-charset', 'utf8', '{filePath}',
-                    //	exclude the following:
+                    //  exclude the following:
                     '--directory', '--filepermissions', '--exiftoolversion', '--filename', '--filesize',
                     '--filemodifydate', '--fileaccessdate', '--fileinodechangedate', '--createdate', '--modifydate',
                     '--metadatadate', '--xmptoolkit'
                 ]
             },
             XDMS2Desc : {
-                //	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
-                cmd		: 'xdms',
-                args	: [ 'd', '{filePath}' ]
+                //  http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+                cmd     : 'xdms',
+                args    : [ 'd', '{filePath}' ]
             },
             XDMS2LongDesc : {
-                //	http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
-                cmd		: 'xdms',
-                args	: [ 'f', '{filePath}' ]
+                //  http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
+                cmd     : 'xdms',
+                args    : [ 'f', '{filePath}' ]
             }
         },
 
         fileTypes : {
             //
-            //	File types explicitly known to the system. Here we can configure
-            //	information extraction, archive treatment, etc.
+            //  File types explicitly known to the system. Here we can configure
+            //  information extraction, archive treatment, etc.
             //
-            //	MIME types can be found in mime-db: https://github.com/jshttp/mime-db
+            //  MIME types can be found in mime-db: https://github.com/jshttp/mime-db
             //
-            //	Resources for signature/magic bytes:
-            //	* http://www.garykessler.net/library/file_sigs.html
+            //  Resources for signature/magic bytes:
+            //  * http://www.garykessler.net/library/file_sigs.html
             //
             //
-            //	:TODO: text/x-ansi -> SAUCE extraction for .ans uploads
-            //	:TODO: textual : bool -- if text, we can view.
-            //	:TODO: asText : { cmd, args[] } -> viewable text
+            //  :TODO: text/x-ansi -> SAUCE extraction for .ans uploads
+            //  :TODO: textual : bool -- if text, we can view.
+            //  :TODO: asText : { cmd, args[] } -> viewable text
 
             //
-            //	Audio
+            //  Audio
             //
             'audio/mpeg' : {
-                desc 			: 'MP3 Audio',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'MP3 Audio',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             'application/pdf' : {
-                desc			: 'Adobe PDF',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'Adobe PDF',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             //
-            //	Video
+            //  Video
             //
             'video/mp4' : {
-                desc			: 'MPEG Video',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'MPEG Video',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             'video/x-matroska ' : {
-                desc			: 'Matroska Video',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'Matroska Video',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             'video/x-msvideo' : {
-                desc			: 'Audio Video Interleave',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'Audio Video Interleave',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             //
-            //	Images
+            //  Images
             //
-            'image/jpeg'	: {
-                desc			: 'JPEG Image',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+            'image/jpeg'    : {
+                desc            : 'JPEG Image',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
-            'image/png'	: {
-                desc			: 'Portable Network Graphic Image',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+            'image/png' : {
+                desc            : 'Portable Network Graphic Image',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             'image/gif' : {
-                desc			: 'Graphics Interchange Format Image',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'Graphics Interchange Format Image',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             'image/webp' :  {
-                desc			: 'WebP Image',
-                shortDescUtil	: 'Exiftool2Desc',
-                longDescUtil	: 'Exiftool',
+                desc            : 'WebP Image',
+                shortDescUtil   : 'Exiftool2Desc',
+                longDescUtil    : 'Exiftool',
             },
             //
-            //	Archives
+            //  Archives
             //
             'application/zip' : {
-                desc			: 'ZIP Archive',
-                sig				: '504b0304',
-                offset			: 0,
-                archiveHandler	: '7Zip',
+                desc            : 'ZIP Archive',
+                sig             : '504b0304',
+                offset          : 0,
+                archiveHandler  : '7Zip',
             },
             /*
-			'application/x-cbr' : {
-				desc			: 'Comic Book Archive',
-				sig				: '504b0304',
-			},
-			*/
+            'application/x-cbr' : {
+                desc            : 'Comic Book Archive',
+                sig             : '504b0304',
+            },
+            */
             'application/x-arj' : {
-                desc			: 'ARJ Archive',
-                sig				: '60ea',
-                offset			: 0,
-                archiveHandler	: 'Arj',
+                desc            : 'ARJ Archive',
+                sig             : '60ea',
+                offset          : 0,
+                archiveHandler  : 'Arj',
             },
             'application/x-rar-compressed' : {
-                desc			: 'RAR Archive',
-                sig				: '526172211a0700',
-                offset			: 0,
-                archiveHandler	: 'Rar',
+                desc            : 'RAR Archive',
+                sig             : '526172211a0700',
+                offset          : 0,
+                archiveHandler  : 'Rar',
             },
             'application/gzip' : {
-                desc			: 'Gzip Archive',
-                sig				: '1f8b',
-                offset			: 0,
-                archiveHandler	: 'TarGz',
+                desc            : 'Gzip Archive',
+                sig             : '1f8b',
+                offset          : 0,
+                archiveHandler  : 'TarGz',
             },
-            //	:TODO: application/x-bzip
+            //  :TODO: application/x-bzip
             'application/x-bzip2' : {
-                desc			: 'BZip2 Archive',
-                sig				: '425a68',
-                offset			: 0,
-                archiveHandler	: '7Zip',
+                desc            : 'BZip2 Archive',
+                sig             : '425a68',
+                offset          : 0,
+                archiveHandler  : '7Zip',
             },
             'application/x-lzh-compressed' : {
-                desc			: 'LHArc Archive',
-                sig				: '2d6c68',
-                offset			: 2,
-                archiveHandler	: 'Lha',
+                desc            : 'LHArc Archive',
+                sig             : '2d6c68',
+                offset          : 2,
+                archiveHandler  : 'Lha',
             },
             'application/x-lzx' : {
-                desc			: 'LZX Archive',
-                sig				: '4c5a5800',
-                offset			: 0,
-                archiveHandler	: 'Lzx',
+                desc            : 'LZX Archive',
+                sig             : '4c5a5800',
+                offset          : 0,
+                archiveHandler  : 'Lzx',
             },
             'application/x-7z-compressed' : {
-                desc			: '7-Zip Archive',
-                sig				: '377abcaf271c',
-                offset			: 0,
-                archiveHandler	: '7Zip',
+                desc            : '7-Zip Archive',
+                sig             : '377abcaf271c',
+                offset          : 0,
+                archiveHandler  : '7Zip',
             },
 
             //
-            //	Generics that need further mapping
+            //  Generics that need further mapping
             //
             'application/octet-stream' : [
                 {
-                    desc			: 'Amiga DISKMASHER',
-                    sig				: '444d5321',	//	DMS!
-                    ext				: '.dms',
-                    shortDescUtil	: 'XDMS2Desc',
-                    longDescUtil	: 'XDMS2LongDesc',
+                    desc            : 'Amiga DISKMASHER',
+                    sig             : '444d5321',   //  DMS!
+                    ext             : '.dms',
+                    shortDescUtil   : 'XDMS2Desc',
+                    longDescUtil    : 'XDMS2LongDesc',
                 }
             ]
         },
@@ -462,119 +462,119 @@ function getDefaultConfig() {
         archives : {
             archivers : {
                 '7Zip' : {
-                    compress		: {
-                        cmd			: '7za',
-                        args		: [ 'a', '-tzip', '{archivePath}', '{fileList}' ],
+                    compress        : {
+                        cmd         : '7za',
+                        args        : [ 'a', '-tzip', '{archivePath}', '{fileList}' ],
                     },
-                    decompress		: {
-                        cmd			: '7za',
-                        args		: [ 'e', '-o{extractPath}', '{archivePath}' ]	//	:TODO: should be 'x'?
+                    decompress      : {
+                        cmd         : '7za',
+                        args        : [ 'e', '-o{extractPath}', '{archivePath}' ]   //  :TODO: should be 'x'?
                     },
-                    list			: {
-                        cmd			: '7za',
-                        args		: [ 'l', '{archivePath}' ],
-                        entryMatch	: '^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\s[A-Za-z\\.]{5}\\s+([0-9]+)\\s+[0-9]+\\s+([^\\r\\n]+)$',
+                    list            : {
+                        cmd         : '7za',
+                        args        : [ 'l', '{archivePath}' ],
+                        entryMatch  : '^[0-9]{4}-[0-9]{2}-[0-9]{2}\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\s[A-Za-z\\.]{5}\\s+([0-9]+)\\s+[0-9]+\\s+([^\\r\\n]+)$',
                     },
-                    extract			: {
-                        cmd			: '7za',
-                        args		: [ 'e', '-o{extractPath}', '{archivePath}', '{fileList}' ],
+                    extract         : {
+                        cmd         : '7za',
+                        args        : [ 'e', '-o{extractPath}', '{archivePath}', '{fileList}' ],
                     },
                 },
 
                 Lha : {
                     //
-                    //	'lha' command can be obtained from:
-                    //	* apt-get: lhasa
+                    //  'lha' command can be obtained from:
+                    //  * apt-get: lhasa
                     //
-                    //	(compress not currently supported)
+                    //  (compress not currently supported)
                     //
-                    decompress		: {
-                        cmd			: 'lha',
-                        args		: [ '-efw={extractPath}', '{archivePath}' ],
+                    decompress      : {
+                        cmd         : 'lha',
+                        args        : [ '-efw={extractPath}', '{archivePath}' ],
                     },
-                    list			: {
-                        cmd			: 'lha',
-                        args		: [ '-l', '{archivePath}' ],
-                        entryMatch	: '^[\\[a-z\\]]+(?:\\s+[0-9]+\\s+[0-9]+|\\s+)([0-9]+)\\s+[0-9]{2}\\.[0-9]\\%\\s+[A-Za-z]{3}\\s+[0-9]{1,2}\\s+[0-9]{4}\\s+([^\\r\\n]+)$',
+                    list            : {
+                        cmd         : 'lha',
+                        args        : [ '-l', '{archivePath}' ],
+                        entryMatch  : '^[\\[a-z\\]]+(?:\\s+[0-9]+\\s+[0-9]+|\\s+)([0-9]+)\\s+[0-9]{2}\\.[0-9]\\%\\s+[A-Za-z]{3}\\s+[0-9]{1,2}\\s+[0-9]{4}\\s+([^\\r\\n]+)$',
                     },
-                    extract			: {
-                        cmd			: 'lha',
-                        args		: [ '-efw={extractPath}', '{archivePath}', '{fileList}' ]
+                    extract         : {
+                        cmd         : 'lha',
+                        args        : [ '-efw={extractPath}', '{archivePath}', '{fileList}' ]
                     }
                 },
 
                 Lzx : {
                     //
-                    //	'unlzx' command can be obtained from:
-                    //	* Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
-                    //	* RedHat: https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html
-                    //	* Source: http://xavprods.free.fr/lzx/
+                    //  'unlzx' command can be obtained from:
+                    //  * Debian based: https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127 (amd64/x86_64)
+                    //  * RedHat: https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html
+                    //  * Source: http://xavprods.free.fr/lzx/
                     //
-                    decompress		: {
-                        cmd			: 'unlzx',
-                        //	unzlx doesn't have a output dir option, but we'll cwd to the temp output dir first
-                        args		: [ '-x', '{archivePath}' ],
+                    decompress      : {
+                        cmd         : 'unlzx',
+                        //  unzlx doesn't have a output dir option, but we'll cwd to the temp output dir first
+                        args        : [ '-x', '{archivePath}' ],
                     },
-                    list			: {
-                        cmd			: 'unlzx',
-                        args		: [ '-v', '{archivePath}' ],
-                        entryMatch	: '^\\s+([0-9]+)\\s+[^\\s]+\\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\\s+[0-9]{1,2}-[a-z]{3}-[0-9]{4}\\s+[a-z\\-]+\\s+\\"([^"]+)\\"$',
+                    list            : {
+                        cmd         : 'unlzx',
+                        args        : [ '-v', '{archivePath}' ],
+                        entryMatch  : '^\\s+([0-9]+)\\s+[^\\s]+\\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\\s+[0-9]{1,2}-[a-z]{3}-[0-9]{4}\\s+[a-z\\-]+\\s+\\"([^"]+)\\"$',
                     }
                 },
 
                 Arj : {
                     //
-                    //	'arj' command can be obtained from:
-                    //	* apt-get: arj
+                    //  'arj' command can be obtained from:
+                    //  * apt-get: arj
                     //
-                    decompress		: {
-                        cmd			: 'arj',
-                        args		: [ 'x', '{archivePath}', '{extractPath}' ],
+                    decompress      : {
+                        cmd         : 'arj',
+                        args        : [ 'x', '{archivePath}', '{extractPath}' ],
                     },
-                    list			: {
-                        cmd				: 'arj',
-                        args			: [ 'l', '{archivePath}' ],
-                        entryMatch		: '^([^\\s]+)\\s+([0-9]+)\\s+[0-9]+\\s[0-9\\.]+\\s+[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}\\s+(?:[^\\r\\n]+)$',
-                        entryGroupOrder	: {	//	defaults to { byteSize : 1, fileName : 2 }
-                            fileName	: 1,
-                            byteSize	: 2,
+                    list            : {
+                        cmd             : 'arj',
+                        args            : [ 'l', '{archivePath}' ],
+                        entryMatch      : '^([^\\s]+)\\s+([0-9]+)\\s+[0-9]+\\s[0-9\\.]+\\s+[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\:[0-9]{2}\\s+(?:[^\\r\\n]+)$',
+                        entryGroupOrder : { //  defaults to { byteSize : 1, fileName : 2 }
+                            fileName    : 1,
+                            byteSize    : 2,
                         }
                     },
-                    extract			: {
-                        cmd			: 'arj',
-                        args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
+                    extract         : {
+                        cmd         : 'arj',
+                        args        : [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
                     }
                 },
 
                 Rar : {
-                    decompress		: {
-                        cmd			: 'unrar',
-                        args		: [ 'x', '{archivePath}', '{extractPath}' ],
+                    decompress      : {
+                        cmd         : 'unrar',
+                        args        : [ 'x', '{archivePath}', '{extractPath}' ],
                     },
-                    list			: {
-                        cmd			: 'unrar',
-                        args		: [ 'l', '{archivePath}' ],
-                        entryMatch	: '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
+                    list            : {
+                        cmd         : 'unrar',
+                        args        : [ 'l', '{archivePath}' ],
+                        entryMatch  : '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
                     },
-                    extract			: {
-                        cmd			: 'unrar',
-                        args		: [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
+                    extract         : {
+                        cmd         : 'unrar',
+                        args        : [ 'e', '{archivePath}', '{extractPath}', '{fileList}' ],
                     }
                 },
 
                 TarGz : {
-                    decompress		: {
-                        cmd			: 'tar',
-                        args		: [ '-xf', '{archivePath}', '-C', '{extractPath}', '--strip-components=1' ],
+                    decompress      : {
+                        cmd         : 'tar',
+                        args        : [ '-xf', '{archivePath}', '-C', '{extractPath}', '--strip-components=1' ],
                     },
-                    list			: {
-                        cmd			: 'tar',
-                        args		: [ '-tvf', '{archivePath}' ],
-                        entryMatch	: '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',
+                    list            : {
+                        cmd         : 'tar',
+                        args        : [ '-tvf', '{archivePath}' ],
+                        entryMatch  : '^[drwx\\-]{10}\\s[A-Za-z0-9\\/]+\\s+([0-9]+)\\s[0-9]{4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s([^\\r\\n]+)$',
                     },
-                    extract			: {
-                        cmd			: 'tar',
-                        args		: [ '-xvf', '{archivePath}', '-C', '{extractPath}', '{fileList}' ],
+                    extract         : {
+                        cmd         : 'tar',
+                        args        : [ '-xvf', '{archivePath}', '-C', '{extractPath}', '{fileList}' ],
                     }
                 }
             },
@@ -582,89 +582,89 @@ function getDefaultConfig() {
 
         fileTransferProtocols : {
             //
-            //	See http://www.synchro.net/docs/sexyz.txt for information on SEXYZ
+            //  See http://www.synchro.net/docs/sexyz.txt for information on SEXYZ
             //
             zmodem8kSexyz : {
-                name		: 'ZModem 8k (SEXYZ)',
-                type		: 'external',
-                sort		: 1,
-                external	: {
-                    //	:TODO: Look into shipping sexyz binaries or at least hosting them somewhere for common systems
-                    sendCmd				: 'sexyz',
-                    sendArgs			: [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
-                    recvCmd				: 'sexyz',
-                    recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
-                    recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
+                name        : 'ZModem 8k (SEXYZ)',
+                type        : 'external',
+                sort        : 1,
+                external    : {
+                    //  :TODO: Look into shipping sexyz binaries or at least hosting them somewhere for common systems
+                    sendCmd             : 'sexyz',
+                    sendArgs            : [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
+                    recvCmd             : 'sexyz',
+                    recvArgs            : [ '-telnet', '-8', 'rz', '{uploadDir}' ],
+                    recvArgsNonBatch    : [ '-telnet', '-8', 'rz', '{fileName}' ],
                 }
             },
 
             xmodemSexyz : {
-                name		: 'XModem (SEXYZ)',
-                type		: 'external',
-                sort		: 3,
-                external	: {
-                    sendCmd				: 'sexyz',
-                    sendArgs			: [ '-telnet', 'sX', '@{fileListPath}' ],
-                    recvCmd				: 'sexyz',
-                    recvArgsNonBatch	: [ '-telnet', 'rC', '{fileName}' ]
+                name        : 'XModem (SEXYZ)',
+                type        : 'external',
+                sort        : 3,
+                external    : {
+                    sendCmd             : 'sexyz',
+                    sendArgs            : [ '-telnet', 'sX', '@{fileListPath}' ],
+                    recvCmd             : 'sexyz',
+                    recvArgsNonBatch    : [ '-telnet', 'rC', '{fileName}' ]
                 }
             },
 
             ymodemSexyz : {
-                name		: 'YModem (SEXYZ)',
-                type		: 'external',
-                sort		: 4,
-                external	: {
-                    sendCmd				: 'sexyz',
-                    sendArgs			: [ '-telnet', 'sY', '@{fileListPath}' ],
-                    recvCmd				: 'sexyz',
-                    recvArgs			: [ '-telnet', 'ry', '{uploadDir}' ],
+                name        : 'YModem (SEXYZ)',
+                type        : 'external',
+                sort        : 4,
+                external    : {
+                    sendCmd             : 'sexyz',
+                    sendArgs            : [ '-telnet', 'sY', '@{fileListPath}' ],
+                    recvCmd             : 'sexyz',
+                    recvArgs            : [ '-telnet', 'ry', '{uploadDir}' ],
                 }
             },
 
             zmodem8kSz : {
-                name		: 'ZModem 8k',
-                type		: 'external',
-                sort		: 2,
-                external	: {
-                    sendCmd		: 'sz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
-                    sendArgs	: [
-                        //	:TODO: try -q
+                name        : 'ZModem 8k',
+                type        : 'external',
+                sort        : 2,
+                external    : {
+                    sendCmd     : 'sz', //  Avail on Debian/Ubuntu based systems as the package "lrzsz"
+                    sendArgs    : [
+                        //  :TODO: try -q
                         '--zmodem', '--try-8k', '--binary', '--restricted', '{filePaths}'
                     ],
-                    recvCmd		: 'rz',	//	Avail on Debian/Ubuntu based systems as the package "lrzsz"
-                    recvArgs	: [
-                        '--zmodem', '--binary', '--restricted', '--keep-uppercase', 	//	dumps to CWD which is set to {uploadDir}
+                    recvCmd     : 'rz', //  Avail on Debian/Ubuntu based systems as the package "lrzsz"
+                    recvArgs    : [
+                        '--zmodem', '--binary', '--restricted', '--keep-uppercase',     //  dumps to CWD which is set to {uploadDir}
                     ],
-                    //	:TODO: can we not just use --escape ?
-                    escapeTelnet	: true,	//	set to true to escape Telnet codes such as IAC
+                    //  :TODO: can we not just use --escape ?
+                    escapeTelnet    : true, //  set to true to escape Telnet codes such as IAC
                 }
             }
         },
 
         messageAreaDefaults : {
             //
-            //	The following can be override per-area as well
+            //  The following can be override per-area as well
             //
-            maxMessages		: 1024,	//	0 = unlimited
-            maxAgeDays		: 0,	//	0 = unlimited
+            maxMessages     : 1024, //  0 = unlimited
+            maxAgeDays      : 0,    //  0 = unlimited
         },
 
         messageConferences : {
             system_internal : {
-                name 	: 'System Internal',
-                desc 	: 'Built in conference for private messages, bulletins, etc.',
+                name    : 'System Internal',
+                desc    : 'Built in conference for private messages, bulletins, etc.',
 
                 areas : {
                     private_mail : {
-                        name					: 'Private Mail',
-                        desc					: 'Private user to user mail/email',
-                        maxExternalSentAgeDays	: 30,	//	max external "outbox" item age
+                        name                    : 'Private Mail',
+                        desc                    : 'Private user to user mail/email',
+                        maxExternalSentAgeDays  : 30,   //  max external "outbox" item age
                     },
 
                     local_bulletin : {
-                        name	: 'System Bulletins',
-                        desc	: 'Bulletin messages for all users',
+                        name    : 'System Bulletins',
+                        desc    : 'Bulletin messages for all users',
                     }
                 }
             }
@@ -673,99 +673,99 @@ function getDefaultConfig() {
         scannerTossers : {
             ftn_bso : {
                 paths : {
-                    outbound		: paths.join(__dirname, './../mail/ftn_out/'),
-                    inbound			: paths.join(__dirname, './../mail/ftn_in/'),
-                    secInbound		: paths.join(__dirname, './../mail/ftn_secin/'),
-                    reject			: paths.join(__dirname, './../mail/reject/'),	//	bad pkt, bundles, TIC attachments that fail any check, etc.
-                    //outboundNetMail	: paths.join(__dirname, './../mail/ftn_netmail_out/'),
-                    //	set 'retain' to a valid path to keep good pkt files
+                    outbound        : paths.join(__dirname, './../mail/ftn_out/'),
+                    inbound         : paths.join(__dirname, './../mail/ftn_in/'),
+                    secInbound      : paths.join(__dirname, './../mail/ftn_secin/'),
+                    reject          : paths.join(__dirname, './../mail/reject/'),   //  bad pkt, bundles, TIC attachments that fail any check, etc.
+                    //outboundNetMail   : paths.join(__dirname, './../mail/ftn_netmail_out/'),
+                    //  set 'retain' to a valid path to keep good pkt files
                 },
 
                 //
-                //	Packet and (ArcMail) bundle target sizes are just that: targets.
-                //	Actual sizes may be slightly larger when we must place a full
-                //	PKT contents *somewhere*
+                //  Packet and (ArcMail) bundle target sizes are just that: targets.
+                //  Actual sizes may be slightly larger when we must place a full
+                //  PKT contents *somewhere*
                 //
-                packetTargetByteSize	: 512000,		//	512k, before placing messages in a new pkt
-                bundleTargetByteSize	: 2048000,		//	2M, before creating another archive
-                packetMsgEncoding		: 'utf8',		//	default packet encoding. Override per node if desired.
-                packetAnsiMsgEncoding	: 'cp437',		//	packet encoding for *ANSI ART* messages
+                packetTargetByteSize    : 512000,       //  512k, before placing messages in a new pkt
+                bundleTargetByteSize    : 2048000,      //  2M, before creating another archive
+                packetMsgEncoding       : 'utf8',       //  default packet encoding. Override per node if desired.
+                packetAnsiMsgEncoding   : 'cp437',      //  packet encoding for *ANSI ART* messages
 
                 tic : {
-                    secureInOnly	: true,				//	only bring in from secure inbound (|secInbound| path, password protected)
-                    uploadBy		: 'ENiGMA TIC',		//	default upload by username (override @ network)
-                    allowReplace	: false,			//	use "Replaces" TIC field
-                    descPriority	: 'diz',			//	May be diz=.DIZ/etc., or tic=from TIC Ldesc
+                    secureInOnly    : true,             //  only bring in from secure inbound (|secInbound| path, password protected)
+                    uploadBy        : 'ENiGMA TIC',     //  default upload by username (override @ network)
+                    allowReplace    : false,            //  use "Replaces" TIC field
+                    descPriority    : 'diz',            //  May be diz=.DIZ/etc., or tic=from TIC Ldesc
                 }
             }
         },
 
         fileBase: {
-            //	areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|:
-            areaStoragePrefix	: paths.join(__dirname, './../file_base/'),
+            //  areas with an explicit |storageDir| will be stored relative to |areaStoragePrefix|:
+            areaStoragePrefix   : paths.join(__dirname, './../file_base/'),
 
-            maxDescFileByteSize			: 471859,	//	~1/4 MB
-            maxDescLongFileByteSize		: 524288,	//	1/2 MB
+            maxDescFileByteSize         : 471859,   //  ~1/4 MB
+            maxDescLongFileByteSize     : 524288,   //  1/2 MB
 
             fileNamePatterns: {
-                //	These are NOT case sensitive
-                //	FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
-                //	Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
-                desc		: [
-                    '^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'	//	eslint-disable-line no-useless-escape
+                //  These are NOT case sensitive
+                //  FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
+                //  Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
+                desc        : [
+                    '^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'  //  eslint-disable-line no-useless-escape
                 ],
 
-                //	common README filename - https://en.wikipedia.org/wiki/README
-                descLong		: [
-                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'	//	eslint-disable-line no-useless-escape
+                //  common README filename - https://en.wikipedia.org/wiki/README
+                descLong        : [
+                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'    //  eslint-disable-line no-useless-escape
                 ],
             },
 
             yearEstPatterns: [
                 //
-                //	Patterns should produce the year in the first submatch.
-                //	The extracted year may be YY or YYYY
+                //  Patterns should produce the year in the first submatch.
+                //  The extracted year may be YY or YYYY
                 //
-                '\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',	//	yyyy-mm-dd, yyyy/mm/dd, ...
-                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1-2][0-9][0-9]{2}))\\b',	//	mm/dd/yyyy, mm.dd.yyyy, ...
-                '\\b((?:[1789][0-9]))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',			//	yy-mm-dd, yy-mm-dd, ...
-                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',			//	mm-dd-yy, mm/dd/yy, ...
-                //'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',	//	yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
-                //"\\b('[1789][0-9])\\b",	//	eslint-disable-line quotes
+                '\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',   //  yyyy-mm-dd, yyyy/mm/dd, ...
+                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1-2][0-9][0-9]{2}))\\b',   //  mm/dd/yyyy, mm.dd.yyyy, ...
+                '\\b((?:[1789][0-9]))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]\\b',          //  yy-mm-dd, yy-mm-dd, ...
+                '\\b[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[1789][0-9]))\\b',          //  mm-dd-yy, mm/dd/yy, ...
+                //'\\b((?:[1-2][0-9][0-9]{2}))[\\-\\/\\.][0-3]?[0-9][\\-\\/\\.][0-3]?[0-9]|[0-3]?[0-9][\\-\\/\\.][0-3]?[0-9][\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b', //  yyyy-mm-dd, m/d/yyyy, mm-dd-yyyy, etc.
+                //"\\b('[1789][0-9])\\b",   //  eslint-disable-line quotes
                 '\\b[0-3]?[0-9][\\-\\/\\.](?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december)[\\-\\/\\.]((?:[0-9]{2})?[0-9]{2})\\b',
-                '\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',	//	November 29th, 1997
-                '\\(((?:19|20)[0-9]{2})\\)',	//	(19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
-                '\\b((?:19|20)[0-9]{2})\\b',	//	simple 19xx or 20xx with word boundaries
-                '\\b\'([17-9][0-9])\\b',		//	'95, '17, ...
-                //	:TODO: DD/MMM/YY, DD/MMMM/YY, DD/MMM/YYYY, etc.
+                '\\b(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|september|october|november|december),?\\s[0-9]+(?:st|nd|rd|th)?,?\\s((?:[0-9]{2})?[0-9]{2})\\b',   //  November 29th, 1997
+                '\\(((?:19|20)[0-9]{2})\\)',    //  (19xx) or (20xx) -- with parens -- do this before 19xx 20xx such that this has priority
+                '\\b((?:19|20)[0-9]{2})\\b',    //  simple 19xx or 20xx with word boundaries
+                '\\b\'([17-9][0-9])\\b',        //  '95, '17, ...
+                //  :TODO: DD/MMM/YY, DD/MMMM/YY, DD/MMM/YYYY, etc.
             ],
 
             web : {
-                path			: '/f/',
-                routePath		: '/f/[a-zA-Z0-9]+$',
-                expireMinutes	: 1440,	//	1 day
+                path            : '/f/',
+                routePath       : '/f/[a-zA-Z0-9]+$',
+                expireMinutes   : 1440, //  1 day
             },
 
             //
-            //	File area storage location tag/value pairs.
-            //	Non-absolute paths are relative to |areaStoragePrefix|.
+            //  File area storage location tag/value pairs.
+            //  Non-absolute paths are relative to |areaStoragePrefix|.
             //
             storageTags : {
-                sys_msg_attach		: 'sys_msg_attach',
-                sys_temp_download	: 'sys_temp_download',
+                sys_msg_attach      : 'sys_msg_attach',
+                sys_temp_download   : 'sys_temp_download',
             },
 
             areas: {
                 system_message_attachment : {
-                    name		: 'System Message Attachments',
-                    desc		: 'File attachments to messages',
-                    storageTags	: [ 'sys_msg_attach' ],
+                    name        : 'System Message Attachments',
+                    desc        : 'File attachments to messages',
+                    storageTags : [ 'sys_msg_attach' ],
                 },
 
                 system_temporary_download : {
-                    name		: 'System Temporary Downloads',
-                    desc		: 'Temporary downloadables',
-                    storageTags	: [ 'sys_temp_download' ],
+                    name        : 'System Temporary Downloads',
+                    desc        : 'Temporary downloadables',
+                    storageTags : [ 'sys_temp_download' ],
                 }
             }
         },
@@ -774,63 +774,63 @@ function getDefaultConfig() {
 
             events : {
                 trimMessageAreas : {
-                    //	may optionally use [or ]@watch:/path/to/file
-                    schedule	: 'every 24 hours',
+                    //  may optionally use [or ]@watch:/path/to/file
+                    schedule    : 'every 24 hours',
 
-                    //	action:
-                    //	- @method:path/to/module.js:theMethodName
-                    //	  (path is relative to engima base dir)
+                    //  action:
+                    //  - @method:path/to/module.js:theMethodName
+                    //    (path is relative to engima base dir)
                     //
-                    //	- @execute:/path/to/something/executable.sh
+                    //  - @execute:/path/to/something/executable.sh
                     //
-                    action		: '@method:core/message_area.js:trimMessageAreasScheduledEvent',
+                    action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
                 },
 
                 updateFileAreaStats : {
-                    schedule	: 'every 1 hours',
-                    action		: '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
+                    schedule    : 'every 1 hours',
+                    action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
                 },
 
                 forgotPasswordMaintenance : {
-                    schedule	: 'every 24 hours',
-                    action		: '@method:core/web_password_reset.js:performMaintenanceTask',
-                    args		: [ '24 hours' ]	//	items older than this will be removed
+                    schedule    : 'every 24 hours',
+                    action      : '@method:core/web_password_reset.js:performMaintenanceTask',
+                    args        : [ '24 hours' ]    //  items older than this will be removed
                 },
 
                 //
-                //	Enable the following entry in your config.hjson to periodically create/update
-                //	DESCRIPT.ION files for your file base
+                //  Enable the following entry in your config.hjson to periodically create/update
+                //  DESCRIPT.ION files for your file base
                 //
                 /*
-				updateDescriptIonFiles : {
-					schedule	: 'on the last day of the week',
-					action		: '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
-				}
-				*/
+                updateDescriptIonFiles : {
+                    schedule    : 'on the last day of the week',
+                    action      : '@method:core/file_base_list_export.js:updateFileBaseDescFilesScheduledEvent',
+                }
+                */
             }
         },
 
         misc : {
-            preAuthIdleLogoutSeconds	: 60 * 3,	//	3m
-            idleLogoutSeconds			: 60 * 6,	//	6m
+            preAuthIdleLogoutSeconds    : 60 * 3,   //  3m
+            idleLogoutSeconds           : 60 * 6,   //  6m
         },
 
         logging : {
-            level	: 'debug',
+            level   : 'debug',
 
-            rotatingFile	: {	//	set to 'disabled' or false to disable
-                type		: 'rotating-file',
-                fileName	: 'enigma-bbs.log',
-                period		: '1d',
-                count		: 3,
-                level		: 'debug',
+            rotatingFile    : { //  set to 'disabled' or false to disable
+                type        : 'rotating-file',
+                fileName    : 'enigma-bbs.log',
+                period      : '1d',
+                count       : 3,
+                level       : 'debug',
             }
 
-            //	:TODO: syslog - https://github.com/mcavage/node-bunyan-syslog
+            //  :TODO: syslog - https://github.com/mcavage/node-bunyan-syslog
         },
 
         debug : {
-            assertsEnabled	: false,
+            assertsEnabled  : false,
         }
     };
 }
diff --git a/core/config_cache.js b/core/config_cache.js
index 15143efc..e8e06f14 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -1,16 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const paths				= require('path');
-const fs				= require('graceful-fs');
-const hjson				= require('hjson');
-const sane				= require('sane');
+//  deps
+const paths             = require('path');
+const fs                = require('graceful-fs');
+const hjson             = require('hjson');
+const sane              = require('sane');
 
 module.exports = new class ConfigCache
 {
     constructor() {
-        this.cache		= new Map();	//	path->parsed config
+        this.cache      = new Map();    //  path->parsed config
     }
 
     getConfigWithOptions(options, cb) {
diff --git a/core/config_util.js b/core/config_util.js
index 1c61162c..bda0e1bd 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -1,19 +1,19 @@
 /* jslint node: true */
 'use strict';
 
-const Config			= require('./config.js').get;
-const ConfigCache		= require('./config_cache.js');
-const Events			= require('./events.js');
+const Config            = require('./config.js').get;
+const ConfigCache       = require('./config_cache.js');
+const Events            = require('./events.js');
 
-//	deps
-const paths				= require('path');
-const async				= require('async');
+//  deps
+const paths             = require('path');
+const async             = require('async');
 
-exports.init			= init;
-exports.getFullConfig	= getFullConfig;
+exports.init            = init;
+exports.getFullConfig   = getFullConfig;
 
 function getConfigPath(filePath) {
-    //	|filePath| is assumed to be in the config path if it's only a file name
+    //  |filePath| is assumed to be in the config path if it's only a file name
     if('.' === paths.dirname(filePath)) {
         filePath = paths.join(Config().paths.config, filePath);
     }
@@ -21,7 +21,7 @@ function getConfigPath(filePath) {
 }
 
 function init(cb) {
-    //	pre-cache menu.hjson and prompt.hjson + establish events
+    //  pre-cache menu.hjson and prompt.hjson + establish events
     const changed = ( { fileName, fileRoot } ) => {
         const reCachedPath = paths.join(fileRoot, fileName);
         if(reCachedPath === getConfigPath(Config().general.menuFile)) {
diff --git a/core/connect.js b/core/connect.js
index 86cf3833..44277813 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const ansi		= require('./ansi_term.js');
+//  ENiGMA½
+const ansi      = require('./ansi_term.js');
 const Events    = require('./events.js');
 
-//	deps
-const async		= require('async');
+//  deps
+const async     = require('async');
 
-exports.connectEntry	= connectEntry;
+exports.connectEntry    = connectEntry;
 
 function ansiDiscoverHomePosition(client, cb) {
     //
-    //	We want to find the home position. ANSI-BBS and most terminals
-    //	utilize 1,1 as home. However, some terminals such as ConnectBot
-    //	think of home as 0,0. If this is the case, we need to offset
-    //	our positioning to accomodate for such.
+    //  We want to find the home position. ANSI-BBS and most terminals
+    //  utilize 1,1 as home. However, some terminals such as ConnectBot
+    //  think of home as 0,0. If this is the case, we need to offset
+    //  our positioning to accomodate for such.
     //
     const done = function(err) {
         client.removeListener('cursor position report', cprListener);
@@ -28,7 +28,7 @@ function ansiDiscoverHomePosition(client, cb) {
         const w = pos[1];
 
         //
-        //	We expect either 0,0, or 1,1. Anything else will be filed as bad data
+        //  We expect either 0,0, or 1,1. Anything else will be filed as bad data
         //
         if(h > 1 || w > 1) {
             client.log.warn( { height : h, width : w }, 'Ignoring ANSI home position CPR due to unexpected values');
@@ -37,7 +37,7 @@ function ansiDiscoverHomePosition(client, cb) {
 
         if(0 === h & 0 === w) {
             //
-            //	Store a CPR offset in the client. All CPR's from this point on will offset by this amount
+            //  Store a CPR offset in the client. All CPR's from this point on will offset by this amount
             //
             client.log.info('Setting CPR offset to 1');
             client.cprOffset = 1;
@@ -50,9 +50,9 @@ function ansiDiscoverHomePosition(client, cb) {
 
     const giveUpTimer = setTimeout( () => {
         return done(new Error('Giving up on home position CPR'));
-    }, 3000);	//	3s
+    }, 3000);   //  3s
 
-    client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);	//	go home, query pos
+    client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);    //  go home, query pos
 }
 
 function ansiQueryTermSizeIfNeeded(client, cb) {
@@ -68,7 +68,7 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 
     const cprListener = function(pos) {
         //
-        //	If we've already found out, disregard
+        //  If we've already found out, disregard
         //
         if(client.term.termHeight > 0 || client.term.termWidth > 0) {
             return done(null);
@@ -78,8 +78,8 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
         const w = pos[1];
 
         //
-        //	Netrunner for example gives us 1x1 here. Not really useful. Ignore
-        //	values that seem obviously bad.
+        //  Netrunner for example gives us 1x1 here. Not really useful. Ignore
+        //  values that seem obviously bad.
         //
         if(h < 10 || w < 10) {
             client.log.warn(
@@ -88,14 +88,14 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
             return done(new Error('Term size <= 10 considered invalid'));
         }
 
-        client.term.termHeight	= h;
-        client.term.termWidth	= w;
+        client.term.termHeight  = h;
+        client.term.termWidth   = w;
 
         client.log.debug(
             {
-                termWidth	: client.term.termWidth,
-                termHeight	: client.term.termHeight,
-                source		: 'ANSI CPR'
+                termWidth   : client.term.termWidth,
+                termHeight  : client.term.termHeight,
+                source      : 'ANSI CPR'
             },
             'Window size updated'
         );
@@ -105,23 +105,23 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 
     client.once('cursor position report', cprListener);
 
-    //	give up after 2s
+    //  give up after 2s
     const giveUpTimer = setTimeout( () => {
         return done(new Error('No term size established by CPR within timeout'));
     }, 2000);
 
-    //	Start the process: Query for CPR
+    //  Start the process: Query for CPR
     client.term.rawWrite(ansi.queryScreenSize());
 }
 
 function prepareTerminal(term) {
     term.rawWrite(ansi.normal());
     //term.rawWrite(ansi.disableVT100LineWrapping());
-    //	:TODO: set xterm stuff -- see x84/others
+    //  :TODO: set xterm stuff -- see x84/others
 }
 
 function displayBanner(term) {
-    //	note: intentional formatting:
+    //  note: intentional formatting:
     term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
 |06Copyright (c) 2014-2018 Bryan Ashby |14- |12http://l33t.codes/
@@ -141,26 +141,26 @@ function connectEntry(client, nextMenu) {
             },
             function discoverHomePosition(callback) {
                 ansiDiscoverHomePosition(client, () => {
-                    //	:TODO: If CPR for home fully fails, we should bail out on the connection with an error, e.g. ANSI support required
-                    return callback(null);	//	we try to continue anyway
+                    //  :TODO: If CPR for home fully fails, we should bail out on the connection with an error, e.g. ANSI support required
+                    return callback(null);  //  we try to continue anyway
                 });
             },
             function queryTermSizeByNonStandardAnsi(callback) {
                 ansiQueryTermSizeIfNeeded(client, err => {
                     if(err) {
                         //
-                        //	Check again; We may have got via NAWS/similar before CPR completed.
+                        //  Check again; We may have got via NAWS/similar before CPR completed.
                         //
                         if(0 === term.termHeight || 0 === term.termWidth) {
                             //
-                            //	We still don't have something good for term height/width.
-                            //	Default to DOS size 80x25.
+                            //  We still don't have something good for term height/width.
+                            //  Default to DOS size 80x25.
                             //
-                            //	:TODO: Netrunner is currenting hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
+                            //  :TODO: Netrunner is currenting hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
                             client.log.warn( { reason : err.message }, 'Failed to negotiate term size; Defaulting to 80x25!');
 
-                            term.termHeight	= 25;
-                            term.termWidth	= 80;
+                            term.termHeight = 25;
+                            term.termWidth  = 80;
                         }
                     }
 
@@ -172,7 +172,7 @@ function connectEntry(client, nextMenu) {
             prepareTerminal(term);
 
             //
-            //	Always show an ENiGMA½ banner
+            //  Always show an ENiGMA½ banner
             //
             displayBanner(term);
 
diff --git a/core/crc.js b/core/crc.js
index d7974c66..f90ac961 100644
--- a/core/crc.js
+++ b/core/crc.js
@@ -52,8 +52,8 @@ exports.CRC32 = class CRC32 {
     }
 
     update_4(input) {
-        const len	= input.length - 3;
-        let i		= 0;
+        const len   = input.length - 3;
+        let i       = 0;
 
         for(i = 0; i < len;) {
             this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
@@ -67,8 +67,8 @@ exports.CRC32 = class CRC32 {
     }
 
     update_8(input) {
-        const len	= input.length - 7;
-        let i		= 0;
+        const len   = input.length - 7;
+        let i       = 0;
 
         for(i = 0; i < len;) {
             this.crc = (this.crc >>> 8) ^ CRC32_TABLE[ (this.crc ^ input[i++]) & 0xff ];
diff --git a/core/database.js b/core/database.js
index 3ce2e031..ba48b404 100644
--- a/core/database.js
+++ b/core/database.js
@@ -1,28 +1,28 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const conf			= require('./config.js');
+//  ENiGMA½
+const conf          = require('./config.js');
 
-//	deps
-const sqlite3		= require('sqlite3');
-const sqlite3Trans	= require('sqlite3-trans');
-const paths			= require('path');
-const async			= require('async');
-const _				= require('lodash');
-const assert		= require('assert');
-const moment		= require('moment');
+//  deps
+const sqlite3       = require('sqlite3');
+const sqlite3Trans  = require('sqlite3-trans');
+const paths         = require('path');
+const async         = require('async');
+const _             = require('lodash');
+const assert        = require('assert');
+const moment        = require('moment');
 
-//	database handles
+//  database handles
 const dbs = {};
 
-exports.getTransactionDatabase		= getTransactionDatabase;
-exports.getModDatabasePath			= getModDatabasePath;
-exports.getISOTimestampString		= getISOTimestampString;
-exports.sanatizeString				= sanatizeString;
-exports.initializeDatabases			= initializeDatabases;
+exports.getTransactionDatabase      = getTransactionDatabase;
+exports.getModDatabasePath          = getModDatabasePath;
+exports.getISOTimestampString       = getISOTimestampString;
+exports.sanatizeString              = sanatizeString;
+exports.initializeDatabases         = initializeDatabases;
 
-exports.dbs							= dbs;
+exports.dbs                         = dbs;
 
 function getTransactionDatabase(db) {
     return sqlite3Trans.wrap(db);
@@ -34,9 +34,9 @@ function getDatabasePath(name) {
 
 function getModDatabasePath(moduleInfo, suffix) {
     //
-    //	Mods that use a database are stored in Config.paths.modsDb (e.g. enigma-bbs/db/mods)
-    //	We expect that moduleInfo defines packageName which will be the base of the modules
-    //	filename. An optional suffix may be supplied as well.
+    //  Mods that use a database are stored in Config.paths.modsDb (e.g. enigma-bbs/db/mods)
+    //  We expect that moduleInfo defines packageName which will be the base of the modules
+    //  filename. An optional suffix may be supplied as well.
     //
     const HOST_RE = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
 
@@ -61,14 +61,14 @@ function getISOTimestampString(ts) {
 }
 
 function sanatizeString(s) {
-    return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {	//	eslint-disable-line no-control-regex
+    return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {   //  eslint-disable-line no-control-regex
         switch (c) {
-            case '\0'	: return '\\0';
-            case '\x08'	: return '\\b';
-            case '\x09'	: return '\\t';
-            case '\x1a'	: return '\\z';
-            case '\n'	: return '\\n';
-            case '\r'	: return '\\r';
+            case '\0'   : return '\\0';
+            case '\x08' : return '\\b';
+            case '\x09' : return '\\t';
+            case '\x1a' : return '\\z';
+            case '\n'   : return '\\n';
+            case '\r'   : return '\\r';
 
             case '"' :
             case '\'' :
@@ -107,35 +107,35 @@ const DB_INIT_TABLE = {
     system : (cb) => {
         enableForeignKeys(dbs.system);
 
-        //	Various stat/event logging - see stat_log.js
+        //  Various stat/event logging - see stat_log.js
         dbs.system.run(
             `CREATE TABLE IF NOT EXISTS system_stat (
-				stat_name		VARCHAR PRIMARY KEY NOT NULL,
-				stat_value		VARCHAR NOT NULL
-			);`
+                stat_name       VARCHAR PRIMARY KEY NOT NULL,
+                stat_value      VARCHAR NOT NULL
+            );`
         );
 
         dbs.system.run(
             `CREATE TABLE IF NOT EXISTS system_event_log (
-				id				INTEGER PRIMARY KEY,
-				timestamp		DATETIME NOT NULL,
-				log_name		VARCHAR NOT NULL,
-				log_value		VARCHAR NOT NULL,
+                id              INTEGER PRIMARY KEY,
+                timestamp       DATETIME NOT NULL,
+                log_name        VARCHAR NOT NULL,
+                log_value       VARCHAR NOT NULL,
 
-				UNIQUE(timestamp, log_name)
-			);`
+                UNIQUE(timestamp, log_name)
+            );`
         );
 
         dbs.system.run(
             `CREATE TABLE IF NOT EXISTS user_event_log (
-				id				INTEGER PRIMARY KEY,
-				timestamp		DATETIME NOT NULL,
-				user_id			INTEGER NOT NULL,
-				log_name		VARCHAR NOT NULL,
-				log_value		VARCHAR NOT NULL,
+                id              INTEGER PRIMARY KEY,
+                timestamp       DATETIME NOT NULL,
+                user_id         INTEGER NOT NULL,
+                log_name        VARCHAR NOT NULL,
+                log_value       VARCHAR NOT NULL,
 
-				UNIQUE(timestamp, user_id, log_name)
-			);`
+                UNIQUE(timestamp, user_id, log_name)
+            );`
         );
 
         return cb(null);
@@ -146,38 +146,38 @@ const DB_INIT_TABLE = {
 
         dbs.user.run(
             `CREATE TABLE IF NOT EXISTS user ( 
-				id			INTEGER PRIMARY KEY,
-				user_name	VARCHAR NOT NULL, 
-				UNIQUE(user_name)
-			);`
+                id          INTEGER PRIMARY KEY,
+                user_name   VARCHAR NOT NULL, 
+                UNIQUE(user_name)
+            );`
         );
 
-        //	:TODO: create FK on delete/etc.
+        //  :TODO: create FK on delete/etc.
 
         dbs.user.run(
             `CREATE TABLE IF NOT EXISTS user_property (
-				user_id		INTEGER NOT NULL,
-				prop_name	VARCHAR NOT NULL,
-				prop_value	VARCHAR,
-				UNIQUE(user_id, prop_name),
-				FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE 
-			);`
+                user_id     INTEGER NOT NULL,
+                prop_name   VARCHAR NOT NULL,
+                prop_value  VARCHAR,
+                UNIQUE(user_id, prop_name),
+                FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE 
+            );`
         );
 
         dbs.user.run(
             `CREATE TABLE IF NOT EXISTS user_group_member ( 
-				group_name	VARCHAR NOT NULL, 
-				user_id		INTEGER NOT NULL,
-				UNIQUE(group_name, user_id)
-			);`
+                group_name  VARCHAR NOT NULL, 
+                user_id     INTEGER NOT NULL,
+                UNIQUE(group_name, user_id)
+            );`
         );
 
         dbs.user.run(
-            `CREATE TABLE IF NOT EXISTS user_login_history (	
-				user_id		INTEGER NOT NULL,
-				user_name	VARCHAR NOT NULL,
-				timestamp	DATETIME NOT NULL
-			);`
+            `CREATE TABLE IF NOT EXISTS user_login_history (    
+                user_id     INTEGER NOT NULL,
+                user_name   VARCHAR NOT NULL,
+                timestamp   DATETIME NOT NULL
+            );`
         );
 
         return cb(null);
@@ -188,104 +188,104 @@ const DB_INIT_TABLE = {
 
         dbs.message.run(
             `CREATE TABLE IF NOT EXISTS message (
-				message_id				INTEGER PRIMARY KEY, 
-				area_tag				VARCHAR NOT NULL,
-				message_uuid			VARCHAR(36) NOT NULL, 
-				reply_to_message_id		INTEGER,
-				to_user_name			VARCHAR NOT NULL,
-				from_user_name			VARCHAR NOT NULL,
-				subject, /* FTS @ message_fts */
-				message, /* FTS @ message_fts */
-				modified_timestamp		DATETIME NOT NULL,
-				view_count				INTEGER NOT NULL DEFAULT 0,
-				UNIQUE(message_uuid) 
-			);`
+                message_id              INTEGER PRIMARY KEY, 
+                area_tag                VARCHAR NOT NULL,
+                message_uuid            VARCHAR(36) NOT NULL, 
+                reply_to_message_id     INTEGER,
+                to_user_name            VARCHAR NOT NULL,
+                from_user_name          VARCHAR NOT NULL,
+                subject, /* FTS @ message_fts */
+                message, /* FTS @ message_fts */
+                modified_timestamp      DATETIME NOT NULL,
+                view_count              INTEGER NOT NULL DEFAULT 0,
+                UNIQUE(message_uuid) 
+            );`
         );
 
         dbs.message.run(
             `CREATE INDEX IF NOT EXISTS message_by_area_tag_index
-			ON message (area_tag);`
+            ON message (area_tag);`
         );
 
         dbs.message.run(
             `CREATE VIRTUAL TABLE IF NOT EXISTS message_fts USING fts4 (
-				content="message",
-				subject,
-				message
-			);`
+                content="message",
+                subject,
+                message
+            );`
         );
 
         dbs.message.run(
             `CREATE TRIGGER IF NOT EXISTS message_before_update BEFORE UPDATE ON message BEGIN
-				DELETE FROM message_fts WHERE docid=old.rowid;
-			END;`
+                DELETE FROM message_fts WHERE docid=old.rowid;
+            END;`
         );
 
         dbs.message.run(
             `CREATE TRIGGER IF NOT EXISTS message_before_delete BEFORE DELETE ON message BEGIN
-				DELETE FROM message_fts WHERE docid=old.rowid;
-			END;`
+                DELETE FROM message_fts WHERE docid=old.rowid;
+            END;`
         );
 
         dbs.message.run(
             `CREATE TRIGGER IF NOT EXISTS message_after_update AFTER UPDATE ON message BEGIN
-				INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
-			END;`
+                INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
+            END;`
         );
 
         dbs.message.run(
             `CREATE TRIGGER IF NOT EXISTS message_after_insert AFTER INSERT ON message BEGIN
-				INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
-			END;`
+                INSERT INTO message_fts(docid, subject, message) VALUES(new.rowid, new.subject, new.message);
+            END;`
         );
 
         dbs.message.run(
             `CREATE TABLE IF NOT EXISTS message_meta (
-				message_id		INTEGER NOT NULL,
-				meta_category	INTEGER NOT NULL,
-				meta_name		VARCHAR NOT NULL,
-				meta_value		VARCHAR NOT NULL,
-				UNIQUE(message_id, meta_category, meta_name, meta_value), 
-				FOREIGN KEY(message_id) REFERENCES message(message_id) ON DELETE CASCADE
-			);`
+                message_id      INTEGER NOT NULL,
+                meta_category   INTEGER NOT NULL,
+                meta_name       VARCHAR NOT NULL,
+                meta_value      VARCHAR NOT NULL,
+                UNIQUE(message_id, meta_category, meta_name, meta_value), 
+                FOREIGN KEY(message_id) REFERENCES message(message_id) ON DELETE CASCADE
+            );`
         );
 
 
-        //	:TODO: need SQL to ensure cleaned up if delete from message?
+        //  :TODO: need SQL to ensure cleaned up if delete from message?
         /*
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS hash_tag (
-				hash_tag_id		INTEGER PRIMARY KEY,
-				hash_tag_name	VARCHAR NOT NULL,
-				UNIQUE(hash_tag_name)
-			);`
-		);
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS hash_tag (
+                hash_tag_id     INTEGER PRIMARY KEY,
+                hash_tag_name   VARCHAR NOT NULL,
+                UNIQUE(hash_tag_name)
+            );`
+        );
 
-		//	:TODO: need SQL to ensure cleaned up if delete from message?
-		dbs.message.run(
-			`CREATE TABLE IF NOT EXISTS message_hash_tag (
-				hash_tag_id	INTEGER NOT NULL,
-				message_id	INTEGER NOT NULL,
-			);`
-		);
-		*/
+        //  :TODO: need SQL to ensure cleaned up if delete from message?
+        dbs.message.run(
+            `CREATE TABLE IF NOT EXISTS message_hash_tag (
+                hash_tag_id INTEGER NOT NULL,
+                message_id  INTEGER NOT NULL,
+            );`
+        );
+        */
 
         dbs.message.run(
             `CREATE TABLE IF NOT EXISTS user_message_area_last_read (
-				user_id		INTEGER NOT NULL,
-				area_tag	VARCHAR NOT NULL,
-				message_id	INTEGER NOT NULL,
-				UNIQUE(user_id, area_tag)
-			);`
+                user_id     INTEGER NOT NULL,
+                area_tag    VARCHAR NOT NULL,
+                message_id  INTEGER NOT NULL,
+                UNIQUE(user_id, area_tag)
+            );`
         );
 
         dbs.message.run(
             `CREATE TABLE IF NOT EXISTS message_area_last_scan (
-				scan_toss		VARCHAR NOT NULL,
-				area_tag		VARCHAR NOT NULL,
-				message_id		INTEGER NOT NULL,
-				UNIQUE(scan_toss, area_tag)
-			);`
+                scan_toss       VARCHAR NOT NULL,
+                area_tag        VARCHAR NOT NULL,
+                message_id      INTEGER NOT NULL,
+                UNIQUE(scan_toss, area_tag)
+            );`
         );
 
         return cb(null);
@@ -295,114 +295,114 @@ const DB_INIT_TABLE = {
         enableForeignKeys(dbs.file);
 
         dbs.file.run(
-            //	:TODO: should any of this be unique -- file_sha256 unless dupes are allowed on the system
+            //  :TODO: should any of this be unique -- file_sha256 unless dupes are allowed on the system
             `CREATE TABLE IF NOT EXISTS file (
-				file_id				INTEGER PRIMARY KEY,
-				area_tag			VARCHAR NOT NULL,
-				file_sha256			VARCHAR NOT NULL,
-				file_name,			/* FTS @ file_fts */
-				storage_tag			VARCHAR NOT NULL,
-				desc,				/* FTS @ file_fts */
-				desc_long,			/* FTS @ file_fts */				
-				upload_timestamp	DATETIME NOT NULL
-			);`
+                file_id             INTEGER PRIMARY KEY,
+                area_tag            VARCHAR NOT NULL,
+                file_sha256         VARCHAR NOT NULL,
+                file_name,          /* FTS @ file_fts */
+                storage_tag         VARCHAR NOT NULL,
+                desc,               /* FTS @ file_fts */
+                desc_long,          /* FTS @ file_fts */                
+                upload_timestamp    DATETIME NOT NULL
+            );`
         );
 
         dbs.file.run(
             `CREATE INDEX IF NOT EXISTS file_by_area_tag_index
-			ON file (area_tag);`
+            ON file (area_tag);`
         );
 
         dbs.file.run(
             `CREATE INDEX IF NOT EXISTS file_by_sha256_index
-			ON file (file_sha256);`
+            ON file (file_sha256);`
         );
 
         dbs.file.run(
             `CREATE VIRTUAL TABLE IF NOT EXISTS file_fts USING fts4 (
-				content="file",
-				file_name,
-				desc,
-				desc_long
-			);`
+                content="file",
+                file_name,
+                desc,
+                desc_long
+            );`
         );
 
         dbs.file.run(
             `CREATE TRIGGER IF NOT EXISTS file_before_update BEFORE UPDATE ON file BEGIN
-				DELETE FROM file_fts WHERE docid=old.rowid;
-			END;`
+                DELETE FROM file_fts WHERE docid=old.rowid;
+            END;`
         );
 
         dbs.file.run(
             `CREATE TRIGGER IF NOT EXISTS file_before_delete BEFORE DELETE ON file BEGIN
-				DELETE FROM file_fts WHERE docid=old.rowid;
-			END;`
+                DELETE FROM file_fts WHERE docid=old.rowid;
+            END;`
         );
 
         dbs.file.run(
             `CREATE TRIGGER IF NOT EXISTS file_after_update AFTER UPDATE ON file BEGIN
-				INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
-			END;`
+                INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
+            END;`
         );
 
         dbs.file.run(
             `CREATE TRIGGER IF NOT EXISTS file_after_insert AFTER INSERT ON file BEGIN
-				INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
-			END;`
+                INSERT INTO file_fts(docid, file_name, desc, desc_long) VALUES(new.rowid, new.file_name, new.desc, new.desc_long);
+            END;`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS file_meta (
-				file_id			INTEGER NOT NULL,
-				meta_name		VARCHAR NOT NULL,
-				meta_value		VARCHAR NOT NULL,
-				UNIQUE(file_id, meta_name, meta_value), 
-				FOREIGN KEY(file_id) REFERENCES file(file_id) ON DELETE CASCADE
-			);`
+                file_id         INTEGER NOT NULL,
+                meta_name       VARCHAR NOT NULL,
+                meta_value      VARCHAR NOT NULL,
+                UNIQUE(file_id, meta_name, meta_value), 
+                FOREIGN KEY(file_id) REFERENCES file(file_id) ON DELETE CASCADE
+            );`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS hash_tag (
-				hash_tag_id		INTEGER PRIMARY KEY,
-				hash_tag		VARCHAR NOT NULL,
-			
-				UNIQUE(hash_tag)
-			);`
+                hash_tag_id     INTEGER PRIMARY KEY,
+                hash_tag        VARCHAR NOT NULL,
+            
+                UNIQUE(hash_tag)
+            );`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS file_hash_tag (
-				hash_tag_id		INTEGER NOT NULL,
-				file_id			INTEGER NOT NULL,
-			
-				UNIQUE(hash_tag_id, file_id)
-			);`
+                hash_tag_id     INTEGER NOT NULL,
+                file_id         INTEGER NOT NULL,
+            
+                UNIQUE(hash_tag_id, file_id)
+            );`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS file_user_rating (
-				file_id			INTEGER NOT NULL,
-				user_id			INTEGER NOT NULL,
-				rating			INTEGER NOT NULL,
+                file_id         INTEGER NOT NULL,
+                user_id         INTEGER NOT NULL,
+                rating          INTEGER NOT NULL,
 
-				UNIQUE(file_id, user_id)
-			);`
+                UNIQUE(file_id, user_id)
+            );`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS file_web_serve (
-				hash_id				VARCHAR NOT NULL PRIMARY KEY,
-				expire_timestamp	DATETIME NOT NULL
-			);`
+                hash_id             VARCHAR NOT NULL PRIMARY KEY,
+                expire_timestamp    DATETIME NOT NULL
+            );`
         );
 
         dbs.file.run(
             `CREATE TABLE IF NOT EXISTS file_web_serve_batch (
-				hash_id		VARCHAR NOT NULL,
-				file_id		INTEGER NOT NULL,
+                hash_id     VARCHAR NOT NULL,
+                file_id     INTEGER NOT NULL,
 
-				UNIQUE(hash_id, file_id)
-			);`
+                UNIQUE(hash_id, file_id)
+            );`
         );
 
         return cb(null);
diff --git a/core/descript_ion_file.js b/core/descript_ion_file.js
index 1ead544f..a5d68e1d 100644
--- a/core/descript_ion_file.js
+++ b/core/descript_ion_file.js
@@ -1,10 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const fs			= require('graceful-fs');
-const iconv			= require('iconv-lite');
-const async			= require('async');
+//  deps
+const fs            = require('graceful-fs');
+const iconv         = require('iconv-lite');
+const async         = require('async');
 
 module.exports = class DescriptIonFile {
     constructor() {
@@ -30,34 +30,34 @@ module.exports = class DescriptIonFile {
 
             const descIonFile = new DescriptIonFile();
 
-            //	DESCRIPT.ION entries are terminated with a CR and/or LF
+            //  DESCRIPT.ION entries are terminated with a CR and/or LF
             const lines = iconv.decode(descData, 'cp437').split(/\r?\n/g);
 
             async.each(lines, (entryData, nextLine) => {
                 //
-                //	We allow quoted (long) filenames or non-quoted filenames.
-                //	FILENAME<SPC>DESC<0x04><program data><CR/LF>
+                //  We allow quoted (long) filenames or non-quoted filenames.
+                //  FILENAME<SPC>DESC<0x04><program data><CR/LF>
                 //
-                const parts = entryData.match(/^(?:(?:"([^"]+)" )|(?:([^ ]+) ))([^\x04]+)\x04(.)[^\r\n]*$/);	//	eslint-disable-line no-control-regex
+                const parts = entryData.match(/^(?:(?:"([^"]+)" )|(?:([^ ]+) ))([^\x04]+)\x04(.)[^\r\n]*$/);    //  eslint-disable-line no-control-regex
                 if(!parts) {
                     return nextLine(null);
                 }
 
-                const fileName	= parts[1] || parts[2];
+                const fileName  = parts[1] || parts[2];
 
                 //
-                //	Un-escape CR/LF's
-                //	- escapped \r and/or \n
-                //	- BBBS style @n - See https://www.bbbs.net/sysop.html
+                //  Un-escape CR/LF's
+                //  - escapped \r and/or \n
+                //  - BBBS style @n - See https://www.bbbs.net/sysop.html
                 //
-                const desc		= parts[3].replace(/\\r\\n|\\n|[^@]@n/g, '\r\n');
+                const desc      = parts[3].replace(/\\r\\n|\\n|[^@]@n/g, '\r\n');
 
                 descIonFile.entries.set(
                     fileName,
                     {
-                        desc		: desc,
-                        programId	: parts[4],
-                        programData	: parts[5],
+                        desc        : desc,
+                        programId   : parts[4],
+                        programData : parts[5],
                     }
                 );
 
diff --git a/core/door.js b/core/door.js
index 06a10f60..ffd57b48 100644
--- a/core/door.js
+++ b/core/door.js
@@ -2,36 +2,36 @@
 'use strict';
 
 
-const stringFormat	= require('./string_format.js');
+const stringFormat  = require('./string_format.js');
 
-const events		= require('events');
-const _				= require('lodash');
-const pty			= require('node-pty');
-const decode 		= require('iconv-lite').decode;
-const createServer	= require('net').createServer;
+const events        = require('events');
+const _             = require('lodash');
+const pty           = require('node-pty');
+const decode        = require('iconv-lite').decode;
+const createServer  = require('net').createServer;
 
-exports.Door		= Door;
+exports.Door        = Door;
 
 function Door(client, exeInfo) {
     events.EventEmitter.call(this);
 
-    const self 				= this;
-    this.client				= client;
-    this.exeInfo			= exeInfo;
-    this.exeInfo.encoding	= (this.exeInfo.encoding || 'cp437').toLowerCase();
-    let restored			= false;
+    const self              = this;
+    this.client             = client;
+    this.exeInfo            = exeInfo;
+    this.exeInfo.encoding   = (this.exeInfo.encoding || 'cp437').toLowerCase();
+    let restored            = false;
 
     //
-    //	Members of exeInfo:
-    //	cmd
-    //	args[]
-    //	env{}
-    //	cwd
-    //	io
-    //	encoding
-    //	dropFile
-    //	node
-    //	inhSocket
+    //  Members of exeInfo:
+    //  cmd
+    //  args[]
+    //  env{}
+    //  cwd
+    //  io
+    //  encoding
+    //  dropFile
+    //  node
+    //  inhSocket
     //
 
     this.doorDataHandler = function(data) {
@@ -52,7 +52,7 @@ function Door(client, exeInfo) {
 
                 sockServer.getConnections( (err, count) => {
 
-                    //	We expect only one connection from our DOOR/emulator/etc.
+                    //  We expect only one connection from our DOOR/emulator/etc.
                     if(!err && count <= 1) {
                         self.client.term.output.pipe(conn);
 
@@ -94,25 +94,25 @@ Door.prototype.run = function() {
             return self.doorExited();
         }
 
-        //	Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
-        //	:TODO: Use .map() here
-        let args = _.clone(self.exeInfo.args);	//	we need a copy so the original is not modified
+        //  Expand arg strings, e.g. {dropFile} -> DOOR32.SYS
+        //  :TODO: Use .map() here
+        let args = _.clone(self.exeInfo.args);  //  we need a copy so the original is not modified
 
         for(let i = 0; i < args.length; ++i) {
             args[i] = stringFormat(self.exeInfo.args[i], {
-                dropFile		: self.exeInfo.dropFile,
-                node			: self.exeInfo.node.toString(),
-                srvPort			: sockServer ? sockServer.address().port.toString() : '-1',
-                userId			: self.client.user.userId.toString(),
+                dropFile        : self.exeInfo.dropFile,
+                node            : self.exeInfo.node.toString(),
+                srvPort         : sockServer ? sockServer.address().port.toString() : '-1',
+                userId          : self.client.user.userId.toString(),
             });
         }
 
         const door = pty.spawn(self.exeInfo.cmd, args, {
-            cols 		: self.client.term.termWidth,
-            rows		: self.client.term.termHeight,
-            //	:TODO: cwd
-            env			: self.exeInfo.env,
-            encoding	: null,	//	we want to handle all encoding ourself
+            cols        : self.client.term.termWidth,
+            rows        : self.client.term.termHeight,
+            //  :TODO: cwd
+            env         : self.exeInfo.env,
+            encoding    : null, //  we want to handle all encoding ourself
         });
 
         if('stdio' === self.exeInfo.io) {
@@ -136,7 +136,7 @@ Door.prototype.run = function() {
                 sockServer.close();
             }
 
-            //	we may not get a close
+            //  we may not get a close
             if('stdio' === self.exeInfo.io) {
                 self.restoreIo(door);
             }
diff --git a/core/door_party.js b/core/door_party.js
index 3c5b29a7..63247f69 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -1,30 +1,30 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule	= require('../core/menu_module.js').MenuModule;
-const resetScreen	= require('../core/ansi_term.js').resetScreen;
+//  enigma-bbs
+const MenuModule    = require('../core/menu_module.js').MenuModule;
+const resetScreen   = require('../core/ansi_term.js').resetScreen;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const SSHClient		= require('ssh2').Client;
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const SSHClient     = require('ssh2').Client;
 
 exports.moduleInfo = {
-    name	: 'DoorParty',
-    desc	: 'DoorParty Access Module',
-    author	: 'NuSkooler',
+    name    : 'DoorParty',
+    desc    : 'DoorParty Access Module',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class DoorPartyModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        //	establish defaults
-        this.config				= options.menuConfig.config;
-        this.config.host		= this.config.host || 'dp.throwbackbbs.com';
-        this.config.sshPort 	= this.config.sshPort || 2022;
-        this.config.rloginPort	= this.config.rloginPort || 513;
+        //  establish defaults
+        this.config             = options.menuConfig.config;
+        this.config.host        = this.config.host || 'dp.throwbackbbs.com';
+        this.config.sshPort     = this.config.sshPort || 2022;
+        this.config.rloginPort  = this.config.rloginPort || 513;
     }
 
     initSequence() {
@@ -61,32 +61,32 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                     };
 
                     sshClient.on('ready', () => {
-                        //	track client termination so we can clean up early
+                        //  track client termination so we can clean up early
                         self.client.once('end', () => {
                             self.client.log.info('Connection ended. Terminating DoorParty connection');
                             clientTerminated = true;
                             sshClient.end();
                         });
 
-                        //	establish tunnel for rlogin
+                        //  establish tunnel for rlogin
                         sshClient.forwardOut('127.0.0.1', self.config.sshPort, self.config.host, self.config.rloginPort, (err, stream) => {
                             if(err) {
                                 return callback(new Error('Failed to establish tunnel'));
                             }
 
                             //
-                            //	Send rlogin
-                            //	DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
-                            //	[XA]nuskooler
+                            //  Send rlogin
+                            //  DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
+                            //  [XA]nuskooler
                             //
                             const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
                             stream.write(rlogin);
 
-                            pipedStream = stream;	//	:TODO: this is hacky...
+                            pipedStream = stream;   //  :TODO: this is hacky...
                             self.client.term.output.pipe(stream);
 
                             stream.on('data', d => {
-                                //	:TODO: we should just pipe this...
+                                //  :TODO: we should just pipe this...
                                 self.client.term.rawWrite(d);
                             });
 
@@ -107,13 +107,13 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                     });
 
                     sshClient.connect( {
-                        host 		: self.config.host,
-                        port		: self.config.sshPort,
-                        username	: self.config.username,
-                        password	: self.config.password,
+                        host        : self.config.host,
+                        port        : self.config.sshPort,
+                        username    : self.config.username,
+                        password    : self.config.password,
                     });
 
-                    //	note: no explicit callback() until we're finished!
+                    //  note: no explicit callback() until we're finished!
                 }
             ],
             err => {
@@ -121,7 +121,7 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                     self.client.log.warn( { error : err.message }, 'DoorParty error');
                 }
 
-                //	if the client is stil here, go to previous
+                //  if the client is stil here, go to previous
                 if(!clientTerminated) {
                     self.prevMenu();
                 }
diff --git a/core/download_queue.js b/core/download_queue.js
index d8617f75..0d1e3847 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -1,14 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-const FileEntry		= require('./file_entry.js');
+const FileEntry     = require('./file_entry.js');
 
-//	deps
-const { partition }	= require('lodash');
+//  deps
+const { partition } = require('lodash');
 
 module.exports = class DownloadQueue {
     constructor(client) {
-        this.client	= client;
+        this.client = client;
 
         if(!Array.isArray(this.client.user.downloadQueue)) {
             if(this.client.user.properties.dl_queue) {
@@ -37,12 +37,12 @@ module.exports = class DownloadQueue {
 
     add(fileEntry, systemFile=false) {
         this.client.user.downloadQueue.push({
-            fileId		: fileEntry.fileId,
-            areaTag		: fileEntry.areaTag,
-            fileName	: fileEntry.fileName,
-            path		: fileEntry.filePath,
-            byteSize	: fileEntry.meta.byte_size || 0,
-            systemFile	: systemFile,
+            fileId      : fileEntry.fileId,
+            areaTag     : fileEntry.areaTag,
+            fileName    : fileEntry.fileName,
+            path        : fileEntry.filePath,
+            byteSize    : fileEntry.meta.byte_size || 0,
+            systemFile  : systemFile,
         });
     }
 
diff --git a/core/dropfile.js b/core/dropfile.js
index 7a49cca4..76977eaf 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -1,31 +1,31 @@
 /* jslint node: true */
 'use strict';
 
-var Config			= require('./config.js').get;
-const StatLog		= require('./stat_log.js');
+var Config          = require('./config.js').get;
+const StatLog       = require('./stat_log.js');
 
-var fs				= require('graceful-fs');
-var paths			= require('path');
-var _				= require('lodash');
-var moment			= require('moment');
-var iconv			= require('iconv-lite');
+var fs              = require('graceful-fs');
+var paths           = require('path');
+var _               = require('lodash');
+var moment          = require('moment');
+var iconv           = require('iconv-lite');
 
-exports.DropFile	= DropFile;
+exports.DropFile    = DropFile;
 
 //
-//	Resources
-//	* http://goldfndr.home.mindspring.com/dropfile/
-//	* https://en.wikipedia.org/wiki/Talk%3ADropfile
-//	* http://thoughtproject.com/libraries/bbs/Sysop/Doors/DropFiles/index.htm
-//	* http://thebbs.org/bbsfaq/ch06.02.htm
+//  Resources
+//  * http://goldfndr.home.mindspring.com/dropfile/
+//  * https://en.wikipedia.org/wiki/Talk%3ADropfile
+//  * http://thoughtproject.com/libraries/bbs/Sysop/Doors/DropFiles/index.htm
+//  * http://thebbs.org/bbsfaq/ch06.02.htm
 
-//	http://lord.lordlegacy.com/dosemu/
+//  http://lord.lordlegacy.com/dosemu/
 
 function DropFile(client, fileType) {
 
-    var self 			= this;
-    this.client			= client;
-    this.fileType		= (fileType || 'DORINFO').toUpperCase();
+    var self            = this;
+    this.client         = client;
+    this.fileType       = (fileType || 'DORINFO').toUpperCase();
 
     Object.defineProperty(this, 'fullPath', {
         get : function() {
@@ -36,20 +36,20 @@ function DropFile(client, fileType) {
     Object.defineProperty(this, 'fileName', {
         get : function() {
             return {
-                DOOR			: 'DOOR.SYS',					//	GAP BBS, many others
-                DOOR32			: 'DOOR32.SYS',					//	EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
-                CALLINFO		: 'CALLINFO.BBS',				//	Citadel?
-                DORINFO			: self.getDoorInfoFileName(),	//	RBBS, RemoteAccess, QBBS, ...
-                CHAIN			: 'CHAIN.TXT',					//	WWIV
-                CURRUSER		: 'CURRUSER.BBS',				//	RyBBS
-                SFDOORS			: 'SFDOORS.DAT',				//	Spitfire
-                PCBOARD			: 'PCBOARD.SYS',				//	PCBoard
-                TRIBBS			: 'TRIBBS.SYS',					//	TriBBS
-                USERINFO		: 'USERINFO.DAT',				//	Wildcat! 3.0+
-                JUMPER			: 'JUMPER.DAT',					//	2AM BBS
-                SXDOOR			: 								//	System/X, dESiRE
-					'SXDOOR.' + _.pad(self.client.node.toString(), 3, '0'),
-                INFO			: 'INFO.BBS',					//	Phoenix BBS
+                DOOR            : 'DOOR.SYS',                   //  GAP BBS, many others
+                DOOR32          : 'DOOR32.SYS',                 //  EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
+                CALLINFO        : 'CALLINFO.BBS',               //  Citadel?
+                DORINFO         : self.getDoorInfoFileName(),   //  RBBS, RemoteAccess, QBBS, ...
+                CHAIN           : 'CHAIN.TXT',                  //  WWIV
+                CURRUSER        : 'CURRUSER.BBS',               //  RyBBS
+                SFDOORS         : 'SFDOORS.DAT',                //  Spitfire
+                PCBOARD         : 'PCBOARD.SYS',                //  PCBoard
+                TRIBBS          : 'TRIBBS.SYS',                 //  TriBBS
+                USERINFO        : 'USERINFO.DAT',               //  Wildcat! 3.0+
+                JUMPER          : 'JUMPER.DAT',                 //  2AM BBS
+                SXDOOR          :                               //  System/X, dESiRE
+                    'SXDOOR.' + _.pad(self.client.node.toString(), 3, '0'),
+                INFO            : 'INFO.BBS',                   //  Phoenix BBS
             }[self.fileType];
         }
     });
@@ -57,9 +57,9 @@ function DropFile(client, fileType) {
     Object.defineProperty(this, 'dropFileContents', {
         get : function() {
             return {
-                DOOR			: self.getDoorSysBuffer(),
-                DOOR32			: self.getDoor32Buffer(),
-                DORINFO			: self.getDoorInfoDefBuffer(),
+                DOOR            : self.getDoorSysBuffer(),
+                DOOR32          : self.getDoor32Buffer(),
+                DORINFO         : self.getDoorInfoDefBuffer(),
             }[self.fileType];
         }
     });
@@ -78,124 +78,124 @@ function DropFile(client, fileType) {
     };
 
     this.getDoorSysBuffer = function() {
-        var up			= self.client.user.properties;
-        var now			= moment();
-        var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+        var up          = self.client.user.properties;
+        var now         = moment();
+        var secLevel    = self.client.user.getLegacySecurityLevel().toString();
 
-        //	:TODO: fix time remaining
-        //	:TODO: fix default protocol -- user prop: transfer_protocol
+        //  :TODO: fix time remaining
+        //  :TODO: fix default protocol -- user prop: transfer_protocol
 
         return iconv.encode( [
-            'COM1:',											//	"Comm Port - COM0: = LOCAL MODE"
-            '57600',											//	"Baud Rate - 300 to 38400" (Note: set as 57600 instead!)
-            '8',												//	"Parity - 7 or 8"
-            self.client.node.toString(),						//	"Node Number - 1 to 99"
-            '57600',											//	"DTE Rate. Actual BPS rate to use. (kg)"
-            'Y',												//	"Screen Display - Y=On  N=Off             (Default to Y)"
-            'Y',												//	"Printer Toggle - Y=On  N=Off             (Default to Y)"
-            'Y',												//	"Page Bell      - Y=On  N=Off             (Default to Y)"
-            'Y',												//	"Caller Alarm   - Y=On  N=Off             (Default to Y)"
-            up.real_name || self.client.user.username,			//	"User Full Name"
-            up.location || 'Anywhere',							//	"Calling From"
-            '123-456-7890',										//	"Home Phone"
-            '123-456-7890',										//	"Work/Data Phone"
-            'NOPE',												//	"Password" (Note: this is never given out or even stored plaintext)
-            secLevel,											//	"Security Level"
-            up.login_count.toString(),							//	"Total Times On"
-            now.format('MM/DD/YY'),								//	"Last Date Called"
-            '15360',											//	"Seconds Remaining THIS call (for those that particular)"
-            '256',												//	"Minutes Remaining THIS call"
-            'GR',												//	"Graphics Mode - GR=Graph, NG=Non-Graph, 7E=7,E Caller"
-            self.client.term.termHeight.toString(),				//	"Page Length"
-            'N',												//	"User Mode - Y = Expert, N = Novice"
-            '1,2,3,4,5,6,7',									//	"Conferences/Forums Registered In  (ABCDEFG)"
-            '1',												//	"Conference Exited To DOOR From    (G)"
-            '01/01/99',											//	"User Expiration Date              (mm/dd/yy)"
-            self.client.user.userId.toString(),					//	"User File's Record Number"
-            'Z',												//	"Default Protocol - X, C, Y, G, I, N, Etc."
-            //	:TODO: fix up, down, etc. form user properties
-            '0',												//	"Total Uploads"
-            '0',												//	"Total Downloads"
-            '0',												//	"Daily Download "K" Total"
-            '999999',											//	"Daily Download Max. "K" Limit"
-            moment(up.birthdate).format('MM/DD/YY'),			//	"Caller's Birthdate"
-            'X:\\MAIN\\',										//	"Path to the MAIN directory (where User File is)"
-            'X:\\GEN\\',										//	"Path to the GEN directory"
-            StatLog.getSystemStat('sysop_username'),			//	"Sysop's Name (name BBS refers to Sysop as)"
-            self.client.user.username,							//	"Alias name"
-            '00:05',											//	"Event time                        (hh:mm)" (note: wat?)
-            'Y',												//	"If its an error correcting connection (Y/N)"
-            'Y',												//	"ANSI supported & caller using NG mode (Y/N)"
-            'Y',												//	"Use Record Locking                    (Y/N)"
-            '7',												//	"BBS Default Color (Standard IBM color code, ie, 1-15)"
-            //	:TODO: fix minutes here also:
-            '256',												//	"Time Credits In Minutes (positive/negative)"
-            '07/07/90',											//	"Last New Files Scan Date          (mm/dd/yy)"
-            //	:TODO: fix last vs now times:
-            now.format('hh:mm'),								//	"Time of This Call"
-            now.format('hh:mm'),								//	"Time of Last Call                 (hh:mm)"
-            '9999',												//	"Maximum daily files available"
-            //	:TODO: fix these stats:
-            '0',												//	"Files d/led so far today"
-            '0',												//	"Total "K" Bytes Uploaded"
-            '0',												//	"Total "K" Bytes Downloaded"
-            up.user_comment || 'None',							//	"User Comment"
-            '0',												//	"Total Doors Opened"
-            '0',												//	"Total Messages Left"
+            'COM1:',                                            //  "Comm Port - COM0: = LOCAL MODE"
+            '57600',                                            //  "Baud Rate - 300 to 38400" (Note: set as 57600 instead!)
+            '8',                                                //  "Parity - 7 or 8"
+            self.client.node.toString(),                        //  "Node Number - 1 to 99"
+            '57600',                                            //  "DTE Rate. Actual BPS rate to use. (kg)"
+            'Y',                                                //  "Screen Display - Y=On  N=Off             (Default to Y)"
+            'Y',                                                //  "Printer Toggle - Y=On  N=Off             (Default to Y)"
+            'Y',                                                //  "Page Bell      - Y=On  N=Off             (Default to Y)"
+            'Y',                                                //  "Caller Alarm   - Y=On  N=Off             (Default to Y)"
+            up.real_name || self.client.user.username,          //  "User Full Name"
+            up.location || 'Anywhere',                          //  "Calling From"
+            '123-456-7890',                                     //  "Home Phone"
+            '123-456-7890',                                     //  "Work/Data Phone"
+            'NOPE',                                             //  "Password" (Note: this is never given out or even stored plaintext)
+            secLevel,                                           //  "Security Level"
+            up.login_count.toString(),                          //  "Total Times On"
+            now.format('MM/DD/YY'),                             //  "Last Date Called"
+            '15360',                                            //  "Seconds Remaining THIS call (for those that particular)"
+            '256',                                              //  "Minutes Remaining THIS call"
+            'GR',                                               //  "Graphics Mode - GR=Graph, NG=Non-Graph, 7E=7,E Caller"
+            self.client.term.termHeight.toString(),             //  "Page Length"
+            'N',                                                //  "User Mode - Y = Expert, N = Novice"
+            '1,2,3,4,5,6,7',                                    //  "Conferences/Forums Registered In  (ABCDEFG)"
+            '1',                                                //  "Conference Exited To DOOR From    (G)"
+            '01/01/99',                                         //  "User Expiration Date              (mm/dd/yy)"
+            self.client.user.userId.toString(),                 //  "User File's Record Number"
+            'Z',                                                //  "Default Protocol - X, C, Y, G, I, N, Etc."
+            //  :TODO: fix up, down, etc. form user properties
+            '0',                                                //  "Total Uploads"
+            '0',                                                //  "Total Downloads"
+            '0',                                                //  "Daily Download "K" Total"
+            '999999',                                           //  "Daily Download Max. "K" Limit"
+            moment(up.birthdate).format('MM/DD/YY'),            //  "Caller's Birthdate"
+            'X:\\MAIN\\',                                       //  "Path to the MAIN directory (where User File is)"
+            'X:\\GEN\\',                                        //  "Path to the GEN directory"
+            StatLog.getSystemStat('sysop_username'),            //  "Sysop's Name (name BBS refers to Sysop as)"
+            self.client.user.username,                          //  "Alias name"
+            '00:05',                                            //  "Event time                        (hh:mm)" (note: wat?)
+            'Y',                                                //  "If its an error correcting connection (Y/N)"
+            'Y',                                                //  "ANSI supported & caller using NG mode (Y/N)"
+            'Y',                                                //  "Use Record Locking                    (Y/N)"
+            '7',                                                //  "BBS Default Color (Standard IBM color code, ie, 1-15)"
+            //  :TODO: fix minutes here also:
+            '256',                                              //  "Time Credits In Minutes (positive/negative)"
+            '07/07/90',                                         //  "Last New Files Scan Date          (mm/dd/yy)"
+            //  :TODO: fix last vs now times:
+            now.format('hh:mm'),                                //  "Time of This Call"
+            now.format('hh:mm'),                                //  "Time of Last Call                 (hh:mm)"
+            '9999',                                             //  "Maximum daily files available"
+            //  :TODO: fix these stats:
+            '0',                                                //  "Files d/led so far today"
+            '0',                                                //  "Total "K" Bytes Uploaded"
+            '0',                                                //  "Total "K" Bytes Downloaded"
+            up.user_comment || 'None',                          //  "User Comment"
+            '0',                                                //  "Total Doors Opened"
+            '0',                                                //  "Total Messages Left"
 
         ].join('\r\n') + '\r\n', 'cp437');
     };
 
     this.getDoor32Buffer = function() {
         //
-        //	Resources:
-        //	* http://wiki.bbses.info/index.php/DOOR32.SYS
+        //  Resources:
+        //  * http://wiki.bbses.info/index.php/DOOR32.SYS
         //
-        //	:TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
+        //  :TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
         return iconv.encode([
-            '2',						//	:TODO: This needs to be configurable!
-            //	:TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
-            '-1',	//	self.client.output._handle.fd.toString(),	//	:TODO: ALWAYS -1 on Windows!
+            '2',                        //  :TODO: This needs to be configurable!
+            //  :TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
+            '-1',   //  self.client.output._handle.fd.toString(),   //  :TODO: ALWAYS -1 on Windows!
             '57600',
             Config().general.boardName,
             self.client.user.userId.toString(),
             self.client.user.properties.real_name || self.client.user.username,
             self.client.user.username,
             self.client.user.getLegacySecurityLevel().toString(),
-            '546',	//	:TODO: Minutes left!
-            '1',	//	ANSI
+            '546',  //  :TODO: Minutes left!
+            '1',    //  ANSI
             self.client.node.toString(),
         ].join('\r\n') + '\r\n', 'cp437');
 
     };
 
     this.getDoorInfoDefBuffer = function() {
-        //	:TODO: fix time remaining
+        //  :TODO: fix time remaining
 
         //
-        //	Resources:
-        //	* http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm
+        //  Resources:
+        //  * http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm
         //
-        //	Note that usernames are just used for first/last names here
+        //  Note that usernames are just used for first/last names here
         //
-        var opUn		= /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
-        var un			= /[^\s]*/.exec(self.client.user.username)[0];
-        var secLevel	= self.client.user.getLegacySecurityLevel().toString();
+        var opUn        = /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
+        var un          = /[^\s]*/.exec(self.client.user.username)[0];
+        var secLevel    = self.client.user.getLegacySecurityLevel().toString();
 
         return iconv.encode( [
-            Config().general.boardName,							//	"The name of the system."
-            opUn,												//	"The sysop's name up to the first space."
-            opUn,												//	"The sysop's name following the first space."
-            'COM1',												//	"The serial port the modem is connected to, or 0 if logged in on console."
-            '57600',											//	"The current port (DTE) rate."
-            '0',												//	"The number "0""
-            un,													//	"The current user's name, up to the first space."
-            un,													//	"The current user's name, following the first space."
-            self.client.user.properties.location || '',			//	"Where the user lives, or a blank line if unknown."
-            '1',												//	"The number "0" if TTY, or "1" if ANSI."
-            secLevel,											//	"The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
-            '546',												//	"The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
-            '-1'												//	"The number "-1" if using an external serial driver or "0" if using internal serial routines."
+            Config().general.boardName,                         //  "The name of the system."
+            opUn,                                               //  "The sysop's name up to the first space."
+            opUn,                                               //  "The sysop's name following the first space."
+            'COM1',                                             //  "The serial port the modem is connected to, or 0 if logged in on console."
+            '57600',                                            //  "The current port (DTE) rate."
+            '0',                                                //  "The number "0""
+            un,                                                 //  "The current user's name, up to the first space."
+            un,                                                 //  "The current user's name, following the first space."
+            self.client.user.properties.location || '',         //  "Where the user lives, or a blank line if unknown."
+            '1',                                                //  "The number "0" if TTY, or "1" if ANSI."
+            secLevel,                                           //  "The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
+            '546',                                              //  "The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
+            '-1'                                                //  "The number "-1" if using an external serial driver or "0" if using internal serial routines."
         ].join('\r\n') + '\r\n', 'cp437');
     };
 
diff --git a/core/edit_text_view.js b/core/edit_text_view.js
index b1b89726..05868e92 100644
--- a/core/edit_text_view.js
+++ b/core/edit_text_view.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const TextView		= require('./text_view.js').TextView;
-const miscUtil		= require('./misc_util.js');
-const strUtil		= require('./string_util.js');
+//  ENiGMA½
+const TextView      = require('./text_view.js').TextView;
+const miscUtil      = require('./misc_util.js');
+const strUtil       = require('./string_util.js');
 
-//	deps
-const _				= require('lodash');
+//  deps
+const _             = require('lodash');
 
-exports.EditTextView	= EditTextView;
+exports.EditTextView    = EditTextView;
 
 function EditTextView(options) {
-    options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-    options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
-    options.resizable		= false;
+    options.acceptsFocus    = miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput    = miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.cursorStyle     = miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
+    options.resizable       = false;
 
     TextView.call(this, options);
 
@@ -47,9 +47,9 @@ EditTextView.prototype.onKeyPress = function(ch, key) {
 
             return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
         } else if(this.isKeyMapped('clearLine', key.name)) {
-            this.text			= '';
-            this.cursorPos.col	= 0;
-            this.setFocus(true);	//	resetting focus will redraw & adjust cursor
+            this.text           = '';
+            this.cursorPos.col  = 0;
+            this.setFocus(true);    //  resetting focus will redraw & adjust cursor
 
             return EditTextView.super_.prototype.onKeyPress.call(this, ch, key);
         }
@@ -62,7 +62,7 @@ EditTextView.prototype.onKeyPress = function(ch, key) {
             this.text += ch;
 
             if(this.text.length > this.dimens.width) {
-                //	no shortcuts - redraw the view
+                //  no shortcuts - redraw the view
                 this.redraw();
             } else {
                 this.cursorPos.col += 1;
@@ -82,9 +82,9 @@ EditTextView.prototype.onKeyPress = function(ch, key) {
 };
 
 EditTextView.prototype.setText = function(text) {
-    //	draw & set |text|
+    //  draw & set |text|
     EditTextView.super_.prototype.setText.call(this, text);
 
-    //	adjust local cursor tracking
+    //  adjust local cursor tracking
     this.cursorPos = { row : 0, col : text.length };
 };
diff --git a/core/email.js b/core/email.js
index af195da5..1de3b034 100644
--- a/core/email.js
+++ b/core/email.js
@@ -1,16 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config				= require('./config.js').get;
-const Errors				= require('./enig_error.js').Errors;
-const Log					= require('./logger.js').log;
+//  ENiGMA½
+const Config                = require('./config.js').get;
+const Errors                = require('./enig_error.js').Errors;
+const Log                   = require('./logger.js').log;
 
-//	deps
-const _						= require('lodash');
-const nodeMailer			= require('nodemailer');
+//  deps
+const _                     = require('lodash');
+const nodeMailer            = require('nodemailer');
 
-exports.sendMail			= sendMail;
+exports.sendMail            = sendMail;
 
 function sendMail(message, cb) {
     const config = Config();
@@ -21,7 +21,7 @@ function sendMail(message, cb) {
     message.from = message.from || config.email.defaultFrom;
 
     const transportOptions = Object.assign( {}, config.email.transport, {
-        logger	: Log,
+        logger  : Log,
     });
 
     const transport = nodeMailer.createTransport(transportOptions);
diff --git a/core/enig_error.js b/core/enig_error.js
index 879a18ab..63c90cb9 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -5,11 +5,11 @@ class EnigError extends Error {
     constructor(message, code, reason, reasonCode) {
         super(message);
 
-        this.name		= this.constructor.name;
-        this.message	= message;
-        this.code		= code;
-        this.reason		= reason;
-        this.reasonCode	= reasonCode;
+        this.name       = this.constructor.name;
+        this.message    = message;
+        this.code       = code;
+        this.reason     = reason;
+        this.reasonCode = reasonCode;
 
         if(this.reason) {
             this.message += `: ${this.reason}`;
@@ -23,24 +23,24 @@ class EnigError extends Error {
     }
 }
 
-exports.EnigError				= EnigError;
+exports.EnigError               = EnigError;
 
 exports.Errors = {
-    General				: (reason, reasonCode) 	=> new EnigError('An error occurred', -33000, reason, reasonCode),
-    MenuStack			: (reason, reasonCode)	=> new EnigError('Menu stack error', -33001, reason, reasonCode),
-    DoesNotExist		: (reason, reasonCode) 	=> new EnigError('Object does not exist', -33002, reason, reasonCode),
-    AccessDenied		: (reason, reasonCode)	=> new EnigError('Access denied', -32003, reason, reasonCode),
-    Invalid				: (reason, reasonCode)	=> new EnigError('Invalid', -32004, reason, reasonCode),
-    ExternalProcess		: (reason, reasonCode)	=> new EnigError('External process error', -32005, reason, reasonCode),
-    MissingConfig		: (reason, reasonCode)	=> new EnigError('Missing configuration', -32006, reason, reasonCode),
-    UnexpectedState		: (reason, reasonCode)	=> new EnigError('Unexpected state', -32007, reason, reasonCode),
-    MissingParam		: (reason, reasonCode)	=> new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
+    General             : (reason, reasonCode)  => new EnigError('An error occurred', -33000, reason, reasonCode),
+    MenuStack           : (reason, reasonCode)  => new EnigError('Menu stack error', -33001, reason, reasonCode),
+    DoesNotExist        : (reason, reasonCode)  => new EnigError('Object does not exist', -33002, reason, reasonCode),
+    AccessDenied        : (reason, reasonCode)  => new EnigError('Access denied', -32003, reason, reasonCode),
+    Invalid             : (reason, reasonCode)  => new EnigError('Invalid', -32004, reason, reasonCode),
+    ExternalProcess     : (reason, reasonCode)  => new EnigError('External process error', -32005, reason, reasonCode),
+    MissingConfig       : (reason, reasonCode)  => new EnigError('Missing configuration', -32006, reason, reasonCode),
+    UnexpectedState     : (reason, reasonCode)  => new EnigError('Unexpected state', -32007, reason, reasonCode),
+    MissingParam        : (reason, reasonCode)  => new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
-    AlreadyThere		: 'ALREADYTHERE',
-    InvalidNextMenu		: 'BADNEXT',
-    NoPreviousMenu		: 'NOPREV',
-    NoConditionMatch	: 'NOCONDMATCH',
-    NotEnabled			: 'NOTENABLED',
+    AlreadyThere        : 'ALREADYTHERE',
+    InvalidNextMenu     : 'BADNEXT',
+    NoPreviousMenu      : 'NOPREV',
+    NoConditionMatch    : 'NOCONDMATCH',
+    NotEnabled          : 'NOTENABLED',
 };
\ No newline at end of file
diff --git a/core/enigma_assert.js b/core/enigma_assert.js
index 0d1d5176..34f9beed 100644
--- a/core/enigma_assert.js
+++ b/core/enigma_assert.js
@@ -1,12 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config	= require('./config.js').get;
-const Log		= require('./logger.js').log;
+//  ENiGMA½
+const Config    = require('./config.js').get;
+const Log       = require('./logger.js').log;
 
-//	deps
-const assert	= require('assert');
+//  deps
+const assert    = require('assert');
 
 module.exports = function(condition, message) {
     if(Config().debug.assertsEnabled) {
diff --git a/core/erc_client.js b/core/erc_client.js
index 79a47240..018c9372 100644
--- a/core/erc_client.js
+++ b/core/erc_client.js
@@ -1,55 +1,55 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('./menu_module.js').MenuModule;
-const stringFormat	= require('./string_format.js');
+const MenuModule    = require('./menu_module.js').MenuModule;
+const stringFormat  = require('./string_format.js');
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const net			= require('net');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const net           = require('net');
 
 /*
-	Expected configuration block example:
+    Expected configuration block example:
 
-	config: {
-		host: 192.168.1.171
-		port: 5001
-		bbsTag: SOME_TAG
-	}
+    config: {
+        host: 192.168.1.171
+        port: 5001
+        bbsTag: SOME_TAG
+    }
 
 */
 
-exports.getModule	= ErcClientModule;
+exports.getModule   = ErcClientModule;
 
 exports.moduleInfo = {
-    name	: 'ENiGMA Relay Chat Client',
-    desc	: 'Chat with other ENiGMA BBSes',
-    author	: 'Andrew Pamment',
+    name    : 'ENiGMA Relay Chat Client',
+    desc    : 'Chat with other ENiGMA BBSes',
+    author  : 'Andrew Pamment',
 };
 
 var MciViewIds = {
     ChatDisplay : 1,
-    InputArea 	: 3,
+    InputArea   : 3,
 };
 
-//	:TODO: needs converted to ES6 MenuModule subclass
+//  :TODO: needs converted to ES6 MenuModule subclass
 function ErcClientModule(options) {
     MenuModule.prototype.ctorShim.call(this, options);
 
-    const self			= this;
-    this.config			= options.menuConfig.config;
+    const self          = this;
+    this.config         = options.menuConfig.config;
 
-    this.chatEntryFormat	= this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
-    this.systemEntryFormat	= this.config.systemEntryFormat || '[*SYSTEM*] {message}';
+    this.chatEntryFormat    = this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
+    this.systemEntryFormat  = this.config.systemEntryFormat || '[*SYSTEM*] {message}';
 
     this.finishedLoading = function() {
         async.waterfall(
             [
                 function validateConfig(callback) {
                     if(_.isString(self.config.host) &&
-						_.isNumber(self.config.port) &&
-						_.isString(self.config.bbsTag))
+                        _.isNumber(self.config.port) &&
+                        _.isString(self.config.bbsTag))
                     {
                         return callback(null);
                     } else {
@@ -58,8 +58,8 @@ function ErcClientModule(options) {
                 },
                 function connectToServer(callback) {
                     const connectOpts = {
-                        port	: self.config.port,
-                        host	: self.config.host,
+                        port    : self.config.port,
+                        host    : self.config.host,
                     };
 
                     const chatMessageView = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
@@ -69,7 +69,7 @@ function ErcClientModule(options) {
 
                     self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
 
-                    //	:TODO: Track actual client->enig connection for optional prevMenu @ final CB
+                    //  :TODO: Track actual client->enig connection for optional prevMenu @ final CB
                     self.chatConnection = net.createConnection(connectOpts.port, connectOpts.host);
 
                     self.chatConnection.on('data', data => {
@@ -87,10 +87,10 @@ function ErcClientModule(options) {
                             let text;
                             try {
                                 if(data.userName) {
-                                    //	user message
+                                    //  user message
                                     text = stringFormat(self.chatEntryFormat, data);
                                 } else {
-                                    //	system message
+                                    //  system message
                                     text = stringFormat(self.systemEntryFormat, data);
                                 }
                             } catch(e) {
@@ -99,7 +99,7 @@ function ErcClientModule(options) {
 
                             chatMessageView.addText(text);
 
-                            if(chatMessageView.getLineCount() > 30) {	//	:TODO: should probably be ChatDisplay.height?
+                            if(chatMessageView.getLineCount() > 30) {   //  :TODO: should probably be ChatDisplay.height?
                                 chatMessageView.deleteLine(0);
                                 chatMessageView.scrollDown();
                             }
@@ -130,8 +130,8 @@ function ErcClientModule(options) {
     };
 
     this.scrollHandler = function(keyName) {
-        const inputAreaView 	= self.viewControllers.menu.getView(MciViewIds.InputArea);
-        const chatDisplayView	= self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
+        const inputAreaView     = self.viewControllers.menu.getView(MciViewIds.InputArea);
+        const chatDisplayView   = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
 
         if('up arrow' === keyName) {
             chatDisplayView.scrollUp();
@@ -147,7 +147,7 @@ function ErcClientModule(options) {
     this.menuMethods = {
         inputAreaSubmit : function(formData, extraArgs, cb) {
             const inputAreaView = self.viewControllers.menu.getView(MciViewIds.InputArea);
-            const inputData		= inputAreaView.getData();
+            const inputData     = inputAreaView.getData();
 
             if('/quit' === inputData.toLowerCase()) {
                 self.chatConnection.end();
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 1465d42b..22c2d58d 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const PluginModule			= require('./plugin_module.js').PluginModule;
-const Config				= require('./config.js').get;
-const Log					= require('./logger.js').log;
+//  ENiGMA½
+const PluginModule          = require('./plugin_module.js').PluginModule;
+const Config                = require('./config.js').get;
+const Log                   = require('./logger.js').log;
 
-const _						= require('lodash');
-const later					= require('later');
-const path					= require('path');
-const pty					= require('node-pty');
-const sane					= require('sane');
-const moment				= require('moment');
-const paths					= require('path');
-const fse					= require('fs-extra');
+const _                     = require('lodash');
+const later                 = require('later');
+const path                  = require('path');
+const pty                   = require('node-pty');
+const sane                  = require('sane');
+const moment                = require('moment');
+const paths                 = require('path');
+const fse                   = require('fs-extra');
 
-exports.getModule				= EventSchedulerModule;
-exports.EventSchedulerModule	= EventSchedulerModule;	//	allow for loadAndStart
+exports.getModule               = EventSchedulerModule;
+exports.EventSchedulerModule    = EventSchedulerModule; //  allow for loadAndStart
 
 exports.moduleInfo = {
-    name	: 'Event Scheduler',
-    desc	: 'Support for scheduling arbritary events',
-    author	: 'NuSkooler',
+    name    : 'Event Scheduler',
+    desc    : 'Support for scheduling arbritary events',
+    author  : 'NuSkooler',
 };
 
-const SCHEDULE_REGEXP	= /(?:^|or )?(@watch:)([^\0]+)?$/;
-const ACTION_REGEXP		= /@(method|execute):([^\0]+)?$/;
+const SCHEDULE_REGEXP   = /(?:^|or )?(@watch:)([^\0]+)?$/;
+const ACTION_REGEXP     = /@(method|execute):([^\0]+)?$/;
 
 class ScheduledEvent {
     constructor(events, name) {
-        this.name		= name;
-        this.schedule 	= this.parseScheduleString(events[name].schedule);
-        this.action		= this.parseActionSpec(events[name].action);
+        this.name       = name;
+        this.schedule   = this.parseScheduleString(events[name].schedule);
+        this.action     = this.parseActionSpec(events[name].action);
         if(this.action) {
             this.action.args = events[name].args || [];
         }
@@ -72,7 +72,7 @@ class ScheduledEvent {
             }
         }
 
-        //	return undefined if we couldn't parse out anything useful
+        //  return undefined if we couldn't parse out anything useful
         if(!_.isEmpty(schedule)) {
             return schedule;
         }
@@ -86,21 +86,21 @@ class ScheduledEvent {
                     if(m[2].indexOf(':') > -1) {
                         const parts = m[2].split(':');
                         return {
-                            type		: m[1],
-                            location	: parts[0],
-                            what		: parts[1],
+                            type        : m[1],
+                            location    : parts[0],
+                            what        : parts[1],
                         };
                     } else {
                         return {
-                            type	: m[1],
-                            what	: m[2],
+                            type    : m[1],
+                            what    : m[2],
                         };
                     }
                 }
             } else {
                 return {
-                    type	: 'execute',
-                    what	: actionSpec,
+                    type    : 'execute',
+                    what    : actionSpec,
                 };
             }
         }
@@ -110,7 +110,7 @@ class ScheduledEvent {
         Log.info( { eventName : this.name, action : this.action, reason : reason }, 'Executing scheduled event action...');
 
         if('method' === this.action.type) {
-            const modulePath = path.join(__dirname, '../', this.action.location);	//	enigma-bbs base + supplied location (path/file.js')
+            const modulePath = path.join(__dirname, '../', this.action.location);   //  enigma-bbs base + supplied location (path/file.js')
             try {
                 const methodModule = require(modulePath);
                 methodModule[this.action.what](this.action.args, err => {
@@ -131,11 +131,11 @@ class ScheduledEvent {
             }
         } else if('execute' === this.action.type) {
             const opts = {
-                //	:TODO: cwd
-                name	: this.name,
-                cols	: 80,
-                rows	: 24,
-                env		: process.env,
+                //  :TODO: cwd
+                name    : this.name,
+                cols    : 80,
+                rows    : 24,
+                env     : process.env,
             };
 
             const proc = pty.spawn(this.action.what, this.action.args, opts);
@@ -165,7 +165,7 @@ function EventSchedulerModule(options) {
 
     this.performAction = function(schedEvent, reason) {
         if(self.runningActions.has(schedEvent.name)) {
-            return;	//	already running
+            return; //  already running
         }
 
         self.runningActions.add(schedEvent.name);
@@ -176,13 +176,13 @@ function EventSchedulerModule(options) {
     };
 }
 
-//	convienence static method for direct load + start
+//  convienence static method for direct load + start
 EventSchedulerModule.loadAndStart = function(cb) {
     const loadModuleEx = require('./module_util.js').loadModuleEx;
 
     const loadOpts = {
-        name		: path.basename(__filename, '.js'),
-        path		: __dirname,
+        name        : path.basename(__filename, '.js'),
+        path        : __dirname,
     };
 
     loadModuleEx(loadOpts, (err, mod) => {
@@ -199,7 +199,7 @@ EventSchedulerModule.loadAndStart = function(cb) {
 
 EventSchedulerModule.prototype.startup = function(cb) {
 
-    this.eventTimers	= [];
+    this.eventTimers    = [];
     const self = this;
 
     if(this.moduleConfig && _.has(this.moduleConfig, 'events')) {
@@ -215,10 +215,10 @@ EventSchedulerModule.prototype.startup = function(cb) {
 
             Log.debug(
                 {
-                    eventName	: schedEvent.name,
-                    schedule	: this.moduleConfig.events[schedEvent.name].schedule,
-                    action		: schedEvent.action,
-                    next		: schedEvent.schedule.sched ? moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
+                    eventName   : schedEvent.name,
+                    schedule    : this.moduleConfig.events[schedEvent.name].schedule,
+                    action      : schedEvent.action,
+                    next        : schedEvent.schedule.sched ? moment(later.schedule(schedEvent.schedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
                 },
                 'Scheduled event loaded'
             );
@@ -237,7 +237,7 @@ EventSchedulerModule.prototype.startup = function(cb) {
                     }
                 );
 
-                //	:TODO: should track watched files & stop watching @ shutdown?
+                //  :TODO: should track watched files & stop watching @ shutdown?
 
                 [ 'change', 'add', 'delete' ].forEach(event => {
                     watcher.on(event, (fileName, fileRoot) => {
diff --git a/core/events.js b/core/events.js
index aa75345f..6284597e 100644
--- a/core/events.js
+++ b/core/events.js
@@ -1,20 +1,20 @@
 /* jslint node: true */
 'use strict';
 
-const paths				= require('path');
-const events			= require('events');
-const Log				= require('./logger.js').log;
-const SystemEvents		= require('./system_events.js');
+const paths             = require('path');
+const events            = require('events');
+const Log               = require('./logger.js').log;
+const SystemEvents      = require('./system_events.js');
 
-//	deps
-const _					= require('lodash');
-const async				= require('async');
-const glob				= require('glob');
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
+const glob              = require('glob');
 
 module.exports = new class Events extends events.EventEmitter {
     constructor() {
         super();
-        this.setMaxListeners(32);	//	:TODO: play with this...
+        this.setMaxListeners(32);   //  :TODO: play with this...
     }
 
     getSystemEvents() {
@@ -60,7 +60,7 @@ module.exports = new class Events extends events.EventEmitter {
                         const mod = require(fullModulePath);
 
                         if(_.isFunction(mod.registerEvents)) {
-                            //	:TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
+                            //  :TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
                             mod.registerEvents(this);
                         }
                     } catch(e) {
diff --git a/core/exodus.js b/core/exodus.js
index b20f18a1..e25b4973 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -1,83 +1,83 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const resetScreen			= require('./ansi_term.js').resetScreen;
-const Config				= require('./config.js').get;
-const Errors				= require('./enig_error.js').Errors;
-const Log					= require('./logger.js').log;
-const getEnigmaUserAgent	= require('./misc_util.js').getEnigmaUserAgent;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const resetScreen           = require('./ansi_term.js').resetScreen;
+const Config                = require('./config.js').get;
+const Errors                = require('./enig_error.js').Errors;
+const Log                   = require('./logger.js').log;
+const getEnigmaUserAgent    = require('./misc_util.js').getEnigmaUserAgent;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const joinPath		= require('path').join;
-const crypto		= require('crypto');
-const moment		= require('moment');
-const https			= require('https');
-const querystring	= require('querystring');
-const fs			= require('fs');
-const SSHClient		= require('ssh2').Client;
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const joinPath      = require('path').join;
+const crypto        = require('crypto');
+const moment        = require('moment');
+const https         = require('https');
+const querystring   = require('querystring');
+const fs            = require('fs');
+const SSHClient     = require('ssh2').Client;
 
 /*
-	Configuration block:
+    Configuration block:
 
 
-	someDoor: {
-		module: exodus
-		config: {
-			//	defaults
-			ticketHost: oddnetwork.org
-			ticketPort: 1984
-			ticketPath: /exodus
-			rejectUnauthorized: false // set to true to allow untrusted CA's (dangerous!)
-			sshHost: oddnetwork.org
-			sshPort: 22
-			sshUser: exodus
-			sshKeyPem: /path/to/enigma-bbs/misc/exodus.id_rsa
+    someDoor: {
+        module: exodus
+        config: {
+            //  defaults
+            ticketHost: oddnetwork.org
+            ticketPort: 1984
+            ticketPath: /exodus
+            rejectUnauthorized: false // set to true to allow untrusted CA's (dangerous!)
+            sshHost: oddnetwork.org
+            sshPort: 22
+            sshUser: exodus
+            sshKeyPem: /path/to/enigma-bbs/misc/exodus.id_rsa
 
-			//	optional
-			caPem: /path/to/cacerts.pem	// see https://curl.haxx.se/docs/caextract.html
+            //  optional
+            caPem: /path/to/cacerts.pem // see https://curl.haxx.se/docs/caextract.html
 
-			//	required
-			board: XXXX
-			key: XXXX
-			door: some_door
-		}
-	}
+            //  required
+            board: XXXX
+            key: XXXX
+            door: some_door
+        }
+    }
 */
 
 exports.moduleInfo = {
-    name	: 'Exodus',
-    desc	: 'Exodus Door Server Access Module - https://oddnetwork.org/exodus/',
-    author	: 'NuSkooler',
+    name    : 'Exodus',
+    desc    : 'Exodus Door Server Access Module - https://oddnetwork.org/exodus/',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class ExodusModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.config						= options.menuConfig.config || {};
-        this.config.ticketHost			= this.config.ticketHost || 'oddnetwork.org';
-        this.config.ticketPort			= this.config.ticketPort || 1984,
-        this.config.ticketPath			= this.config.ticketPath || '/exodus';
-        this.config.rejectUnauthorized	= _.get(this.config, 'rejectUnauthorized', true);
-        this.config.sshHost				= this.config.sshHost || this.config.ticketHost;
-        this.config.sshPort				= this.config.sshPort || 22;
-        this.config.sshUser				= this.config.sshUser || 'exodus_server';
-        this.config.sshKeyPem			= this.config.sshKeyPem || joinPath(Config().paths.misc, 'exodus.id_rsa');
+        this.config                     = options.menuConfig.config || {};
+        this.config.ticketHost          = this.config.ticketHost || 'oddnetwork.org';
+        this.config.ticketPort          = this.config.ticketPort || 1984,
+        this.config.ticketPath          = this.config.ticketPath || '/exodus';
+        this.config.rejectUnauthorized  = _.get(this.config, 'rejectUnauthorized', true);
+        this.config.sshHost             = this.config.sshHost || this.config.ticketHost;
+        this.config.sshPort             = this.config.sshPort || 22;
+        this.config.sshUser             = this.config.sshUser || 'exodus_server';
+        this.config.sshKeyPem           = this.config.sshKeyPem || joinPath(Config().paths.misc, 'exodus.id_rsa');
     }
 
     initSequence() {
 
-        const self				= this;
-        let clientTerminated	= false;
+        const self              = this;
+        let clientTerminated    = false;
 
         async.waterfall(
             [
                 function validateConfig(callback) {
-                    //	very basic validation on optionals
+                    //  very basic validation on optionals
                     async.each( [ 'board', 'key', 'door' ], (key, next) => {
                         return _.isString(self.config[key]) ? next(null) : next(Errors.MissingConfig(`Config requires "${key}"!`));
                     }, callback);
@@ -92,27 +92,27 @@ exports.getModule = class ExodusModule extends MenuModule {
                     });
                 },
                 function getTicket(certAuthorities, callback) {
-                    const now		= moment.utc().unix();
-                    const sha256	= crypto.createHash('sha256').update(`${self.config.key}${now}`).digest('hex');
-                    const token		= `${sha256}|${now}`;
+                    const now       = moment.utc().unix();
+                    const sha256    = crypto.createHash('sha256').update(`${self.config.key}${now}`).digest('hex');
+                    const token     = `${sha256}|${now}`;
 
-                    const postData	= querystring.stringify({
-                        token		: token,
-                        board		: self.config.board,
-                        user		: self.client.user.username,
-                        door		: self.config.door,
+                    const postData  = querystring.stringify({
+                        token       : token,
+                        board       : self.config.board,
+                        user        : self.client.user.username,
+                        door        : self.config.door,
                     });
 
                     const reqOptions = {
-                        hostname			: self.config.ticketHost,
-                        port				: self.config.ticketPort,
-                        path				: self.config.ticketPath,
-                        rejectUnauthorized	: self.config.rejectUnauthorized,
-                        method				: 'POST',
-                        headers				: {
-                            'Content-Type'		: 'application/x-www-form-urlencoded',
-                            'Content-Length'	: postData.length,
-                            'User-Agent'		: getEnigmaUserAgent(),
+                        hostname            : self.config.ticketHost,
+                        port                : self.config.ticketPort,
+                        path                : self.config.ticketPath,
+                        rejectUnauthorized  : self.config.rejectUnauthorized,
+                        method              : 'POST',
+                        headers             : {
+                            'Content-Type'      : 'application/x-www-form-urlencoded',
+                            'Content-Length'    : postData.length,
+                            'User-Agent'        : getEnigmaUserAgent(),
                         }
                     };
 
@@ -165,11 +165,11 @@ exports.getModule = class ExodusModule extends MenuModule {
                     const sshClient = new SSHClient();
 
                     const window = {
-                        rows		: self.client.term.termHeight,
-                        cols		: self.client.term.termWidth,
-                        width		: 0,
-                        height		: 0,
-                        term		: 'vt100',	//	Want to pass |self.client.term.termClient| here, but we end up getting hung up on :(
+                        rows        : self.client.term.termHeight,
+                        cols        : self.client.term.termWidth,
+                        width       : 0,
+                        height      : 0,
+                        term        : 'vt100',  //  Want to pass |self.client.term.termClient| here, but we end up getting hung up on :(
                     };
 
                     const options = {
@@ -186,7 +186,7 @@ exports.getModule = class ExodusModule extends MenuModule {
                         });
 
                         sshClient.shell(window, options, (err, stream) => {
-                            pipedStream = stream;	//	:TODO: ewwwwwwwww hack
+                            pipedStream = stream;   //  :TODO: ewwwwwwwww hack
                             self.client.term.output.pipe(stream);
 
                             stream.on('data', d => {
@@ -210,10 +210,10 @@ exports.getModule = class ExodusModule extends MenuModule {
                     });
 
                     sshClient.connect({
-                        host		: self.config.sshHost,
-                        port		: self.config.sshPort,
-                        username	: self.config.sshUser,
-                        privateKey	: privateKey,
+                        host        : self.config.sshHost,
+                        port        : self.config.sshPort,
+                        username    : self.config.sshUser,
+                        privateKey  : privateKey,
                     });
                 }
             ],
diff --git a/core/file_area_filter_edit.js b/core/file_area_filter_edit.js
index 3cdeb68b..06c0fd6e 100644
--- a/core/file_area_filter_edit.js
+++ b/core/file_area_filter_edit.js
@@ -1,36 +1,36 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('./file_base_filter.js');
-const stringFormat					= require('./string_format.js');
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas   = require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters               = require('./file_base_filter.js');
+const stringFormat                  = require('./string_format.js');
 
-//	deps
-const async				= require('async');
+//  deps
+const async             = require('async');
 
 exports.moduleInfo = {
-    name		: 'File Area Filter Editor',
-    desc		: 'Module for adding, deleting, and modifying file base filters',
-    author		: 'NuSkooler',
+    name        : 'File Area Filter Editor',
+    desc        : 'Module for adding, deleting, and modifying file base filters',
+    author      : 'NuSkooler',
 };
 
 const MciViewIds = {
     editor : {
-        searchTerms			: 1,
-        tags				: 2,
-        area				: 3,
-        sort				: 4,
-        order				: 5,
-        filterName			: 6,
-        navMenu				: 7,
+        searchTerms         : 1,
+        tags                : 2,
+        area                : 3,
+        sort                : 4,
+        order               : 5,
+        filterName          : 6,
+        navMenu             : 7,
 
-        //	:TODO: use the customs new standard thing - filter obj can have active/selected, etc.
-        selectedFilterInfo	: 10,	//	{ ...filter object ... }
-        activeFilterInfo	: 11,	//	{ ...filter object ... }
-        error				: 12,	//	validation errors
+        //  :TODO: use the customs new standard thing - filter obj can have active/selected, etc.
+        selectedFilterInfo  : 10,   //  { ...filter object ... }
+        activeFilterInfo    : 11,   //  { ...filter object ... }
+        error               : 12,   //  validation errors
     }
 };
 
@@ -38,11 +38,11 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.filtersArray		= new FileBaseFilters(this.client).toArray();	//	ordered, such that we can index into them
-        this.currentFilterIndex	= 0;	//	into |filtersArray|
+        this.filtersArray       = new FileBaseFilters(this.client).toArray();   //  ordered, such that we can index into them
+        this.currentFilterIndex = 0;    //  into |filtersArray|
 
         //
-        //	Lexical sort + keep currently active filter (if any) as the first item in |filtersArray|
+        //  Lexical sort + keep currently active filter (if any) as the first item in |filtersArray|
         //
         const activeFilter = FileBaseFilters.getActiveFilter(this.client);
         this.filtersArray.sort( (filterA, filterB) => {
@@ -87,41 +87,41 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
                 return cb(null);
             },
             newFilter : (formData, extraArgs, cb) => {
-                this.currentFilterIndex = this.filtersArray.length;	//	next avail slot
+                this.currentFilterIndex = this.filtersArray.length; //  next avail slot
                 this.clearForm(MciViewIds.editor.searchTerms);
                 return cb(null);
             },
             deleteFilter : (formData, extraArgs, cb) => {
-                const selectedFilter	= this.filtersArray[this.currentFilterIndex];
-                const filterUuid		= selectedFilter.uuid;
+                const selectedFilter    = this.filtersArray[this.currentFilterIndex];
+                const filterUuid        = selectedFilter.uuid;
 
-                //	cannot delete built-in/system filters
+                //  cannot delete built-in/system filters
                 if(true === selectedFilter.system) {
                     this.showError('Cannot delete built in filters!');
                     return cb(null);
                 }
 
-                this.filtersArray.splice(this.currentFilterIndex, 1);	//	remove selected entry
+                this.filtersArray.splice(this.currentFilterIndex, 1);   //  remove selected entry
 
-                //	remove from stored properties
+                //  remove from stored properties
                 const filters = new FileBaseFilters(this.client);
                 filters.remove(filterUuid);
                 filters.persist( () => {
 
                     //
-                    //	If the item was also the active filter, we need to make a new one active
+                    //  If the item was also the active filter, we need to make a new one active
                     //
                     if(filterUuid === this.client.user.properties.file_base_filter_active_uuid) {
                         const newActive = this.filtersArray[this.currentFilterIndex];
                         if(newActive) {
                             filters.setActive(newActive.uuid);
                         } else {
-                            //	nothing to set active to
+                            //  nothing to set active to
                             this.client.user.removeProperty('file_base_filter_active_uuid');
                         }
                     }
 
-                    //	update UI
+                    //  update UI
                     this.updateActiveLabel();
 
                     if(this.filtersArray.length > 0) {
@@ -140,7 +140,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
                 if(errorView) {
                     if(err) {
                         errorView.setText(err.message);
-                        err.view.clearText();	//	clear out the invalid data
+                        err.view.clearText();   //  clear out the invalid data
                     } else {
                         errorView.clearText();
                     }
@@ -168,8 +168,8 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.addViewController( 'editor', new ViewController( { client : this.client } ) );
+            const self  = this;
+            const vc    = self.addViewController( 'editor', new ViewController( { client : this.client } ) );
 
             async.series(
                 [
@@ -241,7 +241,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
 
     getSelectedAreaTag(index) {
         if(0 === index) {
-            return '';	//	-ALL-
+            return '';  //  -ALL-
         }
         const area = this.availAreas[index];
         if(!area) {
@@ -258,7 +258,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
         let index;
         const filter = this.getCurrentFilter();
         if(filter) {
-            //	special treatment: areaTag saved as blank ("") if -ALL-
+            //  special treatment: areaTag saved as blank ("") if -ALL-
             index = (filter.areaTag && this.availAreas.findIndex(area => filter.areaTag === area.areaTag)) || 0;
         } else {
             index = 0;
@@ -293,31 +293,31 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
     }
 
     setFilterValuesFromFormData(filter, formData) {
-        filter.name		= formData.value.name;
-        filter.areaTag	= this.getSelectedAreaTag(formData.value.areaIndex);
-        filter.terms	= formData.value.searchTerms;
-        filter.tags		= formData.value.tags;
-        filter.order	= this.getOrderBy(formData.value.orderByIndex);
-        filter.sort		= this.getSortBy(formData.value.sortByIndex);
+        filter.name     = formData.value.name;
+        filter.areaTag  = this.getSelectedAreaTag(formData.value.areaIndex);
+        filter.terms    = formData.value.searchTerms;
+        filter.tags     = formData.value.tags;
+        filter.order    = this.getOrderBy(formData.value.orderByIndex);
+        filter.sort     = this.getSortBy(formData.value.sortByIndex);
     }
 
     saveCurrentFilter(formData, cb) {
-        const filters			= new FileBaseFilters(this.client);
-        const selectedFilter	= this.filtersArray[this.currentFilterIndex];
+        const filters           = new FileBaseFilters(this.client);
+        const selectedFilter    = this.filtersArray[this.currentFilterIndex];
 
         if(selectedFilter) {
-            //	*update* currently selected filter
+            //  *update* currently selected filter
             this.setFilterValuesFromFormData(selectedFilter, formData);
             filters.replace(selectedFilter.uuid, selectedFilter);
         } else {
-            //	add a new entry; note that UUID will be generated
+            //  add a new entry; note that UUID will be generated
             const newFilter = {};
             this.setFilterValuesFromFormData(newFilter, formData);
 
-            //	set current to what we just saved
+            //  set current to what we just saved
             newFilter.uuid = filters.add(newFilter);
 
-            //	add to our array (at current index position)
+            //  add to our array (at current index position)
             this.filtersArray[this.currentFilterIndex] = newFilter;
         }
 
@@ -327,9 +327,9 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
     loadDataForFilter(filterIndex) {
         const filter = this.filtersArray[filterIndex];
         if(filter) {
-            this.setText(MciViewIds.editor.searchTerms,	filter.terms);
-            this.setText(MciViewIds.editor.tags,			filter.tags);
-            this.setText(MciViewIds.editor.filterName,		filter.name);
+            this.setText(MciViewIds.editor.searchTerms, filter.terms);
+            this.setText(MciViewIds.editor.tags,            filter.tags);
+            this.setText(MciViewIds.editor.filterName,      filter.name);
 
             this.setAreaIndexFromCurrentFilter();
             this.setSortByFromCurrentFilter();
diff --git a/core/file_area_list.js b/core/file_area_list.js
index 8b992f94..f3172d4d 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -1,71 +1,71 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const ansi					= require('./ansi_term.js');
-const theme					= require('./theme.js');
-const FileEntry				= require('./file_entry.js');
-const stringFormat			= require('./string_format.js');
-const FileArea				= require('./file_base_area.js');
-const Errors				= require('./enig_error.js').Errors;
-const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
-const ArchiveUtil			= require('./archive_util.js');
-const Config				= require('./config.js').get;
-const DownloadQueue			= require('./download_queue.js');
-const FileAreaWeb			= require('./file_area_web.js');
-const FileBaseFilters		= require('./file_base_filter.js');
-const resolveMimeType		= require('./mime_util.js').resolveMimeType;
-const isAnsi				= require('./string_util.js').isAnsi;
-const controlCodesToAnsi	= require('./color_codes.js').controlCodesToAnsi;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const ansi                  = require('./ansi_term.js');
+const theme                 = require('./theme.js');
+const FileEntry             = require('./file_entry.js');
+const stringFormat          = require('./string_format.js');
+const FileArea              = require('./file_base_area.js');
+const Errors                = require('./enig_error.js').Errors;
+const ErrNotEnabled         = require('./enig_error.js').ErrorReasons.NotEnabled;
+const ArchiveUtil           = require('./archive_util.js');
+const Config                = require('./config.js').get;
+const DownloadQueue         = require('./download_queue.js');
+const FileAreaWeb           = require('./file_area_web.js');
+const FileBaseFilters       = require('./file_base_filter.js');
+const resolveMimeType       = require('./mime_util.js').resolveMimeType;
+const isAnsi                = require('./string_util.js').isAnsi;
+const controlCodesToAnsi    = require('./color_codes.js').controlCodesToAnsi;
 
-//	deps
-const async				= require('async');
-const _					= require('lodash');
-const moment			= require('moment');
-const paths				= require('path');
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
+const moment            = require('moment');
+const paths             = require('path');
 
 exports.moduleInfo = {
-    name	: 'File Area List',
-    desc	: 'Lists contents of file an file area',
-    author	: 'NuSkooler',
+    name    : 'File Area List',
+    desc    : 'Lists contents of file an file area',
+    author  : 'NuSkooler',
 };
 
 const FormIds = {
-    browse			: 0,
-    details			: 1,
-    detailsGeneral	: 2,
-    detailsNfo		: 3,
-    detailsFileList	: 4,
+    browse          : 0,
+    details         : 1,
+    detailsGeneral  : 2,
+    detailsNfo      : 3,
+    detailsFileList : 4,
 };
 
 const MciViewIds = {
-    browse	: {
-        desc				: 1,
-        navMenu				: 2,
+    browse  : {
+        desc                : 1,
+        navMenu             : 2,
 
-        customRangeStart	: 10,	//	10+ = customs
+        customRangeStart    : 10,   //  10+ = customs
     },
-    details	: {
-        navMenu				: 1,
-        infoXyTop			: 2,	//	%XY starting position for info area
-        infoXyBottom		: 3,
+    details : {
+        navMenu             : 1,
+        infoXyTop           : 2,    //  %XY starting position for info area
+        infoXyBottom        : 3,
 
-        customRangeStart	: 10,	//	10+ = customs
+        customRangeStart    : 10,   //  10+ = customs
     },
     detailsGeneral : {
-        customRangeStart	: 10, //	10+ = customs
+        customRangeStart    : 10, //    10+ = customs
     },
     detailsNfo : {
-        nfo		: 1,
+        nfo     : 1,
 
-        customRangeStart	: 10,	//	10+ = customs
+        customRangeStart    : 10,   //  10+ = customs
     },
     detailsFileList : {
-        fileList	: 1,
+        fileList    : 1,
 
-        customRangeStart	: 10,	//	10+ = customs
+        customRangeStart    : 10,   //  10+ = customs
     },
 };
 
@@ -74,12 +74,12 @@ exports.getModule = class FileAreaList extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.filterCriteria		= _.get(options, 'extraArgs.filterCriteria');
-        this.fileList			= _.get(options, 'extraArgs.fileList');
-        this.lastFileNextExit	= _.get(options, 'extraArgs.lastFileNextExit', true);
+        this.filterCriteria     = _.get(options, 'extraArgs.filterCriteria');
+        this.fileList           = _.get(options, 'extraArgs.fileList');
+        this.lastFileNextExit   = _.get(options, 'extraArgs.lastFileNextExit', true);
 
         if(this.fileList) {
-            //	we'll need to adjust position as well!
+            //  we'll need to adjust position as well!
             this.fileListPosition = 0;
         }
 
@@ -102,7 +102,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                 if(this.fileListPosition + 1 < this.fileList.length) {
                     this.fileListPosition += 1;
 
-                    return this.displayBrowsePage(true, cb);	//	true=clerarScreen
+                    return this.displayBrowsePage(true, cb);    //  true=clerarScreen
                 }
 
                 if(this.lastFileNextExit) {
@@ -115,7 +115,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                 if(this.fileListPosition > 0) {
                     --this.fileListPosition;
 
-                    return this.displayBrowsePage(true, cb);	//	true=clearScreen
+                    return this.displayBrowsePage(true, cb);    //  true=clearScreen
                 }
 
                 return cb(null);
@@ -132,7 +132,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                     }
                 });
 
-                return this.displayBrowsePage(true, cb);	//	true=clearScreen
+                return this.displayBrowsePage(true, cb);    //  true=clearScreen
             },
             toggleQueue : (formData, extraArgs, cb) => {
                 this.dlQueue.toggle(this.currentFileEntry);
@@ -158,15 +158,15 @@ exports.getModule = class FileAreaList extends MenuModule {
 
     getSaveState() {
         return {
-            fileList			: this.fileList,
-            fileListPosition	: this.fileListPosition,
+            fileList            : this.fileList,
+            fileListPosition    : this.fileListPosition,
         };
     }
 
     restoreSavedState(savedState) {
         if(savedState) {
-            this.fileList			= savedState.fileList;
-            this.fileListPosition	= savedState.fileListPosition;
+            this.fileList           = savedState.fileList;
+            this.fileListPosition   = savedState.fileListPosition;
         }
     }
 
@@ -215,35 +215,35 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     populateCurrentEntryInfo(cb) {
-        const config		= this.menuConfig.config;
-        const currEntry		= this.currentFileEntry;
+        const config        = this.menuConfig.config;
+        const currEntry     = this.currentFileEntry;
 
         const uploadTimestampFormat = config.browseUploadTimestampFormat || config.uploadTimestampFormat || 'YYYY-MMM-DD';
-        const area					= FileArea.getFileAreaByTag(currEntry.areaTag);
-        const hashTagsSep			= config.hashTagsSep || ', ';
-        const isQueuedIndicator		= config.isQueuedIndicator || 'Y';
-        const isNotQueuedIndicator	= config.isNotQueuedIndicator || 'N';
+        const area                  = FileArea.getFileAreaByTag(currEntry.areaTag);
+        const hashTagsSep           = config.hashTagsSep || ', ';
+        const isQueuedIndicator     = config.isQueuedIndicator || 'Y';
+        const isNotQueuedIndicator  = config.isNotQueuedIndicator || 'N';
 
         const entryInfo = currEntry.entryInfo = {
-            fileId				: currEntry.fileId,
-            areaTag				: currEntry.areaTag,
-            areaName			: _.get(area, 'name') || 'N/A',
-            areaDesc			: _.get(area, 'desc') || 'N/A',
-            fileSha256			: currEntry.fileSha256,
-            fileName			: currEntry.fileName,
-            desc				: currEntry.desc || '',
-            descLong			: currEntry.descLong || '',
-            userRating			: currEntry.userRating,
-            uploadTimestamp		: moment(currEntry.uploadTimestamp).format(uploadTimestampFormat),
-            hashTags			: Array.from(currEntry.hashTags).join(hashTagsSep),
-            isQueued			: this.dlQueue.isQueued(currEntry) ? isQueuedIndicator : isNotQueuedIndicator,
-            webDlLink			: '',	//	:TODO: fetch web any existing web d/l link
-            webDlExpire			: '',	//	:TODO: fetch web d/l link expire time
+            fileId              : currEntry.fileId,
+            areaTag             : currEntry.areaTag,
+            areaName            : _.get(area, 'name') || 'N/A',
+            areaDesc            : _.get(area, 'desc') || 'N/A',
+            fileSha256          : currEntry.fileSha256,
+            fileName            : currEntry.fileName,
+            desc                : currEntry.desc || '',
+            descLong            : currEntry.descLong || '',
+            userRating          : currEntry.userRating,
+            uploadTimestamp     : moment(currEntry.uploadTimestamp).format(uploadTimestampFormat),
+            hashTags            : Array.from(currEntry.hashTags).join(hashTagsSep),
+            isQueued            : this.dlQueue.isQueued(currEntry) ? isQueuedIndicator : isNotQueuedIndicator,
+            webDlLink           : '',   //  :TODO: fetch web any existing web d/l link
+            webDlExpire         : '',   //  :TODO: fetch web d/l link expire time
         };
 
         //
-        //	We need the entry object to contain meta keys even if they are empty as
-        //	consumers may very likely attempt to use them
+        //  We need the entry object to contain meta keys even if they are empty as
+        //  consumers may very likely attempt to use them
         //
         const metaValues = FileEntry.WellKnownMetaValues;
         metaValues.forEach(name => {
@@ -258,7 +258,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                 let fileType = _.get(Config(), [ 'fileTypes', mimeType ] );
 
                 if(Array.isArray(fileType)) {
-                    //	further refine by extention
+                    //  further refine by extention
                     fileType = fileType.find(ft => paths.extname(currEntry.fileName) === ft.ext);
                 }
                 desc = fileType && fileType.desc;
@@ -268,31 +268,31 @@ exports.getModule = class FileAreaList extends MenuModule {
             entryInfo.archiveTypeDesc = 'N/A';
         }
 
-        entryInfo.uploadByUsername 	= entryInfo.uploadByUsername || 'N/A';	//	may be imported
-        entryInfo.hashTags			= entryInfo.hashTags || '(none)';
+        entryInfo.uploadByUsername  = entryInfo.uploadByUsername || 'N/A';  //  may be imported
+        entryInfo.hashTags          = entryInfo.hashTags || '(none)';
 
-        //	create a rating string, e.g. "**---"
-        const userRatingTicked		= config.userRatingTicked || '*';
-        const userRatingUnticked	= config.userRatingUnticked || '';
-        entryInfo.userRating		= ~~Math.round(entryInfo.userRating) || 0;	//	be safe!
-        entryInfo.userRatingString	= userRatingTicked.repeat(entryInfo.userRating);
+        //  create a rating string, e.g. "**---"
+        const userRatingTicked      = config.userRatingTicked || '*';
+        const userRatingUnticked    = config.userRatingUnticked || '';
+        entryInfo.userRating        = ~~Math.round(entryInfo.userRating) || 0;  //  be safe!
+        entryInfo.userRatingString  = userRatingTicked.repeat(entryInfo.userRating);
         if(entryInfo.userRating < 5) {
             entryInfo.userRatingString += userRatingUnticked.repeat( (5 - entryInfo.userRating) );
         }
 
         FileAreaWeb.getExistingTempDownloadServeItem(this.client, this.currentFileEntry, (err, serveItem) => {
             if(err) {
-                entryInfo.webDlExpire	= '';
+                entryInfo.webDlExpire   = '';
                 if(ErrNotEnabled === err.reasonCode) {
-                    entryInfo.webDlExpire	= config.webDlLinkNoWebserver || 'Web server is not enabled';
+                    entryInfo.webDlExpire   = config.webDlLinkNoWebserver || 'Web server is not enabled';
                 } else {
-                    entryInfo.webDlLink 	= config.webDlLinkNeedsGenerated || 'Not yet generated';
+                    entryInfo.webDlLink     = config.webDlLinkNeedsGenerated || 'Not yet generated';
                 }
             } else {
                 const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-                entryInfo.webDlLink		= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
-                entryInfo.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+                entryInfo.webDlLink     = ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
+                entryInfo.webDlExpire   = moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
             }
 
             return cb(null);
@@ -304,8 +304,8 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     displayArtAndPrepViewController(name, options, cb) {
-        const self		= this;
-        const config	= this.menuConfig.config;
+        const self      = this;
+        const config    = this.menuConfig.config;
 
         async.waterfall(
             [
@@ -326,8 +326,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                 function prepeareViewController(artData, callback) {
                     if(_.isUndefined(self.viewControllers[name])) {
                         const vcOpts = {
-                            client		: self.client,
-                            formId		: FormIds[name],
+                            client      : self.client,
+                            formId      : FormIds[name],
                         };
 
                         if(!_.isUndefined(options.noInput)) {
@@ -339,8 +339,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                         if('details' === name) {
                             try {
                                 self.detailsInfoArea = {
-                                    top		: artData.mciMap.XY2.position,
-                                    bottom	: artData.mciMap.XY3.position,
+                                    top     : artData.mciMap.XY2.position,
+                                    bottom  : artData.mciMap.XY3.position,
                                 };
                             } catch(e) {
                                 return callback(Errors.DoesNotExist('Missing XY2 and XY3 position indicators!'));
@@ -348,9 +348,9 @@ exports.getModule = class FileAreaList extends MenuModule {
                         }
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds[name],
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds[name],
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -368,7 +368,7 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     displayBrowsePage(clearScreen, cb) {
-        const self		= this;
+        const self      = this;
 
         async.series(
             [
@@ -376,7 +376,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                     if(self.fileList) {
                         return callback(null);
                     }
-                    return self.loadFileIds(false, callback);	//	false=do not force
+                    return self.loadFileIds(false, callback);   //  false=do not force
                 },
                 function checkEmptyResults(callback) {
                     if(0 === self.fileList.length) {
@@ -403,21 +403,21 @@ exports.getModule = class FileAreaList extends MenuModule {
                         const descView = self.viewControllers.browse.getView(MciViewIds.browse.desc);
                         if(descView) {
                             //
-                            //	For descriptions we want to support as many color code systems
-                            //	as we can for coverage of what is found in the while (e.g. Renegade
-                            //	pipes, PCB @X##, etc.)
+                            //  For descriptions we want to support as many color code systems
+                            //  as we can for coverage of what is found in the while (e.g. Renegade
+                            //  pipes, PCB @X##, etc.)
                             //
-                            //	MLTEV doesn't support all of this, so convert. If we produced ANSI
-                            //	esc sequences, we'll proceed with specialization, else just treat
-                            //	it as text.
+                            //  MLTEV doesn't support all of this, so convert. If we produced ANSI
+                            //  esc sequences, we'll proceed with specialization, else just treat
+                            //  it as text.
                             //
                             const desc = controlCodesToAnsi(self.currentFileEntry.desc);
                             if(desc.length != self.currentFileEntry.desc.length || isAnsi(desc)) {
                                 descView.setAnsi(
                                     desc,
                                     {
-                                        prepped			: false,
-                                        forceLineTerm	: true
+                                        prepped         : false,
+                                        forceLineTerm   : true
                                     },
                                     () => {
                                         return callback(null);
@@ -447,7 +447,7 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     displayDetailsPage(cb) {
-        const self		= this;
+        const self      = this;
 
         async.series(
             [
@@ -467,9 +467,9 @@ exports.getModule = class FileAreaList extends MenuModule {
 
                     navMenu.on('index update', index => {
                         const sectionName = {
-                            0	: 'general',
-                            1	: 'nfo',
-                            2	: 'fileList',
+                            0   : 'general',
+                            1   : 'nfo',
+                            2   : 'fileList',
                         }[index];
 
                         if(sectionName) {
@@ -524,8 +524,8 @@ exports.getModule = class FileAreaList extends MenuModule {
 
                             const webDlExpireTimeFormat = self.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-                            self.currentFileEntry.entryInfo.webDlLink 	= ansi.vtxHyperlink(self.client, url) + url;
-                            self.currentFileEntry.entryInfo.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
+                            self.currentFileEntry.entryInfo.webDlLink   = ansi.vtxHyperlink(self.client, url) + url;
+                            self.currentFileEntry.entryInfo.webDlExpire = expireTime.format(webDlExpireTimeFormat);
 
                             return callback(null);
                         }
@@ -547,8 +547,8 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     updateQueueIndicator() {
-        const isQueuedIndicator		= this.menuConfig.config.isQueuedIndicator || 'Y';
-        const isNotQueuedIndicator	= this.menuConfig.config.isNotQueuedIndicator || 'N';
+        const isQueuedIndicator     = this.menuConfig.config.isQueuedIndicator || 'Y';
+        const isNotQueuedIndicator  = this.menuConfig.config.isNotQueuedIndicator || 'N';
 
         this.currentFileEntry.entryInfo.isQueued = stringFormat(
             this.dlQueue.isQueued(this.currentFileEntry) ?
@@ -565,7 +565,7 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     cacheArchiveEntries(cb) {
-        //	check cache
+        //  check cache
         if(this.currentFileEntry.archiveEntries) {
             return cb(null, 'cache');
         }
@@ -575,8 +575,8 @@ exports.getModule = class FileAreaList extends MenuModule {
             return cb(Errors.Invalid('Invalid area tag'));
         }
 
-        const filePath		= this.currentFileEntry.filePath;
-        const archiveUtil	= ArchiveUtil.getInstance();
+        const filePath      = this.currentFileEntry.filePath;
+        const archiveUtil   = ArchiveUtil.getInstance();
 
         archiveUtil.listEntries(filePath, this.currentFileEntry.entryInfo.archiveType, (err, entries) => {
             if(err) {
@@ -594,14 +594,14 @@ exports.getModule = class FileAreaList extends MenuModule {
         if(this.currentFileEntry.entryInfo.archiveType) {
             this.cacheArchiveEntries( (err, cacheStatus) => {
                 if(err) {
-                    //	:TODO: Handle me!!!
-                    fileListView.setItems( [ 'Failed getting file listing' ] );	//	:TODO: make this not suck
+                    //  :TODO: Handle me!!!
+                    fileListView.setItems( [ 'Failed getting file listing' ] ); //  :TODO: make this not suck
                     return;
                 }
 
                 if('re-cached' === cacheStatus) {
-                    const fileListEntryFormat 		= this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';	//	:TODO: use byteSize here?
-                    const focusFileListEntryFormat	= this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
+                    const fileListEntryFormat       = this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';    //  :TODO: use byteSize here?
+                    const focusFileListEntryFormat  = this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
 
                     fileListView.setItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(fileListEntryFormat, entry) ) );
                     fileListView.setFocusItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(focusFileListEntryFormat, entry) ) );
@@ -615,8 +615,8 @@ exports.getModule = class FileAreaList extends MenuModule {
     }
 
     displayDetailsSection(sectionName, clearArea, cb) {
-        const self		= this;
-        const name		= `details${_.upperFirst(sectionName)}`;
+        const self      = this;
+        const name      = `details${_.upperFirst(sectionName)}`;
 
         async.series(
             [
@@ -637,8 +637,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                     if(clearArea) {
                         self.client.term.rawWrite(ansi.reset());
 
-                        let pos 		= self.detailsInfoArea.top[0];
-                        const bottom	= self.detailsInfoArea.bottom[0];
+                        let pos         = self.detailsInfoArea.top[0];
+                        const bottom    = self.detailsInfoArea.bottom[0];
 
                         while(pos++ <= bottom) {
                             self.client.term.rawWrite(ansi.eraseLine() + ansi.down());
@@ -664,8 +664,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                                     nfoView.setAnsi(
                                         self.currentFileEntry.entryInfo.descLong,
                                         {
-                                            prepped			: false,
-                                            forceLineTerm	: true,
+                                            prepped         : false,
+                                            forceLineTerm   : true,
                                         },
                                         () => {
                                             return callback(null);
@@ -701,7 +701,7 @@ exports.getModule = class FileAreaList extends MenuModule {
 
     loadFileIds(force, cb) {
         if(force || (_.isUndefined(this.fileList) || _.isUndefined(this.fileListPosition))) {
-            this.fileListPosition	= 0;
+            this.fileListPosition   = 0;
 
             const filterCriteria = Object.assign({}, this.filterCriteria);
             if(!filterCriteria.areaTag) {
diff --git a/core/file_area_web.js b/core/file_area_web.js
index 88c108f6..a1d12989 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -1,29 +1,29 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config				= require('./config.js').get;
-const FileDb				= require('./database.js').dbs.file;
-const getISOTimestampString	= require('./database.js').getISOTimestampString;
-const FileEntry				= require('./file_entry.js');
-const getServer				= require('./listening_server.js').getServer;
-const Errors				= require('./enig_error.js').Errors;
-const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
-const StatLog				= require('./stat_log.js');
-const User					= require('./user.js');
-const Log					= require('./logger.js').log;
-const getConnectionByUserId	= require('./client_connections.js').getConnectionByUserId;
-const webServerPackageName	= require('./servers/content/web.js').moduleInfo.packageName;
-const Events				= require('./events.js');
+//  ENiGMA½
+const Config                = require('./config.js').get;
+const FileDb                = require('./database.js').dbs.file;
+const getISOTimestampString = require('./database.js').getISOTimestampString;
+const FileEntry             = require('./file_entry.js');
+const getServer             = require('./listening_server.js').getServer;
+const Errors                = require('./enig_error.js').Errors;
+const ErrNotEnabled         = require('./enig_error.js').ErrorReasons.NotEnabled;
+const StatLog               = require('./stat_log.js');
+const User                  = require('./user.js');
+const Log                   = require('./logger.js').log;
+const getConnectionByUserId = require('./client_connections.js').getConnectionByUserId;
+const webServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
+const Events                = require('./events.js');
 
-//	deps
-const hashids		= require('hashids');
-const moment		= require('moment');
-const paths			= require('path');
-const async			= require('async');
-const fs			= require('graceful-fs');
-const mimeTypes		= require('mime-types');
-const yazl			= require('yazl');
+//  deps
+const hashids       = require('hashids');
+const moment        = require('moment');
+const paths         = require('path');
+const async         = require('async');
+const fs            = require('graceful-fs');
+const mimeTypes     = require('mime-types');
+const yazl          = require('yazl');
 
 function notEnabledError() {
     return Errors.General('Web server is not enabled', ErrNotEnabled);
@@ -31,8 +31,8 @@ function notEnabledError() {
 
 class FileAreaWebAccess {
     constructor() {
-        this.hashids		= new hashids(Config().general.boardName);
-        this.expireTimers	= {};	//	hashId->timer
+        this.hashids        = new hashids(Config().general.boardName);
+        this.expireTimers   = {};   //  hashId->timer
     }
 
     startup(cb) {
@@ -51,13 +51,13 @@ class FileAreaWebAccess {
 
                     if(self.isEnabled()) {
                         const routeAdded = self.webServer.instance.addRoute({
-                            method	: 'GET',
-                            path	: Config().fileBase.web.routePath,
-                            handler	: self.routeWebRequest.bind(self),
+                            method  : 'GET',
+                            path    : Config().fileBase.web.routePath,
+                            handler : self.routeWebRequest.bind(self),
                         });
                         return callback(routeAdded ? null : Errors.General('Failed adding route'));
                     } else {
-                        return callback(null);	//	not enabled, but no error
+                        return callback(null);  //  not enabled, but no error
                     }
                 }
             ],
@@ -77,18 +77,18 @@ class FileAreaWebAccess {
 
     static getHashIdTypes() {
         return {
-            SingleFile		: 0,
-            BatchArchive	: 1,
+            SingleFile      : 0,
+            BatchArchive    : 1,
         };
     }
 
     load(cb) {
         //
-        //	Load entries, register expiration timers
+        //  Load entries, register expiration timers
         //
         FileDb.each(
             `SELECT hash_id, expire_timestamp
-			FROM file_web_serve;`,
+            FROM file_web_serve;`,
             (err, row) => {
                 if(row) {
                     this.scheduleExpire(row.hash_id, moment(row.expire_timestamp));
@@ -102,11 +102,11 @@ class FileAreaWebAccess {
 
     removeEntry(hashId) {
         //
-        //	Delete record from DB, and our timer
+        //  Delete record from DB, and our timer
         //
         FileDb.run(
             `DELETE FROM file_web_serve
-			WHERE hash_id = ?;`,
+            WHERE hash_id = ?;`,
             [ hashId ]
         );
 
@@ -115,7 +115,7 @@ class FileAreaWebAccess {
 
     scheduleExpire(hashId, expireTime) {
 
-        //	remove any previous entry for this hashId
+        //  remove any previous entry for this hashId
         const previous = this.expireTimers[hashId];
         if(previous) {
             clearTimeout(previous);
@@ -138,8 +138,8 @@ class FileAreaWebAccess {
     loadServedHashId(hashId, cb) {
         FileDb.get(
             `SELECT expire_timestamp FROM
-			file_web_serve
-			WHERE hash_id = ?`,
+            file_web_serve
+            WHERE hash_id = ?`,
             [ hashId ],
             (err, result) => {
                 if(err || !result) {
@@ -148,16 +148,16 @@ class FileAreaWebAccess {
 
                 const decoded = this.hashids.decode(hashId);
 
-                //	decode() should provide an array of [ userId, hashIdType, id, ... ]
+                //  decode() should provide an array of [ userId, hashIdType, id, ... ]
                 if(!Array.isArray(decoded) || decoded.length < 3) {
                     return cb(Errors.Invalid('Invalid or unknown hash ID'));
                 }
 
                 const servedItem = {
-                    hashId			: hashId,
-                    userId			: decoded[0],
-                    hashIdType		: decoded[1],
-                    expireTimestamp	: moment(result.expire_timestamp),
+                    hashId          : hashId,
+                    userId          : decoded[0],
+                    hashIdType      : decoded[1],
+                    expireTimestamp : moment(result.expire_timestamp),
                 };
 
                 if(FileAreaWebAccess.getHashIdTypes().SingleFile === servedItem.hashIdType) {
@@ -209,10 +209,10 @@ class FileAreaWebAccess {
     }
 
     _addOrUpdateHashIdRecord(dbOrTrans, hashId, expireTime, cb) {
-        //	add/update rec with hash id and (latest) timestamp
+        //  add/update rec with hash id and (latest) timestamp
         dbOrTrans.run(
             `REPLACE INTO file_web_serve (hash_id, expire_timestamp)
-			VALUES (?, ?);`,
+            VALUES (?, ?);`,
             [ hashId, getISOTimestampString(expireTime) ],
             err => {
                 if(err) {
@@ -231,9 +231,9 @@ class FileAreaWebAccess {
             return cb(notEnabledError());
         }
 
-        const hashId		= this.getSingleFileHashId(client, fileEntry);
-        const url			= this.buildSingleFileTempDownloadLink(client, fileEntry, hashId);
-        options.expireTime	= options.expireTime || moment().add(2, 'days');
+        const hashId        = this.getSingleFileHashId(client, fileEntry);
+        const url           = this.buildSingleFileTempDownloadLink(client, fileEntry, hashId);
+        options.expireTime  = options.expireTime || moment().add(2, 'days');
 
         this._addOrUpdateHashIdRecord(FileDb, hashId, options.expireTime, err => {
             return cb(err, url);
@@ -245,10 +245,10 @@ class FileAreaWebAccess {
             return cb(notEnabledError());
         }
 
-        const batchId		= moment().utc().unix();
-        const hashId		= this.getBatchArchiveHashId(client, batchId);
-        const url			= this.buildBatchArchiveTempDownloadLink(client, hashId);
-        options.expireTime	= options.expireTime || moment().add(2, 'days');
+        const batchId       = moment().utc().unix();
+        const hashId        = this.getBatchArchiveHashId(client, batchId);
+        const url           = this.buildBatchArchiveTempDownloadLink(client, hashId);
+        options.expireTime  = options.expireTime || moment().add(2, 'days');
 
         FileDb.beginTransaction( (err, trans) => {
             if(err) {
@@ -265,7 +265,7 @@ class FileAreaWebAccess {
                 async.eachSeries(fileEntries, (entry, nextEntry) => {
                     trans.run(
                         `INSERT INTO file_web_serve_batch (hash_id, file_id)
-						VALUES (?, ?);`,
+                        VALUES (?, ?);`,
                         [ hashId, entry.fileId ],
                         err => {
                             return nextEntry(err);
@@ -332,19 +332,19 @@ class FileAreaWebAccess {
                 }
 
                 resp.on('close', () => {
-                    //	connection closed *before* the response was fully sent
-                    //	:TODO: Log and such
+                    //  connection closed *before* the response was fully sent
+                    //  :TODO: Log and such
                 });
 
                 resp.on('finish', () => {
-                    //	transfer completed fully
+                    //  transfer completed fully
                     this.updateDownloadStatsForUserIdAndSystem(servedItem.userId, stats.size, [ fileEntry ]);
                 });
 
                 const headers = {
-                    'Content-Type'			: mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
-                    'Content-Length'		: stats.size,
-                    'Content-Disposition'	: `attachment; filename="${fileEntry.fileName}"`,
+                    'Content-Type'          : mimeTypes.contentType(filePath) || mimeTypes.contentType('.bin'),
+                    'Content-Length'        : stats.size,
+                    'Content-Disposition'   : `attachment; filename="${fileEntry.fileName}"`,
                 };
 
                 const readStream = fs.createReadStream(filePath);
@@ -358,10 +358,10 @@ class FileAreaWebAccess {
         Log.debug( { servedItem : servedItem }, 'Batch file web request');
 
         //
-        //	We are going to build an on-the-fly zip file stream of 1:n
-        //	files in the batch.
+        //  We are going to build an on-the-fly zip file stream of 1:n
+        //  files in the batch.
         //
-        //	First, collect all file IDs
+        //  First, collect all file IDs
         //
         const self = this;
 
@@ -370,8 +370,8 @@ class FileAreaWebAccess {
                 function fetchFileIds(callback) {
                     FileDb.all(
                         `SELECT file_id
-						FROM file_web_serve_batch
-						WHERE hash_id = ?;`,
+                        FROM file_web_serve_batch
+                        WHERE hash_id = ?;`,
                         [ servedItem.hashId ],
                         (err, fileIdRows) => {
                             if(err || !Array.isArray(fileIdRows) || 0 === fileIdRows.length) {
@@ -408,10 +408,10 @@ class FileAreaWebAccess {
 
                     filePaths.forEach(fp => {
                         zipFile.addFile(
-                            fp,					//	path to physical file
-                            paths.basename(fp),	//	filename/path *stored in archive*
+                            fp,                 //  path to physical file
+                            paths.basename(fp), //  filename/path *stored in archive*
                             {
-                                compress : false,	//	:TODO: do this smartly - if ext is in set = false, else true via isArchive() or such... mimeDB has this for us.
+                                compress : false,   //  :TODO: do this smartly - if ext is in set = false, else true via isArchive() or such... mimeDB has this for us.
                             }
                         );
                     });
@@ -422,21 +422,21 @@ class FileAreaWebAccess {
                         }
 
                         resp.on('close', () => {
-                            //	connection closed *before* the response was fully sent
-                            //	:TODO: Log and such
+                            //  connection closed *before* the response was fully sent
+                            //  :TODO: Log and such
                         });
 
                         resp.on('finish', () => {
-                            //	transfer completed fully
+                            //  transfer completed fully
                             self.updateDownloadStatsForUserIdAndSystem(servedItem.userId, finalZipSize, fileEntries);
                         });
 
                         const batchFileName = `batch_${servedItem.hashId}.zip`;
 
                         const headers = {
-                            'Content-Type'			: mimeTypes.contentType(batchFileName) || mimeTypes.contentType('.bin'),
-                            'Content-Length'		: finalZipSize,
-                            'Content-Disposition'	: `attachment; filename="${batchFileName}"`,
+                            'Content-Type'          : mimeTypes.contentType(batchFileName) || mimeTypes.contentType('.bin'),
+                            'Content-Length'        : finalZipSize,
+                            'Content-Disposition'   : `attachment; filename="${batchFileName}"`,
                         };
 
                         resp.writeHead(200, headers);
@@ -446,11 +446,11 @@ class FileAreaWebAccess {
             ],
             err => {
                 if(err) {
-                    //	:TODO: Log me!
+                    //  :TODO: Log me!
                     return this.fileNotFound(resp);
                 }
 
-                //	...otherwise, we would have called resp() already.
+                //  ...otherwise, we would have called resp() already.
             }
         );
     }
@@ -464,7 +464,7 @@ class FileAreaWebAccess {
                         return callback(null, clientForUserId.user);
                     }
 
-                    //	not online now - look 'em up
+                    //  not online now - look 'em up
                     User.getUser(userId, (err, assocUser) => {
                         return callback(err, assocUser);
                     });
@@ -481,8 +481,8 @@ class FileAreaWebAccess {
                     Events.emit(
                         Events.getSystemEvents().UserDownload,
                         {
-                            user	: user,
-                            files	: fileEntries,
+                            user    : user,
+                            files   : fileEntries,
                         }
                     );
                     return callback(null);
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 511e11af..7d7ce6fb 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -1,57 +1,57 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config			= require('./config.js').get;
-const Errors			= require('./enig_error.js').Errors;
-const sortAreasOrConfs	= require('./conf_area_util.js').sortAreasOrConfs;
-const FileEntry			= require('./file_entry.js');
-const FileDb			= require('./database.js').dbs.file;
-const ArchiveUtil		= require('./archive_util.js');
-const CRC32				= require('./crc.js').CRC32;
-const Log				= require('./logger.js').log;
-const resolveMimeType	= require('./mime_util.js').resolveMimeType;
-const stringFormat		= require('./string_format.js');
-const wordWrapText		= require('./word_wrap.js').wordWrapText;
-const StatLog			= require('./stat_log.js');
+//  ENiGMA½
+const Config            = require('./config.js').get;
+const Errors            = require('./enig_error.js').Errors;
+const sortAreasOrConfs  = require('./conf_area_util.js').sortAreasOrConfs;
+const FileEntry         = require('./file_entry.js');
+const FileDb            = require('./database.js').dbs.file;
+const ArchiveUtil       = require('./archive_util.js');
+const CRC32             = require('./crc.js').CRC32;
+const Log               = require('./logger.js').log;
+const resolveMimeType   = require('./mime_util.js').resolveMimeType;
+const stringFormat      = require('./string_format.js');
+const wordWrapText      = require('./word_wrap.js').wordWrapText;
+const StatLog           = require('./stat_log.js');
 
-//	deps
-const _				= require('lodash');
-const async			= require('async');
-const fs			= require('graceful-fs');
-const crypto		= require('crypto');
-const paths			= require('path');
-const temptmp		= require('temptmp').createTrackedSession('file_area');
-const iconv			= require('iconv-lite');
-const execFile		= require('child_process').execFile;
-const moment		= require('moment');
+//  deps
+const _             = require('lodash');
+const async         = require('async');
+const fs            = require('graceful-fs');
+const crypto        = require('crypto');
+const paths         = require('path');
+const temptmp       = require('temptmp').createTrackedSession('file_area');
+const iconv         = require('iconv-lite');
+const execFile      = require('child_process').execFile;
+const moment        = require('moment');
 
-exports.startup							= startup;
-exports.isInternalArea					= isInternalArea;
-exports.getAvailableFileAreas			= getAvailableFileAreas;
-exports.getAvailableFileAreaTags		= getAvailableFileAreaTags;
-exports.getSortedAvailableFileAreas		= getSortedAvailableFileAreas;
-exports.isValidStorageTag				= isValidStorageTag;
-exports.getAreaStorageDirectoryByTag	= getAreaStorageDirectoryByTag;
-exports.getAreaDefaultStorageDirectory	= getAreaDefaultStorageDirectory;
-exports.getAreaStorageLocations			= getAreaStorageLocations;
-exports.getDefaultFileAreaTag			= getDefaultFileAreaTag;
-exports.getFileAreaByTag				= getFileAreaByTag;
-exports.getFileEntryPath				= getFileEntryPath;
-exports.changeFileAreaWithOptions		= changeFileAreaWithOptions;
-exports.scanFile						= scanFile;
-exports.scanFileAreaForChanges			= scanFileAreaForChanges;
-exports.getDescFromFileName				= getDescFromFileName;
-exports.getAreaStats					= getAreaStats;
-exports.cleanUpTempSessionItems			= cleanUpTempSessionItems;
+exports.startup                         = startup;
+exports.isInternalArea                  = isInternalArea;
+exports.getAvailableFileAreas           = getAvailableFileAreas;
+exports.getAvailableFileAreaTags        = getAvailableFileAreaTags;
+exports.getSortedAvailableFileAreas     = getSortedAvailableFileAreas;
+exports.isValidStorageTag               = isValidStorageTag;
+exports.getAreaStorageDirectoryByTag    = getAreaStorageDirectoryByTag;
+exports.getAreaDefaultStorageDirectory  = getAreaDefaultStorageDirectory;
+exports.getAreaStorageLocations         = getAreaStorageLocations;
+exports.getDefaultFileAreaTag           = getDefaultFileAreaTag;
+exports.getFileAreaByTag                = getFileAreaByTag;
+exports.getFileEntryPath                = getFileEntryPath;
+exports.changeFileAreaWithOptions       = changeFileAreaWithOptions;
+exports.scanFile                        = scanFile;
+exports.scanFileAreaForChanges          = scanFileAreaForChanges;
+exports.getDescFromFileName             = getDescFromFileName;
+exports.getAreaStats                    = getAreaStats;
+exports.cleanUpTempSessionItems         = cleanUpTempSessionItems;
 
-//	for scheduler:
-exports.updateAreaStatsScheduledEvent	= updateAreaStatsScheduledEvent;
+//  for scheduler:
+exports.updateAreaStatsScheduledEvent   = updateAreaStatsScheduledEvent;
 
-const WellKnownAreaTags					= exports.WellKnownAreaTags = {
-    Invalid				: '',
-    MessageAreaAttach	: 'system_message_attachment',
-    TempDownloads		: 'system_temporary_download',
+const WellKnownAreaTags                 = exports.WellKnownAreaTags = {
+    Invalid             : '',
+    MessageAreaAttach   : 'system_message_attachment',
+    TempDownloads       : 'system_temporary_download',
 };
 
 function startup(cb) {
@@ -65,7 +65,7 @@ function isInternalArea(areaTag) {
 function getAvailableFileAreas(client, options) {
     options = options || { };
 
-    //	perform ACS check per conf & omit internal if desired
+    //  perform ACS check per conf & omit internal if desired
     const allAreas = _.map(Config().fileBase.areas, (areaInfo, areaTag) => Object.assign(areaInfo, { areaTag : areaTag } ));
 
     return _.omitBy(allAreas, areaInfo => {
@@ -74,11 +74,11 @@ function getAvailableFileAreas(client, options) {
         }
 
         if(options.skipAcsCheck) {
-            return false;	//	no ACS checks (below)
+            return false;   //  no ACS checks (below)
         }
 
         if(options.writeAcs && !client.acs.hasFileAreaWrite(areaInfo)) {
-            return true;	//	omit
+            return true;    //  omit
         }
 
         return !client.acs.hasFileAreaRead(areaInfo);
@@ -116,8 +116,8 @@ function getDefaultFileAreaTag(client, disableAcsCheck) {
 function getFileAreaByTag(areaTag) {
     const areaInfo = Config().fileBase.areas[areaTag];
     if(areaInfo) {
-        areaInfo.areaTag	= areaTag;	//	convienence!
-        areaInfo.storage	= getAreaStorageLocations(areaInfo);
+        areaInfo.areaTag    = areaTag;  //  convienence!
+        areaInfo.storage    = getAreaStorageLocations(areaInfo);
         return areaInfo;
     }
 }
@@ -183,8 +183,8 @@ function getAreaStorageLocations(areaInfo) {
     return _.compact(storageTags.map(storageTag => {
         if(avail[storageTag]) {
             return {
-                storageTag	: storageTag,
-                dir			: getAreaStorageDirectoryByTag(storageTag),
+                storageTag  : storageTag,
+                dir         : getAreaStorageDirectoryByTag(storageTag),
             };
         }
     }));
@@ -202,14 +202,14 @@ function getExistingFileEntriesBySha256(sha256, cb) {
 
     FileDb.each(
         `SELECT file_id, area_tag
-		FROM file
-		WHERE file_sha256=?;`,
+        FROM file
+        WHERE file_sha256=?;`,
         [ sha256 ],
         (err, fileRow) => {
             if(fileRow) {
                 entries.push({
-                    fileId	: fileRow.file_id,
-                    areaTag	: fileRow.area_tag,
+                    fileId  : fileRow.file_id,
+                    areaTag : fileRow.area_tag,
                 });
             }
         },
@@ -219,10 +219,10 @@ function getExistingFileEntriesBySha256(sha256, cb) {
     );
 }
 
-//	:TODO: This is bascially sliceAtEOF() from art.js .... DRY!
+//  :TODO: This is bascially sliceAtEOF() from art.js .... DRY!
 function sliceAtSauceMarker(data) {
-    let eof			= data.length;
-    const stopPos	= Math.max(data.length - (256), 0);	//	256 = 2 * sizeof(SAUCE)
+    let eof         = data.length;
+    const stopPos   = Math.max(data.length - (256), 0); //  256 = 2 * sizeof(SAUCE)
 
     for(let i = eof - 1; i > stopPos; i--) {
         if(0x1a === data[i]) {
@@ -234,8 +234,8 @@ function sliceAtSauceMarker(data) {
 }
 
 function attemptSetEstimatedReleaseDate(fileEntry) {
-    //	:TODO: yearEstPatterns RegExp's should be cached - we can do this @ Config (re)load time
-    const patterns	= Config().fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
+    //  :TODO: yearEstPatterns RegExp's should be cached - we can do this @ Config (re)load time
+    const patterns  = Config().fileBase.yearEstPatterns.map( p => new RegExp(p, 'gmi'));
 
     function getMatch(input) {
         if(input) {
@@ -250,10 +250,10 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
     }
 
     //
-    //	We attempt detection in short -> long order
+    //  We attempt detection in short -> long order
     //
-    //	Throw out anything that is current_year + 2 (we give some leway)
-    //	with the assumption that must be wrong.
+    //  Throw out anything that is current_year + 2 (we give some leway)
+    //  with the assumption that must be wrong.
     //
     const maxYear = moment().add(2, 'year').year();
     const match = getMatch(fileEntry.desc) || getMatch(fileEntry.descLong);
@@ -279,7 +279,7 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
     }
 }
 
-//	a simple log proxy for when we call from oputil.js
+//  a simple log proxy for when we call from oputil.js
 function logDebug(obj, msg) {
     if(Log) {
         Log.debug(obj, msg);
@@ -290,8 +290,8 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
     async.waterfall(
         [
             function extractDescFiles(callback) {
-                //	:TODO: would be nice if these RegExp's were cached
-                //	:TODO: this is long winded...
+                //  :TODO: would be nice if these RegExp's were cached
+                //  :TODO: this is long winded...
                 const config = Config();
                 const extractList = [];
 
@@ -327,8 +327,8 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                         }
 
                         const descFiles = {
-                            desc		: shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
-                            descLong	: longDescFile ? paths.join(tempDir, longDescFile.fileName) : null,
+                            desc        : shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
+                            descLong    : longDescFile ? paths.join(tempDir, longDescFile.fileName) : null,
                         };
 
                         return callback(null, descFiles);
@@ -348,7 +348,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                             return next(null);
                         }
 
-                        //	skip entries that are too large
+                        //  skip entries that are too large
                         const maxFileSizeKey = `max${_.upperFirst(descType)}FileByteSize`;
                         if(config.fileBase[maxFileSizeKey] && stats.size > config.fileBase[maxFileSizeKey]) {
                             logDebug( { byteSize : stats.size, maxByteSize : config.fileBase[maxFileSizeKey] }, `Skipping "${descType}"; Too large` );
@@ -361,18 +361,18 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                             }
 
                             //
-                            //	Assume FILE_ID.DIZ, NFO files, etc. are CP437.
+                            //  Assume FILE_ID.DIZ, NFO files, etc. are CP437.
                             //
-                            //	:TODO: This isn't really always the case - how to handle this? We could do a quick detection...
-                            fileEntry[descType]			= iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
-                            fileEntry[`${descType}Src`]	= 'descFile';
+                            //  :TODO: This isn't really always the case - how to handle this? We could do a quick detection...
+                            fileEntry[descType]         = iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
+                            fileEntry[`${descType}Src`] = 'descFile';
                             return next(null);
                         });
                     });
                 }, () => {
-                    //	cleanup but don't wait
+                    //  cleanup but don't wait
                     temptmp.cleanup( paths => {
-                        //	note: don't use client logger here - may not be avail
+                        //  note: don't use client logger here - may not be avail
                         logDebug( { paths : paths, sessionId : temptmp.sessionId }, 'Cleaned up temporary files' );
                     });
                     return callback(null);
@@ -390,7 +390,7 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
     async.waterfall(
         [
             function extractToTemp(callback) {
-                //	:TODO: we may want to skip this if the compressed file is too large...
+                //  :TODO: we may want to skip this if the compressed file is too large...
                 temptmp.mkdir( { prefix : 'enigextract-' }, (err, tempDir) => {
                     if(err) {
                         return callback(err);
@@ -398,7 +398,7 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
 
                     const archiveUtil = ArchiveUtil.getInstance();
 
-                    //	ensure we only extract one - there should only be one anyway -- we also just need the fileName
+                    //  ensure we only extract one - there should only be one anyway -- we also just need the fileName
                     const extractList = archiveEntries.slice(0, 1).map(entry => entry.fileName);
 
                     archiveUtil.extractTo(filePath, tempDir, fileEntry.meta.archive_type, extractList, err => {
@@ -413,8 +413,8 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
             function processSingleExtractedFile(extractedFile, callback) {
                 populateFileEntryInfoFromFile(fileEntry, extractedFile, err => {
                     if(!fileEntry.desc) {
-                        fileEntry.desc		= getDescFromFileName(filePath);
-                        fileEntry.descSrc	= 'fileName';
+                        fileEntry.desc      = getDescFromFileName(filePath);
+                        fileEntry.descSrc   = 'fileName';
                     }
                     return callback(err);
                 });
@@ -427,8 +427,8 @@ function extractAndProcessSingleArchiveEntry(fileEntry, filePath, archiveEntries
 }
 
 function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, cb) {
-    const archiveUtil 	= ArchiveUtil.getInstance();
-    const archiveType	= fileEntry.meta.archive_type;	//	we set this previous to populateFileEntryWithArchive()
+    const archiveUtil   = ArchiveUtil.getInstance();
+    const archiveType   = fileEntry.meta.archive_type;  //  we set this previous to populateFileEntryWithArchive()
 
     async.waterfall(
         [
@@ -449,7 +449,7 @@ function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, c
                         }
 
                         iterator(iterErr => {
-                            return callback( iterErr, entries || [] );	//	ignore original |err| here
+                            return callback( iterErr, entries || [] );  //  ignore original |err| here
                         });
                     });
                 });
@@ -462,12 +462,12 @@ function populateFileEntryWithArchive(fileEntry, filePath, stepInfo, iterator, c
             },
             function extractDescFromArchive(entries, callback) {
                 //
-                //	If we have a -single- entry in the archive, extract that file
-                //	and try retrieving info in the non-archive manor. This should
-                //	work for things like zipped up .pdf files.
+                //  If we have a -single- entry in the archive, extract that file
+                //  and try retrieving info in the non-archive manor. This should
+                //  work for things like zipped up .pdf files.
                 //
-                //	Otherwise, try to find particular desc files such as FILE_ID.DIZ
-                //	and README.1ST
+                //  Otherwise, try to find particular desc files such as FILE_ID.DIZ
+                //  and README.1ST
                 //
                 const archDescHandler = (1 === entries.length) ? extractAndProcessSingleArchiveEntry : extractAndProcessDescFiles;
                 archDescHandler(fileEntry, filePath, entries, err => {
@@ -494,7 +494,7 @@ function getInfoExtractUtilForDesc(mimeType, filePath, descType) {
     let fileType = _.get(config, [ 'fileTypes', mimeType ] );
 
     if(Array.isArray(fileType)) {
-        //	further refine by extention
+        //  further refine by extention
         fileType = fileType.find(ft => paths.extname(filePath) === ft.ext);
     }
 
@@ -542,17 +542,17 @@ function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
                     const key = 'short' === descType ? 'desc' : 'descLong';
                     if('desc' === key) {
                         //
-                        //	Word wrap short descriptions to FILE_ID.DIZ spec
+                        //  Word wrap short descriptions to FILE_ID.DIZ spec
                         //
-                        //	"...no more than 45 characters long"
+                        //  "...no more than 45 characters long"
                         //
-                        //	See http://www.textfiles.com/computers/fileid.txt
+                        //  See http://www.textfiles.com/computers/fileid.txt
                         //
                         stdout = (wordWrapText( stdout, { width : 45 } ).wrapped || []).join('\n');
                     }
 
-                    fileEntry[key]			= stdout;
-                    fileEntry[`${key}Src`]	= 'infoTool';
+                    fileEntry[key]          = stdout;
+                    fileEntry[`${key}Src`]  = 'infoTool';
                 }
             }
 
@@ -574,8 +574,8 @@ function populateFileEntryNonArchive(fileEntry, filePath, stepInfo, iterator, cb
             function getDescriptions(callback) {
                 populateFileEntryInfoFromFile(fileEntry, filePath, err => {
                     if(!fileEntry.desc) {
-                        fileEntry.desc		= getDescFromFileName(filePath);
-                        fileEntry.descSrc	= 'fileName';
+                        fileEntry.desc      = getDescFromFileName(filePath);
+                        fileEntry.descSrc   = 'fileName';
                     }
                     return callback(err);
                 });
@@ -592,7 +592,7 @@ function populateFileEntryNonArchive(fileEntry, filePath, stepInfo, iterator, cb
 }
 
 function addNewFileEntry(fileEntry, filePath, cb) {
-    //	:TODO: Use detectTypeWithBuf() once avail - we *just* read some file data
+    //  :TODO: Use detectTypeWithBuf() once avail - we *just* read some file data
 
     async.series(
         [
@@ -611,26 +611,26 @@ const HASH_NAMES =  [ 'sha1', 'sha256', 'md5', 'crc32' ];
 function scanFile(filePath, options, iterator, cb) {
 
     if(3 === arguments.length && _.isFunction(iterator)) {
-        cb			= iterator;
-        iterator	= null;
+        cb          = iterator;
+        iterator    = null;
     } else if(2 === arguments.length && _.isFunction(options)) {
-        cb			= options;
-        iterator	= null;
-        options		= {};
+        cb          = options;
+        iterator    = null;
+        options     = {};
     }
 
     const fileEntry = new FileEntry({
-        areaTag		: options.areaTag,
-        meta		: options.meta,
-        hashTags	: options.hashTags,	//	Set() or Array
-        fileName	: paths.basename(filePath),
-        storageTag	: options.storageTag,
-        fileSha256	: options.sha256,	//	caller may know this already
+        areaTag     : options.areaTag,
+        meta        : options.meta,
+        hashTags    : options.hashTags, //  Set() or Array
+        fileName    : paths.basename(filePath),
+        storageTag  : options.storageTag,
+        fileSha256  : options.sha256,   //  caller may know this already
     });
 
     const stepInfo = {
-        filePath	: filePath,
-        fileName	: paths.basename(filePath),
+        filePath    : filePath,
+        fileName    : paths.basename(filePath),
     };
 
     const callIter = (next) => {
@@ -638,8 +638,8 @@ function scanFile(filePath, options, iterator, cb) {
     };
 
     const readErrorCallIter = (origError, next) => {
-        stepInfo.step	= 'read_error';
-        stepInfo.error	= origError.message;
+        stepInfo.step   = 'read_error';
+        stepInfo.error  = origError.message;
 
         callIter( () => {
             return next(origError);
@@ -648,7 +648,7 @@ function scanFile(filePath, options, iterator, cb) {
 
     let lastCalcHashPercent;
 
-    //	don't re-calc hashes for any we already have in |options|
+    //  don't re-calc hashes for any we already have in |options|
     const hashesToCalc = HASH_NAMES.filter(hn =>  {
         if('sha256' === hn && fileEntry.fileSha256) {
             return false;
@@ -669,8 +669,8 @@ function scanFile(filePath, options, iterator, cb) {
                         return readErrorCallIter(err, callback);
                     }
 
-                    stepInfo.step		= 'start';
-                    stepInfo.byteSize	= fileEntry.meta.byte_size = stats.size;
+                    stepInfo.step       = 'start';
+                    stepInfo.byteSize   = fileEntry.meta.byte_size = stats.size;
 
                     return callIter(callback);
                 });
@@ -694,9 +694,9 @@ function scanFile(filePath, options, iterator, cb) {
                 };
 
                 //
-                //	Note that we are not using fs.createReadStream() here:
-                //	While convenient, it is quite a bit slower -- which adds
-                //	up to many seconds in time for larger files.
+                //  Note that we are not using fs.createReadStream() here:
+                //  While convenient, it is quite a bit slower -- which adds
+                //  up to many seconds in time for larger files.
                 //
                 const chunkSize = 1024 * 64;
                 const buffer = new Buffer(chunkSize);
@@ -714,7 +714,7 @@ function scanFile(filePath, options, iterator, cb) {
                             }
 
                             if(0 === bytesRead) {
-                                //	done - finalize
+                                //  done - finalize
                                 fileEntry.meta.byte_size = stepInfo.bytesProcessed;
 
                                 for(let i = 0; i < hashesToCalc.length; ++i) {
@@ -733,11 +733,11 @@ function scanFile(filePath, options, iterator, cb) {
                                 return callIter(callback);
                             }
 
-                            stepInfo.bytesProcessed		+= bytesRead;
-                            stepInfo.calcHashPercent	= Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
+                            stepInfo.bytesProcessed     += bytesRead;
+                            stepInfo.calcHashPercent    = Math.round(((stepInfo.bytesProcessed / stepInfo.byteSize) * 100));
 
                             //
-                            //	Only send 'hash_update' step update if we have a noticable percentage change in progress
+                            //  Only send 'hash_update' step update if we have a noticable percentage change in progress
                             //
                             const data = bytesRead < chunkSize ? buffer.slice(0, bytesRead) : buffer;
                             if(!iterator || stepInfo.calcHashPercent === lastCalcHashPercent) {
@@ -745,7 +745,7 @@ function scanFile(filePath, options, iterator, cb) {
                                 return nextChunk();
                             } else {
                                 lastCalcHashPercent = stepInfo.calcHashPercent;
-                                stepInfo.step		= 'hash_update';
+                                stepInfo.step       = 'hash_update';
 
                                 callIter(err => {
                                     if(err) {
@@ -767,7 +767,7 @@ function scanFile(filePath, options, iterator, cb) {
 
                 archiveUtil.detectType(filePath, (err, archiveType) => {
                     if(archiveType) {
-                        //	save this off
+                        //  save this off
                         fileEntry.meta.archive_type = archiveType;
 
                         populateFileEntryWithArchive(fileEntry, filePath, stepInfo, callIter, err => {
@@ -776,7 +776,7 @@ function scanFile(filePath, options, iterator, cb) {
                                     if(err) {
                                         logDebug( { error : err.message }, 'Non-archive file entry population failed');
                                     }
-                                    return callback(null);	//	ignore err
+                                    return callback(null);  //  ignore err
                                 });
                             } else {
                                 return callback(null);
@@ -787,7 +787,7 @@ function scanFile(filePath, options, iterator, cb) {
                             if(err) {
                                 logDebug( { error : err.message }, 'Non-archive file entry population failed');
                             }
-                            return callback(null);	//	ignore err
+                            return callback(null);  //  ignore err
                         });
                     }
                 });
@@ -816,12 +816,12 @@ function scanFile(filePath, options, iterator, cb) {
 
 function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
     if(3 === arguments.length && _.isFunction(iterator)) {
-        cb			= iterator;
-        iterator	= null;
+        cb          = iterator;
+        iterator    = null;
     } else if(2 === arguments.length && _.isFunction(options)) {
-        cb			= options;
-        iterator	= null;
-        options		= {};
+        cb          = options;
+        iterator    = null;
+        options     = {};
     }
 
     const storageLocations = getAreaStorageLocations(areaInfo);
@@ -842,8 +842,8 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
 
                             fs.stat(fullPath, (err, stats) => {
                                 if(err) {
-                                    //	:TODO: Log me!
-                                    return nextFile(null);	//	always try next file
+                                    //  :TODO: Log me!
+                                    return nextFile(null);  //  always try next file
                                 }
 
                                 if(!stats.isFile()) {
@@ -853,18 +853,18 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
                                 scanFile(
                                     fullPath,
                                     {
-                                        areaTag		: areaInfo.areaTag,
-                                        storageTag	: storageLoc.storageTag
+                                        areaTag     : areaInfo.areaTag,
+                                        storageTag  : storageLoc.storageTag
                                     },
                                     iterator,
                                     (err, fileEntry, dupeEntries) => {
                                         if(err) {
-                                            //	:TODO: Log me!!!
-                                            return nextFile(null);	//	try next anyway
+                                            //  :TODO: Log me!!!
+                                            return nextFile(null);  //  try next anyway
                                         }
 
                                         if(dupeEntries.length > 0) {
-                                            //	:TODO: Handle duplidates -- what to do here???
+                                            //  :TODO: Handle duplidates -- what to do here???
                                         } else {
                                             if(Array.isArray(options.tags)) {
                                                 options.tags.forEach(tag => {
@@ -872,7 +872,7 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
                                                 });
                                             }
                                             addNewFileEntry(fileEntry, fullPath, err => {
-                                                //	pass along error; we failed to insert a record in our DB or something else bad
+                                                //  pass along error; we failed to insert a record in our DB or something else bad
                                                 return nextFile(err);
                                             });
                                         }
@@ -885,7 +885,7 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
                     });
                 },
                 function scanDbEntries(callback) {
-                    //	:TODO: Look @ db entries for area that were *not* processed above
+                    //  :TODO: Look @ db entries for area that were *not* processed above
                     return callback(null);
                 }
             ],
@@ -900,7 +900,7 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
 }
 
 function getDescFromFileName(fileName) {
-    //	:TODO: this method could use some more logic to really be nice.
+    //  :TODO: this method could use some more logic to really be nice.
     const ext   = paths.extname(fileName);
     const name  = paths.basename(fileName, ext);
 
@@ -908,26 +908,26 @@ function getDescFromFileName(fileName) {
 }
 
 //
-//	Return an object of stats about an area(s)
+//  Return an object of stats about an area(s)
 //
-//	{
+//  {
 //
-//		totalFiles : <totalFileCount>,
-//		totalBytes : <totalByteSize>,
-//		areas : {
-//			<areaTag> : {
-//				files : <fileCount>,
-//				bytes : <byteSize>
-//			}
-//		}
-//	}
+//      totalFiles : <totalFileCount>,
+//      totalBytes : <totalByteSize>,
+//      areas : {
+//          <areaTag> : {
+//              files : <fileCount>,
+//              bytes : <byteSize>
+//          }
+//      }
+//  }
 //
 function getAreaStats(cb) {
     FileDb.all(
         `SELECT DISTINCT f.area_tag, COUNT(f.file_id) AS total_files, SUM(m.meta_value) AS total_byte_size
-		FROM file f, file_meta m
-		WHERE f.file_id = m.file_id AND m.meta_name='byte_size'
-		GROUP BY f.area_tag;`,
+        FROM file f, file_meta m
+        WHERE f.file_id = m.file_id AND m.meta_name='byte_size'
+        GROUP BY f.area_tag;`,
         (err, statRows) => {
             if(err) {
                 return cb(err);
@@ -946,8 +946,8 @@ function getAreaStats(cb) {
                     stats.areas = stats.areas || {};
 
                     stats.areas[v.area_tag] = {
-                        files 	: v.total_files,
-                        bytes	: v.total_byte_size,
+                        files   : v.total_files,
+                        bytes   : v.total_byte_size,
                     };
                     return stats;
                 }, {})
@@ -956,7 +956,7 @@ function getAreaStats(cb) {
     );
 }
 
-//	method exposed for event scheduler
+//  method exposed for event scheduler
 function updateAreaStatsScheduledEvent(args, cb) {
     getAreaStats( (err, stats) => {
         if(!err) {
@@ -968,13 +968,13 @@ function updateAreaStatsScheduledEvent(args, cb) {
 }
 
 function cleanUpTempSessionItems(cb) {
-    //	find (old) temporary session items and nuke 'em
+    //  find (old) temporary session items and nuke 'em
     const filter = {
-        areaTag 	: WellKnownAreaTags.TempDownloads,
-        metaPairs	: [
+        areaTag     : WellKnownAreaTags.TempDownloads,
+        metaPairs   : [
             {
-                name	: 'session_temp_dl',
-                value	: 1
+                name    : 'session_temp_dl',
+                value   : 1
             }
         ]
     };
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index bdca4e72..1b77eb21 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -1,22 +1,22 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule						= require('./menu_module.js').MenuModule;
-const { getSortedAvailableFileAreas }	= require('./file_base_area.js');
-const StatLog							= require('./stat_log.js');
+//  enigma-bbs
+const MenuModule                        = require('./menu_module.js').MenuModule;
+const { getSortedAvailableFileAreas }   = require('./file_base_area.js');
+const StatLog                           = require('./stat_log.js');
 
-//	deps
-const async								= require('async');
+//  deps
+const async                             = require('async');
 
 exports.moduleInfo = {
-    name	: 'File Area Selector',
-    desc	: 'Select from available file areas',
-    author	: 'NuSkooler',
+    name    : 'File Area Selector',
+    desc    : 'Select from available file areas',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
-    areaList	: 1,
+    areaList    : 1,
 };
 
 exports.getModule = class FileAreaSelectModule extends MenuModule {
@@ -26,14 +26,14 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
         this.menuMethods = {
             selectArea : (formData, extraArgs, cb) => {
                 const filterCriteria = {
-                    areaTag		: formData.value.areaTag,
+                    areaTag     : formData.value.areaTag,
                 };
 
                 const menuOpts = {
-                    extraArgs	: {
-                        filterCriteria	: filterCriteria,
+                    extraArgs   : {
+                        filterCriteria  : filterCriteria,
                     },
-                    menuFlags	: [ 'popParent', 'mergeFlags' ],
+                    menuFlags   : [ 'popParent', 'mergeFlags' ],
                 };
 
                 return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
@@ -54,12 +54,12 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
                     function mergeAreaStats(callback) {
                         const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
 
-                        //	we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
+                        //  we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
                         const availAreas = getSortedAvailableFileAreas(self.client);
                         availAreas.forEach(area => {
                             const stats = areaStats.areas[area.areaTag];
                             area.totalFiles = stats ? stats.files : 0;
-                            area.totalBytes	= stats ? stats.bytes : 0;
+                            area.totalBytes = stats ? stats.bytes : 0;
                         });
 
                         return callback(null, availAreas);
diff --git a/core/file_base_download_manager.js b/core/file_base_download_manager.js
index fc7672d0..f590ebd3 100644
--- a/core/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const DownloadQueue			= require('./download_queue.js');
-const theme					= require('./theme.js');
-const ansi					= require('./ansi_term.js');
-const Errors				= require('./enig_error.js').Errors;
-const stringFormat			= require('./string_format.js');
-const FileAreaWeb			= require('./file_area_web.js');
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const DownloadQueue         = require('./download_queue.js');
+const theme                 = require('./theme.js');
+const ansi                  = require('./ansi_term.js');
+const Errors                = require('./enig_error.js').Errors;
+const stringFormat          = require('./string_format.js');
+const FileAreaWeb           = require('./file_area_web.js');
 
-//	deps
-const async					= require('async');
-const _						= require('lodash');
-const moment				= require('moment');
+//  deps
+const async                 = require('async');
+const _                     = require('lodash');
+const moment                = require('moment');
 
 exports.moduleInfo = {
-    name		: 'File Base Download Queue Manager',
-    desc		: 'Module for interacting with download queue/batch',
-    author		: 'NuSkooler',
+    name        : 'File Base Download Queue Manager',
+    desc        : 'Module for interacting with download queue/batch',
+    author      : 'NuSkooler',
 };
 
 const FormIds = {
-    queueManager	: 0,
+    queueManager    : 0,
 };
 
 const MciViewIds = {
     queueManager : {
-        queue				: 1,
-        navMenu				: 2,
+        queue               : 1,
+        navMenu             : 2,
 
-        customRangeStart	: 10,
+        customRangeStart    : 10,
     },
 };
 
@@ -52,8 +52,8 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
             downloadAll : (formData, extraArgs, cb) => {
                 const modOpts = {
                     extraArgs : {
-                        sendQueue 	: this.dlQueue.items,
-                        direction	: 'send',
+                        sendQueue   : this.dlQueue.items,
+                        direction   : 'send',
                     }
                 };
 
@@ -67,13 +67,13 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
 
                 this.dlQueue.removeItems(selectedItem.fileId);
 
-                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                //  :TODO: broken: does not redraw menu properly - needs fixed!
                 return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
             },
             clearQueue : (formData, extraArgs, cb) => {
                 this.dlQueue.clear();
 
-                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                //  :TODO: broken: does not redraw menu properly - needs fixed!
                 return this.removeItemsFromDownloadQueueView('all', cb);
             }
         };
@@ -82,11 +82,11 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
     initSequence() {
         if(0 === this.dlQueue.items.length) {
             if(this.sendFileIds) {
-                //	we've finished everything up - just fall back
+                //  we've finished everything up - just fall back
                 return this.prevMenu();
             }
 
-            //	Simply an empty D/L queue: Present a specialized "empty queue" page
+            //  Simply an empty D/L queue: Present a specialized "empty queue" page
             return this.gotoMenu(this.menuConfig.config.emptyQueueMenu || 'fileBaseDownloadManagerEmptyQueue');
         }
 
@@ -129,11 +129,11 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
             if(serveItem && serveItem.url) {
                 const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
-                fileEntry.webDlLink 	= ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
-                fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+                fileEntry.webDlLink     = ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
+                fileEntry.webDlExpire   = moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
             } else {
-                fileEntry.webDlLink		= '';
-                fileEntry.webDlExpire	= '';
+                fileEntry.webDlLink     = '';
+                fileEntry.webDlExpire   = '';
             }
 
             this.updateCustomViewTextsWithFilter(
@@ -150,8 +150,8 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
             return cb(Errors.DoesNotExist('Queue view does not exist'));
         }
 
-        const queueListFormat		= this.menuConfig.config.queueListFormat || '{fileName} {byteSize}';
-        const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
+        const queueListFormat       = this.menuConfig.config.queueListFormat || '{fileName} {byteSize}';
+        const focusQueueListFormat  = this.menuConfig.config.focusQueueListFormat || queueListFormat;
 
         queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
         queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
@@ -188,8 +188,8 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
     }
 
     displayArtAndPrepViewController(name, options, cb) {
-        const self		= this;
-        const config	= this.menuConfig.config;
+        const self      = this;
+        const config    = this.menuConfig.config;
 
         async.waterfall(
             [
@@ -210,8 +210,8 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
                 function prepeareViewController(artData, callback) {
                     if(_.isUndefined(self.viewControllers[name])) {
                         const vcOpts = {
-                            client		: self.client,
-                            formId		: FormIds[name],
+                            client      : self.client,
+                            formId      : FormIds[name],
                         };
 
                         if(!_.isUndefined(options.noInput)) {
@@ -221,9 +221,9 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
                         const vc = self.addViewController(name, new ViewController(vcOpts));
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds[name],
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds[name],
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index 9a22051f..82a75986 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -1,13 +1,13 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const _						= require('lodash');
-const uuidV4				= require('uuid/v4');
+//  deps
+const _                     = require('lodash');
+const uuidV4                = require('uuid/v4');
 
 module.exports = class FileBaseFilters {
     constructor(client) {
-        this.client	= client;
+        this.client = client;
 
         this.load();
     }
@@ -74,7 +74,7 @@ module.exports = class FileBaseFilters {
         try {
             this.filters = JSON.parse(filtersProperty);
         } catch(e) {
-            this.filters = FileBaseFilters.getBuiltInSystemFilters();	//	something bad happened; reset everything back to defaults :(
+            this.filters = FileBaseFilters.getBuiltInSystemFilters();   //  something bad happened; reset everything back to defaults :(
             defaulted = true;
             this.client.log.error( { error : e.message, property : filtersProperty }, 'Failed parsing file base filters property' );
         }
@@ -110,18 +110,18 @@ module.exports = class FileBaseFilters {
     }
 
     static getBuiltInSystemFilters() {
-        const U_LATEST	= '7458b09d-40ab-4f9b-a0d7-0cf866646329';
+        const U_LATEST  = '7458b09d-40ab-4f9b-a0d7-0cf866646329';
 
         const filters = {
             [ U_LATEST ] : {
-                name	: 'By Date Added',
-                areaTag	: '',	//	all
-                terms	: '',	//	*
-                tags	: '',	//	*
-                order	: 'descending',
-                sort	: 'upload_timestamp',
-                uuid	: U_LATEST,
-                system	: true,
+                name    : 'By Date Added',
+                areaTag : '',   //  all
+                terms   : '',   //  *
+                tags    : '',   //  *
+                order   : 'descending',
+                sort    : 'upload_timestamp',
+                uuid    : U_LATEST,
+                system  : true,
             }
         };
 
diff --git a/core/file_base_list_export.js b/core/file_base_list_export.js
index b66e04db..5c4991f3 100644
--- a/core/file_base_list_export.js
+++ b/core/file_base_list_export.js
@@ -1,46 +1,46 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const stringFormat		= require('./string_format.js');
-const FileEntry			= require('./file_entry.js');
-const FileArea			= require('./file_base_area.js');
-const Config			= require('./config.js').get;
-const { Errors }		= require('./enig_error.js');
+//  ENiGMA½
+const stringFormat      = require('./string_format.js');
+const FileEntry         = require('./file_entry.js');
+const FileArea          = require('./file_base_area.js');
+const Config            = require('./config.js').get;
+const { Errors }        = require('./enig_error.js');
 const {
     splitTextAtTerms,
     isAnsi,
-}						= require('./string_util.js');
-const AnsiPrep			= require('./ansi_prep.js');
-const Log				= require('./logger.js').log;
+}                       = require('./string_util.js');
+const AnsiPrep          = require('./ansi_prep.js');
+const Log               = require('./logger.js').log;
 
-//	deps
-const _					= require('lodash');
-const async				= require('async');
-const fs				= require('graceful-fs');
-const paths				= require('path');
-const iconv				= require('iconv-lite');
-const moment			= require('moment');
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
+const fs                = require('graceful-fs');
+const paths             = require('path');
+const iconv             = require('iconv-lite');
+const moment            = require('moment');
 
-exports.exportFileList							= exportFileList;
-exports.updateFileBaseDescFilesScheduledEvent	= updateFileBaseDescFilesScheduledEvent;
+exports.exportFileList                          = exportFileList;
+exports.updateFileBaseDescFilesScheduledEvent   = updateFileBaseDescFilesScheduledEvent;
 
 function exportFileList(filterCriteria, options, cb) {
-    options.templateEncoding	= options.templateEncoding || 'utf8';
-    options.entryTemplate		= options.entryTemplate || 'descript_ion_export_entry_template.asc';
-    options.tsFormat			= options.tsFormat || 'YYYY-MM-DD';
-    options.descWidth			= options.descWidth || 45;	//	FILE_ID.DIZ spec
-    options.escapeDesc			= _.get(options, 'escapeDesc', false);	//	escape \r and \n in desc?
+    options.templateEncoding    = options.templateEncoding || 'utf8';
+    options.entryTemplate       = options.entryTemplate || 'descript_ion_export_entry_template.asc';
+    options.tsFormat            = options.tsFormat || 'YYYY-MM-DD';
+    options.descWidth           = options.descWidth || 45;  //  FILE_ID.DIZ spec
+    options.escapeDesc          = _.get(options, 'escapeDesc', false);  //  escape \r and \n in desc?
 
     if(true === options.escapeDesc) {
         options.escapeDesc = '\\n';
     }
 
     const state = {
-        total	: 0,
-        current	: 0,
-        step	: 'preparing',
-        status	: 'Preparing',
+        total   : 0,
+        current : 0,
+        step    : 'preparing',
+        status  : 'Preparing',
     };
 
     const updateProgress = _.isFunction(options.progress) ?
@@ -50,7 +50,7 @@ function exportFileList(filterCriteria, options, cb) {
         progCb => {
             return progCb(null);
         }
-		;
+        ;
 
     async.waterfall(
         [
@@ -61,8 +61,8 @@ function exportFileList(filterCriteria, options, cb) {
                     }
 
                     const templateFiles = [
-                        { name : options.headerTemplate,	req : false },
-                        { name : options.entryTemplate,		req : true }
+                        { name : options.headerTemplate,    req : false },
+                        { name : options.entryTemplate,     req : true }
                     ];
 
                     const config = Config();
@@ -80,19 +80,19 @@ function exportFileList(filterCriteria, options, cb) {
                             return callback(Errors.General(err.message));
                         }
 
-                        //	decode + ensure DOS style CRLF
+                        //  decode + ensure DOS style CRLF
                         templates = templates.map(tmp => iconv.decode(tmp, options.templateEncoding).replace(/\r?\n/g, '\r\n') );
 
-                        //	Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
+                        //  Look for the first {fileDesc} (if any) in 'entry' template & find indentation requirements
                         let descIndent = 0;
                         if(!options.escapeDesc) {
                             splitTextAtTerms(templates[1]).some(line => {
                                 const pos = line.indexOf('{fileDesc}');
                                 if(pos > -1) {
                                     descIndent = pos;
-                                    return true;	//	found it!
+                                    return true;    //  found it!
                                 }
-                                return false;	//	keep looking
+                                return false;   //  keep looking
                             });
                         }
 
@@ -101,8 +101,8 @@ function exportFileList(filterCriteria, options, cb) {
                 });
             },
             function findFiles(headerTemplate, entryTemplate, descIndent, callback) {
-                state.step		= 'gathering';
-                state.status	= 'Gathering files for supplied criteria';
+                state.step      = 'gathering';
+                state.status    = 'Gathering files for supplied criteria';
                 updateProgress(err => {
                     if(err) {
                         return callback(err);
@@ -119,15 +119,15 @@ function exportFileList(filterCriteria, options, cb) {
             },
             function buildListEntries(headerTemplate, entryTemplate, descIndent, fileIds, callback) {
                 const formatObj = {
-                    totalFileCount	: fileIds.length,
+                    totalFileCount  : fileIds.length,
                 };
 
-                let current		= 0;
-                let listBody	= '';
-                const totals	= { fileCount : fileIds.length, bytes : 0 };
-                state.total		= fileIds.length;
+                let current     = 0;
+                let listBody    = '';
+                const totals    = { fileCount : fileIds.length, bytes : 0 };
+                state.total     = fileIds.length;
 
-                state.step		= 'file';
+                state.step      = 'file';
 
                 async.eachSeries(fileIds, (fileId, nextFileId) => {
                     const fileInfo = new FileEntry();
@@ -135,7 +135,7 @@ function exportFileList(filterCriteria, options, cb) {
 
                     fileInfo.load(fileId, err => {
                         if(err) {
-                            return nextFileId(null);	//	failed, but try the next
+                            return nextFileId(null);    //  failed, but try the next
                         }
 
                         totals.bytes += fileInfo.meta.byte_size;
@@ -151,9 +151,9 @@ function exportFileList(filterCriteria, options, cb) {
 
                             listBody += stringFormat(entryTemplate, formatObj);
 
-                            state.current	= current;
-                            state.status	= `Processing ${fileInfo.fileName}`;
-                            state.fileInfo	= formatObj;
+                            state.current   = current;
+                            state.status    = `Processing ${fileInfo.fileName}`;
+                            state.fileInfo  = formatObj;
 
                             updateProgress(err => {
                                 return nextFileId(err);
@@ -162,33 +162,33 @@ function exportFileList(filterCriteria, options, cb) {
 
                         const area = FileArea.getFileAreaByTag(fileInfo.areaTag);
 
-                        formatObj.fileId		= fileId;
-                        formatObj.areaName		= _.get(area, 'name') || 'N/A';
-                        formatObj.areaDesc		= _.get(area, 'desc') || 'N/A';
-                        formatObj.userRating	= fileInfo.userRating || 0;
-                        formatObj.fileName		= fileInfo.fileName;
-                        formatObj.fileSize		= fileInfo.meta.byte_size;
-                        formatObj.fileDesc		= fileInfo.desc || '';
-                        formatObj.fileDescShort	= formatObj.fileDesc.slice(0, options.descWidth);
-                        formatObj.fileSha256	= fileInfo.fileSha256;
-                        formatObj.fileCrc32		= fileInfo.meta.file_crc32;
-                        formatObj.fileMd5		= fileInfo.meta.file_md5;
-                        formatObj.fileSha1		= fileInfo.meta.file_sha1;
-                        formatObj.uploadBy		= fileInfo.meta.upload_by_username || 'N/A';
-                        formatObj.fileUploadTs	= moment(fileInfo.uploadTimestamp).format(options.tsFormat);
-                        formatObj.fileHashTags	= fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
-                        formatObj.currentFile	= current;
-                        formatObj.progress		= Math.floor( (current / fileIds.length) * 100 );
+                        formatObj.fileId        = fileId;
+                        formatObj.areaName      = _.get(area, 'name') || 'N/A';
+                        formatObj.areaDesc      = _.get(area, 'desc') || 'N/A';
+                        formatObj.userRating    = fileInfo.userRating || 0;
+                        formatObj.fileName      = fileInfo.fileName;
+                        formatObj.fileSize      = fileInfo.meta.byte_size;
+                        formatObj.fileDesc      = fileInfo.desc || '';
+                        formatObj.fileDescShort = formatObj.fileDesc.slice(0, options.descWidth);
+                        formatObj.fileSha256    = fileInfo.fileSha256;
+                        formatObj.fileCrc32     = fileInfo.meta.file_crc32;
+                        formatObj.fileMd5       = fileInfo.meta.file_md5;
+                        formatObj.fileSha1      = fileInfo.meta.file_sha1;
+                        formatObj.uploadBy      = fileInfo.meta.upload_by_username || 'N/A';
+                        formatObj.fileUploadTs  = moment(fileInfo.uploadTimestamp).format(options.tsFormat);
+                        formatObj.fileHashTags  = fileInfo.hashTags.size > 0 ? Array.from(fileInfo.hashTags).join(', ') : 'N/A';
+                        formatObj.currentFile   = current;
+                        formatObj.progress      = Math.floor( (current / fileIds.length) * 100 );
 
                         if(isAnsi(fileInfo.desc)) {
                             AnsiPrep(
                                 fileInfo.desc,
                                 {
-                                    cols			: Math.min(options.descWidth, 79 - descIndent),
-                                    forceLineTerm	: true,				//	ensure each line is term'd
-                                    asciiMode		: true,				//	export to ASCII
-                                    fillLines		: false,			//	don't fill up to |cols|
-                                    indent			: descIndent,
+                                    cols            : Math.min(options.descWidth, 79 - descIndent),
+                                    forceLineTerm   : true,             //  ensure each line is term'd
+                                    asciiMode       : true,             //  export to ASCII
+                                    fillLines       : false,            //  don't fill up to |cols|
+                                    indent          : descIndent,
                                 },
                                 (err, desc) => {
                                     if(desc) {
@@ -208,29 +208,29 @@ function exportFileList(filterCriteria, options, cb) {
                 });
             },
             function buildHeader(listBody, headerTemplate, totals, callback) {
-                //	header is built last such that we can have totals/etc.
+                //  header is built last such that we can have totals/etc.
 
                 let filterAreaName;
                 let filterAreaDesc;
                 if(filterCriteria.areaTag) {
-                    const area 		= FileArea.getFileAreaByTag(filterCriteria.areaTag);
-                    filterAreaName	= _.get(area, 'name') || 'N/A';
-                    filterAreaDesc	= _.get(area, 'desc') || 'N/A';
+                    const area      = FileArea.getFileAreaByTag(filterCriteria.areaTag);
+                    filterAreaName  = _.get(area, 'name') || 'N/A';
+                    filterAreaDesc  = _.get(area, 'desc') || 'N/A';
                 } else {
-                    filterAreaName	= '-ALL-';
-                    filterAreaDesc	= 'All areas';
+                    filterAreaName  = '-ALL-';
+                    filterAreaDesc  = 'All areas';
                 }
 
                 const headerFormatObj = {
-                    nowTs			: moment().format(options.tsFormat),
-                    boardName		: Config().general.boardName,
-                    totalFileCount	: totals.fileCount,
-                    totalFileSize	: totals.bytes,
-                    filterAreaTag	: filterCriteria.areaTag || '-ALL-',
-                    filterAreaName	: filterAreaName,
-                    filterAreaDesc	: filterAreaDesc,
-                    filterTerms		: filterCriteria.terms || '(none)',
-                    filterHashTags	: filterCriteria.tags || '(none)',
+                    nowTs           : moment().format(options.tsFormat),
+                    boardName       : Config().general.boardName,
+                    totalFileCount  : totals.fileCount,
+                    totalFileSize   : totals.bytes,
+                    filterAreaTag   : filterCriteria.areaTag || '-ALL-',
+                    filterAreaName  : filterAreaName,
+                    filterAreaDesc  : filterAreaDesc,
+                    filterTerms     : filterCriteria.terms || '(none)',
+                    filterHashTags  : filterCriteria.tags || '(none)',
                 };
 
                 listBody = stringFormat(headerTemplate, headerFormatObj) + listBody;
@@ -238,8 +238,8 @@ function exportFileList(filterCriteria, options, cb) {
             },
             function done(listBody, callback) {
                 delete state.fileInfo;
-                state.step 		= 'finished';
-                state.status	= 'Finished processing';
+                state.step      = 'finished';
+                state.status    = 'Finished processing';
                 updateProgress( () => {
                     return callback(null, listBody);
                 });
@@ -252,16 +252,16 @@ function exportFileList(filterCriteria, options, cb) {
 
 function updateFileBaseDescFilesScheduledEvent(args, cb) {
     //
-    //	For each area, loop over storage locations and build
-    //	DESCRIPT.ION file to store in the same directory.
+    //  For each area, loop over storage locations and build
+    //  DESCRIPT.ION file to store in the same directory.
     //
-    //	Standard-ish 4DOS spec is as such:
-    //	* Entry: <QUOTED_LFN> <DESC>[0x04<AppData>]\r\n
-    //	* Multi line descriptions are stored with *escaped* \r\n pairs
-    //	* Default template uses 0x2c for <AppData> as per https://stackoverflow.com/questions/1810398/descript-ion-file-spec
+    //  Standard-ish 4DOS spec is as such:
+    //  * Entry: <QUOTED_LFN> <DESC>[0x04<AppData>]\r\n
+    //  * Multi line descriptions are stored with *escaped* \r\n pairs
+    //  * Default template uses 0x2c for <AppData> as per https://stackoverflow.com/questions/1810398/descript-ion-file-spec
     //
-    const entryTemplate 	= args[0];
-    const headerTemplate	= args[1];
+    const entryTemplate     = args[0];
+    const headerTemplate    = args[1];
 
     const areas = FileArea.getAvailableFileAreas(null, { skipAcsCheck : true });
     async.each(areas, (area, nextArea) => {
@@ -269,15 +269,15 @@ function updateFileBaseDescFilesScheduledEvent(args, cb) {
 
         async.each(storageLocations, (storageLoc, nextStorageLoc) => {
             const filterCriteria = {
-                areaTag		: area.areaTag,
-                storageTag	: storageLoc.storageTag,
+                areaTag     : area.areaTag,
+                storageTag  : storageLoc.storageTag,
             };
 
             const exportOpts = {
-                headerTemplate	: headerTemplate,
-                entryTemplate	: entryTemplate,
-                escapeDesc		: true,	//	escape CRLF's
-                maxDescLen		: 4096,	//	DESCRIPT.ION: "The line length limit is 4096 bytes"
+                headerTemplate  : headerTemplate,
+                entryTemplate   : entryTemplate,
+                escapeDesc      : true, //  escape CRLF's
+                maxDescLen      : 4096, //  DESCRIPT.ION: "The line length limit is 4096 bytes"
             };
 
             exportFileList(filterCriteria, exportOpts, (err, listBody) => {
diff --git a/core/file_base_search.js b/core/file_base_search.js
index 3e754b91..168ed39a 100644
--- a/core/file_base_search.js
+++ b/core/file_base_search.js
@@ -1,30 +1,30 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('./file_base_filter.js');
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas   = require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters               = require('./file_base_filter.js');
 
-//	deps
-const async							= require('async');
+//  deps
+const async                         = require('async');
 
 exports.moduleInfo = {
-    name		: 'File Base Search',
-    desc		: 'Module for quickly searching the file base',
-    author		: 'NuSkooler',
+    name        : 'File Base Search',
+    desc        : 'Module for quickly searching the file base',
+    author      : 'NuSkooler',
 };
 
 const MciViewIds = {
     search : {
-        searchTerms	: 1,
-        search		: 2,
-        tags		: 3,
-        area		: 4,
-        orderBy		: 5,
-        sort		: 6,
-        advSearch	: 7,
+        searchTerms : 1,
+        search      : 2,
+        tags        : 3,
+        area        : 4,
+        orderBy     : 5,
+        sort        : 6,
+        advSearch   : 7,
     }
 };
 
@@ -46,8 +46,8 @@ exports.getModule = class FileBaseSearch extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.addViewController( 'search', new ViewController( { client : this.client } ) );
+            const self  = this;
+            const vc    = self.addViewController( 'search', new ViewController( { client : this.client } ) );
 
             async.series(
                 [
@@ -74,7 +74,7 @@ exports.getModule = class FileBaseSearch extends MenuModule {
 
     getSelectedAreaTag(index) {
         if(0 === index) {
-            return '';	//	-ALL-
+            return '';  //  -ALL-
         }
         const area = this.availAreas[index];
         if(!area) {
@@ -92,16 +92,16 @@ exports.getModule = class FileBaseSearch extends MenuModule {
     }
 
     getFilterValuesFromFormData(formData, isAdvanced) {
-        const areaIndex		= isAdvanced ? formData.value.areaIndex : 0;
-        const orderByIndex	= isAdvanced ? formData.value.orderByIndex : 0;
-        const sortByIndex	= isAdvanced ? formData.value.sortByIndex : 0;
+        const areaIndex     = isAdvanced ? formData.value.areaIndex : 0;
+        const orderByIndex  = isAdvanced ? formData.value.orderByIndex : 0;
+        const sortByIndex   = isAdvanced ? formData.value.sortByIndex : 0;
 
         return {
-            areaTag		: this.getSelectedAreaTag(areaIndex),
-            terms		: formData.value.searchTerms,
-            tags		: isAdvanced ? formData.value.tags : '',
-            order		: this.getOrderBy(orderByIndex),
-            sort		: this.getSortBy(sortByIndex),
+            areaTag     : this.getSelectedAreaTag(areaIndex),
+            terms       : formData.value.searchTerms,
+            tags        : isAdvanced ? formData.value.tags : '',
+            order       : this.getOrderBy(orderByIndex),
+            sort        : this.getSortBy(sortByIndex),
         };
     }
 
@@ -109,10 +109,10 @@ exports.getModule = class FileBaseSearch extends MenuModule {
         const filterCriteria = this.getFilterValuesFromFormData(formData, isAdvanced);
 
         const menuOpts = {
-            extraArgs	: {
-                filterCriteria	: filterCriteria,
+            extraArgs   : {
+                filterCriteria  : filterCriteria,
             },
-            menuFlags	: [ 'popParent' ],
+            menuFlags   : [ 'popParent' ],
         };
 
         return this.gotoMenu(this.menuConfig.config.fileBaseListEntriesMenu || 'fileBaseListEntries', menuOpts, cb);
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 8f691273..3c00d167 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -1,66 +1,66 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const { MenuModule }		= require('./menu_module.js');
-const FileEntry				= require('./file_entry.js');
-const FileArea				= require('./file_base_area.js');
-const { renderSubstr }		= require('./string_util.js');
-const { Errors }			= require('./enig_error.js');
-const Events				= require('./events.js');
-const Log					= require('./logger.js').log;
-const DownloadQueue			= require('./download_queue.js');
-const { exportFileList }	= require('./file_base_list_export.js');
+//  ENiGMA½
+const { MenuModule }        = require('./menu_module.js');
+const FileEntry             = require('./file_entry.js');
+const FileArea              = require('./file_base_area.js');
+const { renderSubstr }      = require('./string_util.js');
+const { Errors }            = require('./enig_error.js');
+const Events                = require('./events.js');
+const Log                   = require('./logger.js').log;
+const DownloadQueue         = require('./download_queue.js');
+const { exportFileList }    = require('./file_base_list_export.js');
 
-//	deps
-const _					= require('lodash');
-const async				= require('async');
-const fs				= require('graceful-fs');
-const fse				= require('fs-extra');
-const paths				= require('path');
-const moment			= require('moment');
-const uuidv4			= require('uuid/v4');
-const yazl				= require('yazl');
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
+const fs                = require('graceful-fs');
+const fse               = require('fs-extra');
+const paths             = require('path');
+const moment            = require('moment');
+const uuidv4            = require('uuid/v4');
+const yazl              = require('yazl');
 
 /*
-	Module config block can contain the following:
-	templateEncoding	- encoding of template files (utf8)
-	tsFormat			- timestamp format (theme 'short')
-	descWidth			- max desc width (45)
-	progBarChar			- progress bar character (â–’)
-	compressThreshold	- threshold to kick in comrpession for lists (1.44 MiB)
-	templates			- object containing:
-		header			- filename of header template (misc/file_list_header.asc)
-		entry			- filename of entry template (misc/file_list_entry.asc)
+    Module config block can contain the following:
+    templateEncoding    - encoding of template files (utf8)
+    tsFormat            - timestamp format (theme 'short')
+    descWidth           - max desc width (45)
+    progBarChar         - progress bar character (â–’)
+    compressThreshold   - threshold to kick in comrpession for lists (1.44 MiB)
+    templates           - object containing:
+        header          - filename of header template (misc/file_list_header.asc)
+        entry           - filename of entry template (misc/file_list_entry.asc)
 
-	Header template variables:
-	nowTs, boardName, totalFileCount, totalFileSize,
-	filterAreaTag, filterAreaName, filterAreaDesc,
-	filterTerms, filterHashTags
+    Header template variables:
+    nowTs, boardName, totalFileCount, totalFileSize,
+    filterAreaTag, filterAreaName, filterAreaDesc,
+    filterTerms, filterHashTags
 
-	Entry template variables:
-	fileId, areaName, areaDesc, userRating, fileName,
-	fileSize, fileDesc, fileDescShort, fileSha256, fileCrc32,
-	fileMd5, fileSha1, uploadBy, fileUploadTs, fileHashTags,
-	currentFile, progress,
+    Entry template variables:
+    fileId, areaName, areaDesc, userRating, fileName,
+    fileSize, fileDesc, fileDescShort, fileSha256, fileCrc32,
+    fileMd5, fileSha1, uploadBy, fileUploadTs, fileHashTags,
+    currentFile, progress,
 */
 
 exports.moduleInfo = {
-    name	: 'File Base List Export',
-    desc	: 'Exports file base listings for download',
-    author	: 'NuSkooler',
+    name    : 'File Base List Export',
+    desc    : 'Exports file base listings for download',
+    author  : 'NuSkooler',
 };
 
 const FormIds = {
-    main	: 0,
+    main    : 0,
 };
 
 const MciViewIds = {
     main : {
-        status				: 1,
-        progressBar			: 2,
+        status              : 1,
+        progressBar         : 2,
 
-        customRangeStart	: 10,
+        customRangeStart    : 10,
     }
 };
 
@@ -70,11 +70,11 @@ exports.getModule = class FileBaseListExport extends MenuModule {
         super(options);
         this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
-        this.config.templateEncoding	= this.config.templateEncoding || 'utf8';
-        this.config.tsFormat			= this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
-        this.config.descWidth			= this.config.descWidth || 45;	//	ie FILE_ID.DIZ
-        this.config.progBarChar			= renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
-        this.config.compressThreshold	= this.config.compressThreshold || (1440000);	//	>= 1.44M by default :)
+        this.config.templateEncoding    = this.config.templateEncoding || 'utf8';
+        this.config.tsFormat            = this.config.tsFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
+        this.config.descWidth           = this.config.descWidth || 45;  //  ie FILE_ID.DIZ
+        this.config.progBarChar         = renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
+        this.config.compressThreshold   = this.config.compressThreshold || (1440000);   //  >= 1.44M by default :)
     }
 
     mciReady(mciData, cb) {
@@ -154,7 +154,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
         async.waterfall(
             [
                 function buildList(callback) {
-                    //	this may take quite a while; temp disable of idle monitor
+                    //  this may take quite a while; temp disable of idle monitor
                     self.client.stopIdleMonitor();
 
                     self.client.on('key press', keyPressHandler);
@@ -165,12 +165,12 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                     }
 
                     const opts = {
-                        templateEncoding	: self.config.templateEncoding,
-                        headerTemplate		: _.get(self.config, 'templates.header', 'file_list_header.asc'),
-                        entryTemplate		: _.get(self.config, 'templates.entry', 'file_list_entry.asc'),
-                        tsFormat			: self.config.tsFormat,
-                        descWidth			: self.config.descWidth,
-                        progress			: exportListProgress,
+                        templateEncoding    : self.config.templateEncoding,
+                        headerTemplate      : _.get(self.config, 'templates.header', 'file_list_header.asc'),
+                        entryTemplate       : _.get(self.config, 'templates.entry', 'file_list_entry.asc'),
+                        tsFormat            : self.config.tsFormat,
+                        descWidth           : self.config.descWidth,
+                        progress            : exportListProgress,
                     };
 
                     exportFileList(filterCriteria, opts, (err, listBody) => {
@@ -180,8 +180,8 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                 function persistList(listBody, callback) {
                     updateStatus('Persisting list');
 
-                    const sysTempDownloadArea	= FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
-                    const sysTempDownloadDir	= FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
+                    const sysTempDownloadArea   = FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
+                    const sysTempDownloadDir    = FileArea.getAreaDefaultStorageDirectory(sysTempDownloadArea);
 
                     fse.mkdirs(sysTempDownloadDir, err => {
                         if(err) {
@@ -206,14 +206,14 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                 },
                 function persistFileEntry(outputFileName, fileSize, sysTempDownloadArea, callback) {
                     const newEntry = new FileEntry({
-                        areaTag		: sysTempDownloadArea.areaTag,
-                        fileName	: paths.basename(outputFileName),
-                        storageTag	: sysTempDownloadArea.storageTags[0],
-                        meta		: {
-                            upload_by_username	: self.client.user.username,
-                            upload_by_user_id	: self.client.user.userId,
-                            byte_size			: fileSize,
-                            session_temp_dl		: 1,	//	download is valid until session is over
+                        areaTag     : sysTempDownloadArea.areaTag,
+                        fileName    : paths.basename(outputFileName),
+                        storageTag  : sysTempDownloadArea.storageTags[0],
+                        meta        : {
+                            upload_by_username  : self.client.user.username,
+                            upload_by_user_id   : self.client.user.userId,
+                            byte_size           : fileSize,
+                            session_temp_dl     : 1,    //  download is valid until session is over
                         }
                     });
 
@@ -221,11 +221,11 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
                     newEntry.persist(err => {
                         if(!err) {
-                            //	queue it!
+                            //  queue it!
                             const dlQueue = new DownloadQueue(self.client);
-                            dlQueue.add(newEntry, true);	//	true=systemFile
+                            dlQueue.add(newEntry, true);    //  true=systemFile
 
-                            //	clean up after ourselves when the session ends
+                            //  clean up after ourselves when the session ends
                             const thisClientId = self.client.session.id;
                             Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
                                 if(thisClientId === _.get(evt, 'client.session.id')) {
@@ -243,7 +243,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                     });
                 },
                 function done(callback) {
-                    //	re-enable idle monitor
+                    //  re-enable idle monitor
                     self.client.startIdleMonitor();
 
                     updateStatus('Exported list has been added to your download queue');
@@ -264,7 +264,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
             }
 
             if(stats.size < this.config.compressThreshold) {
-                //	small enough, keep orig
+                //  small enough, keep orig
                 return cb(null, filePath, stats.size);
             }
 
@@ -276,13 +276,13 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                 const outZipFile = fs.createWriteStream(zipFilePath);
                 zipFile.outputStream.pipe(outZipFile);
                 zipFile.outputStream.on('finish', () => {
-                    //	delete the original
+                    //  delete the original
                     fse.unlink(filePath, err => {
                         if(err) {
                             return cb(err);
                         }
 
-                        //	finally stat the new output
+                        //  finally stat the new output
                         fse.stat(zipFilePath, (err, stats) => {
                             return cb(err, zipFilePath, stats ? stats.size : 0);
                         });
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index 69c87ec8..02bffa3e 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -1,39 +1,39 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const DownloadQueue			= require('./download_queue.js');
-const theme					= require('./theme.js');
-const ansi					= require('./ansi_term.js');
-const Errors				= require('./enig_error.js').Errors;
-const stringFormat			= require('./string_format.js');
-const FileAreaWeb			= require('./file_area_web.js');
-const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
-const Config				= require('./config.js').get;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const DownloadQueue         = require('./download_queue.js');
+const theme                 = require('./theme.js');
+const ansi                  = require('./ansi_term.js');
+const Errors                = require('./enig_error.js').Errors;
+const stringFormat          = require('./string_format.js');
+const FileAreaWeb           = require('./file_area_web.js');
+const ErrNotEnabled         = require('./enig_error.js').ErrorReasons.NotEnabled;
+const Config                = require('./config.js').get;
 
-//	deps
-const async					= require('async');
-const _						= require('lodash');
-const moment				= require('moment');
+//  deps
+const async                 = require('async');
+const _                     = require('lodash');
+const moment                = require('moment');
 
 exports.moduleInfo = {
-    name		: 'File Base Download Web Queue Manager',
-    desc		: 'Module for interacting with web backed download queue/batch',
-    author		: 'NuSkooler',
+    name        : 'File Base Download Web Queue Manager',
+    desc        : 'Module for interacting with web backed download queue/batch',
+    author      : 'NuSkooler',
 };
 
 const FormIds = {
-    queueManager	: 0
+    queueManager    : 0
 };
 
 const MciViewIds = {
     queueManager : {
-        queue				: 1,
-        navMenu				: 2,
+        queue               : 1,
+        navMenu             : 2,
 
-        customRangeStart	: 10,
+        customRangeStart    : 10,
     }
 };
 
@@ -53,13 +53,13 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
 
                 this.dlQueue.removeItems(selectedItem.fileId);
 
-                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                //  :TODO: broken: does not redraw menu properly - needs fixed!
                 return this.removeItemsFromDownloadQueueView(formData.value.queueItem, cb);
             },
             clearQueue : (formData, extraArgs, cb) => {
                 this.dlQueue.clear();
 
-                //	:TODO: broken: does not redraw menu properly - needs fixed!
+                //  :TODO: broken: does not redraw menu properly - needs fixed!
                 return this.removeItemsFromDownloadQueueView('all', cb);
             },
             getBatchLink : (formData, extraArgs, cb) => {
@@ -111,7 +111,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
         this.updateCustomViewTextsWithFilter(
             'queueManager',
             MciViewIds.queueManager.customRangeStart, fileEntry,
-            { filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }	//	:TODO: Others....
+            { filter : [ '{webDlLink}', '{webDlExpire}', '{fileName}' ] }   //  :TODO: Others....
         );
     }
 
@@ -121,8 +121,8 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
             return cb(Errors.DoesNotExist('Queue view does not exist'));
         }
 
-        const queueListFormat		= this.menuConfig.config.queueListFormat || '{webDlLink}';
-        const focusQueueListFormat	= this.menuConfig.config.focusQueueListFormat || queueListFormat;
+        const queueListFormat       = this.menuConfig.config.queueListFormat || '{webDlLink}';
+        const focusQueueListFormat  = this.menuConfig.config.focusQueueListFormat || queueListFormat;
 
         queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
         queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
@@ -148,7 +148,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                 expireTime : expireTime
             },
             (err, webBatchDlLink) => {
-                //	:TODO: handle not enabled -> display such
+                //  :TODO: handle not enabled -> display such
                 if(err) {
                     return cb(err);
                 }
@@ -156,8 +156,8 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                 const webDlExpireTimeFormat = this.menuConfig.config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
 
                 const formatObj = {
-                    webBatchDlLink		: ansi.vtxHyperlink(this.client, webBatchDlLink) + webBatchDlLink,
-                    webBatchDlExpire	: expireTime.format(webDlExpireTimeFormat),
+                    webBatchDlLink      : ansi.vtxHyperlink(this.client, webBatchDlLink) + webBatchDlLink,
+                    webBatchDlExpire    : expireTime.format(webDlExpireTimeFormat),
                 };
 
                 this.updateCustomViewTextsWithFilter(
@@ -188,7 +188,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                         FileAreaWeb.getExistingTempDownloadServeItem(self.client, fileEntry, (err, serveItem) => {
                             if(err) {
                                 if(ErrNotEnabled === err.reasonCode) {
-                                    return nextFileEntry(err);	//	we should have caught this prior
+                                    return nextFileEntry(err);  //  we should have caught this prior
                                 }
 
                                 const expireTime = moment().add(config.fileBase.web.expireMinutes, 'minutes');
@@ -202,17 +202,17 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                                             return nextFileEntry(err);
                                         }
 
-                                        fileEntry.webDlLinkRaw	= url;
-                                        fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, url) + url;
-                                        fileEntry.webDlExpire	= expireTime.format(webDlExpireTimeFormat);
+                                        fileEntry.webDlLinkRaw  = url;
+                                        fileEntry.webDlLink     = ansi.vtxHyperlink(self.client, url) + url;
+                                        fileEntry.webDlExpire   = expireTime.format(webDlExpireTimeFormat);
 
                                         return nextFileEntry(null);
                                     }
                                 );
                             } else {
-                                fileEntry.webDlLinkRaw	= serveItem.url;
-                                fileEntry.webDlLink		= ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
-                                fileEntry.webDlExpire	= moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
+                                fileEntry.webDlLinkRaw  = serveItem.url;
+                                fileEntry.webDlLink     = ansi.vtxHyperlink(self.client, serveItem.url) + serveItem.url;
+                                fileEntry.webDlExpire   = moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
                                 return nextFileEntry(null);
                             }
                         });
@@ -233,8 +233,8 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
     }
 
     displayArtAndPrepViewController(name, options, cb) {
-        const self		= this;
-        const config	= this.menuConfig.config;
+        const self      = this;
+        const config    = this.menuConfig.config;
 
         async.waterfall(
             [
@@ -255,8 +255,8 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                 function prepeareViewController(artData, callback) {
                     if(_.isUndefined(self.viewControllers[name])) {
                         const vcOpts = {
-                            client		: self.client,
-                            formId		: FormIds[name],
+                            client      : self.client,
+                            formId      : FormIds[name],
                         };
 
                         if(!_.isUndefined(options.noInput)) {
@@ -266,9 +266,9 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
                         const vc = self.addViewController(name, new ViewController(vcOpts));
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds[name],
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds[name],
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
diff --git a/core/file_entry.js b/core/file_entry.js
index 75fafb29..0f519e10 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -1,57 +1,57 @@
 /* jslint node: true */
 'use strict';
 
-const fileDb				= require('./database.js').dbs.file;
-const Errors				= require('./enig_error.js').Errors;
+const fileDb                = require('./database.js').dbs.file;
+const Errors                = require('./enig_error.js').Errors;
 const {
     getISOTimestampString,
     sanatizeString
-}							= require('./database.js');
-const Config				= require('./config.js').get;
+}                           = require('./database.js');
+const Config                = require('./config.js').get;
 
-//	deps
-const async					= require('async');
-const _						= require('lodash');
-const paths					= require('path');
-const fse					= require('fs-extra');
-const { unlink, readFile }	= require('graceful-fs');
-const crypto				= require('crypto');
-const moment				= require('moment');
+//  deps
+const async                 = require('async');
+const _                     = require('lodash');
+const paths                 = require('path');
+const fse                   = require('fs-extra');
+const { unlink, readFile }  = require('graceful-fs');
+const crypto                = require('crypto');
+const moment                = require('moment');
 
-const FILE_TABLE_MEMBERS	= [
+const FILE_TABLE_MEMBERS    = [
     'file_id', 'area_tag', 'file_sha256', 'file_name', 'storage_tag',
     'desc', 'desc_long', 'upload_timestamp'
 ];
 
 const FILE_WELL_KNOWN_META = {
-    //	name -> *read* converter, if any
-    upload_by_username	: null,
-    upload_by_user_id	: (u) => parseInt(u) || 0,
-    file_md5			: null,
-    file_sha1			: null,
-    file_crc32			: null,
-    est_release_year	: (y) => parseInt(y) || new Date().getFullYear(),
-    dl_count			: (d) => parseInt(d) || 0,
-    byte_size			: (b) => parseInt(b) || 0,
-    archive_type		: null,
-    short_file_name		: null,	//	e.g. DOS 8.3 filename, avail in some scenarios such as TIC import
-    tic_origin			: null,	//	TIC "Origin"
-    tic_desc			: null,	//	TIC "Desc"
-    tic_ldesc			: null,	//	TIC "Ldesc" joined by '\n'
-    session_temp_dl		: (v) => parseInt(v) ? true : false,
+    //  name -> *read* converter, if any
+    upload_by_username  : null,
+    upload_by_user_id   : (u) => parseInt(u) || 0,
+    file_md5            : null,
+    file_sha1           : null,
+    file_crc32          : null,
+    est_release_year    : (y) => parseInt(y) || new Date().getFullYear(),
+    dl_count            : (d) => parseInt(d) || 0,
+    byte_size           : (b) => parseInt(b) || 0,
+    archive_type        : null,
+    short_file_name     : null, //  e.g. DOS 8.3 filename, avail in some scenarios such as TIC import
+    tic_origin          : null, //  TIC "Origin"
+    tic_desc            : null, //  TIC "Desc"
+    tic_ldesc           : null, //  TIC "Ldesc" joined by '\n'
+    session_temp_dl     : (v) => parseInt(v) ? true : false,
 };
 
 module.exports = class FileEntry {
     constructor(options) {
-        options			= options || {};
+        options         = options || {};
 
-        this.fileId		= options.fileId || 0;
-        this.areaTag	= options.areaTag || '';
-        this.meta		= Object.assign( { dl_count : 0 }, options.meta);
-        this.hashTags	= options.hashTags || new Set();
-        this.fileName	= options.fileName;
-        this.storageTag	= options.storageTag;
-        this.fileSha256	= options.fileSha256;
+        this.fileId     = options.fileId || 0;
+        this.areaTag    = options.areaTag || '';
+        this.meta       = Object.assign( { dl_count : 0 }, options.meta);
+        this.hashTags   = options.hashTags || new Set();
+        this.fileName   = options.fileName;
+        this.storageTag = options.storageTag;
+        this.fileSha256 = options.fileSha256;
     }
 
     static loadBasicEntry(fileId, dest, cb) {
@@ -59,9 +59,9 @@ module.exports = class FileEntry {
 
         fileDb.get(
             `SELECT ${FILE_TABLE_MEMBERS.join(', ')}
-			FROM file
-			WHERE file_id=?
-			LIMIT 1;`,
+            FROM file
+            WHERE file_id=?
+            LIMIT 1;`,
             [ fileId ],
             (err, file) => {
                 if(err) {
@@ -72,7 +72,7 @@ module.exports = class FileEntry {
                     return cb(Errors.DoesNotExist('No file is available by that ID'));
                 }
 
-                //	assign props from |file|
+                //  assign props from |file|
                 FILE_TABLE_MEMBERS.forEach(prop => {
                     dest[_.camelCase(prop)] = file[prop];
                 });
@@ -149,7 +149,7 @@ module.exports = class FileEntry {
                     if(isUpdate) {
                         trans.run(
                             `REPLACE INTO file (file_id, area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
-							VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
+                            VALUES(?, ?, ?, ?, ?, ?, ?, ?);`,
                             [ self.fileId, self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
                             err => {
                                 return callback(err, trans);
@@ -158,9 +158,9 @@ module.exports = class FileEntry {
                     } else {
                         trans.run(
                             `REPLACE INTO file (area_tag, file_sha256, file_name, storage_tag, desc, desc_long, upload_timestamp)
-							VALUES(?, ?, ?, ?, ?, ?, ?);`,
+                            VALUES(?, ?, ?, ?, ?, ?, ?);`,
                             [ self.areaTag, self.fileSha256, self.fileName, self.storageTag, self.desc, self.descLong, getISOTimestampString() ],
-                            function inserted(err) {	//	use non-arrow func for 'this' scope / lastID
+                            function inserted(err) {    //  use non-arrow func for 'this' scope / lastID
                                 if(!err) {
                                     self.fileId = this.lastID;
                                 }
@@ -189,7 +189,7 @@ module.exports = class FileEntry {
                 }
             ],
             (err, trans) => {
-                //	:TODO: Log orig err
+                //  :TODO: Log orig err
                 if(trans) {
                     trans[err ? 'rollback' : 'commit'](transErr => {
                         return cb(transErr ? transErr : err);
@@ -205,12 +205,12 @@ module.exports = class FileEntry {
         const config = Config();
         const storageLocation = (storageTag && config.fileBase.storageTags[storageTag]);
 
-        //	absolute paths as-is
+        //  absolute paths as-is
         if(storageLocation && '/' === storageLocation.charAt(0)) {
             return storageLocation;
         }
 
-        //	relative to |areaStoragePrefix|
+        //  relative to |areaStoragePrefix|
         return paths.join(config.fileBase.areaStoragePrefix, storageLocation || '');
     }
 
@@ -222,9 +222,9 @@ module.exports = class FileEntry {
     static quickCheckExistsByPath(fullPath, cb) {
         fileDb.get(
             `SELECT COUNT() AS count
-			FROM file
-			WHERE file_name = ?
-			LIMIT 1;`,
+            FROM file
+            WHERE file_name = ?
+            LIMIT 1;`,
             [ paths.basename(fullPath) ],
             (err, rows) => {
                 return err ? cb(err) : cb(null, rows.count > 0 ? true : false);
@@ -235,7 +235,7 @@ module.exports = class FileEntry {
     static persistUserRating(fileId, userId, rating, cb) {
         return fileDb.run(
             `REPLACE INTO file_user_rating (file_id, user_id, rating)
-			VALUES (?, ?, ?);`,
+            VALUES (?, ?, ?);`,
             [ fileId, userId, rating ],
             cb
         );
@@ -249,7 +249,7 @@ module.exports = class FileEntry {
 
         return transOrDb.run(
             `REPLACE INTO file_meta (file_id, meta_name, meta_value)
-			VALUES (?, ?, ?);`,
+            VALUES (?, ?, ?);`,
             [ fileId, name, value ],
             cb
         );
@@ -259,8 +259,8 @@ module.exports = class FileEntry {
         incrementBy = incrementBy || 1;
         fileDb.run(
             `UPDATE file_meta
-			SET meta_value = meta_value + ?
-			WHERE file_id = ? AND meta_name = ?;`,
+            SET meta_value = meta_value + ?
+            WHERE file_id = ? AND meta_name = ?;`,
             [ incrementBy, fileId, name ],
             err => {
                 if(cb) {
@@ -273,8 +273,8 @@ module.exports = class FileEntry {
     loadMeta(cb) {
         fileDb.each(
             `SELECT meta_name, meta_value
-			FROM file_meta
-			WHERE file_id=?;`,
+            FROM file_meta
+            WHERE file_id=?;`,
             [ this.fileId ],
             (err, meta) => {
                 if(meta) {
@@ -297,18 +297,18 @@ module.exports = class FileEntry {
         transOrDb.serialize( () => {
             transOrDb.run(
                 `INSERT OR IGNORE INTO hash_tag (hash_tag)
-				VALUES (?);`,
+                VALUES (?);`,
                 [ hashTag ]
             );
 
             transOrDb.run(
                 `REPLACE INTO file_hash_tag (hash_tag_id, file_id)
-				VALUES (
-					(SELECT hash_tag_id
-					FROM hash_tag
-					WHERE hash_tag = ?),
-					?
-				);`,
+                VALUES (
+                    (SELECT hash_tag_id
+                    FROM hash_tag
+                    WHERE hash_tag = ?),
+                    ?
+                );`,
                 [ hashTag, fileId ],
                 err => {
                     return cb(err);
@@ -320,12 +320,12 @@ module.exports = class FileEntry {
     loadHashTags(cb) {
         fileDb.each(
             `SELECT ht.hash_tag_id, ht.hash_tag
-			FROM hash_tag ht
-			WHERE ht.hash_tag_id IN (
-				SELECT hash_tag_id
-				FROM file_hash_tag
-				WHERE file_id=?
-			);`,
+            FROM hash_tag ht
+            WHERE ht.hash_tag_id IN (
+                SELECT hash_tag_id
+                FROM file_hash_tag
+                WHERE file_id=?
+            );`,
             [ this.fileId ],
             (err, hashTag) => {
                 if(hashTag) {
@@ -341,10 +341,10 @@ module.exports = class FileEntry {
     loadRating(cb) {
         fileDb.get(
             `SELECT AVG(fur.rating) AS avg_rating
-			FROM file_user_rating fur
-			INNER JOIN file f
-				ON f.file_id = fur.file_id
-				AND f.file_id = ?`,
+            FROM file_user_rating fur
+            INNER JOIN file f
+                ON f.file_id = fur.file_id
+                AND f.file_id = ?`,
             [ this.fileId ],
             (err, result) => {
                 if(result) {
@@ -370,12 +370,12 @@ module.exports = class FileEntry {
     }
 
     static findFileBySha(sha, cb) {
-        //	full or partial SHA-256
+        //  full or partial SHA-256
         fileDb.all(
             `SELECT file_id
-			FROM file
-			WHERE file_sha256 LIKE "${sha}%"
-			LIMIT 2;`,	//	limit 2 such that we can find if there are dupes
+            FROM file
+            WHERE file_sha256 LIKE "${sha}%"
+            LIMIT 2;`,  //  limit 2 such that we can find if there are dupes
             (err, fileIdRows) => {
                 if(err) {
                     return cb(err);
@@ -398,14 +398,14 @@ module.exports = class FileEntry {
     }
 
     static findByFileNameWildcard(wc, cb) {
-        //	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
+        //  convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
         wc = wc.replace(/\*/g, '%').replace(/\?/g, '_');
 
         fileDb.all(
             `SELECT file_id
-			FROM file
-			WHERE file_name LIKE "${wc}"
-			`,
+            FROM file
+            WHERE file_name LIKE "${wc}"
+            `,
             (err, fileIdRows) => {
                 if(err) {
                     return cb(err);
@@ -462,38 +462,38 @@ module.exports = class FileEntry {
         }
 
         if(filter.sort && filter.sort.length > 0) {
-            if(Object.keys(FILE_WELL_KNOWN_META).indexOf(filter.sort) > -1) {	//	sorting via a meta value?
+            if(Object.keys(FILE_WELL_KNOWN_META).indexOf(filter.sort) > -1) {   //  sorting via a meta value?
                 sql =
-					`SELECT DISTINCT f.file_id
-					FROM file f, file_meta m`;
+                    `SELECT DISTINCT f.file_id
+                    FROM file f, file_meta m`;
 
                 appendWhereClause(`f.file_id = m.file_id AND m.meta_name = "${filter.sort}"`);
 
                 sqlOrderBy = `${getOrderByWithCast('m.meta_value')} ${sqlOrderDir}`;
             } else {
-                //	additional special treatment for user ratings: we need to average them
+                //  additional special treatment for user ratings: we need to average them
                 if('user_rating' === filter.sort) {
                     sql =
-						`SELECT DISTINCT f.file_id,
-							(SELECT IFNULL(AVG(rating), 0) rating 
-							FROM file_user_rating 
-							WHERE file_id = f.file_id)
-							AS avg_rating
-						FROM file f`;
+                        `SELECT DISTINCT f.file_id,
+                            (SELECT IFNULL(AVG(rating), 0) rating 
+                            FROM file_user_rating 
+                            WHERE file_id = f.file_id)
+                            AS avg_rating
+                        FROM file f`;
 
                     sqlOrderBy = `ORDER BY avg_rating ${sqlOrderDir}`;
                 } else {
                     sql =
-						`SELECT DISTINCT f.file_id
-						FROM file f`;
+                        `SELECT DISTINCT f.file_id
+                        FROM file f`;
 
                     sqlOrderBy = getOrderByWithCast(`f.${filter.sort}`) +  ' ' + sqlOrderDir;
                 }
             }
         } else {
             sql =
-				`SELECT DISTINCT f.file_id
-				FROM file f`;
+                `SELECT DISTINCT f.file_id
+                FROM file f`;
 
             sqlOrderBy = `${getOrderByWithCast('f.file_id')} ${sqlOrderDir}`;
         }
@@ -511,22 +511,22 @@ module.exports = class FileEntry {
 
             filter.metaPairs.forEach(mp => {
                 if(mp.wildcards) {
-                    //	convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
+                    //  convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
                     mp.value = mp.value.replace(/\*/g, '%').replace(/\?/g, '_');
                     appendWhereClause(
                         `f.file_id IN (
-							SELECT file_id 
-							FROM file_meta 
-							WHERE meta_name = "${mp.name}" AND meta_value LIKE "${mp.value}"
-						)`
+                            SELECT file_id 
+                            FROM file_meta 
+                            WHERE meta_name = "${mp.name}" AND meta_value LIKE "${mp.value}"
+                        )`
                     );
                 } else {
                     appendWhereClause(
                         `f.file_id IN (
-							SELECT file_id 
-							FROM file_meta 
-							WHERE meta_name = "${mp.name}" AND meta_value = "${mp.value}"
-						)`
+                            SELECT file_id 
+                            FROM file_meta 
+                            WHERE meta_name = "${mp.name}" AND meta_value = "${mp.value}"
+                        )`
                     );
                 }
             });
@@ -537,30 +537,30 @@ module.exports = class FileEntry {
         }
 
         if(filter.terms && filter.terms.length > 0) {
-            //	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
+            //  note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
             appendWhereClause(
                 `f.file_id IN (
-					SELECT rowid
-					FROM file_fts
-					WHERE file_fts MATCH ":${sanatizeString(filter.terms)}"
-				)`
+                    SELECT rowid
+                    FROM file_fts
+                    WHERE file_fts MATCH ":${sanatizeString(filter.terms)}"
+                )`
             );
         }
 
         if(filter.tags && filter.tags.length > 0) {
-            //	build list of quoted tags; filter.tags comes in as a space and/or comma separated values
+            //  build list of quoted tags; filter.tags comes in as a space and/or comma separated values
             const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanatizeString(tag)}"` ).join(',');
 
             appendWhereClause(
                 `f.file_id IN (
-					SELECT file_id
-					FROM file_hash_tag
-					WHERE hash_tag_id IN (
-						SELECT hash_tag_id
-						FROM hash_tag
-						WHERE hash_tag IN (${tags})
-					)
-				)`
+                    SELECT file_id
+                    FROM file_hash_tag
+                    WHERE hash_tag_id IN (
+                        SELECT hash_tag_id
+                        FROM hash_tag
+                        WHERE hash_tag IN (${tags})
+                    )
+                )`
             );
         }
 
@@ -585,7 +585,7 @@ module.exports = class FileEntry {
                 return cb(err);
             }
             if(!rows || 0 === rows.length) {
-                return cb(null, []);	//	no matches
+                return cb(null, []);    //  no matches
             }
             return cb(null, rows.map(r => r.file_id));
         });
@@ -602,7 +602,7 @@ module.exports = class FileEntry {
                 function removeFromDatabase(callback) {
                     fileDb.run(
                         `DELETE FROM file
-						WHERE file_id = ?;`,
+                        WHERE file_id = ?;`,
                         [ srcFileEntry.fileId ],
                         err => {
                             return callback(err);
@@ -631,20 +631,20 @@ module.exports = class FileEntry {
             destFileName = srcFileEntry.fileName;
         }
 
-        const srcPath	= srcFileEntry.filePath;
-        const dstDir	= FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
+        const srcPath   = srcFileEntry.filePath;
+        const dstDir    = FileEntry.getAreaStorageDirectoryByTag(destStorageTag);
 
         if(!dstDir) {
             return cb(Errors.Invalid('Invalid storage tag'));
         }
 
-        const dstPath	= paths.join(dstDir, destFileName);
+        const dstPath   = paths.join(dstDir, destFileName);
 
         async.series(
             [
                 function movePhysFile(callback) {
                     if(srcPath === dstPath) {
-                        return callback(null);	//	don't need to move file, but may change areas
+                        return callback(null);  //  don't need to move file, but may change areas
                     }
 
                     fse.move(srcPath, dstPath, err => {
@@ -654,8 +654,8 @@ module.exports = class FileEntry {
                 function updateDatabase(callback) {
                     fileDb.run(
                         `UPDATE file
-						SET area_tag = ?, file_name = ?, storage_tag = ?
-						WHERE file_id = ?;`,
+                        SET area_tag = ?, file_name = ?, storage_tag = ?
+                        WHERE file_id = ?;`,
                         [ destAreaTag, destFileName, destStorageTag, srcFileEntry.fileId ],
                         err => {
                             return callback(err);
diff --git a/core/file_transfer.js b/core/file_transfer.js
index e66a98f7..dbd19a8f 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -1,50 +1,50 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule		= require('./menu_module.js').MenuModule;
-const Config			= require('./config.js').get;
-const stringFormat		= require('./string_format.js');
-const Errors			= require('./enig_error.js').Errors;
-const DownloadQueue		= require('./download_queue.js');
-const StatLog			= require('./stat_log.js');
-const FileEntry			= require('./file_entry.js');
-const Log				= require('./logger.js').log;
-const Events			= require('./events.js');
+//  enigma-bbs
+const MenuModule        = require('./menu_module.js').MenuModule;
+const Config            = require('./config.js').get;
+const stringFormat      = require('./string_format.js');
+const Errors            = require('./enig_error.js').Errors;
+const DownloadQueue     = require('./download_queue.js');
+const StatLog           = require('./stat_log.js');
+const FileEntry         = require('./file_entry.js');
+const Log               = require('./logger.js').log;
+const Events            = require('./events.js');
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const pty			= require('node-pty');
-const temptmp		= require('temptmp').createTrackedSession('transfer_file');
-const paths			= require('path');
-const fs			= require('graceful-fs');
-const fse			= require('fs-extra');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const pty           = require('node-pty');
+const temptmp       = require('temptmp').createTrackedSession('transfer_file');
+const paths         = require('path');
+const fs            = require('graceful-fs');
+const fse           = require('fs-extra');
 
-//	some consts
-const SYSTEM_EOL	= require('os').EOL;
-const TEMP_SUFFIX	= 'enigtf-';	//	temp CWD/etc.
+//  some consts
+const SYSTEM_EOL    = require('os').EOL;
+const TEMP_SUFFIX   = 'enigtf-';    //  temp CWD/etc.
 
 /*
-	Notes
-	-----------------------------------------------------------------------------
+    Notes
+    -----------------------------------------------------------------------------
 
-	See core/config.js for external protocol configuration
+    See core/config.js for external protocol configuration
 
 
-	Resources
-	-----------------------------------------------------------------------------
+    Resources
+    -----------------------------------------------------------------------------
 
-	ZModem
-		* http://gallium.inria.fr/~doligez/zmodem/zmodem.txt
-		* https://github.com/protomouse/synchronet/blob/master/src/sbbs3/zmodem.c
+    ZModem
+        * http://gallium.inria.fr/~doligez/zmodem/zmodem.txt
+        * https://github.com/protomouse/synchronet/blob/master/src/sbbs3/zmodem.c
 
 */
 
 exports.moduleInfo = {
-    name	: 'Transfer file',
-    desc	: 'Sends or receives a file(s)',
-    author	: 'NuSkooler',
+    name    : 'Transfer file',
+    desc    : 'Sends or receives a file(s)',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class TransferFileModule extends MenuModule {
@@ -54,7 +54,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
         this.config = this.menuConfig.config || {};
 
         //
-        //	Most options can be set via extraArgs or config block
+        //  Most options can be set via extraArgs or config block
         //
         const config = Config();
         if(options.extraArgs) {
@@ -99,11 +99,11 @@ exports.getModule = class TransferFileModule extends MenuModule {
             }
         }
 
-        this.protocolConfig = this.protocolConfig || config.fileTransferProtocols.zmodem8kSz;	//	try for *something*
-        this.direction		= this.direction || 'send';
-        this.sendQueue		= this.sendQueue || [];
+        this.protocolConfig = this.protocolConfig || config.fileTransferProtocols.zmodem8kSz;   //  try for *something*
+        this.direction      = this.direction || 'send';
+        this.sendQueue      = this.sendQueue || [];
 
-        //	Ensure sendQueue is an array of objects that contain at least a 'path' member
+        //  Ensure sendQueue is an array of objects that contain at least a 'path' member
         this.sendQueue = this.sendQueue.map(item => {
             if(_.isString(item)) {
                 return { path : item };
@@ -128,8 +128,8 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     sendFiles(cb) {
-        //	assume *sending* can always batch
-        //	:TODO: Look into this further
+        //  assume *sending* can always batch
+        //  :TODO: Look into this further
         const allFiles = this.sendQueue.map(f => f.path);
         this.executeExternalProtocolHandlerForSend(allFiles, err => {
             if(err) {
@@ -149,64 +149,64 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     /*
-	sendFiles(cb) {
-		//	:TODO: built in/native protocol support
+    sendFiles(cb) {
+        //  :TODO: built in/native protocol support
 
-		if(this.protocolConfig.external.supportsBatch) {
-			const allFiles = this.sendQueue.map(f => f.path);
-			this.executeExternalProtocolHandlerForSend(allFiles, err => {
-				if(err) {
-					this.client.log.warn( { files : allFiles, error : err.message }, 'Error sending file(s)' );
-				} else {
-					const sentFiles = [];
-					this.sendQueue.forEach(f => {
-						f.sent = true;
-						sentFiles.push(f.path);
+        if(this.protocolConfig.external.supportsBatch) {
+            const allFiles = this.sendQueue.map(f => f.path);
+            this.executeExternalProtocolHandlerForSend(allFiles, err => {
+                if(err) {
+                    this.client.log.warn( { files : allFiles, error : err.message }, 'Error sending file(s)' );
+                } else {
+                    const sentFiles = [];
+                    this.sendQueue.forEach(f => {
+                        f.sent = true;
+                        sentFiles.push(f.path);
 
-					});
+                    });
 
-					this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
-				}
-				return cb(err);
-			});
-		} else {
-			//	:TODO: we need to prompt between entries such that users can prepare their clients
-			async.eachSeries(this.sendQueue, (queueItem, next) => {
-				this.executeExternalProtocolHandlerForSend(queueItem.path, err => {
-					if(err) {
-						this.client.log.warn( { file : queueItem.path, error : err.message }, 'Error sending file' );
-					} else {
-						queueItem.sent = true;
+                    this.client.log.info( { sentFiles : sentFiles }, `Successfully sent ${sentFiles.length} file(s)` );
+                }
+                return cb(err);
+            });
+        } else {
+            //  :TODO: we need to prompt between entries such that users can prepare their clients
+            async.eachSeries(this.sendQueue, (queueItem, next) => {
+                this.executeExternalProtocolHandlerForSend(queueItem.path, err => {
+                    if(err) {
+                        this.client.log.warn( { file : queueItem.path, error : err.message }, 'Error sending file' );
+                    } else {
+                        queueItem.sent = true;
 
-						this.client.log.info( { sentFile : queueItem.path }, 'Successfully sent file' );
-					}
-					return next(err);
-				});
-			}, err => {
-				return cb(err);
-			});
-		}
-	}
-	*/
+                        this.client.log.info( { sentFile : queueItem.path }, 'Successfully sent file' );
+                    }
+                    return next(err);
+                });
+            }, err => {
+                return cb(err);
+            });
+        }
+    }
+    */
 
     moveFileWithCollisionHandling(src, dst, cb) {
         //
-        //	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
-        //	in the case of collisions.
+        //  Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
+        //  in the case of collisions.
         //
-        const dstPath		= paths.dirname(dst);
-        const dstFileExt	= paths.extname(dst);
-        const dstFileSuffix	= paths.basename(dst, dstFileExt);
+        const dstPath       = paths.dirname(dst);
+        const dstFileExt    = paths.extname(dst);
+        const dstFileSuffix = paths.basename(dst, dstFileExt);
 
-        let renameIndex		= 0;
-        let movedOk			= false;
+        let renameIndex     = 0;
+        let movedOk         = false;
         let tryDstPath;
 
         async.until(
-            () => movedOk,	//	until moved OK
+            () => movedOk,  //  until moved OK
             (cb) => {
                 if(0 === renameIndex) {
-                    //	try originally supplied path first
+                    //  try originally supplied path first
                     tryDstPath = dst;
                 } else {
                     tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
@@ -216,7 +216,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
                     if(err) {
                         if('EEXIST' === err.code) {
                             renameIndex += 1;
-                            return cb(null);	//	keep trying
+                            return cb(null);    //  keep trying
                         }
 
                         return cb(err);
@@ -242,8 +242,8 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
             if(this.recvFileName) {
                 //
-                //	file name specified - we expect a single file in |this.recvDirectory|
-                //	by the name of |this.recvFileName|
+                //  file name specified - we expect a single file in |this.recvDirectory|
+                //  by the name of |this.recvFileName|
                 //
                 const recvFullPath = paths.join(this.recvDirectory, this.recvFileName);
                 fs.stat(recvFullPath, (err, stats) => {
@@ -260,21 +260,21 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 });
             } else {
                 //
-                //	Blind Upload (recv): files in |this.recvDirectory| should be named appropriately already
+                //  Blind Upload (recv): files in |this.recvDirectory| should be named appropriately already
                 //
                 fs.readdir(this.recvDirectory, (err, files) => {
                     if(err) {
                         return cb(err);
                     }
 
-                    //	stat each to grab files only
+                    //  stat each to grab files only
                     async.each(files, (fileName, nextFile) => {
                         const recvFullPath = paths.join(this.recvDirectory, fileName);
 
                         fs.stat(recvFullPath, (err, stats) => {
                             if(err) {
                                 this.client.log.warn('Failed to stat file', { path : recvFullPath } );
-                                return nextFile(null);	//	just try the next one
+                                return nextFile(null);  //  just try the next one
                             }
 
                             if(stats.isFile()) {
@@ -299,7 +299,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     prepAndBuildSendArgs(filePaths, cb) {
-        const externalArgs	= this.protocolConfig.external['sendArgs'];
+        const externalArgs  = this.protocolConfig.external['sendArgs'];
 
         async.waterfall(
             [
@@ -311,7 +311,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
                     temptmp.open( { prefix : TEMP_SUFFIX, suffix : '.txt' }, (err, tempFileInfo) => {
                         if(err) {
-                            return callback(err);	//	failed to create it
+                            return callback(err);   //  failed to create it
                         }
 
                         fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL));
@@ -321,16 +321,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
                     });
                 },
                 function createArgs(tempFileListPath, callback) {
-                    //	initial args: ignore {filePaths} as we must break that into it's own sep array items
+                    //  initial args: ignore {filePaths} as we must break that into it's own sep array items
                     const args = externalArgs.map(arg => {
                         return '{filePaths}' === arg ? arg : stringFormat(arg, {
-                            fileListPath	: tempFileListPath || '',
+                            fileListPath    : tempFileListPath || '',
                         });
                     });
 
                     const filePathsPos = args.indexOf('{filePaths}');
                     if(filePathsPos > -1) {
-                        //	replace {filePaths} with 0:n individual entries in |args|
+                        //  replace {filePaths} with 0:n individual entries in |args|
                         args.splice.apply( args, [ filePathsPos, 1 ].concat(filePaths) );
                     }
 
@@ -344,19 +344,19 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     prepAndBuildRecvArgs(cb) {
-        const argsKey		= this.recvFileName ? 'recvArgsNonBatch' : 'recvArgs';
-        const externalArgs	= this.protocolConfig.external[argsKey];
-        const args			= externalArgs.map(arg => stringFormat(arg, {
-            uploadDir		: this.recvDirectory,
-            fileName		: this.recvFileName || '',
+        const argsKey       = this.recvFileName ? 'recvArgsNonBatch' : 'recvArgs';
+        const externalArgs  = this.protocolConfig.external[argsKey];
+        const args          = externalArgs.map(arg => stringFormat(arg, {
+            uploadDir       : this.recvDirectory,
+            fileName        : this.recvFileName || '',
         }));
 
         return cb(null, args);
     }
 
     executeExternalProtocolHandler(args, cb) {
-        const external	= this.protocolConfig.external;
-        const cmd		= external[`${this.direction}Cmd`];
+        const external  = this.protocolConfig.external;
+        const cmd       = external[`${this.direction}Cmd`];
 
         this.client.log.debug(
             { cmd : cmd, args : args, tempDir : this.recvDirectory, direction : this.direction },
@@ -364,18 +364,18 @@ exports.getModule = class TransferFileModule extends MenuModule {
         );
 
         const spawnOpts = {
-            cols		: this.client.term.termWidth,
-            rows		: this.client.term.termHeight,
-            cwd			: this.recvDirectory,
-            encoding	: null,	//	don't bork our data!
+            cols        : this.client.term.termWidth,
+            rows        : this.client.term.termHeight,
+            cwd         : this.recvDirectory,
+            encoding    : null, //  don't bork our data!
         };
 
         const externalProc = pty.spawn(cmd, args, spawnOpts);
 
         this.client.setTemporaryDirectDataHandler(data => {
-            //	needed for things like sz/rz
+            //  needed for things like sz/rz
             if(external.escapeTelnet) {
-                const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');	//	de-escape
+                const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
                 externalProc.write(Buffer.from(tmp, 'binary'));
             } else {
                 externalProc.write(data);
@@ -383,9 +383,9 @@ exports.getModule = class TransferFileModule extends MenuModule {
         });
 
         externalProc.on('data', data => {
-            //	needed for things like sz/rz
+            //  needed for things like sz/rz
             if(external.escapeTelnet) {
-                const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');	//	escape
+                const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');   //  escape
                 this.client.term.rawWrite(Buffer.from(tmp, 'binary'));
             } else {
                 this.client.term.rawWrite(data);
@@ -443,9 +443,9 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     updateSendStats(cb) {
-        let downloadBytes 	= 0;
-        let downloadCount	= 0;
-        let fileIds			= [];
+        let downloadBytes   = 0;
+        let downloadCount   = 0;
+        let fileIds         = [];
 
         async.each(this.sendQueue, (queueItem, next) => {
             if(!queueItem.sent) {
@@ -462,7 +462,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 return next(null);
             }
 
-            //	we just have a path - figure it out
+            //  we just have a path - figure it out
             fs.stat(queueItem.path, (err, stats) => {
                 if(err) {
                     this.client.log.warn( { error : err.message, path : queueItem.path }, 'File stat failed' );
@@ -474,7 +474,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 return next(null);
             });
         }, () => {
-            //	All stats/meta currently updated via fire & forget - if this is ever a issue, we can wait for callbacks
+            //  All stats/meta currently updated via fire & forget - if this is ever a issue, we can wait for callbacks
             StatLog.incrementUserStat(this.client.user, 'dl_total_count', downloadCount);
             StatLog.incrementUserStat(this.client.user, 'dl_total_bytes', downloadBytes);
             StatLog.incrementSystemStat('dl_total_count', downloadCount);
@@ -489,16 +489,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
     }
 
     updateRecvStats(cb) {
-        let uploadBytes	= 0;
-        let uploadCount	= 0;
+        let uploadBytes = 0;
+        let uploadCount = 0;
 
         async.each(this.recvFilePaths, (filePath, next) => {
-            //	we just have a path - figure it out
+            //  we just have a path - figure it out
             fs.stat(filePath, (err, stats) => {
                 if(err) {
                     this.client.log.warn( { error : err.message, path : filePath }, 'File stat failed' );
                 } else {
-                    uploadCount	+= 1;
+                    uploadCount += 1;
                     uploadBytes += stats.size;
                 }
 
@@ -517,7 +517,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
     initSequence() {
         const self = this;
 
-        //	:TODO: break this up to send|recv
+        //  :TODO: break this up to send|recv
 
         async.series(
             [
@@ -545,16 +545,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
                             });
 
                             if(sentFileIds.length > 0) {
-                                //	remove items we sent from the D/L queue
+                                //  remove items we sent from the D/L queue
                                 const dlQueue = new DownloadQueue(self.client);
                                 const dlFileEntries = dlQueue.removeItems(sentFileIds);
 
-                                //	fire event for downloaded entries
+                                //  fire event for downloaded entries
                                 Events.emit(
                                     Events.getSystemEvents().UserDownload,
                                     {
-                                        user	: self.client.user,
-                                        files	: dlFileEntries
+                                        user    : self.client.user,
+                                        files   : dlFileEntries
                                     }
                                 );
 
diff --git a/core/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
index 1fe1944b..d8500dc5 100644
--- a/core/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -1,24 +1,24 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule		= require('./menu_module.js').MenuModule;
-const Config			= require('./config.js').get;
-const stringFormat		= require('./string_format.js');
-const ViewController	= require('./view_controller.js').ViewController;
+//  enigma-bbs
+const MenuModule        = require('./menu_module.js').MenuModule;
+const Config            = require('./config.js').get;
+const stringFormat      = require('./string_format.js');
+const ViewController    = require('./view_controller.js').ViewController;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'File transfer protocol selection',
-    desc	: 'Select protocol / method for file transfer',
-    author	: 'NuSkooler',
+    name    : 'File transfer protocol selection',
+    desc    : 'Select protocol / method for file transfer',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
-    protList	: 1,
+    protList    : 1,
 };
 
 exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
@@ -36,7 +36,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 
         this.config.direction = this.config.direction || 'send';
 
-        this.extraArgs	= options.extraArgs;
+        this.extraArgs  = options.extraArgs;
 
         if(_.has(options, 'lastMenuResult.sentFileIds')) {
             this.sentFileIds = options.lastMenuResult.sentFileIds;
@@ -46,13 +46,13 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
             this.recvFilePaths = options.lastMenuResult.recvFilePaths;
         }
 
-        this.fallbackOnly	= options.lastMenuResult ? true : false;
+        this.fallbackOnly   = options.lastMenuResult ? true : false;
 
         this.loadAvailProtocols();
 
         this.menuMethods = {
             selectProtocol : (formData, extraArgs, cb) => {
-                const protocol	= this.protocols[formData.value.protocol];
+                const protocol  = this.protocols[formData.value.protocol];
                 const finalExtraArgs = this.extraArgs || {};
                 Object.assign(finalExtraArgs, { protocol : protocol.protocol, direction : this.config.direction }, extraArgs );
 
@@ -81,7 +81,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
 
     initSequence() {
         if(this.sentFileIds || this.recvFilePaths) {
-            //	nothing to do here; move along (we're just falling through)
+            //  nothing to do here; move along (we're just falling through)
             this.prevMenu();
         } else {
             super.initSequence();
@@ -94,15 +94,15 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.allViews = new ViewController( { client : self.client } );
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu
+                            callingMenu     : self,
+                            mciMap          : mciData.menu
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -110,8 +110,8 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
                     function populateList(callback) {
                         const protListView = vc.getView(MciViewIds.protList);
 
-                        const protListFormat 		= self.config.protListFormat || '{name}';
-                        const protListFocusFormat	= self.config.protListFocusFormat || protListFormat;
+                        const protListFormat        = self.config.protListFormat || '{name}';
+                        const protListFocusFormat   = self.config.protListFocusFormat || protListFormat;
 
                         protListView.setItems(self.protocols.map(p => stringFormat(protListFormat, p) ) );
                         protListView.setFocusItems(self.protocols.map(p => stringFormat(protListFocusFormat, p) ) );
@@ -131,22 +131,22 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
     loadAvailProtocols() {
         this.protocols = _.map(Config().fileTransferProtocols, (protInfo, protocol) => {
             return {
-                protocol	: protocol,
-                name		: protInfo.name,
-                hasBatch	: _.has(protInfo, 'external.recvArgs'),
-                hasNonBatch	: _.has(protInfo, 'external.recvArgsNonBatch'),
-                sort		: protInfo.sort,
+                protocol    : protocol,
+                name        : protInfo.name,
+                hasBatch    : _.has(protInfo, 'external.recvArgs'),
+                hasNonBatch : _.has(protInfo, 'external.recvArgsNonBatch'),
+                sort        : protInfo.sort,
             };
         });
 
-        //	Filter out batch vs non-batch only protocols
-        if(this.extraArgs.recvFileName) {	//	non-batch aka non-blind
+        //  Filter out batch vs non-batch only protocols
+        if(this.extraArgs.recvFileName) {   //  non-batch aka non-blind
             this.protocols = this.protocols.filter( prot => prot.hasNonBatch );
         } else {
             this.protocols = this.protocols.filter( prot => prot.hasBatch );
         }
 
-        //	natural sort taking explicit orders into consideration
+        //  natural sort taking explicit orders into consideration
         this.protocols.sort( (a, b) => {
             if(_.isNumber(a.sort) && _.isNumber(b.sort)) {
                 return a.sort - b.sort;
diff --git a/core/file_util.js b/core/file_util.js
index 428622da..64167771 100644
--- a/core/file_util.js
+++ b/core/file_util.js
@@ -1,28 +1,28 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const EnigAssert	= require('./enigma_assert.js');
+//  ENiGMA½
+const EnigAssert    = require('./enigma_assert.js');
 
-//	deps
-const fse			= require('fs-extra');
-const paths			= require('path');
-const async			= require('async');
+//  deps
+const fse           = require('fs-extra');
+const paths         = require('path');
+const async         = require('async');
 
-exports.moveFileWithCollisionHandling		= moveFileWithCollisionHandling;
-exports.copyFileWithCollisionHandling		= copyFileWithCollisionHandling;
-exports.pathWithTerminatingSeparator		= pathWithTerminatingSeparator;
+exports.moveFileWithCollisionHandling       = moveFileWithCollisionHandling;
+exports.copyFileWithCollisionHandling       = copyFileWithCollisionHandling;
+exports.pathWithTerminatingSeparator        = pathWithTerminatingSeparator;
 
 function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
-    operation			= operation || 'copy';
-    const dstPath		= paths.dirname(dst);
-    const dstFileExt	= paths.extname(dst);
-    const dstFileSuffix	= paths.basename(dst, dstFileExt);
+    operation           = operation || 'copy';
+    const dstPath       = paths.dirname(dst);
+    const dstFileExt    = paths.extname(dst);
+    const dstFileSuffix = paths.basename(dst, dstFileExt);
 
     EnigAssert('move' === operation || 'copy' === operation);
 
-    let renameIndex		= 0;
-    let opOk			= false;
+    let renameIndex     = 0;
+    let opOk            = false;
     let tryDstPath;
 
     function tryOperation(src, dst, callback) {
@@ -38,10 +38,10 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
     }
 
     async.until(
-        () => opOk,	//	until moved OK
+        () => opOk, //  until moved OK
         (cb) => {
             if(0 === renameIndex) {
-                //	try originally supplied path first
+                //  try originally supplied path first
                 tryDstPath = dst;
             } else {
                 tryDstPath = paths.join(dstPath, `${dstFileSuffix}(${renameIndex})${dstFileExt}`);
@@ -49,11 +49,11 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
 
             tryOperation(src, tryDstPath, err => {
                 if(err) {
-                    //	for some reason fs-extra copy doesn't pass err.code
-                    //	:TODO: this is dangerous: submit a PR to fs-extra to set EEXIST
+                    //  for some reason fs-extra copy doesn't pass err.code
+                    //  :TODO: this is dangerous: submit a PR to fs-extra to set EEXIST
                     if('EEXIST' === err.code || 'copy' === operation) {
                         renameIndex += 1;
-                        return cb(null);	//	keep trying
+                        return cb(null);    //  keep trying
                     }
 
                     return cb(err);
@@ -70,8 +70,8 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
 }
 
 //
-//	Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
-//	in the case of collisions.
+//  Move |src| -> |dst| renaming to file(1).ext, file(2).ext, etc.
+//  in the case of collisions.
 //
 function moveFileWithCollisionHandling(src, dst, cb) {
     return moveOrCopyFileWithCollisionHandling(src, dst, 'move', cb);
diff --git a/core/fnv1a.js b/core/fnv1a.js
index 53400a66..9acc8f27 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -1,9 +1,9 @@
 /* jslint node: true */
 'use strict';
 
-let _		= require('lodash');
+let _       = require('lodash');
 
-//	FNV-1a based on work here: https://github.com/wiedi/node-fnv
+//  FNV-1a based on work here: https://github.com/wiedi/node-fnv
 module.exports = class FNV1a {
     constructor(data) {
         this.hash = 0x811c9dc5;
@@ -29,8 +29,8 @@ module.exports = class FNV1a {
         for(let b of data) {
             this.hash = this.hash ^ b;
             this.hash +=
-				(this.hash << 24) + (this.hash << 8) + (this.hash << 7) +
-				(this.hash << 4) + (this.hash << 1);
+                (this.hash << 24) + (this.hash << 8) + (this.hash << 7) +
+                (this.hash << 4) + (this.hash << 1);
         }
 
         return this;
diff --git a/core/fse.js b/core/fse.js
index 6dea6a1b..7d3565ad 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -1,118 +1,118 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const ansi							= require('./ansi_term.js');
-const theme							= require('./theme.js');
-const Message						= require('./message.js');
-const updateMessageAreaLastReadId	= require('./message_area.js').updateMessageAreaLastReadId;
-const getMessageAreaByTag			= require('./message_area.js').getMessageAreaByTag;
-const User							= require('./user.js');
-const StatLog						= require('./stat_log.js');
-const stringFormat					= require('./string_format.js');
-const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
-const { isAnsi, cleanControlCodes, insert }	= require('./string_util.js');
-const Config						= require('./config.js').get;
-const { getAddressedToInfo } 		= require('./mail_util.js');
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const ansi                          = require('./ansi_term.js');
+const theme                         = require('./theme.js');
+const Message                       = require('./message.js');
+const updateMessageAreaLastReadId   = require('./message_area.js').updateMessageAreaLastReadId;
+const getMessageAreaByTag           = require('./message_area.js').getMessageAreaByTag;
+const User                          = require('./user.js');
+const StatLog                       = require('./stat_log.js');
+const stringFormat                  = require('./string_format.js');
+const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
+const { isAnsi, cleanControlCodes, insert } = require('./string_util.js');
+const Config                        = require('./config.js').get;
+const { getAddressedToInfo }        = require('./mail_util.js');
 
-//	deps
-const async							= require('async');
-const assert						= require('assert');
-const _								= require('lodash');
-const moment						= require('moment');
+//  deps
+const async                         = require('async');
+const assert                        = require('assert');
+const _                             = require('lodash');
+const moment                        = require('moment');
 
 exports.moduleInfo = {
-    name	: 'Full Screen Editor (FSE)',
-    desc	: 'A full screen editor/viewer',
-    author	: 'NuSkooler',
+    name    : 'Full Screen Editor (FSE)',
+    desc    : 'A full screen editor/viewer',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
     header : {
-        from 				: 1,
-        to					: 2,
-        subject				: 3,
-        errorMsg			: 4,
-        modTimestamp		: 5,
-        msgNum				: 6,
-        msgTotal			: 7,
+        from                : 1,
+        to                  : 2,
+        subject             : 3,
+        errorMsg            : 4,
+        modTimestamp        : 5,
+        msgNum              : 6,
+        msgTotal            : 7,
 
-        customRangeStart	: 10,	//	10+ = customs
+        customRangeStart    : 10,   //  10+ = customs
     },
 
     body : {
-        message	: 1,
+        message : 1,
     },
 
-    //	:TODO: quote builder MCIs - remove all magic #'s
+    //  :TODO: quote builder MCIs - remove all magic #'s
 
-    //	:TODO: consolidate all footer MCI's - remove all magic #'s
+    //  :TODO: consolidate all footer MCI's - remove all magic #'s
     ViewModeFooter : {
-        MsgNum			: 6,
-        MsgTotal		: 7,
-        //	:TODO: Just use custom ranges
+        MsgNum          : 6,
+        MsgTotal        : 7,
+        //  :TODO: Just use custom ranges
     },
 
     quoteBuilder : {
-        quotedMsg	: 1,
-        //	2 NYI
-        quoteLines	: 3,
+        quotedMsg   : 1,
+        //  2 NYI
+        quoteLines  : 3,
     }
 };
 
 /*
-	Custom formatting:
-	header
-		fromUserName
-		toUserName
+    Custom formatting:
+    header
+        fromUserName
+        toUserName
 
-		fromRealName (may be fromUserName) NYI
-		toRealName (may be toUserName) NYI
+        fromRealName (may be fromUserName) NYI
+        toRealName (may be toUserName) NYI
 
-		fromRemoteUser (may be "N/A")
-		toRemoteUser (may be "N/A")
-		subject
-		modTimestamp
-		msgNum
-		msgTotal (in area)
-		messageId
+        fromRemoteUser (may be "N/A")
+        toRemoteUser (may be "N/A")
+        subject
+        modTimestamp
+        msgNum
+        msgTotal (in area)
+        messageId
 */
 
-//	:TODO: convert code in this class to newer styles, conventions, etc. There is a lot of experimental stuff here that has better (DRY) alternatives
+//  :TODO: convert code in this class to newer styles, conventions, etc. There is a lot of experimental stuff here that has better (DRY) alternatives
 
 exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModule extends MessageAreaConfTempSwitcher(MenuModule) {
 
     constructor(options) {
         super(options);
 
-        const self		= this;
-        const config	= this.menuConfig.config;
+        const self      = this;
+        const config    = this.menuConfig.config;
 
         //
-        //	menuConfig.config:
-        //		editorType				: email | area
-        //		editorMode				: view | edit | quote
+        //  menuConfig.config:
+        //      editorType              : email | area
+        //      editorMode              : view | edit | quote
         //
-        //	menuConfig.config or extraArgs
-        //		messageAreaTag
-        //		messageIndex / messageTotal
-        //		toUserId
+        //  menuConfig.config or extraArgs
+        //      messageAreaTag
+        //      messageIndex / messageTotal
+        //      toUserId
         //
-        this.editorType			= config.editorType;
-        this.editorMode			= config.editorMode;
+        this.editorType         = config.editorType;
+        this.editorMode         = config.editorMode;
 
         if(config.messageAreaTag) {
-            //	:TODO: swtich to this.config.messageAreaTag so we can follow Object.assign pattern for config/extraArgs
-            this.messageAreaTag	= config.messageAreaTag;
+            //  :TODO: swtich to this.config.messageAreaTag so we can follow Object.assign pattern for config/extraArgs
+            this.messageAreaTag = config.messageAreaTag;
         }
 
-        this.messageIndex		= config.messageIndex || 0;
-        this.messageTotal		= config.messageTotal || 0;
-        this.toUserId			= config.toUserId || 0;
+        this.messageIndex       = config.messageIndex || 0;
+        this.messageTotal       = config.messageTotal || 0;
+        this.toUserId           = config.toUserId || 0;
 
-        //	extraArgs can override some config
+        //  extraArgs can override some config
         if(_.isObject(options.extraArgs)) {
             if(options.extraArgs.messageAreaTag) {
                 this.messageAreaTag = options.extraArgs.messageAreaTag;
@@ -140,7 +140,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
         this.menuMethods = {
             //
-            //	Validation stuff
+            //  Validation stuff
             //
             viewValidationListener : function(err, cb) {
                 var errMsgView = self.viewControllers.header.getView(MciViewIds.header.errorMsg);
@@ -150,7 +150,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         errMsgView.setText(err.message);
 
                         if(MciViewIds.header.subject === err.view.getId()) {
-                            //	:TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
+                            //  :TODO: for "area" mode, should probably just bail if this is emtpy (e.g. cancel)
                         }
                     } else {
                         errMsgView.clearText();
@@ -201,19 +201,19 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 if(self.newQuoteBlock) {
                     self.newQuoteBlock = false;
 
-                    //	:TODO: If replying to ANSI, add a blank sepration line here
+                    //  :TODO: If replying to ANSI, add a blank sepration line here
 
                     quoteMsgView.addText(self.getQuoteByHeader());
                 }
 
                 const quoteListView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
-                const quoteText		= quoteListView.getItem(formData.value.quote);
+                const quoteText     = quoteListView.getItem(formData.value.quote);
 
                 quoteMsgView.addText(quoteText);
 
                 //
-                //	If this is *not* the last item, advance. Otherwise, do nothing as we
-                //	don't want to jump back to the top and repeat already quoted lines
+                //  If this is *not* the last item, advance. Otherwise, do nothing as we
+                //  don't want to jump back to the top and repeat already quoted lines
                 //
 
                 if(quoteListView.getData() !== quoteListView.getCount() - 1) {
@@ -229,18 +229,18 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 return cb(null);
             },
             /*
-			replyDiscard : function(formData, extraArgs) {
-				//	:TODO: need to prompt yes/no
-				//	:TODO: @method for fallback would be better
-				self.prevMenu();
-			},
-			*/
+            replyDiscard : function(formData, extraArgs) {
+                //  :TODO: need to prompt yes/no
+                //  :TODO: @method for fallback would be better
+                self.prevMenu();
+            },
+            */
             editModeMenuHelp : function(formData, extraArgs, cb) {
                 self.viewControllers.footerEditorMenu.setFocus(false);
                 return self.displayHelp(cb);
             },
             ///////////////////////////////////////////////////////////////////////
-            //	View Mode
+            //  View Mode
             ///////////////////////////////////////////////////////////////////////
             viewModeMenuHelp : function(formData, extraArgs, cb) {
                 self.viewControllers.footerView.setFocus(false);
@@ -266,43 +266,43 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     }
 
     getFooterName() {
-        return 'footer' + _.upperFirst(this.footerMode);	//	e.g. 'footerEditor', 'footerEditorMenu', ...
+        return 'footer' + _.upperFirst(this.footerMode);    //  e.g. 'footerEditor', 'footerEditorMenu', ...
     }
 
     getFormId(name) {
         return {
-            header				: 0,
-            body				: 1,
-            footerEditor		: 2,
-            footerEditorMenu	: 3,
-            footerView			: 4,
-            quoteBuilder		: 5,
+            header              : 0,
+            body                : 1,
+            footerEditor        : 2,
+            footerEditorMenu    : 3,
+            footerView          : 4,
+            quoteBuilder        : 5,
 
-            help				: 50,
+            help                : 50,
         }[name];
     }
 
     getHeaderFormatObj() {
-        const remoteUserNotAvail 	= this.menuConfig.config.remoteUserNotAvail || 'N/A';
-        const localUserIdNotAvail	= this.menuConfig.config.localUserIdNotAvail || 'N/A';
-        const modTimestampFormat	= this.menuConfig.config.modTimestampFormat || this.client.currentTheme.helpers.getDateTimeFormat();
+        const remoteUserNotAvail    = this.menuConfig.config.remoteUserNotAvail || 'N/A';
+        const localUserIdNotAvail   = this.menuConfig.config.localUserIdNotAvail || 'N/A';
+        const modTimestampFormat    = this.menuConfig.config.modTimestampFormat || this.client.currentTheme.helpers.getDateTimeFormat();
 
         return {
-            //	:TODO: ensure we show real names for form/to if they are enforced in the area
-            fromUserName		: this.message.fromUserName,
-            toUserName			: this.message.toUserName,
-            //	:TODO:
+            //  :TODO: ensure we show real names for form/to if they are enforced in the area
+            fromUserName        : this.message.fromUserName,
+            toUserName          : this.message.toUserName,
+            //  :TODO:
             //fromRealName
             //toRealName
-            fromUserId			: _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
-            toUserId			: _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
-            fromRemoteUser		: _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
-            toRemoteUser		: _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
-            subject				: this.message.subject,
-            modTimestamp		: this.message.modTimestamp.format(modTimestampFormat),
-            msgNum				: this.messageIndex + 1,
-            msgTotal			: this.messageTotal,
-            messageId			: this.message.messageId,
+            fromUserId          : _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
+            toUserId            : _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
+            fromRemoteUser      : _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
+            toRemoteUser        : _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
+            subject             : this.message.subject,
+            modTimestamp        : this.message.modTimestamp.format(modTimestampFormat),
+            msgNum              : this.messageIndex + 1,
+            msgTotal            : this.messageTotal,
+            messageId           : this.message.messageId,
         };
     }
 
@@ -317,26 +317,26 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         const headerValues = this.viewControllers.header.getFormData().value;
 
         const msgOpts = {
-            areaTag			: this.messageAreaTag,
-            toUserName		: headerValues.to,
-            fromUserName	: this.client.user.username,
-            subject			: headerValues.subject,
-            //	:TODO: don't hard code 1 here:
-            message			: this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
+            areaTag         : this.messageAreaTag,
+            toUserName      : headerValues.to,
+            fromUserName    : this.client.user.username,
+            subject         : headerValues.subject,
+            //  :TODO: don't hard code 1 here:
+            message         : this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
         };
 
         if(this.isReply()) {
-            msgOpts.replyToMsgId	= this.replyToMessage.messageId;
+            msgOpts.replyToMsgId    = this.replyToMessage.messageId;
 
             if(this.replyIsAnsi) {
                 //
-                //	Ensure first characters indicate ANSI for detection down
-                //	the line (other boards/etc.). We also set explicit_encoding
-                //	to packetAnsiMsgEncoding (generally cp437) as various boards
-                //	really don't like ANSI messages in UTF-8 encoding (they should!)
+                //  Ensure first characters indicate ANSI for detection down
+                //  the line (other boards/etc.). We also set explicit_encoding
+                //  to packetAnsiMsgEncoding (generally cp437) as various boards
+                //  really don't like ANSI messages in UTF-8 encoding (they should!)
                 //
-                msgOpts.meta		= { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
-                msgOpts.message		= `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
+                msgOpts.meta        = { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
+                msgOpts.message     = `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
             }
         }
 
@@ -363,18 +363,18 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 this.initHeaderViewMode();
                 this.initFooterViewMode();
 
-                const bodyMessageView	= this.viewControllers.body.getView(MciViewIds.body.message);
-                let msg					= this.message.message;
+                const bodyMessageView   = this.viewControllers.body.getView(MciViewIds.body.message);
+                let msg                 = this.message.message;
 
                 if(bodyMessageView && _.has(this, 'message.message')) {
                     //
-                    //	We handle ANSI messages differently than standard messages -- this is required as
-                    //	we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
-                    //	how the author wanted it
+                    //  We handle ANSI messages differently than standard messages -- this is required as
+                    //  we don't want to do things like word wrap ANSI, but instead, trust that it's formatted
+                    //  how the author wanted it
                     //
                     if(isAnsi(msg)) {
                         //
-                        //	Find tearline - we want to color it differently.
+                        //  Find tearline - we want to color it differently.
                         //
                         const tearLinePos = this.message.getTearLinePosition(msg);
 
@@ -383,10 +383,10 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         }
 
                         bodyMessageView.setAnsi(
-                            msg.replace(/\r?\n/g, '\r\n'),	//	messages are stored with CRLF -> LF
+                            msg.replace(/\r?\n/g, '\r\n'),  //  messages are stored with CRLF -> LF
                             {
-                                prepped				: false,
-                                forceLineTerm		: true,
+                                prepped             : false,
+                                forceLineTerm       : true,
                             }
                         );
                     } else {
@@ -404,7 +404,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             [
                 function buildIfNecessary(callback) {
                     if(self.isEditMode()) {
-                        return self.buildMessage(callback);	//	creates initial self.message
+                        return self.buildMessage(callback); //  creates initial self.message
                     }
 
                     return callback(null);
@@ -422,9 +422,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                     }
 
                     //
-                    //	If the message we're replying to is from a remote user
-                    //	don't try to look up the local user ID. Instead, mark the mail
-                    //	for export with the remote to address.
+                    //  If the message we're replying to is from a remote user
+                    //  don't try to look up the local user ID. Instead, mark the mail
+                    //  for export with the remote to address.
                     //
                     if(self.replyToMessage && self.replyToMessage.isFromRemoteUser()) {
                         self.message.setRemoteToUser(self.replyToMessage.meta.System[Message.SystemMetaNames.RemoteFromUser]);
@@ -433,9 +433,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                     }
 
                     //
-                    //	Detect if the user is attempting to send to a remote mail type that we support
+                    //  Detect if the user is attempting to send to a remote mail type that we support
                     //
-                    //	:TODO: how to plug in support without tying to various types here? isSupportedExteranlType() or such
+                    //  :TODO: how to plug in support without tying to various types here? isSupportedExteranlType() or such
                     const addressedToInfo = getAddressedToInfo(self.message.toUserName);
                     if(addressedToInfo.name && Message.AddressFlavor.FTN === addressedToInfo.flavor) {
                         self.message.setRemoteToUser(addressedToInfo.remote);
@@ -444,7 +444,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         return callback(null);
                     }
 
-                    //	we need to look it up
+                    //  we need to look it up
                     User.getUserIdAndNameByLookup(self.message.toUserName, (err, toUserId) => {
                         if(err) {
                             return callback(err);
@@ -466,7 +466,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             if(cb) {
                 cb(null);
             }
-            return;	//	don't inc stats for private messages
+            return; //  don't inc stats for private messages
         }
 
         return StatLog.incrementUserStat(this.client.user, 'post_count', 1, cb);
@@ -479,9 +479,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             [
                 function moveToFooterPosition(callback) {
                     //
-                    //	Calculate footer starting position
+                    //  Calculate footer starting position
                     //
-                    //	row = (header height + body height)
+                    //  row = (header height + body height)
                     //
                     var footerRow = self.header.height + self.body.height;
                     self.client.term.rawWrite(ansi.goto(footerRow, 1));
@@ -489,10 +489,10 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 },
                 function clearFooterArea(callback) {
                     if(options.clear) {
-                        //	footer up to 3 rows in height
+                        //  footer up to 3 rows in height
 
-                        //	:TODO: We'd like to delete up to N rows, but this does not work
-                        //	in NetRunner:
+                        //  :TODO: We'd like to delete up to N rows, but this does not work
+                        //  in NetRunner:
                         self.client.term.rawWrite(ansi.reset() + ansi.deleteLine(3));
 
                         self.client.term.rawWrite(ansi.reset() + ansi.eraseLine(2));
@@ -519,9 +519,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     }
 
     redrawScreen(cb) {
-        var comps	= [ 'header', 'body' ];
-        const self	= this;
-        var art		= self.menuConfig.config.art;
+        var comps   = [ 'header', 'body' ];
+        const self  = this;
+        var art     = self.menuConfig.config.art;
 
         self.client.term.rawWrite(ansi.resetScreen());
 
@@ -543,7 +543,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                     });
                 },
                 function displayFooter(callback) {
-                    //	we have to treat the footer special
+                    //  we have to treat the footer special
                     self.redrawFooter( { clear : false, footerName : self.getFooterName() }, function footerDisplayed(err) {
                         callback(err);
                     });
@@ -577,9 +577,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
             if(_.isUndefined(this.viewControllers[footerName])) {
                 var menuLoadOpts = {
-                    callingMenu	: this,
-                    formId		: formId,
-                    mciMap		: artData.mciMap
+                    callingMenu : this,
+                    formId      : formId,
+                    mciMap      : artData.mciMap
                 };
 
                 this.addViewController(
@@ -597,8 +597,8 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
     initSequence() {
         var mciData = { };
-        const self	= this;
-        var art		= self.menuConfig.config.art;
+        const self  = this;
+        var art     = self.menuConfig.config.art;
 
         assert(_.isObject(art));
 
@@ -659,7 +659,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             [
                 function header(callback) {
                     menuLoadOpts.formId = self.getFormId('header');
-                    menuLoadOpts.mciMap	= mciData.header.mciMap;
+                    menuLoadOpts.mciMap = mciData.header.mciMap;
 
                     self.addViewController(
                         'header',
@@ -669,8 +669,8 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                     });
                 },
                 function body(callback) {
-                    menuLoadOpts.formId	= self.getFormId('body');
-                    menuLoadOpts.mciMap	= mciData.body.mciMap;
+                    menuLoadOpts.formId = self.getFormId('body');
+                    menuLoadOpts.mciMap = mciData.body.mciMap;
 
                     self.addViewController(
                         'body',
@@ -698,12 +698,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                     from.acceptsFocus = false;
                     //from.setText(self.client.user.username);
 
-                    //	:TODO: make this a method
+                    //  :TODO: make this a method
                     var body = self.viewControllers.body.getView(MciViewIds.body.message);
                     self.updateTextEditMode(body.getTextEditMode());
                     self.updateEditModePosition(body.getEditPosition());
 
-                    //	:TODO: If view mode, set body to read only... which needs an impl...
+                    //  :TODO: If view mode, set body to read only... which needs an impl...
 
                     callback(null);
                 },
@@ -767,22 +767,22 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     mciReadyHandler(mciData, cb) {
 
         this.createInitialViews(mciData, err => {
-            //	:TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in
-            //	place - if this is for existing usernames else validate spec
+            //  :TODO: Can probably be replaced with @systemMethod:validateUserNameExists when the framework is in
+            //  place - if this is for existing usernames else validate spec
 
             /*
-			self.viewControllers.header.on('leave', function headerViewLeave(view) {
+            self.viewControllers.header.on('leave', function headerViewLeave(view) {
 
-				if(2 === view.id) {	//	"to" field
-					self.validateToUserName(view.getData(), function result(err) {
-						if(err) {
-							//	:TODO: display a error in a %TL area or such
-							view.clearText();
-							self.viewControllers.headers.switchFocus(2);
-						}
-					});
-				}
-			});*/
+                if(2 === view.id) { //  "to" field
+                    self.validateToUserName(view.getData(), function result(err) {
+                        if(err) {
+                            //  :TODO: display a error in a %TL area or such
+                            view.clearText();
+                            self.viewControllers.headers.switchFocus(2);
+                        }
+                    });
+                }
+            });*/
 
             cb(err);
         });
@@ -793,7 +793,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             var posView = this.viewControllers.footerEditor.getView(1);
             if(posView) {
                 this.client.term.rawWrite(ansi.savePos());
-                //	:TODO: Use new formatting techniques here, e.g. state.cursorPositionRow, cursorPositionCol and cursorPositionFormat
+                //  :TODO: Use new formatting techniques here, e.g. state.cursorPositionRow, cursorPositionCol and cursorPositionFormat
                 posView.setText(_.padStart(String(pos.row + 1), 2, '0') + ',' + _.padEnd(String(pos.col + 1), 2, '0'));
                 this.client.term.rawWrite(ansi.restorePos());
             }
@@ -816,16 +816,16 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     }
 
     initHeaderViewMode() {
-        this.setHeaderText(MciViewIds.header.from,			this.message.fromUserName);
-        this.setHeaderText(MciViewIds.header.to,			this.message.toUserName);
-        this.setHeaderText(MciViewIds.header.subject,		this.message.subject);
-        this.setHeaderText(MciViewIds.header.modTimestamp,	moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
-        this.setHeaderText(MciViewIds.header.msgNum,		(this.messageIndex + 1).toString());
-        this.setHeaderText(MciViewIds.header.msgTotal,		this.messageTotal.toString());
+        this.setHeaderText(MciViewIds.header.from,          this.message.fromUserName);
+        this.setHeaderText(MciViewIds.header.to,            this.message.toUserName);
+        this.setHeaderText(MciViewIds.header.subject,       this.message.subject);
+        this.setHeaderText(MciViewIds.header.modTimestamp,  moment(this.message.modTimestamp).format(this.client.currentTheme.helpers.getDateTimeFormat()));
+        this.setHeaderText(MciViewIds.header.msgNum,        (this.messageIndex + 1).toString());
+        this.setHeaderText(MciViewIds.header.msgTotal,      this.messageTotal.toString());
 
         this.updateCustomViewTextsWithFilter('header', MciViewIds.header.customRangeStart, this.getHeaderFormatObj());
 
-        //	if we changed conf/area we need to update any related standard MCI view
+        //  if we changed conf/area we need to update any related standard MCI view
         this.refreshPredefinedMciViewsByCode('header', [ 'MA', 'MC', 'ML', 'CM' ] );
     }
 
@@ -835,15 +835,15 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         this.setHeaderText(MciViewIds.header.to, this.replyToMessage.fromUserName);
 
         //
-        //	We want to prefix the subject with "RE: " only if it's not already
-        //	that way -- avoid RE: RE: RE: RE: ...
+        //  We want to prefix the subject with "RE: " only if it's not already
+        //  that way -- avoid RE: RE: RE: RE: ...
         //
         let newSubj = this.replyToMessage.subject;
         if(false === /^RE:\s+/i.test(newSubj)) {
             newSubj = `RE: ${newSubj}`;
         }
 
-        this.setHeaderText(MciViewIds.header.subject,	newSubj);
+        this.setHeaderText(MciViewIds.header.subject,   newSubj);
     }
 
     initFooterViewMode() {
@@ -869,7 +869,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
     displayQuoteBuilder() {
         //
-        //	Clear body area
+        //  Clear body area
         //
         this.newQuoteBlock = true;
         const self = this;
@@ -877,10 +877,10 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         async.waterfall(
             [
                 function clearAndDisplayArt(callback) {
-                    //	:TODO: NetRunner does NOT support delete line, so this does not work:
+                    //  :TODO: NetRunner does NOT support delete line, so this does not work:
                     self.client.term.rawWrite(
                         ansi.goto(self.header.height + 1, 1) +
-						ansi.deleteLine((self.client.term.termHeight - self.header.height) - 1));
+                        ansi.deleteLine((self.client.term.termHeight - self.header.height) - 1));
 
                     theme.displayThemeArt( { name : self.menuConfig.config.art.quote, client : self.client }, function displayed(err, artData) {
                         callback(err, artData);
@@ -891,9 +891,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
                     if(_.isUndefined(self.viewControllers.quoteBuilder)) {
                         var menuLoadOpts = {
-                            callingMenu	: self,
-                            formId		: formId,
-                            mciMap		: artData.mciMap,
+                            callingMenu : self,
+                            formId      : formId,
+                            mciMap      : artData.mciMap,
                         };
 
                         self.addViewController(
@@ -909,16 +909,16 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 },
                 function loadQuoteLines(callback) {
                     const quoteView = self.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quoteLines);
-                    const bodyView	= self.viewControllers.body.getView(MciViewIds.body.message);
+                    const bodyView  = self.viewControllers.body.getView(MciViewIds.body.message);
 
                     self.replyToMessage.getQuoteLines(
                         {
-                            termWidth			: self.client.term.termWidth,
-                            termHeight			: self.client.term.termHeight,
-                            cols				: quoteView.dimens.width,
-                            startCol			: quoteView.position.col,
-                            ansiResetSgr		: bodyView.styleSGR1,
-                            ansiFocusPrefixSgr	: quoteView.styleSGR2,
+                            termWidth           : self.client.term.termWidth,
+                            termHeight          : self.client.term.termHeight,
+                            cols                : quoteView.dimens.width,
+                            startCol            : quoteView.position.col,
+                            ansiResetSgr        : bodyView.styleSGR1,
+                            ansiFocusPrefixSgr  : quoteView.styleSGR2,
                         },
                         (err, quoteLines, focusQuoteLines, replyIsAnsi) => {
                             if(err) {
@@ -959,16 +959,16 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     }
 
     /*
-	this.observeViewPosition = function() {
-		self.viewControllers.body.getView(MciViewIds.body.message).on('edit position', function positionUpdate(pos) {
-			console.log(pos.percent + ' / ' + pos.below)
-		});
-	};
-	*/
+    this.observeViewPosition = function() {
+        self.viewControllers.body.getView(MciViewIds.body.message).on('edit position', function positionUpdate(pos) {
+            console.log(pos.percent + ' / ' + pos.below)
+        });
+    };
+    */
 
     switchToHeader() {
         this.viewControllers.body.setFocus(false);
-        this.viewControllers.header.switchFocus(2);	//	to
+        this.viewControllers.header.switchFocus(2); //  to
     }
 
     switchToBody() {
@@ -982,7 +982,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         this.viewControllers.header.setFocus(false);
         this.viewControllers.body.setFocus(false);
 
-        this.viewControllers[this.getFooterName()].switchFocus(1);	//	HM1
+        this.viewControllers[this.getFooterName()].switchFocus(1);  //  HM1
     }
 
     switchFromQuoteBuilderToBody() {
@@ -991,7 +991,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         body.redraw();
         this.viewControllers.body.switchFocus(1);
 
-        //	:TODO: create method (DRY)
+        //  :TODO: create method (DRY)
 
         this.updateTextEditMode(body.getTextEditMode());
         this.updateEditModePosition(body.getEditPosition());
@@ -1000,11 +1000,11 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     }
 
     quoteBuilderFinalize() {
-        //	:TODO: fix magic #'s
-        const quoteMsgView	= this.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
-        const msgView		= this.viewControllers.body.getView(MciViewIds.body.message);
+        //  :TODO: fix magic #'s
+        const quoteMsgView  = this.viewControllers.quoteBuilder.getView(MciViewIds.quoteBuilder.quotedMsg);
+        const msgView       = this.viewControllers.body.getView(MciViewIds.body.message);
 
-        let quoteLines 		= quoteMsgView.getData().trim();
+        let quoteLines      = quoteMsgView.getData().trim();
 
         if(quoteLines.length > 0) {
             if(this.replyIsAnsi) {
@@ -1034,8 +1034,8 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
         const dtFormat = this.menuConfig.config.quoteDateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();
         return stringFormat(quoteFormat, {
-            dateTime	: moment(this.replyToMessage.modTimestamp).format(dtFormat),
-            userName	: this.replyToMessage.fromUserName,
+            dateTime    : moment(this.replyToMessage.modTimestamp).format(dtFormat),
+            userName    : this.replyToMessage.fromUserName,
         });
     }
 
diff --git a/core/ftn_address.js b/core/ftn_address.js
index 92c37557..6751adb8 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-const _		= require('lodash');
+const _     = require('lodash');
 
 const FTN_ADDRESS_REGEXP = /^([0-9]+:)?([0-9]+)(\/[0-9]+)?(\.[0-9]+)?(@[a-z0-9\-.]+)?$/i;
 const FTN_PATTERN_REGEXP = /^([0-9*]+:)?([0-9*]+)(\/[0-9*]+)?(\.[0-9*]+)?(@[a-z0-9\-.*]+)?$/i;
@@ -25,7 +25,7 @@ module.exports = class Address {
     }
 
     isValid() {
-        //	FTN address is valid if we have at least a net/node
+        //  FTN address is valid if we have at least a net/node
         return _.isNumber(this.net) && _.isNumber(this.node);
     }
 
@@ -36,10 +36,10 @@ module.exports = class Address {
 
         return (
             this.net === other.net &&
-			this.node === other.node &&
-			this.zone === other.zone &&
-			this.point === other.point &&
-			this.domain === other.domain
+            this.node === other.node &&
+            this.zone === other.zone &&
+            this.point === other.point &&
+            this.domain === other.domain
         );
     }
 
@@ -95,36 +95,36 @@ module.exports = class Address {
     }
 
     /*
-	getMatchScore(pattern) {
-		let score = 0;
-		const addr = this.getMatchAddr(pattern);
-		if(addr) {
-			const PARTS = [ 'net', 'node', 'zone', 'point', 'domain' ];
-			for(let i = 0; i < PARTS.length; ++i) {
-				const member = PARTS[i];
-				if(this[member] === addr[member]) {
-					score += 2;
-				} else if('*' === addr[member]) {
-					score += 1;
-				} else {
-					break;
-				}
-			}
-		}
+    getMatchScore(pattern) {
+        let score = 0;
+        const addr = this.getMatchAddr(pattern);
+        if(addr) {
+            const PARTS = [ 'net', 'node', 'zone', 'point', 'domain' ];
+            for(let i = 0; i < PARTS.length; ++i) {
+                const member = PARTS[i];
+                if(this[member] === addr[member]) {
+                    score += 2;
+                } else if('*' === addr[member]) {
+                    score += 1;
+                } else {
+                    break;
+                }
+            }
+        }
 
-		return score;
-	}
-	*/
+        return score;
+    }
+    */
 
     isPatternMatch(pattern) {
         const addr = this.getMatchAddr(pattern);
         if(addr) {
             return (
                 ('*' === addr.net || this.net === addr.net) &&
-				('*' === addr.node || this.node === addr.node) &&
-				('*' === addr.zone || this.zone === addr.zone) &&
-				('*' === addr.point || this.point === addr.point) &&
-				('*' === addr.domain || this.domain === addr.domain)
+                ('*' === addr.node || this.node === addr.node) &&
+                ('*' === addr.zone || this.zone === addr.zone) &&
+                ('*' === addr.point || this.point === addr.point) &&
+                ('*' === addr.domain || this.domain === addr.domain)
             );
         }
 
@@ -137,8 +137,8 @@ module.exports = class Address {
         if(m) {
             //  start with a 2D
             let addr = {
-                net		: parseInt(m[2]),
-                node	: parseInt(m[3].substr(1)),
+                net     : parseInt(m[2]),
+                node    : parseInt(m[3].substr(1)),
             };
 
             //  3D: Addition of zone if present
@@ -165,14 +165,14 @@ module.exports = class Address {
 
         let addrStr = `${this.zone}:${this.net}`;
 
-        //	allow for e.g. '4D' or 5
+        //  allow for e.g. '4D' or 5
         const dim = parseInt(dimensions.toString()[0]);
 
         if(dim >= 3) {
             addrStr += `/${this.node}`;
         }
 
-        //	missing & .0 are equiv for point
+        //  missing & .0 are equiv for point
         if(dim >= 4 && this.point) {
             addrStr += `.${this.point}`;
         }
diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 6c49c1c6..cc0dde3e 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -1,75 +1,75 @@
 /* jslint node: true */
 'use strict';
 
-const ftn			= require('./ftn_util.js');
-const Message		= require('./message.js');
-const sauce			= require('./sauce.js');
-const Address		= require('./ftn_address.js');
-const strUtil		= require('./string_util.js');
-const Log			= require('./logger.js').log;
-const ansiPrep		= require('./ansi_prep.js');
-const Errors		= require('./enig_error.js').Errors;
+const ftn           = require('./ftn_util.js');
+const Message       = require('./message.js');
+const sauce         = require('./sauce.js');
+const Address       = require('./ftn_address.js');
+const strUtil       = require('./string_util.js');
+const Log           = require('./logger.js').log;
+const ansiPrep      = require('./ansi_prep.js');
+const Errors        = require('./enig_error.js').Errors;
 
-const _				= require('lodash');
-const assert		= require('assert');
-const { Parser }	= require('binary-parser');
-const fs			= require('graceful-fs');
-const async			= require('async');
-const iconv			= require('iconv-lite');
-const moment		= require('moment');
+const _             = require('lodash');
+const assert        = require('assert');
+const { Parser }    = require('binary-parser');
+const fs            = require('graceful-fs');
+const async         = require('async');
+const iconv         = require('iconv-lite');
+const moment        = require('moment');
 
-exports.Packet			= Packet;
+exports.Packet          = Packet;
 
-const FTN_PACKET_HEADER_SIZE	= 58;	//	fixed header size
-const FTN_PACKET_HEADER_TYPE	= 2;
-const FTN_PACKET_MESSAGE_TYPE	= 2;
-const FTN_PACKET_BAUD_TYPE_2_2	= 2;
+const FTN_PACKET_HEADER_SIZE    = 58;   //  fixed header size
+const FTN_PACKET_HEADER_TYPE    = 2;
+const FTN_PACKET_MESSAGE_TYPE   = 2;
+const FTN_PACKET_BAUD_TYPE_2_2  = 2;
 
-//	SAUCE magic header + version ("00")
+//  SAUCE magic header + version ("00")
 const FTN_MESSAGE_SAUCE_HEADER = Buffer.from('SAUCE00');
 
-const FTN_MESSAGE_KLUDGE_PREFIX	= '\x01';
+const FTN_MESSAGE_KLUDGE_PREFIX = '\x01';
 
 class PacketHeader {
     constructor(origAddr, destAddr, version, createdMoment) {
         const EMPTY_ADDRESS = {
-            node	: 0,
-            net		: 0,
-            zone	: 0,
-            point	: 0,
+            node    : 0,
+            net     : 0,
+            zone    : 0,
+            point   : 0,
         };
 
-        this.version 		= version || '2+';
-        this.origAddress 	= origAddr || EMPTY_ADDRESS;
-        this.destAddress 	= destAddr || EMPTY_ADDRESS;
-        this.created		= createdMoment || moment();
+        this.version        = version || '2+';
+        this.origAddress    = origAddr || EMPTY_ADDRESS;
+        this.destAddress    = destAddr || EMPTY_ADDRESS;
+        this.created        = createdMoment || moment();
 
-        //	uncommon to set the following explicitly
-        this.prodCodeLo			= 0xfe;	//	http://ftsc.org/docs/fta-1005.003
-        this.prodRevLo			= 0;
-        this.baud				= 0;
-        this.packetType			= FTN_PACKET_HEADER_TYPE;
-        this.password			= '';
-        this.prodData 			= 0x47694e45;	//	"ENiG"
+        //  uncommon to set the following explicitly
+        this.prodCodeLo         = 0xfe; //  http://ftsc.org/docs/fta-1005.003
+        this.prodRevLo          = 0;
+        this.baud               = 0;
+        this.packetType         = FTN_PACKET_HEADER_TYPE;
+        this.password           = '';
+        this.prodData           = 0x47694e45;   //  "ENiG"
 
-        this.capWord			= 0x0001;
-        this.capWordValidate	= ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);	//	swap
+        this.capWord            = 0x0001;
+        this.capWordValidate    = ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);  //  swap
 
-        this.prodCodeHi			= 0xfe;	//	see above
-        this.prodRevHi			= 0;
+        this.prodCodeHi         = 0xfe; //  see above
+        this.prodRevHi          = 0;
     }
 
     get origAddress() {
         let addr = new Address({
-            node	: this.origNode,
-            zone	: this.origZone,
+            node    : this.origNode,
+            zone    : this.origZone,
         });
 
         if(this.origPoint) {
-            addr.point	= this.origPoint;
-            addr.net	= this.auxNet;
+            addr.point  = this.origPoint;
+            addr.net    = this.auxNet;
         } else {
-            addr.net	= this.origNet;
+            addr.net    = this.origNet;
         }
 
         return addr;
@@ -82,29 +82,29 @@ class PacketHeader {
 
         this.origNode = address.node;
 
-        //	See FSC-48
-        //	:TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
+        //  See FSC-48
+        //  :TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
         /*if(address.point) {
-			this.auxNet		= address.origNet;
-			this.origNet	= -1;
-		} else {
-			this.origNet	= address.net;
-			this.auxNet		= 0;
-		}
-		*/
-        this.origNet		= address.net;
-        this.auxNet			= 0;
+            this.auxNet     = address.origNet;
+            this.origNet    = -1;
+        } else {
+            this.origNet    = address.net;
+            this.auxNet     = 0;
+        }
+        */
+        this.origNet        = address.net;
+        this.auxNet         = 0;
 
-        this.origZone	= address.zone;
-        this.origZone2	= address.zone;
-        this.origPoint	= address.point || 0;
+        this.origZone   = address.zone;
+        this.origZone2  = address.zone;
+        this.origPoint  = address.point || 0;
     }
 
     get destAddress() {
         let addr = new Address({
-            node	: this.destNode,
-            net		: this.destNet,
-            zone	: this.destZone,
+            node    : this.destNode,
+            net     : this.destNet,
+            zone    : this.destZone,
         });
 
         if(this.destPoint) {
@@ -119,21 +119,21 @@ class PacketHeader {
             address = Address.fromString(address);
         }
 
-        this.destNode	= address.node;
-        this.destNet	= address.net;
-        this.destZone	= address.zone;
-        this.destZone2	= address.zone;
-        this.destPoint	= address.point || 0;
+        this.destNode   = address.node;
+        this.destNet    = address.net;
+        this.destZone   = address.zone;
+        this.destZone2  = address.zone;
+        this.destPoint  = address.point || 0;
     }
 
     get created() {
         return moment({
-            year 	: this.year,
-            month	: this.month - 1,	//	moment uses 0 indexed months
-            date	: this.day,
-            hour	: this.hour,
-            minute	: this.minute,
-            second	: this.second
+            year    : this.year,
+            month   : this.month - 1,   //  moment uses 0 indexed months
+            date    : this.day,
+            hour    : this.hour,
+            minute  : this.minute,
+            second  : this.second
         });
     }
 
@@ -142,28 +142,28 @@ class PacketHeader {
             momentCreated = moment(momentCreated);
         }
 
-        this.year	= momentCreated.year();
-        this.month	= momentCreated.month() + 1;	//	moment uses 0 indexed months
-        this.day	= momentCreated.date();			//	day of month
-        this.hour	= momentCreated.hour();
-        this.minute	= momentCreated.minute();
-        this.second	= momentCreated.second();
+        this.year   = momentCreated.year();
+        this.month  = momentCreated.month() + 1;    //  moment uses 0 indexed months
+        this.day    = momentCreated.date();         //  day of month
+        this.hour   = momentCreated.hour();
+        this.minute = momentCreated.minute();
+        this.second = momentCreated.second();
     }
 }
 
 exports.PacketHeader = PacketHeader;
 
 //
-//	Read/Write FTN packets with support for the following formats:
+//  Read/Write FTN packets with support for the following formats:
 //
-//	*	Type 2 FTS-0001	@ http://ftsc.org/docs/fts-0001.016 (Obsolete)
-//	*	Type 2.2 FSC-0045	@ http://ftsc.org/docs/fsc-0045.001
-//	*	Type 2+ FSC-0039 and FSC-0048 @ http://ftsc.org/docs/fsc-0039.004
-//		and http://ftsc.org/docs/fsc-0048.002
+//  *   Type 2 FTS-0001 @ http://ftsc.org/docs/fts-0001.016 (Obsolete)
+//  *   Type 2.2 FSC-0045   @ http://ftsc.org/docs/fsc-0045.001
+//  *   Type 2+ FSC-0039 and FSC-0048 @ http://ftsc.org/docs/fsc-0039.004
+//      and http://ftsc.org/docs/fsc-0048.002
 //
-//	Additional resources:
-//	*	Writeup on differences between type 2, 2.2, and 2+:
-//		http://walon.org/pub/fidonet/FTSC-nodelists-etc./pkt-types.txt
+//  Additional resources:
+//  *   Writeup on differences between type 2, 2.2, and 2+:
+//      http://walon.org/pub/fidonet/FTSC-nodelists-etc./pkt-types.txt
 //
 function Packet(options) {
     var self = this;
@@ -189,13 +189,13 @@ function Packet(options) {
                 .uint16le('origNet')
                 .uint16le('destNet')
                 .int8('prodCodeLo')
-                .int8('prodRevLo')	//	aka serialNo
-                .buffer('password', { length : 8 })	//	can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
+                .int8('prodRevLo')  //  aka serialNo
+                .buffer('password', { length : 8 }) //  can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
                 .uint16le('origZone')
                 .uint16le('destZone')
                 //
-                //	The following is "filler" in FTS-0001, specifics in
-                //	FSC-0045 and FSC-0048
+                //  The following is "filler" in FTS-0001, specifics in
+                //  FSC-0045 and FSC-0048
                 //
                 .uint16le('auxNet')
                 .uint16le('capWordValidate')
@@ -212,7 +212,7 @@ function Packet(options) {
             return Errors.Invalid(`Unable to parse FTN packet header: ${e.message}`);
         }
 
-        //	Convert password from NULL padded array to string
+        //  Convert password from NULL padded array to string
         packetHeader.password = strUtil.stringFromNullTermBuffer(packetHeader.password, 'CP437');
 
         if(FTN_PACKET_HEADER_TYPE !== packetHeader.packetType) {
@@ -220,50 +220,50 @@ function Packet(options) {
         }
 
         //
-        //	What kind of packet do we really have here?
+        //  What kind of packet do we really have here?
         //
-        //	:TODO: adjust values based on version discovered
+        //  :TODO: adjust values based on version discovered
         if(FTN_PACKET_BAUD_TYPE_2_2 === packetHeader.baud) {
             packetHeader.version = '2.2';
 
-            //	See FSC-0045
-            packetHeader.origPoint	= packetHeader.year;
-            packetHeader.destPoint	= packetHeader.month;
+            //  See FSC-0045
+            packetHeader.origPoint  = packetHeader.year;
+            packetHeader.destPoint  = packetHeader.month;
 
             packetHeader.destDomain = packetHeader.origZone2;
-            packetHeader.origDomain	= packetHeader.auxNet;
+            packetHeader.origDomain = packetHeader.auxNet;
         } else {
             //
-            //	See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
+            //  See heuristics described in FSC-0048, "Receiving Type-2+ bundles"
             //
             const capWordValidateSwapped =
-				((packetHeader.capWordValidate & 0xff) << 8) |
-				((packetHeader.capWordValidate >> 8) & 0xff);
+                ((packetHeader.capWordValidate & 0xff) << 8) |
+                ((packetHeader.capWordValidate >> 8) & 0xff);
 
             if(capWordValidateSwapped === packetHeader.capWord &&
-				0 != packetHeader.capWord &&
-				packetHeader.capWord & 0x0001)
+                0 != packetHeader.capWord &&
+                packetHeader.capWord & 0x0001)
             {
                 packetHeader.version = '2+';
 
-                //	See FSC-0048
+                //  See FSC-0048
                 if(-1 === packetHeader.origNet) {
                     packetHeader.origNet = packetHeader.auxNet;
                 }
             } else {
                 packetHeader.version = '2';
 
-                //	:TODO: should fill bytes be 0?
+                //  :TODO: should fill bytes be 0?
             }
         }
 
         packetHeader.created = moment({
-            year 	: packetHeader.year,
-            month	: packetHeader.month - 1,	//	moment uses 0 indexed months
-            date	: packetHeader.day,
-            hour	: packetHeader.hour,
-            minute	: packetHeader.minute,
-            second	: packetHeader.second
+            year    : packetHeader.year,
+            month   : packetHeader.month - 1,   //  moment uses 0 indexed months
+            date    : packetHeader.day,
+            hour    : packetHeader.hour,
+            minute  : packetHeader.minute,
+            second  : packetHeader.second
         });
 
         const ph = new PacketHeader();
@@ -352,36 +352,36 @@ function Packet(options) {
 
     this.processMessageBody = function(messageBodyBuffer, cb) {
         //
-        //	From FTS-0001.16:
-        //		"Message text is unbounded and null terminated (note exception below).
+        //  From FTS-0001.16:
+        //      "Message text is unbounded and null terminated (note exception below).
         //
-        //		A 'hard' carriage return, 0DH,  marks the end of a paragraph, and must
-        //		be preserved.
+        //      A 'hard' carriage return, 0DH,  marks the end of a paragraph, and must
+        //      be preserved.
         //
-        //		So   called  'soft'  carriage  returns,  8DH,  may  mark  a   previous
-        //		processor's  automatic line wrap, and should be ignored.  Beware  that
-        //		they may be followed by linefeeds, or may not.
+        //      So   called  'soft'  carriage  returns,  8DH,  may  mark  a   previous
+        //      processor's  automatic line wrap, and should be ignored.  Beware  that
+        //      they may be followed by linefeeds, or may not.
         //
-        //		All  linefeeds, 0AH, should be ignored.  Systems which display message
-        //		text should wrap long lines to suit their application."
+        //      All  linefeeds, 0AH, should be ignored.  Systems which display message
+        //      text should wrap long lines to suit their application."
         //
-        //	This can be a bit tricky:
-        //	*	Decoding as CP437 converts 0x8d -> 0xec, so we'll need to correct for that
-        //	*	Many kludge lines specify an encoding. If we find one of such lines, we'll
-        //		likely need to re-decode as the specified encoding
-        //	*	SAUCE is binary-ish data, so we need to inspect for it before any
-        //		decoding occurs
+        //  This can be a bit tricky:
+        //  *   Decoding as CP437 converts 0x8d -> 0xec, so we'll need to correct for that
+        //  *   Many kludge lines specify an encoding. If we find one of such lines, we'll
+        //      likely need to re-decode as the specified encoding
+        //  *   SAUCE is binary-ish data, so we need to inspect for it before any
+        //      decoding occurs
         //
         let messageBodyData = {
-            message		: [],
-            kludgeLines	: {},	//	KLUDGE:[value1, value2, ...] map
-            seenBy		: [],
+            message     : [],
+            kludgeLines : {},   //  KLUDGE:[value1, value2, ...] map
+            seenBy      : [],
         };
 
         function addKludgeLine(line) {
             //
-            //	We have to special case INTL/TOPT/FMPT as they don't contain
-            //	a ':' name/value separator like the rest of the kludge lines... because stupdity.
+            //  We have to special case INTL/TOPT/FMPT as they don't contain
+            //  a ':' name/value separator like the rest of the kludge lines... because stupdity.
             //
             let key = line.substr(0, 4).trim();
             let value;
@@ -389,13 +389,13 @@ function Packet(options) {
                 value = line.substr(key.length).trim();
             } else {
                 const sepIndex = line.indexOf(':');
-                key		= line.substr(0, sepIndex).toUpperCase();
-                value	= line.substr(sepIndex + 1).trim();
+                key     = line.substr(0, sepIndex).toUpperCase();
+                value   = line.substr(sepIndex + 1).trim();
             }
 
             //
-            //	Allow mapped value to be either a key:value if there is only
-            //	one entry, or key:[value1, value2,...] if there are more
+            //  Allow mapped value to be either a key:value if there is only
+            //  one entry, or key:[value1, value2,...] if there are more
             //
             if(messageBodyData.kludgeLines[key]) {
                 if(!_.isArray(messageBodyData.kludgeLines[key])) {
@@ -412,21 +412,21 @@ function Packet(options) {
         async.series(
             [
                 function extractSauce(callback) {
-                    //	:TODO: This is wrong: SAUCE may not have EOF marker for one, also if it's
-                    //	present, we need to extract it but keep the rest of hte message intact as it likely
-                    //	has SEEN-BY, PATH, and other kludge information *appended*
+                    //  :TODO: This is wrong: SAUCE may not have EOF marker for one, also if it's
+                    //  present, we need to extract it but keep the rest of hte message intact as it likely
+                    //  has SEEN-BY, PATH, and other kludge information *appended*
                     const sauceHeaderPosition = messageBodyBuffer.indexOf(FTN_MESSAGE_SAUCE_HEADER);
                     if(sauceHeaderPosition > -1) {
                         sauce.readSAUCE(messageBodyBuffer.slice(sauceHeaderPosition, sauceHeaderPosition + sauce.SAUCE_SIZE), (err, theSauce) => {
                             if(!err) {
-                                //	we read some SAUCE - don't re-process that portion into the body
-                                messageBodyBuffer		= messageBodyBuffer.slice(0, sauceHeaderPosition) + messageBodyBuffer.slice(sauceHeaderPosition + sauce.SAUCE_SIZE);
-                                //								messageBodyBuffer 		= messageBodyBuffer.slice(0, sauceHeaderPosition);
-                                messageBodyData.sauce	= theSauce;
+                                //  we read some SAUCE - don't re-process that portion into the body
+                                messageBodyBuffer       = messageBodyBuffer.slice(0, sauceHeaderPosition) + messageBodyBuffer.slice(sauceHeaderPosition + sauce.SAUCE_SIZE);
+                                //                              messageBodyBuffer       = messageBodyBuffer.slice(0, sauceHeaderPosition);
+                                messageBodyData.sauce   = theSauce;
                             } else {
                                 Log.warn( { error : err.message }, 'Found what looks like to be a SAUCE record, but failed to read');
                             }
-                            return callback(null);	//	failure to read SAUCE is OK
+                            return callback(null);  //  failure to read SAUCE is OK
                         });
                     } else {
                         callback(null);
@@ -434,21 +434,21 @@ function Packet(options) {
                 },
                 function extractChrsAndDetermineEncoding(callback) {
                     //
-                    //	From FTS-5003.001:
-                    //	"The CHRS control line is formatted as follows:
+                    //  From FTS-5003.001:
+                    //  "The CHRS control line is formatted as follows:
                     //
-                    //	^ACHRS: <identifier> <level>
+                    //  ^ACHRS: <identifier> <level>
                     //
-                    //	Where <identifier> is a character string of no more than eight (8)
-                    //	ASCII characters identifying the character set or character encoding
-                    //	scheme used, and level is a positive integer value describing what
-                    //	level of CHRS the  message is written in."
+                    //  Where <identifier> is a character string of no more than eight (8)
+                    //  ASCII characters identifying the character set or character encoding
+                    //  scheme used, and level is a positive integer value describing what
+                    //  level of CHRS the  message is written in."
                     //
-                    //	Also according to the spec, the deprecated "CHARSET" value may be used
-                    //	:TODO: Look into CHARSET more - should we bother supporting it?
-                    //	:TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
-                    const FTN_CHRS_PREFIX 	= Buffer.from( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );	//	"\x01CHRS:"
-                    const FTN_CHRS_SUFFIX	= Buffer.from( [ 0x0d ] );
+                    //  Also according to the spec, the deprecated "CHARSET" value may be used
+                    //  :TODO: Look into CHARSET more - should we bother supporting it?
+                    //  :TODO: See encodingFromHeader() for CHRS/CHARSET support @ https://github.com/Mithgol/node-fidonet-jam
+                    const FTN_CHRS_PREFIX   = Buffer.from( [ 0x01, 0x43, 0x48, 0x52, 0x53, 0x3a, 0x20 ] );  //  "\x01CHRS:"
+                    const FTN_CHRS_SUFFIX   = Buffer.from( [ 0x0d ] );
 
                     let chrsPrefixIndex = messageBodyBuffer.indexOf(FTN_CHRS_PREFIX);
                     if(chrsPrefixIndex < 0) {
@@ -476,9 +476,9 @@ function Packet(options) {
                 },
                 function extractMessageData(callback) {
                     //
-                    //	Decode |messageBodyBuffer| using |encoding| defaulted or detected above
+                    //  Decode |messageBodyBuffer| using |encoding| defaulted or detected above
                     //
-                    //	:TODO: Look into \xec thing more - document
+                    //  :TODO: Look into \xec thing more - document
                     let decoded;
                     try {
                         decoded = iconv.decode(messageBodyBuffer, encoding);
@@ -487,8 +487,8 @@ function Packet(options) {
                         decoded = iconv.decode(messageBodyBuffer, 'ascii');
                     }
 
-                    const messageLines	= strUtil.splitTextAtTerms(decoded.replace(/\xec/g, ''));
-                    let endOfMessage	= false;
+                    const messageLines  = strUtil.splitTextAtTerms(decoded.replace(/\xec/g, ''));
+                    let endOfMessage    = false;
 
                     messageLines.forEach(line => {
                         if(0 === line.length) {
@@ -499,21 +499,21 @@ function Packet(options) {
                         if(line.startsWith('AREA:')) {
                             messageBodyData.area = line.substring(line.indexOf(':') + 1).trim();
                         } else if(line.startsWith('--- ')) {
-                            //	Tear Lines are tracked allowing for specialized display/etc.
+                            //  Tear Lines are tracked allowing for specialized display/etc.
                             messageBodyData.tearLine = line;
-                        } else if(/^[ ]{1,2}\* Origin: /.test(line)) {	//	To spec is " * Origin: ..."
+                        } else if(/^[ ]{1,2}\* Origin: /.test(line)) {  //  To spec is " * Origin: ..."
                             messageBodyData.originLine = line;
-                            endOfMessage = true;	//	Anything past origin is not part of the message body
+                            endOfMessage = true;    //  Anything past origin is not part of the message body
                         } else if(line.startsWith('SEEN-BY:')) {
-                            endOfMessage = true;	//	Anything past the first SEEN-BY is not part of the message body
+                            endOfMessage = true;    //  Anything past the first SEEN-BY is not part of the message body
                             messageBodyData.seenBy.push(line.substring(line.indexOf(':') + 1).trim());
                         } else if(FTN_MESSAGE_KLUDGE_PREFIX === line.charAt(0)) {
                             if('PATH:' === line.slice(1, 6)) {
-                                endOfMessage = true;	//	Anything pats the first PATH is not part of the message body
+                                endOfMessage = true;    //  Anything pats the first PATH is not part of the message body
                             }
                             addKludgeLine(line.slice(1));
                         } else if(!endOfMessage) {
-                            //	regular ol' message line
+                            //  regular ol' message line
                             messageBodyData.message.push(line);
                         }
                     });
@@ -530,16 +530,16 @@ function Packet(options) {
 
     this.parsePacketMessages = function(header, packetBuffer, iterator, cb) {
         //
-        //	Check for end-of-messages marker up front before parse so we can easily
-        //	tell the difference between end and bad header
+        //  Check for end-of-messages marker up front before parse so we can easily
+        //  tell the difference between end and bad header
         //
         if(packetBuffer.length < 3) {
             const peek = packetBuffer.slice(0, 2);
             if(peek.equals(Buffer.from([ 0x00 ])) || peek.equals(Buffer.from( [ 0x00, 0x00 ]))) {
-                //	end marker - no more messages
+                //  end marker - no more messages
                 return cb(null);
             }
-            //	else fall through & hit exception below to log error
+            //  else fall through & hit exception below to log error
         }
 
         let msgData;
@@ -552,26 +552,26 @@ function Packet(options) {
                 .uint16le('ftn_msg_dest_net')
                 .uint16le('ftn_attr_flags')
                 .uint16le('ftn_cost')
-                //	:TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
+                //  :TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
                 .array('modDateTime', {
-                    type		: 'uint8',
-                    readUntil	: b => 0x00 === b,
+                    type        : 'uint8',
+                    readUntil   : b => 0x00 === b,
                 })
                 .array('toUserName', {
-                    type		: 'uint8',
-                    readUntil	: b => 0x00 === b,
+                    type        : 'uint8',
+                    readUntil   : b => 0x00 === b,
                 })
                 .array('fromUserName', {
-                    type		: 'uint8',
-                    readUntil	: b => 0x00 === b,
+                    type        : 'uint8',
+                    readUntil   : b => 0x00 === b,
                 })
                 .array('subject', {
-                    type		: 'uint8',
-                    readUntil	: b => 0x00 === b,
+                    type        : 'uint8',
+                    readUntil   : b => 0x00 === b,
                 })
                 .array('message', {
-                    type		: 'uint8',
-                    readUntil	: b => 0x00 === b,
+                    type        : 'uint8',
+                    readUntil   : b => 0x00 === b,
                 })
                 .parse(packetBuffer);
         } catch(e) {
@@ -583,49 +583,49 @@ function Packet(options) {
         }
 
         //
-        //	Convert null terminated arrays to strings
+        //  Convert null terminated arrays to strings
         //
         [ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
             msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
         });
 
-        //	Technically the following fields have length limits as per fts-0001.016:
-        //	* modDateTime	: 20 bytes
-        //	* toUserName	: 36 bytes
-        //	* fromUserName	: 36 bytes
-        //	* subject		: 72 bytes
+        //  Technically the following fields have length limits as per fts-0001.016:
+        //  * modDateTime   : 20 bytes
+        //  * toUserName    : 36 bytes
+        //  * fromUserName  : 36 bytes
+        //  * subject       : 72 bytes
 
         //
-        //	The message body itself is a special beast as it may
-        //	contain an origin line, kludges, SAUCE in the case
-        //	of ANSI files, etc.
+        //  The message body itself is a special beast as it may
+        //  contain an origin line, kludges, SAUCE in the case
+        //  of ANSI files, etc.
         //
         const msg = new Message( {
-            toUserName		: msgData.toUserName,
-            fromUserName	: msgData.fromUserName,
-            subject			: msgData.subject,
-            modTimestamp	: ftn.getDateFromFtnDateTime(msgData.modDateTime),
+            toUserName      : msgData.toUserName,
+            fromUserName    : msgData.fromUserName,
+            subject         : msgData.subject,
+            modTimestamp    : ftn.getDateFromFtnDateTime(msgData.modDateTime),
         });
 
-        //	:TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
+        //  :TODO: When non-private (e.g. EchoMail), attempt to extract SRC from MSGID vs headers, when avail (or Orgin line? research further)
         msg.meta.FtnProperty = {
-            ftn_orig_node		: header.origNode,
-            ftn_dest_node		: header.destNode,
-            ftn_orig_network	: header.origNet,
-            ftn_dest_network	: header.destNet,
+            ftn_orig_node       : header.origNode,
+            ftn_dest_node       : header.destNode,
+            ftn_orig_network    : header.origNet,
+            ftn_dest_network    : header.destNet,
 
-            ftn_attr_flags		: msgData.ftn_attr_flags,
-            ftn_cost			: msgData.ftn_cost,
+            ftn_attr_flags      : msgData.ftn_attr_flags,
+            ftn_cost            : msgData.ftn_cost,
 
-            ftn_msg_orig_node	: msgData.ftn_msg_orig_node,
-            ftn_msg_dest_node	: msgData.ftn_msg_dest_node,
-            ftn_msg_orig_net	: msgData.ftn_msg_orig_net,
-            ftn_msg_dest_net	: msgData.ftn_msg_dest_net,
+            ftn_msg_orig_node   : msgData.ftn_msg_orig_node,
+            ftn_msg_dest_node   : msgData.ftn_msg_dest_node,
+            ftn_msg_orig_net    : msgData.ftn_msg_orig_net,
+            ftn_msg_dest_net    : msgData.ftn_msg_dest_net,
         };
 
         self.processMessageBody(msgData.message, messageBodyData => {
-            msg.message 		= messageBodyData.message;
-            msg.meta.FtnKludge	= messageBodyData.kludgeLines;
+            msg.message         = messageBodyData.message;
+            msg.meta.FtnKludge  = messageBodyData.kludgeLines;
 
             if(messageBodyData.tearLine) {
                 msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
@@ -652,21 +652,21 @@ function Packet(options) {
             }
 
             //
-            //	If we have a UTC offset kludge (e.g. TZUTC) then update
-            //	modDateTime with it
+            //  If we have a UTC offset kludge (e.g. TZUTC) then update
+            //  modDateTime with it
             //
             if(_.isString(msg.meta.FtnKludge.TZUTC) && msg.meta.FtnKludge.TZUTC.length > 0) {
                 msg.modDateTime = msg.modTimestamp.utcOffset(msg.meta.FtnKludge.TZUTC);
             }
 
-            //	:TODO: Parser should give is this info:
+            //  :TODO: Parser should give is this info:
             const bytesRead =
-				14 +								//	fixed header size
-				msgData.modDateTime.length + 1 +	//	+1 = NULL
-				msgData.toUserName.length + 1 +		//	+1 = NULL
-				msgData.fromUserName.length + 1 +	//	+1 = NULL
-				msgData.subject.length + 1 +		//	+1 = NULL
-				msgData.message.length;				//	includes NULL
+                14 +                                //  fixed header size
+                msgData.modDateTime.length + 1 +    //  +1 = NULL
+                msgData.toUserName.length + 1 +     //  +1 = NULL
+                msgData.fromUserName.length + 1 +   //  +1 = NULL
+                msgData.subject.length + 1 +        //  +1 = NULL
+                msgData.message.length;             //  includes NULL
 
             const nextBuf = packetBuffer.slice(bytesRead);
             if(nextBuf.length > 0) {
@@ -710,11 +710,11 @@ function Packet(options) {
     };
 
     this.writeMessageHeader = function(message, buf) {
-        //	ensure address FtnProperties are numbers
+        //  ensure address FtnProperties are numbers
         self.sanatizeFtnProperties(message);
 
-        const destNode	= message.meta.FtnProperty.ftn_msg_dest_node || message.meta.FtnProperty.ftn_dest_node;
-        const destNet	= message.meta.FtnProperty.ftn_msg_dest_net || message.meta.FtnProperty.ftn_dest_network;
+        const destNode  = message.meta.FtnProperty.ftn_msg_dest_node || message.meta.FtnProperty.ftn_dest_node;
+        const destNet   = message.meta.FtnProperty.ftn_msg_dest_net || message.meta.FtnProperty.ftn_dest_network;
 
         buf.writeUInt16LE(FTN_PACKET_MESSAGE_TYPE, 0);
         buf.writeUInt16LE(message.meta.FtnProperty.ftn_orig_node, 2);
@@ -751,43 +751,43 @@ function Packet(options) {
                     self.writeMessageHeader(message, basicHeader);
 
                     //
-                    //	To, from, and subject must be NULL term'd and have max lengths as per spec.
+                    //  To, from, and subject must be NULL term'd and have max lengths as per spec.
                     //
-                    const toUserNameBuf 	= strUtil.stringToNullTermBuffer(message.toUserName, { encoding : 'cp437', maxBufLen : 36 } );
-                    const fromUserNameBuf	= strUtil.stringToNullTermBuffer(message.fromUserName, { encoding : 'cp437', maxBufLen : 36 } );
-                    const subjectBuf		= strUtil.stringToNullTermBuffer(message.subject, { encoding : 'cp437', maxBufLen : 72 } );
+                    const toUserNameBuf     = strUtil.stringToNullTermBuffer(message.toUserName, { encoding : 'cp437', maxBufLen : 36 } );
+                    const fromUserNameBuf   = strUtil.stringToNullTermBuffer(message.fromUserName, { encoding : 'cp437', maxBufLen : 36 } );
+                    const subjectBuf        = strUtil.stringToNullTermBuffer(message.subject, { encoding : 'cp437', maxBufLen : 72 } );
 
                     //
-                    //	message: unbound length, NULL term'd
+                    //  message: unbound length, NULL term'd
                     //
-                    //	We need to build in various special lines - kludges, area,
-                    //	seen-by, etc.
+                    //  We need to build in various special lines - kludges, area,
+                    //  seen-by, etc.
                     //
                     let msgBody = '';
 
                     //
-                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-                    //	AREA:CONFERENCE
-                    //	Should be first line in a message
+                    //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //  AREA:CONFERENCE
+                    //  Should be first line in a message
                     //
                     if(message.meta.FtnProperty.ftn_area) {
-                        msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
+                        msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;   //  note: no ^A (0x01)
                     }
 
-                    //	:TODO: DRY with similar function in this file!
+                    //  :TODO: DRY with similar function in this file!
                     Object.keys(message.meta.FtnKludge).forEach(k => {
                         switch(k) {
                             case 'PATH' :
-                                break;	//	skip & save for last
+                                break;  //  skip & save for last
 
                             case 'Via' :
                             case 'FMPT' :
                             case 'TOPT' :
                             case 'INTL' :
-                                msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');	// no sepChar
+                                msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], '');    // no sepChar
                                 break;
 
-                            default		:
+                            default     :
                                 msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
                                 break;
                         }
@@ -803,10 +803,10 @@ function Packet(options) {
                     ansiPrep(
                         message.message,
                         {
-                            cols				: 80,
-                            rows				: 'auto',
-                            forceLineTerm		: true,
-                            exportMode			: true,
+                            cols                : 80,
+                            rows                : 'auto',
+                            forceLineTerm       : true,
+                            exportMode          : true,
                         },
                         (err, preppedMsg) => {
                             return callback(null, basicHeader, toUserNameBuf, fromUserNameBuf, subjectBuf, msgBody, preppedMsg || message.message);
@@ -817,25 +817,25 @@ function Packet(options) {
                     msgBody += preppedMsg + '\r';
 
                     //
-                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-                    //	Tear line should be near the bottom of a message
+                    //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //  Tear line should be near the bottom of a message
                     //
                     if(message.meta.FtnProperty.ftn_tear_line) {
                         msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
                     }
 
                     //
-                    //	Origin line should be near the bottom of a message
+                    //  Origin line should be near the bottom of a message
                     //
                     if(message.meta.FtnProperty.ftn_origin) {
                         msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
                     }
 
                     //
-                    //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-                    //	SEEN-BY and PATH should be the last lines of a message
+                    //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+                    //  SEEN-BY and PATH should be the last lines of a message
                     //
-                    msgBody += getAppendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
+                    msgBody += getAppendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);  //  note: no ^A (0x01)
                     msgBody += getAppendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
 
                     let msgBodyEncoded;
@@ -869,28 +869,28 @@ function Packet(options) {
 
         ws.write(basicHeader);
 
-        //	toUserName & fromUserName: up to 36 bytes in length, NULL term'd
-        //	:TODO: DRY...
+        //  toUserName & fromUserName: up to 36 bytes in length, NULL term'd
+        //  :TODO: DRY...
         let encBuf = iconv.encode(message.toUserName + '\0', 'CP437').slice(0, 36);
-        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        encBuf[encBuf.length - 1] = '\0';   //  ensure it's null term'd
         ws.write(encBuf);
 
         encBuf = iconv.encode(message.fromUserName + '\0', 'CP437').slice(0, 36);
-        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        encBuf[encBuf.length - 1] = '\0';   //  ensure it's null term'd
         ws.write(encBuf);
 
-        //	subject: up to 72 bytes in length, NULL term'd
+        //  subject: up to 72 bytes in length, NULL term'd
         encBuf = iconv.encode(message.subject + '\0', 'CP437').slice(0, 72);
-        encBuf[encBuf.length - 1] = '\0';	//	ensure it's null term'd
+        encBuf[encBuf.length - 1] = '\0';   //  ensure it's null term'd
         ws.write(encBuf);
 
         //
-        //	message: unbound length, NULL term'd
+        //  message: unbound length, NULL term'd
         //
-        //	We need to build in various special lines - kludges, area,
-        //	seen-by, etc.
+        //  We need to build in various special lines - kludges, area,
+        //  seen-by, etc.
         //
-        //	:TODO: Put this in it's own method
+        //  :TODO: Put this in it's own method
         let msgBody = '';
 
         function appendMeta(k, m, sepChar=':') {
@@ -906,54 +906,54 @@ function Packet(options) {
         }
 
         //
-        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-        //	AREA:CONFERENCE
-        //	Should be first line in a message
+        //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //  AREA:CONFERENCE
+        //  Should be first line in a message
         //
         if(message.meta.FtnProperty.ftn_area) {
-            msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;	//	note: no ^A (0x01)
+            msgBody += `AREA:${message.meta.FtnProperty.ftn_area}\r`;   //  note: no ^A (0x01)
         }
 
         Object.keys(message.meta.FtnKludge).forEach(k => {
             switch(k) {
-                case 'PATH' : break;	//	skip & save for last
+                case 'PATH' : break;    //  skip & save for last
 
                 case 'Via' :
                 case 'FMPT' :
                 case 'TOPT' :
-                case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break;	//	no sepChar
+                case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break; //  no sepChar
 
-                default		: appendMeta(`\x01${k}`, message.meta.FtnKludge[k]); break;
+                default     : appendMeta(`\x01${k}`, message.meta.FtnKludge[k]); break;
             }
         });
 
         msgBody += message.message + '\r';
 
         //
-        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-        //	Tear line should be near the bottom of a message
+        //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //  Tear line should be near the bottom of a message
         //
         if(message.meta.FtnProperty.ftn_tear_line) {
             msgBody += `${message.meta.FtnProperty.ftn_tear_line}\r`;
         }
 
         //
-        //	Origin line should be near the bottom of a message
+        //  Origin line should be near the bottom of a message
         //
         if(message.meta.FtnProperty.ftn_origin) {
             msgBody += `${message.meta.FtnProperty.ftn_origin}\r`;
         }
 
         //
-        //	FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
-        //	SEEN-BY and PATH should be the last lines of a message
+        //  FTN-0004.001 @ http://ftsc.org/docs/fts-0004.001
+        //  SEEN-BY and PATH should be the last lines of a message
         //
-        appendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);	//	note: no ^A (0x01)
+        appendMeta('SEEN-BY', message.meta.FtnProperty.ftn_seen_by);    //  note: no ^A (0x01)
 
         appendMeta('\x01PATH', message.meta.FtnKludge['PATH']);
 
         //
-        //	:TODO: We should encode based on config and add the proper kludge here!
+        //  :TODO: We should encode based on config and add the proper kludge here!
         ws.write(iconv.encode(msgBody + '\0', options.encoding));
     };
 
@@ -981,35 +981,35 @@ function Packet(options) {
                         callback);
                 }
             ],
-            cb	//	complete
+            cb  //  complete
         );
     };
 }
 
 //
-//	Message attributes defined in FTS-0001.016
-//	http://ftsc.org/docs/fts-0001.016
+//  Message attributes defined in FTS-0001.016
+//  http://ftsc.org/docs/fts-0001.016
 //
-//	See also:
-//	* http://www.skepticfiles.org/aj/basics03.htm
+//  See also:
+//  * http://www.skepticfiles.org/aj/basics03.htm
 //
 Packet.Attribute = {
-    Private					: 0x0001,	//	Private message / NetMail
-    Crash					: 0x0002,
-    Received				: 0x0004,
-    Sent					: 0x0008,
-    FileAttached			: 0x0010,
-    InTransit				: 0x0020,
-    Orphan					: 0x0040,
-    KillSent				: 0x0080,
-    Local					: 0x0100,	//	Message is from *this* system
-    Hold					: 0x0200,
-    Reserved0				: 0x0400,
-    FileRequest				: 0x0800,
-    ReturnReceiptRequest	: 0x1000,
-    ReturnReceipt			: 0x2000,
-    AuditRequest			: 0x4000,
-    FileUpdateRequest		: 0x8000,
+    Private                 : 0x0001,   //  Private message / NetMail
+    Crash                   : 0x0002,
+    Received                : 0x0004,
+    Sent                    : 0x0008,
+    FileAttached            : 0x0010,
+    InTransit               : 0x0020,
+    Orphan                  : 0x0040,
+    KillSent                : 0x0080,
+    Local                   : 0x0100,   //  Message is from *this* system
+    Hold                    : 0x0200,
+    Reserved0               : 0x0400,
+    FileRequest             : 0x0800,
+    ReturnReceiptRequest    : 0x1000,
+    ReturnReceipt           : 0x2000,
+    AuditRequest            : 0x4000,
+    FileUpdateRequest       : 0x8000,
 };
 Object.freeze(Packet.Attribute);
 
@@ -1051,10 +1051,10 @@ Packet.prototype.writeMessageEntry = function(ws, msgEntry) {
 
 Packet.prototype.writeTerminator = function(ws) {
     //
-    //	From FTS-0001.016:
-    //	"A  pseudo-message beginning with the word 0000H signifies the end of the packet."
+    //  From FTS-0001.016:
+    //  "A  pseudo-message beginning with the word 0000H signifies the end of the packet."
     //
-    ws.write(Buffer.from( [ 0x00, 0x00 ] ));	//	final extra null term
+    ws.write(Buffer.from( [ 0x00, 0x00 ] ));    //  final extra null term
     return 2;
 };
 
@@ -1074,7 +1074,7 @@ Packet.prototype.writeStream = function(ws, messages, options) {
     });
 
     if(true === options.terminatePacket) {
-        ws.write(Buffer.from( [ 0 ] ));	//	final extra null term
+        ws.write(Buffer.from( [ 0 ] )); //  final extra null term
     }
 };
 
@@ -1083,10 +1083,10 @@ Packet.prototype.write = function(path, packetHeader, messages, options) {
         messages = [ messages ];
     }
 
-    options = options || { encoding : 'utf8' };	//	utf-8 = 'CHRS UTF-8 4'
+    options = options || { encoding : 'utf8' }; //  utf-8 = 'CHRS UTF-8 4'
 
     this.writeStream(
-        fs.createWriteStream(path),	//	:TODO: specify mode/etc.
+        fs.createWriteStream(path), //  :TODO: specify mode/etc.
         messages,
         Object.assign( { packetHeader : packetHeader, terminatePacket : true }, options)
     );
diff --git a/core/ftn_util.js b/core/ftn_util.js
index 0f65e127..e4637554 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -1,52 +1,52 @@
 /* jslint node: true */
 'use strict';
 
-const Config				= require('./config.js').get;
-const Address				= require('./ftn_address.js');
-const FNV1a					= require('./fnv1a.js');
-const getCleanEnigmaVersion	= require('./misc_util.js').getCleanEnigmaVersion;
+const Config                = require('./config.js').get;
+const Address               = require('./ftn_address.js');
+const FNV1a                 = require('./fnv1a.js');
+const getCleanEnigmaVersion = require('./misc_util.js').getCleanEnigmaVersion;
 
-const _						= require('lodash');
-const iconv					= require('iconv-lite');
-const moment				= require('moment');
-const os					= require('os');
+const _                     = require('lodash');
+const iconv                 = require('iconv-lite');
+const moment                = require('moment');
+const os                    = require('os');
 
-const packageJson 			= require('../package.json');
+const packageJson           = require('../package.json');
 
-//	:TODO: Remove "Ftn" from most of these -- it's implied in the module
-exports.stringToNullPaddedBuffer	= stringToNullPaddedBuffer;
-exports.getMessageSerialNumber		= getMessageSerialNumber;
-exports.getDateFromFtnDateTime		= getDateFromFtnDateTime;
-exports.getDateTimeString			= getDateTimeString;
+//  :TODO: Remove "Ftn" from most of these -- it's implied in the module
+exports.stringToNullPaddedBuffer    = stringToNullPaddedBuffer;
+exports.getMessageSerialNumber      = getMessageSerialNumber;
+exports.getDateFromFtnDateTime      = getDateFromFtnDateTime;
+exports.getDateTimeString           = getDateTimeString;
 
-exports.getMessageIdentifier		= getMessageIdentifier;
-exports.getProductIdentifier		= getProductIdentifier;
-exports.getUTCTimeZoneOffset		= getUTCTimeZoneOffset;
-exports.getOrigin					= getOrigin;
-exports.getTearLine					= getTearLine;
-exports.getVia						= getVia;
-exports.getIntl						= getIntl;
-exports.getAbbreviatedNetNodeList	= getAbbreviatedNetNodeList;
-exports.parseAbbreviatedNetNodeList	= parseAbbreviatedNetNodeList;
-exports.getUpdatedSeenByEntries		= getUpdatedSeenByEntries;
-exports.getUpdatedPathEntries		= getUpdatedPathEntries;
+exports.getMessageIdentifier        = getMessageIdentifier;
+exports.getProductIdentifier        = getProductIdentifier;
+exports.getUTCTimeZoneOffset        = getUTCTimeZoneOffset;
+exports.getOrigin                   = getOrigin;
+exports.getTearLine                 = getTearLine;
+exports.getVia                      = getVia;
+exports.getIntl                     = getIntl;
+exports.getAbbreviatedNetNodeList   = getAbbreviatedNetNodeList;
+exports.parseAbbreviatedNetNodeList = parseAbbreviatedNetNodeList;
+exports.getUpdatedSeenByEntries     = getUpdatedSeenByEntries;
+exports.getUpdatedPathEntries       = getUpdatedPathEntries;
 
-exports.getCharacterSetIdentifierByEncoding		= getCharacterSetIdentifierByEncoding;
-exports.getEncodingFromCharacterSetIdentifier	= getEncodingFromCharacterSetIdentifier;
+exports.getCharacterSetIdentifierByEncoding     = getCharacterSetIdentifierByEncoding;
+exports.getEncodingFromCharacterSetIdentifier   = getEncodingFromCharacterSetIdentifier;
 
-exports.getQuotePrefix				= getQuotePrefix;
+exports.getQuotePrefix              = getQuotePrefix;
 
 //
-//	Namespace for RFC-4122 name based UUIDs generated from
-//	FTN kludges MSGID + AREA
+//  Namespace for RFC-4122 name based UUIDs generated from
+//  FTN kludges MSGID + AREA
 //
-//const ENIGMA_FTN_MSGID_NAMESPACE 	= uuid.parse('a5c7ae11-420c-4469-a116-0e9a6d8d2654');
+//const ENIGMA_FTN_MSGID_NAMESPACE  = uuid.parse('a5c7ae11-420c-4469-a116-0e9a6d8d2654');
 
-//	See list here: https://github.com/Mithgol/node-fidonet-jam
+//  See list here: https://github.com/Mithgol/node-fidonet-jam
 
 function stringToNullPaddedBuffer(s, bufLen) {
-    let buffer 	= Buffer.alloc(bufLen);
-    let enc		= iconv.encode(s, 'CP437').slice(0, bufLen);
+    let buffer  = Buffer.alloc(bufLen);
+    let enc     = iconv.encode(s, 'CP437').slice(0, bufLen);
     for(let i = 0; i < enc.length; ++i) {
         buffer[i] = enc[i];
     }
@@ -54,37 +54,37 @@ function stringToNullPaddedBuffer(s, bufLen) {
 }
 
 //
-//	Convert a FTN style DateTime string to a Date object
+//  Convert a FTN style DateTime string to a Date object
 //
-//	:TODO: Name the next couple methods better - for FTN *packets*
+//  :TODO: Name the next couple methods better - for FTN *packets*
 function getDateFromFtnDateTime(dateTime) {
     //
-    //	Examples seen in the wild (Working):
-    //		"12 Sep 88 18:17:59"
-    //		"Tue 01 Jan 80 00:00"
-    //		"27 Feb 15  00:00:03"
+    //  Examples seen in the wild (Working):
+    //      "12 Sep 88 18:17:59"
+    //      "Tue 01 Jan 80 00:00"
+    //      "27 Feb 15  00:00:03"
     //
-    //	:TODO: Use moment.js here
-    return moment(Date.parse(dateTime));	//	Date.parse() allows funky formats
-//	return (new Date(Date.parse(dateTime))).toISOString();
+    //  :TODO: Use moment.js here
+    return moment(Date.parse(dateTime));    //  Date.parse() allows funky formats
+//  return (new Date(Date.parse(dateTime))).toISOString();
 }
 
 function getDateTimeString(m) {
     //
-    //	From http://ftsc.org/docs/fts-0001.016:
-    //	DateTime   = (* a character string 20 characters long *)
-    //  	(* 01 Jan 86  02:34:56 *)
-    //		DayOfMonth " " Month " " Year " "
-    //		" " HH ":" MM ":" SS
-    //		Null
+    //  From http://ftsc.org/docs/fts-0001.016:
+    //  DateTime   = (* a character string 20 characters long *)
+    //      (* 01 Jan 86  02:34:56 *)
+    //      DayOfMonth " " Month " " Year " "
+    //      " " HH ":" MM ":" SS
+    //      Null
     //
-    //	DayOfMonth = "01" | "02" | "03" | ... | "31"   (* Fido 0 fills *)
-    //	Month      = "Jan" | "Feb" | "Mar" | "Apr" | "May" | "Jun" |
-    //	           "Jul" | "Aug" | "Sep" | "Oct" | "Nov" | "Dec"
-    //	Year       = "01" | "02" | .. | "85" | "86" | ... | "99" | "00"
-    //	HH         = "00" | .. | "23"
-    //	MM         = "00" | .. | "59"
-    //	SS         = "00" | .. | "59"
+    //  DayOfMonth = "01" | "02" | "03" | ... | "31"   (* Fido 0 fills *)
+    //  Month      = "Jan" | "Feb" | "Mar" | "Apr" | "May" | "Jun" |
+    //             "Jul" | "Aug" | "Sep" | "Oct" | "Nov" | "Dec"
+    //  Year       = "01" | "02" | .. | "85" | "86" | ... | "99" | "00"
+    //  HH         = "00" | .. | "23"
+    //  MM         = "00" | .. | "59"
+    //  SS         = "00" | .. | "59"
     //
     if(!moment.isMoment(m)) {
         m = moment(m);
@@ -95,52 +95,52 @@ function getDateTimeString(m) {
 
 function getMessageSerialNumber(messageId) {
     const msSinceEnigmaEpoc = (Date.now() - Date.UTC(2016, 1, 1));
-    const hash				= Math.abs(new FNV1a(msSinceEnigmaEpoc + messageId).value).toString(16);
+    const hash              = Math.abs(new FNV1a(msSinceEnigmaEpoc + messageId).value).toString(16);
     return `00000000${hash}`.substr(-8);
 }
 
 //
-//	Return a FTS-0009.001 compliant MSGID value given a message
-//	See http://ftsc.org/docs/fts-0009.001
+//  Return a FTS-0009.001 compliant MSGID value given a message
+//  See http://ftsc.org/docs/fts-0009.001
 //
-//	"A MSGID line consists of the string "^AMSGID:" (where ^A is a
-//	control-A (hex 01) and the double-quotes are not part of the
-//	string),  followed by a space,  the address of the originating
-//	system,  and a serial number unique to that message on the
-//	originating system,  i.e.:
+//  "A MSGID line consists of the string "^AMSGID:" (where ^A is a
+//  control-A (hex 01) and the double-quotes are not part of the
+//  string),  followed by a space,  the address of the originating
+//  system,  and a serial number unique to that message on the
+//  originating system,  i.e.:
 //
-//		^AMSGID: origaddr serialno
+//      ^AMSGID: origaddr serialno
 //
-//	The originating address should be specified in a form that
-//	constitutes a valid return address for the originating network.
-//	If the originating address is enclosed in double-quotes,  the
-//	entire string between the beginning and ending double-quotes is
-//	considered to be the orginating address.  A double-quote character
-//	within a quoted address is represented by by two consecutive
-//	double-quote characters.  The serial number may be any eight
-//	character hexadecimal number,  as long as it is unique - no two
-//	messages from a given system may have the same serial number
-//	within a three years.  The manner in which this serial number is
-//	generated is left to the implementor."
+//  The originating address should be specified in a form that
+//  constitutes a valid return address for the originating network.
+//  If the originating address is enclosed in double-quotes,  the
+//  entire string between the beginning and ending double-quotes is
+//  considered to be the orginating address.  A double-quote character
+//  within a quoted address is represented by by two consecutive
+//  double-quote characters.  The serial number may be any eight
+//  character hexadecimal number,  as long as it is unique - no two
+//  messages from a given system may have the same serial number
+//  within a three years.  The manner in which this serial number is
+//  generated is left to the implementor."
 //
 //
-//	Examples & Implementations
+//  Examples & Implementations
 //
-//	Synchronet: <msgNum>.<conf+area>@<ftnAddr> <serial>
-//		2606.agora-agn_tst@46:1/142 19609217
+//  Synchronet: <msgNum>.<conf+area>@<ftnAddr> <serial>
+//      2606.agora-agn_tst@46:1/142 19609217
 //
-//	Mystic: <ftnAddress> <serial>
-//		46:3/102 46686263
+//  Mystic: <ftnAddress> <serial>
+//      46:3/102 46686263
 //
-//	ENiGMA½: <messageId>.<areaTag>@<5dFtnAddress> <serial>
+//  ENiGMA½: <messageId>.<areaTag>@<5dFtnAddress> <serial>
 //
-//	0.0.8-alpha:
-//	Made compliant with FTN spec *when exporting NetMail* due to
-//	Mystic rejecting messages with the true-unique version.
-//	Strangely, Synchronet uses the unique format and Mystic does
-//	OK with it. Will need to research further. Note also that
-//	g00r00 was kind enough to fix Mystic to allow for the Sync/Enig
-//	format, but that will only help when using newer Mystic versions.
+//  0.0.8-alpha:
+//  Made compliant with FTN spec *when exporting NetMail* due to
+//  Mystic rejecting messages with the true-unique version.
+//  Strangely, Synchronet uses the unique format and Mystic does
+//  OK with it. Will need to research further. Note also that
+//  g00r00 was kind enough to fix Mystic to allow for the Sync/Enig
+//  format, but that will only help when using newer Mystic versions.
 //
 function getMessageIdentifier(message, address, isNetMail = false) {
     const addrStr = new Address(address).toString('5D');
@@ -151,42 +151,42 @@ function getMessageIdentifier(message, address, isNetMail = false) {
 }
 
 //
-//	Return a FSC-0046.005 Product Identifier or "PID"
-//	http://ftsc.org/docs/fsc-0046.005
+//  Return a FSC-0046.005 Product Identifier or "PID"
+//  http://ftsc.org/docs/fsc-0046.005
 //
-//	Note that we use a variant on the spec for <serial>
-//	in which (<os>; <arch>; <nodeVer>) is used instead
+//  Note that we use a variant on the spec for <serial>
+//  in which (<os>; <arch>; <nodeVer>) is used instead
 //
 function getProductIdentifier() {
     const version = getCleanEnigmaVersion();
-    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    const nodeVer = process.version.substr(1);  //  remove 'v' prefix
 
     return `ENiGMA1/2 ${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
 
 //
-//	Return a FRL-1004 style time zone offset for a
-//	'TZUTC' kludge line
+//  Return a FRL-1004 style time zone offset for a
+//  'TZUTC' kludge line
 //
-//	http://ftsc.org/docs/frl-1004.002
+//  http://ftsc.org/docs/frl-1004.002
 //
 function getUTCTimeZoneOffset() {
     return moment().format('ZZ').replace(/\+/, '');
 }
 
 //
-//	Get a FSC-0032 style quote prefix
-//	http://ftsc.org/docs/fsc-0032.001
+//  Get a FSC-0032 style quote prefix
+//  http://ftsc.org/docs/fsc-0032.001
 //
 function getQuotePrefix(name) {
     let initials;
 
     const parts = name.split(' ');
     if(parts.length > 1) {
-        //	First & Last initials - (Bryan Ashby -> BA)
+        //  First & Last initials - (Bryan Ashby -> BA)
         initials = `${parts[0].slice(0, 1)}${parts[parts.length - 1].slice(0, 1)}`.toUpperCase();
     } else {
-        //	Just use the first two - (NuSkooler -> Nu)
+        //  Just use the first two - (NuSkooler -> Nu)
         initials = _.capitalize(name.slice(0, 2));
     }
 
@@ -194,8 +194,8 @@ function getQuotePrefix(name) {
 }
 
 //
-//	Return a FTS-0004 Origin line
-//	http://ftsc.org/docs/fts-0004.001
+//  Return a FTS-0004 Origin line
+//  http://ftsc.org/docs/fts-0004.001
 //
 function getOrigin(address) {
     const config = Config();
@@ -208,38 +208,38 @@ function getOrigin(address) {
 }
 
 function getTearLine() {
-    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    const nodeVer = process.version.substr(1);  //  remove 'v' prefix
     return `--- ENiGMA 1/2 v${packageJson.version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
 
 //
-//	Return a FRL-1005.001 "Via" line
-//	http://ftsc.org/docs/frl-1005.001
+//  Return a FRL-1005.001 "Via" line
+//  http://ftsc.org/docs/frl-1005.001
 //
 function getVia(address) {
     /*
-		FRL-1005.001 states teh following format:
+        FRL-1005.001 states teh following format:
 
-		^AVia: <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone]
-	    <Program Name> <Version> [Serial Number]<CR>
-	*/
-    const addrStr	= new Address(address).toString('5D');
-    const dateTime	= moment().utc().format('YYYYMMDD.HHmmSS.SSSS.UTC');
-    const version	= getCleanEnigmaVersion();
+        ^AVia: <FTN Address> @YYYYMMDD.HHMMSS[.Precise][.Time Zone]
+        <Program Name> <Version> [Serial Number]<CR>
+    */
+    const addrStr   = new Address(address).toString('5D');
+    const dateTime  = moment().utc().format('YYYYMMDD.HHmmSS.SSSS.UTC');
+    const version   = getCleanEnigmaVersion();
 
     return `${addrStr} @${dateTime} ENiGMA1/2 ${version}`;
 }
 
 //
-//	Creates a INTL kludge value as per FTS-4001
-//	http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
+//  Creates a INTL kludge value as per FTS-4001
+//  http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
 //
 function getIntl(toAddress, fromAddress) {
     //
-    //	INTL differs from 'standard' kludges in that there is no ':' after "INTL"
+    //  INTL differs from 'standard' kludges in that there is no ':' after "INTL"
     //
-    //	"<SOH>"INTL "<destination address>" "<origin address><CR>"
-    //	"...These addresses shall be given on the form <zone>:<net>/<node>"
+    //  "<SOH>"INTL "<destination address>" "<origin address><CR>"
+    //  "...These addresses shall be given on the form <zone>:<net>/<node>"
     //
     return `${toAddress.toString('3D')} ${fromAddress.toString('3D')}`;
 }
@@ -258,11 +258,11 @@ function getAbbreviatedNetNodeList(netNodes) {
         abbrList += `${netNode.node} `;
     });
 
-    return abbrList.trim();	//	remove trailing space
+    return abbrList.trim(); //  remove trailing space
 }
 
 //
-//	Parse an abbreviated net/node list commonly used for SEEN-BY and PATH
+//  Parse an abbreviated net/node list commonly used for SEEN-BY and PATH
 //
 function parseAbbreviatedNetNodeList(netNodes) {
     const re = /([0-9]+)\/([0-9]+)\s?|([0-9]+)\s?/g;
@@ -282,39 +282,39 @@ function parseAbbreviatedNetNodeList(netNodes) {
 }
 
 //
-//	Return a FTS-0004.001 SEEN-BY entry(s) that include
-//	all pre-existing SEEN-BY entries with the addition
-//	of |additions|.
+//  Return a FTS-0004.001 SEEN-BY entry(s) that include
+//  all pre-existing SEEN-BY entries with the addition
+//  of |additions|.
 //
-//	See http://ftsc.org/docs/fts-0004.001
-//	and notes at http://ftsc.org/docs/fsc-0043.002.
+//  See http://ftsc.org/docs/fts-0004.001
+//  and notes at http://ftsc.org/docs/fsc-0043.002.
 //
-//	For a great write up, see http://www.skepticfiles.org/aj/basics03.htm
+//  For a great write up, see http://www.skepticfiles.org/aj/basics03.htm
 //
-//	This method returns an sorted array of values, but
-//	not the "SEEN-BY" prefix itself
+//  This method returns an sorted array of values, but
+//  not the "SEEN-BY" prefix itself
 //
 function getUpdatedSeenByEntries(existingEntries, additions) {
     /*
-		From FTS-0004:
+        From FTS-0004:
 
-		"There can  be many  seen-by lines  at the  end of Conference
-		Mail messages,  and they  are the real "meat" of the control
-		information. They  are used  to  determine  the  systems  to
-		receive the exported messages. The format of the line is:
+        "There can  be many  seen-by lines  at the  end of Conference
+        Mail messages,  and they  are the real "meat" of the control
+        information. They  are used  to  determine  the  systems  to
+        receive the exported messages. The format of the line is:
 
-		           SEEN-BY: 132/101 113 136/601 1014/1
+                   SEEN-BY: 132/101 113 136/601 1014/1
 
-		The net/node  numbers correspond  to the net/node numbers of
-		the systems having already received the message. In this way
-		a message  is never  sent to a system twice. In a conference
-		with many  participants the  number of  seen-by lines can be
-		very large.   This line is added if it is not already a part
-		of the  message, or added to if it already exists, each time
-		a message  is exported  to other systems. This is a REQUIRED
-		field, and  Conference Mail  will not  function correctly if
-		this field  is not put in place by other Echomail compatible
-		programs."
+        The net/node  numbers correspond  to the net/node numbers of
+        the systems having already received the message. In this way
+        a message  is never  sent to a system twice. In a conference
+        with many  participants the  number of  seen-by lines can be
+        very large.   This line is added if it is not already a part
+        of the  message, or added to if it already exists, each time
+        a message  is exported  to other systems. This is a REQUIRED
+        field, and  Conference Mail  will not  function correctly if
+        this field  is not put in place by other Echomail compatible
+        programs."
     */
     existingEntries = existingEntries || [];
     if(!_.isArray(existingEntries)) {
@@ -328,15 +328,15 @@ function getUpdatedSeenByEntries(existingEntries, additions) {
     additions = additions.sort(Address.getComparator());
 
     //
-    //	For now, we'll just append a new SEEN-BY entry
+    //  For now, we'll just append a new SEEN-BY entry
     //
-    //	:TODO: we should at least try and update what is already there in a smart way
+    //  :TODO: we should at least try and update what is already there in a smart way
     existingEntries.push(getAbbreviatedNetNodeList(additions));
     return existingEntries;
 }
 
 function getUpdatedPathEntries(existingEntries, localAddress) {
-    //	:TODO: append to PATH in a smart way! We shoudl try to fit at least the last existing line
+    //  :TODO: append to PATH in a smart way! We shoudl try to fit at least the last existing line
 
     existingEntries = existingEntries || [];
     if(!_.isArray(existingEntries)) {
@@ -350,23 +350,23 @@ function getUpdatedPathEntries(existingEntries, localAddress) {
 }
 
 //
-//	Return FTS-5000.001 "CHRS" value
-//	http://ftsc.org/docs/fts-5003.001
+//  Return FTS-5000.001 "CHRS" value
+//  http://ftsc.org/docs/fts-5003.001
 //
 const ENCODING_TO_FTS_5003_001_CHARS = {
-    //	level 1 - generally should not be used
-    ascii		: [ 'ASCII', 1 ],
-    'us-ascii'	: [ 'ASCII', 1 ],
+    //  level 1 - generally should not be used
+    ascii       : [ 'ASCII', 1 ],
+    'us-ascii'  : [ 'ASCII', 1 ],
 
-    //	level 2 - 8 bit, ASCII based
-    cp437		: [ 'CP437', 2 ],
-    cp850		: [ 'CP850', 2 ],
+    //  level 2 - 8 bit, ASCII based
+    cp437       : [ 'CP437', 2 ],
+    cp850       : [ 'CP850', 2 ],
 
-    //	level 3 - reserved
+    //  level 3 - reserved
 
-    //	level 4
-    utf8		: [ 'UTF-8', 4 ],
-    'utf-8'		: [ 'UTF-8', 4 ],
+    //  level 4
+    utf8        : [ 'UTF-8', 4 ],
+    'utf-8'     : [ 'UTF-8', 4 ],
 };
 
 
@@ -378,47 +378,47 @@ function getCharacterSetIdentifierByEncoding(encodingName) {
 function getEncodingFromCharacterSetIdentifier(chrs) {
     const ident = chrs.split(' ')[0].toUpperCase();
 
-    //	:TODO: fill in the rest!!!
+    //  :TODO: fill in the rest!!!
     return {
-        //	level 1
-        'ASCII'		: 'iso-646-1',
-        'DUTCH'		: 'iso-646',
-        'FINNISH'	: 'iso-646-10',
-        'FRENCH'	: 'iso-646',
-        'CANADIAN'	: 'iso-646',
-        'GERMAN'	: 'iso-646',
-        'ITALIAN'	: 'iso-646',
-        'NORWEIG'	: 'iso-646',
-        'PORTU'		: 'iso-646',
-        'SPANISH'	: 'iso-656',
-        'SWEDISH'	: 'iso-646-10',
-        'SWISS'		: 'iso-646',
-        'UK'		: 'iso-646',
-        'ISO-10'	: 'iso-646-10',
+        //  level 1
+        'ASCII'     : 'iso-646-1',
+        'DUTCH'     : 'iso-646',
+        'FINNISH'   : 'iso-646-10',
+        'FRENCH'    : 'iso-646',
+        'CANADIAN'  : 'iso-646',
+        'GERMAN'    : 'iso-646',
+        'ITALIAN'   : 'iso-646',
+        'NORWEIG'   : 'iso-646',
+        'PORTU'     : 'iso-646',
+        'SPANISH'   : 'iso-656',
+        'SWEDISH'   : 'iso-646-10',
+        'SWISS'     : 'iso-646',
+        'UK'        : 'iso-646',
+        'ISO-10'    : 'iso-646-10',
 
-        //	level 2
-        'CP437'		: 'cp437',
-        'CP850'		: 'cp850',
-        'CP852'		: 'cp852',
-        'CP866'		: 'cp866',
-        'CP848'		: 'cp848',
-        'CP1250'	: 'cp1250',
-        'CP1251'	: 'cp1251',
-        'CP1252'	: 'cp1252',
-        'CP10000'	: 'macroman',
-        'LATIN-1'	: 'iso-8859-1',
-        'LATIN-2'	: 'iso-8859-2',
-        'LATIN-5'	: 'iso-8859-9',
-        'LATIN-9'	: 'iso-8859-15',
+        //  level 2
+        'CP437'     : 'cp437',
+        'CP850'     : 'cp850',
+        'CP852'     : 'cp852',
+        'CP866'     : 'cp866',
+        'CP848'     : 'cp848',
+        'CP1250'    : 'cp1250',
+        'CP1251'    : 'cp1251',
+        'CP1252'    : 'cp1252',
+        'CP10000'   : 'macroman',
+        'LATIN-1'   : 'iso-8859-1',
+        'LATIN-2'   : 'iso-8859-2',
+        'LATIN-5'   : 'iso-8859-9',
+        'LATIN-9'   : 'iso-8859-15',
 
-        //	level 4
-        'UTF-8'		: 'utf8',
+        //  level 4
+        'UTF-8'     : 'utf8',
 
-        //	deprecated stuff
-        'IBMPC'		: 'cp1250',		//	:TODO: validate
-        '+7_FIDO'	: 'cp866',
-        '+7'		: 'cp866',
-        'MAC'		: 'macroman',	//	:TODO: validate
+        //  deprecated stuff
+        'IBMPC'     : 'cp1250',     //  :TODO: validate
+        '+7_FIDO'   : 'cp866',
+        '+7'        : 'cp866',
+        'MAC'       : 'macroman',   //  :TODO: validate
 
     }[ident];
 }
\ No newline at end of file
diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index eb45d993..b7d0aba3 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-const MenuView			= require('./menu_view.js').MenuView;
-const strUtil			= require('./string_util.js');
-const formatString		= require('./string_format');
-const { pipeToAnsi }	= require('./color_codes.js');
-const { goto }			= require('./ansi_term.js');
+const MenuView          = require('./menu_view.js').MenuView;
+const strUtil           = require('./string_util.js');
+const formatString      = require('./string_format');
+const { pipeToAnsi }    = require('./color_codes.js');
+const { goto }          = require('./ansi_term.js');
 
-const assert			= require('assert');
-const _					= require('lodash');
+const assert            = require('assert');
+const _                 = require('lodash');
 
-exports.HorizontalMenuView		= HorizontalMenuView;
+exports.HorizontalMenuView      = HorizontalMenuView;
 
-//	:TODO: Update this to allow scrolling if number of items cannot fit in width (similar to VerticalMenuView)
+//  :TODO: Update this to allow scrolling if number of items cannot fit in width (similar to VerticalMenuView)
 
 function HorizontalMenuView(options) {
-    options.cursor	= options.cursor || 'hide';
+    options.cursor  = options.cursor || 'hide';
 
     if(!_.isNumber(options.itemSpacing)) {
         options.itemSpacing = 1;
@@ -23,7 +23,7 @@ function HorizontalMenuView(options) {
 
     MenuView.call(this, options);
 
-    this.dimens.height = 1;	//	always the case
+    this.dimens.height = 1; //  always the case
 
     var self = this;
 
@@ -33,8 +33,8 @@ function HorizontalMenuView(options) {
 
     this.performAutoScale = function() {
         if(self.autoScale.width) {
-            var spacer	= self.getSpacer();
-            var width	= self.items.join(spacer).length + (spacer.length * 2);
+            var spacer  = self.getSpacer();
+            var width   = self.items.join(spacer).length + (spacer.length * 2);
             assert(width <= self.client.term.termWidth - self.position.col);
             self.dimens.width = width;
         }
@@ -44,8 +44,8 @@ function HorizontalMenuView(options) {
 
     this.cachePositions = function() {
         if(this.positionCacheExpired) {
-            var col		= self.position.col;
-            var spacer	= self.getSpacer();
+            var col     = self.position.col;
+            var spacer  = self.getSpacer();
 
             for(var i = 0; i < self.items.length; ++i) {
                 self.items[i].col = col;
@@ -90,7 +90,7 @@ require('util').inherits(HorizontalMenuView, MenuView);
 
 HorizontalMenuView.prototype.setHeight = function(height) {
     height = parseInt(height, 10);
-    assert(1 === height);	//	nothing else allowed here
+    assert(1 === height);   //  nothing else allowed here
     HorizontalMenuView.super_.prototype.setHeight(this, height);
 };
 
@@ -130,7 +130,7 @@ HorizontalMenuView.prototype.focusNext = function() {
         this.focusedItemIndex++;
     }
 
-    //	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
+    //  :TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
     this.redraw();
 
     HorizontalMenuView.super_.prototype.focusNext.call(this);
@@ -144,7 +144,7 @@ HorizontalMenuView.prototype.focusPrevious = function() {
         this.focusedItemIndex--;
     }
 
-    //	:TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
+    //  :TODO: Optimize this in cases where we only need to redraw two items. Always the case now, somtimes
     this.redraw();
 
     HorizontalMenuView.super_.prototype.focusPrevious.call(this);
diff --git a/core/key_entry_view.js b/core/key_entry_view.js
index 1d7ca905..0bab0ad5 100644
--- a/core/key_entry_view.js
+++ b/core/key_entry_view.js
@@ -1,12 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const View				= require('./view.js').View;
-const valueWithDefault	= require('./misc_util.js').valueWithDefault;
-const isPrintable		= require('./string_util.js').isPrintable;
-const stylizeString		= require('./string_util.js').stylizeString;
+const View              = require('./view.js').View;
+const valueWithDefault  = require('./misc_util.js').valueWithDefault;
+const isPrintable       = require('./string_util.js').isPrintable;
+const stylizeString     = require('./string_util.js').stylizeString;
 
-const _					= require('lodash');
+const _                 = require('lodash');
 
 module.exports = class KeyEntryView extends View {
     constructor(options) {
@@ -15,8 +15,8 @@ module.exports = class KeyEntryView extends View {
 
         super(options);
 
-        this.eatTabKey			= options.eatTabKey || true;
-        this.caseInsensitive	= options.caseInsensitive || true;
+        this.eatTabKey          = options.eatTabKey || true;
+        this.caseInsensitive    = options.caseInsensitive || true;
 
         if(Array.isArray(options.keys)) {
             if(this.caseInsensitive) {
@@ -35,7 +35,7 @@ module.exports = class KeyEntryView extends View {
         }
 
         if(drawKey && isPrintable(drawKey) && (!this.keys || this.keys.indexOf(ch) > -1)) {
-            this.redraw();	//	sets position
+            this.redraw();  //  sets position
             this.client.term.write(stylizeString(ch, this.textStyle));
         }
 
@@ -46,7 +46,7 @@ module.exports = class KeyEntryView extends View {
         }
 
         this.emit('action', 'accept');
-        //	NOTE: we don't call super here. KeyEntryView is a special snowflake.
+        //  NOTE: we don't call super here. KeyEntryView is a special snowflake.
     }
 
     setPropertyValue(propName, propValue) {
@@ -73,5 +73,5 @@ module.exports = class KeyEntryView extends View {
         super.setPropertyValue(propName, propValue);
     }
 
-    getData() {	return this.keyEntered; }
+    getData() { return this.keyEntered; }
 };
\ No newline at end of file
diff --git a/core/last_callers.js b/core/last_callers.js
index 88b0b716..52ec08f9 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule		= require('./menu_module.js').MenuModule;
-const ViewController	= require('./view_controller.js').ViewController;
-const StatLog			= require('./stat_log.js');
-const User				= require('./user.js');
-const stringFormat		= require('./string_format.js');
+//  ENiGMA½
+const MenuModule        = require('./menu_module.js').MenuModule;
+const ViewController    = require('./view_controller.js').ViewController;
+const StatLog           = require('./stat_log.js');
+const User              = require('./user.js');
+const stringFormat      = require('./string_format.js');
 
-//	deps
-const moment			= require('moment');
-const async				= require('async');
-const _					= require('lodash');
+//  deps
+const moment            = require('moment');
+const async             = require('async');
+const _                 = require('lodash');
 
 /*
-	Available listFormat object members:
-	userId
-	userName
-	location
-	affiliation
-	ts
+    Available listFormat object members:
+    userId
+    userName
+    location
+    affiliation
+    ts
 
 */
 
 exports.moduleInfo = {
-    name		: 'Last Callers',
-    desc		: 'Last callers to the system',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.lastcallers'
+    name        : 'Last Callers',
+    desc        : 'Last callers to the system',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.lastcallers'
 };
 
 const MciCodeIds = {
-    CallerList		: 1,
+    CallerList      : 1,
 };
 
 exports.getModule = class LastCallersModule extends MenuModule {
@@ -45,8 +45,8 @@ exports.getModule = class LastCallersModule extends MenuModule {
                 return cb(err);
             }
 
-            const self		= this;
-            const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self      = this;
+            const vc        = self.viewControllers.allViews = new ViewController( { client : self.client } );
 
             let loginHistory;
             let callersView;
@@ -55,9 +55,9 @@ exports.getModule = class LastCallersModule extends MenuModule {
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu,
-                            noInput			: true,
+                            callingMenu     : self,
+                            mciMap          : mciData.menu,
+                            noInput         : true,
                         };
 
                         vc.loadFromMenuConfig(loadOpts, callback);
@@ -65,18 +65,18 @@ exports.getModule = class LastCallersModule extends MenuModule {
                     function fetchHistory(callback) {
                         callersView = vc.getView(MciCodeIds.CallerList);
 
-                        //	fetch up
+                        //  fetch up
                         StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, 200, (err, lh) => {
                             loginHistory = lh;
 
                             if(self.menuConfig.config.hideSysOpLogin) {
                                 const noOpLoginHistory = loginHistory.filter(lh => {
-                                    return false === User.isRootUserId(parseInt(lh.log_value));	//	log_value=userId
+                                    return false === User.isRootUserId(parseInt(lh.log_value)); //  log_value=userId
                                 });
 
                                 //
-                                //	If we have enough items to display, or hideSysOpLogin is set to 'always',
-                                //	then set loginHistory to our filtered list. Else, we'll leave it be.
+                                //  If we have enough items to display, or hideSysOpLogin is set to 'always',
+                                //  then set loginHistory to our filtered list. Else, we'll leave it be.
                                 //
                                 if(noOpLoginHistory.length >= callersView.dimens.height || 'always' === self.menuConfig.config.hideSysOpLogin) {
                                     loginHistory = noOpLoginHistory;
@@ -84,7 +84,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
                             }
 
                             //
-                            //	Finally, we need to trim up the list to the needed size
+                            //  Finally, we need to trim up the list to the needed size
                             //
                             loginHistory = loginHistory.slice(0, callersView.dimens.height);
 
@@ -93,7 +93,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
                     },
                     function getUserNamesAndProperties(callback) {
                         const getPropOpts = {
-                            names		: [ 'location', 'affiliation' ]
+                            names       : [ 'location', 'affiliation' ]
                         };
 
                         const dateTimeFormat = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
@@ -102,7 +102,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
                             loginHistory,
                             (item, next) => {
                                 item.userId = parseInt(item.log_value);
-                                item.ts		= moment(item.timestamp).format(dateTimeFormat);
+                                item.ts     = moment(item.timestamp).format(dateTimeFormat);
 
                                 User.getUserName(item.userId, (err, userName) => {
                                     if(err) {
@@ -113,11 +113,11 @@ exports.getModule = class LastCallersModule extends MenuModule {
 
                                         User.loadProperties(item.userId, getPropOpts, (err, props) => {
                                             if(!err && props) {
-                                                item.location 		= props.location || 'N/A';
-                                                item.affiliation	= item.affils = (props.affiliation || 'N/A');
+                                                item.location       = props.location || 'N/A';
+                                                item.affiliation    = item.affils = (props.affiliation || 'N/A');
                                             } else {
-                                                item.location		= 'N/A';
-                                                item.affiliation	= item.affils = 'N/A';
+                                                item.location       = 'N/A';
+                                                item.affiliation    = item.affils = 'N/A';
                                             }
                                             return next(null);
                                         });
diff --git a/core/listening_server.js b/core/listening_server.js
index 3678ff3f..00cf0a86 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -1,17 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const logger			= require('./logger.js');
+//  ENiGMA½
+const logger            = require('./logger.js');
 
-//	deps
-const async				= require('async');
+//  deps
+const async             = require('async');
 
-const listeningServers = {};	//	packageName -> info
+const listeningServers = {};    //  packageName -> info
 
-exports.startup			= startup;
-exports.shutdown		= shutdown;
-exports.getServer		= getServer;
+exports.startup         = startup;
+exports.shutdown        = shutdown;
+exports.getServer       = getServer;
 
 function startup(cb) {
     return startListening(cb);
@@ -26,11 +26,11 @@ function getServer(packageName) {
 }
 
 function startListening(cb) {
-    const moduleUtil = require('./module_util.js');	//	late load so we get Config
+    const moduleUtil = require('./module_util.js'); //  late load so we get Config
 
     async.each( [ 'login', 'content' ], (category, next) => {
         moduleUtil.loadModulesForCategory(`${category}Servers`, (err, module) => {
-            //	:TODO: use enig error here!
+            //  :TODO: use enig error here!
             if(err) {
                 if('EENIGMODDISABLED' === err.code) {
                     logger.log.debug(err.message);
@@ -48,8 +48,8 @@ function startListening(cb) {
                 }
 
                 listeningServers[module.moduleInfo.packageName] = {
-                    instance	: moduleInst,
-                    info		: module.moduleInfo,
+                    instance    : moduleInst,
+                    info        : module.moduleInfo,
                 };
 
             } catch(e) {
diff --git a/core/logger.js b/core/logger.js
index 8b95c821..9a4e8711 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const bunyan	= require('bunyan');
-const paths		= require('path');
-const fs		= require('graceful-fs');
-const _			= require('lodash');
+//  deps
+const bunyan    = require('bunyan');
+const paths     = require('path');
+const fs        = require('graceful-fs');
+const _         = require('lodash');
 
 module.exports = class Log {
 
     static init() {
-        const Config	= require('./config.js').get();
-        const logPath	= Config.paths.logs;
+        const Config    = require('./config.js').get();
+        const logPath   = Config.paths.logs;
 
         const err = this.checkLogPath(logPath);
         if(err) {
-            console.error(err.message);	//	eslint-disable-line no-console
+            console.error(err.message); //  eslint-disable-line no-console
             return process.exit();
         }
 
@@ -26,18 +26,18 @@ module.exports = class Log {
         }
 
         const serializers = {
-            err	: bunyan.stdSerializers.err,		//	handle 'err' fields with stack/etc.
+            err : bunyan.stdSerializers.err,        //  handle 'err' fields with stack/etc.
         };
 
-        //	try to remove sensitive info by default, e.g. 'password' fields
+        //  try to remove sensitive info by default, e.g. 'password' fields
         [ 'formData', 'formValue' ].forEach(keyName => {
             serializers[keyName] = (fd) => Log.hideSensitive(fd);
         });
 
         this.log = bunyan.createLogger({
-            name			: 'ENiGMA½ BBS',
-            streams			: logStreams,
-            serializers		: serializers,
+            name            : 'ENiGMA½ BBS',
+            streams         : logStreams,
+            serializers     : serializers,
         });
     }
 
@@ -59,7 +59,7 @@ module.exports = class Log {
     static hideSensitive(obj) {
         try {
             //
-            //	Use a regexp -- we don't know how nested fields we want to seek and destroy may be
+            //  Use a regexp -- we don't know how nested fields we want to seek and destroy may be
             //
             return JSON.parse(
                 JSON.stringify(obj).replace(/"(password|passwordConfirm|key|authCode)"\s?:\s?"([^"]+)"/, (match, valueName) => {
@@ -67,7 +67,7 @@ module.exports = class Log {
                 })
             );
         } catch(e) {
-            //	be safe and return empty obj!
+            //  be safe and return empty obj!
             return {};
         }
     }
diff --git a/core/login_server_module.js b/core/login_server_module.js
index ef4e712e..02cd4e41 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -1,27 +1,27 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const conf			= require('./config.js');
-const logger		= require('./logger.js');
-const ServerModule	= require('./server_module.js').ServerModule;
-const clientConns	= require('./client_connections.js');
+//  ENiGMA½
+const conf          = require('./config.js');
+const logger        = require('./logger.js');
+const ServerModule  = require('./server_module.js').ServerModule;
+const clientConns   = require('./client_connections.js');
 
-//	deps
-const _			= require('lodash');
+//  deps
+const _         = require('lodash');
 
 module.exports = class LoginServerModule extends ServerModule {
     constructor() {
         super();
     }
 
-    //	:TODO: we need to max connections -- e.g. from config 'maxConnections'
+    //  :TODO: we need to max connections -- e.g. from config 'maxConnections'
 
     prepareClient(client, cb) {
         const theme = require('./theme.js');
 
         //
-        //	Choose initial theme before we have user context
+        //  Choose initial theme before we have user context
         //
         if('*' === conf.config.preLoginTheme) {
             client.user.properties.theme_id = theme.getRandomTheme() || '';
@@ -35,15 +35,15 @@ module.exports = class LoginServerModule extends ServerModule {
 
     handleNewClient(client, clientSock, modInfo) {
         //
-        //	Start tracking the client. We'll assign it an ID which is
-        //	just the index in our connections array.
+        //  Start tracking the client. We'll assign it an ID which is
+        //  just the index in our connections array.
         //
         if(_.isUndefined(client.session)) {
             client.session = {};
         }
 
-        client.session.serverName 	= modInfo.name;
-        client.session.isSecure		= _.isBoolean(client.isSecure) ? client.isSecure : (modInfo.isSecure || false);
+        client.session.serverName   = modInfo.name;
+        client.session.isSecure     = _.isBoolean(client.isSecure) ? client.isSecure : (modInfo.isSecure || false);
 
         clientConns.addNewClient(client, clientSock);
 
@@ -51,7 +51,7 @@ module.exports = class LoginServerModule extends ServerModule {
 
             client.startIdleMonitor();
 
-            //	Go to module -- use default error handler
+            //  Go to module -- use default error handler
             this.prepareClient(client, () => {
                 require('./connect.js').connectEntry(client, readyOptions.firstMenu);
             });
@@ -77,7 +77,7 @@ module.exports = class LoginServerModule extends ServerModule {
 
             client.menuStack.goto('idleLogoff', err => {
                 if(err) {
-                    //	likely just doesn't exist
+                    //  likely just doesn't exist
                     client.term.write('\nIdle timeout expired. Goodbye!\n');
                     client.end();
                 }
diff --git a/core/mail_packet.js b/core/mail_packet.js
index 32b85a06..ce5b160a 100644
--- a/core/mail_packet.js
+++ b/core/mail_packet.js
@@ -1,16 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-var events			= require('events');
-var assert			= require('assert');
-var _				= require('lodash');
+var events          = require('events');
+var assert          = require('assert');
+var _               = require('lodash');
 
 module.exports = MailPacket;
 
 function MailPacket(options) {
     events.EventEmitter.call(this);
 
-    //	map of network name -> address obj ( { zone, net, node, point, domain } )
+    //  map of network name -> address obj ( { zone, net, node, point, domain } )
     this.nodeAddresses = options.nodeAddresses || {};
 }
 
@@ -18,19 +18,19 @@ require('util').inherits(MailPacket, events.EventEmitter);
 
 MailPacket.prototype.read = function(options) {
     //
-    //	options.packetPath | opts.packetBuffer: supplies a path-to-file
-    //	or a buffer containing packet data
+    //  options.packetPath | opts.packetBuffer: supplies a path-to-file
+    //  or a buffer containing packet data
     //
-    //	emits 'message' event per message read
+    //  emits 'message' event per message read
     //
     assert(_.isString(options.packetPath) || Buffer.isBuffer(options.packetBuffer));
 };
 
 MailPacket.prototype.write = function(options) {
     //
-    //	options.messages[]: array of message(s) to create packets from
+    //  options.messages[]: array of message(s) to create packets from
     //
-    //	emits 'packet' event per packet constructed
+    //  emits 'packet' event per packet constructed
     //
     assert(_.isArray(options.messages));
 };
\ No newline at end of file
diff --git a/core/mail_util.js b/core/mail_util.js
index 6822e78e..6bd433d3 100644
--- a/core/mail_util.js
+++ b/core/mail_util.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-const Address				= require('./ftn_address.js');
-const Message				= require('./message.js');
+const Address               = require('./ftn_address.js');
+const Message               = require('./message.js');
 
-exports.getAddressedToInfo	= getAddressedToInfo;
+exports.getAddressedToInfo  = getAddressedToInfo;
 
 const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
 /*
-	Input                              Output
-	----------------------------------------------------------------------------------------------------
-	User                               { name : 'User', flavor : 'local' }
-	Some User                          { name : 'Some User', flavor : 'local' }
-	JoeUser @ 1:103/75                 { name : 'JoeUser', flavor : 'ftn', remote : '1:103/75' }
-	Bob@1:103/705@fidonet.org          { name : 'Bob', flavor : 'ftn', remote : '1:103/705@fidonet.org' }
-	1:103/705@fidonet.org              { flavor : 'ftn', remote : '1:103/705@fidonet.org' }
-	Jane <23:4/100>                    { name : 'Jane', flavor : 'ftn', remote : '23:4/100' }
-	43:20/100.2                        { flavor : 'ftn', remote : '43:20/100.2' }
-	foo@host.com                       { name : 'foo', flavor : 'email', remote : 'foo@host.com' }
-	Bar <baz@foobar.net>               { name : 'Bar', flavor : 'email', remote : 'baz@foobar.com' }
+    Input                              Output
+    ----------------------------------------------------------------------------------------------------
+    User                               { name : 'User', flavor : 'local' }
+    Some User                          { name : 'Some User', flavor : 'local' }
+    JoeUser @ 1:103/75                 { name : 'JoeUser', flavor : 'ftn', remote : '1:103/75' }
+    Bob@1:103/705@fidonet.org          { name : 'Bob', flavor : 'ftn', remote : '1:103/705@fidonet.org' }
+    1:103/705@fidonet.org              { flavor : 'ftn', remote : '1:103/705@fidonet.org' }
+    Jane <23:4/100>                    { name : 'Jane', flavor : 'ftn', remote : '23:4/100' }
+    43:20/100.2                        { flavor : 'ftn', remote : '43:20/100.2' }
+    foo@host.com                       { name : 'foo', flavor : 'email', remote : 'foo@host.com' }
+    Bar <baz@foobar.net>               { name : 'Bar', flavor : 'email', remote : 'baz@foobar.com' }
 */
 function getAddressedToInfo(input) {
     input = input.trim();
@@ -50,8 +50,8 @@ function getAddressedToInfo(input) {
         return { name : input, flavor : Message.AddressFlavor.Local };
     }
 
-    const lessThanPos		= input.indexOf('<');
-    const greaterThanPos	= input.indexOf('>');
+    const lessThanPos       = input.indexOf('<');
+    const greaterThanPos    = input.indexOf('>');
     if(lessThanPos > 0 && greaterThanPos > lessThanPos) {
         const addr = input.slice(lessThanPos + 1, greaterThanPos);
         const m = addr.match(EMAIL_REGEX);
@@ -67,7 +67,7 @@ function getAddressedToInfo(input) {
         return { name : input.slice(0, firstAtPos), flavor : Message.AddressFlavor.Email, remote : input };
     }
 
-    let addr = Address.fromString(input);	//	5D?
+    let addr = Address.fromString(input);   //  5D?
     if(Address.isValidAddress(addr)) {
         return { flavor : Message.AddressFlavor.FTN, remote : addr.toString() } ;
     }
diff --git a/core/mask_edit_text_view.js b/core/mask_edit_text_view.js
index 417b7928..6cdf40b0 100644
--- a/core/mask_edit_text_view.js
+++ b/core/mask_edit_text_view.js
@@ -1,42 +1,42 @@
 /* jslint node: true */
 'use strict';
 
-var TextView		= require('./text_view.js').TextView;
-var miscUtil		= require('./misc_util.js');
-var strUtil			= require('./string_util.js');
-var ansi			= require('./ansi_term.js');
+var TextView        = require('./text_view.js').TextView;
+var miscUtil        = require('./misc_util.js');
+var strUtil         = require('./string_util.js');
+var ansi            = require('./ansi_term.js');
 
-//var util			= require('util');
-var assert			= require('assert');
-var _				= require('lodash');
+//var util          = require('util');
+var assert          = require('assert');
+var _               = require('lodash');
 
-exports.MaskEditTextView	= MaskEditTextView;
+exports.MaskEditTextView    = MaskEditTextView;
 
-//	##/##/#### <--styleSGR2 if fillChar
-//	  ^- styleSGR1
-//	buildPattern -> [ RE, RE, '/', RE, RE, '/', RE, RE, RE, RE ]
-//	patternIndex -----^
+//  ##/##/#### <--styleSGR2 if fillChar
+//    ^- styleSGR1
+//  buildPattern -> [ RE, RE, '/', RE, RE, '/', RE, RE, RE, RE ]
+//  patternIndex -----^
 
-//	styleSGR1: Literal's (non-focus)
-//	styleSGR2: Literals (focused)
-//	styleSGR3: fillChar
+//  styleSGR1: Literal's (non-focus)
+//  styleSGR2: Literals (focused)
+//  styleSGR3: fillChar
 
 //
-//	:TODO:
-//	* Hint, e.g. YYYY/MM/DD
-//	* Return values with literals in place
+//  :TODO:
+//  * Hint, e.g. YYYY/MM/DD
+//  * Return values with literals in place
 //
 
 function MaskEditTextView(options) {
-    options.acceptsFocus 	= miscUtil.valueWithDefault(options.acceptsFocus, true);
-    options.acceptsInput	= miscUtil.valueWithDefault(options.acceptsInput, true);
-    options.cursorStyle		= miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
-    options.resizable		= false;
+    options.acceptsFocus    = miscUtil.valueWithDefault(options.acceptsFocus, true);
+    options.acceptsInput    = miscUtil.valueWithDefault(options.acceptsInput, true);
+    options.cursorStyle     = miscUtil.valueWithDefault(options.cursorStyle, 'steady block');
+    options.resizable       = false;
 
     TextView.call(this, options);
 
-    this.cursorPos			= { x : 0 };
-    this.patternArrayPos	= 0;
+    this.cursorPos          = { x : 0 };
+    this.patternArrayPos    = 0;
 
     var self = this;
 
@@ -52,7 +52,7 @@ function MaskEditTextView(options) {
 
         assert(textToDraw.length <= self.patternArray.length);
 
-        //	draw out the text we have so far
+        //  draw out the text we have so far
         var i = 0;
         var t = 0;
         while(i < self.patternArray.length) {
@@ -72,11 +72,11 @@ function MaskEditTextView(options) {
     };
 
     this.buildPattern = function() {
-        self.patternArray	= [];
-        self.maxLength		= 0;
+        self.patternArray   = [];
+        self.maxLength      = 0;
 
         for(var i = 0; i < self.maskPattern.length; i++) {
-            //	:TODO: support escaped characters, e.g. \#. Also allow \\ for a '\' mark!
+            //  :TODO: support escaped characters, e.g. \#. Also allow \\ for a '\' mark!
             if(self.maskPattern[i] in MaskEditTextView.maskPatternCharacterRegEx) {
                 self.patternArray.push(MaskEditTextView.maskPatternCharacterRegEx[self.maskPattern[i]]);
                 ++self.maxLength;
@@ -97,16 +97,16 @@ function MaskEditTextView(options) {
 require('util').inherits(MaskEditTextView, TextView);
 
 MaskEditTextView.maskPatternCharacterRegEx = {
-    '#'				: /[0-9]/,				//	Numeric
-    'A'				: /[a-zA-Z]/,			//	Alpha
-    '@'				: /[0-9a-zA-Z]/,		//	Alphanumeric
-    '&'				: /[\w\d\s]/,			//	Any "printable" 32-126, 128-255
+    '#'             : /[0-9]/,              //  Numeric
+    'A'             : /[a-zA-Z]/,           //  Alpha
+    '@'             : /[0-9a-zA-Z]/,        //  Alphanumeric
+    '&'             : /[\w\d\s]/,           //  Any "printable" 32-126, 128-255
 };
 
 MaskEditTextView.prototype.setText = function(text) {
     MaskEditTextView.super_.prototype.setText.call(this, text);
 
-    if(this.patternArray) {	//	:TODO: This is a hack - see TextView ctor note about setText()
+    if(this.patternArray) { //  :TODO: This is a hack - see TextView ctor note about setText()
         this.patternArrayPos = this.patternArray.length;
     }
 };
@@ -143,9 +143,9 @@ MaskEditTextView.prototype.onKeyPress = function(ch, key) {
 
             return;
         } else if(this.isKeyMapped('clearLine', key.name)) {
-            this.text				= '';
-            this.patternArrayPos	= 0;
-            this.setFocus(true);	//	redraw + adjust cursor
+            this.text               = '';
+            this.patternArrayPos    = 0;
+            this.setFocus(true);    //  redraw + adjust cursor
 
             return;
         }
@@ -163,7 +163,7 @@ MaskEditTextView.prototype.onKeyPress = function(ch, key) {
             this.patternArrayPos++;
 
             while(this.patternArrayPos < this.patternArray.length &&
-				!_.isRegExp(this.patternArray[this.patternArrayPos]))
+                !_.isRegExp(this.patternArray[this.patternArrayPos]))
             {
                 this.patternArrayPos++;
             }
@@ -178,7 +178,7 @@ MaskEditTextView.prototype.onKeyPress = function(ch, key) {
 
 MaskEditTextView.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
-        case 'maskPattern'	: this.setMaskPattern(value); break;
+        case 'maskPattern'  : this.setMaskPattern(value); break;
     }
 
     MaskEditTextView.super_.prototype.setPropertyValue.call(this, propName, value);
@@ -191,7 +191,7 @@ MaskEditTextView.prototype.getData = function() {
         return rawData;
     }
 
-    var data	= '';
+    var data    = '';
 
     assert(rawData.length <= this.patternArray.length);
 
diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index 3bc333ae..86246d45 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const TextView				= require('./text_view.js').TextView;
-const EditTextView			= require('./edit_text_view.js').EditTextView;
-const ButtonView			= require('./button_view.js').ButtonView;
-const VerticalMenuView		= require('./vertical_menu_view.js').VerticalMenuView;
-const HorizontalMenuView	= require('./horizontal_menu_view.js').HorizontalMenuView;
-const SpinnerMenuView		= require('./spinner_menu_view.js').SpinnerMenuView;
-const ToggleMenuView		= require('./toggle_menu_view.js').ToggleMenuView;
-const MaskEditTextView		= require('./mask_edit_text_view.js').MaskEditTextView;
-const KeyEntryView			= require('./key_entry_view.js');
-const MultiLineEditTextView	= require('./multi_line_edit_text_view.js').MultiLineEditTextView;
-const getPredefinedMCIValue	= require('./predefined_mci.js').getPredefinedMCIValue;
-const ansi					= require('./ansi_term.js');
+//  ENiGMA½
+const TextView              = require('./text_view.js').TextView;
+const EditTextView          = require('./edit_text_view.js').EditTextView;
+const ButtonView            = require('./button_view.js').ButtonView;
+const VerticalMenuView      = require('./vertical_menu_view.js').VerticalMenuView;
+const HorizontalMenuView    = require('./horizontal_menu_view.js').HorizontalMenuView;
+const SpinnerMenuView       = require('./spinner_menu_view.js').SpinnerMenuView;
+const ToggleMenuView        = require('./toggle_menu_view.js').ToggleMenuView;
+const MaskEditTextView      = require('./mask_edit_text_view.js').MaskEditTextView;
+const KeyEntryView          = require('./key_entry_view.js');
+const MultiLineEditTextView = require('./multi_line_edit_text_view.js').MultiLineEditTextView;
+const getPredefinedMCIValue = require('./predefined_mci.js').getPredefinedMCIValue;
+const ansi                  = require('./ansi_term.js');
 
-//	deps
-const assert					= require('assert');
-const _						= require('lodash');
+//  deps
+const assert                    = require('assert');
+const _                     = require('lodash');
 
-exports.MCIViewFactory		= MCIViewFactory;
+exports.MCIViewFactory      = MCIViewFactory;
 
 function MCIViewFactory(client) {
     this.client = client;
@@ -29,9 +29,9 @@ MCIViewFactory.UserViewCodes = [
     'TL', 'ET', 'ME', 'MT', 'PL', 'BT', 'VM', 'HM', 'SM', 'TM', 'KE',
 
     //
-    //	XY is a special MCI code that allows finding positions
-    //	and counts for key lookup, but does not explicitly
-    //	represent a visible View on it's own
+    //  XY is a special MCI code that allows finding positions
+    //  and counts for key lookup, but does not explicitly
+    //  represent a visible View on it's own
     //
     'XY',
 ];
@@ -43,14 +43,14 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
 
     var view;
     var options = {
-        client			: this.client,
-        id				: mci.id,
-        ansiSGR			: mci.SGR,
-        ansiFocusSGR	: mci.focusSGR,
-        position		: { row : mci.position[0], col : mci.position[1] },
+        client          : this.client,
+        id              : mci.id,
+        ansiSGR         : mci.SGR,
+        ansiFocusSGR    : mci.focusSGR,
+        position        : { row : mci.position[0], col : mci.position[1] },
     };
 
-    //	:TODO: These should use setPropertyValue()!
+    //  :TODO: These should use setPropertyValue()!
     function setOption(pos, name) {
         if(mci.args.length > pos && mci.args[pos].length > 0) {
             options[name] = mci.args[pos];
@@ -73,44 +73,44 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
     }
 
     //
-    //	Note: Keep this in sync with UserViewCodes above!
+    //  Note: Keep this in sync with UserViewCodes above!
     //
     switch(mci.code) {
-        //	Text Label (Text View)
+        //  Text Label (Text View)
         case 'TL' :
-            setOption(0,	'textStyle');
-            setOption(1,	'justify');
+            setOption(0,    'textStyle');
+            setOption(1,    'justify');
             setWidth(2);
 
             view = new TextView(options);
             break;
 
-            //	Edit Text
+            //  Edit Text
         case 'ET' :
             setWidth(0);
 
-            setOption(1, 		'textStyle');
-            setFocusOption(0,	'focusTextStyle');
+            setOption(1,        'textStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new EditTextView(options);
             break;
 
-            //	Masked Edit Text
+            //  Masked Edit Text
         case 'ME' :
-            setOption(0,		'textStyle');
-            setFocusOption(0,	'focusTextStyle');
+            setOption(0,        'textStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new MaskEditTextView(options);
             break;
 
-            //	Multi Line Edit Text
+            //  Multi Line Edit Text
         case 'MT' :
-            //	:TODO: apply params
+            //  :TODO: apply params
             view = new MultiLineEditTextView(options);
             break;
 
-            //	Pre-defined Label (Text View)
-            //	:TODO: Currently no real point of PL -- @method replaces this pretty much... probably remove
+            //  Pre-defined Label (Text View)
+            //  :TODO: Currently no real point of PL -- @method replaces this pretty much... probably remove
         case 'PL' :
             if(mci.args.length > 0) {
                 options.text = getPredefinedMCIValue(this.client, mci.args[0]);
@@ -124,7 +124,7 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
             }
             break;
 
-            //	Button
+            //  Button
         case 'BT' :
             if(mci.args.length > 0) {
                 options.dimens = { width : parseInt(mci.args[0], 10) };
@@ -138,32 +138,32 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
             view = new ButtonView(options);
             break;
 
-            //	Vertial Menu
+            //  Vertial Menu
         case 'VM' :
-            setOption(0,		'itemSpacing');
-            setOption(1, 		'justify');
-            setOption(2, 		'textStyle');
+            setOption(0,        'itemSpacing');
+            setOption(1,        'justify');
+            setOption(2,        'textStyle');
 
-            setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new VerticalMenuView(options);
             break;
 
-            //	Horizontal Menu
+            //  Horizontal Menu
         case 'HM' :
-            setOption(0,		'itemSpacing');
-            setOption(1,		'textStyle');
+            setOption(0,        'itemSpacing');
+            setOption(1,        'textStyle');
 
-            setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new HorizontalMenuView(options);
             break;
 
         case 'SM' :
-            setOption(0,		'textStyle');
-            setOption(1, 		'justify');
+            setOption(0,        'textStyle');
+            setOption(1,        'justify');
 
-            setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new SpinnerMenuView(options);
             break;
@@ -177,7 +177,7 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
                 options.styleSG1 = ansi.getSGRFromGraphicRendition(styleSG1, true);
             }
 
-            setFocusOption(0,	'focusTextStyle');
+            setFocusOption(0,   'focusTextStyle');
 
             view = new ToggleMenuView(options);
             break;
@@ -191,8 +191,8 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
             if(_.isString(options.text)) {
                 setWidth(0);
 
-                setOption(1,	'textStyle');
-                setOption(2,	'justify');
+                setOption(1,    'textStyle');
+                setOption(2,    'justify');
 
                 view = new TextView(options);
             }
diff --git a/core/menu_module.js b/core/menu_module.js
index 520d30e9..2a3bf23b 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-const PluginModule				= require('./plugin_module.js').PluginModule;
-const theme						= require('./theme.js');
-const ansi						= require('./ansi_term.js');
-const ViewController			= require('./view_controller.js').ViewController;
-const menuUtil					= require('./menu_util.js');
-const Config					= require('./config.js').get;
-const stringFormat				= require('../core/string_format.js');
-const MultiLineEditTextView		= require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
-const Errors					= require('../core/enig_error.js').Errors;
-const { getPredefinedMCIValue }	= require('../core/predefined_mci.js');
+const PluginModule              = require('./plugin_module.js').PluginModule;
+const theme                     = require('./theme.js');
+const ansi                      = require('./ansi_term.js');
+const ViewController            = require('./view_controller.js').ViewController;
+const menuUtil                  = require('./menu_util.js');
+const Config                    = require('./config.js').get;
+const stringFormat              = require('../core/string_format.js');
+const MultiLineEditTextView     = require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
+const Errors                    = require('../core/enig_error.js').Errors;
+const { getPredefinedMCIValue } = require('../core/predefined_mci.js');
 
-//	deps
-const async					= require('async');
-const assert				= require('assert');
-const _						= require('lodash');
+//  deps
+const async                 = require('async');
+const assert                = require('assert');
+const _                     = require('lodash');
 
 exports.MenuModule = class MenuModule extends PluginModule {
 
     constructor(options) {
         super(options);
 
-        this.menuName			= options.menuName;
-        this.menuConfig			= options.menuConfig;
-        this.client				= options.client;
-        this.menuConfig.options	= options.menuConfig.options || {};
-        this.menuMethods		= {};	//	methods called from @method's
-        this.menuConfig.config	= this.menuConfig.config || {};
+        this.menuName           = options.menuName;
+        this.menuConfig         = options.menuConfig;
+        this.client             = options.client;
+        this.menuConfig.options = options.menuConfig.options || {};
+        this.menuMethods        = {};   //  methods called from @method's
+        this.menuConfig.config  = this.menuConfig.config || {};
 
         this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
 
-        this.viewControllers	= {};
+        this.viewControllers    = {};
     }
 
     enter() {
@@ -43,8 +43,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     initSequence() {
-        const self		= this;
-        const mciData	= {};
+        const self      = this;
+        const mciData   = {};
         let pausePosition;
 
         async.series(
@@ -67,13 +67,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
                                 mciData.menu = artData.mciMap;
                             }
 
-                            return callback(null);	//	any errors are non-fatal
+                            return callback(null);  //  any errors are non-fatal
                         }
                     );
                 },
                 function moveToPromptLocation(callback) {
                     if(self.menuConfig.prompt) {
-                        //	:TODO: fetch and move cursor to prompt location, if supplied. See notes/etc. on placements
+                        //  :TODO: fetch and move cursor to prompt location, if supplied. See notes/etc. on placements
                     }
 
                     return callback(null);
@@ -94,13 +94,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
                             if(artData) {
                                 mciData.prompt = artData.mciMap;
                             }
-                            return callback(err);	//	pass err here; prompts *must* have art
+                            return callback(err);   //  pass err here; prompts *must* have art
                         }
                     );
                 },
                 function recordCursorPosition(callback) {
                     if(!self.shouldPause()) {
-                        return callback(null);	//	cursor position not needed
+                        return callback(null);  //  cursor position not needed
                     }
 
                     self.client.once('cursor position report', pos => {
@@ -138,7 +138,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
     beforeArt(cb) {
         if(_.isNumber(this.menuConfig.options.baudRate)) {
-            //	:TODO: some terminals not supporting cterm style emulated baud rate end up displaying a broken ESC sequence or a single "r" here
+            //  :TODO: some terminals not supporting cterm style emulated baud rate end up displaying a broken ESC sequence or a single "r" here
             this.client.term.rawWrite(ansi.setEmulatedBaudRate(this.menuConfig.options.baudRate));
         }
 
@@ -150,30 +150,30 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     mciReady(mciData, cb) {
-        //	available for sub-classes
+        //  available for sub-classes
         return cb(null);
     }
 
     finishedLoading() {
-        //	nothing in base
+        //  nothing in base
     }
 
     getSaveState() {
-        //	nothing in base
+        //  nothing in base
     }
 
     restoreSavedState(/*savedState*/) {
-        //	nothing in base
+        //  nothing in base
     }
 
     getMenuResult() {
-        //	default to the formData that was provided @ a submit, if any
+        //  default to the formData that was provided @ a submit, if any
         return this.submitFormData;
     }
 
     nextMenu(cb) {
         if(!this.haveNext()) {
-            return this.prevMenu(cb);	//	no next, go to prev
+            return this.prevMenu(cb);   //  no next, go to prev
         }
 
         return this.client.menuStack.next(cb);
@@ -236,10 +236,10 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
     standardMCIReadyHandler(mciData, cb) {
         //
-        //	A quick rundown:
-        //	*	We may have mciData.menu, mciData.prompt, or both.
-        //	*	Prompt form is favored over menu form if both are present.
-        //	*	Standard/prefdefined MCI entries must load both (e.g. %BN is expected to resolve)
+        //  A quick rundown:
+        //  *   We may have mciData.menu, mciData.prompt, or both.
+        //  *   Prompt form is favored over menu form if both are present.
+        //  *   Standard/prefdefined MCI entries must load both (e.g. %BN is expected to resolve)
         //
         const self = this;
 
@@ -259,9 +259,9 @@ exports.MenuModule = class MenuModule extends PluginModule {
                     }
 
                     const menuLoadOpts = {
-                        mciMap		: mciData.menu,
-                        callingMenu	: self,
-                        withoutForm	: _.isObject(mciData.prompt),
+                        mciMap      : mciData.menu,
+                        callingMenu : self,
+                        withoutForm : _.isObject(mciData.prompt),
                     };
 
                     self.viewControllers.menu.loadFromMenuConfig(menuLoadOpts, err => {
@@ -274,8 +274,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
                     }
 
                     const promptLoadOpts = {
-                        callingMenu		: self,
-                        mciMap			: mciData.prompt,
+                        callingMenu     : self,
+                        mciMap          : mciData.prompt,
                     };
 
                     self.viewControllers.prompt.loadFromPromptConfig(promptLoadOpts, err => {
@@ -314,16 +314,16 @@ exports.MenuModule = class MenuModule extends PluginModule {
     prepViewController(name, formId, mciMap, cb) {
         if(_.isUndefined(this.viewControllers[name])) {
             const vcOpts = {
-                client		: this.client,
-                formId		: formId,
+                client      : this.client,
+                formId      : formId,
             };
 
             const vc = this.addViewController(name, new ViewController(vcOpts));
 
             const loadOpts = {
-                callingMenu		: this,
-                mciMap			: mciMap,
-                formId			: formId,
+                callingMenu     : this,
+                mciMap          : mciMap,
+                formId          : formId,
             };
 
             return vc.loadFromMenuConfig(loadOpts, err => {
@@ -371,20 +371,20 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     /*
-	:TODO: this needs quite a bit of work - but would be nice: promptForInput(..., (err, formData) => ... )
-	promptForInput(formName, name, options, cb) {
-		if(!cb && _.isFunction(options)) {
-			cb = options;
-			options = {};
-		}
+    :TODO: this needs quite a bit of work - but would be nice: promptForInput(..., (err, formData) => ... )
+    promptForInput(formName, name, options, cb) {
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
 
-		options.viewController = this.viewControllers[formName];
+        options.viewController = this.viewControllers[formName];
 
-		this.optionalMoveToPosition(options.position);
+        this.optionalMoveToPosition(options.position);
 
-		return theme.displayThemedPrompt(name, this.client, options, cb);
-	}
-	*/
+        return theme.displayThemedPrompt(name, this.client, options, cb);
+    }
+    */
 
     setViewText(formName, mciId, text, appendMultiLine) {
         const view = this.viewControllers[formName].getView(mciId);
@@ -404,12 +404,12 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
         let textView;
         let customMciId = startId;
-        const config	= this.menuConfig.config;
-        const endId		= options.endId || 99;	//	we'll fail to get a view before 99
+        const config    = this.menuConfig.config;
+        const endId     = options.endId || 99;  //  we'll fail to get a view before 99
 
         while(customMciId <= endId && (textView = this.viewControllers[formName].getView(customMciId)) ) {
-            const key		= `${formName}InfoFormat${customMciId}`;	//	e.g. "mainInfoFormat10"
-            const format	= config[key];
+            const key       = `${formName}InfoFormat${customMciId}`;    //  e.g. "mainInfoFormat10"
+            const format    = config[key];
 
             if(format && (!options.filter || options.filter.find(f => format.indexOf(f) > - 1))) {
                 const text = stringFormat(format, fmtObj);
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 90269bcb..5ab5a091 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -1,20 +1,20 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const loadMenu	= require('./menu_util.js').loadMenu;
-const Errors	= require('./enig_error.js').Errors;
+//  ENiGMA½
+const loadMenu  = require('./menu_util.js').loadMenu;
+const Errors    = require('./enig_error.js').Errors;
 
-//	deps
-const _			= require('lodash');
-const assert	= require('assert');
+//  deps
+const _         = require('lodash');
+const assert    = require('assert');
 
-//	:TODO: Stack is backwards.... top should be most recent! :)
+//  :TODO: Stack is backwards.... top should be most recent! :)
 
 module.exports = class MenuStack {
     constructor(client) {
-        this.client	= client;
-        this.stack	= [];
+        this.client = client;
+        this.stack  = [];
     }
 
     push(moduleInfo) {
@@ -52,8 +52,8 @@ module.exports = class MenuStack {
         const currentModuleInfo = this.top();
         assert(currentModuleInfo, 'Empty menu stack!');
 
-        const menuConfig	= currentModuleInfo.instance.menuConfig;
-        const nextMenu		= this.client.acs.getConditionalValue(menuConfig.next, 'next');
+        const menuConfig    = currentModuleInfo.instance.menuConfig;
+        const nextMenu      = this.client.acs.getConditionalValue(menuConfig.next, 'next');
         if(!nextMenu) {
             return cb(Array.isArray(menuConfig.next) ?
                 Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
@@ -71,16 +71,16 @@ module.exports = class MenuStack {
     prev(cb) {
         const menuResult = this.top().instance.getMenuResult();
 
-        //	:TODO: leave() should really take a cb...
-        this.pop().instance.leave();	//	leave & remove current
+        //  :TODO: leave() should really take a cb...
+        this.pop().instance.leave();    //  leave & remove current
 
-        const previousModuleInfo = this.pop();	//	get previous
+        const previousModuleInfo = this.pop();  //  get previous
 
         if(previousModuleInfo) {
             const opts = {
-                extraArgs		: previousModuleInfo.extraArgs,
-                savedState		: previousModuleInfo.savedState,
-                lastMenuResult	: menuResult,
+                extraArgs       : previousModuleInfo.extraArgs,
+                savedState      : previousModuleInfo.savedState,
+                lastMenuResult  : menuResult,
             };
 
             return this.goto(previousModuleInfo.name, opts, cb);
@@ -108,8 +108,8 @@ module.exports = class MenuStack {
         }
 
         const loadOpts = {
-            name		: name,
-            client		: self.client,
+            name        : name,
+            client      : self.client,
         };
 
         if(currentModuleInfo && currentModuleInfo.menuFlags.includes('forwardArgs')) {
@@ -117,19 +117,19 @@ module.exports = class MenuStack {
         } else {
             loadOpts.extraArgs = options.extraArgs || _.get(options, 'formData.value');
         }
-        loadOpts.lastMenuResult	= options.lastMenuResult;
+        loadOpts.lastMenuResult = options.lastMenuResult;
 
         loadMenu(loadOpts, (err, modInst) => {
             if(err) {
-                //	:TODO: probably should just require a cb...
+                //  :TODO: probably should just require a cb...
                 const errCb = cb || self.client.defaultHandlerMissingMod();
                 errCb(err);
             } else {
                 self.client.log.debug( { menuName : name }, 'Goto menu module');
 
                 //
-                //	If menuFlags were supplied in menu.hjson, they should win over
-                //	anything supplied in code.
+                //  If menuFlags were supplied in menu.hjson, they should win over
+                //  anything supplied in code.
                 //
                 let menuFlags;
                 if(0 === modInst.menuConfig.options.menuFlags.length) {
@@ -137,14 +137,14 @@ module.exports = class MenuStack {
                 } else {
                     menuFlags = modInst.menuConfig.options.menuFlags;
 
-                    //	in code we can ask to merge in
+                    //  in code we can ask to merge in
                     if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
                         menuFlags = _.uniq(menuFlags.concat(options.menuFlags));
                     }
                 }
 
                 if(currentModuleInfo) {
-                    //	save stack state
+                    //  save stack state
                     currentModuleInfo.savedState = currentModuleInfo.instance.getSaveState();
 
                     currentModuleInfo.instance.leave();
@@ -154,18 +154,18 @@ module.exports = class MenuStack {
                     }
 
                     if(menuFlags.includes('popParent')) {
-                        this.pop().instance.leave();	//	leave & remove current
+                        this.pop().instance.leave();    //  leave & remove current
                     }
                 }
 
                 self.push({
-                    name		: name,
-                    instance	: modInst,
-                    extraArgs	: loadOpts.extraArgs,
-                    menuFlags	: menuFlags,
+                    name        : name,
+                    instance    : modInst,
+                    extraArgs   : loadOpts.extraArgs,
+                    menuFlags   : menuFlags,
                 });
 
-                //	restore previous state if requested
+                //  restore previous state if requested
                 if(options.savedState) {
                     modInst.restoreSavedState(options.savedState);
                 }
diff --git a/core/menu_util.js b/core/menu_util.js
index 76205d3f..f362041c 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -1,22 +1,22 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-var moduleUtil			= require('./module_util.js');
-var Log					= require('./logger.js').log;
-var Config				= require('./config.js').get;
-var asset				= require('./asset.js');
-var MCIViewFactory		= require('./mci_view_factory.js').MCIViewFactory;
+//  ENiGMA½
+var moduleUtil          = require('./module_util.js');
+var Log                 = require('./logger.js').log;
+var Config              = require('./config.js').get;
+var asset               = require('./asset.js');
+var MCIViewFactory      = require('./mci_view_factory.js').MCIViewFactory;
 
-var paths				= require('path');
-var async				= require('async');
-var assert				= require('assert');
-var _					= require('lodash');
+var paths               = require('path');
+var async               = require('async');
+var assert              = require('assert');
+var _                   = require('lodash');
 
-exports.loadMenu						= loadMenu;
-exports.getFormConfigByIDAndMap			= getFormConfigByIDAndMap;
-exports.handleAction					= handleAction;
-exports.handleNext						= handleNext;
+exports.loadMenu                        = loadMenu;
+exports.getFormConfigByIDAndMap         = getFormConfigByIDAndMap;
+exports.handleAction                    = handleAction;
+exports.handleNext                      = handleNext;
 
 function getMenuConfig(client, name, cb) {
     var menuConfig;
@@ -70,20 +70,20 @@ function loadMenu(options, cb) {
                     menuConfig.options.menuFlags = [ menuConfig.options.menuFlags ];
                 }
 
-                const modAsset		= asset.getModuleAsset(menuConfig.module);
-                const modSupplied	= null !== modAsset;
+                const modAsset      = asset.getModuleAsset(menuConfig.module);
+                const modSupplied   = null !== modAsset;
 
                 const modLoadOpts = {
-                    name		: modSupplied ? modAsset.asset : 'standard_menu',
-                    path		: (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config().paths.mods,
-                    category	: (!modSupplied || 'systemModule' === modAsset.type) ? null : 'mods',
+                    name        : modSupplied ? modAsset.asset : 'standard_menu',
+                    path        : (!modSupplied || 'systemModule' === modAsset.type) ? __dirname : Config().paths.mods,
+                    category    : (!modSupplied || 'systemModule' === modAsset.type) ? null : 'mods',
                 };
 
                 moduleUtil.loadModuleEx(modLoadOpts, (err, mod) => {
                     const modData = {
-                        name	: modLoadOpts.name,
-                        config	: menuConfig,
-                        mod		: mod,
+                        name    : modLoadOpts.name,
+                        config  : menuConfig,
+                        mod     : mod,
                     };
 
                     return callback(err, modData);
@@ -97,11 +97,11 @@ function loadMenu(options, cb) {
                 let moduleInstance;
                 try {
                     moduleInstance = new modData.mod.getModule({
-                        menuName		: options.name,
-                        menuConfig		: modData.config,
-                        extraArgs		: options.extraArgs,
-                        client			: options.client,
-                        lastMenuResult	: options.lastMenuResult,
+                        menuName        : options.name,
+                        menuConfig      : modData.config,
+                        extraArgs       : options.extraArgs,
+                        client          : options.client,
+                        lastMenuResult  : options.lastMenuResult,
                     });
                 } catch(e) {
                     return callback(e);
@@ -137,7 +137,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
     Log.trace( { mciKey : mciReqKey }, 'Looking for MCI configuration key');
 
     //
-    //	Exact, explicit match?
+    //  Exact, explicit match?
     //
     if(_.isObject(formForId[mciReqKey])) {
         Log.trace( { mciKey : mciReqKey }, 'Using exact configuration key match');
@@ -146,7 +146,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
     }
 
     //
-    //	Generic match
+    //  Generic match
     //
     if(_.has(formForId, 'mci') || _.has(formForId, 'submit')) {
         Log.trace('Using generic configuration');
@@ -156,7 +156,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
     cb(new Error('No matching form configuration found for key \'' + mciReqKey + '\''));
 }
 
-//	:TODO: Most of this should be moved elsewhere .... DRY...
+//  :TODO: Most of this should be moved elsewhere .... DRY...
 function callModuleMenuMethod(client, asset, path, formData, extraArgs, cb) {
     if('' === paths.extname(path)) {
         path += '.js';
@@ -194,8 +194,8 @@ function handleAction(client, formData, conf, cb) {
                     conf.extraArgs,
                     cb);
             } else if('systemMethod' === actionAsset.type) {
-                //	:TODO: Need to pass optional args here -- conf.extraArgs and args between e.g. ()
-                //	:TODO: Probably better as system_method.js
+                //  :TODO: Need to pass optional args here -- conf.extraArgs and args between e.g. ()
+                //  :TODO: Probably better as system_method.js
                 return callModuleMenuMethod(
                     client,
                     actionAsset,
@@ -204,7 +204,7 @@ function handleAction(client, formData, conf, cb) {
                     conf.extraArgs,
                     cb);
             } else {
-                //	local to current module
+                //  local to current module
                 const currentModule = client.currentMenuModule;
                 if(_.isFunction(currentModule.menuMethods[actionAsset.asset])) {
                     return currentModule.menuMethods[actionAsset.asset](formData, conf.extraArgs, cb);
@@ -221,28 +221,28 @@ function handleAction(client, formData, conf, cb) {
 }
 
 function handleNext(client, nextSpec, conf, cb) {
-    nextSpec = client.acs.getConditionalValue(nextSpec, 'next');	//	handle any conditionals
+    nextSpec = client.acs.getConditionalValue(nextSpec, 'next');    //  handle any conditionals
 
     const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
-    //	:TODO: getAssetWithShorthand() can return undefined - handle it!
+    //  :TODO: getAssetWithShorthand() can return undefined - handle it!
 
     conf = conf || {};
     const extraArgs = conf.extraArgs || {};
 
-    //	:TODO: DRY this with handleAction()
+    //  :TODO: DRY this with handleAction()
     switch(nextAsset.type) {
         case 'method' :
         case 'systemMethod' :
             if(_.isString(nextAsset.location)) {
                 return callModuleMenuMethod(client, nextAsset, paths.join(Config().paths.mods, nextAsset.location), {}, extraArgs, cb);
             } else if('systemMethod' === nextAsset.type) {
-                //	:TODO: see other notes about system_menu_method.js here
+                //  :TODO: see other notes about system_menu_method.js here
                 return callModuleMenuMethod(client, nextAsset, paths.join(__dirname, 'system_menu_method.js'), {}, extraArgs, cb);
             } else {
-                //	local to current module
+                //  local to current module
                 const currentModule = client.currentMenuModule;
                 if(_.isFunction(currentModule.menuMethods[nextAsset.asset])) {
-                    const formData = {};	//	 we don't have any
+                    const formData = {};    //   we don't have any
                     return currentModule.menuMethods[nextAsset.asset]( formData, extraArgs, cb );
                 }
 
diff --git a/core/menu_view.js b/core/menu_view.js
index 78bf2c87..73e56a4a 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -1,17 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const View			= require('./view.js').View;
-const miscUtil		= require('./misc_util.js');
-const pipeToAnsi	= require('./color_codes.js').pipeToAnsi;
+//  ENiGMA½
+const View          = require('./view.js').View;
+const miscUtil      = require('./misc_util.js');
+const pipeToAnsi    = require('./color_codes.js').pipeToAnsi;
 
-//	deps
-const util			= require('util');
-const assert		= require('assert');
-const _				= require('lodash');
+//  deps
+const util          = require('util');
+const assert        = require('assert');
+const _             = require('lodash');
 
-exports.MenuView	= MenuView;
+exports.MenuView    = MenuView;
 
 function MenuView(options) {
     options.acceptsFocus = miscUtil.valueWithDefault(options.acceptsFocus, true);
@@ -38,14 +38,14 @@ function MenuView(options) {
     this.focusedItemIndex = options.focusedItemIndex || 0;
     this.focusedItemIndex = this.items.length >= this.focusedItemIndex ? this.focusedItemIndex : 0;
 
-    this.itemSpacing	= _.isNumber(options.itemSpacing) ? options.itemSpacing : 0;
+    this.itemSpacing    = _.isNumber(options.itemSpacing) ? options.itemSpacing : 0;
 
-    //	:TODO: probably just replace this with owner draw / pipe codes / etc. more control, less specialization
-    this.focusPrefix	= options.focusPrefix || '';
-    this.focusSuffix	= options.focusSuffix || '';
+    //  :TODO: probably just replace this with owner draw / pipe codes / etc. more control, less specialization
+    this.focusPrefix    = options.focusPrefix || '';
+    this.focusSuffix    = options.focusSuffix || '';
 
-    this.fillChar		= miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
-    this.justify		= options.justify || 'none';
+    this.fillChar       = miscUtil.valueWithDefault(options.fillChar, ' ').substr(0, 1);
+    this.justify        = options.justify || 'none';
 
     this.hasFocusItems = function() {
         return !_.isUndefined(self.focusItems);
@@ -74,15 +74,15 @@ MenuView.prototype.setItems = function(items) {
         this.renderCache = {};
 
         //
-        //	Items can be an array of strings or an array of objects.
+        //  Items can be an array of strings or an array of objects.
         //
-        //	In the case of objects, items are considered complex and
-        //	may have one or more members that can later be formatted
-        //	against. The default member is 'text'. The member 'data'
-        //	may be overridden to provide a form value other than the
-        //	item's index.
+        //  In the case of objects, items are considered complex and
+        //  may have one or more members that can later be formatted
+        //  against. The default member is 'text'. The member 'data'
+        //  may be overridden to provide a form value other than the
+        //  item's index.
         //
-        //	Items can be formatted with 'itemFormat' and 'focusItemFormat'
+        //  Items can be formatted with 'itemFormat' and 'focusItemFormat'
         //
         let text;
         let stringItem;
@@ -96,7 +96,7 @@ MenuView.prototype.setItems = function(items) {
             }
 
             text = this.disablePipe ? text : pipeToAnsi(text, this.client);
-            return Object.assign({ }, { text }, stringItem ? {} : item);	//	ensure we have a text member, plus any others
+            return Object.assign({ }, { text }, stringItem ? {} : item);    //  ensure we have a text member, plus any others
         });
 
         if(this.complexItems) {
@@ -122,7 +122,7 @@ MenuView.prototype.setSort = function(sort) {
 
     const key = true === sort ? 'text' : sort;
     if('text' !== sort && !this.complexItems) {
-        return;	//	need a valid sort key
+        return; //  need a valid sort key
     }
 
     this.items.sort( (a, b) => {
@@ -237,26 +237,26 @@ MenuView.prototype.setItemSpacing = function(itemSpacing) {
     itemSpacing = parseInt(itemSpacing);
     assert(_.isNumber(itemSpacing));
 
-    this.itemSpacing			= itemSpacing;
-    this.positionCacheExpired	= true;
+    this.itemSpacing            = itemSpacing;
+    this.positionCacheExpired   = true;
 };
 
 MenuView.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
-        case 'itemSpacing' 		: this.setItemSpacing(value); break;
-        case 'items'			: this.setItems(value); break;
-        case 'focusItems'		: this.setFocusItems(value); break;
-        case 'hotKeys'			: this.setHotKeys(value); break;
-        case 'hotKeySubmit'		: this.hotKeySubmit = value; break;
-        case 'justify'			: this.justify = value; break;
-        case 'focusItemIndex'	: this.focusedItemIndex = value; break;
+        case 'itemSpacing'      : this.setItemSpacing(value); break;
+        case 'items'            : this.setItems(value); break;
+        case 'focusItems'       : this.setFocusItems(value); break;
+        case 'hotKeys'          : this.setHotKeys(value); break;
+        case 'hotKeySubmit'     : this.hotKeySubmit = value; break;
+        case 'justify'          : this.justify = value; break;
+        case 'focusItemIndex'   : this.focusedItemIndex = value; break;
 
         case 'itemFormat' :
         case 'focusItemFormat' :
             this[propName] = value;
             break;
 
-        case 'sort' 			: this.setSort(value); break;
+        case 'sort'             : this.setSort(value); break;
     }
 
     MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
diff --git a/core/message.js b/core/message.js
index 277f5781..53b82e73 100644
--- a/core/message.js
+++ b/core/message.js
@@ -1,96 +1,96 @@
 /* jslint node: true */
 'use strict';
 
-const msgDb					= require('./database.js').dbs.message;
-const wordWrapText			= require('./word_wrap.js').wordWrapText;
-const ftnUtil				= require('./ftn_util.js');
-const createNamedUUID		= require('./uuid_util.js').createNamedUUID;
-const Errors				= require('./enig_error.js').Errors;
-const ANSI					= require('./ansi_term.js');
+const msgDb                 = require('./database.js').dbs.message;
+const wordWrapText          = require('./word_wrap.js').wordWrapText;
+const ftnUtil               = require('./ftn_util.js');
+const createNamedUUID       = require('./uuid_util.js').createNamedUUID;
+const Errors                = require('./enig_error.js').Errors;
+const ANSI                  = require('./ansi_term.js');
 const {
     sanatizeString,
-    getISOTimestampString }	= require('./database.js');
+    getISOTimestampString } = require('./database.js');
 
 const {
     isAnsi, isFormattedLine,
     splitTextAtTerms,
     renderSubstr
-}							= require('./string_util.js');
+}                           = require('./string_util.js');
 
-const ansiPrep				= require('./ansi_prep.js');
+const ansiPrep              = require('./ansi_prep.js');
 
-//	deps
-const uuidParse				= require('uuid-parse');
-const async					= require('async');
-const _						= require('lodash');
-const assert				= require('assert');
-const moment				= require('moment');
-const iconvEncode			= require('iconv-lite').encode;
+//  deps
+const uuidParse             = require('uuid-parse');
+const async                 = require('async');
+const _                     = require('lodash');
+const assert                = require('assert');
+const moment                = require('moment');
+const iconvEncode           = require('iconv-lite').encode;
 
-const ENIGMA_MESSAGE_UUID_NAMESPACE 	= uuidParse.parse('154506df-1df8-46b9-98f8-ebb5815baaf8');
+const ENIGMA_MESSAGE_UUID_NAMESPACE     = uuidParse.parse('154506df-1df8-46b9-98f8-ebb5815baaf8');
 
 const WELL_KNOWN_AREA_TAGS = {
-    Invalid		: '',
-    Private		: 'private_mail',
-    Bulletin	: 'local_bulletin',
+    Invalid     : '',
+    Private     : 'private_mail',
+    Bulletin    : 'local_bulletin',
 };
 
 const SYSTEM_META_NAMES = {
-    LocalToUserID			: 'local_to_user_id',
-    LocalFromUserID			: 'local_from_user_id',
-    StateFlags0				: 'state_flags0',		//	See Message.StateFlags0
-    ExplicitEncoding		: 'explicit_encoding',	//	Explicitly set encoding when exporting/etc.
-    ExternalFlavor			: 'external_flavor',	//	"Flavor" of message - imported from or to be exported to. See Message.AddressFlavor
-    RemoteToUser			: 'remote_to_user',		//	Opaque value depends on external system, e.g. FTN address
-    RemoteFromUser			: 'remote_from_user',	//	Opaque value depends on external system, e.g. FTN address
+    LocalToUserID           : 'local_to_user_id',
+    LocalFromUserID         : 'local_from_user_id',
+    StateFlags0             : 'state_flags0',       //  See Message.StateFlags0
+    ExplicitEncoding        : 'explicit_encoding',  //  Explicitly set encoding when exporting/etc.
+    ExternalFlavor          : 'external_flavor',    //  "Flavor" of message - imported from or to be exported to. See Message.AddressFlavor
+    RemoteToUser            : 'remote_to_user',     //  Opaque value depends on external system, e.g. FTN address
+    RemoteFromUser          : 'remote_from_user',   //  Opaque value depends on external system, e.g. FTN address
 };
 
-//	Types for Message.SystemMetaNames.ExternalFlavor meta
+//  Types for Message.SystemMetaNames.ExternalFlavor meta
 const ADDRESS_FLAVOR = {
-    Local		: 'local',	//	local / non-remote addressing
-    FTN			: 'ftn',	//	FTN style
-    Email		: 'email',
+    Local       : 'local',  //  local / non-remote addressing
+    FTN         : 'ftn',    //  FTN style
+    Email       : 'email',
 };
 
 const STATE_FLAGS0 = {
-    None		: 0x00000000,
-    Imported	: 0x00000001,	//	imported from foreign system
-    Exported	: 0x00000002,	//	exported to foreign system
+    None        : 0x00000000,
+    Imported    : 0x00000001,   //  imported from foreign system
+    Exported    : 0x00000002,   //  exported to foreign system
 };
 
-//	:TODO: these should really live elsewhere...
+//  :TODO: these should really live elsewhere...
 const FTN_PROPERTY_NAMES = {
-    //	packet header oriented
-    FtnOrigNode			: 'ftn_orig_node',
-    FtnDestNode			: 'ftn_dest_node',
-    //	:TODO: rename these to ftn_*_net vs network - ensure things won't break, may need mapping
-    FtnOrigNetwork		: 'ftn_orig_network',
-    FtnDestNetwork		: 'ftn_dest_network',
-    FtnAttrFlags		: 'ftn_attr_flags',
-    FtnCost				: 'ftn_cost',
-    FtnOrigZone			: 'ftn_orig_zone',
-    FtnDestZone			: 'ftn_dest_zone',
-    FtnOrigPoint		: 'ftn_orig_point',
-    FtnDestPoint		: 'ftn_dest_point',
+    //  packet header oriented
+    FtnOrigNode         : 'ftn_orig_node',
+    FtnDestNode         : 'ftn_dest_node',
+    //  :TODO: rename these to ftn_*_net vs network - ensure things won't break, may need mapping
+    FtnOrigNetwork      : 'ftn_orig_network',
+    FtnDestNetwork      : 'ftn_dest_network',
+    FtnAttrFlags        : 'ftn_attr_flags',
+    FtnCost             : 'ftn_cost',
+    FtnOrigZone         : 'ftn_orig_zone',
+    FtnDestZone         : 'ftn_dest_zone',
+    FtnOrigPoint        : 'ftn_orig_point',
+    FtnDestPoint        : 'ftn_dest_point',
 
-    //	message header oriented
-    FtnMsgOrigNode		: 'ftn_msg_orig_node',
-    FtnMsgDestNode		: 'ftn_msg_dest_node',
-    FtnMsgOrigNet		: 'ftn_msg_orig_net',
-    FtnMsgDestNet		: 'ftn_msg_dest_net',
+    //  message header oriented
+    FtnMsgOrigNode      : 'ftn_msg_orig_node',
+    FtnMsgDestNode      : 'ftn_msg_dest_node',
+    FtnMsgOrigNet       : 'ftn_msg_orig_net',
+    FtnMsgDestNet       : 'ftn_msg_dest_net',
 
-    FtnAttribute		: 'ftn_attribute',
+    FtnAttribute        : 'ftn_attribute',
 
-    FtnTearLine			: 'ftn_tear_line',		//	http://ftsc.org/docs/fts-0004.001
-    FtnOrigin			: 'ftn_origin',			//	http://ftsc.org/docs/fts-0004.001
-    FtnArea				: 'ftn_area',			//	http://ftsc.org/docs/fts-0004.001
-    FtnSeenBy			: 'ftn_seen_by',		//	http://ftsc.org/docs/fts-0004.001
+    FtnTearLine         : 'ftn_tear_line',      //  http://ftsc.org/docs/fts-0004.001
+    FtnOrigin           : 'ftn_origin',         //  http://ftsc.org/docs/fts-0004.001
+    FtnArea             : 'ftn_area',           //  http://ftsc.org/docs/fts-0004.001
+    FtnSeenBy           : 'ftn_seen_by',        //  http://ftsc.org/docs/fts-0004.001
 };
 
-//	:TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
+//  :TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
 const MESSAGE_ROW_MAP = {
-    reply_to_message_id	: 'replyToMsgId',
-    modified_timestamp	: 'modTimestamp'
+    reply_to_message_id : 'replyToMsgId',
+    modified_timestamp  : 'modTimestamp'
 };
 
 module.exports = class Message {
@@ -102,28 +102,28 @@ module.exports = class Message {
         } = { }
     )
     {
-        this.messageId		= messageId;
-        this.areaTag		= areaTag;
-        this.uuid			= uuid;
-        this.replyToMsgId	= replyToMsgId;
-        this.toUserName		= toUserName;
-        this.fromUserName	= fromUserName;
-        this.subject		= subject;
-        this.message		= message;
+        this.messageId      = messageId;
+        this.areaTag        = areaTag;
+        this.uuid           = uuid;
+        this.replyToMsgId   = replyToMsgId;
+        this.toUserName     = toUserName;
+        this.fromUserName   = fromUserName;
+        this.subject        = subject;
+        this.message        = message;
 
         if(_.isDate(modTimestamp) || _.isString(modTimestamp)) {
             modTimestamp = moment(modTimestamp);
         }
 
-        this.modTimestamp	= modTimestamp;
+        this.modTimestamp   = modTimestamp;
 
         this.meta = {};
         _.defaultsDeep(this.meta, { System : {} }, meta);
 
-        this.hashTags		= hashTags;
+        this.hashTags       = hashTags;
     }
 
-    isValid() { return true; }	//	:TODO: obviously useless; look into this or remove it
+    isValid() { return true; }  //  :TODO: obviously useless; look into this or remove it
 
     static isPrivateAreaTag(areaTag) {
         return areaTag.toLowerCase() === Message.WellKnownAreaTags.Private;
@@ -187,10 +187,10 @@ module.exports = class Message {
             modTimestamp = moment(modTimestamp);
         }
 
-        areaTag			= iconvEncode(areaTag.toUpperCase(), 'CP437');
-        modTimestamp	= iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
-        subject			= iconvEncode(subject.toUpperCase().trim(), 'CP437');
-        body			= iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
+        areaTag         = iconvEncode(areaTag.toUpperCase(), 'CP437');
+        modTimestamp    = iconvEncode(modTimestamp.format('DD MMM YY  HH:mm:ss'), 'CP437');
+        subject         = iconvEncode(subject.toUpperCase().trim(), 'CP437');
+        body            = iconvEncode(body.replace(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g, '').trim(), 'CP437');
 
         return uuidParse.unparse(createNamedUUID(ENIGMA_MESSAGE_UUID_NAMESPACE, Buffer.concat( [ areaTag, modTimestamp, subject, body ] )));
     }
@@ -198,7 +198,7 @@ module.exports = class Message {
     static getMessageFromRow(row) {
         const msg = {};
         _.each(row, (v, k) => {
-            //	:TODO: see notes around MESSAGE_ROW_MAP -- clean this up so we can just _camelCase()!
+            //  :TODO: see notes around MESSAGE_ROW_MAP -- clean this up so we can just _camelCase()!
             k = MESSAGE_ROW_MAP[k] || _.camelCase(k);
             msg[k] = v;
         });
@@ -206,38 +206,38 @@ module.exports = class Message {
     }
 
     /*
-		Find message IDs or UUIDs by filter. Available filters/options:
+        Find message IDs or UUIDs by filter. Available filters/options:
 
-		filter.uuids - use with resultType='id'
-		filter.ids - use with resultType='uuid'
-		filter.toUserName
-		filter.fromUserName
-		filter.replyToMesageId
-		filter.newerThanTimestamp
-		filter.newerThanMessageId
-		filter.areaTag - note if you want by conf, send in all areas for a conf
-		*filter.metaTuples - {category, name, value}
+        filter.uuids - use with resultType='id'
+        filter.ids - use with resultType='uuid'
+        filter.toUserName
+        filter.fromUserName
+        filter.replyToMesageId
+        filter.newerThanTimestamp
+        filter.newerThanMessageId
+        filter.areaTag - note if you want by conf, send in all areas for a conf
+        *filter.metaTuples - {category, name, value}
 
-		filter.terms - FTS search
+        filter.terms - FTS search
 
-		filter.sort = modTimestamp | messageId
-		filter.order = ascending | (descending)
+        filter.sort = modTimestamp | messageId
+        filter.order = ascending | (descending)
 
-		filter.limit
-		filter.resultType = (id) | uuid | count
-		filter.extraFields = []
+        filter.limit
+        filter.resultType = (id) | uuid | count
+        filter.extraFields = []
 
-		filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
-		- any other areaTag or confTag filters will be ignored
-		- if NOT present, private areas are skipped
+        filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
+        - any other areaTag or confTag filters will be ignored
+        - if NOT present, private areas are skipped
 
-		*=NYI
-	*/
+        *=NYI
+    */
     static findMessages(filter, cb) {
         filter = filter || {};
 
-        filter.resultType	= filter.resultType || 'id';
-        filter.extraFields	= filter.extraFields || [];
+        filter.resultType   = filter.resultType || 'id';
+        filter.extraFields  = filter.extraFields || [];
 
         if('messageList' === filter.resultType) {
             filter.extraFields = _.uniq(filter.extraFields.concat(
@@ -254,13 +254,13 @@ module.exports = class Message {
         let sql;
         if('count' === filter.resultType) {
             sql =
-				`SELECT COUNT() AS count
-				FROM message m`;
+                `SELECT COUNT() AS count
+                FROM message m`;
 
         } else {
             sql =
-				`SELECT DISTINCT m.${field}${filter.extraFields.length > 0 ? ', ' + filter.extraFields.map(f => `m.${f}`).join(', ') : ''}
-				FROM message m`;
+                `SELECT DISTINCT m.${field}${filter.extraFields.length > 0 ? ', ' + filter.extraFields.map(f => `m.${f}`).join(', ') : ''}
+                FROM message m`;
         }
 
         const sqlOrderDir = 'ascending' === filter.order ? 'ASC' : 'DESC';
@@ -276,7 +276,7 @@ module.exports = class Message {
             sqlWhere += clause;
         }
 
-        //	currently only avail sort
+        //  currently only avail sort
         if('modTimestamp' === filter.sort) {
             sqlOrderBy = `ORDER BY m.modified_timestamp ${sqlOrderDir}`;
         } else {
@@ -297,10 +297,10 @@ module.exports = class Message {
             appendWhereClause(`m.area_tag = "${Message.WellKnownAreaTags.Private}"`);
             appendWhereClause(
                 `m.message_id IN (
-					SELECT message_id 
-					FROM message_meta 
-					WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
-				)`);
+                    SELECT message_id 
+                    FROM message_meta 
+                    WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
+                )`);
         } else {
             if(filter.areaTag && filter.areaTag.length > 0) {
                 if(Array.isArray(filter.areaTag)) {
@@ -315,7 +315,7 @@ module.exports = class Message {
                 }
             }
 
-            //	explicit exclude of Private
+            //  explicit exclude of Private
             appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
         }
 
@@ -338,13 +338,13 @@ module.exports = class Message {
         }
 
         if(filter.terms && filter.terms.length > 0) {
-            //	note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
+            //  note the ':' in MATCH expr., see https://www.sqlite.org/cvstrac/wiki?p=FullTextIndex
             appendWhereClause(
                 `m.message_id IN (
-					SELECT rowid
-					FROM message_fts
-					WHERE message_fts MATCH ":${sanatizeString(filter.terms)}"
-				)`
+                    SELECT rowid
+                    FROM message_fts
+                    WHERE message_fts MATCH ":${sanatizeString(filter.terms)}"
+                )`
             );
         }
 
@@ -376,13 +376,13 @@ module.exports = class Message {
         }
     }
 
-    //	:TODO: use findMessages, by uuid, limit=1
+    //  :TODO: use findMessages, by uuid, limit=1
     static getMessageIdByUuid(uuid, cb) {
         msgDb.get(
             `SELECT message_id
-			FROM message
-			WHERE message_uuid = ?
-			LIMIT 1;`,
+            FROM message
+            WHERE message_uuid = ?
+            LIMIT 1;`,
             [ uuid ],
             (err, row) => {
                 if(err) {
@@ -398,27 +398,27 @@ module.exports = class Message {
         );
     }
 
-    //	:TODO: use findMessages
+    //  :TODO: use findMessages
     static getMessageIdsByMetaValue(category, name, value, cb) {
         msgDb.all(
             `SELECT message_id
-			FROM message_meta
-			WHERE meta_category = ? AND meta_name = ? AND meta_value = ?;`,
+            FROM message_meta
+            WHERE meta_category = ? AND meta_name = ? AND meta_value = ?;`,
             [ category, name, value ],
             (err, rows) => {
                 if(err) {
                     return cb(err);
                 }
-                return cb(null, rows.map(r => parseInt(r.message_id)));	//	return array of ID(s)
+                return cb(null, rows.map(r => parseInt(r.message_id))); //  return array of ID(s)
             }
         );
     }
 
     static getMetaValuesByMessageId(messageId, category, name, cb) {
         const sql =
-			`SELECT meta_value
-			FROM message_meta
-			WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
+            `SELECT meta_value
+            FROM message_meta
+            WHERE message_id = ? AND meta_category = ? AND meta_name = ?;`;
 
         msgDb.all(sql, [ messageId, category, name ], (err, rows) => {
             if(err) {
@@ -429,12 +429,12 @@ module.exports = class Message {
                 return cb(Errors.DoesNotExist('No value for category/name'));
             }
 
-            //	single values are returned without an array
+            //  single values are returned without an array
             if(1 === rows.length) {
                 return cb(null, rows[0].meta_value);
             }
 
-            return cb(null, rows.map(r => r.meta_value));	//	map to array of values only
+            return cb(null, rows.map(r => r.meta_value));   //  map to array of values only
         });
     }
 
@@ -460,23 +460,23 @@ module.exports = class Message {
 
     loadMeta(cb) {
         /*
-			Example of loaded this.meta:
+            Example of loaded this.meta:
 
-			meta: {
-				System: {
-					local_to_user_id: 1234,
-				},
-				FtnProperty: {
-					ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
-				}
-			}
-		*/
+            meta: {
+                System: {
+                    local_to_user_id: 1234,
+                },
+                FtnProperty: {
+                    ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
+                }
+            }
+        */
         const sql =
-			`SELECT meta_category, meta_name, meta_value
-			FROM message_meta
-			WHERE message_id = ?;`;
+            `SELECT meta_category, meta_name, meta_value
+            FROM message_meta
+            WHERE message_id = ?;`;
 
-        const self = this;	//	:TODO: not required - arrow functions below:
+        const self = this;  //  :TODO: not required - arrow functions below:
         msgDb.each(sql, [ this.messageId ], (err, row) => {
             if(!(row.meta_category in self.meta)) {
                 self.meta[row.meta_category] = { };
@@ -497,7 +497,7 @@ module.exports = class Message {
         });
     }
 
-    //	:TODO: this should only take a UUID...
+    //  :TODO: this should only take a UUID...
     load(options, cb) {
         assert(_.isString(options.uuid));
 
@@ -508,10 +508,10 @@ module.exports = class Message {
                 function loadMessage(callback) {
                     msgDb.get(
                         `SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject,
-						message, modified_timestamp, view_count
-						FROM message
-						WHERE message_uuid=?
-						LIMIT 1;`,
+                        message, modified_timestamp, view_count
+                        FROM message
+                        WHERE message_uuid=?
+                        LIMIT 1;`,
                         [ options.uuid ],
                         (err, msgRow) => {
                             if(err) {
@@ -522,15 +522,15 @@ module.exports = class Message {
                                 return callback(Errors.DoesNotExist('Message (no longer) available'));
                             }
 
-                            self.messageId		= msgRow.message_id;
-                            self.areaTag		= msgRow.area_tag;
-                            self.messageUuid	= msgRow.message_uuid;
-                            self.replyToMsgId	= msgRow.reply_to_message_id;
-                            self.toUserName		= msgRow.to_user_name;
-                            self.fromUserName	= msgRow.from_user_name;
-                            self.subject		= msgRow.subject;
-                            self.message		= msgRow.message;
-                            self.modTimestamp	= moment(msgRow.modified_timestamp);
+                            self.messageId      = msgRow.message_id;
+                            self.areaTag        = msgRow.area_tag;
+                            self.messageUuid    = msgRow.message_uuid;
+                            self.replyToMsgId   = msgRow.reply_to_message_id;
+                            self.toUserName     = msgRow.to_user_name;
+                            self.fromUserName   = msgRow.from_user_name;
+                            self.subject        = msgRow.subject;
+                            self.message        = msgRow.message;
+                            self.modTimestamp   = moment(msgRow.modified_timestamp);
 
                             return callback(err);
                         }
@@ -542,7 +542,7 @@ module.exports = class Message {
                     });
                 },
                 function loadHashTags(callback) {
-                    //	:TODO:
+                    //  :TODO:
                     return callback(null);
                 }
             ],
@@ -560,7 +560,7 @@ module.exports = class Message {
 
         const metaStmt = transOrDb.prepare(
             `INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
-			VALUES (?, ?, ?, ?);`);
+            VALUES (?, ?, ?, ?);`);
 
         if(!_.isArray(value)) {
             value = [ value ];
@@ -590,7 +590,7 @@ module.exports = class Message {
                     return msgDb.beginTransaction(callback);
                 },
                 function storeMessage(trans, callback) {
-                    //	generate a UUID for this message if required (general case)
+                    //  generate a UUID for this message if required (general case)
                     const msgTimestamp = moment();
                     if(!self.uuid) {
                         self.uuid = Message.createMessageUUID(
@@ -603,9 +603,9 @@ module.exports = class Message {
 
                     trans.run(
                         `INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
-						VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
                         [ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
-                        function inserted(err) {	//	use non-arrow function for 'this' scope
+                        function inserted(err) {    //  use non-arrow function for 'this' scope
                             if(!err) {
                                 self.messageId = this.lastID;
                             }
@@ -619,17 +619,17 @@ module.exports = class Message {
                         return callback(null, trans);
                     }
                     /*
-						Example of self.meta:
+                        Example of self.meta:
 
-						meta: {
-							System: {
-								local_to_user_id: 1234,
-							},
-							FtnProperty: {
-								ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
-							}
-						}
-					*/
+                        meta: {
+                            System: {
+                                local_to_user_id: 1234,
+                            },
+                            FtnProperty: {
+                                ftn_seen_by: [ "1/102 103", "2/42 52 65" ]
+                            }
+                        }
+                    */
                     async.each(Object.keys(self.meta), (category, nextCat) => {
                         async.each(Object.keys(self.meta[category]), (name, nextName) => {
                             self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
@@ -644,7 +644,7 @@ module.exports = class Message {
                     });
                 },
                 function storeHashTags(trans, callback) {
-                    //	:TODO: hash tag support
+                    //  :TODO: hash tag support
                     return callback(null, trans);
                 }
             ],
@@ -660,7 +660,7 @@ module.exports = class Message {
         );
     }
 
-    //	:TODO: FTN stuff doesn't have any business here
+    //  :TODO: FTN stuff doesn't have any business here
     getFTNQuotePrefix(source) {
         source = source || 'fromUserName';
 
@@ -677,32 +677,32 @@ module.exports = class Message {
             return cb(Errors.MissingParam());
         }
 
-        options.startCol			= options.startCol || 1;
-        options.includePrefix 		= _.get(options, 'includePrefix', true);
-        options.ansiResetSgr		= options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
-        options.ansiFocusPrefixSgr	= options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
-        options.isAnsi				= options.isAnsi || isAnsi(this.message);	//	:TODO: If this.isAnsi, use that setting
+        options.startCol            = options.startCol || 1;
+        options.includePrefix       = _.get(options, 'includePrefix', true);
+        options.ansiResetSgr        = options.ansiResetSgr || ANSI.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
+        options.ansiFocusPrefixSgr  = options.ansiFocusPrefixSgr || ANSI.getSGRFromGraphicRendition( { intensity : 'bold', fg : 39, bg : 49 } );
+        options.isAnsi              = options.isAnsi || isAnsi(this.message);   //  :TODO: If this.isAnsi, use that setting
 
         /*
-			Some long text that needs to be wrapped and quoted should look right after
-			doing so, don't ya think? yeah I think so
+            Some long text that needs to be wrapped and quoted should look right after
+            doing so, don't ya think? yeah I think so
 
-			Nu> Some long text that needs to be wrapped and quoted should look right
-			Nu> after doing so, don't ya think? yeah I think so
+            Nu> Some long text that needs to be wrapped and quoted should look right
+            Nu> after doing so, don't ya think? yeah I think so
 
-			Ot> Nu> Some long text that needs to be wrapped and quoted should look
-			Ot> Nu> right after doing so, don't ya think? yeah I think so
+            Ot> Nu> Some long text that needs to be wrapped and quoted should look
+            Ot> Nu> right after doing so, don't ya think? yeah I think so
 
-		*/
+        */
         const quotePrefix = options.includePrefix ? this.getFTNQuotePrefix(options.prefixSource || 'fromUserName') : '';
 
         function getWrapped(text, extraPrefix) {
             extraPrefix = extraPrefix ? ` ${extraPrefix}` : '';
 
             const wrapOpts = {
-                width		: options.cols - (quotePrefix.length + extraPrefix.length),
-                tabHandling	: 'expand',
-                tabWidth	: 4,
+                width       : options.cols - (quotePrefix.length + extraPrefix.length),
+                tabHandling : 'expand',
+                tabWidth    : 4,
             };
 
             return wordWrapText(text, wrapOpts).wrapped.map( (w, i) => {
@@ -711,7 +711,7 @@ module.exports = class Message {
         }
 
         function getFormattedLine(line) {
-            //	for pre-formatted text, we just append a line truncated to fit
+            //  for pre-formatted text, we just append a line truncated to fit
             let newLen;
             const total = line.length + quotePrefix.length;
 
@@ -726,14 +726,14 @@ module.exports = class Message {
 
         if(options.isAnsi) {
             ansiPrep(
-                this.message.replace(/\r?\n/g, '\r\n'),	//	normalized LF -> CRLF
+                this.message.replace(/\r?\n/g, '\r\n'), //  normalized LF -> CRLF
                 {
-                    termWidth		: options.termWidth,
-                    termHeight		: options.termHeight,
-                    cols			: options.cols,
-                    rows			: 'auto',
-                    startCol		: options.startCol,
-                    forceLineTerm	: true,
+                    termWidth       : options.termWidth,
+                    termHeight      : options.termHeight,
+                    cols            : options.cols,
+                    rows            : 'auto',
+                    startCol        : options.startCol,
+                    forceLineTerm   : true,
                 },
                 (err, prepped) => {
                     prepped = prepped || this.message;
@@ -741,20 +741,20 @@ module.exports = class Message {
                     let lastSgr = '';
                     const split = splitTextAtTerms(prepped);
 
-                    const quoteLines		= [];
-                    const focusQuoteLines	= [];
+                    const quoteLines        = [];
+                    const focusQuoteLines   = [];
 
                     //
-                    //	Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
-                    //	as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
-                    //	strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
-                    //	the trick and allow them to leave them alone!
+                    //  Do not include quote prefixes (e.g. XX> ) on ANSI replies (and therefor quote builder)
+                    //  as while this works in ENiGMA, other boards such as Mystic, WWIV, etc. will try to
+                    //  strip colors, colorize the lines, etc. If we exclude the prefixes, this seems to do
+                    //  the trick and allow them to leave them alone!
                     //
                     split.forEach(l => {
                         quoteLines.push(`${lastSgr}${l}`);
 
                         focusQuoteLines.push(`${options.ansiFocusPrefixSgr}>${lastSgr}${renderSubstr(l, 1, l.length - 1)}`);
-                        lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';	//	eslint-disable-line no-control-regex
+                        lastSgr = (l.match(/(?:\x1b\x5b)[?=;0-9]*m(?!.*(?:\x1b\x5b)[?=;0-9]*m)/) || [])[0] || '';   //  eslint-disable-line no-control-regex
                     });
 
                     quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
@@ -763,23 +763,23 @@ module.exports = class Message {
                 }
             );
         } else {
-            const QUOTE_RE	= /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
-            const quoted	= [];
-            const input		= _.trimEnd(this.message).replace(/\b/g, '');
+            const QUOTE_RE  = /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
+            const quoted    = [];
+            const input     = _.trimEnd(this.message).replace(/\b/g, '');
 
-            //	find *last* tearline
+            //  find *last* tearline
             let tearLinePos = this.getTearLinePosition(input);
-            tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;	//	we just want the index or the entire string
+            tearLinePos = -1 === tearLinePos ? input.length : tearLinePos;  //  we just want the index or the entire string
 
             input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
                 //
-                //	For each paragraph, a state machine:
-                //	- New line - line
-                //	- New (pre)quoted line - quote_line
-                //	- Continuation of new/quoted line
+                //  For each paragraph, a state machine:
+                //  - New line - line
+                //  - New (pre)quoted line - quote_line
+                //  - Continuation of new/quoted line
                 //
-                //	Also:
-                //	- Detect pre-formatted lines & try to keep them as-is
+                //  Also:
+                //  - Detect pre-formatted lines & try to keep them as-is
                 //
                 let state;
                 let buf = '';
@@ -787,18 +787,18 @@ module.exports = class Message {
 
                 if(quoted.length > 0) {
                     //
-                    //	Preserve paragraph seperation.
+                    //  Preserve paragraph seperation.
                     //
-                    //	FSC-0032 states something about leaving blank lines fully blank
-                    //	(without a prefix) but it seems nicer (and more consistent with other systems)
-                    //	to put 'em in.
+                    //  FSC-0032 states something about leaving blank lines fully blank
+                    //  (without a prefix) but it seems nicer (and more consistent with other systems)
+                    //  to put 'em in.
                     //
                     quoted.push(quotePrefix);
                 }
 
                 paragraph.split(/\r?\n/).forEach(line => {
                     if(0 === line.trim().length) {
-                        //	see blank line notes above
+                        //  see blank line notes above
                         return quoted.push(quotePrefix);
                     }
 
@@ -839,8 +839,8 @@ module.exports = class Message {
                             if(isFormattedLine(line)) {
                                 quoted.push(getFormattedLine(line));
                             } else {
-                                state	= quoteMatch ? 'quote_line' : 'line';
-                                buf		= 'line' === state ? line : line.replace(/\s/, '');	//	trim *first* leading space, if any
+                                state   = quoteMatch ? 'quote_line' : 'line';
+                                buf     = 'line' === state ? line : line.replace(/\s/, ''); //  trim *first* leading space, if any
                             }
                             break;
                     }
diff --git a/core/message_area.js b/core/message_area.js
index 03cc914c..e5227ef0 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -1,45 +1,45 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const msgDb						= require('./database.js').dbs.message;
-const Config					= require('./config.js').get;
-const Message					= require('./message.js');
-const Log						= require('./logger.js').log;
-const msgNetRecord				= require('./msg_network.js').recordMessage;
-const sortAreasOrConfs			= require('./conf_area_util.js').sortAreasOrConfs;
+//  ENiGMA½
+const msgDb                     = require('./database.js').dbs.message;
+const Config                    = require('./config.js').get;
+const Message                   = require('./message.js');
+const Log                       = require('./logger.js').log;
+const msgNetRecord              = require('./msg_network.js').recordMessage;
+const sortAreasOrConfs          = require('./conf_area_util.js').sortAreasOrConfs;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const assert		= require('assert');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const assert        = require('assert');
 
 exports.getAvailableMessageConferences      = getAvailableMessageConferences;
-exports.getSortedAvailMessageConferences	= getSortedAvailMessageConferences;
+exports.getSortedAvailMessageConferences    = getSortedAvailMessageConferences;
 exports.getAvailableMessageAreasByConfTag   = getAvailableMessageAreasByConfTag;
 exports.getSortedAvailMessageAreasByConfTag = getSortedAvailMessageAreasByConfTag;
 exports.getDefaultMessageConferenceTag      = getDefaultMessageConferenceTag;
 exports.getDefaultMessageAreaTagByConfTag   = getDefaultMessageAreaTagByConfTag;
-exports.getMessageConferenceByTag			= getMessageConferenceByTag;
-exports.getMessageAreaByTag					= getMessageAreaByTag;
-exports.changeMessageConference				= changeMessageConference;
-exports.changeMessageArea					= changeMessageArea;
-exports.tempChangeMessageConfAndArea		= tempChangeMessageConfAndArea;
-exports.getMessageListForArea				= getMessageListForArea;
-exports.getNewMessageCountInAreaForUser		= getNewMessageCountInAreaForUser;
-exports.getNewMessagesInAreaForUser			= getNewMessagesInAreaForUser;
-exports.getMessageIdNewerThanTimestampByArea	= getMessageIdNewerThanTimestampByArea;
-exports.getMessageAreaLastReadId			= getMessageAreaLastReadId;
-exports.updateMessageAreaLastReadId			= updateMessageAreaLastReadId;
-exports.persistMessage						= persistMessage;
-exports.trimMessageAreasScheduledEvent		= trimMessageAreasScheduledEvent;
+exports.getMessageConferenceByTag           = getMessageConferenceByTag;
+exports.getMessageAreaByTag                 = getMessageAreaByTag;
+exports.changeMessageConference             = changeMessageConference;
+exports.changeMessageArea                   = changeMessageArea;
+exports.tempChangeMessageConfAndArea        = tempChangeMessageConfAndArea;
+exports.getMessageListForArea               = getMessageListForArea;
+exports.getNewMessageCountInAreaForUser     = getNewMessageCountInAreaForUser;
+exports.getNewMessagesInAreaForUser         = getNewMessagesInAreaForUser;
+exports.getMessageIdNewerThanTimestampByArea    = getMessageIdNewerThanTimestampByArea;
+exports.getMessageAreaLastReadId            = getMessageAreaLastReadId;
+exports.updateMessageAreaLastReadId         = updateMessageAreaLastReadId;
+exports.persistMessage                      = persistMessage;
+exports.trimMessageAreasScheduledEvent      = trimMessageAreasScheduledEvent;
 
 function getAvailableMessageConferences(client, options) {
     options = options || { includeSystemInternal : false };
 
     assert(client || true === options.noClient);
 
-    //	perform ACS check per conf & omit system_internal if desired
+    //  perform ACS check per conf & omit system_internal if desired
     return _.omitBy(Config().messageConferences, (conf, confTag) => {
         if(!options.includeSystemInternal && 'system_internal' === confTag) {
             return true;
@@ -53,7 +53,7 @@ function getSortedAvailMessageConferences(client, options) {
     const confs = _.map(getAvailableMessageConferences(client, options), (v, k) => {
         return {
             confTag : k,
-            conf	: v,
+            conf    : v,
         };
     });
 
@@ -73,10 +73,10 @@ function getAvailableMessageAreasByConfTag(confTag, options) {
         const areas = config.messageConferences[confTag].areas;
 
         if(!options.client || true === options.noAcsCheck) {
-            //	everything - no ACS checks
+            //  everything - no ACS checks
             return areas;
         } else {
-            //	perform ACS check per area
+            //  perform ACS check per area
             return _.omitBy(areas, area => {
                 return !options.client.acs.hasMessageAreaRead(area);
             });
@@ -87,8 +87,8 @@ function getAvailableMessageAreasByConfTag(confTag, options) {
 function getSortedAvailMessageAreasByConfTag(confTag, options) {
     const areas = _.map(getAvailableMessageAreasByConfTag(confTag, options), (v, k) => {
         return  {
-            areaTag	: k,
-            area	: v,
+            areaTag : k,
+            area    : v,
         };
     });
 
@@ -99,16 +99,16 @@ function getSortedAvailMessageAreasByConfTag(confTag, options) {
 
 function getDefaultMessageConferenceTag(client, disableAcsCheck) {
     //
-    //	Find the first conference marked 'default'. If found,
-    //	inspect |client| against *read* ACS using defaults if not
-    //	specified.
+    //  Find the first conference marked 'default'. If found,
+    //  inspect |client| against *read* ACS using defaults if not
+    //  specified.
     //
-    //	If the above fails, just go down the list until we get one
-    //	that passes.
+    //  If the above fails, just go down the list until we get one
+    //  that passes.
     //
-    //	It's possible that we end up with nothing here!
+    //  It's possible that we end up with nothing here!
     //
-    //	Note that built in 'system_internal' is always ommited here
+    //  Note that built in 'system_internal' is always ommited here
     //
     const config = Config();
     let defaultConf = _.findKey(config.messageConferences, o => o.default);
@@ -170,7 +170,7 @@ function getMessageConfTagByAreaTag(areaTag) {
 function getMessageAreaByTag(areaTag, optionalConfTag) {
     const confs = Config().messageConferences;
 
-    //	:TODO: this could be cached
+    //  :TODO: this could be cached
     if(_.isString(optionalConfTag)) {
         if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
             return confs[optionalConfTag].areas[areaTag];
@@ -204,8 +204,8 @@ function changeMessageConference(client, confTag, cb) {
                 }
             },
             function getDefaultAreaInConf(conf, callback) {
-                const areaTag 	= getDefaultMessageAreaTagByConfTag(client, confTag);
-                const area		= getMessageAreaByTag(areaTag, confTag);
+                const areaTag   = getDefaultMessageAreaTagByConfTag(client, confTag);
+                const area      = getMessageAreaByTag(areaTag, confTag);
 
                 if(area) {
                     callback(null, conf, { areaTag : areaTag, area : area } );
@@ -222,8 +222,8 @@ function changeMessageConference(client, confTag, cb) {
             },
             function changeConferenceAndArea(conf, areaInfo, callback) {
                 const newProps = {
-                    message_conf_tag	: confTag,
-                    message_area_tag	: areaInfo.areaTag,
+                    message_conf_tag    : confTag,
+                    message_area_tag    : areaInfo.areaTag,
                 };
                 client.user.persistProperties(newProps, err => {
                     callback(err, conf, areaInfo);
@@ -242,7 +242,7 @@ function changeMessageConference(client, confTag, cb) {
 }
 
 function changeMessageAreaWithOptions(client, areaTag, options, cb) {
-    options = options || {};	//	:TODO: this is currently pointless... cb is required...
+    options = options || {};    //  :TODO: this is currently pointless... cb is required...
 
     async.waterfall(
         [
@@ -284,14 +284,14 @@ function changeMessageAreaWithOptions(client, areaTag, options, cb) {
 }
 
 //
-//	Temporairly -- e.g. non-persisted -- change to an area and it's
-//	associated underlying conference. ACS is checked for both.
+//  Temporairly -- e.g. non-persisted -- change to an area and it's
+//  associated underlying conference. ACS is checked for both.
 //
-//	This is useful for example when doing a new scan
+//  This is useful for example when doing a new scan
 //
 function tempChangeMessageConfAndArea(client, areaTag) {
-    const area		= getMessageAreaByTag(areaTag);
-    const confTag	= getMessageConfTagByAreaTag(areaTag);
+    const area      = getMessageAreaByTag(areaTag);
+    const confTag   = getMessageConfTagByAreaTag(areaTag);
 
     if(!area || !confTag) {
         return false;
@@ -303,7 +303,7 @@ function tempChangeMessageConfAndArea(client, areaTag) {
         return false;
     }
 
-    client.user.properties.message_conf_tag	= confTag;
+    client.user.properties.message_conf_tag = confTag;
     client.user.properties.message_area_tag = areaTag;
 
     return true;
@@ -319,8 +319,8 @@ function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
 
         const filter = {
             areaTag,
-            newerThanMessageId	: lastMessageId,
-            resultType			: 'count',
+            newerThanMessageId  : lastMessageId,
+            resultType          : 'count',
         };
 
         if(Message.isPrivateAreaTag(areaTag)) {
@@ -339,10 +339,10 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
 
         const filter = {
             areaTag,
-            resultType			: 'messageList',
-            newerThanMessageId	: lastMessageId,
-            sort				: 'messageId',
-            order				: 'ascending',
+            resultType          : 'messageList',
+            newerThanMessageId  : lastMessageId,
+            sort                : 'messageId',
+            order               : 'ascending',
         };
 
         if(Message.isPrivateAreaTag(areaTag)) {
@@ -356,9 +356,9 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
 function getMessageListForArea(client, areaTag, cb) {
     const filter = {
         areaTag,
-        resultType	: 'messageList',
-        sort		: 'messageId',
-        order		: 'ascending',
+        resultType  : 'messageList',
+        sort        : 'messageId',
+        order       : 'ascending',
     };
 
     if(Message.isPrivateAreaTag(areaTag)) {
@@ -373,9 +373,9 @@ function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
         {
             areaTag,
             newerThanTimestamp,
-            sort 	: 'modTimestamp',
-            order	: 'ascending',
-            limit	: 1,
+            sort    : 'modTimestamp',
+            order   : 'ascending',
+            limit   : 1,
         },
         (err, id) => {
             if(err) {
@@ -388,9 +388,9 @@ function getMessageIdNewerThanTimestampByArea(areaTag, newerThanTimestamp, cb) {
 
 function getMessageAreaLastReadId(userId, areaTag, cb) {
     msgDb.get(
-        'SELECT message_id '					+
-		'FROM user_message_area_last_read '		+
-		'WHERE user_id = ? AND area_tag = ?;',
+        'SELECT message_id '                    +
+        'FROM user_message_area_last_read '     +
+        'WHERE user_id = ? AND area_tag = ?;',
         [ userId, areaTag.toLowerCase() ],
         function complete(err, row) {
             cb(err, row ? row.message_id : 0);
@@ -404,20 +404,20 @@ function updateMessageAreaLastReadId(userId, areaTag, messageId, allowOlder, cb)
         allowOlder = false;
     }
 
-    //	:TODO: likely a better way to do this...
+    //  :TODO: likely a better way to do this...
     async.waterfall(
         [
             function getCurrent(callback) {
                 getMessageAreaLastReadId(userId, areaTag, function result(err, lastId) {
                     lastId = lastId || 0;
-                    callback(null, lastId);	//	ignore errors as we default to 0
+                    callback(null, lastId); //  ignore errors as we default to 0
                 });
             },
             function update(lastId, callback) {
                 if(allowOlder || messageId > lastId) {
                     msgDb.run(
-                        'REPLACE INTO user_message_area_last_read (user_id, area_tag, message_id) '	+
-						'VALUES (?, ?, ?);',
+                        'REPLACE INTO user_message_area_last_read (user_id, area_tag, message_id) ' +
+                        'VALUES (?, ?, ?);',
                         [ userId, areaTag, messageId ],
                         function written(err) {
                             callback(err, true);    //  true=didUpdate
@@ -459,7 +459,7 @@ function persistMessage(message, cb) {
     );
 }
 
-//	method exposed for event scheduler
+//  method exposed for event scheduler
 function trimMessageAreasScheduledEvent(args, cb) {
 
     function trimMessageAreaByMaxMessages(areaInfo, cb) {
@@ -469,15 +469,15 @@ function trimMessageAreasScheduledEvent(args, cb) {
 
         msgDb.run(
             `DELETE FROM message
-			WHERE message_id IN(
-				SELECT message_id
-				FROM message
-				WHERE area_tag = ?
-				ORDER BY message_id DESC
-				LIMIT -1 OFFSET ${areaInfo.maxMessages}
-			);`,
+            WHERE message_id IN(
+                SELECT message_id
+                FROM message
+                WHERE area_tag = ?
+                ORDER BY message_id DESC
+                LIMIT -1 OFFSET ${areaInfo.maxMessages}
+            );`,
             [ areaInfo.areaTag.toLowerCase() ],
-            function result(err) {	//	no arrow func; need this
+            function result(err) {  //  no arrow func; need this
                 if(err) {
                     Log.error( { areaInfo : areaInfo, error : err.message, type : 'maxMessages' }, 'Error trimming message area');
                 } else {
@@ -495,9 +495,9 @@ function trimMessageAreasScheduledEvent(args, cb) {
 
         msgDb.run(
             `DELETE FROM message
-			WHERE area_tag = ? AND modified_timestamp < date('now', '-${areaInfo.maxAgeDays} days');`,
+            WHERE area_tag = ? AND modified_timestamp < date('now', '-${areaInfo.maxAgeDays} days');`,
             [ areaInfo.areaTag ],
-            function result(err) {	//	no arrow func; need this
+            function result(err) {  //  no arrow func; need this
                 if(err) {
                     Log.warn( { areaInfo : areaInfo, error : err.message, type : 'maxAgeDays' }, 'Error trimming message area');
                 } else {
@@ -514,17 +514,17 @@ function trimMessageAreasScheduledEvent(args, cb) {
                 const areaTags = [];
 
                 //
-                //	We use SQL here vs API such that no-longer-used tags are picked up
+                //  We use SQL here vs API such that no-longer-used tags are picked up
                 //
                 msgDb.each(
                     `SELECT DISTINCT area_tag
-					FROM message;`,
+                    FROM message;`,
                     (err, row) => {
                         if(err) {
                             return callback(err);
                         }
 
-                        //	We treat private mail special
+                        //  We treat private mail special
                         if(!Message.isPrivateAreaTag(row.area_tag)) {
                             areaTags.push(row.area_tag);
                         }
@@ -537,23 +537,23 @@ function trimMessageAreasScheduledEvent(args, cb) {
             function prepareAreaInfo(areaTags, callback) {
                 let areaInfos = [];
 
-                //	determine maxMessages & maxAgeDays per area
+                //  determine maxMessages & maxAgeDays per area
                 const config = Config();
                 areaTags.forEach(areaTag => {
 
                     let maxMessages = config.messageAreaDefaults.maxMessages;
-                    let maxAgeDays	= config.messageAreaDefaults.maxAgeDays;
+                    let maxAgeDays  = config.messageAreaDefaults.maxAgeDays;
 
-                    const area = getMessageAreaByTag(areaTag);	//	note: we don't know the conf here
+                    const area = getMessageAreaByTag(areaTag);  //  note: we don't know the conf here
                     if(area) {
                         maxMessages = area.maxMessages || maxMessages;
-                        maxAgeDays	= area.maxAgeDays || maxAgeDays;
+                        maxAgeDays  = area.maxAgeDays || maxAgeDays;
                     }
 
                     areaInfos.push( {
-                        areaTag		: areaTag,
-                        maxMessages	: maxMessages,
-                        maxAgeDays	: maxAgeDays,
+                        areaTag     : areaTag,
+                        maxMessages : maxMessages,
+                        maxAgeDays  : maxAgeDays,
                     } );
                 });
 
@@ -578,13 +578,13 @@ function trimMessageAreasScheduledEvent(args, cb) {
             },
             function trimExternalPrivateSentMail(callback) {
                 //
-                //	*External* (FTN, email, ...) outgoing is cleaned up *after export*
-                //	if it is older than the configured |maxExternalSentAgeDays| days
+                //  *External* (FTN, email, ...) outgoing is cleaned up *after export*
+                //  if it is older than the configured |maxExternalSentAgeDays| days
                 //
-                //	Outgoing externally exported private mail is:
-                //	- In the 'private_mail' area
-                //	- Marked exported (state_flags0 exported bit set)
-                //	- Marked with any external flavor (we don't mark local)
+                //  Outgoing externally exported private mail is:
+                //  - In the 'private_mail' area
+                //  - Marked exported (state_flags0 exported bit set)
+                //  - Marked with any external flavor (we don't mark local)
                 //
                 const maxExternalSentAgeDays = _.get(
                     Config,
@@ -594,18 +594,18 @@ function trimMessageAreasScheduledEvent(args, cb) {
 
                 msgDb.run(
                     `DELETE FROM message
-					WHERE message_id IN (
-						SELECT m.message_id
-						FROM message m
-						JOIN message_meta mms
-							ON m.message_id = mms.message_id AND
-							(mms.meta_category='System' AND mms.meta_name='${Message.SystemMetaNames.StateFlags0}' AND (mms.meta_value & ${Message.StateFlags0.Exported} = ${Message.StateFlags0.Exported}))
-						JOIN message_meta mmf
-							ON m.message_id = mmf.message_id AND
-							(mmf.meta_category='System' AND mmf.meta_name='${Message.SystemMetaNames.ExternalFlavor}')
-						WHERE m.area_tag='${Message.WellKnownAreaTags.Private}' AND	DATETIME('now') > DATETIME(m.modified_timestamp, '+${maxExternalSentAgeDays} days')
-					);`,
-                    function results(err) {	//	no arrow func; need this
+                    WHERE message_id IN (
+                        SELECT m.message_id
+                        FROM message m
+                        JOIN message_meta mms
+                            ON m.message_id = mms.message_id AND
+                            (mms.meta_category='System' AND mms.meta_name='${Message.SystemMetaNames.StateFlags0}' AND (mms.meta_value & ${Message.StateFlags0.Exported} = ${Message.StateFlags0.Exported}))
+                        JOIN message_meta mmf
+                            ON m.message_id = mmf.message_id AND
+                            (mmf.meta_category='System' AND mmf.meta_name='${Message.SystemMetaNames.ExternalFlavor}')
+                        WHERE m.area_tag='${Message.WellKnownAreaTags.Private}' AND DATETIME('now') > DATETIME(m.modified_timestamp, '+${maxExternalSentAgeDays} days')
+                    );`,
+                    function results(err) { //  no arrow func; need this
                         if(err) {
                             Log.warn( { error : err.message }, 'Error trimming private externally sent messages');
                         } else {
diff --git a/core/message_base_search.js b/core/message_base_search.js
index 98f78552..9684b8f0 100644
--- a/core/message_base_search.js
+++ b/core/message_base_search.js
@@ -1,34 +1,34 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
 const {
     getSortedAvailMessageConferences,
     getAvailableMessageAreasByConfTag,
     getSortedAvailMessageAreasByConfTag,
-}									= require('./message_area.js');
-const Errors						= require('./enig_error.js').Errors;
-const Message						= require('./message.js');
+}                                   = require('./message_area.js');
+const Errors                        = require('./enig_error.js').Errors;
+const Message                       = require('./message.js');
 
-//	deps
-const _								= require('lodash');
+//  deps
+const _                             = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Message Base Search',
-    desc	: 'Module for quickly searching the message base',
-    author	: 'NuSkooler',
+    name    : 'Message Base Search',
+    desc    : 'Module for quickly searching the message base',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
     search : {
-        searchTerms	: 1,
-        search		: 2,
-        conf		: 3,
-        area		: 4,
-        to			: 5,
-        from		: 6,
-        advSearch	: 7,
+        searchTerms : 1,
+        search      : 2,
+        conf        : 3,
+        area        : 4,
+        to          : 5,
+        from        : 6,
+        advSearch   : 7,
     }
 };
 
@@ -54,8 +54,8 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
                     return cb(err);
                 }
 
-                const confView 	= vc.getView(MciViewIds.search.conf);
-                const areaView	= vc.getView(MciViewIds.search.area);
+                const confView  = vc.getView(MciViewIds.search.conf);
+                const areaView  = vc.getView(MciViewIds.search.area);
 
                 if(!confView || !areaView) {
                     return cb(Errors.DoesNotExist('Missing one or more required views'));
@@ -65,7 +65,7 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
                     getSortedAvailMessageConferences(this.client).map(conf => Object.assign(conf, { text : conf.conf.name, data : conf.confTag } )) || []
                 );
 
-                let availAreas = [ { text : '-ALL-', data : '' } ];	//	note: will populate if conf changes from ALL
+                let availAreas = [ { text : '-ALL-', data : '' } ]; //  note: will populate if conf changes from ALL
 
                 confView.setItems(availConfs);
                 areaView.setItems(availAreas);
@@ -90,30 +90,30 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
     }
 
     searchNow(formData, cb) {
-        const isAdvanced	= formData.submitId === MciViewIds.search.advSearch;
-        const value			= formData.value;
+        const isAdvanced    = formData.submitId === MciViewIds.search.advSearch;
+        const value         = formData.value;
 
         const filter = {
-            resultType		: 'messageList',
-            sort			: 'modTimestamp',
-            terms			: value.searchTerms,
-            //extraFields		: [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
-            limit			: 2048,	//	:TODO: best way to handle this? we should probably let the user know if some results are returned
+            resultType      : 'messageList',
+            sort            : 'modTimestamp',
+            terms           : value.searchTerms,
+            //extraFields       : [ 'area_tag', 'message_uuid', 'reply_to_message_id', 'to_user_name', 'from_user_name', 'subject', 'modified_timestamp' ],
+            limit           : 2048, //  :TODO: best way to handle this? we should probably let the user know if some results are returned
         };
 
         if(isAdvanced) {
-            filter.toUserName	= value.toUserName;
-            filter.fromUserName	= value.fromUserName;
+            filter.toUserName   = value.toUserName;
+            filter.fromUserName = value.fromUserName;
 
             if(value.confTag && !value.areaTag) {
-                //	areaTag may be a string or array of strings
-                //	getAvailableMessageAreasByConfTag() returns a obj - we only need tags
+                //  areaTag may be a string or array of strings
+                //  getAvailableMessageAreasByConfTag() returns a obj - we only need tags
                 filter.areaTag = _.map(
                     getAvailableMessageAreasByConfTag(value.confTag, { client : this.client } ),
                     (area, areaTag) => areaTag
                 );
             } else if(value.areaTag) {
-                filter.areaTag = value.areaTag;	//	specific conf + area
+                filter.areaTag = value.areaTag; //  specific conf + area
             }
         }
 
@@ -133,9 +133,9 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
             const menuOpts = {
                 extraArgs : {
                     messageList,
-                    noUpdateLastReadId	: true
+                    noUpdateLastReadId  : true
                 },
-                menuFlags	: [ 'popParent' ],
+                menuFlags   : [ 'popParent' ],
             };
 
             return this.gotoMenu(
diff --git a/core/mime_util.js b/core/mime_util.js
index d6631077..857b967c 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -1,26 +1,26 @@
 /* jslint node: true */
 'use strict';
 
-//	deps
-const _			= require('lodash');
+//  deps
+const _         = require('lodash');
 
-const mimeTypes	= require('mime-types');
+const mimeTypes = require('mime-types');
 
-exports.startup				= startup;
-exports.resolveMimeType		= resolveMimeType;
+exports.startup             = startup;
+exports.resolveMimeType     = resolveMimeType;
 
 function startup(cb) {
     //
-    //	Add in types (not yet) supported by mime-db -- and therefor, mime-types
+    //  Add in types (not yet) supported by mime-db -- and therefor, mime-types
     //
     const ADDITIONAL_EXT_MIMETYPES = {
-        ans				: 'text/x-ansi',
-        gz				: 'application/gzip',	//	not in mime-types 2.1.15 :(
-        lzx				: 'application/x-lzx',	//	:TODO: submit to mime-types
+        ans             : 'text/x-ansi',
+        gz              : 'application/gzip',   //  not in mime-types 2.1.15 :(
+        lzx             : 'application/x-lzx',  //  :TODO: submit to mime-types
     };
 
     _.forEach(ADDITIONAL_EXT_MIMETYPES, (mimeType, ext) => {
-        //	don't override any entries
+        //  don't override any entries
         if(!_.isString(mimeTypes.types[ext])) {
             mimeTypes[ext] = mimeType;
         }
@@ -35,8 +35,8 @@ function startup(cb) {
 
 function resolveMimeType(query) {
     if(mimeTypes.extensions[query]) {
-        return query;	//	alreaed a mime-type
+        return query;   //  alreaed a mime-type
     }
 
-    return mimeTypes.lookup(query) || undefined;	//	lookup() returns false; we want undefined
+    return mimeTypes.lookup(query) || undefined;    //  lookup() returns false; we want undefined
 }
\ No newline at end of file
diff --git a/core/misc_util.js b/core/misc_util.js
index 3a75d065..633cc967 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -1,17 +1,17 @@
 /* jslint node: true */
 'use strict';
 
-const paths			= require('path');
+const paths         = require('path');
 
-const os			= require('os');
-const packageJson 	= require('../package.json');
+const os            = require('os');
+const packageJson   = require('../package.json');
 
-exports.isProduction			= isProduction;
-exports.isDevelopment			= isDevelopment;
-exports.valueWithDefault		= valueWithDefault;
-exports.resolvePath				= resolvePath;
-exports.getCleanEnigmaVersion	= getCleanEnigmaVersion;
-exports.getEnigmaUserAgent		= getEnigmaUserAgent;
+exports.isProduction            = isProduction;
+exports.isDevelopment           = isDevelopment;
+exports.valueWithDefault        = valueWithDefault;
+exports.resolvePath             = resolvePath;
+exports.getCleanEnigmaVersion   = getCleanEnigmaVersion;
+exports.getEnigmaUserAgent      = getEnigmaUserAgent;
 
 function isProduction() {
     var env = process.env.NODE_ENV || 'dev';
@@ -42,11 +42,11 @@ function getCleanEnigmaVersion() {
     ;
 }
 
-//	See also ftn_util.js getTearLine() & getProductIdentifier()
+//  See also ftn_util.js getTearLine() & getProductIdentifier()
 function getEnigmaUserAgent() {
-    //	can't have 1/2 or ½ in User-Agent according to RFC 1945  :(
+    //  can't have 1/2 or ½ in User-Agent according to RFC 1945  :(
     const version = getCleanEnigmaVersion();
-    const nodeVer = process.version.substr(1);	//	remove 'v' prefix
+    const nodeVer = process.version.substr(1);  //  remove 'v' prefix
 
     return `ENiGMA-BBS/${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
 }
\ No newline at end of file
diff --git a/core/mod_mixins.js b/core/mod_mixins.js
index fd9db771..f3d9d5ad 100644
--- a/core/mod_mixins.js
+++ b/core/mod_mixins.js
@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const messageArea	= require('../core/message_area.js');
-const { get }		= require('lodash');
+const messageArea   = require('../core/message_area.js');
+const { get }       = require('lodash');
 
 
 exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
@@ -10,13 +10,13 @@ exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
     tempMessageConfAndAreaSwitch(messageAreaTag, recordPrevious = true) {
         messageAreaTag = messageAreaTag || get(this, 'config.messageAreaTag', this.messageAreaTag);
         if(!messageAreaTag) {
-            return;	//	nothing to do!
+            return; //  nothing to do!
         }
 
         if(recordPrevious) {
             this.prevMessageConfAndArea = {
-                confTag	: this.client.user.properties.message_conf_tag,
-                areaTag	: this.client.user.properties.message_area_tag,
+                confTag : this.client.user.properties.message_conf_tag,
+                areaTag : this.client.user.properties.message_area_tag,
             };
         }
 
diff --git a/core/module_util.js b/core/module_util.js
index 26a1ec53..5a575f3e 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config	= require('./config.js').get;
+//  ENiGMA½
+const Config    = require('./config.js').get;
 
-//	deps
-const fs 		= require('graceful-fs');
-const paths		= require('path');
-const _			= require('lodash');
-const assert	= require('assert');
-const async		= require('async');
+//  deps
+const fs        = require('graceful-fs');
+const paths     = require('path');
+const _         = require('lodash');
+const assert    = require('assert');
+const async     = require('async');
 
-//	exports
-exports.loadModuleEx			= loadModuleEx;
-exports.loadModule				= loadModule;
-exports.loadModulesForCategory	= loadModulesForCategory;
-exports.getModulePaths			= getModulePaths;
+//  exports
+exports.loadModuleEx            = loadModuleEx;
+exports.loadModule              = loadModule;
+exports.loadModulesForCategory  = loadModulesForCategory;
+exports.getModulePaths          = getModulePaths;
 
 function loadModuleEx(options, cb) {
     assert(_.isObject(options));
@@ -25,18 +25,18 @@ function loadModuleEx(options, cb) {
     const modConfig = _.isObject(Config[options.category]) ? Config[options.category][options.name] : null;
 
     if(_.isObject(modConfig) && false === modConfig.enabled) {
-        const err	= new Error(`Module "${options.name}" is disabled`);
-        err.code	= 'EENIGMODDISABLED';
+        const err   = new Error(`Module "${options.name}" is disabled`);
+        err.code    = 'EENIGMODDISABLED';
         return cb(err);
     }
 
     //
-    //	Modules are allowed to live in /path/to/<moduleName>/<moduleName>.js or
-    //	simply in /path/to/<moduleName>.js. This allows for more advanced modules
-    //	to have their own containing folder, package.json & dependencies, etc.
+    //  Modules are allowed to live in /path/to/<moduleName>/<moduleName>.js or
+    //  simply in /path/to/<moduleName>.js. This allows for more advanced modules
+    //  to have their own containing folder, package.json & dependencies, etc.
     //
     let mod;
-    let modPath = paths.join(options.path, `${options.name}.js`);	//	general case first
+    let modPath = paths.join(options.path, `${options.name}.js`);   //  general case first
     try {
         mod = require(modPath);
     } catch(e) {
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 2d61044d..27cbcbb1 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -1,30 +1,30 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const messageArea			= require('./message_area.js');
-const displayThemeArt		= require('./theme.js').displayThemeArt;
-const resetScreen			= require('./ansi_term.js').resetScreen;
-const stringFormat			= require('./string_format.js');
-const Errors				= require('./enig_error.js').Errors;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const messageArea           = require('./message_area.js');
+const displayThemeArt       = require('./theme.js').displayThemeArt;
+const resetScreen           = require('./ansi_term.js').resetScreen;
+const stringFormat          = require('./string_format.js');
+const Errors                = require('./enig_error.js').Errors;
 
-//	deps
-const async				= require('async');
-const _					= require('lodash');
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Message Area List',
-    desc	: 'Module for listing / choosing message areas',
-    author	: 'NuSkooler',
+    name    : 'Message Area List',
+    desc    : 'Module for listing / choosing message areas',
+    author  : 'NuSkooler',
 };
 
 /*
-	:TODO:
+    :TODO:
 
-	Obv/2 has the following:
-	CHANGE .ANS - Message base changing ansi
+    Obv/2 has the following:
+    CHANGE .ANS - Message base changing ansi
           |SN      Current base name
           |SS      Current base sponsor
           |NM      Number of messages in current base
@@ -35,9 +35,9 @@ exports.moduleInfo = {
 */
 
 const MciViewIds = {
-    AreaList		: 1,
-    SelAreaInfo1	: 2,
-    SelAreaInfo2	: 3,
+    AreaList        : 1,
+    SelAreaInfo1    : 2,
+    SelAreaInfo2    : 3,
 };
 
 exports.getModule = class MessageAreaListModule extends MenuModule {
@@ -53,9 +53,9 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
         this.menuMethods = {
             changeArea : function(formData, extraArgs, cb) {
                 if(1 === formData.submitId) {
-                    let area 		= self.messageAreas[formData.value.area];
-                    const areaTag	=  area.areaTag;
-                    area = area.area;	//	what we want is actually embedded
+                    let area        = self.messageAreas[formData.value.area];
+                    const areaTag   =  area.areaTag;
+                    area = area.area;   //  what we want is actually embedded
 
                     messageArea.changeMessageArea(self.client, areaTag, err => {
                         if(err) {
@@ -65,14 +65,14 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
                         } else {
                             if(_.isString(area.art)) {
                                 const dispOptions = {
-                                    client	: self.client,
-                                    name	: area.art,
+                                    client  : self.client,
+                                    name    : area.art,
                                 };
 
                                 self.client.term.rawWrite(resetScreen());
 
                                 displayThemeArt(dispOptions, () => {
-                                    //	pause by default, unless explicitly told not to
+                                    //  pause by default, unless explicitly told not to
                                     if(_.has(area, 'options.pause') && false === area.options.pause) {
                                         return self.prevMenuOnTimeout(1000, cb);
                                     } else {
@@ -99,18 +99,18 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
         }, timeout);
     }
 
-    //	:TODO: these concepts have been replaced with the {someKey} style formatting - update me!
+    //  :TODO: these concepts have been replaced with the {someKey} style formatting - update me!
     updateGeneralAreaInfoViews(areaIndex) {
         /*
-		const areaInfo = self.messageAreas[areaIndex];
+        const areaInfo = self.messageAreas[areaIndex];
 
-		[ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
-			const v = self.viewControllers.areaList.getView(mciId);
-			if(v) {
-				v.setFormatObject(areaInfo.area);
-			}
-		});
-		*/
+        [ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
+            const v = self.viewControllers.areaList.getView(mciId);
+            if(v) {
+                v.setFormatObject(areaInfo.area);
+            }
+        });
+        */
     }
 
     mciReady(mciData, cb) {
@@ -119,16 +119,16 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.areaList = new ViewController( { client : self.client } );
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu	: self,
-                            mciMap		: mciData.menu,
-                            formId		: 0,
+                            callingMenu : self,
+                            mciMap      : mciData.menu,
+                            formId      : 0,
                         };
 
                         vc.loadFromMenuConfig(loadOpts, function startingViewReady(err) {
@@ -136,8 +136,8 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
                         });
                     },
                     function populateAreaListView(callback) {
-                        const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
-                        const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                        const listFormat        = self.menuConfig.config.listFormat || '{index} ) - {name}';
+                        const focusListFormat   = self.menuConfig.config.focusListFormat || listFormat;
 
                         const areaListView = vc.getView(MciViewIds.AreaList);
                         if(!areaListView) {
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 8c2136c7..8e4d9f3f 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -1,16 +1,16 @@
 /* jslint node: true */
 'use strict';
 
-const FullScreenEditorModule	= require('./fse.js').FullScreenEditorModule;
-const persistMessage			= require('./message_area.js').persistMessage;
+const FullScreenEditorModule    = require('./fse.js').FullScreenEditorModule;
+const persistMessage            = require('./message_area.js').persistMessage;
 
-const _							= require('lodash');
-const async					 	= require('async');
+const _                         = require('lodash');
+const async                     = require('async');
 
 exports.moduleInfo = {
-    name	: 'Message Area Post',
-    desc	: 'Module for posting a new message to an area',
-    author	: 'NuSkooler',
+    name    : 'Message Area Post',
+    desc    : 'Module for posting a new message to an area',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
@@ -19,7 +19,7 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
 
         const self = this;
 
-        //	we're posting, so always start with 'edit' mode
+        //  we're posting, so always start with 'edit' mode
         this.editorMode = 'edit';
 
         this.menuMethods.editModeMenuSave = function(formData, extraArgs, cb) {
@@ -42,9 +42,9 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                 ],
                 function complete(err) {
                     if(err) {
-                        //	:TODO:... sooooo now what?
+                        //  :TODO:... sooooo now what?
                     } else {
-                        //	note: not logging 'from' here as it's part of client.log.xxxx()
+                        //  note: not logging 'from' here as it's part of client.log.xxxx()
                         self.client.log.info(
                             { to : msg.toUserName, subject : msg.subject, uuid : msg.uuid },
                             'Message persisted'
diff --git a/core/msg_area_reply_fse.js b/core/msg_area_reply_fse.js
index 83cb99c7..11742865 100644
--- a/core/msg_area_reply_fse.js
+++ b/core/msg_area_reply_fse.js
@@ -1,14 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-var FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
+var FullScreenEditorModule      = require('./fse.js').FullScreenEditorModule;
 
-exports.getModule				= AreaReplyFSEModule;
+exports.getModule               = AreaReplyFSEModule;
 
 exports.moduleInfo = {
-    name	: 'Message Area Reply',
-    desc	: 'Module for replying to an area message',
-    author	: 'NuSkooler',
+    name    : 'Message Area Reply',
+    desc    : 'Module for replying to an area message',
+    author  : 'NuSkooler',
 };
 
 function AreaReplyFSEModule(options) {
diff --git a/core/msg_area_view_fse.js b/core/msg_area_view_fse.js
index af0cbb78..1ca5617c 100644
--- a/core/msg_area_view_fse.js
+++ b/core/msg_area_view_fse.js
@@ -1,35 +1,35 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
-const Message						= require('./message.js');
+//  ENiGMA½
+const FullScreenEditorModule        = require('./fse.js').FullScreenEditorModule;
+const Message                       = require('./message.js');
 
-//	deps
-const _							= require('lodash');
+//  deps
+const _                         = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Message Area View',
-    desc	: 'Module for viewing an area message',
-    author	: 'NuSkooler',
+    name    : 'Message Area View',
+    desc    : 'Module for viewing an area message',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
     constructor(options) {
         super(options);
 
-        this.editorType			= 'area';
-        this.editorMode			= 'view';
+        this.editorType         = 'area';
+        this.editorMode         = 'view';
 
         if(_.isObject(options.extraArgs)) {
-            this.messageList			= options.extraArgs.messageList;
-            this.messageIndex			= options.extraArgs.messageIndex;
-            this.lastMessageNextExit	= options.extraArgs.lastMessageNextExit;
+            this.messageList            = options.extraArgs.messageList;
+            this.messageIndex           = options.extraArgs.messageIndex;
+            this.lastMessageNextExit    = options.extraArgs.lastMessageNextExit;
         }
 
-        this.messageList	= this.messageList || [];
-        this.messageIndex	= this.messageIndex || 0;
-        this.messageTotal	= this.messageList.length;
+        this.messageList    = this.messageList || [];
+        this.messageIndex   = this.messageIndex || 0;
+        this.messageTotal   = this.messageList.length;
 
         if(this.messageList.length > 0) {
             this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
@@ -37,19 +37,19 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 
         const self = this;
 
-        //	assign *additional* menuMethods
+        //  assign *additional* menuMethods
         Object.assign(this.menuMethods, {
             nextMessage : (formData, extraArgs, cb) => {
                 if(self.messageIndex + 1 < self.messageList.length) {
                     self.messageIndex++;
 
                     this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
-                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);  //  false=don't record prev; we want what we entered the module with
 
                     return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
                 }
 
-                //	auto-exit if no more to go?
+                //  auto-exit if no more to go?
                 if(self.lastMessageNextExit) {
                     self.lastMessageReached = true;
                     return self.prevMenu(cb);
@@ -63,7 +63,7 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
                     self.messageIndex--;
 
                     this.messageAreaTag = this.messageList[this.messageIndex].areaTag;
-                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);	//	false=don't record prev; we want what we entered the module with
+                    this.tempMessageConfAndAreaSwitch(this.messageAreaTag, false);  //  false=don't record prev; we want what we entered the module with
 
                     return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
                 }
@@ -72,18 +72,18 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
             },
 
             movementKeyPressed : (formData, extraArgs, cb) => {
-                const bodyView = self.viewControllers.body.getView(1);	//	:TODO: use const here vs magic #
+                const bodyView = self.viewControllers.body.getView(1);  //  :TODO: use const here vs magic #
 
-                //	:TODO: Create methods for up/down vs using keyPressXXXXX
+                //  :TODO: Create methods for up/down vs using keyPressXXXXX
                 switch(formData.key.name) {
-                    case 'down arrow'	: bodyView.scrollDocumentUp(); break;
-                    case 'up arrow'		: bodyView.scrollDocumentDown(); break;
-                    case 'page up'		: bodyView.keyPressPageUp(); break;
-                    case 'page down'	: bodyView.keyPressPageDown(); break;
+                    case 'down arrow'   : bodyView.scrollDocumentUp(); break;
+                    case 'up arrow'     : bodyView.scrollDocumentDown(); break;
+                    case 'page up'      : bodyView.keyPressPageUp(); break;
+                    case 'page down'    : bodyView.keyPressPageDown(); break;
                 }
 
-                //	:TODO: need to stop down/page down if doing so would push the last
-                //	visible page off the screen at all .... this should be handled by MLTEV though...
+                //  :TODO: need to stop down/page down if doing so would push the last
+                //  visible page off the screen at all .... this should be handled by MLTEV though...
 
                 return cb(null);
             },
@@ -92,8 +92,8 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
                 if(_.isString(extraArgs.menu)) {
                     const modOpts = {
                         extraArgs : {
-                            messageAreaTag		: self.messageAreaTag,
-                            replyToMessage		: self.message,
+                            messageAreaTag      : self.messageAreaTag,
+                            replyToMessage      : self.message,
                         }
                     };
 
@@ -124,22 +124,22 @@ exports.getModule = class AreaViewFSEModule extends FullScreenEditorModule {
 
     getSaveState() {
         return {
-            messageList		: this.messageList,
-            messageIndex	: this.messageIndex,
-            messageTotal	: this.messageList.length,
+            messageList     : this.messageList,
+            messageIndex    : this.messageIndex,
+            messageTotal    : this.messageList.length,
         };
     }
 
     restoreSavedState(savedState) {
-        this.messageList	= savedState.messageList;
-        this.messageIndex	= savedState.messageIndex;
-        this.messageTotal	= savedState.messageTotal;
+        this.messageList    = savedState.messageList;
+        this.messageIndex   = savedState.messageIndex;
+        this.messageTotal   = savedState.messageTotal;
     }
 
     getMenuResult() {
         return {
-            messageIndex 		: this.messageIndex,
-            lastMessageReached	: this.lastMessageReached,
+            messageIndex        : this.messageIndex,
+            lastMessageReached  : this.lastMessageReached,
         };
     }
 };
diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index 0876f89a..c20d06ca 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -1,29 +1,29 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const messageArea			= require('./message_area.js');
-const displayThemeArt		= require('./theme.js').displayThemeArt;
-const resetScreen			= require('./ansi_term.js').resetScreen;
-const stringFormat			= require('./string_format.js');
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const messageArea           = require('./message_area.js');
+const displayThemeArt       = require('./theme.js').displayThemeArt;
+const resetScreen           = require('./ansi_term.js').resetScreen;
+const stringFormat          = require('./string_format.js');
 
-//	deps
-const async				= require('async');
-const _					= require('lodash');
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Message Conference List',
-    desc	: 'Module for listing / choosing message conferences',
-    author	: 'NuSkooler',
+    name    : 'Message Conference List',
+    desc    : 'Module for listing / choosing message conferences',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
-    ConfList	: 1,
+    ConfList    : 1,
 
-    //	:TODO:
-    //	# areas in conf .... see Obv/2, iNiQ, ...
+    //  :TODO:
+    //  # areas in conf .... see Obv/2, iNiQ, ...
     //
 };
 
@@ -37,9 +37,9 @@ exports.getModule = class MessageConfListModule extends MenuModule {
         this.menuMethods = {
             changeConference : function(formData, extraArgs, cb) {
                 if(1 === formData.submitId) {
-                    let conf		= self.messageConfs[formData.value.conf];
-                    const confTag	= conf.confTag;
-                    conf = conf.conf;	//	what we want is embedded
+                    let conf        = self.messageConfs[formData.value.conf];
+                    const confTag   = conf.confTag;
+                    conf = conf.conf;   //  what we want is embedded
 
                     messageArea.changeMessageConference(self.client, confTag, err => {
                         if(err) {
@@ -51,14 +51,14 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                         } else {
                             if(_.isString(conf.art)) {
                                 const dispOptions = {
-                                    client	: self.client,
-                                    name	: conf.art,
+                                    client  : self.client,
+                                    name    : conf.art,
                                 };
 
                                 self.client.term.rawWrite(resetScreen());
 
                                 displayThemeArt(dispOptions, () => {
-                                    //	pause by default, unless explicitly told not to
+                                    //  pause by default, unless explicitly told not to
                                     if(_.has(conf, 'options.pause') && false === conf.options.pause) {
                                         return self.prevMenuOnTimeout(1000, cb);
                                     } else {
@@ -91,23 +91,23 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.areaList = new ViewController( { client : self.client } );
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         let loadOpts = {
-                            callingMenu	: self,
-                            mciMap		: mciData.menu,
-                            formId		: 0,
+                            callingMenu : self,
+                            mciMap      : mciData.menu,
+                            formId      : 0,
                         };
 
                         vc.loadFromMenuConfig(loadOpts, callback);
                     },
                     function populateConfListView(callback) {
-                        const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
-                        const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
+                        const listFormat        = self.menuConfig.config.listFormat || '{index} ) - {name}';
+                        const focusListFormat   = self.menuConfig.config.focusListFormat || listFormat;
 
                         const confListView = vc.getView(MciViewIds.ConfList);
                         let i = 1;
@@ -135,7 +135,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                         callback(null);
                     },
                     function populateTextViews(callback) {
-                        //	:TODO: populate other avail MCI, e.g. current conf name
+                        //  :TODO: populate other avail MCI, e.g. current conf name
                         callback(null);
                     }
                 ],
diff --git a/core/msg_list.js b/core/msg_list.js
index 5c8624ab..a4eb18aa 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -1,51 +1,51 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const messageArea					= require('./message_area.js');
-const stringFormat					= require('./string_format.js');
-const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const messageArea                   = require('./message_area.js');
+const stringFormat                  = require('./string_format.js');
+const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 
-//	deps
-const async				= require('async');
-const _					= require('lodash');
-const moment			= require('moment');
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
+const moment            = require('moment');
 
 /*
-	Available listFormat/focusListFormat members (VM1):
+    Available listFormat/focusListFormat members (VM1):
 
-	msgNum			: Message number
-	to				: To username/handle
-	from			: From username/handle
-	subj			: Subject
-	ts				: Message mod timestamp (format with config.dateTimeFormat)
-	newIndicator	: New mark/indicator (config.newIndicator)
+    msgNum          : Message number
+    to              : To username/handle
+    from            : From username/handle
+    subj            : Subject
+    ts              : Message mod timestamp (format with config.dateTimeFormat)
+    newIndicator    : New mark/indicator (config.newIndicator)
 
-	MCI codes:
+    MCI codes:
 
-	VM1			: Message list
-	TL2			: Message info 1: { msgNumSelected, msgNumTotal }
+    VM1         : Message list
+    TL2         : Message info 1: { msgNumSelected, msgNumTotal }
 */
 
 exports.moduleInfo = {
-    name	: 'Message List',
-    desc	: 'Module for listing/browsing available messages',
-    author	: 'NuSkooler',
+    name    : 'Message List',
+    desc    : 'Module for listing/browsing available messages',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
-    msgList			: 1,	//	VM1
-    msgInfo1		: 2,	//	TL2
+    msgList         : 1,    //  VM1
+    msgInfo1        : 2,    //  TL2
 };
 
 exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(MenuModule) {
     constructor(options) {
         super(options);
 
-        //	:TODO: consider this pattern in base MenuModule - clean up code all over
-        this.config	= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+        //  :TODO: consider this pattern in base MenuModule - clean up code all over
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
 
         this.lastMessageReachedExit = _.get(options, 'lastMenuResult.lastMessageReached', false);
 
@@ -55,11 +55,11 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                     this.initialFocusIndex = formData.value.message;
 
                     const modOpts = {
-                        extraArgs 	: {
-                            messageAreaTag		: this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
-                            messageList			: this.config.messageList,
-                            messageIndex		: formData.value.message,
-                            lastMessageNextExit	: true,
+                        extraArgs   : {
+                            messageAreaTag      : this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
+                            messageList         : this.config.messageList,
+                            messageIndex        : formData.value.message,
+                            lastMessageNextExit : true,
                         }
                     };
 
@@ -68,8 +68,8 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                     }
 
                     //
-                    //	Provide a serializer so we don't dump *huge* bits of information to the log
-                    //	due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
+                    //  Provide a serializer so we don't dump *huge* bits of information to the log
+                    //  due to the size of |messageList|. See https://github.com/trentm/node-bunyan/issues/189
                     //
                     const self = this;
                     modOpts.extraArgs.toJSON = function() {
@@ -78,11 +78,11 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                             self.config.messageList.slice(0, 2).concat(self.config.messageList.slice(-2));
 
                         return {
-                            //	note |this| is scope of toJSON()!
-                            messageAreaTag		: this.messageAreaTag,
-                            apprevMessageList	: logMsgList,
-                            messageCount		: this.messageList.length,
-                            messageIndex		: this.messageIndex,
+                            //  note |this| is scope of toJSON()!
+                            messageAreaTag      : this.messageAreaTag,
+                            apprevMessageList   : logMsgList,
+                            messageCount        : this.messageList.length,
+                            messageIndex        : this.messageIndex,
                         };
                     };
 
@@ -111,10 +111,10 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
         super.enter();
 
         //
-        //	Config can specify |messageAreaTag| else it comes from
-        //	the user's current area. If |messageList| is supplied,
-        //	each item is expected to contain |areaTag|, so we use that
-        //	instead in those cases.
+        //  Config can specify |messageAreaTag| else it comes from
+        //  the user's current area. If |messageList| is supplied,
+        //  each item is expected to contain |areaTag|, so we use that
+        //  instead in those cases.
         //
         if(!Array.isArray(this.config.messageList)) {
             if(this.config.messageAreaTag) {
@@ -136,23 +136,23 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.allViews = new ViewController( { client : self.client } );
             let configProvidedMessageList = false;
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu
+                            callingMenu     : self,
+                            mciMap          : mciData.menu
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
                     },
                     function fetchMessagesInArea(callback) {
                         //
-                        //	Config can supply messages else we'll need to populate the list now
+                        //  Config can supply messages else we'll need to populate the list now
                         //
                         if(_.isArray(self.config.messageList)) {
                             configProvidedMessageList = true;
@@ -169,7 +169,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                         });
                     },
                     function getLastReadMesageId(callback) {
-                        //	messageList entries can contain |isNew| if they want to be considered new
+                        //  messageList entries can contain |isNew| if they want to be considered new
                         if(configProvidedMessageList) {
                             self.lastReadId = 0;
                             return callback(null);
@@ -177,33 +177,33 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
                         messageArea.getMessageAreaLastReadId(self.client.user.userId, self.config.messageAreaTag, function lastRead(err, lastReadId) {
                             self.lastReadId = lastReadId || 0;
-                            return callback(null);	//	ignore any errors, e.g. missing value
+                            return callback(null);  //  ignore any errors, e.g. missing value
                         });
                     },
                     function updateMessageListObjects(callback) {
-                        const dateTimeFormat	= self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
-                        const newIndicator		= self.menuConfig.config.newIndicator || '*';
-                        const regIndicator		= new Array(newIndicator.length + 1).join(' ');	//	fill with space to avoid draw issues
+                        const dateTimeFormat    = self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
+                        const newIndicator      = self.menuConfig.config.newIndicator || '*';
+                        const regIndicator      = new Array(newIndicator.length + 1).join(' '); //  fill with space to avoid draw issues
 
                         let msgNum = 1;
                         self.config.messageList.forEach( (listItem, index) => {
-                            listItem.msgNum			= msgNum++;
-                            listItem.ts				= moment(listItem.modTimestamp).format(dateTimeFormat);
-                            const isNew				= _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
-                            listItem.newIndicator	=  isNew ? newIndicator : regIndicator;
+                            listItem.msgNum         = msgNum++;
+                            listItem.ts             = moment(listItem.modTimestamp).format(dateTimeFormat);
+                            const isNew             = _.isBoolean(listItem.isNew) ? listItem.isNew : listItem.messageId > self.lastReadId;
+                            listItem.newIndicator   =  isNew ? newIndicator : regIndicator;
 
                             if(_.isUndefined(self.initialFocusIndex) && listItem.messageId > self.lastReadId) {
                                 self.initialFocusIndex = index;
                             }
 
-                            listItem.text			= `${listItem.msgNum} - ${listItem.subject} from ${listItem.fromUserName}`;	//	default text
+                            listItem.text           = `${listItem.msgNum} - ${listItem.subject} from ${listItem.fromUserName}`; //  default text
                         });
                         return callback(null);
                     },
                     function populateList(callback) {
-                        const msgListView			= vc.getView(MciViewIds.msgList);
-                        //	:TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
-                        const messageInfo1Format	= self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
+                        const msgListView           = vc.getView(MciViewIds.msgList);
+                        //  :TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
+                        const messageInfo1Format    = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
 
                         msgListView.setItems(self.config.messageList);
 
@@ -215,7 +215,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                         });
 
                         if(self.initialFocusIndex > 0) {
-                            //	note: causes redraw()
+                            //  note: causes redraw()
                             msgListView.setFocusItemIndex(self.initialFocusIndex);
                         } else {
                             msgListView.redraw();
diff --git a/core/msg_network.js b/core/msg_network.js
index 721ebba4..b26d5f1b 100644
--- a/core/msg_network.js
+++ b/core/msg_network.js
@@ -1,15 +1,15 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-let loadModulesForCategory	= require('./module_util.js').loadModulesForCategory;
+//  ENiGMA½
+let loadModulesForCategory  = require('./module_util.js').loadModulesForCategory;
 
-//	standard/deps
-let async				= require('async');
+//  standard/deps
+let async               = require('async');
 
-exports.startup			= startup;
-exports.shutdown		= shutdown;
-exports.recordMessage	= recordMessage;
+exports.startup         = startup;
+exports.shutdown        = shutdown;
+exports.recordMessage   = recordMessage;
 
 let msgNetworkModules = [];
 
@@ -53,9 +53,9 @@ function shutdown(cb) {
 
 function recordMessage(message, cb) {
     //
-    //	Give all message network modules (scanner/tossers)
-    //	a chance to do something with |message|. Any or all can
-    //	choose to ignore it.
+    //  Give all message network modules (scanner/tossers)
+    //  a chance to do something with |message|. Any or all can
+    //  choose to ignore it.
     //
     async.each(msgNetworkModules, (modInst, next) => {
         modInst.record(message);
diff --git a/core/msg_scan_toss_module.js b/core/msg_scan_toss_module.js
index 002c2cc3..59c94be0 100644
--- a/core/msg_scan_toss_module.js
+++ b/core/msg_scan_toss_module.js
@@ -1,10 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-var PluginModule				= require('./plugin_module.js').PluginModule;
+//  ENiGMA½
+var PluginModule                = require('./plugin_module.js').PluginModule;
 
-exports.MessageScanTossModule	= MessageScanTossModule;
+exports.MessageScanTossModule   = MessageScanTossModule;
 
 function MessageScanTossModule() {
     PluginModule.call(this);
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 3a7f29d9..1d16e201 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -1,22 +1,22 @@
 /* jslint node: true */
 'use strict';
 
-const View			= require('./view.js').View;
-const strUtil		= require('./string_util.js');
-const ansi			= require('./ansi_term.js');
-const wordWrapText	= require('./word_wrap.js').wordWrapText;
-const ansiPrep		= require('./ansi_prep.js');
+const View          = require('./view.js').View;
+const strUtil       = require('./string_util.js');
+const ansi          = require('./ansi_term.js');
+const wordWrapText  = require('./word_wrap.js').wordWrapText;
+const ansiPrep      = require('./ansi_prep.js');
 
-const assert		= require('assert');
-const _				= require('lodash');
+const assert        = require('assert');
+const _             = require('lodash');
 
-//	:TODO: Determine CTRL-* keys for various things
-//	See http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
-//	http://wiki.synchro.net/howto:editor:slyedit#edit_mode
-//	http://sublime-text-unofficial-documentation.readthedocs.org/en/latest/reference/keyboard_shortcuts_win.html
+//  :TODO: Determine CTRL-* keys for various things
+//  See http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
+//  http://wiki.synchro.net/howto:editor:slyedit#edit_mode
+//  http://sublime-text-unofficial-documentation.readthedocs.org/en/latest/reference/keyboard_shortcuts_win.html
 
 /* Mystic
-	 [^B]  Reformat Paragraph            [^O]  Show this help file
+     [^B]  Reformat Paragraph            [^O]  Show this help file
        [^I]  Insert tab space              [^Q]  Enter quote mode
        [^K]  Cut current line of text      [^V]  Toggle insert/overwrite
        [^U]  Paste previously cut text     [^Y]  Delete current line
@@ -29,58 +29,58 @@ const _				= require('lodash');
 */
 
 //
-//	Some other interesting implementations, resources, etc.
+//  Some other interesting implementations, resources, etc.
 //
-//	Editors - BBS
-//	*	https://github.com/M-griffin/Enthral/blob/master/src/msg_fse.cpp
+//  Editors - BBS
+//  *   https://github.com/M-griffin/Enthral/blob/master/src/msg_fse.cpp
 //
 //
-//	Editors - Other
-//	*	http://joe-editor.sourceforge.net/
-//	* 	http://www.jbox.dk/downloads/edit.c
-//	*	https://github.com/dominictarr/hipster
+//  Editors - Other
+//  *   http://joe-editor.sourceforge.net/
+//  *   http://www.jbox.dk/downloads/edit.c
+//  *   https://github.com/dominictarr/hipster
 //
-//	Implementations - Word Wrap
-//	*	https://github.com/protomouse/synchronet/blob/93b01c55b3102ebc3c4f4793c3a45b8c13d0dc2a/src/sbbs3/wordwrap.c
+//  Implementations - Word Wrap
+//  *   https://github.com/protomouse/synchronet/blob/93b01c55b3102ebc3c4f4793c3a45b8c13d0dc2a/src/sbbs3/wordwrap.c
 //
-//	Misc notes
-//	* https://github.com/dominictarr/hipster/issues/15 (Deleting lines/etc.)
+//  Misc notes
+//  * https://github.com/dominictarr/hipster/issues/15 (Deleting lines/etc.)
 //
-//	Blessed
-//		insertLine: CSR(top, bottom) + CUP(y, 0) + IL(1) + CSR(0, height)
-//		deleteLine: CSR(top, bottom) + CUP(y, 0) + DL(1) + CSR(0, height)
-//	Quick Ansi -- update only what was changed:
-//	https://github.com/dominictarr/quickansi
+//  Blessed
+//      insertLine: CSR(top, bottom) + CUP(y, 0) + IL(1) + CSR(0, height)
+//      deleteLine: CSR(top, bottom) + CUP(y, 0) + DL(1) + CSR(0, height)
+//  Quick Ansi -- update only what was changed:
+//  https://github.com/dominictarr/quickansi
 
 //
-//	To-Do
+//  To-Do
 //
-//	* Index pos % for emit scroll events
-//	* Some of this should be async'd where there is lots of processing (e.g. word wrap)
-//	* Fix backspace when col=0 (e.g. bs to prev line)
-//	* Add word delete (CTRL+????)
-//	*
+//  * Index pos % for emit scroll events
+//  * Some of this should be async'd where there is lots of processing (e.g. word wrap)
+//  * Fix backspace when col=0 (e.g. bs to prev line)
+//  * Add word delete (CTRL+????)
+//  *
 
 
 const SPECIAL_KEY_MAP_DEFAULT = {
-    'line feed'		: [ 'return' ],
-    exit			: [ 'esc' ],
-    backspace		: [ 'backspace' ],
-    delete			: [ 'delete' ],
-    tab				: [ 'tab' ],
-    up				: [ 'up arrow' ],
-    down			: [ 'down arrow' ],
-    end				: [ 'end' ],
-    home			: [ 'home' ],
-    left			: [ 'left arrow' ],
-    right			: [ 'right arrow' ],
-    'delete line'	: [ 'ctrl + y' ],
-    'page up'		: [ 'page up' ],
-    'page down'		: [ 'page down' ],
-    insert			: [ 'insert', 'ctrl + v' ],
+    'line feed'     : [ 'return' ],
+    exit            : [ 'esc' ],
+    backspace       : [ 'backspace' ],
+    delete          : [ 'delete' ],
+    tab             : [ 'tab' ],
+    up              : [ 'up arrow' ],
+    down            : [ 'down arrow' ],
+    end             : [ 'end' ],
+    home            : [ 'home' ],
+    left            : [ 'left arrow' ],
+    right           : [ 'right arrow' ],
+    'delete line'   : [ 'ctrl + y' ],
+    'page up'       : [ 'page up' ],
+    'page down'     : [ 'page down' ],
+    insert          : [ 'insert', 'ctrl + v' ],
 };
 
-exports.MultiLineEditTextView	= MultiLineEditTextView;
+exports.MultiLineEditTextView   = MultiLineEditTextView;
 
 function MultiLineEditTextView(options) {
     if(!_.isBoolean(options.acceptsFocus)) {
@@ -100,18 +100,18 @@ function MultiLineEditTextView(options) {
     var self = this;
 
     //
-    //	ANSI seems to want tabs to default to 8 characters. See the following:
-    //	* http://www.ansi-bbs.org/ansi-bbs2/control_chars/
-    //	* http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
+    //  ANSI seems to want tabs to default to 8 characters. See the following:
+    //  * http://www.ansi-bbs.org/ansi-bbs2/control_chars/
+    //  * http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt
     //
-    //	This seems overkill though, so let's default to 4 :)
-    //	:TODO: what shoudl this really be? Maybe 8 is OK
+    //  This seems overkill though, so let's default to 4 :)
+    //  :TODO: what shoudl this really be? Maybe 8 is OK
     //
-    this.tabWidth			= _.isNumber(options.tabWidth) ? options.tabWidth : 4;
+    this.tabWidth           = _.isNumber(options.tabWidth) ? options.tabWidth : 4;
 
-    this.textLines			= [ ];
-    this.topVisibleIndex	= 0;
-    this.mode				= options.mode || 'edit';	//	edit | preview | read-only
+    this.textLines          = [ ];
+    this.topVisibleIndex    = 0;
+    this.mode               = options.mode || 'edit';   //  edit | preview | read-only
 
     if ('preview' === this.mode) {
         this.autoScroll = options.autoScroll || true;
@@ -121,10 +121,10 @@ function MultiLineEditTextView(options) {
         this.tabSwitchesView = options.tabSwitchesView || false;
     }
     //
-    //	cursorPos represents zero-based row, col positions
-    //	within the editor itself
+    //  cursorPos represents zero-based row, col positions
+    //  within the editor itself
     //
-    this.cursorPos			= { col : 0, row : 0 };
+    this.cursorPos          = { col : 0, row : 0 };
 
     this.getSGRFor = function(sgrFor) {
         return {
@@ -140,7 +140,7 @@ function MultiLineEditTextView(options) {
         return 'preview' === self.mode;
     };
 
-    //	:TODO: Most of the calls to this could be avoided via incrementRow(), decrementRow() that keeps track or such
+    //  :TODO: Most of the calls to this could be avoided via incrementRow(), decrementRow() that keeps track or such
     this.getTextLinesIndex = function(row) {
         if(!_.isNumber(row)) {
             row = self.cursorPos.row;
@@ -172,34 +172,34 @@ function MultiLineEditTextView(options) {
     this.redrawRows = function(startRow, endRow) {
         self.toggleTextCursor('hide');
 
-        const startIndex	= self.getTextLinesIndex(startRow);
-        const endIndex		= Math.min(self.getTextLinesIndex(endRow), self.textLines.length);
-        const absPos		= self.getAbsolutePosition(startRow, 0);
+        const startIndex    = self.getTextLinesIndex(startRow);
+        const endIndex      = Math.min(self.getTextLinesIndex(endRow), self.textLines.length);
+        const absPos        = self.getAbsolutePosition(startRow, 0);
 
         for(let i = startIndex; i < endIndex; ++i) {
             //${self.getSGRFor('text')}
             self.client.term.write(
                 `${ansi.goto(absPos.row++, absPos.col)}${self.getRenderText(i)}`,
-                false	//	convertLineFeeds
+                false   //  convertLineFeeds
             );
         }
 
         self.toggleTextCursor('show');
 
-        return absPos.row - self.position.row;	//	row we ended on
+        return absPos.row - self.position.row;  //  row we ended on
     };
 
     this.eraseRows = function(startRow, endRow) {
         self.toggleTextCursor('hide');
 
-        const absPos		= self.getAbsolutePosition(startRow, 0);
-        const absPosEnd		= self.getAbsolutePosition(endRow, 0);
-        const eraseFiller	= ' '.repeat(self.dimens.width);//new Array(self.dimens.width).join(' ');
+        const absPos        = self.getAbsolutePosition(startRow, 0);
+        const absPosEnd     = self.getAbsolutePosition(endRow, 0);
+        const eraseFiller   = ' '.repeat(self.dimens.width);//new Array(self.dimens.width).join(' ');
 
         while(absPos.row < absPosEnd.row) {
             self.client.term.write(
                 `${ansi.goto(absPos.row++, absPos.col)}${eraseFiller}`,
-                false	//	convertLineFeeds
+                false   //  convertLineFeeds
             );
         }
 
@@ -213,16 +213,16 @@ function MultiLineEditTextView(options) {
         self.eraseRows(lastRow, self.dimens.height);
         /*
 
-		//	:TOOD: create eraseRows(startRow, endRow)
-		if(lastRow < self.dimens.height) {
-			var absPos	= self.getAbsolutePosition(lastRow, 0);
-			var empty	= new Array(self.dimens.width).join(' ');
-			while(lastRow++ < self.dimens.height) {
-				self.client.term.write(ansi.goto(absPos.row++, absPos.col));
-				self.client.term.write(empty);
-			}
-		}
-		*/
+        //  :TOOD: create eraseRows(startRow, endRow)
+        if(lastRow < self.dimens.height) {
+            var absPos  = self.getAbsolutePosition(lastRow, 0);
+            var empty   = new Array(self.dimens.width).join(' ');
+            while(lastRow++ < self.dimens.height) {
+                self.client.term.write(ansi.goto(absPos.row++, absPos.col));
+                self.client.term.write(empty);
+            }
+        }
+        */
     };
 
     this.getVisibleText = function(index) {
@@ -262,12 +262,12 @@ function MultiLineEditTextView(options) {
     };
 
     this.getRenderText = function(index) {
-        let text 		= self.getVisibleText(index);
-        const remain	= self.dimens.width - text.length;
+        let text        = self.getVisibleText(index);
+        const remain    = self.dimens.width - text.length;
 
         if(remain > 0) {
             text += ' '.repeat(remain + 1);
-            //			text += new Array(remain + 1).join(' ');
+            //          text += new Array(remain + 1).join(' ');
         }
 
         return text;
@@ -278,15 +278,15 @@ function MultiLineEditTextView(options) {
         if(startIndex === endIndex) {
             lines = [ self.textLines[startIndex] ];
         } else {
-            lines = self.textLines.slice(startIndex, endIndex + 1);	//	"slice extracts up to but not including end."
+            lines = self.textLines.slice(startIndex, endIndex + 1); //  "slice extracts up to but not including end."
         }
         return lines;
     };
 
     this.getOutputText = function(startIndex, endIndex, eolMarker, options) {
-        const lines	= self.getTextLines(startIndex, endIndex);
-        let text	= '';
-        const re	= new RegExp('\\t{1,' + (self.tabWidth) + '}', 'g');
+        const lines = self.getTextLines(startIndex, endIndex);
+        let text    = '';
+        const re    = new RegExp('\\t{1,' + (self.tabWidth) + '}', 'g');
 
         lines.forEach(line => {
             text += line.text.replace(re, '\t');
@@ -317,28 +317,28 @@ function MultiLineEditTextView(options) {
     };
 
     /*
-	this.editTextAtPosition = function(editAction, text, index, col) {
-		switch(editAction) {
-			case 'insert' :
-				self.insertCharactersInText(text, index, col);
-				break;
+    this.editTextAtPosition = function(editAction, text, index, col) {
+        switch(editAction) {
+            case 'insert' :
+                self.insertCharactersInText(text, index, col);
+                break;
 
-			case 'deleteForward' :
-				break;
+            case 'deleteForward' :
+                break;
 
-			case 'deleteBack' :
-				break;
+            case 'deleteBack' :
+                break;
 
-			case 'replace' :
-				break;
-		}
-	};
-	*/
+            case 'replace' :
+                break;
+        }
+    };
+    */
 
     this.updateTextWordWrap = function(index) {
-        const nextEolIndex	= self.getNextEndOfLineIndex(index);
-        const wrapped		= self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
-        const newLines		= wrapped.wrapped.map(l => { return { text : l }; } );
+        const nextEolIndex  = self.getNextEndOfLineIndex(index);
+        const wrapped       = self.wordWrapSingleLine(self.getContiguousText(index, nextEolIndex), 'tabsIntact');
+        const newLines      = wrapped.wrapped.map(l => { return { text : l }; } );
 
         newLines[newLines.length - 1].eol = true;
 
@@ -352,17 +352,17 @@ function MultiLineEditTextView(options) {
     this.removeCharactersFromText = function(index, col, operation, count) {
         if('delete' === operation) {
             self.textLines[index].text =
-				self.textLines[index].text.slice(0, col) +
-				self.textLines[index].text.slice(col + count);
+                self.textLines[index].text.slice(0, col) +
+                self.textLines[index].text.slice(col + count);
 
             self.updateTextWordWrap(index);
             self.redrawRows(self.cursorPos.row, self.dimens.height);
             self.moveClientCursorToCursorPos();
         } else if ('backspace' === operation) {
-            //	:TODO: method for splicing text
+            //  :TODO: method for splicing text
             self.textLines[index].text =
-				self.textLines[index].text.slice(0, col - (count - 1)) +
-				self.textLines[index].text.slice(col + 1);
+                self.textLines[index].text.slice(0, col - (count - 1)) +
+                self.textLines[index].text.slice(col + 1);
 
             self.cursorPos.col -= (count - 1);
 
@@ -372,14 +372,14 @@ function MultiLineEditTextView(options) {
             self.moveClientCursorToCursorPos();
         } else if('delete line' === operation) {
             //
-            //	Delete a visible line. Note that this is *not* the "physical" line, or
-            //	1:n entries up to eol! This is to keep consistency with home/end, and
-            //	some other text editors such as nano. Sublime for example want to
-            //	treat all of these things using the physical approach, but this seems
-            //	a bit odd in this context.
+            //  Delete a visible line. Note that this is *not* the "physical" line, or
+            //  1:n entries up to eol! This is to keep consistency with home/end, and
+            //  some other text editors such as nano. Sublime for example want to
+            //  treat all of these things using the physical approach, but this seems
+            //  a bit odd in this context.
             //
-            var isLastLine	= (index === self.textLines.length - 1);
-            var hadEol		= self.textLines[index].eol;
+            var isLastLine  = (index === self.textLines.length - 1);
+            var hadEol      = self.textLines[index].eol;
 
             self.textLines.splice(index, 1);
             if(hadEol && self.textLines.length > index && !self.textLines[index].eol) {
@@ -387,11 +387,11 @@ function MultiLineEditTextView(options) {
             }
 
             //
-            //	Create a empty edit buffer if necessary
-            //	:TODO: Make this a method
+            //  Create a empty edit buffer if necessary
+            //  :TODO: Make this a method
             if(self.textLines.length < 1) {
                 self.textLines = [ { text : '', eol : true } ];
-                isLastLine = false;	//	resetting
+                isLastLine = false; //  resetting
             }
 
             self.cursorPos.col = 0;
@@ -400,7 +400,7 @@ function MultiLineEditTextView(options) {
             self.eraseRows(lastRow, self.dimens.height);
 
             //
-            //	If we just deleted the last line in the buffer, move up
+            //  If we just deleted the last line in the buffer, move up
             //
             if(isLastLine) {
                 self.cursorEndOfPreviousLine();
@@ -411,8 +411,8 @@ function MultiLineEditTextView(options) {
     };
 
     this.insertCharactersInText = function(c, index, col) {
-        const prevTextLength	= self.getTextLength(index);
-        let editingEol			= self.cursorPos.col === prevTextLength;
+        const prevTextLength    = self.getTextLength(index);
+        let editingEol          = self.cursorPos.col === prevTextLength;
 
         self.textLines[index].text = [
             self.textLines[index].text.slice(0, col),
@@ -424,43 +424,43 @@ function MultiLineEditTextView(options) {
 
         if(self.getTextLength(index) > self.dimens.width) {
             //
-            //	Update word wrapping and |cursorOffset| if the cursor
-            //	was within the bounds of the wrapped text
+            //  Update word wrapping and |cursorOffset| if the cursor
+            //  was within the bounds of the wrapped text
             //
             let cursorOffset;
-            const lastCol			= self.cursorPos.col - c.length;
-            const firstWrapRange	= self.updateTextWordWrap(index);
+            const lastCol           = self.cursorPos.col - c.length;
+            const firstWrapRange    = self.updateTextWordWrap(index);
             if(lastCol >= firstWrapRange.start && lastCol <= firstWrapRange.end) {
                 cursorOffset = self.cursorPos.col - firstWrapRange.start;
-                editingEol = true; 	//override
+                editingEol = true;  //override
             } else {
                 cursorOffset = firstWrapRange.end;
             }
 
-            //	redraw from current row to end of visible area
+            //  redraw from current row to end of visible area
             self.redrawRows(self.cursorPos.row, self.dimens.height);
 
-            //	If we're editing mid, we're done here. Else, we need to
-            //	move the cursor to the new editing position after a wrap
+            //  If we're editing mid, we're done here. Else, we need to
+            //  move the cursor to the new editing position after a wrap
             if(editingEol) {
                 self.cursorBeginOfNextLine();
                 self.cursorPos.col += cursorOffset;
                 self.client.term.rawWrite(ansi.right(cursorOffset));
             } else {
-                //	adjust cursor after drawing new rows
+                //  adjust cursor after drawing new rows
                 const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
                 self.client.term.rawWrite(ansi.goto(absPos.row, absPos.col));
             }
         } else {
             //
-            //	We must only redraw from col -> end of current visible line
+            //  We must only redraw from col -> end of current visible line
             //
             const absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
             const renderText = self.getRenderText(index).slice(self.cursorPos.col - c.length);
 
             self.client.term.write(
                 `${ansi.hideCursor()}${self.getSGRFor('text')}${renderText}${ansi.goto(absPos.row, absPos.col)}${ansi.showCursor()}`,
-                false	//	convertLineFeeds
+                false   //  convertLineFeeds
             );
         }
     };
@@ -502,24 +502,24 @@ function MultiLineEditTextView(options) {
         return wordWrapText(
             line,
             {
-                width		: self.dimens.width,
-                tabHandling	: tabHandling,
-                tabWidth	: self.tabWidth,
-                tabChar		: '\t',
+                width       : self.dimens.width,
+                tabHandling : tabHandling,
+                tabWidth    : self.tabWidth,
+                tabChar     : '\t',
             }
         );
     };
 
     this.setTextLines = function(lines, index, termWithEol) {
         if(0 === index && (0 === self.textLines.length || (self.textLines.length === 1 && '' === self.textLines[0].text) )) {
-            //	quick path: just set the things
+            //  quick path: just set the things
             self.textLines = lines.slice(0, -1).map(l => {
                 return { text : l };
             }).concat( { text : lines[lines.length - 1], eol : termWithEol } );
         } else {
-            //	insert somewhere in textLines...
+            //  insert somewhere in textLines...
             if(index > self.textLines.length) {
-                //	fill with empty
+                //  fill with empty
                 self.textLines.splice(
                     self.textLines.length,
                     0,
@@ -547,7 +547,7 @@ function MultiLineEditTextView(options) {
             let index = 0;
 
             text.forEach(line => {
-                self.setTextLines( [ line ], index, true);	//	true=termWithEol
+                self.setTextLines( [ line ], index, true);  //  true=termWithEol
                 index += 1;
             });
 
@@ -565,12 +565,12 @@ function MultiLineEditTextView(options) {
         ansiPrep(
             ansi,
             {
-                termWidth			: this.client.term.termWidth,
-                termHeight			: this.client.term.termHeight,
-                cols				: this.dimens.width,
-                rows				: 'auto',
-                startCol			: this.position.col,
-                forceLineTerm		: options.forceLineTerm,
+                termWidth           : this.client.term.termWidth,
+                termHeight          : this.client.term.termHeight,
+                cols                : this.dimens.width,
+                rows                : 'auto',
+                startCol            : this.position.col,
+                forceLineTerm       : options.forceLineTerm,
             },
             (err, preppedAnsi) => {
                 return setLines(err ? ansi : preppedAnsi);
@@ -580,31 +580,31 @@ function MultiLineEditTextView(options) {
 
     this.insertRawText = function(text, index, col) {
         //
-        //	Perform the following on |text|:
-        //	*	Normalize various line feed formats -> \n
-        //	*	Remove some control characters (e.g. \b)
-        //	*	Word wrap lines such that they fit in the visible workspace.
-        //		Each actual line will then take 1:n elements in textLines[].
-        //	*	Each tab will be appropriately expanded and take 1:n \t
-        //		characters. This allows us to know when we're in tab space
-        //		when doing cursor movement/etc.
+        //  Perform the following on |text|:
+        //  *   Normalize various line feed formats -> \n
+        //  *   Remove some control characters (e.g. \b)
+        //  *   Word wrap lines such that they fit in the visible workspace.
+        //      Each actual line will then take 1:n elements in textLines[].
+        //  *   Each tab will be appropriately expanded and take 1:n \t
+        //      characters. This allows us to know when we're in tab space
+        //      when doing cursor movement/etc.
         //
         //
-        //	Try to handle any possible newline that can be fed to us.
-        //	See http://stackoverflow.com/questions/5034781/js-regex-to-split-by-line
+        //  Try to handle any possible newline that can be fed to us.
+        //  See http://stackoverflow.com/questions/5034781/js-regex-to-split-by-line
         //
-        //	:TODO: support index/col insertion point
+        //  :TODO: support index/col insertion point
 
         if(_.isNumber(index)) {
             if(_.isNumber(col)) {
                 //
-                //	Modify text to have information from index
-                //	before and and after column
+                //  Modify text to have information from index
+                //  before and and after column
                 //
-                //	:TODO: Need to clean this string (e.g. collapse tabs)
+                //  :TODO: Need to clean this string (e.g. collapse tabs)
                 text = self.textLines;
 
-                //	:TODO: Remove original line @ index
+                //  :TODO: Remove original line @ index
             }
         } else {
             index = self.textLines.length;
@@ -616,7 +616,7 @@ function MultiLineEditTextView(options) {
         text.forEach(line => {
             wrapped = self.wordWrapSingleLine(line, 'expand').wrapped;
 
-            self.setTextLines(wrapped, index, true);	//	true=termWithEol
+            self.setTextLines(wrapped, index, true);    //  true=termWithEol
             index += wrapped.length;
         });
     };
@@ -638,16 +638,16 @@ function MultiLineEditTextView(options) {
         var index = self.getTextLinesIndex();
 
         //
-        //	:TODO: stuff that needs to happen
-        //	* Break up into smaller methods
-        //	* Even in overtype mode, word wrapping must apply if past bounds
-        //	* A lot of this can be used for backspacing also
-        //	* See how Sublime treats tabs in *non* overtype mode... just overwrite them?
+        //  :TODO: stuff that needs to happen
+        //  * Break up into smaller methods
+        //  * Even in overtype mode, word wrapping must apply if past bounds
+        //  * A lot of this can be used for backspacing also
+        //  * See how Sublime treats tabs in *non* overtype mode... just overwrite them?
         //
         //
 
         if(self.overtypeMode) {
-            //	:TODO: special handing for insert over eol mark?
+            //  :TODO: special handing for insert over eol mark?
             self.replaceCharacterInText(c, index, self.cursorPos.col);
             self.cursorPos.col++;
             self.client.term.write(c);
@@ -754,7 +754,7 @@ function MultiLineEditTextView(options) {
             self.adjustCursorIfPastEndOfLine(true);
         } else {
             self.cursorPos.row = 0;
-            self.moveClientCursorToCursorPos();	//	:TODO: ajust if eol, etc.
+            self.moveClientCursorToCursorPos(); //  :TODO: ajust if eol, etc.
         }
 
         self.emitEditPosition();
@@ -773,13 +773,13 @@ function MultiLineEditTextView(options) {
 
     this.keyPressLineFeed = function() {
         //
-        //	Break up text from cursor position, redraw, and update cursor
-        //	position to start of next line
+        //  Break up text from cursor position, redraw, and update cursor
+        //  position to start of next line
         //
-        var index			= self.getTextLinesIndex();
-        var nextEolIndex	= self.getNextEndOfLineIndex(index);
-        var text			= self.getContiguousText(index, nextEolIndex);
-        const newLines		= self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
+        var index           = self.getTextLinesIndex();
+        var nextEolIndex    = self.getNextEndOfLineIndex(index);
+        var text            = self.getContiguousText(index, nextEolIndex);
+        const newLines      = self.wordWrapSingleLine(text.slice(self.cursorPos.col), 'tabsIntact').wrapped;
 
         newLines.unshift( { text : text.slice(0, self.cursorPos.col), eol : true } );
         for(var i = 1; i < newLines.length; ++i) {
@@ -791,7 +791,7 @@ function MultiLineEditTextView(options) {
             self.textLines,
             [ index, (nextEolIndex - index) + 1 ].concat(newLines));
 
-        //	redraw from current row to end of visible area
+        //  redraw from current row to end of visible area
         self.redrawRows(self.cursorPos.row, self.dimens.height);
         self.cursorBeginOfNextLine();
 
@@ -812,8 +812,8 @@ function MultiLineEditTextView(options) {
     this.keyPressBackspace = function() {
         if(self.cursorPos.col >= 1) {
             //
-            //	Don't want to delete character at cursor, but rather the character
-            //	to the left of the cursor!
+            //  Don't want to delete character at cursor, but rather the character
+            //  to the left of the cursor!
             //
             self.cursorPos.col -= 1;
 
@@ -842,12 +842,12 @@ function MultiLineEditTextView(options) {
                 count);
         } else {
             //
-            //	Delete character at end of line previous.
-            //	* This may be a eol marker
-            //	* Word wrapping will need re-applied
+            //  Delete character at end of line previous.
+            //  * This may be a eol marker
+            //  * Word wrapping will need re-applied
             //
-            //	:TODO: apply word wrapping such that text can be re-adjusted if it can now fit on prev
-            self.keyPressLeft();	//	same as hitting left - jump to previous line
+            //  :TODO: apply word wrapping such that text can be re-adjusted if it can now fit on prev
+            self.keyPressLeft();    //  same as hitting left - jump to previous line
             //self.keyPressBackspace();
         }
 
@@ -859,7 +859,7 @@ function MultiLineEditTextView(options) {
 
         if(0 === self.cursorPos.col && 0 === self.textLines[lineIndex].text.length && self.textLines.length > 0) {
             //
-            //	Start of line and nothing left. Just delete the line
+            //  Start of line and nothing left. Just delete the line
             //
             self.removeCharactersFromText(
                 lineIndex,
@@ -906,7 +906,7 @@ function MultiLineEditTextView(options) {
             var move;
             switch(direction) {
                 //
-                //	Next tabstop to the right
+                //  Next tabstop to the right
                 //
                 case 'right' :
                     move = self.getNextTabStop(self.cursorPos.col) - self.cursorPos.col;
@@ -915,7 +915,7 @@ function MultiLineEditTextView(options) {
                     break;
 
                     //
-                    //	Next tabstop to the left
+                    //  Next tabstop to the left
                     //
                 case 'left' :
                     move = self.cursorPos.col - self.getPrevTabStop(self.cursorPos.col);
@@ -926,7 +926,7 @@ function MultiLineEditTextView(options) {
                 case 'up' :
                 case 'down' :
                     //
-                    //	Jump to the tabstop nearest the cursor
+                    //  Jump to the tabstop nearest the cursor
                     //
                     var newCol = self.tabStops.reduce(function r(prev, curr) {
                         return (Math.abs(curr - self.cursorPos.col) < Math.abs(prev - self.cursorPos.col) ? curr : prev);
@@ -946,43 +946,43 @@ function MultiLineEditTextView(options) {
 
             return true;
         }
-        return false;	//	did not fall on a tab
+        return false;   //  did not fall on a tab
     };
 
     this.cursorStartOfDocument = function() {
-        self.topVisibleIndex	= 0;
-        self.cursorPos			= { row : 0, col : 0 };
+        self.topVisibleIndex    = 0;
+        self.cursorPos          = { row : 0, col : 0 };
 
         self.redraw();
         self.moveClientCursorToCursorPos();
     };
 
     this.cursorEndOfDocument = function() {
-        self.topVisibleIndex	= Math.max(self.textLines.length - self.dimens.height, 0);
-        self.cursorPos.row		= (self.textLines.length - self.topVisibleIndex) - 1;
-        self.cursorPos.col		= self.getTextEndOfLineColumn();
+        self.topVisibleIndex    = Math.max(self.textLines.length - self.dimens.height, 0);
+        self.cursorPos.row      = (self.textLines.length - self.topVisibleIndex) - 1;
+        self.cursorPos.col      = self.getTextEndOfLineColumn();
 
         self.redraw();
         self.moveClientCursorToCursorPos();
     };
 
     this.cursorBeginOfNextLine = function() {
-        //	e.g. when scrolling right past eol
+        //  e.g. when scrolling right past eol
         var linesBelow = self.getRemainingLinesBelowRow();
 
         if(linesBelow > 0) {
-            var lastVisibleRow	= Math.min(self.dimens.height, self.textLines.length) - 1;
+            var lastVisibleRow  = Math.min(self.dimens.height, self.textLines.length) - 1;
             if(self.cursorPos.row < lastVisibleRow) {
                 self.cursorPos.row++;
             } else {
                 self.scrollDocumentUp();
             }
-            self.keyPressHome();	//	same as pressing 'home'
+            self.keyPressHome();    //  same as pressing 'home'
         }
     };
 
     this.cursorEndOfPreviousLine = function() {
-        //	e.g. when scrolling left past start of line
+        //  e.g. when scrolling left past start of line
         var moveToEnd;
         if(self.cursorPos.row > 0) {
             self.cursorPos.row--;
@@ -993,30 +993,30 @@ function MultiLineEditTextView(options) {
         }
 
         if(moveToEnd) {
-            self.keyPressEnd();	//	same as pressing 'end'
+            self.keyPressEnd(); //  same as pressing 'end'
         }
     };
 
     /*
-	this.cusorEndOfNextLine = function() {
-		var linesBelow = self.getRemainingLinesBelowRow();
+    this.cusorEndOfNextLine = function() {
+        var linesBelow = self.getRemainingLinesBelowRow();
 
-		if(linesBelow > 0) {
-			var lastVisibleRow = Math.min(self.dimens.height, self.textLines.length) - 1;
-			if(self.cursorPos.row < lastVisibleRow) {
-				self.cursorPos.row++;
-			} else {
-				self.scrollDocumentUp();
-			}
-			self.keyPressEnd();	//	same as pressing 'end'
-		}
-	};
-	*/
+        if(linesBelow > 0) {
+            var lastVisibleRow = Math.min(self.dimens.height, self.textLines.length) - 1;
+            if(self.cursorPos.row < lastVisibleRow) {
+                self.cursorPos.row++;
+            } else {
+                self.scrollDocumentUp();
+            }
+            self.keyPressEnd(); //  same as pressing 'end'
+        }
+    };
+    */
 
     this.scrollDocumentUp = function() {
         //
-        //	Note: We scroll *up* when the cursor goes *down* beyond
-        //	the visible area!
+        //  Note: We scroll *up* when the cursor goes *down* beyond
+        //  the visible area!
         //
         var linesBelow = self.getRemainingLinesBelowRow();
         if(linesBelow > 0) {
@@ -1027,8 +1027,8 @@ function MultiLineEditTextView(options) {
 
     this.scrollDocumentDown = function() {
         //
-        //	Note: We scroll *down* when the cursor goes *up* beyond
-        //	the visible area!
+        //  Note: We scroll *down* when the cursor goes *up* beyond
+        //  the visible area!
         //
         if(self.topVisibleIndex > 0) {
             self.topVisibleIndex--;
@@ -1037,7 +1037,7 @@ function MultiLineEditTextView(options) {
     };
 
     this.emitEditPosition = function() {
-        self.emit('edit position', 	self.getEditPosition());
+        self.emit('edit position',  self.getEditPosition());
     };
 
     this.toggleTextEditMode = function() {
@@ -1045,7 +1045,7 @@ function MultiLineEditTextView(options) {
         self.emit('text edit mode', self.getTextEditMode());
     };
 
-    this.insertRawText('');	//	init to blank/empty
+    this.insertRawText(''); //  init to blank/empty
 }
 
 require('util').inherits(MultiLineEditTextView, View);
@@ -1074,11 +1074,11 @@ MultiLineEditTextView.prototype.setText = function(text, options = { scrollMode
     this.addText(text, options);
     /*this.insertRawText(text);
 
-	if(this.isEditMode()) {
-		this.cursorEndOfDocument();
-	} else if(this.isPreviewMode()) {
-		this.cursorStartOfDocument();
-	}*/
+    if(this.isEditMode()) {
+        this.cursorEndOfDocument();
+    } else if(this.isPreviewMode()) {
+        this.cursorStartOfDocument();
+    }*/
 };
 
 MultiLineEditTextView.prototype.setAnsi = function(ansi, options = { prepped : false }, cb) {
@@ -1116,14 +1116,14 @@ MultiLineEditTextView.prototype.getData = function(options = { forceLineTerms :
 
 MultiLineEditTextView.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
-        case 'mode'			:
+        case 'mode'         :
             this.mode = value;
             if('preview' === value && !this.specialKeyMap.next) {
                 this.specialKeyMap.next = [ 'tab' ];
             }
             break;
 
-        case 'autoScroll'	:
+        case 'autoScroll'   :
             this.autoScroll = value;
             break;
 
@@ -1205,9 +1205,9 @@ MultiLineEditTextView.prototype.getEditPosition = function() {
     var currentIndex = this.getTextLinesIndex() + 1;
 
     return {
-        row		: this.getTextLinesIndex(this.cursorPos.row),
-        col 	: this.cursorPos.col,
-        percent	: Math.floor(((currentIndex / this.textLines.length) * 100)),
-        below	: this.getRemainingLinesBelowRow(),
+        row     : this.getTextLinesIndex(this.cursorPos.row),
+        col     : this.cursorPos.col,
+        percent : Math.floor(((currentIndex / this.textLines.length) * 100)),
+        below   : this.getRemainingLinesBelowRow(),
     };
 };
diff --git a/core/new_scan.js b/core/new_scan.js
index b84eab52..974519af 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -1,24 +1,24 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const msgArea						= require('./message_area.js');
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const stringFormat					= require('./string_format.js');
-const FileEntry						= require('./file_entry.js');
-const FileBaseFilters				= require('./file_base_filter.js');
-const Errors						= require('./enig_error.js').Errors;
-const { getAvailableFileAreaTags }	= require('./file_base_area.js');
+//  ENiGMA½
+const msgArea                       = require('./message_area.js');
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const stringFormat                  = require('./string_format.js');
+const FileEntry                     = require('./file_entry.js');
+const FileBaseFilters               = require('./file_base_filter.js');
+const Errors                        = require('./enig_error.js').Errors;
+const { getAvailableFileAreaTags }  = require('./file_base_area.js');
 
-//	deps
-const _					= require('lodash');
-const async				= require('async');
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
 
 exports.moduleInfo = {
-    name		: 'New Scan',
-    desc		: 'Performs a new scan against various areas of the system',
-    author		: 'NuSkooler',
+    name        : 'New Scan',
+    desc        : 'Performs a new scan against various areas of the system',
+    author      : 'NuSkooler',
 };
 
 /*
@@ -30,15 +30,15 @@ exports.moduleInfo = {
 */
 
 const MciCodeIds = {
-    ScanStatusLabel	: 1,	//	TL1
-    ScanStatusList	: 2,	//	VM2 (appends)
+    ScanStatusLabel : 1,    //  TL1
+    ScanStatusList  : 2,    //  VM2 (appends)
 };
 
 const Steps = {
-    MessageConfs	: 'messageConferences',
-    FileBase		: 'fileBase',
+    MessageConfs    : 'messageConferences',
+    FileBase        : 'fileBase',
 
-    Finished		: 'finished',
+    Finished        : 'finished',
 };
 
 exports.getModule = class NewScanModule extends MenuModule {
@@ -46,17 +46,17 @@ exports.getModule = class NewScanModule extends MenuModule {
         super(options);
 
 
-        this.newScanFullExit	= _.get(options, 'lastMenuResult.fullExit', false);
+        this.newScanFullExit    = _.get(options, 'lastMenuResult.fullExit', false);
 
-        this.currentStep		= Steps.MessageConfs;
-        this.currentScanAux		= {};
+        this.currentStep        = Steps.MessageConfs;
+        this.currentScanAux     = {};
 
         //  :TODO: Make this conf/area specific:
-        const config			= this.menuConfig.config;
-        this.scanStartFmt		= config.scanStartFmt || 'Scanning {confName} - {areaName}...';
-        this.scanFinishNoneFmt	= config.scanFinishNoneFmt || 'Nothing new';
-        this.scanFinishNewFmt	= config.scanFinishNewFmt || '{count} entries found';
-        this.scanCompleteMsg	= config.scanCompleteMsg || 'Finished newscan';
+        const config            = this.menuConfig.config;
+        this.scanStartFmt       = config.scanStartFmt || 'Scanning {confName} - {areaName}...';
+        this.scanFinishNoneFmt  = config.scanFinishNoneFmt || 'Nothing new';
+        this.scanFinishNewFmt   = config.scanFinishNewFmt || '{count} entries found';
+        this.scanCompleteMsg    = config.scanCompleteMsg || 'Finished newscan';
     }
 
     updateScanStatus(statusText) {
@@ -76,9 +76,9 @@ exports.getModule = class NewScanModule extends MenuModule {
             });
 
             //
-            //	Sort conferences by name, other than 'system_internal' which should
-            //	always come first such that we display private mails/etc. before
-            //	other conferences & areas
+            //  Sort conferences by name, other than 'system_internal' which should
+            //  always come first such that we display private mails/etc. before
+            //  other conferences & areas
             //
             this.sortedMessageConfs.sort((a, b) => {
                 if('system_internal' === a.confTag) {
@@ -110,23 +110,23 @@ exports.getModule = class NewScanModule extends MenuModule {
     newScanMessageArea(conf, cb) {
         //  :TODO: it would be nice to cache this - must be done by conf!
         const sortedAreas   = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } );
-        const currentArea	= sortedAreas[this.currentScanAux.area];
+        const currentArea   = sortedAreas[this.currentScanAux.area];
 
         //
-        //	Scan and update index until we find something. If results are found,
-        //	we'll goto the list module & show them.
+        //  Scan and update index until we find something. If results are found,
+        //  we'll goto the list module & show them.
         //
         const self = this;
         async.waterfall(
             [
                 function checkAndUpdateIndex(callback) {
-                    //	Advance to next area if possible
+                    //  Advance to next area if possible
                     if(sortedAreas.length >= self.currentScanAux.area + 1) {
                         self.currentScanAux.area += 1;
                         return callback(null);
                     } else {
                         self.updateScanStatus(self.scanCompleteMsg);
-                        return callback(Errors.DoesNotExist('No more areas'));	//	this will stop our scan
+                        return callback(Errors.DoesNotExist('No more areas'));  //  this will stop our scan
                     }
                 },
                 function updateStatusScanStarted(callback) {
@@ -147,7 +147,7 @@ exports.getModule = class NewScanModule extends MenuModule {
                 },
                 function displayMessageList(newMessageCount) {
                     if(newMessageCount <= 0) {
-                        return self.newScanMessageArea(conf, cb);	//	next area, if any
+                        return self.newScanMessageArea(conf, cb);   //  next area, if any
                     }
 
                     const nextModuleOpts = {
@@ -166,11 +166,11 @@ exports.getModule = class NewScanModule extends MenuModule {
     }
 
     newScanFileBase(cb) {
-        //	:TODO: add in steps
+        //  :TODO: add in steps
         const filterCriteria = {
             newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
-            areaTag			: getAvailableFileAreaTags(this.client),
-            order			: 'ascending',	//	oldest first
+            areaTag         : getAvailableFileAreaTags(this.client),
+            order           : 'ascending',  //  oldest first
         };
 
         FileEntry.findFiles(
@@ -195,14 +195,14 @@ exports.getModule = class NewScanModule extends MenuModule {
 
     getSaveState() {
         return {
-            currentStep 	: this.currentStep,
-            currentScanAux	: this.currentScanAux,
+            currentStep     : this.currentStep,
+            currentScanAux  : this.currentScanAux,
         };
     }
 
     restoreSavedState(savedState) {
-        this.currentStep 	= savedState.currentStep;
-        this.currentScanAux	= savedState.currentScanAux;
+        this.currentStep    = savedState.currentStep;
+        this.currentScanAux = savedState.currentScanAux;
     }
 
     performScanCurrentStep(cb) {
@@ -227,7 +227,7 @@ exports.getModule = class NewScanModule extends MenuModule {
 
     mciReady(mciData, cb) {
         if(this.newScanFullExit) {
-            //	user has canceled the entire scan @ message list view
+            //  user has canceled the entire scan @ message list view
             return cb(null);
         }
 
@@ -236,18 +236,18 @@ exports.getModule = class NewScanModule extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.allViews = new ViewController( { client : self.client } );
 
-            //	:TODO: display scan step/etc.
+            //  :TODO: display scan step/etc.
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu,
-                            noInput			: true,
+                            callingMenu     : self,
+                            mciMap          : mciData.menu,
+                            noInput         : true,
                         };
 
                         vc.loadFromMenuConfig(loadOpts, callback);
diff --git a/core/nua.js b/core/nua.js
index 011ad943..7eafe16d 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -1,24 +1,24 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule	= require('./menu_module.js').MenuModule;
-const User			= require('./user.js');
-const theme			= require('./theme.js');
-const login			= require('./system_menu_method.js').login;
-const Config		= require('./config.js').get;
-const messageArea	= require('./message_area.js');
+//  ENiGMA½
+const MenuModule    = require('./menu_module.js').MenuModule;
+const User          = require('./user.js');
+const theme         = require('./theme.js');
+const login         = require('./system_menu_method.js').login;
+const Config        = require('./config.js').get;
+const messageArea   = require('./message_area.js');
 
 exports.moduleInfo = {
-    name	: 'NUA',
-    desc	: 'New User Application',
+    name    : 'NUA',
+    desc    : 'New User Application',
 };
 
 const MciViewIds = {
-    userName	: 1,
-    password	: 9,
-    confirm		: 10,
-    errMsg		: 11,
+    userName    : 1,
+    password    : 9,
+    confirm     : 10,
+    errMsg      : 11,
 };
 
 exports.getModule = class NewUserAppModule extends MenuModule {
@@ -30,7 +30,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 
         this.menuMethods = {
             //
-            //	Validation stuff
+            //  Validation stuff
             //
             validatePassConfirmMatch : function(data, cb) {
                 const passwordView = self.viewControllers.menu.getView(MciViewIds.password);
@@ -58,7 +58,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 
 
             //
-            //	Submit handlers
+            //  Submit handlers
             //
             submitApplication : function(formData, extraArgs, cb) {
                 const newUser = new User();
@@ -67,33 +67,33 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                 newUser.username = formData.value.username;
 
                 //
-                //	We have to disable ACS checks for initial default areas as the user is not yet ready
+                //  We have to disable ACS checks for initial default areas as the user is not yet ready
                 //
-                let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
-                let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
+                let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);                //  true=disableAcsCheck
+                let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);    //  true=disableAcsCheck
 
                 //  can't store undefined!
                 confTag = confTag || '';
                 areaTag = areaTag || '';
 
                 newUser.properties = {
-                    real_name			: formData.value.realName,
-                    birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(), 	//	:TODO: Use moment & explicit ISO string format
-                    sex					: formData.value.sex,
-                    location			: formData.value.location,
-                    affiliation			: formData.value.affils,
-                    email_address		: formData.value.email,
-                    web_address			: formData.value.web,
-                    account_created		: new Date().toISOString(),	//	:TODO: Use moment & explicit ISO string format
+                    real_name           : formData.value.realName,
+                    birthdate           : new Date(Date.parse(formData.value.birthdate)).toISOString(),     //  :TODO: Use moment & explicit ISO string format
+                    sex                 : formData.value.sex,
+                    location            : formData.value.location,
+                    affiliation         : formData.value.affils,
+                    email_address       : formData.value.email,
+                    web_address         : formData.value.web,
+                    account_created     : new Date().toISOString(), //  :TODO: Use moment & explicit ISO string format
 
                     message_conf_tag    : confTag,
                     message_area_tag    : areaTag,
 
-                    term_height			: self.client.term.termHeight,
-                    term_width			: self.client.term.termWidth,
+                    term_height         : self.client.term.termHeight,
+                    term_width          : self.client.term.termWidth,
 
-                    //	:TODO: Other defaults
-                    //	:TODO: should probably have a place to create defaults/etc.
+                    //  :TODO: Other defaults
+                    //  :TODO: should probably have a place to create defaults/etc.
                 };
 
                 if('*' === config.defaults.theme) {
@@ -102,7 +102,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                     newUser.properties.theme_id = config.defaults.theme;
                 }
 
-                //	:TODO: User.create() should validate email uniqueness!
+                //  :TODO: User.create() should validate email uniqueness!
                 newUser.create(formData.value.password, err => {
                     if(err) {
                         self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
@@ -116,12 +116,12 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                     } else {
                         self.client.log.info( { username : formData.value.username, userId : newUser.userId }, 'New user created');
 
-                        //	Cache SysOp information now
-                        //	:TODO: Similar to bbs.js. DRY
+                        //  Cache SysOp information now
+                        //  :TODO: Similar to bbs.js. DRY
                         if(newUser.isSysOp()) {
                             config.general.sysOp = {
-                                username	: formData.value.username,
-                                properties	: newUser.properties,
+                                username    : formData.value.username,
+                                properties  : newUser.properties,
                             };
                         }
 
@@ -129,7 +129,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                             return self.gotoMenu(extraArgs.inactive, cb);
                         } else {
                             //
-                            //	If active now, we need to call login() to authenticate
+                            //  If active now, we need to call login() to authenticate
                             //
                             return login(self, formData, extraArgs, cb);
                         }
diff --git a/core/onelinerz.js b/core/onelinerz.js
index d54d7f4f..2a917ad2 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -1,56 +1,56 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
 
 const {
     getModDatabasePath,
     getTransactionDatabase
-}							= require('./database.js');
+}                           = require('./database.js');
 
-const ViewController		= require('./view_controller.js').ViewController;
-const theme					= require('./theme.js');
-const ansi					= require('./ansi_term.js');
-const stringFormat			= require('./string_format.js');
+const ViewController        = require('./view_controller.js').ViewController;
+const theme                 = require('./theme.js');
+const ansi                  = require('./ansi_term.js');
+const stringFormat          = require('./string_format.js');
 
-//	deps
-const sqlite3				= require('sqlite3');
-const async					= require('async');
-const _						= require('lodash');
-const moment				= require('moment');
+//  deps
+const sqlite3               = require('sqlite3');
+const async                 = require('async');
+const _                     = require('lodash');
+const moment                = require('moment');
 
 /*
-	Module :TODO:
-	* Add pipe code support
-		- override max length & monitor *display* len as user types in order to allow for actual display len with color
-	* Add preview control: Shows preview with pipe codes resolved
-	* Add ability to at least alternate formatStrings -- every other
+    Module :TODO:
+    * Add pipe code support
+        - override max length & monitor *display* len as user types in order to allow for actual display len with color
+    * Add preview control: Shows preview with pipe codes resolved
+    * Add ability to at least alternate formatStrings -- every other
 */
 
 
 exports.moduleInfo = {
-    name		: 'Onelinerz',
-    desc		: 'Standard local onelinerz',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.onelinerz',
+    name        : 'Onelinerz',
+    desc        : 'Standard local onelinerz',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.onelinerz',
 };
 
 const MciViewIds = {
-    ViewForm	:  {
-        Entries		: 1,
-        AddPrompt	: 2,
+    ViewForm    :  {
+        Entries     : 1,
+        AddPrompt   : 2,
     },
     AddForm : {
-        NewEntry		: 1,
-        EntryPreview	: 2,
-        AddPrompt		: 3,
+        NewEntry        : 1,
+        EntryPreview    : 2,
+        AddPrompt       : 3,
     }
 };
 
 const FormIds = {
-    View	: 0,
-    Add		: 1,
+    View    : 0,
+    Add     : 1,
 };
 
 exports.getModule = class OnelinerzModule extends MenuModule {
@@ -66,7 +66,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 
             addEntry : function(formData, extraArgs, cb) {
                 if(_.isString(formData.value.oneliner) && formData.value.oneliner.length > 0) {
-                    const oneliner = formData.value.oneliner.trim();	//	remove any trailing ws
+                    const oneliner = formData.value.oneliner.trim();    //  remove any trailing ws
 
                     self.storeNewOneliner(oneliner, err => {
                         if(err) {
@@ -74,18 +74,18 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                         }
 
                         self.clearAddForm();
-                        return self.displayViewScreen(true, cb);	//	true=cls
+                        return self.displayViewScreen(true, cb);    //  true=cls
                     });
 
                 } else {
-                    //	empty message - treat as if cancel was hit
-                    return self.displayViewScreen(true, cb);	//	true=cls
+                    //  empty message - treat as if cancel was hit
+                    return self.displayViewScreen(true, cb);    //  true=cls
                 }
             },
 
             cancelAdd : function(formData, extraArgs, cb) {
                 self.clearAddForm();
-                return self.displayViewScreen(true, cb);	//	true=cls
+                return self.displayViewScreen(true, cb);    //  true=cls
             }
         };
     }
@@ -103,7 +103,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
             ],
             err => {
                 if(err) {
-                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                    //  :TODO: Handle me -- initSequence() should really take a completion callback
                 }
                 self.finishedLoading();
             }
@@ -141,9 +141,9 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.View,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.View,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -160,16 +160,16 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 
                     self.db.each(
                         `SELECT *
-						FROM (
-							SELECT * 
-							FROM onelinerz
-							ORDER BY timestamp DESC
-							LIMIT ${limit}
-							)
-						ORDER BY timestamp ASC;`,
+                        FROM (
+                            SELECT * 
+                            FROM onelinerz
+                            ORDER BY timestamp DESC
+                            LIMIT ${limit}
+                            )
+                        ORDER BY timestamp ASC;`,
                         (err, row) => {
                             if(!err) {
-                                row.timestamp = moment(row.timestamp);	//	convert -> moment
+                                row.timestamp = moment(row.timestamp);  //  convert -> moment
                                 entries.push(row);
                             }
                         },
@@ -179,15 +179,15 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                     );
                 },
                 function populateEntries(entriesView, entries, callback) {
-                    const listFormat	= self.menuConfig.config.listFormat || '{username}@{ts}: {oneliner}';//	:TODO: should be userName to be consistent
-                    const tsFormat		= self.menuConfig.config.timestampFormat || 'ddd h:mma';
+                    const listFormat    = self.menuConfig.config.listFormat || '{username}@{ts}: {oneliner}';// :TODO: should be userName to be consistent
+                    const tsFormat      = self.menuConfig.config.timestampFormat || 'ddd h:mma';
 
                     entriesView.setItems(entries.map( e => {
                         return stringFormat(listFormat, {
-                            userId		: e.user_id,
-                            username	: e.user_name,
-                            oneliner	: e.oneliner,
-                            ts			: e.timestamp.format(tsFormat),
+                            userId      : e.user_id,
+                            username    : e.user_name,
+                            oneliner    : e.oneliner,
+                            ts          : e.timestamp.format(tsFormat),
                         } );
                     }));
 
@@ -197,7 +197,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                 },
                 function finalPrep(callback) {
                     const promptView = self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt);
-                    promptView.setFocusItemIndex(1);	//	default to NO
+                    promptView.setFocusItemIndex(1);    //  default to NO
                     return callback(null);
                 }
             ],
@@ -235,9 +235,9 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.Add,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.Add,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -278,12 +278,12 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                 function createTables(callback) {
                     self.db.run(
                         `CREATE TABLE IF NOT EXISTS onelinerz (
-							id				INTEGER PRIMARY KEY,
-							user_id			INTEGER_NOT NULL,
-							user_name		VARCHAR NOT NULL,								
-							oneliner		VARCHAR NOT NULL,
-							timestamp		DATETIME NOT NULL
-						);`
+                            id              INTEGER PRIMARY KEY,
+                            user_id         INTEGER_NOT NULL,
+                            user_name       VARCHAR NOT NULL,                               
+                            oneliner        VARCHAR NOT NULL,
+                            timestamp       DATETIME NOT NULL
+                        );`
                         ,
                         err => {
                             return callback(err);
@@ -297,29 +297,29 @@ exports.getModule = class OnelinerzModule extends MenuModule {
     }
 
     storeNewOneliner(oneliner, cb) {
-        const self	= this;
-        const ts	= moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+        const self  = this;
+        const ts    = moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 
         async.series(
             [
                 function addRec(callback) {
                     self.db.run(
                         `INSERT INTO onelinerz (user_id, user_name, oneliner, timestamp)
-						VALUES (?, ?, ?, ?);`,
+                        VALUES (?, ?, ?, ?);`,
                         [ self.client.user.userId, self.client.user.username, oneliner, ts ],
                         callback
                     );
                 },
                 function removeOld(callback) {
-                    //	keep 25 max most recent items - remove the older ones
+                    //  keep 25 max most recent items - remove the older ones
                     self.db.run(
                         `DELETE FROM onelinerz
-						WHERE id IN (
-							SELECT id
-							FROM onelinerz
-							ORDER BY id DESC
-							LIMIT -1 OFFSET 25
-						);`,
+                        WHERE id IN (
+                            SELECT id
+                            FROM onelinerz
+                            ORDER BY id DESC
+                            LIMIT -1 OFFSET 25
+                        );`,
                         callback
                     );
                 }
diff --git a/core/plugin_module.js b/core/plugin_module.js
index da9410b0..60b878aa 100644
--- a/core/plugin_module.js
+++ b/core/plugin_module.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-exports.PluginModule	= PluginModule;
+exports.PluginModule    = PluginModule;
 
 function PluginModule(/*options*/) {
 }
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 584feffa..fe8d4b43 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -1,24 +1,24 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config							= require('./config.js').get;
-const Log								= require('./logger.js').log;
-const getMessageAreaByTag				= require('./message_area.js').getMessageAreaByTag;
-const getMessageConferenceByTag			= require('./message_area.js').getMessageConferenceByTag;
-const clientConnections					= require('./client_connections.js');
-const StatLog							= require('./stat_log.js');
-const FileBaseFilters					= require('./file_base_filter.js');
-const formatByteSize					= require('./string_util.js').formatByteSize;
+//  ENiGMA½
+const Config                            = require('./config.js').get;
+const Log                               = require('./logger.js').log;
+const getMessageAreaByTag               = require('./message_area.js').getMessageAreaByTag;
+const getMessageConferenceByTag         = require('./message_area.js').getMessageConferenceByTag;
+const clientConnections                 = require('./client_connections.js');
+const StatLog                           = require('./stat_log.js');
+const FileBaseFilters                   = require('./file_base_filter.js');
+const formatByteSize                    = require('./string_util.js').formatByteSize;
 
-//	deps
-const packageJson 			= require('../package.json');
-const os					= require('os');
-const _						= require('lodash');
-const moment				= require('moment');
+//  deps
+const packageJson           = require('../package.json');
+const os                    = require('os');
+const _                     = require('lodash');
+const moment                = require('moment');
 
-exports.getPredefinedMCIValue	= getPredefinedMCIValue;
-exports.init					= init;
+exports.getPredefinedMCIValue   = getPredefinedMCIValue;
+exports.init                    = init;
 
 function init(cb) {
     setNextRandomRumor(cb);
@@ -39,8 +39,8 @@ function setNextRandomRumor(cb) {
 
 function getUserRatio(client, propA, propB) {
     const a = StatLog.getUserStatNum(client.user, propA);
-    const b	= StatLog.getUserStatNum(client.user, propB);
-    const ratio	= ~~((a / b) * 100);
+    const b = StatLog.getUserStatNum(client.user, propB);
+    const ratio = ~~((a / b) * 100);
     return `${ratio}%`;
 }
 
@@ -54,72 +54,72 @@ function sysStatAsString(statName, defaultValue) {
 
 const PREDEFINED_MCI_GENERATORS = {
     //
-    //	Board
+    //  Board
     //
-    BN	: function boardName() { return Config().general.boardName; },
+    BN  : function boardName() { return Config().general.boardName; },
 
-    //	ENiGMA
-    VL	: function versionLabel() { return 'ENiGMA½ v' + packageJson.version; },
-    VN	: function version() { return packageJson.version; },
+    //  ENiGMA
+    VL  : function versionLabel() { return 'ENiGMA½ v' + packageJson.version; },
+    VN  : function version() { return packageJson.version; },
 
-    //	+op info
-    SN	: function opUserName() { return StatLog.getSystemStat('sysop_username'); },
-    SR	: function opRealName() { return StatLog.getSystemStat('sysop_real_name'); },
-    SL	: function opLocation() { return StatLog.getSystemStat('sysop_location'); },
-    SA	: function opAffils() { return StatLog.getSystemStat('sysop_affiliation'); },
-    SS	: function opSex() { return StatLog.getSystemStat('sysop_sex'); },
-    SE	: function opEmail() { return StatLog.getSystemStat('sysop_email_address'); },
-    //	:TODO: op age, web, ?????
+    //  +op info
+    SN  : function opUserName() { return StatLog.getSystemStat('sysop_username'); },
+    SR  : function opRealName() { return StatLog.getSystemStat('sysop_real_name'); },
+    SL  : function opLocation() { return StatLog.getSystemStat('sysop_location'); },
+    SA  : function opAffils() { return StatLog.getSystemStat('sysop_affiliation'); },
+    SS  : function opSex() { return StatLog.getSystemStat('sysop_sex'); },
+    SE  : function opEmail() { return StatLog.getSystemStat('sysop_email_address'); },
+    //  :TODO: op age, web, ?????
 
     //
-    //	Current user / session
+    //  Current user / session
     //
-    UN	: function userName(client) { return client.user.username; },
-    UI	: function userId(client) { return client.user.userId.toString(); },
-    UG	: function groups(client) { return _.values(client.user.groups).join(', '); },
-    UR	: function realName(client) { return userStatAsString(client, 'real_name', ''); },
-    LO	: function location(client) { return userStatAsString(client, 'location', ''); },
-    UA	: function age(client) { return client.user.getAge().toString(); },
-    BD	: function birthdate(client) { return moment(client.user.properties.birthdate).format(client.currentTheme.helpers.getDateFormat()); },	//	iNiQUiTY
-    US	: function sex(client) { return userStatAsString(client, 'sex', ''); },
-    UE	: function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
-    UW	: function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
-    UF	: function affils(client) { return userStatAsString(client, 'affiliation', ''); },
-    UT	: function themeId(client) { return userStatAsString(client, 'theme_id', ''); },
-    UC	: function loginCount(client) { return userStatAsString(client, 'login_count', 0); },
-    ND	: function connectedNode(client) { return client.node.toString(); },
-    IP	: function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },	//	convert any :ffff: IPv4's to 32bit version
-    ST	: function serverName(client) { return client.session.serverName; },
-    FN	: function activeFileBaseFilterName(client) {
+    UN  : function userName(client) { return client.user.username; },
+    UI  : function userId(client) { return client.user.userId.toString(); },
+    UG  : function groups(client) { return _.values(client.user.groups).join(', '); },
+    UR  : function realName(client) { return userStatAsString(client, 'real_name', ''); },
+    LO  : function location(client) { return userStatAsString(client, 'location', ''); },
+    UA  : function age(client) { return client.user.getAge().toString(); },
+    BD  : function birthdate(client) { return moment(client.user.properties.birthdate).format(client.currentTheme.helpers.getDateFormat()); },  //  iNiQUiTY
+    US  : function sex(client) { return userStatAsString(client, 'sex', ''); },
+    UE  : function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
+    UW  : function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
+    UF  : function affils(client) { return userStatAsString(client, 'affiliation', ''); },
+    UT  : function themeId(client) { return userStatAsString(client, 'theme_id', ''); },
+    UC  : function loginCount(client) { return userStatAsString(client, 'login_count', 0); },
+    ND  : function connectedNode(client) { return client.node.toString(); },
+    IP  : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },    //  convert any :ffff: IPv4's to 32bit version
+    ST  : function serverName(client) { return client.session.serverName; },
+    FN  : function activeFileBaseFilterName(client) {
         const activeFilter = FileBaseFilters.getActiveFilter(client);
         return activeFilter ? activeFilter.name : '';
     },
-    DN	: function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },		//	Obv/2
-    DK	: function userByteDownload(client) {	//	Obv/2 uses DK=downloaded Kbytes
+    DN  : function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },      //  Obv/2
+    DK  : function userByteDownload(client) {   //  Obv/2 uses DK=downloaded Kbytes
         const byteSize = StatLog.getUserStatNum(client.user, 'dl_total_bytes');
-        return formatByteSize(byteSize, true);	//	true=withAbbr
+        return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    UP	: function userNumUploads(client) { return userStatAsString(client, 'ul_total_count', 0); },			//	Obv/2
-    UK	: function userByteUpload(client) { //	Obv/2 uses UK=uploaded Kbytes
+    UP  : function userNumUploads(client) { return userStatAsString(client, 'ul_total_count', 0); },            //  Obv/2
+    UK  : function userByteUpload(client) { //  Obv/2 uses UK=uploaded Kbytes
         const byteSize = StatLog.getUserStatNum(client.user, 'ul_total_bytes');
-        return formatByteSize(byteSize, true);	//	true=withAbbr
+        return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    NR	: function userUpDownRatio(client) {	//	Obv/2
+    NR  : function userUpDownRatio(client) {    //  Obv/2
         return getUserRatio(client, 'ul_total_count', 'dl_total_count');
     },
-    KR	: function userUpDownByteRatio(client) {	//	Obv/2 uses KR=upload/download Kbyte ratio
+    KR  : function userUpDownByteRatio(client) {    //  Obv/2 uses KR=upload/download Kbyte ratio
         return getUserRatio(client, 'ul_total_bytes', 'dl_total_bytes');
     },
 
-    MS	: function accountCreatedclient(client) { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
-    PS	: function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
-    PC	: function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
+    MS  : function accountCreatedclient(client) { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
+    PS  : function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
+    PC  : function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
 
-    MD	: function currentMenuDescription(client) {
+    MD  : function currentMenuDescription(client) {
         return _.has(client, 'currentMenuModule.menuConfig.desc') ? client.currentMenuModule.menuConfig.desc : '';
     },
 
-    MA	: function messageAreaName(client) {
+    MA  : function messageAreaName(client) {
         const area = getMessageAreaByTag(client.user.properties.message_area_tag);
         return area ? area.name : '';
     },
@@ -131,102 +131,102 @@ const PREDEFINED_MCI_GENERATORS = {
         const area = getMessageAreaByTag(client.user.properties.message_area_tag);
         return area ? area.desc : '';
     },
-    CM	: function messageConfDescription(client) {
+    CM  : function messageConfDescription(client) {
         const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
         return conf ? conf.desc : '';
     },
 
-    SH	: function termHeight(client) { return client.term.termHeight.toString(); },
-    SW	: function termWidth(client) { return client.term.termWidth.toString(); },
+    SH  : function termHeight(client) { return client.term.termHeight.toString(); },
+    SW  : function termWidth(client) { return client.term.termWidth.toString(); },
 
     //
-    //	Date/Time
+    //  Date/Time
     //
-    //	:TODO: change to CD for 'Current Date'
-    DT	: function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
-    CT	: function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
+    //  :TODO: change to CD for 'Current Date'
+    DT  : function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
+    CT  : function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
 
     //
-    //	OS/System Info
+    //  OS/System Info
     //
-    OS	: function operatingSystem() {
+    OS  : function operatingSystem() {
         return {
-            linux	: 'Linux',
-            darwin	: 'Mac OS X',
-            win32	: 'Windows',
-            sunos	: 'SunOS',
-            freebsd	: 'FreeBSD',
+            linux   : 'Linux',
+            darwin  : 'Mac OS X',
+            win32   : 'Windows',
+            sunos   : 'SunOS',
+            freebsd : 'FreeBSD',
         }[os.platform()] || os.type();
     },
 
-    OA	: function systemArchitecture() { return os.arch(); },
+    OA  : function systemArchitecture() { return os.arch(); },
 
-    SC	: function systemCpuModel() {
+    SC  : function systemCpuModel() {
         //
-        //	Clean up CPU strings a bit for better display
+        //  Clean up CPU strings a bit for better display
         //
         return os.cpus()[0].model
             .replace(/\(R\)|\(TM\)|processor|CPU/g, '')
             .replace(/\s+(?= )/g, '');
     },
 
-    //	:TODO: MCI for core count, e.g. os.cpus().length
+    //  :TODO: MCI for core count, e.g. os.cpus().length
 
-    //	:TODO: cpu load average (over N seconds): http://stackoverflow.com/questions/9565912/convert-the-output-of-os-cpus-in-node-js-to-percentage
-    NV	: function nodeVersion() { return process.version; },
+    //  :TODO: cpu load average (over N seconds): http://stackoverflow.com/questions/9565912/convert-the-output-of-os-cpus-in-node-js-to-percentage
+    NV  : function nodeVersion() { return process.version; },
 
-    AN	: function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
+    AN  : function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
 
-    TC	: function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
+    TC  : function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
 
-    RR	: function randomRumor() {
-        //	start the process of picking another random one
+    RR  : function randomRumor() {
+        //  start the process of picking another random one
         setNextRandomRumor();
 
         return StatLog.getSystemStat('random_rumor');
     },
 
     //
-    //	System File Base, Up/Download Info
+    //  System File Base, Up/Download Info
     //
-    //	:TODO: DD - Today's # of downloads (iNiQUiTY)
+    //  :TODO: DD - Today's # of downloads (iNiQUiTY)
     //
-    SD	: function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
-    SO	: function systemByteDownload() {
+    SD  : function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
+    SO  : function systemByteDownload() {
         const byteSize = StatLog.getSystemStatNum('dl_total_bytes');
-        return formatByteSize(byteSize, true);	//	true=withAbbr
+        return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    SU	: function systemNumUploads() { return sysStatAsString('ul_total_count', 0); },
-    SP	: function systemByteUpload() {
+    SU  : function systemNumUploads() { return sysStatAsString('ul_total_count', 0); },
+    SP  : function systemByteUpload() {
         const byteSize = StatLog.getSystemStatNum('ul_total_bytes');
-        return formatByteSize(byteSize, true);	//	true=withAbbr
+        return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    TF	: function totalFilesOnSystem() {
+    TF  : function totalFilesOnSystem() {
         const areaStats = StatLog.getSystemStat('file_base_area_stats');
         return _.get(areaStats, 'totalFiles', 0).toLocaleString();
     },
-    TB	: function totalBytesOnSystem() {
-        const areaStats		= StatLog.getSystemStat('file_base_area_stats');
-        const totalBytes	= parseInt(_.get(areaStats, 'totalBytes', 0));
-        return formatByteSize(totalBytes, true);	//	true=withAbbr
+    TB  : function totalBytesOnSystem() {
+        const areaStats     = StatLog.getSystemStat('file_base_area_stats');
+        const totalBytes    = parseInt(_.get(areaStats, 'totalBytes', 0));
+        return formatByteSize(totalBytes, true);    //  true=withAbbr
     },
 
-    //	:TODO: PT - Messages posted *today* (Obv/2)
-    //		-> Include FTN/etc.
-    //	:TODO: NT - New users today (Obv/2)
-    //	:TODO: CT - Calls *today* (Obv/2)
-    //	:TODO: FT - Files uploaded/added *today* (Obv/2)
-    //	:TODO: DD - Files downloaded *today* (iNiQUiTY)
-    //	:TODO: TP - total message/posts on the system (Obv/2)
-    //		-> Include FTN/etc.
-    //	:TODO: LC - name of last caller to system (Obv/2)
-    //	:TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
+    //  :TODO: PT - Messages posted *today* (Obv/2)
+    //      -> Include FTN/etc.
+    //  :TODO: NT - New users today (Obv/2)
+    //  :TODO: CT - Calls *today* (Obv/2)
+    //  :TODO: FT - Files uploaded/added *today* (Obv/2)
+    //  :TODO: DD - Files downloaded *today* (iNiQUiTY)
+    //  :TODO: TP - total message/posts on the system (Obv/2)
+    //      -> Include FTN/etc.
+    //  :TODO: LC - name of last caller to system (Obv/2)
+    //  :TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
 
 
     //
-    //	Special handling for XY
+    //  Special handling for XY
     //
-    XY	: function xyHack() { return; /* nothing */ },
+    XY  : function xyHack() { return; /* nothing */ },
 };
 
 function getPredefinedMCIValue(client, code) {
diff --git a/core/rumorz.js b/core/rumorz.js
index d51e33e8..153a74ee 100644
--- a/core/rumorz.js
+++ b/core/rumorz.js
@@ -1,42 +1,42 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const theme					= require('./theme.js');
-const resetScreen			= require('./ansi_term.js').resetScreen;
-const StatLog				= require('./stat_log.js');
-const renderStringLength	= require('./string_util.js').renderStringLength;
-const stringFormat			= require('./string_format.js');
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const theme                 = require('./theme.js');
+const resetScreen           = require('./ansi_term.js').resetScreen;
+const StatLog               = require('./stat_log.js');
+const renderStringLength    = require('./string_util.js').renderStringLength;
+const stringFormat          = require('./string_format.js');
 
-//	deps
-const async					= require('async');
-const _						= require('lodash');
+//  deps
+const async                 = require('async');
+const _                     = require('lodash');
 
 exports.moduleInfo = {
-    name		: 'Rumorz',
-    desc		: 'Standard local rumorz',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.rumorz',
+    name        : 'Rumorz',
+    desc        : 'Standard local rumorz',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.rumorz',
 };
 
-const STATLOG_KEY_RUMORZ	= 'system_rumorz';
+const STATLOG_KEY_RUMORZ    = 'system_rumorz';
 
 const FormIds = {
-    View	: 0,
-    Add		: 1,
+    View    : 0,
+    Add     : 1,
 };
 
 const MciCodeIds = {
-    ViewForm	:  {
-        Entries		: 1,
-        AddPrompt	: 2,
+    ViewForm    :  {
+        Entries     : 1,
+        AddPrompt   : 2,
     },
     AddForm : {
-        NewEntry		: 1,
-        EntryPreview	: 2,
-        AddPrompt		: 3,
+        NewEntry        : 1,
+        EntryPreview    : 2,
+        AddPrompt       : 3,
     }
 };
 
@@ -51,21 +51,21 @@ exports.getModule = class RumorzModule extends MenuModule {
 
             addEntry : (formData, extraArgs, cb) => {
                 if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
-                    const rumor = formData.value.rumor.trim();	//	remove any trailing ws
+                    const rumor = formData.value.rumor.trim();  //  remove any trailing ws
 
                     StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
                         this.clearAddForm();
-                        return this.displayViewScreen(true, cb);	//	true=cls
+                        return this.displayViewScreen(true, cb);    //  true=cls
                     });
                 } else {
-                    //	empty message - treat as if cancel was hit
-                    return this.displayViewScreen(true, cb);	//	true=cls
+                    //  empty message - treat as if cancel was hit
+                    return this.displayViewScreen(true, cb);    //  true=cls
                 }
             },
 
             cancelAdd : (formData, extraArgs, cb) => {
                 this.clearAddForm();
-                return this.displayViewScreen(true, cb);	//	true=cls
+                return this.displayViewScreen(true, cb);    //  true=cls
             }
         };
     }
@@ -73,12 +73,12 @@ exports.getModule = class RumorzModule extends MenuModule {
     get config() { return this.menuConfig.config; }
 
     clearAddForm() {
-        const newEntryView	= this.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
-        const previewView	= this.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
+        const newEntryView  = this.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
+        const previewView   = this.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
 
         newEntryView.setText('');
 
-        //	preview is optional
+        //  preview is optional
         if(previewView) {
             previewView.setText('');
         }
@@ -98,7 +98,7 @@ exports.getModule = class RumorzModule extends MenuModule {
             ],
             err => {
                 if(err) {
-                    //	:TODO: Handle me -- initSequence() should really take a completion callback
+                    //  :TODO: Handle me -- initSequence() should really take a completion callback
                 }
                 self.finishedLoading();
             }
@@ -135,9 +135,9 @@ exports.getModule = class RumorzModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.View,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.View,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -155,9 +155,9 @@ exports.getModule = class RumorzModule extends MenuModule {
                     });
                 },
                 function populateEntries(entriesView, entries, callback) {
-                    const config			= self.config;
-                    const listFormat		= config.listFormat || '{rumor}';
-                    const focusListFormat	= config.focusListFormat || listFormat;
+                    const config            = self.config;
+                    const listFormat        = config.listFormat || '{rumor}';
+                    const focusListFormat   = config.focusListFormat || listFormat;
 
                     entriesView.setItems(entries.map( e => stringFormat(listFormat, { rumor : e.log_value } ) ) );
                     entriesView.setFocusItems(entries.map(e => stringFormat(focusListFormat, { rumor : e.log_value } ) ) );
@@ -167,7 +167,7 @@ exports.getModule = class RumorzModule extends MenuModule {
                 },
                 function finalPrep(callback) {
                     const promptView = self.viewControllers.view.getView(MciCodeIds.ViewForm.AddPrompt);
-                    promptView.setFocusItemIndex(1);	//	default to NO
+                    promptView.setFocusItemIndex(1);    //  default to NO
                     return callback(null);
                 }
             ],
@@ -205,9 +205,9 @@ exports.getModule = class RumorzModule extends MenuModule {
                         );
 
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: artData.mciMap,
-                            formId			: FormIds.Add,
+                            callingMenu     : self,
+                            mciMap          : artData.mciMap,
+                            formId          : FormIds.Add,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
@@ -219,8 +219,8 @@ exports.getModule = class RumorzModule extends MenuModule {
                     }
                 },
                 function initPreviewUpdates(callback) {
-                    const previewView	= self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
-                    const entryView		= self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
+                    const previewView   = self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
+                    const entryView     = self.viewControllers.add.getView(MciCodeIds.AddForm.NewEntry);
                     if(previewView) {
                         let timerId;
                         entryView.on('key press', () => {
diff --git a/core/sauce.js b/core/sauce.js
index 29176d8d..6291c16e 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -1,28 +1,28 @@
 /* jslint node: true */
 'use strict';
 
-const Errors		= require('./enig_error.js').Errors;
+const Errors        = require('./enig_error.js').Errors;
 
-//	deps
-const iconv			= require('iconv-lite');
-const { Parser }	= require('binary-parser');
+//  deps
+const iconv         = require('iconv-lite');
+const { Parser }    = require('binary-parser');
 
-exports.readSAUCE		= readSAUCE;
+exports.readSAUCE       = readSAUCE;
 
-const SAUCE_SIZE	= 128;
-const SAUCE_ID		= Buffer.from([0x53, 0x41, 0x55, 0x43, 0x45]);	//	'SAUCE'
+const SAUCE_SIZE    = 128;
+const SAUCE_ID      = Buffer.from([0x53, 0x41, 0x55, 0x43, 0x45]);  //  'SAUCE'
 
-//	:TODO read comments
-//const COMNT_ID		= Buffer.from([0x43, 0x4f, 0x4d, 0x4e, 0x54]);	//	'COMNT'
+//  :TODO read comments
+//const COMNT_ID        = Buffer.from([0x43, 0x4f, 0x4d, 0x4e, 0x54]);  //  'COMNT'
 
-exports.SAUCE_SIZE		= SAUCE_SIZE;
-//	:TODO: SAUCE should be a class
-//	- with getFontName()
-//	- ...other methods
+exports.SAUCE_SIZE      = SAUCE_SIZE;
+//  :TODO: SAUCE should be a class
+//  - with getFontName()
+//  - ...other methods
 
 //
-//	See
-//	http://www.acid.org/info/sauce/sauce.htm
+//  See
+//  http://www.acid.org/info/sauce/sauce.htm
 //
 const SAUCE_VALID_DATA_TYPES = [0, 1, 2, 3, 4, 5, 6, 7, 8 ];
 
@@ -49,8 +49,8 @@ function readSAUCE(data, cb) {
             .uint16le('tinfo4')
             .int8('numComments')
             .int8('flags')
-            //	:TODO: does this need to be optional?
-            .buffer('tinfos', { length: 22 } )	//	SAUCE 00.5
+            //  :TODO: does this need to be optional?
+            .buffer('tinfos', { length: 22 } )  //  SAUCE 00.5
             .parse(data.slice(data.length - SAUCE_SIZE));
     } catch(e) {
         return cb(Errors.Invalid('Invalid SAUCE record'));
@@ -72,22 +72,22 @@ function readSAUCE(data, cb) {
     }
 
     const sauce = {
-        id 			: iconv.decode(sauceRec.id, 'cp437'),
-        version		: iconv.decode(sauceRec.version, 'cp437').trim(),
-        title		: iconv.decode(sauceRec.title, 'cp437').trim(),
-        author		: iconv.decode(sauceRec.author, 'cp437').trim(),
-        group		: iconv.decode(sauceRec.group, 'cp437').trim(),
-        date		: iconv.decode(sauceRec.date, 'cp437').trim(),
-        fileSize	: sauceRec.fileSize,
-        dataType	: sauceRec.dataType,
-        fileType	: sauceRec.fileType,
-        tinfo1		: sauceRec.tinfo1,
-        tinfo2		: sauceRec.tinfo2,
-        tinfo3		: sauceRec.tinfo3,
-        tinfo4		: sauceRec.tinfo4,
-        numComments	: sauceRec.numComments,
-        flags		: sauceRec.flags,
-        tinfos		: sauceRec.tinfos,
+        id          : iconv.decode(sauceRec.id, 'cp437'),
+        version     : iconv.decode(sauceRec.version, 'cp437').trim(),
+        title       : iconv.decode(sauceRec.title, 'cp437').trim(),
+        author      : iconv.decode(sauceRec.author, 'cp437').trim(),
+        group       : iconv.decode(sauceRec.group, 'cp437').trim(),
+        date        : iconv.decode(sauceRec.date, 'cp437').trim(),
+        fileSize    : sauceRec.fileSize,
+        dataType    : sauceRec.dataType,
+        fileType    : sauceRec.fileType,
+        tinfo1      : sauceRec.tinfo1,
+        tinfo2      : sauceRec.tinfo2,
+        tinfo3      : sauceRec.tinfo3,
+        tinfo4      : sauceRec.tinfo4,
+        numComments : sauceRec.numComments,
+        flags       : sauceRec.flags,
+        tinfos      : sauceRec.tinfos,
     };
 
     const dt = SAUCE_DATA_TYPES[sauce.dataType];
@@ -98,51 +98,51 @@ function readSAUCE(data, cb) {
     return cb(null, sauce);
 }
 
-//	:TODO: These need completed:
+//  :TODO: These need completed:
 const SAUCE_DATA_TYPES = {
-    0	: { name : 'None' },
-    1	: { name : 'Character', parser : parseCharacterSAUCE },
-    2 	: 'Bitmap',
-    3	: 'Vector',
-    4	: 'Audio',
-    5	: 'BinaryText',
-    6	: 'XBin',
-    7	: 'Archive',
-    8	: 'Executable',
+    0   : { name : 'None' },
+    1   : { name : 'Character', parser : parseCharacterSAUCE },
+    2   : 'Bitmap',
+    3   : 'Vector',
+    4   : 'Audio',
+    5   : 'BinaryText',
+    6   : 'XBin',
+    7   : 'Archive',
+    8   : 'Executable',
 };
 
 const SAUCE_CHARACTER_FILE_TYPES = {
-    0	: 'ASCII',
-    1	: 'ANSi',
-    2	: 'ANSiMation',
-    3	: 'RIP script',
-    4	: 'PCBoard',
-    5	: 'Avatar',
-    6	: 'HTML',
-    7	: 'Source',
-    8	: 'TundraDraw',
+    0   : 'ASCII',
+    1   : 'ANSi',
+    2   : 'ANSiMation',
+    3   : 'RIP script',
+    4   : 'PCBoard',
+    5   : 'Avatar',
+    6   : 'HTML',
+    7   : 'Source',
+    8   : 'TundraDraw',
 };
 
 //
-//	Map of SAUCE font -> encoding hint
+//  Map of SAUCE font -> encoding hint
 //
-//	Note that this is the same mapping that x84 uses. Be compatible!
+//  Note that this is the same mapping that x84 uses. Be compatible!
 //
 const SAUCE_FONT_TO_ENCODING_HINT = {
-    'Amiga MicroKnight'		: 'amiga',
-    'Amiga MicroKnight+'	: 'amiga',
-    'Amiga mOsOul'			: 'amiga',
-    'Amiga P0T-NOoDLE'		: 'amiga',
-    'Amiga Topaz 1'			: 'amiga',
-    'Amiga Topaz 1+'		: 'amiga',
-    'Amiga Topaz 2'			: 'amiga',
-    'Amiga Topaz 2+'		: 'amiga',
-    'Atari ATASCII'			: 'atari',
-    'IBM EGA43'				: 'cp437',
-    'IBM EGA'				: 'cp437',
-    'IBM VGA25G'			: 'cp437',
-    'IBM VGA50'				: 'cp437',
-    'IBM VGA'				: 'cp437',
+    'Amiga MicroKnight'     : 'amiga',
+    'Amiga MicroKnight+'    : 'amiga',
+    'Amiga mOsOul'          : 'amiga',
+    'Amiga P0T-NOoDLE'      : 'amiga',
+    'Amiga Topaz 1'         : 'amiga',
+    'Amiga Topaz 1+'        : 'amiga',
+    'Amiga Topaz 2'         : 'amiga',
+    'Amiga Topaz 2+'        : 'amiga',
+    'Atari ATASCII'         : 'atari',
+    'IBM EGA43'             : 'cp437',
+    'IBM EGA'               : 'cp437',
+    'IBM VGA25G'            : 'cp437',
+    'IBM VGA50'             : 'cp437',
+    'IBM VGA'               : 'cp437',
 };
 
 [
@@ -150,20 +150,20 @@ const SAUCE_FONT_TO_ENCODING_HINT = {
     '860', '861', '862', '863', '864', '865', '866', '869', '872'
 ].forEach( page => {
     const codec = 'cp' + page;
-    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]	= codec;
-    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]		= codec;
-    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA25g ' + page]	= codec;
-    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA50 ' + page]	= codec;
-    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA ' + page]		= codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA43 ' + page]    = codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM EGA ' + page]      = codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA25g ' + page]   = codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA50 ' + page]    = codec;
+    SAUCE_FONT_TO_ENCODING_HINT['IBM VGA ' + page]      = codec;
 });
 
 function parseCharacterSAUCE(sauce) {
     const result = {};
 
-    result.fileType	= SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
+    result.fileType = SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
 
     if(sauce.fileType === 0 || sauce.fileType === 1 || sauce.fileType === 2) {
-        //	convience: create ansiFlags
+        //  convience: create ansiFlags
         sauce.ansiFlags = sauce.flags;
 
         let i = 0;
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 98fece9b..2e08b6e2 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1,57 +1,57 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MessageScanTossModule				= require('../msg_scan_toss_module.js').MessageScanTossModule;
-const Config							= require('../config.js').get;
-const ftnMailPacket						= require('../ftn_mail_packet.js');
-const ftnUtil							= require('../ftn_util.js');
-const Address							= require('../ftn_address.js');
-const Log								= require('../logger.js').log;
-const ArchiveUtil						= require('../archive_util.js');
-const msgDb								= require('../database.js').dbs.message;
-const Message							= require('../message.js');
-const TicFileInfo						= require('../tic_file_info.js');
-const Errors							= require('../enig_error.js').Errors;
-const FileEntry							= require('../file_entry.js');
-const scanFile							= require('../file_base_area.js').scanFile;
-const getFileAreaByTag					= require('../file_base_area.js').getFileAreaByTag;
-const getDescFromFileName				= require('../file_base_area.js').getDescFromFileName;
-const copyFileWithCollisionHandling		= require('../file_util.js').copyFileWithCollisionHandling;
-const getAreaStorageDirectoryByTag		= require('../file_base_area.js').getAreaStorageDirectoryByTag;
-const isValidStorageTag					= require('../file_base_area.js').isValidStorageTag;
-const User								= require('../user.js');
+//  ENiGMA½
+const MessageScanTossModule             = require('../msg_scan_toss_module.js').MessageScanTossModule;
+const Config                            = require('../config.js').get;
+const ftnMailPacket                     = require('../ftn_mail_packet.js');
+const ftnUtil                           = require('../ftn_util.js');
+const Address                           = require('../ftn_address.js');
+const Log                               = require('../logger.js').log;
+const ArchiveUtil                       = require('../archive_util.js');
+const msgDb                             = require('../database.js').dbs.message;
+const Message                           = require('../message.js');
+const TicFileInfo                       = require('../tic_file_info.js');
+const Errors                            = require('../enig_error.js').Errors;
+const FileEntry                         = require('../file_entry.js');
+const scanFile                          = require('../file_base_area.js').scanFile;
+const getFileAreaByTag                  = require('../file_base_area.js').getFileAreaByTag;
+const getDescFromFileName               = require('../file_base_area.js').getDescFromFileName;
+const copyFileWithCollisionHandling     = require('../file_util.js').copyFileWithCollisionHandling;
+const getAreaStorageDirectoryByTag      = require('../file_base_area.js').getAreaStorageDirectoryByTag;
+const isValidStorageTag                 = require('../file_base_area.js').isValidStorageTag;
+const User                              = require('../user.js');
 
-//	deps
-const moment				= require('moment');
-const _						= require('lodash');
-const paths					= require('path');
-const async					= require('async');
-const fs					= require('graceful-fs');
-const later					= require('later');
-const temptmp				= require('temptmp').createTrackedSession('ftn_bso');
-const assert				= require('assert');
-const sane					= require('sane');
-const fse					= require('fs-extra');
-const iconv					= require('iconv-lite');
-const uuidV4				= require('uuid/v4');
+//  deps
+const moment                = require('moment');
+const _                     = require('lodash');
+const paths                 = require('path');
+const async                 = require('async');
+const fs                    = require('graceful-fs');
+const later                 = require('later');
+const temptmp               = require('temptmp').createTrackedSession('ftn_bso');
+const assert                = require('assert');
+const sane                  = require('sane');
+const fse                   = require('fs-extra');
+const iconv                 = require('iconv-lite');
+const uuidV4                = require('uuid/v4');
 
 exports.moduleInfo = {
-    name	: 'FTN BSO',
-    desc	: 'BSO style message scanner/tosser for FTN networks',
-    author	: 'NuSkooler',
+    name    : 'FTN BSO',
+    desc    : 'BSO style message scanner/tosser for FTN networks',
+    author  : 'NuSkooler',
 };
 
 /*
-	:TODO:
-	* Support (approx) max bundle size
-	* Validate packet passwords!!!!
-		=> secure vs insecure landing areas
+    :TODO:
+    * Support (approx) max bundle size
+    * Validate packet passwords!!!!
+        => secure vs insecure landing areas
 */
 
 exports.getModule = FTNMessageScanTossModule;
 
-const SCHEDULE_REGEXP	= /(?:^|or )?(@watch:|@immediate)([^\0]+)?$/;
+const SCHEDULE_REGEXP   = /(?:^|or )?(@watch:|@immediate)([^\0]+)?$/;
 
 function FTNMessageScanTossModule() {
     MessageScanTossModule.call(this);
@@ -82,7 +82,7 @@ function FTNMessageScanTossModule() {
             return config.messageNetworks.ftn.networks[networkName].defaultZone;
         }
 
-        //	non-explicit: default to local address zone
+        //  non-explicit: default to local address zone
         const networkLocalAddress = config.messageNetworks.ftn.networks[networkName].localAddress;
         if(networkLocalAddress) {
             const addr = Address.fromString(networkLocalAddress);
@@ -91,11 +91,11 @@ function FTNMessageScanTossModule() {
     };
 
     /*
-	this.isDefaultDomainZone = function(networkName, address) {
-		const defaultNetworkName 	= this.getDefaultNetworkName();
-		return(networkName === defaultNetworkName && address.zone === this.moduleConfig.defaultZone);
-	};
-	*/
+    this.isDefaultDomainZone = function(networkName, address) {
+        const defaultNetworkName    = this.getDefaultNetworkName();
+        return(networkName === defaultNetworkName && address.zone === this.moduleConfig.defaultZone);
+    };
+    */
 
     this.getNetworkNameByAddress = function(remoteAddress) {
         return _.findKey(Config().messageNetworks.ftn.networks, network => {
@@ -112,7 +112,7 @@ function FTNMessageScanTossModule() {
     };
 
     this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
-        ftnAreaTag = ftnAreaTag.toUpperCase();	//	always compare upper
+        ftnAreaTag = ftnAreaTag.toUpperCase();  //  always compare upper
         return _.findKey(Config().messageNetworks.ftn.areas, areaConf => {
             return areaConf.tag.toUpperCase() === ftnAreaTag;
         });
@@ -123,41 +123,41 @@ function FTNMessageScanTossModule() {
     };
 
     /*
-	this.getSeenByAddresses = function(messageSeenBy) {
-		if(!_.isArray(messageSeenBy)) {
-			messageSeenBy = [ messageSeenBy ];
-		}
+    this.getSeenByAddresses = function(messageSeenBy) {
+        if(!_.isArray(messageSeenBy)) {
+            messageSeenBy = [ messageSeenBy ];
+        }
 
-		let seenByAddrs = [];
-		messageSeenBy.forEach(sb => {
-			seenByAddrs = seenByAddrs.concat(ftnUtil.parseAbbreviatedNetNodeList(sb));
-		});
-		return seenByAddrs;
-	};
-	*/
+        let seenByAddrs = [];
+        messageSeenBy.forEach(sb => {
+            seenByAddrs = seenByAddrs.concat(ftnUtil.parseAbbreviatedNetNodeList(sb));
+        });
+        return seenByAddrs;
+    };
+    */
 
     this.messageHasValidMSGID = function(msg) {
         return _.isString(msg.meta.FtnKludge.MSGID) && msg.meta.FtnKludge.MSGID.length > 0;
     };
 
     /*
-	this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
-		let dir = this.moduleConfig.paths.outbound;
-		if(!this.isDefaultDomainZone(networkName, destAddress)) {
-			const hexZone = `000${destAddress.zone.toString(16)}`.substr(-3);
-			dir = paths.join(dir, `${networkName.toLowerCase()}.${hexZone}`);
-		}
-		return dir;
-	};
-	*/
+    this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
+        let dir = this.moduleConfig.paths.outbound;
+        if(!this.isDefaultDomainZone(networkName, destAddress)) {
+            const hexZone = `000${destAddress.zone.toString(16)}`.substr(-3);
+            dir = paths.join(dir, `${networkName.toLowerCase()}.${hexZone}`);
+        }
+        return dir;
+    };
+    */
 
     this.getOutgoingEchoMailPacketDir = function(networkName, destAddress) {
         networkName = networkName.toLowerCase();
 
         let dir = this.moduleConfig.paths.outbound;
 
-        const defaultNetworkName 	= this.getDefaultNetworkName();
-        const defaultZone			= this.getDefaultZone(networkName);
+        const defaultNetworkName    = this.getDefaultNetworkName();
+        const defaultZone           = this.getDefaultZone(networkName);
 
         let zoneExt;
         if(defaultZone !== destAddress.zone) {
@@ -177,24 +177,24 @@ function FTNMessageScanTossModule() {
 
     this.getOutgoingPacketFileName = function(basePath, messageId, isTemp, fileCase) {
         //
-        //	Generating an outgoing packet file name comes with a few issues:
-        //	*	We must use DOS 8.3 filenames due to legacy systems that receive
-        //		the packet not understanding LFNs
-        //	*	We need uniqueness; This is especially important with packets that
-        //		end up in bundles and on the receiving/remote system where conflicts
-        //		with other systems could also occur
+        //  Generating an outgoing packet file name comes with a few issues:
+        //  *   We must use DOS 8.3 filenames due to legacy systems that receive
+        //      the packet not understanding LFNs
+        //  *   We need uniqueness; This is especially important with packets that
+        //      end up in bundles and on the receiving/remote system where conflicts
+        //      with other systems could also occur
         //
-        //	There are a lot of systems in use here for the name:
-        //	*	HEX CRC16/32 of data
-        //	*	HEX UNIX timestamp
-        //	*	Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second)
-        //		See https://groups.google.com/forum/#!searchin/alt.bbs.mystic/netmail$20filename/alt.bbs.mystic/m1xLnY8i1pU/YnG2excdl6MJ
-        //	* 	SBBSEcho uses DDHHMMSS - see https://github.com/ftnapps/pkg-sbbs/blob/master/docs/fidonet.txt
-        //	*	We already have a system for 8-character serial number gernation that is
-        //		used for e.g. in FTS-0009.001 MSGIDs... let's use that!
+        //  There are a lot of systems in use here for the name:
+        //  *   HEX CRC16/32 of data
+        //  *   HEX UNIX timestamp
+        //  *   Mystic at least at one point, used Hex8(day of month + seconds past midnight + hundredths of second)
+        //      See https://groups.google.com/forum/#!searchin/alt.bbs.mystic/netmail$20filename/alt.bbs.mystic/m1xLnY8i1pU/YnG2excdl6MJ
+        //  *   SBBSEcho uses DDHHMMSS - see https://github.com/ftnapps/pkg-sbbs/blob/master/docs/fidonet.txt
+        //  *   We already have a system for 8-character serial number gernation that is
+        //      used for e.g. in FTS-0009.001 MSGIDs... let's use that!
         //
-        const name		= ftnUtil.getMessageSerialNumber(messageId);
-        const ext		= (true === isTemp) ? 'pk_' : 'pkt';
+        const name      = ftnUtil.getMessageSerialNumber(messageId);
+        const ext       = (true === isTemp) ? 'pk_' : 'pkt';
 
         let fileName = `${name}.${ext}`;
         if('upper' === fileCase) {
@@ -208,11 +208,11 @@ function FTNMessageScanTossModule() {
         let ext;
 
         switch(flowType) {
-            case 'mail'		: ext = `${exportType.toLowerCase()[0]}ut`; break;
-            case 'ref'		: ext = `${exportType.toLowerCase()[0]}lo`; break;
-            case 'busy'		: ext = 'bsy'; break;
-            case 'request'	: ext = 'req'; break;
-            case 'requests'	: ext = 'hrq'; break;
+            case 'mail'     : ext = `${exportType.toLowerCase()[0]}ut`; break;
+            case 'ref'      : ext = `${exportType.toLowerCase()[0]}lo`; break;
+            case 'busy'     : ext = 'bsy'; break;
+            case 'request'  : ext = 'req'; break;
+            case 'requests' : ext = 'hrq'; break;
         }
 
         if('upper' === fileCase) {
@@ -224,9 +224,9 @@ function FTNMessageScanTossModule() {
 
     this.getOutgoingFlowFileName = function(basePath, destAddress, flowType, exportType, fileCase) {
         //
-        //	Refs
-        //	* http://ftsc.org/docs/fts-5005.003
-        //	* http://wiki.synchro.net/ref:fidonet_files#flow_files
+        //  Refs
+        //  * http://ftsc.org/docs/fts-5005.003
+        //  * http://wiki.synchro.net/ref:fidonet_files#flow_files
         //
         let controlFileBaseName;
         let pointDir;
@@ -238,30 +238,30 @@ function FTNMessageScanTossModule() {
             fileCase
         );
 
-        const netComponent	= `0000${destAddress.net.toString(16)}`.substr(-4);
-        const nodeComponent	= `0000${destAddress.node.toString(16)}`.substr(-4);
+        const netComponent  = `0000${destAddress.net.toString(16)}`.substr(-4);
+        const nodeComponent = `0000${destAddress.node.toString(16)}`.substr(-4);
 
         if(destAddress.point) {
-            //	point's go in an extra subdir, e.g. outbound/NNNNnnnn.pnt/00000001.pnt (for a point of 1)
-            pointDir			= `${netComponent}${nodeComponent}.pnt`;
+            //  point's go in an extra subdir, e.g. outbound/NNNNnnnn.pnt/00000001.pnt (for a point of 1)
+            pointDir            = `${netComponent}${nodeComponent}.pnt`;
             controlFileBaseName = `00000000${destAddress.point.toString(16)}`.substr(-8);
         } else {
             pointDir = '';
 
             //
-            //	Use |destAddress| nnnnNNNN.??? where nnnn is dest net and NNNN is dest
-            //	node. This seems to match what Mystic does
+            //  Use |destAddress| nnnnNNNN.??? where nnnn is dest net and NNNN is dest
+            //  node. This seems to match what Mystic does
             //
             controlFileBaseName = `${netComponent}${nodeComponent}`;
         }
 
         //
-        //	From FTS-5005.003: "Lower case filenames are prefered if supported by the file system."
-        //	...but we let the user override.
+        //  From FTS-5005.003: "Lower case filenames are prefered if supported by the file system."
+        //  ...but we let the user override.
         //
         if('upper' === fileCase) {
-            controlFileBaseName	= controlFileBaseName.toUpperCase();
-            pointDir			= pointDir.toUpperCase();
+            controlFileBaseName = controlFileBaseName.toUpperCase();
+            pointDir            = pointDir.toUpperCase();
         }
 
         return paths.join(basePath, pointDir, `${controlFileBaseName}.${ext}`);
@@ -269,12 +269,12 @@ function FTNMessageScanTossModule() {
 
     this.flowFileAppendRefs = function(filePath, fileRefs, directive, cb) {
         //
-        //	We have to ensure the *directory* of |filePath| exists here esp.
-        //	for cases such as point destinations where a subdir may be
-        //	present in the path that doesn't yet exist.
+        //  We have to ensure the *directory* of |filePath| exists here esp.
+        //  for cases such as point destinations where a subdir may be
+        //  present in the path that doesn't yet exist.
         //
         const flowFileDir = paths.dirname(filePath);
-        fse.mkdirs(flowFileDir, () => {	//	note not checking err; let's try appendFile
+        fse.mkdirs(flowFileDir, () => { //  note not checking err; let's try appendFile
             const appendLines = fileRefs.reduce( (content, ref) => {
                 return content + `${directive}${ref}\n`;
             }, '');
@@ -287,14 +287,14 @@ function FTNMessageScanTossModule() {
 
     this.getOutgoingBundleFileName = function(basePath, sourceAddress, destAddress, cb) {
         //
-        //	Base filename is constructed as such:
-        //	*	If this |destAddress| is *not* a point address, we use NNNNnnnn where
-        //		NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded
-        //		hex of dest node - source node.
-        //	*	If |destAddress| is a point, NNNN becomes 0000 and nnnn becomes 'p' +
-        //		3 digit 0 padded hex point
+        //  Base filename is constructed as such:
+        //  *   If this |destAddress| is *not* a point address, we use NNNNnnnn where
+        //      NNNN is 0 padded hex of dest net - source net and and nnnn is 0 padded
+        //      hex of dest node - source node.
+        //  *   If |destAddress| is a point, NNNN becomes 0000 and nnnn becomes 'p' +
+        //      3 digit 0 padded hex point
         //
-        //	Extension is dd? where dd is Su...Mo and ? is 0...Z as collisions arise
+        //  Extension is dd? where dd is Su...Mo and ? is 0...Z as collisions arise
         //
         let basename;
         if(destAddress.point) {
@@ -302,13 +302,13 @@ function FTNMessageScanTossModule() {
             basename = `0000p${pointHex}`;
         } else {
             basename =
-				`0000${Math.abs(sourceAddress.net - destAddress.net).toString(16)}`.substr(-4) +
-				`0000${Math.abs(sourceAddress.node - destAddress.node).toString(16)}`.substr(-4);
+                `0000${Math.abs(sourceAddress.net - destAddress.net).toString(16)}`.substr(-4) +
+                `0000${Math.abs(sourceAddress.node - destAddress.node).toString(16)}`.substr(-4);
         }
 
         //
-        //	We need to now find the first entry that does not exist starting
-        //	with dd0 to ddz
+        //  We need to now find the first entry that does not exist starting
+        //  with dd0 to ddz
         //
         const EXT_SUFFIXES = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
         let fileName = `${basename}.${moment().format('dd').toLowerCase()}`;
@@ -328,63 +328,63 @@ function FTNMessageScanTossModule() {
 
     this.prepareMessage = function(message, options) {
         //
-        //	Set various FTN kludges/etc.
+        //  Set various FTN kludges/etc.
         //
-        const localAddress = new Address(options.network.localAddress);	//	ensure we have an Address obj not a string version
+        const localAddress = new Address(options.network.localAddress); //  ensure we have an Address obj not a string version
 
-        //	:TODO: create Address.toMeta() / similar
+        //  :TODO: create Address.toMeta() / similar
         message.meta.FtnProperty = message.meta.FtnProperty || {};
         message.meta.FtnKludge = message.meta.FtnKludge || {};
 
-        message.meta.FtnProperty.ftn_orig_node			= localAddress.node;
-        message.meta.FtnProperty.ftn_orig_network		= localAddress.net;
-        message.meta.FtnProperty.ftn_cost				= 0;
-        message.meta.FtnProperty.ftn_msg_orig_node		= localAddress.node;
-        message.meta.FtnProperty.ftn_msg_orig_net	= localAddress.net;
+        message.meta.FtnProperty.ftn_orig_node          = localAddress.node;
+        message.meta.FtnProperty.ftn_orig_network       = localAddress.net;
+        message.meta.FtnProperty.ftn_cost               = 0;
+        message.meta.FtnProperty.ftn_msg_orig_node      = localAddress.node;
+        message.meta.FtnProperty.ftn_msg_orig_net   = localAddress.net;
 
         const destAddress = options.routeAddress || options.destAddress;
-        message.meta.FtnProperty.ftn_dest_node		= destAddress.node;
-        message.meta.FtnProperty.ftn_dest_network	= destAddress.net;
+        message.meta.FtnProperty.ftn_dest_node      = destAddress.node;
+        message.meta.FtnProperty.ftn_dest_network   = destAddress.net;
 
         if(destAddress.zone) {
-            message.meta.FtnProperty.ftn_dest_zone	= destAddress.zone;
+            message.meta.FtnProperty.ftn_dest_zone  = destAddress.zone;
         }
         if(destAddress.point) {
-            message.meta.FtnProperty.ftn_dest_point	= destAddress.point;
+            message.meta.FtnProperty.ftn_dest_point = destAddress.point;
         }
 
-        //	tear line and origin can both go in EchoMail & NetMail
-        message.meta.FtnProperty.ftn_tear_line		= ftnUtil.getTearLine();
-        message.meta.FtnProperty.ftn_origin			= ftnUtil.getOrigin(localAddress);
+        //  tear line and origin can both go in EchoMail & NetMail
+        message.meta.FtnProperty.ftn_tear_line      = ftnUtil.getTearLine();
+        message.meta.FtnProperty.ftn_origin         = ftnUtil.getOrigin(localAddress);
 
-        let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;	//	message from our system
+        let ftnAttribute = ftnMailPacket.Packet.Attribute.Local;    //  message from our system
 
         const config = Config();
         if(self.isNetMailMessage(message)) {
             //
-            //	Set route and message destination properties -- they may differ
+            //  Set route and message destination properties -- they may differ
             //
-            message.meta.FtnProperty.ftn_msg_dest_node		= options.destAddress.node;
-            message.meta.FtnProperty.ftn_msg_dest_net	= options.destAddress.net;
+            message.meta.FtnProperty.ftn_msg_dest_node      = options.destAddress.node;
+            message.meta.FtnProperty.ftn_msg_dest_net   = options.destAddress.net;
 
             ftnAttribute |= ftnMailPacket.Packet.Attribute.Private;
 
             //
-            //	NetMail messages need a FRL-1005.001 "Via" line
-            //	http://ftsc.org/docs/frl-1005.001
+            //  NetMail messages need a FRL-1005.001 "Via" line
+            //  http://ftsc.org/docs/frl-1005.001
             //
-            //	:TODO: 	We need to do this when FORWARDING NetMail
+            //  :TODO:  We need to do this when FORWARDING NetMail
             /*
-			if(_.isString(message.meta.FtnKludge.Via)) {
-				message.meta.FtnKludge.Via = [ message.meta.FtnKludge.Via ];
-			}
-			message.meta.FtnKludge.Via = message.meta.FtnKludge.Via || [];
-			message.meta.FtnKludge.Via.push(ftnUtil.getVia(options.network.localAddress));
-			*/
+            if(_.isString(message.meta.FtnKludge.Via)) {
+                message.meta.FtnKludge.Via = [ message.meta.FtnKludge.Via ];
+            }
+            message.meta.FtnKludge.Via = message.meta.FtnKludge.Via || [];
+            message.meta.FtnKludge.Via.push(ftnUtil.getVia(options.network.localAddress));
+            */
 
             //
-            //	We need to set INTL, and possibly FMPT and/or TOPT
-            //	See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
+            //  We need to set INTL, and possibly FMPT and/or TOPT
+            //  See http://retro.fidoweb.ru/docs/index=ftsc&doc=FTS-4001&enc=mac
             //
             message.meta.FtnKludge.INTL = ftnUtil.getIntl(options.destAddress, localAddress);
 
@@ -397,30 +397,30 @@ function FTNMessageScanTossModule() {
             }
         } else {
             //
-            //	Set appropriate attribute flag for export type
+            //  Set appropriate attribute flag for export type
             //
             switch(this.getExportType(options.nodeConfig)) {
-                case 'crash'	: ftnAttribute |= ftnMailPacket.Packet.Attribute.Crash; break;
-                case 'hold'		: ftnAttribute |= ftnMailPacket.Packet.Attribute.Hold; break;
-				//	:TODO: Others?
+                case 'crash'    : ftnAttribute |= ftnMailPacket.Packet.Attribute.Crash; break;
+                case 'hold'     : ftnAttribute |= ftnMailPacket.Packet.Attribute.Hold; break;
+                //  :TODO: Others?
             }
 
             //
-            //	EchoMail requires some additional properties & kludges
+            //  EchoMail requires some additional properties & kludges
             //
             message.meta.FtnProperty.ftn_area = config.messageNetworks.ftn.areas[message.areaTag].tag;
 
             //
-            //	When exporting messages, we should create/update SEEN-BY
-            //	with remote address(s) we are exporting to.
+            //  When exporting messages, we should create/update SEEN-BY
+            //  with remote address(s) we are exporting to.
             //
             const seenByAdditions =
-				[ `${localAddress.net}/${localAddress.node}` ].concat(config.messageNetworks.ftn.areas[message.areaTag].uplinks);
+                [ `${localAddress.net}/${localAddress.node}` ].concat(config.messageNetworks.ftn.areas[message.areaTag].uplinks);
             message.meta.FtnProperty.ftn_seen_by =
-				ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
+                ftnUtil.getUpdatedSeenByEntries(message.meta.FtnProperty.ftn_seen_by, seenByAdditions);
 
             //
-            //	And create/update PATH for ourself
+            //  And create/update PATH for ourself
             //
             message.meta.FtnKludge.PATH = ftnUtil.getUpdatedPathEntries(message.meta.FtnKludge.PATH, localAddress);
         }
@@ -428,33 +428,33 @@ function FTNMessageScanTossModule() {
         message.meta.FtnProperty.ftn_attr_flags = ftnAttribute;
 
         //
-        //	Additional kludges
+        //  Additional kludges
         //
-        //	Check for existence of MSGID as we may already have stored it from a previous
-        //	export that failed to finish
+        //  Check for existence of MSGID as we may already have stored it from a previous
+        //  export that failed to finish
         //
         if(!message.meta.FtnKludge.MSGID) {
             message.meta.FtnKludge.MSGID = ftnUtil.getMessageIdentifier(
                 message,
                 localAddress,
-                message.isPrivate()	// true = isNetMail
+                message.isPrivate() // true = isNetMail
             );
         }
 
         message.meta.FtnKludge.TZUTC = ftnUtil.getUTCTimeZoneOffset();
 
         //
-        //	According to FSC-0046:
+        //  According to FSC-0046:
         //
-        //	"When a Conference Mail processor adds a TID to a message, it may not
-        //	add a PID. An existing TID should, however, be replaced. TIDs follow
-        //	the same format used for PIDs, as explained above."
+        //  "When a Conference Mail processor adds a TID to a message, it may not
+        //  add a PID. An existing TID should, however, be replaced. TIDs follow
+        //  the same format used for PIDs, as explained above."
         //
         message.meta.FtnKludge.TID = ftnUtil.getProductIdentifier();
 
         //
-        //	Determine CHRS and actual internal encoding name. If the message has an
-        //	explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
+        //  Determine CHRS and actual internal encoding name. If the message has an
+        //  explicit encoding set, use it. Otherwise, try to preserve any CHRS/encoding already set.
         //
         let encoding = options.nodeConfig.encoding || config.scannerTossers.ftn_bso.packetMsgEncoding || 'utf8';
         const explicitEncoding = _.get(message.meta, 'System.explicit_encoding');
@@ -468,40 +468,40 @@ function FTNMessageScanTossModule() {
         }
 
         //
-        //	Ensure we ended up with something useable. If not, back to utf8!
+        //  Ensure we ended up with something useable. If not, back to utf8!
         //
         if(!iconv.encodingExists(encoding)) {
             Log.debug( { encoding : encoding }, 'Unknown encoding. Falling back to utf8');
             encoding = 'utf8';
         }
 
-        options.encoding = encoding;	//	save for later
+        options.encoding = encoding;    //  save for later
         message.meta.FtnKludge.CHRS = ftnUtil.getCharacterSetIdentifierByEncoding(encoding);
     };
 
     this.setReplyKludgeFromReplyToMsgId = function(message, cb) {
         //
-        //	Look up MSGID kludge for |message.replyToMsgId|, if any.
-        //	If found, we can create a REPLY kludge with the previously
-        //	discovered MSGID.
+        //  Look up MSGID kludge for |message.replyToMsgId|, if any.
+        //  If found, we can create a REPLY kludge with the previously
+        //  discovered MSGID.
         //
 
         if(0 === message.replyToMsgId) {
-            return cb(null);	//	nothing to do
+            return cb(null);    //  nothing to do
         }
 
         Message.getMetaValuesByMessageId(message.replyToMsgId, 'FtnKludge', 'MSGID', (err, msgIdVal) => {
             if(!err) {
                 assert(_.isString(msgIdVal), 'Expected string but got ' + (typeof msgIdVal) + ' (' + msgIdVal + ')');
-                //	got a MSGID - create a REPLY
+                //  got a MSGID - create a REPLY
                 message.meta.FtnKludge.REPLY = msgIdVal;
             }
 
-            cb(null);	//	this method always passes
+            cb(null);   //  this method always passes
         });
     };
 
-    //	check paths, Addresses, etc.
+    //  check paths, Addresses, etc.
     this.isAreaConfigValid = function(areaConfig) {
         if(!areaConfig || !_.isString(areaConfig.tag) || !_.isString(areaConfig.network)) {
             return false;
@@ -520,14 +520,14 @@ function FTNMessageScanTossModule() {
             return false;
         }
 
-        //	:TODO: need to check more!
+        //  :TODO: need to check more!
 
         return true;
     };
 
     this.parseScheduleString = function(schedStr) {
         if(!schedStr) {
-            return;	//	nothing to parse!
+            return; //  nothing to parse!
         }
 
         let schedule = {};
@@ -550,7 +550,7 @@ function FTNMessageScanTossModule() {
             }
         }
 
-        //	return undefined if we couldn't parse out anything useful
+        //  return undefined if we couldn't parse out anything useful
         if(!_.isEmpty(schedule)) {
             return schedule;
         }
@@ -558,10 +558,10 @@ function FTNMessageScanTossModule() {
 
     this.getAreaLastScanId = function(areaTag, cb) {
         const sql =
-			`SELECT area_tag, message_id
-			FROM message_area_last_scan
-			WHERE scan_toss = "ftn_bso" AND area_tag = ?
-			LIMIT 1;`;
+            `SELECT area_tag, message_id
+            FROM message_area_last_scan
+            WHERE scan_toss = "ftn_bso" AND area_tag = ?
+            LIMIT 1;`;
 
         msgDb.get(sql, [ areaTag ], (err, row) => {
             return cb(err, row ? row.message_id : 0);
@@ -570,8 +570,8 @@ function FTNMessageScanTossModule() {
 
     this.setAreaLastScanId = function(areaTag, lastScanId, cb) {
         const sql =
-			`REPLACE INTO message_area_last_scan (scan_toss, area_tag, message_id)
-			VALUES ("ftn_bso", ?, ?);`;
+            `REPLACE INTO message_area_last_scan (scan_toss, area_tag, message_id)
+            VALUES ("ftn_bso", ?, ?);`;
 
         msgDb.run(sql, [ areaTag, lastScanId ], err => {
             return cb(err);
@@ -581,7 +581,7 @@ function FTNMessageScanTossModule() {
     this.getNodeConfigByAddress = function(addr) {
         addr = _.isString(addr) ? Address.fromString(addr) : addr;
 
-        //	:TODO: sort wildcard nodes{} entries by most->least explicit according to FTN hierarchy
+        //  :TODO: sort wildcard nodes{} entries by most->least explicit according to FTN hierarchy
         return _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
             return addr.isPatternMatch(nodeAddrWildcard);
         });
@@ -589,7 +589,7 @@ function FTNMessageScanTossModule() {
 
     this.exportNetMailMessagePacket = function(message, exportOpts, cb) {
         //
-        //	For NetMail, we always create a *single* packet per message.
+        //  For NetMail, we always create a *single* packet per message.
         //
         async.series(
             [
@@ -609,11 +609,11 @@ function FTNMessageScanTossModule() {
 
                     packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
 
-                    //	use current message ID for filename seed
+                    //  use current message ID for filename seed
                     exportOpts.pktFileName = self.getOutgoingPacketFileName(
                         self.exportTempDir,
                         message.messageId,
-                        false,	//	createTempPacket=false
+                        false,  //  createTempPacket=false
                         exportOpts.fileCase
                     );
 
@@ -645,13 +645,13 @@ function FTNMessageScanTossModule() {
 
     this.exportMessagesByUuid = function(messageUuids, exportOpts, cb) {
         //
-        //	This method has a lot of madness going on:
-        //	- Try to stuff messages into packets until we've hit the target size
-        //	- We need to wait for write streams to finish before proceeding in many cases
-        //	  or data will be cut off when closing and creating a new stream
+        //  This method has a lot of madness going on:
+        //  - Try to stuff messages into packets until we've hit the target size
+        //  - We need to wait for write streams to finish before proceeding in many cases
+        //    or data will be cut off when closing and creating a new stream
         //
-        let exportedFiles	= [];
-        let currPacketSize	= self.moduleConfig.packetTargetByteSize;
+        let exportedFiles   = [];
+        let currPacketSize  = self.moduleConfig.packetTargetByteSize;
         let packet;
         let ws;
         let remainMessageBuf;
@@ -684,7 +684,7 @@ function FTNMessageScanTossModule() {
                                 return callback(err);
                             }
 
-                            //	General preperation
+                            //  General preperation
                             self.prepareMessage(message, exportOpts);
 
                             self.setReplyKludgeFromReplyToMsgId(message, err => {
@@ -703,7 +703,7 @@ function FTNMessageScanTossModule() {
 
                             packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
 
-                            //	use current message ID for filename seed
+                            //  use current message ID for filename seed
                             const pktFileName = self.getOutgoingPacketFileName(
                                 self.exportTempDir,
                                 message.messageId,
@@ -731,11 +731,11 @@ function FTNMessageScanTossModule() {
                                 return callback(err);
                             }
 
-                            currPacketSize	+= msgBuf.length;
+                            currPacketSize  += msgBuf.length;
 
                             if(currPacketSize >= self.moduleConfig.packetTargetByteSize) {
-                                remainMessageBuf	= msgBuf;	//	save for next packet
-                                remainMessageId 	= message.messageId;
+                                remainMessageBuf    = msgBuf;   //  save for next packet
+                                remainMessageId     = message.messageId;
                             } else {
                                 ws.write(msgBuf);
                             }
@@ -750,8 +750,8 @@ function FTNMessageScanTossModule() {
                     },
                     function storeMsgIdMeta(callback) {
                         //
-                        //	We want to store some meta as if we had imported
-                        //	this message for later reference
+                        //  We want to store some meta as if we had imported
+                        //  this message for later reference
                         //
                         if(message.meta.FtnKludge.MSGID) {
                             message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, err => {
@@ -781,7 +781,7 @@ function FTNMessageScanTossModule() {
                         },
                         function writeRemainPacket(callback) {
                             if(remainMessageBuf) {
-                                //	:TODO: DRY this with the code above -- they are basically identical
+                                //  :TODO: DRY this with the code above -- they are basically identical
                                 packet = new ftnMailPacket.Packet();
 
                                 const packetHeader = new ftnMailPacket.PacketHeader(
@@ -791,7 +791,7 @@ function FTNMessageScanTossModule() {
 
                                 packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
 
-                                //	use current message ID for filename seed
+                                //  use current message ID for filename seed
                                 const pktFileName = self.getOutgoingPacketFileName(
                                     self.exportTempDir,
                                     remainMessageId,
@@ -821,7 +821,7 @@ function FTNMessageScanTossModule() {
 
     this.getNetMailRoute = function(dstAddr) {
         //
-        //	Route full|wildcard -> full adddress/network lookup
+        //  Route full|wildcard -> full adddress/network lookup
         //
         const routes = _.get(Config(), 'scannerTossers.ftn_bso.netMail.routes');
         if(!routes) {
@@ -835,15 +835,15 @@ function FTNMessageScanTossModule() {
 
     this.getNetMailRouteInfoFromAddress = function(destAddress, cb) {
         //
-        //	Attempt to find route information for |destAddress|:
+        //  Attempt to find route information for |destAddress|:
         //
-        //	1) Routes: scannerTossers.ftn_bso.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
-        //		- Where we send may not be where destAddress is (it's routed!)
-        //	2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
-        //		- Where we send is direct to destAddress
+        //  1) Routes: scannerTossers.ftn_bso.netMail.routes{} -> scannerTossers.ftn_bso.nodes{} -> config
+        //      - Where we send may not be where destAddress is (it's routed!)
+        //  2) Direct to nodes: scannerTossers.ftn_bso.nodes{} -> config
+        //      - Where we send is direct to destAddress
         //
-        //	In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
-        //	falling back to Config.scannerTossers.ftn_bso.defaultNetwork
+        //  In both cases, attempt to look up Zone:Net/* to discover local "from" network/address
+        //  falling back to Config.scannerTossers.ftn_bso.defaultNetwork
         //
         const route = this.getNetMailRoute(destAddress);
 
@@ -851,21 +851,21 @@ function FTNMessageScanTossModule() {
         let networkName;
         let isRouted;
         if(route) {
-            routeAddress	= Address.fromString(route.address);
-            networkName		= route.network;
-            isRouted		= true;
+            routeAddress    = Address.fromString(route.address);
+            networkName     = route.network;
+            isRouted        = true;
         } else {
-            routeAddress	= destAddress;
-            isRouted		= false;
+            routeAddress    = destAddress;
+            isRouted        = false;
         }
 
         networkName = networkName || this.getNetworkNameByAddress(routeAddress);
 
         const config = _.find(this.moduleConfig.nodes, (node, nodeAddrWildcard) => {
             return routeAddress.isPatternMatch(nodeAddrWildcard);
-        }) || { packetType : '2+', encoding	: Config().scannerTossers.ftn_bso.packetMsgEncoding };
+        }) || { packetType : '2+', encoding : Config().scannerTossers.ftn_bso.packetMsgEncoding };
 
-        //	we should never be failing here; we may just be using defaults.
+        //  we should never be failing here; we may just be using defaults.
         return cb(
             networkName ? null : Errors.DoesNotExist(`No NetMail route for ${destAddress.toString()}`),
             { destAddress, routeAddress, networkName, config, isRouted }
@@ -873,7 +873,7 @@ function FTNMessageScanTossModule() {
     };
 
     this.exportNetMailMessagesToUplinks = function(messagesOrMessageUuids, cb) {
-        //	for each message/UUID, find where to send the thing
+        //  for each message/UUID, find where to send the thing
         async.each(messagesOrMessageUuids, (msgOrUuid, nextMessageOrUuid) => {
 
             const exportOpts = {};
@@ -898,14 +898,14 @@ function FTNMessageScanTossModule() {
                                 return callback(err);
                             }
 
-                            exportOpts.nodeConfig	= routeInfo.config;
-                            exportOpts.destAddress	= dstAddr;
-                            exportOpts.routeAddress	= routeInfo.routeAddress;
-                            exportOpts.fileCase		= routeInfo.config.fileCase || 'lower';
-                            exportOpts.network		= Config().messageNetworks.ftn.networks[routeInfo.networkName];
-                            exportOpts.networkName	= routeInfo.networkName;
-                            exportOpts.outgoingDir	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
-                            exportOpts.exportType	= self.getExportType(routeInfo.config);
+                            exportOpts.nodeConfig   = routeInfo.config;
+                            exportOpts.destAddress  = dstAddr;
+                            exportOpts.routeAddress = routeInfo.routeAddress;
+                            exportOpts.fileCase     = routeInfo.config.fileCase || 'lower';
+                            exportOpts.network      = Config().messageNetworks.ftn.networks[routeInfo.networkName];
+                            exportOpts.networkName  = routeInfo.networkName;
+                            exportOpts.outgoingDir  = self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
+                            exportOpts.exportType   = self.getExportType(routeInfo.config);
 
                             if(!exportOpts.network) {
                                 return callback(Errors.DoesNotExist(`No configuration found for network ${routeInfo.networkName}`));
@@ -915,7 +915,7 @@ function FTNMessageScanTossModule() {
                         });
                     },
                     function createOutgoingDir(callback) {
-                        //	ensure outgoing NetMail directory exists
+                        //  ensure outgoing NetMail directory exists
                         return fse.mkdirs(exportOpts.outgoingDir, callback);
                     },
                     function exportPacket(callback) {
@@ -945,7 +945,7 @@ function FTNMessageScanTossModule() {
                         return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);
                     },
                     function storeMsgIdMeta(callback) {
-                        //	Store meta as if we had imported this message -- for later reference
+                        //  Store meta as if we had imported this message -- for later reference
                         if(message.meta.FtnKludge.MSGID) {
                             return message.persistMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.MSGID, callback);
                         }
@@ -978,18 +978,18 @@ function FTNMessageScanTossModule() {
 
             const exportOpts = {
                 nodeConfig,
-                network			: config.messageNetworks.ftn.networks[areaConfig.network],
-                destAddress		: Address.fromString(uplink),
-                networkName		: areaConfig.network,
-                fileCase		: nodeConfig.fileCase || 'lower',
+                network         : config.messageNetworks.ftn.networks[areaConfig.network],
+                destAddress     : Address.fromString(uplink),
+                networkName     : areaConfig.network,
+                fileCase        : nodeConfig.fileCase || 'lower',
             };
 
             if(_.isString(exportOpts.network.localAddress)) {
                 exportOpts.network.localAddress = Address.fromString(exportOpts.network.localAddress);
             }
 
-            const outgoingDir 	= self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
-            const exportType	= self.getExportType(exportOpts.nodeConfig);
+            const outgoingDir   = self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
+            const exportType    = self.getExportType(exportOpts.nodeConfig);
 
             async.waterfall(
                 [
@@ -1003,19 +1003,19 @@ function FTNMessageScanTossModule() {
                     },
                     function createArcMailBundle(exportedFileNames, callback) {
                         if(self.archUtil.haveArchiver(exportOpts.nodeConfig.archiveType)) {
-                            //	:TODO: support bundleTargetByteSize:
+                            //  :TODO: support bundleTargetByteSize:
                             //
-                            //	Compress to a temp location then we'll move it in the next step
+                            //  Compress to a temp location then we'll move it in the next step
                             //
-                            //	Note that we must use the *final* output dir for getOutgoingBundleFileName()
-                            //	as it checks for collisions in bundle names!
+                            //  Note that we must use the *final* output dir for getOutgoingBundleFileName()
+                            //  as it checks for collisions in bundle names!
                             //
                             self.getOutgoingBundleFileName(outgoingDir, exportOpts.network.localAddress, exportOpts.destAddress, (err, bundlePath) => {
                                 if(err) {
                                     return callback(err);
                                 }
 
-                                //	adjust back to temp path
+                                //  adjust back to temp path
                                 const tempBundlePath = paths.join(self.exportTempDir, paths.basename(bundlePath));
 
                                 self.archUtil.compressTo(
@@ -1035,8 +1035,8 @@ function FTNMessageScanTossModule() {
                             const ext = paths.extname(oldPath).toLowerCase();
                             if('.pk_' === ext.toLowerCase()) {
                                 //
-                                //	For a given temporary .pk_ file, we need to move it to the outoing
-                                //	directory with the appropriate BSO style filename.
+                                //  For a given temporary .pk_ file, we need to move it to the outoing
+                                //  directory with the appropriate BSO style filename.
                                 //
                                 const newExt = self.getOutgoingFlowFileExtension(
                                     exportOpts.destAddress,
@@ -1062,7 +1062,7 @@ function FTNMessageScanTossModule() {
                                     }
 
                                     //
-                                    //	For bundles, we need to append to the appropriate flow file
+                                    //  For bundles, we need to append to the appropriate flow file
                                     //
                                     const flowFilePath = self.getOutgoingFlowFileName(
                                         outgoingDir,
@@ -1072,7 +1072,7 @@ function FTNMessageScanTossModule() {
                                         exportOpts.fileCase
                                     );
 
-                                    //	directive of '^' = delete file after transfer
+                                    //  directive of '^' = delete file after transfer
                                     self.flowFileAppendRefs(flowFilePath, [ newPath ], '^', err => {
                                         if(err) {
                                             Log.warn( { path : flowFilePath }, 'Failed appending flow reference record!');
@@ -1085,31 +1085,31 @@ function FTNMessageScanTossModule() {
                     }
                 ],
                 err => {
-                    //	:TODO: do something with |err| ?
+                    //  :TODO: do something with |err| ?
                     if(err) {
                         Log.warn(err.message);
                     }
                     nextUplink();
                 }
             );
-        }, cb);	//	complete
+        }, cb); //  complete
     };
 
     this.setReplyToMsgIdFtnReplyKludge = function(message, cb) {
         //
-        //	Given a FTN REPLY kludge, set |message.replyToMsgId|, if possible,
-        //	by looking up an associated MSGID kludge meta.
+        //  Given a FTN REPLY kludge, set |message.replyToMsgId|, if possible,
+        //  by looking up an associated MSGID kludge meta.
         //
-        //	See also: http://ftsc.org/docs/fts-0009.001
+        //  See also: http://ftsc.org/docs/fts-0009.001
         //
         if(!_.isString(message.meta.FtnKludge.REPLY)) {
-            //	nothing to do
+            //  nothing to do
             return cb();
         }
 
         Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => {
             if(msgIds && msgIds.length > 0) {
-                //	expect a single match, but dupe checking is not perfect - warn otherwise
+                //  expect a single match, but dupe checking is not perfect - warn otherwise
                 if(1 === msgIds.length) {
                     message.replyToMsgId = msgIds[0];
                 } else {
@@ -1125,7 +1125,7 @@ function FTNMessageScanTossModule() {
 
         const aliases = _.get(Config(), 'messageNetworks.ftn.netMail.aliases');
         if(!aliases) {
-            return lookup;	//	keep orig
+            return lookup;  //  keep orig
         }
 
         const alias = _.find(aliases, (localName, alias) => {
@@ -1148,7 +1148,7 @@ function FTNMessageScanTossModule() {
         }
 
         const fromPoint = _.get(message, 'meta.FtnKludge.FMPT');
-        const toPoint	= _.get(message, 'meta.FtnKludge.TOPT');
+        const toPoint   = _.get(message, 'meta.FtnKludge.TOPT');
 
         if(fromPoint) {
             from += `.${fromPoint}`;
@@ -1172,7 +1172,7 @@ function FTNMessageScanTossModule() {
                 },
                 function checkForDupeMSGID(callback) {
                     //
-                    //	If we have a MSGID, don't allow a dupe
+                    //  If we have a MSGID, don't allow a dupe
                     //
                     if(!_.has(message.meta, 'FtnKludge.MSGID')) {
                         return callback(null);
@@ -1191,16 +1191,16 @@ function FTNMessageScanTossModule() {
                 function basicSetup(callback) {
                     message.areaTag = config.localAreaTag;
 
-                    //	indicate this was imported from FTN
+                    //  indicate this was imported from FTN
                     message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.AddressFlavor.FTN;
 
                     //
-                    //	If we *allow* dupes (disabled by default), then just generate
-                    //	a random UUID. Otherwise, don't assign the UUID just yet. It will be
-                    //	generated at persist() time and should be consistent across import/exports
+                    //  If we *allow* dupes (disabled by default), then just generate
+                    //  a random UUID. Otherwise, don't assign the UUID just yet. It will be
+                    //  generated at persist() time and should be consistent across import/exports
                     //
                     if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
-                        //	just generate a UUID & therefor always allow for dupes
+                        //  just generate a UUID & therefor always allow for dupes
                         message.uuid = uuidV4();
                     }
 
@@ -1213,15 +1213,15 @@ function FTNMessageScanTossModule() {
                 },
                 function setupPrivateMessage(callback) {
                     //
-                    //	If this is a private message (e.g. NetMail) we set the local user ID
+                    //  If this is a private message (e.g. NetMail) we set the local user ID
                     //
                     if(Message.WellKnownAreaTags.Private !== config.localAreaTag) {
                         return callback(null);
                     }
 
                     //
-                    //	Create a meta value for the *remote* from user. In the case here with FTN,
-                    //	their fully qualified FTN from address
+                    //  Create a meta value for the *remote* from user. In the case here with FTN,
+                    //  their fully qualified FTN from address
                     //
                     const { from } = self.getAddressesFromNetMailMessage(message);
 
@@ -1236,8 +1236,8 @@ function FTNMessageScanTossModule() {
                     User.getUserIdAndNameByLookup(lookupName, (err, localToUserId, localUserName) => {
                         if(err) {
                             //
-                            //	Couldn't find a local username. If the toUserName itself is a FTN address
-                            //	we can only assume the message is to the +op, else we'll have to fail.
+                            //  Couldn't find a local username. If the toUserName itself is a FTN address
+                            //  we can only assume the message is to the +op, else we'll have to fail.
                             //
                             const toUserNameAsAddress = Address.fromString(message.toUserName);
                             if(toUserNameAsAddress.isValid()) {
@@ -1261,21 +1261,21 @@ function FTNMessageScanTossModule() {
                             }
                         }
 
-                        //	we do this after such that error cases can be preseved above
+                        //  we do this after such that error cases can be preseved above
                         if(lookupName !== message.toUserName) {
                             message.toUserName = localUserName;
                         }
 
-                        //	set the meta information - used elsehwere for retrieval
+                        //  set the meta information - used elsehwere for retrieval
                         message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
                         return callback(null);
                     });
                 },
                 function persistImport(callback) {
-                    //	mark as imported
+                    //  mark as imported
                     message.meta.System.state_flags0 = Message.StateFlags0.Imported.toString();
 
-                    //	save to disc
+                    //  save to disc
                     message.persist(err => {
                         return callback(err);
                     });
@@ -1298,19 +1298,19 @@ function FTNMessageScanTossModule() {
     };
 
     //
-    //	Ref. implementations on import:
-    //	*	https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/pkt.c
-    //		https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/handle.c
+    //  Ref. implementations on import:
+    //  *   https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/pkt.c
+    //      https://github.com/larsks/crashmail/blob/26e5374710c7868dab3d834be14bf4041041aae5/crashmail/handle.c
     //
     this.importMessagesFromPacketFile = function(packetPath, password, cb) {
         let packetHeader;
 
-        const packetOpts = { keepTearAndOrigin : false };	//	needed so we can calc message UUID without these; we'll add later
+        const packetOpts = { keepTearAndOrigin : false };   //  needed so we can calc message UUID without these; we'll add later
 
         let importStats = {
-            areaSuccess	: {},	//	areaTag->count
-            areaFail	: {},	//	areaTag->count
-            otherFail	: 0,
+            areaSuccess : {},   //  areaTag->count
+            areaFail    : {},   //  areaTag->count
+            otherFail   : 0,
         };
 
         new ftnMailPacket.Packet(packetOpts).read(packetPath, (entryType, entryData, next) => {
@@ -1323,7 +1323,7 @@ function FTNMessageScanTossModule() {
                     return next(new Error(`No local configuration for packet addressed to ${addrString}`));
                 } else {
 
-                    //	:TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!
+                    //  :TODO: password needs validated - need to determine if it will use the same node config (which can have wildcards) or something else?!
                     return next(null);
                 }
 
@@ -1337,19 +1337,19 @@ function FTNMessageScanTossModule() {
 
                     if(!localAreaTag) {
                         //
-                        //	No local area configured for this import
+                        //  No local area configured for this import
                         //
-                        //	:TODO: Handle the "catch all" area bucket case if configured
+                        //  :TODO: Handle the "catch all" area bucket case if configured
                         Log.warn( { areaTag : areaTag }, 'No local area configured for this packet file!');
 
-                        //	bump generic failure
+                        //  bump generic failure
                         importStats.otherFail += 1;
 
                         return next(null);
                     }
                 } else {
                     //
-                    //	No area tag: If marked private in attributes, this is a NetMail
+                    //  No area tag: If marked private in attributes, this is a NetMail
                     //
                     if(message.meta.FtnProperty.ftn_attr_flags & ftnMailPacket.Packet.Attribute.Private) {
                         localAreaTag = Message.WellKnownAreaTags.Private;
@@ -1369,12 +1369,12 @@ function FTNMessageScanTossModule() {
                 self.appendTearAndOrigin(message);
 
                 const importConfig = {
-                    localAreaTag	: localAreaTag,
+                    localAreaTag    : localAreaTag,
                 };
 
                 self.importMailToArea(importConfig, packetHeader, message, err => {
                     if(err) {
-                        //	bump area fail stats
+                        //  bump area fail stats
                         importStats.areaFail[localAreaTag] = (importStats.areaFail[localAreaTag] || 0) + 1;
 
                         if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
@@ -1386,7 +1386,7 @@ function FTNMessageScanTossModule() {
                             return next(null);
                         }
                     } else {
-                        //	bump area success
+                        //  bump area success
                         importStats.areaSuccess[localAreaTag] = (importStats.areaSuccess[localAreaTag] || 0) + 1;
                     }
 
@@ -1395,7 +1395,7 @@ function FTNMessageScanTossModule() {
             }
         }, err => {
             //
-            //	try to produce something helpful in the log
+            //  try to produce something helpful in the log
             //
             const finalStats = Object.assign(importStats, { packetPath : packetPath } );
             if(err || Object.keys(finalStats.areaFail).length > 0) {
@@ -1414,11 +1414,11 @@ function FTNMessageScanTossModule() {
 
     this.maybeArchiveImportFile = function(origPath, type, status, cb) {
         //
-        //	type	: pkt|tic|bundle
-        //	status	: good|reject
+        //  type    : pkt|tic|bundle
+        //  status  : good|reject
         //
-        //	Status of "good" is only applied to pkt files & placed
-        //	in |retain| if set. This is generally used for debugging only.
+        //  Status of "good" is only applied to pkt files & placed
+        //  in |retain| if set. This is generally used for debugging only.
         //
         let archivePath;
         const ts = moment().format('YYYY-MM-DDTHH.mm.ss.SSS');
@@ -1433,7 +1433,7 @@ function FTNMessageScanTossModule() {
         } else if('good' !== status) {
             archivePath = paths.join(self.moduleConfig.paths.reject, `${status}-${type}--${ts}-${fn}`);
         } else {
-            return cb(null);	//	don't archive non-good/pkt files
+            return cb(null);    //  don't archive non-good/pkt files
         }
 
         Log.debug( { origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Archiving import file');
@@ -1443,7 +1443,7 @@ function FTNMessageScanTossModule() {
                 Log.warn( { error : err.message, origPath : origPath, archivePath : archivePath, type : type, status : status }, 'Failed to archive packet file');
             }
 
-            return cb(null);	//	never fatal
+            return cb(null);    //  never fatal
         });
     };
 
@@ -1472,13 +1472,13 @@ function FTNMessageScanTossModule() {
                             nextFile();
                         });
                     }, err => {
-                        //	:TODO: Handle err! we should try to keep going though...
+                        //  :TODO: Handle err! we should try to keep going though...
                         callback(err, packetFiles, rejects);
                     });
                 },
                 function handleProcessedFiles(packetFiles, rejects, callback) {
                     async.each(packetFiles, (packetFile, nextFile) => {
-                        //	possibly archive, then remove original
+                        //  possibly archive, then remove original
                         const fullPath = paths.join(importDir, packetFile);
                         self.maybeArchiveImportFile(
                             fullPath,
@@ -1504,7 +1504,7 @@ function FTNMessageScanTossModule() {
     this.importFromDirectory = function(inboundType, importDir, cb) {
         async.waterfall(
             [
-                //	start with .pkt files
+                //  start with .pkt files
                 function importPacketFiles(callback) {
                     self.importPacketFilesFromDirectory(importDir, '', err => {
                         callback(err);
@@ -1512,7 +1512,7 @@ function FTNMessageScanTossModule() {
                 },
                 function discoverBundles(callback) {
                     fs.readdir(importDir, (err, files) => {
-                        //	:TODO: if we do much more of this, probably just use the glob module
+                        //  :TODO: if we do much more of this, probably just use the glob module
                         const bundleRegExp = /\.(su|mo|tu|we|th|fr|sa)[0-9a-z]/i;
                         files = files.filter(f => {
                             const fext = paths.extname(f);
@@ -1540,7 +1540,7 @@ function FTNMessageScanTossModule() {
 
                             rejects.push(bundleFile.path);
 
-                            return nextFile();	//	unknown archive type
+                            return nextFile();  //  unknown archive type
                         }
 
                         Log.debug( { bundleFile : bundleFile }, 'Processing bundle' );
@@ -1567,10 +1567,10 @@ function FTNMessageScanTossModule() {
                         }
 
                         //
-                        //	All extracted - import .pkt's
+                        //  All extracted - import .pkt's
                         //
                         self.importPacketFilesFromDirectory(self.importTempDir, '', () => {
-                            //	:TODO: handle |err|
+                            //  :TODO: handle |err|
                             callback(null, bundleFiles, rejects);
                         });
                     });
@@ -1622,7 +1622,7 @@ function FTNMessageScanTossModule() {
         });
     };
 
-    //	Starts an export block - returns true if we can proceed
+    //  Starts an export block - returns true if we can proceed
     this.exportingStart = function() {
         if(!this.exportRunning) {
             this.exportRunning = true;
@@ -1632,7 +1632,7 @@ function FTNMessageScanTossModule() {
         return false;
     };
 
-    //	ends an export block
+    //  ends an export block
     this.exportingEnd = function(cb) {
         this.exportRunning = false;
 
@@ -1666,9 +1666,9 @@ function FTNMessageScanTossModule() {
                 function generalValidation(callback) {
                     const sysConfig = Config();
                     const config = {
-                        nodes			: sysConfig.scannerTossers.ftn_bso.nodes,
-                        defaultPassword	: sysConfig.scannerTossers.ftn_bso.tic.password,
-                        localAreaTags	: self.getLocalAreaTagsForTic(),
+                        nodes           : sysConfig.scannerTossers.ftn_bso.nodes,
+                        defaultPassword : sysConfig.scannerTossers.ftn_bso.tic.password,
+                        localAreaTags   : self.getLocalAreaTagsForTic(),
                     };
 
                     return ticFileInfo.validate(config, (err, localInfo) => {
@@ -1677,14 +1677,14 @@ function FTNMessageScanTossModule() {
                             return callback(err);
                         }
 
-                        //	We may need to map |localAreaTag| back to real areaTag if it's a mapping/alias
+                        //  We may need to map |localAreaTag| back to real areaTag if it's a mapping/alias
                         const mappedLocalAreaTag = _.get(Config().scannerTossers.ftn_bso, [ 'ticAreas', localInfo.areaTag ]);
 
                         if(mappedLocalAreaTag) {
                             if(_.isString(mappedLocalAreaTag.areaTag)) {
-                                localInfo.areaTag		= mappedLocalAreaTag.areaTag;
-                                localInfo.hashTags		= mappedLocalAreaTag.hashTags;		//	override default for node
-                                localInfo.storageTag	= mappedLocalAreaTag.storageTag;	//	override default
+                                localInfo.areaTag       = mappedLocalAreaTag.areaTag;
+                                localInfo.hashTags      = mappedLocalAreaTag.hashTags;      //  override default for node
+                                localInfo.storageTag    = mappedLocalAreaTag.storageTag;    //  override default
                             } else if(_.isString(mappedLocalAreaTag)) {
                                 localInfo.areaTag = mappedLocalAreaTag;
                             }
@@ -1695,18 +1695,18 @@ function FTNMessageScanTossModule() {
                 },
                 function findExistingItem(localInfo, callback) {
                     //
-                    //	We will need to look for an existing item to replace/update if:
-                    //	a) The TIC file has a "Replaces" field
-                    //	b) The general or node specific |allowReplace| is true
+                    //  We will need to look for an existing item to replace/update if:
+                    //  a) The TIC file has a "Replaces" field
+                    //  b) The general or node specific |allowReplace| is true
                     //
-                    //	Replace specifies a DOS 8.3 *pattern* which is allowed to have
-                    //	? and * characters. For example, RETRONET.*
+                    //  Replace specifies a DOS 8.3 *pattern* which is allowed to have
+                    //  ? and * characters. For example, RETRONET.*
                     //
-                    //	Lastly, we will only replace if the item is in the same/specified area
-                    //	and that come from the same origin as a previous entry.
+                    //  Lastly, we will only replace if the item is in the same/specified area
+                    //  and that come from the same origin as a previous entry.
                     //
-                    const allowReplace	= _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config().scannerTossers.ftn_bso.tic.allowReplace);
-                    const replaces		= ticFileInfo.getAsString('Replaces');
+                    const allowReplace  = _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'allowReplace' ], Config().scannerTossers.ftn_bso.tic.allowReplace);
+                    const replaces      = ticFileInfo.getAsString('Replaces');
 
                     if(!allowReplace || !replaces) {
                         return callback(null, localInfo);
@@ -1714,13 +1714,13 @@ function FTNMessageScanTossModule() {
 
                     const metaPairs = [
                         {
-                            name		: 'short_file_name',
-                            value		: replaces.toUpperCase(),	//	we store upper as well
-                            wildcards	: true,	//	value may contain wildcards
+                            name        : 'short_file_name',
+                            value       : replaces.toUpperCase(),   //  we store upper as well
+                            wildcards   : true, //  value may contain wildcards
                         },
                         {
-                            name	: 'tic_origin',
-                            value	: ticFileInfo.getAsString('Origin'),
+                            name    : 'tic_origin',
+                            value   : ticFileInfo.getAsString('Origin'),
                         }
                     ];
 
@@ -1729,11 +1729,11 @@ function FTNMessageScanTossModule() {
                             return callback(err);
                         }
 
-                        //	0:1 allowed
+                        //  0:1 allowed
                         if(1 === fileIds.length) {
                             localInfo.existingFileId = fileIds[0];
 
-                            //	fetch old filename - we may need to remove it if replacing with a new name
+                            //  fetch old filename - we may need to remove it if replacing with a new name
                             FileEntry.loadBasicEntry(localInfo.existingFileId, {}, (err, info) => {
                                 if(info) {
                                     Log.trace(
@@ -1741,10 +1741,10 @@ function FTNMessageScanTossModule() {
                                         'Existing TIC file target to be replaced'
                                     );
 
-                                    localInfo.oldFileName 	= info.fileName;
-                                    localInfo.oldStorageTag	= info.storageTag;
+                                    localInfo.oldFileName   = info.fileName;
+                                    localInfo.oldStorageTag = info.storageTag;
                                 }
-                                return callback(null, localInfo);	//	continue even if we couldn't find an old match
+                                return callback(null, localInfo);   //  continue even if we couldn't find an old match
                             });
                         } else if(fileIds.legnth > 1) {
                             return callback(Errors.General(`More than one existing entry for TIC in ${localInfo.areaTag} ([${fileIds.join(', ')}])`));
@@ -1755,13 +1755,13 @@ function FTNMessageScanTossModule() {
                 },
                 function scan(localInfo, callback) {
                     const scanOpts = {
-                        sha256		: localInfo.sha256,	//	*may* have already been calculated
-                        meta		: {
-                            //	some TIC-related metadata we always want
-                            short_file_name		: ticFileInfo.getAsString('File').toUpperCase(),	//	upper to ensure no case issues later; this should be a DOS 8.3 name
-                            tic_origin			: ticFileInfo.getAsString('Origin'),
-                            tic_desc			: ticFileInfo.getAsString('Desc'),
-                            upload_by_username	: _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config().scannerTossers.ftn_bso.tic.uploadBy),
+                        sha256      : localInfo.sha256, //  *may* have already been calculated
+                        meta        : {
+                            //  some TIC-related metadata we always want
+                            short_file_name     : ticFileInfo.getAsString('File').toUpperCase(),    //  upper to ensure no case issues later; this should be a DOS 8.3 name
+                            tic_origin          : ticFileInfo.getAsString('Origin'),
+                            tic_desc            : ticFileInfo.getAsString('Desc'),
+                            upload_by_username  : _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ], Config().scannerTossers.ftn_bso.tic.uploadBy),
                         }
                     };
 
@@ -1771,18 +1771,18 @@ function FTNMessageScanTossModule() {
                     }
 
                     //
-                    //	We may have TIC auto-tagging for this node and/or specific (remote) area
+                    //  We may have TIC auto-tagging for this node and/or specific (remote) area
                     //
                     const hashTags =
-						localInfo.hashTags ||
-						_.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );		//	catch-all*/
+                        localInfo.hashTags ||
+                        _.get(Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'hashTags' ] );       //  catch-all*/
 
                     if(hashTags) {
                         scanOpts.hashTags = new Set(hashTags.split(/[\s,]+/));
                     }
 
                     if(localInfo.crc32) {
-                        scanOpts.meta.file_crc32 = localInfo.crc32.toString(16);	//	again, *may* have already been calculated
+                        scanOpts.meta.file_crc32 = localInfo.crc32.toString(16);    //  again, *may* have already been calculated
                     }
 
                     scanFile(
@@ -1800,7 +1800,7 @@ function FTNMessageScanTossModule() {
                 },
                 function store(localInfo, callback) {
                     //
-                    //	Move file to final area storage and persist to DB
+                    //  Move file to final area storage and persist to DB
                     //
                     const areaInfo = getFileAreaByTag(localInfo.areaTag);
                     if(!areaInfo) {
@@ -1812,15 +1812,15 @@ function FTNMessageScanTossModule() {
                         return callback(Errors.Invalid(`Invalid storage tag: ${storageTag}`));
                     }
 
-                    localInfo.fileEntry.storageTag	= storageTag;
-                    localInfo.fileEntry.areaTag		= localInfo.areaTag;
-                    localInfo.fileEntry.fileName	= ticFileInfo.longFileName;
+                    localInfo.fileEntry.storageTag  = storageTag;
+                    localInfo.fileEntry.areaTag     = localInfo.areaTag;
+                    localInfo.fileEntry.fileName    = ticFileInfo.longFileName;
 
                     //
-                    //	We may now have two descriptions: from .DIZ/etc. or the TIC itself.
-                    //	Determine which one to use using |descPriority| and availability.
+                    //  We may now have two descriptions: from .DIZ/etc. or the TIC itself.
+                    //  Determine which one to use using |descPriority| and availability.
                     //
-                    //	We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
+                    //  We will still fallback as needed from <priority1> -> <priority2> -> <fromFileName>
                     //
                     const descPriority = _.get(
                         Config().scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'descPriority' ],
@@ -1831,7 +1831,7 @@ function FTNMessageScanTossModule() {
                         const origDesc = localInfo.fileEntry.desc;
                         localInfo.fileEntry.desc = ticFileInfo.getAsString('Ldesc') || origDesc || getDescFromFileName(ticFileInfo.filePath);
                     } else {
-                        //	see if we got desc from .DIZ/etc.
+                        //  see if we got desc from .DIZ/etc.
                         const fromDescFile = 'descFile' === localInfo.fileEntry.descSrc;
                         localInfo.fileEntry.desc = fromDescFile ? localInfo.fileEntry.desc : ticFileInfo.getAsString('Ldesc');
                         localInfo.fileEntry.desc = localInfo.fileEntry.desc || getDescFromFileName(ticFileInfo.filePath);
@@ -1845,7 +1845,7 @@ function FTNMessageScanTossModule() {
                     const isUpdate = localInfo.existingFileId ? true : false;
 
                     if(isUpdate) {
-                        //	we need to *update* an existing record/file
+                        //  we need to *update* an existing record/file
                         localInfo.fileEntry.fileId = localInfo.existingFileId;
                     }
 
@@ -1866,14 +1866,14 @@ function FTNMessageScanTossModule() {
                         });
                     });
                 },
-                //	:TODO: from here, we need to re-toss files if needed, before they are removed
+                //  :TODO: from here, we need to re-toss files if needed, before they are removed
                 function cleanupOldFile(localInfo, callback) {
                     if(!localInfo.existingFileId) {
                         return callback(null, localInfo);
                     }
 
                     const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
-                    const oldPath 		= paths.join(oldStorageDir, localInfo.oldFileName);
+                    const oldPath       = paths.join(oldStorageDir, localInfo.oldFileName);
 
                     fs.unlink(oldPath, err => {
                         if(err) {
@@ -1881,7 +1881,7 @@ function FTNMessageScanTossModule() {
                         } else {
                             Log.debug( { oldPath : oldPath }, 'Removed old physical file during TIC replacement');
                         }
-                        return callback(null, localInfo);	//	continue even if err
+                        return callback(null, localInfo);   //  continue even if err
                     });
                 },
             ],
@@ -1902,7 +1902,7 @@ function FTNMessageScanTossModule() {
     this.removeAssocTicFiles = function(ticFileInfo, cb) {
         async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
             fs.unlink(path, err => {
-                if(err && 'ENOENT' !== err.code) {	//	don't log when the file doesn't exist
+                if(err && 'ENOENT' !== err.code) {  //  don't log when the file doesn't exist
                     Log.warn( { error : err.message, path : path }, 'Failed unlinking TIC file');
                 }
                 return nextPath(null);
@@ -1915,23 +1915,23 @@ function FTNMessageScanTossModule() {
 
     this.performEchoMailExport = function(cb) {
         //
-        //	Select all messages with a |message_id| > |lastScanId|.
-        //	Additionally exclude messages with the System state_flags0 which will be present for
-        //	imported or already exported messages
+        //  Select all messages with a |message_id| > |lastScanId|.
+        //  Additionally exclude messages with the System state_flags0 which will be present for
+        //  imported or already exported messages
         //
-        //	NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
+        //  NOTE: If StateFlags0 starts to use additional bits, we'll likely need to check them here!
         //
         const getNewUuidsSql =
-			`SELECT message_id, message_uuid
-			FROM message m
-			WHERE area_tag = ? AND message_id > ? AND
-				(SELECT COUNT(message_id) 
-				FROM message_meta 
-				WHERE message_id = m.message_id AND meta_category = 'System' AND meta_name = 'state_flags0') = 0
-			ORDER BY message_id;`
-			;
+            `SELECT message_id, message_uuid
+            FROM message m
+            WHERE area_tag = ? AND message_id > ? AND
+                (SELECT COUNT(message_id) 
+                FROM message_meta 
+                WHERE message_id = m.message_id AND meta_category = 'System' AND meta_name = 'state_flags0') = 0
+            ORDER BY message_id;`
+            ;
 
-        //	we shouldn't, but be sure we don't try to pick up private mail here
+        //  we shouldn't, but be sure we don't try to pick up private mail here
         const config = Config();
         const areaTags = Object.keys(config.messageNetworks.ftn.areas)
             .filter(areaTag => Message.WellKnownAreaTags.Private !== areaTag);
@@ -1943,8 +1943,8 @@ function FTNMessageScanTossModule() {
             }
 
             //
-            //	For each message that is newer than that of the last scan
-            //	we need to export to each configured associated uplink(s)
+            //  For each message that is newer than that of the last scan
+            //  we need to export to each configured associated uplink(s)
             //
             async.waterfall(
                 [
@@ -1967,7 +1967,7 @@ function FTNMessageScanTossModule() {
                         });
                     },
                     function exportToConfiguredUplinks(msgRows, callback) {
-                        const uuidsOnly = msgRows.map(r => r.message_uuid);	//	convert to array of UUIDs only
+                        const uuidsOnly = msgRows.map(r => r.message_uuid); //  convert to array of UUIDs only
                         self.exportEchoMailMessagesToUplinks(uuidsOnly, areaConfig, err => {
                             const newLastScanId = msgRows[msgRows.length - 1].message_id;
 
@@ -1994,35 +1994,35 @@ function FTNMessageScanTossModule() {
 
     this.performNetMailExport = function(cb) {
         //
-        //	Select all messages with a |message_id| > |lastScanId| in the private area
-        //	that are schedule for export to FTN-style networks.
+        //  Select all messages with a |message_id| > |lastScanId| in the private area
+        //  that are schedule for export to FTN-style networks.
         //
-        //	Just like EchoMail, we additionally exclude messages with the System state_flags0
-        //	which will be present for imported or already exported messages
+        //  Just like EchoMail, we additionally exclude messages with the System state_flags0
+        //  which will be present for imported or already exported messages
         //
         //
-        //	:TODO: fill out the rest of the consts here
-        //	:TODO: this statement is crazy ugly -- use JOIN / NOT EXISTS for state_flags & 0x02
+        //  :TODO: fill out the rest of the consts here
+        //  :TODO: this statement is crazy ugly -- use JOIN / NOT EXISTS for state_flags & 0x02
         const getNewUuidsSql =
-			`SELECT message_id, message_uuid
-			FROM message m
-			WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
-				(SELECT COUNT(message_id)
-				FROM message_meta
-				WHERE message_id = m.message_id
-					AND meta_category = 'System'
-					AND (meta_name = 'state_flags0' OR meta_name = 'local_to_user_id')
-				) = 0
-			AND
-				(SELECT COUNT(message_id)
-				FROM message_meta
-				WHERE message_id = m.message_id
-					AND meta_category = 'System' 
-					AND meta_name = '${Message.SystemMetaNames.ExternalFlavor}'
-					AND meta_value = '${Message.AddressFlavor.FTN}'
-				) = 1
-			ORDER BY message_id;
-			`;
+            `SELECT message_id, message_uuid
+            FROM message m
+            WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
+                (SELECT COUNT(message_id)
+                FROM message_meta
+                WHERE message_id = m.message_id
+                    AND meta_category = 'System'
+                    AND (meta_name = 'state_flags0' OR meta_name = 'local_to_user_id')
+                ) = 0
+            AND
+                (SELECT COUNT(message_id)
+                FROM message_meta
+                WHERE message_id = m.message_id
+                    AND meta_category = 'System' 
+                    AND meta_name = '${Message.SystemMetaNames.ExternalFlavor}'
+                    AND meta_value = '${Message.AddressFlavor.FTN}'
+                ) = 1
+            ORDER BY message_id;
+            `;
 
         async.waterfall(
             [
@@ -2036,7 +2036,7 @@ function FTNMessageScanTossModule() {
                         }
 
                         if(0 === rows.length) {
-                            return cb(null);	//	note |cb| -- early bail out!
+                            return cb(null);    //  note |cb| -- early bail out!
                         }
 
                         return callback(null, rows);
@@ -2055,17 +2055,17 @@ function FTNMessageScanTossModule() {
 
     this.isNetMailMessage = function(message) {
         return message.isPrivate() &&
-			null === _.get(message, 'meta.System.LocalToUserID', null) &&
-			Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null);
+            null === _.get(message, 'meta.System.LocalToUserID', null) &&
+            Message.AddressFlavor.FTN === _.get(message, 'meta.System.external_flavor', null);
     };
 }
 
 require('util').inherits(FTNMessageScanTossModule, MessageScanTossModule);
 
-//	:TODO: *scheduled* portion of this stuff should probably use event_scheduler - @immediate would still use record().
+//  :TODO: *scheduled* portion of this stuff should probably use event_scheduler - @immediate would still use record().
 
 FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importDir, cb) {
-    //	:TODO: pass in 'inbound' vs 'secInbound' -- pass along to processSingleTicFile() where password will be checked
+    //  :TODO: pass in 'inbound' vs 'secInbound' -- pass along to processSingleTicFile() where password will be checked
 
     const self = this;
     async.waterfall(
@@ -2103,9 +2103,9 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
                 async.eachSeries(ticFilesInfo, (ticFileInfo, nextTicInfo) => {
                     self.processSingleTicFile(ticFileInfo, err => {
                         if(err) {
-                            //	archive rejected TIC stuff (.TIC + attach)
+                            //  archive rejected TIC stuff (.TIC + attach)
                             async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
-                                if(!path) {	//	possibly rejected due to "File" not existing/etc.
+                                if(!path) { //  possibly rejected due to "File" not existing/etc.
                                     return nextPath(null);
                                 }
 
@@ -2170,10 +2170,10 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
             if(exportSchedule) {
                 Log.debug(
                     {
-                        schedule	: this.moduleConfig.schedule.export,
-                        schedOK		: -1 === exportSchedule.sched.error,
-                        next		: moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
-                        immediate	: exportSchedule.immediate ? true : false,
+                        schedule    : this.moduleConfig.schedule.export,
+                        schedOK     : -1 === exportSchedule.sched.error,
+                        next        : moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        immediate   : exportSchedule.immediate ? true : false,
                     },
                     'Export schedule loaded'
                 );
@@ -2199,10 +2199,10 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
             if(importSchedule) {
                 Log.debug(
                     {
-                        schedule	: this.moduleConfig.schedule.import,
-                        schedOK		: -1 === importSchedule.sched.error,
-                        next		: moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
-                        watchFile	: _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
+                        schedule    : this.moduleConfig.schedule.import,
+                        schedOK     : -1 === importSchedule.sched.error,
+                        next        : moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        watchFile   : _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
                     },
                     'Import schedule loaded'
                 );
@@ -2231,8 +2231,8 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
                     });
 
                     //
-                    //	If the watch file already exists, kick off now
-                    //	https://github.com/NuSkooler/enigma-bbs/issues/122
+                    //  If the watch file already exists, kick off now
+                    //  https://github.com/NuSkooler/enigma-bbs/issues/122
                     //
                     fse.exists(importSchedule.watchFile, exists => {
                         if(exists) {
@@ -2259,14 +2259,14 @@ FTNMessageScanTossModule.prototype.shutdown = function(cb) {
     }
 
     //
-    //	Clean up temp dir/files we created
+    //  Clean up temp dir/files we created
     //
     temptmp.cleanup( paths => {
         const fullStats = {
-            exportDir	: this.exportTempDir,
-            importTemp	: this.importTempDir,
-            paths		: paths,
-            sessionId	: temptmp.sessionId,
+            exportDir   : this.exportTempDir,
+            importTemp  : this.importTempDir,
+            paths       : paths,
+            sessionId   : temptmp.sessionId,
         };
 
         Log.trace(fullStats, 'Temporary directories cleaned up');
@@ -2293,8 +2293,8 @@ FTNMessageScanTossModule.prototype.performImport = function(cb) {
 
 FTNMessageScanTossModule.prototype.performExport = function(cb) {
     //
-    //	We're only concerned with areas related to FTN. For each area, loop though
-    //	and let's find out what messages need exported.
+    //  We're only concerned with areas related to FTN. For each area, loop though
+    //  and let's find out what messages need exported.
     //
     if(!this.hasValidConfiguration()) {
         return cb(new Error('Missing or invalid configuration'));
@@ -2307,7 +2307,7 @@ FTNMessageScanTossModule.prototype.performExport = function(cb) {
             if(err) {
                 Log.warn( { error : err.message, type : type }, 'Error(s) during export' );
             }
-            return nextType(null);	//	try next, always
+            return nextType(null);  //  try next, always
         });
     }, () => {
         return cb(null);
@@ -2316,7 +2316,7 @@ FTNMessageScanTossModule.prototype.performExport = function(cb) {
 
 FTNMessageScanTossModule.prototype.record = function(message) {
     //
-    //	This module works off schedules, but we do support @immediate for export
+    //  This module works off schedules, but we do support @immediate for export
     //
     if(true !== this.exportImmediate || !this.hasValidConfiguration()) {
         return;
diff --git a/core/server_module.js b/core/server_module.js
index 26000c1b..c9ba1cab 100644
--- a/core/server_module.js
+++ b/core/server_module.js
@@ -1,9 +1,9 @@
 /* jslint node: true */
 'use strict';
 
-var PluginModule		= require('./plugin_module.js').PluginModule;
+var PluginModule        = require('./plugin_module.js').PluginModule;
 
-exports.ServerModule	= ServerModule;
+exports.ServerModule    = ServerModule;
 
 function ServerModule() {
     PluginModule.call(this);
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index bc221b84..019dbffa 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -1,62 +1,62 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Log					= require('../../logger.js').log;
-const { ServerModule }		= require('../../server_module.js');
-const Config				= require('../../config.js').get;
+//  ENiGMA½
+const Log                   = require('../../logger.js').log;
+const { ServerModule }      = require('../../server_module.js');
+const Config                = require('../../config.js').get;
 const {
     splitTextAtTerms,
     isAnsi,
     cleanControlCodes
-}							= require('../../string_util.js');
+}                           = require('../../string_util.js');
 const {
     getMessageConferenceByTag,
     getMessageAreaByTag,
     getMessageListForArea,
-}							= require('../../message_area.js');
-const { sortAreasOrConfs }	= require('../../conf_area_util.js');
-const AnsiPrep				= require('../../ansi_prep.js');
+}                           = require('../../message_area.js');
+const { sortAreasOrConfs }  = require('../../conf_area_util.js');
+const AnsiPrep              = require('../../ansi_prep.js');
 
-//	deps
-const net					= require('net');
-const _						= require('lodash');
-const fs					= require('graceful-fs');
-const paths					= require('path');
-const moment				= require('moment');
+//  deps
+const net                   = require('net');
+const _                     = require('lodash');
+const fs                    = require('graceful-fs');
+const paths                 = require('path');
+const moment                = require('moment');
 
 const ModuleInfo = exports.moduleInfo = {
-    name		: 'Gopher',
-    desc		: 'Gopher Server',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.gopher.server',
+    name        : 'Gopher',
+    desc        : 'Gopher Server',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.gopher.server',
 };
 
-const Message				= require('../../message.js');
+const Message               = require('../../message.js');
 
 const ItemTypes = {
-    Invalid				: '',	//	not really a type, of course!
+    Invalid             : '',   //  not really a type, of course!
 
-    //	Canonical, RFC-1436
-    TextFile			: '0',
-    SubMenu				: '1',
-    CCSONameserver		: '2',
-    Error				: '3',
-    BinHexFile			: '4',
-    DOSFile				: '5',
-    UuEncodedFile		: '6',
-    FullTextSearch		: '7',
-    Telnet				: '8',
-    BinaryFile			: '9',
-    AltServer			: '+',
-    GIFFile				: 'g',
-    ImageFile			: 'I',
-    Telnet3270			: 'T',
+    //  Canonical, RFC-1436
+    TextFile            : '0',
+    SubMenu             : '1',
+    CCSONameserver      : '2',
+    Error               : '3',
+    BinHexFile          : '4',
+    DOSFile             : '5',
+    UuEncodedFile       : '6',
+    FullTextSearch      : '7',
+    Telnet              : '8',
+    BinaryFile          : '9',
+    AltServer           : '+',
+    GIFFile             : 'g',
+    ImageFile           : 'I',
+    Telnet3270          : 'T',
 
-    //	Non-canonical
-    HtmlFile			: 'h',
-    InfoMessage			: 'i',
-    SoundFile			: 's',
+    //  Non-canonical
+    HtmlFile            : 'h',
+    InfoMessage         : 'i',
+    SoundFile           : 's',
 };
 
 exports.getModule = class GopherModule extends ServerModule {
@@ -64,7 +64,7 @@ exports.getModule = class GopherModule extends ServerModule {
     constructor() {
         super();
 
-        this.routes = new Map();	//	selector->generator => gopher item
+        this.routes = new Map();    //  selector->generator => gopher item
         this.log = Log.child( { server : 'Gopher' } );
     }
 
@@ -75,7 +75,7 @@ exports.getModule = class GopherModule extends ServerModule {
 
         const config = Config();
         this.publicHostname = config.contentServers.gopher.publicHostname;
-        this.publicPort		= config.contentServers.gopher.publicPort;
+        this.publicPort     = config.contentServers.gopher.publicPort;
 
         this.addRoute(/^\/?\r\n$/, this.defaultGenerator);
         this.addRoute(/^\/msgarea(\/[a-z0-9_-]+(\/[a-z0-9_-]+)?(\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(_raw)?)?)?\/?\r\n$/, this.messageAreaGenerator);
@@ -88,7 +88,7 @@ exports.getModule = class GopherModule extends ServerModule {
             });
 
             socket.on('error', err => {
-                if('ECONNRESET' !== err.code) {	//	normal
+                if('ECONNRESET' !== err.code) { //  normal
                     this.log.trace( { error : err.message }, 'Socket error');
                 }
             });
@@ -97,7 +97,7 @@ exports.getModule = class GopherModule extends ServerModule {
 
     listen() {
         if(!this.enabled) {
-            return true;	//	nothing to do, but not an error
+            return true;    //  nothing to do, but not an error
         }
 
         const config = Config();
@@ -115,10 +115,10 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     isConfigured() {
-        //	public hostname & port must be set; responses contain them!
+        //  public hostname & port must be set; responses contain them!
         const config = Config();
         return _.isString(_.get(config, 'contentServers.gopher.publicHostname')) &&
-			_.isNumber(_.get(config, 'contentServers.gopher.publicPort'));
+            _.isNumber(_.get(config, 'contentServers.gopher.publicPort'));
     }
 
     addRoute(selectorRegExp, generatorHandler) {
@@ -149,7 +149,7 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     makeItem(itemType, text, selector, hostname, port) {
-        selector = selector || '';	//	e.g. for info
+        selector = selector || '';  //  e.g. for info
         hostname = hostname || this.publicHostname;
         port = port || this.publicPort;
         return `${itemType}${text}\t${selector}\t${hostname}\t${port}\r\n`;
@@ -186,10 +186,10 @@ exports.getModule = class GopherModule extends ServerModule {
             AnsiPrep(
                 body,
                 {
-                    cols			: 79,				//	Gopher std. wants 70, but we'll have to deal with it.
-                    forceLineTerm	: true,				//	ensure each line is term'd
-                    asciiMode		: true,				//	export to ASCII
-                    fillLines		: false,			//	don't fill up to |cols|
+                    cols            : 79,               //  Gopher std. wants 70, but we'll have to deal with it.
+                    forceLineTerm   : true,             //  ensure each line is term'd
+                    asciiMode       : true,             //  export to ASCII
+                    fillLines       : false,            //  don't fill up to |cols|
                 },
                 (err, prepped) => {
                     return cb(prepped || body);
@@ -207,21 +207,21 @@ exports.getModule = class GopherModule extends ServerModule {
     messageAreaGenerator(selectorMatch, cb) {
         this.log.trace( { selector : selectorMatch[0] }, 'Serving message area content');
         //
-        //	Selector should be:
-        //	/msgarea - list confs
-        //	/msgarea/conftag - list areas in conf
-        //	/msgarea/conftag/areatag - list messages in area
-        //	/msgarea/conftag/areatag/<UUID> - message as text
-        //	/msgarea/conftag/areatag/<UUID>_raw - full message as text + headers
+        //  Selector should be:
+        //  /msgarea - list confs
+        //  /msgarea/conftag - list areas in conf
+        //  /msgarea/conftag/areatag - list messages in area
+        //  /msgarea/conftag/areatag/<UUID> - message as text
+        //  /msgarea/conftag/areatag/<UUID>_raw - full message as text + headers
         //
         if(selectorMatch[3] || selectorMatch[4]) {
-            //	message
+            //  message
             //const raw = selectorMatch[4] ? true : false;
-            //	:TODO: support 'raw'
-            const msgUuid	= selectorMatch[3].replace(/\r\n|\//g, '');
-            const confTag	= selectorMatch[1].substr(1).split('/')[0];
-            const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
-            const message 	= new Message();
+            //  :TODO: support 'raw'
+            const msgUuid   = selectorMatch[3].replace(/\r\n|\//g, '');
+            const confTag   = selectorMatch[1].substr(1).split('/')[0];
+            const areaTag   = selectorMatch[2].replace(/\r\n|\//g, '');
+            const message   = new Message();
 
             return message.load( { uuid : msgUuid }, err => {
                 if(err) {
@@ -248,15 +248,15 @@ Subject: ${message.subject}
 ID     : ${message.messageUuid} (${message.messageId})
 ${'-'.repeat(70)}
 ${msgBody}
-	`;
+    `;
                     return cb(response);
                 });
             });
         } else if(selectorMatch[2]) {
-            //	list messages in area
-            const confTag	= selectorMatch[1].substr(1).split('/')[0];
-            const areaTag	= selectorMatch[2].replace(/\r\n|\//g, '');
-            const area		= getMessageAreaByTag(areaTag);
+            //  list messages in area
+            const confTag   = selectorMatch[1].substr(1).split('/')[0];
+            const areaTag   = selectorMatch[2].replace(/\r\n|\//g, '');
+            const area      = getMessageAreaByTag(areaTag);
 
             if(Message.isPrivateAreaTag(areaTag)) {
                 this.log.warn( { areaTag }, 'Attempted access to private area!');
@@ -283,10 +283,10 @@ ${msgBody}
                 return cb(response);
             });
         } else if(selectorMatch[1]) {
-            //	list areas in conf
+            //  list areas in conf
             const sysConfig = Config();
-            const confTag	= selectorMatch[1].replace(/\r\n|\//g, '');
-            const conf		= _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
+            const confTag   = selectorMatch[1].replace(/\r\n|\//g, '');
+            const conf      = _.get(sysConfig, [ 'contentServers', 'gopher', 'messageConferences', confTag ]) && getMessageConferenceByTag(confTag);
             if(!conf) {
                 return this.notFoundGenerator(selectorMatch, cb);
             }
@@ -310,10 +310,10 @@ ${msgBody}
 
             return cb(response);
         } else {
-            //	message area base (list confs)
+            //  message area base (list confs)
             const confs = Object.keys(_.get(Config(), 'contentServers.gopher.messageConferences', {}))
                 .map(confTag => Object.assign( { confTag }, getMessageConferenceByTag(confTag)))
-                .filter(conf => conf);	//	remove any baddies
+                .filter(conf => conf);  //  remove any baddies
 
             if(0 === confs.length) {
                 return cb(this.makeItem(ItemTypes.InfoMessage, 'No message conferences available'));
diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index c31a3720..7088b8f9 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -1,24 +1,24 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Log			= require('../../logger.js').log;
-const ServerModule	= require('../../server_module.js').ServerModule;
-const Config		= require('../../config.js').get;
+//  ENiGMA½
+const Log           = require('../../logger.js').log;
+const ServerModule  = require('../../server_module.js').ServerModule;
+const Config        = require('../../config.js').get;
 
-//	deps
-const http			= require('http');
-const https			= require('https');
-const _				= require('lodash');
-const fs			= require('graceful-fs');
-const paths			= require('path');
-const mimeTypes		= require('mime-types');
+//  deps
+const http          = require('http');
+const https         = require('https');
+const _             = require('lodash');
+const fs            = require('graceful-fs');
+const paths         = require('path');
+const mimeTypes     = require('mime-types');
 
 const ModuleInfo = exports.moduleInfo = {
-    name		: 'Web',
-    desc		: 'Web Server',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.web.server',
+    name        : 'Web',
+    desc        : 'Web Server',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.web.server',
 };
 
 class Route {
@@ -39,8 +39,8 @@ class Route {
     isValid() {
         return (
             this.pathRegExp instanceof RegExp &&
-			( -1 !== [ 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE',  ].indexOf(this.method) ) ||
-			!_.isFunction(this.handler)
+            ( -1 !== [ 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE',  ].indexOf(this.method) ) ||
+            !_.isFunction(this.handler)
         );
     }
 
@@ -55,28 +55,28 @@ exports.getModule = class WebServerModule extends ServerModule {
     constructor() {
         super();
 
-        const config 		= Config();
-        this.enableHttp		= config.contentServers.web.http.enabled || false;
-        this.enableHttps	= config.contentServers.web.https.enabled || false;
+        const config        = Config();
+        this.enableHttp     = config.contentServers.web.http.enabled || false;
+        this.enableHttps    = config.contentServers.web.https.enabled || false;
 
         this.routes = {};
 
         if(this.isEnabled() && config.contentServers.web.staticRoot) {
             this.addRoute({
-                method		: 'GET',
-                path		: '/static/.*$',
-                handler		: this.routeStaticFile.bind(this),
+                method      : 'GET',
+                path        : '/static/.*$',
+                handler     : this.routeStaticFile.bind(this),
             });
         }
     }
 
     buildUrl(pathAndQuery) {
         //
-        //	Create a URL such as
-        //	https://l33t.codes:44512/ + |pathAndQuery|
+        //  Create a URL such as
+        //  https://l33t.codes:44512/ + |pathAndQuery|
         //
-        //	Prefer HTTPS over HTTP. Be explicit about the port
-        //	only if non-standard. Allow users to override full prefix in config.
+        //  Prefer HTTPS over HTTP. Be explicit about the port
+        //  only if non-standard. Allow users to override full prefix in config.
         //
         const config = Config();
         if(_.isString(config.contentServers.web.overrideUrlPrefix)) {
@@ -86,13 +86,13 @@ exports.getModule = class WebServerModule extends ServerModule {
         let schema;
         let port;
         if(config.contentServers.web.https.enabled) {
-            schema	= 'https://';
-            port	=  (443 === config.contentServers.web.https.port) ?
+            schema  = 'https://';
+            port    =  (443 === config.contentServers.web.https.port) ?
                 '' :
                 `:${config.contentServers.web.https.port}`;
         } else {
-            schema	= 'http://';
-            port	= (80 === config.contentServers.web.http.port) ?
+            schema  = 'http://';
+            port    = (80 === config.contentServers.web.http.port) ?
                 '' :
                 `:${config.contentServers.web.http.port}`;
         }
@@ -112,11 +112,11 @@ exports.getModule = class WebServerModule extends ServerModule {
         const config = Config();
         if(this.enableHttps) {
             const options = {
-                cert	: fs.readFileSync(config.contentServers.web.https.certPem),
-                key		: fs.readFileSync(config.contentServers.web.https.keyPem),
+                cert    : fs.readFileSync(config.contentServers.web.https.certPem),
+                key     : fs.readFileSync(config.contentServers.web.https.keyPem),
             };
 
-            //	additional options
+            //  additional options
             Object.assign(options, config.contentServers.web.https.options || {} );
 
             this.httpsServer = https.createServer(options, (req, resp) => this.routeRequest(req, resp) );
@@ -178,18 +178,18 @@ exports.getModule = class WebServerModule extends ServerModule {
 
             if(err) {
                 return resp.end(`<!doctype html>
-					<html lang="en">
-						<head>
-						<meta charset="utf-8">
-						<title>${title}</title>
-						<meta name="viewport" content="width=device-width, initial-scale=1">
-						</head>
-						<body>
-							<article>
-								<h2>${bodyText}</h2>
-							</article>
-						</body>
-					</html>`
+                    <html lang="en">
+                        <head>
+                        <meta charset="utf-8">
+                        <title>${title}</title>
+                        <meta name="viewport" content="width=device-width, initial-scale=1">
+                        </head>
+                        <body>
+                            <article>
+                                <h2>${bodyText}</h2>
+                            </article>
+                        </body>
+                    </html>`
                 );
             }
 
@@ -227,8 +227,8 @@ exports.getModule = class WebServerModule extends ServerModule {
             }
 
             const headers = {
-                'Content-Type'		: mimeTypes.contentType(paths.basename(filePath)) || mimeTypes.contentType('.bin'),
-                'Content-Length'	: stats.size,
+                'Content-Type'      : mimeTypes.contentType(paths.basename(filePath)) || mimeTypes.contentType('.bin'),
+                'Content-Length'    : stats.size,
             };
 
             const readStream = fs.createReadStream(filePath);
@@ -251,8 +251,8 @@ exports.getModule = class WebServerModule extends ServerModule {
                 }
 
                 const headers = {
-                    'Content-Type'		: contentType || mimeTypes.contentType('.html'),
-                    'Content-Length'	: finalPage.length,
+                    'Content-Type'      : contentType || mimeTypes.contentType('.html'),
+                    'Content-Length'    : finalPage.length,
                 };
 
                 resp.writeHead(200, headers);
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 982ab0a1..016c215e 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config			= require('../../config.js').get;
-const baseClient		= require('../../client.js');
-const Log				= require('../../logger.js').log;
-const LoginServerModule	= require('../../login_server_module.js');
-const userLogin			= require('../../user_login.js').userLogin;
-const enigVersion 		= require('../../../package.json').version;
-const theme				= require('../../theme.js');
-const stringFormat		= require('../../string_format.js');
+//  ENiGMA½
+const Config            = require('../../config.js').get;
+const baseClient        = require('../../client.js');
+const Log               = require('../../logger.js').log;
+const LoginServerModule = require('../../login_server_module.js');
+const userLogin         = require('../../user_login.js').userLogin;
+const enigVersion       = require('../../../package.json').version;
+const theme             = require('../../theme.js');
+const stringFormat      = require('../../string_format.js');
 
-//	deps
-const ssh2			= require('ssh2');
-const fs			= require('graceful-fs');
-const util			= require('util');
-const _				= require('lodash');
-const assert		= require('assert');
+//  deps
+const ssh2          = require('ssh2');
+const fs            = require('graceful-fs');
+const util          = require('util');
+const _             = require('lodash');
+const assert        = require('assert');
 
 const ModuleInfo = exports.moduleInfo = {
-    name		: 'SSH',
-    desc		: 'SSH Server',
-    author		: 'NuSkooler',
-    isSecure	: true,
-    packageName	: 'codes.l33t.enigma.ssh.server',
+    name        : 'SSH',
+    desc        : 'SSH Server',
+    author      : 'NuSkooler',
+    isSecure    : true,
+    packageName : 'codes.l33t.enigma.ssh.server',
 };
 
 function SSHClient(clientConn) {
     baseClient.Client.apply(this, arguments);
 
     //
-    //	WARNING: Until we have emit 'ready', self.input, and self.output and
-    //	not yet defined!
+    //  WARNING: Until we have emit 'ready', self.input, and self.output and
+    //  not yet defined!
     //
 
     const self = this;
@@ -39,11 +39,11 @@ function SSHClient(clientConn) {
     let loginAttempts = 0;
 
     clientConn.on('authentication', function authAttempt(ctx) {
-        const username	= ctx.username || '';
-        const password	= ctx.password || '';
+        const username  = ctx.username || '';
+        const password  = ctx.password || '';
 
-        const config	= Config();
-        self.isNewUser	= (config.users.newUserNames || []).indexOf(username) > -1;
+        const config    = Config();
+        self.isNewUser  = (config.users.newUserNames || []).indexOf(username) > -1;
 
         self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
 
@@ -58,8 +58,8 @@ function SSHClient(clientConn) {
         }
 
         //
-        //	If the system is open and |isNewUser| is true, the login
-        //	sequence is hijacked in order to start the applicaiton process.
+        //  If the system is open and |isNewUser| is true, the login
+        //  sequence is hijacked in order to start the applicaiton process.
         //
         if(false === config.general.closedSystem && self.isNewUser) {
             return ctx.accept();
@@ -85,7 +85,7 @@ function SSHClient(clientConn) {
             }
 
             if(0 === username.length) {
-                //	:TODO: can we display something here?
+                //  :TODO: can we display something here?
                 return ctx.reject();
             }
 
@@ -105,9 +105,9 @@ function SSHClient(clientConn) {
                         }
 
                         const artOpts = {
-                            client		: self,
-                            name 		: 'SSHPMPT.ASC',
-                            readSauce	: false,
+                            client      : self,
+                            name        : 'SSHPMPT.ASC',
+                            readSauce   : false,
                         };
 
                         theme.getThemeArt(artOpts, (err, artInfo) => {
@@ -136,31 +136,31 @@ function SSHClient(clientConn) {
 
     this.updateTermInfo = function(info) {
         //
-        //	From ssh2 docs:
-        //	"rows and cols override width and height when rows and cols are non-zero."
+        //  From ssh2 docs:
+        //  "rows and cols override width and height when rows and cols are non-zero."
         //
         let termHeight;
         let termWidth;
 
         if(info.rows > 0 && info.cols > 0) {
-            termHeight 	= info.rows;
-            termWidth	= info.cols;
+            termHeight  = info.rows;
+            termWidth   = info.cols;
         } else if(info.width > 0 && info.height > 0) {
-            termHeight	= info.height;
-            termWidth	= info.width;
+            termHeight  = info.height;
+            termWidth   = info.width;
         }
 
         assert(_.isObject(self.term));
 
         //
-        //	Note that if we fail here, connect.js attempts some non-standard
-        //	queries/etc., and ultimately will default to 80x24 if all else fails
+        //  Note that if we fail here, connect.js attempts some non-standard
+        //  queries/etc., and ultimately will default to 80x24 if all else fails
         //
         if(termHeight > 0 && termWidth > 0) {
             self.term.termHeight = termHeight;
-            self.term.termWidth	= termWidth;
+            self.term.termWidth = termWidth;
 
-            self.clearMciCache();	//	term size changes = invalidate cache
+            self.clearMciCache();   //  term size changes = invalidate cache
         }
 
         if(_.isString(info.term) && info.term.length > 0 && 'unknown' === self.term.termType) {
@@ -182,7 +182,7 @@ function SSHClient(clientConn) {
                     accept();
                 }
 
-                if(self.input) {	//	do we have I/O?
+                if(self.input) {    //  do we have I/O?
                     self.updateTermInfo(info);
                 } else {
                     self.cachedTermInfo = info;
@@ -203,7 +203,7 @@ function SSHClient(clientConn) {
                     delete self.cachedTermInfo;
                 }
 
-                //	we're ready!
+                //  we're ready!
                 const firstMenu = self.isNewUser ? Config().loginServers.ssh.firstMenuNewUser : Config().loginServers.ssh.firstMenu;
                 self.emit('ready', { firstMenu : firstMenu } );
             });
@@ -222,7 +222,7 @@ function SSHClient(clientConn) {
     });
 
     clientConn.on('end', () => {
-        self.emit('end');	//	remove client connection/tracking
+        self.emit('end');   //  remove client connection/tracking
     });
 
     clientConn.on('error', err => {
@@ -244,13 +244,13 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
         const serverConf = {
             hostKeys : [
                 {
-                    key			: fs.readFileSync(config.loginServers.ssh.privateKeyPem),
-                    passphrase	: config.loginServers.ssh.privateKeyPass,
+                    key         : fs.readFileSync(config.loginServers.ssh.privateKeyPem),
+                    passphrase  : config.loginServers.ssh.privateKeyPass,
                 }
             ],
             ident : 'enigma-bbs-' + enigVersion + '-srv',
 
-            //	Note that sending 'banner' breaks at least EtherTerm!
+            //  Note that sending 'banner' breaks at least EtherTerm!
             debug : (sshDebugLine) => {
                 if(true === config.loginServers.ssh.traceConnections) {
                     Log.trace(`SSH: ${sshDebugLine}`);
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index ce854013..1f8afa6a 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -1,166 +1,166 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const baseClient					= require('../../client.js');
-const Log							= require('../../logger.js').log;
-const LoginServerModule				= require('../../login_server_module.js');
-const Config						= require('../../config.js').get;
-const EnigAssert					= require('../../enigma_assert.js');
-const { stringFromNullTermBuffer }	= require('../../string_util.js');
+//  ENiGMA½
+const baseClient                    = require('../../client.js');
+const Log                           = require('../../logger.js').log;
+const LoginServerModule             = require('../../login_server_module.js');
+const Config                        = require('../../config.js').get;
+const EnigAssert                    = require('../../enigma_assert.js');
+const { stringFromNullTermBuffer }  = require('../../string_util.js');
 
-//	deps
-const net 			= require('net');
-const buffers		= require('buffers');
-const { Parser }	= require('binary-parser');
-const util			= require('util');
+//  deps
+const net           = require('net');
+const buffers       = require('buffers');
+const { Parser }    = require('binary-parser');
+const util          = require('util');
 
-//var debug	= require('debug')('telnet');
+//var debug = require('debug')('telnet');
 
 const ModuleInfo = exports.moduleInfo = {
-    name		: 'Telnet',
-    desc		: 'Telnet Server',
-    author		: 'NuSkooler',
-    isSecure	: false,
-    packageName	: 'codes.l33t.enigma.telnet.server',
+    name        : 'Telnet',
+    desc        : 'Telnet Server',
+    author      : 'NuSkooler',
+    isSecure    : false,
+    packageName : 'codes.l33t.enigma.telnet.server',
 };
 
-exports.TelnetClient	= TelnetClient;
+exports.TelnetClient    = TelnetClient;
 
 //
-//	Telnet Protocol Resources
-//	* http://pcmicro.com/netfoss/telnet.html
-//	* http://mud-dev.wikidot.com/telnet:negotiation
+//  Telnet Protocol Resources
+//  * http://pcmicro.com/netfoss/telnet.html
+//  * http://mud-dev.wikidot.com/telnet:negotiation
 //
 
 /*
-	TODO:
-	* Document COMMANDS -- add any missing
-	* Document OPTIONS -- add any missing
-	* Internally handle OPTIONS:
-		* Some should be emitted generically
-		* Some should be handled internally -- denied, handled, etc.
-		*
+    TODO:
+    * Document COMMANDS -- add any missing
+    * Document OPTIONS -- add any missing
+    * Internally handle OPTIONS:
+        * Some should be emitted generically
+        * Some should be handled internally -- denied, handled, etc.
+        *
 
-	* Allow term (ttype) to be set by environ sub negotiation
+    * Allow term (ttype) to be set by environ sub negotiation
 
-	* Process terms in loop.... research needed
+    * Process terms in loop.... research needed
 
-	* Handle will/won't
-	* Handle do's, ..
-	* Some won't should close connection
+    * Handle will/won't
+    * Handle do's, ..
+    * Some won't should close connection
 
-	* Options/Commands we don't understand shouldn't crash the server!!
+    * Options/Commands we don't understand shouldn't crash the server!!
 
 
 */
 
 const COMMANDS = {
-    SE		: 240,	//	End of Sub-Negotation Parameters
-    NOP		: 241,	//	No Operation
-    DM		: 242,	//	Data Mark
-    BRK		: 243,	//	Break
-    IP		: 244,	//	Interrupt Process
-    AO		: 245,	//	Abort Output
-    AYT		: 246,	//	Are You There?
-    EC		: 247,	//	Erase Character
-    EL		: 248,	//	Erase Line
-    GA		: 249,	//	Go Ahead
-    SB		: 250,	//	Start Sub-Negotiation Parameters
-    WILL	: 251,	//
-    WONT	: 252,
-    DO		: 253,
-    DONT	: 254,
-    IAC		: 255,	//	(Data Byte)
+    SE      : 240,  //  End of Sub-Negotation Parameters
+    NOP     : 241,  //  No Operation
+    DM      : 242,  //  Data Mark
+    BRK     : 243,  //  Break
+    IP      : 244,  //  Interrupt Process
+    AO      : 245,  //  Abort Output
+    AYT     : 246,  //  Are You There?
+    EC      : 247,  //  Erase Character
+    EL      : 248,  //  Erase Line
+    GA      : 249,  //  Go Ahead
+    SB      : 250,  //  Start Sub-Negotiation Parameters
+    WILL    : 251,  //
+    WONT    : 252,
+    DO      : 253,
+    DONT    : 254,
+    IAC     : 255,  //  (Data Byte)
 };
 
 //
-//	Resources:
-//		* http://www.faqs.org/rfcs/rfc1572.html
+//  Resources:
+//      * http://www.faqs.org/rfcs/rfc1572.html
 //
 const SB_COMMANDS = {
-    IS		: 0,
-    SEND	: 1,
-    INFO	: 2,
+    IS      : 0,
+    SEND    : 1,
+    INFO    : 2,
 };
 
 //
-//	Telnet Options
+//  Telnet Options
 //
-//	Resources
-//		* http://mars.netanya.ac.il/~unesco/cdrom/booklet/HTML/NETWORKING/node300.html
-//		* http://www.networksorcery.com/enp/protocol/telnet.htm
+//  Resources
+//      * http://mars.netanya.ac.il/~unesco/cdrom/booklet/HTML/NETWORKING/node300.html
+//      * http://www.networksorcery.com/enp/protocol/telnet.htm
 //
 const OPTIONS = {
-    TRANSMIT_BINARY			: 0,	// http://tools.ietf.org/html/rfc856
-    ECHO					: 1,	//	http://tools.ietf.org/html/rfc857
-    //	RECONNECTION : 2
-    SUPPRESS_GO_AHEAD		: 3,	// aka 'SGA': RFC 858 @ http://tools.ietf.org/html/rfc858
-    //APPROX_MESSAGE_SIZE 	: 4
-    STATUS					: 5,	// http://tools.ietf.org/html/rfc859
-    TIMING_MARK				: 6, // http://tools.ietf.org/html/rfc860
-    //RC_TRANS_AND_ECHO		: 7,	//	aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
-    //OUPUT_LINE_WIDTH		: 8,
-    //OUTPUT_PAGE_SIZE		: 9,	//
-    //OUTPUT_CARRIAGE_RETURN_DISP	: 10,	//	RFC 652
-    //OUTPUT_HORIZ_TABSTOPS	: 11,	//	RFC 653
-    //OUTPUT_HORIZ_TAB_DISP	: 12,	//	RFC 654
-    //OUTPUT_FORMFEED_DISP	: 13,	//	RFC 655
-    //OUTPUT_VERT_TABSTOPS	: 14,	//	RFC 656
-    //OUTPUT_VERT_TAB_DISP	: 15,	//	RFC 657
-    //OUTPUT_LF_DISP		: 16,	//	RFC 658
-    //EXTENDED_ASCII		: 17,	//	RFC 659
-    //LOGOUT				: 18,	//	RFC 727
-    //BYTE_MACRO			: 19,	//	RFC 753
-    //DATA_ENTRY_TERMINAL	: 20,	//	RFC 1043
-    //SUPDUP				: 21,	//	RFC 736
-    //SUPDUP_OUTPUT			: 22,	//	RFC 749
-    SEND_LOCATION			: 23,	//	RFC 779
-    TERMINAL_TYPE			: 24,	//	aka 'TTYPE': RFC 1091 @ http://tools.ietf.org/html/rfc1091
-    //END_OF_RECORD			: 25,	//	RFC 885
-    //TACACS_USER_ID		: 26,	//	RFC 927
-    //OUTPUT_MARKING		: 27,	//	RFC 933
-    //TERMINCAL_LOCATION_NUMBER	: 28,	//	RFC 946
-    //TELNET_3270_REGIME	: 29,	//	RFC 1041
-    WINDOW_SIZE				: 31,	//	aka 'NAWS': RFC 1073 @ http://tools.ietf.org/html/rfc1073
-    TERMINAL_SPEED			: 32,	//	RFC 1079 @ http://tools.ietf.org/html/rfc1079
-    REMOTE_FLOW_CONTROL		: 33,	//	RFC 1072 @ http://tools.ietf.org/html/rfc1372
-    LINEMODE				: 34,	//	RFC 1184 @ http://tools.ietf.org/html/rfc1184
-    X_DISPLAY_LOCATION		: 35,	//	aka 'XDISPLOC': RFC 1096 @ http://tools.ietf.org/html/rfc1096
-    NEW_ENVIRONMENT_DEP		: 36,	//	aka 'NEW-ENVIRON': RFC 1408 @ http://tools.ietf.org/html/rfc1408 (note: RFC 1572 is an update to this)
-    AUTHENTICATION			: 37,	//	RFC 2941 @ http://tools.ietf.org/html/rfc2941
-    ENCRYPT					: 38,	//	RFC 2946 @ http://tools.ietf.org/html/rfc2946
-    NEW_ENVIRONMENT			: 39,	//	aka 'NEW-ENVIRON': RFC 1572 @ http://tools.ietf.org/html/rfc1572 (note: update to RFC 1408)
-    //TN3270E					: 40,	//	RFC 2355
-    //XAUTH					: 41,
-    //CHARSET				: 42,	//	RFC 2066
-    //REMOTE_SERIAL_PORT	: 43,
-    //COM_PORT_CONTROL		: 44,	//	RFC 2217
-    //SUPRESS_LOCAL_ECHO	: 45,
-    //START_TLS				: 46,
-    //KERMIT				: 47,	//	RFC 2840
-    //SEND_URL				: 48,
-    //FORWARD_X				: 49,
+    TRANSMIT_BINARY         : 0,    // http://tools.ietf.org/html/rfc856
+    ECHO                    : 1,    //  http://tools.ietf.org/html/rfc857
+    //  RECONNECTION : 2
+    SUPPRESS_GO_AHEAD       : 3,    // aka 'SGA': RFC 858 @ http://tools.ietf.org/html/rfc858
+    //APPROX_MESSAGE_SIZE   : 4
+    STATUS                  : 5,    // http://tools.ietf.org/html/rfc859
+    TIMING_MARK             : 6, // http://tools.ietf.org/html/rfc860
+    //RC_TRANS_AND_ECHO     : 7,    //  aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
+    //OUPUT_LINE_WIDTH      : 8,
+    //OUTPUT_PAGE_SIZE      : 9,    //
+    //OUTPUT_CARRIAGE_RETURN_DISP   : 10,   //  RFC 652
+    //OUTPUT_HORIZ_TABSTOPS : 11,   //  RFC 653
+    //OUTPUT_HORIZ_TAB_DISP : 12,   //  RFC 654
+    //OUTPUT_FORMFEED_DISP  : 13,   //  RFC 655
+    //OUTPUT_VERT_TABSTOPS  : 14,   //  RFC 656
+    //OUTPUT_VERT_TAB_DISP  : 15,   //  RFC 657
+    //OUTPUT_LF_DISP        : 16,   //  RFC 658
+    //EXTENDED_ASCII        : 17,   //  RFC 659
+    //LOGOUT                : 18,   //  RFC 727
+    //BYTE_MACRO            : 19,   //  RFC 753
+    //DATA_ENTRY_TERMINAL   : 20,   //  RFC 1043
+    //SUPDUP                : 21,   //  RFC 736
+    //SUPDUP_OUTPUT         : 22,   //  RFC 749
+    SEND_LOCATION           : 23,   //  RFC 779
+    TERMINAL_TYPE           : 24,   //  aka 'TTYPE': RFC 1091 @ http://tools.ietf.org/html/rfc1091
+    //END_OF_RECORD         : 25,   //  RFC 885
+    //TACACS_USER_ID        : 26,   //  RFC 927
+    //OUTPUT_MARKING        : 27,   //  RFC 933
+    //TERMINCAL_LOCATION_NUMBER : 28,   //  RFC 946
+    //TELNET_3270_REGIME    : 29,   //  RFC 1041
+    WINDOW_SIZE             : 31,   //  aka 'NAWS': RFC 1073 @ http://tools.ietf.org/html/rfc1073
+    TERMINAL_SPEED          : 32,   //  RFC 1079 @ http://tools.ietf.org/html/rfc1079
+    REMOTE_FLOW_CONTROL     : 33,   //  RFC 1072 @ http://tools.ietf.org/html/rfc1372
+    LINEMODE                : 34,   //  RFC 1184 @ http://tools.ietf.org/html/rfc1184
+    X_DISPLAY_LOCATION      : 35,   //  aka 'XDISPLOC': RFC 1096 @ http://tools.ietf.org/html/rfc1096
+    NEW_ENVIRONMENT_DEP     : 36,   //  aka 'NEW-ENVIRON': RFC 1408 @ http://tools.ietf.org/html/rfc1408 (note: RFC 1572 is an update to this)
+    AUTHENTICATION          : 37,   //  RFC 2941 @ http://tools.ietf.org/html/rfc2941
+    ENCRYPT                 : 38,   //  RFC 2946 @ http://tools.ietf.org/html/rfc2946
+    NEW_ENVIRONMENT         : 39,   //  aka 'NEW-ENVIRON': RFC 1572 @ http://tools.ietf.org/html/rfc1572 (note: update to RFC 1408)
+    //TN3270E                   : 40,   //  RFC 2355
+    //XAUTH                 : 41,
+    //CHARSET               : 42,   //  RFC 2066
+    //REMOTE_SERIAL_PORT    : 43,
+    //COM_PORT_CONTROL      : 44,   //  RFC 2217
+    //SUPRESS_LOCAL_ECHO    : 45,
+    //START_TLS             : 46,
+    //KERMIT                : 47,   //  RFC 2840
+    //SEND_URL              : 48,
+    //FORWARD_X             : 49,
 
-    //PRAGMA_LOGON			: 138,
-    //SSPI_LOGON			: 139,
-    //PRAGMA_HEARTBEAT		: 140
+    //PRAGMA_LOGON          : 138,
+    //SSPI_LOGON            : 139,
+    //PRAGMA_HEARTBEAT      : 140
 
-    ARE_YOU_THERE			: 246,	//	aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
+    ARE_YOU_THERE           : 246,  //  aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
 
-    EXTENDED_OPTIONS_LIST	: 255,	//	RFC 861 (STD 32)
+    EXTENDED_OPTIONS_LIST   : 255,  //  RFC 861 (STD 32)
 };
 
-//	Commands used within NEW_ENVIRONMENT[_DEP]
+//  Commands used within NEW_ENVIRONMENT[_DEP]
 const NEW_ENVIRONMENT_COMMANDS = {
-    VAR		: 0,
-    VALUE	: 1,
-    ESC		: 2,
-    USERVAR	: 3,
+    VAR     : 0,
+    VALUE   : 1,
+    ESC     : 2,
+    USERVAR : 3,
 };
 
-const IAC_BUF 		= Buffer.from([ COMMANDS.IAC ]);
-const IAC_SE_BUF	= Buffer.from([ COMMANDS.IAC, COMMANDS.SE ]);
+const IAC_BUF       = Buffer.from([ COMMANDS.IAC ]);
+const IAC_SE_BUF    = Buffer.from([ COMMANDS.IAC, COMMANDS.SE ]);
 
 const COMMAND_NAMES = Object.keys(COMMANDS).reduce(function(names, name) {
     names[COMMANDS[name]] = name.toLowerCase();
@@ -178,9 +178,9 @@ const COMMAND_IMPLS = {};
     };
 });
 
-//	:TODO: See TooTallNate's telnet.js: Handle COMMAND_IMPL for IAC in binary mode
+//  :TODO: See TooTallNate's telnet.js: Handle COMMAND_IMPL for IAC in binary mode
 
-//	Create option names such as 'transmit binary' -> OPTIONS.TRANSMIT_BINARY
+//  Create option names such as 'transmit binary' -> OPTIONS.TRANSMIT_BINARY
 const OPTION_NAMES = Object.keys(OPTIONS).reduce(function(names, name) {
     names[OPTIONS[name]] = name.toLowerCase().replace(/_/g, ' ');
     return names;
@@ -193,19 +193,19 @@ function unknownOption(bufs, i, event) {
 }
 
 const OPTION_IMPLS = {};
-//	:TODO: fill in the rest...
-OPTION_IMPLS.NO_ARGS						=
-OPTION_IMPLS[OPTIONS.ECHO]					=
-OPTION_IMPLS[OPTIONS.STATUS]				=
-OPTION_IMPLS[OPTIONS.LINEMODE]				=
-OPTION_IMPLS[OPTIONS.TRANSMIT_BINARY]		=
-OPTION_IMPLS[OPTIONS.AUTHENTICATION]		=
-OPTION_IMPLS[OPTIONS.TERMINAL_SPEED]		=
-OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL]	=
-OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION]	=
-OPTION_IMPLS[OPTIONS.SEND_LOCATION]			=
-OPTION_IMPLS[OPTIONS.ARE_YOU_THERE]			=
-OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]		= function(bufs, i, event) {
+//  :TODO: fill in the rest...
+OPTION_IMPLS.NO_ARGS                        =
+OPTION_IMPLS[OPTIONS.ECHO]                  =
+OPTION_IMPLS[OPTIONS.STATUS]                =
+OPTION_IMPLS[OPTIONS.LINEMODE]              =
+OPTION_IMPLS[OPTIONS.TRANSMIT_BINARY]       =
+OPTION_IMPLS[OPTIONS.AUTHENTICATION]        =
+OPTION_IMPLS[OPTIONS.TERMINAL_SPEED]        =
+OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL]   =
+OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION]    =
+OPTION_IMPLS[OPTIONS.SEND_LOCATION]         =
+OPTION_IMPLS[OPTIONS.ARE_YOU_THERE]         =
+OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]     = function(bufs, i, event) {
     event.buf = bufs.splice(0, i).toBuffer();
     return event;
 };
@@ -214,12 +214,12 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
     if(event.commandCode !== COMMANDS.SB) {
         OPTION_IMPLS.NO_ARGS(bufs, i, event);
     } else {
-        //	We need 4 bytes header + data + IAC SE
+        //  We need 4 bytes header + data + IAC SE
         if(bufs.length < 7) {
             return MORE_DATA_REQUIRED;
         }
 
-        const end = bufs.indexOf(IAC_SE_BUF, 5);	//	look past header bytes
+        const end = bufs.indexOf(IAC_SE_BUF, 5);    //  look past header bytes
         if(-1 === end) {
             return MORE_DATA_REQUIRED;
         }
@@ -232,10 +232,10 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
                 .uint8('opt')
                 .uint8('is')
                 .array('ttype', {
-                    type		: 'uint8',
-                    readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+                    type        : 'uint8',
+                    readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
                 })
-                //	note we read iac2 above
+                //  note we read iac2 above
                 .uint8('se')
                 .parse(bufs.toBuffer());
         } catch(e) {
@@ -248,10 +248,10 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
         EnigAssert(OPTIONS.TERMINAL_TYPE === ttypeCmd.opt);
         EnigAssert(SB_COMMANDS.IS === ttypeCmd.is);
         EnigAssert(ttypeCmd.ttype.length > 0);
-        //	note we found IAC_SE above
+        //  note we found IAC_SE above
 
-        //	some terminals such as NetRunner provide a NULL-terminated buffer
-        //	slice to remove IAC
+        //  some terminals such as NetRunner provide a NULL-terminated buffer
+        //  slice to remove IAC
         event.ttype = stringFromNullTermBuffer(ttypeCmd.ttype.slice(0, -1), 'ascii');
 
         bufs.splice(0, end);
@@ -264,7 +264,7 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
     if(event.commandCode !== COMMANDS.SB) {
         OPTION_IMPLS.NO_ARGS(bufs, i, event);
     } else {
-        //	we need 9 bytes
+        //  we need 9 bytes
         if(bufs.length < 9) {
             return MORE_DATA_REQUIRED;
         }
@@ -291,39 +291,39 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
         EnigAssert(COMMANDS.IAC === nawsCmd.iac2);
         EnigAssert(COMMANDS.SE === nawsCmd.se);
 
-        event.cols	= event.columns	= event.width = nawsCmd.width;
-        event.rows	= event.height = nawsCmd.height;
+        event.cols  = event.columns = event.width = nawsCmd.width;
+        event.rows  = event.height = nawsCmd.height;
     }
     return event;
 };
 
-//	Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
+//  Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
 const NEW_ENVIRONMENT_DELIMITERS = [];
 Object.keys(NEW_ENVIRONMENT_COMMANDS).forEach(function onKey(k) {
     NEW_ENVIRONMENT_DELIMITERS.push(NEW_ENVIRONMENT_COMMANDS[k]);
 });
 
-//	Handle the deprecated RFC 1408 & the updated RFC 1572:
-OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]	=
-OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
+//  Handle the deprecated RFC 1408 & the updated RFC 1572:
+OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]   =
+OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]       = function(bufs, i, event) {
     if(event.commandCode !== COMMANDS.SB) {
         OPTION_IMPLS.NO_ARGS(bufs, i, event);
     } else {
         //
-        //	We need 4 bytes header + <optional payload> + IAC SE
-        //	Many terminals send a empty list:
-        //		IAC SB NEW-ENVIRON IS IAC SE
+        //  We need 4 bytes header + <optional payload> + IAC SE
+        //  Many terminals send a empty list:
+        //      IAC SB NEW-ENVIRON IS IAC SE
         //
         if(bufs.length < 6) {
             return MORE_DATA_REQUIRED;
         }
 
-        let end = bufs.indexOf(IAC_SE_BUF, 4);	//	look past header bytes
+        let end = bufs.indexOf(IAC_SE_BUF, 4);  //  look past header bytes
         if(-1 === end) {
             return MORE_DATA_REQUIRED;
         }
 
-        //	:TODO: It's likely that we could do all the env name/value parsing directly in Parser.
+        //  :TODO: It's likely that we could do all the env name/value parsing directly in Parser.
 
         let envCmd;
         try {
@@ -331,12 +331,12 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
                 .uint8('iac1')
                 .uint8('sb')
                 .uint8('opt')
-                .uint8('isOrInfo')	//	IS=initial, INFO=updates
+                .uint8('isOrInfo')  //  IS=initial, INFO=updates
                 .array('envBlock', {
                     type : 'uint8',
-                    readUntil	: b => 255 === b,	//	255=COMMANDS.IAC
+                    readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
                 })
-                //	note we consume IAC above
+                //  note we consume IAC above
                 .uint8('se')
                 .parse(bufs.splice(0, bufs.length).toBuffer());
         } catch(e) {
@@ -350,34 +350,34 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
         EnigAssert(SB_COMMANDS.IS === envCmd.isOrInfo || SB_COMMANDS.INFO === envCmd.isOrInfo);
 
         if(OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt) {
-            //	:TODO: we should probably support this for legacy clients?
+            //  :TODO: we should probably support this for legacy clients?
             Log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
         }
 
-        const envBuf = envCmd.envBlock.slice(0, -1);	//	remove IAC
+        const envBuf = envCmd.envBlock.slice(0, -1);    //  remove IAC
 
-        if(envBuf.length < 4) {	//	TYPE + single char name + sep + single char value
-            //	empty env block
+        if(envBuf.length < 4) { //  TYPE + single char name + sep + single char value
+            //  empty env block
             return event;
         }
 
         const States = {
-            Name		: 1,
-            Value		: 2,
+            Name        : 1,
+            Value       : 2,
         };
 
         let state = States.Name;
         const setVars = {};
         const delVars = [];
         let varName;
-        //	:TODO: handle ESC type!!!
+        //  :TODO: handle ESC type!!!
         while(envBuf.length) {
             switch(state) {
                 case States.Name :
                     {
                         const type = parseInt(envBuf.splice(0, 1));
                         if(![ NEW_ENVIRONMENT_COMMANDS.VAR, NEW_ENVIRONMENT_COMMANDS.USERVAR, NEW_ENVIRONMENT_COMMANDS.ESC ].includes(type)) {
-                            return event;	//	fail :(
+                            return event;   //  fail :(
                         }
 
                         let nameEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VALUE);
@@ -387,7 +387,7 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
 
                         varName = envBuf.splice(0, nameEnd);
                         if(!varName) {
-                            return event;	//	something is wrong.
+                            return event;   //  something is wrong.
                         }
 
                         varName = Buffer.from(varName).toString('ascii');
@@ -397,7 +397,7 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
                             state = States.Value;
                         } else {
                             state = States.Name;
-                            delVars.push(varName);	//	no value; del this var
+                            delVars.push(varName);  //  no value; del this var
                         }
                     }
                     break;
@@ -423,15 +423,15 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]		= function(bufs, i, event) {
             }
         }
 
-        //	:TODO: Handle deleting previously set vars via delVars
-        event.type		= envCmd.isOrInfo;
-        event.envVars	= setVars;
+        //  :TODO: Handle deleting previously set vars via delVars
+        event.type      = envCmd.isOrInfo;
+        event.envVars   = setVars;
     }
 
     return event;
 };
 
-const MORE_DATA_REQUIRED	= 0xfeedface;
+const MORE_DATA_REQUIRED    = 0xfeedface;
 
 function parseBufs(bufs) {
     EnigAssert(bufs.length >= 2);
@@ -440,16 +440,16 @@ function parseBufs(bufs) {
 }
 
 function parseCommand(bufs, i, event) {
-    const command		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
-    event.commandCode	= command;
-    event.command		= COMMAND_NAMES[command];
+    const command       = bufs.get(i);  //  :TODO: fix deprecation... [i] is not the same
+    event.commandCode   = command;
+    event.command       = COMMAND_NAMES[command];
 
     const handler = COMMAND_IMPLS[command];
     if(handler) {
         return handler(bufs, i + 1, event);
     } else {
         if(2 !== bufs.length) {
-            Log.warn( { bufsLength : bufs.length }, 'Expected bufs length of 2');	//	expected: IAC + COMMAND
+            Log.warn( { bufsLength : bufs.length }, 'Expected bufs length of 2');   //  expected: IAC + COMMAND
         }
 
         event.buf = bufs.splice(0, 2).toBuffer();
@@ -458,9 +458,9 @@ function parseCommand(bufs, i, event) {
 }
 
 function parseOption(bufs, i, event) {
-    const option		= bufs.get(i);	//	:TODO: fix deprecation... [i] is not the same
-    event.optionCode	= option;
-    event.option		= OPTION_NAMES[option];
+    const option        = bufs.get(i);  //  :TODO: fix deprecation... [i] is not the same
+    event.optionCode    = option;
+    event.option        = OPTION_NAMES[option];
 
     const handler = OPTION_IMPLS[option];
     return handler ? handler(bufs, i + 1, event) : unknownOption(bufs, i + 1, event);
@@ -470,20 +470,20 @@ function parseOption(bufs, i, event) {
 function TelnetClient(input, output) {
     baseClient.Client.apply(this, arguments);
 
-    const self	= this;
+    const self  = this;
 
-    let bufs	= buffers();
-    this.bufs	= bufs;
+    let bufs    = buffers();
+    this.bufs   = bufs;
 
-    this.sentDont = {};	//	DON'T's we've already sent
+    this.sentDont = {}; //  DON'T's we've already sent
 
     this.setInputOutput(input, output);
 
-    this.negotiationsComplete	= false;	//	are we in the 'negotiation' phase?
-    this.didReady				= false;	//	have we emit the 'ready' event?
+    this.negotiationsComplete   = false;    //  are we in the 'negotiation' phase?
+    this.didReady               = false;    //  have we emit the 'ready' event?
 
     this.subNegotiationState = {
-        newEnvironRequested	: false,
+        newEnvironRequested : false,
     };
 
     this.dataHandler = function(b) {
@@ -498,7 +498,7 @@ function TelnetClient(input, output) {
         while((i = bufs.indexOf(IAC_BUF)) >= 0) {
 
             //
-            //	Some clients will send even IAC separate from data
+            //  Some clients will send even IAC separate from data
             //
             if(bufs.length <= (i + 1)) {
                 i = MORE_DATA_REQUIRED;
@@ -517,7 +517,7 @@ function TelnetClient(input, output) {
                 break;
             } else if(i) {
                 if(i.option) {
-                    self.emit(i.option, i);	//	"transmit binary", "echo", ...
+                    self.emit(i.option, i); //  "transmit binary", "echo", ...
                 }
 
                 self.handleTelnetEvent(i);
@@ -530,8 +530,8 @@ function TelnetClient(input, output) {
 
         if(MORE_DATA_REQUIRED !== i && bufs.length > 0) {
             //
-            //	Standard data payload. This can still be "non-user" data
-            //	such as ANSI control, but we don't handle that here.
+            //  Standard data payload. This can still be "non-user" data
+            //  such as ANSI control, but we don't handle that here.
             //
             self.emit('data', bufs.splice(0).toBuffer());
         }
@@ -576,7 +576,7 @@ function TelnetClient(input, output) {
 util.inherits(TelnetClient, baseClient.Client);
 
 ///////////////////////////////////////////////////////////////////////////////
-//	Telnet Command/Option handling
+//  Telnet Command/Option handling
 ///////////////////////////////////////////////////////////////////////////////
 TelnetClient.prototype.handleTelnetEvent = function(evt) {
 
@@ -584,14 +584,14 @@ TelnetClient.prototype.handleTelnetEvent = function(evt) {
         return this.connectionWarn( { evt : evt }, 'No command for event');
     }
 
-    //	handler name e.g. 'handleWontCommand'
+    //  handler name e.g. 'handleWontCommand'
     const handlerName = `handle${evt.command.charAt(0).toUpperCase()}${evt.command.substr(1)}Command`;
 
     if(this[handlerName]) {
-        //	specialized
+        //  specialized
         this[handlerName](evt);
     } else {
-        //	generic-ish
+        //  generic-ish
         this.handleMiscCommand(evt);
     }
 };
@@ -599,16 +599,16 @@ TelnetClient.prototype.handleTelnetEvent = function(evt) {
 TelnetClient.prototype.handleWillCommand = function(evt) {
     if('terminal type' === evt.option) {
         //
-        //	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //  See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
         //
         this.requestTerminalType();
     } else if('new environment' === evt.option) {
         //
-        //	See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
+        //  See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
         //
         this.requestNewEnvironment();
     } else {
-        //	:TODO: temporary:
+        //  :TODO: temporary:
         this.connectionTrace(evt, 'WILL');
     }
 };
@@ -628,20 +628,20 @@ TelnetClient.prototype.handleWontCommand = function(evt) {
 };
 
 TelnetClient.prototype.handleDoCommand = function(evt) {
-    //	:TODO: handle the rest, e.g. echo nd the like
+    //  :TODO: handle the rest, e.g. echo nd the like
 
     if('linemode' === evt.option) {
         //
-        //	Client wants to enable linemode editing. Denied.
+        //  Client wants to enable linemode editing. Denied.
         //
         this.wont.linemode();
     } else if('encrypt' === evt.option) {
         //
-        //	Client wants to enable encryption. Denied.
+        //  Client wants to enable encryption. Denied.
         //
         this.wont.encrypt();
     } else {
-        //	:TODO: temporary:
+        //  :TODO: temporary:
         this.connectionTrace(evt, 'DO');
     }
 };
@@ -655,33 +655,33 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
 
     if('terminal type' === evt.option) {
         //
-        //	See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //  See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
         //
-        //	:TODO: According to RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-        //	We should keep asking until we see a repeat. From there, determine the best type/etc.
+        //  :TODO: According to RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
+        //  We should keep asking until we see a repeat. From there, determine the best type/etc.
         self.setTermType(evt.ttype);
 
-        self.negotiationsComplete = true;	//	:TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
+        self.negotiationsComplete = true;   //  :TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
 
         self.readyNow();
     } else if('new environment' === evt.option) {
         //
-        //	Handling is as follows:
-        //	* Map 'TERM' -> 'termType' and only update if ours is 'unknown'
-        //	* Map COLUMNS -> 'termWidth' and only update if ours is 0
-        //	* Map ROWS -> 'termHeight' and only update if ours is 0
-        //	* Add any new variables, ignore any existing
+        //  Handling is as follows:
+        //  * Map 'TERM' -> 'termType' and only update if ours is 'unknown'
+        //  * Map COLUMNS -> 'termWidth' and only update if ours is 0
+        //  * Map ROWS -> 'termHeight' and only update if ours is 0
+        //  * Add any new variables, ignore any existing
         //
         Object.keys(evt.envVars || {} ).forEach(function onEnv(name) {
             if('TERM' === name && 'unknown' === self.term.termType) {
                 self.setTermType(evt.envVars[name]);
             } else if('COLUMNS' === name && 0 === self.term.termWidth) {
                 self.term.termWidth = parseInt(evt.envVars[name]);
-                self.clearMciCache();	//	term size changes = invalidate cache
+                self.clearMciCache();   //  term size changes = invalidate cache
                 self.connectionDebug({ termWidth : self.term.termWidth, source : 'NEW-ENVIRON'}, 'Window width updated');
             } else if('ROWS' === name && 0 === self.term.termHeight) {
                 self.term.termHeight = parseInt(evt.envVars[name]);
-                self.clearMciCache();	//	term size changes = invalidate cache
+                self.clearMciCache();   //  term size changes = invalidate cache
                 self.connectionDebug({ termHeight : self.term.termHeight, source : 'NEW-ENVIRON'}, 'Window height updated');
             } else {
                 if(name in self.term.env) {
@@ -704,11 +704,11 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
 
     } else if('window size' === evt.option) {
         //
-        //	Update termWidth & termHeight.
-        //	Set LINES and COLUMNS environment variables as well.
+        //  Update termWidth & termHeight.
+        //  Set LINES and COLUMNS environment variables as well.
         //
-        self.term.termWidth		= evt.width;
-        self.term.termHeight	= evt.height;
+        self.term.termWidth     = evt.width;
+        self.term.termHeight    = evt.height;
 
         if(evt.width > 0) {
             self.term.env.COLUMNS = evt.height;
@@ -718,7 +718,7 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
             self.term.env.ROWS = evt.height;
         }
 
-        self.clearMciCache();	//	term size changes = invalidate cache
+        self.clearMciCache();   //  term size changes = invalidate cache
 
         self.connectionDebug({ termWidth : evt.width , termHeight : evt.height, source : 'NAWS' }, 'Window size updated');
     } else {
@@ -736,11 +736,11 @@ TelnetClient.prototype.handleMiscCommand = function(evt) {
     EnigAssert(evt.command !== 'undefined' && evt.command.length > 0);
 
     //
-    //	See:
-    //	* RFC 854 @ http://tools.ietf.org/html/rfc854
+    //  See:
+    //  * RFC 854 @ http://tools.ietf.org/html/rfc854
     //
     if('ip' === evt.command) {
-        //	Interrupt Process (IP)
+        //  Interrupt Process (IP)
         this.log.debug('Interrupt Process (IP) - Ending');
 
         this.input.end();
@@ -817,33 +817,33 @@ TelnetClient.prototype.banner = function() {
 };
 
 function Command(command, client) {
-    this.command	= COMMANDS[command.toUpperCase()];
-    this.client		= client;
+    this.command    = COMMANDS[command.toUpperCase()];
+    this.client     = client;
 }
 
-//	Create Command objects with echo, transmit_binary, ...
+//  Create Command objects with echo, transmit_binary, ...
 Object.keys(OPTIONS).forEach(function(name) {
     const code = OPTIONS[name];
 
     Command.prototype[name.toLowerCase()] = function() {
         const buf = Buffer.alloc(3);
-        buf[0]	= COMMANDS.IAC;
-        buf[1]	= this.command;
-        buf[2]	= code;
+        buf[0]  = COMMANDS.IAC;
+        buf[1]  = this.command;
+        buf[2]  = code;
         return this.client.output.write(buf);
     };
 });
 
-//	Create do, dont, etc. methods on Client
+//  Create do, dont, etc. methods on Client
 ['do', 'dont', 'will', 'wont'].forEach(function(command) {
     const get = function() {
         return new Command(command, this);
     };
 
     Object.defineProperty(TelnetClient.prototype, command, {
-        get				: get,
-        enumerable		: true,
-        configurable	: true
+        get             : get,
+        enumerable      : true,
+        configurable    : true
     });
 });
 
@@ -861,9 +861,9 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
             this.handleNewClient(client, sock, ModuleInfo);
 
             //
-            //	Set a timeout and attempt to proceed even if we don't know
-            //	the term type yet, which is the preferred trigger
-            //	for moving along
+            //  Set a timeout and attempt to proceed even if we don't know
+            //  the term type yet, which is the preferred trigger
+            //  for moving along
             //
             setTimeout( () => {
                 if(!client.didReady) {
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index f7dac07d..fa7d97a3 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config			= require('../../config.js').get;
-const TelnetClient		= require('./telnet.js').TelnetClient;
-const Log				= require('../../logger.js').log;
-const LoginServerModule	= require('../../login_server_module.js');
+//  ENiGMA½
+const Config            = require('../../config.js').get;
+const TelnetClient      = require('./telnet.js').TelnetClient;
+const Log               = require('../../logger.js').log;
+const LoginServerModule = require('../../login_server_module.js');
 
-//	deps
-const _					= require('lodash');
-const WebSocketServer	= require('ws').Server;
-const http				= require('http');
-const https				= require('https');
-const fs				= require('graceful-fs');
-const Writable			= require('stream');
+//  deps
+const _                 = require('lodash');
+const WebSocketServer   = require('ws').Server;
+const http              = require('http');
+const https             = require('https');
+const fs                = require('graceful-fs');
+const Writable          = require('stream');
 
 const ModuleInfo = exports.moduleInfo = {
-    name		: 'WebSocket',
-    desc		: 'WebSocket Server',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.websocket.server',
+    name        : 'WebSocket',
+    desc        : 'WebSocket Server',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.websocket.server',
 };
 
 function WebSocketClient(ws, req, serverType) {
@@ -35,8 +35,8 @@ function WebSocketClient(ws, req, serverType) {
     };
 
     //
-    //	This bridge makes accessible various calls that client sub classes
-    //	want to access on I/O socket
+    //  This bridge makes accessible various calls that client sub classes
+    //  want to access on I/O socket
     //
     this.socketBridge = new class SocketBridge extends Writable {
         constructor(ws) {
@@ -49,12 +49,12 @@ function WebSocketClient(ws, req, serverType) {
         }
 
         write(data, cb) {
-            cb = cb || ( () => { /* eat it up */} );	//	handle data writes after close
+            cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
 
             return this.ws.send(data, { binary : true }, cb);
         }
 
-        //	we need to fake some streaming work
+        //  we need to fake some streaming work
         unpipe() {
             Log.trace('WebSocket SocketBridge unpipe()');
         }
@@ -64,7 +64,7 @@ function WebSocketClient(ws, req, serverType) {
         }
 
         get remoteAddress() {
-            //	Support X-Forwarded-For and X-Real-IP headers for proxied connections
+            //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
             return (self.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
         }
     }(ws);
@@ -72,12 +72,12 @@ function WebSocketClient(ws, req, serverType) {
     ws.on('message', this.dataHandler);
 
     ws.on('close', () => {
-        //	we'll remove client connection which will in turn end() via our SocketBridge above
+        //  we'll remove client connection which will in turn end() via our SocketBridge above
         return this.emit('end');
     });
 
     //
-    //	Montior connection status with ping/pong
+    //  Montior connection status with ping/pong
     //
     ws.on('pong', () => {
         Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
@@ -89,11 +89,11 @@ function WebSocketClient(ws, req, serverType) {
     Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
 
     //
-    //	If the config allows it, look for 'x-forwarded-proto' as "https"
-    //	to override |isSecure|
+    //  If the config allows it, look for 'x-forwarded-proto' as "https"
+    //  to override |isSecure|
     //
     if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
-		'https' === req.headers['x-forwarded-proto'])
+        'https' === req.headers['x-forwarded-proto'])
     {
         Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
         this.proxied = true;
@@ -101,7 +101,7 @@ function WebSocketClient(ws, req, serverType) {
         this.proxied = false;
     }
 
-    //	start handshake process
+    //  start handshake process
     this.banner();
 }
 
@@ -116,40 +116,40 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 
     createServer() {
         //
-        //	We will actually create up to two servers:
-        //	* insecure websocket (ws://)
-        //	* secure (tls) websocket (wss://)
+        //  We will actually create up to two servers:
+        //  * insecure websocket (ws://)
+        //  * secure (tls) websocket (wss://)
         //
         const config = _.get(Config(), 'loginServers.webSocket');
         if(!_.isObject(config)) {
             return;
         }
 
-        const wsPort 	= _.get(config, 'ws.port');
-        const wssPort	= _.get(config, 'wss.port');
+        const wsPort    = _.get(config, 'ws.port');
+        const wssPort   = _.get(config, 'wss.port');
 
         if(true === _.get(config, 'ws.enabled') && _.isNumber(wsPort)) {
             const httpServer = http.createServer( (req, resp) => {
-                //	dummy handler
+                //  dummy handler
                 resp.writeHead(200);
                 return resp.end('ENiGMA½ BBS WebSocket Server!');
             });
 
             this.insecure = {
-                httpServer	: httpServer,
-                wsServer	: new WebSocketServer( { server : httpServer } ),
+                httpServer  : httpServer,
+                wsServer    : new WebSocketServer( { server : httpServer } ),
             };
         }
 
         if(_.isObject(config, 'wss') && true === _.get(config, 'wss.enabled') && _.isNumber(wssPort)) {
             const httpServer = https.createServer({
-                key		: fs.readFileSync(config.wss.keyPem),
-                cert	: fs.readFileSync(config.wss.certPem),
+                key     : fs.readFileSync(config.wss.keyPem),
+                cert    : fs.readFileSync(config.wss.certPem),
             });
 
             this.secure = {
-                httpServer	: httpServer,
-                wsServer	: new WebSocketServer( { server : httpServer } ),
+                httpServer  : httpServer,
+                wsServer    : new WebSocketServer( { server : httpServer } ),
             };
         }
     }
@@ -161,8 +161,8 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
                 return;
             }
 
-            const serverName 	= `${ModuleInfo.name} (${serverType})`;
-            const port			= parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
+            const serverName    = `${ModuleInfo.name} (${serverType})`;
+            const port          = parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
 
             if(isNaN(port)) {
                 Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
@@ -180,7 +180,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
         });
 
         //
-        //	Send pings every 30s
+        //  Send pings every 30s
         //
         setInterval( () => {
             WSS_SERVER_TYPES.forEach(serverType => {
@@ -191,10 +191,10 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
                             return ws.terminate();
                         }
 
-                        ws.isConnectionAlive = false;	//	pong will reset this
+                        ws.isConnectionAlive = false;   //  pong will reset this
 
                         Log.trace('Ping to remote WebSocket client');
-                        return ws.ping('', false);	//	false=don't mask
+                        return ws.ping('', false);  //  false=don't mask
                     });
                 }
             });
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
index 85b9cfcd..27a27c21 100644
--- a/core/set_newscan_date.js
+++ b/core/set_newscan_date.js
@@ -1,40 +1,40 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule					= require('./menu_module.js').MenuModule;
-const ViewController				= require('./view_controller.js').ViewController;
-const Errors						= require('./enig_error.js').Errors;
-const FileEntry						= require('./file_entry.js');
-const FileBaseFilters				= require('./file_base_filter.js');
-const { getAvailableFileAreaTags }	= require('./file_base_area.js');
+//  ENiGMA½
+const MenuModule                    = require('./menu_module.js').MenuModule;
+const ViewController                = require('./view_controller.js').ViewController;
+const Errors                        = require('./enig_error.js').Errors;
+const FileEntry                     = require('./file_entry.js');
+const FileBaseFilters               = require('./file_base_filter.js');
+const { getAvailableFileAreaTags }  = require('./file_base_area.js');
 const {
     getSortedAvailMessageConferences,
     getSortedAvailMessageAreasByConfTag,
     updateMessageAreaLastReadId,
     getMessageIdNewerThanTimestampByArea
-}									= require('./message_area.js');
-const stringFormat					= require('./string_format.js');
+}                                   = require('./message_area.js');
+const stringFormat                  = require('./string_format.js');
 
-//	deps
-const async					= require('async');
-const moment				= require('moment');
-const _						= require('lodash');
+//  deps
+const async                 = require('async');
+const moment                = require('moment');
+const _                     = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Set New Scan Date',
-    desc	: 'Sets new scan date for applicable scans',
-    author	: 'NuSkooler',
+    name    : 'Set New Scan Date',
+    desc    : 'Sets new scan date for applicable scans',
+    author  : 'NuSkooler',
 };
 
 const MciViewIds = {
     main : {
-        scanDate		: 1,
-        targetSelection	: 2,
+        scanDate        : 1,
+        targetSelection : 2,
     }
 };
 
-//	:TODO: for messages, we could insert "conf - all areas" into targets, and allow such
+//  :TODO: for messages, we could insert "conf - all areas" into targets, and allow such
 
 exports.getModule = class SetNewScanDate extends MenuModule {
     constructor(options) {
@@ -42,8 +42,8 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 
         const config = this.menuConfig.config;
 
-        this.target			= config.target || 'message';
-        this.scanDateFormat	= config.scanDateFormat || 'YYYYMMDD';
+        this.target         = config.target || 'message';
+        this.scanDateFormat = config.scanDateFormat || 'YYYYMMDD';
 
         this.menuMethods = {
             scanDateSubmit : (formData, extraArgs, cb) => {
@@ -57,7 +57,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                     return cb(Errors.Invalid(`"${_.get(formData, 'value.scanDate')}" is not a valid date`));
                 }
 
-                const targetSelection = _.get(formData, 'value.targetSelection');	//	may be undefined if N/A
+                const targetSelection = _.get(formData, 'value.targetSelection');   //  may be undefined if N/A
 
                 this[`setNewScanDateFor${_.capitalize(this.target)}Base`](targetSelection, scanDate, () => {
                     return this.prevMenu(cb);
@@ -72,12 +72,12 @@ exports.getModule = class SetNewScanDate extends MenuModule {
             return cb(Errors.UnexpectedState('Unable to get target in which to set new scan'));
         }
 
-        //	selected area, or all of 'em
+        //  selected area, or all of 'em
         let updateAreaTags;
         if('' === target.area.areaTag) {
             updateAreaTags = this.targetSelections
                 .map( targetSelection => targetSelection.area.areaTag )
-                .filter( areaTag => areaTag );	//	remove the blank 'all' entry
+                .filter( areaTag => areaTag );  //  remove the blank 'all' entry
         } else {
             updateAreaTags = [ target.area.areaTag ];
         }
@@ -89,7 +89,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                 }
 
                 if(!messageId) {
-                    return nextAreaTag(null);	//	nothing to do
+                    return nextAreaTag(null);   //  nothing to do
                 }
 
                 messageId = Math.max(messageId - 1, 0);
@@ -98,7 +98,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                     this.client.user.userId,
                     areaTag,
                     messageId,
-                    true,	//	allowOlder
+                    true,   //  allowOlder
                     nextAreaTag
                 );
             });
@@ -109,16 +109,16 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 
     setNewScanDateForFileBase(targetSelection, scanDate, cb) {
         //
-        //	ENiGMA doesn't currently have the concept of per-area
-        //	scan pointers for users, so we use all areas avail
-        //	to the user.
+        //  ENiGMA doesn't currently have the concept of per-area
+        //  scan pointers for users, so we use all areas avail
+        //  to the user.
         //
         const filterCriteria = {
-            areaTag				: getAvailableFileAreaTags(this.client),
-            newerThanTimestamp	: scanDate,
-            limit				: 1,
-            orderBy				: 'upload_timestamp',
-            order				: 'ascending',
+            areaTag             : getAvailableFileAreaTags(this.client),
+            newerThanTimestamp  : scanDate,
+            limit               : 1,
+            orderBy             : 'upload_timestamp',
+            order               : 'ascending',
         };
 
         FileEntry.findFiles(filterCriteria, (err, fileIds) => {
@@ -127,7 +127,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
             }
 
             if(!fileIds || 0 === fileIds.length) {
-                //	nothing to do
+                //  nothing to do
                 return cb(null);
             }
 
@@ -136,7 +136,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
             return FileBaseFilters.setFileBaseLastViewedFileIdForUser(
                 this.client.user,
                 pointerFileId,
-                true,	//	allowOlder
+                true,   //  allowOlder
                 cb
             );
         });
@@ -144,22 +144,22 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 
     loadAvailMessageBaseSelections(cb) {
         //
-        //	Create an array of objects with conf/area information per entry,
-        //	sorted naturally or via the 'sort' member in config
+        //  Create an array of objects with conf/area information per entry,
+        //  sorted naturally or via the 'sort' member in config
         //
         const selections = [];
         getSortedAvailMessageConferences(this.client).forEach(conf => {
             getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).forEach(area => {
                 selections.push({
-                    conf	: {
+                    conf    : {
                         confTag : conf.confTag,
-                        name	: conf.conf.name,
-                        desc	: conf.conf.desc,
+                        name    : conf.conf.name,
+                        desc    : conf.conf.desc,
                     },
-                    area	: {
-                        areaTag	: area.areaTag,
-                        name	: area.area.name,
-                        desc	: area.area.desc,
+                    area    : {
+                        areaTag : area.areaTag,
+                        name    : area.area.name,
+                        desc    : area.area.desc,
                     }
                 });
             });
@@ -167,20 +167,20 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 
         selections.unshift({
             conf : {
-                confTag	: '',
-                name	: 'All conferences',
-                desc	: 'All conferences',
+                confTag : '',
+                name    : 'All conferences',
+                desc    : 'All conferences',
             },
-            area	: {
-                areaTag	: '',
-                name	: 'All areas',
-                desc	: 'All areas',
+            area    : {
+                areaTag : '',
+                name    : 'All areas',
+                desc    : 'All areas',
             }
         });
 
-        //	Find current conf/area & move it directly under "All"
-        const currConfTag 	= this.client.user.properties.message_conf_tag;
-        const currAreaTag	= this.client.user.properties.message_area_tag;
+        //  Find current conf/area & move it directly under "All"
+        const currConfTag   = this.client.user.properties.message_conf_tag;
+        const currAreaTag   = this.client.user.properties.message_area_tag;
         if(currConfTag && currAreaTag) {
             const confAreaIndex = selections.findIndex( confArea => {
                 return confArea.conf.confTag === currConfTag && confArea.area.areaTag === currAreaTag;
@@ -202,8 +202,8 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.addViewController( 'main', new ViewController( { client : this.client } ) );
+            const self  = this;
+            const vc    = self.addViewController( 'main', new ViewController( { client : this.client } ) );
 
             async.series(
                 [
@@ -211,7 +211,7 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                         if(![ 'message', 'file' ].includes(self.target)) {
                             return callback(Errors.Invalid(`Invalid "target" in config: ${self.target}`));
                         }
-                        //	:TOD0: validate scanDateFormat
+                        //  :TOD0: validate scanDateFormat
                         return callback(null);
                     },
                     function loadFromConfig(callback) {
@@ -231,13 +231,13 @@ exports.getModule = class SetNewScanDate extends MenuModule {
 
                         const scanDateView = vc.getView(MciViewIds.main.scanDate);
 
-                        //	:TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
+                        //  :TODO: MaskTextEditView needs some love: If setText() with input that matches the mask, we should ignore the non-mask chars! Hack in place for now
                         const scanDateFormat = self.scanDateFormat.replace(/[/\-. ]/g, '');
                         scanDateView.setText(today.format(scanDateFormat));
 
                         if('message' === self.target) {
-                            const messageSelectionsFormat		= self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
-                            const messageSelectionFocusFormat	= self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
+                            const messageSelectionsFormat       = self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
+                            const messageSelectionFocusFormat   = self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
 
                             const targetSelectionView = vc.getView(MciViewIds.main.targetSelection);
 
diff --git a/core/show_art.js b/core/show_art.js
index bb917e91..66e330db 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -1,20 +1,20 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule	= require('./menu_module.js').MenuModule;
-const Errors		= require('../core/enig_error.js').Errors;
-const ANSI			= require('./ansi_term.js');
-const Config		= require('./config.js').get;
+//  ENiGMA½
+const MenuModule    = require('./menu_module.js').MenuModule;
+const Errors        = require('../core/enig_error.js').Errors;
+const ANSI          = require('./ansi_term.js');
+const Config        = require('./config.js').get;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
 
 exports.moduleInfo = {
-    name	: 'Show Art',
-    desc	: 'Module for more advanced methods of displaying art',
-    author	: 'NuSkooler',
+    name    : 'Show Art',
+    desc    : 'Module for more advanced methods of displaying art',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class ShowArtModule extends MenuModule {
@@ -36,13 +36,13 @@ exports.getModule = class ShowArtModule extends MenuModule {
                 },
                 function showArt(callback) {
                     //
-                    //	How we show art depends on our configuration
+                    //  How we show art depends on our configuration
                     //
                     let handler = {
-                        extraArgs		: self.showByExtraArgs,
-                        sequence		: self.showBySequence,
-                        random			: self.showByRandom,
-                        fileBaseArea	: self.showByFileBaseArea,
+                        extraArgs       : self.showByExtraArgs,
+                        sequence        : self.showBySequence,
+                        random          : self.showByRandom,
+                        fileBaseArea    : self.showByFileBaseArea,
                     }[self.config.method] || self.showRandomArt;
 
                     handler = handler.bind(self);
@@ -68,8 +68,8 @@ exports.getModule = class ShowArtModule extends MenuModule {
                 return cb(err);
             }
             const options = {
-                pause 	: this.shouldPause(),
-                desc	: 'extraArgs',
+                pause   : this.shouldPause(),
+                desc    : 'extraArgs',
             };
             return this.displaySingleArtWithOptions(artSpec, options, cb);
         });
@@ -89,14 +89,14 @@ exports.getModule = class ShowArtModule extends MenuModule {
                 return cb(err);
             }
 
-            //	further resolve key -> file base area art
+            //  further resolve key -> file base area art
             const artSpec = _.get(Config(), [ 'fileBase', 'areas', key, 'art' ]);
             if(!artSpec) {
                 return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
             }
             const options = {
-                pause 	: this.shouldPause(),
-                desc	: 'fileBaseArea',
+                pause   : this.shouldPause(),
+                desc    : 'fileBaseArea',
             };
             return this.displaySingleArtWithOptions(artSpec, options, cb);
         });
@@ -122,7 +122,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
         async.waterfall(
             [
                 function art(callback) {
-                    //	:TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
+                    //  :TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
                     self.displayAsset(
                         artSpec,
                         self.menuConfig.options,
@@ -137,7 +137,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
                 },
                 function recordCursorPosition(mciData, callback) {
                     if(!options.pause) {
-                        return callback(null, mciData, null);	//	cursor position not needed
+                        return callback(null, mciData, null);   //  cursor position not needed
                     }
 
                     self.client.once('cursor position report', pos => {
diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index b46dda51..e6be1232 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -1,29 +1,29 @@
 /* jslint node: true */
 'use strict';
 
-const MenuView		= require('./menu_view.js').MenuView;
-const ansi			= require('./ansi_term.js');
-const strUtil		= require('./string_util.js');
+const MenuView      = require('./menu_view.js').MenuView;
+const ansi          = require('./ansi_term.js');
+const strUtil       = require('./string_util.js');
 
-const util			= require('util');
-const assert		= require('assert');
-const _				= require('lodash');
+const util          = require('util');
+const assert        = require('assert');
+const _             = require('lodash');
 
-exports.SpinnerMenuView	= SpinnerMenuView;
+exports.SpinnerMenuView = SpinnerMenuView;
 
 function SpinnerMenuView(options) {
-    options.justify	= options.justify || 'left';
-    options.cursor	= options.cursor || 'hide';
+    options.justify = options.justify || 'left';
+    options.cursor  = options.cursor || 'hide';
 
     MenuView.call(this, options);
 
     var self = this;
 
     /*
-	this.cachePositions = function() {
-		self.positionCacheExpired = false;
-	};
-	*/
+    this.cachePositions = function() {
+        self.positionCacheExpired = false;
+    };
+    */
 
     this.updateSelection = function() {
         //assert(!self.positionCacheExpired);
@@ -66,9 +66,9 @@ SpinnerMenuView.prototype.setFocus = function(focused) {
 };
 
 SpinnerMenuView.prototype.setFocusItemIndex = function(index) {
-    SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);   //  sets this.focusedItemIndex
 
-    this.updateSelection();	//	will redraw
+    this.updateSelection(); //  will redraw
 };
 
 SpinnerMenuView.prototype.onKeyPress = function(ch, key) {
diff --git a/core/standard_menu.js b/core/standard_menu.js
index f22153b2..a4dacb95 100644
--- a/core/standard_menu.js
+++ b/core/standard_menu.js
@@ -1,12 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('./menu_module.js').MenuModule;
+const MenuModule    = require('./menu_module.js').MenuModule;
 
 exports.moduleInfo = {
-    name	: 'Standard Menu Module',
-    desc	: 'A Menu Module capable of handing standard configurations',
-    author	: 'NuSkooler',
+    name    : 'Standard Menu Module',
+    desc    : 'A Menu Module capable of handing standard configurations',
+    author  : 'NuSkooler',
 };
 
 exports.getModule = class StandardMenuModule extends MenuModule {
@@ -20,7 +20,7 @@ exports.getModule = class StandardMenuModule extends MenuModule {
                 return cb(err);
             }
 
-            //	 we do this so other modules can be both customized and still perform standard tasks
+            //   we do this so other modules can be both customized and still perform standard tasks
             return this.standardMCIReadyHandler(mciData, cb);
         });
     }
diff --git a/core/stat_log.js b/core/stat_log.js
index 849404c2..4b076e6d 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -1,23 +1,23 @@
 /* jslint node: true */
 'use strict';
 
-const sysDb		= require('./database.js').dbs.system;
+const sysDb     = require('./database.js').dbs.system;
 
-//	deps
-const _			= require('lodash');
-const moment	= require('moment');
+//  deps
+const _         = require('lodash');
+const moment    = require('moment');
 
 /*
-	System Event Log & Stats
-	------------------------
+    System Event Log & Stats
+    ------------------------
 
-	System & user specific:
-	* Events for generating various statistics, logs such as last callers, etc.
-	* Stats such as counters
+    System & user specific:
+    * Events for generating various statistics, logs such as last callers, etc.
+    * Stats such as counters
 
-	User specific stats are simply an alternate interface to user properties, while
-	system wide entries are handled on their own. Both are read accessible non-blocking
-	making them easily available for MCI codes for example.
+    User specific stats are simply an alternate interface to user properties, while
+    system wide entries are handled on their own. Both are read accessible non-blocking
+    making them easily available for MCI codes for example.
 */
 class StatLog {
     constructor() {
@@ -26,13 +26,13 @@ class StatLog {
 
     init(cb) {
         //
-        //	Load previous state/values of |this.systemStats|
+        //  Load previous state/values of |this.systemStats|
         //
         const self = this;
 
         sysDb.each(
             `SELECT stat_name, stat_value
-			FROM system_stat;`,
+            FROM system_stat;`,
             (err, row) => {
                 if(row) {
                     self.systemStats[row.stat_name] = row.stat_value;
@@ -52,19 +52,19 @@ class StatLog {
 
     get KeepType() {
         return {
-            Forever	: 'forever',
-            Days	: 'days',
-            Max		: 'max',
-            Count	: 'max',
+            Forever : 'forever',
+            Days    : 'days',
+            Max     : 'max',
+            Count   : 'max',
         };
     }
 
     get Order() {
         return {
-            Timestamp		: 'timestamp_asc',
-            TimestampAsc	: 'timestamp_asc',
-            TimestampDesc	: 'timestamp_desc',
-            Random			: 'random',
+            Timestamp       : 'timestamp_asc',
+            TimestampAsc    : 'timestamp_asc',
+            TimestampDesc   : 'timestamp_desc',
+            Random          : 'random',
         };
     }
 
@@ -73,16 +73,16 @@ class StatLog {
     }
 
     setSystemStat(statName, statValue, cb) {
-        //	live stats
+        //  live stats
         this.systemStats[statName] = statValue;
 
-        //	persisted stats
+        //  persisted stats
         sysDb.run(
             `REPLACE INTO system_stat (stat_name, stat_value)
-			VALUES (?, ?);`,
+            VALUES (?, ?);`,
             [ statName, statValue ],
             err => {
-                //	cb optional - callers may fire & forget
+                //  cb optional - callers may fire & forget
                 if(cb) {
                     return cb(err);
                 }
@@ -114,11 +114,11 @@ class StatLog {
     }
 
     //
-    //	User specific stats
-    //	These are simply convience methods to the user's properties
+    //  User specific stats
+    //  These are simply convience methods to the user's properties
     //
     setUserStat(user, statName, statValue, cb) {
-        //	note: cb is optional in PersistUserProperty
+        //  note: cb is optional in PersistUserProperty
         return user.persistProperty(statName, statValue, cb);
     }
 
@@ -147,17 +147,17 @@ class StatLog {
         return this.setUserStat(user, statName, newValue, cb);
     }
 
-    //	the time "now" in the ISO format we use and love :)
+    //  the time "now" in the ISO format we use and love :)
     get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); }
 
     appendSystemLogEntry(logName, logValue, keep, keepType, cb) {
         sysDb.run(
             `INSERT INTO system_event_log (timestamp, log_name, log_value)
-			VALUES (?, ?, ?);`,
+            VALUES (?, ?, ?);`,
             [ this.now, logName, logValue ],
             () => {
                 //
-                //	Handle keep
+                //  Handle keep
                 //
                 if(-1 === keep) {
                     if(cb) {
@@ -167,14 +167,14 @@ class StatLog {
                 }
 
                 switch(keepType) {
-                    //	keep # of days
+                    //  keep # of days
                     case 'days' :
                         sysDb.run(
                             `DELETE FROM system_event_log
-							WHERE log_name = ? AND timestamp <= DATETIME("now", "-${keep} day");`,
+                            WHERE log_name = ? AND timestamp <= DATETIME("now", "-${keep} day");`,
                             [ logName ],
                             err => {
-                                //	cb optional - callers may fire & forget
+                                //  cb optional - callers may fire & forget
                                 if(cb) {
                                     return cb(err);
                                 }
@@ -184,16 +184,16 @@ class StatLog {
 
                     case 'count':
                     case 'max' :
-                        //	keep max of N/count
+                        //  keep max of N/count
                         sysDb.run(
                             `DELETE FROM system_event_log
-							WHERE id IN(
-								SELECT id 
-								FROM system_event_log
-								WHERE log_name = ?
-								ORDER BY id DESC
-								LIMIT -1 OFFSET ${keep}
-							);`,
+                            WHERE id IN(
+                                SELECT id 
+                                FROM system_event_log
+                                WHERE log_name = ?
+                                ORDER BY id DESC
+                                LIMIT -1 OFFSET ${keep}
+                            );`,
                             [ logName ],
                             err => {
                                 if(cb) {
@@ -205,7 +205,7 @@ class StatLog {
 
                     case 'forever' :
                     default :
-                        //	nop
+                        //  nop
                         break;
                 }
             }
@@ -214,9 +214,9 @@ class StatLog {
 
     getSystemLogEntries(logName, order, limit, cb) {
         let sql =
-			`SELECT timestamp, log_value
-			FROM system_event_log
-			WHERE log_name = ?`;
+            `SELECT timestamp, log_value
+            FROM system_event_log
+            WHERE log_name = ?`;
 
         switch(order) {
             case 'timestamp' :
@@ -228,13 +228,13 @@ class StatLog {
                 sql += ' ORDER BY timestamp DESC';
                 break;
 
-            case 'random'	:
+            case 'random'   :
                 sql += ' ORDER BY RANDOM()';
         }
 
         if(!cb && _.isFunction(limit)) {
-            cb		= limit;
-            limit	= 0;
+            cb      = limit;
+            limit   = 0;
         } else {
             limit = limit || 0;
         }
@@ -253,11 +253,11 @@ class StatLog {
     appendUserLogEntry(user, logName, logValue, keepDays, cb) {
         sysDb.run(
             `INSERT INTO user_event_log (timestamp, user_id, log_name, log_value)
-			VALUES (?, ?, ?, ?);`,
+            VALUES (?, ?, ?, ?);`,
             [ this.now, user.userId, logName, logValue ],
             () => {
                 //
-                //	Handle keepDays
+                //  Handle keepDays
                 //
                 if(-1 === keepDays) {
                     if(cb) {
@@ -268,10 +268,10 @@ class StatLog {
 
                 sysDb.run(
                     `DELETE FROM user_event_log
-					WHERE user_id = ? AND log_name = ? AND timestamp <= DATETIME("now", "-${keepDays} day");`,
+                    WHERE user_id = ? AND log_name = ? AND timestamp <= DATETIME("now", "-${keepDays} day");`,
                     [ user.userId, logName ],
                     err => {
-                        //	cb optional - callers may fire & forget
+                        //  cb optional - callers may fire & forget
                         if(cb) {
                             return cb(err);
                         }
diff --git a/core/string_format.js b/core/string_format.js
index 7857f2b3..cef937c4 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-const EnigError				= require('./enig_error.js').EnigError;
+const EnigError             = require('./enig_error.js').EnigError;
 
 const {
     pad,
@@ -10,41 +10,41 @@ const {
     renderSubstr,
     formatByteSize, formatByteSizeAbbr,
     formatCount, formatCountAbbr,
-}							= require('./string_util.js');
+}                           = require('./string_util.js');
 
-//	deps
-const _				= require('lodash');
+//  deps
+const _             = require('lodash');
 
 /*
-	String formatting HEAVILY inspired by David Chambers string-format library
-	and the mini-language branch specifically which was gratiously released
-	under the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE.
+    String formatting HEAVILY inspired by David Chambers string-format library
+    and the mini-language branch specifically which was gratiously released
+    under the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE.
 
-	We need some extra functionality. Namely, support for RA style pipe codes
-	and ANSI escape sequences.
+    We need some extra functionality. Namely, support for RA style pipe codes
+    and ANSI escape sequences.
 */
 
 class ValueError extends EnigError { }
 class KeyError extends EnigError { }
 
 const SpecRegExp = {
-    FillAlign	: /^(.)?([<>=^])/,
-    Sign		: /^[ +-]/,
-    Width		: /^\d*/,
-    Precision	: /^\d+/,
+    FillAlign   : /^(.)?([<>=^])/,
+    Sign        : /^[ +-]/,
+    Width       : /^\d*/,
+    Precision   : /^\d+/,
 };
 
 function tokenizeFormatSpec(spec) {
     const tokens = {
-        fill		: '',
-        align		: '',
-        sign		: '',
-        '#'			: false,
-        '0'			: false,
-        width		: '',
-        ','			: false,
-        precision	: '',
-        type		: '',
+        fill        : '',
+        align       : '',
+        sign        : '',
+        '#'         : false,
+        '0'         : false,
+        width       : '',
+        ','         : false,
+        precision   : '',
+        type        : '',
     };
 
     let index = 0;
@@ -110,7 +110,7 @@ function tokenizeFormatSpec(spec) {
     }
 
     if(tokens[','] && 's' === tokens.type) {
-        throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
+        throw new ValueError(`Cannot specify ',' with 's'`);    //  eslint-disable-line quotes
     }
 
     return tokens;
@@ -129,16 +129,16 @@ function getPadAlign(align) {
 }
 
 function formatString(value, tokens) {
-    const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
-    const align		= tokens.align || (tokens['0'] ? '=' : '<');
-    const precision	= Number(tokens.precision || renderStringLength(value) + 1);
+    const fill      = tokens.fill || (tokens['0'] ? '0' : ' ');
+    const align     = tokens.align || (tokens['0'] ? '=' : '<');
+    const precision = Number(tokens.precision || renderStringLength(value) + 1);
 
     if('' !== tokens.type && 's' !== tokens.type) {
         throw new ValueError(`Unknown format code "${tokens.type}" for String object`);
     }
 
     if(tokens[',']) {
-        throw new ValueError(`Cannot specify ',' with 's'`);	//	eslint-disable-line quotes
+        throw new ValueError(`Cannot specify ',' with 's'`);    //  eslint-disable-line quotes
     }
 
     if(tokens.sign) {
@@ -157,8 +157,8 @@ function formatString(value, tokens) {
 }
 
 const FormatNumRegExp = {
-    UpperType	: /[A-Z]/,
-    ExponentRep	: /e[+-](?=\d$)/,
+    UpperType   : /[A-Z]/,
+    ExponentRep : /e[+-](?=\d$)/,
 };
 
 function formatNumberHelper(n, precision, type) {
@@ -175,7 +175,7 @@ function formatNumberHelper(n, precision, type) {
         case 'e' : return n.toExponential(precision).replace(FormatNumRegExp.ExponentRep, '$&0');
         case 'f' : return n.toFixed(precision);
         case 'g' :
-            //	we don't want useless trailing zeros. parseFloat -> back to string fixes this for us
+            //  we don't want useless trailing zeros. parseFloat -> back to string fixes this for us
             return parseFloat(n.toPrecision(precision || 1)).toString();
 
         case '%' : return formatNumberHelper(n * 100, precision, 'f') + '%';
@@ -187,10 +187,10 @@ function formatNumberHelper(n, precision, type) {
 }
 
 function formatNumber(value, tokens) {
-    const fill		= tokens.fill || (tokens['0'] ? '0' : ' ');
-    const align		= tokens.align || (tokens['0'] ? '=' : '>');
-    const width		= Number(tokens.width);
-    const type		= tokens.type || (tokens.precision ? 'g' : '');
+    const fill      = tokens.fill || (tokens['0'] ? '0' : ' ');
+    const align     = tokens.align || (tokens['0'] ? '=' : '>');
+    const width     = Number(tokens.width);
+    const type      = tokens.type || (tokens.precision ? 'g' : '');
 
     if( [ 'c', 'd', 'b', 'o', 'x', 'X' ].indexOf(type) > -1) {
         if(0 !== value % 1) {
@@ -198,7 +198,7 @@ function formatNumber(value, tokens) {
         }
 
         if('' !== tokens.sign && 'c' !== type) {
-            throw new ValueError(`Sign not allowed with integer format specifier 'c'`);	//	eslint-disable-line quotes
+            throw new ValueError(`Sign not allowed with integer format specifier 'c'`); //  eslint-disable-line quotes
         }
 
         if(tokens[','] && 'd' !== type) {
@@ -214,16 +214,16 @@ function formatNumber(value, tokens) {
         }
     }
 
-    const s			= formatNumberHelper(Math.abs(value), Number(tokens.precision || 6), type);
-    const sign		= value < 0 || 1 / value < 0 ?
+    const s         = formatNumberHelper(Math.abs(value), Number(tokens.precision || 6), type);
+    const sign      = value < 0 || 1 / value < 0 ?
         '-' :
         '-' === tokens.sign ? '' : tokens.sign;
 
-    const prefix	= tokens['#'] && ( [ 'b', 'o', 'x', 'X' ].indexOf(type) > -1 ) ? '0' + type : '';
+    const prefix    = tokens['#'] && ( [ 'b', 'o', 'x', 'X' ].indexOf(type) > -1 ) ? '0' + type : '';
 
     if(tokens[',']) {
-        const match 	= /^(\d*)(.*)$/.exec(s);
-        const separated	= match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2];
+        const match     = /^(\d*)(.*)$/.exec(s);
+        const separated = match[1].replace(/.(?=(...)+$)/g, '$&,') + match[2];
 
         if('=' !== align) {
             return pad(sign + separated, width, fill, getPadAlign(align));
@@ -231,9 +231,9 @@ function formatNumber(value, tokens) {
 
         if('0' === fill) {
             const shortfall = Math.max(0, width - sign.length - separated.length);
-            const digits	= /^\d*/.exec(separated)[0].length;
-            let padding 	= '';
-            //	:TODO: do this differntly...
+            const digits    = /^\d*/.exec(separated)[0].length;
+            let padding     = '';
+            //  :TODO: do this differntly...
             for(let n = 0; n < shortfall; n++) {
                 padding = ((digits + n) % 4 === 3 ? ',' : '0') + padding;
             }
@@ -256,31 +256,31 @@ function formatNumber(value, tokens) {
 }
 
 const transformers = {
-    //	String standard
-    toUpperCase			: String.prototype.toUpperCase,
-    toLowerCase			: String.prototype.toLowerCase,
+    //  String standard
+    toUpperCase         : String.prototype.toUpperCase,
+    toLowerCase         : String.prototype.toLowerCase,
 
-    //	some super l33b BBS styles!!
-    styleUpper			: (s) => stylizeString(s, 'upper'),
-    styleLower			: (s) => stylizeString(s, 'lower'),
-    styleTitle			: (s) => stylizeString(s, 'title'),
-    styleFirstLower		: (s) => stylizeString(s, 'first lower'),
-    styleSmallVowels	: (s) => stylizeString(s, 'small vowels'),
-    styleBigVowels		: (s) => stylizeString(s, 'big vowels'),
-    styleSmallI			: (s) => stylizeString(s, 'small i'),
-    styleMixed			: (s) => stylizeString(s, 'mixed'),
-    styleL33t			: (s) => stylizeString(s, 'l33t'),
+    //  some super l33b BBS styles!!
+    styleUpper          : (s) => stylizeString(s, 'upper'),
+    styleLower          : (s) => stylizeString(s, 'lower'),
+    styleTitle          : (s) => stylizeString(s, 'title'),
+    styleFirstLower     : (s) => stylizeString(s, 'first lower'),
+    styleSmallVowels    : (s) => stylizeString(s, 'small vowels'),
+    styleBigVowels      : (s) => stylizeString(s, 'big vowels'),
+    styleSmallI         : (s) => stylizeString(s, 'small i'),
+    styleMixed          : (s) => stylizeString(s, 'mixed'),
+    styleL33t           : (s) => stylizeString(s, 'l33t'),
 
-    //	:TODO:
-    //	toMegs(), toKilobytes(), ...
-    //	toList(), toCommaList(),
+    //  :TODO:
+    //  toMegs(), toKilobytes(), ...
+    //  toList(), toCommaList(),
 
-    sizeWithAbbr		: (n) => formatByteSize(n, true, 2),
-    sizeWithoutAbbr		: (n) => formatByteSize(n, false, 2),
-    sizeAbbr			: (n) => formatByteSizeAbbr(n),
-    countWithAbbr		: (n) => formatCount(n, true, 0),
-    countWithoutAbbr	: (n) => formatCount(n, false, 0),
-    countAbbr			: (n) => formatCountAbbr(n),
+    sizeWithAbbr        : (n) => formatByteSize(n, true, 2),
+    sizeWithoutAbbr     : (n) => formatByteSize(n, false, 2),
+    sizeAbbr            : (n) => formatByteSizeAbbr(n),
+    countWithAbbr       : (n) => formatCount(n, true, 0),
+    countWithoutAbbr    : (n) => formatCount(n, false, 0),
+    countAbbr           : (n) => formatCountAbbr(n),
 };
 
 function transformValue(transformerName, value) {
@@ -292,8 +292,8 @@ function transformValue(transformerName, value) {
     return value;
 }
 
-//	:TODO: Use explicit set of chars for paths & function/transforms such that } is allowed as fill/etc.
-const REGEXP_BASIC_FORMAT	= /{([^.!:}]+(?:\.[^.!:}]+)*)(?:!([^:}]+))?(?::([^}]+))?}/g;
+//  :TODO: Use explicit set of chars for paths & function/transforms such that } is allowed as fill/etc.
+const REGEXP_BASIC_FORMAT   = /{([^.!:}]+(?:\.[^.!:}]+)*)(?:!([^:}]+))?(?::([^}]+))?}/g;
 
 function getValue(obj, path) {
     const value = _.get(obj, path);
@@ -307,7 +307,7 @@ function getValue(obj, path) {
 module.exports = function format(fmt, obj) {
 
     const re = REGEXP_BASIC_FORMAT;
-    re.lastIndex = 0;	//	reset from prev
+    re.lastIndex = 0;   //  reset from prev
 
     let match;
     let pos;
@@ -319,17 +319,17 @@ module.exports = function format(fmt, obj) {
     let tokens;
 
     do {
-        pos		= re.lastIndex;
-        match	= re.exec(fmt);
+        pos     = re.lastIndex;
+        match   = re.exec(fmt);
 
         if(match) {
             if(match.index > pos) {
                 out += fmt.slice(pos, match.index);
             }
 
-            objPath		= match[1];
-            transformer	= match[2];
-            formatSpec	= match[3];
+            objPath     = match[1];
+            transformer = match[2];
+            formatSpec  = match[3];
 
             value = getValue(obj,  objPath);
             if(transformer) {
@@ -347,7 +347,7 @@ module.exports = function format(fmt, obj) {
 
     } while(0 !== re.lastIndex);
 
-    //	remainder
+    //  remainder
     if(pos < fmt.length) {
         out += fmt.slice(pos);
     }
diff --git a/core/string_util.js b/core/string_util.js
index 88f0e57e..8fab88b8 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -1,35 +1,35 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const ANSI				= require('./ansi_term.js');
+//  ENiGMA½
+const ANSI              = require('./ansi_term.js');
 
-//	deps
-const iconv				= require('iconv-lite');
-const _					= require('lodash');
+//  deps
+const iconv             = require('iconv-lite');
+const _                 = require('lodash');
 
-exports.stylizeString				= stylizeString;
-exports.pad							= pad;
-exports.insert						= insert;
-exports.replaceAt					= replaceAt;
-exports.isPrintable					= isPrintable;
-exports.stripAllLineFeeds			= stripAllLineFeeds;
-exports.debugEscapedString			= debugEscapedString;
-exports.stringFromNullTermBuffer	= stringFromNullTermBuffer;
-exports.stringToNullTermBuffer		= stringToNullTermBuffer;
-exports.renderSubstr				= renderSubstr;
-exports.renderStringLength			= renderStringLength;
-exports.formatByteSizeAbbr			= formatByteSizeAbbr;
-exports.formatByteSize				= formatByteSize;
-exports.formatCountAbbr				= formatCountAbbr;
-exports.formatCount					= formatCount;
-exports.cleanControlCodes			= cleanControlCodes;
-exports.isAnsi						= isAnsi;
-exports.isAnsiLine					= isAnsiLine;
-exports.isFormattedLine				= isFormattedLine;
-exports.splitTextAtTerms			= splitTextAtTerms;
+exports.stylizeString               = stylizeString;
+exports.pad                         = pad;
+exports.insert                      = insert;
+exports.replaceAt                   = replaceAt;
+exports.isPrintable                 = isPrintable;
+exports.stripAllLineFeeds           = stripAllLineFeeds;
+exports.debugEscapedString          = debugEscapedString;
+exports.stringFromNullTermBuffer    = stringFromNullTermBuffer;
+exports.stringToNullTermBuffer      = stringToNullTermBuffer;
+exports.renderSubstr                = renderSubstr;
+exports.renderStringLength          = renderStringLength;
+exports.formatByteSizeAbbr          = formatByteSizeAbbr;
+exports.formatByteSize              = formatByteSize;
+exports.formatCountAbbr             = formatCountAbbr;
+exports.formatCount                 = formatCount;
+exports.cleanControlCodes           = cleanControlCodes;
+exports.isAnsi                      = isAnsi;
+exports.isAnsiLine                  = isAnsiLine;
+exports.isFormattedLine             = isFormattedLine;
+exports.splitTextAtTerms            = splitTextAtTerms;
 
-//	:TODO: create Unicode verison of this
+//  :TODO: create Unicode verison of this
 const VOWELS = [ 'a', 'e', 'i', 'o', 'u' ];
 VOWELS.concat(VOWELS.map(l => l.toUpperCase()));
 
@@ -49,36 +49,36 @@ function stylizeString(s, style) {
     var stylized = '';
 
     switch(style) {
-        //	None/normal
+        //  None/normal
         case 'normal' :
         case 'N' :
             return s;
 
-            //	UPPERCASE
+            //  UPPERCASE
         case 'upper' :
         case 'U' :
             return s.toUpperCase();
 
-            //	lowercase
+            //  lowercase
         case 'lower' :
         case 'l' :
             return s.toLowerCase();
 
-            //	Title Case
+            //  Title Case
         case 'title' :
         case 'T' :
             return s.replace(/\w\S*/g, function onProperCaseChar(t) {
                 return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase();
             });
 
-            //	fIRST lOWER
+            //  fIRST lOWER
         case 'first lower' :
         case 'f' :
             return s.replace(/\w\S*/g, function onFirstLowerChar(t) {
                 return t.charAt(0).toLowerCase() + t.substr(1).toUpperCase();
             });
 
-            //	SMaLL VoWeLS
+            //  SMaLL VoWeLS
         case 'small vowels' :
         case 'v' :
             for(i = 0; i < len; ++i) {
@@ -91,7 +91,7 @@ function stylizeString(s, style) {
             }
             return stylized;
 
-            //	bIg vOwELS
+            //  bIg vOwELS
         case 'big vowels' :
         case 'V' :
             for(i = 0; i < len; ++i) {
@@ -104,12 +104,12 @@ function stylizeString(s, style) {
             }
             return stylized;
 
-            //	Small i's: DEMENTiA
+            //  Small i's: DEMENTiA
         case 'small i' :
         case 'i' :
             return s.toUpperCase().replace(/I/g, 'i');
 
-            //	mIxeD CaSE (random upper/lower)
+            //  mIxeD CaSE (random upper/lower)
         case 'mixed' :
         case 'M' :
             for(i = 0; i < len; i++) {
@@ -121,7 +121,7 @@ function stylizeString(s, style) {
             }
             return stylized;
 
-            //	l337 5p34k
+            //  l337 5p34k
         case 'l33t' :
         case '3' :
             for(i = 0; i < len; ++i) {
@@ -135,15 +135,15 @@ function stylizeString(s, style) {
 }
 
 function pad(s, len, padChar, justify, stringSGR, padSGR, useRenderLen) {
-    len				= len || 0;
-    padChar			= padChar || ' ';
-    justify			= justify || 'left';
-    stringSGR		= stringSGR || '';
-    padSGR			= padSGR || '';
-    useRenderLen 	= _.isUndefined(useRenderLen) ? true : useRenderLen;
+    len             = len || 0;
+    padChar         = padChar || ' ';
+    justify         = justify || 'left';
+    stringSGR       = stringSGR || '';
+    padSGR          = padSGR || '';
+    useRenderLen    = _.isUndefined(useRenderLen) ? true : useRenderLen;
 
-    const renderLen	= useRenderLen ? renderStringLength(s) : s.length;
-    const padlen	= len >= renderLen ? len - renderLen : 0;
+    const renderLen = useRenderLen ? renderStringLength(s) : s.length;
+    const padlen    = len >= renderLen ? len - renderLen : 0;
 
     switch(justify) {
         case 'L' :
@@ -155,9 +155,9 @@ function pad(s, len, padChar, justify, stringSGR, padSGR, useRenderLen) {
         case 'center' :
         case 'both' :
             {
-                const right	= Math.ceil(padlen / 2);
-                const left	= padlen - right;
-                s			= `${padSGR}${Array(left + 1).join(padChar)}${stringSGR}${s}${padSGR}${Array(right + 1).join(padChar)}`;
+                const right = Math.ceil(padlen / 2);
+                const left  = padlen - right;
+                s           = `${padSGR}${Array(left + 1).join(padChar)}${stringSGR}${s}${padSGR}${Array(right + 1).join(padChar)}`;
             }
             break;
 
@@ -181,16 +181,16 @@ function replaceAt(s, n, t) {
 }
 
 const RE_NON_PRINTABLE =
-	/[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;	//	eslint-disable-line no-control-regex
+    /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;    //  eslint-disable-line no-control-regex
 
 function isPrintable(s) {
     //
-    //	See the following:
-    //		https://mathiasbynens.be/notes/javascript-unicode
-    //		http://stackoverflow.com/questions/11598786/how-to-replace-non-printable-unicode-characters-javascript
-    //		http://stackoverflow.com/questions/12052825/regular-expression-for-all-printable-characters-in-javascript
+    //  See the following:
+    //      https://mathiasbynens.be/notes/javascript-unicode
+    //      http://stackoverflow.com/questions/11598786/how-to-replace-non-printable-unicode-characters-javascript
+    //      http://stackoverflow.com/questions/12052825/regular-expression-for-all-printable-characters-in-javascript
     //
-    //	:TODO: Probably need somthing better here.
+    //  :TODO: Probably need somthing better here.
     return !RE_NON_PRINTABLE.test(s);
 }
 
@@ -213,29 +213,29 @@ function stringFromNullTermBuffer(buf, encoding) {
 
 function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1 } ) {
     let buf = iconv.encode( `${s}\0`, options.encoding ).slice(0, options.maxBufLen);
-    buf[buf.length - 1] = '\0';	//	make abs sure we null term even if truncated
+    buf[buf.length - 1] = '\0'; //  make abs sure we null term even if truncated
     return buf;
 }
 
-const PIPE_REGEXP			= /(\|[A-Z\d]{2})/g;
-//const ANSI_REGEXP			= /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
-//const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
-const ANSI_OR_PIPE_REGEXP	= new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
+const PIPE_REGEXP           = /(\|[A-Z\d]{2})/g;
+//const ANSI_REGEXP         = /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
+//const ANSI_OR_PIPE_REGEXP = new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
+const ANSI_OR_PIPE_REGEXP   = new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
 
 //
-//	Similar to substr() but works with ANSI/Pipe code strings
+//  Similar to substr() but works with ANSI/Pipe code strings
 //
 function renderSubstr(str, start, length) {
-    //	shortcut for empty strings
+    //  shortcut for empty strings
     if(0 === str.length) {
         return str;
     }
 
-    start	= start || 0;
-    length	= length || str.length - start;
+    start   = start || 0;
+    length  = length || str.length - start;
 
     const re = ANSI_OR_PIPE_REGEXP;
-    re.lastIndex	 = 0;	//	we recycle the obj; must reset!
+    re.lastIndex     = 0;   //  we recycle the obj; must reset!
 
     let pos = 0;
     let match;
@@ -243,22 +243,22 @@ function renderSubstr(str, start, length) {
     let renderLen = 0;
     let s;
     do {
-        pos		= re.lastIndex;
-        match	= re.exec(str);
+        pos     = re.lastIndex;
+        match   = re.exec(str);
 
         if(match) {
             if(match.index > pos) {
                 s = str.slice(pos + start, Math.min(match.index, pos + (length - renderLen)));
-                start		= 0;	//	start offset applies only once
-                out			+= s;
-                renderLen	+= s.length;
+                start       = 0;    //  start offset applies only once
+                out         += s;
+                renderLen   += s.length;
             }
 
             out += match[0];
         }
     } while(renderLen < length && 0 !== re.lastIndex);
 
-    //	remainder
+    //  remainder
     if(pos + start < str.length && renderLen < length) {
         out += str.slice(pos + start, (pos + start + (length - renderLen)));
         //out += str.slice(pos + start, Math.max(1, pos + (length - renderLen - 1)));
@@ -268,12 +268,12 @@ function renderSubstr(str, start, length) {
 }
 
 //
-//	Method to return the "rendered" length taking into account Pipe and ANSI color codes.
+//  Method to return the "rendered" length taking into account Pipe and ANSI color codes.
 //
-//	We additionally account for ANSI *forward* movement ESC sequences
-//	in the form of ESC[<N>C where <N> is the "go forward" character count.
+//  We additionally account for ANSI *forward* movement ESC sequences
+//  in the form of ESC[<N>C where <N> is the "go forward" character count.
 //
-//	See also https://github.com/chalk/ansi-regex/blob/master/index.js
+//  See also https://github.com/chalk/ansi-regex/blob/master/index.js
 //
 function renderStringLength(s) {
     let m;
@@ -281,22 +281,22 @@ function renderStringLength(s) {
     let len = 0;
 
     const re = ANSI_OR_PIPE_REGEXP;
-    re.lastIndex = 0;	//	we recycle the rege; reset
+    re.lastIndex = 0;   //  we recycle the rege; reset
 
     //
-    //	Loop counting only literal (non-control) sequences
-    //	paying special attention to ESC[<N>C which means forward <N>
+    //  Loop counting only literal (non-control) sequences
+    //  paying special attention to ESC[<N>C which means forward <N>
     //
     do {
-        pos	= re.lastIndex;
-        m	= re.exec(s);
+        pos = re.lastIndex;
+        m   = re.exec(s);
 
         if(m) {
             if(m.index > pos) {
                 len += s.slice(pos, m.index).length;
             }
 
-            if('C' === m[3]) {	//	ESC[<N>C is foward/right
+            if('C' === m[3]) {  //  ESC[<N>C is foward/right
                 len += parseInt(m[2], 10) || 0;
             }
         }
@@ -309,19 +309,19 @@ function renderStringLength(s) {
     return len;
 }
 
-const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];	//	:)
+const BYTE_SIZE_ABBRS = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];    //  :)
 
 function formatByteSizeAbbr(byteSize) {
     if(0 === byteSize) {
-        return BYTE_SIZE_ABBRS[0];	//	B
+        return BYTE_SIZE_ABBRS[0];  //  B
     }
 
     return BYTE_SIZE_ABBRS[Math.floor(Math.log(byteSize) / Math.log(1024))];
 }
 
 function formatByteSize(byteSize, withAbbr = false, decimals = 2) {
-    const i		= 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
-    let result	= parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
+    const i     = 0 === byteSize ? byteSize : Math.floor(Math.log(byteSize) / Math.log(1024));
+    let result  = parseFloat((byteSize / Math.pow(1024, i)).toFixed(decimals));
     if(withAbbr) {
         result += ` ${BYTE_SIZE_ABBRS[i]}`;
     }
@@ -339,8 +339,8 @@ function formatCountAbbr(count) {
 }
 
 function formatCount(count, withAbbr = false, decimals = 2) {
-    const i		= 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
-    let result	= parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
+    const i     = 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));
+    let result  = parseFloat((count / Math.pow(1000, i)).toFixed(decimals));
     if(withAbbr) {
         result += `${COUNT_ABBRS[i]}`;
     }
@@ -348,13 +348,13 @@ function formatCount(count, withAbbr = false, decimals = 2) {
 }
 
 
-//	:TODO: See notes in word_wrap.js about need to consolidate the various ANSI related RegExp's
-//const REGEXP_ANSI_CONTROL_CODES		= /(\x1b\x5b)([\?=;0-9]*?)([0-9A-ORZcf-npsu=><])/g;
-const REGEXP_ANSI_CONTROL_CODES		= /(?:\x1b\x5b)([?=;0-9]*?)([A-ORZcf-npsu=><])/g;	//	eslint-disable-line no-control-regex
-const ANSI_OPCODES_ALLOWED_CLEAN	= [
-    //'A', 'B',	//	up, down
-    //'C', 'D',	//	right, left
-    'm',		//	color
+//  :TODO: See notes in word_wrap.js about need to consolidate the various ANSI related RegExp's
+//const REGEXP_ANSI_CONTROL_CODES       = /(\x1b\x5b)([\?=;0-9]*?)([0-9A-ORZcf-npsu=><])/g;
+const REGEXP_ANSI_CONTROL_CODES     = /(?:\x1b\x5b)([?=;0-9]*?)([A-ORZcf-npsu=><])/g;   //  eslint-disable-line no-control-regex
+const ANSI_OPCODES_ALLOWED_CLEAN    = [
+    //'A', 'B', //  up, down
+    //'C', 'D', //  right, left
+    'm',        //  color
 ];
 
 function cleanControlCodes(input, options) {
@@ -365,12 +365,12 @@ function cleanControlCodes(input, options) {
     options = options || {};
 
     //
-    //	Loop through |input| adding only allowed ESC
-    //	sequences and literals to |cleaned|
+    //  Loop through |input| adding only allowed ESC
+    //  sequences and literals to |cleaned|
     //
     do {
-        pos	= REGEXP_ANSI_CONTROL_CODES.lastIndex;
-        m	= REGEXP_ANSI_CONTROL_CODES.exec(input);
+        pos = REGEXP_ANSI_CONTROL_CODES.lastIndex;
+        m   = REGEXP_ANSI_CONTROL_CODES.exec(input);
 
         if(m) {
             if(m.index > pos) {
@@ -388,7 +388,7 @@ function cleanControlCodes(input, options) {
 
     } while(0 !== REGEXP_ANSI_CONTROL_CODES.lastIndex);
 
-    //	remainder
+    //  remainder
     if(pos < input.length) {
         cleaned += input.slice(pos);
     }
@@ -401,20 +401,20 @@ function isAnsiLine(line) {
 }
 
 //
-//	Returns true if the line is considered "formatted". A line is
-//	considered formatted if it contains:
-//	* ANSI
-//	* Pipe codes
-//	* Extended (CP437) ASCII - https://www.ascii-codes.com/
-//	* Tabs
-//	* Contigous 3+ spaces before the end of the line
+//  Returns true if the line is considered "formatted". A line is
+//  considered formatted if it contains:
+//  * ANSI
+//  * Pipe codes
+//  * Extended (CP437) ASCII - https://www.ascii-codes.com/
+//  * Tabs
+//  * Contigous 3+ spaces before the end of the line
 //
 function isFormattedLine(line) {
     if(renderStringLength(line) < line.length) {
-        return true;	//	ANSI or Pipe Codes
+        return true;    //  ANSI or Pipe Codes
     }
 
-    if(line.match(/[\t\x00-\x1f\x80-\xff]/)) {	//	eslint-disable-line no-control-regex
+    if(line.match(/[\t\x00-\x1f\x80-\xff]/)) {  //  eslint-disable-line no-control-regex
         return true;
     }
 
@@ -425,35 +425,35 @@ function isFormattedLine(line) {
     return false;
 }
 
-//	:TODO: rename to containsAnsi()
+//  :TODO: rename to containsAnsi()
 function isAnsi(input) {
     if(!input || 0 === input.length) {
         return false;
     }
 
     //
-    //	* ANSI found - limited, just colors
-    //	* Full ANSI art
-    //	*
+    //  * ANSI found - limited, just colors
+    //  * Full ANSI art
+    //  *
     //
-    //	FULL ANSI art:
-    //	* SAUCE present & reports as ANSI art
-    //	* ANSI clear screen within first 2-3 codes
-    //	* ANSI movement codes (goto, right, left, etc.)
+    //  FULL ANSI art:
+    //  * SAUCE present & reports as ANSI art
+    //  * ANSI clear screen within first 2-3 codes
+    //  * ANSI movement codes (goto, right, left, etc.)
     //
-    //	*
+    //  *
     /*
-	readSAUCE(input, (err, sauce) => {
-		if(!err && ('ANSi' === sauce.fileType || 'ANSiMation' === sauce.fileType)) {
-			return cb(null, 'ansi');
-		}
-	});
-	*/
+    readSAUCE(input, (err, sauce) => {
+        if(!err && ('ANSi' === sauce.fileType || 'ANSiMation' === sauce.fileType)) {
+            return cb(null, 'ansi');
+        }
+    });
+    */
 
-    //	:TODO: if a similar method is kept, use exec() until threshold
-    const ANSI_DET_REGEXP = /(?:\x1b\x5b)[?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g;	//	eslint-disable-line no-control-regex
+    //  :TODO: if a similar method is kept, use exec() until threshold
+    const ANSI_DET_REGEXP = /(?:\x1b\x5b)[?=;0-9]*?[ABCDEFGHJKLMSTfhlmnprsu]/g; //  eslint-disable-line no-control-regex
     const m = input.match(ANSI_DET_REGEXP) || [];
-    return m.length >= 4;	//	:TODO: do this reasonably, e.g. a percent or soemthing
+    return m.length >= 4;   //  :TODO: do this reasonably, e.g. a percent or soemthing
 }
 
 function splitTextAtTerms(s) {
diff --git a/core/system_events.js b/core/system_events.js
index e471c712..95316c95 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -2,24 +2,24 @@
 'use strict';
 
 module.exports = {
-    ClientConnected		: 'codes.l33t.enigma.system.connected',			//	{ client, connectionCount }
-    ClientDisconnected	: 'codes.l33t.enigma.system.disconnected',		//	{ client, connectionCount }
-    TermDetected		: 'codes.l33t.enigma.system.term_detected',		//	{ client }
+    ClientConnected     : 'codes.l33t.enigma.system.connected',         //  { client, connectionCount }
+    ClientDisconnected  : 'codes.l33t.enigma.system.disconnected',      //  { client, connectionCount }
+    TermDetected        : 'codes.l33t.enigma.system.term_detected',     //  { client }
 
-    ThemeChanged		: 'codes.l33t.enigma.system.theme_changed',		//	{ themeId }
-    ConfigChanged		: 'codes.l33t.enigma.system.config_changed',
-    MenusChanged		: 'codes.l33t.enigma.system.menus_changed',
-    PromptsChanged		: 'codes.l33t.enigma.system.prompts_changed',
+    ThemeChanged        : 'codes.l33t.enigma.system.theme_changed',     //  { themeId }
+    ConfigChanged       : 'codes.l33t.enigma.system.config_changed',
+    MenusChanged        : 'codes.l33t.enigma.system.menus_changed',
+    PromptsChanged      : 'codes.l33t.enigma.system.prompts_changed',
 
-    //	User - includes { user, ...}
-    NewUser				: 'codes.l33t.enigma.system.new_user',
-    UserLogin			: 'codes.l33t.enigma.system.user_login',
-    UserLogoff			: 'codes.l33t.enigma.system.user_logoff',
-    UserUpload			: 'codes.l33t.enigma.system.user_upload',		//	{..., files[ fileEntry, ...] }
-    UserDownload		: 'codes.l33t.enigma.system.user_download',		//	{..., files[ fileEntry, ...] }
+    //  User - includes { user, ...}
+    NewUser             : 'codes.l33t.enigma.system.new_user',
+    UserLogin           : 'codes.l33t.enigma.system.user_login',
+    UserLogoff          : 'codes.l33t.enigma.system.user_logoff',
+    UserUpload          : 'codes.l33t.enigma.system.user_upload',       //  {..., files[ fileEntry, ...] }
+    UserDownload        : 'codes.l33t.enigma.system.user_download',     //  {..., files[ fileEntry, ...] }
 
-    //	NYI below here:
-    UserPostMessage		: 'codes.l33t.enigma.system.user_post_msg',
-    UserSendMail		: 'codes.l33t.enigma.system.user_send_mail',
-    UserSendRunDoor		: 'codes.l33t.enigma.system.user_run_door',
+    //  NYI below here:
+    UserPostMessage     : 'codes.l33t.enigma.system.user_post_msg',
+    UserSendMail        : 'codes.l33t.enigma.system.user_send_mail',
+    UserSendRunDoor     : 'codes.l33t.enigma.system.user_run_door',
 };
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 55da7430..9c9cd6d3 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -1,61 +1,61 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const removeClient		= require('./client_connections.js').removeClient;
-const ansiNormal		= require('./ansi_term.js').normal;
-const userLogin			= require('./user_login.js').userLogin;
-const messageArea		= require('./message_area.js');
+//  ENiGMA½
+const removeClient      = require('./client_connections.js').removeClient;
+const ansiNormal        = require('./ansi_term.js').normal;
+const userLogin         = require('./user_login.js').userLogin;
+const messageArea       = require('./message_area.js');
 
-//	deps
-const _					= require('lodash');
-const iconv				= require('iconv-lite');
+//  deps
+const _                 = require('lodash');
+const iconv             = require('iconv-lite');
 
-exports.login					= login;
-exports.logoff					= logoff;
-exports.prevMenu				= prevMenu;
-exports.nextMenu				= nextMenu;
-exports.prevConf				= prevConf;
-exports.nextConf				= nextConf;
-exports.prevArea				= prevArea;
-exports.nextArea				= nextArea;
-exports.sendForgotPasswordEmail	= sendForgotPasswordEmail;
+exports.login                   = login;
+exports.logoff                  = logoff;
+exports.prevMenu                = prevMenu;
+exports.nextMenu                = nextMenu;
+exports.prevConf                = prevConf;
+exports.nextConf                = nextConf;
+exports.prevArea                = prevArea;
+exports.nextArea                = nextArea;
+exports.sendForgotPasswordEmail = sendForgotPasswordEmail;
 
 function login(callingMenu, formData, extraArgs, cb) {
 
     userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
         if(err) {
-            //	login failure
+            //  login failure
             if(err.existingConn && _.has(callingMenu, 'menuConfig.config.tooNodeMenu')) {
                 return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
             } else {
-                //	Other error
+                //  Other error
                 return callingMenu.prevMenu(cb);
             }
         }
 
-        //	success!
+        //  success!
         return callingMenu.nextMenu(cb);
     });
 }
 
 function logoff(callingMenu, formData, extraArgs, cb) {
     //
-    //	Simple logoff. Note that recording of @ logoff properties/stats
-    //	occurs elsewhere!
+    //  Simple logoff. Note that recording of @ logoff properties/stats
+    //  occurs elsewhere!
     //
     const client = callingMenu.client;
 
     setTimeout( () => {
         //
-        //	For giggles...
+        //  For giggles...
         //
         client.term.write(
-            ansiNormal() +	'\n' +
-			iconv.decode(require('crypto').randomBytes(Math.floor(Math.random() * 65) + 20), client.term.outputEncoding) +
-			'NO CARRIER', null, () => {
+            ansiNormal() +  '\n' +
+            iconv.decode(require('crypto').randomBytes(Math.floor(Math.random() * 65) + 20), client.term.outputEncoding) +
+            'NO CARRIER', null, () => {
 
-                //	after data is written, disconnect & remove the client
+                //  after data is written, disconnect & remove the client
                 removeClient(client);
                 return cb(null);
             }
@@ -65,7 +65,7 @@ function logoff(callingMenu, formData, extraArgs, cb) {
 
 function prevMenu(callingMenu, formData, extraArgs, cb) {
 
-    //	:TODO: this is a pretty big hack -- need the whole key map concep there like other places
+    //  :TODO: this is a pretty big hack -- need the whole key map concep there like other places
     if(formData.key && 'return' === formData.key.name) {
         callingMenu.submitFormData = formData;
     }
@@ -87,7 +87,7 @@ function nextMenu(callingMenu, formData, extraArgs, cb) {
     });
 }
 
-//	:TODO: prev/nextConf, prev/nextArea should use a NYI MenuModule.redraw() or such -- avoid pop/goto() hack!
+//  :TODO: prev/nextConf, prev/nextArea should use a NYI MenuModule.redraw() or such -- avoid pop/goto() hack!
 function reloadMenu(menu, cb) {
     const prevMenu = menu.client.menuStack.pop();
     prevMenu.instance.leave();
@@ -95,12 +95,12 @@ function reloadMenu(menu, cb) {
 }
 
 function prevConf(callingMenu, formData, extraArgs, cb) {
-    const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
+    const confs     = messageArea.getSortedAvailMessageConferences(callingMenu.client);
     const currIndex = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag) || confs.length;
 
     messageArea.changeMessageConference(callingMenu.client, confs[currIndex - 1].confTag, err => {
         if(err) {
-            return cb(err);	//	logged within changeMessageConference()
+            return cb(err); //  logged within changeMessageConference()
         }
 
         return reloadMenu(callingMenu, cb);
@@ -108,8 +108,8 @@ function prevConf(callingMenu, formData, extraArgs, cb) {
 }
 
 function nextConf(callingMenu, formData, extraArgs, cb) {
-    const confs		= messageArea.getSortedAvailMessageConferences(callingMenu.client);
-    let currIndex	= confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag);
+    const confs     = messageArea.getSortedAvailMessageConferences(callingMenu.client);
+    let currIndex   = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag);
 
     if(currIndex === confs.length - 1) {
         currIndex = -1;
@@ -117,7 +117,7 @@ function nextConf(callingMenu, formData, extraArgs, cb) {
 
     messageArea.changeMessageConference(callingMenu.client, confs[currIndex + 1].confTag, err => {
         if(err) {
-            return cb(err);	//	logged within changeMessageConference()
+            return cb(err); //  logged within changeMessageConference()
         }
 
         return reloadMenu(callingMenu, cb);
@@ -125,12 +125,12 @@ function nextConf(callingMenu, formData, extraArgs, cb) {
 }
 
 function prevArea(callingMenu, formData, extraArgs, cb) {
-    const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
+    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
     const currIndex = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag) || areas.length;
 
     messageArea.changeMessageArea(callingMenu.client, areas[currIndex - 1].areaTag, err => {
         if(err) {
-            return cb(err);	//	logged within changeMessageArea()
+            return cb(err); //  logged within changeMessageArea()
         }
 
         return reloadMenu(callingMenu, cb);
@@ -138,8 +138,8 @@ function prevArea(callingMenu, formData, extraArgs, cb) {
 }
 
 function nextArea(callingMenu, formData, extraArgs, cb) {
-    const areas		= messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
-    let currIndex	= areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag);
+    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
+    let currIndex   = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag);
 
     if(currIndex === areas.length - 1) {
         currIndex = -1;
@@ -147,7 +147,7 @@ function nextArea(callingMenu, formData, extraArgs, cb) {
 
     messageArea.changeMessageArea(callingMenu.client, areas[currIndex + 1].areaTag, err => {
         if(err) {
-            return cb(err);	//	logged within changeMessageArea()
+            return cb(err); //  logged within changeMessageArea()
         }
 
         return reloadMenu(callingMenu, cb);
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 397f08c0..5eb0fc4a 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const User						= require('./user.js');
-const Config					= require('./config.js').get;
-const Log						= require('./logger.js').log;
-const { getAddressedToInfo } 	= require('./mail_util.js');
-const Message					= require('./message.js');
+//  ENiGMA½
+const User                      = require('./user.js');
+const Config                    = require('./config.js').get;
+const Log                       = require('./logger.js').log;
+const { getAddressedToInfo }    = require('./mail_util.js');
+const Message                   = require('./message.js');
 
-//	deps
-const fs		= require('graceful-fs');
+//  deps
+const fs        = require('graceful-fs');
 
-exports.validateNonEmpty					= validateNonEmpty;
-exports.validateMessageSubject				= validateMessageSubject;
-exports.validateUserNameAvail 				= validateUserNameAvail;
-exports.validateUserNameExists				= validateUserNameExists;
-exports.validateUserNameOrRealNameExists	= validateUserNameOrRealNameExists;
-exports.validateGeneralMailAddressedTo		= validateGeneralMailAddressedTo;
-exports.validateEmailAvail					= validateEmailAvail;
-exports.validateBirthdate					= validateBirthdate;
-exports.validatePasswordSpec				= validatePasswordSpec;
+exports.validateNonEmpty                    = validateNonEmpty;
+exports.validateMessageSubject              = validateMessageSubject;
+exports.validateUserNameAvail               = validateUserNameAvail;
+exports.validateUserNameExists              = validateUserNameExists;
+exports.validateUserNameOrRealNameExists    = validateUserNameOrRealNameExists;
+exports.validateGeneralMailAddressedTo      = validateGeneralMailAddressedTo;
+exports.validateEmailAvail                  = validateEmailAvail;
+exports.validateBirthdate                   = validateBirthdate;
+exports.validatePasswordSpec                = validatePasswordSpec;
 
 function validateNonEmpty(data, cb) {
     return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
@@ -34,11 +34,11 @@ function validateUserNameAvail(data, cb) {
     if(!data || data.length < config.users.usernameMin) {
         cb(new Error('Username too short'));
     } else if(data.length > config.users.usernameMax) {
-        //	generally should be unreached due to view restraints
+        //  generally should be unreached due to view restraints
         return cb(new Error('Username too long'));
     } else {
-        const usernameRegExp	= new RegExp(config.users.usernamePattern);
-        const invalidNames		= config.users.newUserNames + config.users.badUserNames;
+        const usernameRegExp    = new RegExp(config.users.usernamePattern);
+        const invalidNames      = config.users.newUserNames + config.users.badUserNames;
 
         if(!usernameRegExp.test(data)) {
             return cb(new Error('Username contains invalid characters'));
@@ -47,9 +47,9 @@ function validateUserNameAvail(data, cb) {
         } else if(/^[0-9]+$/.test(data)) {
             return cb(new Error('Username cannot be a number'));
         } else {
-            //	a new user name cannot be an existing user name or an existing real name
+            //  a new user name cannot be an existing user name or an existing real name
             User.getUserIdAndNameByLookup(data, function userIdAndName(err) {
-                if(!err) {	//	err is null if we succeeded -- meaning this user exists already
+                if(!err) {  //  err is null if we succeeded -- meaning this user exists already
                     return cb(new Error('Username unavailable'));
                 }
 
@@ -83,11 +83,11 @@ function validateUserNameOrRealNameExists(data, cb) {
 
 function validateGeneralMailAddressedTo(data, cb) {
     //
-    //	Allow any supported addressing:
-    //	- Local username or real name
-    //	- Supported remote flavors such as FTN, email, ...
+    //  Allow any supported addressing:
+    //  - Local username or real name
+    //  - Supported remote flavors such as FTN, email, ...
     //
-    //	:TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
+    //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
     if(Message.AddressFlavor.FTN === addressedToInfo.flavor) {
@@ -99,17 +99,17 @@ function validateGeneralMailAddressedTo(data, cb) {
 
 function validateEmailAvail(data, cb) {
     //
-    //	This particular method allows empty data - e.g. no email entered
+    //  This particular method allows empty data - e.g. no email entered
     //
     if(!data || 0 === data.length) {
         return cb(null);
     }
 
     //
-    //	Otherwise, it must be a valid email. We'll be pretty lose here, like
-    //	the HTML5 spec.
+    //  Otherwise, it must be a valid email. We'll be pretty lose here, like
+    //  the HTML5 spec.
     //
-    //	See http://stackoverflow.com/questions/7786058/find-the-regex-used-by-html5-forms-for-validation
+    //  See http://stackoverflow.com/questions/7786058/find-the-regex-used-by-html5-forms-for-validation
     //
     const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
     if(!emailRegExp.test(data)) {
@@ -129,7 +129,7 @@ function validateEmailAvail(data, cb) {
 
 
 function validateBirthdate(data, cb) {
-    //	:TODO: check for dates in the future, or > reasonable values
+    //  :TODO: check for dates in the future, or > reasonable values
     return cb(isNaN(Date.parse(data)) ? new Error('Invalid birthdate') : null);
 }
 
@@ -139,7 +139,7 @@ function validatePasswordSpec(data, cb) {
         return cb(new Error('Password too short'));
     }
 
-    //	check badpass, if avail
+    //  check badpass, if avail
     fs.readFile(config.users.badPassFile, 'utf8', (err, passwords) => {
         if(err) {
             Log.warn( { error : err.message }, 'Cannot read bad pass file');
diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index 5276ebb0..a3a4d672 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -1,36 +1,36 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule				= require('./menu_module.js').MenuModule;
-const resetScreen				= require('./ansi_term.js').resetScreen;
-const setSyncTermFontWithAlias	= require('./ansi_term.js').setSyncTermFontWithAlias;
+//  ENiGMA½
+const MenuModule                = require('./menu_module.js').MenuModule;
+const resetScreen               = require('./ansi_term.js').resetScreen;
+const setSyncTermFontWithAlias  = require('./ansi_term.js').setSyncTermFontWithAlias;
 
-//	deps
-const async			= require('async');
-const _				= require('lodash');
-const net			= require('net');
-const EventEmitter	= require('events');
-const buffers		= require('buffers');
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const net           = require('net');
+const EventEmitter  = require('events');
+const buffers       = require('buffers');
 
 /*
-	Expected configuration block:
+    Expected configuration block:
 
-	{
-		module: telnet_bridge
-		...
-		config: {
-			host: somehost.net
-			port: 23
-		}
-	}
+    {
+        module: telnet_bridge
+        ...
+        config: {
+            host: somehost.net
+            port: 23
+        }
+    }
 */
 
-//	:TODO: ENH: Support nodeMax and tooManyArt
+//  :TODO: ENH: Support nodeMax and tooManyArt
 exports.moduleInfo = {
-    name	: 'Telnet Bridge',
-    desc	: 'Connect to other Telnet Systems',
-    author	: 'Andrew Pamment',
+    name    : 'Telnet Bridge',
+    desc    : 'Connect to other Telnet Systems',
+    author  : 'Andrew Pamment',
 };
 
 const IAC_DO_TERM_TYPE = Buffer.from( [ 255, 253, 24 ] );
@@ -39,7 +39,7 @@ class TelnetClientConnection extends EventEmitter {
     constructor(client) {
         super();
 
-        this.client		= client;
+        this.client     = client;
     }
 
 
@@ -47,7 +47,7 @@ class TelnetClientConnection extends EventEmitter {
         if(!this.pipeRestored) {
             this.pipeRestored = true;
 
-            //	client may have bailed
+            //  client may have bailed
             if(null !== _.get(this, 'client.term.output', null)) {
                 if(this.bridgeConnection) {
                     this.client.term.output.unpipe(this.bridgeConnection);
@@ -69,9 +69,9 @@ class TelnetClientConnection extends EventEmitter {
             this.client.term.rawWrite(data);
 
             //
-            //	Wait for a terminal type request, and send it eactly once.
-            //	This is enough (in additional to other negotiations handled in telnet.js)
-            //	to get us in on most systems
+            //  Wait for a terminal type request, and send it eactly once.
+            //  This is enough (in additional to other negotiations handled in telnet.js)
+            //  to get us in on most systems
             //
             if(!this.termSent && data.indexOf(IAC_DO_TERM_TYPE) > -1) {
                 this.termSent = true;
@@ -107,23 +107,23 @@ class TelnetClientConnection extends EventEmitter {
 
     getTermTypeNegotiationBuffer() {
         //
-        //	Create a TERMINAL-TYPE sub negotiation buffer using the
-        //	actual/current terminal type.
+        //  Create a TERMINAL-TYPE sub negotiation buffer using the
+        //  actual/current terminal type.
         //
         let bufs = buffers();
 
         bufs.push(Buffer.from(
             [
-                255,	//	IAC
-                250,	//	SB
-                24,		//	TERMINAL-TYPE
-                0,		//	IS
+                255,    //  IAC
+                250,    //  SB
+                24,     //  TERMINAL-TYPE
+                0,      //  IS
             ]
         ));
 
         bufs.push(
-            Buffer.from(this.client.term.termType),	//	e.g. "ansi"
-            Buffer.from( [ 255, 240 ] )				//	IAC, SE
+            Buffer.from(this.client.term.termType), //  e.g. "ansi"
+            Buffer.from( [ 255, 240 ] )             //  IAC, SE
         );
 
         return bufs.toBuffer();
@@ -135,8 +135,8 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.config			= Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
-        this.config.port	= this.config.port || 23;
+        this.config         = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+        this.config.port    = this.config.port || 23;
     }
 
     initSequence() {
@@ -147,7 +147,7 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
             [
                 function validateConfig(callback) {
                     if(_.isString(self.config.host) &&
-						_.isNumber(self.config.port))
+                        _.isNumber(self.config.port))
                     {
                         callback(null);
                     } else {
@@ -156,8 +156,8 @@ exports.getModule = class TelnetBridgeModule extends MenuModule {
                 },
                 function createTelnetBridge(callback) {
                     const connectOpts = {
-                        port	: self.config.port,
-                        host	: self.config.host,
+                        port    : self.config.port,
+                        host    : self.config.host,
                     };
 
                     self.client.term.write(resetScreen());
diff --git a/core/text_view.js b/core/text_view.js
index 69908e50..4611821a 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -1,26 +1,26 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const View					= require('./view.js').View;
-const miscUtil				= require('./misc_util.js');
-const ansi					= require('./ansi_term.js');
-const padStr				= require('./string_util.js').pad;
-const stylizeString			= require('./string_util.js').stylizeString;
-const renderSubstr			= require('./string_util.js').renderSubstr;
-const renderStringLength	= require('./string_util.js').renderStringLength;
-const pipeToAnsi			= require('./color_codes.js').pipeToAnsi;
-const stripAllLineFeeds		= require('./string_util.js').stripAllLineFeeds;
+//  ENiGMA½
+const View                  = require('./view.js').View;
+const miscUtil              = require('./misc_util.js');
+const ansi                  = require('./ansi_term.js');
+const padStr                = require('./string_util.js').pad;
+const stylizeString         = require('./string_util.js').stylizeString;
+const renderSubstr          = require('./string_util.js').renderSubstr;
+const renderStringLength    = require('./string_util.js').renderStringLength;
+const pipeToAnsi            = require('./color_codes.js').pipeToAnsi;
+const stripAllLineFeeds     = require('./string_util.js').stripAllLineFeeds;
 
-//	deps
-const util			= require('util');
-const _				= require('lodash');
+//  deps
+const util          = require('util');
+const _             = require('lodash');
 
-exports.TextView			= TextView;
+exports.TextView            = TextView;
 
 function TextView(options) {
     if(options.dimens) {
-        options.dimens.height = 1;	//	force height of 1 for TextView's & sub classes
+        options.dimens.height = 1;  //  force height of 1 for TextView's & sub classes
     }
 
     View.call(this, options);
@@ -31,10 +31,10 @@ function TextView(options) {
         this.maxLength = this.client.term.termWidth - this.position.col;
     }
 
-    this.fillChar			= renderSubstr(miscUtil.valueWithDefault(options.fillChar, ' '), 0, 1);
-    this.justify			= options.justify || 'left';
-    this.resizable			= miscUtil.valueWithDefault(options.resizable, true);
-    this.horizScroll		= miscUtil.valueWithDefault(options.horizScroll, true);
+    this.fillChar           = renderSubstr(miscUtil.valueWithDefault(options.fillChar, ' '), 0, 1);
+    this.justify            = options.justify || 'left';
+    this.resizable          = miscUtil.valueWithDefault(options.resizable, true);
+    this.horizScroll        = miscUtil.valueWithDefault(options.horizScroll, true);
 
     if(_.isString(options.textOverflow)) {
         this.textOverflow = options.textOverflow;
@@ -45,57 +45,57 @@ function TextView(options) {
     }
 
     /*
-	this.drawText = function(s) {
+    this.drawText = function(s) {
 
-		//
-		//                     |<- this.maxLength
-		//	 ABCDEFGHIJK
-		//	|ABCDEFG|  ^_ this.text.length
-		//	        ^-- this.dimens.width
-		//
-		let textToDraw = _.isString(this.textMaskChar) ?
-			new Array(s.length + 1).join(this.textMaskChar) :
-			stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
+        //
+        //                     |<- this.maxLength
+        //   ABCDEFGHIJK
+        //  |ABCDEFG|  ^_ this.text.length
+        //          ^-- this.dimens.width
+        //
+        let textToDraw = _.isString(this.textMaskChar) ?
+            new Array(s.length + 1).join(this.textMaskChar) :
+            stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-		if(textToDraw.length > this.dimens.width) {
-			if(this.hasFocus) {
-				if(this.horizScroll) {
-					textToDraw = textToDraw.substr(textToDraw.length - this.dimens.width, textToDraw.length);
-				}
-			} else {
-				if(textToDraw.length > this.dimens.width) {
-					if(this.textOverflow &&
-						this.dimens.width > this.textOverflow.length &&
-						textToDraw.length - this.textOverflow.length >= this.textOverflow.length)
-					{
-						textToDraw = textToDraw.substr(0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
-					} else {
-						textToDraw = textToDraw.substr(0, this.dimens.width);
-					}
-				}
-			}
-		}
+        if(textToDraw.length > this.dimens.width) {
+            if(this.hasFocus) {
+                if(this.horizScroll) {
+                    textToDraw = textToDraw.substr(textToDraw.length - this.dimens.width, textToDraw.length);
+                }
+            } else {
+                if(textToDraw.length > this.dimens.width) {
+                    if(this.textOverflow &&
+                        this.dimens.width > this.textOverflow.length &&
+                        textToDraw.length - this.textOverflow.length >= this.textOverflow.length)
+                    {
+                        textToDraw = textToDraw.substr(0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
+                    } else {
+                        textToDraw = textToDraw.substr(0, this.dimens.width);
+                    }
+                }
+            }
+        }
 
-		this.client.term.write(padStr(
-			textToDraw,
-			this.dimens.width + 1,
-			this.fillChar,
-			this.justify,
-			this.hasFocus ? this.getFocusSGR() : this.getSGR(),
-			this.getStyleSGR(1) || this.getSGR()
-			), false);
-	};
+        this.client.term.write(padStr(
+            textToDraw,
+            this.dimens.width + 1,
+            this.fillChar,
+            this.justify,
+            this.hasFocus ? this.getFocusSGR() : this.getSGR(),
+            this.getStyleSGR(1) || this.getSGR()
+            ), false);
+    };
 */
 
     this.drawText = function(s) {
 
         //
         //                     |<- this.maxLength
-        //	 ABCDEFGHIJK
-        //	|ABCDEFG|  ^_ this.text.length
-        //	        ^-- this.dimens.width
+        //   ABCDEFGHIJK
+        //  |ABCDEFG|  ^_ this.text.length
+        //          ^-- this.dimens.width
         //
-        let renderLength = renderStringLength(s);	//	initial; may be adjusted below:
+        let renderLength = renderStringLength(s);   //  initial; may be adjusted below:
 
         let textToDraw = _.isString(this.textMaskChar) ?
             new Array(renderLength + 1).join(this.textMaskChar) :
@@ -110,8 +110,8 @@ function TextView(options) {
                 }
             } else {
                 if(this.textOverflow &&
-					this.dimens.width > this.textOverflow.length &&
-					renderLength - this.textOverflow.length >= this.textOverflow.length)
+                    this.dimens.width > this.textOverflow.length &&
+                    renderLength - this.textOverflow.length >= this.textOverflow.length)
                 {
                     textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
                 } else {
@@ -130,9 +130,9 @@ function TextView(options) {
                 this.justify,
                 this.hasFocus ? this.getFocusSGR() : this.getSGR(),
                 this.getStyleSGR(1) || this.getSGR(),
-                true	//	use render len
+                true    //  use render len
             ),
-            false	//	no converting CRLF needed
+            false   //  no converting CRLF needed
         );
     };
 
@@ -142,16 +142,16 @@ function TextView(options) {
         return this.position.col + offset;
     };
 
-    this.setText(options.text || '', false);	//	false=do not redraw now
+    this.setText(options.text || '', false);    //  false=do not redraw now
 }
 
 util.inherits(TextView, View);
 
 TextView.prototype.redraw = function() {
     //
-    //	A lot of views will get an initial redraw() with empty text (''). We can short
-    //	circuit this by NOT doing any of the work if this is the initial drawText
-    //	and there is no actual text (e.g. save SGR's and processing)
+    //  A lot of views will get an initial redraw() with empty text (''). We can short
+    //  circuit this by NOT doing any of the work if this is the initial drawText
+    //  and there is no actual text (e.g. save SGR's and processing)
     //
     if(!this.hasDrawnOnce) {
         if(_.isUndefined(this.text)) {
@@ -187,7 +187,7 @@ TextView.prototype.setText = function(text, redraw) {
         text = text.toString();
     }
 
-    text = pipeToAnsi(stripAllLineFeeds(text), this.client);	//	expand MCI/etc.
+    text = pipeToAnsi(stripAllLineFeeds(text), this.client);    //  expand MCI/etc.
 
     var widthDelta = 0;
     if(this.text && this.text !== text) {
@@ -201,7 +201,7 @@ TextView.prototype.setText = function(text, redraw) {
         //this.text = this.text.substr(0, this.maxLength);
     }
 
-    //	:TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
+    //  :TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
     this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
     if(this.autoScale.width) {
@@ -215,32 +215,32 @@ TextView.prototype.setText = function(text, redraw) {
 
 /*
 TextView.prototype.setText = function(text) {
-	if(!_.isString(text)) {
-		text = text.toString();
-	}
+    if(!_.isString(text)) {
+        text = text.toString();
+    }
 
-	var widthDelta = 0;
-	if(this.text && this.text !== text) {
-		widthDelta = Math.abs(this.text.length - text.length);
-	}
+    var widthDelta = 0;
+    if(this.text && this.text !== text) {
+        widthDelta = Math.abs(this.text.length - text.length);
+    }
 
-	this.text = text;
+    this.text = text;
 
-	if(this.maxLength > 0) {
-		this.text = this.text.substr(0, this.maxLength);
-	}
+    if(this.maxLength > 0) {
+        this.text = this.text.substr(0, this.maxLength);
+    }
 
-	this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
+    this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-	//if(this.resizable) {
-	//	this.dimens.width = this.text.length + widthDelta;
-	//}
+    //if(this.resizable) {
+    //  this.dimens.width = this.text.length + widthDelta;
+    //}
 
-	if(this.autoScale.width) {
-		this.dimens.width = this.text.length + widthDelta;
-	}
+    if(this.autoScale.width) {
+        this.dimens.width = this.text.length + widthDelta;
+    }
 
-	this.redraw();
+    this.redraw();
 };
 */
 
@@ -251,9 +251,9 @@ TextView.prototype.clearText = function() {
 TextView.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
         case 'textMaskChar' : this.textMaskChar = value.substr(0, 1); break;
-        case 'textOverflow'	: this.textOverflow = value; break;
-        case 'maxLength'	: this.maxLength = parseInt(value, 10); break;
-        case 'password'		:
+        case 'textOverflow' : this.textOverflow = value; break;
+        case 'maxLength'    : this.maxLength = parseInt(value, 10); break;
+        case 'password'     :
             if(true === value) {
                 this.textMaskChar = this.client.currentTheme.helpers.getPasswordChar();
             }
diff --git a/core/theme.js b/core/theme.js
index aca8ca2c..6d2bcff6 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -1,37 +1,37 @@
 /* jslint node: true */
 'use strict';
 
-const Config			= require('./config.js').get;
-const art				= require('./art.js');
-const ansi				= require('./ansi_term.js');
-const Log				= require('./logger.js').log;
-const ConfigCache		= require('./config_cache.js');
-const getFullConfig		= require('./config_util.js').getFullConfig;
-const asset				= require('./asset.js');
-const ViewController	= require('./view_controller.js').ViewController;
-const Errors			= require('./enig_error.js').Errors;
-const ErrorReasons		= require('./enig_error.js').ErrorReasons;
-const Events			= require('./events.js');
+const Config            = require('./config.js').get;
+const art               = require('./art.js');
+const ansi              = require('./ansi_term.js');
+const Log               = require('./logger.js').log;
+const ConfigCache       = require('./config_cache.js');
+const getFullConfig     = require('./config_util.js').getFullConfig;
+const asset             = require('./asset.js');
+const ViewController    = require('./view_controller.js').ViewController;
+const Errors            = require('./enig_error.js').Errors;
+const ErrorReasons      = require('./enig_error.js').ErrorReasons;
+const Events            = require('./events.js');
 
-const fs				= require('graceful-fs');
-const paths				= require('path');
-const async				= require('async');
-const _					= require('lodash');
-const assert			= require('assert');
+const fs                = require('graceful-fs');
+const paths             = require('path');
+const async             = require('async');
+const _                 = require('lodash');
+const assert            = require('assert');
 
-exports.getThemeArt				= getThemeArt;
-exports.getAvailableThemes		= getAvailableThemes;
-exports.getRandomTheme			= getRandomTheme;
+exports.getThemeArt             = getThemeArt;
+exports.getAvailableThemes      = getAvailableThemes;
+exports.getRandomTheme          = getRandomTheme;
 exports.setClientTheme          = setClientTheme;
-exports.initAvailableThemes		= initAvailableThemes;
-exports.displayThemeArt			= displayThemeArt;
-exports.displayThemedPause		= displayThemedPause;
-exports.displayThemedPrompt		= displayThemedPrompt;
-exports.displayThemedAsset		= displayThemedAsset;
+exports.initAvailableThemes     = initAvailableThemes;
+exports.displayThemeArt         = displayThemeArt;
+exports.displayThemedPause      = displayThemedPause;
+exports.displayThemedPrompt     = displayThemedPrompt;
+exports.displayThemedAsset      = displayThemedAsset;
 
 function refreshThemeHelpers(theme) {
     //
-    //	Create some handy helpers
+    //  Create some handy helpers
     //
     theme.helpers = {
         getPasswordChar : function() {
@@ -75,9 +75,9 @@ function loadTheme(themeId, cb) {
     };
 
     const getOpts = {
-        filePath 		: path,
-        forceReCache	: true,
-        callback		: changed,
+        filePath        : path,
+        forceReCache    : true,
+        callback        : changed,
     };
 
     ConfigCache.getConfigWithOptions(getOpts, (err, theme) => {
@@ -86,8 +86,8 @@ function loadTheme(themeId, cb) {
         }
 
         if(!_.isObject(theme.info) ||
-			!_.isString(theme.info.name) ||
-			!_.isString(theme.info.author))
+            !_.isString(theme.info.name) ||
+            !_.isString(theme.info.author))
         {
             return cb(Errors.Invalid('Invalid or missing "info" section'));
         }
@@ -113,7 +113,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
     assert(_.isObject(theme));
 
     //  :TODO: merge in defaults (customization.defaults{} )
-    //	:TODO: apply generic stuff, e.g. "VM" (vs "VM1")
+    //  :TODO: apply generic stuff, e.g. "VM" (vs "VM1")
 
     //
     //  Create a *clone* of menuConfig (menu.hjson) then bring in
@@ -213,7 +213,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
             if(_.has(theme, [ 'customization', sectionName, menuName ])) {
                 const menuTheme = theme.customization[sectionName][menuName];
 
-                //	config block is direct assign/overwrite
+                //  config block is direct assign/overwrite
                 //  :TODO: should probably be _.merge()
                 if(menuTheme.config) {
                     mergedThemeMenu.config = _.assign(mergedThemeMenu.config || {}, menuTheme.config);
@@ -250,7 +250,7 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
             //  *   There is no 'prompt' specified
             //
             if('menus' === sectionName && !_.isString(mergedThemeMenu.prompt) &&
-				(createdFormSection || !_.isObject(mergedThemeMenu.form)))
+                (createdFormSection || !_.isObject(mergedThemeMenu.form)))
             {
                 mergedThemeMenu.runtime = _.merge(mergedThemeMenu.runtime || {}, { autoNext : true } );
             }
@@ -337,21 +337,21 @@ function initAvailableThemes(cb) {
                         menuConfig,
                         promptConfig,
                         files.filter( f => {
-                            //	sync normally not allowed -- initAvailableThemes() is a startup-only method, however
+                            //  sync normally not allowed -- initAvailableThemes() is a startup-only method, however
                             return fs.statSync(paths.join(config.paths.themes, f)).isDirectory();
                         })
                     );
                 });
             },
             function populateAvailable(menuConfig, promptConfig, themeDirectories, callback) {
-                async.each(themeDirectories, (themeId, nextThemeDir) => {	//	theme dir = theme ID
+                async.each(themeDirectories, (themeId, nextThemeDir) => {   //  theme dir = theme ID
                     loadTheme(themeId, (err, theme) => {
                         if(err) {
                             if(ErrorReasons.NotEnabled !== err.reasonCode) {
                                 Log.warn( { themeId : themeId, err : err.message }, 'Failed loading theme');
                             }
 
-                            return nextThemeDir(null);	//	try next
+                            return nextThemeDir(null);  //  try next
                         }
 
                         Object.assign(theme.info, { themeId } );
@@ -413,15 +413,15 @@ function setClientTheme(client, themeId) {
 
 function getThemeArt(options, cb) {
     //
-    //	options - required:
-    //		name
+    //  options - required:
+    //      name
     //
-    //	options - optional
-    //		client - needed for user's theme/etc.
-    //		themeId
-    //		asAnsi
-    //		readSauce
-    //		random
+    //  options - optional
+    //      client - needed for user's theme/etc.
+    //      themeId
+    //      asAnsi
+    //      readSauce
+    //      random
     //
     const config = Config();
     if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
@@ -430,30 +430,30 @@ function getThemeArt(options, cb) {
         options.themeId = config.defaults.theme;
     }
 
-    //	:TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
-    //	:TODO: Some of these options should only be set if not provided!
-    options.asAnsi		= true;	//	always convert to ANSI
-    options.readSauce	= true;	//	read SAUCE, if avail
-    options.random		= _.get(options, 'random', true);	//	FILENAME<n>.EXT support
+    //  :TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
+    //  :TODO: Some of these options should only be set if not provided!
+    options.asAnsi      = true; //  always convert to ANSI
+    options.readSauce   = true; //  read SAUCE, if avail
+    options.random      = _.get(options, 'random', true);   //  FILENAME<n>.EXT support
 
     //
-    //	We look for themed art in the following order:
-    //	1)	Direct/relative path
-    //	2)	Via theme supplied by |themeId|
-    //	3)	Via default theme
-    //	4)	General art directory
+    //  We look for themed art in the following order:
+    //  1)  Direct/relative path
+    //  2)  Via theme supplied by |themeId|
+    //  3)  Via default theme
+    //  4)  General art directory
     //
     async.waterfall(
         [
             function fromPath(callback) {
                 //
-                //	We allow relative (to enigma-bbs) or full paths
+                //  We allow relative (to enigma-bbs) or full paths
                 //
                 if('/' === options.name.charAt(0)) {
-                    //	just take the path as-is
+                    //  just take the path as-is
                     options.basePath = paths.dirname(options.name);
                 } else if(options.name.indexOf('/') > -1) {
-                    //	make relative to base BBS dir
+                    //  make relative to base BBS dir
                     options.basePath = paths.join(__dirname, '../', paths.dirname(options.name));
                 } else {
                     return callback(null, null);
@@ -513,11 +513,11 @@ function displayThemeArt(options, cb) {
         if(err) {
             return cb(err);
         }
-        //	:TODO: just use simple merge of options -> displayOptions
+        //  :TODO: just use simple merge of options -> displayOptions
         const displayOpts = {
-            sauce		: artInfo.sauce,
-            font		: options.font,
-            trailingLF	: options.trailingLF,
+            sauce       : artInfo.sauce,
+            font        : options.font,
+            trailingLF  : options.trailingLF,
         };
 
         art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
@@ -543,14 +543,14 @@ function displayThemedPrompt(name, client, options, cb) {
                 }
 
                 //
-                //	If we did *not* clear the screen, don't let the font change
-                //	doing so messes things up -- most terminals that support font
-                //	changing can only display a single font at at time.
+                //  If we did *not* clear the screen, don't let the font change
+                //  doing so messes things up -- most terminals that support font
+                //  changing can only display a single font at at time.
                 //
-                //	:TODO: We can use term detection to do nifty things like avoid this kind of kludge:
+                //  :TODO: We can use term detection to do nifty things like avoid this kind of kludge:
                 const dispOptions = Object.assign( {}, promptConfig.options );
                 if(!options.clearScreen) {
-                    dispOptions.font = 'not_really_a_font!';	//	kludge :)
+                    dispOptions.font = 'not_really_a_font!';    //  kludge :)
                 }
 
                 displayThemedAsset(
@@ -568,7 +568,7 @@ function displayThemedPrompt(name, client, options, cb) {
             },
             function discoverCursorPosition(promptConfig, artInfo, callback) {
                 if(!options.clearPrompt) {
-                    //	no need to query cursor - we're not gonna use it
+                    //  no need to query cursor - we're not gonna use it
                     return callback(null, promptConfig, artInfo);
                 }
 
@@ -583,9 +583,9 @@ function displayThemedPrompt(name, client, options, cb) {
                 const tempViewController = useTempViewController ? new ViewController( { client : client } ) : options.viewController;
 
                 const loadOpts = {
-                    promptName	: name,
-                    mciMap		: artInfo.mciMap,
-                    config		: promptConfig,
+                    promptName  : name,
+                    mciMap      : artInfo.mciMap,
+                    config      : promptConfig,
                 };
 
                 tempViewController.loadFromPromptConfig(loadOpts, () => {
@@ -606,7 +606,7 @@ function displayThemedPrompt(name, client, options, cb) {
                     if(artInfo.startRow && artInfo.height) {
                         client.term.rawWrite(ansi.goto(artInfo.startRow, 1));
 
-                        //	Note: Does not work properly in NetRunner < 2.0b17:
+                        //  Note: Does not work properly in NetRunner < 2.0b17:
                         client.term.rawWrite(ansi.deleteLine(artInfo.height));
                     } else {
                         client.term.rawWrite(ansi.eraseLine(1));
@@ -631,7 +631,7 @@ function displayThemedPrompt(name, client, options, cb) {
 }
 
 //
-//	Pause prompts are a special prompt by the name 'pause'.
+//  Pause prompts are a special prompt by the name 'pause'.
 //
 function displayThemedPause(client, options, cb) {
 
@@ -651,7 +651,7 @@ function displayThemedPause(client, options, cb) {
 function displayThemedAsset(assetSpec, client, options, cb) {
     assert(_.isObject(client));
 
-    //	options are... optional
+    //  options are... optional
     if(3 === arguments.length) {
         cb = options;
         options = {};
@@ -666,12 +666,12 @@ function displayThemedAsset(assetSpec, client, options, cb) {
         return cb(new Error('Asset not found: ' + assetSpec));
     }
 
-    //	:TODO: just use simple merge of options -> displayOptions
+    //  :TODO: just use simple merge of options -> displayOptions
     var dispOpts = {
-        name			: artAsset.asset,
-        client			: client,
-        font			: options.font,
-        trailingLF		: options.trailingLF,
+        name            : artAsset.asset,
+        client          : client,
+        font            : options.font,
+        trailingLF      : options.trailingLF,
     };
 
     switch(artAsset.type) {
@@ -682,13 +682,13 @@ function displayThemedAsset(assetSpec, client, options, cb) {
             break;
 
         case 'method' :
-            //	:TODO: fetch & render via method
+            //  :TODO: fetch & render via method
             break;
 
         case 'inline ' :
-            //	:TODO: think about this more in relation to themes, etc. How can this come
-            //	from a theme (with override from menu.json) ???
-            //	look @ client.currentTheme.inlineArt[name] -> menu/prompt[name]
+            //  :TODO: think about this more in relation to themes, etc. How can this come
+            //  from a theme (with override from menu.json) ???
+            //  look @ client.currentTheme.inlineArt[name] -> menu/prompt[name]
             break;
 
         default :
diff --git a/core/tic_file_info.js b/core/tic_file_info.js
index 37aec134..5db24cc2 100644
--- a/core/tic_file_info.js
+++ b/core/tic_file_info.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Address		= require('./ftn_address.js');
-const Errors		= require('./enig_error.js').Errors;
-const EnigAssert	= require('./enigma_assert.js');
+//  ENiGMA½
+const Address       = require('./ftn_address.js');
+const Errors        = require('./enig_error.js').Errors;
+const EnigAssert    = require('./enigma_assert.js');
 
-//	deps
-const fs			= require('graceful-fs');
-const CRC32			= require('./crc.js').CRC32;
-const _				= require('lodash');
-const async			= require('async');
-const paths			= require('path');
-const crypto		= require('crypto');
+//  deps
+const fs            = require('graceful-fs');
+const CRC32         = require('./crc.js').CRC32;
+const _             = require('lodash');
+const async         = require('async');
+const paths         = require('path');
+const crypto        = require('crypto');
 
 //
-//	Class to read and hold information from a TIC file
+//  Class to read and hold information from a TIC file
 //
-//	* FTS-5006.001 @ http://www.filegate.net/ftsc/FTS-5006.001
-//	* FSP-1039.001 @ http://ftsc.org/docs/old/fsp-1039.001
-//	* FSC-0087.001 @ http://ftsc.org/docs/fsc-0087.001
+//  * FTS-5006.001 @ http://www.filegate.net/ftsc/FTS-5006.001
+//  * FSP-1039.001 @ http://ftsc.org/docs/old/fsp-1039.001
+//  * FSC-0087.001 @ http://ftsc.org/docs/fsc-0087.001
 //
 module.exports = class TicFileInfo {
     constructor() {
@@ -29,8 +29,8 @@ module.exports = class TicFileInfo {
     static get requiredFields() {
         return [
             'Area', 'Origin', 'From', 'File', 'Crc',
-            //	:TODO: validate this:
-            //'Path', 'Seenby'	//	these two are questionable; some systems don't send them?
+            //  :TODO: validate this:
+            //'Path', 'Seenby'  //  these two are questionable; some systems don't send them?
         ];
     }
 
@@ -42,7 +42,7 @@ module.exports = class TicFileInfo {
         const value = this.get(key);
         if(value) {
             //
-            //	We call toString() on values to ensure numbers, addresses, etc. are converted
+            //  We call toString() on values to ensure numbers, addresses, etc. are converted
             //
             joinWith = joinWith || '';
             if(Array.isArray(value)) {
@@ -67,9 +67,9 @@ module.exports = class TicFileInfo {
     }
 
     validate(config, cb) {
-        //	config.nodes
-        //	config.defaultPassword (optional)
-        //	config.localAreaTags
+        //  config.nodes
+        //  config.defaultPassword (optional)
+        //  config.localAreaTags
         EnigAssert(config.nodes && config.localAreaTags);
 
         const self = this;
@@ -84,7 +84,7 @@ module.exports = class TicFileInfo {
                     const area = self.getAsString('Area').toUpperCase();
 
                     const localInfo = {
-                        areaTag	: config.localAreaTags.find( areaTag => areaTag.toUpperCase() === area ),
+                        areaTag : config.localAreaTags.find( areaTag => areaTag.toUpperCase() === area ),
                     };
 
                     if(!localInfo.areaTag) {
@@ -96,17 +96,17 @@ module.exports = class TicFileInfo {
                         return callback(Errors.Invalid(`Invalid "From" address: ${self.getAsString('From')}`));
                     }
 
-                    //	note that our config may have wildcards, such as "80:774/*"
+                    //  note that our config may have wildcards, such as "80:774/*"
                     localInfo.node = Object.keys(config.nodes).find( nodeAddrWildcard => from.isPatternMatch(nodeAddrWildcard) );
 
                     if(!localInfo.node) {
                         return callback(Errors.Invalid('TIC is not from a known node'));
                     }
 
-                    //	if we require a password, "PW" must match
+                    //  if we require a password, "PW" must match
                     const passActual = _.get(config.nodes, [ localInfo.node, 'tic', 'password' ] ) || config.defaultPassword;
                     if(!passActual) {
-                        return callback(null, localInfo);	//	no pw validation
+                        return callback(null, localInfo);   //  no pw validation
                     }
 
                     const passTic = self.getAsString('Pw');
@@ -117,22 +117,22 @@ module.exports = class TicFileInfo {
                     return callback(null, localInfo);
                 },
                 function checksumAndSize(localInfo, callback) {
-                    const crcTic	= self.get('Crc');
-                    const stream	= fs.createReadStream(self.filePath);
-                    const crc		= new CRC32();
-                    let sizeActual	= 0;
+                    const crcTic    = self.get('Crc');
+                    const stream    = fs.createReadStream(self.filePath);
+                    const crc       = new CRC32();
+                    let sizeActual  = 0;
 
-                    let sha256Tic	= self.getAsString('Sha256');
+                    let sha256Tic   = self.getAsString('Sha256');
                     let sha256;
                     if(sha256Tic) {
-                        sha256Tic	= sha256Tic.toLowerCase();
-                        sha256		= crypto.createHash('sha256');
+                        sha256Tic   = sha256Tic.toLowerCase();
+                        sha256      = crypto.createHash('sha256');
                     }
 
                     stream.on('data', data => {
                         sizeActual += data.length;
 
-                        //	sha256 if possible, else crc32
+                        //  sha256 if possible, else crc32
                         if(sha256) {
                             sha256.update(data);
                         } else {
@@ -141,7 +141,7 @@ module.exports = class TicFileInfo {
                     });
 
                     stream.on('end', () => {
-                        //	again, use sha256 if possible
+                        //  again, use sha256 if possible
                         if(sha256) {
                             const sha256Actual = sha256.digest('hex');
                             if(sha256Tic != sha256Actual) {
@@ -182,20 +182,20 @@ module.exports = class TicFileInfo {
 
     isToAddress(address, allowNonExplicit) {
         //
-        //	FSP-1039.001:
-        //	"This keyword specifies the FTN address of the system where to
-        //	send the file to be distributed and the accompanying TIC file.
-        //	Some File processors (Allfix) only insert a line with this
-        //	keyword when the file and the associated TIC file are to be
-        //	file routed through a third sysem instead of being processed
-        //	by a file processor on that system. Others always insert it.
-        //	Note that the To keyword may cause problems when the TIC file
-        //	is proecessed by software that does not recognise it and
-        //	passes the line "as is" to other systems.
+        //  FSP-1039.001:
+        //  "This keyword specifies the FTN address of the system where to
+        //  send the file to be distributed and the accompanying TIC file.
+        //  Some File processors (Allfix) only insert a line with this
+        //  keyword when the file and the associated TIC file are to be
+        //  file routed through a third sysem instead of being processed
+        //  by a file processor on that system. Others always insert it.
+        //  Note that the To keyword may cause problems when the TIC file
+        //  is proecessed by software that does not recognise it and
+        //  passes the line "as is" to other systems.
         //
-        //	Example:  To 292/854
+        //  Example:  To 292/854
         //
-        //	This is an optional keyword."
+        //  This is an optional keyword."
         //
         const to = this.get('To');
 
@@ -212,12 +212,12 @@ module.exports = class TicFileInfo {
                 return cb(err);
             }
 
-            const ticFileInfo	= new TicFileInfo();
-            ticFileInfo.path	= path;
+            const ticFileInfo   = new TicFileInfo();
+            ticFileInfo.path    = path;
 
             //
-            //	Lines in a TIC file should be separated by CRLF (DOS)
-            //	may be separated by LF (UNIX)
+            //  Lines in a TIC file should be separated by CRLF (DOS)
+            //  may be separated by LF (UNIX)
             //
             const lines = ticData.split(/\r\n|\n/g);
             let keyEnd;
@@ -226,7 +226,7 @@ module.exports = class TicFileInfo {
             let entry;
 
             lines.forEach(line => {
-                keyEnd	= line.search(/\s/);
+                keyEnd  = line.search(/\s/);
 
                 if(keyEnd < 0) {
                     keyEnd = line.length;
@@ -240,12 +240,12 @@ module.exports = class TicFileInfo {
 
                 value = line.substr(keyEnd + 1);
 
-                //	don't trim Ldesc; may mess with FILE_ID.DIZ type descriptions
+                //  don't trim Ldesc; may mess with FILE_ID.DIZ type descriptions
                 if('ldesc' !== key) {
                     value = value.trim();
                 }
 
-                //	convert well known keys to a more reasonable format
+                //  convert well known keys to a more reasonable format
                 switch(key) {
                     case 'origin' :
                     case 'from' :
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index 28818189..ae163bd7 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -1,13 +1,13 @@
 /* jslint node: true */
 'use strict';
 
-const MenuView		= require('./menu_view.js').MenuView;
-const strUtil		= require('./string_util.js');
+const MenuView      = require('./menu_view.js').MenuView;
+const strUtil       = require('./string_util.js');
 
-const util			= require('util');
-const assert		= require('assert');
+const util          = require('util');
+const assert        = require('assert');
 
-exports.ToggleMenuView		= ToggleMenuView;
+exports.ToggleMenuView      = ToggleMenuView;
 
 function ToggleMenuView (options) {
     options.cursor = options.cursor || 'hide';
@@ -17,10 +17,10 @@ function ToggleMenuView (options) {
     var self = this;
 
     /*
-	this.cachePositions = function() {
-		self.positionCacheExpired = false;
-	};
-	*/
+    this.cachePositions = function() {
+        self.positionCacheExpired = false;
+    };
+    */
 
     this.updateSelection = function() {
         assert(this.focusedItemIndex >= 0 && this.focusedItemIndex <= self.items.length);
@@ -47,8 +47,8 @@ ToggleMenuView.prototype.redraw = function() {
             //console.log(this.styleColor1)
             //var sepColor = this.getANSIColor(this.styleColor1 || this.getColor());
             //console.log(sepColor.substr(1))
-            //var sepColor = '\u001b[0m\u001b[1;30m';	//	:TODO: FIX ME!!!
-            //	:TODO: sepChar needs to be configurable!!!
+            //var sepColor = '\u001b[0m\u001b[1;30m';   //  :TODO: FIX ME!!!
+            //  :TODO: sepChar needs to be configurable!!!
             this.client.term.write(this.styleSGR1 + ' / ');
             //this.client.term.write(sepColor + ' / ');
         }
@@ -59,7 +59,7 @@ ToggleMenuView.prototype.redraw = function() {
 };
 
 ToggleMenuView.prototype.setFocusItemIndex = function(index) {
-    ToggleMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    ToggleMenuView.super_.prototype.setFocusItemIndex.call(this, index);    //  sets this.focusedItemIndex
 
     this.updateSelection();
 };
@@ -113,9 +113,9 @@ ToggleMenuView.prototype.getData = function() {
 };
 
 ToggleMenuView.prototype.setItems = function(items) {
-    items = items.slice(0, 2);	//	switch/toggle only works with two elements
+    items = items.slice(0, 2);  //  switch/toggle only works with two elements
 
     ToggleMenuView.super_.prototype.setItems.call(this, items);
 
-    this.dimens.width = items.join(' / ').length;	//	:TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
+    this.dimens.width = items.join(' / ').length;   //  :TODO: allow configurable seperator... string & color, e.g. styleColor1 (same as fillChar color)
 };
diff --git a/core/upload.js b/core/upload.js
index 2279e6b4..87bdcb4a 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -1,70 +1,70 @@
 /* jslint node: true */
 'use strict';
 
-//	enigma-bbs
-const MenuModule						= require('./menu_module.js').MenuModule;
-const stringFormat						= require('./string_format.js');
-const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
-const getAreaDefaultStorageDirectory	= require('./file_base_area.js').getAreaDefaultStorageDirectory;
-const scanFile							= require('./file_base_area.js').scanFile;
-const getFileAreaByTag					= require('./file_base_area.js').getFileAreaByTag;
-const getDescFromFileName				= require('./file_base_area.js').getDescFromFileName;
-const ansiGoto							= require('./ansi_term.js').goto;
-const moveFileWithCollisionHandling		= require('./file_util.js').moveFileWithCollisionHandling;
-const pathWithTerminatingSeparator		= require('./file_util.js').pathWithTerminatingSeparator;
-const Log								= require('./logger.js').log;
-const Errors							= require('./enig_error.js').Errors;
-const FileEntry							= require('./file_entry.js');
-const isAnsi							= require('./string_util.js').isAnsi;
-const Events							= require('./events.js');
+//  enigma-bbs
+const MenuModule                        = require('./menu_module.js').MenuModule;
+const stringFormat                      = require('./string_format.js');
+const getSortedAvailableFileAreas       = require('./file_base_area.js').getSortedAvailableFileAreas;
+const getAreaDefaultStorageDirectory    = require('./file_base_area.js').getAreaDefaultStorageDirectory;
+const scanFile                          = require('./file_base_area.js').scanFile;
+const getFileAreaByTag                  = require('./file_base_area.js').getFileAreaByTag;
+const getDescFromFileName               = require('./file_base_area.js').getDescFromFileName;
+const ansiGoto                          = require('./ansi_term.js').goto;
+const moveFileWithCollisionHandling     = require('./file_util.js').moveFileWithCollisionHandling;
+const pathWithTerminatingSeparator      = require('./file_util.js').pathWithTerminatingSeparator;
+const Log                               = require('./logger.js').log;
+const Errors                            = require('./enig_error.js').Errors;
+const FileEntry                         = require('./file_entry.js');
+const isAnsi                            = require('./string_util.js').isAnsi;
+const Events                            = require('./events.js');
 
-//	deps
-const async								= require('async');
-const _									= require('lodash');
-const temptmp							= require('temptmp').createTrackedSession('upload');
-const paths								= require('path');
-const sanatizeFilename					= require('sanitize-filename');
+//  deps
+const async                             = require('async');
+const _                                 = require('lodash');
+const temptmp                           = require('temptmp').createTrackedSession('upload');
+const paths                             = require('path');
+const sanatizeFilename                  = require('sanitize-filename');
 
 exports.moduleInfo = {
-    name		: 'Upload',
-    desc		: 'Module for classic file uploads',
-    author		: 'NuSkooler',
+    name        : 'Upload',
+    desc        : 'Module for classic file uploads',
+    author      : 'NuSkooler',
 };
 
 const FormIds = {
-    options		: 0,
-    processing	: 1,
-    fileDetails	: 2,
-    dupes		: 3,
+    options     : 0,
+    processing  : 1,
+    fileDetails : 2,
+    dupes       : 3,
 };
 
 const MciViewIds = {
     options : {
-        area		: 1,	//	area selection
-        uploadType	: 2,	//	blind vs specify filename
-        fileName	: 3,	//	for non-blind; not editable for blind
-        navMenu		: 4,	//	next/cancel/etc.
-        errMsg		: 5,	//	errors (e.g. filename cannot be blank)
+        area        : 1,    //  area selection
+        uploadType  : 2,    //  blind vs specify filename
+        fileName    : 3,    //  for non-blind; not editable for blind
+        navMenu     : 4,    //  next/cancel/etc.
+        errMsg      : 5,    //  errors (e.g. filename cannot be blank)
     },
 
     processing : {
-        calcHashIndicator		: 1,
-        archiveListIndicator	: 2,
-        descFileIndicator		: 3,
-        logStep					: 4,
-        customRangeStart		: 10,	//	10+ = customs
+        calcHashIndicator       : 1,
+        archiveListIndicator    : 2,
+        descFileIndicator       : 3,
+        logStep                 : 4,
+        customRangeStart        : 10,   //  10+ = customs
     },
 
     fileDetails : {
-        desc				: 1,	//	defaults to 'desc' (e.g. from FILE_ID.DIZ)
-        tags				: 2,	//	tag(s) for item
-        estYear				: 3,
-        accept				: 4,	//	accept fields & continue
-        customRangeStart	: 10,	//	10+ = customs
+        desc                : 1,    //  defaults to 'desc' (e.g. from FILE_ID.DIZ)
+        tags                : 2,    //  tag(s) for item
+        estYear             : 3,
+        accept              : 4,    //  accept fields & continue
+        customRangeStart    : 10,   //  10+ = customs
     },
 
     dupes : {
-        dupeList			: 1,
+        dupeList            : 1,
     }
 };
 
@@ -85,14 +85,14 @@ exports.getModule = class UploadModule extends MenuModule {
             },
 
             fileDetailsContinue : (formData, extraArgs, cb) => {
-                //	see displayFileDetailsPageForUploadEntry() for this hackery:
+                //  see displayFileDetailsPageForUploadEntry() for this hackery:
                 cb(null);
-                return this.fileDetailsCurrentEntrySubmitCallback(null, formData.value);	//	move on to the next entry, if any
+                return this.fileDetailsCurrentEntrySubmitCallback(null, formData.value);    //  move on to the next entry, if any
             },
 
-            //	validation
+            //  validation
             validateNonBlindFileName : (fileName, cb) => {
-                fileName = sanatizeFilename(fileName);	//	remove unsafe chars, path info, etc.
+                fileName = sanatizeFilename(fileName);  //  remove unsafe chars, path info, etc.
                 if(0 === fileName.length) {
                     return cb(new Error('Invalid filename'));
                 }
@@ -101,7 +101,7 @@ exports.getModule = class UploadModule extends MenuModule {
                     return cb(new Error('Filename cannot be empty'));
                 }
 
-                //	At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused
+                //  At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused
                 if(/^[0-9].*$/.test(fileName)) {
                     return cb(new Error('Invalid filename'));
                 }
@@ -124,21 +124,21 @@ exports.getModule = class UploadModule extends MenuModule {
     }
 
     getSaveState() {
-        //	if no areas, we're falling back due to lack of access/areas avail to upload to
+        //  if no areas, we're falling back due to lack of access/areas avail to upload to
         if(this.availAreas.length > 0) {
             return {
-                uploadType			: this.uploadType,
-                tempRecvDirectory	: this.tempRecvDirectory,
-                areaInfo			: this.availAreas[ this.viewControllers.options.getView(MciViewIds.options.area).getData() ],
+                uploadType          : this.uploadType,
+                tempRecvDirectory   : this.tempRecvDirectory,
+                areaInfo            : this.availAreas[ this.viewControllers.options.getView(MciViewIds.options.area).getData() ],
             };
         }
     }
 
     restoreSavedState(savedState) {
         if(savedState.areaInfo) {
-            this.uploadType			= savedState.uploadType;
-            this.areaInfo			= savedState.areaInfo;
-            this.tempRecvDirectory	= savedState.tempRecvDirectory;
+            this.uploadType         = savedState.uploadType;
+            this.areaInfo           = savedState.areaInfo;
+            this.tempRecvDirectory  = savedState.tempRecvDirectory;
         }
     }
 
@@ -184,24 +184,24 @@ exports.getModule = class UploadModule extends MenuModule {
                 return cb(err);
             }
 
-            //	need a terminator for various external protocols
+            //  need a terminator for various external protocols
             this.tempRecvDirectory = pathWithTerminatingSeparator(tempRecvDirectory);
 
             const modOpts = {
                 extraArgs : {
-                    recvDirectory	: this.tempRecvDirectory,	//	we'll move files from here to their area container once processed/confirmed
-                    direction		: 'recv',
+                    recvDirectory   : this.tempRecvDirectory,   //  we'll move files from here to their area container once processed/confirmed
+                    direction       : 'recv',
                 }
             };
 
             if(!this.isBlindUpload()) {
-                //	data has been sanatized at this point
+                //  data has been sanatized at this point
                 modOpts.extraArgs.recvFileName = this.viewControllers.options.getView(MciViewIds.options.fileName).getData();
             }
 
             //
-            //	Move along to protocol selection -> file transfer
-            //	Upon completion, we'll re-enter the module with some file paths handed to us
+            //  Move along to protocol selection -> file transfer
+            //  Upon completion, we'll re-enter the module with some file paths handed to us
             //
             return this.gotoMenu(
                 this.menuConfig.config.fileTransferProtocolSelection || 'fileTransferProtocolSelection',
@@ -216,7 +216,7 @@ exports.getModule = class UploadModule extends MenuModule {
     }
 
     updateScanStepInfoViews(stepInfo) {
-        //	:TODO: add some blinking (e.g. toggle items) indicators - see OBV.DOC
+        //  :TODO: add some blinking (e.g. toggle items) indicators - see OBV.DOC
 
         const fmtObj = Object.assign( {}, stepInfo);
         let stepIndicatorFmt = '';
@@ -224,8 +224,8 @@ exports.getModule = class UploadModule extends MenuModule {
 
         const fmtConfig = this.menuConfig.config;
 
-        const indicatorStates 	= fmtConfig.indicatorStates || [ '|', '/', '-', '\\' ];
-        const indicatorFinished	= fmtConfig.indicatorFinished || '√';
+        const indicatorStates   = fmtConfig.indicatorStates || [ '|', '/', '-', '\\' ];
+        const indicatorFinished = fmtConfig.indicatorFinished || '√';
 
         const indicator = { };
         const self = this;
@@ -310,8 +310,8 @@ exports.getModule = class UploadModule extends MenuModule {
         const self = this;
 
         const results = {
-            newEntries	: [],
-            dupes		: [],
+            newEntries  : [],
+            dupes       : [],
         };
 
         self.client.log.debug('Scanning upload(s)', { paths : this.recvFilePaths } );
@@ -319,22 +319,22 @@ exports.getModule = class UploadModule extends MenuModule {
         let currentFileNum = 0;
 
         async.eachSeries(this.recvFilePaths, (filePath, nextFilePath) => {
-            //	:TODO: virus scanning/etc. should occur around here
+            //  :TODO: virus scanning/etc. should occur around here
 
             currentFileNum += 1;
 
             self.scanStatus = {
-                indicatorPos	: 0,
+                indicatorPos    : 0,
             };
 
             const scanOpts = {
-                areaTag		: self.areaInfo.areaTag,
-                storageTag	: self.areaInfo.storageTags[0],
+                areaTag     : self.areaInfo.areaTag,
+                storageTag  : self.areaInfo.storageTags[0],
             };
 
             function handleScanStep(stepInfo, nextScanStep) {
-                stepInfo.totalFileNum		= self.recvFilePaths.length;
-                stepInfo.currentFileNum		= currentFileNum;
+                stepInfo.totalFileNum       = self.recvFilePaths.length;
+                stepInfo.currentFileNum     = currentFileNum;
 
                 self.updateScanStepInfoViews(stepInfo);
                 return nextScanStep(null);
@@ -347,14 +347,14 @@ exports.getModule = class UploadModule extends MenuModule {
                     return nextFilePath(err);
                 }
 
-                //	new or dupe?
+                //  new or dupe?
                 if(dupeEntries.length > 0) {
-                    //	1:n dupes found
+                    //  1:n dupes found
                     self.client.log.debug('Duplicate file(s) found', { dupeEntries : dupeEntries } );
 
                     results.dupes = results.dupes.concat(dupeEntries);
                 } else {
-                    //	new one
+                    //  new one
                     results.newEntries.push(fileEntry);
                 }
 
@@ -377,37 +377,37 @@ exports.getModule = class UploadModule extends MenuModule {
         const self = this;
 
         async.eachSeries(newEntries, (newEntry, nextEntry) => {
-            const src 	= paths.join(self.tempRecvDirectory, newEntry.fileName);
-            const dst	= paths.join(areaStorageDir, newEntry.fileName);
+            const src   = paths.join(self.tempRecvDirectory, newEntry.fileName);
+            const dst   = paths.join(areaStorageDir, newEntry.fileName);
 
-            moveFileWithCollisionHandling(src, dst,	(err, finalPath) => {
+            moveFileWithCollisionHandling(src, dst, (err, finalPath) => {
                 if(err) {
                     self.client.log.error(
                         'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
                     );
 
                     if(dst !== finalPath) {
-                        //	name changed; ajust before persist
+                        //  name changed; ajust before persist
                         newEntry.fileName = paths.basename(finalPath);
                     }
 
-                    return nextEntry(null);	//	still try next file
+                    return nextEntry(null); //  still try next file
                 }
 
                 self.client.log.debug('Moved upload to area', { path : finalPath } );
 
-                //	persist to DB
+                //  persist to DB
                 newEntry.persist(err => {
                     if(err) {
                         self.client.log.error('Failed persisting upload to database', { path : finalPath, error : err.message } );
                     }
 
-                    return nextEntry(null);	//	still try next file
+                    return nextEntry(null); //  still try next file
                 });
             });
         }, () => {
             //
-            //	Finally, we can remove any temp files that we may have created
+            //  Finally, we can remove any temp files that we may have created
             //
             self.cleanupTempFiles();
         });
@@ -415,8 +415,8 @@ exports.getModule = class UploadModule extends MenuModule {
 
     prepDetailsForUpload(scanResults, cb) {
         async.eachSeries(scanResults.newEntries, (newEntry, nextEntry) => {
-            newEntry.meta.upload_by_username 	= this.client.user.username;
-            newEntry.meta.upload_by_user_id		= this.client.user.userId;
+            newEntry.meta.upload_by_username    = this.client.user.username;
+            newEntry.meta.upload_by_user_id     = this.client.user.userId;
 
             this.displayFileDetailsPageForUploadEntry(newEntry, (err, newValues) => {
                 if(err) {
@@ -445,8 +445,8 @@ exports.getModule = class UploadModule extends MenuModule {
 
     displayDupesPage(dupes, cb) {
         //
-        //	If we have custom art to show, use it - else just dump basic info.
-        //	Pause at the end in either case.
+        //  If we have custom art to show, use it - else just dump basic info.
+        //  Pause at the end in either case.
         //
         const self = this;
 
@@ -469,7 +469,7 @@ exports.getModule = class UploadModule extends MenuModule {
                     );
                 },
                 function prepDupeObjects(dupeListView, callback) {
-                    //	update dupe objects with additional info that can be used for formatString() and the like
+                    //  update dupe objects with additional info that can be used for formatString() and the like
                     async.each(dupes, (dupe, nextDupe) => {
                         FileEntry.loadBasicEntry(dupe.fileId, dupe, err => {
                             if(err) {
@@ -478,8 +478,8 @@ exports.getModule = class UploadModule extends MenuModule {
 
                             const areaInfo = getFileAreaByTag(dupe.areaTag);
                             if(areaInfo) {
-                                dupe.areaName 	= areaInfo.name;
-                                dupe.areaDesc	= areaInfo.desc;
+                                dupe.areaName   = areaInfo.name;
+                                dupe.areaDesc   = areaInfo.desc;
                             }
                             return nextDupe(null);
                         });
@@ -513,7 +513,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
     processUploadedFiles() {
         //
-        //	For each file uploaded, we need to process & gather information
+        //  For each file uploaded, we need to process & gather information
         //
         const self = this;
 
@@ -525,8 +525,8 @@ exports.getModule = class UploadModule extends MenuModule {
                     }
 
                     //
-                    //	For non-blind uploads, batch is not supported, we expect a single file
-                    //	in |recvFilePaths|. If not, it's an error (we don't want to process the wrong thing)
+                    //  For non-blind uploads, batch is not supported, we expect a single file
+                    //  in |recvFilePaths|. If not, it's an error (we don't want to process the wrong thing)
                     //
                     if(self.recvFilePaths.length > 1) {
                         self.client.log.warn( { recvFilePaths : self.recvFilePaths }, 'Non-blind upload received 2:n files' );
@@ -563,9 +563,9 @@ exports.getModule = class UploadModule extends MenuModule {
                 },
                 function startMovingAndPersistingToDatabase(scanResults, callback) {
                     //
-                    //	*Start* the process of moving files from their current |tempRecvDirectory|
-                    //	locations -> their final area destinations. Don't make the user wait
-                    //	here as I/O can take quite a bit of time. Log any failures.
+                    //  *Start* the process of moving files from their current |tempRecvDirectory|
+                    //  locations -> their final area destinations. Don't make the user wait
+                    //  here as I/O can take quite a bit of time. Log any failures.
                     //
                     self.moveAndPersistUploadsToDatabase(scanResults.newEntries);
                     return callback(null, scanResults.newEntries);
@@ -574,8 +574,8 @@ exports.getModule = class UploadModule extends MenuModule {
                     Events.emit(
                         Events.getSystemEvents().UserUpload,
                         {
-                            user	: self.client.user,
-                            files	: uploadedEntries,
+                            user    : self.client.user,
+                            files   : uploadedEntries,
                         }
                     );
                     return callback(null);
@@ -584,7 +584,7 @@ exports.getModule = class UploadModule extends MenuModule {
             err => {
                 if(err) {
                     self.client.log.warn('File upload error encountered', { error : err.message } );
-                    self.cleanupTempFiles();	//	normally called after moveAndPersistUploadsToDatabase() is completed.
+                    self.cleanupTempFiles();    //  normally called after moveAndPersistUploadsToDatabase() is completed.
                 }
 
                 return self.prevMenu();
@@ -609,8 +609,8 @@ exports.getModule = class UploadModule extends MenuModule {
                     const areaSelectView = self.viewControllers.options.getView(MciViewIds.options.area);
                     areaSelectView.setItems( self.availAreas.map(areaInfo => areaInfo.name ) );
 
-                    const uploadTypeView 	= self.viewControllers.options.getView(MciViewIds.options.uploadType);
-                    const fileNameView		= self.viewControllers.options.getView(MciViewIds.options.fileName);
+                    const uploadTypeView    = self.viewControllers.options.getView(MciViewIds.options.uploadType);
+                    const fileNameView      = self.viewControllers.options.getView(MciViewIds.options.fileName);
 
                     const blindFileNameText = self.menuConfig.config.blindFileNameText || '(blind - filename ignored)';
 
@@ -626,7 +626,7 @@ exports.getModule = class UploadModule extends MenuModule {
                         }
                     });
 
-                    //	sanatize filename for display when leaving the view
+                    //  sanatize filename for display when leaving the view
                     self.viewControllers.options.on('leave', prevView => {
                         if(prevView.id === MciViewIds.options.fileName) {
                             fileNameView.setText(sanatizeFilename(fileNameView.getData()));
@@ -634,7 +634,7 @@ exports.getModule = class UploadModule extends MenuModule {
                     });
 
                     self.uploadType = 'blind';
-                    uploadTypeView.setFocusItemIndex(0);	//	default to blind
+                    uploadTypeView.setFocusItemIndex(0);    //  default to blind
                     fileNameView.setText(blindFileNameText);
                     areaSelectView.redraw();
 
@@ -655,7 +655,7 @@ exports.getModule = class UploadModule extends MenuModule {
             FormIds.processing,
             { clearScreen : true, trailingLF : false },
             err => {
-                //	note: this art is not required
+                //  note: this art is not required
                 this.hasProcessingArt = !err;
 
                 return cb(null);
@@ -689,7 +689,7 @@ exports.getModule = class UploadModule extends MenuModule {
 
                     self.updateCustomViewTextsWithFilter('fileDetails', MciViewIds.fileDetails.customRangeStart, fileEntry );
 
-                    tagsView.setText( Array.from(fileEntry.hashTags).join(',') );	//	:TODO: optional 'hashTagsSep' like file list/browse
+                    tagsView.setText( Array.from(fileEntry.hashTags).join(',') );   //  :TODO: optional 'hashTagsSep' like file list/browse
                     yearView.setText(fileEntry.meta.est_release_year || '');
 
                     if(isAnsi(fileEntry.desc)) {
@@ -698,8 +698,8 @@ exports.getModule = class UploadModule extends MenuModule {
                         return descView.setAnsi(
                             fileEntry.desc,
                             {
-                                prepped			: false,
-                                forceLineTerm	: true,
+                                prepped         : false,
+                                forceLineTerm   : true,
                             },
                             () => {
                                 return callback(null, descView, 'preview', MciViewIds.fileDetails.tags);
@@ -709,29 +709,29 @@ exports.getModule = class UploadModule extends MenuModule {
                         const hasDesc = self.fileEntryHasDetectedDesc(fileEntry);
                         descView.setText(
                             hasDesc ? fileEntry.desc : getDescFromFileName(fileEntry.fileName),
-                            { scrollMode : 'top' }	//	override scroll mode; we want to be @ top
+                            { scrollMode : 'top' }  //  override scroll mode; we want to be @ top
                         );
                         return callback(null, descView, 'edit', hasDesc ? MciViewIds.fileDetails.tags : MciViewIds.fileDetails.desc);
                     }
                 },
                 function finalizeViews(descView, descViewMode, focusId, callback) {
                     descView.setPropertyValue('mode', descViewMode);
-                    descView.acceptsFocus	= 'preview' === descViewMode ? false : true;
+                    descView.acceptsFocus   = 'preview' === descViewMode ? false : true;
                     self.viewControllers.fileDetails.switchFocus(focusId);
                     return callback(null);
                 }
             ],
             err => {
                 //
-                //	we only call |cb| here if there is an error
-                //	else, wait for the current from to be submit - then call -
-                //	this way we'll move on to the next file entry when ready
+                //  we only call |cb| here if there is an error
+                //  else, wait for the current from to be submit - then call -
+                //  this way we'll move on to the next file entry when ready
                 //
                 if(err) {
                     return cb(err);
                 }
 
-                self.fileDetailsCurrentEntrySubmitCallback = cb;	//	stash for moduleMethods.fileDetailsContinue
+                self.fileDetailsCurrentEntrySubmitCallback = cb;    //  stash for moduleMethods.fileDetailsContinue
             }
         );
     }
diff --git a/core/user.js b/core/user.js
index 72808f00..e3314cc7 100644
--- a/core/user.js
+++ b/core/user.js
@@ -1,53 +1,53 @@
 /* jslint node: true */
 'use strict';
 
-const userDb		= require('./database.js').dbs.user;
-const Config		= require('./config.js').get;
-const userGroup		= require('./user_group.js');
-const Errors		= require('./enig_error.js').Errors;
-const Events		= require('./events.js');
+const userDb        = require('./database.js').dbs.user;
+const Config        = require('./config.js').get;
+const userGroup     = require('./user_group.js');
+const Errors        = require('./enig_error.js').Errors;
+const Events        = require('./events.js');
 
-//	deps
-const crypto		= require('crypto');
-const assert		= require('assert');
-const async			= require('async');
-const _				= require('lodash');
-const moment		= require('moment');
+//  deps
+const crypto        = require('crypto');
+const assert        = require('assert');
+const async         = require('async');
+const _             = require('lodash');
+const moment        = require('moment');
 
 exports.isRootUserId = function(id) { return 1 === id; };
 
 module.exports = class User {
     constructor() {
-        this.userId		= 0;
-        this.username	= '';
-        this.properties	= {};	//	name:value
-        this.groups		= [];	//	group membership(s)
+        this.userId     = 0;
+        this.username   = '';
+        this.properties = {};   //  name:value
+        this.groups     = [];   //  group membership(s)
     }
 
-    //	static property accessors
+    //  static property accessors
     static get RootUserID() {
         return 1;
     }
 
     static get PBKDF2() {
         return {
-            iterations	: 1000,
-            keyLen		: 128,
-            saltLen		: 32,
+            iterations  : 1000,
+            keyLen      : 128,
+            saltLen     : 32,
         };
     }
 
     static get StandardPropertyGroups() {
         return {
-            password	: [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
+            password    : [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
         };
     }
 
     static get AccountStatus() {
         return {
-            disabled	: 0,
-            inactive	: 1,
-            active		: 2,
+            disabled    : 0,
+            inactive    : 1,
+            active      : 2,
         };
     }
 
@@ -69,14 +69,14 @@ module.exports = class User {
         }
 
         return ((this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2) &&
-			(this.properties.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2));
+            (this.properties.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2));
     }
 
     isRoot() {
         return User.isRootUserId(this.userId);
     }
 
-    isSysOp() {	//	alias to isRoot()
+    isSysOp() { //  alias to isRoot()
         return this.isRoot();
     }
 
@@ -98,7 +98,7 @@ module.exports = class User {
             return 30;
         }
 
-        return 10;	//	:TODO: Is this what we want?
+        return 10;  //  :TODO: Is this what we want?
     }
 
     authenticate(username, password, cb) {
@@ -108,32 +108,32 @@ module.exports = class User {
         async.waterfall(
             [
                 function fetchUserId(callback) {
-                    //	get user ID
+                    //  get user ID
                     User.getUserIdAndName(username, (err, uid, un) => {
-                        cachedInfo.userId	= uid;
-                        cachedInfo.username	= un;
+                        cachedInfo.userId   = uid;
+                        cachedInfo.username = un;
 
                         return callback(err);
                     });
                 },
                 function getRequiredAuthProperties(callback) {
-                    //	fetch properties required for authentication
+                    //  fetch properties required for authentication
                     User.loadProperties(cachedInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
                         return callback(err, props);
                     });
                 },
                 function getDkWithSalt(props, callback) {
-                    //	get DK from stored salt and password provided
+                    //  get DK from stored salt and password provided
                     User.generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, (err, dk) => {
                         return callback(err, dk, props.pw_pbkdf2_dk);
                     });
                 },
                 function validateAuth(passDk, propsDk, callback) {
                     //
-                    //	Use constant time comparison here for security feel-goods
+                    //  Use constant time comparison here for security feel-goods
                     //
-                    const passDkBuf		= Buffer.from(passDk,	'hex');
-                    const propsDkBuf	= Buffer.from(propsDk,	'hex');
+                    const passDkBuf     = Buffer.from(passDk,   'hex');
+                    const propsDkBuf    = Buffer.from(propsDk,  'hex');
 
                     if(passDkBuf.length !== propsDkBuf.length) {
                         return callback(Errors.AccessDenied('Invalid password'));
@@ -167,11 +167,11 @@ module.exports = class User {
             ],
             err => {
                 if(!err) {
-                    self.userId			= cachedInfo.userId;
-                    self.username		= cachedInfo.username;
-                    self.properties		= cachedInfo.properties;
-                    self.groups			= cachedInfo.groups;
-                    self.authenticated	= true;
+                    self.userId         = cachedInfo.userId;
+                    self.username       = cachedInfo.username;
+                    self.properties     = cachedInfo.properties;
+                    self.groups         = cachedInfo.groups;
+                    self.authenticated  = true;
                 }
 
                 return cb(err);
@@ -189,7 +189,7 @@ module.exports = class User {
 
         const self = this;
 
-        //	:TODO: set various defaults, e.g. default activation status, etc.
+        //  :TODO: set various defaults, e.g. default activation status, etc.
         self.properties.account_status = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
 
         async.waterfall(
@@ -200,16 +200,16 @@ module.exports = class User {
                 function createUserRec(trans, callback) {
                     trans.run(
                         `INSERT INTO user (user_name)
-						VALUES (?);`,
+                        VALUES (?);`,
                         [ self.username ],
-                        function inserted(err) {	//	use classic function for |this|
+                        function inserted(err) {    //  use classic function for |this|
                             if(err) {
                                 return callback(err);
                             }
 
                             self.userId = this.lastID;
 
-                            //	Do not require activation for userId 1 (root/admin)
+                            //  Do not require activation for userId 1 (root/admin)
                             if(User.RootUserID === self.userId) {
                                 self.properties.account_status = User.AccountStatus.active;
                             }
@@ -224,15 +224,15 @@ module.exports = class User {
                             return callback(err);
                         }
 
-                        self.properties.pw_pbkdf2_salt	= info.salt;
-                        self.properties.pw_pbkdf2_dk	= info.dk;
+                        self.properties.pw_pbkdf2_salt  = info.salt;
+                        self.properties.pw_pbkdf2_dk    = info.dk;
                         return callback(null, trans);
                     });
                 },
                 function setInitialGroupMembership(trans, callback) {
                     self.groups = config.users.defaultGroups;
 
-                    if(User.RootUserID === self.userId) {	//	root/SysOp?
+                    if(User.RootUserID === self.userId) {   //  root/SysOp?
                         self.groups.push('sysops');
                     }
 
@@ -285,12 +285,12 @@ module.exports = class User {
     }
 
     persistProperty(propName, propValue, cb) {
-        //	update live props
+        //  update live props
         this.properties[propName] = propValue;
 
         userDb.run(
             `REPLACE INTO user_property (user_id, prop_name, prop_value)
-			VALUES (?, ?, ?);`,
+            VALUES (?, ?, ?);`,
             [ this.userId, propName, propValue ],
             err => {
                 if(cb) {
@@ -301,12 +301,12 @@ module.exports = class User {
     }
 
     removeProperty(propName, cb) {
-        //	update live
+        //  update live
         delete this.properties[propName];
 
         userDb.run(
             `DELETE FROM user_property
-			WHERE user_id = ? AND prop_name = ?;`,
+            WHERE user_id = ? AND prop_name = ?;`,
             [ this.userId, propName ],
             err => {
                 if(cb) {
@@ -324,12 +324,12 @@ module.exports = class User {
 
         const self = this;
 
-        //	update live props
+        //  update live props
         _.merge(this.properties, properties);
 
         const stmt = transOrDb.prepare(
             `REPLACE INTO user_property (user_id, prop_name, prop_value)
-			VALUES (?, ?, ?);`
+            VALUES (?, ?, ?);`
         );
 
         async.each(Object.keys(properties), (propName, nextProp) => {
@@ -355,8 +355,8 @@ module.exports = class User {
             }
 
             const newProperties = {
-                pw_pbkdf2_salt	: info.salt,
-                pw_pbkdf2_dk	: info.dk,
+                pw_pbkdf2_salt  : info.salt,
+                pw_pbkdf2_dk    : info.dk,
             };
 
             this.persistProperties(newProperties, err => {
@@ -392,11 +392,11 @@ module.exports = class User {
             ],
             (err, userName, properties, groups) => {
                 const user = new User();
-                user.userId			= userId;
-                user.username		= userName;
-                user.properties		= properties;
-                user.groups			= groups;
-                user.authenticated	= false;	//	this is NOT an authenticated user!
+                user.userId         = userId;
+                user.username       = userName;
+                user.properties     = properties;
+                user.groups         = groups;
+                user.authenticated  = false;    //  this is NOT an authenticated user!
 
                 return cb(err, user);
             }
@@ -410,8 +410,8 @@ module.exports = class User {
     static getUserIdAndName(username, cb) {
         userDb.get(
             `SELECT id, user_name
-			FROM user
-			WHERE user_name LIKE ?;`,
+            FROM user
+            WHERE user_name LIKE ?;`,
             [ username ],
             (err, row) => {
                 if(err) {
@@ -430,12 +430,12 @@ module.exports = class User {
     static getUserIdAndNameByRealName(realName, cb) {
         userDb.get(
             `SELECT id, user_name
-			FROM user
-			WHERE id = (
-				SELECT user_id
-				FROM user_property
-				WHERE prop_name='real_name' AND prop_value LIKE ?
-			);`,
+            FROM user
+            WHERE id = (
+                SELECT user_id
+                FROM user_property
+                WHERE prop_name='real_name' AND prop_value LIKE ?
+            );`,
             [ realName ],
             (err, row) => {
                 if(err) {
@@ -466,8 +466,8 @@ module.exports = class User {
     static getUserName(userId, cb) {
         userDb.get(
             `SELECT user_name
-			FROM user
-			WHERE id = ?;`,
+            FROM user
+            WHERE id = ?;`,
             [ userId ],
             (err, row) => {
                 if(err) {
@@ -490,9 +490,9 @@ module.exports = class User {
         }
 
         let sql =
-			`SELECT prop_name, prop_value
-			FROM user_property
-			WHERE user_id = ?`;
+            `SELECT prop_name, prop_value
+            FROM user_property
+            WHERE user_id = ?`;
 
         if(options.names) {
             sql += ` AND prop_name IN("${options.names.join('","')}");`;
@@ -511,14 +511,14 @@ module.exports = class User {
         });
     }
 
-    //	:TODO: make this much more flexible - propValue should allow for case-insensitive compare, etc.
+    //  :TODO: make this much more flexible - propValue should allow for case-insensitive compare, etc.
     static getUserIdsWithProperty(propName, propValue, cb) {
         let userIds = [];
 
         userDb.each(
             `SELECT user_id
-			FROM user_property
-			WHERE prop_name = ? AND prop_value = ?;`,
+            FROM user_property
+            WHERE prop_name = ? AND prop_value = ?;`,
             [ propName, propValue ],
             (err, row) => {
                 if(row) {
@@ -537,13 +537,13 @@ module.exports = class User {
 
         userDb.each(
             `SELECT id, user_name
-			FROM user
-			${orderClause};`,
+            FROM user
+            ${orderClause};`,
             (err, row) => {
                 if(row) {
                     userList.push({
-                        userId		: row.id,
-                        userName	: row.user_name,
+                        userId      : row.id,
+                        userName    : row.user_name,
                     });
                 }
             },
@@ -552,8 +552,8 @@ module.exports = class User {
                 async.map(userList, (user, nextUser) => {
                     userDb.each(
                         `SELECT prop_name, prop_value
-						FROM user_property
-						WHERE user_id = ? AND prop_name IN ("${options.properties.join('","')}");`,
+                        FROM user_property
+                        WHERE user_id = ? AND prop_name IN ("${options.properties.join('","')}");`,
                         [ user.userId ],
                         (err, row) => {
                             if(row) {
diff --git a/core/user_config.js b/core/user_config.js
index b5e124b6..f9aad6c4 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -1,38 +1,38 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('./menu_module.js').MenuModule;
-const ViewController	= require('./view_controller.js').ViewController;
-const theme 			= require('./theme.js');
-const sysValidate		= require('./system_view_validate.js');
+const MenuModule        = require('./menu_module.js').MenuModule;
+const ViewController    = require('./view_controller.js').ViewController;
+const theme             = require('./theme.js');
+const sysValidate       = require('./system_view_validate.js');
 
-const async				= require('async');
-const assert			= require('assert');
-const _					= require('lodash');
-const moment			= require('moment');
+const async             = require('async');
+const assert            = require('assert');
+const _                 = require('lodash');
+const moment            = require('moment');
 
 exports.moduleInfo = {
-    name		: 'User Configuration',
-    desc		: 'Module for user configuration',
-    author		: 'NuSkooler',
+    name        : 'User Configuration',
+    desc        : 'Module for user configuration',
+    author      : 'NuSkooler',
 };
 
 const MciCodeIds = {
-    RealName	: 1,
-    BirthDate	: 2,
-    Sex			: 3,
-    Loc			: 4,
-    Affils		: 5,
-    Email		: 6,
-    Web			: 7,
-    TermHeight	: 8,
-    Theme		: 9,
-    Password	: 10,
-    PassConfirm	: 11,
-    ThemeInfo	: 20,
-    ErrorMsg	: 21,
+    RealName    : 1,
+    BirthDate   : 2,
+    Sex         : 3,
+    Loc         : 4,
+    Affils      : 5,
+    Email       : 6,
+    Web         : 7,
+    TermHeight  : 8,
+    Theme       : 9,
+    Password    : 10,
+    PassConfirm : 11,
+    ThemeInfo   : 20,
+    ErrorMsg    : 21,
 
-    SaveCancel	: 25,
+    SaveCancel  : 25,
 };
 
 exports.getModule = class UserConfigModule extends MenuModule {
@@ -43,29 +43,29 @@ exports.getModule = class UserConfigModule extends MenuModule {
 
         this.menuMethods = {
             //
-            //	Validation support
+            //  Validation support
             //
             validateEmailAvail : function(data, cb) {
                 //
-                //	If nothing changed, we know it's OK
+                //  If nothing changed, we know it's OK
                 //
                 if(self.client.user.properties.email_address.toLowerCase() === data.toLowerCase()) {
                     return cb(null);
                 }
 
-                //	Otherwise we can use the standard system method
+                //  Otherwise we can use the standard system method
                 return sysValidate.validateEmailAvail(data, cb);
             },
 
             validatePassword : function(data, cb) {
                 //
-                //	Blank is OK - this means we won't be changing it
+                //  Blank is OK - this means we won't be changing it
                 //
                 if(!data || 0 === data.length) {
                     return cb(null);
                 }
 
-                //	Otherwise we can use the standard system method
+                //  Otherwise we can use the standard system method
                 return sysValidate.validatePasswordSpec(data, cb);
             },
 
@@ -95,21 +95,21 @@ exports.getModule = class UserConfigModule extends MenuModule {
             },
 
             //
-            //	Handlers
+            //  Handlers
             //
             saveChanges : function(formData, extraArgs, cb) {
                 assert(formData.value.password === formData.value.passwordConfirm);
 
                 const newProperties = {
-                    real_name			: formData.value.realName,
-                    birthdate			: new Date(Date.parse(formData.value.birthdate)).toISOString(),
-                    sex					: formData.value.sex,
-                    location			: formData.value.location,
-                    affiliation			: formData.value.affils,
-                    email_address		: formData.value.email,
-                    web_address			: formData.value.web,
-                    term_height			: formData.value.termHeight.toString(),
-                    theme_id			: self.availThemeInfo[formData.value.theme].themeId,
+                    real_name           : formData.value.realName,
+                    birthdate           : new Date(Date.parse(formData.value.birthdate)).toISOString(),
+                    sex                 : formData.value.sex,
+                    location            : formData.value.location,
+                    affiliation         : formData.value.affils,
+                    email_address       : formData.value.email,
+                    web_address         : formData.value.web,
+                    term_height         : formData.value.termHeight.toString(),
+                    theme_id            : self.availThemeInfo[formData.value.theme].themeId,
                 };
 
                 //  runtime set theme
@@ -119,11 +119,11 @@ exports.getModule = class UserConfigModule extends MenuModule {
                 self.client.user.persistProperties(newProperties, err => {
                     if(err) {
                         self.client.log.warn( { error : err.toString() }, 'Failed persisting updated properties');
-                        //	:TODO: warn end user!
+                        //  :TODO: warn end user!
                         return self.prevMenu(cb);
                     }
                     //
-                    //	New password if it's not empty
+                    //  New password if it's not empty
                     //
                     self.client.log.info('User updated properties');
 
@@ -154,8 +154,8 @@ exports.getModule = class UserConfigModule extends MenuModule {
                 return cb(err);
             }
 
-            const self 				= this;
-            const vc				= self.viewControllers.menu = new ViewController( { client : self.client} );
+            const self              = this;
+            const vc                = self.viewControllers.menu = new ViewController( { client : self.client} );
             let currentThemeIdIndex = 0;
 
             async.series(
@@ -167,11 +167,11 @@ exports.getModule = class UserConfigModule extends MenuModule {
                         self.availThemeInfo = _.sortBy([...theme.getAvailableThemes()].map(entry => {
                             const theme = entry[1];
                             return {
-                                themeId		: theme.info.themeId,
-                                name		: theme.info.name,
-                                author		: theme.info.author,
-                                desc		: _.isString(theme.info.desc) ? theme.info.desc : '',
-                                group		: _.isString(theme.info.group) ? theme.info.group : '',
+                                themeId     : theme.info.themeId,
+                                name        : theme.info.name,
+                                author      : theme.info.author,
+                                desc        : _.isString(theme.info.desc) ? theme.info.desc : '',
+                                group       : _.isString(theme.info.group) ? theme.info.group : '',
                             };
                         }), 'name');
 
@@ -202,7 +202,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
 
                         var realNameView = self.getView(MciCodeIds.RealName);
                         if(realNameView) {
-                            realNameView.setFocus(true);	//	:TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
+                            realNameView.setFocus(true);    //  :TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
                         }
 
                         callback(null);
diff --git a/core/user_group.js b/core/user_group.js
index a350e5b2..4b1548b8 100644
--- a/core/user_group.js
+++ b/core/user_group.js
@@ -1,21 +1,21 @@
 /* jslint node: true */
 'use strict';
 
-const userDb		= require('./database.js').dbs.user;
+const userDb        = require('./database.js').dbs.user;
 
-const async			= require('async');
-const _				= require('lodash');
+const async         = require('async');
+const _             = require('lodash');
 
-exports.getGroupsForUser	 	= getGroupsForUser;
-exports.addUserToGroup			= addUserToGroup;
-exports.addUserToGroups			= addUserToGroups;
-exports.removeUserFromGroup		= removeUserFromGroup;
+exports.getGroupsForUser        = getGroupsForUser;
+exports.addUserToGroup          = addUserToGroup;
+exports.addUserToGroups         = addUserToGroups;
+exports.removeUserFromGroup     = removeUserFromGroup;
 
 function getGroupsForUser(userId, cb) {
     const sql =
-		`SELECT group_name
-		FROM user_group_member
-		WHERE user_id=?;`;
+        `SELECT group_name
+        FROM user_group_member
+        WHERE user_id=?;`;
 
     const groups = [];
 
@@ -39,7 +39,7 @@ function addUserToGroup(userId, groupName, transOrDb, cb) {
 
     transOrDb.run(
         `REPLACE INTO user_group_member (group_name, user_id)
-		VALUES(?, ?);`,
+        VALUES(?, ?);`,
         [ groupName, userId ],
         err => {
             return cb(err);
@@ -59,7 +59,7 @@ function addUserToGroups(userId, groups, transOrDb, cb) {
 function removeUserFromGroup(userId, groupName, cb) {
     userDb.run(
         `DELETE FROM user_group_member
-		WHERE group_name=? AND user_id=?;`,
+        WHERE group_name=? AND user_id=?;`,
         [ groupName, userId ],
         err => {
             return cb(err);
diff --git a/core/user_list.js b/core/user_list.js
index 212eb9ea..8af9690b 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -1,35 +1,35 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('./menu_module.js').MenuModule;
-const User				= require('./user.js');
-const ViewController	= require('./view_controller.js').ViewController;
-const stringFormat		= require('./string_format.js');
+const MenuModule        = require('./menu_module.js').MenuModule;
+const User              = require('./user.js');
+const ViewController    = require('./view_controller.js').ViewController;
+const stringFormat      = require('./string_format.js');
 
-const moment			= require('moment');
-const async				= require('async');
-const _					= require('lodash');
+const moment            = require('moment');
+const async             = require('async');
+const _                 = require('lodash');
 
 /*
-	Available listFormat/focusListFormat object members:
+    Available listFormat/focusListFormat object members:
 
-	userId			: User ID
-	userName		: User name/handle
-	lastLoginTs		: Last login timestamp
-	status			: Status: active | inactive
-	location		: Location
-	affiliation		: Affils
-	note			: User note
+    userId          : User ID
+    userName        : User name/handle
+    lastLoginTs     : Last login timestamp
+    status          : Status: active | inactive
+    location        : Location
+    affiliation     : Affils
+    note            : User note
 */
 
 exports.moduleInfo = {
-    name		: 'User List',
-    desc		: 'Lists all system users',
-    author		: 'NuSkooler',
+    name        : 'User List',
+    desc        : 'Lists all system users',
+    author      : 'NuSkooler',
 };
 
 const MciViewIds = {
-    UserList	: 1,
+    UserList    : 1,
 };
 
 exports.getModule = class UserListModule extends MenuModule {
@@ -43,8 +43,8 @@ exports.getModule = class UserListModule extends MenuModule {
                 return cb(err);
             }
 
-            const self		= this;
-            const vc		= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self      = this;
+            const vc        = self.viewControllers.allViews = new ViewController( { client : self.client } );
 
             let userList = [];
 
@@ -56,14 +56,14 @@ exports.getModule = class UserListModule extends MenuModule {
                 [
                     function loadFromConfig(callback) {
                         var loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu,
+                            callingMenu     : self,
+                            mciMap          : mciData.menu,
                         };
 
                         vc.loadFromMenuConfig(loadOpts, callback);
                     },
                     function fetchUserList(callback) {
-                        //	:TODO: Currently fetching all users - probably always OK, but this could be paged
+                        //  :TODO: Currently fetching all users - probably always OK, but this could be paged
                         User.getUserList(USER_LIST_OPTS, function got(err, ul) {
                             userList = ul;
                             callback(err);
@@ -72,19 +72,19 @@ exports.getModule = class UserListModule extends MenuModule {
                     function populateList(callback) {
                         var userListView = vc.getView(MciViewIds.UserList);
 
-                        var listFormat 		= self.menuConfig.config.listFormat || '{userName} - {affils}';
-                        var focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;	//	:TODO: default changed color!
-                        var dateTimeFormat	= self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
+                        var listFormat      = self.menuConfig.config.listFormat || '{userName} - {affils}';
+                        var focusListFormat = self.menuConfig.config.focusListFormat || listFormat; //  :TODO: default changed color!
+                        var dateTimeFormat  = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
 
                         function getUserFmtObj(ue) {
                             return {
-                                userId		: ue.userId,
-                                userName	: ue.userName,
-                                affils		: ue.affiliation,
-                                location	: ue.location,
-                                //	:TODO: the rest!
-                                note		: ue.note || '',
-                                lastLoginTs	: moment(ue.last_login_timestamp).format(dateTimeFormat),
+                                userId      : ue.userId,
+                                userName    : ue.userName,
+                                affils      : ue.affiliation,
+                                location    : ue.location,
+                                //  :TODO: the rest!
+                                note        : ue.note || '',
+                                lastLoginTs : moment(ue.last_login_timestamp).format(dateTimeFormat),
                             };
                         }
 
diff --git a/core/user_login.js b/core/user_login.js
index aa3cfe7b..07a0a2d2 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -1,34 +1,34 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const setClientTheme	= require('./theme.js').setClientTheme;
-const clientConnections	= require('./client_connections.js').clientConnections;
-const StatLog			= require('./stat_log.js');
-const logger			= require('./logger.js');
-const Events			= require('./events.js');
+//  ENiGMA½
+const setClientTheme    = require('./theme.js').setClientTheme;
+const clientConnections = require('./client_connections.js').clientConnections;
+const StatLog           = require('./stat_log.js');
+const logger            = require('./logger.js');
+const Events            = require('./events.js');
 
-//	deps
-const async				= require('async');
+//  deps
+const async             = require('async');
 
-exports.userLogin		= userLogin;
+exports.userLogin       = userLogin;
 
 function userLogin(client, username, password, cb) {
     client.user.authenticate(username, password, function authenticated(err) {
         if(err) {
             client.log.info( { username : username, error : err.message }, 'Failed login attempt');
 
-            //	:TODO: if username exists, record failed login attempt to properties
-            //	:TODO: check Config max failed logon attempts/etc. - set err.maxAttempts = true
+            //  :TODO: if username exists, record failed login attempt to properties
+            //  :TODO: check Config max failed logon attempts/etc. - set err.maxAttempts = true
 
             return cb(err);
         }
-        const user	= client.user;
+        const user  = client.user;
 
         //
-        //	Ensure this user is not already logged in.
-        //	Loop through active connections -- which includes the current --
-        //	and check for matching user ID. If the count is > 1, disallow.
+        //  Ensure this user is not already logged in.
+        //  Loop through active connections -- which includes the current --
+        //  and check for matching user ID. If the count is > 1, disallow.
         //
         let existingClientConnection;
         clientConnections.forEach(function connEntry(cc) {
@@ -40,9 +40,9 @@ function userLogin(client, username, password, cb) {
         if(existingClientConnection) {
             client.log.info(
                 {
-                    existingClientId	: existingClientConnection.session.id,
-                    username			: user.username,
-                    userId				: user.userId
+                    existingClientId    : existingClientConnection.session.id,
+                    username            : user.username,
+                    userId              : user.userId
                 },
                 'Already logged in'
             );
@@ -50,23 +50,23 @@ function userLogin(client, username, password, cb) {
             const existingConnError = new Error('Already logged in as supplied user');
             existingConnError.existingConn = true;
 
-            //	:TODO: We should use EnigError & pass existing connection as second param
+            //  :TODO: We should use EnigError & pass existing connection as second param
 
             return cb(existingConnError);
         }
 
-        //	update client logger with addition of username
+        //  update client logger with addition of username
         client.log = logger.log.child(
             {
-                clientId	: client.log.fields.clientId,
-                sessionId	: client.log.fields.sessionId,
-                username	: user.username,
+                clientId    : client.log.fields.clientId,
+                sessionId   : client.log.fields.sessionId,
+                username    : user.username,
             }
         );
         client.log.info('Successful login');
 
-        //	User's unique session identifier is the same as the connection itself
-        user.sessionId = client.session.uniqueId;	//	convienence
+        //  User's unique session identifier is the same as the connection itself
+        user.sessionId = client.session.uniqueId;   //  convienence
 
         Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
@@ -86,7 +86,7 @@ function userLogin(client, username, password, cb) {
                     return StatLog.incrementUserStat(user, 'login_count', 1, callback);
                 },
                 function recordLoginHistory(callback) {
-                    const LOGIN_HISTORY_MAX	= 200;	//	history of up to last 200 callers
+                    const LOGIN_HISTORY_MAX = 200;  //  history of up to last 200 callers
                     return StatLog.appendSystemLogEntry('user_login_history', user.userId, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
                 }
             ],
diff --git a/core/uuid_util.js b/core/uuid_util.js
index 7cf582f5..f731ecc0 100644
--- a/core/uuid_util.js
+++ b/core/uuid_util.js
@@ -1,14 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-const createHash	= require('crypto').createHash;
+const createHash    = require('crypto').createHash;
 
-exports.createNamedUUID	= createNamedUUID;
+exports.createNamedUUID = createNamedUUID;
 
 function createNamedUUID(namespaceUuid, key) {
     //
-    //	v5 UUID generation code based on the work here:
-    //	https://github.com/download13/uuidv5/blob/master/uuid.js
+    //  v5 UUID generation code based on the work here:
+    //  https://github.com/download13/uuidv5/blob/master/uuid.js
     //
     if(!Buffer.isBuffer(namespaceUuid)) {
         namespaceUuid = Buffer.from(namespaceUuid);
@@ -24,12 +24,12 @@ function createNamedUUID(namespaceUuid, key) {
     let u = Buffer.alloc(16);
 
     // bbbb - bb - bb - bb - bbbbbb
-    digest.copy(u, 0, 0, 4);			// time_low
-    digest.copy(u, 4, 4, 6);			// time_mid
-    digest.copy(u, 6, 6, 8);			// time_hi_and_version
+    digest.copy(u, 0, 0, 4);            // time_low
+    digest.copy(u, 4, 4, 6);            // time_mid
+    digest.copy(u, 6, 6, 8);            // time_hi_and_version
 
-    u[6] = (u[6] & 0x0f) | 0x50;		// version, 4 most significant bits are set to version 5 (0101)
-    u[8] = (digest[8] & 0x3f) | 0x80;	// clock_seq_hi_and_reserved, 2msb are set to 10
+    u[6] = (u[6] & 0x0f) | 0x50;        // version, 4 most significant bits are set to version 5 (0101)
+    u[8] = (digest[8] & 0x3f) | 0x80;   // clock_seq_hi_and_reserved, 2msb are set to 10
     u[9] = digest[9];
 
     digest.copy(u, 10, 10, 16);
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index e56207a2..ea071010 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -1,32 +1,32 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuView		= require('./menu_view.js').MenuView;
-const ansi			= require('./ansi_term.js');
-const strUtil		= require('./string_util.js');
-const formatString	= require('./string_format');
-const pipeToAnsi	= require('./color_codes.js').pipeToAnsi;
+//  ENiGMA½
+const MenuView      = require('./menu_view.js').MenuView;
+const ansi          = require('./ansi_term.js');
+const strUtil       = require('./string_util.js');
+const formatString  = require('./string_format');
+const pipeToAnsi    = require('./color_codes.js').pipeToAnsi;
 
-//	deps
-const util			= require('util');
-const _				= require('lodash');
+//  deps
+const util          = require('util');
+const _             = require('lodash');
 
-exports.VerticalMenuView		= VerticalMenuView;
+exports.VerticalMenuView        = VerticalMenuView;
 
 function VerticalMenuView(options) {
-    options.cursor	= options.cursor || 'hide';
+    options.cursor  = options.cursor || 'hide';
     options.justify = options.justify || 'left';
 
     MenuView.call(this, options);
 
     const self = this;
 
-    //	we want page up/page down by default
+    //  we want page up/page down by default
     if(!_.isObject(options.specialKeyMap)) {
         Object.assign(this.specialKeyMap, {
-            'page up'		: [ 'page up' ],
-            'page down'		: [ 'page down' ],
+            'page up'       : [ 'page up' ],
+            'page down'     : [ 'page down' ],
         });
     }
 
@@ -53,8 +53,8 @@ function VerticalMenuView(options) {
         self.maxVisibleItems = Math.ceil(self.dimens.height / (self.itemSpacing + 1));
 
         self.viewWindow = {
-            top		: self.focusedItemIndex,
-            bottom	: Math.min(self.focusedItemIndex + self.maxVisibleItems, self.items.length) - 1,
+            top     : self.focusedItemIndex,
+            bottom  : Math.min(self.focusedItemIndex + self.maxVisibleItems, self.items.length) - 1,
         };
     };
 
@@ -94,7 +94,7 @@ util.inherits(VerticalMenuView, MenuView);
 VerticalMenuView.prototype.redraw = function() {
     VerticalMenuView.super_.prototype.redraw.call(this);
 
-    //	:TODO: rename positionCacheExpired to something that makese sense; combine methods for such
+    //  :TODO: rename positionCacheExpired to something that makese sense; combine methods for such
     if(this.positionCacheExpired) {
         this.performAutoScale();
         this.updateViewVisibleItems();
@@ -102,13 +102,13 @@ VerticalMenuView.prototype.redraw = function() {
         this.positionCacheExpired = false;
     }
 
-    //	erase old items
-    //	:TODO: optimize this: only needed if a item is removed or new max width < old.
+    //  erase old items
+    //  :TODO: optimize this: only needed if a item is removed or new max width < old.
     if(this.oldDimens) {
-        const blank 	= new Array(Math.max(this.oldDimens.width, this.dimens.width)).join(' ');
-        let seq			= ansi.goto(this.position.row, this.position.col) + this.getSGR() + blank;
-        let row			= this.position.row + 1;
-        const endRow	= (row + this.oldDimens.height) - 2;
+        const blank     = new Array(Math.max(this.oldDimens.width, this.dimens.width)).join(' ');
+        let seq         = ansi.goto(this.position.row, this.position.col) + this.getSGR() + blank;
+        let row         = this.position.row + 1;
+        const endRow    = (row + this.oldDimens.height) - 2;
 
         while(row <= endRow) {
             seq += ansi.goto(row, this.position.col) + blank;
@@ -148,16 +148,16 @@ VerticalMenuView.prototype.setFocus = function(focused) {
 };
 
 VerticalMenuView.prototype.setFocusItemIndex = function(index) {
-    VerticalMenuView.super_.prototype.setFocusItemIndex.call(this, index);	//	sets this.focusedItemIndex
+    VerticalMenuView.super_.prototype.setFocusItemIndex.call(this, index);  //  sets this.focusedItemIndex
 
     const remainAfterFocus = this.items.length - index;
     if(remainAfterFocus >= this.maxVisibleItems) {
         this.viewWindow = {
-            top		: this.focusedItemIndex,
-            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+            top     : this.focusedItemIndex,
+            bottom  : Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
         };
 
-        this.positionCacheExpired = false;	//	skip standard behavior
+        this.positionCacheExpired = false;  //  skip standard behavior
         this.performAutoScale();
     }
 
@@ -190,7 +190,7 @@ VerticalMenuView.prototype.getData = function() {
 };
 
 VerticalMenuView.prototype.setItems = function(items) {
-    //	if we have items already, save off their drawing area so we don't leave fragments at redraw
+    //  if we have items already, save off their drawing area so we don't leave fragments at redraw
     if(this.items && this.items.length) {
         this.oldDimens = Object.assign({}, this.dimens);
     }
@@ -208,15 +208,15 @@ VerticalMenuView.prototype.removeItem = function(index) {
     VerticalMenuView.super_.prototype.removeItem.call(this, index);
 };
 
-//	:TODO: Apply draw optimizaitons when only two items need drawn vs entire view!
+//  :TODO: Apply draw optimizaitons when only two items need drawn vs entire view!
 
 VerticalMenuView.prototype.focusNext = function() {
     if(this.items.length - 1 === this.focusedItemIndex) {
         this.focusedItemIndex = 0;
 
         this.viewWindow = {
-            top		: 0,
-            bottom	: Math.min(this.maxVisibleItems, this.items.length) - 1
+            top     : 0,
+            bottom  : Math.min(this.maxVisibleItems, this.items.length) - 1
         };
     } else {
         this.focusedItemIndex++;
@@ -237,9 +237,9 @@ VerticalMenuView.prototype.focusPrevious = function() {
         this.focusedItemIndex = this.items.length - 1;
 
         this.viewWindow = {
-            //top		: this.items.length - this.maxVisibleItems,
-            top		: Math.max(this.items.length - this.maxVisibleItems, 0),
-            bottom	: this.items.length - 1
+            //top       : this.items.length - this.maxVisibleItems,
+            top     : Math.max(this.items.length - this.maxVisibleItems, 0),
+            bottom  : this.items.length - 1
         };
 
     } else {
@@ -249,7 +249,7 @@ VerticalMenuView.prototype.focusPrevious = function() {
             this.viewWindow.top--;
             this.viewWindow.bottom--;
 
-            //	adjust for focus index being set & window needing expansion as we scroll up
+            //  adjust for focus index being set & window needing expansion as we scroll up
             const rem = (this.viewWindow.bottom - this.viewWindow.top) + 1;
             if(rem < this.maxVisibleItems && (this.items.length - 1) > this.focusedItemIndex) {
                 this.viewWindow.bottom = this.items.length - 1;
@@ -264,11 +264,11 @@ VerticalMenuView.prototype.focusPrevious = function() {
 
 VerticalMenuView.prototype.focusPreviousPageItem = function() {
     //
-    //	Jump to current - up to page size or top
-    //	If already at the top, jump to bottom
+    //  Jump to current - up to page size or top
+    //  If already at the top, jump to bottom
     //
     if(0 === this.focusedItemIndex) {
-        return this.focusPrevious();	//	will jump to bottom
+        return this.focusPrevious();    //  will jump to bottom
     }
 
     const index = Math.max(this.focusedItemIndex - this.dimens.height, 0);
@@ -284,11 +284,11 @@ VerticalMenuView.prototype.focusPreviousPageItem = function() {
 
 VerticalMenuView.prototype.focusNextPageItem = function() {
     //
-    //	Jump to current + up to page size or bottom
-    //	If already at the bottom, jump to top
+    //  Jump to current + up to page size or bottom
+    //  If already at the bottom, jump to top
     //
     if(this.items.length - 1 === this.focusedItemIndex) {
-        return this.focusNext();	//	will jump to top
+        return this.focusNext();    //  will jump to top
     }
 
     const index = Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length - 1);
@@ -299,8 +299,8 @@ VerticalMenuView.prototype.focusNextPageItem = function() {
         this.focusedItemIndex = index;
 
         this.viewWindow = {
-            top		: this.focusedItemIndex,
-            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+            top     : this.focusedItemIndex,
+            bottom  : Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
         };
 
         this.redraw();
@@ -328,8 +328,8 @@ VerticalMenuView.prototype.focusLast = function() {
         this.focusedItemIndex = index;
 
         this.viewWindow = {
-            top		: this.focusedItemIndex,
-            bottom	: Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
+            top     : this.focusedItemIndex,
+            bottom  : Math.min(this.focusedItemIndex + this.maxVisibleItems, this.items.length) - 1
         };
 
         this.redraw();
diff --git a/core/view.js b/core/view.js
index fd46428f..702be949 100644
--- a/core/view.js
+++ b/core/view.js
@@ -1,35 +1,35 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const events			= require('events');
-const util				= require('util');
-const ansi				= require('./ansi_term.js');
-const colorCodes		= require('./color_codes.js');
-const enigAssert		= require('./enigma_assert.js');
-const { renderSubstr }	= require('./string_util.js');
+//  ENiGMA½
+const events            = require('events');
+const util              = require('util');
+const ansi              = require('./ansi_term.js');
+const colorCodes        = require('./color_codes.js');
+const enigAssert        = require('./enigma_assert.js');
+const { renderSubstr }  = require('./string_util.js');
 
-//	deps
-const _				= require('lodash');
+//  deps
+const _             = require('lodash');
 
-exports.View							= View;
+exports.View                            = View;
 
 const VIEW_SPECIAL_KEY_MAP_DEFAULT = {
-    accept		: [ 'return' ],
-    exit		: [ 'esc' ],
-    backspace	: [ 'backspace', 'del' ],
-    del			: [ 'del' ],
-    next		: [ 'tab' ],
-    up			: [ 'up arrow' ],
-    down		: [ 'down arrow' ],
-    end			: [ 'end' ],
-    home		: [ 'home' ],
-    left		: [ 'left arrow' ],
-    right		: [ 'right arrow' ],
-    clearLine	: [ 'ctrl + y' ],
+    accept      : [ 'return' ],
+    exit        : [ 'esc' ],
+    backspace   : [ 'backspace', 'del' ],
+    del         : [ 'del' ],
+    next        : [ 'tab' ],
+    up          : [ 'up arrow' ],
+    down        : [ 'down arrow' ],
+    end         : [ 'end' ],
+    home        : [ 'home' ],
+    left        : [ 'left arrow' ],
+    right       : [ 'right arrow' ],
+    clearLine   : [ 'ctrl + y' ],
 };
 
-exports.VIEW_SPECIAL_KEY_MAP_DEFAULT	= VIEW_SPECIAL_KEY_MAP_DEFAULT;
+exports.VIEW_SPECIAL_KEY_MAP_DEFAULT    = VIEW_SPECIAL_KEY_MAP_DEFAULT;
 
 function View(options) {
     events.EventEmitter.call(this);
@@ -37,21 +37,21 @@ function View(options) {
     enigAssert(_.isObject(options));
     enigAssert(_.isObject(options.client));
 
-    var self			= this;
+    var self            = this;
 
-    this.client			= options.client;
+    this.client         = options.client;
 
-    this.cursor			= options.cursor || 'show';
-    this.cursorStyle	= options.cursorStyle || 'default';
+    this.cursor         = options.cursor || 'show';
+    this.cursorStyle    = options.cursorStyle || 'default';
 
-    this.acceptsFocus	= options.acceptsFocus || false;
-    this.acceptsInput	= options.acceptsInput || false;
+    this.acceptsFocus   = options.acceptsFocus || false;
+    this.acceptsInput   = options.acceptsInput || false;
 
-    this.position 		= { x : 0, y : 0 };
-    this.dimens			= { height : 1, width : 0 };
+    this.position       = { x : 0, y : 0 };
+    this.dimens         = { height : 1, width : 0 };
 
-    this.textStyle		= options.textStyle || 'normal';
-    this.focusTextStyle	= options.focusTextStyle || this.textStyle;
+    this.textStyle      = options.textStyle || 'normal';
+    this.focusTextStyle = options.focusTextStyle || this.textStyle;
 
     if(options.id) {
         this.setId(options.id);
@@ -72,17 +72,17 @@ function View(options) {
         this.autoScale = { height : false, width : false };
     } else {
         this.dimens = {
-            width	: options.width || 0,
-            height	: 0
+            width   : options.width || 0,
+            height  : 0
         };
     }
 
-    //	:TODO: Just use styleSGRx for these, e.g. styleSGR0, styleSGR1 = norm/focus
-    this.ansiSGR		= options.ansiSGR || ansi.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
-    this.ansiFocusSGR	= options.ansiFocusSGR || this.ansiSGR;
+    //  :TODO: Just use styleSGRx for these, e.g. styleSGR0, styleSGR1 = norm/focus
+    this.ansiSGR        = options.ansiSGR || ansi.getSGRFromGraphicRendition( { fg : 39, bg : 49 }, true);
+    this.ansiFocusSGR   = options.ansiFocusSGR || this.ansiSGR;
 
-    this.styleSGR1		= options.styleSGR1 || this.ansiSGR;
-    this.styleSGR2		= options.styleSGR2 || this.ansiFocusSGR;
+    this.styleSGR1      = options.styleSGR1 || this.ansiSGR;
+    this.styleSGR2      = options.styleSGR2 || this.ansiFocusSGR;
 
     if(this.acceptsInput) {
         this.specialKeyMap = options.specialKeyMap || VIEW_SPECIAL_KEY_MAP_DEFAULT;
@@ -126,7 +126,7 @@ View.prototype.getId = function() {
 
 View.prototype.setPosition = function(pos) {
     //
-    //	Allow the following forms: [row, col], { row : r, col : c }, or (row, col)
+    //  Allow the following forms: [row, col], { row : r, col : c }, or (row, col)
     //
     if(util.isArray(pos)) {
         this.position.row = pos[0];
@@ -139,34 +139,34 @@ View.prototype.setPosition = function(pos) {
         this.position.col = parseInt(arguments[1], 10);
     }
 
-    //	sanatize
-    this.position.row	= Math.max(this.position.row, 1);
-    this.position.col	= Math.max(this.position.col, 1);
-    this.position.row	= Math.min(this.position.row, this.client.term.termHeight);
-    this.position.col	= Math.min(this.position.col, this.client.term.termWidth);
+    //  sanatize
+    this.position.row   = Math.max(this.position.row, 1);
+    this.position.col   = Math.max(this.position.col, 1);
+    this.position.row   = Math.min(this.position.row, this.client.term.termHeight);
+    this.position.col   = Math.min(this.position.col, this.client.term.termWidth);
 };
 
 View.prototype.setDimension = function(dimens) {
     enigAssert(_.isObject(dimens) && _.isNumber(dimens.height) && _.isNumber(dimens.width));
 
-    this.dimens		= dimens;
-    this.autoScale	= { height : false, width : false };
+    this.dimens     = dimens;
+    this.autoScale  = { height : false, width : false };
 };
 
 View.prototype.setHeight = function(height) {
-    height	= parseInt(height) || 1;
-    height	= Math.min(height, this.client.term.termHeight);
+    height  = parseInt(height) || 1;
+    height  = Math.min(height, this.client.term.termHeight);
 
-    this.dimens.height		= height;
-    this.autoScale.height	= false;
+    this.dimens.height      = height;
+    this.autoScale.height   = false;
 };
 
 View.prototype.setWidth = function(width) {
-    width	= parseInt(width) || 1;
-    width	= Math.min(width, this.client.term.termWidth);
+    width   = parseInt(width) || 1;
+    width   = Math.min(width, this.client.term.termWidth);
 
-    this.dimens.width		= width;
-    this.autoScale.width	= false;
+    this.dimens.width       = width;
+    this.autoScale.width    = false;
 };
 
 View.prototype.getSGR = function() {
@@ -188,20 +188,20 @@ View.prototype.setSpecialKeyMapOverride = function(specialKeyMapOverride) {
 
 View.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
-        case 'height'	: this.setHeight(value); break;
-        case 'width'	: this.setWidth(value); break;
-        case 'focus'	: this.setFocus(value); break;
+        case 'height'   : this.setHeight(value); break;
+        case 'width'    : this.setWidth(value); break;
+        case 'focus'    : this.setFocus(value); break;
 
-        case 'text'		:
+        case 'text'     :
             if('setText' in this) {
                 this.setText(value);
             }
             break;
 
-        case 'textStyle'		: this.textStyle = value; break;
-        case 'focusTextStyle'	: this.focusTextStyle = value; break;
+        case 'textStyle'        : this.textStyle = value; break;
+        case 'focusTextStyle'   : this.focusTextStyle = value; break;
 
-        case 'justify'	: this.justify = value; break;
+        case 'justify'  : this.justify = value; break;
 
         case 'fillChar' :
             if('fillChar' in this) {
@@ -217,9 +217,9 @@ View.prototype.setPropertyValue = function(propName, value) {
             if(_.isBoolean(value)) {
                 this.submit = value;
             }/* else {
-				this.submit = _.isArray(value) && value.length > 0;
-			}
-			*/
+                this.submit = _.isArray(value) && value.length > 0;
+            }
+            */
             break;
 
         case 'resizable' :
@@ -258,8 +258,8 @@ View.prototype.setFocus = function(focused) {
 };
 
 View.prototype.onKeyPress = function(ch, key) {
-    enigAssert(this.hasFocus,		'View does not have focus');
-    enigAssert(this.acceptsInput,	'View does not accept input');
+    enigAssert(this.hasFocus,       'View does not have focus');
+    enigAssert(this.acceptsInput,   'View does not accept input');
 
     if(!this.hasFocus || !this.acceptsInput) {
         return;
diff --git a/core/view_controller.js b/core/view_controller.js
index f6a2bc2b..0df09084 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -1,23 +1,23 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-var MCIViewFactory	= require('./mci_view_factory.js').MCIViewFactory;
-var menuUtil		= require('./menu_util.js');
-var asset			= require('./asset.js');
-var ansi			= require('./ansi_term.js');
+//  ENiGMA½
+var MCIViewFactory  = require('./mci_view_factory.js').MCIViewFactory;
+var menuUtil        = require('./menu_util.js');
+var asset           = require('./asset.js');
+var ansi            = require('./ansi_term.js');
 
-//	deps
-var events			= require('events');
-var util			= require('util');
-var assert			= require('assert');
-var async			= require('async');
-var _				= require('lodash');
-var paths			= require('path');
+//  deps
+var events          = require('events');
+var util            = require('util');
+var assert          = require('assert');
+var async           = require('async');
+var _               = require('lodash');
+var paths           = require('path');
 
-exports.ViewController		= ViewController;
+exports.ViewController      = ViewController;
 
-var MCI_REGEXP	= /([A-Z]{2})([0-9]{1,2})/;
+var MCI_REGEXP  = /([A-Z]{2})([0-9]{1,2})/;
 
 function ViewController(options) {
     assert(_.isObject(options));
@@ -25,29 +25,29 @@ function ViewController(options) {
 
     events.EventEmitter.call(this);
 
-    var self			= this;
+    var self            = this;
 
-    this.client			= options.client;
-    this.views			= {};	//	map of ID -> view
-    this.formId			= options.formId || 0;
-    this.mciViewFactory	= new MCIViewFactory(this.client);	//	:TODO: can this not be a singleton?
-    this.noInput		= _.isBoolean(options.noInput) ? options.noInput : false;
+    this.client         = options.client;
+    this.views          = {};   //  map of ID -> view
+    this.formId         = options.formId || 0;
+    this.mciViewFactory = new MCIViewFactory(this.client);  //  :TODO: can this not be a singleton?
+    this.noInput        = _.isBoolean(options.noInput) ? options.noInput : false;
 
-    this.actionKeyMap	= {};
+    this.actionKeyMap   = {};
 
     //
-    //	Small wrapper/proxy around handleAction() to ensure we do not allow
-    //	input/additional actions queued while performing an action
+    //  Small wrapper/proxy around handleAction() to ensure we do not allow
+    //  input/additional actions queued while performing an action
     //
     this.handleActionWrapper = function(formData, actionBlock) {
         if(self.waitActionCompletion) {
-            return;	//	ignore until this is finished!
+            return; //  ignore until this is finished!
         }
 
         self.waitActionCompletion = true;
         menuUtil.handleAction(self.client, formData, actionBlock, (err) => {
             if(err) {
-                //	:TODO: What can we really do here?
+                //  :TODO: What can we really do here?
                 if('ALREADYTHERE' === err.reasonCode) {
                     self.client.log.trace( err.reason );
                 } else {
@@ -61,22 +61,22 @@ function ViewController(options) {
 
     this.clientKeyPressHandler = function(ch, key) {
         //
-        //	Process key presses treating form submit mapped	keys special.
-        //	Everything else is forwarded on to the focused View, if any.
+        //  Process key presses treating form submit mapped keys special.
+        //  Everything else is forwarded on to the focused View, if any.
         //
         var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
         if(actionForKey) {
             if(_.isNumber(actionForKey.viewId)) {
                 //
-                //	Key works on behalf of a view -- switch focus & submit
+                //  Key works on behalf of a view -- switch focus & submit
                 //
                 self.switchFocus(actionForKey.viewId);
                 self.submitForm(key);
             } else if(_.isString(actionForKey.action)) {
                 const formData = self.getFocusedView() ? self.getFormData() : { };
                 self.handleActionWrapper(
-                    Object.assign( { ch : ch, key : key }, formData ),	//	formData + key info
-                    actionForKey);			//	actionBlock
+                    Object.assign( { ch : ch, key : key }, formData ),  //  formData + key info
+                    actionForKey);          //  actionBlock
             }
         } else {
             if(self.focusedView && self.focusedView.acceptsInput) {
@@ -94,7 +94,7 @@ function ViewController(options) {
 
             case 'accept' :
                 if(self.focusedView && self.focusedView.submit) {
-                    //	:TODO: need to do validation here!!!
+                    //  :TODO: need to do validation here!!!
                     var focusedView = self.focusedView;
                     self.validateView(focusedView, function validated(err, newFocusedViewId) {
                         if(err) {
@@ -116,9 +116,9 @@ function ViewController(options) {
         self.emit('submit', this.getFormData(key));
     };
 
-    //	:TODO: replace this in favor of overriding toJSON() for various things such that logging will *never* output them
+    //  :TODO: replace this in favor of overriding toJSON() for various things such that logging will *never* output them
     this.getLogFriendlyFormData = function(formData) {
-        //	:TODO: these fields should be part of menu.json sensitiveMembers[]
+        //  :TODO: these fields should be part of menu.json sensitiveMembers[]
         var safeFormData = _.cloneDeep(formData);
         if(safeFormData.value.password) {
             safeFormData.value.password = '*****';
@@ -141,8 +141,8 @@ function ViewController(options) {
 
     this.createViewsFromMCI = function(mciMap, cb) {
         async.each(Object.keys(mciMap), (name, nextItem) => {
-            const mci	= mciMap[name];
-            const view	= self.mciViewFactory.createFromMCI(mci);
+            const mci   = mciMap[name];
+            const view  = self.mciViewFactory.createFromMCI(mci);
 
             if(view) {
                 if(false === self.noInput) {
@@ -160,7 +160,7 @@ function ViewController(options) {
         });
     };
 
-    //	:TODO: move this elsewhere
+    //  :TODO: move this elsewhere
     this.setViewPropertiesFromMCIConf = function(view, conf) {
 
         var propAsset;
@@ -178,14 +178,14 @@ function ViewController(options) {
                         propValue = asset.resolveSystemStatAsset(conf[propName]);
                         break;
 
-                        //	:TODO: handle @art (e.g. text : @art ...)
+                        //  :TODO: handle @art (e.g. text : @art ...)
 
                     case 'method' :
                     case 'systemMethod' :
                         if('validate' === propName) {
-                            //	:TODO: handle propAsset.location for @method script specification
+                            //  :TODO: handle propAsset.location for @method script specification
                             if('systemMethod' === propAsset.type) {
-                                //	:TODO: implementation validation @systemMethod handling!
+                                //  :TODO: implementation validation @systemMethod handling!
                                 var methodModule = require(paths.join(__dirname, 'system_view_validate.js'));
                                 if(_.isFunction(methodModule[propAsset.asset])) {
                                     propValue = methodModule[propAsset.asset];
@@ -200,12 +200,12 @@ function ViewController(options) {
                                 // :TODO: clean this code up!
                             } else {
                                 if('systemMethod' === propAsset.type) {
-                                    //	:TODO:
+                                    //  :TODO:
                                 } else {
-                                    //	local to current module
+                                    //  local to current module
                                     var currentModule = self.client.currentMenuModule;
                                     if(_.isFunction(currentModule.menuMethods[propAsset.asset])) {
-                                        //	:TODO: Fix formData & extraArgs... this all needs general processing
+                                        //  :TODO: Fix formData & extraArgs... this all needs general processing
                                         propValue = currentModule.menuMethods[propAsset.asset]({}, {});//formData, conf.extraArgs);
                                     }
                                 }
@@ -233,14 +233,14 @@ function ViewController(options) {
         let initialFocusId = 1;
 
         async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
-            const mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
+            const mciMatch = mci.match(MCI_REGEXP); //  :TODO: How to handle auto-generated IDs????
             if(null === mciMatch) {
                 self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
                 return;
             }
 
             const viewId = parseInt(mciMatch[2]);
-            assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]);	//	shouldn't be possible with RegExp used
+            assert(!isNaN(viewId), 'Cannot parse view ID: ' + mciMatch[2]); //  shouldn't be possible with RegExp used
 
             if(viewId > highestId) {
                 highestId = viewId;
@@ -269,7 +269,7 @@ function ViewController(options) {
             nextItem(null);
         },
         err => {
-            //	default to highest ID if no 'submit' entry present
+            //  default to highest ID if no 'submit' entry present
             if(!submitId) {
                 var highestIdView = self.getView(highestId);
                 if(highestIdView) {
@@ -283,19 +283,19 @@ function ViewController(options) {
         });
     };
 
-    //	method for comparing submitted form data to configuration entries
+    //  method for comparing submitted form data to configuration entries
     this.actionBlockValueComparator = function(formValue, actionValue) {
         //
-        //	For a match to occur, one of the following must be true:
+        //  For a match to occur, one of the following must be true:
         //
-        //	*	actionValue is a Object:
-        //		a)	All key/values must exactly match
-        //		b)	value is null; The key (view ID or "argName") must be present
-        //			in formValue. This is a wildcard/any match.
-        //	*	actionValue is a Number: This represents a view ID that
-        //		must be present in formValue.
-        //	* 	actionValue is a string: This represents a view with
-        //		"argName" set that must be present in formValue.
+        //  *   actionValue is a Object:
+        //      a)  All key/values must exactly match
+        //      b)  value is null; The key (view ID or "argName") must be present
+        //          in formValue. This is a wildcard/any match.
+        //  *   actionValue is a Number: This represents a view ID that
+        //      must be present in formValue.
+        //  *   actionValue is a string: This represents a view with
+        //      "argName" set that must be present in formValue.
         //
         if(_.isUndefined(actionValue)) {
             return false;
@@ -307,12 +307,12 @@ function ViewController(options) {
             }
         } else {
             /*
-				:TODO: support:
-				value: {
-					someArgName: [ "key1", "key2", ... ],
-					someOtherArg: [ "key1, ... ]
-				}
-			*/
+                :TODO: support:
+                value: {
+                    someArgName: [ "key1", "key2", ... ],
+                    someOtherArg: [ "key1, ... ]
+                }
+            */
             var actionValueKeys = Object.keys(actionValue);
             for(var i = 0; i < actionValueKeys.length; ++i) {
                 var viewId = actionValueKeys[i];
@@ -328,8 +328,8 @@ function ViewController(options) {
 
         self.client.log.trace(
             {
-                formValue	: formValue,
-                actionValue	: actionValue
+                formValue   : formValue,
+                actionValue : actionValue
             },
             'Action match'
         );
@@ -362,7 +362,7 @@ function ViewController(options) {
                 var viewValidationListener = self.client.currentMenuModule.menuMethods.viewValidationListener;
                 if(_.isFunction(viewValidationListener)) {
                     if(err) {
-                        err.view = view;	//	pass along the view that failed
+                        err.view = view;    //  pass along the view that failed
                     }
 
                     viewValidationListener(err, function validationComplete(newViewFocusId) {
@@ -390,7 +390,7 @@ ViewController.prototype.attachClientEvents = function() {
     this.client.on('key press', this.clientKeyPressHandler);
 
     Object.keys(this.views).forEach(function vid(i) {
-        //	remove, then add to ensure we only have one listener
+        //  remove, then add to ensure we only have one listener
         self.views[i].removeListener('action', self.viewActionListener);
         self.views[i].on('action', self.viewActionListener);
     });
@@ -462,10 +462,10 @@ ViewController.prototype.resetInitialFocus = function() {
 
 ViewController.prototype.switchFocus = function(id) {
     //
-    //	Perform focus switching validation now
+    //  Perform focus switching validation now
     //
-    var self 		= this;
-    var focusedView	= self.focusedView;
+    var self        = this;
+    var focusedView = self.focusedView;
 
     self.validateView(focusedView, function validated(err, newFocusedViewId) {
         if(err) {
@@ -474,10 +474,10 @@ ViewController.prototype.switchFocus = function(id) {
         } else {
             self.attachClientEvents();
 
-            //	remove from old
+            //  remove from old
             self.setViewFocusWithEvents(focusedView, false);
 
-            //	set to new
+            //  set to new
             self.setViewFocusWithEvents(self.getView(id), true);
         }
     });
@@ -486,7 +486,7 @@ ViewController.prototype.switchFocus = function(id) {
 ViewController.prototype.nextFocus = function() {
     let nextFocusView = this.focusedView ? this.focusedView : this.views[this.firstId];
 
-    //	find the next view that accepts focus
+    //  find the next view that accepts focus
     while(nextFocusView && nextFocusView.nextId) {
         nextFocusView = this.getView(nextFocusView.nextId);
         if(!nextFocusView || nextFocusView.acceptsFocus) {
@@ -531,7 +531,7 @@ ViewController.prototype.redrawAll = function(initialFocusId) {
 
     for(var id in this.views) {
         if(initialFocusId === id) {
-            continue;	//	will draw @ focus
+            continue;   //  will draw @ focus
         }
         this.views[id].redraw();
     }
@@ -543,9 +543,9 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
     assert(_.isObject(options));
     assert(_.isObject(options.mciMap));
 
-    var self			= this;
-    var promptConfig	= _.isObject(options.config) ? options.config : self.client.currentMenuModule.menuConfig.promptConfig;
-    var initialFocusId	= 1;	//	default to first
+    var self            = this;
+    var promptConfig    = _.isObject(options.config) ? options.config : self.client.currentMenuModule.menuConfig.promptConfig;
+    var initialFocusId  = 1;    //  default to first
 
     async.waterfall(
         [
@@ -574,12 +574,12 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
                             self.handleActionWrapper(formData, self.client.currentMenuModule.menuConfig);
                         } else {
                             //
-                            //	Menus that reference prompts can have a sepcial "submit" block without the
-                            //	hassle of by-form-id configurations, etc.
+                            //  Menus that reference prompts can have a sepcial "submit" block without the
+                            //  hassle of by-form-id configurations, etc.
                             //
-                            //	"submit" : [
-                            //		{ ... }
-                            //	]
+                            //  "submit" : [
+                            //      { ... }
+                            //  ]
                             //
                             var menuSubmit = self.client.currentMenuModule.menuConfig.submit;
                             if(!_.isArray(menuSubmit)) {
@@ -588,15 +588,15 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
                             }
 
                             //
-                            //	Locate matching action block
+                            //  Locate matching action block
                             //
-                            //	:TODO: this is basically the same as for menus -- DRY it up!
+                            //  :TODO: this is basically the same as for menus -- DRY it up!
                             for(var c = 0; c < menuSubmit.length; ++c) {
                                 var actionBlock = menuSubmit[c];
 
                                 if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
                                     self.handleActionWrapper(formData, actionBlock);
-                                    break;	//	there an only be one...
+                                    break;  //  there an only be one...
                                 }
                             }
                         }
@@ -612,13 +612,13 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
 
                 promptConfig.actionKeys.forEach(ak => {
                     //
-                    //	*	'keys' must be present and be an array of key names
-                    //	*	If 'viewId' is present, key(s) will focus & submit on behalf
-                    //		of the specified view.
-                    //	*	If 'action' is present, that action will be procesed when
-                    //		triggered by key(s)
+                    //  *   'keys' must be present and be an array of key names
+                    //  *   If 'viewId' is present, key(s) will focus & submit on behalf
+                    //      of the specified view.
+                    //  *   If 'action' is present, that action will be procesed when
+                    //      triggered by key(s)
                     //
-                    //	Ultimately, create a map of key -> { action block }
+                    //  Ultimately, create a map of key -> { action block }
                     //
                     if(!_.isArray(ak.keys)) {
                         return;
@@ -657,12 +657,12 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
         return;
     }
 
-    var self			= this;
-    var formIdKey		= options.formId ? options.formId.toString() : '0';
-    this.formInitialFocusId	 = 1;	//	default to first
+    var self            = this;
+    var formIdKey       = options.formId ? options.formId.toString() : '0';
+    this.formInitialFocusId  = 1;   //  default to first
     var formConfig;
 
-    //	:TODO: honor options.withoutForm
+    //  :TODO: honor options.withoutForm
 
     async.waterfall(
         [
@@ -671,7 +671,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                     formConfig = fc;
 
                     if(err) {
-                        //	non-fatal
+                        //  non-fatal
                         self.client.log.trace(
                             { reason : err.message, mci : Object.keys(options.mciMap), formId : formIdKey },
                             'Unable to find matching form configuration');
@@ -686,28 +686,28 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                 });
             },
             /*
-			function applyThemeCustomization(callback) {
-				formConfig = formConfig || {};
-				formConfig.mci = formConfig.mci || {};
-				//self.client.currentMenuModule.menuConfig.config = self.client.currentMenuModule.menuConfig.config || {};
+            function applyThemeCustomization(callback) {
+                formConfig = formConfig || {};
+                formConfig.mci = formConfig.mci || {};
+                //self.client.currentMenuModule.menuConfig.config = self.client.currentMenuModule.menuConfig.config || {};
 
-				//console.log('menu config.....');
-				//console.log(self.client.currentMenuModule.menuConfig)
+                //console.log('menu config.....');
+                //console.log(self.client.currentMenuModule.menuConfig)
 
-				menuUtil.applyMciThemeCustomization({
-					name		: self.client.currentMenuModule.menuName,
-					type		: 'menus',
-					client		: self.client,
-					mci			: formConfig.mci,
-					//config		: self.client.currentMenuModule.menuConfig.config,
-					formId		: formIdKey,
-				});
+                menuUtil.applyMciThemeCustomization({
+                    name        : self.client.currentMenuModule.menuName,
+                    type        : 'menus',
+                    client      : self.client,
+                    mci         : formConfig.mci,
+                    //config        : self.client.currentMenuModule.menuConfig.config,
+                    formId      : formIdKey,
+                });
 
-				//console.log('after theme...')
-				//console.log(self.client.currentMenuModule.menuConfig.config)
+                //console.log('after theme...')
+                //console.log(self.client.currentMenuModule.menuConfig.config)
 
-				callback(null);
-			},
+                callback(null);
+            },
             */
             function applyViewConfiguration(callback) {
                 if(_.isObject(formConfig)) {
@@ -730,7 +730,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                     self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Form submit');
 
                     //
-                    //	Locate configuration for this form ID
+                    //  Locate configuration for this form ID
                     //
                     var confForFormId;
                     if(_.isObject(formConfig.submit[formData.submitId])) {
@@ -738,20 +738,20 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                     } else if(_.isObject(formConfig.submit['*'])) {
                         confForFormId = formConfig.submit['*'];
                     } else {
-                        //	no configuration for this submitId
+                        //  no configuration for this submitId
                         self.client.log.debug( { formId : formData.submitId }, 'No configuration for form ID');
                         return;
                     }
 
                     //
-                    //	Locate a matching action block based on the submitted data
+                    //  Locate a matching action block based on the submitted data
                     //
                     for(var c = 0; c < confForFormId.length; ++c) {
                         var actionBlock = confForFormId[c];
 
                         if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
                             self.handleActionWrapper(formData, actionBlock);
-                            break;	//	there an only be one...
+                            break;  //  there an only be one...
                         }
                     }
                 });
@@ -766,13 +766,13 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 
                 formConfig.actionKeys.forEach(function akEntry(ak) {
                     //
-                    //	*	'keys' must be present and be an array of key names
-                    //	*	If 'viewId' is present, key(s) will focus & submit on behalf
-                    //		of the specified view.
-                    //	*	If 'action' is present, that action will be procesed when
-                    //		triggered by key(s)
+                    //  *   'keys' must be present and be an array of key names
+                    //  *   If 'viewId' is present, key(s) will focus & submit on behalf
+                    //      of the specified view.
+                    //  *   If 'action' is present, that action will be procesed when
+                    //      triggered by key(s)
                     //
-                    //	Ultimately, create a map of key -> { action block }
+                    //  Ultimately, create a map of key -> { action block }
                     //
                     if(!_.isArray(ak.keys)) {
                         return;
@@ -822,23 +822,23 @@ ViewController.prototype.formatMCIString = function(format) {
 
 ViewController.prototype.getFormData = function(key) {
     /*
-		Example form data:
-		{
-			id : 0,
-			submitId : 1,
-			value : {
-				"1" : "hurp",
-				"2" : [ 'a', 'b', ... ],
-				"3" 2,
-				"pants" : "no way"
-			}
+        Example form data:
+        {
+            id : 0,
+            submitId : 1,
+            value : {
+                "1" : "hurp",
+                "2" : [ 'a', 'b', ... ],
+                "3" 2,
+                "pants" : "no way"
+            }
 
-		}
-	*/
+        }
+    */
     const formData = {
-        id			: this.formId,
-        submitId	: this.focusedView.id,
-        value		: {},
+        id          : this.formId,
+        submitId    : this.focusedView.id,
+        value       : {},
     };
 
     if(key) {
@@ -848,7 +848,7 @@ ViewController.prototype.getFormData = function(key) {
     let viewData;
     _.each(this.views, view => {
         try {
-            //	don't fill forms with static, non user-editable data data
+            //  don't fill forms with static, non user-editable data data
             if(!view.acceptsInput) {
                 return;
             }
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 7f30425f..6ca916da 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -1,29 +1,29 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const Config				= require('./config.js').get;
-const Errors				= require('./enig_error.js').Errors;
-const getServer				= require('./listening_server.js').getServer;
-const webServerPackageName	= require('./servers/content/web.js').moduleInfo.packageName;
-const User					= require('./user.js');
-const userDb				= require('./database.js').dbs.user;
-const getISOTimestampString	= require('./database.js').getISOTimestampString;
-const Log					= require('./logger.js').log;
+//  ENiGMA½
+const Config                = require('./config.js').get;
+const Errors                = require('./enig_error.js').Errors;
+const getServer             = require('./listening_server.js').getServer;
+const webServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
+const User                  = require('./user.js');
+const userDb                = require('./database.js').dbs.user;
+const getISOTimestampString = require('./database.js').getISOTimestampString;
+const Log                   = require('./logger.js').log;
 
-//	deps
-const async					= require('async');
-const crypto				= require('crypto');
-const fs					= require('graceful-fs');
-const url					= require('url');
-const querystring			= require('querystring');
+//  deps
+const async                 = require('async');
+const crypto                = require('crypto');
+const fs                    = require('graceful-fs');
+const url                   = require('url');
+const querystring           = require('querystring');
 
 const PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT =
-	`%USERNAME%:
+    `%USERNAME%:
 a password reset has been requested for your account on %BOARDNAME%.
     
-	* If this was not you, please ignore this email.
-	* Otherwise, follow this link: %RESET_URL%
+    * If this was not you, please ignore this email.
+    * Otherwise, follow this link: %RESET_URL%
 `;
 
 function getWebServer() {
@@ -67,7 +67,7 @@ class WebPasswordReset {
                 },
                 function generateAndStoreResetToken(user, callback) {
                     //
-                    //	Reset "token" is simply HEX encoded cryptographically generated bytes
+                    //  Reset "token" is simply HEX encoded cryptographically generated bytes
                     //
                     crypto.randomBytes(256, (err, token) => {
                         if(err) {
@@ -77,11 +77,11 @@ class WebPasswordReset {
                         token = token.toString('hex');
 
                         const newProperties = {
-                            email_password_reset_token		: token,
-                            email_password_reset_token_ts	: getISOTimestampString(),
+                            email_password_reset_token      : token,
+                            email_password_reset_token_ts   : getISOTimestampString(),
                         };
 
-                        //	we simply place the reset token in the user's properties
+                        //  we simply place the reset token in the user's properties
                         user.persistProperties(newProperties, err => {
                             return callback(err, user);
                         });
@@ -107,10 +107,10 @@ class WebPasswordReset {
 
                     function replaceTokens(s) {
                         return s
-                            .replace(/%BOARDNAME%/g,	Config().general.boardName)
-                            .replace(/%USERNAME%/g, 	user.username)
-                            .replace(/%TOKEN%/g,		user.properties.email_password_reset_token)
-                            .replace(/%RESET_URL%/g,	resetUrl)
+                            .replace(/%BOARDNAME%/g,    Config().general.boardName)
+                            .replace(/%USERNAME%/g,     user.username)
+                            .replace(/%TOKEN%/g,        user.properties.email_password_reset_token)
+                            .replace(/%RESET_URL%/g,    resetUrl)
                         ;
                     }
 
@@ -120,11 +120,11 @@ class WebPasswordReset {
                     }
 
                     const message = {
-                        to		: `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
-                        //	from will be filled in
-                        subject	: 'Forgot Password',
-                        text	: textTemplate,
-                        html	: htmlTemplate,
+                        to      : `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
+                        //  from will be filled in
+                        subject : 'Forgot Password',
+                        text    : textTemplate,
+                        html    : htmlTemplate,
                     };
 
                     sendMail(message, (err, info) => {
@@ -145,32 +145,32 @@ class WebPasswordReset {
     }
 
     static scheduleEvents(cb) {
-        //	:TODO: schedule ~daily cleanup task
+        //  :TODO: schedule ~daily cleanup task
         return cb(null);
     }
 
     static registerRoutes(cb) {
         const webServer = getWebServer();
         if(!webServer) {
-            return cb(null);	//	no webserver enabled
+            return cb(null);    //  no webserver enabled
         }
 
         if(!webServer.instance.isEnabled()) {
-            return cb(null);	//	no error, but we're not serving web stuff
+            return cb(null);    //  no error, but we're not serving web stuff
         }
 
         [
             {
-                //	this is the page displayed to user when they GET it
-                method		: 'GET',
-                path		: '^\\/reset_password\\?token\\=[a-f0-9]+$',	//	Config.contentServers.web.forgotPasswordPageTemplate
-                handler		: WebPasswordReset.routeResetPasswordGet,
+                //  this is the page displayed to user when they GET it
+                method      : 'GET',
+                path        : '^\\/reset_password\\?token\\=[a-f0-9]+$',    //  Config.contentServers.web.forgotPasswordPageTemplate
+                handler     : WebPasswordReset.routeResetPasswordGet,
             },
-            //	POST handler for performing the actual reset
+            //  POST handler for performing the actual reset
             {
-                method		: 'POST',
-                path		: '^\\/reset_password$',
-                handler		: WebPasswordReset.routeResetPasswordPost,
+                method      : 'POST',
+                path        : '^\\/reset_password$',
+                handler     : WebPasswordReset.routeResetPasswordPost,
             }
         ].forEach(r => {
             webServer.instance.addRoute(r);
@@ -213,10 +213,10 @@ class WebPasswordReset {
     }
 
     static routeResetPasswordGet(req, resp) {
-        const webServer = getWebServer();	//	must be valid, we just got a req!
+        const webServer = getWebServer();   //  must be valid, we just got a req!
 
-        const urlParts	= url.parse(req.url, true);
-        const token		= urlParts.query && urlParts.query.token;
+        const urlParts  = url.parse(req.url, true);
+        const token     = urlParts.query && urlParts.query.token;
 
         if(!token) {
             return WebPasswordReset.accessDenied(webServer, resp);
@@ -224,7 +224,7 @@ class WebPasswordReset {
 
         WebPasswordReset.getUserByToken(token, (err, user) => {
             if(err) {
-                //	assume it's expired
+                //  assume it's expired
                 return webServer.instance.respondWithError(resp, 410, 'Invalid or expired reset link.', 'Expired Link');
             }
 
@@ -236,11 +236,11 @@ class WebPasswordReset {
                 (templateData, preprocessFinished) => {
 
                     const finalPage = templateData
-                        .replace(/%BOARDNAME%/g,	config.general.boardName)
-                        .replace(/%USERNAME%/g,		user.username)
-                        .replace(/%TOKEN%/g,		token)
-                        .replace(/%RESET_URL%/g,	postResetUrl)
-						;
+                        .replace(/%BOARDNAME%/g,    config.general.boardName)
+                        .replace(/%USERNAME%/g,     user.username)
+                        .replace(/%TOKEN%/g,        token)
+                        .replace(/%RESET_URL%/g,    postResetUrl)
+                        ;
 
                     return preprocessFinished(null, finalPage);
                 },
@@ -250,7 +250,7 @@ class WebPasswordReset {
     }
 
     static routeResetPasswordPost(req, resp) {
-        const webServer = getWebServer();	//	must be valid, we just got a req!
+        const webServer = getWebServer();   //  must be valid, we just got a req!
 
         let bodyData = '';
         req.on('data', data => {
@@ -266,8 +266,8 @@ class WebPasswordReset {
 
             const config = Config();
             if(!formData.token || !formData.password || !formData.confirm_password ||
-				formData.password !== formData.confirm_password ||
-				formData.password.length < config.users.passwordMin || formData.password.length > config.users.passwordMax)
+                formData.password !== formData.confirm_password ||
+                formData.password.length < config.users.passwordMin || formData.password.length > config.users.passwordMax)
             {
                 return badRequest();
             }
@@ -282,7 +282,7 @@ class WebPasswordReset {
                         return badRequest();
                     }
 
-                    //	delete assoc properties - no need to wait for completion
+                    //  delete assoc properties - no need to wait for completion
                     user.removeProperty('email_password_reset_token');
                     user.removeProperty('email_password_reset_token_ts');
 
@@ -298,15 +298,15 @@ function performMaintenanceTask(args, cb) {
 
     const forgotPassExpireTime = args[0] || '24 hours';
 
-    //	remove all reset token associated properties older than |forgotPassExpireTime|
+    //  remove all reset token associated properties older than |forgotPassExpireTime|
     userDb.run(
         `DELETE FROM user_property
-		WHERE user_id IN (
-			SELECT user_id
-			FROM user_property
-			WHERE prop_name = "email_password_reset_token_ts"
-			AND DATETIME("now") >= DATETIME(prop_value, "+${forgotPassExpireTime}")
-		) AND prop_name IN ("email_password_reset_token_ts", "email_password_reset_token");`,
+        WHERE user_id IN (
+            SELECT user_id
+            FROM user_property
+            WHERE prop_name = "email_password_reset_token_ts"
+            AND DATETIME("now") >= DATETIME(prop_value, "+${forgotPassExpireTime}")
+        ) AND prop_name IN ("email_password_reset_token_ts", "email_password_reset_token");`,
         err => {
             if(err) {
                 Log.warn( { error : err.message }, 'Failed deleting old email reset tokens');
@@ -316,5 +316,5 @@ function performMaintenanceTask(args, cb) {
     );
 }
 
-exports.WebPasswordReset		= WebPasswordReset;
-exports.performMaintenanceTask	= performMaintenanceTask;
\ No newline at end of file
+exports.WebPasswordReset        = WebPasswordReset;
+exports.performMaintenanceTask  = performMaintenanceTask;
\ No newline at end of file
diff --git a/core/whos_online.js b/core/whos_online.js
index edda6c20..28b71703 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -1,25 +1,25 @@
 /* jslint node: true */
 'use strict';
 
-//	ENiGMA½
-const MenuModule			= require('./menu_module.js').MenuModule;
-const ViewController		= require('./view_controller.js').ViewController;
-const getActiveNodeList		= require('./client_connections.js').getActiveNodeList;
-const stringFormat			= require('./string_format.js');
+//  ENiGMA½
+const MenuModule            = require('./menu_module.js').MenuModule;
+const ViewController        = require('./view_controller.js').ViewController;
+const getActiveNodeList     = require('./client_connections.js').getActiveNodeList;
+const stringFormat          = require('./string_format.js');
 
-//	deps
-const async					= require('async');
-const _						= require('lodash');
+//  deps
+const async                 = require('async');
+const _                     = require('lodash');
 
 exports.moduleInfo = {
-    name		: 'Who\'s Online',
-    desc		: 'Who is currently online',
-    author		: 'NuSkooler',
-    packageName	: 'codes.l33t.enigma.whosonline'
+    name        : 'Who\'s Online',
+    desc        : 'Who is currently online',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.whosonline'
 };
 
 const MciViewIds = {
-    OnlineList		: 1,
+    OnlineList      : 1,
 };
 
 exports.getModule = class WhosOnlineModule extends MenuModule {
@@ -33,26 +33,26 @@ exports.getModule = class WhosOnlineModule extends MenuModule {
                 return cb(err);
             }
 
-            const self	= this;
-            const vc	= self.viewControllers.allViews = new ViewController( { client : self.client } );
+            const self  = this;
+            const vc    = self.viewControllers.allViews = new ViewController( { client : self.client } );
 
             async.series(
                 [
                     function loadFromConfig(callback) {
                         const loadOpts = {
-                            callingMenu		: self,
-                            mciMap			: mciData.menu,
-                            noInput			: true,
+                            callingMenu     : self,
+                            mciMap          : mciData.menu,
+                            noInput         : true,
                         };
 
                         return vc.loadFromMenuConfig(loadOpts, callback);
                     },
                     function populateList(callback) {
-                        const onlineListView	= vc.getView(MciViewIds.OnlineList);
-                        const listFormat		= self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
-                        const nonAuthUser		= self.menuConfig.config.nonAuthUser || 'Logging In';
-                        const otherUnknown		= self.menuConfig.config.otherUnknown || 'N/A';
-                        const onlineList 		= getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
+                        const onlineListView    = vc.getView(MciViewIds.OnlineList);
+                        const listFormat        = self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
+                        const nonAuthUser       = self.menuConfig.config.nonAuthUser || 'Logging In';
+                        const otherUnknown      = self.menuConfig.config.otherUnknown || 'N/A';
+                        const onlineList        = getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
 
                         onlineListView.setItems(_.map(onlineList, oe => {
                             if(oe.authenticated) {
diff --git a/core/word_wrap.js b/core/word_wrap.js
index a42dd2ea..94773283 100644
--- a/core/word_wrap.js
+++ b/core/word_wrap.js
@@ -1,15 +1,15 @@
 /* jslint node: true */
 'use strict';
 
-const renderStringLength	= require('./string_util.js').renderStringLength;
+const renderStringLength    = require('./string_util.js').renderStringLength;
 
-//	deps
-const assert				= require('assert');
-const _						= require('lodash');
+//  deps
+const assert                = require('assert');
+const _                     = require('lodash');
 
-exports.wordWrapText	= wordWrapText;
+exports.wordWrapText    = wordWrapText;
 
-const SPACE_CHARS		= [
+const SPACE_CHARS       = [
     ' ', '\f', '\n', '\r', '\v',
     '​\u00a0', '\u1680', '​\u180e', '\u2000​', '\u2001', '\u2002', '​\u2003', '\u2004',
     '\u2005', '\u2006​', '\u2007', '\u2008​', '\u2009', '\u200a​', '\u2028', '\u2029​',
@@ -22,25 +22,25 @@ function wordWrapText(text, options) {
     assert(_.isObject(options));
     assert(_.isNumber(options.width));
 
-    options.tabHandling	= options.tabHandling || 'expand';
-    options.tabWidth	= options.tabWidth || 4;
-    options.tabChar		= options.tabChar || ' ';
+    options.tabHandling = options.tabHandling || 'expand';
+    options.tabWidth    = options.tabWidth || 4;
+    options.tabChar     = options.tabChar || ' ';
 
     //const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}`, 'g');
     //
-    //	For a given word, match 0->options.width chars -- alwasy include a full trailing ESC
-    //	sequence if present!
+    //  For a given word, match 0->options.width chars -- alwasy include a full trailing ESC
+    //  sequence if present!
     //
-    //	:TODO: Need to create ansi.getMatchRegex or something - this is used all over
+    //  :TODO: Need to create ansi.getMatchRegex or something - this is used all over
     const REGEXP_GOBBLE = new RegExp(`.{0,${options.width}}\\x1b\\[[\\?=;0-9]*[ABCDEFGHJKLMSTfhlmnprsu]|.{0,${options.width}}`, 'g');
 
     let m;
     let word;
     let c;
     let renderLen;
-    let i			= 0;
-    let wordStart	= 0;
-    let result		= { wrapped : [ '' ], renderLen : [ 0 ] };
+    let i           = 0;
+    let wordStart   = 0;
+    let result      = { wrapped : [ '' ], renderLen : [ 0 ] };
 
     function expandTab(column) {
         const remainWidth = options.tabWidth - (column % options.tabWidth);
@@ -56,26 +56,26 @@ function wordWrapText(text, options) {
                     result.firstWrapRange = { start : wordStart, end : wordStart + w.length };
                 }
 
-                result.wrapped[++i]	= w;
-                result.renderLen[i]	= renderLen;
+                result.wrapped[++i] = w;
+                result.renderLen[i] = renderLen;
             } else {
-                result.wrapped[i] 	+= w;
+                result.wrapped[i]   += w;
                 result.renderLen[i] = (result.renderLen[i] || 0) + renderLen;
             }
         });
     }
 
     //
-    //	Some of the way we word wrap is modeled after Sublime Test 3:
+    //  Some of the way we word wrap is modeled after Sublime Test 3:
     //
-    //	*	Sublime Text 3 for example considers spaces after a word
-    //		part of said word. For example, "word    " would be wraped
-    //		in it's entirity.
+    //  *   Sublime Text 3 for example considers spaces after a word
+    //      part of said word. For example, "word    " would be wraped
+    //      in it's entirity.
     //
-    //	*	Tabs in Sublime Text 3 are also treated as a word, so, e.g.
-    //		"\t" may resolve to "      " and must fit within the space.
+    //  *   Tabs in Sublime Text 3 are also treated as a word, so, e.g.
+    //      "\t" may resolve to "      " and must fit within the space.
     //
-    //	*	If a word is ultimately too long to fit, break it up until it does.
+    //  *   If a word is ultimately too long to fit, break it up until it does.
     //
     while(null !== (m = REGEXP_WORD_WRAP.exec(text))) {
         word = text.substring(wordStart, REGEXP_WORD_WRAP.lastIndex - 1);
@@ -85,7 +85,7 @@ function wordWrapText(text, options) {
             word += m[0];
         } else if('\t' === c) {
             if('expand' === options.tabHandling) {
-                //	Good info here: http://c-for-dummies.com/blog/?p=424
+                //  Good info here: http://c-for-dummies.com/blog/?p=424
                 word += expandTab(result.wrapped[i].length + word.length) + options.tabChar;
             } else {
                 word += m[0];

From d8c5c8e6347144e91adb573cfbff09c06b4fc054 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Jun 2018 23:25:31 -0600
Subject: [PATCH 0338/1013] MagiTerm and Undercurrents info to README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 82f94ce6..ec879c23 100644
--- a/README.md
+++ b/README.md
@@ -52,10 +52,12 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 * [SyncTERM](http://syncterm.bbsdev.net/)
 * [EtherTerm](https://github.com/M-griffin/EtherTerm)
 * [NetRunner](http://mysticbbs.com/downloads.html)
+* [MagiTerm](https://magickabbs.com/index.php/magiterm/)
 
 ## Boards
 * WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**telnet://xibalba.l33t.codes:44510** or via SSH secure on port 44511)
 * [fORCE9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
+* [Undercurrents](https://undercurrents.io): (**ssh://undercurrents.io**)
 
 
 ## Installation

From ff48bd74315e9047941edeac53ebedb78e7cefcc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 10:23:21 -0600
Subject: [PATCH 0339/1013] Add more thanks

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ec879c23..24b2e810 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,8 @@ Please see the [Quickstart](docs/index.md) for more information.
 * Avon of [Agency BBS](http://bbs.geek.nz/) and [fsxNet](http://bbs.geek.nz/#fsxNet) for putting up with my experiments to his system
 * Maskreet of [Throwback BBS](http://www.throwbackbbs.com/) hosting [DoorParty](http://forums.throwbackbbs.com/)!
 * [Apam](https://github.com/apamment) of [Magicka](https://magickabbs.com/)
+* [nail/blocktronics](http://blocktronics.org/tag/nail/) for the [sickmade Xibalba logo](http://pc.textmod.es/pack/blocktronics-420/n-xbalba.ans)!
+* [Whazzit/blocktronics](http://blocktronics.org/tag/whazzit/) for the amazing Mayan ANSI pieces scattered about Xibalba BBS!
 
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:

From 9af19428c50cc1b7e8b2e7433ddc241d2289e0da Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 10:26:32 -0600
Subject: [PATCH 0340/1013] Yet more README updates

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 24b2e810..d9f3da0a 100644
--- a/README.md
+++ b/README.md
@@ -65,10 +65,10 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
 ```
 
-Please see the [Quickstart](docs/index.md) for more information.
+Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) in the docs for more information.
 
 ## Special Thanks
-* [Dave Stephens aka RiPuk](https://github.com/davestephens) for the [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.
+* [Dave Stephens aka RiPuk](https://github.com/davestephens) for the awesome [ENiGMA website](https://enigma-bbs.github.io/) [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.
 * [Daniel Mecklenburg Jr.](https://github.com/codewar65) for the awesome VTX terminal and general coding talk
 * [M. Brutman](http://www.brutman.com/), author of [mTCP](http://www.brutman.com/mTCP/mTCP.html) (Interwebs for DOS!)
 * [M. Griffin](https://github.com/M-griffin), author of [Enthral BBS](https://github.com/M-griffin/Enthral), [Oblivion/2 XRM](https://github.com/M-griffin/Oblivion2-XRM) and [EtherTerm](https://github.com/M-griffin/EtherTerm)!

From 812fd28d8232ee98bad6cd26847223881bc67a7c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 10:27:12 -0600
Subject: [PATCH 0341/1013] Doh!

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d9f3da0a..e4b76e9c 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/inst
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) in the docs for more information.
 
 ## Special Thanks
-* [Dave Stephens aka RiPuk](https://github.com/davestephens) for the awesome [ENiGMA website](https://enigma-bbs.github.io/) [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.
+* [Dave Stephens aka RiPuk](https://github.com/davestephens) for the awesome [ENiGMA website](https://enigma-bbs.github.io/) and [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.
 * [Daniel Mecklenburg Jr.](https://github.com/codewar65) for the awesome VTX terminal and general coding talk
 * [M. Brutman](http://www.brutman.com/), author of [mTCP](http://www.brutman.com/mTCP/mTCP.html) (Interwebs for DOS!)
 * [M. Griffin](https://github.com/M-griffin), author of [Enthral BBS](https://github.com/M-griffin/Enthral), [Oblivion/2 XRM](https://github.com/M-griffin/Oblivion2-XRM) and [EtherTerm](https://github.com/M-griffin/EtherTerm)!

From 4ef1061fc59e3be9ace487acfa37a0ccf200491b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 11:17:21 -0600
Subject: [PATCH 0342/1013] Use standard list format for message area select

---
 core/msg_area_list.js | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 27cbcbb1..1b9870bd 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -136,31 +136,20 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
                         });
                     },
                     function populateAreaListView(callback) {
-                        const listFormat        = self.menuConfig.config.listFormat || '{index} ) - {name}';
-                        const focusListFormat   = self.menuConfig.config.focusListFormat || listFormat;
-
                         const areaListView = vc.getView(MciViewIds.AreaList);
                         if(!areaListView) {
                             return callback(Errors.MissingMci('A MenuView compatible MCI code is required'));
                         }
-                        let i = 1;
-                        areaListView.setItems(_.map(self.messageAreas, v => {
-                            return stringFormat(listFormat, {
-                                index   : i++,
-                                areaTag : v.area.areaTag,
-                                name    : v.area.name,
-                                desc    : v.area.desc,
-                            });
-                        }));
 
-                        i = 1;
-                        areaListView.setFocusItems(_.map(self.messageAreas, v => {
-                            return stringFormat(focusListFormat, {
-                                index   : i++,
-                                areaTag : v.area.areaTag,
-                                name    : v.area.name,
-                                desc    : v.area.desc,
-                            });
+                        let i = 1;
+                        areaListView.setItems(self.messageAreas.map(a => {
+                            return {
+                                index       : i++,
+                                areaTag     : a.area.areaTag,
+                                text        : a.area.name,  //  standard
+                                name        : a.area.name,
+                                desc        : a.area.desc,
+                            };
                         }));
 
                         areaListView.on('index update', areaIndex => {
@@ -168,8 +157,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
                         });
 
                         areaListView.redraw();
-
-                        callback(null);
+                        return callback(null);
                     }
                 ],
                 function complete(err) {

From d1dd13ea990fdd85f5e646567a5d556e6001291f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 11:50:51 -0600
Subject: [PATCH 0343/1013] Update luciano_blocktronics theme for message area
 change updates

---
 art/themes/luciano_blocktronics/CHANGE.ANS  | Bin 2035 -> 2159 bytes
 art/themes/luciano_blocktronics/theme.hjson |   6 ++----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/art/themes/luciano_blocktronics/CHANGE.ANS b/art/themes/luciano_blocktronics/CHANGE.ANS
index 885b3cc9bc181f04ca6b953688abc2511344fa5c..056dd1cfc55e7030c282078b2f68d4814b3a6e18 100644
GIT binary patch
delta 428
zcmey&|6agZI@-Y6#K79vJXbo}&;ZCaHp;zo2S|YgOrd-z*AmL*g7VEF{E4da9$@8A
z{(W@qcNFd`C@9<q5_f=1n5-E@_x(F}?nBKpG;^L<sL6wD^~5<&sQd@f%s~0cmW;~m
zP}faPX3T=9f!aU$JYx|=0BXf#XQoq121xz^x(4VJm^VP?7+M<}O;%;j=7n1h7MaT2
z&jHeC0aP+si=`FJ0jZz7m1P0M4v-Wu%qEAk)}XrLDr+LxsU~cR{9scJjUg5p<W8Q?
oW)F4{(8plA4RY__xvu~W94;^bMheKaljYdgGqG_@KF_WK02x1iQvd(}

delta 348
zcmXYsu}Z}-6ozTMZ7&7UQOFWOClT6P+umyj#f&<-Wso9WlsFXK1Sc0k<Z^Iva&U2S
z5_|@Ig-9OZ4({Tg#6ZqDoc!lMUlyxBD>q!_?M~j7x#p_KC0FG{8^cv45oXe4Ts6{I
zAq4J!62kb75!MEQ4HIZMA%a1PUM(%8a4wy5qw(rD{2~=?S?l=+XO*1W14P=66x~Pb
zDG(e0y+>!Pk+j7IR!e$ipKBFt01HGoVF~D5tDwiF^Egz?qlaYbW%M$-O~M2f@iUuB
z`i`%iW1n>Nm7HWi@c%9)&C<R7!r@v0^voaZ0x^JVeR?$v{l%r|hQ9OYx!w&go5x2J
QCxnci(l>UO(&2dH4^Fjkd;kCd

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 9a8d3b6c..e97c8e97 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -233,14 +233,12 @@
 			}
 
 			messageAreaChangeCurrentArea: {
-				config: {
-					listFormat: "|00|15{index} |07- |03{name}"
-					focusListFormat: "|00|19|15{index} - {name}"
-				}
 				mci: {
 					VM1: {
 						width: 26
 						height: 19
+						itemFormat: "|00|15{index:.2} |07- |03{name}"
+						focusItemFormat: "|00|09|15{index:.2} - {name}"
 					}
 				}
 			}

From 6d4b8abc9c461d928e8f601d5a4d0cde7ffd1fd1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 18:17:15 -0600
Subject: [PATCH 0344/1013] Remove ERC: It's not maintained. Can be added to
 boards as a mod anyway

---
 art/general/erc.ans | Bin 376 -> 0 bytes
 config/menu.hjson   |  56 --------------
 core/erc_client.js  | 179 --------------------------------------------
 3 files changed, 235 deletions(-)
 delete mode 100644 art/general/erc.ans
 delete mode 100644 core/erc_client.js

diff --git a/art/general/erc.ans b/art/general/erc.ans
deleted file mode 100644
index d2f336d2255ffac5d5eed3b240d40fe2d6e267ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmb1+Hn27^ur@Z$y-j5x9c^r$tLhtK$b}66Wr0>oN1K>h8yn=N1|=&vXC#&=IOk-h
z=9MVu7nWw0D3s(YfN3jDpgMBgC>?ER4RnN^G|-bk>l7ePat$%&k_vVVb#^r{P@o<#
jGB7kVFf%gaWn^GrWDH=CU;qPQPbXi6Fn31?4^9FA1c{gz

diff --git a/config/menu.hjson b/config/menu.hjson
index 0a57414c..1ee13d07 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1019,10 +1019,6 @@
 					value: { command: "R" }
 					action: @menu:mainMenuRumorz
 				}
-				{
-					value: { command: "CHAT"}
-					action: @menu:ercClient
-				}
 				{
 					value: { command: "BBS"}
 					action: @menu:bbsList
@@ -1473,58 +1469,6 @@
 			}
 		}
 
-		ercClient: {
-			art: erc
-			module: erc_client
-			config: {
-				host: localhost
-        		port: 5001
-				bbsTag: CHANGEME
-      		}
-
-			form: {
-				0: {
-					mci: {
-						MT1: {
-							width: 79
-							height: 21
-							mode: preview
-							autoScroll: true
-						}
-						ET3: {
-							autoScale: false
-							width: 77
-							argName: inputArea
-							focus: true
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { inputArea: null }
-								action: @method:inputAreaSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "tab" ]
-						}
-						{
-							keys: [ "up arrow" ]
-							action: @method:scrollDown
-						}
-						{
-							keys: [ "down arrow" ]
-							action: @method:scrollUp
-						}
-					]
-				}
-			}
-		}
-
 		bbsList: {
 			desc: Viewing BBS List
 			module: bbs_list
diff --git a/core/erc_client.js b/core/erc_client.js
deleted file mode 100644
index 018c9372..00000000
--- a/core/erc_client.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/* jslint node: true */
-'use strict';
-
-const MenuModule    = require('./menu_module.js').MenuModule;
-const stringFormat  = require('./string_format.js');
-
-//  deps
-const async         = require('async');
-const _             = require('lodash');
-const net           = require('net');
-
-/*
-    Expected configuration block example:
-
-    config: {
-        host: 192.168.1.171
-        port: 5001
-        bbsTag: SOME_TAG
-    }
-
-*/
-
-exports.getModule   = ErcClientModule;
-
-exports.moduleInfo = {
-    name    : 'ENiGMA Relay Chat Client',
-    desc    : 'Chat with other ENiGMA BBSes',
-    author  : 'Andrew Pamment',
-};
-
-var MciViewIds = {
-    ChatDisplay : 1,
-    InputArea   : 3,
-};
-
-//  :TODO: needs converted to ES6 MenuModule subclass
-function ErcClientModule(options) {
-    MenuModule.prototype.ctorShim.call(this, options);
-
-    const self          = this;
-    this.config         = options.menuConfig.config;
-
-    this.chatEntryFormat    = this.config.chatEntryFormat || '[{bbsTag}] {userName}: {message}';
-    this.systemEntryFormat  = this.config.systemEntryFormat || '[*SYSTEM*] {message}';
-
-    this.finishedLoading = function() {
-        async.waterfall(
-            [
-                function validateConfig(callback) {
-                    if(_.isString(self.config.host) &&
-                        _.isNumber(self.config.port) &&
-                        _.isString(self.config.bbsTag))
-                    {
-                        return callback(null);
-                    } else {
-                        return callback(new Error('Configuration is missing required option(s)'));
-                    }
-                },
-                function connectToServer(callback) {
-                    const connectOpts = {
-                        port    : self.config.port,
-                        host    : self.config.host,
-                    };
-
-                    const chatMessageView = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
-
-                    chatMessageView.setText('Connecting to server...');
-                    chatMessageView.redraw();
-
-                    self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
-
-                    //  :TODO: Track actual client->enig connection for optional prevMenu @ final CB
-                    self.chatConnection = net.createConnection(connectOpts.port, connectOpts.host);
-
-                    self.chatConnection.on('data', data => {
-                        data = data.toString();
-
-                        if(data.startsWith('ERCHANDSHAKE')) {
-                            self.chatConnection.write(`ERCMAGIC|${self.config.bbsTag}|${self.client.user.username}\r\n`);
-                        } else if(data.startsWith('{')) {
-                            try {
-                                data = JSON.parse(data);
-                            } catch(e) {
-                                return self.client.log.warn( { error : e.message }, 'ERC: Error parsing ERC data from server');
-                            }
-
-                            let text;
-                            try {
-                                if(data.userName) {
-                                    //  user message
-                                    text = stringFormat(self.chatEntryFormat, data);
-                                } else {
-                                    //  system message
-                                    text = stringFormat(self.systemEntryFormat, data);
-                                }
-                            } catch(e) {
-                                return self.client.log.warn( { error : e.message }, 'ERC: chatEntryFormat error');
-                            }
-
-                            chatMessageView.addText(text);
-
-                            if(chatMessageView.getLineCount() > 30) {   //  :TODO: should probably be ChatDisplay.height?
-                                chatMessageView.deleteLine(0);
-                                chatMessageView.scrollDown();
-                            }
-
-                            chatMessageView.redraw();
-                            self.viewControllers.menu.switchFocus(MciViewIds.InputArea);
-                        }
-                    });
-
-                    self.chatConnection.once('end', () => {
-                        return callback(null);
-                    });
-
-                    self.chatConnection.once('error', err => {
-                        self.client.log.info(`ERC connection error: ${err.message}`);
-                        return callback(new Error('Failed connecting to ERC server!'));
-                    });
-                }
-            ],
-            err => {
-                if(err) {
-                    self.client.log.warn( { error : err.message }, 'ERC error');
-                }
-
-                self.prevMenu();
-            }
-        );
-    };
-
-    this.scrollHandler = function(keyName) {
-        const inputAreaView     = self.viewControllers.menu.getView(MciViewIds.InputArea);
-        const chatDisplayView   = self.viewControllers.menu.getView(MciViewIds.ChatDisplay);
-
-        if('up arrow' === keyName) {
-            chatDisplayView.scrollUp();
-        } else {
-            chatDisplayView.scrollDown();
-        }
-
-        chatDisplayView.redraw();
-        inputAreaView.setFocus(true);
-    };
-
-
-    this.menuMethods = {
-        inputAreaSubmit : function(formData, extraArgs, cb) {
-            const inputAreaView = self.viewControllers.menu.getView(MciViewIds.InputArea);
-            const inputData     = inputAreaView.getData();
-
-            if('/quit' === inputData.toLowerCase()) {
-                self.chatConnection.end();
-            } else {
-                try {
-                    self.chatConnection.write(`${inputData}\r\n`);
-                } catch(e) {
-                    self.client.log.warn( { error : e.message }, 'ERC error');
-                }
-                inputAreaView.clearText();
-            }
-            return cb(null);
-        },
-        scrollUp : function(formData, extraArgs, cb) {
-            self.scrollHandler(formData.key.name);
-            return cb(null);
-        },
-        scrollDown : function(formData, extraArgs, cb) {
-            self.scrollHandler(formData.key.name);
-            return cb(null);
-        }
-    };
-}
-
-require('util').inherits(ErcClientModule, MenuModule);
-
-ErcClientModule.prototype.mciReady = function(mciData, cb) {
-    this.standardMCIReadyHandler(mciData, cb);
-};

From 611a52e9467d630d4a10f8db84cd4a39a8896e2e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 20:16:44 -0600
Subject: [PATCH 0345/1013] * Did add a tweak to the concept for height only:
 autoAdjustHeight can be used where it makes sense * See also: #159

---
 core/horizontal_menu_view.js | 11 ---------
 core/text_view.js            | 48 ++----------------------------------
 core/vertical_menu_view.js   | 31 +++++++++--------------
 core/view.js                 | 44 +++++++++++----------------------
 4 files changed, 29 insertions(+), 105 deletions(-)

diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index b7d0aba3..5c83eb16 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -31,17 +31,6 @@ function HorizontalMenuView(options) {
         return new Array(self.itemSpacing + 1).join(' ');
     };
 
-    this.performAutoScale = function() {
-        if(self.autoScale.width) {
-            var spacer  = self.getSpacer();
-            var width   = self.items.join(spacer).length + (spacer.length * 2);
-            assert(width <= self.client.term.termWidth - self.position.col);
-            self.dimens.width = width;
-        }
-    };
-
-    this.performAutoScale();
-
     this.cachePositions = function() {
         if(this.positionCacheExpired) {
             var col     = self.position.col;
diff --git a/core/text_view.js b/core/text_view.js
index 4611821a..2a5c93c5 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -183,67 +183,23 @@ TextView.prototype.getData = function() {
 TextView.prototype.setText = function(text, redraw) {
     redraw = _.isBoolean(redraw) ? redraw : true;
 
-    if(!_.isString(text)) {
+    if(!_.isString(text)) { //  allow |text| to be numbers/etc.
         text = text.toString();
     }
 
-    text = pipeToAnsi(stripAllLineFeeds(text), this.client);    //  expand MCI/etc.
-
-    var widthDelta = 0;
-    if(this.text && this.text !== text) {
-        widthDelta = Math.abs(renderStringLength(this.text) - renderStringLength(text));
-    }
-
-    this.text = text;
-
+    this.text = pipeToAnsi(stripAllLineFeeds(text), this.client);    //  expand MCI/etc.
     if(this.maxLength > 0) {
         this.text = renderSubstr(this.text, 0, this.maxLength);
-        //this.text = this.text.substr(0, this.maxLength);
     }
 
     //  :TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
     this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
 
-    if(this.autoScale.width) {
-        this.dimens.width = renderStringLength(this.text) + widthDelta;
-    }
-
     if(redraw) {
         this.redraw();
     }
 };
 
-/*
-TextView.prototype.setText = function(text) {
-    if(!_.isString(text)) {
-        text = text.toString();
-    }
-
-    var widthDelta = 0;
-    if(this.text && this.text !== text) {
-        widthDelta = Math.abs(this.text.length - text.length);
-    }
-
-    this.text = text;
-
-    if(this.maxLength > 0) {
-        this.text = this.text.substr(0, this.maxLength);
-    }
-
-    this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
-
-    //if(this.resizable) {
-    //  this.dimens.width = this.text.length + widthDelta;
-    //}
-
-    if(this.autoScale.width) {
-        this.dimens.width = this.text.length + widthDelta;
-    }
-
-    this.redraw();
-};
-*/
-
 TextView.prototype.clearText = function() {
     this.setText('');
 };
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index ea071010..e91e86f2 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -15,11 +15,13 @@ const _             = require('lodash');
 exports.VerticalMenuView        = VerticalMenuView;
 
 function VerticalMenuView(options) {
-    options.cursor  = options.cursor || 'hide';
-    options.justify = options.justify || 'left';
+    options.cursor          = options.cursor || 'hide';
+    options.justify         = options.justify || 'left';
 
     MenuView.call(this, options);
 
+    this.dimens.width = this.dimens.width || Math.min(15, this.client.term.termWidth - this.position.col);
+
     const self = this;
 
     //  we want page up/page down by default
@@ -30,24 +32,14 @@ function VerticalMenuView(options) {
         });
     }
 
-    this.performAutoScale = function() {
-        if(this.autoScale.height) {
-            this.dimens.height = (self.items.length * (self.itemSpacing + 1)) - (self.itemSpacing);
-            this.dimens.height = Math.min(self.dimens.height, self.client.term.termHeight - self.position.row);
-        }
-
-        if(self.autoScale.width) {
-            let maxLen = 0;
-            self.items.forEach( item => {
-                if(item.text.length > maxLen) {
-                    maxLen = Math.min(item.text.length, self.client.term.termWidth - self.position.col);
-                }
-            });
-            self.dimens.width = maxLen + 1;
+    this.autoAdjustHeightIfEnabled = function() {
+        if(this.autoAdjustHeight) {
+            this.dimens.height = (this.items.length * (this.itemSpacing + 1)) - (this.itemSpacing);
+            this.dimens.height = Math.min(this.dimens.height, this.client.term.termHeight - this.position.row);
         }
     };
 
-    this.performAutoScale();
+    this.autoAdjustHeightIfEnabled();
 
     this.updateViewVisibleItems = function() {
         self.maxVisibleItems = Math.ceil(self.dimens.height / (self.itemSpacing + 1));
@@ -96,7 +88,7 @@ VerticalMenuView.prototype.redraw = function() {
 
     //  :TODO: rename positionCacheExpired to something that makese sense; combine methods for such
     if(this.positionCacheExpired) {
-        this.performAutoScale();
+        this.autoAdjustHeightIfEnabled();
         this.updateViewVisibleItems();
 
         this.positionCacheExpired = false;
@@ -133,6 +125,7 @@ VerticalMenuView.prototype.setHeight = function(height) {
     VerticalMenuView.super_.prototype.setHeight.call(this, height);
 
     this.positionCacheExpired = true;
+    this.autoAdjustHeight = false;
 };
 
 VerticalMenuView.prototype.setPosition = function(pos) {
@@ -158,7 +151,7 @@ VerticalMenuView.prototype.setFocusItemIndex = function(index) {
         };
 
         this.positionCacheExpired = false;  //  skip standard behavior
-        this.performAutoScale();
+        this.autoAdjustHeightIfEnabled();
     }
 
     this.redraw();
diff --git a/core/view.js b/core/view.js
index 702be949..e32b402b 100644
--- a/core/view.js
+++ b/core/view.js
@@ -37,21 +37,16 @@ function View(options) {
     enigAssert(_.isObject(options));
     enigAssert(_.isObject(options.client));
 
-    var self            = this;
+    this.client             = options.client;
+    this.cursor             = options.cursor || 'show';
+    this.cursorStyle        = options.cursorStyle || 'default';
 
-    this.client         = options.client;
-
-    this.cursor         = options.cursor || 'show';
-    this.cursorStyle    = options.cursorStyle || 'default';
-
-    this.acceptsFocus   = options.acceptsFocus || false;
-    this.acceptsInput   = options.acceptsInput || false;
-
-    this.position       = { x : 0, y : 0 };
-    this.dimens         = { height : 1, width : 0 };
-
-    this.textStyle      = options.textStyle || 'normal';
-    this.focusTextStyle = options.focusTextStyle || this.textStyle;
+    this.acceptsFocus       = options.acceptsFocus || false;
+    this.acceptsInput       = options.acceptsInput || false;
+    this.autoAdjustHeight = _.get(options, 'dimens.height') ? false : _.get(options, 'autoAdjustHeight', true);
+    this.position           = { x : 0, y : 0 };
+    this.textStyle          = options.textStyle || 'normal';
+    this.focusTextStyle     = options.focusTextStyle || this.textStyle;
 
     if(options.id) {
         this.setId(options.id);
@@ -61,15 +56,8 @@ function View(options) {
         this.setPosition(options.position);
     }
 
-    if(_.isObject(options.autoScale)) {
-        this.autoScale = options.autoScale;
-    } else {
-        this.autoScale = { height : true, width : true };
-    }
-
     if(options.dimens) {
         this.setDimension(options.dimens);
-        this.autoScale = { height : false, width : false };
     } else {
         this.dimens = {
             width   : options.width || 0,
@@ -105,7 +93,7 @@ function View(options) {
     };
 
     this.hideCusor = function() {
-        self.client.term.rawWrite(ansi.hideCursor());
+        this.client.term.rawWrite(ansi.hideCursor());
     };
 
     this.restoreCursor = function() {
@@ -148,25 +136,23 @@ View.prototype.setPosition = function(pos) {
 
 View.prototype.setDimension = function(dimens) {
     enigAssert(_.isObject(dimens) && _.isNumber(dimens.height) && _.isNumber(dimens.width));
-
-    this.dimens     = dimens;
-    this.autoScale  = { height : false, width : false };
+    this.dimens = dimens;
+    this.autoAdjustHeight = false;
 };
 
 View.prototype.setHeight = function(height) {
     height  = parseInt(height) || 1;
     height  = Math.min(height, this.client.term.termHeight);
 
-    this.dimens.height      = height;
-    this.autoScale.height   = false;
+    this.dimens.height = height;
+    this.autoAdjustHeight = false;
 };
 
 View.prototype.setWidth = function(width) {
     width   = parseInt(width) || 1;
     width   = Math.min(width, this.client.term.termWidth);
 
-    this.dimens.width       = width;
-    this.autoScale.width    = false;
+    this.dimens.width = width;
 };
 
 View.prototype.getSGR = function() {

From 469c08b0f2d02cf2072fc0a1f32d11961a8d07ce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 21:01:36 -0600
Subject: [PATCH 0346/1013] Note on auto scaling

---
 WHATSNEW.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 27f9380d..be4e90cd 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -12,6 +12,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * You can now set the `sort` property on a menu to sort items. If `true` items are sorted by `text`. If the value is a string, it represents the key in menu objects to sort by.
 * Hot-reload of configuration files such as menu.hjson, config.hjson, your themes.hjson, etc.: When a file is saved, it will be hot-reloaded into the running system
   * Note that any custom modules should make use of the new Config.get() method.
+* The old concept of `autoScale` has been removed. See https://github.com/NuSkooler/enigma-bbs/issues/166
 
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.

From 5bb4f9b903169aed986956cd9773303c93c4ab2a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 21:02:16 -0600
Subject: [PATCH 0347/1013] Fix archive util config reload

---
 core/archive_util.js  | 11 ++++++++---
 core/config.js        |  7 ++++++-
 core/system_events.js |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index c0076dba..32425eaa 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -6,6 +6,7 @@ const Config            = require('./config.js').get;
 const stringFormat      = require('./string_format.js');
 const Errors            = require('./enig_error.js').Errors;
 const resolveMimeType   = require('./mime_util.js').resolveMimeType;
+const Events            = require('./events.js');
 
 //  base/modules
 const fs        = require('graceful-fs');
@@ -58,9 +59,13 @@ module.exports = class ArchiveUtil {
     }
 
     init() {
-        //
-        //  Load configuration
-        //
+        this.reloadConfig();
+        Events.on(Events.getSystemEvents().ConfigChanged, () => {
+            this.reloadConfig();
+        });
+    }
+
+    reloadConfig() {
         const config = Config();
         if(_.has(config, 'archives.archivers')) {
             Object.keys(config.archives.archivers).forEach(archKey => {
diff --git a/core/config.js b/core/config.js
index f85ffe2a..1e69b6ef 100644
--- a/core/config.js
+++ b/core/config.js
@@ -94,7 +94,12 @@ function init(configPath, options, cb) {
         const reCachedPath = paths.join(fileRoot, fileName);
         ConfigCache.getConfig(reCachedPath, (err, config) => {
             if(!err) {
-                mergeValidateAndFinalize(config);
+                mergeValidateAndFinalize(config, err => {
+                    if(!err) {
+                        const Events = require('./events.js');
+                        Events.emit(Events.getSystemEvents().ConfigChanged);
+                    }
+                });
             }
         });
     };
diff --git a/core/system_events.js b/core/system_events.js
index 95316c95..42aa0700 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -6,10 +6,10 @@ module.exports = {
     ClientDisconnected  : 'codes.l33t.enigma.system.disconnected',      //  { client, connectionCount }
     TermDetected        : 'codes.l33t.enigma.system.term_detected',     //  { client }
 
-    ThemeChanged        : 'codes.l33t.enigma.system.theme_changed',     //  { themeId }
-    ConfigChanged       : 'codes.l33t.enigma.system.config_changed',
-    MenusChanged        : 'codes.l33t.enigma.system.menus_changed',
-    PromptsChanged      : 'codes.l33t.enigma.system.prompts_changed',
+    ThemeChanged        : 'codes.l33t.enigma.system.theme_changed',     //  (theme.hjson): { themeId }
+    ConfigChanged       : 'codes.l33t.enigma.system.config_changed',    //  (config.hjson)
+    MenusChanged        : 'codes.l33t.enigma.system.menus_changed',     //  (menu.hjson)
+    PromptsChanged      : 'codes.l33t.enigma.system.prompts_changed',   //  (prompt.hjson)
 
     //  User - includes { user, ...}
     NewUser             : 'codes.l33t.enigma.system.new_user',

From 359f21914fff47d6e04a2fedbb34e783acdd13bd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 21:02:33 -0600
Subject: [PATCH 0348/1013] Defualt width

---
 core/button_view.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/button_view.js b/core/button_view.js
index 63de435a..8e8d6ebc 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -14,6 +14,8 @@ function ButtonView(options) {
     options.cursor          = miscUtil.valueWithDefault(options.cursor, 'hide');
 
     TextView.call(this, options);
+
+    this.dimens.width = this.dimens.width || Math.min(10, this.client.term.termWidth - this.position.col);
 }
 
 util.inherits(ButtonView, TextView);

From ff3ab38a7aec01351bf6f81c9b3ffa940b758522 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 21:03:05 -0600
Subject: [PATCH 0349/1013] Fix moveOrCopyFileWithCollisions() for fse-extra
 with kludge

---
 core/file_util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_util.js b/core/file_util.js
index 64167771..fdea4e45 100644
--- a/core/file_util.js
+++ b/core/file_util.js
@@ -51,7 +51,7 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
                 if(err) {
                     //  for some reason fs-extra copy doesn't pass err.code
                     //  :TODO: this is dangerous: submit a PR to fs-extra to set EEXIST
-                    if('EEXIST' === err.code || 'copy' === operation) {
+                    if('EEXIST' === err.code || 'dest already exists.' === err.message) {
                         renameIndex += 1;
                         return cb(null);    //  keep trying
                     }

From 0cfd45d8a92e991d29853b703e56273ded988abd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 21:03:32 -0600
Subject: [PATCH 0350/1013] Fix undefined ref if we fail to copy/move a upload
 file

---
 core/upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/upload.js b/core/upload.js
index 87bdcb4a..7dd5dd51 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -386,7 +386,7 @@ exports.getModule = class UploadModule extends MenuModule {
                         'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
                     );
 
-                    if(dst !== finalPath) {
+                    if(!err && dst !== finalPath) {
                         //  name changed; ajust before persist
                         newEntry.fileName = paths.basename(finalPath);
                     }

From 3aa23db306a04f689d225f33f8cfe0de9f75900e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Jun 2018 22:23:22 -0600
Subject: [PATCH 0351/1013] initDefaultWidht() for various views

---
 core/button_view.js               | 2 +-
 core/edit_text_view.js            | 2 ++
 core/mask_edit_text_view.js       | 2 ++
 core/multi_line_edit_text_view.js | 2 ++
 core/spinner_menu_view.js         | 2 ++
 core/toggle_menu_view.js          | 2 ++
 core/vertical_menu_view.js        | 2 +-
 core/view.js                      | 4 ++++
 8 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/button_view.js b/core/button_view.js
index 8e8d6ebc..edb32e12 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -15,7 +15,7 @@ function ButtonView(options) {
 
     TextView.call(this, options);
 
-    this.dimens.width = this.dimens.width || Math.min(10, this.client.term.termWidth - this.position.col);
+    this.initDefaultWidth();
 }
 
 util.inherits(ButtonView, TextView);
diff --git a/core/edit_text_view.js b/core/edit_text_view.js
index 05868e92..db01b9f5 100644
--- a/core/edit_text_view.js
+++ b/core/edit_text_view.js
@@ -19,6 +19,8 @@ function EditTextView(options) {
 
     TextView.call(this, options);
 
+    this.initDefaultWidth();
+
     this.cursorPos = { row : 0, col : 0 };
 
     this.clientBackspace = function() {
diff --git a/core/mask_edit_text_view.js b/core/mask_edit_text_view.js
index 6cdf40b0..dbc782a0 100644
--- a/core/mask_edit_text_view.js
+++ b/core/mask_edit_text_view.js
@@ -35,6 +35,8 @@ function MaskEditTextView(options) {
 
     TextView.call(this, options);
 
+    this.initDefaultWidth();
+
     this.cursorPos          = { x : 0 };
     this.patternArrayPos    = 0;
 
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 1d16e201..bd49a73f 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -97,6 +97,8 @@ function MultiLineEditTextView(options) {
 
     View.call(this, options);
 
+    this.initDefaultWidth();
+
     var self = this;
 
     //
diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index e6be1232..7c38b195 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -17,6 +17,8 @@ function SpinnerMenuView(options) {
 
     MenuView.call(this, options);
 
+    this.initDefaultWidth();
+
     var self = this;
 
     /*
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index ae163bd7..aadfe9c3 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -14,6 +14,8 @@ function ToggleMenuView (options) {
 
     MenuView.call(this, options);
 
+    this.initDefaultWidth();
+
     var self = this;
 
     /*
diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js
index e91e86f2..1837b718 100644
--- a/core/vertical_menu_view.js
+++ b/core/vertical_menu_view.js
@@ -20,7 +20,7 @@ function VerticalMenuView(options) {
 
     MenuView.call(this, options);
 
-    this.dimens.width = this.dimens.width || Math.min(15, this.client.term.termWidth - this.position.col);
+    this.initDefaultWidth();
 
     const self = this;
 
diff --git a/core/view.js b/core/view.js
index e32b402b..7d3c5693 100644
--- a/core/view.js
+++ b/core/view.js
@@ -100,6 +100,10 @@ function View(options) {
         //this.client.term.write(ansi.setCursorStyle(this.cursorStyle));
         this.client.term.rawWrite('show' === this.cursor ? ansi.showCursor() : ansi.hideCursor());
     };
+
+    this.initDefaultWidth = function(width = 15) {
+        this.dimens.width = this.dimens.width || Math.min(width, this.client.term.termWidth - this.position.col);
+    };
 }
 
 util.inherits(View, events.EventEmitter);

From c75845413436f76fda18f74b0c76616bc2584409 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 18:08:41 -0600
Subject: [PATCH 0352/1013] Fix empty filename check

---
 core/upload.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/upload.js b/core/upload.js
index 7dd5dd51..a2f2c9ea 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -92,16 +92,16 @@ exports.getModule = class UploadModule extends MenuModule {
 
             //  validation
             validateNonBlindFileName : (fileName, cb) => {
-                fileName = sanatizeFilename(fileName);  //  remove unsafe chars, path info, etc.
-                if(0 === fileName.length) {
-                    return cb(new Error('Invalid filename'));
-                }
-
                 if(0 === fileName.length) {
                     return cb(new Error('Filename cannot be empty'));
                 }
 
-                //  At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused
+                fileName = sanatizeFilename(fileName);  //  remove unsafe chars, path info, etc.
+                if(0 === fileName.length) { //  sanatize nuked everything?
+                    return cb(new Error('Invalid filename'));
+                }
+
+                //  At least SEXYZ doesn't like non-blind names that start with a number - it becomes confused ;-(
                 if(/^[0-9].*$/.test(fileName)) {
                     return cb(new Error('Invalid filename'));
                 }

From 851da9e8c8ba04571aea6673dc4a5d0d8a75da10 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 18:09:32 -0600
Subject: [PATCH 0353/1013] Do not require MCI configurations in theme.hjson
 for theme.hjson to apply #167

---
 core/theme.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 6d2bcff6..ebdcf1ca 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -139,14 +139,18 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
     };
 
     function getFormKeys(fromObj) {
-        return _.remove(_.keys(fromObj), function pred(k) {
-            return !isNaN(k);    //  remove all non-numbers
-        });
+        //  remove all non-numbers
+        return _.remove(_.keys(fromObj), k => !isNaN(k));
     }
 
     function mergeMciProperties(dest, src) {
-        Object.keys(src).forEach(function mciEntry(mci) {
-            _.mergeWith(dest[mci], src[mci], mciCustomizer);
+        Object.keys(src).forEach(mci => {
+            if(dest[mci]) {
+                _.mergeWith(dest[mci], src[mci], mciCustomizer);
+            } else {
+                //  theme contains MCI not in menu; bring in as-is
+                dest[mci] = src[mci];
+            }
         });
     }
 
@@ -186,11 +190,9 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
         if(_.isObject(form.mci)) {
             //   non-explicit: no MCI code(s) key assumed since we found 'mci' directly under form ID
             applyThemeMciBlock(form.mci, menuTheme, formKey);
-
         } else {
-            const menuMciCodeKeys = _.remove(_.keys(form), function pred(k) {
-                return k === k.toUpperCase(); //  remove anything not uppercase
-            });
+            //  remove anything not uppercase
+            const menuMciCodeKeys = _.remove(_.keys(form), k => k === k.toUpperCase());
 
             menuMciCodeKeys.forEach(function mciKeyEntry(mciKey) {
                 let applyFrom;

From 7cdb362c32eb911cb946938a4cc4b3ac19836ce7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 18:10:27 -0600
Subject: [PATCH 0354/1013] Limit filename length in luciano_blocktronics theme

---
 art/themes/luciano_blocktronics/theme.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index e97c8e97..abb15955 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -492,7 +492,7 @@
 			fileBaseListEntries: {
 				config: {
 					hashTagsSep: "|08, |07"
-					browseInfoFormat10: "|00|10{fileName} |08- |03{byteSize!sizeWithoutAbbr} |11{byteSize!sizeAbbr} |08- |03uploaded |11{uploadTimestamp}"
+					browseInfoFormat10: "|00|10{fileName:<.44} |08- |03{byteSize!sizeWithoutAbbr} |11{byteSize!sizeAbbr} |08- |03uploaded |11{uploadTimestamp}"
 					browseInfoFormat11: "|00|15{areaName}"				
 					browseInfoFormat12: "|00|07{hashTags}"
 					browseInfoFormat13: "|00|07{estReleaseYear}"
@@ -593,7 +593,7 @@
 			newScanFileBaseList: {
 				config: {
 					hashTagsSep: "|08, |07"
-					browseInfoFormat10: "|00|10{fileName} |08- |03{byteSize!sizeWithoutAbbr} |11{byteSize!sizeAbbr} |08- |03uploaded |11{uploadTimestamp}"
+					browseInfoFormat10: "|00|10{fileName:<44} |08- |03{byteSize!sizeWithoutAbbr} |11{byteSize!sizeAbbr} |08- |03uploaded |11{uploadTimestamp}"
 					browseInfoFormat11: "|00|15{areaName}"				
 					browseInfoFormat12: "|00|07{hashTags}"
 					browseInfoFormat13: "|00|07{estReleaseYear}"

From c99074ba2743934bfe3a2532a02c6cee41019b61 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 18:10:43 -0600
Subject: [PATCH 0355/1013] Remove empty MCI {} now that #167 is fixed

---
 config/menu.hjson | 52 +----------------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 1ee13d07..4f88f6df 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -818,17 +818,6 @@
 							]
 							focusItemIndex: 1
 						}
-
-						//	:TODO: these can be removed once the hack is not required:
-						TL10: {}
-						TL11: {}
-						TL12: {}
-						TL13: {}
-						TL14: {}
-						TL15: {}
-						TL16: {}
-						TL17: {}
-						TL18: {}
 					}
 					
 					submit: {
@@ -902,17 +891,6 @@
 								"general", "nfo/readme", "file listing"
 							]
 						}
-
-						//	:TODO: these can be removed once the hack is not required:
-						TL10: {}
-						TL11: {}
-						TL12: {}
-						TL13: {}
-						TL14: {}
-						TL15: {}
-						TL16: {}
-						TL17: {}
-						TL18: {}
 					}
 
 					actionKeys: [
@@ -2576,17 +2554,6 @@
 							]
 							focusItemIndex: 1
 						}
-
-						//	:TODO: these can be removed once the hack is not required:
-						TL10: {}
-						TL11: {}
-						TL12: {}
-						TL13: {}
-						TL14: {}
-						TL15: {}
-						TL16: {}
-						TL17: {}
-						TL18: {}
 					}
 					
 					submit: {
@@ -2668,17 +2635,6 @@
 								"general", "nfo/readme", "file listing"
 							]
 						}
-
-						//	:TODO: these can be removed once the hack is not required:
-						TL10: {}
-						TL11: {}
-						TL12: {}
-						TL13: {}
-						TL14: {}
-						TL15: {}
-						TL16: {}
-						TL17: {}
-						TL18: {}
 					}
 
 					actionKeys: [
@@ -3152,13 +3108,7 @@
 				}
 
 				1: {
-					mci: {
-						TL1: {}
-						TL2: {}
-						TL3: {}
-						MT4: {}
-						TL10: {}
-					}
+					mci: { }
 				}
 
 				//	file details entry

From 2fa9d6a3c28518e40417fc44bc6e597a2b80d654 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 19:09:08 -0600
Subject: [PATCH 0356/1013] Clean up a couple DEP0013 spots

---
 core/file_base_area.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 7d7ce6fb..faa2dc6a 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -280,12 +280,20 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
 }
 
 //  a simple log proxy for when we call from oputil.js
-function logDebug(obj, msg) {
+const logDebug = (obj, msg) => {
     if(Log) {
         Log.debug(obj, msg);
     }
 }
 
+const logError = (obj, msg) => {
+    if(Log) {
+        Log.error(obj, msg);
+    } else {
+        console.error(`${msg}: ${JSON.stringify(obj)}`);
+    }
+}
+
 function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
     async.waterfall(
         [
@@ -709,8 +717,12 @@ function scanFile(filePath, options, iterator, cb) {
                     const nextChunk = () => {
                         fs.read(fd, buffer, 0, chunkSize, null, (err, bytesRead) => {
                             if(err) {
-                                fs.close(fd);
-                                return readErrorCallIter(err, callback);
+                                return fs.close(fd, closeErr => {
+                                    if(closeErr) {
+                                        logError( { filePath, error : err.message }, 'Failed to close file');
+                                    }
+                                    return readErrorCallIter(err, callback);
+                                });
                             }
 
                             if(0 === bytesRead) {
@@ -729,8 +741,12 @@ function scanFile(filePath, options, iterator, cb) {
                                 }
 
                                 stepInfo.step = 'hash_finish';
-                                fs.close(fd);
-                                return callIter(callback);
+                                return fs.close(fd, closeErr => {
+                                    if(closeErr) {
+                                        logError( { filePath, error : err.message }, 'Failed to close file');
+                                    }
+                                    return callIter(callback);
+                                });
                             }
 
                             stepInfo.bytesProcessed     += bytesRead;

From fa100c2da154d51c15c9296ead1ddb03511681f8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 25 Jun 2018 19:25:07 -0600
Subject: [PATCH 0357/1013] Resolve TODO: set cwd when launching doors; allow
 user to set in config

---
 core/abracadabra.js | 1 +
 core/door.js        | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 48b80d65..676600e4 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -149,6 +149,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
         const exeInfo = {
             cmd             : this.config.cmd,
+            cwd             : this.config.cwd,  //  null/undefined=path of |cwd|
             args            : this.config.args,
             io              : this.config.io || 'stdio',
             encoding        : this.config.encoding || this.client.term.outputEncoding,
diff --git a/core/door.js b/core/door.js
index 79d79b22..5ad5855a 100644
--- a/core/door.js
+++ b/core/door.js
@@ -7,6 +7,7 @@ const { Errors }    = require('./enig_error.js');
 const pty           = require('node-pty');
 const decode        = require('iconv-lite').decode;
 const createServer  = require('net').createServer;
+const paths         = require('path');
 
 module.exports = class Door {
     constructor(client) {
@@ -55,12 +56,15 @@ module.exports = class Door {
             return cb(Errors.UnexpectedState('Socket server is not running'));
         }
 
+        const cwd = exeInfo.cwd || paths.dirname(exeInfo.cmd);
+
         const formatObj = {
             dropFile        : exeInfo.dropFile,
             dropFilePath    : exeInfo.dropFilePath,
             node            : exeInfo.node.toString(),
             srvPort         : this.sockServer ? this.sockServer.address().port.toString() : '-1',
             userId          : this.client.user.userId.toString(),
+            cwd             : cwd,
         };
 
         const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
@@ -68,7 +72,7 @@ module.exports = class Door {
         const door = pty.spawn(exeInfo.cmd, args, {
             cols        : this.client.term.termWidth,
             rows        : this.client.term.termHeight,
-            //  :TODO: cwd
+            cwd         : cwd,
             env         : exeInfo.env,
             encoding    : null, //  we want to handle all encoding ourself
         });

From a8e27b4cf5dde683dd52e32f8a0af9499d1fc2d5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 Jun 2018 22:39:36 -0600
Subject: [PATCH 0358/1013] Tabs -> Spaces

---
 util/exiftool2desc.js | 140 +++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/util/exiftool2desc.js b/util/exiftool2desc.js
index 4b3b350f..5299bcb5 100755
--- a/util/exiftool2desc.js
+++ b/util/exiftool2desc.js
@@ -20,96 +20,96 @@ const FILETYPE_HANDLERS = {};
 [ 'MP4', 'MOV', 'AVI', 'MKV', 'MPG', 'MPEG', 'M4V', 'WMV' ].forEach(ext => FILETYPE_HANDLERS[ext] = videoFile);
 
 function audioFile(metadata) {
-	//	nothing if we don't know at least the author or title
-	if(!metadata.author && !metadata.title) {
-		return;
-	}
-	
-	let desc = `${metadata.artist||'Unknown Artist'} - ${metadata.title||'Unknown'} (`;
-	if(metadata.year) {
-		desc += `${metadata.year}, `;
-	}
-	desc += `${metadata.audioBitrate})`;
-	return desc;
+    //	nothing if we don't know at least the author or title
+    if(!metadata.author && !metadata.title) {
+        return;
+    }
+
+    let desc = `${metadata.artist||'Unknown Artist'} - ${metadata.title||'Unknown'} (`;
+    if(metadata.year) {
+        desc += `${metadata.year}, `;
+    }
+    desc += `${metadata.audioBitrate})`;
+    return desc;
 }
 
 function videoFile(metadata) {
-	return `${metadata.fileType} video(${metadata.imageSize}px, ${metadata.duration}, ${metadata.audioBitsPerSample}/${metadata.audioSampleRate} audio)`;
+    return `${metadata.fileType} video(${metadata.imageSize}px, ${metadata.duration}, ${metadata.audioBitsPerSample}/${metadata.audioSampleRate} audio)`;
 }
 
 function documentFile(metadata) {
-	//	nothing if we don't know at least the author or title
-	if(!metadata.author && !metadata.title) {
-		return;
-	}
+    //	nothing if we don't know at least the author or title
+    if(!metadata.author && !metadata.title) {
+        return;
+    }
 
-	let result = metadata.author || '';
-	if(result) {
-		result += ' - ';
-	}
-	result += metadata.title || 'Unknown Title';
-	return result;
+    let result = metadata.author || '';
+    if(result) {
+        result += ' - ';
+    }
+    result += metadata.title || 'Unknown Title';
+    return result;
 }
 
 function imageFile(metadata) {
-	let desc = `${metadata.fileType} image (`;
-	if(metadata.animationIterations) {
-		desc += 'Animated, ';
-	}
-	desc += `${metadata.imageSize}px`;
-	const created = moment(metadata.createdate);
-	if(created.isValid()) {
-		desc += `, ${created.format('YYYY')})`;
-	} else {
-		desc += ')';
-	}
-	return desc;
+    let desc = `${metadata.fileType} image (`;
+    if(metadata.animationIterations) {
+        desc += 'Animated, ';
+    }
+    desc += `${metadata.imageSize}px`;
+    const created = moment(metadata.createdate);
+    if(created.isValid()) {
+        desc += `, ${created.format('YYYY')})`;
+    } else {
+        desc += ')';
+    }
+    return desc;
 }
 
 function main() {
-	const argv = exports.argv = require('minimist')(process.argv.slice(2), {
-		alias : {
-			h		: 'help',
-			v		: 'version',			
-		}
-	});
+    const argv = exports.argv = require('minimist')(process.argv.slice(2), {
+        alias : {
+            h		: 'help',
+            v		: 'version',
+        }
+    });
 
-	if(argv.version) {
-		console.info(TOOL_VERSION);
-		return 0;
-	}
+    if(argv.version) {
+        console.info(TOOL_VERSION);
+        return 0;
+    }
 
-	if(0 === argv._.length || argv.help) {
-		console.info('usage: exiftool2desc.js [--version] [--help] PATH');
-		return 0;
-	}
+    if(0 === argv._.length || argv.help) {
+        console.info('usage: exiftool2desc.js [--version] [--help] PATH');
+        return 0;
+    }
 
-	const path = argv._[0];
+    const path = argv._[0];
 
-	fs.readFile(path, (err, data) => {
-		if(err) {
-			return -1;
-		}
+    fs.readFile(path, (err, data) => {
+        if(err) {
+            return -1;
+        }
 
-		exiftool.metadata(data, (err, metadata) => {
-			if(err) {
-				return -1;				
-			}
+        exiftool.metadata(data, (err, metadata) => {
+            if(err) {
+                return -1;
+            }
 
-			const handler = FILETYPE_HANDLERS[metadata.fileType];
-			if(!handler) {
-				return -1;
-			}
-			
-			const info = handler(metadata);
-			if(!info) {
-				return -1;
-			}
+            const handler = FILETYPE_HANDLERS[metadata.fileType];
+            if(!handler) {
+                return -1;
+            }
 
-			console.info(info);
-			return 0;
-		});
-	});
+            const info = handler(metadata);
+            if(!info) {
+                return -1;
+            }
+
+            console.info(info);
+            return 0;
+        });
+    });
 }
 
 return main();
\ No newline at end of file

From b6e7ecb193cf39ed33757b067a625ea439bf999c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 Jun 2018 22:40:13 -0600
Subject: [PATCH 0359/1013] Atari Disk Image (.atr) support via (modified for
 now; PR open) atr tool

---
 core/config.js | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 1e69b6ef..e425bdfa 100644
--- a/core/config.js
+++ b/core/config.js
@@ -319,7 +319,7 @@ function getDefaultConfig() {
                 //  http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html
                 cmd     : 'xdms',
                 args    : [ 'f', '{filePath}' ]
-            }
+            },
         },
 
         fileTypes : {
@@ -460,6 +460,12 @@ function getDefaultConfig() {
                     ext             : '.dms',
                     shortDescUtil   : 'XDMS2Desc',
                     longDescUtil    : 'XDMS2LongDesc',
+                },
+                {
+                    desc            : 'SIO2PC Atari Disk Image',
+                    sig             : '9602',   //  16bit sum of "NICKATARI"
+                    ext             : '.atr',
+                    archiveHandler  : 'Atr',
                 }
             ]
         },
@@ -581,6 +587,26 @@ function getDefaultConfig() {
                         cmd         : 'tar',
                         args        : [ '-xvf', '{archivePath}', '-C', '{extractPath}', '{fileList}' ],
                     }
+                },
+
+                Atr : {
+                    decompress      : {
+                        cmd         : 'atr',
+                        args        : [ '{archivePath}', 'x', '-a', '-o', '{extractPath}' ]
+                    },
+                    list            : {
+                        cmd         : 'atr',
+                        args        : [ '{archivePath}', 'ls', '-la1' ],
+                        entryMatch  : '^[rwxs-]{5}\\s+([0-9]+)\\s\\([0-9\\s]+\\)\\s([^\\r\\n\\s]*)(?:[^\\r\\n]+)?$',
+                    },
+                    extract         : {
+                        cmd         : 'atr',
+                        //  :TODO: If text, we need to ensure to normalize
+                        //  :TODO: can only do a single file & need full path. May need e.g. {fileName}, '{extractPath}\{fileName}' ???
+                        //  ....create a small wrapper .js: atrex.js --extract {archivePath} --to {extractPath}
+                        //  note: -l converts Atari 0x9b line feeds to 0x0a; not ideal if we're dealing with a binary of course.
+                        args        : [ '{archivePath}', 'x', '-a', '-o', '{extractPath}', '{fileList}' ]
+                    }
                 }
             },
         },

From 2cef12f47e4d090e1c1fa1a1ba3ed80d9ca6d5d8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 Jun 2018 23:04:03 -0600
Subject: [PATCH 0360/1013] * Fix file descriptor leak * Allow noWatch init
 (e.g. for oputil)

---
 core/archive_util.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 32425eaa..6a58f935 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -50,19 +50,21 @@ module.exports = class ArchiveUtil {
     }
 
     //  singleton access
-    static getInstance() {
+    static getInstance(noWatch = false) {
         if(!archiveUtil) {
             archiveUtil = new ArchiveUtil();
-            archiveUtil.init();
+            archiveUtil.init(noWatch);
         }
         return archiveUtil;
     }
 
-    init() {
+    init(noWatch = false) {
         this.reloadConfig();
-        Events.on(Events.getSystemEvents().ConfigChanged, () => {
-            this.reloadConfig();
-        });
+        if(!noWatch) {
+            Events.on(Events.getSystemEvents().ConfigChanged, () => {
+                this.reloadConfig();
+            });
+        }
     }
 
     reloadConfig() {
@@ -147,6 +149,10 @@ module.exports = class ArchiveUtil {
     */
 
     detectType(path, cb) {
+        const closeFile = (fd) => {
+            fs.close(fd, () => { /* sadface */ });
+        };
+
         fs.open(path, 'r', (err, fd) => {
             if(err) {
                 return cb(err);
@@ -155,6 +161,7 @@ module.exports = class ArchiveUtil {
             const buf = Buffer.alloc(this.longestSignature);
             fs.read(fd, buf, 0, buf.length, 0, (err, bytesRead) => {
                 if(err) {
+                    closeFile(fd);
                     return cb(err);
                 }
 
@@ -176,6 +183,7 @@ module.exports = class ArchiveUtil {
                     });
                 });
 
+                closeFile(fd);
                 return cb(archFormat ? null : Errors.General('Unknown type'), archFormat);
             });
         });

From 35c5c5dd0fcca45a79ddb3382230a82091adba88 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 Jun 2018 23:04:31 -0600
Subject: [PATCH 0361/1013] Init ArchiveUtil with noWatch

---
 core/oputil/oputil_common.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index 13f9ec91..90328b07 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -67,6 +67,11 @@ function initConfigAndDatabases(cb) {
             function initDb(callback) {
                 db.initializeDatabases(callback);
             },
+            function initArchiveUtil(callback) {
+                //  ensure we init ArchiveUtil without events
+                require('../../core/archive_util').getInstance(true);  //  true=noWatch
+                return callback(null);
+            }
         ],
         err => {
             return cb(err);

From c894ed17ecdcf4e9b0a480d783e6407faa6c7081 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 Jun 2018 11:55:13 -0600
Subject: [PATCH 0362/1013] Convert line endings when using Atr

---
 core/config.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/config.js b/core/config.js
index e425bdfa..92016731 100644
--- a/core/config.js
+++ b/core/config.js
@@ -601,11 +601,8 @@ function getDefaultConfig() {
                     },
                     extract         : {
                         cmd         : 'atr',
-                        //  :TODO: If text, we need to ensure to normalize
-                        //  :TODO: can only do a single file & need full path. May need e.g. {fileName}, '{extractPath}\{fileName}' ???
-                        //  ....create a small wrapper .js: atrex.js --extract {archivePath} --to {extractPath}
                         //  note: -l converts Atari 0x9b line feeds to 0x0a; not ideal if we're dealing with a binary of course.
-                        args        : [ '{archivePath}', 'x', '-a', '-o', '{extractPath}', '{fileList}' ]
+                        args        : [ '{archivePath}', 'x', '-a', '-l', '-o', '{extractPath}', '{fileList}' ]
                     }
                 }
             },

From 7c741481e1222ce11cf055ea367d5357f438f7de Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 Jun 2018 13:03:08 -0600
Subject: [PATCH 0363/1013] Much improved getDescFromFileName()

---
 core/file_base_area.js | 45 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index faa2dc6a..384d4e36 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -916,11 +916,48 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
 }
 
 function getDescFromFileName(fileName) {
-    //  :TODO: this method could use some more logic to really be nice.
-    const ext   = paths.extname(fileName);
-    const name  = paths.basename(fileName, ext);
+    //
+    //  Example filenames:
+    //
+    //  input                                                               desired output
+    //  -----------------------------------------------------------------------------------------
+    //  Nintendo_Power_Issue_011_March-April_1990.cbr                       Nintendo Power Issue 011 March-April 1990
+    //  Atari User Issue 3 (July 1985).pdf                                  Atari User Issue 3 (July 1985)
+    //  Out_Of_The_Shadows_010__1953_.cbz                                   Out Of The Shadows 010 1953
+    //  ABC A Basic Compiler 1.03 [pro].atr                                 ABC A Basic Compiler 1.03 [pro]
+    //  221B Baker Street v1.0 (1987)(Datasoft)(Side B)[cr The Bounty].zip  221B Baker Street v1.0 (1987)(Datasoft)(Side B)[cr the Bounty]
+    //
+    //  See also:
+    //  * https://scenerules.org/
+    //
 
-    return _.upperFirst(name.replace(/[-_.+]/g, ' ').replace(/\s+/g, ' '));
+    const ext       = paths.extname(fileName);
+    const name      = paths.basename(fileName, ext);
+    const asIsRe    = /([vV]?(?:[0-9]{1,4})(?:\.[0-9]{1,4})+[-+]?(?:[a-z]{1,4})?)|(Incl\.)|(READ\.NFO)/g;
+
+    const normalize = (s) => {
+        return _.upperFirst(s.replace(/[-_.+]/g, ' ').replace(/\s+/g, ' '));
+    };
+
+    let out = '';
+    let m;
+    let pos;
+    do {
+        pos = asIsRe.lastIndex;
+        m = asIsRe.exec(name);
+        if(m) {
+            if(m.index > pos) {
+                out += normalize(name.slice(pos, m.index));
+            }
+            out += m[0];    //  as-is
+        }
+    } while(0 != asIsRe.lastIndex);
+
+    if(pos < name.length) {
+        out += normalize(name.slice(pos));
+    }
+
+    return out;
 }
 
 //

From a9e2551ae55859e0d2274740218356dae38293d4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 Jun 2018 16:52:54 -0600
Subject: [PATCH 0364/1013] Spelling

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e4b76e9c..0b70f71b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * [Door support](docs/modding/door-servers.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging
  * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export. Messages Bases can also be set to read-only viewable using a built in Gopher server!
- * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
+ * [Gazelle](https://github.com/WhatCD/Gazelle) inspired File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on
  
diff --git a/docs/index.md b/docs/index.md
index a49f8ab1..b19f1b7d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -22,6 +22,6 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * [Door support](docs/doors.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging
  * [Message networks](docs/msg_networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export
- * [Gazelle](https://github.com/WhatCD/Gazelle) inspirted File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/web_server.md). Legacy X/Y/Z modem also supported!
+ * [Gazelle](https://github.com/WhatCD/Gazelle) inspired File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/web_server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on

From f4afe9847d8f7e1487d99b127ac56be5541dd243 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 2 Jul 2018 19:32:27 -0600
Subject: [PATCH 0365/1013] Handle bad config.hjson at startup/re-cache: output
 to stderr

---
 core/bbs.js    | 22 ++++++++++++----------
 core/config.js |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 86134c38..4436eb02 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -75,10 +75,10 @@ function main() {
                                 configPathSupplied = null;  //  make non-fatal; we'll go with defaults
                             }
                         } else {
-                            console.error(err.toString());
+                            console.error(err.message);
                         }
                     }
-                    callback(err);
+                    return callback(err);
                 });
             },
             function initSystem(callback) {
@@ -91,14 +91,16 @@ function main() {
             }
         ],
         function complete(err) {
-            //  note this is escaped:
-            fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
-                console.info(FULL_COPYRIGHT);
-                if(!err) {
-                    console.info(banner);
-                }
-                console.info('System started!');
-            });
+            if(!err) {
+                //  note this is escaped:
+                fs.readFile(paths.join(__dirname, '../misc/startup_banner.asc'), 'utf8', (err, banner) => {
+                    console.info(FULL_COPYRIGHT);
+                    if(!err) {
+                        console.info(banner);
+                    }
+                    console.info('System started!');
+                });
+            }
 
             if(err) {
                 console.error('Error initializing: ' + util.inspect(err));
diff --git a/core/config.js b/core/config.js
index 92016731..6d5251a3 100644
--- a/core/config.js
+++ b/core/config.js
@@ -100,6 +100,8 @@ function init(configPath, options, cb) {
                         Events.emit(Events.getSystemEvents().ConfigChanged);
                     }
                 });
+            } else {
+                console.stdout(`Configuration ${reCachedPath} is invalid: ${err.message}`); //  eslint-disable-line no-console
             }
         });
     };

From 0f6924a9165a066ff248d846d782092b32046509 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 14:59:15 -0600
Subject: [PATCH 0366/1013] XY MCI code now properly c reates vanilla view for
 later lookup/retrieval

---
 core/mci_view_factory.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index 86246d45..85c440e5 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -3,6 +3,7 @@
 
 //  ENiGMA½
 const TextView              = require('./text_view.js').TextView;
+const View                  = require('./view.js').View;
 const EditTextView          = require('./edit_text_view.js').EditTextView;
 const ButtonView            = require('./button_view.js').ButtonView;
 const VerticalMenuView      = require('./vertical_menu_view.js').VerticalMenuView;
@@ -186,6 +187,10 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
             view = new KeyEntryView(options);
             break;
 
+        case 'XY' :
+            view = new View(options);
+            break;
+
         default :
             options.text = getPredefinedMCIValue(this.client, mci.code);
             if(_.isString(options.text)) {

From 8922bb66834c0e9cb66da5caad30ed00fa63c11b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 17:58:38 -0600
Subject: [PATCH 0367/1013] Catch exception if we try to log due to
 config.hjson error

---
 core/config_cache.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/config_cache.js b/core/config_cache.js
index e8e06f14..62c6bb55 100644
--- a/core/config_cache.js
+++ b/core/config_cache.js
@@ -62,7 +62,11 @@ module.exports = new class ConfigCache
                 parsed = hjson.parse(data);
                 this.cache.set(path, parsed);
             } catch(e) {
-                require('./logger.js').log.error( { filePath : path, error : e.message }, 'Failed to re-cache' );
+                try {
+                    require('./logger.js').log.error( { filePath : path, error : e.message }, 'Failed to re-cache' );
+                } catch(ignored) {
+                    //  nothing - we may be failing to parse the config in which we can't log here!
+                }
                 return cb(e);
             }
 

From e24511678d92949548da4718421495f73ebffb51 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:42:59 -0600
Subject: [PATCH 0368/1013] Ensure 'tag' exists

---
 core/scanner_tossers/ftn_bso.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 2e08b6e2..f20e61ea 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -114,7 +114,7 @@ function FTNMessageScanTossModule() {
     this.getLocalAreaTagByFtnAreaTag = function(ftnAreaTag) {
         ftnAreaTag = ftnAreaTag.toUpperCase();  //  always compare upper
         return _.findKey(Config().messageNetworks.ftn.areas, areaConf => {
-            return areaConf.tag.toUpperCase() === ftnAreaTag;
+            return _.isString(areaConf.tag) && areaConf.tag.toUpperCase() === ftnAreaTag;
         });
     };
 

From fbffe2873c7398e8dff4f78edc4d8028e988b62a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:43:40 -0600
Subject: [PATCH 0369/1013] * ansiPrepOptions support for displaying art *
 simplify proxy of options along call path * general improvements

---
 core/theme.js | 94 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 39 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index ebdcf1ca..c7a2b06d 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -12,6 +12,7 @@ const ViewController    = require('./view_controller.js').ViewController;
 const Errors            = require('./enig_error.js').Errors;
 const ErrorReasons      = require('./enig_error.js').ErrorReasons;
 const Events            = require('./events.js');
+const AnsiPrep          = require('./ansi_prep.js');
 
 const fs                = require('graceful-fs');
 const paths             = require('path');
@@ -511,26 +512,47 @@ function displayThemeArt(options, cb) {
     assert(_.isObject(options.client));
     assert(_.isString(options.name));
 
-    getThemeArt(options, (err, artInfo) => {
-        if(err) {
-            return cb(err);
+    async.waterfall(
+        [
+            function getArt(callback) {
+                return getThemeArt(options, callback);
+            },
+            function prepWork(artInfo, callback) {
+                if(_.isObject(options.ansiPrepOptions)) {
+                    AnsiPrep(
+                        artInfo.data,
+                        options.ansiPrepOptions,
+                        (err, prepped) => {
+                            if(!err && prepped) {
+                                artInfo.data = prepped;
+                                return callback(null, artInfo);
+                            }
+                        }
+                    );
+                } else {
+                    return callback(null, artInfo);
+                }
+            },
+            function disp(artInfo, callback) {
+                const displayOpts = {
+                    sauce       : artInfo.sauce,
+                    font        : options.font,
+                    trailingLF  : options.trailingLF,
+                };
+                art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
+                    return callback(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
+                });
+            }
+        ],
+        (err, artData) => {
+            return cb(err, artData);
         }
-        //  :TODO: just use simple merge of options -> displayOptions
-        const displayOpts = {
-            sauce       : artInfo.sauce,
-            font        : options.font,
-            trailingLF  : options.trailingLF,
-        };
-
-        art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
-            return cb(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
-        });
-    });
+    );
 }
 
 function displayThemedPrompt(name, client, options, cb) {
 
-    const useTempViewController = _.isUndefined(options.viewController);
+    const usingTempViewController = _.isUndefined(options.viewController);
 
     async.waterfall(
         [
@@ -549,8 +571,8 @@ function displayThemedPrompt(name, client, options, cb) {
                 //  doing so messes things up -- most terminals that support font
                 //  changing can only display a single font at at time.
                 //
+                const dispOptions = Object.assign( {}, options, promptConfig.options );
                 //  :TODO: We can use term detection to do nifty things like avoid this kind of kludge:
-                const dispOptions = Object.assign( {}, promptConfig.options );
                 if(!options.clearScreen) {
                     dispOptions.font = 'not_really_a_font!';    //  kludge :)
                 }
@@ -582,28 +604,29 @@ function displayThemedPrompt(name, client, options, cb) {
                 client.term.rawWrite(ansi.queryPos());
             },
             function createMCIViews(promptConfig, artInfo, callback) {
-                const tempViewController = useTempViewController ? new ViewController( { client : client } ) : options.viewController;
+                const assocViewController = usingTempViewController ? new ViewController( { client : client } ) : options.viewController;
 
                 const loadOpts = {
-                    promptName  : name,
-                    mciMap      : artInfo.mciMap,
-                    config      : promptConfig,
+                    promptName      : name,
+                    mciMap          : artInfo.mciMap,
+                    config          : promptConfig,
+                    submitNotify    : options.submitNotify,
                 };
 
-                tempViewController.loadFromPromptConfig(loadOpts, () => {
-                    return callback(null, artInfo, tempViewController);
+                assocViewController.loadFromPromptConfig(loadOpts, () => {
+                    return callback(null, artInfo, assocViewController);
                 });
             },
-            function pauseForUserInput(artInfo, tempViewController, callback) {
+            function pauseForUserInput(artInfo, assocViewController, callback) {
                 if(!options.pause) {
-                    return callback(null, artInfo, tempViewController);
+                    return callback(null, artInfo, assocViewController);
                 }
 
                 client.waitForKeyPress( () => {
-                    return callback(null, artInfo, tempViewController);
+                    return callback(null, artInfo, assocViewController);
                 });
             },
-            function clearPauseArt(artInfo, tempViewController, callback) {
+            function clearPauseArt(artInfo, assocViewController, callback) {
                 if(options.clearPrompt) {
                     if(artInfo.startRow && artInfo.height) {
                         client.term.rawWrite(ansi.goto(artInfo.startRow, 1));
@@ -615,19 +638,19 @@ function displayThemedPrompt(name, client, options, cb) {
                     }
                 }
 
-                return callback(null, tempViewController);
+                return callback(null, assocViewController, artInfo);
             }
         ],
-        (err, tempViewController) => {
+        (err, assocViewController, artInfo) => {
             if(err) {
                 client.log.warn( { error : err.message }, `Failed displaying "${name}" prompt` );
             }
 
-            if(tempViewController && useTempViewController) {
-                tempViewController.detachClientEvents();
+            if(assocViewController && usingTempViewController) {
+                assocViewController.detachClientEvents();
             }
 
-            return cb(null);
+            return cb(null, artInfo);
         }
     );
 }
@@ -668,14 +691,7 @@ function displayThemedAsset(assetSpec, client, options, cb) {
         return cb(new Error('Asset not found: ' + assetSpec));
     }
 
-    //  :TODO: just use simple merge of options -> displayOptions
-    var dispOpts = {
-        name            : artAsset.asset,
-        client          : client,
-        font            : options.font,
-        trailingLF      : options.trailingLF,
-    };
-
+    const dispOpts = Object.assign( {}, options, { client, name : artAsset.asset } );
     switch(artAsset.type) {
         case 'art' :
             displayThemeArt(dispOpts, function displayed(err, artData) {

From 3e06e2fa6bf0a7da0cd455f4e8187b138091ae56 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:45:14 -0600
Subject: [PATCH 0370/1013] + promptForInput() support * removeViewController()
 support

---
 core/menu_module.js | 56 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 2a3bf23b..8c7516f6 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -194,6 +194,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
         return vc;
     }
 
+    removeViewController(name) {
+        if(this.viewControllers[name]) {
+            this.viewControllers[name].detachClientEvents();
+            delete this.viewControllers[name];
+        }
+    }
+
     detachViewControllers() {
         Object.keys(this.viewControllers).forEach( name => {
             this.viewControllers[name].detachClientEvents();
@@ -370,21 +377,56 @@ exports.MenuModule = class MenuModule extends PluginModule {
         return theme.displayThemedPause(this.client, cb);
     }
 
-    /*
-    :TODO: this needs quite a bit of work - but would be nice: promptForInput(..., (err, formData) => ... )
-    promptForInput(formName, name, options, cb) {
+    promptForInput( { formName, formId, promptName, prevFormName, position } = {}, options, cb) {
         if(!cb && _.isFunction(options)) {
             cb = options;
             options = {};
         }
 
-        options.viewController = this.viewControllers[formName];
+        options.viewController = this.addViewController(
+            formName,
+            new ViewController( { client : this.client, formId } )
+        );
 
-        this.optionalMoveToPosition(options.position);
+        options.trailingLF = _.get(options, 'trailingLF', false);
 
-        return theme.displayThemedPrompt(name, this.client, options, cb);
+        let prevVc;
+        if(prevFormName) {
+            prevVc = this.viewControllers[prevFormName];
+            if(prevVc) {
+                prevVc.setFocus(false);
+            }
+        }
+
+        //let artHeight;
+        options.submitNotify = () => {
+            if(prevVc) {
+                prevVc.setFocus(true);
+            }
+            this.removeViewController(formName);
+            if(options.clearAtSubmit) {
+                this.optionalMoveToPosition(position);
+                if(options.clearWidth) {
+                    this.client.term.rawWrite(`${ansi.reset()}${' '.repeat(options.clearWidth)}`);
+                } else {
+                    //  :TODO: handle multi-rows via artHeight
+                    this.client.term.rawWrite(ansi.eraseLine());
+                }
+            }
+        };
+
+        options.viewController.setFocus(true);
+
+        this.optionalMoveToPosition(position);
+        theme.displayThemedPrompt(promptName, this.client, options, (err, artInfo) => {
+            /*
+            if(artInfo) {
+                artHeight = artInfo.height;
+            }
+            */
+            return cb(err, artInfo);
+        });
     }
-    */
 
     setViewText(formName, mciId, text, appendMultiLine) {
         const view = this.viewControllers[formName].getView(mciId);

From ab9ffc715a7740a364b0f0e589527dc0e708b8ae Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:46:40 -0600
Subject: [PATCH 0371/1013] * Cleaner action block discovery for 'submit' *
 Allow "embedded" prompts to use form action matching

---
 core/view_controller.js | 87 +++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 37 deletions(-)

diff --git a/core/view_controller.js b/core/view_controller.js
index 0df09084..cd0dd3b0 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -32,15 +32,17 @@ function ViewController(options) {
     this.formId         = options.formId || 0;
     this.mciViewFactory = new MCIViewFactory(this.client);  //  :TODO: can this not be a singleton?
     this.noInput        = _.isBoolean(options.noInput) ? options.noInput : false;
-
     this.actionKeyMap   = {};
 
     //
     //  Small wrapper/proxy around handleAction() to ensure we do not allow
     //  input/additional actions queued while performing an action
     //
-    this.handleActionWrapper = function(formData, actionBlock) {
+    this.handleActionWrapper = function(formData, actionBlock, cb) {
         if(self.waitActionCompletion) {
+            if(cb) {
+                return cb(null);
+            }
             return; //  ignore until this is finished!
         }
 
@@ -56,6 +58,9 @@ function ViewController(options) {
             }
 
             self.waitActionCompletion = false;
+            if(cb) {
+                return cb(null);
+            }
         });
     };
 
@@ -570,34 +575,51 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
                     self.on('submit', function promptSubmit(formData) {
                         self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Prompt submit');
 
+                        const doSubmitNotify = () => {
+                            if(options.submitNotify) {
+                                options.submitNotify();
+                            }
+                        };
+
+                        const handleIt = (fd, conf) => {
+                            self.handleActionWrapper(fd, conf, () => {
+                                doSubmitNotify();
+                            });
+                        };
+
                         if(_.isString(self.client.currentMenuModule.menuConfig.action)) {
-                            self.handleActionWrapper(formData, self.client.currentMenuModule.menuConfig);
+                            handleIt(formData, self.client.currentMenuModule.menuConfig);
                         } else {
                             //
-                            //  Menus that reference prompts can have a sepcial "submit" block without the
+                            //  Menus that reference prompts can have a special "submit" block without the
                             //  hassle of by-form-id configurations, etc.
                             //
                             //  "submit" : [
                             //      { ... }
                             //  ]
                             //
-                            var menuSubmit = self.client.currentMenuModule.menuConfig.submit;
-                            if(!_.isArray(menuSubmit)) {
-                                self.client.log.debug('No configuration to handle submit');
-                                return;
+                            const menuConfig = self.client.currentMenuModule.menuConfig;
+                            let submitConf;
+                            if(Array.isArray(menuConfig.submit)) {    //  standalone prompts)) {
+                                submitConf = menuConfig.submit;
+                            } else {
+                                //  look for embedded prompt configurations - using their own form ID within the menu
+                                submitConf =
+                                    _.get(menuConfig, [ 'form', formData.id, 'submit', formData.submitId ]) ||
+                                    _.get(menuConfig, [ 'form', formData.id, 'submit', '*' ]);
                             }
 
-                            //
-                            //  Locate matching action block
-                            //
-                            //  :TODO: this is basically the same as for menus -- DRY it up!
-                            for(var c = 0; c < menuSubmit.length; ++c) {
-                                var actionBlock = menuSubmit[c];
+                            if(!Array.isArray(submitConf)) {
+                                doSubmitNotify();
+                                return self.client.log.debug('No configuration to handle submit');
+                            }
 
-                                if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
-                                    self.handleActionWrapper(formData, actionBlock);
-                                    break;  //  there an only be one...
-                                }
+                            //  locate any matching action block
+                            const actionBlock = submitConf.find(actionBlock => _.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator));
+                            if(actionBlock) {
+                                handleIt(formData, actionBlock);
+                            } else {
+                                doSubmitNotify();
                             }
                         }
                     });
@@ -732,27 +754,18 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                     //
                     //  Locate configuration for this form ID
                     //
-                    var confForFormId;
-                    if(_.isObject(formConfig.submit[formData.submitId])) {
-                        confForFormId = formConfig.submit[formData.submitId];
-                    } else if(_.isObject(formConfig.submit['*'])) {
-                        confForFormId = formConfig.submit['*'];
-                    } else {
-                        //  no configuration for this submitId
-                        self.client.log.debug( { formId : formData.submitId }, 'No configuration for form ID');
-                        return;
+                    const confForFormId =
+                        _.get(formConfig, [ 'submit', formData.submitId ]) ||
+                        _.get(formConfig, [ 'submit', '*' ]);
+
+                    if(!Array.isArray(confForFormId)) {
+                        return self.client.log.debug( { formId : formData.submitId }, 'No configuration for form ID');
                     }
 
-                    //
-                    //  Locate a matching action block based on the submitted data
-                    //
-                    for(var c = 0; c < confForFormId.length; ++c) {
-                        var actionBlock = confForFormId[c];
-
-                        if(_.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator)) {
-                            self.handleActionWrapper(formData, actionBlock);
-                            break;  //  there an only be one...
-                        }
+                    //  locate a matching action block, if any
+                    const actionBlock = confForFormId.find(actionBlock => _.isEqualWith(formData.value, actionBlock.value, self.actionBlockValueComparator));
+                    if(actionBlock) {
+                        self.handleActionWrapper(formData, actionBlock);
                     }
                 });
 

From 514edb984fdd9a4078b49ccb4baa5f8409c806dc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:47:58 -0600
Subject: [PATCH 0372/1013] + userHasDeleteRights() + deleteMessage()

---
 core/message.js | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/core/message.js b/core/message.js
index 53b82e73..768cd116 100644
--- a/core/message.js
+++ b/core/message.js
@@ -137,6 +137,32 @@ module.exports = class Message {
         return null !== _.get(this, 'meta.System.remote_from_user', null);
     }
 
+    /*
+    :TODO: finish me
+    static checkUserHasDeleteRights(user, messageIdOrUuid, cb) {
+        const isMessageId = _.isNumber(messageIdOrUuid);
+        const getMetaName = isMessageId ? 'getMetaValuesByMessageId' : 'getMetaValuesByMessageUuid';
+
+        Message[getMetaName](messageIdOrUuid, 'System', Message.SystemMetaNames.LocalToUserID, (err, localUserId) => {
+            if(err) {
+                return cb(err);
+            }
+
+            //  expect single value
+            if(!_.isString(localUserId)) {
+                return cb(Errors.Invalid(`Invalid ${Message.SystemMetaNames.LocalToUserID} value: ${localUserId}`));
+            }
+
+            localUserId = parseInt(localUserId);
+        });
+    }
+    */
+
+    userHasDeleteRights(user) {
+        const messageLocalUserId = parseInt(this.meta.System[Message.SystemMetaNames.LocalToUserID]);
+        return (this.isPrivate() && user.userId === messageLocalUserId) || user.isSysOp();
+    }
+
     static get WellKnownAreaTags() {
         return WELL_KNOWN_AREA_TAGS;
     }
@@ -660,6 +686,21 @@ module.exports = class Message {
         );
     }
 
+    deleteMessage(requestingUser, cb) {
+        if(!this.userHasDeleteRights(requestingUser)) {
+            return cb(Errors.AccessDenied('User does not have rights to delete this message'));
+        }
+
+        msgDb.run(
+            `DELETE FROM message
+            WHERE message_uuid = ?;`,
+            [ this.messageUuid ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
     //  :TODO: FTN stuff doesn't have any business here
     getFTNQuotePrefix(source) {
         source = source || 'fromUserName';

From 2408d4c5c0017d5c9287b8e47343b0ad54d1b372 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:48:35 -0600
Subject: [PATCH 0373/1013] Fixes around render cache

---
 core/menu_view.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/menu_view.js b/core/menu_view.js
index 73e56a4a..d9016153 100644
--- a/core/menu_view.js
+++ b/core/menu_view.js
@@ -102,6 +102,8 @@ MenuView.prototype.setItems = function(items) {
         if(this.complexItems) {
             this.itemFormat = this.itemFormat || '{text}';
         }
+
+        this.invalidateRenderCache();
     }
 };
 
@@ -110,11 +112,19 @@ MenuView.prototype.getRenderCacheItem = function(index, focusItem = false) {
     return item && item[focusItem ? 'focus' : 'standard'];
 };
 
+MenuView.prototype.removeRenderCacheItem = function(index) {
+    delete this.renderCache[index];
+};
+
 MenuView.prototype.setRenderCacheItem = function(index, rendered, focusItem = false) {
     this.renderCache[index] = this.renderCache[index] || {};
     this.renderCache[index][focusItem ? 'focus' : 'standard'] = rendered;
 };
 
+MenuView.prototype.invalidateRenderCache = function() {
+    this.renderCache = {};
+};
+
 MenuView.prototype.setSort = function(sort) {
     if(this.sorted || !Array.isArray(this.items) || 0 === this.items.length) {
         return;
@@ -152,6 +162,8 @@ MenuView.prototype.removeItem = function(index) {
         this.focusedItemIndex = Math.max(this.focusedItemIndex - 1, 0);
     }
 
+    this.removeRenderCacheItem(index);
+
     this.positionCacheExpired = true;
 };
 

From 0d55daabe48ea3142b8c96d4e88d813b439c5193 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:49:03 -0600
Subject: [PATCH 0374/1013] Ability to delete private (aka inbox) messages

---
 core/msg_list.js | 162 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 130 insertions(+), 32 deletions(-)

diff --git a/core/msg_list.js b/core/msg_list.js
index a4eb18aa..05b48ab9 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -7,6 +7,8 @@ const ViewController                = require('./view_controller.js').ViewContro
 const messageArea                   = require('./message_area.js');
 const stringFormat                  = require('./string_format.js');
 const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
+const Errors                        = require('./enig_error.js').Errors;
+const Message                       = require('./message.js');
 
 //  deps
 const async             = require('async');
@@ -14,7 +16,7 @@ const _                 = require('lodash');
 const moment            = require('moment');
 
 /*
-    Available listFormat/focusListFormat members (VM1):
+    Available listFormat/focusListFormat members for |msgList|
 
     msgNum          : Message number
     to              : To username/handle
@@ -22,22 +24,28 @@ const moment            = require('moment');
     subj            : Subject
     ts              : Message mod timestamp (format with config.dateTimeFormat)
     newIndicator    : New mark/indicator (config.newIndicator)
-
-    MCI codes:
-
-    VM1         : Message list
-    TL2         : Message info 1: { msgNumSelected, msgNumTotal }
 */
-
 exports.moduleInfo = {
     name    : 'Message List',
     desc    : 'Module for listing/browsing available messages',
     author  : 'NuSkooler',
 };
 
+const FormIds = {
+    allViews    : 0,
+    delPrompt   : 1,
+};
+
 const MciViewIds = {
-    msgList         : 1,    //  VM1
-    msgInfo1        : 2,    //  TL2
+    allViews : {
+        msgList             : 1,    //  VM1 - see above
+        delPromptXy         : 2,    //  %XY2, e.g: delete confirmation
+        customRangeStart    : 10,   //  Everything |msgList| has plus { msgNumSelected, msgNumTotal }
+    },
+
+    delPrompt: {
+        prompt  : 1,
+    }
 };
 
 exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(MenuModule) {
@@ -51,7 +59,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
         this.menuMethods = {
             selectMessage : (formData, extraArgs, cb) => {
-                if(MciViewIds.msgList === formData.submitId) {
+                if(MciViewIds.allViews.msgList === formData.submitId) {
                     this.initialFocusIndex = formData.value.message;
 
                     const modOpts = {
@@ -91,10 +99,40 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                     return cb(null);
                 }
             },
-
             fullExit : (formData, extraArgs, cb) => {
                 this.menuResult = { fullExit : true };
                 return this.prevMenu(cb);
+            },
+            deleteSelected : (formData, extraArgs, cb) => {
+                if(MciViewIds.allViews.msgList != formData.submitId) {
+                    return cb(null);
+                }
+                const messageIndex = _.get(formData, 'value.message');
+                return this.promptDeleteMessageConfirm(messageIndex, cb);
+            },
+            deleteMessageYes : (formData, extraArgs, cb) => {
+                const msgListView = this.viewControllers.allViews.getView(MciViewIds.allViews.msgList);
+                this.enableMessageListIndexUpdates(msgListView);
+                if(this.selectedMessageForDelete) {
+                    this.selectedMessageForDelete.deleteMessage(this.client.user, err => {
+                        if(err) {
+                            this.client.log.error(`Failed to delete message: ${this.selectedMessageForDelete.messageUuid}`);
+                        } else {
+                            this.client.log.info(`User deleted message: ${this.selectedMessageForDelete.messageUuid}`);
+                            this.config.messageList.splice(msgListView.focusedItemIndex, 1);
+                            this.updateMessageNumbersAfterDelete(msgListView.focusedItemIndex);
+                            msgListView.setItems(this.config.messageList);
+                        }
+                        this.selectedMessageForDelete = null;
+                        msgListView.redraw();
+                        return cb(null);
+                    });
+                } else {
+                    return cb(null);
+                }
+            },
+            deleteMessageNo : (formData, extraArgs, cb) => {
+                return cb(null);
             }
         };
     }
@@ -130,6 +168,17 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
         super.leave();
     }
 
+    populateCustomLabelsForSelected(selectedIndex) {
+        const formatObj = Object.assign(
+            {
+                msgNumSelected  : (selectedIndex + 1),
+                msgNumTotal     : this.config.messageList.length,
+            },
+            this.config.messageList[selectedIndex] //  plus, all the selected message props
+        );
+        return this.updateCustomViewTextsWithFilter('allViews', MciViewIds.allViews.customRangeStart, formatObj);
+    }
+
     mciReady(mciData, cb) {
         super.mciReady(mciData, err => {
             if(err) {
@@ -183,7 +232,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                     function updateMessageListObjects(callback) {
                         const dateTimeFormat    = self.menuConfig.config.dateTimeFormat || self.client.currentTheme.helpers.getDateTimeFormat();
                         const newIndicator      = self.menuConfig.config.newIndicator || '*';
-                        const regIndicator      = new Array(newIndicator.length + 1).join(' '); //  fill with space to avoid draw issues
+                        const regIndicator      = ' '.repeat(newIndicator.length); //  fill with space to avoid draw issues
 
                         let msgNum = 1;
                         self.config.messageList.forEach( (listItem, index) => {
@@ -200,19 +249,10 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                         });
                         return callback(null);
                     },
-                    function populateList(callback) {
-                        const msgListView           = vc.getView(MciViewIds.msgList);
-                        //  :TODO: replace with standard custom info MCI - msgNumSelected, msgNumTotal, areaName, areaDesc, confName, confDesc, ...
-                        const messageInfo1Format    = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
-
+                    function populateAndDrawViews(callback) {
+                        const msgListView = vc.getView(MciViewIds.allViews.msgList);
                         msgListView.setItems(self.config.messageList);
-
-                        msgListView.on('index update', idx => {
-                            self.setViewText(
-                                'allViews',
-                                MciViewIds.msgInfo1,
-                                stringFormat(messageInfo1Format, { msgNumSelected : (idx + 1), msgNumTotal : self.config.messageList.length } ));
-                        });
+                        self.enableMessageListIndexUpdates(msgListView);
 
                         if(self.initialFocusIndex > 0) {
                             //  note: causes redraw()
@@ -221,14 +261,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                             msgListView.redraw();
                         }
 
-                        return callback(null);
-                    },
-                    function drawOtherViews(callback) {
-                        const messageInfo1Format = self.menuConfig.config.messageInfo1Format || '{msgNumSelected} / {msgNumTotal}';
-                        self.setViewText(
-                            'allViews',
-                            MciViewIds.msgInfo1,
-                            stringFormat(messageInfo1Format, { msgNumSelected : self.initialFocusIndex + 1, msgNumTotal : self.config.messageList.length } ));
+                        self.populateCustomLabelsForSelected(self.initialFocusIndex || 0);
                         return callback(null);
                     },
                 ],
@@ -255,4 +288,69 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
     getMenuResult() {
         return this.menuResult;
     }
+
+    enableMessageListIndexUpdates(msgListView) {
+        msgListView.on('index update', idx => this.populateCustomLabelsForSelected(idx) );
+    }
+
+    updateMessageNumbersAfterDelete(startIndex) {
+        //  all index -= 1 from this point on.
+        for(let i = startIndex; i < this.config.messageList.length; ++i) {
+            const msgItem = this.config.messageList[i];
+            msgItem.msgNum -= 1;
+            msgItem.text = `${msgItem.msgNum} - ${msgItem.subject} from ${msgItem.fromUserName}`; //  default text
+        }
+    }
+
+    promptDeleteMessageConfirm(messageIndex, cb) {
+        const messageInfo = this.config.messageList[messageIndex];
+        if(!_.isObject(messageInfo)) {
+            return cb(Errors.Invalid(`Invalid message index: ${messageIndex}`));
+        }
+
+        //  :TODO: create static userHasDeleteRights() that takes id || uuid that doesn't require full msg load
+        this.selectedMessageForDelete = new Message();
+        this.selectedMessageForDelete.load( { uuid : messageInfo.messageUuid }, err => {
+            if(err) {
+                this.selectedMessageForDelete = null;
+                return cb(err);
+            }
+
+            if(!this.selectedMessageForDelete.userHasDeleteRights(this.client.user)) {
+                this.selectedMessageForDelete = null;
+                return cb(Errors.AccessDenied('User does not have rights to delete this message'));
+            }
+
+            //  user has rights to delete -- prompt/confirm then proceed
+            return this.promptConfirmDelete(cb);
+        });
+    }
+
+    promptConfirmDelete(cb) {
+        const promptXyView = this.viewControllers.allViews.getView(MciViewIds.allViews.delPromptXy);
+        if(!promptXyView) {
+            return cb(Errors.MissingMci(`Missing prompt XY${MciViewIds.allViews.delPromptXy} MCI`));
+        }
+
+        const promptOpts = {
+            clearAtSubmit : true,
+        };
+        if(promptXyView.dimens.width) {
+            promptOpts.clearWidth = promptXyView.dimens.width;
+        }
+
+        return this.promptForInput(
+            {
+                formName        : 'delPrompt',
+                formId          : FormIds.delPrompt,
+                promptName      : this.config.deleteMessageFromListPrompt || 'deleteMessageFromListPrompt',
+                prevFormName    : 'allViews',
+                position        : promptXyView.position,
+            },
+            promptOpts,
+            err => {
+                return cb(err);
+            }
+        );
+    }
 };

From c7739c0503400ee99650042fc2b0d5982a888621 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Jul 2018 18:49:26 -0600
Subject: [PATCH 0375/1013] * Clean up themes a bit more with new features *
 Theme related work for deleting user messages

---
 .../luciano_blocktronics/MSGDELPMPT.ANS       | Bin 0 -> 197 bytes
 art/themes/luciano_blocktronics/MSGLIST.ANS   | Bin 2249 -> 2264 bytes
 art/themes/luciano_blocktronics/NEWMSGS.ANS   | Bin 2312 -> 2312 bytes
 art/themes/luciano_blocktronics/theme.hjson   |   9 +++++++++
 config/prompt.hjson                           |  13 +++++++++++++
 5 files changed, 22 insertions(+)
 create mode 100644 art/themes/luciano_blocktronics/MSGDELPMPT.ANS

diff --git a/art/themes/luciano_blocktronics/MSGDELPMPT.ANS b/art/themes/luciano_blocktronics/MSGDELPMPT.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..74713b1f548e89ed4a303e8a421d6310661ea6ee
GIT binary patch
literal 197
zcmb1+Hn29dHZia^HpsQIvXYKA$W@SzHa5#mNzF+uNma;AEiO(>PnC`~1gWqG$^n&{
z<*J7G8Un?@G?!GcW2m#Mfq??`fRTZrg@Ku|fhz+810!Pq10#?I0%1=lUxhGtM+gs2
F0stf3A(j9D

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/MSGLIST.ANS b/art/themes/luciano_blocktronics/MSGLIST.ANS
index e1e0ddf86c304f43a5d013de1c28e9a6b0bbad54..b67b31a6746fb981bbc768d3b07c89fb036c5cbb 100644
GIT binary patch
delta 72
zcmX>pctdc)VLd|w>1cyo>1cCj>1ac1V}sn=x49H<-v$XPNJkqR<*G(R8UY#RKs9ET
Y8z0FsF^Bk=Zf0U$$jVqSc?pLq09xl3V*mgE

delta 49
zcmca1cv5h}VPPZbXme-jXoFk@>1ac1V}sn=w<qSvZDwZVW@3(rG~O)8ypWYKaq?yk
FRRD|^4(|W}

diff --git a/art/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS
index 78f129c5669f92b50e8b4ddfce2ce482bae0fb5f..1065e2956d71a721e9764535d78fb360b2cae214 100644
GIT binary patch
delta 21
ccmeAW>JXZ6n9I;WI@%ytI@;WM<5_DC07>o!w*UYD

delta 21
ccmeAW>JXZ6n9E2y+T2+>+8|e9<5_DC07;_;r~m)}

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index abb15955..6a36ae05 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -209,10 +209,12 @@
 			messageAreaMessageList: {
 				config: {					
 					dateTimeFormat: ddd MMM Do
+					allViewsInfoFormat10: "|00|15{msgNumSelected:>4.4} |08/ |15{msgNumTotal:<4.4}"
 				}
 				mci: {
 					VM1: {
 						height: 14
+						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
 					}
@@ -261,13 +263,18 @@
 			mailMenuInbox: {
 				config: {
 					dateTimeFormat: ddd MMM Do
+					allViewsInfoFormat10: "|00|15{msgNumSelected:>4.4} |08/ |15{msgNumTotal:<4.4}"
 				}
 				mci: {
 					VM1: {
 						height: 14
+						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
 					}
+					XY2: {
+						width: 30
+					}
 				}
 			}
 
@@ -468,10 +475,12 @@
 			newScanMessageList: {
 				config: {					
 					dateTimeFormat: ddd MMM Do
+					allViewsInfoFormat10: "|00|15{msgNumSelected:>4.4} |08/ |15{msgNumTotal:<4.4}"
 				}
 				mci: {
 					VM1: {
 						height: 14
+						width: 70
 						itemFormat: "|00|15  {msgNum:<5.5}|03{subject:<28.27} |15{fromUserName:<20.20} {ts}"
 						focusItemFormat: "|00|19> |15{msgNum:<5.5}{subject:<28.27} {fromUserName:<20.20} {ts}"
 					}
diff --git a/config/prompt.hjson b/config/prompt.hjson
index b6bf6691..b165fbd5 100644
--- a/config/prompt.hjson
+++ b/config/prompt.hjson
@@ -133,6 +133,19 @@
 			}
 		},
 
+		deleteMessageFromListPrompt: {
+			art: MSGDELPMPT
+			mci: {
+				TM1: {
+					argName: promptValue
+					items: [ "yes", "no" ]
+					focus: true
+					hotKeys: { Y: 0, N: 1 }
+					hotKeySubmit: true
+				}
+			}
+		}
+
 		"newAreaPostPrompt" : {
 			"art"	: "message_area_new_post",
 			"mci"	: {

From ad71b2385380499dc38dc117b5b6a848c3da9fc6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 5 Jul 2018 18:39:35 -0600
Subject: [PATCH 0376/1013] Updates for latest changes

---
 config/menu.hjson | 244 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 242 insertions(+), 2 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 4f88f6df..8973c833 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1713,6 +1713,10 @@
 					value: { command: "D" }
 					action: @menu:messageAreaSetNewScanDate
 				}
+				{
+					value: { command: "S" }
+					action: @menu:messageSearch
+				}
 				{
 					value: 1
 					action: @menu:messageArea
@@ -1720,6 +1724,114 @@
 			]
 		}
 
+		messageSearch: {
+			desc: Message Search
+			module: message_base_search
+			art: MSEARCH
+			config: {
+				messageListMenu: messageAreaSearchMessageList
+			}
+			form: {
+				0: {
+					mci: {
+						ET1: {
+							focus: true
+							argName: searchTerms
+						}
+						BT2: {
+							argName: search
+							text: search
+							submit: true
+						}
+						SM3: {
+							argName: confTag
+						}
+						SM4: {
+							argName: areaTag
+						}
+						ET5: {
+							argName: toUserName
+							maxLength: @config:users.usernameMax
+						}
+						ET6: {
+							argName: fromUserName
+							maxLength: @config:users.usernameMax
+						}
+						BT7: {
+							argName: advancedSearch
+							text: advanced search
+							submit: true
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { search: null }
+								action: @method:search
+							}
+							{
+								value: { advancedSearch: null }
+								action: @method:search
+							}
+						]
+					}
+
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
+		messageAreaSearchMessageList: {
+			desc: Message Search
+			module: msg_list
+			art: MSRCHLST
+			config: {
+				menuViewPost: messageAreaViewPost
+			}
+			form: {
+				0: {
+					mci:  {
+						VM1: {
+							focus: true
+							submit: true
+							argName: message
+						}
+						TL6: {
+							//	theme me!
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { message: null }
+								action: @method:selectMessage
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape", "q", "shift + q" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
+		messageSearchNoResults: {
+			desc: Message Search
+			art: MSRCNORES
+			options: {
+				pause: true
+			}
+		}
+
 		messageAreaChangeCurrentConference: {
 			art: CCHANGE
 			module: msg_conf_list
@@ -2411,7 +2523,7 @@
 				messageAreaTag: private_mail
 			}
 			form: {
-				0: {
+				0: {	//	main list
 					mci:  {
 						VM1: {
 							focus: true
@@ -2432,8 +2544,26 @@
 							keys: [ "escape", "q", "shift + q" ]
 							action: @systemMethod:prevMenu
 						}
+						{
+							keys: [ "delete", "d", "shift + d" ]
+							action: @method:deleteSelected
+						}
 					]
 				}
+				1: {	//	delete prompt form
+					submit: {
+						*: [
+							{
+								value: { promptValue: 0 }
+								action: @method:deleteMessageYes
+							}
+							{
+								value: { promptValue: 1 }
+								action: @method:deleteMessageNo
+							}
+						]
+					}
+				}
 			}
 		}
 
@@ -2486,9 +2616,119 @@
 					value: { menuOption: "P" }
 					action: @menu:fileBaseSetNewScanDate
 				}
+				{
+					value: { menuOption: "E" }
+					action: @menu:fileBaseExportListFilter
+				}
 			]
 		}
 
+		fileBaseExportListFilter: {
+			module: file_base_search
+			//	:TODO: fixme:
+			art: FSEARCH
+			config: {
+				fileBaseListEntriesMenu: fileBaseExportList
+			}
+			form: {
+				0: {
+					mci: {
+						ET1: {
+							focus: true
+							argName: searchTerms
+						}
+						BT2: {
+							argName: search
+							text: search
+							submit: true
+						}
+						ET3: {
+							maxLength: 64
+							argName: tags
+						}
+						SM4: {
+							maxLength: 64
+							argName: areaIndex
+						}
+						SM5: {
+							items: [
+								"upload date",
+								"uploaded by",
+								"downloads",
+								"rating",
+								"estimated year",
+								"size",
+								"filename"
+							]
+							argName: sortByIndex
+						}
+						SM6: {
+							items: [
+								"decending",
+								"ascending"
+							]
+							argName: orderByIndex
+						}
+						BT7: {
+							argName: advancedSearch
+							text: advanced search
+							submit: true
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { search: null }
+								action: @method:search
+							}
+							{
+								value: { advancedSearch: null }
+								action: @method:search
+							}
+						]
+					}
+
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+				}
+			}
+		}
+
+		fileBaseExportList: {
+			module: file_base_user_list_export
+			art: FBLISTEXP
+			options: {
+				pause: true
+			}
+			config: {
+				templates: {
+					entry: file_list_entry.asc
+				}
+			}
+			form: {
+				0: {
+					mci:  {
+						TL1: { }
+						TL2: { }
+					}
+				}
+			}
+		}
+
+		fileBaseExportListNoResults: {
+			desc: Browsing Files
+			art: FBNORES
+			options: {
+				pause: true
+				menuFlags: [ "noHistory", "popParent" ]
+			}
+		}
+
 		fileBaseSetNewScanDate: {
 			module: set_newscan_date
 			desc: File Base
@@ -2694,7 +2934,7 @@
 
 					actionKeys: [
 						{
-							keys: [ "escape" ]
+							keys: [ "escape", "q", "shift + q" ]
 							action: @systemMethod:prevMenu
 						}
 					]

From 53cda734e5c7e1d0ee70e1e7e2e22b541556410f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 5 Jul 2018 20:35:38 -0600
Subject: [PATCH 0377/1013] Minor bugfix

---
 core/msg_list.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/msg_list.js b/core/msg_list.js
index 05b48ab9..d4798012 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -132,6 +132,8 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                 }
             },
             deleteMessageNo : (formData, extraArgs, cb) => {
+                const msgListView = this.viewControllers.allViews.getView(MciViewIds.allViews.msgList);
+                this.enableMessageListIndexUpdates(msgListView);
                 return cb(null);
             }
         };

From 539c25ea83136617840c0afd3451756a8422887b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 15:20:45 -0600
Subject: [PATCH 0378/1013] Add ability to omit message and/or file area tags
 from new scan by config 'omitFileAreaTags' and 'omitMessageAreaTags' arrays

---
 core/misc_util.js |  8 ++++++++
 core/new_scan.js  | 13 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/core/misc_util.js b/core/misc_util.js
index 633cc967..6e477821 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -12,6 +12,7 @@ exports.valueWithDefault        = valueWithDefault;
 exports.resolvePath             = resolvePath;
 exports.getCleanEnigmaVersion   = getCleanEnigmaVersion;
 exports.getEnigmaUserAgent      = getEnigmaUserAgent;
+exports.valueAsArray            = valueAsArray;
 
 function isProduction() {
     var env = process.env.NODE_ENV || 'dev';
@@ -49,4 +50,11 @@ function getEnigmaUserAgent() {
     const nodeVer = process.version.substr(1);  //  remove 'v' prefix
 
     return `ENiGMA-BBS/${version} (${os.platform()}; ${os.arch()}; ${nodeVer})`;
+}
+
+function valueAsArray(value) {
+    if(!value) {
+        return [];
+    }
+    return Array.isArray(value) ? value : [ value ];
 }
\ No newline at end of file
diff --git a/core/new_scan.js b/core/new_scan.js
index 974519af..4d20ac18 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -10,6 +10,7 @@ const FileEntry                     = require('./file_entry.js');
 const FileBaseFilters               = require('./file_base_filter.js');
 const Errors                        = require('./enig_error.js').Errors;
 const { getAvailableFileAreaTags }  = require('./file_base_area.js');
+const { valueAsArray }              = require('./misc_util.js');
 
 //  deps
 const _                 = require('lodash');
@@ -52,6 +53,7 @@ exports.getModule = class NewScanModule extends MenuModule {
         this.currentScanAux     = {};
 
         //  :TODO: Make this conf/area specific:
+        //  :TODO: Use newer custom info format - TL10+
         const config            = this.menuConfig.config;
         this.scanStartFmt       = config.scanStartFmt || 'Scanning {confName} - {areaName}...';
         this.scanFinishNoneFmt  = config.scanFinishNoneFmt || 'Nothing new';
@@ -109,8 +111,12 @@ exports.getModule = class NewScanModule extends MenuModule {
 
     newScanMessageArea(conf, cb) {
         //  :TODO: it would be nice to cache this - must be done by conf!
-        const sortedAreas   = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } );
-        const currentArea   = sortedAreas[this.currentScanAux.area];
+        const omitMessageAreaTags = valueAsArray(_.get(this, 'menuConfig.config.omitMessageAreaTags', []));
+        const sortedAreas = _.omitBy(
+            msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ),
+            area => omitMessageAreaTags.includes(area.areaTag)
+        );
+        const currentArea = sortedAreas[this.currentScanAux.area];
 
         //
         //  Scan and update index until we find something. If results are found,
@@ -167,9 +173,10 @@ exports.getModule = class NewScanModule extends MenuModule {
 
     newScanFileBase(cb) {
         //  :TODO: add in steps
+        const omitFileAreaTags = valueAsArray(_.get(this, 'menuConfig.config.omitFileAreaTags', []));
         const filterCriteria = {
             newerThanFileId : FileBaseFilters.getFileBaseLastViewedFileIdByUser(this.client.user),
-            areaTag         : getAvailableFileAreaTags(this.client),
+            areaTag         : getAvailableFileAreaTags(this.client).filter(ft => !omitFileAreaTags.includes(ft)),
             order           : 'ascending',  //  oldest first
         };
 

From d392865aa32c614f1cf7c87938ac3aaf492af33f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 15:22:56 -0600
Subject: [PATCH 0379/1013] Add note on new omit file/message areas config

---
 WHATSNEW.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index be4e90cd..bce2ba32 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -13,6 +13,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Hot-reload of configuration files such as menu.hjson, config.hjson, your themes.hjson, etc.: When a file is saved, it will be hot-reloaded into the running system
   * Note that any custom modules should make use of the new Config.get() method.
 * The old concept of `autoScale` has been removed. See https://github.com/NuSkooler/enigma-bbs/issues/166
+* Ability to delete from personal mailbox (finally!)
+* Add ability to skip file and/or message areas during newscan. Set config.omitFileAreaTags and config.omitMessageAreaTags in new_scan configuration of your menu.hjson
 
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.

From 89bce2c23c8684c2c218ea53d8fdeb058aecc92b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 20:01:52 -0600
Subject: [PATCH 0380/1013] trace -> debug for Gopher access logs

---
 core/servers/content/gopher.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 019dbffa..240236d1 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -156,7 +156,7 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     defaultGenerator(selectorMatch, cb) {
-        this.log.trace( { selector : selectorMatch[0] }, 'Serving default content');
+        this.log.debug( { selector : selectorMatch[0] }, 'Serving default content');
 
         let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'startup_banner.asc');
         bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
@@ -172,7 +172,7 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     notFoundGenerator(selector, cb) {
-        this.log.trace( { selector }, 'Serving not found content');
+        this.log.debug( { selector }, 'Serving not found content');
         return cb('Not found');
     }
 
@@ -205,7 +205,7 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     messageAreaGenerator(selectorMatch, cb) {
-        this.log.trace( { selector : selectorMatch[0] }, 'Serving message area content');
+        this.log.debug( { selector : selectorMatch[0] }, 'Serving message area content');
         //
         //  Selector should be:
         //  /msgarea - list confs

From 73bc211b94d323203940189d833dd327a1d67719 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 20:03:03 -0600
Subject: [PATCH 0381/1013] Oops, fix newscan filter

---
 core/new_scan.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/new_scan.js b/core/new_scan.js
index 4d20ac18..55cbedc3 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -112,10 +112,9 @@ exports.getModule = class NewScanModule extends MenuModule {
     newScanMessageArea(conf, cb) {
         //  :TODO: it would be nice to cache this - must be done by conf!
         const omitMessageAreaTags = valueAsArray(_.get(this, 'menuConfig.config.omitMessageAreaTags', []));
-        const sortedAreas = _.omitBy(
-            msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ),
-            area => omitMessageAreaTags.includes(area.areaTag)
-        );
+        const sortedAreas = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).filter(area => {
+            return area => !omitMessageAreaTags.includes(area.areaTag);
+        });
         const currentArea = sortedAreas[this.currentScanAux.area];
 
         //

From dd7b234a1d1f1021a0b91da680a2eebbbfbe4058 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 20:04:51 -0600
Subject: [PATCH 0382/1013] Add @markAllRead method for msg_list

---
 art/themes/luciano_blocktronics/NEWMSGS.ANS | Bin 2312 -> 2340 bytes
 config/menu.hjson                           |   4 ++
 core/msg_list.js                            |  52 +++++++++++++++++++-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS
index 1065e2956d71a721e9764535d78fb360b2cae214..904399929a667f16171632ce890b9ca08f9ed634 100644
GIT binary patch
delta 98
zcmeAWS|YUJFq?^~vvjnfwXsodu5`3Pt^$~2kZUC!4HN?M3_wzeIXMbNsfj6EP}#{(
g*<Oo5wYdfZ4KOyy)d%Y++<b?fjgfKB<i{MU0BV~Yy8r+H

delta 70
zcmZ1?)FHItFq@KvvvjnfwXs32f^@WjwXsodadKjwf&!2S7QKC&Yw~xt*E~=Gqg>Zu
R=gmLZ*%%oYO#aWI3IOdD7196z

diff --git a/config/menu.hjson b/config/menu.hjson
index 8973c833..7dfe4bba 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -783,6 +783,10 @@
 							keys: [ "x", "shift + x" ]
 							action: @method:fullExit
 						}
+						{
+							keys: [ "m", "shift + m" ]
+							action: @method:markAllRead
+						}
 					]
 				}
 			}
diff --git a/core/msg_list.js b/core/msg_list.js
index d4798012..25c9772d 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -5,7 +5,6 @@
 const MenuModule                    = require('./menu_module.js').MenuModule;
 const ViewController                = require('./view_controller.js').ViewController;
 const messageArea                   = require('./message_area.js');
-const stringFormat                  = require('./string_format.js');
 const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 const Errors                        = require('./enig_error.js').Errors;
 const Message                       = require('./message.js');
@@ -64,7 +63,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
 
                     const modOpts = {
                         extraArgs   : {
-                            messageAreaTag      : this.getSelectedAreaTag(formData.value.message),// this.config.messageAreaTag,
+                            messageAreaTag      : this.getSelectedAreaTag(formData.value.message),
                             messageList         : this.config.messageList,
                             messageIndex        : formData.value.message,
                             lastMessageNextExit : true,
@@ -135,6 +134,13 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                 const msgListView = this.viewControllers.allViews.getView(MciViewIds.allViews.msgList);
                 this.enableMessageListIndexUpdates(msgListView);
                 return cb(null);
+            },
+            markAllRead : (formData, extraArgs, cb) => {
+                if(this.config.noUpdateLastReadId) {
+                    return cb(null);
+                }
+
+                return this.markAllMessagesAsRead(cb);
             }
         };
     }
@@ -295,6 +301,48 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
         msgListView.on('index update', idx => this.populateCustomLabelsForSelected(idx) );
     }
 
+    markAllMessagesAsRead(cb) {
+        if(!this.config.messageList || this.config.messageList.length === 0) {
+            return cb(null);    //  nothing to do.
+        }
+
+        //
+        //  Generally we'll have a message list for a specific area,
+        //  but this is not always the case. For a given area, we need
+        //  to find the highest message ID in the list to set a
+        //  last read pointer.
+        //
+        const areaHighestIds = {};
+        this.config.messageList.forEach(msg => {
+            const highestId = areaHighestIds[msg.areaTag];
+            if(highestId) {
+                if(msg.messageId > highestId) {
+                    areaHighestIds[msg.areaTag] = msg.messageId;
+                }
+            } else {
+                areaHighestIds[msg.areaTag] = msg.messageId;
+            }
+        });
+
+        async.forEachOf(areaHighestIds, (highestId, areaTag, nextArea) => {
+            messageArea.updateMessageAreaLastReadId(
+                this.client.user.userId,
+                areaTag,
+                highestId,
+                err => {
+                    if(err) {
+                        this.client.log.warn( { error : err.message }, 'Failed marking area as read');
+                    } else {
+                        this.client.log.info( { highestId, areaTag }, 'User marked area as read');
+                    }
+                    return nextArea(null);  //  always continue
+                }
+            );
+        }, () => {
+            return cb(null);
+        });
+    }
+
     updateMessageNumbersAfterDelete(startIndex) {
         //  all index -= 1 from this point on.
         for(let i = startIndex; i < this.config.messageList.length; ++i) {

From bf11fc24a3929aed4f37497214f2c3c106a88b7e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 20:13:24 -0600
Subject: [PATCH 0383/1013] Update message list after marking all as read for
 'newIndicator'

---
 core/msg_list.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/msg_list.js b/core/msg_list.js
index 25c9772d..aec6e852 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -324,6 +324,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
             }
         });
 
+        const regIndicator = ' '.repeat( (this.menuConfig.config.newIndicator || '*').length );
         async.forEachOf(areaHighestIds, (highestId, areaTag, nextArea) => {
             messageArea.updateMessageAreaLastReadId(
                 this.client.user.userId,
@@ -333,6 +334,15 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                     if(err) {
                         this.client.log.warn( { error : err.message }, 'Failed marking area as read');
                     } else {
+                        //  update newIndicator on messages
+                        this.config.messageList.forEach(msg => {
+                            if(areaTag === msg.areaTag) {
+                                msg.newIndicator = regIndicator;
+                            }
+                        });
+                        const msgListView = this.viewControllers.allViews.getView(MciViewIds.allViews.msgList);
+                        msgListView.setItems(this.config.messageList);
+                        msgListView.redraw();
                         this.client.log.info( { highestId, areaTag }, 'User marked area as read');
                     }
                     return nextArea(null);  //  always continue

From be37fb0587ba4d1fa72ade4d2dd8b9384448e400 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 7 Jul 2018 20:13:39 -0600
Subject: [PATCH 0384/1013] Notes on itemFormat/etc.

---
 UPGRADE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index bec189ed..243894e8 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -41,6 +41,8 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 * Development is now against Node.js 8.x LTS. Follow your standard upgrade path to update to Node 8.x before using 0.0.9-alpha.
 * The property `justify` found on various views previously had `left` and `right` values swapped (oops!); you will need to adjust any custom `theme.hjson` that use one or the other and swap them as well.
 * Possible breaking changes in FSE: The MCI code `%TL13` for error indicator is now `%TL4`. This is part of a cleanup and standardization on "custom ranges". You may need to update your `theme.hjson` and related artwork.
+* Removed view width auto-size: Some views still can auto-size their height, but in general you should be explicit in your themes
+* More standardization using "custom ranges" and `itemFormat` / `focusItemFormat` semantics. Update your themes!
 
 
 # 0.0.7-alpha to 0.0.8-alpha

From 3f34f77fcd9e8f767c21eca9275f838be5dc55b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 8 Jul 2018 11:23:56 -0600
Subject: [PATCH 0385/1013] Implement fake pipe() for WebSocket (doors/etc.)

---
 core/servers/login/websocket.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index fa7d97a3..3fc16343 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -31,7 +31,11 @@ function WebSocketClient(ws, req, serverType) {
     const self = this;
 
     this.dataHandler = function(data) {
-        self.socketBridge.emit('data', data);
+        if(self.pipedDest) {
+            self.pipedDest.write(data);
+        } else {
+            self.socketBridge.emit('data', data);
+        }
     };
 
     //
@@ -54,9 +58,14 @@ function WebSocketClient(ws, req, serverType) {
             return this.ws.send(data, { binary : true }, cb);
         }
 
-        //  we need to fake some streaming work
+        pipe(dest) {
+            Log.trace('WebSocket SocketBridge pipe()');
+            self.pipedDest = dest;
+        }
+
         unpipe() {
             Log.trace('WebSocket SocketBridge unpipe()');
+            self.pipedDest = null;
         }
 
         resume() {

From d54267b318630c910fc62471a3cd89b652c177f2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 8 Jul 2018 11:33:39 -0600
Subject: [PATCH 0386/1013] Update custom views after del

---
 core/msg_list.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/msg_list.js b/core/msg_list.js
index aec6e852..6046b4a6 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -124,6 +124,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                         }
                         this.selectedMessageForDelete = null;
                         msgListView.redraw();
+                        this.populateCustomLabelsForSelected(msgListView.focusedItemIndex);
                         return cb(null);
                     });
                 } else {

From 2f22d91bcf57962ba5af31d7c93fc46145bd7554 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 8 Jul 2018 19:20:08 -0600
Subject: [PATCH 0387/1013] Fix comment

---
 core/msg_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/msg_list.js b/core/msg_list.js
index 6046b4a6..2796db88 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -15,7 +15,7 @@ const _                 = require('lodash');
 const moment            = require('moment');
 
 /*
-    Available listFormat/focusListFormat members for |msgList|
+    Available itemFormat/focusItemFormat members for |msgList|
 
     msgNum          : Message number
     to              : To username/handle

From 5c826abd5b3822b16ec75246e96083b2f460c1d5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 9 Jul 2018 20:27:09 -0600
Subject: [PATCH 0388/1013] Onelinerz updates: * Uses standard `itemFormat` *
 Uses format of {userName} vs {username} (case) * Has preview implemented as
 %TL2

---
 UPGRADE.md                                  |   1 +
 art/themes/luciano_blocktronics/theme.hjson |  16 ++-
 core/menu_module.js                         |   7 +-
 core/onelinerz.js                           | 146 ++++++++------------
 4 files changed, 77 insertions(+), 93 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 243894e8..5dfed60d 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -43,6 +43,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 * Possible breaking changes in FSE: The MCI code `%TL13` for error indicator is now `%TL4`. This is part of a cleanup and standardization on "custom ranges". You may need to update your `theme.hjson` and related artwork.
 * Removed view width auto-size: Some views still can auto-size their height, but in general you should be explicit in your themes
 * More standardization using "custom ranges" and `itemFormat` / `focusItemFormat` semantics. Update your themes!
+* In addition to using `itemFormat`, the `onelinerz` module uses `userName` vs `username` (note the case) to match other modules
 
 
 # 0.0.7-alpha to 0.0.8-alpha
diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 6a36ae05..c0735e6f 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -88,11 +88,15 @@
 
 			fullLoginSequenceOnelinerz: {
 				config: {
-					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.59}"
+					tsFormat: ddd h:mma
 				}
 				0: {
 					mci: {
-						VM1: { height: 10, width: 20 }
+						VM1: {
+							height: 10
+							width: 20
+							itemFormat: "|00|11{userName:<12}|08: |03{oneliner:<59.59}"
+						}
 						TM2: {
 							focusTextStyle: first lower
 						}						
@@ -183,13 +187,15 @@
 			}
 
 			mainMenuOnelinerz: {
-				//	:TODO: Need way to just duplicate entry here & in menu.hjson, e.g. use: someName + must supply next/etc. in menu
 				config: {
-					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.59}"
+					tsFormat: ddd h:mma
 				}
 				0: {
 					mci: {
-						VM1: { height: 10, width: 10 }
+						VM1: {
+							height: 10
+							itemFormat: "|00|11{userName:<12}|08: |03{oneliner:<59.59}"
+						}
 						TM2: {
 							focusTextStyle: first lower
 						}						
diff --git a/core/menu_module.js b/core/menu_module.js
index 8c7516f6..d284aa64 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -319,7 +319,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     prepViewController(name, formId, mciMap, cb) {
-        if(_.isUndefined(this.viewControllers[name])) {
+        const needsCreated = _.isUndefined(this.viewControllers[name]);
+        if(needsCreated) {
             const vcOpts = {
                 client      : this.client,
                 formId      : formId,
@@ -334,13 +335,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
             };
 
             return vc.loadFromMenuConfig(loadOpts, err => {
-                return cb(err, vc);
+                return cb(err, vc, true);
             });
         }
 
         this.viewControllers[name].setFocus(true);
 
-        return cb(null, this.viewControllers[name]);
+        return cb(null, this.viewControllers[name], false);
     }
 
     prepViewControllerWithArt(name, formId, options, cb) {
diff --git a/core/onelinerz.js b/core/onelinerz.js
index 2a917ad2..3ecde562 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -9,11 +9,6 @@ const {
     getTransactionDatabase
 }                           = require('./database.js');
 
-const ViewController        = require('./view_controller.js').ViewController;
-const theme                 = require('./theme.js');
-const ansi                  = require('./ansi_term.js');
-const stringFormat          = require('./string_format.js');
-
 //  deps
 const sqlite3               = require('sqlite3');
 const async                 = require('async');
@@ -22,13 +17,9 @@ const moment                = require('moment');
 
 /*
     Module :TODO:
-    * Add pipe code support
-        - override max length & monitor *display* len as user types in order to allow for actual display len with color
-    * Add preview control: Shows preview with pipe codes resolved
     * Add ability to at least alternate formatStrings -- every other
 */
 
-
 exports.moduleInfo = {
     name        : 'Onelinerz',
     desc        : 'Standard local onelinerz',
@@ -37,20 +28,20 @@ exports.moduleInfo = {
 };
 
 const MciViewIds = {
-    ViewForm    :  {
-        Entries     : 1,
-        AddPrompt   : 2,
+    view    :  {
+        entries     : 1,
+        addPrompt   : 2,
     },
-    AddForm : {
-        NewEntry        : 1,
-        EntryPreview    : 2,
-        AddPrompt       : 3,
+    add : {
+        newEntry        : 1,
+        entryPreview    : 2,
+        addPrompt       : 3,
     }
 };
 
 const FormIds = {
-    View    : 0,
-    Add     : 1,
+    view    : 0,
+    add     : 1,
 };
 
 exports.getModule = class OnelinerzModule extends MenuModule {
@@ -115,46 +106,29 @@ exports.getModule = class OnelinerzModule extends MenuModule {
 
         async.waterfall(
             [
-                function clearAndDisplayArt(callback) {
+                function prepArtAndViewController(callback) {
                     if(self.viewControllers.add) {
                         self.viewControllers.add.setFocus(false);
                     }
 
-                    if(clearScreen) {
-                        self.client.term.rawWrite(ansi.resetScreen());
-                    }
-
-                    theme.displayThemedAsset(
-                        self.menuConfig.config.art.entries,
-                        self.client,
-                        { font : self.menuConfig.font, trailingLF : false },
-                        (err, artData) => {
-                            return callback(err, artData);
+                    return self.prepViewControllerWithArt(
+                        'view',
+                        FormIds.view,
+                        {
+                            clearScreen,
+                            trailingLF : false
+                        },
+                        (err, artInfo, wasCreated) => {
+                            if(!wasCreated) {
+                                self.viewControllers.view.setFocus(true);
+                                self.viewControllers.view.getView(MciViewIds.view.addPrompt).redraw();
+                            }
+                            return callback(err);
                         }
                     );
                 },
-                function initOrRedrawViewController(artData, callback) {
-                    if(_.isUndefined(self.viewControllers.add)) {
-                        const vc = self.addViewController(
-                            'view',
-                            new ViewController( { client : self.client, formId : FormIds.View } )
-                        );
-
-                        const loadOpts = {
-                            callingMenu     : self,
-                            mciMap          : artData.mciMap,
-                            formId          : FormIds.View,
-                        };
-
-                        return vc.loadFromMenuConfig(loadOpts, callback);
-                    } else {
-                        self.viewControllers.view.setFocus(true);
-                        self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt).redraw();
-                        return callback(null);
-                    }
-                },
                 function fetchEntries(callback) {
-                    const entriesView = self.viewControllers.view.getView(MciViewIds.ViewForm.Entries);
+                    const entriesView = self.viewControllers.view.getView(MciViewIds.view.entries);
                     const limit = entriesView.dimens.height;
                     let entries = [];
 
@@ -179,24 +153,22 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                     );
                 },
                 function populateEntries(entriesView, entries, callback) {
-                    const listFormat    = self.menuConfig.config.listFormat || '{username}@{ts}: {oneliner}';// :TODO: should be userName to be consistent
-                    const tsFormat      = self.menuConfig.config.timestampFormat || 'ddd h:mma';
+                    const tsFormat = self.menuConfig.config.timestampFormat || self.client.currentTheme.helpers.getDateFormat('short');
 
                     entriesView.setItems(entries.map( e => {
-                        return stringFormat(listFormat, {
+                        return {
                             userId      : e.user_id,
-                            username    : e.user_name,
+                            userName    : e.user_name,
                             oneliner    : e.oneliner,
                             ts          : e.timestamp.format(tsFormat),
-                        } );
+                        };
                     }));
 
                     entriesView.redraw();
-
                     return callback(null);
                 },
                 function finalPrep(callback) {
-                    const promptView = self.viewControllers.view.getView(MciViewIds.ViewForm.AddPrompt);
+                    const promptView = self.viewControllers.view.getView(MciViewIds.view.addPrompt);
                     promptView.setFocusItemIndex(1);    //  default to NO
                     return callback(null);
                 }
@@ -216,37 +188,41 @@ exports.getModule = class OnelinerzModule extends MenuModule {
             [
                 function clearAndDisplayArt(callback) {
                     self.viewControllers.view.setFocus(false);
-                    self.client.term.rawWrite(ansi.resetScreen());
 
-                    theme.displayThemedAsset(
-                        self.menuConfig.config.art.add,
-                        self.client,
-                        { font : self.menuConfig.font },
-                        (err, artData) => {
-                            return callback(err, artData);
+                    return self.prepViewControllerWithArt(
+                        'add',
+                        FormIds.add,
+                        {
+                            clearScreen : true,
+                            trailingLF  : false
+                        },
+                        (err, artInfo, wasCreated) => {
+                            if(!wasCreated) {
+                                self.viewControllers.add.setFocus(true);
+                                self.viewControllers.add.redrawAll();
+                                self.viewControllers.add.switchFocus(MciViewIds.add.newEntry);
+                            }
+                            return callback(err);
                         }
                     );
                 },
-                function initOrRedrawViewController(artData, callback) {
-                    if(_.isUndefined(self.viewControllers.add)) {
-                        const vc = self.addViewController(
-                            'add',
-                            new ViewController( { client : self.client, formId : FormIds.Add } )
-                        );
-
-                        const loadOpts = {
-                            callingMenu     : self,
-                            mciMap          : artData.mciMap,
-                            formId          : FormIds.Add,
-                        };
-
-                        return vc.loadFromMenuConfig(loadOpts, callback);
-                    } else {
-                        self.viewControllers.add.setFocus(true);
-                        self.viewControllers.add.redrawAll();
-                        self.viewControllers.add.switchFocus(MciViewIds.AddForm.NewEntry);
-                        return callback(null);
+                function initPreviewUpdates(callback) {
+                    const previewView   = self.viewControllers.add.getView(MciViewIds.add.entryPreview);
+                    const entryView     = self.viewControllers.add.getView(MciViewIds.add.newEntry);
+                    if(previewView) {
+                        let timerId;
+                        entryView.on('key press', () => {
+                            clearTimeout(timerId);
+                            timerId = setTimeout( () => {
+                                const focused = self.viewControllers.add.getFocusedView();
+                                if(focused === entryView) {
+                                    previewView.setText(entryView.getData());
+                                    focused.setFocus(true);
+                                }
+                            }, 500);
+                        });
                     }
+                    return callback(null);
                 }
             ],
             err => {
@@ -258,8 +234,8 @@ exports.getModule = class OnelinerzModule extends MenuModule {
     }
 
     clearAddForm() {
-        this.setViewText('add', MciViewIds.AddForm.NewEntry, '');
-        this.setViewText('add', MciViewIds.AddForm.EntryPreview, '');
+        this.setViewText('add', MciViewIds.add.newEntry, '');
+        this.setViewText('add', MciViewIds.add.entryPreview, '');
     }
 
     initDatabase(cb) {

From 0599bd32fc13102fadd57648877b81050aae55ce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 9 Jul 2018 20:35:37 -0600
Subject: [PATCH 0389/1013] Note on websocket server

---
 UPGRADE.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index 5dfed60d..25fe477f 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -44,6 +44,19 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 * Removed view width auto-size: Some views still can auto-size their height, but in general you should be explicit in your themes
 * More standardization using "custom ranges" and `itemFormat` / `focusItemFormat` semantics. Update your themes!
 * In addition to using `itemFormat`, the `onelinerz` module uses `userName` vs `username` (note the case) to match other modules
+* `loginServers.webSocket` configuration block has changed to be more consistent with other servers. Example:
+```
+webSocket: {
+    ws: {
+        enabled: true
+    }
+    wss: {
+        enabled: true
+        port: 1234
+    }
+    proxied: true	//	X-Forwarded-Proto: https support
+}
+```
 
 
 # 0.0.7-alpha to 0.0.8-alpha

From 45ca627b4eba59669048bef5cc72f7720ee54e1c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 9 Jul 2018 20:55:47 -0600
Subject: [PATCH 0390/1013] Minor update

---
 core/onelinerz.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/onelinerz.js b/core/onelinerz.js
index 3ecde562..2d902a8e 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -119,7 +119,7 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                             trailingLF : false
                         },
                         (err, artInfo, wasCreated) => {
-                            if(!wasCreated) {
+                            if(!err && !wasCreated) {
                                 self.viewControllers.view.setFocus(true);
                                 self.viewControllers.view.getView(MciViewIds.view.addPrompt).redraw();
                             }

From 3e06c4d2908e6d77141bd247277f03d8ffc4cb6e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 10 Jul 2018 18:57:52 -0600
Subject: [PATCH 0391/1013] Fix onelinerz art name

---
 config/menu.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 7dfe4bba..a26634ce 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1287,7 +1287,7 @@
 			}
 			config: {
 				art: {
-					entries: ONELINER
+					view: ONELINER
 					add: ONEADD
 				}
 			}

From ea3e0ac3ff617dc7ec72027557583983d7cd0527 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 10 Jul 2018 19:00:02 -0600
Subject: [PATCH 0392/1013] Fix onelinerz art name...again

---
 config/menu.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index a26634ce..8a14526b 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -631,7 +631,7 @@
 			}
 			config: {
 				art: {
-					entries: ONELINER
+					view: ONELINER
 					add: ONEADD
 				}
 			}

From 5d91cfb7d0ea9972ac58ceaeb57da52c906fafd4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 10 Jul 2018 19:11:03 -0600
Subject: [PATCH 0393/1013] Add {userName} and {userNameRaw} door launch/format
 options

---
 WHATSNEW.md  |  2 ++
 core/door.js | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index bce2ba32..bedc54e4 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -15,6 +15,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * The old concept of `autoScale` has been removed. See https://github.com/NuSkooler/enigma-bbs/issues/166
 * Ability to delete from personal mailbox (finally!)
 * Add ability to skip file and/or message areas during newscan. Set config.omitFileAreaTags and config.omitMessageAreaTags in new_scan configuration of your menu.hjson
+* `{userName}` (sanatized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
+
 
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.
diff --git a/core/door.js b/core/door.js
index 5ad5855a..1ac0754f 100644
--- a/core/door.js
+++ b/core/door.js
@@ -1,13 +1,15 @@
 /* jslint node: true */
 'use strict';
 
-const stringFormat  = require('./string_format.js');
-const { Errors }    = require('./enig_error.js');
+const stringFormat      = require('./string_format.js');
+const { Errors }        = require('./enig_error.js');
 
-const pty           = require('node-pty');
-const decode        = require('iconv-lite').decode;
-const createServer  = require('net').createServer;
-const paths         = require('path');
+//  deps
+const pty               = require('node-pty');
+const decode            = require('iconv-lite').decode;
+const createServer      = require('net').createServer;
+const paths             = require('path');
+const sanatizeFilename  = require('sanitize-filename');
 
 module.exports = class Door {
     constructor(client) {
@@ -64,6 +66,8 @@ module.exports = class Door {
             node            : exeInfo.node.toString(),
             srvPort         : this.sockServer ? this.sockServer.address().port.toString() : '-1',
             userId          : this.client.user.userId.toString(),
+            userName        : sanatizeFilename(this.client.user.username),
+            userNameRaw     : this.client.user.username,
             cwd             : cwd,
         };
 

From 47e34f9da7570b66467532eae9c764e1b9a9f826 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Jul 2018 21:14:28 -0600
Subject: [PATCH 0394/1013] Fix comment

---
 core/abracadabra.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 676600e4..c0bb2c83 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -149,7 +149,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
         const exeInfo = {
             cmd             : this.config.cmd,
-            cwd             : this.config.cwd,  //  null/undefined=path of |cwd|
+            cwd             : this.config.cwd,  //  null/undefined = parent_of(cmd)
             args            : this.config.args,
             io              : this.config.io || 'stdio',
             encoding        : this.config.encoding || this.client.term.outputEncoding,

From 340c6ccf7633f77c1d8386d89aea23be26e81d3a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Jul 2018 11:49:56 -0600
Subject: [PATCH 0395/1013] Fix asset parsing for path-to-method, etc.

---
 core/asset.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/asset.js b/core/asset.js
index 2204b1da..b3d62154 100644
--- a/core/asset.js
+++ b/core/asset.js
@@ -29,19 +29,23 @@ const ALL_ASSETS = [
     'sysStat',
 ];
 
-const ASSET_RE = new RegExp('\\@(' + ALL_ASSETS.join('|') + ')\\:([\\w\\d\\.]*)(?:\\/([\\w\\d\\_]+))*');
+const ASSET_RE = new RegExp(
+    '^@(' + ALL_ASSETS.join('|') + ')' +
+    /:(?:([^:]+):)?([A-Za-z0-9_\-.]+)$/.source
+);
 
 function parseAsset(s) {
     const m = ASSET_RE.exec(s);
-
     if(m) {
-        let result = { type : m[1] };
+        const result = { type : m[1] };
 
         if(m[3]) {
-            result.location = m[2];
-            result.asset    = m[3];
+            result.asset = m[3];
+            if(m[2]) {
+                result.location = m[2];
+            }
         } else {
-            result.asset    = m[2];
+            result.asset = m[2];
         }
 
         return result;

From 7b75f08c7e2d7e410fa56b6111e16a9b6e22441a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Jul 2018 11:50:04 -0600
Subject: [PATCH 0396/1013] Clean up code a bit

---
 core/menu_util.js | 77 ++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/core/menu_util.js b/core/menu_util.js
index f362041c..7eca129d 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -2,16 +2,17 @@
 'use strict';
 
 //  ENiGMA½
-var moduleUtil          = require('./module_util.js');
-var Log                 = require('./logger.js').log;
-var Config              = require('./config.js').get;
-var asset               = require('./asset.js');
-var MCIViewFactory      = require('./mci_view_factory.js').MCIViewFactory;
+const moduleUtil            = require('./module_util.js');
+const Log                   = require('./logger.js').log;
+const Config                = require('./config.js').get;
+const asset                 = require('./asset.js');
+const { MCIViewFactory }    = require('./mci_view_factory.js');
+const { Errors }            = require('./enig_error.js');
 
-var paths               = require('path');
-var async               = require('async');
-var assert              = require('assert');
-var _                   = require('lodash');
+//  deps
+const paths                 = require('path');
+const async                 = require('async');
+const _                     = require('lodash');
 
 exports.loadMenu                        = loadMenu;
 exports.getFormConfigByIDAndMap         = getFormConfigByIDAndMap;
@@ -19,41 +20,37 @@ exports.handleAction                    = handleAction;
 exports.handleNext                      = handleNext;
 
 function getMenuConfig(client, name, cb) {
-    var menuConfig;
-
     async.waterfall(
         [
             function locateMenuConfig(callback) {
                 if(_.has(client.currentTheme, [ 'menus', name ])) {
-                    menuConfig = client.currentTheme.menus[name];
-                    callback(null);
-                } else {
-                    callback(new Error('No menu entry for \'' + name + '\''));
+                    const menuConfig = client.currentTheme.menus[name];
+                    return callback(null, menuConfig);
                 }
+                return callback(Errors.DoesNotExist(`No menu entry for "${name}"`));
             },
-            function locatePromptConfig(callback) {
+            function locatePromptConfig(menuConfig, callback) {
                 if(_.isString(menuConfig.prompt)) {
                     if(_.has(client.currentTheme, [ 'prompts', menuConfig.prompt ])) {
                         menuConfig.promptConfig = client.currentTheme.prompts[menuConfig.prompt];
-                        callback(null);
-                    } else {
-                        callback(new Error('No prompt entry for \'' + menuConfig.prompt + '\''));
+                        return callback(null, menuConfig);
                     }
-                } else {
-                    callback(null);
+                    return callback(Error.DoesNotExist(`No prompt entry for "${menuConfig.prompt}"`));
                 }
+                return callback(null, menuConfig);
             }
         ],
-        function complete(err) {
-            cb(err, menuConfig);
+        (err, menuConfig) => {
+            return cb(err, menuConfig);
         }
     );
 }
 
+//  :TODO: name/client should not be part of options - they are required always
 function loadMenu(options, cb) {
-    assert(_.isObject(options));
-    assert(_.isString(options.name));
-    assert(_.isObject(options.client));
+    if(!_.isString(options.name) || !_.isObject(options.client)) {
+        return cb(Errors.MissingParam('Missing required options'));
+    }
 
     async.waterfall(
         [
@@ -117,16 +114,12 @@ function loadMenu(options, cb) {
 }
 
 function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
-    assert(_.isObject(menuConfig));
-
     if(!_.isObject(menuConfig.form)) {
-        cb(new Error('Invalid or missing \'form\' member for menu'));
-        return;
+        return cb(Errors.MissingParam('Invalid or missing "form" member for menu'));
     }
 
     if(!_.isObject(menuConfig.form[formId])) {
-        cb(new Error('No form found for formId ' + formId));
-        return;
+        return cb(Errors.DoesNotExist(`No form found for formId ${formId}`));
     }
 
     const formForId = menuConfig.form[formId];
@@ -141,8 +134,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
     //
     if(_.isObject(formForId[mciReqKey])) {
         Log.trace( { mciKey : mciReqKey }, 'Using exact configuration key match');
-        cb(null, formForId[mciReqKey]);
-        return;
+        return cb(null, formForId[mciReqKey]);
     }
 
     //
@@ -153,7 +145,7 @@ function getFormConfigByIDAndMap(menuConfig, formId, mciMap, cb) {
         return cb(null, formForId);
     }
 
-    cb(new Error('No matching form configuration found for key \'' + mciReqKey + '\''));
+    return cb(Errors.DoesNotExist(`No matching form configuration found for key "${mciReqKey}"`));
 }
 
 //  :TODO: Most of this should be moved elsewhere .... DRY...
@@ -176,11 +168,14 @@ function callModuleMenuMethod(client, asset, path, formData, extraArgs, cb) {
 }
 
 function handleAction(client, formData, conf, cb) {
-    assert(_.isObject(conf));
-    assert(_.isString(conf.action));
+    if(!_.isObject(conf)) {
+        return cb(Errors.MissingParam('Missing config'));
+    }
 
     const actionAsset = asset.parseAsset(conf.action);
-    assert(_.isObject(actionAsset));
+    if(!_.isObject(actionAsset)) {
+        return cb(Errors.Invalid('Unable to parse "conf.action"'));
+    }
 
     switch(actionAsset.type) {
         case 'method' :
@@ -210,7 +205,7 @@ function handleAction(client, formData, conf, cb) {
                     return currentModule.menuMethods[actionAsset.asset](formData, conf.extraArgs, cb);
                 }
 
-                const err = new Error('Method does not exist');
+                const err = Errors.DoesNotExist('Method does not exist');
                 client.log.warn( { method : actionAsset.asset }, err.message);
                 return cb(err);
             }
@@ -246,7 +241,7 @@ function handleNext(client, nextSpec, conf, cb) {
                     return currentModule.menuMethods[nextAsset.asset]( formData, extraArgs, cb );
                 }
 
-                const err = new Error('Method does not exist');
+                const err = Errors.DoesNotExist('Method does not exist');
                 client.log.warn( { method : nextAsset.asset }, err.message);
                 return cb(err);
             }
@@ -255,7 +250,7 @@ function handleNext(client, nextSpec, conf, cb) {
             return client.currentMenuModule.gotoMenu(nextAsset.asset, { extraArgs : extraArgs }, cb );
     }
 
-    const err = new Error('Invalid asset type for "next"');
+    const err = Errors.Invalid('Invalid asset type for "next"');
     client.log.error( { nextSpec : nextSpec }, err.message);
     return cb(err);
 }

From 6a3849dbdccc4cc94560b75d5efeaaded091c190 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Jul 2018 19:18:27 -0600
Subject: [PATCH 0397/1013] Fist version of ArchaicNET support module

---
 core/archaicnet.js | 129 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 core/archaicnet.js

diff --git a/core/archaicnet.js b/core/archaicnet.js
new file mode 100644
index 00000000..bc3528d6
--- /dev/null
+++ b/core/archaicnet.js
@@ -0,0 +1,129 @@
+/* jslint node: true */
+'use strict';
+
+//  enigma-bbs
+const { MenuModule }    = require('../core/menu_module.js');
+const { resetScreen }   = require('../core/ansi_term.js');
+const { Errors }        = require('../core/enig_error.js');
+
+//  deps
+const async         = require('async');
+const _             = require('lodash');
+const SSHClient     = require('ssh2').Client;
+
+exports.moduleInfo = {
+    name    : 'ArchaicNET',
+    desc    : 'ArchaicNET Access Module',
+    author  : 'NuSkooler',
+};
+
+exports.getModule = class ArchaicNETModule extends MenuModule {
+    constructor(options) {
+        super(options);
+
+        //  establish defaults
+        this.config             = options.menuConfig.config;
+        this.config.host        = this.config.host || 'bbs.archaicbinary.net';
+        this.config.sshPort     = this.config.sshPort || 8513;
+        this.config.rloginPort  = this.config.rloginPort || 2222;
+    }
+
+    initSequence() {
+        let clientTerminated;
+        const self = this;
+
+        async.series(
+            [
+                function validateConfig(callback) {
+                    const reqConfs = [ 'username', 'password', 'bbsTag' ];
+                    for(let req of reqConfs) {
+                        if(!_.isString(_.get(self, [ 'config', req ]))) {
+                            return callback(Errors.MissingConfig(`Config requires "${req}"`));
+                        }
+                    }
+                    return callback(null);
+                },
+                function establishSecureConnection(callback) {
+                    self.client.term.write(resetScreen());
+                    self.client.term.write('Connecting to ArchaicNET, please wait...\n');
+
+                    const sshClient = new SSHClient();
+
+                    let pipeRestored = false;
+                    let pipedStream;
+                    const restorePipe = function() {
+                        if(pipedStream && !pipeRestored && !clientTerminated) {
+                            self.client.term.output.unpipe(pipedStream);
+                            self.client.term.output.resume();
+                        }
+                    };
+
+                    sshClient.on('ready', () => {
+                        //  track client termination so we can clean up early
+                        self.client.once('end', () => {
+                            self.client.log.info('Connection ended. Terminating ArchaicNET connection');
+                            clientTerminated = true;
+                            return sshClient.end();
+                        });
+
+                        //  establish tunnel for rlogin
+                        const fwdPort = self.config.rloginPort + self.client.node;
+                        sshClient.forwardOut('127.0.0.1', fwdPort, self.config.host,  self.config.rloginPort, (err, stream) => {
+                            if(err) {
+                                return sshClient.end();
+                            }
+
+                            //
+                            //  Send rlogin - [<bbsTag>]<userName> e.g. [Xibalba]NuSkooler
+                            //
+                            const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
+                            stream.write(rlogin);
+
+                            pipedStream = stream;
+                            self.client.term.output.pipe(stream);
+
+                            stream.on('data', d => {
+                                return self.client.term.rawWrite(d);
+                            });
+
+                            stream.on('close', () => {
+                                restorePipe();
+                                return sshClient.end();
+                            });
+                        });
+                    });
+
+                    sshClient.on('error', err => {
+                        return self.client.log.info(`ArchaicNET SSH client error: ${err.message}`);
+                    });
+
+                    sshClient.on('close', hadError => {
+                        if(hadError) {
+                            self.client.warn('Closing ArchaicNET SSH due to error');
+                        }
+                        restorePipe();
+                        return callback(null);
+                    });
+
+                    sshClient.connect( {
+                        host        : self.config.host,
+                        port        : self.config.sshPort,
+                        username    : self.config.username,
+                        password    : self.config.password,
+                    });
+                }
+            ],
+            err => {
+                if(err) {
+                    self.client.log.warn( { error : err.message }, 'ArchaicNET error');
+                }
+
+                //  if the client is stil here, go to previous
+                if(!clientTerminated) {
+                    self.prevMenu();
+                }
+            }
+        );
+    }
+};
+

From 013a947e157ad8a85c35d5c6c9e68ad6eee951cf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Jul 2018 19:18:44 -0600
Subject: [PATCH 0398/1013] Add release-info.asc used by some modern release
 groups

---
 core/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 6d5251a3..9c33f38f 100644
--- a/core/config.js
+++ b/core/config.js
@@ -747,7 +747,8 @@ function getDefaultConfig() {
 
                 //  common README filename - https://en.wikipedia.org/wiki/README
                 descLong        : [
-                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$'    //  eslint-disable-line no-useless-escape
+                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$',//  eslint-disable-line no-useless-escape
+                    '^RELEASE-INFO.ASC$'    //  eslint-disable-line no-useless-escape
                 ],
             },
 

From e3c197c3e11d59f09175cfc451271e97bb9f8397 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Jul 2018 22:08:09 -0600
Subject: [PATCH 0399/1013] Fix event emitter leak

---
 core/client.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/client.js b/core/client.js
index a2eb4bc3..ec10947f 100644
--- a/core/client.js
+++ b/core/client.js
@@ -111,12 +111,13 @@ function Client(/*input, output*/) {
         this.input.on('data', this.dataHandler);
     };
 
-    Events.on(Events.getSystemEvents().ThemeChanged, ( { themeId } ) => {
-        if(_.get(this.currentTheme, 'info.themeId') === themeId) {
-            this.currentTheme = require('./theme.js').getAvailableThemes().get(themeId);
+    this.themeChangedListener = function( { themeId } ) {
+        if(_.get(self.currentTheme, 'info.themeId') === themeId) {
+            self.currentTheme = require('./theme.js').getAvailableThemes().get(themeId);
         }
-    });
+    };
 
+    Events.on(Events.getSystemEvents().ThemeChanged, this.themeChangedListener);
 
     //
     //  Peek at incoming |data| and emit events for any special
@@ -458,7 +459,9 @@ Client.prototype.end = function () {
         this.term.disconnect();
     }
 
-    var currentModule = this.menuStack.getCurrentModule;
+    Events.removeListener(Events.getSystemEvents().ThemeChanged, this.themeChangedListener);
+
+    const currentModule = this.menuStack.getCurrentModule;
 
     if(currentModule) {
         currentModule.leave();
@@ -470,10 +473,9 @@ Client.prototype.end = function () {
         //
         //  We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
         //
-        //  :TODO: is this OK?
         return this.output.end.apply(this.output, arguments);
     } catch(e) {
-        //  TypeError
+        //  ie TypeError
     }
 };
 

From 1f396e198ee04158a2a42fd8de85626d9df069f3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 16 Jul 2018 22:43:19 -0600
Subject: [PATCH 0400/1013] Fix escape/de-escaping for zmodem & friends

---
 core/archaicnet.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/core/archaicnet.js b/core/archaicnet.js
index bc3528d6..b407c97d 100644
--- a/core/archaicnet.js
+++ b/core/archaicnet.js
@@ -52,9 +52,12 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
                     let pipeRestored = false;
                     let pipedStream;
                     const restorePipe = function() {
-                        if(pipedStream && !pipeRestored && !clientTerminated) {
-                            self.client.term.output.unpipe(pipedStream);
-                            self.client.term.output.resume();
+                        if(!pipeRestored) {
+                            if(pipedStream && !clientTerminated) {
+                                self.client.term.output.unpipe(pipedStream);
+                                self.client.term.output.resume();
+                            }
+                            self.client.restoreDataHandler();
                         }
                     };
 
@@ -82,8 +85,15 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
                             pipedStream = stream;
                             self.client.term.output.pipe(stream);
 
-                            stream.on('data', d => {
-                                return self.client.term.rawWrite(d);
+                            //  we need to filter I/O for escape/de-escaping zmodem and the like
+                            self.client.setTemporaryDirectDataHandler(data => {
+                                const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
+                                stream.write(Buffer.from(tmp, 'binary'));
+                            });
+
+                            stream.on('data', data => {
+                                const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');   //  escape
+                                self.client.term.rawWrite(Buffer.from(tmp, 'binary'));
                             });
 
                             stream.on('close', () => {

From 118cb97487e82b1bfbca7e83f66fb019fa3ec786 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 17 Jul 2018 20:00:47 -0600
Subject: [PATCH 0401/1013] MenuModule.reload(), updated
 @systemMethod:reloadMenu(), and notes

---
 core/menu_module.js        | 6 ++++++
 core/system_menu_method.js | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index d284aa64..67fabb7e 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -187,6 +187,12 @@ exports.MenuModule = class MenuModule extends PluginModule {
         return this.client.menuStack.goto(name, options, cb);
     }
 
+    reload(cb) {
+        const prevMenu = this.client.menuStack.pop();
+        prevMenu.instance.leave();
+        return this.client.menuStack.goto(prevMenu.name, cb);
+    }
+
     addViewController(name, vc) {
         assert(!this.viewControllers[name], `ViewController by the name of "${name}" already exists!`);
 
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 9c9cd6d3..9218e34a 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -87,11 +87,9 @@ function nextMenu(callingMenu, formData, extraArgs, cb) {
     });
 }
 
-//  :TODO: prev/nextConf, prev/nextArea should use a NYI MenuModule.redraw() or such -- avoid pop/goto() hack!
+//  :TODO: need redrawMenu() and MenuModule.redraw()
 function reloadMenu(menu, cb) {
-    const prevMenu = menu.client.menuStack.pop();
-    prevMenu.instance.leave();
-    menu.client.menuStack.goto(prevMenu.name, cb);
+    return menu.reload(cb);
 }
 
 function prevConf(callingMenu, formData, extraArgs, cb) {

From 58254ee27b150f218c88cfee228c373131ab8534 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 17 Jul 2018 21:06:27 -0600
Subject: [PATCH 0402/1013] Fix config

---
 core/archaicnet.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/archaicnet.js b/core/archaicnet.js
index b407c97d..31ce4dc2 100644
--- a/core/archaicnet.js
+++ b/core/archaicnet.js
@@ -24,8 +24,8 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
         //  establish defaults
         this.config             = options.menuConfig.config;
         this.config.host        = this.config.host || 'bbs.archaicbinary.net';
-        this.config.sshPort     = this.config.sshPort || 8513;
-        this.config.rloginPort  = this.config.rloginPort || 2222;
+        this.config.sshPort     = this.config.sshPort || 2222;
+        this.config.rloginPort  = this.config.rloginPort || 8513;
     }
 
     initSequence() {
@@ -49,15 +49,12 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
 
                     const sshClient = new SSHClient();
 
-                    let pipeRestored = false;
-                    let pipedStream;
+                    let needRestore = false;
+                    //let pipedStream;
                     const restorePipe = function() {
-                        if(!pipeRestored) {
-                            if(pipedStream && !clientTerminated) {
-                                self.client.term.output.unpipe(pipedStream);
-                                self.client.term.output.resume();
-                            }
+                        if(needRestore && !clientTerminated) {
                             self.client.restoreDataHandler();
+                            needRestore = false;
                         }
                     };
 
@@ -82,14 +79,12 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
                             const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
                             stream.write(rlogin);
 
-                            pipedStream = stream;
-                            self.client.term.output.pipe(stream);
-
                             //  we need to filter I/O for escape/de-escaping zmodem and the like
                             self.client.setTemporaryDirectDataHandler(data => {
                                 const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
                                 stream.write(Buffer.from(tmp, 'binary'));
                             });
+                            needRestore = true;
 
                             stream.on('data', data => {
                                 const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');   //  escape
@@ -115,6 +110,7 @@ exports.getModule = class ArchaicNETModule extends MenuModule {
                         return callback(null);
                     });
 
+                    self.client.log.trace( { host : self.config.host, port : self.config.sshPort }, 'Connecting to ArchaicNET');
                     sshClient.connect( {
                         host        : self.config.host,
                         port        : self.config.sshPort,

From c1ae3d88bad3fcdec4e328ff926ae42cdbec7788 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 14:28:18 -0600
Subject: [PATCH 0403/1013] * Fix RunDoor event name * Standardize *.user_*
 event names

---
 core/system_events.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/system_events.js b/core/system_events.js
index 42aa0700..c8345160 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -12,14 +12,12 @@ module.exports = {
     PromptsChanged      : 'codes.l33t.enigma.system.prompts_changed',   //  (prompt.hjson)
 
     //  User - includes { user, ...}
-    NewUser             : 'codes.l33t.enigma.system.new_user',
+    NewUser             : 'codes.l33t.enigma.system.user_new',
     UserLogin           : 'codes.l33t.enigma.system.user_login',
     UserLogoff          : 'codes.l33t.enigma.system.user_logoff',
     UserUpload          : 'codes.l33t.enigma.system.user_upload',       //  {..., files[ fileEntry, ...] }
     UserDownload        : 'codes.l33t.enigma.system.user_download',     //  {..., files[ fileEntry, ...] }
-
-    //  NYI below here:
-    UserPostMessage     : 'codes.l33t.enigma.system.user_post_msg',
+    UserPostMessage     : 'codes.l33t.enigma.system.user_post_msg',     //  { areaTag }
     UserSendMail        : 'codes.l33t.enigma.system.user_send_mail',
-    UserSendRunDoor     : 'codes.l33t.enigma.system.user_run_door',
+    UserRunDoor         : 'codes.l33t.enigma.system.user_run_door',
 };

From 52585c78f04b21d7d75cc56325a94b60cbb9d10f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 14:32:06 -0600
Subject: [PATCH 0404/1013] Major changes around events, event log, etc. * User
 event log is now functional & attached to various events * Add additional
 missing system events * Completely re-write last_callers to have new
 functionality, etc. * Events.addListenerMultipleEvents() * New
 'moduleInitialize' export for module init vs Event specific registerEvents *
 Add docs on last_callers mod

---
 UPGRADE.md                   |   2 +
 WHATSNEW.md                  |   2 +
 core/abracadabra.js          |   5 +-
 core/bbs.js                  |   6 +
 core/config.js               |   2 +-
 core/database.js             |  13 +-
 core/events.js               |  46 ++----
 core/fse.js                  |  46 +++---
 core/last_callers.js         | 286 ++++++++++++++++++++++-------------
 core/mask_edit_text_view.js  |   3 +-
 core/module_util.js          |  54 +++++++
 core/nua.js                  |   6 +-
 core/stat_log.js             |  41 ++++-
 core/user.js                 |  11 +-
 core/user_login.js           |   6 +-
 docs/modding/last-callers.md |  34 +++++
 16 files changed, 392 insertions(+), 171 deletions(-)
 create mode 100644 docs/modding/last-callers.md

diff --git a/UPGRADE.md b/UPGRADE.md
index 25fe477f..956789c3 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -57,6 +57,8 @@ webSocket: {
     proxied: true	//	X-Forwarded-Proto: https support
 }
 ```
+* The module export `registerEvents` has been deprecated. If you have a module that depends on this, use the new more generic `moduleInitialize` export instead.
+* The `system.db` `user_event_log` table has been updated to include a unique session ID. Previously this table was not used, but you will need to perform a slight maintenance task before it can be properly used. After updating to `0.0.9-alpha`, please run the following: `sqlite3 db/system.db DROP TABLE user_event_log;`. The new table format will be created and used at startup.
 
 
 # 0.0.7-alpha to 0.0.8-alpha
diff --git a/WHATSNEW.md b/WHATSNEW.md
index bedc54e4..5e92784e 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -16,6 +16,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Ability to delete from personal mailbox (finally!)
 * Add ability to skip file and/or message areas during newscan. Set config.omitFileAreaTags and config.omitMessageAreaTags in new_scan configuration of your menu.hjson
 * `{userName}` (sanatized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
+* Any module may now register for a system startup intiialization via the `initializeModules(initInfo, cb)` export.
+* User event log is now functional. Various events a user performs will be persisted to the `system.db` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
 
 
 ## 0.0.8-alpha
diff --git a/core/abracadabra.js b/core/abracadabra.js
index c0bb2c83..9ada9e5a 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -1,11 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule        = require('./menu_module.js').MenuModule;
+const { MenuModule }    = require('./menu_module.js');
 const DropFile          = require('./dropfile.js');
 const Door              = require('./door.js');
 const theme             = require('./theme.js');
 const ansi              = require('./ansi_term.js');
+const Events            = require('./events.js');
 
 const async             = require('async');
 const assert            = require('assert');
@@ -145,6 +146,8 @@ exports.getModule = class AbracadabraModule extends MenuModule {
     }
 
     runDoor() {
+        Events.emit(Events.getSystemEvents().UserRunDoor, { user : this.client.user } );
+
         this.client.term.write(ansi.resetScreen());
 
         const exeInfo = {
diff --git a/core/bbs.js b/core/bbs.js
index 4436eb02..f3d59200 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -267,6 +267,9 @@ function initialize(cb) {
             function readyEvents(callback) {
                 return require('./events.js').startup(callback);
             },
+            function genericModulesInit(callback) {
+                return require('./module_util.js').initializeModules(callback);
+            },
             function listenConnections(callback) {
                 return require('./listening_server.js').startup(callback);
             },
@@ -286,6 +289,9 @@ function initialize(cb) {
                     initServices.eventScheduler = modInst;
                     return callback(err);
                 });
+            },
+            function listenUserEventsForStatLog(callback) {
+                return require('./stat_log.js').initUserEvents(callback);
             }
         ],
         function onComplete(err) {
diff --git a/core/config.js b/core/config.js
index 9c33f38f..3d7c6d70 100644
--- a/core/config.js
+++ b/core/config.js
@@ -147,7 +147,7 @@ function getDefaultConfig() {
         users : {
             usernameMin         : 2,
             usernameMax         : 16,   //  Note that FidoNet wants 36 max
-            usernamePattern     : '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ ]+$',
+            usernamePattern     : '^[A-Za-z0-9~!@#$%^&*()\\-\\_+ .]+$',
 
             passwordMin         : 6,
             passwordMax         : 128,
diff --git a/core/database.js b/core/database.js
index ba48b404..8bae6a87 100644
--- a/core/database.js
+++ b/core/database.js
@@ -18,6 +18,7 @@ const dbs = {};
 
 exports.getTransactionDatabase      = getTransactionDatabase;
 exports.getModDatabasePath          = getModDatabasePath;
+exports.loadDatabaseForMod          = loadDatabaseForMod;
 exports.getISOTimestampString       = getISOTimestampString;
 exports.sanatizeString              = sanatizeString;
 exports.initializeDatabases         = initializeDatabases;
@@ -55,6 +56,15 @@ function getModDatabasePath(moduleInfo, suffix) {
     return paths.join(conf.config.paths.modsDb, `${full}.sqlite3`);
 }
 
+function loadDatabaseForMod(modInfo, cb) {
+    const db = getTransactionDatabase(new sqlite3.Database(
+        getModDatabasePath(modInfo),
+        err => {
+            return cb(err, db);
+        }
+    ));
+}
+
 function getISOTimestampString(ts) {
     ts = ts || moment();
     return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
@@ -131,10 +141,11 @@ const DB_INIT_TABLE = {
                 id              INTEGER PRIMARY KEY,
                 timestamp       DATETIME NOT NULL,
                 user_id         INTEGER NOT NULL,
+                session_id      VARCHAR NOT NULL,
                 log_name        VARCHAR NOT NULL,
                 log_value       VARCHAR NOT NULL,
 
-                UNIQUE(timestamp, user_id, log_name)
+                UNIQUE(timestamp, user_id, session_id, log_name)
             );`
         );
 
diff --git a/core/events.js b/core/events.js
index 6284597e..73253fe3 100644
--- a/core/events.js
+++ b/core/events.js
@@ -1,20 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-const paths             = require('path');
 const events            = require('events');
 const Log               = require('./logger.js').log;
 const SystemEvents      = require('./system_events.js');
 
-//  deps
-const _                 = require('lodash');
-const async             = require('async');
-const glob              = require('glob');
-
 module.exports = new class Events extends events.EventEmitter {
     constructor() {
         super();
-        this.setMaxListeners(32);   //  :TODO: play with this...
+        this.setMaxListeners(64);   //  :TODO: play with this...
     }
 
     getSystemEvents() {
@@ -41,39 +35,21 @@ module.exports = new class Events extends events.EventEmitter {
         return super.once(event, listener);
     }
 
+    addListenerMultipleEvents(events, listener) {
+        Log.trace( { events }, 'Registring event listeners');
+        events.forEach(eventName => {
+            this.on(eventName, event => {
+                listener(eventName, event);
+            });
+        });
+    }
+
     removeListener(event, listener) {
         Log.trace( { event : event }, 'Removing listener');
         return super.removeListener(event, listener);
     }
 
     startup(cb) {
-        async.each(require('./module_util.js').getModulePaths(), (modulePath, nextPath) => {
-            glob('*{.js,/*.js}', { cwd : modulePath }, (err, files) => {
-                if(err) {
-                    return nextPath(err);
-                }
-
-                async.each(files, (moduleName, nextModule) => {
-                    const fullModulePath = paths.join(modulePath, moduleName);
-
-                    try {
-                        const mod = require(fullModulePath);
-
-                        if(_.isFunction(mod.registerEvents)) {
-                            //  :TODO: ... or just systemInit() / systemShutdown() & mods could call Events.on() / Events.removeListener() ?
-                            mod.registerEvents(this);
-                        }
-                    } catch(e) {
-                        Log.warn( { error : e }, 'Exception during module "registerEvents"');
-                    }
-
-                    return nextModule(null);
-                }, err => {
-                    return nextPath(err);
-                });
-            });
-        }, err => {
-            return cb(err);
-        });
+        return cb(null);
     }
 };
diff --git a/core/fse.js b/core/fse.js
index 7d3565ad..fcf27ad4 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -2,26 +2,34 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule                    = require('./menu_module.js').MenuModule;
-const ViewController                = require('./view_controller.js').ViewController;
-const ansi                          = require('./ansi_term.js');
-const theme                         = require('./theme.js');
-const Message                       = require('./message.js');
-const updateMessageAreaLastReadId   = require('./message_area.js').updateMessageAreaLastReadId;
-const getMessageAreaByTag           = require('./message_area.js').getMessageAreaByTag;
-const User                          = require('./user.js');
-const StatLog                       = require('./stat_log.js');
-const stringFormat                  = require('./string_format.js');
-const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
-const { isAnsi, cleanControlCodes, insert } = require('./string_util.js');
-const Config                        = require('./config.js').get;
-const { getAddressedToInfo }        = require('./mail_util.js');
+const { MenuModule }            = require('./menu_module.js');
+const { ViewController }        = require('./view_controller.js');
+const ansi                      = require('./ansi_term.js');
+const theme                     = require('./theme.js');
+const Message                   = require('./message.js');
+const {
+    updateMessageAreaLastReadId
+}                               = require('./message_area.js');
+const { getMessageAreaByTag }   = require('./message_area.js');
+const User                      = require('./user.js');
+const StatLog                   = require('./stat_log.js');
+const stringFormat              = require('./string_format.js');
+const {
+    MessageAreaConfTempSwitcher
+}                               = require('./mod_mixins.js');
+const {
+    isAnsi, cleanControlCodes,
+    insert
+}                               = require('./string_util.js');
+const Config                    = require('./config.js').get;
+const { getAddressedToInfo }    = require('./mail_util.js');
+const Events                    = require('./events.js');
 
 //  deps
-const async                         = require('async');
-const assert                        = require('assert');
-const _                             = require('lodash');
-const moment                        = require('moment');
+const async                     = require('async');
+const assert                    = require('assert');
+const _                         = require('lodash');
+const moment                    = require('moment');
 
 exports.moduleInfo = {
     name    : 'Full Screen Editor (FSE)',
@@ -463,12 +471,14 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
     updateUserStats(cb) {
         if(Message.isPrivateAreaTag(this.message.areaTag)) {
+            Events.emit(Events.getSystemEvents().UserSendMail, { user : this.client.user });
             if(cb) {
                 cb(null);
             }
             return; //  don't inc stats for private messages
         }
 
+        Events.emit(Events.getSystemEvents().UserPostMessage, { user : this.client.user, areaTag : this.message.areaTag });
         return StatLog.incrementUserStat(this.client.user, 'post_count', 1, cb);
     }
 
diff --git a/core/last_callers.js b/core/last_callers.js
index 52ec08f9..84ca01c3 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -2,27 +2,16 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule        = require('./menu_module.js').MenuModule;
-const ViewController    = require('./view_controller.js').ViewController;
-const StatLog           = require('./stat_log.js');
-const User              = require('./user.js');
-const stringFormat      = require('./string_format.js');
+const { MenuModule }            = require('./menu_module.js');
+const StatLog                   = require('./stat_log.js');
+const User                      = require('./user.js');
+const sysDb                     = require('./database.js').dbs.system;
 
 //  deps
 const moment            = require('moment');
 const async             = require('async');
 const _                 = require('lodash');
 
-/*
-    Available listFormat object members:
-    userId
-    userName
-    location
-    affiliation
-    ts
-
-*/
-
 exports.moduleInfo = {
     name        : 'Last Callers',
     desc        : 'Last callers to the system',
@@ -37,6 +26,9 @@ const MciCodeIds = {
 exports.getModule = class LastCallersModule extends MenuModule {
     constructor(options) {
         super(options);
+
+        this.actionIndicators        = _.get(options, 'menuConfig.config.actionIndicators', {});
+        this.actionIndicatorDefault  = _.get(options, 'menuConfig.config.actionIndicatorDefault', '-');
     }
 
     mciReady(mciData, cb) {
@@ -45,107 +37,191 @@ exports.getModule = class LastCallersModule extends MenuModule {
                 return cb(err);
             }
 
-            const self      = this;
-            const vc        = self.viewControllers.allViews = new ViewController( { client : self.client } );
-
-            let loginHistory;
-            let callersView;
-
-            async.series(
+            async.waterfall(
                 [
-                    function loadFromConfig(callback) {
-                        const loadOpts = {
-                            callingMenu     : self,
-                            mciMap          : mciData.menu,
-                            noInput         : true,
-                        };
-
-                        vc.loadFromMenuConfig(loadOpts, callback);
-                    },
-                    function fetchHistory(callback) {
-                        callersView = vc.getView(MciCodeIds.CallerList);
-
-                        //  fetch up
-                        StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, 200, (err, lh) => {
-                            loginHistory = lh;
-
-                            if(self.menuConfig.config.hideSysOpLogin) {
-                                const noOpLoginHistory = loginHistory.filter(lh => {
-                                    return false === User.isRootUserId(parseInt(lh.log_value)); //  log_value=userId
-                                });
-
-                                //
-                                //  If we have enough items to display, or hideSysOpLogin is set to 'always',
-                                //  then set loginHistory to our filtered list. Else, we'll leave it be.
-                                //
-                                if(noOpLoginHistory.length >= callersView.dimens.height || 'always' === self.menuConfig.config.hideSysOpLogin) {
-                                    loginHistory = noOpLoginHistory;
-                                }
-                            }
-
-                            //
-                            //  Finally, we need to trim up the list to the needed size
-                            //
-                            loginHistory = loginHistory.slice(0, callersView.dimens.height);
-
-                            return callback(err);
+                    (next) => {
+                        this.prepViewController('callers', 0, mciData.menu, err => {
+                            return next(err);
                         });
                     },
-                    function getUserNamesAndProperties(callback) {
-                        const getPropOpts = {
-                            names       : [ 'location', 'affiliation' ]
-                        };
-
-                        const dateTimeFormat = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
-
-                        async.each(
-                            loginHistory,
-                            (item, next) => {
-                                item.userId = parseInt(item.log_value);
-                                item.ts     = moment(item.timestamp).format(dateTimeFormat);
-
-                                User.getUserName(item.userId, (err, userName) => {
-                                    if(err) {
-                                        item.deleted = true;
-                                        return next(null);
-                                    } else {
-                                        item.userName = userName || 'N/A';
-
-                                        User.loadProperties(item.userId, getPropOpts, (err, props) => {
-                                            if(!err && props) {
-                                                item.location       = props.location || 'N/A';
-                                                item.affiliation    = item.affils = (props.affiliation || 'N/A');
-                                            } else {
-                                                item.location       = 'N/A';
-                                                item.affiliation    = item.affils = 'N/A';
-                                            }
-                                            return next(null);
-                                        });
-                                    }
-                                });
-                            },
-                            err => {
-                                loginHistory = loginHistory.filter(lh => true !== lh.deleted);
-                                return callback(err);
-                            }
-                        );
+                    (next) => {
+                        this.fetchHistory( (err, loginHistory) => {
+                            return next(err, loginHistory);
+                        });
                     },
-                    function populateList(callback) {
-                        const listFormat = self.menuConfig.config.listFormat || '{userName} - {location} - {affiliation} - {ts}';
-
-                        callersView.setItems(_.map(loginHistory, ce => stringFormat(listFormat, ce) ) );
-
+                    (loginHistory, next) => {
+                        this.loadUserForHistoryItems(loginHistory, (err, updatedHistory) => {
+                            return next(err, updatedHistory);
+                        });
+                    },
+                    (loginHistory, next) => {
+                        const callersView = this.viewControllers.callers.getView(MciCodeIds.CallerList);
+                        callersView.setItems(loginHistory);
                         callersView.redraw();
-                        return callback(null);
+                        return next(null);
                     }
                 ],
-                (err) => {
+                err => {
                     if(err) {
-                        self.client.log.error( { error : err.toString() }, 'Error loading last callers');
+                        this.client.log.warn( { error : err.message }, 'Error loading last callers');
                     }
-                    cb(err);
+                    return cb(err);
                 }
             );
         });
     }
+
+    getCollapse(conf) {
+        let collapse = _.get(this, conf);
+        collapse = collapse && collapse.match(/^([0-9]+)\s*(minutes|seconds|hours|days|months)$/);
+        if(collapse) {
+            return moment.duration(parseInt(collapse[1]), collapse[2]);
+        }
+    }
+
+    fetchHistory(cb) {
+        const callersView = this.viewControllers.callers.getView(MciCodeIds.CallerList);
+        if(!callersView || 0 === callersView.dimens.height) {
+            return cb(null);
+        }
+
+        StatLog.getSystemLogEntries(
+            'user_login_history',
+            StatLog.Order.TimestampDesc,
+            200,    //  max items to fetch - we need more than max displayed for filtering/etc.
+            (err, loginHistory) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                const dateTimeFormat = _.get(
+                    this, 'menuConfig.config.dateTimeFormat', this.client.currentTheme.helpers.getDateFormat('short'));
+
+                loginHistory = loginHistory.map(item => {
+                    try {
+                        const historyItem = JSON.parse(item.log_value);
+                        if(_.isObject(historyItem)) {
+                            item.userId     = historyItem.userId;
+                            item.sessionId  = historyItem.sessionId;
+                        } else {
+                            item.userId     = historyItem;  //  older format
+                            item.sessionId  = '-none-';
+                        }
+                    } catch(e) {
+                        return null;    //  we'll filter this out
+                    }
+
+                    item.timestamp = moment(item.timestamp);
+
+                    return Object.assign(
+                        item,
+                        {
+                            ts : moment(item.timestamp).format(dateTimeFormat)
+                        }
+                    );
+                });
+
+                const hideSysOp     = _.get(this, 'menuConfig.config.sysop.hide');
+                const sysOpCollapse = this.getCollapse('menuConfig.config.sysop.collapse');
+
+                if(hideSysOp) {
+                    loginHistory = loginHistory.filter(item => false === User.isRootUserId(item.userId));
+                } else if(sysOpCollapse) {
+                    //  :TODO: DRY op & user collapse code
+                    const maxAge = sysOpCollapse.asSeconds();
+                    let lastUserId;
+                    let lastTimestamp;
+
+                    loginHistory = loginHistory.filter(item => {
+                        const op        = User.isRootUserId(item.userId);
+                        const repeat    = lastUserId === item.userId;
+                        const recent    = lastTimestamp ? moment.duration(lastTimestamp.diff(item.timestamp)).seconds() < maxAge : false;
+
+                        lastUserId = item.userId;
+                        lastTimestamp = item.timestamp;
+
+                        return !op || !repeat || !recent;
+                    });
+                }
+
+                const userCollapse  = this.getCollapse('menuConfig.config.user.collapse');
+                if(userCollapse) {
+                    const maxAge = userCollapse.asSeconds();
+                    let lastUserId;
+                    let lastTimestamp;
+
+                    loginHistory = loginHistory.filter(item => {
+                        const repeat    = lastUserId === item.userId;
+                        const recent    = lastTimestamp ? moment.duration(lastTimestamp.diff(item.timestamp)).seconds() < maxAge : false;
+
+                        lastUserId = item.userId;
+                        lastTimestamp = item.timestamp;
+
+                        return !repeat || !recent;
+                    });
+                }
+
+                return cb(
+                    null,
+                    loginHistory.slice(0, callersView.dimens.height)      //  trim the fat
+                );
+            }
+        );
+    }
+
+    loadUserForHistoryItems(loginHistory, cb) {
+        const getPropOpts = {
+            names : [  'real_name', 'location', 'affiliation' ]
+        };
+
+        const actionIndicatorNames = _.map(this.actionIndicators, (v, k) => k);
+        let indicatorSumsSql;
+        if(actionIndicatorNames.length > 0) {
+            indicatorSumsSql = actionIndicatorNames.map(i => {
+                return `SUM(CASE WHEN log_value='${_.snakeCase(i)}' THEN 1 ELSE 0 END) AS ${i}`;
+            });
+        }
+
+        async.map(loginHistory, (item, next) => {
+            User.getUserName(item.userId, (err, userName) => {
+                if(err) {
+                    return cb(null, null);
+                }
+
+                item.userName = item.text = (userName || 'N/A');
+
+                User.loadProperties(item.userId, getPropOpts, (err, props) => {
+                    item.location       = (props && props.location) || 'N/A';
+                    item.affiliation    = item.affils = (props && props.affiliation) || 'N/A';
+                    item.realName       = (props && props.real_name) || 'N/A';
+
+                    if(!indicatorSumsSql) {
+                        return next(null, item);
+                    }
+
+                    sysDb.get(
+                        `SELECT ${indicatorSumsSql.join(', ')}
+                        FROM user_event_log
+                        WHERE user_id=? AND session_id=?
+                        LIMIT 1;`,
+                        [ item.userId, item.sessionId ],
+                        (err, results) => {
+                            if(_.isObject(results)) {
+                                item.actions = '';
+                                Object.keys(results).forEach(n => {
+                                    const indicator = results[n] > 0 ? this.actionIndicators[n] || this.actionIndicatorDefault : this.actionIndicatorDefault;
+                                    item[n] = indicator;
+                                    item.actions += indicator;
+                                });
+                            }
+                            return next(null, item);
+                        }
+                    );
+                });
+            });
+        },
+        (err, mapped) => {
+            return cb(err, mapped.filter(item => item));    //  remove deleted
+        });
+    }
 };
diff --git a/core/mask_edit_text_view.js b/core/mask_edit_text_view.js
index dbc782a0..abd04cb1 100644
--- a/core/mask_edit_text_view.js
+++ b/core/mask_edit_text_view.js
@@ -25,7 +25,8 @@ exports.MaskEditTextView    = MaskEditTextView;
 //  :TODO:
 //  * Hint, e.g. YYYY/MM/DD
 //  * Return values with literals in place
-//
+//  * Tab in/out results in oddities such as cursor placement & ability to type in non-pattern chars
+//  * There exists some sort of condition that allows pattern position to get out of sync
 
 function MaskEditTextView(options) {
     options.acceptsFocus    = miscUtil.valueWithDefault(options.acceptsFocus, true);
diff --git a/core/module_util.js b/core/module_util.js
index 5a575f3e..ae342d4b 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -3,6 +3,7 @@
 
 //  ENiGMA½
 const Config    = require('./config.js').get;
+const Log       = require('./logger.js').log;
 
 //  deps
 const fs        = require('graceful-fs');
@@ -10,12 +11,14 @@ const paths     = require('path');
 const _         = require('lodash');
 const assert    = require('assert');
 const async     = require('async');
+const glob      = require('glob');
 
 //  exports
 exports.loadModuleEx            = loadModuleEx;
 exports.loadModule              = loadModule;
 exports.loadModulesForCategory  = loadModulesForCategory;
 exports.getModulePaths          = getModulePaths;
+exports.initializeModules       = initializeModules;
 
 function loadModuleEx(options, cb) {
     assert(_.isObject(options));
@@ -108,3 +111,54 @@ function getModulePaths() {
         config.paths.scannerTossers,
     ];
 }
+
+function initializeModules(cb) {
+    const Events = require('./events.js');
+
+    const modulePaths = getModulePaths().concat(__dirname);
+
+    async.each(modulePaths, (modulePath, nextPath) => {
+        glob('*{.js,/*.js}', { cwd : modulePath }, (err, files) => {
+            if(err) {
+                return nextPath(err);
+            }
+
+            const ourPath = paths.join(__dirname, __filename);
+
+            async.each(files, (moduleName, nextModule) => {
+                const fullModulePath = paths.join(modulePath, moduleName);
+                if(ourPath === fullModulePath) {
+                    return nextModule(null);
+                }
+
+                try {
+                    const mod = require(fullModulePath);
+
+                    if(_.isFunction(mod.moduleInitialize)) {
+                        const initInfo = {
+                            events : Events,
+                        };
+
+                        mod.moduleInitialize(initInfo, err => {
+                            if(err) {
+                                Log.warn( { error : err.message, modulePath : fullModulePath }, 'Error during "moduleInitialize"');
+                            }
+                            return nextModule(null);
+                        });
+                    } else {
+                        return nextModule(null);
+                    }
+                } catch(e) {
+                    Log.warn( { error : e }, 'Exception during "moduleInitialize"');
+                    return nextModule(null);
+                }
+            },
+            err => {
+                return nextPath(err);
+            });
+        });
+    },
+    err => {
+        return cb(err);
+    });
+}
diff --git a/core/nua.js b/core/nua.js
index 7eafe16d..18b9a719 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -103,7 +103,11 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                 }
 
                 //  :TODO: User.create() should validate email uniqueness!
-                newUser.create(formData.value.password, err => {
+                const createUserInfo = {
+                    password    : formData.value.password,
+                    sessionId   : self.client.session.uniqueId, //  used for events/etc.
+                };
+                newUser.create(createUserInfo, err => {
                     if(err) {
                         self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
 
diff --git a/core/stat_log.js b/core/stat_log.js
index 4b076e6d..9e655999 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -252,10 +252,16 @@ class StatLog {
 
     appendUserLogEntry(user, logName, logValue, keepDays, cb) {
         sysDb.run(
-            `INSERT INTO user_event_log (timestamp, user_id, log_name, log_value)
-            VALUES (?, ?, ?, ?);`,
-            [ this.now, user.userId, logName, logValue ],
-            () => {
+            `INSERT INTO user_event_log (timestamp, user_id, session_id, log_name, log_value)
+            VALUES (?, ?, ?, ?, ?);`,
+            [ this.now, user.userId, user.sessionId, logName, logValue ],
+            err => {
+                if(err) {
+                    if(cb) {
+                        cb(err);
+                    }
+                    return;
+                }
                 //
                 //  Handle keepDays
                 //
@@ -280,6 +286,33 @@ class StatLog {
             }
         );
     }
+
+    initUserEvents(cb) {
+        //
+        //  We map some user events directly to user stat log entries such that they
+        //  are persisted for a time.
+        //
+        const Events = require('./events.js');
+        const systemEvents = Events.getSystemEvents();
+
+        const interestedEvents = [
+            systemEvents.NewUser,
+            systemEvents.UserUpload, systemEvents.UserDownload,
+            systemEvents.UserPostMessage, systemEvents.UserSendMail,
+            systemEvents.UserRunDoor,
+        ];
+
+        Events.addListenerMultipleEvents(interestedEvents, (eventName, event) => {
+            this.appendUserLogEntry(
+                event.user,
+                'system_event',
+                eventName.replace(/^codes\.l33t\.enigma\.system\./, ''),    //  strip package name prefix
+                90
+            );
+        });
+
+        return cb(null);
+    }
 }
 
 module.exports = new StatLog();
diff --git a/core/user.js b/core/user.js
index e3314cc7..18acc02c 100644
--- a/core/user.js
+++ b/core/user.js
@@ -179,7 +179,7 @@ module.exports = class User {
         );
     }
 
-    create(password, cb) {
+    create(createUserInfo , cb) {
         assert(0 === this.userId);
         const config = Config();
 
@@ -219,7 +219,7 @@ module.exports = class User {
                     );
                 },
                 function genAuthCredentials(trans, callback) {
-                    User.generatePasswordDerivedKeyAndSalt(password, (err, info) => {
+                    User.generatePasswordDerivedKeyAndSalt(createUserInfo.password, (err, info) => {
                         if(err) {
                             return callback(err);
                         }
@@ -244,7 +244,12 @@ module.exports = class User {
                     });
                 },
                 function sendEvent(trans, callback) {
-                    Events.emit(Events.getSystemEvents().NewUser, { user : self });
+                    Events.emit(
+                        Events.getSystemEvents().NewUser,
+                        {
+                            user : Object.assign({}, self, { sessionId : createUserInfo.sessionId } )
+                        }
+                    );
                     return callback(null, trans);
                 }
             ],
diff --git a/core/user_login.js b/core/user_login.js
index 07a0a2d2..2030152d 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -87,7 +87,11 @@ function userLogin(client, username, password, cb) {
                 },
                 function recordLoginHistory(callback) {
                     const LOGIN_HISTORY_MAX = 200;  //  history of up to last 200 callers
-                    return StatLog.appendSystemLogEntry('user_login_history', user.userId, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
+                    const historyItem = JSON.stringify({
+                        userId      : user.userId,
+                        sessionId   : user.sessionId,
+                    });
+                    return StatLog.appendSystemLogEntry('user_login_history', historyItem, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
                 }
             ],
             err => {
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
new file mode 100644
index 00000000..1f7aee8e
--- /dev/null
+++ b/docs/modding/last-callers.md
@@ -0,0 +1,34 @@
+---
+layout: page
+title: Last Callers
+---
+## The Last Callers Module
+The built in `last_callers` module provides flexible retro last callers mod.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `dateTimeFormat`: [moment.js](https://momentjs.com) style format. Defaults to current theme → system `short` format.
+* `user`: User options:
+    * `collapse`: Collapse or roll up entries that fall within the period specified. May be a string in the form of `30 minutes`, `3 weeks`, `1 hour`, etc.
+* `sysop`: Sysop options:
+    * `collapse`: Collapse or roll up entries that fall within the period specified. May be a string in the form of `30 minutes`, `3 weeks`, `1 hour`, etc.
+    * `hide`: Hide all +op logins
+* `actionIndicators`: Maps user actions to indicators. For example: `userDownload` to "D". Available indicators:
+    * `userDownload`
+    * `userUpload`
+    * `userPostMsg`
+    * `userSendMail`
+    * `userRunDoor`
+* `actionIndicatorDefault`: Default indicator when an action is not set. Defaults to "-".
+
+### Theming
+When in a list view, the following `itemFormat` object is provided:
+* `userId`: User ID.
+* `realName`: User's real name or "N/A".
+* `ts`: Timestamp in `dateTimeFormat` format.
+* `location`: User's location or "N/A".
+* `affiliation` or `affils`: Users affiliations or "N/A".
+* `actions`: A string built by concatenating action indicators for a users logged in session. For example, given a indincator of `userDownload` mapped to "D", the string may be "-D----". The format was made popular on Amiga style boards.
+
+

From f1ffd958a53ca5d459aafb8c346584a5870b497f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 14:36:38 -0600
Subject: [PATCH 0405/1013] Fix luciano_blocktronics last allers theme with new
 changes

---
 art/themes/luciano_blocktronics/theme.hjson | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index c0735e6f..d1c11297 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -143,11 +143,14 @@
 
 			mainMenuLastCallers: {
 				config: {
-					listFormat: "|00|11{userName:<17.17}|03{location:<20.20}|11{affils:<17.17}|03{ts:<15}"
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 10, width: 20 }
+					VM1: {
+						height: 10,
+						width: 20
+						itemFormat: "|00|11{userName:<17.16} |03{location:<20.19} |11{affils:<18.17} |03{ts:<15}"
+					}
 				}
 			}
 
@@ -422,11 +425,14 @@
 
 			fullLoginSequenceLastCallers: {
 				config: {
-					listFormat: "|00|11{userName:<17.17}|03{location:<20.20}|11{affils:<17.17}|03{ts:<15}"
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 10, width: 20 }
+					VM1: {
+						height: 10,
+						width: 20
+						itemFormat: "|00|11{userName:<17.16} |03{location:<20.19} |11{affils:<18.17} |03{ts:<15}"
+					}
 				}
 			}
 

From bc9a833f1d3b29921c682b4175b6329dcdaf9526 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 15:28:55 -0600
Subject: [PATCH 0406/1013] Add last callers to nav

---
 docs/_includes/nav.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index dacb2f00..9e5b432c 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -64,6 +64,7 @@
         - Combatnet
         - Exodus
     - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
+    - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 

From 48f7456d4aa334a8e56aabf8e0808f6a15d5fcfb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 15:31:55 -0600
Subject: [PATCH 0407/1013] Minor doc updates on terms

---
 docs/installation/testing.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/installation/testing.md b/docs/installation/testing.md
index 9505f863..9238fc61 100644
--- a/docs/installation/testing.md
+++ b/docs/installation/testing.md
@@ -41,4 +41,7 @@ If you don't have any telnet software, these are compatible with ENiGMA½:
 
 * [SyncTERM](http://syncterm.bbsdev.net/)
 * [EtherTerm](https://github.com/M-griffin/EtherTerm)
-* [NetRunner](http://mysticbbs.com/downloads.html)
\ No newline at end of file
+* [NetRunner](http://mysticbbs.com/downloads.html)
+* [MagiTerm](https://magickabbs.com/index.php/magiterm/)
+* [VTX](https://github.com/codewar65/VTX_ClientServer) (Browser based)
+* [fTelnet](https://www.ftelnet.ca/) (Browser based)
\ No newline at end of file

From f601fd256b3d19a3ab9ca888dcd7db71289c8503 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 21:38:06 -0600
Subject: [PATCH 0408/1013] Fix last_callers collapsing & DRY code

---
 core/last_callers.js | 48 ++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/core/last_callers.js b/core/last_callers.js
index 84ca01c3..ebc98d5f 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -124,41 +124,31 @@ exports.getModule = class LastCallersModule extends MenuModule {
                 const hideSysOp     = _.get(this, 'menuConfig.config.sysop.hide');
                 const sysOpCollapse = this.getCollapse('menuConfig.config.sysop.collapse');
 
+                const collapseList = (withUserId, minAge) => {
+                    let lastUserId;
+                    let lastTimestamp;
+                    loginHistory = loginHistory.filter(item => {
+                        const secApart = lastTimestamp ? moment.duration(lastTimestamp.diff(item.timestamp)).asSeconds() : 0;
+                        const collapse = (null === withUserId ? true : withUserId === item.userId) &&
+                            (lastUserId === item.userId) &&
+                            (secApart < minAge);
+
+                        lastUserId = item.userId;
+                        lastTimestamp = item.timestamp;
+
+                        return !collapse;
+                    });
+                };
+
                 if(hideSysOp) {
                     loginHistory = loginHistory.filter(item => false === User.isRootUserId(item.userId));
                 } else if(sysOpCollapse) {
-                    //  :TODO: DRY op & user collapse code
-                    const maxAge = sysOpCollapse.asSeconds();
-                    let lastUserId;
-                    let lastTimestamp;
-
-                    loginHistory = loginHistory.filter(item => {
-                        const op        = User.isRootUserId(item.userId);
-                        const repeat    = lastUserId === item.userId;
-                        const recent    = lastTimestamp ? moment.duration(lastTimestamp.diff(item.timestamp)).seconds() < maxAge : false;
-
-                        lastUserId = item.userId;
-                        lastTimestamp = item.timestamp;
-
-                        return !op || !repeat || !recent;
-                    });
+                    collapseList(User.RootUserID, sysOpCollapse.asSeconds());
                 }
 
-                const userCollapse  = this.getCollapse('menuConfig.config.user.collapse');
+                const userCollapse = this.getCollapse('menuConfig.config.user.collapse');
                 if(userCollapse) {
-                    const maxAge = userCollapse.asSeconds();
-                    let lastUserId;
-                    let lastTimestamp;
-
-                    loginHistory = loginHistory.filter(item => {
-                        const repeat    = lastUserId === item.userId;
-                        const recent    = lastTimestamp ? moment.duration(lastTimestamp.diff(item.timestamp)).seconds() < maxAge : false;
-
-                        lastUserId = item.userId;
-                        lastTimestamp = item.timestamp;
-
-                        return !repeat || !recent;
-                    });
+                    collapseList(null, userCollapse.asSeconds());
                 }
 
                 return cb(

From e732d2b10db03d4e70d268a3db706f430a15db95 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 23:57:59 -0600
Subject: [PATCH 0409/1013] Code update + use 'itemFormat' standard

---
 core/whos_online.js | 54 ++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/core/whos_online.js b/core/whos_online.js
index 28b71703..db3fc5c4 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -2,10 +2,9 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule            = require('./menu_module.js').MenuModule;
-const ViewController        = require('./view_controller.js').ViewController;
-const getActiveNodeList     = require('./client_connections.js').getActiveNodeList;
-const stringFormat          = require('./string_format.js');
+const { MenuModule }        = require('./menu_module.js');
+const { getActiveNodeList } = require('./client_connections.js');
+const { Errors }            = require('./enig_error.js');
 
 //  deps
 const async                 = require('async');
@@ -33,48 +32,29 @@ exports.getModule = class WhosOnlineModule extends MenuModule {
                 return cb(err);
             }
 
-            const self  = this;
-            const vc    = self.viewControllers.allViews = new ViewController( { client : self.client } );
-
             async.series(
                 [
-                    function loadFromConfig(callback) {
-                        const loadOpts = {
-                            callingMenu     : self,
-                            mciMap          : mciData.menu,
-                            noInput         : true,
-                        };
-
-                        return vc.loadFromMenuConfig(loadOpts, callback);
+                    (next) => {
+                        return this.prepViewController('online', 0, mciData.menu, next);
                     },
-                    function populateList(callback) {
-                        const onlineListView    = vc.getView(MciViewIds.OnlineList);
-                        const listFormat        = self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
-                        const nonAuthUser       = self.menuConfig.config.nonAuthUser || 'Logging In';
-                        const otherUnknown      = self.menuConfig.config.otherUnknown || 'N/A';
-                        const onlineList        = getActiveNodeList(self.menuConfig.config.authUsersOnly).slice(0, onlineListView.height);
+                    (next) => {
+                        const onlineListView = this.viewControllers.online.getView(MciViewIds.OnlineList);
+                        if(!onlineListView) {
+                            return cb(Errors.MissingMci(`Missing online list MCI ${MciViewIds.OnlineList}`));
+                        }
 
-                        onlineListView.setItems(_.map(onlineList, oe => {
-                            if(oe.authenticated) {
-                                oe.timeOn = _.upperFirst(oe.timeOn.humanize());
-                            } else {
-                                [ 'realName', 'location', 'affils', 'timeOn' ].forEach(m => {
-                                    oe[m] = otherUnknown;
-                                });
-                                oe.userName = nonAuthUser;
-                            }
-                            return stringFormat(listFormat, oe);
-                        }));
+                        const onlineList = getActiveNodeList(true).slice(0, onlineListView.height).map(
+                            oe => Object.assign(oe, { timeOn : _.upperFirst(oe.timeOn.humanize()) })
+                        );
 
-                        onlineListView.focusItems = onlineListView.items;
+                        onlineListView.setItems(onlineList);
                         onlineListView.redraw();
-
-                        return callback(null);
+                        return next(null);
                     }
                 ],
-                function complete(err) {
+                err => {
                     if(err) {
-                        self.client.log.error( { error : err.message }, 'Error loading who\'s online');
+                        this.client.log.error( { error : err.message }, 'Error loading who\'s online');
                     }
                     return cb(err);
                 }

From 28afc56d84aea3db91bd1ec27e1b3394dfd64939 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 21 Jul 2018 23:59:14 -0600
Subject: [PATCH 0410/1013] Update luciano_blocktronics theme for Who's Online
 'itemFormat'

---
 art/themes/luciano_blocktronics/theme.hjson | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index d1c11297..bf28baab 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -166,11 +166,12 @@
 			}
 
 			mainMenuWhosOnline: {
-				config: {
-					listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
-				}
 				mci: {
-					VM1: { height: 10, width: 20 }
+					VM1: {
+						height: 10,
+						width: 20
+						itemFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
+					}
 				}
 			}
 
@@ -437,11 +438,12 @@
 			}
 
 			fullLoginSequenceWhosOnline: {
-				config: {
-					listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
-				}
 				mci: {
-					VM1: { height: 10, width: 20 }
+					VM1: {
+						height: 10,
+						width: 20
+						itemFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}"
+					}
 				}
 			}
 

From 0d7a20027cee9aca663b10ca52ac3bf99c7ebb78 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 10:55:39 -0600
Subject: [PATCH 0411/1013] Add Who's online docs, minor doc updates to last
 callers, and code cleanup

---
 core/client_connections.js   |  4 ++--
 docs/modding/last-callers.md |  2 +-
 docs/modding/whos-online.md  | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 docs/modding/whos-online.md

diff --git a/core/client_connections.js b/core/client_connections.js
index 4c16d610..93bb9465 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -38,7 +38,7 @@ function getActiveNodeList(authUsersOnly) {
             node            : ac.node,
             authenticated   : ac.user.isAuthenticated(),
             userId          : ac.user.userId,
-            action          : _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
+            action          : _.get(ac, 'currentMenuModule.menuConfig.desc', 'Unknown'),
         };
 
         //
@@ -48,7 +48,7 @@ function getActiveNodeList(authUsersOnly) {
             entry.userName  = ac.user.username;
             entry.realName  = ac.user.properties.real_name;
             entry.location  = ac.user.properties.location;
-            entry.affils    = ac.user.properties.affiliation;
+            entry.affils    = entry.affiliation = ac.user.properties.affiliation;
 
             const diff      = now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
             entry.timeOn    = moment.duration(diff, 'minutes');
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
index 1f7aee8e..6e18d346 100644
--- a/docs/modding/last-callers.md
+++ b/docs/modding/last-callers.md
@@ -23,7 +23,7 @@ Available `config` block entries:
 * `actionIndicatorDefault`: Default indicator when an action is not set. Defaults to "-".
 
 ### Theming
-When in a list view, the following `itemFormat` object is provided:
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `userId`: User ID.
 * `realName`: User's real name or "N/A".
 * `ts`: Timestamp in `dateTimeFormat` format.
diff --git a/docs/modding/whos-online.md b/docs/modding/whos-online.md
new file mode 100644
index 00000000..feec5f7e
--- /dev/null
+++ b/docs/modding/whos-online.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: Who's Online
+---
+## The Who's OnlineModule
+The built in `whos_online` module provides a basic who's online mod.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
+* `userId`: User ID.
+* `node`: Node ID the user is connected to.
+* `timeOn`: A human friendly amount of time the user has been online.
+* `realName`: User's real name.
+* `location`: User's location.
+* `affiliation` or `affils`: Users affiliations.
+* `action`: Current action/view in the system taken from the `desc` field of the current MenuModule they are interacting with. For example, "Playing L.O.R.D".
+

From 2e275600b13b3b4041515b06719777e51a560e2d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 12:08:30 -0600
Subject: [PATCH 0412/1013] Minor doc update

---
 docs/_includes/nav.md        | 1 +
 docs/modding/last-callers.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 9e5b432c..d781ed45 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -65,6 +65,7 @@
         - Exodus
     - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
     - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
+    - [Who's Online]({{ site.baseurl }}{% link modding/whos-online.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
index 6e18d346..8778b1e0 100644
--- a/docs/modding/last-callers.md
+++ b/docs/modding/last-callers.md
@@ -22,6 +22,8 @@ Available `config` block entries:
     * `userRunDoor`
 * `actionIndicatorDefault`: Default indicator when an action is not set. Defaults to "-".
 
+Remember that entries such as `actionIndicators` and `actionIndicatorDefault` may contain pipe color codes!
+
 ### Theming
 The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `userId`: User ID.

From e6a812cf34575f89acd46e95369fb88f2b4740d9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 12:56:56 -0600
Subject: [PATCH 0413/1013] Standardization work on built in user list module
 plus docs & code cleanup * More docs, fix some info * Code cleanup

---
 art/themes/luciano_blocktronics/theme.hjson |  9 +-
 core/last_callers.js                        | 28 +++---
 core/user.js                                | 10 ++-
 core/user_list.js                           | 96 +++++++++------------
 core/whos_online.js                         |  6 +-
 docs/_includes/nav.md                       |  1 +
 docs/modding/last-callers.md                |  7 +-
 docs/modding/user-list.md                   | 24 ++++++
 docs/modding/whos-online.md                 |  1 +
 9 files changed, 102 insertions(+), 80 deletions(-)
 create mode 100644 docs/modding/user-list.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index bf28baab..6555f417 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -156,12 +156,15 @@
 
 			mainMenuUserList: {
 				config: {
-					listFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{note:<19.19}|03{lastLoginTs}"
-					focusListFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}"
 					dateTimeFormat: MMM Do h:mma
 				}
 				mci: {
-					VM1: { height: 15, width: 50}
+					VM1: {
+						height: 15,
+						width: 50
+						itemFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{note:<19.19}|03{lastLoginTs}"
+						focusItemFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}"
+					}
 				}
 			}
 
diff --git a/core/last_callers.js b/core/last_callers.js
index ebc98d5f..268fde5f 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -2,10 +2,11 @@
 'use strict';
 
 //  ENiGMA½
-const { MenuModule }            = require('./menu_module.js');
-const StatLog                   = require('./stat_log.js');
-const User                      = require('./user.js');
-const sysDb                     = require('./database.js').dbs.system;
+const { MenuModule }    = require('./menu_module.js');
+const StatLog           = require('./stat_log.js');
+const User              = require('./user.js');
+const sysDb             = require('./database.js').dbs.system;
+const { Errors }        = require('./enig_error.js');
 
 //  deps
 const moment            = require('moment');
@@ -19,8 +20,8 @@ exports.moduleInfo = {
     packageName : 'codes.l33t.enigma.lastcallers'
 };
 
-const MciCodeIds = {
-    CallerList      : 1,
+const MciViewIds = {
+    callerList      : 1,
 };
 
 exports.getModule = class LastCallersModule extends MenuModule {
@@ -55,7 +56,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
                         });
                     },
                     (loginHistory, next) => {
-                        const callersView = this.viewControllers.callers.getView(MciCodeIds.CallerList);
+                        const callersView = this.viewControllers.callers.getView(MciViewIds.callerList);
+                        if(!callersView) {
+                            return cb(Errors.MissingMci(`Missing caller list MCI ${MciViewIds.callerList}`));
+                        }
                         callersView.setItems(loginHistory);
                         callersView.redraw();
                         return next(null);
@@ -80,7 +84,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
     }
 
     fetchHistory(cb) {
-        const callersView = this.viewControllers.callers.getView(MciCodeIds.CallerList);
+        const callersView = this.viewControllers.callers.getView(MciViewIds.callerList);
         if(!callersView || 0 === callersView.dimens.height) {
             return cb(null);
         }
@@ -178,12 +182,12 @@ exports.getModule = class LastCallersModule extends MenuModule {
                     return cb(null, null);
                 }
 
-                item.userName = item.text = (userName || 'N/A');
+                item.userName = item.text = userName;
 
                 User.loadProperties(item.userId, getPropOpts, (err, props) => {
-                    item.location       = (props && props.location) || 'N/A';
-                    item.affiliation    = item.affils = (props && props.affiliation) || 'N/A';
-                    item.realName       = (props && props.real_name) || 'N/A';
+                    item.location       = (props && props.location) || '';
+                    item.affiliation    = item.affils = (props && props.affiliation) || '';
+                    item.realName       = (props && props.real_name) || '';
 
                     if(!indicatorSumsSql) {
                         return next(null, item);
diff --git a/core/user.js b/core/user.js
index 18acc02c..6c2b964d 100644
--- a/core/user.js
+++ b/core/user.js
@@ -537,8 +537,8 @@ module.exports = class User {
     }
 
     static getUserList(options, cb) {
-        let userList = [];
-        let orderClause = 'ORDER BY ' + (options.order || 'user_name');
+        const userList = [];
+        const orderClause = 'ORDER BY ' + (options.order || 'user_name');
 
         userDb.each(
             `SELECT id, user_name
@@ -562,7 +562,11 @@ module.exports = class User {
                         [ user.userId ],
                         (err, row) => {
                             if(row) {
-                                user[row.prop_name] = row.prop_value;
+                                if(options.propsCamelCase) {
+                                    user[_.camelCase(row.prop_name)] = row.prop_value;
+                                } else {
+                                    user[row.prop_name] = row.prop_value;
+                                }
                             }
                         },
                         err => {
diff --git a/core/user_list.js b/core/user_list.js
index 8af9690b..43922998 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -1,11 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule        = require('./menu_module.js').MenuModule;
-const User              = require('./user.js');
-const ViewController    = require('./view_controller.js').ViewController;
-const stringFormat      = require('./string_format.js');
+//  ENiGMA½
+const { MenuModule }    = require('./menu_module.js');
+const { getUserList }   = require('./user.js');
+const { Errors }        = require('./enig_error.js');
 
+//  deps
 const moment            = require('moment');
 const async             = require('async');
 const _                 = require('lodash');
@@ -29,7 +30,7 @@ exports.moduleInfo = {
 };
 
 const MciViewIds = {
-    UserList    : 1,
+    userList    : 1,
 };
 
 exports.getModule = class UserListModule extends MenuModule {
@@ -43,68 +44,51 @@ exports.getModule = class UserListModule extends MenuModule {
                 return cb(err);
             }
 
-            const self      = this;
-            const vc        = self.viewControllers.allViews = new ViewController( { client : self.client } );
-
-            let userList = [];
-
-            const USER_LIST_OPTS = {
-                properties : [ 'location', 'affiliation', 'last_login_timestamp' ],
-            };
-
             async.series(
                 [
-                    function loadFromConfig(callback) {
-                        var loadOpts = {
-                            callingMenu     : self,
-                            mciMap          : mciData.menu,
-                        };
-
-                        vc.loadFromMenuConfig(loadOpts, callback);
+                    (next) => {
+                        return this.prepViewController('userList', 0, mciData.menu, next);
                     },
-                    function fetchUserList(callback) {
-                        //  :TODO: Currently fetching all users - probably always OK, but this could be paged
-                        User.getUserList(USER_LIST_OPTS, function got(err, ul) {
-                            userList = ul;
-                            callback(err);
-                        });
-                    },
-                    function populateList(callback) {
-                        var userListView = vc.getView(MciViewIds.UserList);
-
-                        var listFormat      = self.menuConfig.config.listFormat || '{userName} - {affils}';
-                        var focusListFormat = self.menuConfig.config.focusListFormat || listFormat; //  :TODO: default changed color!
-                        var dateTimeFormat  = self.menuConfig.config.dateTimeFormat || 'ddd MMM DD';
-
-                        function getUserFmtObj(ue) {
-                            return {
-                                userId      : ue.userId,
-                                userName    : ue.userName,
-                                affils      : ue.affiliation,
-                                location    : ue.location,
-                                //  :TODO: the rest!
-                                note        : ue.note || '',
-                                lastLoginTs : moment(ue.last_login_timestamp).format(dateTimeFormat),
-                            };
+                    (next) => {
+                        const userListView = this.viewControllers.userList.getView(MciViewIds.userList);
+                        if(!userListView) {
+                            return cb(Errors.MissingMci(`Missing user list MCI ${MciViewIds.userList}`));
                         }
 
-                        userListView.setItems(_.map(userList, function formatUserEntry(ue) {
-                            return stringFormat(listFormat, getUserFmtObj(ue));
-                        }));
+                        const fetchOpts = {
+                            properties      : [ 'real_name', 'location', 'affiliation', 'last_login_timestamp' ],
+                            propsCamelCase  : true, //  e.g. real_name -> realName
+                        };
+                        getUserList(fetchOpts, (err, userList) => {
+                            if(err) {
+                                return next(err);
+                            }
 
-                        userListView.setFocusItems(_.map(userList, function formatUserEntry(ue) {
-                            return stringFormat(focusListFormat, getUserFmtObj(ue));
-                        }));
+                            const dateTimeFormat = _.get(
+                                this, 'menuConfig.config.dateTimeFormat', this.client.currentTheme.helpers.getDateTimeFormat('short'));
 
-                        userListView.redraw();
-                        callback(null);
+                            userList = userList.map(entry => {
+                                return Object.assign(
+                                    entry,
+                                    {
+                                        text            : entry.userName,
+                                        affils          : entry.affiliation,
+                                        lastLoginTs     : moment(entry.lastLoginTimestamp).format(dateTimeFormat),
+                                    }
+                                );
+                            });
+
+                            userListView.setItems(userList);
+                            userListView.redraw();
+                            return next(null);
+                        });
                     }
                 ],
-                function complete(err) {
+                err => {
                     if(err) {
-                        self.client.log.error( { error : err.toString() }, 'Error loading user list');
+                        this.client.log.error( { error : err.message }, 'Error loading user list');
                     }
-                    cb(err);
+                    return cb(err);
                 }
             );
         });
diff --git a/core/whos_online.js b/core/whos_online.js
index db3fc5c4..1078bc51 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -38,13 +38,13 @@ exports.getModule = class WhosOnlineModule extends MenuModule {
                         return this.prepViewController('online', 0, mciData.menu, next);
                     },
                     (next) => {
-                        const onlineListView = this.viewControllers.online.getView(MciViewIds.OnlineList);
+                        const onlineListView = this.viewControllers.online.getView(MciViewIds.onlineList);
                         if(!onlineListView) {
-                            return cb(Errors.MissingMci(`Missing online list MCI ${MciViewIds.OnlineList}`));
+                            return cb(Errors.MissingMci(`Missing online list MCI ${MciViewIds.onlineList}`));
                         }
 
                         const onlineList = getActiveNodeList(true).slice(0, onlineListView.height).map(
-                            oe => Object.assign(oe, { timeOn : _.upperFirst(oe.timeOn.humanize()) })
+                            oe => Object.assign(oe, { text : oe.userName, timeOn : _.upperFirst(oe.timeOn.humanize()) })
                         );
 
                         onlineListView.setItems(onlineList);
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index d781ed45..d7ada9e2 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -66,6 +66,7 @@
     - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
     - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
     - [Who's Online]({{ site.baseurl }}{% link modding/whos-online.md %})
+    - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
index 8778b1e0..f754a912 100644
--- a/docs/modding/last-callers.md
+++ b/docs/modding/last-callers.md
@@ -27,10 +27,11 @@ Remember that entries such as `actionIndicators` and `actionIndicatorDefault` ma
 ### Theming
 The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `userId`: User ID.
-* `realName`: User's real name or "N/A".
+* `userName`: Login username.
+* `realName`: User's real name.
 * `ts`: Timestamp in `dateTimeFormat` format.
-* `location`: User's location or "N/A".
-* `affiliation` or `affils`: Users affiliations or "N/A".
+* `location`: User's location.
+* `affiliation` or `affils`: Users affiliations.
 * `actions`: A string built by concatenating action indicators for a users logged in session. For example, given a indincator of `userDownload` mapped to "D", the string may be "-D----". The format was made popular on Amiga style boards.
 
 
diff --git a/docs/modding/user-list.md b/docs/modding/user-list.md
new file mode 100644
index 00000000..9aae4750
--- /dev/null
+++ b/docs/modding/user-list.md
@@ -0,0 +1,24 @@
+---
+layout: page
+title: User List
+---
+## The User List Module
+The built in `user_list` module provides basic user list functionality.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `dateTimeFormat`: [moment.js](https://momentjs.com) style format. Defaults to current theme → system `short` format.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
+* `userId`: User ID.
+* `userName`: Login username.
+* `realName`: User's real name.
+* `lastLoginTimestamp`: Full last login timestamp for formatting use.
+* `lastLoginTs`: Last login timestamp formatted with `dateTimeFormat` style.
+* `location`: User's location.
+* `affiliation` or `affils`: Users affiliations.
+
+
+
diff --git a/docs/modding/whos-online.md b/docs/modding/whos-online.md
index feec5f7e..87a2b1ef 100644
--- a/docs/modding/whos-online.md
+++ b/docs/modding/whos-online.md
@@ -8,6 +8,7 @@ The built in `whos_online` module provides a basic who's online mod.
 ### Theming
 The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `userId`: User ID.
+* `userName`: Login username.
 * `node`: Node ID the user is connected to.
 * `timeOn`: A human friendly amount of time the user has been online.
 * `realName`: User's real name.

From 39b35e8d116252e6a2c6523d88bb7d52c4c9ef91 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 12:59:43 -0600
Subject: [PATCH 0414/1013] Fix MCI ref

---
 core/whos_online.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/whos_online.js b/core/whos_online.js
index 1078bc51..0ea2321a 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -18,7 +18,7 @@ exports.moduleInfo = {
 };
 
 const MciViewIds = {
-    OnlineList      : 1,
+    onlineList      : 1,
 };
 
 exports.getModule = class WhosOnlineModule extends MenuModule {

From c5998aa3439c7047e26d3c487cdf78ef8cebf753 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 15:57:51 -0600
Subject: [PATCH 0415/1013] Add prevMenuOnTimeout() method

---
 core/menu_module.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/menu_module.js b/core/menu_module.js
index 67fabb7e..992c17fb 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -193,6 +193,12 @@ exports.MenuModule = class MenuModule extends PluginModule {
         return this.client.menuStack.goto(prevMenu.name, cb);
     }
 
+    prevMenuOnTimeout(timeout, cb) {
+        setTimeout( () => {
+            return this.prevMenu(cb);
+        }, timeout);
+    }
+
     addViewController(name, vc) {
         assert(!this.viewControllers[name], `ViewController by the name of "${name}" already exists!`);
 

From 601433be40618716bbc279ae5133447638f0e53d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 15:58:13 -0600
Subject: [PATCH 0416/1013] Add messageConf support

---
 core/show_art.js | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/core/show_art.js b/core/show_art.js
index 66e330db..8f323e49 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -43,6 +43,8 @@ exports.getModule = class ShowArtModule extends MenuModule {
                         sequence        : self.showBySequence,
                         random          : self.showByRandom,
                         fileBaseArea    : self.showByFileBaseArea,
+                        messageConf     : self.showByMessageConf,
+                        messageArea     : self.showByMessageArea,
                     }[self.config.method] || self.showRandomArt;
 
                     handler = handler.bind(self);
@@ -88,20 +90,36 @@ exports.getModule = class ShowArtModule extends MenuModule {
             if(err) {
                 return cb(err);
             }
-
-            //  further resolve key -> file base area art
-            const artSpec = _.get(Config(), [ 'fileBase', 'areas', key, 'art' ]);
-            if(!artSpec) {
-                return cb(Errors.MissingConfig(`No art defined for file base area "${key}"`));
-            }
-            const options = {
-                pause   : this.shouldPause(),
-                desc    : 'fileBaseArea',
-            };
-            return this.displaySingleArtWithOptions(artSpec, options, cb);
+            return this.displaySingleArtByConfigPath( [ 'fileBase', 'areas', key, 'art' ], cb);
         });
     }
 
+    showByMessageConf(cb) {
+        this.getArtKeyValue( (err, key) => {
+            if(err) {
+                return cb(err);
+            }
+            return this.displaySingleArtByConfigPath( [ 'messageConferences', key, 'art' ], cb);
+        });
+    }
+
+    showByMessageArea(cb) {
+        return cb(null);    //  NYI
+    }
+
+    displaySingleArtByConfigPath(configPath, cb) {
+        const desc = configPath.join('.');
+        const artSpec = _.get(Config(), configPath);
+        if(!artSpec) {
+            return cb(Errors.MissingConfig(`No art defined at path ${desc}`));
+        }
+        const options = {
+            desc,
+            pause   : this.shouldPause(),
+        };
+        return this.displaySingleArtWithOptions(artSpec, options, cb);
+    }
+
     getArtKeyValue(cb) {
         const key = this.config.key;
         if(!_.isString(key)) {

From 9f85a01a89e9821855f3182473181873feb580a1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 15:58:39 -0600
Subject: [PATCH 0417/1013] Remove comment on formatting - see docs

---
 core/user_list.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/core/user_list.js b/core/user_list.js
index 43922998..6f005432 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -11,18 +11,6 @@ const moment            = require('moment');
 const async             = require('async');
 const _                 = require('lodash');
 
-/*
-    Available listFormat/focusListFormat object members:
-
-    userId          : User ID
-    userName        : User name/handle
-    lastLoginTs     : Last login timestamp
-    status          : Status: active | inactive
-    location        : Location
-    affiliation     : Affils
-    note            : User note
-*/
-
 exports.moduleInfo = {
     name        : 'User List',
     desc        : 'Lists all system users',

From c3bd03650905fba644b5530fd22527726bb99a76 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 15:59:00 -0600
Subject: [PATCH 0418/1013] Update message conf list with standardized + custom
 formats

---
 art/themes/luciano_blocktronics/theme.hjson |   6 +-
 config/menu.hjson                           |  13 ++
 core/msg_area_list.js                       |   6 -
 core/msg_conf_list.js                       | 159 ++++++++------------
 docs/_includes/nav.md                       |   1 +
 docs/modding/msg-conf-list.md               |  18 +++
 docs/modding/whos-online.md                 |   2 +-
 7 files changed, 101 insertions(+), 104 deletions(-)
 create mode 100644 docs/modding/msg-conf-list.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 6555f417..2733e4c8 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -235,14 +235,12 @@
 			}
 
 			messageAreaChangeCurrentConference: {
-				config: {
-					listFormat: "|00|15{index} |07- |03{name}"
-					focusListFormat: "|00|19|15{index} - {name}"
-				}
 				mci: {
 					VM1: {
 						width: 26
 						height: 19
+						itemFormat: "|00|15{index} |07- |03{name}"
+						focusItemFormat: "|00|19|15{index} - {name}"
 					}
 				}
 			}
diff --git a/config/menu.hjson b/config/menu.hjson
index 8a14526b..1eb71f7b 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1907,6 +1907,19 @@
 			}
 		}
 
+		messageAreaChangeConfPreArt: {
+			module: show_art
+			config: {
+				method: messageConf
+				key: confTag
+			}
+			options: {
+				pause: true
+				cls: true
+				menuFlags: [ "popParent", "noHistory" ]
+			}
+		}
+
 		messageAreaChangeCurrentArea: {
 			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 1b9870bd..a6ee7cc1 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -93,12 +93,6 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
         };
     }
 
-    prevMenuOnTimeout(timeout, cb) {
-        setTimeout( () => {
-            return this.prevMenu(cb);
-        }, timeout);
-    }
-
     //  :TODO: these concepts have been replaced with the {someKey} style formatting - update me!
     updateGeneralAreaInfoViews(areaIndex) {
         /*
diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index c20d06ca..c0340fe4 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -2,12 +2,9 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule            = require('./menu_module.js').MenuModule;
-const ViewController        = require('./view_controller.js').ViewController;
-const messageArea           = require('./message_area.js');
-const displayThemeArt       = require('./theme.js').displayThemeArt;
-const resetScreen           = require('./ansi_term.js').resetScreen;
-const stringFormat          = require('./string_format.js');
+const { MenuModule }    = require('./menu_module.js');
+const messageArea       = require('./message_area.js');
+const { Errors }        = require('./enig_error.js');
 
 //  deps
 const async             = require('async');
@@ -20,57 +17,40 @@ exports.moduleInfo = {
 };
 
 const MciViewIds = {
-    ConfList    : 1,
-
-    //  :TODO:
-    //  # areas in conf .... see Obv/2, iNiQ, ...
-    //
+    confList            : 1,
+    confDesc            : 2,    //  description updated @ index update
+    customRangeStart    : 10,   //  updated @ index update
 };
 
 exports.getModule = class MessageConfListModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.messageConfs = messageArea.getSortedAvailMessageConferences(this.client);
-        const self = this;
+        this.initList();
 
         this.menuMethods = {
-            changeConference : function(formData, extraArgs, cb) {
+            changeConference : (formData, extraArgs, cb) => {
                 if(1 === formData.submitId) {
-                    let conf        = self.messageConfs[formData.value.conf];
-                    const confTag   = conf.confTag;
-                    conf = conf.conf;   //  what we want is embedded
+                    const conf = this.messageConfs[formData.value.conf];
 
-                    messageArea.changeMessageConference(self.client, confTag, err => {
+                    messageArea.changeMessageConference(this.client, conf.confTag, err => {
                         if(err) {
-                            self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
-
-                            setTimeout( () => {
-                                return self.prevMenu(cb);
-                            }, 1000);
-                        } else {
-                            if(_.isString(conf.art)) {
-                                const dispOptions = {
-                                    client  : self.client,
-                                    name    : conf.art,
-                                };
-
-                                self.client.term.rawWrite(resetScreen());
-
-                                displayThemeArt(dispOptions, () => {
-                                    //  pause by default, unless explicitly told not to
-                                    if(_.has(conf, 'options.pause') && false === conf.options.pause) {
-                                        return self.prevMenuOnTimeout(1000, cb);
-                                    } else {
-                                        self.pausePrompt( () => {
-                                            return self.prevMenu(cb);
-                                        });
-                                    }
-                                });
-                            } else {
-                                return self.prevMenu(cb);
-                            }
+                            this.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
+                            return this.prevMenuOnTimeout(1000, cb);
                         }
+
+                        if(conf.hasArt) {
+                            const menuOpts = {
+                                extraArgs : {
+                                    confTag : conf.confTag,
+                                },
+                                menuFlags : [ 'popParent', 'noHistory' ]
+                            };
+
+                            return this.gotoMenu(this.menuConfig.config.changeConfPreArtMenu || 'messageAreaChangeConfPreArt', menuOpts, cb);
+                        }
+
+                        return this.prevMenu(cb);
                     });
                 } else {
                     return cb(null);
@@ -79,70 +59,63 @@ exports.getModule = class MessageConfListModule extends MenuModule {
         };
     }
 
-    prevMenuOnTimeout(timeout, cb) {
-        setTimeout( () => {
-            return this.prevMenu(cb);
-        }, timeout);
-    }
-
     mciReady(mciData, cb) {
         super.mciReady(mciData, err => {
             if(err) {
                 return cb(err);
             }
 
-            const self  = this;
-            const vc    = self.viewControllers.areaList = new ViewController( { client : self.client } );
-
             async.series(
                 [
-                    function loadFromConfig(callback) {
-                        let loadOpts = {
-                            callingMenu : self,
-                            mciMap      : mciData.menu,
-                            formId      : 0,
-                        };
-
-                        vc.loadFromMenuConfig(loadOpts, callback);
+                    (next) => {
+                        return this.prepViewController('confList', 0, mciData.menu, next);
                     },
-                    function populateConfListView(callback) {
-                        const listFormat        = self.menuConfig.config.listFormat || '{index} ) - {name}';
-                        const focusListFormat   = self.menuConfig.config.focusListFormat || listFormat;
+                    (next) => {
+                        const confListView = this.viewControllers.confList.getView(MciViewIds.confList);
+                        if(!confListView) {
+                            return cb(Errors.MissingMci(`Missing conf list MCI ${MciViewIds.onlineList}`));
+                        }
 
-                        const confListView = vc.getView(MciViewIds.ConfList);
-                        let i = 1;
-                        confListView.setItems(_.map(self.messageConfs, v => {
-                            return stringFormat(listFormat, {
-                                index   : i++,
-                                confTag : v.conf.confTag,
-                                name    : v.conf.name,
-                                desc    : v.conf.desc,
-                            });
-                        }));
-
-                        i = 1;
-                        confListView.setFocusItems(_.map(self.messageConfs, v => {
-                            return stringFormat(focusListFormat, {
-                                index   : i++,
-                                confTag : v.conf.confTag,
-                                name    : v.conf.name,
-                                desc    : v.conf.desc,
-                            });
-                        }));
+                        confListView.on('index update', idx => {
+                            this.selectionIndexUpdate(idx);
+                        });
 
+                        confListView.setItems(this.messageConfs);
                         confListView.redraw();
-
-                        callback(null);
-                    },
-                    function populateTextViews(callback) {
-                        //  :TODO: populate other avail MCI, e.g. current conf name
-                        callback(null);
+                        return next(null);
                     }
                 ],
-                function complete(err) {
-                    cb(err);
+                err => {
+                    if(err) {
+                        this.client.log.error( { error : err.message }, 'Failed loading message conference list');
+                    }
                 }
             );
         });
     }
+
+    selectionIndexUpdate(idx) {
+        const conf = this.messageConfs[idx];
+        if(!conf) {
+            return;
+        }
+        this.setViewText('confList', MciViewIds.confDesc, conf.desc);
+        this.updateCustomViewTextsWithFilter('confList', MciViewIds.customRangeStart, conf);
+    }
+
+    initList()
+    {
+        let index = 1;
+        this.messageConfs = messageArea.getSortedAvailMessageConferences(this.client).map(conf => {
+            return {
+                index       : index++,
+                confTag     : conf.confTag,
+                name        : conf.conf.name,
+                text        : conf.conf.name,
+                desc        : conf.conf.desc,
+                areaCount   : Object.keys(conf.conf.areas || {}).length,
+                hasArt      : _.isString(conf.conf.art),
+            };
+        });
+    }
 };
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index d7ada9e2..5af16603 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -67,6 +67,7 @@
     - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
     - [Who's Online]({{ site.baseurl }}{% link modding/whos-online.md %})
     - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
+    - [Message Conference List]({{ site.baseurl }}{% link modding/msg-conf-list.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
diff --git a/docs/modding/msg-conf-list.md b/docs/modding/msg-conf-list.md
new file mode 100644
index 00000000..c00c890d
--- /dev/null
+++ b/docs/modding/msg-conf-list.md
@@ -0,0 +1,18 @@
+---
+layout: page
+title: Message Conference List
+---
+## The Message Conference List Module
+The built in `msg_conf_list` module provides a menu to display and change between message conferences.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
+* `index`: 1-based index into list.
+* `confTag`: Conference tag.
+* `name` or `text`: Display name.
+* `desc`: Description.
+* `areaCount`: Number of areas in this conference.
+
+The following additional MCIs are updated as the user changes selections in the main list:
+* MCI 2 (ie: `%TL2` or `%M%2`) is updated with the conference description.
+* MCI 10+ (ie `%TL10`...) are custom ranges updated with the same information available above in `itemFormat`.
diff --git a/docs/modding/whos-online.md b/docs/modding/whos-online.md
index 87a2b1ef..22fde0ff 100644
--- a/docs/modding/whos-online.md
+++ b/docs/modding/whos-online.md
@@ -2,7 +2,7 @@
 layout: page
 title: Who's Online
 ---
-## The Who's OnlineModule
+## The Who's Online Module
 The built in `whos_online` module provides a basic who's online mod.
 
 ### Theming

From c625d25e2a9c1a5d9d00c81c4e8ddb87c5ee52d3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 19:06:43 -0600
Subject: [PATCH 0419/1013] Clean up msg_area_list module (standardize/etc.),
 update and add docs

---
 config/menu.hjson             |   2 +-
 core/msg_area_list.js         | 167 +++++++++++++---------------------
 core/msg_conf_list.js         |   5 +-
 core/show_art.js              |  15 ++-
 docs/_includes/nav.md         |   1 +
 docs/modding/msg-area-list.md |  17 ++++
 6 files changed, 101 insertions(+), 106 deletions(-)
 create mode 100644 docs/modding/msg-area-list.md

diff --git a/config/menu.hjson b/config/menu.hjson
index 1eb71f7b..b857dd38 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1907,7 +1907,7 @@
 			}
 		}
 
-		messageAreaChangeConfPreArt: {
+		changeMessageConfPreArt: {
 			module: show_art
 			config: {
 				method: messageConf
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index a6ee7cc1..5e756fbe 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -2,13 +2,9 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule            = require('./menu_module.js').MenuModule;
-const ViewController        = require('./view_controller.js').ViewController;
+const { MenuModule }        = require('./menu_module.js');
 const messageArea           = require('./message_area.js');
-const displayThemeArt       = require('./theme.js').displayThemeArt;
-const resetScreen           = require('./ansi_term.js').resetScreen;
-const stringFormat          = require('./string_format.js');
-const Errors                = require('./enig_error.js').Errors;
+const { Errors }            = require('./enig_error.js');
 
 //  deps
 const async             = require('async');
@@ -20,71 +16,43 @@ exports.moduleInfo = {
     author  : 'NuSkooler',
 };
 
-/*
-    :TODO:
-
-    Obv/2 has the following:
-    CHANGE .ANS - Message base changing ansi
-          |SN      Current base name
-          |SS      Current base sponsor
-          |NM      Number of messages in current base
-          |UP      Number of posts current user made (total)
-          |LR      Last read message by current user
-          |DT      Current date
-          |TI      Current time
-*/
+//    :TODO: Obv/2 others can show # of messages in area
 
 const MciViewIds = {
-    AreaList        : 1,
-    SelAreaInfo1    : 2,
-    SelAreaInfo2    : 3,
+    areaList            : 1,
+    areaDesc            : 2,    //  area desc updated @ index update
+    customRangeStart    : 10,   //  updated @ index update
 };
 
 exports.getModule = class MessageAreaListModule extends MenuModule {
     constructor(options) {
         super(options);
 
-        this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
-            this.client.user.properties.message_conf_tag,
-            { client : this.client }
-        );
+        this.initList();
 
-        const self = this;
         this.menuMethods = {
-            changeArea : function(formData, extraArgs, cb) {
+            changeArea : (formData, extraArgs, cb) => {
                 if(1 === formData.submitId) {
-                    let area        = self.messageAreas[formData.value.area];
-                    const areaTag   =  area.areaTag;
-                    area = area.area;   //  what we want is actually embedded
+                    const area = this.messageAreas[formData.value.area];
 
-                    messageArea.changeMessageArea(self.client, areaTag, err => {
+                    messageArea.changeMessageArea(this.client, area.areaTag, err => {
                         if(err) {
-                            self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
-
-                            self.prevMenuOnTimeout(1000, cb);
-                        } else {
-                            if(_.isString(area.art)) {
-                                const dispOptions = {
-                                    client  : self.client,
-                                    name    : area.art,
-                                };
-
-                                self.client.term.rawWrite(resetScreen());
-
-                                displayThemeArt(dispOptions, () => {
-                                    //  pause by default, unless explicitly told not to
-                                    if(_.has(area, 'options.pause') && false === area.options.pause) {
-                                        return self.prevMenuOnTimeout(1000, cb);
-                                    } else {
-                                        self.pausePrompt( () => {
-                                            return self.prevMenu(cb);
-                                        });
-                                    }
-                                });
-                            } else {
-                                return self.prevMenu(cb);
-                            }
+                            this.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
+                            return this.prevMenuOnTimeout(1000, cb);
                         }
+
+                        if(area.hasArt) {
+                            const menuOpts = {
+                                extraArgs : {
+                                    areaTag : area.areaTag,
+                                },
+                                menuFlags : [ 'popParent', 'noHistory' ]
+                            };
+
+                            return this.gotoMenu(this.menuConfig.config.changeAreaPreArtMenu || 'changeMessageAreaPreArt', menuOpts, cb);
+                        }
+
+                        return this.prevMenu(cb);
                     });
                 } else {
                     return cb(null);
@@ -93,71 +61,66 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
         };
     }
 
-    //  :TODO: these concepts have been replaced with the {someKey} style formatting - update me!
-    updateGeneralAreaInfoViews(areaIndex) {
-        /*
-        const areaInfo = self.messageAreas[areaIndex];
-
-        [ MciViewIds.SelAreaInfo1, MciViewIds.SelAreaInfo2 ].forEach(mciId => {
-            const v = self.viewControllers.areaList.getView(mciId);
-            if(v) {
-                v.setFormatObject(areaInfo.area);
-            }
-        });
-        */
-    }
-
     mciReady(mciData, cb) {
         super.mciReady(mciData, err => {
             if(err) {
                 return cb(err);
             }
 
-            const self  = this;
-            const vc    = self.viewControllers.areaList = new ViewController( { client : self.client } );
-
             async.series(
                 [
-                    function loadFromConfig(callback) {
-                        const loadOpts = {
-                            callingMenu : self,
-                            mciMap      : mciData.menu,
-                            formId      : 0,
-                        };
-
-                        vc.loadFromMenuConfig(loadOpts, function startingViewReady(err) {
-                            callback(err);
-                        });
+                    (next) => {
+                        return this.prepViewController('areaList', 0, mciData.menu, next);
                     },
-                    function populateAreaListView(callback) {
-                        const areaListView = vc.getView(MciViewIds.AreaList);
+                    (next) => {
+                        const areaListView = this.viewControllers.areaList.getView(MciViewIds.areaList);
                         if(!areaListView) {
-                            return callback(Errors.MissingMci('A MenuView compatible MCI code is required'));
+                            return cb(Errors.MissingMci(`Missing area list MCI ${MciViewIds.areaList}`));
                         }
 
-                        let i = 1;
-                        areaListView.setItems(self.messageAreas.map(a => {
-                            return {
-                                index       : i++,
-                                areaTag     : a.area.areaTag,
-                                text        : a.area.name,  //  standard
-                                name        : a.area.name,
-                                desc        : a.area.desc,
-                            };
-                        }));
-
-                        areaListView.on('index update', areaIndex => {
-                            self.updateGeneralAreaInfoViews(areaIndex);
+                        areaListView.on('index update', idx => {
+                            this.selectionIndexUpdate(idx);
                         });
 
+                        areaListView.setItems(this.messageAreas);
                         areaListView.redraw();
-                        return callback(null);
+                        this.selectionIndexUpdate(0);
+                        return next(null);
                     }
                 ],
-                function complete(err) {
+                err => {
+                    if(err) {
+                        this.client.log.error( { error : err.message }, 'Failed loading message area list');
+                    }
                     return cb(err);
                 }
             );
         });
     }
+
+    selectionIndexUpdate(idx) {
+        const area = this.messageAreas[idx];
+        if(!area) {
+            return;
+        }
+        this.setViewText('areaList', MciViewIds.areaDesc, area.desc);
+        this.updateCustomViewTextsWithFilter('areaList', MciViewIds.customRangeStart, area);
+    }
+
+    initList() {
+        let index = 1;
+        this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
+            this.client.user.properties.message_conf_tag,
+            { client : this.client }
+        ).map(area => {
+            return {
+                index       : index++,
+                areaTag     : area.area.areaTag,
+                name        : area.area.name,
+                text        : area.area.name,  //  standard
+                desc        : area.area.desc,
+                hasArt      : _.isString(area.area.art),
+            };
+        });
+    }
 };
diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index c0340fe4..3c9d7152 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -47,7 +47,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                                 menuFlags : [ 'popParent', 'noHistory' ]
                             };
 
-                            return this.gotoMenu(this.menuConfig.config.changeConfPreArtMenu || 'messageAreaChangeConfPreArt', menuOpts, cb);
+                            return this.gotoMenu(this.menuConfig.config.changeConfPreArtMenu || 'changeMessageConfPreArt', menuOpts, cb);
                         }
 
                         return this.prevMenu(cb);
@@ -73,7 +73,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                     (next) => {
                         const confListView = this.viewControllers.confList.getView(MciViewIds.confList);
                         if(!confListView) {
-                            return cb(Errors.MissingMci(`Missing conf list MCI ${MciViewIds.onlineList}`));
+                            return cb(Errors.MissingMci(`Missing conf list MCI ${MciViewIds.confList}`));
                         }
 
                         confListView.on('index update', idx => {
@@ -82,6 +82,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
 
                         confListView.setItems(this.messageConfs);
                         confListView.redraw();
+                        this.selectionIndexUpdate(0);
                         return next(null);
                     }
                 ],
diff --git a/core/show_art.js b/core/show_art.js
index 8f323e49..1c7da1b6 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -6,6 +6,9 @@ const MenuModule    = require('./menu_module.js').MenuModule;
 const Errors        = require('../core/enig_error.js').Errors;
 const ANSI          = require('./ansi_term.js');
 const Config        = require('./config.js').get;
+const {
+    getMessageAreaByTag
+}                   = require('./message_area.js');
 
 //  deps
 const async         = require('async');
@@ -104,7 +107,17 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByMessageArea(cb) {
-        return cb(null);    //  NYI
+        this.getArtKeyValue( (err, key) => {
+            if(err) {
+                return cb(err);
+            }
+
+            const area = getMessageAreaByTag(key);
+            if(!area) {
+                return cb(Errors.DoesNotExist(`No area by areaTag ${key} found`));
+            }
+            return cb(null);    //  :TODO: REM OVE ME
+        });
     }
 
     displaySingleArtByConfigPath(configPath, cb) {
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 5af16603..3938e967 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -68,6 +68,7 @@
     - [Who's Online]({{ site.baseurl }}{% link modding/whos-online.md %})
     - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
     - [Message Conference List]({{ site.baseurl }}{% link modding/msg-conf-list.md %})
+    - [Message Area List]({{ site.baseurl }}{% link modding/msg-area-list.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
diff --git a/docs/modding/msg-area-list.md b/docs/modding/msg-area-list.md
new file mode 100644
index 00000000..e3f5cde1
--- /dev/null
+++ b/docs/modding/msg-area-list.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: Message Area List
+---
+## The Message Area List Module
+The built in `msg_area_list` module provides a menu to display and change between message areas in the users current conference.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
+* `index`: 1-based index into list.
+* `areaTag`: Area tag.
+* `name` or `text`: Display name.
+* `desc`: Description.
+
+The following additional MCIs are updated as the user changes selections in the main list:
+* MCI 2 (ie: `%TL2` or `%M%2`) is updated with the area description.
+* MCI 10+ (ie `%TL10`...) are custom ranges updated with the same information available above in `itemFormat`.

From c3405c4fdb280b6e41dc05d995dc7051193b833d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 20:14:50 -0600
Subject: [PATCH 0420/1013] Add missing changeMessageAreaPreArt menu

---
 config/menu.hjson | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/menu.hjson b/config/menu.hjson
index b857dd38..39149416 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1951,6 +1951,19 @@
 			}
 		}
 
+		changeMessageAreaPreArt: {
+			module: show_art
+			config: {
+				method: messageArea
+				key: areaTag
+			}
+			options: {
+				pause: true
+				cls: true
+				menuFlags: [ "popParent", "noHistory" ]
+			}
+		}
+
 		messageAreaMessageList: {
 			module: msg_list
 			art: MSGLIST

From 339752236dff676f4b5c6308aa5f879a81b89594 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 20:15:19 -0600
Subject: [PATCH 0421/1013] Fix user list - system does not have {note}
 currently

---
 art/themes/luciano_blocktronics/USERLST.ANS | Bin 1838 -> 2047 bytes
 art/themes/luciano_blocktronics/theme.hjson |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/USERLST.ANS b/art/themes/luciano_blocktronics/USERLST.ANS
index fa4e349991301e4c5df17d54dc724eb3f882ecf6..8c67ea58e8305ba470bf187c5a1421597450a665 100644
GIT binary patch
delta 723
zcmZuvF-rq66sA3Ur3Ec0f^Z-aD(aSN+8%O~I5>#n<lrry#X{j?!PZR>3SHbv2F1mH
zptECtM*{gD4(fYJS`XSOyf5#2@B6;wW9_$A2@)DNY0RQYWwb?kkhG42B;=|J7f`ja
ziYITMt5`**Vht`X3S|BNo>8uqmPC9Pcf@O9YMRZU7_LN8R0laa<&sE3a5HNIF-TbC
zRzWRJy(13*@$BvA=fKi0@A1jB;%KC5LbPK$NGZS;P)!ikvtBfX^c*!rq2NJD@S&<i
zO6#9d>}~KLi~-e+S2nE%7TPetjl_QN1KJ)2xA$f^s<0ytv5%+SZZ8{HBy1We>vz&&
zuYc#jh6U5XkaW^4v#3ivw}i%5pkw#)EOhdX5RhmEAea}1@tW+-PIPJIE<?2v)6#}V
z>{-Wb4R!vK+Wm@XzCw&jH`fdEkq2^2sIw%ayntm5%sk67A7ann_Hjwr66gL&&HMoy
QqWNF%ey{ja7S(e74-P-y+yDRo

delta 491
zcmZ8eJxjzu6y%aKAt|&GgbOFHIITD4OGzawSlQa7kSHD;WL3B;1x2tCo3Q`GpCQ8i
zgk9LuPCHBWZFX~r-R#?)c{8&=8!ziYRFN_zWkTBEVJo9il@v^dQI%^*m=F@6{T#P%
zPku^RR27t;4Zz7Me;&L$8Rhqm+$^X70id;#oGGd4{Lww+OLy1M@Zq<6JISb004l07
zDkUO|6=<w*o>Rq_!;zm5+)qmWF@!Kicepu;DIc#zcirK@IIXACSu^jP8q50OKHkOb
z>UwdB5=`5&3UO*!O+8=0Mcp)(i1tMYLi7Q4PEX<$3D<VH_Lvbm>bw|=PFkdvy@GbC
zWC(vD-eY{Mw!jWk@0=QD=h1Exq8Ir;P4s_YyS)o*f`572f$l<|b3XEq`?fGEzwu|z
JtH*^u`332&oVfr1

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 2733e4c8..52537323 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -162,8 +162,8 @@
 					VM1: {
 						height: 15,
 						width: 50
-						itemFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{note:<19.19}|03{lastLoginTs}"
-						focusItemFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}"
+						itemFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{location:<19.19}|03{lastLoginTs}"
+						focusItemFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{location:<19.19}{lastLoginTs}"
 					}
 				}
 			}

From 3522b8b6f8333a01c1594cb285002495d05bc0d8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 22 Jul 2018 20:15:41 -0600
Subject: [PATCH 0422/1013] Notes on show_art / config.art changes

---
 UPGRADE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index 956789c3..5ec42295 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -59,6 +59,7 @@ webSocket: {
 ```
 * The module export `registerEvents` has been deprecated. If you have a module that depends on this, use the new more generic `moduleInitialize` export instead.
 * The `system.db` `user_event_log` table has been updated to include a unique session ID. Previously this table was not used, but you will need to perform a slight maintenance task before it can be properly used. After updating to `0.0.9-alpha`, please run the following: `sqlite3 db/system.db DROP TABLE user_event_log;`. The new table format will be created and used at startup.
+* If you have art configured for message conference or area selection via the `art` configuration value, you will need to include a `show_art` menu reference. Defaulted to `changeMessageConfPreArt` for conferences and `changeMessageAreaPreArt` for areas & included in the example `menu.hjson`.
 
 
 # 0.0.7-alpha to 0.0.8-alpha

From 33790a74e34c062658bab188bff463c73fc3eb7f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 25 Jul 2018 21:18:30 -0600
Subject: [PATCH 0423/1013] Allow matches of minutes vs minute, etc. as
 intended

---
 core/last_callers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/last_callers.js b/core/last_callers.js
index 268fde5f..08eb7b71 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -77,7 +77,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
 
     getCollapse(conf) {
         let collapse = _.get(this, conf);
-        collapse = collapse && collapse.match(/^([0-9]+)\s*(minutes|seconds|hours|days|months)$/);
+        collapse = collapse && collapse.match(/^([0-9]+)\s*(minutes?|seconds?|hours?|days?|months?)$/);
         if(collapse) {
             return moment.duration(parseInt(collapse[1]), collapse[2]);
         }

From 82278a212b2792c46d6b2ac6809a4d52148277f5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 27 Jul 2018 21:50:51 -0600
Subject: [PATCH 0424/1013] Doc updates

---
 docs/art/general.md |  3 +--
 docs/art/mci.md     | 31 ++++++++++++++++++++++++++++---
 docs/art/themes.md  | 28 ++++++++++++++++------------
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/docs/art/general.md b/docs/art/general.md
index c43d915c..f08994e8 100644
--- a/docs/art/general.md
+++ b/docs/art/general.md
@@ -2,5 +2,4 @@
 layout: page
 title: General
 ---
-General art lives in the `art/general` directory. 'General' art is ANSI you want to stay consistent across themes,
-such as a welcome ANSI or a rotation of logoff ANSIs. 
+General art lives in the `art/general` directory. 'General' art is ANSI you want to stay consistent across themes, such as a welcome ANSI or a rotation of logoff ANSIs. 
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 4befc411..d6080630 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -72,7 +72,7 @@ iNiQUiTY, etc.
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
 
-A special `XY` MCI code may also be utilized for placement identification when creating menus.
+A special `XY` MCI code may also be utilized for placement identification when creating menus or to extend an otherwise empty space in an art file down the screen.
 
 
 ## Views
@@ -92,7 +92,7 @@ a Vertical Menu (`%VM`): Old-school BBSers may recognize this as a lightbar menu
 | `TM` | Toggle Menu          | A toggle menu commonly used for Yes/No style input | 
 | `KE` | Key Entry            | A *single* key input control |
 
-     
+
 Peek at [/core/mci_view_factory.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) to 
 see additional information.
 
@@ -112,10 +112,14 @@ Predefined MCI codes and other Views can have properties set via `menu.hjson` an
 | `focus` | If set to `true`, establishes initial focus |
 | `text` | (initial) text of a view |
 | `submit` | If set to `true` any `accept` action upon this view will submit the encompassing **form** |
+| `itemFormat` | Sets the format for a list entry. See **Entry Formatting** below |
+| `focusItemFormat` | Sets the format for a focused list entry. See **Entry Formatting** below |
 
 These are just a few of the properties set on various views. *Use the source Luke*, as well as taking a look at the default 
 `menu.hjson` and `theme.hjson` files!
 
+### Custom Properties
+Often a module will provide custom properties that receive format objects (See **Entry Formatting** below). Custom property formatting can be declared in the `config` block. For example, `browseInfoFormat10`..._N_ (where _N_ is up to 99) in the `file_base_search` module received a fairly extensive format object that contains `{fileName}`, `{estReleaseYear}`, etc.
 
 ### Text Styles
 
@@ -132,4 +136,25 @@ Standard style types available for `textStyle` and `focusTextStyle`:
 | `big vowels` | EniGMa bUllEtIn bOArd sOftwArE |
 | `small i` | ENiGMA BULLETiN BOARD SOFTWARE |
 | `mixed` | EnIGma BUlLEtIn BoaRd SOfTWarE (randomly assigned) |
-| `l33t` | 3n1gm4 bull371n b04rd 50f7w4r3 |
\ No newline at end of file
+| `l33t` | 3n1gm4 bull371n b04rd 50f7w4r3 |
+
+### Entry Fromatting
+Various strings can be formatted using a syntax that allows width & precision specifiers, text styling, etc. Depending on the context, various elements can be referenced by `{name}`. Additional text styles can be supplied as well. The syntax is largely modeled after Python's [string format mini language](https://docs.python.org/3/library/string.html#format-specification-mini-language).
+
+### Additional Text Styles
+Additional text styles are available for numbers:
+
+| Style             | Description   |
+|-------------------|---------------|
+| `sizeWithAbbr`    | File size (converted from bytes) with abbreviation such as `1 MB`, `2.2 GB`, `34 KB`, etc. |
+| `sizeWithoutAbbr` | Just the file size (converted from bytes) without the abbreviation. For example: 1024 becomes 1.  |
+| `sizeAbbr`        | Just the abbreviation given a file size (converted from bytes) such as `MB` or `GB`.  |
+| `countWithAbbr`   | Count with abbreviation such as `100 K`, `4.3 B`, etc.  |
+| `countWithoutAbbr`    | Just the count |
+| `countAbbr`       | Just the abbreviation such as `M` for millions.   |
+
+
+#### Examples
+Suppose a format object contains the following elements: `userName` and `affils`. We could create a `itemFormat` entry that builds a item to our specifications: `|04{userName!styleFirstLower} |08- |13{affils}`. This may produce a string such as "<font color="red">eVIL cURRENT</font> <font color="grey">-</font> <font color="magenta">Razor 1911</font>".
+
+Remember that a Python [string format mini language](https://docs.python.org/3/library/string.html#format-specification-mini-language) style syntax is available for widths, alignment, number prevision, etc. as well. A number can be made to be more human readable for example: `{byteSize:,}` may yield "1,123,456".
\ No newline at end of file
diff --git a/docs/art/themes.md b/docs/art/themes.md
index 37631454..9ef482b6 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -2,24 +2,28 @@
 layout: page
 title: Themes
 ---
+# Creating Your Own
 :warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included 
 `luciano_blocktronics' theme. Create your own and make changes to that instead:
 
 1. Copy `/art/themes/luciano_blocktronics` to `art/themes/your_board_theme`
 2. Update the `info` block at the top of the theme.hjson file:
-   
-        info: {
-                name: Awesome Theme
-                author: Cool Artist
-                group: Sick Group
-                enabled: true
-        }
+``` hjson
+    info: {
+        name: Awesome Theme
+        author: Cool Artist
+        group: Sick Group
+        enabled: true
+    }
+```
 
 3. Specify it in the `defaults` section of `config.hjson`. The name supplied should match the name of the 
 directory you created in step 1:
 
-        ```hjson 
-        defaults: {
-          theme: your_board_theme
-        }
-        ```
+``` hjson
+    defaults: {
+        theme: your_board_theme
+    }
+```
+
+# General Theme Info
\ No newline at end of file

From 9012ef76c31e15de8546464a360aa662d0489439 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 28 Jul 2018 13:49:12 -0600
Subject: [PATCH 0425/1013] Fix typo in module name

---
 docs/art/mci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/art/mci.md b/docs/art/mci.md
index d6080630..1bad97d5 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -119,7 +119,7 @@ These are just a few of the properties set on various views. *Use the source Luk
 `menu.hjson` and `theme.hjson` files!
 
 ### Custom Properties
-Often a module will provide custom properties that receive format objects (See **Entry Formatting** below). Custom property formatting can be declared in the `config` block. For example, `browseInfoFormat10`..._N_ (where _N_ is up to 99) in the `file_base_search` module received a fairly extensive format object that contains `{fileName}`, `{estReleaseYear}`, etc.
+Often a module will provide custom properties that receive format objects (See **Entry Formatting** below). Custom property formatting can be declared in the `config` block. For example, `browseInfoFormat10`..._N_ (where _N_ is up to 99) in the `file_area_list` module received a fairly extensive format object that contains `{fileName}`, `{estReleaseYear}`, etc.
 
 ### Text Styles
 

From 6f84ffd7084ec41da231ddd2a62db0dc114532dc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 28 Jul 2018 13:49:37 -0600
Subject: [PATCH 0426/1013] Minor updates to file area list to use proper
 date/time theme formatting + initial docs

---
 art/themes/luciano_blocktronics/theme.hjson | 10 +--
 core/file_area_list.js                      | 16 ++--
 docs/_includes/nav.md                       |  1 +
 docs/modding/file-area-list.md              | 86 +++++++++++++++++++++
 4 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 docs/modding/file-area-list.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 52537323..f3af6df6 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -548,9 +548,6 @@
 					detailsGeneralInfoFormat21: "{uploadTimestamp}"
 					detailsGeneralInfoFormat22: "{archiveTypeDesc}"
 
-					fileListEntryFormat: "|00|03{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
-					focusFileListEntryFormat: "|00|19|15{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
-
 					notAnArchiveFormat: "|00|08( |07{fileName} is not an archive |08)"
 				}
 
@@ -609,6 +606,8 @@
 						VM1: {
 							height: 17
 							width: 79
+							itemFormat: "|00|03{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
+							focusItemFormat: "|00|19|15{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
 						}
 					}
 				}
@@ -649,9 +648,6 @@
 					detailsGeneralInfoFormat21: "{uploadTimestamp}"
 					detailsGeneralInfoFormat22: "{archiveTypeDesc}"
 
-					fileListEntryFormat: "|00|03{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
-					focusFileListEntryFormat: "|00|19|15{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
-
 					notAnArchiveFormat: "|00|08( |07{fileName} is not an archive |08)"
 				}
 
@@ -710,6 +706,8 @@
 						VM1: {
 							height: 17
 							width: 79
+							itemFormat: "|00|03{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
+							focusItemFormat: "|00|19|15{fileName:<67.66} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
 						}
 					}
 				}
diff --git a/core/file_area_list.js b/core/file_area_list.js
index f3172d4d..3a539882 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -218,7 +218,7 @@ exports.getModule = class FileAreaList extends MenuModule {
         const config        = this.menuConfig.config;
         const currEntry     = this.currentFileEntry;
 
-        const uploadTimestampFormat = config.browseUploadTimestampFormat || config.uploadTimestampFormat || 'YYYY-MMM-DD';
+        const uploadTimestampFormat = config.browseUploadTimestampFormat || this.client.currentTheme.helpers.getDateFormat('short');
         const area                  = FileArea.getFileAreaByTag(currEntry.areaTag);
         const hashTagsSep           = config.hashTagsSep || ', ';
         const isQueuedIndicator     = config.isQueuedIndicator || 'Y';
@@ -268,7 +268,7 @@ exports.getModule = class FileAreaList extends MenuModule {
             entryInfo.archiveTypeDesc = 'N/A';
         }
 
-        entryInfo.uploadByUsername  = entryInfo.uploadByUsername || 'N/A';  //  may be imported
+        entryInfo.uploadByUsername  = entryInfo.uploadByUserName = entryInfo.uploadByUsername || 'N/A';  //  may be imported
         entryInfo.hashTags          = entryInfo.hashTags || '(none)';
 
         //  create a rating string, e.g. "**---"
@@ -289,7 +289,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                     entryInfo.webDlLink     = config.webDlLinkNeedsGenerated || 'Not yet generated';
                 }
             } else {
-                const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';
+                const webDlExpireTimeFormat = config.webDlExpireTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat('short');
 
                 entryInfo.webDlLink     = ansi.vtxHyperlink(this.client, serveItem.url) + serveItem.url;
                 entryInfo.webDlExpire   = moment(serveItem.expireTimestamp).format(webDlExpireTimeFormat);
@@ -583,7 +583,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                 return cb(err);
             }
 
-            this.currentFileEntry.archiveEntries = entries;
+            //  assign and add standard "text" member for itemFormat
+            this.currentFileEntry.archiveEntries = entries.map(e => Object.assign(e, { text : `${e.fileName} (${e.byteSize})` } ));
             return cb(null, 're-cached');
         });
     }
@@ -600,12 +601,7 @@ exports.getModule = class FileAreaList extends MenuModule {
                 }
 
                 if('re-cached' === cacheStatus) {
-                    const fileListEntryFormat       = this.menuConfig.config.fileListEntryFormat || '{fileName} {fileSize}';    //  :TODO: use byteSize here?
-                    const focusFileListEntryFormat  = this.menuConfig.config.focusFileListEntryFormat || fileListEntryFormat;
-
-                    fileListView.setItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(fileListEntryFormat, entry) ) );
-                    fileListView.setFocusItems( this.currentFileEntry.archiveEntries.map( entry => stringFormat(focusFileListEntryFormat, entry) ) );
-
+                    fileListView.setItems(this.currentFileEntry.archiveEntries);
                     fileListView.redraw();
                 }
             });
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 3938e967..c366c8fa 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -64,6 +64,7 @@
         - Combatnet
         - Exodus
     - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
+    - [File Area List]({{ site.baseurl }}{% link modding/file-area-list.md %})
     - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
     - [Who's Online]({{ site.baseurl }}{% link modding/whos-online.md %})
     - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
diff --git a/docs/modding/file-area-list.md b/docs/modding/file-area-list.md
new file mode 100644
index 00000000..cec9a18e
--- /dev/null
+++ b/docs/modding/file-area-list.md
@@ -0,0 +1,86 @@
+---
+layout: page
+title: File Area List
+---
+## The File Area List Module
+The built in `file_area_list` module provides a very flexible file listing UI.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `art`: Sup configuration block used to establish art files used for file browsing:
+    * `browse`: The main browse screen.
+    * `details`: The main file details screen.
+    * `detailsGeneral`: The "general" tab of the details page.
+    * `detailsNfo`: The "NFO" viewer tab of the detials page.
+    * `detailsFileList`: The file listing tab of the details page (ie: used for listing archive contents).
+    * `help`: The help page.
+* `hashTagsSep`: Separator for hash entries. Defaults to ", ".
+* `isQueuedIndicator`: Indicator for items that are in the users download queue. Defaults to "Y".
+* `isNotQueuedIndicator`: Indicator for items that are _not_ in the users download queue. Defaults to "N".
+* `userRatingTicked`: Indicator for a items current _n_/5 "star" rating. Defaults to "*". `userRatingTicked` and `userRatingUnticked` are combined to build strings such as "***--" for 3/5 rating.
+* `userRatingUnticked`: Indicator for missing "stars" in a items _n_/5 rating. Defaults to "-". `userRatingTicked` and `userRatingUnticked` are combined to build strings such as "***--" for 3/5 rating.
+* `webDlExpireTimeFormat`: Presents the expiration time of a web download URL. Defaults to current theme → system `short` date/time format.
+* `webDlLinkNeedsGenerated`: Text to present when no web download link is yet generated. Defaults to "Not yet generated".
+* `webDlLinkNoWebserver`: Text to present when no web download is available (ie: webserver not enabled). Defaults to "Web server is not enabled".
+* `notAnArchiveFormat`: Presents text for the "archive type" field for non-archives. Defaults to "Not an archive".
+* `browseUploadTimestampFormat`: Timestamp format for `browseInfoFormatXXX`. Defaults to current theme → system `short` date format. See also **Browse Info Format** below.
+
+Remember that entries such as `isQueuedIndicator` and `userRatingTicked` may contain pipe color codes!
+
+### Browse Info Format
+Additional `config` block entries used for the `browse` page are as follows:
+* `browseInfoFormatXXX`: Where XXX is 10..._N_ such as `browseInfoFormat10`. See **Browse Page** below for format members.
+
+### Theming
+#### Browse Page
+* MCI 1 (ie: `%MT1`): File's short description (user entered, FILE_ID.DIZ, etc.).
+* MCI 2 (ie: `%HM2`): Navigation menu.
+* MCI 10..._N_: Custom entires with the following format members:
+    * `{fileId}`: File identifier.
+    * `{fileName}`: File name (long).
+    * `{desc}`: File short description (user entered, FILE_ID.DIZ, etc.).
+    * `{descLong}`: File's long description (README.TXT, SOMEGROUP.NFO, etc.).
+    * `{uploadByUserName}`: User name of user that uploaded this file, or "N/A".
+    * `{uploadByUserId}`: User ID of user that uploaded this file, or "N/A".
+    * `{userRating}`: User rating of file as a number.
+    * `{userRatingString}`: User rating of this file as a string formatted with `userRatingTicked` and `userRatingUnticked` described above.
+    * `{areaTag}`: Area tag.
+    * `{areaName}`: Area name or "N/A".
+    * `{areaDesc}`: Area description or "N/A".
+    * `{fileSha256}`: File's SHA-256 value in hex.
+    * `{fileMd5}`: File's MD5 value in hex.
+    * `{fileSha1}`: File's SHA1 value in hex.
+    * `{fileCrc32}`: File's CRC-32 value in hex.
+    * `{estReleaseYear}`: Estimated release year of this file.
+    * `{dlCount}`: Number of times this file has been downloaded.
+    * `{byteSize}`: Size of this file in bytes.
+    * `{archiveType}`: Archive type of this file determined by system mappings, or "N/A".
+    * `{archiveTypeDesc}`: A more descriptive archive type based on system mappings, file extention, etc. or "N/A" if it cannot be determined.
+    * `{shortFileName}`: Short DOS style 8.3 name available for some scenarios such as TIC import, or "N/A".
+    * `{ticOrigin}`: Origin from TIC imported files "Origin" field, or "N/A".
+    * `{ticDesc}`: Description from TIC imported files "Desc" field, or "N/A".
+    * `{ticLDesc}`: Long description from TIC imported files "LDesc" field joined by a line feed, or "N/A".
+    * `{uploadTimestamp}`: Upload timestamp formatted with `browseUploadTimestampFormat`.
+    * `{hashTags}`: A string of hash tags(s) separated by `hashTagsSep` described above. "(none)" if there are no tags.
+    * `{isQueued}`: Indicates if a item is currently in the user's download queue presented as `isQueuedIndicator` or `isNotQueuedIndicator` described above.
+    * `{webDlLink}`: Web download link if generated else `webDlLinkNeedsGenerated` or `webDlLinkNoWebserver` described above.
+    * `{webDlExpire}`: Web download link expiration using `webDlExpireTimeFormat` described above.
+
+#### Details Page
+* MCI 1 (ie: `%HM1`): Navigation menu
+* `%XY2`: Info area's top X,Y position.
+* `%XY3`: Info area's bottom X,Y position.
+* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsInfoFormatXXX` `config` block entry.
+
+#### Details Page - General Tab
+* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsGeneralInfoFormatXXX` `config` block entry.
+
+#### Details Page - NFO/README Viewer Tab
+* MCI 1 (ie: `%MT1`): NFO/README viewer using the entries `longDesc`.
+* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsNfoInfoFormatXXX` `config` block entry.
+
+#### Detilas Page - Archive/File Listing Tab
+* MCI 1 (ie: `%VM1`): List of entries in archive. Entries are formatted using the standard `itemFormat` and `focusItemFormat` properties of the view and have all of the format options described above in **Browse Page**.
+* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsFileListInfoFormatXXX` `config` block entry.
+

From 096bc5497f450548bdf483e0c3ef4caaf8dd307b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 28 Jul 2018 15:54:48 -0600
Subject: [PATCH 0427/1013] Minor cleanup/standardization in file list, updated
 docs

---
 core/file_area_list.js         |  2 +-
 docs/modding/file-area-list.md | 41 +++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/core/file_area_list.js b/core/file_area_list.js
index 3a539882..e72589c3 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -218,7 +218,7 @@ exports.getModule = class FileAreaList extends MenuModule {
         const config        = this.menuConfig.config;
         const currEntry     = this.currentFileEntry;
 
-        const uploadTimestampFormat = config.browseUploadTimestampFormat || this.client.currentTheme.helpers.getDateFormat('short');
+        const uploadTimestampFormat = config.uploadTimestampFormat || this.client.currentTheme.helpers.getDateFormat('short');
         const area                  = FileArea.getFileAreaByTag(currEntry.areaTag);
         const hashTagsSep           = config.hashTagsSep || ', ';
         const isQueuedIndicator     = config.isQueuedIndicator || 'Y';
diff --git a/docs/modding/file-area-list.md b/docs/modding/file-area-list.md
index cec9a18e..e46aaaba 100644
--- a/docs/modding/file-area-list.md
+++ b/docs/modding/file-area-list.md
@@ -6,7 +6,7 @@ title: File Area List
 The built in `file_area_list` module provides a very flexible file listing UI.
 
 ## Configuration
-### Config Block
+## Config Block
 Available `config` block entries:
 * `art`: Sup configuration block used to establish art files used for file browsing:
     * `browse`: The main browse screen.
@@ -24,19 +24,24 @@ Available `config` block entries:
 * `webDlLinkNeedsGenerated`: Text to present when no web download link is yet generated. Defaults to "Not yet generated".
 * `webDlLinkNoWebserver`: Text to present when no web download is available (ie: webserver not enabled). Defaults to "Web server is not enabled".
 * `notAnArchiveFormat`: Presents text for the "archive type" field for non-archives. Defaults to "Not an archive".
-* `browseUploadTimestampFormat`: Timestamp format for `browseInfoFormatXXX`. Defaults to current theme → system `short` date format. See also **Browse Info Format** below.
+* `uploadTimestampFormat`: Timestamp format for `xxxxxxInfoFormat##`. Defaults to current theme → system `short` date format. See also **Custom Info Formats** below.
 
 Remember that entries such as `isQueuedIndicator` and `userRatingTicked` may contain pipe color codes!
 
-### Browse Info Format
-Additional `config` block entries used for the `browse` page are as follows:
-* `browseInfoFormatXXX`: Where XXX is 10..._N_ such as `browseInfoFormat10`. See **Browse Page** below for format members.
+## Custom Info Formats
+Additional `config` block entries can set `xxxxxxInfoFormat##` formatting (where xxxxxx is the page name and ## is 10...99 such as `browseInfoFormat10`) for the various available pages:
+* `browseInfoFormat##` for the `browse` page. See **Browse Page** below.
+* `detailsInfoFormat##` for the `details` page. See **Details Page** below.
+* `detailsGeneralInfoFormat##` for the `detailsGeneral` tab. See **Details Page - General Tab** below.
+* `detailsNfoInfoFormat##` for the `detialsNfo` tab. See **Details Page - NFO/README Viewer Tab** below.
+* `detailsFileListInfoFormat##` for the `detailsFileList` tab. See **Details Page - Archive/File Listing Tab** below.
 
-### Theming
-#### Browse Page
+## Theming
+### Browse Page
+The browse page uses the `browse` art described above. The following MCI codes are available:
 * MCI 1 (ie: `%MT1`): File's short description (user entered, FILE_ID.DIZ, etc.).
 * MCI 2 (ie: `%HM2`): Navigation menu.
-* MCI 10..._N_: Custom entires with the following format members:
+* MCI 10...99: Custom entires with the following format members:
     * `{fileId}`: File identifier.
     * `{fileName}`: File name (long).
     * `{desc}`: File short description (user entered, FILE_ID.DIZ, etc.).
@@ -67,20 +72,24 @@ Additional `config` block entries used for the `browse` page are as follows:
     * `{webDlLink}`: Web download link if generated else `webDlLinkNeedsGenerated` or `webDlLinkNoWebserver` described above.
     * `{webDlExpire}`: Web download link expiration using `webDlExpireTimeFormat` described above.
 
-#### Details Page
+### Details Page
+The details page uses the `details` art described above. The following MCI codes are available:
 * MCI 1 (ie: `%HM1`): Navigation menu
 * `%XY2`: Info area's top X,Y position.
 * `%XY3`: Info area's bottom X,Y position.
-* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsInfoFormatXXX` `config` block entry.
+* MCI 10...99: Custom entries with the format options described above in **Browse Page** via the `detailsInfoFormat##` `config` block entry.
 
-#### Details Page - General Tab
-* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsGeneralInfoFormatXXX` `config` block entry.
+### Details Page - General Tab
+The details page general tab uses the `detailsGeneral` art described above. The following MCI codes are available:
+* MCI 10...99: Custom entries with the format options described above in **Browse Page** via the `detailsGeneralInfoFormat##` `config` block entry.
 
-#### Details Page - NFO/README Viewer Tab
+### Details Page - NFO/README Viewer Tab
+The details page nfo tab uses the `detailsNfo` art described above. The following MCI codes are available:
 * MCI 1 (ie: `%MT1`): NFO/README viewer using the entries `longDesc`.
-* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsNfoInfoFormatXXX` `config` block entry.
+* MCI 10...99: Custom entries with the format options described above in **Browse Page** via the `detailsNfoInfoFormat##` `config` block entry.
 
-#### Detilas Page - Archive/File Listing Tab
+### Details Page - Archive/File Listing Tab
+The details page file list tab uses the `detailsFileList` art described above. The following MCI codes are available:
 * MCI 1 (ie: `%VM1`): List of entries in archive. Entries are formatted using the standard `itemFormat` and `focusItemFormat` properties of the view and have all of the format options described above in **Browse Page**.
-* MCI 10..._N_: Custom entries with the format options described above in **Browse Page** via the `detailsFileListInfoFormatXXX` `config` block entry.
+* MCI 10...99: Custom entries with the format options described above in **Browse Page** via the `detailsFileListInfoFormat##` `config` block entry.
 

From 9b73380e0494f6051a9b8c8a1ea9c16302c887d9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 28 Jul 2018 15:57:36 -0600
Subject: [PATCH 0428/1013] Fix typo

---
 docs/modding/file-area-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modding/file-area-list.md b/docs/modding/file-area-list.md
index e46aaaba..a0a58071 100644
--- a/docs/modding/file-area-list.md
+++ b/docs/modding/file-area-list.md
@@ -8,7 +8,7 @@ The built in `file_area_list` module provides a very flexible file listing UI.
 ## Configuration
 ## Config Block
 Available `config` block entries:
-* `art`: Sup configuration block used to establish art files used for file browsing:
+* `art`: Sub-configuration block used to establish art files used for file browsing:
     * `browse`: The main browse screen.
     * `details`: The main file details screen.
     * `detailsGeneral`: The "general" tab of the details page.

From 96c3a0eb7d7597cd8ea119086bd1d3128de16bf2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 28 Jul 2018 15:58:53 -0600
Subject: [PATCH 0429/1013] Escape '*'

---
 docs/modding/file-area-list.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modding/file-area-list.md b/docs/modding/file-area-list.md
index a0a58071..735986a0 100644
--- a/docs/modding/file-area-list.md
+++ b/docs/modding/file-area-list.md
@@ -18,7 +18,7 @@ Available `config` block entries:
 * `hashTagsSep`: Separator for hash entries. Defaults to ", ".
 * `isQueuedIndicator`: Indicator for items that are in the users download queue. Defaults to "Y".
 * `isNotQueuedIndicator`: Indicator for items that are _not_ in the users download queue. Defaults to "N".
-* `userRatingTicked`: Indicator for a items current _n_/5 "star" rating. Defaults to "*". `userRatingTicked` and `userRatingUnticked` are combined to build strings such as "***--" for 3/5 rating.
+* `userRatingTicked`: Indicator for a items current _n_/5 "star" rating. Defaults to "\*". `userRatingTicked` and `userRatingUnticked` are combined to build strings such as "***--" for 3/5 rating.
 * `userRatingUnticked`: Indicator for missing "stars" in a items _n_/5 rating. Defaults to "-". `userRatingTicked` and `userRatingUnticked` are combined to build strings such as "***--" for 3/5 rating.
 * `webDlExpireTimeFormat`: Presents the expiration time of a web download URL. Defaults to current theme → system `short` date/time format.
 * `webDlLinkNeedsGenerated`: Text to present when no web download link is yet generated. Defaults to "Not yet generated".

From b5c67ec88f0be736bdb4b6c076916a91237a5f29 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 29 Jul 2018 20:58:26 -0600
Subject: [PATCH 0430/1013] Fix areaTag bug recently introduced

---
 core/msg_area_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 5e756fbe..97a2e16e 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -115,7 +115,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
         ).map(area => {
             return {
                 index       : index++,
-                areaTag     : area.area.areaTag,
+                areaTag     : area.areaTag,
                 name        : area.area.name,
                 text        : area.area.name,  //  standard
                 desc        : area.area.desc,

From 475fe596f6bb8c9944d3b04aeb63900a676e6698 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 2 Aug 2018 22:13:42 -0600
Subject: [PATCH 0431/1013] Better handling of 'socket' io

---
 core/door.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/door.js b/core/door.js
index 1ac0754f..d6326cbe 100644
--- a/core/door.js
+++ b/core/door.js
@@ -26,22 +26,20 @@ module.exports = class Door {
         }
 
         this.sockServer = createServer(conn => {
-            this.sockServer.getConnections( (err, count) => {
+            conn.once('end', () => {
+                return this.restoreIo(conn);
+            });
 
+            conn.once('error', err => {
+                this.client.log.info( { error : err.message }, 'Door socket server connection');
+                return this.restoreIo(conn);
+            });
+
+            this.sockServer.getConnections( (err, count) => {
                 //  We expect only one connection from our DOOR/emulator/etc.
                 if(!err && count <= 1) {
                     this.client.term.output.pipe(conn);
-
                     conn.on('data', this.doorDataHandler.bind(this));
-
-                    conn.once('end', () => {
-                        return this.restoreIo(conn);
-                    });
-
-                    conn.once('error', err => {
-                        this.client.log.info( { error : err.message }, 'Door socket server connection');
-                        return this.restoreIo(conn);
-                    });
                 }
             });
         });

From 5bd7ecdb880c9e1f2d34279df48d1c8f763c4b4f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 4 Aug 2018 11:49:44 -0600
Subject: [PATCH 0432/1013] Add menu-level ACS check

---
 core/acs.js                      | 15 +++++-
 core/menu_stack.js               |  7 +++
 core/show_art.js                 |  2 +-
 docs/configuration/acs.md        |  2 +-
 docs/configuration/menu-hjson.md | 82 ++++++++++++++++++++++----------
 5 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/core/acs.js b/core/acs.js
index 66f13a08..a86db329 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -51,6 +51,19 @@ class ACS {
         return this.check(area.acs, 'download', ACS.Defaults.FileAreaDownload);
     }
 
+    hasMenuModuleAccess(modInst) {
+        const acs = _.get(modInst, 'menuConfig.config.acs');
+        if(!_.isString(acs)) {
+            return true;    //  no ACS check req.
+        }
+        try {
+            return checkAcs(acs, { client : this.client } );
+        } catch(e) {
+            Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
+            return false;
+        }
+    }
+
     getConditionalValue(condArray, memberName) {
         if(!Array.isArray(condArray)) {
             //  no cond array, just use the value
@@ -68,7 +81,7 @@ class ACS {
                     return false;
                 }
             } else {
-                return true;    //  no acs check req.
+                return true;    //  no ACS check req.
             }
         });
 
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 5ab5a091..06b53d76 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -127,6 +127,13 @@ module.exports = class MenuStack {
             } else {
                 self.client.log.debug( { menuName : name }, 'Goto menu module');
 
+                if(!this.client.acs.hasMenuModuleAccess(modInst)) {
+                    if(cb) {
+                        return cb(Errors.AccessDenied('No access to this menu'));
+                    }
+                    return;
+                }
+
                 //
                 //  If menuFlags were supplied in menu.hjson, they should win over
                 //  anything supplied in code.
diff --git a/core/show_art.js b/core/show_art.js
index 1c7da1b6..bcd15d7b 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -116,7 +116,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
             if(!area) {
                 return cb(Errors.DoesNotExist(`No area by areaTag ${key} found`));
             }
-            return cb(null);    //  :TODO: REM OVE ME
+            return cb(null);    //  :TODO: REMOVE ME --- currently NYI
         });
     }
 
diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index 3b7acbc0..eeab8e9c 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -61,6 +61,6 @@ The following touch points exist in the system. Many more are planned:
 
 * Message conferences and areas
 * File base areas
-* Menus within `menu.hjson`
+* Menus within `menu.hjson`. See [menu.hjson](menu-hjson.md).
 
 See the specific areas documentation for information on available ACS checks.
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 3596e95a..58a06d5a 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -31,9 +31,9 @@ Let's look a couple basic menu entries:
 
 ```hjson
 telnetConnected: {
-  art: CONNECT
-  next: matrix
-  options: { nextTimeout: 1500 }
+    art: CONNECT
+    next: matrix
+    options: { nextTimeout: 1500 }
 }
 ```
 
@@ -54,38 +54,38 @@ Now let's look at `matrix`, the `next` entry from `telnetConnected`:
 
 ```hjson
 matrix: {
-  art: matrix
-  desc: Login Matrix
-  form: {
+    art: matrix
+    desc: Login Matrix
+    form: {
     0: {
-      VM: {
+        VM: {
         mci: {
-          VM1:  {
+            VM1:  {
             submit: true
             focus:  true            
             items: [ "login", "apply", "log off" ]
             argName: matrixSubmit
-          }
+            }
         }
         submit: {
-          *: [
-              {
-                  value: { matrixSubmit: 0 }
-                  action: @menu:login
-              }
-              {
-                  value: { matrixSubmit: 1 },
-                  action: @menu:newUserApplication
-              }
-              {
-                  value: { matrixSubmit: 2 },
-                  action: @menu:logoff
-              }
-          ]
+            *: [
+                {
+                    value: { matrixSubmit: 0 }
+                    action: @menu:login
+                }
+                {
+                    value: { matrixSubmit: 1 },
+                    action: @menu:newUserApplication
+                }
+                {
+                    value: { matrixSubmit: 2 },
+                    action: @menu:logoff
+                }
+            ]
+        }
         }
-      }
     }
-  }
+    }
 }
 ```
 
@@ -99,3 +99,35 @@ The `submit` object tells the system to attempt to apply provided match entries
  Upon submit, the first match will be executed. For example, if the user selects "login", the first entry 
  with a value of `{ matrixSubmit: 0 }` will match causing `action` of `@menu:login` to be executed (go 
  to `login` menu).
+
+## ACS Checks
+Menu modules can check user ACS in order to restrict areas and perform flow control. See [ACS](acs.md) for available ACS syntax.
+
+### Menu Access
+To restrict menu access add an `acs` key to `config`. Example:
+```
+opOnlyMenu: {
+    desc: Ops Only!
+    config: {
+        acs: ID1
+    }
+}
+```
+
+### Flow Control
+The `next` member of a menu may be an array of objects containing an `acs` check as well as the destination. Depending on the current user's ACS, the system will pick the appropriate target. The last element in an array without an `acs` can be used as a catch all. Example:
+```
+login: {
+    desc: Logging In
+    next: [
+        {
+            //	>= 2 calls else you get the full login
+            acs: NC2
+            next: loginSequenceLoginFlavorSelect
+        }
+        {
+            next: fullLoginSequenceLoginArt
+        }
+    ]
+}
+```
\ No newline at end of file

From 746bd5abd042e9fe04f88cd4dd2dec00d900ba08 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 5 Aug 2018 10:50:47 -0600
Subject: [PATCH 0433/1013] * Don't crash with bad string formats * File
 listing: If we fail to get an archive listing, fix attempt to format the
 string with a non-object

---
 core/file_area_list.js | 16 ++++++++++++----
 core/string_format.js  | 26 +++++++++++++++++---------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/core/file_area_list.js b/core/file_area_list.js
index e72589c3..35ce3ea6 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -589,15 +589,22 @@ exports.getModule = class FileAreaList extends MenuModule {
         });
     }
 
+    setFileListNoListing(text) {
+        const fileListView = this.viewControllers.detailsFileList.getView(MciViewIds.detailsFileList.fileList);
+        if(fileListView) {
+            fileListView.complexItems = false;
+            fileListView.setItems( [ text ] );
+            fileListView.redraw();
+        }
+    }
+
     populateFileListing() {
         const fileListView = this.viewControllers.detailsFileList.getView(MciViewIds.detailsFileList.fileList);
 
         if(this.currentFileEntry.entryInfo.archiveType) {
             this.cacheArchiveEntries( (err, cacheStatus) => {
                 if(err) {
-                    //  :TODO: Handle me!!!
-                    fileListView.setItems( [ 'Failed getting file listing' ] ); //  :TODO: make this not suck
-                    return;
+                    return this.setFileListNoListing('Failed to get file listing');
                 }
 
                 if('re-cached' === cacheStatus) {
@@ -606,7 +613,8 @@ exports.getModule = class FileAreaList extends MenuModule {
                 }
             });
         } else {
-            fileListView.setItems( [ stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } ) ] );
+            const notAnArchiveFileName = stringFormat(this.menuConfig.config.notAnArchiveFormat || 'Not an archive', { fileName : this.currentFileEntry.fileName } );
+            this.setFileListNoListing(notAnArchiveFileName);
         }
     }
 
diff --git a/core/string_format.js b/core/string_format.js
index cef937c4..a756db72 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -331,17 +331,25 @@ module.exports = function format(fmt, obj) {
             transformer = match[2];
             formatSpec  = match[3];
 
-            value = getValue(obj,  objPath);
-            if(transformer) {
-                value = transformValue(transformer, value);
-            }
+            try {
+                value = getValue(obj,  objPath);
+                if(transformer) {
+                    value = transformValue(transformer, value);
+                }
 
-            tokens = tokenizeFormatSpec(formatSpec || '');
+                tokens = tokenizeFormatSpec(formatSpec || '');
 
-            if(_.isNumber(value)) {
-                out += formatNumber(value, tokens);
-            } else {
-                out += formatString(value, tokens);
+                if(_.isNumber(value)) {
+                    out += formatNumber(value, tokens);
+                } else {
+                    out += formatString(value, tokens);
+                }
+            } catch(e) {
+                if(e instanceof KeyError) {
+                    out += match[0];    //  preserve full thing
+                } else if(e instanceof ValueError) {
+                    out += value.toString();
+                }
             }
         }
 

From dfe1c297b5ea8ddace2aecc1f2b659ef34ecedec Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 5 Aug 2018 14:06:30 -0600
Subject: [PATCH 0434/1013] Menu "options" block is now deprecated. Move
 members to "config"! * Deprecate & allow conversion behind the scenes for now
 + add warning in log * Add some initial docs * Clean up prompt.hjson and
 menu.hjson

---
 config/menu.hjson                | 78 +++++++++++++-------------------
 config/prompt.hjson              |  2 +-
 core/menu_module.js              | 20 ++++----
 core/menu_stack.js               | 21 +++++++--
 core/menu_util.js                |  8 ++--
 core/show_art.js                 |  2 +-
 core/theme.js                    |  2 +-
 docs/configuration/menu-hjson.md | 45 +++++++++++-------
 8 files changed, 95 insertions(+), 83 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 39149416..3d651412 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -32,7 +32,7 @@
 		telnetConnected: {
 			art: CONNECT
 			next: matrix
-			options: { nextTimeout: 1500 }
+			config: { nextTimeout: 1500 }
 		}
 
 		//
@@ -42,7 +42,7 @@
 		sshConnected: {
 			art: CONNECT
 			next: fullLoginSequenceLoginArt
-			options: { nextTimeout: 1500 }
+			config: { nextTimeout: 1500 }
 		}
 
 		//
@@ -53,7 +53,7 @@
 		sshConnectedNewUser: {
 			art: CONNECT
 			next: newUserApplicationPreSsh
-			options: { nextTimeout: 1500 }
+			config: { nextTimeout: 1500 }
 		}
 
 		//	Ye ol' standard matrix
@@ -158,7 +158,7 @@
 
 		loginAttemptTooNode: {
 			art: TOONODE
-			options: {
+			config: {
 				cls: true
 				nextTimeout: 2000
 			}
@@ -179,7 +179,7 @@
 		forgotPasswordSubmitted: {
 			desc: Forgot password
 			art: FORGOTPWSENT
-			options: {
+			config: {
 				cls: true
 				pause: true
 			}
@@ -206,7 +206,7 @@
 			art: PRELOGAD
 			desc: Logging Off
 			next: fullLogoffSequenceRandomBoardAd
-			options: {
+			config: {
 				cls: true
 				nextTimeout: 1500
 			}
@@ -216,7 +216,7 @@
 			art: OTHRBBS
 			desc: Logging Off
 			next: logoff
-			options: {
+			config: {
 				baudRate: 57600
 				pause: true
 				cls: true
@@ -234,7 +234,7 @@
 			art: NEWUSER1
 			next: newUserApplication
 			desc: Applying
-			options: {
+			config: {
 				pause: true
 				cls: true
 				menuFlags: [ "noHistory" ]
@@ -349,7 +349,7 @@
 			art: NEWUSER1
 			next: newUserApplicationSsh
 			desc: Applying
-			options: {
+			config: {
 				pause: true
 				cls: true
 				menuFlags: [ "noHistory" ]
@@ -456,7 +456,7 @@
 
 		newUserFeedbackToSysOpPreamble: {
 			art: LETTER
-			options: { pause: true }
+			config: { pause: true }
 			next: newUserFeedbackToSysOp
 		}
 
@@ -583,14 +583,14 @@
 		newUserInactiveDone: {
 			desc: Finished with NUA
 			art: DONE
-			options: { pause: true }
+			config: { pause: true }
 			next: @menu:logoff
 		}
 
 		fullLoginSequenceLoginArt: {
 			desc: Logging In
 			art: WELCOME
-			options: { pause: true }
+			config: { pause: true }
 			next: fullLoginSequenceLastCallers
 		}
 
@@ -598,7 +598,7 @@
 			desc: Last Callers
 			module: last_callers
 			art: LASTCALL
-			options: {
+			config: {
 				pause: true
 				font: cp437
 			}
@@ -608,7 +608,7 @@
 			desc: Who's Online
 			module: whos_online
 			art: WHOSON
-			options: { pause: true }
+			config: { pause: true }
 			next: fullLoginSequenceOnelinerz
 		}
 
@@ -626,10 +626,8 @@
 					next: fullLoginSequenceUserStats
 				}
 			]
-			options: {
-				cls: true
-			}
 			config: {
+				cls: true
 				art: {
 					view: ONELINER
 					add: ONEADD
@@ -737,13 +735,13 @@
 		fullLoginSequenceSysStats: {
 			desc: System Stats
 			art: SYSSTAT
-			options: { pause: true }
+			config: { pause: true }
 			next: fullLoginSequenceUserStats
 		}
 		fullLoginSequenceUserStats: {
 			desc: User Stats
 			art: STATUS
-			options: { pause: true }
+			config: { pause: true }
 			next: mainMenu
 		}
 
@@ -937,7 +935,7 @@
 			art: MMENU
 			desc: Main Menu
 			prompt: menuCommand
-			options: {
+			config: {
 				font: cp437
 			}
 			submit: [
@@ -1016,26 +1014,26 @@
 			desc: Last Callers
 			module: last_callers
 			art: LASTCALL
-			options: { pause: true }
+			config: { pause: true }
 		}
 
 		mainMenuWhosOnline: {
 			desc: Who's Online
 			module: whos_online
 			art: WHOSON
-			options: { pause: true }
+			config: { pause: true }
 		}
 
 		mainMenuUserStats: {
 			desc: User Stats
 			art: STATUS
-			options: { pause: true }
+			config: { pause: true }
 		}
 
 		mainMenuSystemStats: {
 			desc: System Stats
 			art: SYSSTAT
-			options: { pause: true }
+			config: { pause: true }
 		}
 
 		mainMenuUserList: {
@@ -1282,10 +1280,8 @@
 		mainMenuOnelinerz: {
 			desc: Viewing Onelinerz
 			module: onelinerz
-			options: {
-				cls: true
-			}
 			config: {
+				cls: true
 				art: {
 					view: ONELINER
 					add: ONEADD
@@ -1368,10 +1364,8 @@
 		mainMenuRumorz: {
 			desc: Rumorz
 			module: rumorz
-			options: {
-				cls: true
-			}
 			config: {
+				cls: true
 				art: {
 					entries: RUMORS
 					add: RUMORADD
@@ -1454,10 +1448,8 @@
 		bbsList: {
 			desc: Viewing BBS List
 			module: bbs_list
-			options: {
-				cls: true
-			}
 			config: {
+				cls: true
 				art: {
 					entries: BBSLIST
 					add: BBSADD
@@ -1831,7 +1823,7 @@
 		messageSearchNoResults: {
 			desc: Message Search
 			art: MSRCNORES
-			options: {
+			config: {
 				pause: true
 			}
 		}
@@ -1912,8 +1904,6 @@
 			config: {
 				method: messageConf
 				key: confTag
-			}
-			options: {
 				pause: true
 				cls: true
 				menuFlags: [ "popParent", "noHistory" ]
@@ -1956,8 +1946,6 @@
 			config: {
 				method: messageArea
 				key: areaTag
-			}
-			options: {
 				pause: true
 				cls: true
 				menuFlags: [ "popParent", "noHistory" ]
@@ -2732,10 +2720,8 @@
 		fileBaseExportList: {
 			module: file_base_user_list_export
 			art: FBLISTEXP
-			options: {
-				pause: true
-			}
 			config: {
+				pause: true
 				templates: {
 					entry: file_list_entry.asc
 				}
@@ -2753,7 +2739,7 @@
 		fileBaseExportListNoResults: {
 			desc: Browsing Files
 			art: FBNORES
-			options: {
+			config: {
 				pause: true
 				menuFlags: [ "noHistory", "popParent" ]
 			}
@@ -2975,7 +2961,7 @@
 		fileBaseGetRatingForSelectedEntry: {
 			desc: Rating a File
 			prompt: fileBaseRateEntryPrompt
-			options: {
+			config: {
 				cls: true
 			}
 			submit: [
@@ -2991,7 +2977,7 @@
 		fileBaseListEntriesNoResults: {
 			desc: Browsing Files
 			art: FBNORES
-			options: {
+			config: {
 				pause: true
 				menuFlags: [ "noHistory", "popParent" ]
 			}
@@ -3282,7 +3268,7 @@
 		fileBaseDownloadManagerEmptyQueue: {
 			desc: Empty Download Queue
 			art: FEMPTYQ
-			options: {
+			config: {
 				pause: true
 				menuFlags: [ "noHistory", "popParent" ]
 			}
@@ -3446,7 +3432,7 @@
 		fileBaseNoUploadAreasAvail: {
 			desc: File Base
 			art: ULNOAREA
-			options: {
+			config: {
 				pause: true
 				menuFlags: [ "noHistory", "popParent" ]
 			}
diff --git a/config/prompt.hjson b/config/prompt.hjson
index b165fbd5..e5a50630 100644
--- a/config/prompt.hjson
+++ b/config/prompt.hjson
@@ -233,7 +233,7 @@
 			//	Any menu 'pause' will use this prompt
 			//
 			art: pause
-			options: {
+			config: {
 				trailingLF: no
 			}
 			/*
diff --git a/core/menu_module.js b/core/menu_module.js
index 992c17fb..ee1502cb 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -25,11 +25,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.menuName           = options.menuName;
         this.menuConfig         = options.menuConfig;
         this.client             = options.client;
-        this.menuConfig.options = options.menuConfig.options || {};
+        //this.menuConfig.options = options.menuConfig.options || {};
         this.menuMethods        = {};   //  methods called from @method's
         this.menuConfig.config  = this.menuConfig.config || {};
 
-        this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
+        this.cls                = _.get(this.menuConfig.config, 'cls', Config().menus.cls);
+
+        //this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
 
         this.viewControllers    = {};
     }
@@ -59,7 +61,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
                     self.displayAsset(
                         self.menuConfig.art,
-                        self.menuConfig.options,
+                        self.menuConfig.config,
                         (err, artData) => {
                             if(err) {
                                 self.client.log.trace('Could not display art', { art : self.menuConfig.art, reason : err.message } );
@@ -89,7 +91,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
                     self.displayAsset(
                         self.menuConfig.promptConfig.art,
-                        self.menuConfig.options,
+                        self.menuConfig.config,
                         (err, artData) => {
                             if(artData) {
                                 mciData.prompt = artData.mciMap;
@@ -137,9 +139,9 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     beforeArt(cb) {
-        if(_.isNumber(this.menuConfig.options.baudRate)) {
+        if(_.isNumber(this.menuConfig.config.baudRate)) {
             //  :TODO: some terminals not supporting cterm style emulated baud rate end up displaying a broken ESC sequence or a single "r" here
-            this.client.term.rawWrite(ansi.setEmulatedBaudRate(this.menuConfig.options.baudRate));
+            this.client.term.rawWrite(ansi.setEmulatedBaudRate(this.menuConfig.config.baudRate));
         }
 
         if(this.cls) {
@@ -220,11 +222,11 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     shouldPause() {
-        return ('end' === this.menuConfig.options.pause || true === this.menuConfig.options.pause);
+        return ('end' === this.menuConfig.config.pause || true === this.menuConfig.config.pause);
     }
 
     hasNextTimeout() {
-        return _.isNumber(this.menuConfig.options.nextTimeout);
+        return _.isNumber(this.menuConfig.config.nextTimeout);
     }
 
     haveNext() {
@@ -246,7 +248,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
             if(this.hasNextTimeout()) {
                 setTimeout( () => {
                     return gotoNextMenu();
-                }, this.menuConfig.options.nextTimeout);
+                }, this.menuConfig.config.nextTimeout);
             } else {
                 return gotoNextMenu();
             }
diff --git a/core/menu_stack.js b/core/menu_stack.js
index 06b53d76..3e9c455b 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -134,15 +134,28 @@ module.exports = class MenuStack {
                     return;
                 }
 
+                //
+                //  Handle deprecated 'options' block by merging to config and warning user.
+                //  :TODO: Remove in 0.0.10+
+                //
+                if(modInst.menuConfig.options) {
+                    self.client.log.warn(
+                        { options : modInst.menuConfig.options },
+                        'Use of "options" is deprecated. Move relevant members to "config" block! Support will be fully removed in future versions'
+                    );
+                    Object.assign(modInst.menuConfig.config || {}, modInst.menuConfig.options);
+                    delete modInst.menuConfig.options;
+                }
+
                 //
                 //  If menuFlags were supplied in menu.hjson, they should win over
                 //  anything supplied in code.
                 //
                 let menuFlags;
-                if(0 === modInst.menuConfig.options.menuFlags.length) {
+                if(0 === modInst.menuConfig.config.menuFlags.length) {
                     menuFlags = Array.isArray(options.menuFlags) ? options.menuFlags : [];
                 } else {
-                    menuFlags = modInst.menuConfig.options.menuFlags;
+                    menuFlags = modInst.menuConfig.config.menuFlags;
 
                     //  in code we can ask to merge in
                     if(Array.isArray(options.menuFlags) && options.menuFlags.includes('mergeFlags')) {
@@ -179,8 +192,8 @@ module.exports = class MenuStack {
 
                 const stackEntries = self.stack.map(stackEntry => {
                     let name = stackEntry.name;
-                    if(stackEntry.instance.menuConfig.options.menuFlags.length > 0) {
-                        name += ` (${stackEntry.instance.menuConfig.options.menuFlags.join(', ')})`;
+                    if(stackEntry.instance.menuConfig.config.menuFlags.length > 0) {
+                        name += ` (${stackEntry.instance.menuConfig.config.menuFlags.join(', ')})`;
                     }
                     return name;
                 });
diff --git a/core/menu_util.js b/core/menu_util.js
index 7eca129d..c05f90d9 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -61,10 +61,10 @@ function loadMenu(options, cb) {
             },
             function loadMenuModule(menuConfig, callback) {
 
-                menuConfig.options = menuConfig.options || {};
-                menuConfig.options.menuFlags = menuConfig.options.menuFlags || [];
-                if(!Array.isArray(menuConfig.options.menuFlags)) {
-                    menuConfig.options.menuFlags = [ menuConfig.options.menuFlags ];
+                menuConfig.config = menuConfig.config || {};
+                menuConfig.config.menuFlags = menuConfig.config.menuFlags || [];
+                if(!Array.isArray(menuConfig.config.menuFlags)) {
+                    menuConfig.config.menuFlags = [ menuConfig.config.menuFlags ];
                 }
 
                 const modAsset      = asset.getModuleAsset(menuConfig.module);
diff --git a/core/show_art.js b/core/show_art.js
index bcd15d7b..30b6e56e 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -156,7 +156,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
                     //  :TODO: we really need a way to supply an explicit path to look in, e.g. general/area_art/
                     self.displayAsset(
                         artSpec,
-                        self.menuConfig.options,
+                        self.menuConfig.config,
                         (err, artData) => {
                             if(err) {
                                 return callback(err);
diff --git a/core/theme.js b/core/theme.js
index c7a2b06d..bdba70bc 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -571,7 +571,7 @@ function displayThemedPrompt(name, client, options, cb) {
                 //  doing so messes things up -- most terminals that support font
                 //  changing can only display a single font at at time.
                 //
-                const dispOptions = Object.assign( {}, options, promptConfig.options );
+                const dispOptions = Object.assign( {}, options, promptConfig.config );
                 //  :TODO: We can use term detection to do nifty things like avoid this kind of kludge:
                 if(!options.clearScreen) {
                     dispOptions.font = 'not_really_a_font!';    //  kludge :)
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 58a06d5a..7d1bbed4 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -2,12 +2,11 @@
 layout: page
 title: menu.hjson
 ---
-:warning: ***IMPORTANT!*** Before making any customisations, create your own copy of `/config/menu.hjson`, and specify it in the
-`general` section of `config.hjson`:
+:warning: ***IMPORTANT!*** Before making any customisations, create your own copy of `/config/menu.hjson`, and specify it in the `general` section of `config.hjson`:
 
 ````hjson
 general: {
-    menuFile: my-menu.hjson
+    menuFile: yourboardname.hjson
 }
 ````
 This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson`
@@ -15,16 +14,33 @@ This document and others will refer to `menu.hjson`. This should be seen as an a
 ## The Basics
 Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
 
-Entries in `menu.hjson` are objects defining a menu. A menu in this sense is something the user can see 
-or visit. Examples include but are not limited to:
+Entries in `menu.hjson` are objects or _sections_ defining a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
 
 * Classical Main, Messages, and File menus
 * Art file display
-* Module driven menus such as door launchers
+* Module driven menus such as door launchers and other custom mods
 
+Menu entries live under the `menus` section of `menu.hjson`. The *key* for a menu is it's name that can be referenced by other menus and areas of the system.
 
-Each entry in `menu.hjson` defines an object that represents a menu. These objects live within the `menus` 
-parent object. Each object's *key* is a menu name you can reference within other menus in the system. 
+## Common Menu Entry Members
+* `desc`: A friendly description that can be found in places such as "Who's Online" or the `%MD` MCI code.
+* `art`: An art file specification.
+* `next`: Specifies the next menu to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below.
+* `prompt`: Specifies a prompt, by name, to use along with this menu.
+* `form`: Defines one or more forms available on this menu.
+* `submit`: Defines a submit handler when using `prompt`.
+* `config`: May contain any of the following standard configuration members in addition to per-module defined types (see appropriate module for more information):
+    * `cls`: If `true` the screen will be cleared before showing this menu.
+    * `pause`: If `true` a pause will occur after showing this menu. Useful for simple menus such as displaying art or status screens.
+    * `nextTimeout`: Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu.
+    * `baudRate`: Sets the SyncTERM style emulated baud rate. May be `300`, `600`, `1200`, `2400`, `4800`, `9600`, `19200`, `38400`, `57600`, `76800`, or `115200`. A value of `ulimited`, `off`, or `0` resets (disables) the rate.  See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
+    * `font`: Sets the SyncTERM style font. May be one of the following: `cp437`, `cp1251`, `koi8_r`,  `iso8859_2`, `iso8859_4`, `cp866`, `iso8859_9`, `haik8`, `iso8859_8`, `koi8_u`, `iso8859_15`, `iso8859_4`, `koi8_r_b`, `iso8859_4`, `iso8859_5`, `ARMSCII_8`, `iso8859_15`, `cp850`, `cp850`, `cp885`, `cp1251`, `iso8859_7`, `koi8-r_c`, `iso8859_4`, `iso8859_1`, `cp866`, `cp437`, `cp866`, `cp885`, `cp866_u`, `iso8859_1`, `cp1131`, `c64_upper`, `c64_lower`, `c128_upper`, `c128_lower`, `atari`, `pot_noodle`, `mo_soul`, `microknight_plus`, `topaz_plus`, `microknight`, `topaz`. See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
+
+## Forms
+TODO
+
+## Submit Handlers
+TODO
 
 ## Example
 Let's look a couple basic menu entries:
@@ -37,18 +53,13 @@ telnetConnected: {
 }
 ```
 
-The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in 
-the Telnet server's config).
+The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config).
 
-An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents 
-a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If 
-desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
+An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
 
-The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after 
-`telnetConnected`.
+The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
 
-Finally, an `options` object may contain various common options for menus. In this case, `nextTimeout` 
-tells the system to proceed to the `next` entry automatically after 1500ms.
+Finally, an `options` object may contain various common options for menus. In this case, `nextTimeout` tells the system to proceed to the `next` entry automatically after 1500ms.
 
 Now let's look at `matrix`, the `next` entry from `telnetConnected`:
 

From d54c38b9a979cea5a8412037f8f2199648512a6a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 5 Aug 2018 21:22:32 -0600
Subject: [PATCH 0435/1013] Default to 'cp437' encoding vs current client
 encoding so we have something stable

---
 core/abracadabra.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 9ada9e5a..1ddec925 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -155,7 +155,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
             cwd             : this.config.cwd,  //  null/undefined = parent_of(cmd)
             args            : this.config.args,
             io              : this.config.io || 'stdio',
-            encoding        : this.config.encoding || this.client.term.outputEncoding,
+            encoding        : this.config.encoding || 'cp437',
             dropFile        : this.dropFile.fileName,
             dropFilePath    : this.dropFile.fullPath,
             node            : this.client.node,

From f0aa611904597674aab0cb6e802886b7ed183534 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 5 Aug 2018 21:22:45 -0600
Subject: [PATCH 0436/1013] Better abracadabra docs!

---
 docs/modding/local-doors.md | 41 +++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index b9620748..719a992b 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -5,28 +5,43 @@ title: Local Doors
 ## The abracadabra Module
 The `abracadabra` module provides a generic and flexible solution for many door types. Through this module you can execute native processes & scripts directly, and process I/O through stdio or a temporary TCP server.
 
-The `abracadabra` `config` block can contain the following:
-* `name`: Used as a key for tracking number of clients using a particular door
-* `dropFileType`: Specifies the type of drop file to generate (See table below)
-* `cmd`: Path to executable to launch
+## Configuration
+The `abracadabra` `config` block can contain the following members:
+* `name`: Used as a key for tracking number of clients using a particular door.
+* `dropFileType`: Specifies the type of drop file to generate (See **Argument Variables** below).
+* `cmd`: Path to executable to launch.
 * `args`: Array of argument(s) to pass to `cmd`. See below for information on variables that can be used here.
+* `cwd`: Set the Current Working Directory for `cmd`. Defaults to the directory of `cmd`.
 * `nodeMax`: Max number of nodes that can access this door at once. Uses `name` as a mapping key
 * `tooManyArt`: Art file spec to display if too many instances are already in use
 * `io`: Where to process I/O. Can be `stdio` or `socket`
+* `encoding`: Specify the door's encoding. Defaults to `cp437`. Linux binaries for example, often produce `utf8`.
 
+### Drop File Types
 Drop file types specified by `dropFileType`:
 * `DOOR`: [DOOR.SYS](http://goldfndr.home.mindspring.com/dropfile/doorsys.htm)
 * `DOOR32`: [DOOR32.SYS](http://wiki.bbses.info/index.php/DOOR32.SYS)
 * `DORINFO`: [DORINFOx.DEF](http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm)
 
-Variables for use in `args`:
-* `{node}`: Current node number
-* `{dropFile}`: Path to generated drop file
-* `{userId}`: Current user ID
-* `{srvPort}`: Tempoary server port when `io` is `socket`
+### Argument Variables
+The following variables may be used in `{args}` entries:
+* `{node}`: Current node number.
+* `{dropFile}`: Drop _filename_ only.
+* `{dropFilePath}`: Full path to generated drop file.
+* `{userId}`: Current user ID.
+* `{userName}`: _Sanatized_ username. Safe for filenames, etc.
+* `{userNameRaw}`: _Raw_ username. May not be safe for filenames!
+* `{srvPort}`: Tempoary server port when `io` is set to `socket`.
+* `{cwd}`: Current Working Directory.
 
+Example:
+```hjson
+args: [
+    "-D", "{dropFile}", "-N", "{node}"
+]
+```
 
-### DOSEMU with abracadabra
+## DOSEMU with abracadabra
 [DOSEMU](http://www.dosemu.org/) can provide a good solution for running legacy DOS doors when running on Linux systems. For this, we will create a virtual serial port (COM1) that communicates via stdio.
 
 As an example, here are the steps for setting up Pimp Wars:
@@ -82,12 +97,12 @@ doorPimpWars: {
 
 ```
 
-### QEMU with abracadabra
+## QEMU with abracadabra
 [QEMU](http://wiki.qemu.org/Main_Page) provides a robust, cross platform solution for launching doors under many platforms (likely anwywhere Node.js is supported and ENiGMA½ can run). Note however that there is an important and major caveat: **Multiple instances of a particular door/OS image should not be run at once!** Being more flexible means being a bit more complex. Let's look at an example for running L.O.R.D. under a UNIX like system such as Linux or FreeBSD.
 
 Basically we'll be creating a bootstrap shell script that generates a temporary node specific `go.bat` to launch our door. This will be called from `autoexec.bat` within our QEMU FreeDOS partition.
 
-#### Step 1: Create a FreeDOS image
+### Step 1: Create a FreeDOS image
 [FreeDOS](http://www.freedos.org/) is a free mostly MS-DOS compatible DOS package that works well for running 16bit doors. Follow the [QEMU/FreeDOS](https://en.wikibooks.org/wiki/QEMU/FreeDOS) guide for creating an `freedos_c.img`. This will contain FreeDOS itself and installed BBS doors.
 
 After this is complete, copy LORD to C:\DOORS\LORD within FreeDOS. An easy way to tranfer files from host to DOS is to use QEMU's vfat as a drive. For example:
@@ -100,7 +115,7 @@ With the above you can now copy files from D: to C: within FreeDOS and add the f
 CALL E:\GO.BAT
 ```
 
-#### Step 2: Create a bootstrap script
+### Step 2: Create a bootstrap script
 Our bootstrap script will prepare `GO.BAT` and launch FreeDOS. Below is an example:
 
 

From aa2e2e56e31860fe8ca5869a3cf2643f5cd37855 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 Aug 2018 20:45:50 -0600
Subject: [PATCH 0437/1013] Fix FTN address lookup crash when scanning

---
 core/scanner_tossers/ftn_bso.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index f20e61ea..e2260d93 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1240,7 +1240,7 @@ function FTNMessageScanTossModule() {
                             //  we can only assume the message is to the +op, else we'll have to fail.
                             //
                             const toUserNameAsAddress = Address.fromString(message.toUserName);
-                            if(toUserNameAsAddress.isValid()) {
+                            if(toUserNameAsAddress && toUserNameAsAddress.isValid()) {
 
                                 Log.info(
                                     { toUserName : message.toUserName, fromUserName : message.fromUserName },
@@ -1879,7 +1879,7 @@ function FTNMessageScanTossModule() {
                         if(err) {
                             Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
                         } else {
-                            Log.debug( { oldPath : oldPath }, 'Removed old physical file during TIC replacement');
+                            Log.trace( { oldPath : oldPath }, 'Removed old physical file during TIC replacement');
                         }
                         return callback(null, localInfo);   //  continue even if err
                     });
@@ -1889,7 +1889,7 @@ function FTNMessageScanTossModule() {
                 if(err) {
                     Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed import/update TIC record' );
                 } else {
-                    Log.debug(
+                    Log.info(
                         { tic : ticFileInfo.path, file : ticFileInfo.filePath, area : localInfo.areaTag },
                         'TIC imported successfully'
                     );

From fc9271ad03c16cc46ef93abfe650e74f389dbf9a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 Aug 2018 20:46:49 -0600
Subject: [PATCH 0438/1013] Initial start of oputil stuff

---
 docs/_includes/nav.md |  4 +++-
 docs/admin/oputil.md  | 47 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 docs/admin/oputil.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index c366c8fa..33702016 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -25,7 +25,6 @@
     - [Access Condition System (ACS)]({{ site.baseurl }}{% link configuration/acs.md %})
     - Scheduled jobs
 
-
   - File Base
     - [About]({{ site.baseurl }}{% link filebase/index.md %})
     - [Configuring a File Area]({{ site.baseurl }}{% link filebase/first-file-area.md %})
@@ -70,6 +69,9 @@
     - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
     - [Message Conference List]({{ site.baseurl }}{% link modding/msg-conf-list.md %})
     - [Message Area List]({{ site.baseurl }}{% link modding/msg-area-list.md %})
+
+  - Administration
+    - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
  
   - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
new file mode 100644
index 00000000..9935ea68
--- /dev/null
+++ b/docs/admin/oputil.md
@@ -0,0 +1,47 @@
+---
+layout: page
+title: oputil
+---
+## The oputil CLI
+ENiGMA½ comes with `oputil.js` henceforth known as `oputil`, a command line interface (CLI) tool for sysops to perform general system and user administration. You likely used oputil to do the initial ENiGMA configuration.
+
+Let's look the main help output as per this writing:
+
+```
+usage: optutil.js [--version] [--help]
+                  <command> [<args>]
+
+global args:
+  -c, --config PATH         specify config path (./config/)
+  -n, --no-prompt           assume defaults/don't prompt for input where possible
+
+commands:
+  user                      user utilities
+  config                    config file management
+  fb                        file base management
+  mb                        message base management
+```
+
+Commands break up operations by groups. Type `./oputil.js <command> --help` for additional help on a particular command. The next sections will describe them.
+
+## User
+```
+usage: optutil.js user <action> [<args>]
+
+actions:
+  pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
+  rm USERNAME                  permanantely removes USERNAME user from system
+  activate USERNAME            sets USERNAME's status to active
+  deactivate USERNAME          sets USERNAME's status to deactive
+  disable USERNAME             sets USERNAME's status to disabled
+  group USERNAME [+|-]GROUP    adds (+) or removes (-) USERNAME from GROUP
+```
+
+| Action    | Description       | Examples                              | Aliases   |
+|-----------|-------------------|---------------------------------------|-----------|
+| `pw`        | Set password      | `./oputil.js user pw joeuser s3cr37`  | `pass`, `passwd`, `password` |
+| `rm`        | Removes user      | `./oputil.js user del joeuser`        | `remove`, `del`, `delete` |
+| `activate` | Activates user    | `./oputil.js user activate joeuser`   | N/A   |
+| `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |
+| `disable`   | Disables user (user will not be able to login)    | `./oputil.js user disable joeuser`    | N/A   |
+| `group`   | Modifies users group membership   | Add to group: `./oputil.js user group joeuser +derp`<br/>Remove from group: `./oputil.js user group joeuser -derp`   | N/A    |

From 1494adc3047cde5fb28462768e010e4c8b91f802 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 Aug 2018 21:50:50 -0600
Subject: [PATCH 0439/1013] More updates to oputil

---
 docs/admin/oputil.md | 101 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 9935ea68..ba456025 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -22,9 +22,23 @@ commands:
   mb                        message base management
 ```
 
-Commands break up operations by groups. Type `./oputil.js <command> --help` for additional help on a particular command. The next sections will describe them.
+Commands break up operations by groups:
+| Command   | Description   |
+|-----------|---------------|
+| `user`    | User management   |
+| `config`  | System configuration and maintentance |
+| `fb`      | File base configuration and management    |
+| `mb`      | Message base configuration and management |
+
+Global arguments apply to most commands and actions:
+* `--config`: Specify configuration directory if it is not the default of `./config/`.
+* `--no-prompt`: Assume defaults and do not prompt when posisible.
+
+Type `./oputil.js <command> --help` for additional help on a particular command. The following sections will describe them.
 
 ## User
+The `user` command covers various user operations.
+
 ```
 usage: optutil.js user <action> [<args>]
 
@@ -45,3 +59,88 @@ actions:
 | `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |
 | `disable`   | Disables user (user will not be able to login)    | `./oputil.js user disable joeuser`    | N/A   |
 | `group`   | Modifies users group membership   | Add to group: `./oputil.js user group joeuser +derp`<br/>Remove from group: `./oputil.js user group joeuser -derp`   | N/A    |
+
+## Configuration
+The `config` command allows sysops to perform various system configuration and maintenance tasks.
+
+```
+usage: optutil.js config <action> [<args>]
+
+actions:
+  new                      generate a new/initial configuration
+  import-areas PATH        import areas using fidonet *.NA or AREAS.BBS file from PATH
+
+import-areas args:
+  --conf CONF_TAG          specify conference tag in which to import areas
+  --network NETWORK        specify network name/key to associate FTN areas
+  --uplinks UL1,UL2,...    specify one or more comma separated uplinks
+  --type TYPE              specifies area import type. valid options are "bbs" and "na"
+```
+
+
+| Action    | Description       | Examples                              |
+|-----------|-------------------|---------------------------------------|
+| `new`     | Generates a new/initial configuration | `./oputil.js config new` (follow the prompts) |
+| `import-areas`    | Imports areas using a Fidonet style *.NA or AREAS.BBS formatted file  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
+
+When using the `import-areas` action, you will be prompted for any missing additional arguments described in "import-areas args".
+
+## File Base Management
+The `fb` command provides a powerful file base management interface.
+
+```
+usage: oputil.js fb <action> [<args>]
+
+actions:
+  scan AREA_TAG[@STORAGE_TAG]  scan specified area
+                               may also contain optional GLOB as last parameter,
+                               for examle: scan some_area *.zip
+
+  info AREA_TAG|SHA|FILE_ID    display information about areas and/or files
+                               SHA may be a full or partial SHA-256
+
+  mv SRC [SRC...] DST          move entry(s) from SRC to DST
+                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+                               DST: AREA_TAG[@STORAGE_TAG]
+
+  rm SRC [SRC...]              remove entry(s) from the system matching SRC
+                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+
+scan args:
+  --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
+
+  --desc-file [PATH]           prefer file descriptions from DESCRIPT.ION file over
+                               other sources such as FILE_ID.DIZ.
+                               if PATH is specified, use DESCRIPT.ION at PATH instead
+                               of looking in specific storage locations
+  --update                     attempt to update information for existing entries
+  --quick                      perform quick scan
+
+info args:
+  --show-desc                  display short description, if any
+
+remove args:
+  --phys-file                  also remove underlying physical file
+
+general information:
+  AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
+                               example: retro@bbs
+  
+  FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
+  SHA                          full or partial SHA-256
+  FILE_ID                      a file identifier. see file.sqlite3
+```
+
+#### Scan File Area
+The `scan` action can (re)scan a file area for new entries as well as update (`--update`) existing entry records (description, etc.). When scanning, a valid area tag must be specified. Optionally, storage tag may also be supplied in order to scan a specific filesystem location using the `@the_storage_tag` syntax. If a [GLOB](http://man7.org/linux/man-pages/man7/glob.7.html) is supplied as the last argument, only file entries with filenames matching will be processed.
+
+#### Examples
+Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extentions:
+```
+./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
+```
+
+Update all entries in the "artscene" area supplying the file tags "artscene", and "textmode".
+```
+./oputil.js fb scan --update --quick --tags artscene,textmode artscene`
+```
\ No newline at end of file

From b8ea3bbd5b8fc04852895e310ed33214bad69358 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 Aug 2018 21:58:56 -0600
Subject: [PATCH 0440/1013] Fix table when showing on GitHub...hopefully

---
 docs/admin/oputil.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index ba456025..c5a8acc7 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -23,6 +23,7 @@ commands:
 ```
 
 Commands break up operations by groups:
+
 | Command   | Description   |
 |-----------|---------------|
 | `user`    | User management   |

From 13d30827aabc12a137b1ddc901c7dd46bb4b4d05 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 14 Aug 2018 21:53:00 -0600
Subject: [PATCH 0441/1013] Allow how many to keep in DB by config
 'retainCount'

---
 core/onelinerz.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/onelinerz.js b/core/onelinerz.js
index 2d902a8e..19b9ce44 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -287,14 +287,15 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                     );
                 },
                 function removeOld(callback) {
-                    //  keep 25 max most recent items - remove the older ones
+                    //  keep 25 max most recent items by default - remove the older ones
+                    const retainCount = self.menuConfig.config.retainCount || 25;
                     self.db.run(
                         `DELETE FROM onelinerz
                         WHERE id IN (
                             SELECT id
                             FROM onelinerz
                             ORDER BY id DESC
-                            LIMIT -1 OFFSET 25
+                            LIMIT -1 OFFSET ${retainCount}
                         );`,
                         callback
                     );

From b6a1008700bc46c6d6fd843fb88986afad53e86d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Sep 2018 14:41:46 -0600
Subject: [PATCH 0442/1013] Some 'fb info' docs

---
 docs/admin/oputil.md | 52 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index c5a8acc7..8fbf0a46 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -97,7 +97,9 @@ actions:
                                may also contain optional GLOB as last parameter,
                                for examle: scan some_area *.zip
 
-  info AREA_TAG|SHA|FILE_ID    display information about areas and/or files
+  info CRITERIA                display information about areas and/or files
+                               where CRITERIA is one of the following:
+                               AREA_TAG|SHA|FILE_ID|FILENAME_WC
                                SHA may be a full or partial SHA-256
 
   mv SRC [SRC...] DST          move entry(s) from SRC to DST
@@ -135,13 +137,53 @@ general information:
 #### Scan File Area
 The `scan` action can (re)scan a file area for new entries as well as update (`--update`) existing entry records (description, etc.). When scanning, a valid area tag must be specified. Optionally, storage tag may also be supplied in order to scan a specific filesystem location using the `@the_storage_tag` syntax. If a [GLOB](http://man7.org/linux/man-pages/man7/glob.7.html) is supplied as the last argument, only file entries with filenames matching will be processed.
 
-#### Examples
+##### Examples
 Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extentions:
 ```
-./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
+$ ./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
 ```
 
 Update all entries in the "artscene" area supplying the file tags "artscene", and "textmode".
 ```
-./oputil.js fb scan --update --quick --tags artscene,textmode artscene`
-```
\ No newline at end of file
+$ ./oputil.js fb scan --update --quick --tags artscene,textmode artscene`
+```
+
+Scan "oldschoolbbs" area using the description file at "/path/to/DESCRIPT.ION":
+```
+$ ./oputil.js fb scan --desc-file /path/to/DESCRIPT.ION oldschoolbbs
+```
+
+#### Retrieve Information
+The `info` action can retrieve information about an area or file entry(s).
+
+##### Examples
+Information about a particular area:
+```
+$ ./oputil.js fb info retro_pc
+areaTag: retro_pc
+name: Retro PC
+desc: Oldschool / retro PC
+storageTag: retro_pc_tdc_1990 => /file_base/dos/tdc/1990
+storageTag: retro_pc_tdc_1991 => /file_base/dos/tdc/1991
+storageTag: retro_pc_tdc_1992 => /file_base/dos/tdc/1992
+storageTag: retro_pc_tdc_1993 => /file_base/dos/tdc/1993
+```
+
+Perhaps we want to fetch some information about a file in which we know piece of the filename:
+```
+$ ./oputil.js fb info "impulse*"
+file_id: 143
+sha_256: 547299301254ccd73eba4c0ec9cd6ab8c5929fbb655e72c4cc842f11332792d4
+area_tag: impulse_project
+storage_tag: impulse_project
+path: /file_base/impulse_project/impulseproject01.tar.gz
+hashTags: impulse.project,8bit.music,cid
+uploaded: 2018-03-10T11:36:41-07:00
+dl_count: 23
+archive_type: application/gzip
+byte_size: 114313
+est_release_year: 2015
+file_crc32: fc6655d
+file_md5: 3455f74bbbf9539e69bd38f45e039a4e
+file_sha1: 558fab3b49a8ac302486e023a3c2a86bd4e4b948
+```

From 4501759d99eb271df403327ac4d3eca6519f50a4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Sep 2018 14:42:36 -0600
Subject: [PATCH 0443/1013] Better help for 'fb info'

---
 core/oputil/oputil_help.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 6f86cdf0..4981f922 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -54,7 +54,9 @@ actions:
                                may also contain optional GLOB as last parameter,
                                for examle: scan some_area *.zip
 
-  info AREA_TAG|SHA|FILE_ID    display information about areas and/or files
+  info CRITERIA                display information about areas and/or files
+                               where CRITERIA is one of the following:
+                               AREA_TAG|SHA|FILE_ID|FILENAME_WC
                                SHA may be a full or partial SHA-256
 
   mv SRC [SRC...] DST          move entry(s) from SRC to DST

From e6055e0f11ef5ec0a9b4ce56b10f8159cd860ba4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Sep 2018 14:44:22 -0600
Subject: [PATCH 0444/1013] Better logging

---
 core/file_base_area.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 384d4e36..78450501 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -280,19 +280,17 @@ function attemptSetEstimatedReleaseDate(fileEntry) {
 }
 
 //  a simple log proxy for when we call from oputil.js
-const logDebug = (obj, msg) => {
+const maybeLog = (obj, msg, level) => {
     if(Log) {
-        Log.debug(obj, msg);
+        Log[level](obj, msg);
+    } else if ('error' === level) {
+        console.error(`${msg}: ${JSON.stringify(obj)}`);    //  eslint-disable-line no-console
     }
-}
+};
 
-const logError = (obj, msg) => {
-    if(Log) {
-        Log.error(obj, msg);
-    } else {
-        console.error(`${msg}: ${JSON.stringify(obj)}`);
-    }
-}
+const logDebug = (obj, msg) => maybeLog(obj, msg, 'debug');
+const logTrace = (obj, msg) => maybeLog(obj, msg, 'trace');
+const logError = (obj, msg) => maybeLog(obj, msg, 'error');
 
 function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
     async.waterfall(
@@ -381,7 +379,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                     //  cleanup but don't wait
                     temptmp.cleanup( paths => {
                         //  note: don't use client logger here - may not be avail
-                        logDebug( { paths : paths, sessionId : temptmp.sessionId }, 'Cleaned up temporary files' );
+                        logTrace( { paths : paths, sessionId : temptmp.sessionId }, 'Cleaned up temporary files' );
                     });
                     return callback(null);
                 });

From 9bb3557509810c9916d365f12de5493878fc0e6d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Sep 2018 20:34:39 -0600
Subject: [PATCH 0445/1013] WIP add in some basic movement MCI codes &
 color/pipe code cleanup

---
 core/client_term.js      | 12 +-----
 core/color_codes.js      | 91 +++++++---------------------------------
 core/mci_view_factory.js | 18 +++++---
 core/predefined_mci.js   | 21 +++++++---
 4 files changed, 44 insertions(+), 98 deletions(-)

diff --git a/core/client_term.js b/core/client_term.js
index eb1ee4f9..f537c359 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -3,7 +3,6 @@
 
 //  ENiGMA½
 var Log             = require('./logger.js').log;
-var enigmaToAnsi    = require('./color_codes.js').enigmaToAnsi;
 var renegadeToAnsi  = require('./color_codes.js').renegadeToAnsi;
 
 var iconv           = require('iconv-lite');
@@ -174,15 +173,8 @@ ClientTerminal.prototype.rawWrite = function(s, cb) {
     }
 };
 
-ClientTerminal.prototype.pipeWrite = function(s, spec, cb) {
-    spec = spec || 'renegade';
-
-    var conv = {
-        enigma      : enigmaToAnsi,
-        renegade    : renegadeToAnsi,
-    }[spec] || renegadeToAnsi;
-
-    this.write(conv(s, this), null, cb);    //  null = use default for |convertLineFeeds|
+ClientTerminal.prototype.pipeWrite = function(s, cb) {
+    this.write(renegadeToAnsi(s, this), null, cb);    //  null = use default for |convertLineFeeds|
 };
 
 ClientTerminal.prototype.encode = function(s, convertLineFeeds) {
diff --git a/core/color_codes.js b/core/color_codes.js
index 272b611a..31a1f983 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -1,13 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-var ansi                    = require('./ansi_term.js');
-var getPredefinedMCIValue   = require('./predefined_mci.js').getPredefinedMCIValue;
+const ANSI                      = require('./ansi_term.js');
+const { getPredefinedMCIValue } = require('./predefined_mci.js');
 
-var assert                  = require('assert');
-var _                       = require('lodash');
+//  deps
+const _                       = require('lodash');
 
-exports.enigmaToAnsi        = enigmaToAnsi;
 exports.stripPipeCodes      = exports.stripEnigmaCodes      = stripEnigmaCodes;
 exports.pipeStrLen          = exports.enigmaStrLen          = enigmaStrLen;
 exports.pipeToAnsi          = exports.renegadeToAnsi        = renegadeToAnsi;
@@ -15,70 +14,6 @@ exports.controlCodesToAnsi  = controlCodesToAnsi;
 
 //  :TODO: Not really happy with the module name of "color_codes". Would like something better
 
-
-
-
-//  Also add:
-//  * fromCelerity(): |<case sensitive letter>
-//  * fromPCBoard(): (@X<bg><fg>)
-//  * fromWildcat(): (@<bg><fg>@ (same as PCBoard without 'X' prefix and '@' suffix)
-//  * fromWWIV(): <ctrl-c><0-7>
-//  * fromSyncronet(): <ctrl-a><colorCode>
-//  See http://wiki.synchro.net/custom:colors
-
-//  :TODO: rid of enigmaToAnsi() -- never really use. Instead, create bbsToAnsi() that supports renegade, PCB, WWIV, etc...
-function enigmaToAnsi(s, client) {
-    if(-1 == s.indexOf('|')) {
-        return s;   //  no pipe codes present
-    }
-
-    var result  = '';
-    var re      = /\|([A-Z\d]{2}|\|)/g;
-    var m;
-    var lastIndex = 0;
-    while((m = re.exec(s))) {
-        var val = m[1];
-
-        if('|' == val) {
-            result += '|';
-            continue;
-        }
-
-        //  convert to number
-        val = parseInt(val, 10);
-        if(isNaN(val)) {
-            //
-            //  ENiGMA MCI code? Only available if |client|
-            //  is supplied.
-            //
-            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);  //  value itself or literal
-        }
-
-        if(_.isString(val)) {
-            result += s.substr(lastIndex, m.index - lastIndex) + val;
-        } else {
-            assert(val >= 0 && val <= 47);
-
-            var attr = '';
-            if(7 == val) {
-                attr = ansi.sgr('normal');
-            } else if (val < 7 || val >= 16) {
-                attr = ansi.sgr(['normal', val]);
-            } else if (val <= 15) {
-                attr = ansi.sgr(['normal', val - 8, 'bold']);
-            }
-
-            result += s.substr(lastIndex, m.index - lastIndex) + attr;
-        }
-
-        lastIndex = re.lastIndex;
-    }
-
-    result = (0 === result.length ? s : result + s.substr(lastIndex));
-
-    return result;
-}
-
 function stripEnigmaCodes(s) {
     return s.replace(/\|[A-Z\d]{2}/g, '');
 }
@@ -88,7 +23,7 @@ function enigmaStrLen(s) {
 }
 
 function ansiSgrFromRenegadeColorCode(cc) {
-    return ansi.sgr({
+    return ANSI.sgr({
         0   : [ 'reset', 'black' ],
         1   : [ 'reset', 'blue' ],
         2   : [ 'reset', 'green' ],
@@ -132,10 +67,11 @@ function renegadeToAnsi(s, client) {
         return s;   //  no pipe codes present
     }
 
-    var result  = '';
-    var re      = /\|([A-Z\d]{2}|\|)/g;
-    var m;
-    var lastIndex = 0;
+    let result  = '';
+    const re    = /\|([A-Z\d]{2}|\|)/g;
+    //const re    = /\|(?:(C[FBUD])([0-9]{1,2})|([A-Z\d]{2})|(\|))/g;
+    let m;
+    let lastIndex = 0;
     while((m = re.exec(s))) {
         var val = m[1];
 
@@ -192,7 +128,7 @@ function controlCodesToAnsi(s, client) {
     while((m = RE.exec(s))) {
         switch(m[0].charAt(0)) {
             case '|' :
-                //  Renegade or ENiGMA MCI
+                //  Renegade |##
                 v = parseInt(m[2], 10);
 
                 if(isNaN(v)) {
@@ -256,17 +192,18 @@ function controlCodesToAnsi(s, client) {
                     F   : [ 'bold', 'whiteBG' ],
                 }[v.charAt(1)] || [ 'normal' ];
 
-                v = ansi.sgr(fg.concat(bg));
+                v = ANSI.sgr(fg.concat(bg));
                 result += s.substr(lastIndex, m.index - lastIndex) + v;
                 break;
 
             case '\x03' :
+                //  WWIV
                 v = parseInt(m[8], 10);
 
                 if(isNaN(v)) {
                     v += m[0];
                 } else {
-                    v = ansi.sgr({
+                    v = ANSI.sgr({
                         0   : [ 'reset', 'black' ],
                         1   : [ 'bold', 'cyan' ],
                         2   : [ 'bold', 'yellow' ],
diff --git a/core/mci_view_factory.js b/core/mci_view_factory.js
index 85c440e5..037121e5 100644
--- a/core/mci_view_factory.js
+++ b/core/mci_view_factory.js
@@ -37,6 +37,10 @@ MCIViewFactory.UserViewCodes = [
     'XY',
 ];
 
+MCIViewFactory.MovementCodes = [
+    'CF', 'CB', 'CU', 'CD',
+];
+
 MCIViewFactory.prototype.createFromMCI = function(mci) {
     assert(mci.code);
     assert(mci.id > 0);
@@ -192,14 +196,16 @@ MCIViewFactory.prototype.createFromMCI = function(mci) {
             break;
 
         default :
-            options.text = getPredefinedMCIValue(this.client, mci.code);
-            if(_.isString(options.text)) {
-                setWidth(0);
+            if(!MCIViewFactory.MovementCodes.includes(mci.code)) {
+                options.text = getPredefinedMCIValue(this.client, mci.code);
+                if(_.isString(options.text)) {
+                    setWidth(0);
 
-                setOption(1,    'textStyle');
-                setOption(2,    'justify');
+                    setOption(1,    'textStyle');
+                    setOption(2,    'justify');
 
-                view = new TextView(options);
+                    view = new TextView(options);
+                }
             }
             break;
     }
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index fe8d4b43..9888ba5e 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -4,12 +4,15 @@
 //  ENiGMA½
 const Config                            = require('./config.js').get;
 const Log                               = require('./logger.js').log;
-const getMessageAreaByTag               = require('./message_area.js').getMessageAreaByTag;
-const getMessageConferenceByTag         = require('./message_area.js').getMessageConferenceByTag;
+const {
+    getMessageAreaByTag,
+    getMessageConferenceByTag
+}                                       = require('./message_area.js');
 const clientConnections                 = require('./client_connections.js');
 const StatLog                           = require('./stat_log.js');
 const FileBaseFilters                   = require('./file_base_filter.js');
-const formatByteSize                    = require('./string_util.js').formatByteSize;
+const { formatByteSize }                = require('./string_util.js');
+const ANSI                              = require('./ansi_term.js');
 
 //  deps
 const packageJson           = require('../package.json');
@@ -227,9 +230,17 @@ const PREDEFINED_MCI_GENERATORS = {
     //  Special handling for XY
     //
     XY  : function xyHack() { return; /* nothing */ },
+
+    //
+    //  Various movement by N
+    //
+    CF  : function cursorForwardBy(client, n = 1) { return ANSI.forward(n); },
+    CB  : function cursorBackBy(client, n = 1) { return ANSI.back(n); },
+    CU  : function cursorUpBy(client, n = 1) { return ANSI.up(n); },
+    CD  : function cursorDownBy(client, n = 1) { return ANSI.down(n); },
 };
 
-function getPredefinedMCIValue(client, code) {
+function getPredefinedMCIValue(client, code, extra) {
 
     if(!client || !code) {
         return;
@@ -240,7 +251,7 @@ function getPredefinedMCIValue(client, code) {
     if(generator) {
         let value;
         try {
-            value = generator(client);
+            value = generator(client, extra);
         } catch(e) {
             Log.error( { code : code, exception : e.message }, 'Exception caught generating predefined MCI value' );
         }

From 2c7354b4fa73aa64f3bb0486f6553ba14bf0acb8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Sep 2018 21:11:44 -0600
Subject: [PATCH 0446/1013] Allow movement codes in renegadeToAnsi()

---
 core/color_codes.js | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index 31a1f983..a6f7ba9d 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -68,29 +68,22 @@ function renegadeToAnsi(s, client) {
     }
 
     let result  = '';
-    const re    = /\|([A-Z\d]{2}|\|)/g;
-    //const re    = /\|(?:(C[FBUD])([0-9]{1,2})|([A-Z\d]{2})|(\|))/g;
+    const re    = /\|(?:(C[FBUD])([0-9]{1,2})|([0-9]{2})|([A-Z]{2})|(\|))/g;
     let m;
     let lastIndex = 0;
     while((m = re.exec(s))) {
-        var val = m[1];
-
-        if('|' == val) {
-            result += '|';
-            continue;
-        }
-
-        //  convert to number
-        val = parseInt(val, 10);
-        if(isNaN(val)) {
-            val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]);  //  value itself or literal
-        }
-
-        if(_.isString(val)) {
-            result += s.substr(lastIndex, m.index - lastIndex) + val;
-        } else {
+        if(m[3]) {
+            //  |## color
+            const val = parseInt(m[3], 10);
             const attr = ansiSgrFromRenegadeColorCode(val);
             result += s.substr(lastIndex, m.index - lastIndex) + attr;
+        } else if(m[4] || m[1]) {
+            //  |AA MCI code or |Cx## movement where ## is in m[1]
+            const val = getPredefinedMCIValue(client, m[4] || m[1], m[2]) || (m[0]);  //  value itself or literal
+            result += s.substr(lastIndex, m.index - lastIndex) + val;
+        } else if(m[5]) {
+            //  || -- literal '|', that is.
+            result += '|';
         }
 
         lastIndex = re.lastIndex;

From d7aabba847b257983cd3c0908afdccb903accc60 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Sep 2018 13:12:54 -0600
Subject: [PATCH 0447/1013] Add CNET style Y-Style/Q-Style color code support

---
 core/color_codes.js | 70 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index a6f7ba9d..2032f057 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -7,19 +7,19 @@ const { getPredefinedMCIValue } = require('./predefined_mci.js');
 //  deps
 const _                       = require('lodash');
 
-exports.stripPipeCodes      = exports.stripEnigmaCodes      = stripEnigmaCodes;
-exports.pipeStrLen          = exports.enigmaStrLen          = enigmaStrLen;
-exports.pipeToAnsi          = exports.renegadeToAnsi        = renegadeToAnsi;
+exports.stripMciColorCodes  = stripMciColorCodes;
+exports.pipeStringLength    = pipeStringLength;
+exports.pipeToAnsi          = exports.renegadeToAnsi = renegadeToAnsi;
 exports.controlCodesToAnsi  = controlCodesToAnsi;
 
-//  :TODO: Not really happy with the module name of "color_codes". Would like something better
+//  :TODO: Not really happy with the module name of "color_codes". Would like something better ... control_code_string?
 
-function stripEnigmaCodes(s) {
+function stripMciColorCodes(s) {
     return s.replace(/\|[A-Z\d]{2}/g, '');
 }
 
-function enigmaStrLen(s) {
-    return stripEnigmaCodes(s).length;
+function pipeStringLength(s) {
+    return stripMciColorCodes(s).length;
 }
 
 function ansiSgrFromRenegadeColorCode(cc) {
@@ -62,6 +62,37 @@ function ansiSgrFromRenegadeColorCode(cc) {
     }[cc] || 'normal');
 }
 
+function ansiSgrFromCnetStyleColorCode(cc) {
+    return ANSI.sgr({
+        c0  : [ 'reset', 'black' ],
+        c1  : [ 'reset', 'red' ],
+        c2  : [ 'reset', 'green' ],
+        c3  : [ 'reset', 'yellow' ],
+        c4  : [ 'reset', 'blue' ],
+        c5  : [ 'reset', 'magenta' ],
+        c6  : [ 'reset', 'cyan' ],
+        c7  : [ 'reset', 'white' ],
+
+        c8  : [ 'bold', 'black' ],
+        c9  : [ 'bold', 'red' ],
+        ca  : [ 'bold', 'green' ],
+        cb  : [ 'bold', 'yellow' ],
+        cc  : [ 'bold', 'blue' ],
+        cd  : [ 'bold', 'magenta' ],
+        ce  : [ 'bold', 'cyan' ],
+        cf  : [ 'bold', 'white' ],
+
+        z0  : [ 'blackBG' ],
+        z1  : [ 'redBG' ],
+        z2  : [ 'greenBG' ],
+        z3  : [ 'yellowBG' ],
+        z4  : [ 'blueBG' ],
+        z5  : [ 'magentaBG' ],
+        z6  : [ 'cyanBG' ],
+        z7  : [ 'whiteBG' ],
+    }[cc] || 'normal');
+}
+
 function renegadeToAnsi(s, client) {
     if(-1 == s.indexOf('|')) {
         return s;   //  no pipe codes present
@@ -98,10 +129,12 @@ function renegadeToAnsi(s, client) {
 //  MCI codes.
 //
 //  Supported control code formats:
-//  * Renegade  : |##
-//  * PCBoard   : @X## where the first number/char is FG color, and second is BG
-//  * WildCat!  : @##@ the same as PCBoard without the X prefix, but with a @ suffix
-//  * WWIV      : ^#
+//  * Renegade      : |##
+//  * PCBoard       : @X## where the first number/char is FG color, and second is BG
+//  * WildCat!      : @##@ the same as PCBoard without the X prefix, but with a @ suffix
+//  * WWIV          : ^#
+//  * CNET Y-Style  : 0x19## where ## is a specific set of codes -- this is the older format
+//  * CNET Q-style  : 0x11##} where ## is a specific set of codes -- this is the newer format
 //
 //  TODO: Add Synchronet and Celerity format support
 //
@@ -109,7 +142,7 @@ function renegadeToAnsi(s, client) {
 //  * http://wiki.synchro.net/custom:colors
 //
 function controlCodesToAnsi(s, client) {
-    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)/g;    //  eslint-disable-line no-control-regex
+    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)|(\x19(c[0-9a-f]|z[0-7]|n1|f1)|\x19)|(\x11(c[0-9a-f]|z[0-7]|n1|f1)}|\x11)/g;    //  eslint-disable-line no-control-regex
 
     let m;
     let result      = '';
@@ -213,6 +246,19 @@ function controlCodesToAnsi(s, client) {
                 result += s.substr(lastIndex, m.index - lastIndex) + v;
 
                 break;
+
+            case '\x19'     :
+            case '\0x11'    :
+                //  CNET "Y-Style" & "Q-Style"
+                v = m[9] || m[11];
+                if('n1' === v) {
+                    result += '\n';
+                } else if('f1' === v) {
+                    result += ANSI.clearScreen();
+                } else {
+                    result += ansiSgrFromCnetStyleColorCode(v);
+                }
+                break;
         }
 
         lastIndex = RE.lastIndex;

From 63b5eed504d1b643a0b987ab3c72f68c66cb40b9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 15:01:27 -0700
Subject: [PATCH 0448/1013] Minor updates to FileEntry / oputil

---
 core/file_entry.js              | 25 ++++++++++++++++++++++++-
 core/oputil/oputil_file_base.js |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index 0f519e10..bb7a4e12 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -369,7 +369,7 @@ module.exports = class FileEntry {
         return Object.keys(FILE_WELL_KNOWN_META);
     }
 
-    static findFileBySha(sha, cb) {
+    static findBySha(sha, cb) {
         //  full or partial SHA-256
         fileDb.all(
             `SELECT file_id
@@ -397,6 +397,29 @@ module.exports = class FileEntry {
         );
     }
 
+    //  Attempt to fine a file by an *existing* full path.
+    //  Checkums may have changed and are not validated here.
+    static findByFullPath(fullPath, cb) {
+        //  first, basic by-filename lookup.
+        FileEntry.findByFileNameWildcard(paths.basename(fuillPath), (err, entries) => {
+            if(err) {
+                return cb(err);
+            }
+            if(!entries || !entries.length || entries.length > 1) {
+                return cb(Errors.DoesNotExist('No matches'));
+            }
+
+            //  ensure the *full* path has not changed
+            //  :TODO: if FS is case-insensitive, we probably want a better check here
+            const possibleMatch = entries[0];
+            if(possibleMatch.fullPath === fullPath) {
+                return cb(null, possibleMatch);
+            }
+
+            return cb(Errors.DoesNotExist('No matches'));
+        });
+    }
+
     static findByFileNameWildcard(wc, cb) {
         //  convert any * -> % and ? -> _ for SQLite syntax - see https://www.sqlite.org/lang_expr.html
         wc = wc.replace(/\*/g, '%').replace(/\?/g, '_');
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 8568372c..9dfcdeca 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -319,7 +319,7 @@ function getFileEntries(pattern, cb) {
                     return callback(null, entries);	//	already got it by FILE_ID
                 }
 
-                FileEntry.findFileBySha(pattern, (err, fileEntry) => {
+                FileEntry.findBySha(pattern, (err, fileEntry) => {
                     return callback(null, fileEntry ? [ fileEntry ] : null );
                 });
             },

From 92a7007e9c89cfca7001ee743a4d614b3c97feaf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 16:12:21 -0700
Subject: [PATCH 0449/1013] Documentation updates around MCI movement

---
 WHATSNEW.md     |  1 +
 docs/art/mci.md | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 5e92784e..b157a927 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -18,6 +18,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * `{userName}` (sanatized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
 * Any module may now register for a system startup intiialization via the `initializeModules(initInfo, cb)` export.
 * User event log is now functional. Various events a user performs will be persisted to the `system.db` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
+* New MCI codes including general purpose movement codes. See [MCI codes](docs/art/mci.md)
 
 
 ## 0.0.8-alpha
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 1bad97d5..f5876105 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -11,8 +11,7 @@ are set by placing duplicate codes back to back in art files.
 ## Predefined MCI Codes
 There are many predefined MCI codes that can be used anywhere on the system (placed in any art file). More are added all 
 the time so also check out [core/predefined_mci.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) 
-for a full listing. Many codes attempt to pay homage to Oblivion/2, 
-iNiQUiTY, etc.
+for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, etc.
 
 | Code | Description  |
 |------|--------------|
@@ -72,7 +71,14 @@ iNiQUiTY, etc.
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
 
-A special `XY` MCI code may also be utilized for placement identification when creating menus or to extend an otherwise empty space in an art file down the screen.
+Some additional special case codes also exist:
+| Code   | Description  |
+|--------|--------------|
+| `CF##` | Moves the cursor position forward _##_ characters |
+| `CB##` | Moves the cursor position back _##_ characters |
+| `CU##` | Moves the cursor position up _##_ characters |
+| `CD##` | Moves the cursor position down _##_ characters |
+| `XY`   | A special code that may be utilized for placement identification when creating menus or to extend an otherwise empty space in an art file down the screen.
 
 
 ## Views

From 206312302ae4885ff5d6eb09b46e5a636f83348e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 18:34:54 -0700
Subject: [PATCH 0450/1013] Fix generated logging level

---
 core/oputil/oputil_config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index d28c977f..65ede6bd 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -222,7 +222,9 @@ function askNewConfigQuestions(cb) {
                     }
 
                     config.logging = {
-                        level : answers.loggingLevel,
+                        rotatingFile : {
+                            level : answers.loggingLevel,
+                        }
                     };
 
                     callback(null);

From 25560cb47a9f7d015465414e8dfafe5aa9fc4939 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 19:29:51 -0700
Subject: [PATCH 0451/1013] SyncTERM SSH support + Enabled all ssh2-streams
 supported KEX, ciphers, etc. for now. Will communicate with Deuce about this.

---
 core/config.js            | 51 +++++++++++++++++++++++++++++++++++++++
 core/servers/login/ssh.js |  3 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 3d7c6d70..02b34911 100644
--- a/core/config.js
+++ b/core/config.js
@@ -242,6 +242,57 @@ function getDefaultConfig() {
                 privateKeyPem       : paths.join(__dirname, './../config/ssh_private_key.pem'),
                 firstMenu           : 'sshConnected',
                 firstMenuNewUser    : 'sshConnectedNewUser',
+
+                //
+                //  SSH details that can affect security. Stronger ciphers are better for example,
+                //  but terminals such as SyncTERM require KEX diffie-hellman-group14-sha1,
+                //  cipher 3des-cbc, etc.
+                //
+                //  See https://github.com/mscdex/ssh2-streams for the full list of supported
+                //  algorithms.
+                //
+                algorithms : {
+                    kex : [
+                        'ecdh-sha2-nistp256',
+                        'ecdh-sha2-nistp384',
+                        'ecdh-sha2-nistp521',
+                        'diffie-hellman-group-exchange-sha256',
+                        'diffie-hellman-group14-sha1',
+                        'diffie-hellman-group-exchange-sha1',
+                        'diffie-hellman-group1-sha1',
+                    ],
+                    cipher : [
+                        'aes128-ctr',
+                        'aes192-ctr',
+                        'aes256-ctr',
+                        'aes128-gcm',
+                        'aes128-gcm@openssh.com',
+                        'aes256-gcm',
+                        'aes256-gcm@openssh.com',
+                        'aes256-cbc',
+                        'aes192-cbc',
+                        'aes128-cbc',
+                        'blowfish-cbc',
+                        '3des-cbc',
+                        'arcfour256',
+                        'arcfour128',
+                        'cast128-cbc',
+                        'arcfour',
+                    ],
+                    hmac : [
+                        'hmac-sha2-256',
+                        'hmac-sha2-512',
+                        'hmac-sha1',
+                        'hmac-md5',
+                        'hmac-sha2-256-96',
+                        'hmac-sha2-512-96',
+                        'hmac-ripemd160',
+                        'hmac-sha1-96',
+                        'hmac-md5-96',
+                    ],
+                    //  note that we disable compression by default due to issues with many clients. YMMV.
+                    compress : [ 'none' ]
+                },
             },
             webSocket : {
                 ws : {
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 016c215e..f9186cf9 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -251,12 +251,13 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
             ident : 'enigma-bbs-' + enigVersion + '-srv',
 
             //  Note that sending 'banner' breaks at least EtherTerm!
+
             debug : (sshDebugLine) => {
                 if(true === config.loginServers.ssh.traceConnections) {
                     Log.trace(`SSH: ${sshDebugLine}`);
                 }
             },
-            algorithms: { compress: ['none'] },
+            algorithms : config.loginServers.ssh.algorithms,
         };
 
         this.server = ssh2.Server(serverConf);

From 87ac0b0f129c69d30d72d87b169f7e2558cae669 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 20:14:54 -0700
Subject: [PATCH 0452/1013] Notes on algorithms

---
 docs/servers/ssh.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
index 676afb51..51471e28 100644
--- a/docs/servers/ssh.md
+++ b/docs/servers/ssh.md
@@ -16,10 +16,10 @@ You then need to enable the SSH server in your `config.hjson`:
 {
 	loginServers: {
 		ssh: {
-                    enabled: true
+            enabled: true
 		    port: 8889
 		    privateKeyPem: /path/to/ssh_private_key.pem
-                    privateKeyPass: YOUR_PK_PASS
+            privateKeyPass: YOUR_PK_PASS
         }                                                             
     }
 }
@@ -29,9 +29,11 @@ You then need to enable the SSH server in your `config.hjson`:
 
 | Option              | Description
 |---------------------|--------------------------------------------------------------------------------------|
-| `privateKeyPem`	  | Path to private key file
-| `privateKeyPass`    | Password to private key file
-| `firstMenu`		  | First menu an SSH connected user is presented with
-| `firstMenuNewUser`  | Menu presented to user when logging in with `users::newUserNames` in your config.hjson (defaults to `new` and `apply`)
-| `enabled`           | Enable/disable SSH server
-| `port`              | Configure a custom port for the SSH server
+| `privateKeyPem`	  | Path to private key file.
+| `privateKeyPass`    | Password to private key file.
+| `firstMenu`		  | First menu an SSH connected user is presented with.
+| `firstMenuNewUser`  | Menu presented to user when logging in with `users::newUserNames` in your config.hjson (defaults to `new` and `apply`).
+| `enabled`           | Enable/disable SSH server.
+| `port`              | Configure a custom port for the SSH server.
+| `algorithms`        | Configuration block for SSH algoritms. Includes arrays with keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config.js`.
+| `traceConnections`  | Set to `true` to enable full trace-level information on SSH connections.

From 46e14685fa1c21cb8e07877da39ccacf882dc63b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 20:15:13 -0700
Subject: [PATCH 0453/1013] Dep. upgrades

---
 package-lock.json | 2281 +++++++++++++++++++++------------------------
 package.json      |   12 +-
 2 files changed, 1073 insertions(+), 1220 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0ba359d..ae264090 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,22 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
     "ansi-escapes": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
@@ -19,7 +35,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
-        "color-convert": "1.9.1"
+        "color-convert": "^1.9.0"
       }
     },
     "anymatch": {
@@ -27,8 +43,22 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "requires": {
-        "micromatch": "3.1.10",
-        "normalize-path": "2.1.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       }
     },
     "arr-diff": {
@@ -51,7 +81,7 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -74,6 +104,11 @@
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -84,7 +119,7 @@
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
       "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "^4.17.10"
       }
     },
     "async-limiter": {
@@ -92,10 +127,25 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
     "atob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
-      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -107,13 +157,13 @@
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "requires": {
-        "cache-base": "1.0.1",
-        "class-utils": "0.3.6",
-        "component-emitter": "1.2.1",
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "mixin-deep": "1.3.1",
-        "pascalcase": "0.1.1"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -121,7 +171,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -129,7 +179,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -137,7 +187,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -145,13 +195,21 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
     },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
     "binary-parser": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/binary-parser/-/binary-parser-1.3.2.tgz",
@@ -162,7 +220,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -171,16 +229,16 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "arr-flatten": "1.1.0",
-        "array-unique": "0.3.2",
-        "extend-shallow": "2.0.1",
-        "fill-range": "4.0.0",
-        "isobject": "3.0.1",
-        "repeat-element": "1.1.2",
-        "snapdragon": "0.8.2",
-        "snapdragon-node": "2.1.1",
-        "split-string": "3.1.0",
-        "to-regex": "3.0.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -188,7 +246,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -198,7 +256,7 @@
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
       "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
       "requires": {
-        "node-int64": "0.4.0"
+        "node-int64": "^0.4.0"
       }
     },
     "buffer-crc32": {
@@ -211,10 +269,10 @@
       "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
       "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
       "requires": {
-        "dtrace-provider": "0.8.6",
-        "moment": "2.22.2",
-        "mv": "2.1.1",
-        "safe-json-stringify": "1.1.0"
+        "dtrace-provider": "~0.8",
+        "moment": "^2.10.6",
+        "mv": "~2",
+        "safe-json-stringify": "~1"
       }
     },
     "cache-base": {
@@ -222,15 +280,15 @@
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "requires": {
-        "collection-visit": "1.0.0",
-        "component-emitter": "1.2.1",
-        "get-value": "2.0.6",
-        "has-value": "1.0.0",
-        "isobject": "3.0.1",
-        "set-value": "2.0.0",
-        "to-object-path": "0.3.0",
-        "union-value": "1.0.0",
-        "unset-value": "1.0.0"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
     "capture-exit": {
@@ -238,28 +296,38 @@
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
       "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
       "requires": {
-        "rsvp": "3.6.2"
+        "rsvp": "^3.3.3"
       }
     },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
     "chalk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "requires": {
-        "ansi-styles": "3.2.1",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.4.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "requires": {
-        "arr-union": "3.1.0",
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "static-extend": "0.1.2"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -267,7 +335,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -277,7 +345,7 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "requires": {
-        "restore-cursor": "2.0.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-width": {
@@ -285,13 +353,23 @@
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
     },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "requires": {
-        "map-visit": "1.0.0",
-        "object-visit": "1.0.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
     "color-convert": {
@@ -299,7 +377,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.1.1"
       }
     },
     "color-name": {
@@ -307,6 +385,14 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
     "component-emitter": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -317,11 +403,41 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -335,13 +451,18 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "requires": {
-        "is-descriptor": "1.0.2",
-        "isobject": "3.0.1"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -349,7 +470,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -357,7 +478,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -365,9 +486,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -377,22 +498,54 @@
       "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
       "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.1",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.4.5"
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+    },
     "dtrace-provider": {
       "version": "0.8.6",
       "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz",
       "integrity": "sha1-QooiOv4DQl0s1tY0f99AxmkDVj0=",
       "optional": true,
       "requires": {
-        "nan": "2.10.0"
+        "nan": "^2.3.3"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "requires": {
+        "once": "^1.4.0"
       }
     },
     "escape-string-regexp": {
@@ -401,11 +554,22 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "exec-sh": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
-      "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
+      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "requires": {
-        "merge": "1.2.0"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "exiftool": {
@@ -418,13 +582,13 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "requires": {
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -432,7 +596,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -440,18 +604,23 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
     },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -459,7 +628,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -469,14 +638,14 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
-        "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "expand-brackets": "2.1.4",
-        "extend-shallow": "2.0.1",
-        "fragment-cache": "0.2.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -484,7 +653,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "extend-shallow": {
@@ -492,7 +661,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "is-accessor-descriptor": {
@@ -500,7 +669,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -508,7 +677,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -516,19 +685,34 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
     },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "fb-watchman": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
       "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
       "requires": {
-        "bser": "2.0.0"
+        "bser": "^2.0.0"
       }
     },
     "figures": {
@@ -536,7 +720,7 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5"
       }
     },
     "fill-range": {
@@ -544,10 +728,10 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1",
-        "to-regex-range": "2.1.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -555,7 +739,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -565,22 +749,45 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "requires": {
-        "map-cache": "0.2.2"
+        "map-cache": "^0.2.2"
       }
     },
     "fs-extra": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+      "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
       "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.1"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs-minipass": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "requires": {
+        "minipass": "^2.2.1"
       }
     },
     "fs.realpath": {
@@ -588,484 +795,86 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz",
-      "integrity": "sha512-X+57O5YkDTiEQGiw8i7wYc2nQgweIekqkepI8Q3y4wVlurgBt2SuwxTeYUYMZIGpLZH3r/TsMjczCMXE5ZOt7Q==",
-      "optional": true,
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
-        "nan": "2.10.0",
-        "node-pre-gyp": "0.9.1"
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true
-        },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "2.2.4"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.21",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": "2.1.2"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true
-        },
-        "minipass": {
-          "version": "2.2.4",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
-          }
-        },
-        "minizlib": {
-          "version": "1.1.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "2.2.4"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.2.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.9",
-            "iconv-lite": "0.4.21",
-            "sax": "1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.9.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.2.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.1.10",
-            "npmlog": "4.1.2",
-            "rc": "1.2.6",
-            "rimraf": "2.6.2",
-            "semver": "5.5.0",
-            "tar": "4.4.1"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.3",
-          "bundled": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.1.10",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.3"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.5.0",
-          "bundled": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "optional": true
-        },
         "string-width": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "chownr": "1.0.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.2.4",
-            "minizlib": "1.1.0",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "yallist": {
-          "version": "3.0.2",
-          "bundled": true
         }
       }
     },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "globby": {
@@ -1073,32 +882,51 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
       "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
+      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "har-schema": "^2.0.0"
+      }
     },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "requires": {
-        "get-value": "2.0.6",
-        "has-values": "1.0.0",
-        "isobject": "3.0.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
     "has-values": {
@@ -1106,8 +934,8 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -1115,7 +943,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -1130,12 +958,30 @@
       "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.1.1.tgz",
       "integrity": "sha512-1oGkOq4sssz7HFZ8Is9HuTR47r8gSC46qAzQxVlAkj0lNKpS+W5Lv2eci+c5+fFqL+Idtj5EvprFreUwH29a8A=="
     },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
     "iconv-lite": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore-walk": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+      "requires": {
+        "minimatch": "^3.0.4"
       }
     },
     "inflight": {
@@ -1143,8 +989,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -1152,24 +998,29 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
     "inquirer": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz",
       "integrity": "sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==",
       "requires": {
-        "ansi-escapes": "3.1.0",
-        "chalk": "2.4.1",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "3.0.0",
-        "figures": "2.0.0",
-        "lodash": "4.17.10",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
         "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rxjs": "6.2.0",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
+        "run-async": "^2.2.0",
+        "rxjs": "^6.1.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
       },
       "dependencies": {
         "chardet": {
@@ -1182,9 +1033,9 @@
           "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz",
           "integrity": "sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==",
           "requires": {
-            "chardet": "0.5.0",
-            "iconv-lite": "0.4.23",
-            "tmp": "0.0.33"
+            "chardet": "^0.5.0",
+            "iconv-lite": "^0.4.22",
+            "tmp": "^0.0.33"
           }
         },
         "rxjs": {
@@ -1192,7 +1043,7 @@
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz",
           "integrity": "sha512-qBzf5uu6eOKiCZuAE0SgZ0/Qp+l54oeVxFfC2t+mJ2SFI6IB8gmMdJHs5DUMu5kqifqcCtsKS2XHjhZu6RKvAw==",
           "requires": {
-            "tslib": "1.9.2"
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -1202,7 +1053,7 @@
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -1210,7 +1061,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -1225,7 +1076,7 @@
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -1233,7 +1084,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -1243,9 +1094,9 @@
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -1270,7 +1121,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -1278,26 +1129,11 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "is-odd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
-      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
-      "requires": {
-        "is-number": "4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
-        }
-      }
-    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -1308,7 +1144,7 @@
       "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "requires": {
-        "is-path-inside": "1.0.1"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
@@ -1316,7 +1152,7 @@
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-plain-object": {
@@ -1324,7 +1160,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "is-promise": {
@@ -1332,6 +1168,16 @@
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -1342,17 +1188,58 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
       }
     },
     "kind-of": {
@@ -1375,7 +1262,7 @@
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
       "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
       "requires": {
-        "tmpl": "1.0.4"
+        "tmpl": "1.0.x"
       }
     },
     "map-cache": {
@@ -1388,45 +1275,45 @@
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "requires": {
-        "object-visit": "1.0.1"
+        "object-visit": "^1.0.0"
       }
     },
     "merge": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
     },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "braces": "2.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "extglob": "2.0.4",
-        "fragment-cache": "0.2.1",
-        "kind-of": "6.0.2",
-        "nanomatch": "1.2.9",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       }
     },
     "mime-db": {
-      "version": "1.33.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
     },
     "mime-types": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "version": "2.1.21",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
+      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
       "requires": {
-        "mime-db": "1.33.0"
+        "mime-db": "~1.37.0"
       }
     },
     "mimic-fn": {
@@ -1439,7 +1326,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "1.1.11"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -1447,13 +1334,30 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
+    "minipass": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz",
+      "integrity": "sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==",
+      "requires": {
+        "minipass": "^2.2.1"
+      }
+    },
     "mixin-deep": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "requires": {
-        "for-in": "1.0.2",
-        "is-extendable": "1.0.1"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -1461,7 +1365,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -1470,7 +1374,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "optional": true,
       "requires": {
         "minimist": "0.0.8"
       },
@@ -1478,8 +1381,7 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "optional": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
       }
     },
@@ -1504,9 +1406,9 @@
       "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
       "optional": true,
       "requires": {
-        "mkdirp": "0.5.1",
-        "ncp": "2.0.0",
-        "rimraf": "2.4.5"
+        "mkdirp": "~0.5.1",
+        "ncp": "~2.0.0",
+        "rimraf": "~2.4.0"
       }
     },
     "nan": {
@@ -1515,22 +1417,21 @@
       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
     },
     "nanomatch": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
-      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-odd": "2.0.0",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.2",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
     "ncp": {
@@ -1539,17 +1440,59 @@
       "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
       "optional": true
     },
+    "needle": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+      "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
+      "requires": {
+        "debug": "^2.1.2",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      }
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
+    "node-pre-gyp": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+      "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "needle": "^2.2.1",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        }
+      }
+    },
     "node-pty": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.7.4.tgz",
       "integrity": "sha512-WxMY1BsGcHJ2Z2qWpYL7QbfOSnkkCzV0H/9+dJ7uQEIJyz0A4fVBLymswBCTc7RoweY5ingib2gNvf87KvJxuA==",
       "requires": {
-        "nan": "2.10.0"
+        "nan": "^2.6.2"
       }
     },
     "nodemailer": {
@@ -1557,14 +1500,66 @@
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.5.tgz",
       "integrity": "sha512-+bt+BgmnOXDz1uIaWXfXuTESth8UHkhtu7+X8+X2W+CHAn0AuuCyCk854qnathYQLWEC2jkpx7/pkVHcfmLKDw=="
     },
+    "nopt": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+      "requires": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      }
+    },
     "normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
+    "npm-bundled": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+      "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="
+    },
+    "npm-packlist": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
+      "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -1575,9 +1570,9 @@
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "requires": {
-        "copy-descriptor": "0.1.1",
-        "define-property": "0.2.5",
-        "kind-of": "3.2.2"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
         "define-property": {
@@ -1585,7 +1580,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "kind-of": {
@@ -1593,7 +1588,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -1603,7 +1598,7 @@
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.0"
       }
     },
     "object.pick": {
@@ -1611,7 +1606,7 @@
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "once": {
@@ -1619,7 +1614,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -1627,14 +1622,33 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "requires": {
-        "mimic-fn": "1.2.0"
+        "mimic-fn": "^1.0.0"
       }
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -1650,6 +1664,16 @@
       "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
       "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
     },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -1665,7 +1689,7 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "posix-character-classes": {
@@ -1673,13 +1697,67 @@
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "psl": {
+      "version": "1.1.29",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "requires": {
-        "extend-shallow": "3.0.2",
-        "safe-regex": "1.1.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "remove-trailing-separator": {
@@ -1688,15 +1766,49 @@
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
     },
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
+      }
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -1707,8 +1819,8 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "ret": {
@@ -1721,7 +1833,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
       "requires": {
-        "glob": "6.0.4"
+        "glob": "^6.0.1"
       },
       "dependencies": {
         "glob": {
@@ -1729,11 +1841,11 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -1753,9 +1865,14 @@
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       }
     },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "safe-json-stringify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz",
@@ -1764,10 +1881,10 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "requires": {
-        "ret": "0.1.15"
+        "ret": "~0.1.10"
       }
     },
     "safer-buffer": {
@@ -1776,19 +1893,19 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sane": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
-      "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.0.2.tgz",
+      "integrity": "sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==",
       "requires": {
-        "anymatch": "2.0.0",
-        "capture-exit": "1.2.0",
-        "exec-sh": "0.2.1",
-        "fb-watchman": "2.0.0",
-        "fsevents": "1.2.3",
-        "micromatch": "3.1.10",
-        "minimist": "1.2.0",
-        "walker": "1.0.7",
-        "watch": "0.18.0"
+        "anymatch": "^2.0.0",
+        "capture-exit": "^1.2.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5",
+        "watch": "~0.18.0"
       }
     },
     "sanitize-filename": {
@@ -1796,23 +1913,33 @@
       "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
       "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
       "requires": {
-        "truncate-utf8-bytes": "1.0.2"
+        "truncate-utf8-bytes": "^1.0.0"
       }
     },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
     "set-value": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-extendable": "0.1.1",
-        "is-plain-object": "2.0.4",
-        "split-string": "3.1.0"
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -1820,11 +1947,24 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
     },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -1835,14 +1975,14 @@
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "requires": {
-        "base": "0.11.2",
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "map-cache": "0.2.2",
-        "source-map": "0.5.7",
-        "source-map-resolve": "0.5.1",
-        "use": "3.1.0"
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -1850,7 +1990,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -1858,7 +1998,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -1868,9 +2008,9 @@
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "requires": {
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "snapdragon-util": "3.0.1"
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -1878,7 +2018,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -1886,7 +2026,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -1894,7 +2034,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -1902,9 +2042,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -1914,7 +2054,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.2.0"
       },
       "dependencies": {
         "kind-of": {
@@ -1922,7 +2062,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -1933,15 +2073,15 @@
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "source-map-resolve": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz",
-      "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "requires": {
-        "atob": "2.1.1",
-        "decode-uri-component": "0.2.0",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.4.0",
-        "urix": "0.1.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-url": {
@@ -1954,417 +2094,17 @@
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
-        "extend-shallow": "3.0.2"
+        "extend-shallow": "^3.0.0"
       }
     },
     "sqlite3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.0.tgz",
-      "integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.3.tgz",
+      "integrity": "sha512-nuWqc26oiJZXyY5MEz+rQbiki1BTibnXsy8Kqo7QD/ut6eksOWi6uWwFMbdnFNME7CZyplWdDXj2fbdQVaEfuA==",
       "requires": {
-        "nan": "2.9.2",
-        "node-pre-gyp": "0.9.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.5"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "bundled": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "requires": {
-            "minipass": "2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "iconv-lite": {
-          "version": "0.4.19",
-          "bundled": true
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "minimatch": "3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true
-        },
-        "minipass": {
-          "version": "2.2.1",
-          "bundled": true,
-          "requires": {
-            "yallist": "3.0.2"
-          }
-        },
-        "minizlib": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "minipass": "2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "nan": {
-          "version": "2.9.2",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
-          "integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw=="
-        },
-        "needle": {
-          "version": "2.2.0",
-          "bundled": true,
-          "requires": {
-            "debug": "2.6.9",
-            "iconv-lite": "0.4.19",
-            "sax": "1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.9.0",
-          "bundled": true,
-          "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.2.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.1.10",
-            "npmlog": "4.1.2",
-            "rc": "1.2.6",
-            "rimraf": "2.6.2",
-            "semver": "5.5.0",
-            "tar": "4.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "npm-packlist": {
-          "version": "1.1.10",
-          "bundled": true,
-          "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.3"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "rc": {
-          "version": "1.2.6",
-          "bundled": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.5",
-          "bundled": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "bundled": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "bundled": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true
-        },
-        "semver": {
-          "version": "5.5.0",
-          "bundled": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "tar": {
-          "version": "4.4.0",
-          "bundled": true,
-          "requires": {
-            "chownr": "1.0.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.2.1",
-            "minizlib": "1.1.0",
-            "mkdirp": "0.5.1",
-            "yallist": "3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "yallist": {
-          "version": "3.0.2",
-          "bundled": true
-        }
+        "nan": "~2.10.0",
+        "node-pre-gyp": "^0.10.3",
+        "request": "^2.87.0"
       }
     },
     "sqlite3-trans": {
@@ -2372,7 +2112,7 @@
       "resolved": "https://registry.npmjs.org/sqlite3-trans/-/sqlite3-trans-1.2.0.tgz",
       "integrity": "sha1-E8/K2wk+1I5m+U7IlWq3RU3clgg=",
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "^4.17.4"
       }
     },
     "ssh2": {
@@ -2380,7 +2120,7 @@
       "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.6.1.tgz",
       "integrity": "sha512-fNvocq+xetsaAZtBG/9Vhh0GDjw1jQeW7Uq/DPh4fVrJd0XxSfXAqBjOGVk4o2jyWHvyC6HiaPFpfHlR12coDw==",
       "requires": {
-        "ssh2-streams": "0.2.1"
+        "ssh2-streams": "~0.2.0"
       },
       "dependencies": {
         "ssh2-streams": {
@@ -2388,20 +2128,36 @@
           "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.2.1.tgz",
           "integrity": "sha512-3zCOsmunh1JWgPshfhKmBCL3lUtHPoh+a/cyQ49Ft0Q0aF7xgN06b76L+oKtFi0fgO57FLjFztb1GlJcEZ4a3Q==",
           "requires": {
-            "asn1": "0.2.3",
-            "semver": "5.5.0",
-            "streamsearch": "0.1.2"
+            "asn1": "~0.2.0",
+            "semver": "^5.1.0",
+            "streamsearch": "~0.1.2"
           }
         }
       }
     },
+    "sshpk": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
+      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "requires": {
-        "define-property": "0.2.5",
-        "object-copy": "0.1.0"
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -2409,7 +2165,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -2424,8 +2180,16 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "is-fullwidth-code-point": "2.0.0",
-        "strip-ansi": "4.0.0"
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
       }
     },
     "strip-ansi": {
@@ -2433,15 +2197,39 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
       "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
       "requires": {
-        "ansi-regex": "3.0.0"
+        "ansi-regex": "^3.0.0"
       }
     },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
     "supports-color": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
       "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "requires": {
-        "has-flag": "3.0.0"
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tar": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz",
+      "integrity": "sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==",
+      "requires": {
+        "chownr": "^1.0.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.3.3",
+        "minizlib": "^1.1.0",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.2"
       }
     },
     "temptmp": {
@@ -2449,7 +2237,7 @@
       "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.0.0.tgz",
       "integrity": "sha1-M7Djbh8nMXyKKBIO6Wufj+tw2UM=",
       "requires": {
-        "del": "2.2.2"
+        "del": "^2.2.2"
       }
     },
     "through": {
@@ -2462,7 +2250,7 @@
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.2"
       }
     },
     "tmpl": {
@@ -2475,7 +2263,7 @@
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -2483,7 +2271,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -2493,10 +2281,10 @@
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "requires": {
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "regex-not": "1.0.2",
-        "safe-regex": "1.1.0"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "to-regex-range": {
@@ -2504,8 +2292,17 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "requires": {
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
       }
     },
     "truncate-utf8-bytes": {
@@ -2513,7 +2310,7 @@
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
       "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
       "requires": {
-        "utf8-byte-length": "1.0.4"
+        "utf8-byte-length": "^1.0.1"
       }
     },
     "tslib": {
@@ -2521,15 +2318,28 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz",
       "integrity": "sha512-AVP5Xol3WivEr7hnssHDsaM+lVrVXWUvd1cfXTRkTj80b//6g2wIFEH6hZG0muGZRnHGrfttpdzRk3YlBkWjKw=="
     },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "requires": {
-        "arr-union": "3.1.0",
-        "get-value": "2.0.6",
-        "is-extendable": "0.1.1",
-        "set-value": "0.4.3"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2537,7 +2347,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "set-value": {
@@ -2545,26 +2355,26 @@
           "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "requires": {
-            "extend-shallow": "2.0.1",
-            "is-extendable": "0.1.1",
-            "is-plain-object": "2.0.4",
-            "to-object-path": "0.3.0"
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
           }
         }
       }
     },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "requires": {
-        "has-value": "0.3.1",
-        "isobject": "3.0.1"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
         "has-value": {
@@ -2572,9 +2382,9 @@
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "requires": {
-            "get-value": "2.0.6",
-            "has-values": "0.1.4",
-            "isobject": "2.1.0"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
           },
           "dependencies": {
             "isobject": {
@@ -2600,18 +2410,20 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "use": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
-      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
-      "requires": {
-        "kind-of": "6.0.2"
-      }
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
       "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
     },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
     "uuid": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
@@ -2622,12 +2434,22 @@
       "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.0.0.tgz",
       "integrity": "sha1-9GV3F2JLDkuIrzb5jYlYmlu+5Wk="
     },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
     "walker": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
       "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
       "requires": {
-        "makeerror": "1.0.11"
+        "makeerror": "1.0.x"
       }
     },
     "watch": {
@@ -2635,8 +2457,34 @@
       "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
       "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
       "requires": {
-        "exec-sh": "0.2.1",
-        "minimist": "1.2.0"
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "exec-sh": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+          "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+          "requires": {
+            "merge": "^1.2.0"
+          }
+        }
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "requires": {
+        "string-width": "^1.0.2 || 2"
       }
     },
     "wrappy": {
@@ -2645,11 +2493,11 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz",
-      "integrity": "sha512-c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz",
+      "integrity": "sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==",
       "requires": {
-        "async-limiter": "1.0.0"
+        "async-limiter": "~1.0.0"
       }
     },
     "xxhash": {
@@ -2657,15 +2505,20 @@
       "resolved": "https://registry.npmjs.org/xxhash/-/xxhash-0.2.4.tgz",
       "integrity": "sha1-i4pIFiz8zCG5IPpQAmEYfUAhbDk=",
       "requires": {
-        "nan": "2.10.0"
+        "nan": "^2.4.0"
       }
     },
+    "yallist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+      "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
+    },
     "yazl": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
       "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
       "requires": {
-        "buffer-crc32": "0.2.13"
+        "buffer-crc32": "~0.2.3"
       }
     }
   }
diff --git a/package.json b/package.json
index 8b6cf110..0d4e4a9f 100644
--- a/package.json
+++ b/package.json
@@ -27,30 +27,30 @@
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^7.0.0",
     "glob": "^7.1.2",
-    "graceful-fs": "^4.1.11",
+    "graceful-fs": "^4.1.15",
     "hashids": "^1.1.1",
     "hjson": "^3.1.1",
     "iconv-lite": "^0.4.23",
     "inquirer": "^6.0.0",
     "later": "1.2.0",
     "lodash": "^4.17.10",
-    "mime-types": "^2.1.18",
+    "mime-types": "^2.1.21",
     "minimist": "1.2.x",
     "moment": "^2.22.2",
     "node-pty": "^0.7.4",
     "nodemailer": "^4.6.5",
     "rlogin": "^1.0.0",
-    "sane": "^2.5.2",
+    "sane": "^4.0.2",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^4.0.0",
+    "sqlite3": "^4.0.3",
     "sqlite3-trans": "^1.2.0",
     "ssh2": "^0.6.1",
     "temptmp": "^1.0.0",
     "uuid": "^3.2.1",
     "uuid-parse": "^1.0.0",
-    "ws": "^5.2.0",
+    "ws": "^6.1.0",
     "xxhash": "^0.2.4",
     "yazl": "^2.4.2"
   },

From 75c952c97694bd24b8f6f9f7ced076fe3229e940 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 21:00:54 -0700
Subject: [PATCH 0454/1013] Fix sexyz Linux x86_64 binary links

---
 core/config.js                                | 1 +
 docs/configuration/file-transfer-protocols.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 02b34911..fe09b956 100644
--- a/core/config.js
+++ b/core/config.js
@@ -671,6 +671,7 @@ function getDefaultConfig() {
                 sort        : 1,
                 external    : {
                     //  :TODO: Look into shipping sexyz binaries or at least hosting them somewhere for common systems
+                    //  Linux x86_64 binary: https://l33t.codes/outgoing/sexyz
                     sendCmd             : 'sexyz',
                     sendArgs            : [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
                     recvCmd             : 'sexyz',
diff --git a/docs/configuration/file-transfer-protocols.md b/docs/configuration/file-transfer-protocols.md
index da5697c7..fd21a938 100644
--- a/docs/configuration/file-transfer-protocols.md
+++ b/docs/configuration/file-transfer-protocols.md
@@ -11,7 +11,7 @@ File transfer protocols are managed via the `fileTransferProtocols` configuratio
 The following file transfer protocols are pre-configured in ENiGMA½ as of this writing. System operators may override or extend this list. PRs are welcome for pre-configured additions!
 
 #### SEXYZ
-[SEXYZ from Synchronet](http://wiki.synchro.net/util:sexyz) offers a nice X, Y, and ZModem implementation including ZModem-8k & works under *nix and Windows based systems. As of this writing, ENiGMA½ is pre-configured to support ZModem-8k, XModem, and YModem using SEXYZ. An x86_64 Linux binary, and hopefully more in the future, [can be downloaded here](http://132.0.0.249/bbs-linux-binaries/).
+[SEXYZ from Synchronet](http://wiki.synchro.net/util:sexyz) offers a nice X, Y, and ZModem implementation including ZModem-8k & works under *nix and Windows based systems. As of this writing, ENiGMA½ is pre-configured to support ZModem-8k, XModem, and YModem using SEXYZ. An x86_64 Linux binary, and hopefully more in the future, [can be downloaded here](https://l33t.codes/bbs-linux-binaries/).
 
 #### sz/rz
 ZModem-8k is configured using the standard Linux [sz(1)](https://linux.die.net/man/1/sz) and [rz(1)](https://linux.die.net/man/1/rz) binaries. Note that these binaries also support XModem and YModem, and as such adding the configurations to your system should be fairly straight forward.

From 8942eff203c846f2e17c055176f235382f646e8b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 4 Nov 2018 21:09:27 -0700
Subject: [PATCH 0455/1013] Fix deprecated write() without callback for Node.js
 10.x+

---
 core/file_transfer.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index dbd19a8f..340ca6b9 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -314,9 +314,13 @@ exports.getModule = class TransferFileModule extends MenuModule {
                             return callback(err);   //  failed to create it
                         }
 
-                        fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL));
-                        fs.close(tempFileInfo.fd, err => {
-                            return callback(err, tempFileInfo.path);
+                        fs.write(tempFileInfo.fd, filePaths.join(SYSTEM_EOL), err => {
+                            if(err) {
+                                return callback(err);
+                            }
+                            fs.close(tempFileInfo.fd, err => {
+                                return callback(err, tempFileInfo.path);
+                            });
                         });
                     });
                 },

From a98940e967fdbdd032553641fd246533b9fae9eb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 21:08:56 -0700
Subject: [PATCH 0456/1013] Use standard itemFormat for BBS list. Add docs

---
 art/themes/luciano_blocktronics/theme.hjson | 6 ++----
 core/bbs_list.js                            | 8 ++------
 docs/_includes/nav.md                       | 1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index f3af6df6..60bede01 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -315,16 +315,14 @@
 			}
 
 			bbsList: {
-				config: {
-					listFormat: "|00|07{bbsName}"
-					focusListFormat: "|00|19|15{bbsName!styleFirstLower}"
-				}
 				0: {
 					mci: {
 						VM1: {
 							height: 11
 							width: 22
 							focusTextStyle: first upper
+							itemFormat: "|00|07{bbsName}"
+							focusItemFormat: "|00|19|15{bbsName!styleFirstLower}"
 						}
 						TL2: { width: 28 }
 						TL3: { width: 28 }
diff --git a/core/bbs_list.js b/core/bbs_list.js
index 2f9b6084..82943a80 100644
--- a/core/bbs_list.js
+++ b/core/bbs_list.js
@@ -218,12 +218,7 @@ exports.getModule = class BBSListModule extends MenuModule {
     }
 
     setEntries(entriesView) {
-        const config            = this.menuConfig.config;
-        const listFormat        = config.listFormat || '{bbsName}';
-        const focusListFormat   = config.focusListFormat || '{bbsName}';
-
-        entriesView.setItems(this.entries.map( e => stringFormat(listFormat, e) ) );
-        entriesView.setFocusItems(this.entries.map( e => stringFormat(focusListFormat, e) ) );
+        return entriesView.setItems(this.entries);
     }
 
     displayBBSList(clearScreen, cb) {
@@ -277,6 +272,7 @@ exports.getModule = class BBSListModule extends MenuModule {
                         (err, row) => {
                             if (!err) {
                                 self.entries.push({
+                                    text            : row.bbs_name, //  standard field
                                     id              : row.id,
                                     bbsName         : row.bbs_name,
                                     sysOp           : row.sysop,
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 33702016..7d3d4c29 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -69,6 +69,7 @@
     - [User List]({{ site.baseurl }}{% link modding/user-list.md %})
     - [Message Conference List]({{ site.baseurl }}{% link modding/msg-conf-list.md %})
     - [Message Area List]({{ site.baseurl }}{% link modding/msg-area-list.md %})
+    - [BBS List]({{ site.baseurl }}{% link modding/bbs-list.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})

From 5af2fdc6c55402444029199fc3c25455872a6da1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 21:35:12 -0700
Subject: [PATCH 0457/1013] More itemFormat & doc work

---
 art/themes/luciano_blocktronics/theme.hjson | 11 +++++-----
 core/rumorz.js                              | 12 +++++------
 docs/modding/bbs-list.md                    | 24 +++++++++++++++++++++
 docs/modding/rumorz.md                      | 12 +++++++++++
 4 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 docs/modding/bbs-list.md
 create mode 100644 docs/modding/rumorz.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 60bede01..1abcd879 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -290,13 +290,14 @@
 			}
 
 			mainMenuRumorz: {
-				config: {
-					listFormat:      "|00|11  {rumor}"
-					focusListFormat: "|00|15> |14{rumor}"
-				}
 				0: {
 					mci: {
-						VM1: { height: 14, width: 70 }
+						VM1: {
+							height: 14,
+							width: 70
+							itemFormat:      "|00|11  {rumor}"
+							focusItemFormat: "|00|15> |14{rumor}"
+						}
 						TM2: {
 							focusTextStyle: upper
 							items: [ "yes", "no" ]
diff --git a/core/rumorz.js b/core/rumorz.js
index 153a74ee..31aea104 100644
--- a/core/rumorz.js
+++ b/core/rumorz.js
@@ -8,7 +8,6 @@ const theme                 = require('./theme.js');
 const resetScreen           = require('./ansi_term.js').resetScreen;
 const StatLog               = require('./stat_log.js');
 const renderStringLength    = require('./string_util.js').renderStringLength;
-const stringFormat          = require('./string_format.js');
 
 //  deps
 const async                 = require('async');
@@ -155,12 +154,13 @@ exports.getModule = class RumorzModule extends MenuModule {
                     });
                 },
                 function populateEntries(entriesView, entries, callback) {
-                    const config            = self.config;
-                    const listFormat        = config.listFormat || '{rumor}';
-                    const focusListFormat   = config.focusListFormat || listFormat;
+                    entriesView.setItems(entries.map(e => {
+                        return {
+                            text    : e.log_value,  //  standard
+                            rumor   : e.log_value,
+                        }
+                    }));
 
-                    entriesView.setItems(entries.map( e => stringFormat(listFormat, { rumor : e.log_value } ) ) );
-                    entriesView.setFocusItems(entries.map(e => stringFormat(focusListFormat, { rumor : e.log_value } ) ) );
                     entriesView.redraw();
 
                     return callback(null);
diff --git a/docs/modding/bbs-list.md b/docs/modding/bbs-list.md
new file mode 100644
index 00000000..4b61e616
--- /dev/null
+++ b/docs/modding/bbs-list.md
@@ -0,0 +1,24 @@
+---
+layout: page
+title: BBS List
+---
+## The BBS List Module
+The built in `bbs_list` module provides the ability for users to manage entries to other Bulletin Board Systems.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `youSubmittedFormat`: Provides a format for entries that were submitted (and therefor ediable) by the current user. Defaults to `'{submitter} (You!)'`. Utilizes the same `itemFormat` object as entries described below.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) (the BBS list):
+* `id`: Row ID
+* `bbsName`: System name. Note that `{text}` also contains this value.
+* `sysOp`: System Operator
+* `telnet`: Telnet address
+* `www`: Web address
+* `location`: System location
+* `software`: System's software
+* `submitter`: Username of entry submitter
+* `submitterUserId`: User ID of submitter
+* `notes`: Any additional notes about the system
diff --git a/docs/modding/rumorz.md b/docs/modding/rumorz.md
new file mode 100644
index 00000000..f930edcc
--- /dev/null
+++ b/docs/modding/rumorz.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title: Rumorz
+---
+## The Rumorz Module
+The built in `rumorz` module provides a classic interface for users to add and view rumorz!
+
+## Configuration
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) (the rumor list):
+* `rumor`: The rumor text. Also available in the standard `{text}` field.

From 0e986238c2889aed6847c89522a49a0b20a3dd6b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 21:47:20 -0700
Subject: [PATCH 0458/1013] Add rumorz to nav

---
 docs/_includes/nav.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 7d3d4c29..dbca7889 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -70,6 +70,7 @@
     - [Message Conference List]({{ site.baseurl }}{% link modding/msg-conf-list.md %})
     - [Message Area List]({{ site.baseurl }}{% link modding/msg-area-list.md %})
     - [BBS List]({{ site.baseurl }}{% link modding/bbs-list.md %})
+    - [Rumorz]({{ site.baseurl }}{% link modding/rumorz.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})

From 5286c52a263d34e0d2923c173ccc64f5810ecbe9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 21:47:53 -0700
Subject: [PATCH 0459/1013] Fix file base area selection in Luciano theme

---
 art/themes/luciano_blocktronics/theme.hjson | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 1abcd879..f8e1faeb 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -713,17 +713,14 @@
 			}
 
 			fileBaseBrowseByAreaSelect: {
-				config: {
-					protListFormat: "|00|03{name}"
-					protListFocusFormat: "|00|19|15{name}"
-				}
-
 				0: {
 					mci: {
 						VM1: {
 							height: 15
 							width: 30
 							focusTextStyle: first lower
+							itemFormat: "|00|03{name}"
+							focusItemFormat: "|00|19|15{name}"
 						}
 					}
 				}

From 047d8fae899e039dc2c5524dd8f30972e14a740b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 21:54:04 -0700
Subject: [PATCH 0460/1013] File Transfer protocol: use itemFormat + docs

---
 art/themes/luciano_blocktronics/theme.hjson   |  7 ++-----
 core/file_transfer_protocol_select.js         |  9 ++-------
 docs/_includes/nav.md                         |  1 +
 docs/modding/file-transfer-protocol-select.md | 13 +++++++++++++
 4 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 docs/modding/file-transfer-protocol-select.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index f8e1faeb..06e6a011 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -912,17 +912,14 @@
 			}
 
 			fileTransferProtocolSelection: {
-				config: {
-					protListFormat: "|00|03{name}"
-					protListFocusFormat: "|00|19|15{name}"
-				}
-
 				0: {
 					mci: {
 						VM1: {
 							height: 15
 							width: 30
 							focusTextStyle: first lower
+							itemFormat: "|00|03{name}"
+							focusItemFormat: "|00|19|15{name}"
 						}
 					}
 				}
diff --git a/core/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js
index d8500dc5..13e30a74 100644
--- a/core/file_transfer_protocol_select.js
+++ b/core/file_transfer_protocol_select.js
@@ -4,7 +4,6 @@
 //  enigma-bbs
 const MenuModule        = require('./menu_module.js').MenuModule;
 const Config            = require('./config.js').get;
-const stringFormat      = require('./string_format.js');
 const ViewController    = require('./view_controller.js').ViewController;
 
 //  deps
@@ -110,12 +109,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
                     function populateList(callback) {
                         const protListView = vc.getView(MciViewIds.protList);
 
-                        const protListFormat        = self.config.protListFormat || '{name}';
-                        const protListFocusFormat   = self.config.protListFocusFormat || protListFormat;
-
-                        protListView.setItems(self.protocols.map(p => stringFormat(protListFormat, p) ) );
-                        protListView.setFocusItems(self.protocols.map(p => stringFormat(protListFocusFormat, p) ) );
-
+                        protListView.setItems(self.protocols);
                         protListView.redraw();
 
                         return callback(null);
@@ -131,6 +125,7 @@ exports.getModule = class FileTransferProtocolSelectModule extends MenuModule {
     loadAvailProtocols() {
         this.protocols = _.map(Config().fileTransferProtocols, (protInfo, protocol) => {
             return {
+                text        : protInfo.name,    //  standard
                 protocol    : protocol,
                 name        : protInfo.name,
                 hasBatch    : _.has(protInfo, 'external.recvArgs'),
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index dbca7889..15641234 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -71,6 +71,7 @@
     - [Message Area List]({{ site.baseurl }}{% link modding/msg-area-list.md %})
     - [BBS List]({{ site.baseurl }}{% link modding/bbs-list.md %})
     - [Rumorz]({{ site.baseurl }}{% link modding/rumorz.md %})
+    - [File Transfer Protocol Select]({{ site.baseurl }}{% link modding/file-transfer-protocol-select.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/file-transfer-protocol-select.md b/docs/modding/file-transfer-protocol-select.md
new file mode 100644
index 00000000..72b8d124
--- /dev/null
+++ b/docs/modding/file-transfer-protocol-select.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: File Transfer Protocol Select
+---
+## The Rumorz Module
+The built in `file_transfer_protocol_select` module provides a way to select a legacy file transfer protocol (X/Y/Z-Modem, etc.) for upload/downloads.
+
+## Configuration
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) (the protocol list):
+* `name`: The name of the protocol. Each entry is +op defined in `config.hjson` with defaults found in `config.js`. Note that the standard `{text}` field also contains this value.
+

From 5859ba0b68cb22caf3b27fc8eac2c7d18fb3b2ce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 22:33:47 -0700
Subject: [PATCH 0461/1013] core/onelinerz.js

tsFormat -> dateTimeFormat (WIP on standardization)
---
 art/themes/luciano_blocktronics/theme.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 06e6a011..aa720934 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -88,7 +88,7 @@
 
 			fullLoginSequenceOnelinerz: {
 				config: {
-					tsFormat: ddd h:mma
+					dateTimeFormat: ddd h:mma
 				}
 				0: {
 					mci: {
@@ -195,7 +195,7 @@
 
 			mainMenuOnelinerz: {
 				config: {
-					tsFormat: ddd h:mma
+					dateTimeFormat: ddd h:mma
 				}
 				0: {
 					mci: {

From a14c0f42afef5fe14126bc9b3a2bde8ede4d65cd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 22:39:49 -0700
Subject: [PATCH 0462/1013] Onelinerz standardization work and docs

---
 core/onelinerz.js         |  6 +++++-
 docs/_includes/nav.md     |  1 +
 docs/modding/onelinerz.md | 18 ++++++++++++++++++
 docs/modding/user-list.md |  3 ---
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 docs/modding/onelinerz.md

diff --git a/core/onelinerz.js b/core/onelinerz.js
index 19b9ce44..d840f731 100644
--- a/core/onelinerz.js
+++ b/core/onelinerz.js
@@ -153,10 +153,14 @@ exports.getModule = class OnelinerzModule extends MenuModule {
                     );
                 },
                 function populateEntries(entriesView, entries, callback) {
-                    const tsFormat = self.menuConfig.config.timestampFormat || self.client.currentTheme.helpers.getDateFormat('short');
+                    const tsFormat =
+                        self.menuConfig.config.dateTimeFormat ||
+                        self.menuConfig.config.timestampFormat ||   //  deprecated
+                        self.client.currentTheme.helpers.getDateFormat('short');
 
                     entriesView.setItems(entries.map( e => {
                         return {
+                            text        : e.oneliner,   //  standard
                             userId      : e.user_id,
                             userName    : e.user_name,
                             oneliner    : e.oneliner,
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 15641234..c8cb67c9 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -72,6 +72,7 @@
     - [BBS List]({{ site.baseurl }}{% link modding/bbs-list.md %})
     - [Rumorz]({{ site.baseurl }}{% link modding/rumorz.md %})
     - [File Transfer Protocol Select]({{ site.baseurl }}{% link modding/file-transfer-protocol-select.md %})
+    - [Onelinerz]({{ site.baseurl }}{% link modding/onelinerz.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/onelinerz.md b/docs/modding/onelinerz.md
new file mode 100644
index 00000000..92515617
--- /dev/null
+++ b/docs/modding/onelinerz.md
@@ -0,0 +1,18 @@
+---
+layout: page
+title: Onelinerz
+---
+## The Onelinerz Module
+The built in `onelinerz` module provides a retro onelinerz system.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `dateTimeFormat`: [moment.js](https://momentjs.com) style format. Defaults to current theme → system `short` date format.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
+* `userId`: User ID of the onliner entry.
+* `userName`: Login username of the onliner entry.
+* `oneliner`: The oneliner text. Note that the standard `{text}` field also contains this value.
+* `ts`: Timestamp of the entry formatted with `dateTimeFormat` format described above.
diff --git a/docs/modding/user-list.md b/docs/modding/user-list.md
index 9aae4750..37eb2e97 100644
--- a/docs/modding/user-list.md
+++ b/docs/modding/user-list.md
@@ -19,6 +19,3 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `lastLoginTs`: Last login timestamp formatted with `dateTimeFormat` style.
 * `location`: User's location.
 * `affiliation` or `affils`: Users affiliations.
-
-
-

From 818214657428ca41dc54ec7b6a4d6d98d2b55240 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 5 Nov 2018 22:49:27 -0700
Subject: [PATCH 0463/1013] Notes on Node.js 10.x LTS

---
 .github/ISSUE_TEMPLATE.md   | 2 +-
 UPGRADE.md                  | 2 +-
 WHATSNEW.md                 | 2 +-
 docs/installation/manual.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d53a6435..a8e6a08e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -3,7 +3,7 @@ For :bug: bug reports, please fill out the information below plus any additional
 **Short problem description**
 
 **Environment**
-- [ ] I am using Node.js v8.x LTS or higher
+- [ ] I am using Node.js v10.x LTS or higher
 - [ ] `npm install` or `yarn` reports success
 - Actual Node.js version (`node --version`):
 - Operating system (`uname -a` on *nix systems):
diff --git a/UPGRADE.md b/UPGRADE.md
index 5ec42295..af9f124a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -38,7 +38,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
 # 0.0.8-alpha to 0.0.9-alpha
-* Development is now against Node.js 8.x LTS. Follow your standard upgrade path to update to Node 8.x before using 0.0.9-alpha.
+* Development is now against Node.js 10.x LTS. Follow your standard upgrade path to update to Node 10.x before using 0.0.9-alpha!
 * The property `justify` found on various views previously had `left` and `right` values swapped (oops!); you will need to adjust any custom `theme.hjson` that use one or the other and swap them as well.
 * Possible breaking changes in FSE: The MCI code `%TL13` for error indicator is now `%TL4`. This is part of a cleanup and standardization on "custom ranges". You may need to update your `theme.hjson` and related artwork.
 * Removed view width auto-size: Some views still can auto-size their height, but in general you should be explicit in your themes
diff --git a/WHATSNEW.md b/WHATSNEW.md
index b157a927..de8b6383 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -2,7 +2,7 @@
 This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
 
 ## 0.0.9-alpha
-* Development is now against Node.js 8.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
+* Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
 * Fixed `justify` properties: `left` and `right` values were formerly swapped (oops!)
 * Menu items can now be arrays of *objects* not just arrays of strings.
   * The properties `itemFormat` and `focusItemFormat` allow you to supply the string format for items. For example if a menu object is `{ "userName" : "Bob", "age" : 35 }`, a `itemFormat` might be `|04{userName} |08- |14{age}`.
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
index f03df762..01c5ca47 100644
--- a/docs/installation/manual.md
+++ b/docs/installation/manual.md
@@ -6,7 +6,7 @@ For Linux environments it's recommended you run the [install script](install-scr
 do things manually, read on...
 
 ## Prerequisites
-* [Node.js](https://nodejs.org/) version **v6.x or higher**
+* [Node.js](https://nodejs.org/) version **v10.x LTS or higher** (Note that 8.x LTS *probably* works but is unsupported).
   * :information_source: It is **highly** recommended to use [nvm](https://github.com/creationix/nvm) to manage your 
   Node.js installation if you're on a Linux/Unix environment.
   

From 7d74556868b22227559dec94ced20cbf95180456 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 7 Nov 2018 18:33:07 -0700
Subject: [PATCH 0464/1013] Changes to config: defaults -> theme, preLoginTheme
 -> theme.preLogin, etc.

---
 UPGRADE.md                         |  1 +
 core/config.js                     | 21 +++++----------------
 core/login_server_module.js        |  5 +++--
 core/nua.js                        |  8 ++++++--
 core/theme.js                      | 18 +++++++++---------
 docs/configuration/config-hjson.md |  6 ++----
 6 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index af9f124a..8cb98e13 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -60,6 +60,7 @@ webSocket: {
 * The module export `registerEvents` has been deprecated. If you have a module that depends on this, use the new more generic `moduleInitialize` export instead.
 * The `system.db` `user_event_log` table has been updated to include a unique session ID. Previously this table was not used, but you will need to perform a slight maintenance task before it can be properly used. After updating to `0.0.9-alpha`, please run the following: `sqlite3 db/system.db DROP TABLE user_event_log;`. The new table format will be created and used at startup.
 * If you have art configured for message conference or area selection via the `art` configuration value, you will need to include a `show_art` menu reference. Defaulted to `changeMessageConfPreArt` for conferences and `changeMessageAreaPreArt` for areas & included in the example `menu.hjson`.
+* Config `defaults` section was theme related and as such, has been renamed to `theme`. `defaults.theme` is now `theme.default`, and `preLoginTheme` is now `theme.preLogin`. See `config.js` if this isn't clear as mud.
 
 
 # 0.0.7-alpha to 0.0.8-alpha
diff --git a/core/config.js b/core/config.js
index fe09b956..74148c69 100644
--- a/core/config.js
+++ b/core/config.js
@@ -141,9 +141,6 @@ function getDefaultConfig() {
             promptFile      : 'prompt.hjson',           //  Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
         },
 
-        //  :TODO: see notes below about 'theme' section - move this!
-        preLoginTheme : 'luciano_blocktronics',
-
         users : {
             usernameMin         : 2,
             usernameMax         : 16,   //  Note that FidoNet wants 36 max
@@ -172,18 +169,10 @@ function getDefaultConfig() {
             ],
         },
 
-        //  :TODO: better name for "defaults"... which is redundant here!
-        /*
-        Concept
-        "theme" : {
-            "default" : "defaultThemeName", // or "*"
-            "preLogin" : "*",
-            "passwordChar" : "*",
-            ...
-        }
-        */
-        defaults : {
-            theme           : 'luciano_blocktronics',
+        theme : {
+            default     : 'luciano_blocktronics',
+            preLogin    : 'luciano_blocktronics',
+
             passwordChar    : '*',      //  TODO: move to user ?
             dateFormat  : {
                 short   : 'MM/DD/YYYY',
@@ -202,7 +191,7 @@ function getDefaultConfig() {
             cls     : true, //  Clear screen before each menu by default?
         },
 
-        paths       : {
+        paths : {
             config              : paths.join(__dirname, './../config/'),
             mods                : paths.join(__dirname, './../mods/'),
             loginServers        : paths.join(__dirname, './servers/login/'),
diff --git a/core/login_server_module.js b/core/login_server_module.js
index 02cd4e41..d1a3552f 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -23,10 +23,11 @@ module.exports = class LoginServerModule extends ServerModule {
         //
         //  Choose initial theme before we have user context
         //
-        if('*' === conf.config.preLoginTheme) {
+        const preLoginTheme = _.get(conf.config, 'theme.preLogin');
+        if('*' === preLoginTheme) {
             client.user.properties.theme_id = theme.getRandomTheme() || '';
         } else {
-            client.user.properties.theme_id = conf.config.preLoginTheme;
+            client.user.properties.theme_id = preLoginTheme;
         }
 
         theme.setClientTheme(client, client.user.properties.theme_id);
diff --git a/core/nua.js b/core/nua.js
index 18b9a719..2d838fcb 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -9,6 +9,9 @@ const login         = require('./system_menu_method.js').login;
 const Config        = require('./config.js').get;
 const messageArea   = require('./message_area.js');
 
+//  deps
+const _             = require('lodash');
+
 exports.moduleInfo = {
     name    : 'NUA',
     desc    : 'New User Application',
@@ -96,10 +99,11 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                     //  :TODO: should probably have a place to create defaults/etc.
                 };
 
-                if('*' === config.defaults.theme) {
+                const defaultTheme = _.get(config, 'theme.default');
+                if('*' === defaultTheme) {
                     newUser.properties.theme_id = theme.getRandomTheme();
                 } else {
-                    newUser.properties.theme_id = config.defaults.theme;
+                    newUser.properties.theme_id = defaultTheme;
                 }
 
                 //  :TODO: User.create() should validate email uniqueness!
diff --git a/core/theme.js b/core/theme.js
index bdba70bc..2f88027e 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -39,7 +39,7 @@ function refreshThemeHelpers(theme) {
             let pwChar = _.get(
                 theme,
                 'customization.defaults.general.passwordChar',
-                Config().defaults.passwordChar
+                Config().theme.passwordChar
             );
 
             if(_.isString(pwChar)) {
@@ -51,15 +51,15 @@ function refreshThemeHelpers(theme) {
             return pwChar;
         },
         getDateFormat : function(style = 'short') {
-            const format = Config().defaults.dateFormat[style] || 'MM/DD/YYYY';
+            const format = Config().theme.dateFormat[style] || 'MM/DD/YYYY';
             return _.get(theme, `customization.defaults.dateFormat.${style}`, format);
         },
         getTimeFormat : function(style = 'short') {
-            const format = Config().defaults.timeFormat[style] || 'h:mm a';
+            const format = Config().theme.timeFormat[style] || 'h:mm a';
             return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
         },
         getDateTimeFormat : function(style = 'short') {
-            const format = Config().defaults.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
+            const format = Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
             return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
         }
     };
@@ -402,9 +402,9 @@ function setClientTheme(client, themeId) {
     if(availThemes.has(themeId)) {
         msg = 'Set client theme';
         setThemeId = themeId;
-    } else if(availThemes.has(config.defaults.theme)) {
+    } else if(availThemes.has(config.theme.default)) {
         msg = 'Failed setting theme by supplied ID; Using default';
-        setThemeId = config.defaults.theme;
+        setThemeId = config.theme.default;
     } else {
         msg = 'Failed setting theme by system default ID; Using the first one we can find';
         setThemeId = availThemes.keys().next().value;
@@ -430,7 +430,7 @@ function getThemeArt(options, cb) {
     if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
         options.themeId = options.client.user.properties.theme_id;
     } else {
-        options.themeId = config.defaults.theme;
+        options.themeId = config.theme.default;
     }
 
     //  :TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
@@ -477,11 +477,11 @@ function getThemeArt(options, cb) {
                 });
             },
             function fromDefaultTheme(artInfo, callback) {
-                if(artInfo || config.defaults.theme === options.themeId) {
+                if(artInfo || config.theme.default === options.themeId) {
                     return callback(null, artInfo);
                 }
 
-                options.basePath = paths.join(config.paths.themes, config.defaults.theme);
+                options.basePath = paths.join(config.paths.themes, config.theme.default);
                 art.getArt(options.name, options, (err, artInfo) => {
                     return callback(null, artInfo);
                 });
diff --git a/docs/configuration/config-hjson.md b/docs/configuration/config-hjson.md
index 10ca119d..37d07beb 100644
--- a/docs/configuration/config-hjson.md
+++ b/docs/configuration/config-hjson.md
@@ -46,12 +46,10 @@ Below is a **sample** `config.hjson` illustrating various (but certainly not all
 		menuFile: "your_bbs.hjson" // copy of menu.hjson file (and adapt to your needs)
 	}
 
-	defaults: {
-		theme: "super-fancy-theme" // default-assigned theme (for new users) 
+	theme: {
+		default: "super-fancy-theme" // default-assigned theme (for new users) 
 	}
 
-	preLoginTheme: "luciano_blocktronics" // theme used before a user logs in (matrix, NUA, etc.)
-
 	messageConferences: {
 		local_general: {
 			name: Local

From 93305d44fc53b802a7eddaf1e0bc10b075cb227d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 7 Nov 2018 20:24:05 -0700
Subject: [PATCH 0465/1013] Initial WIP on better 'oputil config new' for
 testing

---
 core/config.js                |  9 ++--
 core/oputil/oputil_config.js  | 79 +++++++++-------------------
 misc/config_template.in.hjson | 99 +++++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+), 57 deletions(-)
 create mode 100644 misc/config_template.in.hjson

diff --git a/core/config.js b/core/config.js
index 74148c69..6a48c78f 100644
--- a/core/config.js
+++ b/core/config.js
@@ -10,8 +10,9 @@ const async             = require('async');
 const _                 = require('lodash');
 const assert            = require('assert');
 
-exports.init            = init;
-exports.getDefaultPath  = getDefaultPath;
+exports.init                = init;
+exports.getDefaultPath      = getDefaultPath;
+exports.getDefaultConfig    = getDefaultConfig;
 
 let currentConfiguration = {};
 
@@ -133,8 +134,8 @@ function getDefaultConfig() {
         general : {
             boardName       : 'Another Fine ENiGMA½ BBS',
 
+            //  :TODO: closedSystem and loginAttemps prob belong under users{}?
             closedSystem    : false,                    //  is the system closed to new users?
-
             loginAttempts   : 3,
 
             menuFile        : 'menu.hjson',             //  Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
@@ -173,7 +174,7 @@ function getDefaultConfig() {
             default     : 'luciano_blocktronics',
             preLogin    : 'luciano_blocktronics',
 
-            passwordChar    : '*',      //  TODO: move to user ?
+            passwordChar    : '*',
             dateFormat  : {
                 short   : 'MM/DD/YYYY',
                 long    : 'ddd, MMMM Do, YYYY',
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 65ede6bd..2fa7b3a9 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -30,6 +30,10 @@ function getAnswers(questions, cb) {
     });
 }
 
+const ConfigIncludeKeys = [
+    'theme',
+];
+
 const QUESTIONS = {
     Intro		: [
         {
@@ -72,12 +76,6 @@ const QUESTIONS = {
             default	: 2,
             filter	: s => s.toLowerCase(),
         },
-        {
-            name	: 'sevenZipExe',
-            message	: '7-Zip executable:',
-            type	: 'list',
-            choices	: [ '7z', '7za', 'None' ]
-        }
     ],
 
     MessageConfAndArea	: [
@@ -149,27 +147,34 @@ function askNewConfigQuestions(cb) {
             function promptOverwrite(needPrompt, callback) {
                 if(needPrompt) {
                     getAnswers(QUESTIONS.OverwriteConfig, answers => {
-                        callback(answers.overwriteConfig ? null : 'exit');
+                        return callback(answers.overwriteConfig ? null : 'exit');
                     });
                 } else {
-                    callback(null);
+                    return callback(null);
                 }
             },
             function basic(callback) {
                 getAnswers(QUESTIONS.Basic, answers => {
-                    config = {
-                        general : {
-                            boardName : answers.boardName,
-                        },
-                    };
+                    const defaultConfig	= require('../../core/config.js').getDefaultConfig();
 
-                    callback(null);
+                    //  start by plopping in values we want directly from config.js
+                    const template = hjson.rt.parse(fs.readFileSync(paths.join(__dirname, '../../misc/config_template.in.hjson'), 'utf8'));
+
+                    const direct = {};
+                    _.each(ConfigIncludeKeys, keyPath => {
+                        _.set(direct, keyPath, _.get(defaultConfig, keyPath));
+                    });
+
+                    config = _.mergeWith(template, direct);
+
+                    //  we can override/add to it based on user input from this point on...
+                    config.general.boardName = answers.boardName;
+  
+                    return callback(null);
                 });
             },
             function msgConfAndArea(callback) {
                 getAnswers(QUESTIONS.MessageConfAndArea, answers => {
-                    config.messageConferences = {};
-
                     const confName	= makeMsgConfAreaName(answers.msgConfName);
                     const areaName	= makeMsgConfAreaName(answers.msgAreaName);
 
@@ -180,12 +185,6 @@ function askNewConfigQuestions(cb) {
                         default	: true,
                     };
 
-                    config.messageConferences.another_sample_conf = {
-                        name	: 'Another Sample Conference',
-                        desc	: 'Another conference example. Change me!',
-                        sort	: 2,
-                    };
-
                     config.messageConferences[confName].areas = {};
                     config.messageConferences[confName].areas[areaName] = {
                         name	: answers.msgAreaName,
@@ -194,51 +193,25 @@ function askNewConfigQuestions(cb) {
                         default	: true,
                     };
 
-                    config.messageConferences.another_sample_conf = {
-                        name	: 'Another Sample Conference',
-                        desc	: 'Another conf sample. Change me!',
-
-                        areas :  {
-                            another_sample_area : {
-                                name	: 'Another Sample Area',
-                                desc	: 'Another area example. Change me!',
-                                sort	: 2
-                            }
-                        }
-                    };
-
-                    callback(null);
+                    return callback(null);
                 });
             },
             function misc(callback) {
                 getAnswers(QUESTIONS.Misc, answers => {
-                    if('None' !== answers.sevenZipExe) {
-                        config.archivers = {
-                            zip : {
-                                compressCmd		: answers.sevenZipExe,
-                                decompressCmd	: answers.sevenZipExe,
-                            }
-                        };
-                    }
+                    config.logging.rotatingFile.level = answers.loggingLevel;
 
-                    config.logging = {
-                        rotatingFile : {
-                            level : answers.loggingLevel,
-                        }
-                    };
-
-                    callback(null);
+                    return callback(null);
                 });
             }
         ],
         err => {
-            cb(err, configPath, config);
+            return cb(err, configPath, config);
         }
     );
 }
 
 function writeConfig(config, path) {
-    config = hjson.stringify(config, { bracesSameLine : true, spaces : '\t', keepWsc : true, quotes : 'strings' } );
+    config = hjson.stringify(config, { bracesSameLine : true, space : '\t', keepWsc : true, quotes : 'strings' } );
 
     try {
         fs.writeFileSync(path, config, 'utf8');
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
new file mode 100644
index 00000000..715c81be
--- /dev/null
+++ b/misc/config_template.in.hjson
@@ -0,0 +1,99 @@
+{
+	/*
+		./\/\.' ENiGMA½ System Configuration -/--/-------- - --   - 
+
+		_____________________   _____  ____________________    __________\_   /
+		\__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+		//   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+		/____       _____|      __________       ___|__|      ____|     \   /  _____  \
+		---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+		                                                                 /__   _\
+		<*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+
+		-------------------------------------------------------------------------------
+
+		General Information
+		-------------------------------
+		This configuration is in HJSON (http://hjson.org/) format.  Strict to-spec 
+		JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
+		
+		See http://hjson.org/ for more information and syntax.
+
+		Various editors and IDEs have plugins for the HJSON format which can be
+		very useful.
+
+		Available Configuration
+		-------------------------------
+		ENiGMA½ is highly configurable! By default, this file contains common
+		configuration elements, examples, etc. To see a full list of settings
+		available to this file, don't be afraid to open up core/config.js and
+		look around. Do not make changes there however, you may override any
+		of the configuration from within this file!
+
+		See the documentation for more information, and don't be shy to ask
+		for help!
+	*/
+
+	general: {
+		//	Your BBS Name!
+		boardName: XXXXX
+	}
+
+	logging: {
+		//	By default, the system will rotate logs.
+		//	Remember you can pipe logs through bunyan to pretty-print:
+		//	> tail -F enigma/logs/enigma-bbs.log | enigma/node_modules/bunyan/bin/bunyan
+		rotatingFile: {
+			//	If you're having trouble, try setting this to "trace"
+			level: XXXXX
+		}
+	}
+
+	theme: {
+		//	Default theme applied to new users. "*" indicates random.
+		default: XXXXX
+
+		//	Theme applied before a user has logged in. "*" indicates random.
+		preLogin: XXXXX
+	}
+
+	//	Message conferences and areas are within this block
+	messageConferences: {
+		//	An entry here prepresents a conference taka aka confTag
+		another_sample_conf: {
+			name: "Another Sample Conference"
+			desc: "Another conf sample. Change me!"
+			areas: {
+				//	Similar to confTags, this is a areaTag
+				another_sample_area: {
+					name: "Another Sample Area"
+					desc: "Another area example. Change me!"
+					//	The 'sort' key can override natural sort order and can live at the conference and area levels
+					sort: 2
+				}
+			}
+		}
+	}
+
+	//	Archive files and related
+	archives: {
+		//	External utilities used for import & upload processing archives such
+		//	as .zip, .rar, .arj, etc.
+		//
+		//	You'll want to have archivers configured for the many old-school archive
+		//	formats that a BBS may encounter!
+		//
+		//	See config.js for additional configuration
+		archivers: {
+			//
+			//	Each key in the "archivers" configuration block represents a specific
+			//	external archive utility. ENiGMA½ has sane configuration by default
+			//	for many archivers, but the tools themselves are likely not yet installed
+			//	on your system!
+			//
+			//	Please consult the documentation on information as to where to find and
+			//	install these utilities!
+			//			
+		}
+	}
+}
\ No newline at end of file

From 97e2d103e2987af7a6dc9559dc6189997524cd20 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Nov 2018 19:02:07 -0700
Subject: [PATCH 0466/1013] Comments

---
 core/oputil/oputil_config.js  |  2 +-
 misc/config_template.in.hjson | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 2fa7b3a9..66b11fa6 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -169,7 +169,7 @@ function askNewConfigQuestions(cb) {
 
                     //  we can override/add to it based on user input from this point on...
                     config.general.boardName = answers.boardName;
-  
+
                     return callback(null);
                 });
             },
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 715c81be..79bc2bbf 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -40,9 +40,11 @@
 	}
 
 	logging: {
+		//
 		//	By default, the system will rotate logs.
 		//	Remember you can pipe logs through bunyan to pretty-print:
 		//	> tail -F enigma/logs/enigma-bbs.log | enigma/node_modules/bunyan/bin/bunyan
+		//
 		rotatingFile: {
 			//	If you're having trouble, try setting this to "trace"
 			level: XXXXX
@@ -77,6 +79,7 @@
 
 	//	Archive files and related
 	archives: {
+		//
 		//	External utilities used for import & upload processing archives such
 		//	as .zip, .rar, .arj, etc.
 		//
@@ -84,6 +87,7 @@
 		//	formats that a BBS may encounter!
 		//
 		//	See config.js for additional configuration
+		//
 		archivers: {
 			//
 			//	Each key in the "archivers" configuration block represents a specific
@@ -96,4 +100,13 @@
 			//			
 		}
 	}
+
+	users: {
+		//
+		//	ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups
+		//	include "users" (for regular users) and "sysops" for +ops. You can add other
+		//	groups to the system as well by adding a 'groups' key in this section:
+		//	groups: [ "leet", "lamerz" ]
+		//
+	}
 }
\ No newline at end of file

From 2616499c17fc79a962a5967fda154be86b576408 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Nov 2018 19:05:59 -0700
Subject: [PATCH 0467/1013] Installer script should move along with actual
 version!

---
 misc/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/misc/install.sh b/misc/install.sh
index b50ca8c7..dce7ad21 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -3,6 +3,7 @@
 { # this ensures the entire script is downloaded before execution
 
 ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=10}
+ENIGMA_BRANCH=0.0.9-alpha
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
@@ -78,7 +79,7 @@ download_enigma_source() {
   else
     log "Downloading ENiGMA½ from git to '$INSTALL_DIR'"
     mkdir -p "$INSTALL_DIR"
-    command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" || {
+    command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" && git checkout ${ENIGMA_BRANCH} || {
       log_error "Failed to clone ENiGMA½ repo. Please report this!"
       exit 1
     }
@@ -121,6 +122,8 @@ Additionally, the following support binaires are recommended:
     Debian/Ubuntu : apt-get install lrzsz
     CentOS        : yum install lrzsz
 
+  See docs for more information!
+
 EndOfMessage
     echo -e "\e[39m"
 }

From 1c216dc4532b42e88ac78812ea4f496ca53e7805 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Nov 2018 19:19:16 -0700
Subject: [PATCH 0468/1013] Dur.

---
 misc/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index dce7ad21..42cbbd0d 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -79,7 +79,7 @@ download_enigma_source() {
   else
     log "Downloading ENiGMA½ from git to '$INSTALL_DIR'"
     mkdir -p "$INSTALL_DIR"
-    command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" && git checkout ${ENIGMA_BRANCH} || {
+    command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" || {
       log_error "Failed to clone ENiGMA½ repo. Please report this!"
       exit 1
     }
@@ -89,7 +89,7 @@ download_enigma_source() {
 install_node_packages() {
     log "Installing required Node packages"
     cd ${ENIGMA_INSTALL_DIR}
-    npm install
+    git checkout ${ENIGMA_BRANCH} && npm install
     if [ $? -eq 0 ]; then
       log "npm package installation complete"
     else

From a7b506a5959518831e6c0946428eb527f39232b4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 10:17:24 -0700
Subject: [PATCH 0469/1013] Updated bad password list

---
 core/config.js                                |    12 +-
 ...d_list_top_10000.txt => bad_passwords.txt} | 22499 +++++++++-------
 2 files changed, 12583 insertions(+), 9928 deletions(-)
 rename misc/{10_million_password_list_top_10000.txt => bad_passwords.txt} (53%)

diff --git a/core/config.js b/core/config.js
index 6a48c78f..bc6be381 100644
--- a/core/config.js
+++ b/core/config.js
@@ -149,7 +149,17 @@ function getDefaultConfig() {
 
             passwordMin         : 6,
             passwordMax         : 128,
-            badPassFile         : paths.join(__dirname, '../misc/10_million_password_list_top_10000.txt'),  //  https://github.com/danielmiessler/SecLists
+
+            //
+            //  The bad password list is a text file containing a password per line.
+            //  Entries in this list are not allowed to be used on the system as they
+            //  are known to be too common.
+            //
+            //  A great resource can be found at https://github.com/danielmiessler/SecLists
+            //
+            //  Current list source: https://raw.githubusercontent.com/danielmiessler/SecLists/master/Passwords/probable-v2-top12000.txt
+            //
+            badPassFile         : paths.join(__dirname, '../misc/bad_passwords.txt'),
 
             realNameMax         : 32,
             locationMax         : 32,
diff --git a/misc/10_million_password_list_top_10000.txt b/misc/bad_passwords.txt
similarity index 53%
rename from misc/10_million_password_list_top_10000.txt
rename to misc/bad_passwords.txt
index 7404c69b..864276a9 100644
--- a/misc/10_million_password_list_top_10000.txt
+++ b/misc/bad_passwords.txt
@@ -1,10000 +1,12645 @@
 123456
 password
-12345678
-qwerty
 123456789
+12345678
 12345
-1234
+qwerty
+123123
 111111
+abc123
 1234567
 dragon
-123123
-baseball
-abc123
-football
-monkey
-letmein
-696969
-shadow
-master
-666666
-qwertyuiop
-123321
-mustang
-1234567890
-michael
-654321
-pussy
-superman
-1qaz2wsx
-7777777
-fuckyou
-121212
-000000
-qazwsx
-123qwe
-killer
-trustno1
-jordan
-jennifer
-zxcvbnm
-asdfgh
-hunter
-buster
-soccer
-harley
-batman
-andrew
-tigger
+1q2w3e4r
 sunshine
-iloveyou
-fuckme
-2000
-charlie
-robert
-thomas
-hockey
-ranger
-daniel
-starwars
-klaster
-112233
-george
-asshole
+654321
+master
+1234
+football
+1234567890
+000000
 computer
-michelle
+666666
+superman
+michael
+internet
+iloveyou
+daniel
+1qaz2wsx
+monkey
+shadow
 jessica
-pepper
-1111
-zxcvbn
-555555
-11111111
-131313
-freedom
-777777
-pass
-fuck
-maggie
-159753
-aaaaaa
-ginger
+letmein
+baseball
+whatever
 princess
-joshua
-cheese
-amanda
-summer
-love
-ashley
-6969
-nicole
-chelsea
-biteme
-matthew
-access
-yankees
-987654321
-dallas
-austin
-thunder
-taylor
-matrix
-william
-corvette
-hello
-martin
-heather
-secret
-fucker
-merlin
+abcd1234
+123321
+starwars
+121212
+thomas
+zxcvbnm
+trustno1
+killer
+welcome
+jordan
+aaaaaa
+123qwe
+freedom
+password1
+charlie
+batman
+jennifer
+7777777
+michelle
 diamond
-1234qwer
-gfhjkm
-hammer
+oliver
+mercedes
+benjamin
+11111111
+snoopy
+samantha
+victoria
+matrix
+george
+alexander
+secret
+cookie
+asdfgh
+987654321
+123abc
+orange
+fuckyou
+asdf1234
+pepper
+hunter
 silver
-222222
+joshua
+banana
+1q2w3e
+chelsea
+1234qwer
+summer
+qwertyuiop
+phoenix
+andrew
+q1w2e3r4
+elephant
+rainbow
+mustang
+merlin
+london
+garfield
+robert
+chocolate
+112233
+samsung
+qazwsx
+matthew
+buster
+jonathan
+ginger
+flower
+555555
+test
+caroline
+amanda
+maverick
+midnight
+martin
+junior
 88888888
 anthony
-justin
-test
-bailey
-q1w2e3r4t5
-patrick
-internet
-scooter
-orange
-11111
-golfer
-cookie
-richard
-samantha
-bigdog
-guitar
-jackson
-whatever
-mickey
-chicken
-sparky
-snoopy
-maverick
-phoenix
-camaro
-sexy
-peanut
-morgan
-welcome
-falcon
-cowboy
-ferrari
-samsung
-andrea
-smokey
-steelers
-joseph
-mercedes
-dakota
-arsenal
-eagles
-melissa
-boomer
-booboo
-spider
-nascar
-monster
-tigers
-yellow
-xxxxxx
-123123123
-gateway
-marina
-diablo
-bulldog
-qwer1234
-compaq
-purple
-hardcore
-banana
-junior
-hannah
-123654
-porsche
-lakers
-iceman
-money
-cowboys
-987654
-london
-tennis
-999999
-ncc1701
-coffee
-scooby
-0000
-miller
-boston
-q1w2e3r4
-fuckoff
-brandon
-yamaha
-chester
-mother
-forever
-johnny
-edward
-333333
-oliver
-redsox
-player
-nikita
-knight
-fender
-barney
-midnight
-please
-brandy
-chicago
-badboy
-iwantu
-slayer
-rangers
-charles
-angel
-flower
-bigdaddy
-rabbit
-wizard
-bigdick
-jasper
-enter
-rachel
-chris
-steven
-winner
-adidas
-victoria
-natasha
-1q2w3e4r
 jasmine
-winter
-prince
-panties
-marine
-ghbdtn
-fishing
+creative
+patrick
+mickey
+123
+qwerty123
 cocacola
-casper
-james
-232323
-raiders
-888888
-marlboro
-gandalf
-asdfasdf
-crystal
-87654321
-12344321
-sexsex
-golden
-blowme
-bigtits
-8675309
-panther
-lauren
+chicken
+passw0rd
+forever
+william
+nicole
+hello
+yellow
+nirvana
+justin
+friends
+cheese
+tigger
+mother
+liverpool
+blink182
+asdfghjkl
+andrea
+spider
+scooter
+richard
+soccer
+rachel
+purple
+morgan
+melissa
+jackson
+arsenal
+222222
+qwe123
+gabriel
+ferrari
+jasper
+danielle
+bandit
 angela
-bitch
-spanky
-thx1138
+scorpion
+prince
+maggie
+austin
+veronica
+nicholas
+monster
+dexter
+carlos
+thunder
+success
+hannah
+ashley
+131313
+stella
+brandon
+pokemon
+joseph
+asdfasdf
+999999
+metallica
+december
+chester
+taylor
+sophie
+samuel
+rabbit
+crystal
+barney
+xxxxxx
+steven
+ranger
+patricia
+christian
+asshole
+spiderman
+sandra
+hockey
 angels
-madison
-winston
-shannon
-mike
-toyota
-blowjob
+security
+parker
+heather
+888888
+victor
+harley
+333333
+system
+slipknot
+november
 jordan23
 canada
-sophie
-Password
-apples
-dick
-tiger
-razz
-123abc
-pokemon
-qazxsw
-55555
-qwaszx
-muffin
-johnson
-murphy
-cooper
-jonathan
-liverpoo
-david
-danielle
-159357
-jackie
-1990
-123456a
-789456
-turtle
-horny
-abcd1234
-scorpion
-qazwsxedc
-101010
-butter
-carlos
-password1
-dennis
-slipknot
-qwerty123
-booger
-asdf
-1991
-black
-startrek
-12341234
-cameron
-newyork
-rainbow
-nathan
-john
-1992
-rocket
-viking
-redskins
-butthead
-asdfghjkl
-1212
-sierra
-peaches
-gemini
-doctor
-wilson
-sandra
-helpme
+tennis
 qwertyui
-victor
-florida
-dolphin
-pookie
-captain
-tucker
-blue
-liverpool
-theman
-bandit
-dolphins
-maddog
-packers
-jaguar
-lovers
-nicholas
-united
-tiffany
-maxwell
-zzzzzz
-nirvana
-jeremy
-suckit
-stupid
-porn
-monica
-elephant
-giants
-jackass
-hotdog
-rosebud
-success
-debbie
-mountain
-444444
-xxxxxxxx
-warrior
-1q2w3e4r5t
-q1w2e3
-123456q
-albert
-metallic
-lucky
-azerty
-7777
-shithead
-alex
-bond007
-alexis
-1111111
-samson
-5150
-willie
-scorpio
-bonnie
-gators
-benjamin
-voodoo
-driver
-dexter
-2112
-jason
-calvin
-freddy
-212121
-creative
-12345a
-sydney
-rush2112
-1989
-asdfghjk
-red123
-bubba
-4815162342
-passw0rd
-trouble
-gunner
-happy
-fucking
-gordon
-legend
-jessie
-stella
-qwert
-eminem
-arthur
-apple
-nissan
-bullshit
-bear
-america
-1qazxsw2
-nothing
-parker
-4444
-rebecca
-qweqwe
-garfield
-01012011
-beavis
-69696969
-jack
-asdasd
-december
-2222
-102030
-252525
-11223344
-magic
-apollo
-skippy
-315475
-girls
-kitten
-golf
-copper
-braves
-shelby
-godzilla
-beaver
-fred
-tomcat
-august
-buddy
-airborne
-1993
-1988
-lifehack
-qqqqqq
-brooklyn
-animal
-platinum
-phantom
-online
-xavier
-darkness
-blink182
-power
-fish
-green
-789456123
-voyager
-police
-travis
-12qwaszx
-heaven
-snowball
-lover
-abcdef
-00000
-pakistan
-007007
-walter
-playboy
-blazer
-cricket
-sniper
-hooters
-donkey
-willow
-loveme
-saturn
-therock
-redwings
-bigboy
-pumpkin
-trinity
-williams
-tits
-nintendo
-digital
-destiny
-topgun
-runner
-marvin
-guinness
-chance
-bubbles
-testing
-fire
-november
-minecraft
-asdf1234
-lasvegas
-sergey
-broncos
-cartman
-private
-celtic
-birdie
-little
-cassie
-babygirl
-donald
-beatles
-1313
-dickhead
-family
-12121212
-school
-louise
-gabriel
-eclipse
-fluffy
-147258369
-lol123
-explorer
-beer
-nelson
-flyers
-spencer
-scott
-lovely
-gibson
-doggie
-cherry
-andrey
-snickers
-buffalo
-pantera
-metallica
-member
-carter
-qwertyu
-peter
-alexande
-steve
-bronco
-paradise
-goober
-5555
-samuel
-montana
-mexico
-dreams
-michigan
-cock
-carolina
-yankee
-friends
-magnum
-surfer
-poopoo
-maximus
-genius
-cool
-vampire
-lacrosse
+casper
+gemini
 asd123
-aaaa
-christin
-kimberly
-speedy
-sharon
-carmen
-111222
-kristina
-sammy
-racing
-ou812
-sabrina
-horses
-0987654321
-qwerty1
-pimpin
-baby
-stalker
-enigma
-147147
-star
-poohbear
-boobies
-147258
-simple
-bollocks
-12345q
-marcus
-brian
-1987
-qweasdzxc
-drowssap
-hahaha
-caroline
-barbara
-dave
-viper
-drummer
-action
-einstein
-bitches
-genesis
-hello1
-scotty
-friend
-forest
-010203
-hotrod
-google
-vanessa
-spitfire
-badger
-maryjane
-friday
-alaska
-1232323q
-tester
-jester
-jake
-champion
-billy
-147852
-rock
-hawaii
-badass
-chevy
-420420
-walker
-stephen
-eagle1
-bill
-1986
-october
-gregory
-svetlana
-pamela
-1984
-music
-shorty
-westside
-stanley
-diesel
-courtney
-242424
-kevin
-porno
-hitman
-boobs
-mark
-12345qwert
-reddog
-frank
-qwe123
+winter
+hammer
+cooper
+america
+albert
+777777
+winner
+charles
+butterfly
+swordfish
 popcorn
-patricia
-aaaaaaaa
-1969
-teresa
-mozart
-buddha
-anderson
-paul
-melanie
-abcdefg
-security
-lucky1
-lizard
-denise
-3333
-a12345
-123789
-ruslan
-stargate
-simpsons
-scarface
-eagle
-123456789a
-thumper
+penguin
+dolphin
+carolina
+access
+987654
+hardcore
+corvette
+apples
+12341234
+sabrina
+remember
+qwer1234
+edward
+dennis
+cherry
+sparky
+natasha
+arthur
+vanessa
+marina
+leonardo
+johnny
+dallas
+antonio
+winston
+snickers
 olivia
-naruto
-1234554321
-general
-cherokee
-a123456
+nothing
+iceman
+destiny
+coffee
+apollo
+696969
+windows
+williams
+school
+madison
+dakota
+angelina
+anderson
+159753
+1111
+yamaha
+trinity
+rebecca
+nathan
+guitar
+compaq
+123123123
+toyota
+shannon
+playboy
+peanut
+pakistan
+diablo
+abcdef
+maxwell
+golden
+asdasd
+123654
+murphy
+monica
+marlboro
+kimberly
+gateway
+bailey
+00000000
+snowball
+scooby
+nikita
+falcon
+august
+test123
+sebastian
+panther
+love
+johnson
+godzilla
+genesis
+brandy
+adidas
+zxcvbn
+wizard
+porsche
+online
+hello123
+fuckoff
+eagles
+champion
+bubbles
+boston
+smokey
+precious
+mercury
+lauren
+einstein
+cricket
+cameron
+angel
+admin
+napoleon
+mountain
+lovely
+friend
+flowers
+dolphins
+david
+chicago
+sierra
+knight
+yankees
+wilson
+warrior
+simple
+nelson
+muffin
+charlotte
+calvin
+spencer
+newyork
+florida
+fernando
+claudia
+basketball
+barcelona
+87654321
+willow
+stupid
+samson
+police
+paradise
+motorola
+manager
+jaguar
+jackie
+family
+doctor
+bullshit
+brooklyn
+tigers
+stephanie
+slayer
+peaches
+miller
+heaven
+elizabeth
+bulldog
+animal
+789456
+scorpio
+rosebud
+qwerty12
+franklin
+claire
+american
 vincent
-Usuckballz1
-spooky
-qweasd
-cumshot
-free
-frankie
-douglas
-death
-1980
+testing
+pumpkin
+platinum
+louise
+kitten
+general
+united
+turtle
+marine
+icecream
+hacker
+darkness
+cristina
+colorado
+boomer
+alexandra
+steelers
+serenity
+please
+montana
+mitchell
+marcus
+lollipop
+jessie
+happy
+cowboy
+102030
+marshall
+jupiter
+jeremy
+gibson
+fucker
+barbara
+adrian
+1qazxsw2
+12344321
+11111
+startrek
+fishing
+digital
+christine
+business
+abcdefg
+nintendo
+genius
+12qwaszx
+walker
+q1w2e3
+player
+legend
+carmen
+booboo
+tomcat
+ronaldo
+people
+pamela
+marvin
+jackass
+google
+fender
+asdfghjk
+Password
+1q2w3e4r5t
+zaq12wsx
+scotland
+phantom
+hercules
+fluffy
+explorer
+alexis
+walter
+trouble
+tester
+qwerty1
+melanie
+manchester
+gordon
+firebird
+engineer
+azerty
+147258
+virginia
+tiger
+simpsons
+passion
+lakers
+james
+angelica
+55555
+vampire
+tiffany
+september
+private
+maximus
+loveme
+isabelle
+isabella
+eclipse
+dreamer
+changeme
+cassie
+badboy
+123456a
+stanley
+sniper
+rocket
+passport
+pandora
+justice
+infinity
+cookies
+barbie
+xavier
+unicorn
+superstar
+stephen
+rangers
+orlando
+money
+domino
+courtney
+viking
+tucker
+travis
+scarface
+pavilion
+nicolas
+natalie
+gandalf
+freddy
+donald
+captain
+abcdefgh
+a1b2c3d4
+speedy
+peter
+nissan
 loveyou
+harrison
+friday
+francis
+dancer
+159357
+101010
+spitfire
+saturn
+nemesis
+little
+dreams
+catherine
+brother
+birthday
+1111111
+wolverine
+victory
+student
+france
+fantasy
+enigma
+copper
+bonnie
+teresa
+mexico
+guinness
+georgia
+california
+sweety
+logitech
+julian
+hotdog
+emmanuel
+butter
+beatles
+11223344
+tristan
+sydney
+spirit
+october
+mozart
+lolita
+ireland
+goldfish
+eminem
+douglas
+cowboys
+control
+cheyenne
+alex
+testtest
+stargate
+raiders
+microsoft
+diesel
+debbie
+danger
+chance
+asdf
+anything
+aaaaaaaa
+welcome1
+qwert
+hahaha
+forest
+eternity
+disney
+denise
+carter
+alaska
+zzzzzz
+titanic
+shorty
+shelby
+pookie
+pantera
+england
+chris
+zachary
+westside
+tamara
+password123
+pass
+maryjane
+lincoln
+willie
+teacher
+pierre
+michael1
+leslie
+lawrence
+kristina
+kawasaki
+drowssap
+college
+blahblah
+babygirl
+avatar
+alicia
+regina
+qqqqqq
+poohbear
+miranda
+madonna
+florence
+sapphire
+norman
+hamilton
+greenday
+galaxy
+frankie
+black
+awesome
+suzuki
+spring
+qazwsxedc
+magnum
+lovers
+liberty
+gregory
+232323
+twilight
+timothy
+swimming
+super
+stardust
+sophia
+sharon
+robbie
+predator
+penelope
+michigan
+margaret
+jesus
+hawaii
+green
+brittany
+brenda
+badger
+a1b2c3
+444444
+winnie
+wesley
+voodoo
+skippy
+shithead
+redskins
+qwertyu
+pussycat
+houston
+horses
+gunner
+fireball
+donkey
+cherokee
+australia
+arizona
+1234abcd
+skyline
+power
+perfect
+lovelove
+kermit
+kenneth
+katrina
+eugene
+christ
+thailand
+support
+special
+runner
+lasvegas
+jason
+fuckme
+butthead
+blizzard
+athena
+abigail
+8675309
+violet
+tweety
+spanky
+shamrock
+red123
+rascal
+melody
+joanna
+hello1
+driver
+bluebird
+biteme
+atlantis
+arnold
+apple
+alison
+taurus
+random
+pirate
+monitor
+maria
+lizard
+kevin
+hummer
+holland
+buffalo
+147258369
+007007
+valentine
+roberto
+potter
+magnolia
+juventus
+indigo
+indian
+harvey
+duncan
+diamonds
+daniela
+christopher
+bradley
+bananas
+warcraft
+sunset
+simone
+renegade
+redsox
+philip
+monday
+mohammed
+indiana
+energy
+bond007
+avalon
+terminator
+skipper
+shopping
+scotty
+savannah
+raymond
+morris
+mnbvcxz
+michele
+lucky
+lucifer
+kingdom
+karina
+giovanni
+cynthia
+a123456
+147852
+12121212
+wildcats
+ronald
+portugal
+mike
+helpme
+froggy
+dragons
+cancer
+bullet
+beautiful
+alabama
+212121
+unknown
+sunflower
+sports
+siemens
+santiago
+kathleen
+hotmail
+hamster
+golfer
+future
+father
+enterprise
+clifford
+christina
+camille
+camaro
+beauty
+55555555
+vision
+tornado
+something
+rosemary
+qweasd
+patches
+magic
+helena
+denver
+cracker
+beaver
+basket
+atlanta
+vacation
+smiles
+ricardo
+pascal
+newton
+jeffrey
+jasmin
+january
+honey
+hollywood
+holiday
+gloria
+element
+chandler
+booger
+angelo
+allison
+action
+99999999
+target
+snowman
+miguel
+marley
+lorraine
+howard
+harmony
+children
+celtic
+beatrice
+airborne
+wicked
+voyager
+valentin
+thx1138
+thumper
+samurai
+moonlight
+mmmmmm
+karate
+kamikaze
+jamaica
+emerald
+bubble
+brooke
+zombie
+strawberry
+spooky
+software
+simpson
+service
+sarah
+racing
+qazxsw
+philips
+oscar
+minnie
+lalala
+ironman
+goddess
+extreme
+empire
+elaine
+drummer
+classic
+carrie
+berlin
+asdfg
+22222222
+valerie
+tintin
+therock
+sunday
+skywalker
+salvador
+pegasus
+panthers
+packers
+network
+mission
+mark
+legolas
+lacrosse
 kitty
 kelly
-veronica
-suzuki
-semperfi
-penguin
-mercury
-liberty
-spirit
-scotland
-natalie
-marley
-vikings
-system
-sucker
-king
-allison
-marshall
-1979
-098765
-qwerty12
-hummer
-adrian
-1985
-vfhbyf
-sandman
-rocky
-leslie
-antonio
-98765432
-4321
-softball
-passion
-mnbvcxz
-bastard
-passport
-horney
-rascal
-howard
-franklin
-bigred
-assman
-alexander
-homer
-redrum
-jupiter
-claudia
-55555555
-141414
-zaq12wsx
-shit
-patches
-nigger
-cunt
-raider
-infinity
-andre
-54321
-galore
-college
-russia
-kawasaki
-bishop
-77777777
-vladimir
-money1
-freeuser
-wildcats
-francis
-disney
-budlight
-brittany
-1994
-00000000
-sweet
-oksana
-honda
-domino
-bulldogs
-brutus
-swordfis
-norman
-monday
-jimmy
-ironman
-ford
-fantasy
-9999
-7654321
-PASSWORD
-hentai
-duncan
-cougar
-1977
-jeffrey
-house
-dancer
-brooke
-timothy
-super
-marines
-justice
-digger
-connor
-patriots
-karina
-202020
-molly
-everton
-tinker
-alicia
-rasdzv3
-poop
-pearljam
-stinky
-naughty
-colorado
-123123a
-water
-test123
-ncc1701d
-motorola
-ireland
-asdfg
-slut
-matt
-houston
-boogie
-zombie
-accord
-vision
-bradley
-reggie
-kermit
-froggy
-ducati
-avalon
-6666
-9379992
-sarah
-saints
-logitech
-chopper
-852456
-simpson
-madonna
-juventus
-claire
-159951
-zachary
-yfnfif
-wolverin
-warcraft
-hello123
-extreme
-penis
-peekaboo
-fireman
-eugene
-brenda
-123654789
-russell
-panthers
-georgia
-smith
-skyline
-jesus
-elizabet
-spiderma
-smooth
-pirate
-empire
-bullet
-8888
-virginia
-valentin
-psycho
-predator
-arizona
-134679
-mitchell
-alyssa
-vegeta
-titanic
-christ
-goblue
-fylhtq
-wolf
-mmmmmm
-kirill
-indian
-hiphop
-baxter
-awesome
-people
-danger
-roland
-mookie
-741852963
-1111111111
-dreamer
-bambam
-arnold
-1981
-skipper
-serega
-rolltide
-elvis
-changeme
-simon
-1q2w3e
-lovelove
-fktrcfylh
-denver
-tommy
-mine
-loverboy
-hobbes
-happy1
-alison
-nemesis
-chevelle
-cardinal
-burton
-wanker
-picard
-151515
-tweety
-michael1
-147852369
-12312
-xxxx
-windows
-turkey
-456789
-1974
-vfrcbv
-sublime
-1975
-galina
-bobby
-newport
-manutd
-daddy
-american
-alexandr
-1966
-victory
-rooster
-qqq111
-madmax
-electric
-bigcock
-a1b2c3
-wolfpack
-spring
-phpbb
-lalala
-suckme
-spiderman
-eric
-darkside
-classic
-raptor
-123456789q
-hendrix
-1982
-wombat
-avatar
-alpha
-zxc123
-crazy
-hard
-england
-brazil
-1978
-01011980
-wildcat
-polina
-freepass
-carrie
-99999999
-qaz123
-holiday
-fyfcnfcbz
-brother
-taurus
-shaggy
-raymond
-maksim
-gundam
-admin
-vagina
-pretty
-pickle
-good
-chronic
-alabama
-airplane
-22222222
-1976
-1029384756
-01011
-time
-sports
-ronaldo
-pandora
-cheyenne
-caesar
-billybob
-bigman
-1968
-124578
-snowman
-lawrence
-kenneth
-horse
-france
-bondage
-perfect
-kristen
-devils
-alpha1
-pussycat
-kodiak
-flowers
-1973
-01012000
-leather
-amber
-gracie
-chocolat
-bubba1
-catch22
-business
-2323
-1983
-cjkysirj
-1972
-123qweasd
-ytrewq
-wolves
-stingray
-ssssss
-serenity
-ronald
-greenday
-135790
-010101
-tiger1
-sunset
-charlie1
-berlin
-bbbbbb
-171717
-panzer
-lincoln
-katana
-firebird
-blizzard
-a1b2c3d4
-white
-sterling
-redhead
-password123
-candy
-anna
-142536
-sasha
-pyramid
-outlaw
-hercules
-garcia
-454545
-trevor
-teens
-maria
-kramer
-girl
-popeye
-pontiac
-hardon
-dude
-aaaaa
-323232
-tarheels
-honey
-cobra
-buddy1
-remember
-lickme
-detroit
-clinton
-basketball
-zeppelin
-whynot
-swimming
-strike
-service
-pavilion
-michele
-engineer
-dodgers
-britney
-bobafett
-adam
-741852
-21122112
-xxxxx
-robbie
-miranda
-456123
-future
-darkstar
-icecream
-connie
-1970
-jones
-hellfire
-fisher
-fireball
-apache
-fuckit
-blonde
-bigmac
-abcd
-morris
-angel1
-666999
-321321
-simone
-rockstar
-flash
-defender
-1967
-wallace
-trooper
-oscar
-norton
-casino
-cancer
-beauty
-weasel
-savage
-raven
-harvey
-bowling
-246810
-wutang
-theone
-swordfish
-stewart
-airforce
-abcdefgh
-nipples
-nastya
-jenny
-hacker
-753951
-amateur
-viktor
-srinivas
-maxima
-lennon
-freddie
-bluebird
-qazqaz
-presario
-pimp
-packard
-mouse
-looking
-lesbian
-jeff
-cheryl
-2001
-wrangler
-sandy
-machine
-lights
-eatme
-control
-tattoo
-precious
-harrison
-duke
-beach
-tornado
-tanner
-goldfish
-catfish
-openup
-manager
-1971
-street
-Soso123aljg
-roscoe
-paris
-natali
-light
-julian
-jerry
-dilbert
-dbrnjhbz
-chris1
-atlanta
-xfiles
-thailand
-sailor
-pussies
-pervert
-lucifer
-longhorn
-enjoy
-dragons
-young
-target
-elaine
-dustin
-123qweasdzxc
-student
-madman
-lisa
-integra
-wordpass
-prelude
-newton
-lolita
-ladies
-hawkeye
-corona
-bubble
-31415926
-trigger
-spike
-katie
-iloveu
-herman
-design
-cannon
-999999999
-video
-stealth
-shooter
-nfnmzyf
-hottie
-browns
-314159
-trucks
-malibu
-bruins
-bobcat
-barbie
-1964
-orlando
-letmein1
-freaky
-foobar
-cthutq
-baller
-unicorn
-scully
-pussy1
-potter
-cookies
-pppppp
-philip
-gogogo
-elena
-country
-assassin
-1010
-zaqwsx
-testtest
-peewee
-moose
-microsoft
-teacher
-sweety
-stefan
-stacey
-shotgun
-random
-laura
-hooker
-dfvgbh
-devildog
-chipper
-athena
-winnie
-valentina
-pegasus
-kristin
-fetish
-butterfly
-woody
-swinger
-seattle
-lonewolf
-joker
-booty
-babydoll
-atlantis
-tony
-powers
-polaris
-montreal
-angelina
-77777
-tickle
-regina
-pepsi
-gizmo
-express
-dollar
-squirt
-shamrock
-knicks
-hotstuff
-balls
-transam
-stinger
-smiley
-ryan
-redneck
-mistress
-hjvfirf
-cessna
-bunny
-toshiba
-single
-piglet
-fucked
-father
-deftones
-coyote
-castle
-cadillac
-blaster
-valerie
-samurai
-oicu812
-lindsay
-jasmin
-james1
-ficken
-blahblah
-birthday
-1234abcd
-01011990
-sunday
-manson
-flipper
-asdfghj
-181818
-wicked
-great
-daisy
-babes
-skeeter
-reaper
-maddie
-cavalier
-veronika
-trucker
-qazwsx123
-mustang1
-goldberg
-escort
-12345678910
-wolfgang
-rocks
-mylove
-mememe
-lancer
-ibanez
-travel
-sugar
-snake
-sister
-siemens
-savannah
-minnie
-leonardo
-basketba
-1963
-trumpet
-texas
-rocky1
-galaxy
-cristina
-aardvark
-shelly
-hotsex
-goldie
-fatboy
-benson
-321654
-141627
-sweetpea
-ronnie
-indigo
-13131313
-spartan
-roberto
-hesoyam
-freeman
-freedom1
-fredfred
-pizza
-manchester
-lestat
-kathleen
-hamilton
-erotic
-blabla
-22222
-1995
-skater
-pencil
-passwor
-larisa
-hornet
-hamlet
-gambit
-fuckyou2
-alfred
-456456
-sweetie
-marino
-lollol
-565656
-techno
-special
-renegade
-insane
-indiana
-farmer
-drpepper
-blondie
-bigboobs
-272727
-1a2b3c
-valera
-storm
-seven
-rose
-nick
-mister
-karate
-casey
-1qaz2wsx3edc
-1478963
-maiden
-julie
-curtis
-colors
-christia
-buckeyes
-13579
-0123456789
-toronto
-stephani
-pioneer
-kissme
-jungle
-jerome
-holland
-harry
-garden
-enterpri
-dragon1
-diamonds
-chrissy
-bigone
-343434
-wonder
-wetpussy
-subaru
-smitty
-racecar
-pascal
-morpheus
-joanne
-irina
-indians
-impala
-hamster
-charger
-change
-bigfoot
-babylon
-66666666
-timber
-redman
-pornstar
-bernie
-tomtom
-thuglife
-millie
-buckeye
-aaron
-virgin
-tristan
-stormy
-rusty
-pierre
-napoleon
-monkey1
-highland
-chiefs
-chandler
-catdog
-aurora
-1965
-trfnthbyf
-sampson
-nipple
-dudley
-cream
-consumer
-burger
-brandi
-welcome1
-triumph
-joejoe
-hunting
-dirty
-caserta
-brown
-aragorn
-363636
-mariah
-element
-chichi
-2121
-123qwe123
-wrinkle1
-smoke
-omega
-monika
-leonard
-justme
-hobbit
-gloria
-doggy
-chicks
-bass
-audrey
-951753
-51505150
-11235813
-sakura
-philips
-griffin
-butterfl
-artist
-66666
-island
-goforit
-emerald
-elizabeth
-anakin
-watson
-poison
-none
+jester
 italia
-callie
-bobbob
-autumn
-andreas
-123
-sherlock
-q12345
-pitbull
-marathon
-kelsey
-inside
-german
-blackie
-access14
-123asd
-zipper
-overlord
-nadine
-marie
-basket
-trombone
-stones
-sammie
-nugget
-naked
-kaiser
-isabelle
-huskers
-bomber
-barcelona
-babylon5
-babe
-alpine
-weed
-ultimate
-pebbles
-nicolas
-marion
-loser
-linda
-eddie
-wesley
-warlock
-tyler
-goddess
-fatcat
-energy
-david1
-bassman
-yankees1
-whore
-trojan
-trixie
-superfly
-kkkkkk
-ybrbnf
-warren
-sophia
-sidney
-pussys
-nicola
-campbell
-vfvjxrf
-singer
-shirley
-qawsed
-paladin
-martha
-karen
-help
-harold
-geronimo
-forget
-concrete
-191919
-westham
-soldier
-q1w2e3r4t5y6
-poiuyt
-nikki
-mario
-juice
-jessica1
-global
-dodger
-123454321
-webster
-titans
-tintin
-tarzan
-sexual
-sammy1
-portugal
-onelove
-marcel
-manuel
-madness
-jjjjjj
-holly
-christy
-424242
-yvonne
-sundance
-sex4me
-pleasure
-logan
-danny
-wwwwww
-truck
-spartak
-smile
-michel
-history
-Exigen
-65432
-1234321
-sherry
-sherman
-seminole
-rommel
-network
-ladybug
-isabella
-holden
-harris
-germany
-fktrctq
-cotton
-angelo
-14789632
-sergio
-qazxswedc
-moon
-jesus1
-trunks
-snakes
-sluts
-kingkong
-bluesky
-archie
-adgjmptw
-911911
-112358
-sunny
-suck
-snatch
-planet
-panama
-ncc1701e
-mongoose
-head
-hansolo
-desire
-alejandr
-1123581321
-whiskey
-waters
-teen
-party
-martina
-margaret
-january
-connect
+hiphop
+freeman
+charlie1
+cardinal
 bluemoon
-bianca
-andrei
-5555555
-smiles
-nolimit
-long
-assass
-abigail
-555666
-yomama
-rocker
-plastic
-katrina
-ghbdtnbr
-ferret
-emily
-bonehead
-blessed
-beagle
-asasas
-abgrtyu
-sticky
-olga
-japan
-jamaica
-home
-hector
-dddddd
-1961
-turbo
-stallion
-personal
-peace
-movie
-morrison
-joanna
-geheim
-finger
-cactus
-7895123
-susan
-super123
-spyder
-mission
-anything
-aleksandr
-zxcvb
-shalom
-rhbcnbyf
-pickles
-passat
-natalia
-moomoo
-jumper
-inferno
-dietcoke
-cumming
-cooldude
-chuck
-christop
-million
-lollipop
-fernando
-christian
-blue22
-bernard
-apple1
-unreal
-spunky
-ripper
-open
-niners
-letmein2
-flatron
-faster
-deedee
-bertha
-april
-4128
-01012010
-werewolf
-rubber
-punkrock
-orion
-mulder
-missy
-larry
-giovanni
-gggggg
-cdtnkfyf
-yoyoyo
-tottenha
-shaved
-newman
-lindsey
-joey
-hongkong
-freak
-daniela
-camera
-brianna
-blackcat
-a1234567
-1q1q1q
-zzzzzzzz
-stars
-pentium
-patton
-jamie
-hollywoo
-florence
-biscuit
-beetle
-andy
-always
-speed
-sailing
-phillip
-legion
-gn56gn56
-909090
-martini
-dream
-darren
-clifford
-2002
-stocking
-solomon
-silvia
-pirates
-office
-monitor
-monique
-milton
-matthew1
-maniac
-loulou
-jackoff
-immortal
-fossil
-dodge
-delta
-44444444
-121314
-sylvia
-sprite
-shadow1
-salmon
-diana
-shasta
-patriot
-palmer
-oxford
-nylons
-molly1
-irish
-holmes
-curious
-asdzxc
-1999
-makaveli
-kiki
-kennedy
-groovy
-foster
-drizzt
-twister
-snapper
-sebastia
-philly
-pacific
-jersey
-ilovesex
-dominic
-charlott
-carrot
-anthony1
-africa
-111222333
-sharks
-serena
-satan666
-maxmax
-maurice
-jacob
-gerald
-cosmos
-columbia
-colleen
-cjkywt
-cantona
-brooks
-99999
-787878
-rodney
-nasty
-keeper
-infantry
-frog
-french
-eternity
-dillon
-coolio
-condor
-anton
-waterloo
-velvet
-vanhalen
-teddy
-skywalke
-sheila
-sesame
-seinfeld
-funtime
-012345
-standard
-squirrel
-qazwsxed
-ninja
-kingdom
-grendel
-ghost
-fuckfuck
-damien
-crimson
-boeing
-bird
-biggie
-090909
-zaq123
-wolverine
-wolfman
-trains
-sweets
-sunrise
-maxine
-legolas
-jericho
-isabel
-foxtrot
-anal
-shogun
-search
-robinson
-rfrfirf
-ravens
-privet
-penny
-musicman
-memphis
-megadeth
-dogs
-butt
-brownie
-oldman
-graham
-grace
-505050
-verbatim
-support
-safety
-review
-newlife
-muscle
-herbert
-colt45
-bottom
-2525
-1q2w3e4r5t6y
-1960
-159159
-western
-twilight
-thanks
-suzanne
-potato
-pikachu
-murray
-master1
-marlin
-gilbert
-getsome
-fuckyou1
-dima
-denis
-789789
-456852
-stone
-stardust
-seven7
-peanuts
-obiwan
-mollie
-licker
-kansas
-frosty
-ball
-262626
-tarheel
-showtime
-roman
-markus
-maestro
-lobster
-darwin
-cindy
-chubby
-2468
-147896325
-tanker
-surfing
+bbbbbb
+bastard
+alyssa
+0123456789
+zeppelin
+tinker
+surfer
+smile
+rockstar
+operator
+naruto
+freddie
+dragonfly
+dickhead
+connor
+anaconda
+amsterdam
+alfred
+a12345
+789456123
+77777777
+trooper
 skittles
-showme
-shaney14
-qwerty12345
-magic1
-goblin
-fusion
-blades
-banshee
-alberto
-123321123
-123098
-powder
-malcolm
-intrepid
-garrett
-delete
-chaos
-bruno
-1701
-tequila
-short
-sandiego
-python
-punisher
-newpass
-iverson
-clayton
-amadeus
-1234567a
-stimpy
-sooners
-preston
-poopie
-photos
-neptune
-mirage
-harmony
-gold
-fighter
-dingdong
-cats
-whitney
-sucks
-slick
-rick
-ricardo
-princes
-liquid
-helena
-daytona
-clover
-blues
-anubis
-1996
-192837465
-starcraft
-roxanne
-pepsi1
-mushroom
-eatshit
-dagger
-cracker
-capital
-brendan
-blackdog
-25802580
-strider
-slapshot
-porter
-pink
-jason1
-hershey
-gothic
-flight
-ekaterina
-cody
-buffy
-boss
-bananas
-aaaaaaa
-123698745
-1234512345
-tracey
-miami
-kolobok
-danni
-chargers
-cccccc
-blue123
-bigguy
-33333333
-0.0.000
-warriors
-walnut
-raistlin
-ping
-miguel
-latino
-griffey
-green1
-gangster
-felix
-engine
-doodle
-coltrane
-byteme
-buck
-asdf123
-123456z
-0007
-vertigo
-tacobell
-shark
-portland
-penelope
-osiris
-nymets
-nookie
-mary
-lucky7
-lucas
-lester
-ledzep
-gorilla
-coco
-bugger
-bruce
-blood
-bentley
-battle
-1a2b3c4d
-19841984
-12369874
-weezer
-turner
-thegame
-stranger
-sally
-Mailcreated5240
-knights
-halflife
-ffffff
-dorothy
-dookie
-damian
-258456
-women
-trance
-qwerasdf
-playtime
-paradox
-monroe
-kangaroo
-henry
-dumbass
-dublin
-charly
-butler
-brasil
-blade
-blackman
-bender
-baggins
-wisdom
-tazman
-swallow
-stuart
-scruffy
-phoebe
-panasonic
-Michael
-masters
-ghjcnj
-firefly
-derrick
-christine
-beautiful
-auburn
-archer
-aliens
-161616
-1122
-woody1
-wheels
-test1
-spanking
-robin
-redred
-racerx
-postal
-parrot
-nimrod
-meridian
-madrid
-lonestar
-kittycat
-hell
-goodluck
-gangsta
-formula
-devil
-cassidy
-camille
-buttons
-bonjour
-bingo
-barcelon
-allen
-98765
-898989
-303030
-2020
-0000000
-tttttt
-tamara
-scoobydo
-samsam
-rjntyjr
-richie
-qwertz
-megaman
-luther
-jazz
-crusader
-bollox
-123qaz
-12312312
-102938
-window
-sprint
-sinner
-sadie
-rulez
-quality
-pooper
-pass123
-oakland
-misty
-lvbnhbq
-lady
-hannibal
-guardian
-grizzly
-fuckface
-finish
-discover
-collins
-catalina
-carson
-black1
-bang
-annie
-123987
-1122334455
-wookie
-volume
-tina
-rockon
-qwer
-molson
-marco
-californ
-angelica
-2424
-world
-william1
-stonecol
-shemale
-shazam
-picasso
+shalom
+raptor
+pioneer
+personal
+ncc1701
+nascar
+music
+kristen
+kingkong
+global
+geronimo
+germany
+country
+christmas
+bernard
+benson
+wrestling
+warren
+techno
+sunrise
+stefan
+sister
+savage
+russell
+robinson
 oracle
-moscow
-luke
-lorenzo
-kitkat
-johnjohn
-janice
-gerard
-flames
-duck
-dark
-celica
-445566
-234567
-yourmom
-topper
-stevie
-septembe
-scarlett
-santiago
-milano
-lowrider
-loving
-incubus
-dogdog
-anastasia
-1962
-123zxc
-vacation
-tempest
-sithlord
-scarlet
-rebels
-ragnarok
-prodigy
-mobile
+millie
+maddog
+lightning
+kingston
+kennedy
+hannibal
+garcia
+download
+dollar
+darkstar
+brutus
+bobby
+autumn
+webster
+vanilla
+undertaker
+tinkerbell
+sweetpea
+ssssss
+softball
+rafael
+panasonic
+pa55word
 keyboard
-golfing
-english
-carlo
-anime
-545454
-19921992
-11112222
-vfhecz
-sobaka
-shiloh
-penguins
-nuttertools
-mystery
-lorraine
-llllll
-lawyer
-kiss
-jeep
-gizmodo
-elwood
-dkflbvbh
-987456
-6751520
-12121
-titleist
-tardis
-tacoma
-smoker
-shaman
-rootbeer
-magnolia
-julia
-juan
-hoover
-gotcha
-dodgeram
-creampie
-buffett
-bridge
-aspirine
-456654
-socrates
-photo
-parola
-nopass
-megan
-lucy
-kenwood
-kenny
-imagine
-forgot
-cynthia
-blondes
-ashton
-aezakmi
-1234567q
-viper1
-terry
-sabine
-redalert
-qqqqqqqq
-munchkin
-monkeys
-mersedes
-melvin
-mallard
-lizzie
-imperial
-honda1
-gremlin
-gillian
-elliott
-defiant
-dadada
-cooler
-bond
-blueeyes
-birdman
-bigballs
-analsex
-753159
-zaq1xsw2
-xanadu
-weather
-violet
-sergei
-sebastian
-romeo
-research
-putter
-oooooo
+isabel
+hector
+fisher
+dominic
+darkside
+cleopatra
+blue
+assassin
+amelia
+vladimir
+roland
+nigger
 national
-lexmark
-hotboy
-greg
-garbage
-colombia
-chucky
-carpet
-bobo
-bobbie
-assfuck
-88888
-01012001
-smokin
-shaolin
-roger
-rammstein
-pussy69
-katerina
-hearts
-frogger
-freckles
-dogg
-dixie
-claude
-caliente
-amazon
-abcde
-1221
-wright
-willis
-spidey
-sleepy
-sirius
-santos
-rrrrrr
-randy
-picture
-payton
-mason
-dusty
-director
-celeste
-broken
-trebor
-sheena
-qazwsxedcrfv
-polo
+monique
+molly
+matthew1
+godfather
+frank
+curtis
+change
+central
+cartman
+brothers
+boogie
+archie
+warriors
+universe
+turkey
+topgun
+solomon
+sherry
+sakura
+rush2112
+qwaszx
+office
+mushroom
+monika
+marion
+lorenzo
+john
+herman
+connect
+chopper
+burton
+blondie
+bitch
+bigdaddy
+amber
+456789
+1a2b3c4d
+ultimate
+tequila
+tanner
+sweetie
+scott
+rocky
+popeye
+peterpan
+packard
+loverboy
+leonard
+jimmy
+harry
+griffin
+design
+buddha
+1
+wallace
+truelove
+trombone
+toronto
+tarzan
+shirley
+sammy
+pebbles
+natalia
+marcel
+malcolm
+madeline
+jerome
+gilbert
+gangster
+dingdong
+catalina
+buddy
+blazer
+billy
+bianca
+alejandro
+54321
+252525
+111222
+0000
+water
+sucker
+rooster
+potato
+norton
+lucky1
+loving
+lol123
+ladybug
+kittycat
+fuck
+forget
+flipper
+fireman
+digger
+bonjour
+baxter
+audrey
+aquarius
+1111111111
+pppppp
+planet
+pencil
+patriots
+oxford
+million
+martha
+lindsay
+laura
+jamesbond
+ihateyou
+goober
+giants
+garden
+diana
+cecilia
+brazil
+blessing
+bishop
+bigdog
+airplane
+Password1
+tomtom
+stingray
+psycho
+pickle
+outlaw
+number1
+mylove
+maurice
+madman
+maddie
+lester
+hendrix
+hellfire
+happy1
+guardian
+flamingo
+enter
+chichi
+0987654321
+western
+twister
+trumpet
+trixie
+socrates
+singer
+sergio
+sandman
+richmond
+piglet
+pass123
+osiris
+monkey1
+martina
+justine
+english
+electric
+church
+castle
+caesar
+birdie
+aurora
+artist
+amadeus
+alberto
+246810
+whitney
+thankyou
+sterling
+star
+ronnie
+pussy
+printer
+picasso
+munchkin
+morpheus
+madmax
+kaiser
+julius
+imperial
+happiness
+goodluck
+counter
+columbia
+campbell
+blessed
+blackjack
+alpha
+999999999
+142536
+wombat
+wildcat
+trevor
+telephone
+smiley
+saints
+pretty
 oblivion
-mustangs
+newcastle
+mariana
+janice
+israel
+imagine
+freedom1
+detroit
+deedee
+darren
+catfish
+adriana
+washington
+warlock
+valentina
+valencia
+thebest
+spectrum
+skater
+sheila
+shaggy
+poiuyt
+member
+jessica1
+jeremiah
+jack
+insane
+iloveu
+handsome
+goldberg
+gabriela
+elijah
+damien
+daisy
+buttons
+blabla
+bigboy
+apache
+anthony1
+a1234567
+xxxxxxxx
+toshiba
+tommy
+sailor
+peekaboo
+motherfucker
+montreal
+manuel
+madrid
+kramer
+katherine
+kangaroo
+jenny
+immortal
+harris
+hamlet
+gracie
+fucking
+firefly
+chocolat
+bentley
+account
+321321
+2222
+1a2b3c
+thompson
+theman
+strike
+stacey
+science
+running
+research
+polaris
+oklahoma
+mariposa
+marie
+leader
+julia
+island
+idontknow
+hitman
+german
+felipe
+fatcat
+fatboy
+defender
+applepie
+annette
+010203
+watson
+travel
+sublime
+stewart
+steve
+squirrel
+simon
+sexy
+pineapple
+phoebe
+paris
+panzer
+nadine
+master1
+mario
+kelsey
+joker
+hongkong
+gorilla
+dinosaur
+connie
+bowling
+bambam
+babydoll
+aragorn
+andreas
+456123
+151515
+wolves
+wolfgang
+turner
+semperfi
+reaper
+patience
+marilyn
+fletcher
+drpepper
+dorothy
+creation
+brian
+bluesky
+andre
+yankee
+wordpass
+sweet
+spunky
+sidney
+serena
+preston
+pauline
+passwort
+original
+nightmare
+miriam
+martinez
+labrador
+kristin
+kissme
+henry
+gerald
+garrett
+flash
+excalibur
+discovery
+dddddd
+danny
+collins
+casino
+broncos
+brendan
+brasil
+apple123
+yvonne
+wonder
+window
+tomato
+sundance
+sasha
+reggie
+redwings
+poison
+mypassword
+monopoly
+mariah
 margarita
-letsgo
-josh
-jimbob
-jimbo
+lionking
+king
+football1
+director
+darling
+bubba
+biscuit
+44444444
+wisdom
+vivian
+virgin
+sylvester
+street
+stones
+sprite
+spike
+single
+sherlock
+sandy
+rocker
+robin
+matt
+marianne
+linda
+lancelot
+jeanette
+hobbes
+fred
+ferret
+dodger
+cotton
+corona
+clayton
+celine
+cannabis
+bella
+andromeda
+7654321
+4444
+werewolf
+starcraft
+sampson
+redrum
+pyramid
+prodigy
+paul
+michel
+martini
+marathon
+longhorn
+leopard
+judith
+joanne
+jesus1
+inferno
+holly
+harold
+happy123
+esther
+dudley
+dragon1
+darwin
+clinton
+celeste
+catdog
+brucelee
+argentina
+alpine
+147852369
+wrangler
+william1
+vikings
+trigger
+stranger
+silvia
+shotgun
+scarlett
+scarlet
+redhead
+raider
+qweasdzxc
+playstation
+mystery
+morrison
+honda
+february
+fantasia
+designer
+coyote
+cool
+bulldogs
+bernie
+baby
+asdfghj
+angel1
+always
+adam
+202020
+wanker
+sullivan
+stealth
+skeeter
+saturday
+rodney
+prelude
+pingpong
+phillip
+peewee
+peanuts
+peace
+nugget
+newport
+myself
+mouse
+memphis
+lover
+lancer
+kristine
+james1
+hobbit
+halloween
+fuckyou1
+finger
+fearless
+dodgers
+delete
+cougar
+charmed
+cassandra
+caitlin
+bismillah
+believe
+alice
+airforce
+7777
+viper
+tony
+theodore
+sylvia
+suzanne
+starfish
+sparkle
+server
+samsam
+qweqwe
+public
+pass1234
+neptune
+marian
+krishna
+kkkkkk
+jungle
+cinnamon
+bitches
+741852
+trojan
+theresa
+sweetheart
+speaker
+salmon
+powers
+pizza
+overlord
+michaela
+meredith
+masters
+lindsey
+history
+farmer
+express
+escape
+cuddles
+carson
+candy
+buttercup
+brownie
+broken
+abc12345
+aardvark
+Passw0rd
+141414
+124578
+123789
+12345678910
+00000
+universal
+trinidad
+tobias
+thursday
+surfing
+stuart
+stinky
+standard
+roller
+porter
+pearljam
+mobile
+mirage
+markus
+loulou
+jjjjjj
+herbert
+grace
+goldie
+frosty
+fighter
+fatima
+evelyn
+eagle
+desire
+crimson
+coconut
+cheryl
+beavis
+anonymous
+andres
+africa
+134679
+whiskey
+velvet
+stormy
+springer
+soldier
+ragnarok
+portland
+oranges
+nobody
+nathalie
+malibu
+looking
+lemonade
+lavender
+hitler
+hearts
+gotohell
+gladiator
+gggggg
+freckles
+fashion
+david1
+crusader
+cosmos
+commando
+clover
+clarence
+center
+cadillac
+brooks
+bronco
+bonita
+babylon
+archer
+alexandre
+123654789
+verbatim
+umbrella
+thanks
+sunny
+stalker
+splinter
+sparrow
+selena
+russia
+roberts
+register
+qwert123
+penguins
+panda
+ncc1701d
+miracle
+melvin
+lonely
+lexmark
+kitkat
+julie
+graham
+frances
+estrella
+downtown
+doodle
+deborah
+cooler
+colombia
+chemistry
+cactus
+bridge
+bollocks
+beetle
+anastasia
+741852963
+69696969
+unique
+sweets
+station
+showtime
+sheena
+santos
+rock
+revolution
+reading
+qwerasdf
+password2
+mongoose
+marlene
+maiden
+machine
+juliet
+illusion
+hayden
+fabian
+derrick
+crazy
+cooldude
+chipper
+bomber
+blonde
+bigred
+amazing
+aliens
+abracadabra
+123qweasd
+wwwwww
+treasure
+timber
+smith
+shelly
+sesame
+pirates
+pinkfloyd
+passwords
+nature
+marlin
+marines
+linkinpark
+larissa
+laptop
+hotrod
+gambit
+elvis
+education
+dustin
+devils
+damian
+christy
+braves
+baller
+anarchy
+white
+valeria
+underground
+strong
+poopoo
+monalisa
+memory
+lizzie
+keeper
+justdoit
+house
+homer
+gerard
+ericsson
+emily
+divine
+colleen
+chelsea1
+cccccc
+camera
+bonbon
+billie
+bigfoot
+badass
+asterix
+anna
+animals
+andy
+achilles
+a1s2d3f4
+violin
+veronika
+vegeta
+tyler
+test1234
+teddybear
+tatiana
+sporting
+spartan
+shelley
+sharks
+respect
+raven
+pentium
+papillon
+nevermind
+marketing
+manson
+madness
+juliette
+jericho
+gabrielle
+fuckyou2
+forgot
+firewall
+faith
+evolution
+eric
+eduardo
+dagger
+cristian
+cavalier
+canadian
+bruno
+blowjob
+blackie
+beagle
+admin123
+010101
+together
+spongebob
+snakes
+sherman
+reddog
+reality
+ramona
+puppies
+pedro
+pacific
+pa55w0rd
+omega
+noodle
+murray
+mollie
+mister
+halflife
+franco
+foster
+formula1
+felix
+dragonball
+desiree
+default
+chris1
+bunny
+bobcat
+asdf123
+951753
+5555
+242424
+thirteen
+tattoo
+stonecold
+stinger
+shiloh
+seattle
+santana
+roger
+roberta
+rastaman
+pickles
+orion
+mustang1
+felicia
+dracula
+doggie
+cucumber
+cassidy
+britney
+brianna
+blaster
+belinda
+apple1
+753951
+teddy
+striker
+stevie
+soleil
+snake
+skateboard
+sheridan
+sexsex
+roxanne
+redman
+qqqqqqqq
+punisher
+panama
+paladin
+none
+lovelife
+lights
+jerry
+iverson
+inside
+hornet
+holden
+groovy
+gretchen
+grandma
+gangsta
+faster
+eddie
+chevelle
+chester1
+carrot
+cannon
+button
+administrator
+a
+1212
+zxc123
+wireless
+volleyball
+vietnam
+twinkle
+terror
+sandiego
+rose
+pokemon1
+picture
+parrot
+movies
+moose
+mirror
+milton
+mayday
+maestro
+lollypop
+katana
+johanna
+hunting
+hudson
+grizzly
+gorgeous
+garbage
+fish
+ernest
+dolores
+conrad
+chickens
+charity
+casey
+blueberry
+blackman
+blackbird
+bill
+beckham
+battle
+atlantic
+wildfire
+weasel
+waterloo
+trance
+storm
+singapore
+shooter
+rocknroll
+richie
+poop
+pitbull
+mississippi
+kisses
+karen
+juliana
+james123
+iguana
+homework
+highland
+fire
+elliot
+eldorado
+ducati
+discover
+computer1
+buddy1
+antonia
+alphabet
+159951
+123456789a
+1123581321
+0123456
+zaq1xsw2
+webmaster
+vagina
+unreal
+university
+tropical
+swimmer
+sugar
+southpark
+silence
+sammie
+ravens
+question
+presario
+poiuytrewq
+palmer
+notebook
+newman
+nebraska
+manutd
+lucas
+hermes
+gators
+dave
+dalton
+cheetah
+cedric
+camilla
+bullseye
+bridget
+bingo
+ashton
+123asd
+yahoo
+volume
+valhalla
+tomorrow
+starlight
+scruffy
+roscoe
+richard1
+positive
+plymouth
+pepsi
+patrick1
+paradox
+milano
+maxima
+loser
+lestat
+gizmo
+ghetto
+faithful
+emerson
+elliott
+dominique
+doberman
+dillon
+criminal
+crackers
+converse
+chrissy
+casanova
+blowme
+attitude
+66666666
+181818
+12345a
+098765
+zipper
+xfiles
+wonderful
+weather
+utopia
+tsunami
+stars
+shogun
+shit
+seven
+scooter1
+scoobydoo
+rochelle
+qazqaz
+qaz123
+punkrock
+onelove
+nokia
+nicola
+moomoo
+monkeys
+messenger
+marco
+lobster
+kentucky
+john316
+jake
+insomnia
+hooligan
+hawkeye
+gertrude
+freaky
+eleanor
+capricorn
+blueeyes
+blackberry
+blablabla
+balance
+anita
+allen
+aaron
+6969
+tiger1
+texas
+terminal
+snowflake
+sirius
+sanders
+safety
+revenge
+raphael
+poseidon
+paranoid
+noodles
+money1
+minerva
+mastermind
+light
+library
+laurence
+jersey
+istanbul
+guest
+ghost
+games
+frederic
+forrest
+ffffff
+doomsday
+dancing
+courage
+chronic
+chanel
+bradford
+bonehead
+blacky
+apollo13
+answer
+alessandro
+accord
+aaaaaaa
+westwood
+warning
+supernova
+strider
+satan666
+reynolds
+qazwsx123
+q1w2e3r4t5
+penis
+number
+mookie
+monroe
+megaman
+mckenzie
+magician
+larry
+kipper
+jellybean
+jayjay
+jamie
+innocent
+hotstuff
+hooters
+hershey
+gremlin
+fusion
+fountain
+foobar
+flyers
+flames
+firefox
+death
+deadman
+daddy
+cupcake
+concrete
+charly
+charger
+chaos
+chacha
+cartoon
+capslock
+boobies
+bloody
+aussie
+april
+abcd
+tracey
+susan
+sultan
+snuggles
+rommel
+promise
+professor
+pontiac
+nellie
+misty
+mermaid
+megadeth
+medicine
+lisa
+lionheart
+lennon
+laurie
+kelvin
+jackson1
+intrepid
+horizon
+highlander
+hassan
+green123
+goodman
+geoffrey
+francisco
+fossil
+exodus
+dynamite
+delta
+columbus
+cobra
+cinderella
+chemical
+chargers
+burger
+blues
+blossom
+bigmac
+banshee
+amazon
+aaaa
+13579
+young
+vertigo
+username
+tootsie
+theone
+tabitha
+superman1
+subaru
+stone
+sherwood
+shark
+secure
+sailing
+pisces
+picard
+nick
+natural
+moonbeam
+meowmeow
+maxine
+matthias
+matilda
+llllll
+kickass
+kenny
+kansas
+josephine
+jeff
+jacob
+jackson5
+incubus
+honolulu
+free
+eileen
+edwards
+dream
+diamond1
+desmond
+crawford
+claude
+carina
+brown
+broadway
+benny
+bear
+backspace
+assman
+asdfjkl
+asdasdasd
+alpha1
+555666
+zzzzzzzz
+woody
+whocares
+whisper
+watermelon
+svetlana
+southern
+sommer
+someone
+rocky1
+qwertz
+president
+pleasure
+pimpin
+painter
+nikki
+nguyen
+myname
+missy
+mellon
+makaveli
+journey
+jeanne
+honeybee
+gothic
+goodbye
+francois
+eureka
+cindy
+chicken1
+bryant
+bright
+bookworm
+bob
+PASSWORD
+456456
+33333333
+woodstock
+wendy
+tuesday
+trunks
+titans
+sunlight
+stallion
+smoke
+seven7
+sally
+redneck
+randy
+quality
+naughty
+mohamed
+katie
+kathryn
+katerina
+jefferson
+jackpot
+international
+hidden
+hellokitty
+hedgehog
+happyday
+grumpy
+frederick
+fortune
+fallen
+demon
+davidson
+dangerous
+clement
+cerberus
+carol
+candle
+blackcat
+biology
+beloved
+arsenal1
+annie
+angel123
+abraham
+aaaaa
+171717
+10101010
+0000000
+zigzag
+yolanda
+typhoon
+turbo
+training
+smooth
+rodrigo
+roadrunner
+republic
+recovery
+patriot
+pacman
+molly1
+maradona
+lollol
+legion
+keith
+jennie
+javier
+intruder
+hermione
+health
+hastings
+granny
+goldstar
+fredfred
+fiesta
+federico
+everton
+escort
+eleven
+deftones
+cyclone
+commander
+chuck
+chevrolet
+butler
+blackout
+billabong
+bigtits
+bennett
+alexia
+abc
+789789
+454545
+1234567a
+1234554321
+yoyoyo
+yesterday
+wolfpack
+thunder1
+tacobell
+sweetness
+spyder
+solution
+shanghai
+satellite
+sabine
+rusty
+rootbeer
+romance
+pikachu
+phillips
+parola
+oakley
+nancy
+mystic
+mulder
+morning
+monsters
+melinda
+megan
+maximum
+mary
+marissa
+love123
+lorena
+lonewolf
+krista
+kirsten
+keystone
+kendall
+johannes
 janine
 jackal
-iforgot
-hallo
-fatass
-deadhead
-abc12
-zxcv1234
-willy
-stud
-slappy
-roberts
-rescue
-porkchop
-noodles
-nellie
-mypass
-mikey
-marvel
-laurie
-grateful
-fuck_inside
-formula1
-Dragon
-cxfcnmt
-bridget
-aussie
-asterix
-a1s2d3f4
-23232323
-123321q
-veritas
-spankme
-shopping
-roller
-rogers
-queen
-peterpan
-palace
-melinda
-martinez
-lonely
-kristi
-justdoit
-goodtime
-frances
-camel
-beckham
-atomic
-alexandra
-active
-223344
-vanilla
-thankyou
-springer
-sommer
-Software
-sapphire
-richmond
-printer
-ohyeah
-massive
-lemons
-kingston
-granny
-funfun
-evelyn
-donnie
-deanna
-brucelee
-bosco
-aggies
-313131
-wayne
-thunder1
-throat
-temple
-smudge
-qqqq
-qawsedrf
-plymouth
-pacman
-myself
-mariners
-israel
-hitler
-heather1
-faith
-Exigent
-clancy
-chelsea1
-353535
-282828
-123456qwerty
-tobias
-tatyana
-stuff
-spectrum
-sooner
-shitty
-sasha1
-pooh
-pineappl
-mandy
-labrador
-kisses
-katrin
-kasper
-kaktus
-harder
-eduard
-dylan
-dead
-chloe
-astros
-1234567890q
-10101010
-stephanie
-satan
-hudson
-commando
-bones
-bangkok
-amsterdam
-1959
-webmaster
-valley
-space
-southern
-rusty1
-punkin
-napass
-marian
-magnus
-lesbians
-krishna
-hungry
-hhhhhh
-fuckers
-fletcher
-content
-account
-906090
-thompson
-simba
-scream
-q1q1q1
-primus
-Passw0rd
-mature
-ivanov
-husker
-homerun
-esther
-ernest
-champs
-celtics
-candyman
-bush
-boner
-asian
-aquarius
-33333
-zxcv
-starfish
-pics
-peugeot
-painter
-monopoly
-lick
-infiniti
-goodbye
-gangbang
-fatman
-darling
-celine
-camelot
-boat
-blackjac
-barkley
-area51
-8J4yE3Uz
-789654
-19871987
-0000000000
-vader
-shelley
-scrappy
-sarah1
-sailboat
-richard1
-moloko
-method
-mama
-kyle
-kicker
-keith
-judith
-john316
-horndog
-godsmack
-flyboy
-emmanuel
-drago
-cosworth
-blake
-19891989
-writer
-usa123
-topdog
-timmy
-speaker
-rosemary
-pancho
-night
-melody
-lightnin
-life
-hidden
-gator
-farside
-falcons
-desert
-chevrole
-catherin
-carolyn
-bowler
-anders
-666777
-369369
-yesyes
-sabbath
-qwerty123456
-power1
-pete
-oscar1
-ludwig
-jammer
-frontier
-fallen
-dance
-bryan
-asshole1
-amber1
-aaa111
-123457
-01011991
-terror
-telefon
-strong
-spartans
-sara
-odessa
-luckydog
-frank1
-elijah
-chang
-center
-bull
-blacks
-15426378
-132435
-vivian
-tanya
-swingers
-stick
-snuggles
-sanchez
-redbull
-reality
-qwertyuio
-qwert123
-mandingo
-ihateyou
-hayden
-goose
-franco
-forrest
-double
-carol
-bohica
-bell
-beefcake
-beatrice
-avenger
-andrew1
-anarchy
-963852
-1366613
-111111111
-whocares
-scooter1
-rbhbkk
-matilda
-labtec
-kevin1
-jojo
-jesse
-hermes
-fitness
-doberman
-dawg
-clitoris
-camels
-5555555555
-1957
-vulcan
-vectra
-topcat
-theking
-skiing
-nokia
-muppet
-moocow
-leopard
-kelley
-ivan
-grover
-gjkbyf
-filter
-elvis1
-delta1
-dannyboy
-conrad
-children
-catcat
-bossman
-bacon
-amelia
-alice
-2222222
-viktoria
-valhalla
-tricky
-terminator
-soccer1
-ramona
-puppy
-popopo
-oklahoma
-ncc1701a
-mystic
-loveit
-looker
-latin
-laptop
-laguna
-keystone
-iguana
-herbie
-cupcake
-clarence
-bunghole
-blacky
-bennett
-bart
-19751975
-12332
-000007
-vette
-trojans
-today
-romashka
-puppies
-possum
-pa55word
-oakley
-moneys
-kingpin
-golfball
-funny
-doughboy
-dalton
-crash
-charlotte
-carlton
-breeze
-billie
-beast
-achilles
-tatiana
-studio
-sterlin
-plumber
-patrick1
-miles
-kotenok
-homers
-gbpltw
-gateway1
-franky
-durango
-drake
-deeznuts
-cowboys1
-ccbill
-brando
-9876543210
-zzzz
-zxczxc
-vkontakte
-tyrone
-skinny
-rookie
-qwqwqw
-phillies
-lespaul
-juliet
-jeremiah
-igor
-homer1
-dilligaf
-caitlin
-budman
-atlantic
-989898
-362436
-19851985
-vfrcbvrf
-verona
-technics
-svetik
-stripper
-soleil
-september
-pinkfloy
-noodle
-metal
-maynard
-maryland
-kentucky
-hastings
-gang
-frederic
-engage
-eileen
-butthole
-bone
-azsxdc
-agent007
-474747
-19911991
-01011985
-triton
-tractor
-somethin
-snow
-shane
-sassy
-sabina
-russian
-porsche9
-pistol
-justine
-hurrican
-gopher
-deadman
-cutter
-coolman
-command
-chase
-california
-boris
-bicycle
-bethany
-bearbear
-babyboy
-73501505
-123456k
-zvezda
-vortex
-vipers
-tuesday
-traffic
-toto
-star69
-server
-ready
-rafael
-omega1
-nathalie
-microlab
-killme
-jrcfyf
-gizmo1
-function
-freaks
-flamingo
-enterprise
-eleven
-doobie
-deskjet
-cuddles
-church
-breast
-19941994
-19781978
-1225
-01011970
-vladik
-unknown
-truelove
-sweden
-striker
-stoner
-sony
-SaUn
-ranger1
-qqqqq
-pauline
-nebraska
-meatball
-marilyn
-jethro
-hammers
-gustav
-escape
-elliot
-dogman
-chair
-brothers
-boots
-blow
-bella
-belinda
-babies
-1414
-titties
-syracuse
-river
-polska
-pilot
-oilers
-nofear
-military
-macdaddy
-hawk
-diamond1
-dddd
-danila
-central
-annette
-128500
-zxcasd
-warhammer
-universe
-splash
-smut
-sentinel
-rayray
-randall
-Password1
-panda
-nevada
-mighty
-meghan
-mayday
-manchest
-madden
-kamikaze
-jennie
-iloveyo
-hustler
-hunter1
-horny1
-handsome
-dthjybrf
-designer
-demon
-cheers
-cash
-cancel
-blueblue
-bigger
-australia
-asdfjkl
-321654987
-1qaz1qaz
-1955
-1234qwe
-01011981
-zaphod
-ultima
-tolkien
-Thomas
-thekid
-tdutybq
-summit
-select
-saint
-rockets
-rhonda
-retard
-rebel
-ralph
-poncho
-pokemon1
-play
-pantyhos
-nina
-momoney
-market
-lickit
-leader
-kong
-jenna
-jayjay
-javier
-eatpussy
-dracula
-dawson
-daniil
-cartoon
-capone
-bubbas
-789123
-19861986
-01011986
-zxzxzx
-wendy
-tree
-superstar
-super1
-ssssssss
-sonic
-sinatra
-scottie
-sasasa
-rush
-robert1
-rjirfrgbde
-reagan
-meatloaf
-lifetime
-jimmy1
-jamesbon
-houses
-hilton
-gofish
-charmed
-bowser
-betty
-525252
-123456789z
-1066
-woofwoof
-Turkey50
-santana
-rugby
-rfnthbyf
-miracle
-mailman
-lansing
-kathryn
-Jennifer
-giant
-front242
-firefox
-check
-boxing
-bogdan
-bizkit
-azamat
-apollo13
-alan
-zidane
-tracy
-tinman
-terminal
-starbuck
-redhot
-oregon
-memory
-lewis
-lancelot
-illini
-grandma
-govols
-gordon24
-giorgi
-feet
-fatima
-crunch
-creamy
-coke
-cabbage
-bryant
-brandon1
-bigmoney
-azsxdcfv
-3333333
-321123
-warlord
-station
-sayang
-rotten
-rightnow
-mojo
-models
-maradona
-lololo
-lionking
-jarhead
-hehehe
-gary
-fast
-exodus
-crazybab
-conner
-charlton
-catman
-casey1
-bonita
-arjay
-19931993
-19901990
-1001
-100000
-sticks
-poiuytrewq
-peters
-passwort
-orioles
-oranges
-marissa
-japanese
-holyshit
-hohoho
-gogo
-fabian
-donna
-cutlass
-cthulhu
-chewie
-chacha
-bradford
-bigtime
-aikido
-4runner
-21212121
-150781
-wildfire
-utopia
-sport
-sexygirl
-rereirf
-reebok
-raven1
-poontang
-poodle
-movies
-microsof
-grumpy
-eeyore
-down
-dong
-chocolate
-chickens
-butch
-arsenal1
-adult
-adriana
-19831983
-zzzzz
-volley
-tootsie
-sparkle
-software
-sexx
-scotch
-science
-rovers
-nnnnnn
-mellon
-legacy
-julius
-helen
-happyday
-fubar
-danie
-cancun
-br0d3r
-beverly
-beaner
-aberdeen
-44444
-19951995
-13243546
-123456aa
-wilbur
-treasure
-tomato
-theodore
-shania
-raiders1
-natural
-kume
-kathy
-hamburg
-gretchen
-frisco
-ericsson
-daddy1
-cosmo
-condom
-comics
-coconut
-cocks
-Check
-camilla
-bikini
-albatros
-1Passwor
-1958
-1919
-143143
-0.0.0.000
-zxcasdqwe
-zaqxsw
-whisper
-vfvekz
-tyler1
-Sojdlg123aljg
-sixers
-sexsexsex
-rfhbyf
-profit
-okokok
-nancy
-mikemike
-michaela
-memorex
-marlene
-kristy
-jose
-jackson1
-hope
-hailey
-fugazi
-fright
-figaro
-excalibu
-elvira
-dildo
-denali
-cruise
-cooter
-cheng
-candle
-bitch1
-attack
-armani
-anhyeuem
-78945612
-222333
-zenith
-walleye
-tsunami
-trinidad
-thomas1
-temp
-tammy
-sultan
-steve1
-slacker
-selena
-samiam
-revenge
-pooppoop
-pillow
-nobody
-kitty1
-killer1
-jojojo
-huskies
-greens
-greenbay
-greatone
-fuckin
-fortuna
-fordf150
-first
-fashion
-fart
-emerson
-davis
-cloud9
-china
-boob
-applepie
-alien
-963852741
-321456
-292929
-1998
-1956
-18436572
-tasha
-stocks
-rustam
-rfrnec
-piccolo
-orgasm
-milana
-marisa
-marcos
-malaka
-lisalisa
-kelly1
-hithere
-harley1
-hardrock
-flying
-fernand
-dinosaur
-corrado
-coleman
-clapton
-chief
-bloody
-anfield
-636363
-420247
-332211
-voyeur
-toby
-texas1
-surf
-steele
-running
-rastaman
-pa55w0rd
-oleg
-number1
-maxell
-madeline
-keywest
-junebug
-ingrid
-hollywood
-hellyeah
-hayley
-goku
-felicia
-eeeeee
-dicks
-dfkthbz
-dana
-daisy1
-columbus
-charli
-bonsai
-billy1
-aspire
-9999999
-987987
-50cent
-000001
-xxxxxxx
-wolfie
-viagra
-vfksirf
-vernon
-tang
-swimmer
-subway
-stolen
-sparta
-slutty
-skywalker
-sean
-sausage
-rockhard
-ricky
-positive
-nyjets
-miriam
-melissa1
-krista
-kipper
-kcj9wx5n
-jedi
-jazzman
-hyperion
-happy123
-gotohell
-garage
-football1
-fingers
-february
-faggot
-easy
-dragoon
-crazy1
-clemson
-chanel
-canon
-bootie
-balloon
-abc12345
-609609609
-456321
-404040
-162534
-yosemite
-slider
-shado
-sandro
-roadkill
-quincy
-pedro
-mayhem
-lion
-knopka
-kingfish
-jerkoff
+horse
 hopper
-everest
-ddddddd
-damnit
-cunts
-chevy1
-cheetah
-chaser
-billyboy
-bigbird
-bbbb
-789987
-1qa2ws3ed
-1954
-135246
-123789456
-122333
-1000
-050505
-wibble
-valeria
-tunafish
-trident
-thor
-tekken
-tara
-starship
-slave
-saratoga
-romance
-robotech
-rich
-rasputin
-rangers1
-powell
-poppop
-passwords
-p0015123
-nwo4life
-murder
-milena
-midget
-megapass
-lucky13
-lolipop
-koshka
-kenworth
-jonjon
-jenny1
-irish1
-hedgehog
-guiness
-gmoney
-ghetto
-fortune
-emily1
-duster
-ding
-davidson
-davids
-dammit
-dale
-crysis
-bogart
-anaconda
-alibaba
-airbus
-7753191
-515151
-20102010
-200000
-123123q
-12131415
-10203
-work
-wood
-vladislav
-vfczyz
-tundra
-Translator
-torres
-splinter
-spears
-richards
-rachael
-pussie
-phoenix1
-pearl
-monty
-lolo
-lkjhgf
-leelee
-karolina
-johanna
-jensen
-helloo
-harper
-hal9000
-fletch
-feather
-fang
-dfkthf
-depeche
-barsik
-789789789
-757575
-727272
-zorro
-xtreme
-woman
-vitalik
-vermont
-train
-theboss
-sword
-shearer
-sanders
-railroad
-qwer123
-pupsik
-pornos
-pippen
-pingpong
-nikola
-nguyen
-music1
-magicman
-killbill
-kickass
-kenshin
-katie1
-juggalo
-jayhawk
-java
-grapes
-fritz
-drew
-divine
-cyclops
-critter
-coucou
-cecilia
-bristol
-bigsexy
-allsop
-9876
-1230
-01011989
-wrestlin
-twisted
-trout
-tommyboy
-stefano
-song
-skydive
-sherwood
-passpass
-pass1234
-onlyme
-malina
-majestic
-macross
-lillian
-heart
-guest
-gabrie
-fuckthis
-freeporn
-dinamo
-deborah
-crawford
-clipper
-city
-better
-bears
-bangbang
-asdasdasd
-artemis
-angie
-admiral
-2003
-020202
-yousuck
-xbox360
-werner
-vector
-usmc
-umbrella
-tool
-strange
-sparks
-spank
-smelly
-small
-salvador
-sabres
-rupert
-ramses
-presto
-pompey
-operator
-nudist
-ne1469
-minime
-matador
-love69
-kendall
-jordan1
-jeanette
-hooter
-hansen
-gunners
-gonzo
-gggggggg
-fktrcfylhf
-facial
-deepthroat
-daniel1
-dang
-cruiser
-cinnamon
-cigars
-chico
-chester1
-carl
-caramel
-calico
-broadway
-batman1
-baddog
-778899
-2128506
-123456r
-0420
-01011988
-z1x2c3
-wassup
-wally
-vh5150
-underdog
-thesims
-thecat
-sunnyday
-snoopdog
-sandy1
-pooter
-multiplelo
-magick
-library
-kungfu
-kirsten
-kimber
-jean
-jasmine1
-hotshot
-gringo
-fowler
-emma
-duchess
-damage
-cyclone
-Computer
-chong
-chemical
-chainsaw
-caveman
-catherine
-carrera
-canadian
-buster1
-brighton
-back
-australi
-animals
-alliance
-albion
-969696
-555777
-19721972
-19691969
-1024
-trisha
-theresa
-supersta
-steph
-static
-snowboar
-sex123
-scratch
-retired
-rambler
-r2d2c3po
-quantum
-passme
-over
-newbie
-mybaby
-musica
-misfit
-mechanic
-mattie
-mathew
-mamapapa
-looser
-jabroni
-isaiah
-heyhey
-hank
-hang
-golfgolf
-ghjcnjnfr
-frozen
-forfun
-fffff
-downtown
-coolguy
-cohiba
-christopher
-chivas
-chicken1
-bullseye
-boys
-bottle
-bob123
-blueboy
-believe
-becky
-beanie
-20002000
-yzerman
-west
-village
-vietnam
-trader
-summer1
-stereo
-spurs
-solnce
-smegma
-skorpion
-saturday
-samara
-safari
-renault
-rctybz
-peterson
-paper
-meredith
-marc
-louis
-lkjhgfdsa
-ktyjxrf
-kill
-kids
-jjjj
-ivanova
-hotred
-goalie
-fishes
-eastside
-cypress
-cyber
-credit
-brad
-blackhaw
-beastie
-banker
-backdoor
-again
-192837
-112211
-westwood
-venus
-steeler
-spawn
-sneakers
-snapple
-snake1
-sims
-sharky
-sexxxx
-seeker
-scania
-sapper
-route66
-Robert
-q123456
-Passwor1
-mnbvcx
-mirror
-maureen
-marino13
-jamesbond
-jade
-horizon
-haha
-getmoney
-flounder
-fiesta
-europa
-direct
-dean
-compute
-chrono
-chad
-boomboom
-bobby1
-bing
-beerbeer
-apple123
-andres
-8888888
-777888
-333666
-1357
-12345z
-030303
-01011987
-01011984
-wolf359
-whitey
-undertaker
-topher
-tommy1
-tabitha
-stroke
-staples
-sinclair
-silence
-scout
-scanner
-samsung1
-rain
-poetry
-pisces
-phil
-peter1
-packer
-outkast
-nike
-moneyman
-mmmmmmmm
-ming
-marianne
-magpie
-love123
-kahuna
-jokers
-jjjjjjjj
-groucho
-goodman
-gargoyle
-fuckher
-florian
-federico
-droopy
-dorian
-donuts
-ddddd
-cinder
-buttman
-benny
-barry
-amsterda
-alfa
-656565
-1x2zkg8w
-19881988
-19741974
-zerocool
-walrus
-walmart
-vfvfgfgf
-user
-typhoon
-test1234
-studly
-Shadow
-sexy69
-sadie1
-rtyuehe
-rosie
-qwert1
-nipper
-maximum
-klingon
-jess
-idontknow
-heidi
-hahahaha
-gggg
-fucku2
-floppy
-flash1
-fghtkm
-erotica
-erik
-doodoo
-dharma
-deniska
-deacon
-daphne
-daewoo
-dada
-charley
-cambiami
-bimmer
-bike
-bigbear
-alucard
-absolut
-a123456789
-4121
-19731973
-070707
-03082006
-02071986
-vfhufhbnf
-sinbad
-secret1
-second
-seamus
-renee
-redfish
-rabota
-pudding
-pppppppp
-patty
-paint
-ocean
-number
-nature
-motherlode
-micron
-maxx
-massimo
-losers
-lokomotiv
-ling
-kristine
-kostya
-korn
-goldstar
-gegcbr
-floyd
-fallout
-dawn
-custom
-christina
-chrisbln
-button
-bonkers
-bogey
-belle
-bbbbb
-barber
-audia4
-america1
-abraham
-585858
-414141
-336699
-20012001
-12345678q
-0123
-whitesox
-whatsup
-usnavy
-tuan
-titty
-titanium
-thursday
-thirteen
-tazmania
-steel
-starfire
-sparrow
-skidoo
-senior
-reading
-qwerqwer
-qazwsx12
-peyton
-panasoni
-paintbal
-newcastl
-marius
-italian
-hotpussy
-holly1
-goliath
-giuseppe
-frodo
-fresh
-buckshot
-bounce
-babyblue
-attitude
-answer
-90210
-575757
-10203040
-1012
-01011910
-ybrjkfq
-wasser
-tyson
-Superman
-sunflowe
-steam
-ssss
-sound
-solution
-snoop
-shou
-shawn
-sasuke
-rules
-royals
-rivers
-respect
-poppy
-phillips
-olivier
-moose1
-mondeo
-mmmm
-knickers
-hoosier
-greece
-grant
-godfather
-freeze
-europe
-erica
-doogie
-danzig
-dalejr
-contact
-clarinet
-champ
-briana
-bluedog
-backup
-assholes
-allmine
-aaliyah
-12345679
-100100
-zigzag
-whisky
-weaver
-truman
-tomorrow
-tight
-theend
-start
-southpark
-sersolution
-roberta
-rhfcjnrf
-qwerty1234
-quartz
-premier
-paintball
-montgom240
-mommy
-mittens
-micheal
-maggot
-loco
-laurel
-lamont
-karma
-journey
-johannes
-intruder
-insert
-hairy
-hacked
-groove
-gesperrt
-francois
-focus
-felipe
-eternal
-edwards
-doug
-dollars
-dkflbckfd
-dfktynbyf
-demons
-deejay
-cubbies
-christie
-celeron
-cat123
-carbon
-callaway
-bucket
-albina
-2004
-19821982
-19811981
-1515
-12qw34er
-123qwerty
-123aaa
-10101
-1007
-080808
-zeus
-warthog
-tights
-simona
-shun
-salamander
-resident
-reefer
-racer
-quattro
-public
-poseidon
-pianoman
-nonono
-michell
-mellow
-luis
-jillian
-havefun
-gunnar
-goofy
-futbol
-fucku
-eduardo
-diehard
-dian
-chuckles
-carla
-carina
-avalanch
-artur
-allstar
-abc1234
-abby
-4545
-1q2w3e4r5
-125125
-123451
-ziggy
-yumyum
-working
-what
-wang
-wagner
-volvo
-ufkbyf
-twinkle
-susanne
-superman1
-sunshin
-strip
-searay
-rockford
-radio
-qwertyqwerty
-proxy
-prophet
-ou8122
-oasis
-mylife
-monke
-monaco
-meowmeow
-meathead
-Master
-leanne
-kang
-joyjoy
-joker1
-filthy
-emmitt
-craig
-cornell
-changed
-cbr600
-builder
-budweise
-boobie
-bobobo
-biggles
-bigass
-bertie
-amanda1
-a1s2d3
-784512
-767676
-235689
-1953
-19411945
-14725836
-11223
-01091989
-01011992
-zero
-vegas
-twins
-turbo1
-triangle
-thongs
-thanatos
-sting
-starman
-spike1
-smokes
-shai
-sexyman
-sex
-scuba
-runescape
-phish
-pepper1
-padres
-nitram
-nickel
-napster
-lord
-jewels
-jeanne
-gretzky
-great1
-gladiator
-crjhgbjy
-chuang
-chou
-blossom
-bean
-barefoot
-alina
-787898
-567890
-5551212
-25252525
-02071982
-zxcvbnm1
-zhong
-woohoo
-welder
-viewsonic
-venice
-usarmy
-trial
-traveler
-together
-team
-tango
-swords
-starter
-sputnik
-spongebob
-slinky
-rover
-ripken
-rasta
-prissy
-pinhead
-papa
-pants
-original
-mustard
-more
-mohammed
-mian
-medicine
-mazafaka
-lance
-juliette
-james007
-hawkeyes
-goodboy
-gong
-footbal
-feng
-derek
-deeznutz
-dante
-combat
-cicero
-chun
-cerberus
-beretta
-bengals
-beaches
-3232
-135792468
-12345qwe
-01234567
-01011975
-zxasqw12
-xxx123
-xander
-will
-watcher
-thedog
-terrapin
-stoney
-stacy
-something
-shang
-secure
-rooney
-rodman
-redwing
-quan
-pony
-pobeda
-pissing
-philippe
-overkill
-monalisa
-mishka
-lions
-lionel
-leonid
-krystal
-kosmos
-jessic
-jane
-illusion
-hoosiers
-hayabusa
-greene
-gfhjkm123
-games
-francesc
-enter1
+gustavo
+grateful
+figaro
+easter
+dublin
+donovan
+continue
 confused
-cobra1
-clevelan
-cedric
-carole
-busted
-bonbon
-barrett
-banane
-badgirl
+condor
+chubby
+chase
+caramel
+bubba1
+brighton
+blades
+bethany
+asdzxc
 antoine
-7779311
-311311
-2345
-187187
-123456s
-123456654321
-1005
-0987
-01011993
-zippy
-zhei
-vinnie
-tttttttt
-stunner
-stoned
-smoking
-smeghead
-sacred
-redwood
-Pussy1
-moonlight
-momomo
-mimi
-megatron
-massage
-looney
-johnboy
-janet
-jagger
-jacob1
-hurley
-hong
-hihihi
-helmet
-heckfy
-hambone
-gollum
-gaston
-f**k
-death1
-Charlie
-chao
-cfitymrf
-casanova
-brent
-boricua
-blackjack
-blablabla
-bigmike
-bermuda
-bbbbbbbb
-bayern
-amazing
-aleksey
-717171
-12301230
-zheng
-yoyo
-wildman
-tracker
-syncmaster
-sascha
-rhiannon
-reader
-queens
-qing
-purdue
-pool
-poochie
-poker
-petra
+135790
+0000000000
+yankees1
+triangle
+shaman
+shadow1
+sander
+romeo
+pippin
+peterson
 person
-orchid
-nuts
-nice
-lola
-lightning
-leng
-lang
-lambert
-kashmir
-jill
-idiot
-honey1
-fisting
-fester
-eraser
-diao
-delphi
-dddddddd
-cubswin
-cong
-claudio
-clark
-chip
-buzzard
-buzz
-butts
-brewster
-bravo
-bookworm
-blessing
-benfica
-because
-babybaby
-aleksandra
-6666666
-1997
-19961996
-19791979
-1717
-1213
-02091987
-02021987
-xiao
-wild
-valencia
-trapper
-tongue
-thegreat
-sancho
-really
-rainman
-piper
-peng
-peach
-passwd
-packers1
-newpass6
-neng
-mouse1
-motley
-morning
-midway
-Michelle
-miao
-maste
-marin
-kaylee
-justin1
-hokies
-health
-glory
-five
-dutchess
-dogfood
-comet
-clouds
-cloud
-charles1
-buddah
-bacardi
-astrid
-alphabet
-adams
-19801980
-147369
-12qwas
-02081988
-02051986
-02041986
-02011985
-01011977
-xuan
-vedder
-valeri
-teng
-stumpy
-squash
-snapon
-site
-ruan
-roadrunn
-rjycnfynby
-rhtdtlrj
-rambo
-pizzas
-paula
-novell
-mortgage
-misha
-menace
-maxim
-lori
-kool
-hanna
-gsxr750
-goldwing
-frisky
-famous
-dodge1
-dbrnjh
-christmas
-cheese1
-century
-candice
-booker
-beamer
-assword
-army
-angus
-andromeda
-adrienne
-676767
-543210
-2010
-1369
-12345678a
-12011987
-02101985
-02031986
-02021988
-zhuang
-zhou
-wrestling
-tinkerbell
-thumbs
-thedude
-teddybea
-sssss
-sonics
-sinister
-shannon1
-satana
-sang
-salomon
-remote
-qazzaq
-playing
-piao
-pacers
-onetime
-nong
-nikolay
-motherfucker
-mortimer
-misery
-madison1
-luan
-lovesex
-look
-Jessica
-handyman
-hampton
-gromit
-ghostrider
-doghouse
-deluxe
-clown
-chunky
-chuai
-cgfhnfr
-brewer
-boxster
-balloons
-adults
-a1a1a1
-794613
-654123
-24682468
-2005
-1492
-1020
-1017
-02061985
-02011987
-*****
-zhun
-ying
-yang
-windsor
-wedding
-wareagle
-svoboda
-supreme
-stalin
-sponge
-simon1
-roadking
-ripple
-realmadrid
-qiao
-PolniyPizdec0211
-pissoff
-peacock
-norway
-nokia6300
-ninjas
-misty1
-medusa
-medical
-maryann
-marika
-madina
-logan1
-lilly
-laser
-killers
-jiang
-jaybird
-jammin
-intel
-idontkno
-huai
-harry1
-goaway
-gameover
-dino
-destroy
-deng
+moon
+marianna
+maniac
+mandrake
+isaiah
+inuyasha
+home
+hardware
+goblin
+french
+freebird
+florian
+ferguson
+dorian
+dominick
+dick
+carolyn
+bullfrog
+bruce
+babylon5
+avenger
+13131313
+zanzibar
+tricky
+transfer
+television
+sparkles
+space
+silent
+shepherd
+search
+resident
+puppy
+property
+pictures
+piccolo
+oooooo
+mischief
+me
+mathew
+marcelo
+magical
+macintosh
+logan
+lionel
+laguna
+kristian
+kissmyass
+jones
+iforgot
+hurricane
+hoover
+herbie
+heineken
+hahahaha
+goforit
+fuckit
+eastside
+dude
+daffodil
 collin
-claymore
-chicago1
-cheater
-chai
-bunny1
-blackbir
-bigbutt
-bcfields
-athens
-antoni
-abcd123
-686868
-369963
-1357924680
-12qw12
-1236987
-111333
-02091986
-02021986
-01011983
-000111
-zhuai
-yoda
-xiang
-wrestle
+charming
+billybob
+bigman
+attila
+aspire
+artemis
+armstrong
+adventure
+adelaide
+zenith
+underdog
+time
+temple
+technics
+sweden
+subway
+sinner
+sara
+samsung1
+sabina
+rooney
+remote
+qwerty1234
+python
+pillow
+phoenix1
+passwd
+musicman
+murder
+metal
+market
+marjorie
+linkin
+letmein1
+kingpin
+jesse
+jerusalem
+ingrid
+information
+iloveyou1
+hospital
+handball
+gopher
+gonzales
+fortuna
+flying
+fitness
+dylan
+dilbert
+desert
+darkangel
+clouds
+cascade
+camelot
+budapest
+brandon1
+boss
+batista
+armando
+angie
+alliance
+alibaba
+adrienne
+aberdeen
+abc123456
+1234512345
+zephyr
+wonderland
+willis
+ultima
+triton
+thuglife
+studio
+squirt
+splash
+sentinel
+richards
+redrose
+rammstein
+quincy
+queen
+project
+penny
+pearl
+oakland
+newyork1
+mortimer
+micheal
+marcello
+magazine
+luther
+jumper
+josh
+infantry
+impala
+hopeless
+holmes
+harrypotter
+glitter
+fandango
+falcons
+edison
+eagle1
+donna
+deadhead
+clarissa
+christie
+chico
+charlene
+blade
+billyboy
+bangbang
+bamboo
+asasas
+ariana
+absolute
+50cent
+waters
+trucker
+titanium
+tiger123
+supreme
+superior
+stefanie
+sparks
+spaceman
+somebody
+smudge
+sleepy
+sinclair
+secrets
+scrappy
+rubber
+ricky
+pppppppp
+poland
+pink
+paintball
+ninja
+newlife
+nevada
+mmmmmmmm
+military
+medical
+marijuana
+mackenzie
+loveless
+louis
+lolipop
+lilian
+lighthouse
+lewis
+lassie
+kristy
+knights
+karolina
+jillian
+jesuschrist
+jensen
+heart
+grover
+fernanda
+felicity
+dietcoke
+coolio
+cleveland
+chevy
+callie
+bryan
+brewster
+biggie
+bessie
+bertha
+babyblue
+ashleigh
+andrei
+abcde
+8888
+852456
+321654
+1q2w3e4r5t6y
+14789632
+012345
+willy
 whiskers
 valkyrie
-toon
-tong
-ting
-talisman
-starcraf
-sporting
-spaceman
-southpar
-smiths
-skate
-shell
-seng
-saleen
-ruby
-reng
-redline
-rancid
-pepe
-optimus
-nova
-mohamed
-meister
-marcia
-lipstick
-kittykat
-jktymrf
-jenn
-jayden
-inuyasha
-higgins
-guai
-gonavy
-face
-eureka
-dutch
-darkman
-courage
-cocaine
-circus
-cheeks
-camper
-br549
-bagira
-babyface
-7uGd5HIp2J
-5050
-1qaz2ws
-123321a
-02081987
-02081984
-02061986
-02021984
-01011982
-zhai
-xiong
-willia
-vvvvvv
-venera
-unique
-tian
-sveta
+triumph
+tracker
+superfly
 strength
-stories
-squall
-secrets
-seahawks
-sauron
-ripley
-riley
-recovery
-qweqweqwe
-qiong
-puddin
-playstation
-pinky
-phone
-penny1
-nude
-mitch
-milkman
-mermaid
-max123
-maria1
-lust
-loaded
-lighter
-lexus
-leavemealone
-just4me
-jiong
-jing
-jamie1
-india
-hardcock
-gobucks
-gawker
-fytxrf
-fuzzy
-florida1
-flexible
-eleanor
-dragonball
-doudou
-cinema
-checkers
-charlene
-ceng
-buffy1
-brian1
-beautifu
-baseball1
-ashlee
-adonis
-adam12
-434343
-02031984
-02021985
-xxxpass
-toledo
-thedoors
-templar
-sullivan
-stanford
-shei
-sander
-rolling
-qqqqqqq
-pussey
-pothead
-pippin
-nimbus
-niao
-mustafa
-monte
-mollydog
-modena
-mmmmm
-michae
-meng
-mango
-mamama
-lynn
-love12
-kissing
-keegan
-jockey
-illinois
-ib6ub9
-hotbox
-hippie
-hill
-ghblehjr
-gamecube
-ferris
-diggler
-crow
-circle
-chuo
-chinook
-charity
-carmel
-caravan
-cannabis
-cameltoe
-buddie
-bright
-bitchass
-bert
-beowulf
-bartman
-asia
-armagedon
-ariana
-alexalex
-alenka
-ABC123
-987456321
-373737
-2580
-21031988
-123qq123
-12345t
-1234567890a
-123455
-02081989
-02011986
-01020304
-01011999
-xyz123
-xerxes
-wraith
-wishbone
-warning
-todd
-ticket
-three
-subzero
-shuang
-rong
-rider
-quest
-qiang
-pppp
-pian
-petrov
-otto
-nuan
-ning
-myname
-matthews
-martine
-mandarin
-magical
-latinas
-lalalala
-kotaku
-jjjjj
-jeffery
-jameson
-iamgod
-hellos
-hassan
-Harley
-godfathe
-geng
-gabriela
-foryou
-ffffffff
-divorce
-darius
-chui
-breasts
-bluefish
-binladen
-bigtit
-anne
-alexia
-2727
-19771977
-19761976
-02061989
-02041984
-zhui
-zappa
-yfnfkmz
-weng
-tricia
-tottenham
-tiberius
-teddybear
-spinner
-spice
-spectre
-solo
-silverad
-silly
-shuo
-sherri
-samtron
-poland
-poiuy
-pickup
-pdtplf
-paloma
-ntktajy
-northern
-nasty1
-musashi
-missy1
-microphone
-meat
-manman
-lucille
-lotus
-letter
-kendra
-iomega
-hootie
-forward
-elite
-electron
-electra
-duan
-DRAGON
-dotcom
-dirtbike
-dianne
-desiree
-deadpool
-darrell
-cosmic
-common
-chrome
-cathy
-carpedie
-bilbo
-bella1
-beemer
-bearcat
-bank
-ashley1
-asdfzxcv
-amateurs
-allan
-absolute
-50spanks
-147963
-120676
-1123
-02021983
-zang
-virtual
-vampires
-vadim
-tulips
-sweet1
-suan
-spread
-spanish
-some
-slapper
-skylar
-shiner
-sheng
-shanghai
-sanfran
-ramones
-property
-pheonix
-password2
-pablo
-othello
-orange1
-nuggets
-netscape
-ludmila
-lost
-liang
-kakashka
-kaitlyn
-iscool
-huang
-hillary
-high
-hhhh
-heater
-hawaiian
-guang
-grease
-gfhjkmgfhjkm
-gfhjkm1
-fyutkbyf
-finance
-farley
-dogshit
-digital1
-crack
-counter
-corsair
-company
-colonel
-claudi
-carolin
-caprice
-caligula
-bulls
-blackout
-beatle
-beans
-banzai
-banner
-artem
-9562876
-5656
-1945
-159632
-15151515
-123456qw
-1234567891
-02051983
-02041983
-02031987
-02021989
-z1x2c3v4
-xing
-vSjasnel12
-twenty
-toolman
-thing
-testpass
-stretch
-stonecold
-soulmate
-sonny
-snuffy
-shutup
-shuai
-shao
-rhino
-q2w3e4r5
-polly
-poipoi
-pierce
-piano
-pavlov
-pang
-nicole1
-millions
-marsha
-lineage2
-liao
-lemon
-kuai
-keller
-jimmie
-jiao
-gregor
-ggggg
-game
-fuckyo
-fuckoff1
-friendly
-fgtkmcby
-evan
-edgar
-dolores
-doitnow
-dfcbkbq
-criminal
-coldbeer
-chuckie
-chimera
-chan
-ccccc
-cccc
-cards
-capslock
-cang
-bullfrog
-bonjovi
-bobdylan
-beth
-berger
-barker
-balance
-badman
-bacchus
-babylove
-argentina
-annabell
-akira
-646464
-15975
-1223
-11221122
-1022
-02081986
-02041988
-02041987
-02041982
-02011988
-zong
-zhang
-yummy
-yeahbaby
-vasilisa
-temp123
-tank
-slim
-skyler
-silent
-sergeant
-reynolds
-qazwsx1
-PUSSY
-pasword
-nomore
-noelle
-nicol
-newyork1
-mullet
-monarch
-merlot
-mantis
-mancity
-magazine
-llllllll
-kinder
-kilroy
-katherine
-jayhawks
-jackpot
-ipswich
-hack
-fishing1
-fight
-ebony
-dragon12
-dog123
-dipshit
-crusher
-chippy
-canyon
-bigbig
-bamboo
-athlon
-alisha
-abnormal
-a11111
-2469
-12365
-1011
-09876543
-02101984
-02081985
-02071984
-02011980
-010180
-01011979
-zhuo
-zaraza
-wg8e3wjf
-triple
-tototo
-theater
-teddy1
-syzygy
-susana
-sonoma
-slavik
-shitface
-sheba
-sexyboy
-screen
-salasana
-rufus
-Richard
-reds
-rebecca1
-pussyman
-pringles
-preacher
-park
-oceans
-niang
-momo
-misfits
-mikey1
-media
-manowar
-mack
-kayla
-jump
-jorda
-hondas
-hollow
-here
-heineken
-halifax
-gatorade
-gabriell
-ferrari1
-fergie
-female
-eldorado
-eagles1
-cygnus
-coolness
-colton
-ciccio
-cheech
-card
-boom
-blaze
-bhbirf
-BASEBALL
-barton
-655321
-1818
-14141414
-123465
-1224
-1211
-111111a
-02021982
-zhao
-wings
-warner
-vsegda
-tripod
-tiao
-thunderb
-telephon
-tdutybz
-talon
-speedo
-specialk
-shepherd
-shadows
-samsun
-redbird
-race
-promise
-persik
-patience
-paranoid
-orient
-monster1
-missouri
-mets
-mazda
-masamune
-martin1
-marker
-march
-manning
-mamamama
-licking
-lesley
-laurence
-jezebel
-jetski
-hopeless
-hooper
-homeboy
-hole
-heynow
-forum
-foot
-ffff
-farscape
-estrella
-entropy
-eastwood
-dwight
-dragonba
-door
-dododo
-deutsch
-crystal1
-corleone
-cobalt
-chopin
-chevrolet
-cattle
-carlitos
-buttercu
-butcher
-bushido
-buddyboy
-blond
-bingo1
-becker
-baron
-augusta
-alex123
-998877
-24242424
-12365478
-02061988
-02031985
-??????
-zuan
-yfcntymrf
-wowwow
-winston1
-vfibyf
-ventura
-titten
-tiburon
-thoma
-thelma
-stroker
-snooker
-smokie
-slippery
-shui
-shock
-seadoo
-sandwich
-records
-rang
-puffy
-piramida
-orion1
-napoli
-nang
-mouth
-monkey12
-millwall
-mexican
-meme
-maxxxx
-magician
-leon
-lala
-lakota
-jenkins
-jackson5
-insomnia
-harvard
-HARLEY
-hardware
-giorgio
-ginger1
-george1
-gator1
-fountain
-fastball
-exotic
-elizaveta
-dialog
-davide
-channel
-castro
-bunnies
-borussia
-asddsa
-andromed
-alfredo
-alejandro
-7007
-69696
-4417
-3131
-258852
-1952
-147741
-1234asdf
-02081982
-02051982
-zzzzzzz
-zeng
-zalupa
-yong
-windsurf
-wildcard
-weird
-violin
-universal
-sunflower
-suicide
-strawberry
-stepan
-sphinx
-someone
-sassy1
-romano
-reddevil
-raquel
-rachel1
-pornporn
-polopolo
-pluto
-plasma
-pinkfloyd
-panther1
-north
-milo
-maxime
-matteo
-malone
-major
-mail
-lulu
-ltybcrf
-lena
-lassie
-july
-jiggaman
-jelly
-islander
-inspiron
-hopeful
-heng
-hans
-green123
-gore
-gooner
-goirish
-gadget
-freeway
-fergus
-eeeee
-diego
-dickie
-deep
-danny1
-cuan
-cristian
-conover
-civic
-Buster
-bombers
-bird33
-bigfish
-bigblue
-bian
-beng
-beacon
-barnes
-astro
-artemka
-annika
-anita
-Andrew
-747474
-484848
-464646
-369258
-225588
-1z2x3c
-1a2s3d4f
-123456qwe
-02061980
-02031982
-02011984
-zaqxswcde
-wrench
-washington
-violetta
-tuning
-trainer
-tootie
-store
-spurs1
-sporty
-sowhat
-sophi
-smashing
-sleeper
-slave1
-sexysexy
-seeking
-sam123
-robotics
-rjhjktdf
-reckless
-pulsar
-project
-placebo
-paddle
-oooo
-nightmare
-nanook
-married
-linda1
-lilian
-lazarus
-kuang
-knockers
-killkill
-keng
-katherin
-Jordan
-jellybea
-jayson
-iloveme
-hunt
-hothot
-homerj
-hhhhhhhh
-helene
-haggis
-goat
-ganesh
-gandalf1
-fulham
-force
-dynasty
-drakon
-download
-doomsday
-dieter
-devil666
-desmond
-darklord
-daemon
-dabears
-cramps
-cougars
-clowns
-classics
-citizen
-cigar
-chrysler
-carlito
-candace
-bruno1
-browning
-brodie
-bolton
-biao
-barbados
-aubrey
-arlene
-arcadia
-amigo
-abstr
-9293709b13
-737373
-4444444
-4242
-369852
-20202020
-1qa2ws
-1Pussy
-1947
-1234560
-1112
-1000000
-02091983
-02061987
-01081989
-zephyr
-yugioh
-yjdsqgfhjkm
-woofer
-wanted
-volcom
-verizon
-tripper
-toaster
-tipper
-tigger1
-tartar
-superb
-stiffy
-spock
-soprano
-snowboard
-sexxxy
-senator
-scrabble
-santafe
-sally1
-sahara
-romero
-rhjrjlbk
-reload
-ramsey
-rainbow6
-qazwsxedc123
-poopy
-pharmacy
-obelix
-normal
-nevermind
-mordor
-mclaren
-mariposa
-mari
-manuela
-mallory
-magelan
-lovebug
-lips
-kokoko
-jakejake
-insanity
-iceberg
-hughes
-hookup
-hockey1
-hamish
-graphics
-geoffrey
-firewall
-fandango
-ernie
-dottie
-doofus
-donovan
-domain
-digimon
-darryl
-darlene
-dancing
-county
-chloe1
-chantal
-burrito
-bummer
-bubba69
-brett
-bounty
-bigcat
-bessie
-basset
-augustus
-ashleigh
-878787
-3434
-321321321
-12051988
-111qqq
-1023
-1013
-05051987
-02101989
-02101987
-02071987
-02071980
-02041985
-titan
-thong
-sweetnes
-stanislav
-sssssss
-snappy
-shanti
-shanna
-shan
-script
-scorpio1
-RuleZ
-rochelle
-rebel1
-radiohea
-q1q2q3
-puss
-pumpkins
-puffin
-onetwo
-oatmeal
-nutmeg
-ninja1
-nichole
-mobydick
-marine1
-mang
-lover1
-longjohn
-lindros
-killjoy
-kfhbcf
-karen1
-jingle
-jacques
-iverson3
-istanbul
-iiiiii
-howdy
-hover
-hjccbz
-highheel
-happiness
-guitar1
-ghosts
-georg
-geneva
-gamecock
-fraser
-faithful
-dundee
-dell
-creature
-creation
-corey
-concorde
-cleo
-cdtnbr
-carmex2
-budapest
-bronze
-brains
-blue12
-battery
-attila
-arrow
-anthrax
-aloha
-383838
-19711971
-1948
-134679852
-123qw
-123000
-02091984
-02091981
-02091980
-02061983
-02041981
-01011900
-zhjckfd
-zazaza
-wingman
-windmill
-wifey
-webhompas
-watch
-thisisit
-tech
-submit
-stress
-spongebo
-silver1
-senators
-scott1
-sausages
-radical
-qwer12
-ppppp
-pixies
-pineapple
-piazza
-patrice
-officer
-nygiants
-nikitos
-nigga
-nextel
-moses
-moonbeam
-mihail
-MICHAEL
-meagan
-marcello
-maksimka
-loveless
-lottie
-lollypop
-laurent
-latina
-kris
-kleopatra
-kkkk
-kirsty
-katarina
-kamila
-jets
-iiii
-icehouse
-hooligan
-gertrude
-fullmoon
-fuckinside
-fishin
-everett
-erin
-dynamite
-dupont
-dogcat
-dogboy
-diane
-corolla
-citadel
-buttfuck
-bulldog1
-broker
-brittney
-boozer
-banger
-aviation
-almond
-aaron1
-78945
-616161
-426hemi
-333777
-22041987
-2008
-20022002
-153624
-1121
-111111q
-05051985
-02081977
-02071988
-02051988
-02051987
-02041979
-zander
-wwww
-webmaste
-webber
-taylor1
-taxman
-sucking
-stylus
-spoon
-spiker
-simmons
-sergi
-sairam
-royal
-ramrod
-radiohead
-popper
-platypus
-pippo
-pepito
-pavel
-monkeybo
-Michael1
-master12
-marty
-kjkszpj
-kidrock
-judy
-juanita
-joshua1
-jacobs
-idunno
-icu812
-hubert
-heritage
-guyver
-gunther
-Good123654
-ghost1
-getout
-gameboy
-format
-festival
-evolution
-epsilon
-enrico
-electro
-dynamo
-duckie
-drive
-dolphin1
-ctrhtn
-cthtuf
-cobain
-club
-chilly
-charter
-celeb
-cccccccc
-caught
-cascade
-carnage
-bunker
-boxers
-boxer
-bombay
-bigboss
-bigben
-beerman
-baggio
-asdf12
-arrows
-aptiva
-a1a2a3
-a12345678
-626262
-26061987
-1616
-15051981
-08031986
-060606
-02061984
-02061982
-02051989
-02051984
-02031981
-woodland
-whiteout
-visa
-vanguard
-towers
-tiny
-tigger2
-temppass
-super12
-stop
-stevens
-softail
-sheriff
-robot
-reddwarf
-pussy123
-praise
-pistons
-patric
-partner
-niceguy
-morgan1
-model
-mars
-mariana
-manolo
-mankind
-lumber
-krusty
-kittens
-kirby
-june
-johann
-jared
-imation
-henry1
-heat
-gobears
-forsaken
-Football
-fiction
-ferguson
-edison
-earnhard
-dwayne
-dogger
-diver
-delight
-dandan
-dalshe
-cross
-cottage
-coolcool
-coach
-camila
-callum
-busty
-british
-biology
-beta
-beardog
-baldwin
-alone
-albany
-airwolf
-9876543
-987123
-7894561230
-786786
-535353
-21031987
-1949
-13041988
-1234qw
-123456l
-1215
-111000
-11051987
-10011986
-06061986
-02091985
-02021981
-02021979
-01031988
-vjcrdf
-uranus
-tiger123
-summer99
-state
-starstar
-squeeze
-spikes
-snowflak
-slamdunk
-sinned
-shocker
-season
-santa
-sanity
-salome
-saiyan
-renata
-redrose
-queenie
-puppet
-popo
-playboy1
-pecker
-paulie
-oliver1
-ohshit
-norwich
-news
-namaste
-muscles
-mortal
-michael2
-mephisto
-mandy1
-magnet
-longbow
-llll
-living
-lithium
-komodo
-kkkkkkkk
-kjrjvjnbd
-killer12
-kellie
-julie1
-jarvis
-iloveyou2
-holidays
-highway
-havana
-harvest
-harrypotter
-gorgeous
-giraffe
-garion
-frost
-fishman
-erika
-earth
-dusty1
-dudedude
-demo
-deer
-concord
-colnago
-clit
-choice
-chillin
-bumper
-blam
-bitter
-bdsm
-basebal
-barron
-baker
-arturo
-annie1
-andersen
-amerika
-aladin
-abbott
-81fukkc
-5678
-135791
-1002
-02101986
-02081983
-02041989
-02011989
-01011978
-zzzxxx
-zxcvbnm123
-yyyyyy
-yuan
-yolanda
-winners
-welcom
-volkswag
-vera
-ursula
-ultra
-toffee
-toejam
-theatre
-switch
-superma
-Stone55
-solitude
-sissy
-sharp
-scoobydoo
-romans
-roadster
-punk
-presiden
-pool6123
-playstat
-pipeline
-pinball
-peepee
-paulina
-ozzy
-nutter
-nights
-niceass
-mypassword
-mydick
-milan
-medic
-mazdarx7
-mason1
-marlon
-mama123
-lemonade
-krasotka
-koroleva
-karin
-jennife
-itsme
-isaac
-irishman
-hookem
-hewlett
-hawaii50
-habibi
-guitars
-grande
-glacier
-gagging
-gabriel1
-freefree
-francesco
-food
-flyfish
-fabric
-edward1
-dolly
-destin
-delilah
-defense
-codered
-cobras
-climber
-cindy1
-christma
-chipmunk
-chef
-brigitte
-bowwow
-bigblock
-bergkamp
-bearcats
-baba
-altima
-74108520
-45M2DO5BS
-30051985
-258258
-24061986
-22021989
-21011989
-20061988
-1z2x3c4v
-14061991
-13041987
-123456m
-12021988
-11081989
-03041991
-02071981
-02031979
-02021976
-01061990
-01011960
-yvette
-yankees2
-wireless
-werder
-wasted
-visual
-trust
-tiffany1
-stratus
-steffi
-stasik
-starligh
-sigma
-rubble
-ROBERT
-register
-reflex
-redfox
-record
-qwerty7
-premium
-prayer
-players
-pallmall
-nurses
-nikki1
-nascar24
-mudvayne
-moritz
-moreno
-moondog
-monsters
-micro
-mickey1
-mckenzie
-mazda626
-manila
-madcat
-louie
-loud
-krypton
-kitchen
-kisskiss
-kate
-jubilee
-impact
-Horny
-hellboy
-groups
-goten
-gonzalez
-gilles
-gidget
-gene
-gbhfvblf
-freebird
-federal
-fantasia
-dogbert
-deeper
-dayton
-comanche
-cocker
-choochoo
-chambers
-borabora
-bmw325
-blast
-ballin
-asdfgh01
-alissa
-alessandro
-airport
-abrakadabra
-7777777777
-635241
-494949
-420000
-23456789
-23041987
-19701970
-1951
-18011987
-172839
-1235
-123456789s
-1125
-1102
-1031
-07071987
-02091989
-02071989
-02071983
-02021973
-02011981
-01121986
-01071986
-0101
-zodiac
-yogibear
-word
-water1
-wasabi
-wapbbs
-wanderer
-vintage
-viktoriya
-varvara
-upyours
-undertak
-underground
-undead
-umpire
-tropical
-tiger2
-threesom
-there
-sunfire
-sparky1
-snoopy1
-smart
-slowhand
-sheridan
-sensei
-savanna
-rudy
-redsox1
-ramirez
-prowler
-postman
-porno1
-pocket
-pelican
-nfytxrf
-nation
-mykids
-mygirl
-moskva
-mike123
-Master1
-marianna
-maggie1
-maggi
-live
-landon
-lamer
-kissmyass
-keenan
-just4fun
-julien
-juicy
-JORDAN
-jimjim
-hornets
-hammond
-hallie
-glenn
-ghjcnjgfhjkm
-gasman
-FOOTBALL
-flanker
-fishhead
-firefire
-fidelio
-fatty
-excalibur
-enterme
-emilia
-ellie
-eeee
-diving
-dindom
-descent
-daniele
-dallas1
-customer
-contest
-compass
-comfort
-comedy
-cocksuck
-close
-clay
-chriss
-chiara
-cameron1
-calgary
-cabron
-bologna
-berkeley
-andyod22
-alexey
-achtung
-45678
-3636
-28041987
-25081988
-24011985
-20111986
-19651965
-1941
-19101987
-19061987
-1812
-14111986
-13031987
-123ewq
-123456123
-12121990
-112112
-10071987
-10031988
-02101988
-02081980
-02021990
-01091987
-01041985
-01011995
-zebra
-zanzibar
-waffle
-training
-teenage
-sweetness
-sutton
-sushi
-suckers
-spam
-south
-sneaky
-sisters
-shinobi
-shibby
-sexy1
-rockies
-presley
-president
-pizza1
-piggy
-password12
-olesya
-nitro
-motion
-milk
-medion
-markiz
-lovelife
-longdong
-lenny
-larry1
-kirk
-johndeer
-jefferso
-james123
-jackjack
-ijrjkfl
-hotone
-heroes
-gypsy
-foxy
-fishbone
-fischer
-fenway
-eddie1
-eastern
-easter
-drummer1
-Dragon1
-Daniel
-coventry
-corndog
-compton
-chilli
-chase1
-catwoman
-booster
-avenue
-armada
-987321
-818181
-606060
-5454
-28021992
-25800852
-22011988
-19971997
-1776
-17051988
-14021985
-13061986
-12121985
-11061985
-10101986
-10051987
-10011990
-09051945
-08121986
-04041991
-03041986
-02101983
-02101981
-02031989
-02031980
-01121988
-wwwwwww
-virgil
-troy
-torpedo
-toilet
-tatarin
-survivor
-sundevil
-stubby
-straight
-spotty
-slater
-skip
-sheba1
-runaway
-revolver
-qwerty11
-qweasd123
-parol
-paradigm
-older
-nudes
-nonenone
-moore
-mildred
-michaels
-lowell
-knock
-klaste
-junkie
-jimbo1
-hotties
-hollie
-gryphon
-gravity
-grandpa
-ghjuhfvvf
-frogman
-freesex
-foreve
-felix1
-fairlane
-everlast
-ethan
-eggman
-easton
-denmark
-deadly
-cyborg
-create
-corinne
-cisco
-chick
-chestnut
-bruiser
-broncos1
-bobdole
-azazaz
-antelope
-anastasiya
-456456456
-415263
-30041986
-29071983
-29051989
-29011985
-28021990
-28011987
-27061988
-25121987
-25031987
-24680
-22021986
-21031990
-20091991
-20031987
-196969
-19681968
-1946
-17061988
-16051989
-16051987
-1210
-11051990
-100500
-08051990
-05051989
-04041988
-02051980
-02051976
-02041980
-02031977
-02011983
-01061986
-01041988
-01011994
-0000007
-zxcasdqwe123
-washburn
-vfitymrf
-troll
-tranny
-tonight
-thecure
-studman
-spikey
-soccer12
-soccer10
-smirnoff
-slick1
-skyhawk
-skinner
-shrimp
-shakira
-sekret
-seagull
-score
-sasha_007
-rrrrrrrr
-ross
-rollins
-reptile
-razor
-qwert12345
-pumpkin1
-porsche1
-playa
-notused
-noname123
-newcastle
-never
-nana
-MUSTANG
-minerva
-megan1
-marseille
-marjorie
-mamamia
-malachi
-lilith
-letmei
-lane
-lambda
-krissy
-kojak
-kimball
-keepout
-karachi
-kalina
-justus
-joel
-joe123
-jerry1
-irinka
-hurricane
-honolulu
-holycow
-hitachi
-highbury
-hhhhh
-hannah1
-hall
-guess
-glass
-gilligan
-giggles
-flores
-fabie
-eeeeeeee
-dungeon
-drifter
-dogface
-dimas
-dentist
-death666
-costello
-castor
-bronson
-brain
-bolitas
-boating
-benben
-baritone
-bailey1
-badgers
-austin1
-astra
-asimov
-asdqwe
-armand
-anthon
-amorcit
-797979
-4200
-31011987
-3030
-30031988
-3000gt
-224466
-22071986
-21101986
-21051991
-20091988
-2009
-20051988
-19661966
-18091985
-18061990
-15101986
-15051990
-15011987
-13121985
-12qw12qw
-1234123
-1204
-12031987
-12031985
-11121986
-1025
-1003
-08081988
-08031985
-03031986
-02101979
-02071979
-02071978
-02051985
-02051978
-02051973
-02041975
-02041974
-02031988
-02011982
-01031989
-01011974
-zoloto
-zippo
-wwwwwwww
-w_pass
-wildwood
-wildbill
-transit
-superior
-styles
-stryker
-string
-stream
-stefanie
-slugger
-skillet
-sidekick
-show
-shawna
-sf49ers
-Salsero
-rosario
-remingto
-redeye
-redbaron
-question
-quasar
-ppppppp
-popova
-physics
-papers
-palermo
-options
-mothers
-moonligh
-mischief
-ministry
-minemine
-messiah
-mentor
-megane
-mazda6
-marti
-marble
-leroy
-laura1
-lantern
-Kordell1
-koko
-knuckles
-khan
-kerouac
-kelvin
-jorge
-joebob
-jewel
-iforget
-Hunter
-house1
-horace
-hilary
-grand
-gordo
-glock
-georgie
-George
-fuckhead
-freefall
-films
-fantomas
-extra
-ellen
-elcamino
-doors
-diaper
-datsun
-coldplay
-clippers
-chandra
-carpente
-carman
-capricorn
-calimero
-boytoy
-boiler
-bluesman
-bluebell
-bitchy
-bigpimp
-bigbang
-biatch
-Baseball
-audi
-astral
-armstron
-angelika
-angel123
-abcabc
-999666
-868686
-3x7PxR
-357357
-30041987
-27081990
-26031988
-258369
-25091987
-25041988
-24111989
-23021986
-22041988
-22031984
-21051988
-17011987
-16121987
-15021985
-142857
-14021986
-13021990
-12345qw
-123456ru
-1124
-10101990
-10041986
-07091990
-02051981
-01031985
-01021990
-******
-zildjian
-yfnfkb
-yeah
-WP2003WP
-vitamin
-villa
-valentine
-trinitro
-torino
-tigge
-thewho
-thethe
-tbone
-swinging
-sonia
-sonata
-smoke1
-sluggo
-sleep
-simba1
-shamus
-sexxy
-sevens
-rober
-rfvfcenhf
-redhat
-quentin
-qazws
-pufunga7782
-priest
-pizdec
-pigeon
-pebble
-palmtree
-oxygen
-nostromo
-nikolai
-mmmmmmm
-mahler
-lorena
-lopez
-lineage
-korova
-kokomo
-kinky
-kimmie
-kieran
-jsbach
-johngalt
-isabell
-impreza
-iloveyou1
-iiiii
-huge
-fuck123
-franc
-foxylady
-fishfish
-fearless
-evil
-entry
-enforcer
-emilie
-duffman
-ducks
-dominik
-david123
-cutiepie
-coolcat
-cookie1
-conway
-citroen
-chinese
-cheshire
-cherries
-chapman
-changes
-carver
-capricor
-book
-blueball
-blowfish
-benoit
-Beast1
-aramis
-anchor
-741963
-654654
-57chevy
-5252
-357159
-345678
-31031988
-25091990
-25011990
-24111987
-23031990
-22061988
-21011991
-21011988
-1942
-19283746
-19031985
-19011989
-18091986
-17111985
-16051988
-15071987
-145236
-14081985
-132456
-13071984
-1231
-12081985
-1201
-11021985
-10071988
-09021988
-05061990
-02051972
-02041978
-02031983
-01091985
-01031984
-010191
-01012009
-yamahar1
-wormix
-whistler
-wertyu
-warez
-vjqgfhjkm
-versace
-universa
-taco
-sugar1
-strawber
-stacie
-sprinter
-spencer1
-sonyfuck
-smokey1
-slimshady
-skibum
-series
-screamer
-sales
-roswell
-roses
-report
-rampage
-qwedsa
-q11111
-program
-Princess
-petrova
-patrol
-papito
-papillon
-paco
-oooooooo
-mother1
-mick
-Maverick
-marcius2
-magneto
-macman
-luck
-lalakers
-lakeside
-krolik
-kings
-kille
-kernel
-kent
-junior1
-jules
-jermaine
-jaguars
-honeybee
-hola
-highlander
-helper
-hejsan
-hate
-hardone
-gustavo
-grinch
-gratis
-goth
-glamour
-ghbywtccf
-ghbdtn123
-elefant
-earthlink
-draven
-dmitriy
-dkflbr
-dimples
-cygnusx1
-cold
-cococo
-clyde
-cleopatr
-choke
-chelse
-cecile
-casper1
-carnival
-cardiff
-buddy123
-bruce1
-bootys
-bookie
-birddog
-bigbob
-bestbuy
-assasin
-arkansas
-anastasi
-alberta
-addict
-acmilan
-7896321
-30081984
-258963
-25101988
-23051985
-23041986
-23021989
-22121987
-22091988
-22071987
-22021988
-2006
-20052005
-19051987
-15041988
-15011985
-14021990
-14011986
-13051987
-13011988
-13011987
-12345s
-12061988
-12041988
-12041986
-11111q
-11071988
-11031988
-10081989
-08081986
-07071990
-07071977
-05071984
-04041983
-03021986
-02091988
-02081976
-02051977
-02031978
-01071987
-01041987
-01011976
-zack
-zachary1
-yoyoma
-wrestler
-weston
-wealth
-wallet
-vjkjrj
-vendetta
-twiggy
-twelve
-turnip
-tribal
-tommie
-tkbpfdtnf
-thecrow
-test12
-terminat
-telephone
-synergy
-style
-spud
-smackdow
-slammer
-sexgod
-seabee
-schalke
-sanford
-sandrine
-salope
-rusty2
-right
-repair
-referee
-ratman
-radar
-qwert40
-qwe123qwe
-prozac
-portal
-polish
-Patrick
-passes
-otis
-oreo
-option
-opendoor
-nuclear
-navy
-nautilus
-nancy1
-mustang6
-murzik
-mopar
-monty1
-Misfit99
-mental
-medved
-marseill
-magpies
-magellan
-limited
-Letmein1
-lemmein
-leedsutd
-larissa
-kikiki
-jumbo
-jonny
-jamess
-jackass1
-install
-hounddog
-holes
-hetfield
-heidi1
-harlem
-gymnast
-gtnhjdbx
-godlike
-glow
-gideon
-ghhh47hj7649
-flip
-flame
-fkbyjxrf
-fenris
-excite
-espresso
-ernesto
-dontknow
-dogpound
-dinner
-diablo2
-dejavu
-conan
-complete
-cole
-chocha
-chips
-chevys
-cayman
-breanna
-borders
-blue32
-blanco
-bismillah
-biker
-bennie
-benito
-azazel
-ashle
-arianna
-argentin
-antonia
-alanis
-advent
-acura
-858585
-4040
-333444
-30041985
-29071985
-29061990
-27071987
-27061985
-27041990
-26031990
-24031988
-23051990
-2211
-22011986
-21061986
-20121989
-20092009
-20091986
-20081991
-20041988
-20041986
-1qwerty
-19671967
-1950
-19121989
-19061990
-18101987
-18051988
-18041986
-18021984
-17101986
-17061989
-17041991
-16021990
-15071988
-15071986
-14101987
-135798642
-13061987
-1234zxcv
-12321
-1214
-12071989
-1129
-11121985
-11061991
-10121987
-101101
-10101985
-10031987
-100200
-09041987
-09031988
-06041988
-05071988
-03081989
-02071985
-02071975
-0123456
-01051989
-01041992
-01041990
-zarina
-woodie
-whiteboy
-white1
-waterboy
-volkov
-vlad
-virus
-vikings1
-viewsoni
-vbkfirf
-trans
-terefon
-swedish
-squeak
-spanner
-spanker
-sixpack
-seymour
-sexxx
-serpent
-samira
-roma
-rogue
-robocop
-robins
-real
-Qwerty1
-qazxcv
-q2w3e4
-punch
-pinky1
-perry
-peppe
-penguin1
-Password123
-pain
-optimist
-onion
-noway
-nomad
-nine
-morton
-moonshin
-money12
-modern
-mcdonald
-mario1
-maple
-loveya
-love1
-loretta
-lookout
-loki
-lllll
-llamas
-limewire
-konstantin
-k.lvbkf
-keisha
-jones1
-jonathon
-johndoe
-johncena
-john123
-janelle
-intercourse
-hugo
-hopkins
-harddick
-glasgow
-gladiato
-gambler
-galant
-gagged
-fortress
-factory
-expert
-emperor
-eight
-django
-dinara
-devo
-daniels
-crusty
-cowgirl
-clutch
-clarissa
-cevthrb
-ccccccc
-capetown
-candy1
-camero
-camaross
-callisto
-butters
-bigpoppa
-bigones
-bigdawg
-best
-beater
-asgard
-angelus
-amigos
-amand
-alexandre
-9999999999
-8989
-875421
-30011985
-29051985
-2626
-26061985
-25111987
-25071990
-22081986
-22061989
-21061985
-20082008
-20021988
-1a2s3d
-19981998
-16051985
-15111988
-15051985
-15021990
-147896
-14041988
-123567
-12345qwerty
-12121988
-12051990
-12051986
-12041990
-11091989
-11051986
-11051984
-1008
-10061986
-0815
-06081987
-06021987
-04041990
-02081981
-02061977
-02041977
-02031975
-01121987
-01061988
-01031986
-01021989
-01021988
-wolfpac
-wert
-vienna
-venture
-vehpbr
-vampir
-university
-tuna
-trucking
-trip
-trees
-transfer
-tower
-tophat
-tomahawk
-timosha
-timeout
-tenchi
-tabasco
-sunny1
-suckmydick
-suburban
-stratfor
-steaua
-spiral
-simsim
-shadow12
-screw
-schmidt
-rough
-rockie
-reilly
-reggae
-quebec
-private1
-printing
-pentagon
-pearson
-peachy
-notebook
-noname
-nokian73
-myrtle
-munch
-moron
-matthias
-mariya
-marijuan
-mandrake
-mamacita
-malice
-links
-lekker
-lback
-larkin
-ksusha
-kkkkk
-kestrel
-kayleigh
-inter
-insight
-hotgirls
-hoops
-hellokitty
-hallo123
-gotmilk
-googoo
-funstuff
-fredrick
-firefigh
-finland
-fanny
-eggplant
-eating
-dogwood
-doggies
-dfktynby
-derparol
-data
-damon
-cvthnm
-cuervo
-coming
-clock
-cleopatra
-clarke
-cheddar
-cbr900rr
-carroll
-canucks
-buste
-bukkake
-boyboy
-bowman
-bimbo
-bighead
-bball
-barselona
-aspen
-asdqwe123
-around
-aries
-americ
-almighty
-adgjmp
-addison
-absolutely
-aaasss
-4ever
-357951
-29061989
-28051987
-27081986
-25061985
-25011986
-24091986
-24061988
-24031990
-21081987
-21041992
-20031991
-2001112
-19061985
-18111987
-18021988
-17071989
-17031987
-16051990
-15021986
-14031988
-14021987
-14011989
-1220
-1205
-120120
-111999
-111777
-1115
-1114
-11011990
-1027
-10011983
-09021989
-07051990
-06051986
-05091988
-05081988
-04061986
-04041985
-03041980
-02101976
-02071976
-02061976
-02011975
-01031983
-zasada
-wyoming
-wendy1
-washingt
-warrior1
-vickie
-vader1
-uuuuuu
-username
-tupac
-Trustno1
-tinkerbe
-suckdick
-streets
-strap
-storm1
-stinker
-sterva
-southpaw
-solaris
-sloppy
-sexylady
-sandie
-roofer
-rocknrol
-rico
-rfhnjirf
-QWERTY
-qqqqq1
-punker
+speed
+seventeen
+senior
+scottie
+sam
+ryan
+rogers
+rhonda
 progress
-platon
-Phoenix
-Phoeni
-peeper
-pastor
-paolo
-page
-obsidian
-nirvana1
-nineinch
-nbvjatq
-navigator
-native
-money123
-modelsne
-minimoni
-millenium
-max333
-maveric
-matthe
-marriage
-marquis
-markie
-marines1
-marijuana
-margie
-little1
-lfybbk
-klizma
-kimkim
-kfgjxrf
-joshu
-jktxrf
-jennaj
-irishka
-irene
-ilove
-hunte
-htubcnhfwbz
-hottest
-heinrich
-happy2
-hanson
-handball
-greedy
-goodie
-golfer1
-gocubs
-gerrard
-gabber
-fktyrf
-facebook
-eskimo
-elway7
-dylan1
-dominion
-domingo
-dogbone
-default
-darkangel
-cumslut
-cumcum
-cricket1
-coral
-coors
+polska
+plastic
+pinky
+muhammad
+medusa
+maryland
+married
+lololo
+login
+lillian
+leanne
+knicks
+jewels
+hithere
+giraffe
+gillian
+frozen
+frogger
+foxtrot
+evergreen
+emilio
+duchess
+dragoon
+devil
+deanna
+daughter
+daemon
+command
+claudio
+clarinet
+chucky
+chuckles
+chloe
+carlton
+beverly
+beethoven
+beach
+babies
+arlene
+anakin
+almighty
+aaaaaaaaaa
+9876543210
+1qaz1qaz
+1313
+wilbur
+waterfall
+tttttt
+tina
+theking
+suckit
+sparta
+sneakers
+smelly
+saratoga
+root
+reebok
+raquel
+quantum
+qawsedrf
+qawsed
+motocross
+maxmax
+majestic
+kingfish
+kasper
+japanese
+integra
+hhhhhh
+help
+harper
+graphics
+golf
+flounder
+erika
+dundee
+daphne
+dance
+corinne
+coltrane
 chris123
-charon
-challeng
-canuck
-call
-calibra
-buceta
-bubba123
-bricks
-bozo
-blues1
-bluejays
-berry
-beech
-awful
-april1
-antonina
+checkers
+carbon
+brandi
+boxing
+better
+barbados
+augustus
+angelika
+12345qwert
+washburn
+veritas
+tottenham
+tempest
+survivor
+strange
+stanford
+spanish
+soulmate
+snapper
+shawn
+robert1
+rasputin
+rambo
+rachael
+queenie
+pallmall
+overkill
+nimrod
+mustard
+mittens
+medina
+meatloaf
+maureen
+lowrider
+katarina
+ilovegod
+heather1
+hamburg
+hallo123
+grandpa
+gogogo
+giuseppe
+georgie
+fingers
+europe
+enrique
+eastwood
+duke
+dominion
+destroyer
+dawson
+chiquita
+chipmunk
+castillo
+bugger
+buffy
+bobbie
+berkeley
+beast
+antony
+alexandria
+9999
+2000
+121314
+1122334455
+1029384756
+zander
+yasmin
+world
+trebor
+toledo
+thinking
+tarheels
+skiing
+simona
+sheldon
+shanti
+seminole
+select
+rookie
+radiohead
+priscilla
+pornstar
+platypus
+peacock
+nirvana1
+mephisto
+marvel
+mama
+magnus
+lancaster
+knowledge
+johnjohn
+hubert
+hackers
+grant
+gameover
+fuckface
+david123
+darklord
+cutiepie
+create
+contact
+company
+carnival
+candyman
+cancel
+camper
+booker
+blowfish
+black1
+bigboss
+bender
+alien
+active
+abc1234
+zidane
+wright
+working
+wedding
+vortex
+ursula
+twisted
+terry
+ssssssss
+squash
+sponge
+snowboard
+smoking
+shasta
+shadows
+seeker
+sausage
+sandwich
+sailboat
+rupert
+romano
+ripper
+rebel
+rancid
+pudding
+prophet
+powder
+philly
+olivier
+nutmeg
+mandarin
+knuckles
+jimbob
+jasmine1
+japan
+helene
+hardrock
+greece
+gold
+forum
+floppy
+elwood
+dominik
+dimitri
+daredevil
+bristol
+boomboom
+benedict
+babyface
+anders
+albatros
+963852741
+565656
+323232
+262626
+whynot
+whisky
+valentino
+trident
+theboss
+tanya
+sprinter
+soccer1
+shocker
+shakira
+scream
+sammy1
+samara
+salvation
+rolltide
+rodriguez
+r2d2c3po
+qwer
+poetry
+plasma
+password12
+pancake
+mustangs
+moonshine
+missouri
+minimum
+mikey
+meridian
+melina
+meatball
+marino
+mango
+mandy
+malaysia
+kinder
+killbill
+justin1
+jason1
+illinois
+hottie
+gringo
+green1
+gonzalez
+georgina
+gargoyle
+flores
+evangelion
+engine
+emilie
+disaster
+depeche
+daniel1
+coolman
+compton
+complete
+coco
+claymore
+cheesecake
+chainsaw
+cat
+cabbage
+bluebell
+blake
+98765432
+yvette
+wolfman
+wishbone
+warhammer
+viewsonic
+vampires
+uranus
+thunderbird
+tammy
+susanne
+smashing
+sales
+sabbath
+rrrrrr
+rhiannon
+reagan
+rachelle
+playtime
+petunia
+offspring
+octopus
+marius
+marcia
+marcella
+maggot
+lonestar
+lawyer
+jenifer
+hooker
+heritage
+hehehe
+hayabusa
+harvard
+freestyle
+forward
+forsaken
+ferrari1
+fatman
+emperor
+elvira
+dusty
+double
+darius
+cypress
+cruise
+crash
+china
+charley
+challenger
+carole
+beer
+beanie
+battery
+backdoor
+asshole1
+angelus
+4321
+22222
+147896325
+11235813
+yosemite
+yogibear
+xxxxx
+wolf
+venus
+user
+talisman
+taekwondo
+syracuse
+supersonic
+scully
+sasuke
+redline
+red
+randolph
+ramones
+raistlin
+preacher
+peyton
+peugeot
+patty
+party
+papa
+orchid
+musica
+millions
+metallic
+max
+matador
+marcos
+mailman
+madison1
+ludwig
+lucy
+losangeles
+loretta
+lazarus
+kevin1
+isaac
+indians
+iloveme
+hewlett
+hernandez
+hayley
+gunners
+girls
+franky
+flight
+eternal
+eeyore
+dontknow
+coolcool
+charisma
+cessna
+bigbird
+xanadu
+werner
+wednesday
+village
+topper
+susana
+starwars1
+start
+sonic
+sinister
+sharky
+scout
+scotch
+scanner
+salomon
+roman
+program
+polo
+pistol
+paulina
+passpass
+pancho
+outside
+open
+mohammad
+mcdonald
+mayhem
+laurent
+lambda
+kodiak
+jacques
+hilary
+helen
+goldeneye
+geheim
+frontier
+francesca
+flipflop
+fisherman
+famous
+fallout
+eraser
+emilia
+eggplant
+diego
+deejay
+dannyboy
+daniella
+cosmic
+conner
+coleman
+chrysler
+catch22
+cameron1
+cambridge
+buckshot
+bounty
+arkansas
+archangel
+america1
+12345679
+zorro
+yomama
+xxx
+wutang
+woohoo
+walrus
+vermont
+twins
+tom
+tanker
+sprint
+skyler
+shuttle
+romantic
+robotics
+redalert
+rebels
+really
+punkin
+prayer
+newpass
+moocow
+mine
+mememe
+megatron
+marty
+marker
+mamapapa
+mail
+liquid
+lilith
+ladies
+kristi
+jojo
+install
+hyperion
+honesty
+hamburger
+gundam
+good
+goliath
+gladys
+gadget
+gabriel1
+fuckfuck
+friendship
+friendly
+florida1
+first
+expert
+erica
+eatshit
+dreaming
+dollars
+doghouse
+dog
+disturbed
+dianne
+citizen
+christin
+celtics
+candice
+bubblegum
+brigitte
+banner
+anubis
+addicted
+abcd123
+778899
+xxxxxxx
+xander
+valley
+underworld
+slacker
+shane
+shadow12
+rosie
+presto
+porkchop
+pierce
+passat
+negative
+mistress
+melissa1
+massimo
+living
+letter
+lance
+jethro
+jermaine
+james007
+impact
+hanson
+great
+garage
+gabriella
+francine
+fletch
+everest
+dumbass
+dookie
+deskjet
+delphine
+cyclops
+crystal1
+computers
+common
+chestnut
+capital
+booster
+blood
+blah
+baseball1
+barber
+auckland
+attack
+arturo
+alfredo
+aaa111
+321654987
+191919
+writer
+wanderer
+virtual
+venice
+vancouver
+tomahawk
+toffee
+thanatos
+tango
+syncmaster
+snow
+snoopdog
+skinny
+sinbad
+sassy
+sanchez
+roderick
+ripple
+princesa
+porno
+popopo
+poodle
+poncho
+pentagon
+paula
+nathaniel
+money123
+millenium
+mildred
+mighty
+mechanic
+liverpool1
+lesbian
+kenshin
+julien
+joejoe
+greg
+francesco
+fishes
+europa
+esmeralda
+demons
+darrell
+dante
+creature
+cornwall
+chadwick
+celeron
+carpediem
+camila
+calendar
+breeze
+bottom
+blue123
+betty
+barry
+auburn
+assass
+ariel
 antares
 another
-andrea1
-amore
-alena
-aileen
-a1234
-996633
-556677
-5329
-5201314
-3006
-28051986
-28021985
-27031989
-26021987
-25101989
-25061986
-25041985
-25011985
-24061987
-23021985
-23011985
-223322
-22121986
-22121983
-22081983
-22071989
-22061987
-22061941
-22041986
-22021985
-21021985
-2007
-20031988
-1qaz
-199999
-19101990
-19071988
-19071986
-18061985
-18051990
-17071985
-16111990
-16061986
-16011989
-15081991
-15051987
-14071987
-13031986
-123qwer
-1235789
-123459
-1227
-1226
-12101988
-12081984
-12071987
-1200
-11121987
-11081987
-11071985
-11011991
-1101
-1004
-08071987
-08061987
-05061986
-04061991
-03111987
-03071987
-02091976
-02081979
-02041976
-02031973
-02021991
-02021980
-02021971
-zouzou
-yaya
-wxcvbn
-wolfen
-wives
-wingnut
-whatwhat
-Welcome1
-wanking
-VQsaBLPzLa
-truth
-tracer
-trace
-theforce
-terrell
-sylveste
-susanna
+airbus
+abdullah
+Michael
+112358
+zodiac
+xbox360
+wayne
+wassup
+video
+vendetta
+vector
+tyrone
+twenty
+timmy
+telecom
+switch
+supervisor
 stephane
-stephan
-spoons
-spence
-sixty
-sheepdog
-services
-sawyer
-sandr
-saigon
-rudolf
-rodeo
-roadrunner
-rimmer
-ricard
-republic
-redskin
-Ranger
-ranch
-proton
-post
-pigpen
-peggy
-paris1
-paramedi
-ou8123
-nevets
-nazgul
-mizzou
-midnite
-metroid
-Matthew
-masterbate
-margarit
-loser1
-lolol
-lloyd
-kronos
-kiteboy
-junk
-joyce
-jomama
-joemama
-ilikepie
-hung
-homework
-hattrick
-hardball
-guido
-goodgirl
-globus
-funky
-friendster
-flipflop
-flicks
-fender1
-falcon1
-f00tball
-evolutio
-dukeduke
-disco
-devon
-derf
-decker
-davies
-cucumber
-cnfybckfd
-clifton
-chiquita
-castillo
-cars
-capecod
-cafc91
-brown1
-brand
-bomb
-boater
-bledsoe
-bigdicks
-bbbbbbb
-barley
-barfly
-ballet
-azzer
-azert
-asians
-angelic
-ambers
-alcohol
-6996
-5424
-393939
-31121990
-30121987
-29121987
-29111989
-29081990
-29081985
-29051990
-27272727
-27091985
-27031987
-26031987
-26031984
-24051990
-23061990
-22061990
-22041985
-22031991
-22021990
-21111985
-21041985
-20021986
-19071990
-19051986
-19011987
-17171717
-17061986
-17041987
-16101987
-16031990
-159357a
-15091987
-15081988
-15071985
-15011986
-14101988
-14071988
-14051990
-14021983
-132465
-13111990
-12121987
-12121982
-12061986
-12011989
-11111987
-11081990
-10111986
-10031991
-09090909
-08051987
-08041986
-05051990
-04081987
-04051988
-03061987
-03031993
-03031988
-02101980
-02101977
-02091977
-02091975
-02061979
-02051975
-01081990
-01061987
-01011971
-wiseguy
-weed420
-tosser
-toriamos
-toolbox
-toocool
-tomas
-thedon
-tender
-taekwondo
-starwar
-start1
-sprout
-sonyericsson
-slimshad
-skateboard
-shonuf
-shoes
-sheep
-shag
-ring
-riccardo
-rfntymrf
-redcar
-qwe321
-qqqwww
-proview
-prospect
-persona
-penetration
-peaches1
-peace1
-olympus
-oberon
-nokia6233
-nightwish
-munich
-morales
-mone
-mohawk
-merlin1
-Mercedes
-mega
-maxwell1
-mash4077
-marcelo
-mann
-mad
-macbeth
-LOVE
-loren
-longer
-lobo
-leeds
-lakewood
-kurt
-krokodil
-kolbasa
-kerstin
-jenifer
-hott
-hello12
-hairball
-gthcbr
-grin
-grandam
-gotribe
-ghbrjk
-ggggggg
-FUCKYOU
-fuck69
-footjob
-flasher
-females
-fellow
-explore
-evangelion
-egghead
-dudeman
-doubled
-doris
-dolemite
-dirty1
-devin
-delmar
-delfin
-David
-daddyo
-cromwell
-cowboy1
-closer
-cheeky
-ceasar
-cassandr
-camden
-cabernet
-burns
-bugs
-budweiser
-boxcar
-boulder
-biggun
-beloved
-belmont
-beezer
-beaker
-Batman
-bastards
-bahamut
-azertyui
-awnyce
-auggie
-aolsucks
-allegro
-963963
-852852
-515000
-45454545
-31011990
-29011987
-28071986
-28021986
-27051987
-27011988
-26051988
-26041991
-26041986
-25011993
-24121986
-24061992
-24021991
-24011990
-23051986
-23021988
-23011990
-21121986
-21111990
-21071989
-20071986
-20051985
-20011989
-1943
-19111987
-19091988
-18041990
-18021986
-18011986
-17101987
-17091987
-17021985
-17011990
-16061985
-1598753
-15051986
-14881488
-14121989
-14081988
-14071986
-13111984
-122112
-12121989
-12101985
-12051985
-111213
-11071986
-1103
-11011987
-10293847
-101112
-10081985
-10061987
-10041983
-0911
-07091982
-07081986
-06061987
-06041987
-06031983
-04091986
-03071986
-03051987
-03051986
-03031990
-03011987
-02101978
-02091973
-02081974
-02071977
-02071971
-0192837465
-01051988
-01051986
-01011973
-?????
-zxcv123
-zxasqw
-yyyy
-yessir
-wordup
-wizards
-werty
-watford
-Victoria
-vauxhall
-vancouve
-tuscl
-trailer
-touching
-tokiohotel
-suslik
-supernov
-steffen
-spider1
-speakers
-spartan1
-sofia
-signal
-sigmachi
-shen
-sheeba
-sexo
-sambo
-salami
-roger1
-rocknroll
-rockin
-road
-reserve
-rated
-rainyday
-q123456789
-purpl
-puppydog
-power123
-poiuytre
-pointer
-pimping
-phialpha
-penthous
-pavement
-outside
-odyssey
-nthvbyfnjh
-norbert
-nnnnnnnn
-mutant
-Mustang
-mulligan
-mississippi
-mingus
-Merlin
-magic32
-lonesome
-liliana
-lighting
-lara
-ksenia
-koolaid
-kolokol
-klondike
-kkkkkkk
-kiwi
-kazantip
-junio
-jewish
-jajaja
-jaime
-jaeger
-irving
-ironmaiden
-iriska
-homemade
-herewego
-helmut
-hatred
-harald
-gonzales
-goldfing
-gohome
-gerbil
-genesis1
-fyfnjkbq
-freee
-forgetit
-foolish
-flamengo
-finally
-favorite6
-exchange
-enternow
-emilio
-eeeeeee
-dougie
-dodgers1
-deniro
-delaware
-deaths
-darkange
-commande
-comein
-cement
-catcher
-cashmone
-burn
-buffet
-breaker
-brandy1
-bordeaux
-books
-bongo
-blue99
-blaine
-birgit
-billabon
-benessere
-banan
-awesome1
-asdffdsa
-archange
-annmarie
-ambrosia
-ambrose
-alleycat
-all4one
-alchemy
-aceace
-aaaaaaaaaa
-777999
-43214321
-369258147
-31121988
-31121987
-30061987
-30011986
-2fast4u
-29041985
-28121984
-28061986
-28041992
-28031982
-27111985
-27021991
-26111985
-26101986
-26091986
-26031986
-25021988
-24111990
-24101986
-24071987
-24011987
-23051991
-23051987
-23031987
-222777
-22071983
-22051986
-21101989
-21071987
-21051986
-20081986
-20061986
-20031986
-20021985
-20011988
-19641964
-19111986
-19101986
-19021990
-18051987
-18031991
-18021987
-16111982
-16011987
-15111984
-15091988
-15061988
-15031988
-15021983
-14021989
-14011988
-14011987
-12348765
-12345qaz
-1234566
-12111990
-12091988
-12051989
-12051987
-12031988
-12021985
-12011985
-11111986
-11091984
-1109
-11071989
-1016
-10071985
-10061984
-10041990
-10031989
-10011988
-06071983
-05021988
-03041987
-02091982
-02091971
-02061974
-02051990
-02051979
-02011990
-01051990
-010390
-01021985
-youtube
-yasmin
-woodstoc
-wonderful
-wildone
-widget
-whiplash
-ukraine
-tyson1
-twinkie
-trouble1
-treetop
-tigers1
-their
-testing1
-tarpon
-tantra
-summer69
-stickman
-stafford
-spooge
-spliff
-speedway
-somerset
-smoothie
-siobhan
-shuttle
-shodan
-SHADOW
+skylar
+simba
 selina
-segblue2
-sebring
-scheisse
-Samantha
-rrrr
-roll
-riders
-revolution
-redbone
-reason
-rasmus
-randy1
-rainbows
-pumper
-pornking
-point
-ploppy
-pimpdadd
-payday
-pasadena
-p0o9i8u7
-opennow
-nittany
-newark
-navyseal
-nautica
-monic
-mikael
-metall
-Marlboro
-manfred
-macleod
-luna
-luca
-longhair
-lokiloki
-lkjhgfds
-lefty
-lakers1
-kittys
-killa
-kenobi
-karine
-kamasutra
-juliana
-joseph1
-jenjen
-jello
-interne
-houdini
-gsxr1000
-grass
-gotham
-goodday
-gianni
-getting
-gannibal
-gamma
-flower2
-fishon
-Fabie
-evgeniy
-drums
-dingo
-daylight
-dabomb
-cornwall
-cocksucker
-climax
-catnip
-carebear
-camber
-butkus
-bootsy
-blue42
-auto
-austin31
-auditt
-ariel
-alice1
-algebra
-advance
-adrenalin
-888999
-789654123
-777333
-5Wr2i7H8
-4567
-3ip76k2
-32167
-31031987
-30111987
-30071986
-30061983
-30051989
-30041991
-28071987
-28051990
-28051985
-27041985
-26071987
-26061986
-26051986
-25121985
-25051985
-24081988
-24041988
-24031987
-24021988
-23skidoo
-23121986
-23091987
-23071985
-23061992
-22111985
-22091986
-22081991
-22071990
-22061985
-21081985
-21071992
-21021987
-20101988
-20061984
-20051989
-20041990
-1Dragon
-19091990
-19031987
-18121984
-18081988
-18061991
-18041991
-18011988
-17061991
-17021987
-16031988
-16021987
-15091989
-15081990
-15071983
-15041987
-14091990
-14081990
-14041992
-14041987
-14031989
-13081985
-13021987
-123qwert
-12345qwer
-12345abc
-123456t
-123456789m
-1212121212
-12081983
-12021991
-111112
-11101986
-11081988
-11061989
-11041991
-11011989
-1018
-1015
-10121986
-10121985
-10101989
-10041991
-09091986
-09081988
-09051986
-08071988
-08011986
-07101987
-07071985
-0660
-06061985
-06011988
-05031991
-05021987
-04061984
-04051985
-02101973
-02061981
-02061972
-02041973
-02011979
-01101987
-01051985
-01021987
-workout
-wonderboy
-winter1
-wetter
-werdna
-vvvv
-voyager1
-vagabond
-trustme
-toonarmy
-timtim
-Tigger
-thrasher
-terra
-swoosh
-supra
-stigmata
-stayout
-status
-square
-sperma
-smackdown
-sixty9
-sexybabe
-sergbest
-senna
-scuba1
-scrapper
-samoht
-sammy123
-salem
-rugger
-royalty
-rivera
-ringo
-restart
-reginald
-readers
-raleigh
-rainbow1
-rage
-prosper
-pitch
-pictures
-petunia
-peterbil
-perfect1
-patrici
-pantera1
-pancake
+rockets
+revolver
+reggae
+railroad
+qwerty12345
+placebo
+paloma
+pablo
 p4ssw0rd
-outback
-norris
-normandy
-nevermore
-needles
-nathan1
-nataly
-narnia
-musical
-mooney
-michal
-maxdog
-MASTER
-madmad
-m123456
-lumina
-luckyone
-luciano
-linkin
-lillie
-leigh
-kirkland
-kahlua
-junkmail
-Joshua
-josephin
-Jordan23
-johnson1
-jocelyn
-jeannie
-javelin
-inlove
-honor
-holein1
-harbor
-grisha
-gina
-gatit
-futurama
-firenze
-fireblad
-fellatio
-esquire
-errors
-emmett
-elvisp
-drum
-driller
-dragonfl
-dragon69
-dingle
+monaco
+minnesota
+marlon
+mariners
+manuela
+leather
+killers
+insert
+iloveyou2
+ibanez
+holyshit
+hollow
+hallo
+freeze
+freeway
+freak
+elisabeth
+donnie
+demo
+database
+celica
+cathy
+calypso
+bumblebee
+bruins
+bobafett
+bernardo
+barkley
+ballet
+astrid
+amethyst
+albatross
+advanced
+addison
+987456
+272727
+zxcvb
+whistler
+wellington
+weezer
+weaver
+warlord
+wagner
+volley
+vernon
+trisha
+trapper
+susanna
+suicide
+starter
+sphinx
+smitty
+slamdunk
+sisters
+sheffield
+scrabble
+roadkill
+retard
+realmadrid
+randall
+rainbows
+queens
+profile
+postal
+polopolo
+obsidian
+northern
+mortal
+message
+mathias
+magic1
+magenta
+looser
+looney
+legacy
+learning
+kashmir
+independent
+impossible
+husband
+hailey
+elements
+electron
+diane
+derek
 davinci
-crackers
-corwin
-compaq1
-collie
-christa
-checker
-cartoons
-buttercup
-bungle
-budgie
-boomer1
-body
-blue1234
-biit
-bigguns
-barry1
-audio
-atticus
-atlas
-Anthony
-angus1
-Anai
-alisa
-alex12
-aikman
-abacab
-951357
-7894
-4711
-321678
-31101987
-31051985
-30121986
-30091989
-30031992
-30031986
-30011987
-29061988
-29061985
-29031988
-28061988
-27061983
-27031986
-27021990
-26101987
-26071989
-26071986
-25081986
-25061987
-25051987
-25041991
-24101989
-24071991
-23111987
-23091986
-23051983
-23031986
-2222222222
-22121989
-22071991
-22051991
-22011985
-21121985
-21031985
-20121988
-20121986
-20061990
-20051987
-1q2q3q
-1944
-19091983
-19061992
-1905
-19021991
-18121987
-18121983
-18111986
-16121986
-16091987
-16071991
-16071987
-15111989
-15031990
-14041986
-13121983
-13101987
-13091984
-13071990
-1245
-12345m
-1234568
-123456789qwe
-1234567899
-1234561
-1228
-12211221
-12121991
-12121986
-12101990
-12101984
-12091991
-1209
-12081988
-12071990
-12071988
-115599
-11111a
-11041990
-1028
-10081990
-10081983
-10071990
-10061989
-10011992
-09111987
-09081985
-08121987
-08111984
-08101986
-08051989
-07091988
-07081987
-07071988
-07071984
-07071982
-07051987
-06031992
-05111986
-05051991
-05031990
-05011987
-04111988
-04061987
-04041987
-040404
-02081973
-02061978
-02031991
-02031990
-02011976
-01071984
-01041980
-01021992
-zaqwsxcde
-yyyyyyyy
-worthy
-woowoo
-wind
-William
-warhamme
-walton
-vodka
-venom
+customer
+corrado
+concord
+comfort
+cinder
+chopin
+chantal
+budweiser
+brisbane
+bogart
+baritone
+balloon
+badman
+asd
+armageddon
+andrey
+amigos
+amarillo
+alonso
+algebra
+alexandr
+aerosmith
+adriano
+123457
+12301230
+windmill
+wheels
+westham
+visual
+vintage
+vanhalen
+telefon
+tardis
+surprise
+stefano
+starfire
+speakers
+snatch
+smoker
+shazam
+seymour
+satan
+sandro
+salome
+safari
+sadie
+river
+radio
+postman
+poppy
+palace
+oregon
+odessa
+noname
+ncc1701e
+nation
+mustafa
+music1
+mimosa
+method
+lucille
+luciano
+lifetime
+lambert
+kittykat
+keller
+gideon
+funny
+fredrick
+fidelity
+fabulous
+everyday
+eastern
+dixie
+dentist
+daytona
+davids
+darlene
+craig
+coolness
+concorde
+clancy
+chapman
+catwoman
+casablanca
+browns
+boris
+blackhawk
+belle
+barrett
+babybaby
+atomic
+aladdin
+aaa
+147147
+will
+vodafone
+traveler
+trader
+tractor
+tara
+summer1
+stoner
+stimpy
+southside
+sarah1
+santa
+renault
+rainbow1
+radical
+princess1
+primus
+potatoes
+polly
+pipeline
+philippe
+peter1
+payton
+patton
+pathfinder
+openup
+nofear
+nigeria
+monterey
+maxime
+marsha
+madden
+lipstick
+lesley
+lakeside
+krystal
+kendra
+kelly1
+kelley
+juice
+joey
+jakarta
+italian
+internet1
+insanity
+hustler
+hughes
+hotshot
+hihihi
+harvest
+gaston
+fishbone
+emma
+elite
+diehard
+destroy
+daisy1
+curious
+critter
+chihuahua
+channel
+bordeaux
+boeing
+biohazard
+beatriz
+beamer
+bacchus
+alfonso
+21122112
+159159
+wookie
+windsurf
+windsor
+wanted
+walnut
+vinnie
 velocity
-treble
-tralala
-tigercat
-tarakan
-sunlight
-streaming
-starr
-sonysony
-smart1
-skylark
-sites
-shower
-sheldon
-seneca
-sedona
-scamper
-sand
-sabrina1
-romantic
-rockwell
-rabbits
-q1234567
+vagabond
+torres
+topsecret
+thegame
+temp
+stretch
+stereo
+seamus
+scratch
+saskia
+sahara
+rescue
+reloaded
+redred
+raindrop
+prudence
+professional
+praise
+power1
+pilgrim
+pharmacy
+peaceful
+patrice
+nnnnnn
+musical
+multimedia
+montgomery
+midget
+marseille
+marisa
+marietta
+luke
+lotus
+letmein2
+ladybird
+kaitlyn
+jenny1
+janet
+irish
+internal
+hyundai
+hitachi
+havana
+gigabyte
+gameboy
+fourteen
+feather
+everett
+ernesto
+egghead
+dynasty
+dolphin1
+davis
+damnit
+chambers
+castro
+bushido
+bunghole
+buckeyes
+buckeye
+brodie
+breaker
+bluefish
+bleach
+beowulf
+bedford
+because
+bartman
+apocalypse
+aphrodite
+adonis
+5555555
+4815162342
+23232323
+1988
+1980
+12369874
+111222333
+111
+zerocool
+yyyyyy
+ytrewq
+wrestler
+vicky
+tracy
+tortoise
+sysadmin
+sunshine1
+subzero
+starship
+sonia
+sean
+sawyer
+redwood
+redhot
+reason
+qwerty123456
+qwerty11
 puzzle
-protect
-poker1
-plato
-plastics
-pinnacle
-peppers
-pathetic
-patch
+primrose
+politics
+pluto
+paranoia
 pancakes
-ottawa
-ooooo
-offshore
-octopus
-nounours
-nokia1
-neville
-ncc74656
-natasha1
-nastia
-mynameis
-motor
-motocros
-middle
-met2002
-meow
-meliss
-medina
-meadow
-matty
-masterp
-manga
-lucia
-loose
-linden
-lhfrjy
-letsdoit
-leopold
-lawson
-larson
-laddie
-ladder
-kristian
-kittie
-jughead
-joecool
-jimmys
-iklo
-honeys
-hoffman
-hiking
-hello2
-heels
-harrier
-hansol
-haley
-granada
-gofast
-fyutkjxtr
-frogs
-francisc
-four
-fields
-farm
-faith1
-fabio
-dreamcas
-dragster
-doggy1
-dirt
-dicky
+overload
+opensesame
+okokok
+nikola
+nevermore
+moscow
+melbourne
+matthews
+marriage
+mallory
+magdalena
+macaroni
+lespaul
+lemons
+laurel
+kyle
+kittens
+kiss
+kicker
+justme
+juanita
+jonathon
+jocelyn
+jacqueline
+jackjack
+infinite
+hope
+heinrich
+hansolo
+hacked
+greens
+gratis
+graduate
+goodness
+godspeed
+feedback
+domingo
+dieter
+cougars
+corolla
+cornelia
+corleone
+choochoo
+chinese
+challenge
+chairman
+canon
+butthole
+buddy123
+brennan
+bouncer
+bossman
+bonsai
+bonkers
+barracuda
+azsxdcfv
+andrew1
+alisha
+accounting
+505050
+445566
+420420
+1478963
+102938
+woofer
+warner
+volcano
+tyler1
+trucks
+toby
+slider
+sleeping
+serious
+remington
+quicksilver
+pringles
+premier
+power123
+paradigm
+nickolas
+navigator
+nautilus
+muscle
+moreno
+milkshake
+miles
+menace
+master123
+massage
+marshal
+killer1
+kathy
+kate
+jonas
+jane
+jammer
+gravity
+gerrard
+geneva
+ganesh
+frog
+formula
+feathers
+facebook
+enrico
+dragon12
+deluxe
+damage
+cruiser
+condom
+cinema
+brittney
+bones
+bazooka
+aviation
+avalanche
+anthrax
+airport
+admiral
+666999
+19841984
+123qweasdzxc
+10203040
+wolfie
+wildwood
+whatsup
+thrasher
+summit
+stunner
+staples
+speedway
+sonny
+songbird
+sinatra
+sickness
+shannon1
+senator
+screamer
+savior
+sascha
+samantha1
+riverside
+riley
+renata
+redbull
+rabbits
+quentin
+profit
+princeton
+powell
+popper
+poopie
+pooper
+peters
+pepito
+oscar1
+olympia
+oldman
+nopass
+noelle
+monster1
+milena
+micron
+mauricio
+mattie
+massive
+marika
+manhattan
+manfred
+love1234
+lithium
+labtec
+keegan
+joyce
+jojojo
+jennifer1
+jeffery
+jayson
+janelle
+intel
+indonesia
+iceberg
+ibrahim
+hungry
+hell
+hawk
+hammond
+filter
+epsilon
+email
+elena
+electra
+doreen
+dimples
+devil666
+deacon
+dandan
+creator
+cosmo
+cooking
+clipper
+circle
+chimera
+caveman
+bugsbunny
+budlight
+bowler
+bottle
+birdman
+benfica
+barton
+android
+ambrosia
+adrianna
+909090
+2222222
+2001
+zxcvbnm1
+zero
+windows1
+wheeler
+waffle
+verona
+ventura
+toulouse
+toto
+topcat
+tazmania
+static
+stacy
+speedo
+spears
+spaghetti
+slinky
+slapshot
+reptile
+rebekah
+pigeon
+panties
+monty
+mitch
+ministry
+miami
+mental
+matteo
+mathilde
+magpie
+lighting
+lady
+john123
+jenkins
+huskers
+houses
+helsinki
+heidi
+hanuman
+girlfriend
+gateway1
+garnet
+fussball
+frisbee
+frederik
+flexible
+finland
+festival
+federal
+familia
+eloise
+dynamic
+dwight
+dungeon
+doggy
+dickens
 destiny1
-deputy
-delpiero
-dbnfkbr
-dakota1
-daisydog
-cyprus
-cutie
-cupoi
-colonial
-colin
-clovis
-cirrus
-chewy
-chessie
-chelle
-caster
+daydream
+coventry
+constant
+connection
+charles1
+carpet
+bicycle
+becky
+babyboy
+area51
+angeline
+alucard
+a123456789
+99999
+1234321
+111111111
+zebra
+woodland
+wasser
+vipers
+trust
+trains
+theatre
+tabasco
+swinger
+string
+steffi
+spectre
+sooner
+skinhead
+signature
+shutup
+sandrine
+sam123
+sacred
+rufus
+rockford
+quartz
+possum
+pinball
+nipper
+nina
+nichole
+namaste
+morton
+merchant
+ketchup
+kenwood
+jazz
+hentai
+hanna
+haggis
+greatest
+grapes
+fuckers
+fritz
+ford
+everlast
+eunice
+espresso
+encore
+ellen
+elizabet
+eeeeee
+drifter
+dragon123
+dolly
+dddddddd
+darkman
+community
+chrome
+chouchou
+chiefs
+charlton
+champs
+champagne
+carlitos
+camel
+brad
+boobs
+bobbob
+blueblue
+beaner
+beaches
+balls
+baldwin
+awesome1
+athens
+aspirine
+anne
+allstar
+alcohol
+963852
+77777
+3333
+1985
+12345abc
+123098
+zaphod
+weed
+vvvvvv
+vienna
+thelma
+theend
+tekken
+technology
+stronger
+stephan
+starbuck
+spotty
+skeleton
+second
+scissors
+rosario
+rolling
+rodman
+rocks
+reginald
+redeemer
+ralph
+raleigh
+polarbear
+pheonix
+pepsi1
+normandy
+night
+never
+minime
+mellow
+media
+maryann
+mariam
+manning
+manman
+luckydog
+liliana
+leon
+laserjet
+just4fun
+johann
+jarvis
+impulse
+idiot
+hilton
+heroes
+haha
+greenbay
+granada
+graffiti
+giorgio
+galileo
+fiction
+fantastic
+durango
+doughboy
+dortmund
+donuts
+dodge
+delphi
+delilah
+dazzle
+daniele
+dan
+crunch
+cheers
+carrera
+carnage
+carmel
+building
+bruiser
+bombay
+blue22
+bennie
+bbbbbbbb
+bassman
+banzai
+armani
+annabelle
+annabell
+alex123
+alchemist
+absolut
+aaliyah
+223344
+2112
+zimbabwe
+worship
+wisconsin
+winchester
+weekend
+tunafish
+truman
+tolkien
+thisisit
+sticks
+stafford
+sputnik
+spalding
+sometimes
+solitude
+sofia
+snooker
+sex
+sancho
+robotech
+rich
+reader
+rainbow6
+qazwsx12
+pulsar
+protect
+pooppoop
+pointer
+oxygen
+onlyme
+officer
+minister
+man
+lynn
+lola
+lilly
+leonidas
+lemon
+kungfu
+kirkland
+jarrett
+integral
+incognito
+ilovesex
+ignatius
+honda1
+helper
+heavenly
+gustav
+goblue
+gggggggg
+ferdinand
+female
+faggot
+exchange
+droopy
+dogman
+dark
+combat
+carroll
+busted
+bulldog1
+bravo
+blackdog
+bearbear
+bacon
+alan
+911911
+6666
+1990
+123454321
+zaqwsx
+wings
+winfield
+westlife
+turtles
+tricia
+trainer
+thriller
+tarheel
+synergy
+summertime
+spartans
+snapple
+smiths
+skidoo
+shell
+sausages
+salvatore
+salamander
+romans
+printing
+premium
+poster
+photos
+palmtree
+opendoor
+ocean
+obiwan
+normal
+nestor
+mypass
+mybaby
+mosquito
+milkyway
+mexican
+mcdonalds
+maynard
+mason
+magnet
+lucky7
+laughter
+klondike
+kitchen
+kingsley
+kings
+kaylee
+josiah
+joe
+jesus123
+ivan
+irving
+invisible
+humphrey
+hillside
+hattrick
+hampton
+hammerhead
+grinch
+function
+forgotten
+fighting
+excellent
+estelle
+esteban
+easton
+delaware
+darthvader
+dale
+costello
+corey
+colonel
+cisco
+chief
+catalyst
+carla
+cardinals
+caprice
+bucket
+bolton
+bobmarley
+blanca
+bermuda
+batman1
+babylove
+assholes
+annika
+andersen
+amerika
+alexande
+Daniel
+989898
+369369
+19891989
+1234asdf
+xyz123
+xxxx
+whiplash
+wasted
+wasabi
+wally
+visitor
+usa123
+traffic
+toaster
+tiffany1
+tiburon
+teddy1
+steele
+sooners
+solutions
+smart
+smallville
+slimshady
+sixteen
+sergei
+sammy123
+saint
+romero
+rockwell
+robinhood
+ripley
+reddevil
+qwerty7
+piano
+pelican
+pastor
+palermo
+ophelia
+odyssey
+nuclear
+nipple
+nana
+mouse1
+morgana
+mommy
+mimi
+maxwell1
+margie
+major
+mailbox
+madeleine
+louisa
+lolo
+loaded
+life
+ledzep
+latino
+larisa
+lansing
+kahuna
+jordan1
+harriet
+grendel
+grayson
+gordon24
+glendale
+giovanna
+frodo
+frisco
+foxylady
+fortress
+ficken
+favorite
+endless
+doughnut
+domain
+direct
+delaney
+daniels
+cutter
+cristal
+coucou
+comanche
+clark
+cheshire
+cherries
+cheddar
+cheater
+century
+catarina
+butch
+brett
+bob123
+bigger
+bertrand
+benoit
+barefoot
+aubrey
+armada
+arabella
+alligator
+alissa
+advance
+aaa123
+1qaz2wsx3edc
+zxczxc
+ziggy
+vanguard
+titan
+swallow
+super1
+stuttgart
+stephen1
+square
+skating
+shampoo
+rockon
+rhapsody
+renee
+redwing
+reckless
+ramirez
+puppet
+pumpkin1
+problem
+powerful
+pooh
+phone
+pervert
+partner
+painting
+othello
+octavia
+novell
+nocturne
+nickname
+narnia
+mynameis
+mikemike
+martin1
+maison
+llllllll
+limited
+leighton
+lacoste
+koko
+kkkkkkkk
+kingfisher
+juniper
+jorge
+jokers
+johnston
+jagger
+jade
+holidays
+hohoho
+highway
+henderson
+handyman
+gregor
+fuckoff1
+front242
+flamenco
+escalade
+doudou
+doobie
+dogdog
+division
+delfin
+decker
+custom
+covenant
+cornell
+colors
+circus
+churchill
+changes
+chandra
 cannibal
-candyass
+bummer
+boots
+bobo
+bobby1
+blanco
+bird
+bertie
+bears
+badminton
+azsxdc
+ashlee
+annmarie
+alexander1
+alcatraz
+agatha
+a1s2d3
+11112222
+wwwwwwww
+wildcard
+whitesox
+vincent1
+unlock
+tyson
+tycoon
+twiggy
+trojans
+thornton
+thalia
+temporary
+survival
+supernatural
+sunny1
+sprocket
+sony
+sonata
+somerset
+smarty
+skorpion
+skinner
+services
+saxophone
+sacrifice
+rotten
+romania
+restless
+renato
+record
+pumpkins
+paprika
+packer
+operation
+nosferatu
+newpassword
+moses
+monkey123
+middle
+michelle1
+michal
+meathead
+mankind
+management
+lucky123
+licorice
+laser
+language
+kronos
+kismet
+julio
+jean
+jacob1
+jackass1
+irene
+infiniti
+icarus
+horror
+homers
+groove
+goose
+goalie
+generation
+gary
+gamecube
+foolish
+flanders
+electro
+edinburgh
+duckie
+disciple
+diplomat
+darryl
+crescent
+cowgirl
+counterstrike
+cocaine
+cluster
+clemson
+chunky
+chippy
+cherie
+catholic
+caravan
+capoeira
+calculator
+browning
+biscuits
+bikini
+baker
+ambrose
+alexalex
+P@ssw0rd
+Jennifer
+19861986
+123456abc
+yousuck
+winston1
+whitey
+virus
+virgil
+violator
+transam
+train
+torpedo
+tinman
+tangerine
+super123
+straight
+stalin
+sporty
+sorcerer
+sidekick
+shredder
+schubert
+savanna
+sanjose
+racecar
+prestige
+presley
+peter123
+pasword
+nonsense
+news
+naomi
+mulligan
+moneyman
+misha
+matchbox
+mars
+march
+marcela
+marble
+marauder
+losers
+longhair
+lisalisa
+killme
+kieran
+kayleigh
+kakashi
+jayden
+islander
+india
+homeboy
+gunther
+grasshopper
+geraldine
+genesis1
+generic
+gardenia
+gabriele
+explore
+everything
+emanuel
+edmonton
+dwayne
+downhill
+digital1
+denali
+defense
+davide
+dana
+cromwell
+corazon
+chowchow
+cats
+catman
+carebear
+candy1
+burnout
+boxer
+bounce
+bettyboop
+benito
+benben
+beastie
+beans
+ass
+ashley1
+363636
+1984
+161616
+wizards
+walking
+volcom
+viktor
+vanessa1
+twelve
+terrapin
+tennessee
+tasha
+swords
+stockton
+stitch
+steph
+spartacus
+smoothie
+shinobi
+seahawks
+russian
+revelation
+rebecca1
+rangers1
+qweqweqwe
+qqqqqqq
+puppydog
+portal
+popular
+physics
+pete
+norbert
+nipples
+nimbus
+nestle
+milkman
+midway
+meghan
+marigold
+margot
+malachi
+louie
+longbow
+lion
+krypton
+krissy
+info
+hurley
+homerun
+hoffman
+higgins
+hansen
+hacking
+gregorio
+gotcha
+goldfinger
+glamour
+giggle
+ghosts
+gangbang
+freaks
+fowler
+fischer
+finance
+dutchess
+dirty
+dean
+dealer
+daylight
+dawn
+constantine
+colin
+cobalt
+clueless
+cloud
+clever
+chilli
+chaser
+caution
+catcat
+capone
+calamity
+blaze
+blanche
+bigdick
+beefcake
+bayern
+basil
+banker
+babe
+aquarium
+anathema
+ambition
+amanda1
+address
+a12345678
+222333
+1986
+19821982
+wildlife
+vince
+undercover
+truck
+tribal
+transit
+today
+timeout
+snowbird
+shaolin
+shanna
+serpent
+secret1
+schneider
+saffron
+rosita
+rain
+qwert12345
+qwerqwer
+prospect
+porsche911
+pinhead
+perkins
+pendragon
+north
+nike
+native
+natalie1
+mutant
+momo
+mallard
+lunatic
+lol
+lockdown
+lkjhgfdsa
+letsgo
+lala
+junebug
+jose
+jellyfish
+jameson
+italiano
+irishman
+inter
+infamous
+hydrogen
+hooper
+hippie
+hellboy
+hartford
+hammers
+guess
+gryphon
+goodyear
+glacier
+generals
+garrison
+galant
+foxhound
+entrance
+eighteen
+earth
+drake
+dimension
+diamante
+denis
+daedalus
+current
+crack
+colton
+cocktail
+champ
+chameleon
+celina
+callum
+caligula
+borabora
+bondage
+bonanza
+behemoth
+becker
+bass
+bart
+bangkok
+bambino
+balloons
+bachelor
+andrews
+amelie
+adeline
+313131
+234567
+123698745
+xerxes
+waterman
+volvo
+trenton
+thomas1
+teenager
+suckme
+stumpy
+stellar
+spanking
+south
+soccer10
+sergeant
+seashell
+seahorse
+scroll
+scarecrow
+ruben
+royal
+riffraff
+rick
+rapper
+radar
+prowler
+privacy
+pothead
+possible
+pittsburgh
+pissoff
+pinnacle
+peachy
+paulie
+paper
+optimus
+oatmeal
+nostromo
+members
+maximilian
+marc
+mantra
+malone
+malice
+lulu
+lord
+letters
+latitude
+kevin123
+kellie
+kamasutra
+jehovah
+jared
+italy
+invasion
+hugo
+houdini
+hopkins
+honey1
+hibiscus
+heyhey
+harman
+hans
+hallmark
+granite
+goodboy
+glasses
+glasgow
+fuzzy
+fuller
+flyboy
+firestorm
+fernandez
+envision
+enjoy
+engage
+ellie
+editor
+ecuador
+devon
+desperado
+dejavu
+daddy1
+cody
+cicero
+charcoal
+character
+cardiff
+canyon
+candace
+camels
+caleb
+bronze
+bonjovi
+blue1234
+bigguy
+berger
+aurelia
+antelope
+angus
+alejandra
+aircraft
+abby
+753159
+456852
+314159
+303030
+1978
+1969
+123456aa
+123456123
+1234560
+west
+viktoria
+vectra
+unlimited
+tundra
+transport
+topher
+stripper
+stinker
+stefania
+spinner
+spiders
+snowwhite
+smirnoff
+silly
+shearer
+sexual
+seraphim
+sebastien
+sample
+ronaldo7
+rockman
+rivers
+reporter
+redskin
+razor
+rayray
+ramsey
+ramses
+raiders1
+plumber
+peach
+painkiller
+numbers
+nineteen
+muppet
+morena
+monolith
+moneys
+moneymaker
+mishka
+messiah
+memories
+memorial
+massacre
+manila
+lottie
+leland
+legends
+lamborghini
+kimber
+josie
+jimmie
+jazzman
+hussain
+huskies
+honduras
+habibi
+goofball
+george1
+gareth
+fullmoon
+fraser
+forever1
+fester
+ethan
+enter1
+engineering
+elefante
+eatme
+duck
+dragonballz
+doorknob
+dipstick
+deadly
+crusher
+compact
+commerce
+cecile
+carousel
+callisto
+calico
+builder
+brilliant
+blubber
+bettina
+berenice
+barbarian
+banane
+backup
+augusta
+asdfzxcv
+ariane
+angeles
+alex1234
+alchemy
+alberta
+advent
+Welcome1
+9999999
+343434
+336699
+332211
+1qa2ws3ed
+19871987
+12345678a
+123455
+zaq123
+wormwood
+wood
+weapon
+watcher
+volkswagen
+tomas
+tipper
+tahiti
+starstar
+spiral
+spidey
+sonics
+solaris
+snuffy
+shrimp
+sheep
+sheba
+sexygirl
+sephiroth
+screen
+schumacher
+sasasa
+samiam
+salsa
+rudolf
+rosewood
+roses
+rochester
+roadster
+reload
+rapunzel
+putter
+prisoner
+prescott
+pizza123
+phillies
+phil
+phantom1
+perfect1
+pasadena
+papaya
+orange1
+optimist
+norway
+nitram
+nikolas
+myrtle
+monkeyboy
+molson
+mikael
+metropolis
+master12
+marquis
+luna
+locked
+larson
+lakota
+kimberley
+killjoy
+karine
+junkmail
+jingle
+jigsaw
+jenna
+inspiron
+hillary
+hhhhhhhh
+hellohello
+griffith
+greenwood
+golfball
+gator
+gambler
+fucku
+forester
+fergus
+euphoria
+england1
+edwin
+discus
+denmark
+dell
+death666
+cornelius
+coolcat
+constance
+conquest
+confirm
+colt45
+clitoris
+chips
+chelsey
+cesar
+cartoons
+buzzard
+butcher
+buckaroo
+buck
+bologna
+bluejays
+ben
+angelic
+analog
+Alexander
+789123
+787878
+1991
+1977
+123465
+winners
+weenie
+waiting
+volunteer
+violence
+undead
+ultra
+tree
+titties
+testpass
+terrence
+temporal
+tech
+teamwork
+tadpole
+stevens
+sport
+spencer1
+soprano
+social
+skate
+silverado
+shipping
+serendipity
+saigon
+roosters
+retired
+reflex
+referee
+redeye
+prophecy
+popcorn1
+playmate
+pistons
+paragon
+panorama
+p0o9i8u7
+noway
+nonono
+motion
+mordor
+meadow
+marcopolo
+manolo
+magneto
+luis
+looker
+lioness
+lighter
+leticia
+landmark
+kill
+khalid
+johnson1
+jess
+jacobs
+iverson3
+instinct
+infected
+illuminati
+iceland
+hunter1
+horace
+honeydew
+golfing
+gilles
+gabby
+foundation
+force
+forbidden
+floyd
+flame
+fidelio
+esperanza
+dogs
+document
+dharma
+deutsch
+deadline
+dead
+dahlia
+dadada
+crocodile
+credit
+cowboys1
+coolguy
+climbing
+choice
+chicks
+chamber
+castor
+cassius
 camping
-cable
-bynthytn
+buddies
+bubbles1
+briana
+bremen
+bluestar
+birmingham
+beretta
+bathroom
+bastian
+barker
+baltimore
+balboa
+anamaria
+amber1
+aloha
+88888
+33333
+258456
+25802580
+24682468
+123451
+yoyo
+wildman
+whiteboy
+webber
+vader
+trinitron
+topdog
+titleist
+tiberius
+testing123
+talent
+superhero
+stoned
+skydive
+silvana
+sienna
+sidewinder
+shitty
+salami
+ruby
+rosemarie
+rosalie
+retarded
+requiem
+qqqqq
+primavera
+players
+peppermint
+palomino
+outsider
+oooooooo
+musician
+monarch
+misfit
+michelin
+maria1
+mafia
+macbeth
+m
+lynette
+lowell
+kimmie
+june
+juggernaut
+ironmaiden
+hyacinth
+hamish
+grease
+goaway
+gerbil
+gavin
+gatorade
+fuzzball
+fujitsu
+feline
+falling
+everyone
+dottie
+dictionary
+development
+delirium
+daisy123
+cyber
+cutie
+critical
+cradle
+corner
+cordelia
+collection
+chivas
+chiara
+cat123
+carl
+capitals
+caliente
+burning
+bunnies
+bunker
+brent
+bobdylan
+blackrose
+birdhouse
+bighead
+beta
+bassoon
+author
+asparagus
+anton
+allegro
+albino
+Michelle
+Jessica
+898989
+654123
+545454
+1a2s3d4f
+1982
+19781978
+wiggles
+weston
+walleye
+voltaire
+vodka
+valiant
+thedoors
+test1
+tender
+submarine
+stress
+stonewall
+special1
+southpaw
+soledad
+soccer12
+slasher
+simmons
+season
+scamper
+sauron
+sandy1
+sanctuary
+s
+ruthless
+rugby
+rivera
+reuben
+redstar
+recall
+reaction
+rasta
+rapture
+racerx
+quebec
+qazwsxed
+prometheus
+portable
+poisson
+pizzas
+pimp
+pilot
+perry
+pepper1
+password11
+passcode
+oyster
+otto
+omar
+olive
+official
+newbie
+neverland
+mullet
+morales
+monsoon
+mojo
+misery
+mindless
+micro
+masamune
+leopold
+lenny
+lennox
+legendary
+lalalala
+laddie
+kirsty
+kiki
+kerstin
+joel
+jimmy1
+incredible
+icecube
+horatio
+holloway
+helios
+heartless
+hazard
+harley1
+hairball
+gollum
+girl
+genevieve
+game
+format
+fireworks
+eskimo
+entropy
+drew
+doogie
+dirtbike
+dinner
+dinamo
+dilligaf
+defiant
+daewoo
+cunt
+crossfire
+colette
+clippers
+chicago1
+cheeky
+cheech
+cayman
+caldwell
+butters
+butt
+bernadette
+apricot
+allan
+aggies
+agent007
+addict
+adams
+abcabc
+321123
+282828
+19831983
+19801980
+19751975
+123000
+1010
+zzzzz
+yellow1
+word
+widget
+waterpolo
+warthog
+warrior1
+vulcan
+vertical
+venture
+timeless
+thomson
+thegreat
+superuser
+steve1
+steel
+sssss
+squall
+spelling
+source
+someday
+solo
+snoop
+slippery
+silicon
+shine
+salman
+rusty1
+russel
+rumble
+rrrrrrrr
+roxy
+rovers
+robot
+robocop
+ricochet
+reefer
+redemption
+reborn
+raspberry
+protocol
+producer
+priest
+photo
+penguin1
+patterson
+p455w0rd
+olivetti
+oliveira
+oicu812
+neville
+mona
+mnbvcx
+meteor
+metalica
+mentor
+melisa
+mclaren
+max123
+matter
+martins
+mannheim
+mandingo
+magellan
+machines
+lovebird
+link
+linden
+leonie
+lara
+killing
+karma
+jubilee
+jonathan1
+jason123
+inflames
+important
+idunno
+heretic
+helloworld
+headache
+hancock
+hal9000
+godbless
+glenn
+giggles
+gemstone
+funky
+fucked
+ffffffff
+fatass
+emily1
+duster
+danilo
+danica
+cyclones
+cristiano
+crazy1
+color
+colonial
+collie
+claudius
+citadel
+chinook
+cheeks
+carver
+burrito
+bulgaria
+brunette
+bradshaw
+bowser
+boobie
+blazers
+bitter
+beth
+bastards
+basset
+basement
+baron
+baboon
+baba
+azertyuiop
+astro
+arcadia
+applesauce
+angelique
+alvin
+alice1
+albany
+admin1
+acapulco
+abacus
+Charlie
+786786
+25252525
+1987
+123789456
+123456987
+12312312
+zachary1
+yourmom
+yingyang
+xtreme
+workshop
+work
+what
+vicious
+ulysses
+twinkie
+trueblue
+transformers
+thierry
+tarantula
+sycamore
+sunderland
+stripes
+stigmata
+sticky
+stargazer
+staff
+shopper
+seneca
+sabrina1
+rollin
+riccardo
+qazxswedc
+playboy1
+peppers
+password01
+override
+ontario
+nomore
+nighthawk
+nickel
+napoli
+music123
+motdepasse
+mortgage
+moment
+mickeymouse
+meandyou
+maxim
+mantis
+macdaddy
+lovebug
+lorelei
+listen
+leicester
+laura1
+knockers
+kisskiss
+keenan
+katrin
+jjjjjjjj
+invader
+hysteria
+honest
+hilltop
+gonzo
+godlike
+god
+gallery
+frank1
+forgiven
+factory
+evanescence
+eugenia
+ernie
+equinox
+dutch
+distance
+destruction
+denied
+cyrus
+cosworth
+cortez
+console
+coke
+coconuts
+clifton
+client
+cash
+carlo
+carlisle
+buster1
+burgess
+breakfast
+booty
+blinky
+blink
+blaine
+bitch1
+bengals
+astros
+aspen
+asgard
+asdfjkl;
+antivirus
+aikido
+66666
+31415926
+21212121
+123321123
+100000
+yokohama
+worker
+unforgiven
+triple
+tommy123
+tictac
+therapy
+surrender
+spikey
+spiker
+spike1
+smithy
+sixers
+shoes
+shiner
+sheriff
+sheepdog
+shawna
+seinfeld
+sayang
+sabotage
+ronaldinho
+richter
+redfish
+reddragon
+rampage
+prissy
+pressure
+pinetree
+peggy
+pavement
+oriental
+offshore
+nutter
+nice
+newzealand
+netscape
+modern
+misfits
+michaels
+meow
+memorex
+mathieu
+mash4077
+mallorca
+madagascar
+licker
+lawson
+landon
+kokomo
+koala
+kestrel
+junkyard
+johncena
+jewish
+jakejake
+invincible
+intern
+indira
+hawthorn
+hawaiian
+hannah1
+halifax
+greyhound
+greene
+glenda
+futbol
+fresh
+frenchie
+flyaway
+fleming
+fishing1
+finally
+ferris
+fastball
+elisha
+doggies
+desktop
+dental
+delight
+deathrow
+ddddddd
+cocker
+chilly
+chat
+casey1
+carpenter
+calimero
+calgary
+broker
+breakout
+bootsie
+bonito
+black123
+bismarck
+bigtime
+belmont
+barnes
+ball
+baggins
+arrow
+alone
+alkaline
+adrenalin
+abbott
+987987
+3333333
+123qwerty
+000111
+zxcv1234
+walton
+vaughn
+tryagain
+trent
+thatcher
+templar
+stratus
+status
+stampede
+small
+sinned
+silver1
+signal
+shakespeare
+selene
+scheisse
+sayonara
+santacruz
+sanity
+rover
+roswell
+reverse
+redbird
+poppop
+pompom
+pollux
+pokerface
+passions
+papers
+option
+olympus
+oliver1
+notorious
+nothing1
+norris
+nicole1
+necromancer
+nameless
+mysterio
+mylife
+muslim
+monkey12
+mitsubishi
+millwall
+millennium
+megabyte
+mccarthy
+malina
+magister
+magick
+maggie1
+madhouse
+lopez
+liverpoo
+leviathan
+latina
+laetitia
+kurt
+kernel
+kayla
+karachi
+joshua1
+joaquin
+jennings
+janina
+jaime
+holstein
+henrik
+hellraiser
+head
+harder
+granger
+freefall
+focus
+flawless
+finish
+emergency
+edmund
+ebenezer
+dougie
+divinity
+delpiero
+cyborg
+cream
+comedy
+clovis
+chewie
+chewbacca
+chastity
+charlott
+carlotta
+camden
+bunny1
+bumble
+buchanan
+bradley1
+bombers
+blacks
+best
+bella1
+bell
+behappy
+battlefield
+aventura
+astral
+ashanti
+asdffdsa
+arctic
+anchor
+academy
+525252
+456654
+1979
+19741974
+090909
+zildjian
+zaqxsw
+wyoming
+wingman
+welcome123
+wargames
+vvvvvvvv
+viper1
+unicorns
+toilet
+timberland
+things
+tenerife
+tasmania
+tania
+symphony
+sweet1
+superb
+stolen
+stan
+sssssss
+spoon
+splendid
+sonyvaio
+snapshot
+slick
+sleeper
+simon1
+shining
+sherri
+sensei
+seagull
+scott1
+schmidt
+saunders
+sarajevo
+runaway
+route66
+rockey
+reverend
+redfox
+quattro
+prototype
+proton
+pooter
+polaroid
+pixies
+pixie
+perfecto
+passme
+owen
+nurse
+nookie
+nokia123
+nitro
+nights
+nebula
+natasha1
+mystical
+milan
+melanie1
+material
+mariner
+mamamia
+mamama
+maddison
+macross
+lost
+lloyd
+landlord
+kristal
+kris
+korean
+kenzie
+kaktus
+juvenile
+instant
+hybrid
+horny
+hollie
+hawkins
+harry1
+gypsy
+gunnar
+goodwill
+goldwing
+gilberto
+gandalf1
+fuckthis
+froggie
+frisky
+flossy
+flapjack
+flamengo
+finnegan
+fabienne
+error
+erection
+defence
+danny1
+dammit
+conway
+content
+concept
+climber
+clemente
+christophe
+christa
+charon
+cereal
+caterpillar
+caterina
+capetown
+cancan
+bull
+brains
+bracken
+bolero
+biggles
+berserk
+bacardi
+austria
+austin316
+antonio1
+angelito
+amigo
+alvaro
+accounts
+abstract
+Robert
+19911991
+19761976
+1976
+020202
+01234567
+zxcvbnm123
+wilhelm
+warwick
+walmart
+walkman
+vincenzo
+vesper
+turnip
+townsend
+tonight
+thought
+theater
+technical
+tazman
+stoney
+soccer11
+smithers
+smiling
+slugger
+slash
+skyblue
+shooting
+shitshit
+shadow123
+senators
+schwarz
+sairam
+sacramento
+royals
+rowena
+router
+redbaron
+raven1
+qwert1
+proview
+programmer
+prison
+present
+porn
+poipoi
+percival
+painless
+ou812
+oberon
+oasis
+northstar
+newspaper
+myfamily
+mongolia
+miroslav
+marbles
+macarena
+lumberjack
+lee
+landrover
+lakewood
+klingon
+kkkkkkk
+killer12
+keisha
+kareem
+incoming
+immanuel
+images
+hometown
+homeless
+hockey1
+hillbilly
+helmet
+hellothere
+gunter
+guillaume
+goodnight
+giulia
+giordano
+gina
+genocide
+gabber
+funtime
+fiona
+fanatic
+ezekiel
+etoile
+enforcer
+eight
+eduard
+drizzt
+dreamcast
+doodles
+dispatch
+developer
+crayon
+corsair
+copenhagen
+codename
+clowns
+clockwork
+class
+clarke
+chick
+cccccccc
+caramelo
+callaway
+calculus
+buzz
+bugatti
+bronson
+brian123
+boom
+blessed1
+bismark
+berry
+benjamin1
+bartender
+bambi
+attorney
+asteroid
+arianna
+ariadne
+aramis
+angeleyes
+ananda
+almond
+alfalfa
+alcatel
+akira
+academia
+aa
+a1b2c3d4e5
+784512
+1975
+1972
+12131415
+yamahar1
+wilder
+whore
+wealth
+warehouse
+violeta
+versace
+venom
+tuning
+tucson
+tricolor
+tracer
+tim
+thecure
+terrance
+summer99
+stocks
+stirling
+stamford
+stairway
+spooner
+specialist
+sorrow
+soldiers
+slater
+singing
+showme
+shitface
+scorpio1
+rotterdam
+ross
+rollins
+ringo
+right
+records
+real
+rainer
+quest
+principe
+pizzahut
+pizza1
+pepperoni
+patricio
+passwerd
+pacers
+orient
+orgasm
+orchard
+okinawa
+oilers
+nigga
+nautica
+nathan1
+nasty
+mulberry
+muffins
+mistral
+melrose
+meister
+meagan
+maximo
+manny
+malcom
+luscious
+lifeline
+legoland
+leelee
+leaves
+kirby
+kickflip
+kennwort
+kathrine
+katelyn
+junk
+josefina
+johnnie
+johnathan
+jimbo
+jesus777
+hornets
+hopeful
+hollister
+hellsing
+gofish
+gianni
+getout
+funfun
+frogman
+fragile
+fishman
+excelsior
+easy
+drummond
+disneyland
+deutschland
+delldell
+cupcakes
+crybaby
+cottage
+corina
+complex
+claudine
+ciaociao
+christia
+checkmate
+checker
+check
+centurion
+catcher
+cashmere
+carthage
+bosco
+bookmark
+bobobo
+boarder
+bluejay
+bartlett
+b
+armand
+armagedon
+animation
+alphonse
+alessandra
+Benjamin
+5201314
+51505150
+424242
+2004
+1992
+192837465
+yumyum
+yasmine
+xxxxxxxxxx
+xxx123
+woodside
+winona
+willem
+willard
+werder
+water1
+warcraft3
+vengeance
+vaseline
+trinity1
+toxicity
+tommyboy
+ticktock
+thor
+terence
+teachers
+submit
+strategy
+sting
+stephens
+spiffy
+spanner
+snowdrop
+snappy
+smeghead
+shutdown
+sexysexy
+script
+santafe
+rider
+riddle
+rachel1
+prosper
+princesse
+pretender
+popsicle
+polish
+pinkie
+piggy
+philadelphia
+petersen
+pearson
+pasta
+password3
+pandas
+oscar123
+orioles
+nova
+niners
+nelly
+natali
+moonstone
+meggie
+mckenna
+masterkey
+maryanne
+manowar
+magicman
+kittie
+kingking
+kerry
+justus
+juan
+jonjon
+jeannie
+jarrod
+identity
+icehouse
+humble
+hannover
+greedy
+goofy
+glorious
+gizmo1
+ginger1
+gfhjkm
+gathering
+gardner
+furious
+forgetit
+fishtank
+finalfantasy
+fifteen
+fetish
+fernandes
+epiphone
+elevator
+elegance
+drumline
+doodoo
+devilman
+delta1
+delivery
+cross
+cooter
+compass
+chuckie
+chrissie
+carnaval
+carlito
+caffeine
 byebye
 buzzer
-burnout
-burner
-bumbum
-bumble
-briggs
-brest
-boyz
-bowtie
-bootsie
-bmwbmw
-blanche
-blanca
-bigbooty
-baylor
-base
-azertyuiop
-austria
-asd222
-armando
-ariane
-amstel
-amethyst
-airman
-afrika
-adelina
-acidburn
-7734
-741741
-66613666
-44332211
-31071990
-31051993
-30051987
-30011990
-29091987
-29061986
-29011982
-2828
-28101986
-28081990
-28081986
-28011988
-27111989
-27031992
-27021992
-26081986
-25081985
-25031991
-25031983
-24121987
-24091991
-23111989
-23091989
-23091985
-23061989
-22091991
-22071985
-22071984
-22061984
-22051989
-22051987
-22031986
-22011992
-21061988
-21031984
-20071988
-20061983
-20041985
-1qazzaq1
-1qazxsw23edc
-19991999
-19061991
-18101985
-18051989
-18031988
-18021992
-18011985
-17051990
-17051989
-17051987
-17021989
-16091988
-16081986
-16061988
-16061987
-15121987
-15091985
-15081986
-15061985
-15011983
-14101986
-1357911
-13071987
-13061985
-13021985
-123456qqq
-123456789d
-1234509876
-12131213
-12111991
-12111985
-12081990
-12081987
-12071991
-1207
-120689
-1120
-11071987
-11051988
-1104
-11031983
-10091984
-10071989
-10071986
-10061985
-10051990
-10041987
-10031993
-10031990
-09091988
-09051987
-09041986
-08081990
-08081989
-08021990
-07101984
-07071989
-07041987
-07031989
-07021991
-06061981
-06021986
-05121990
-05061988
-05031987
-04071988
-04071986
-04041986
-03101991
-03091983
-03051988
-03041983
-03031992
-02081970
-02061971
-02051970
-02041972
-02031974
-02021978
-0202
-02011977
-01121990
-01091992
-01081992
-01081985
-01011972
-007bond
-zapper
-vipergts
-vfntvfnbrf
-vfndtq
-tujhrf
-tripleh
-track
-THOMAS
-thierry
-thebear
+bukowski
+brownies
+bond
+blue12
+bearcats
+badboys
+architect
+ankara
+amalia
+albion
+akatsuki
+987456321
+567890
+19941994
+135246
+111213
+000001
+you
+woofwoof
+virginie
+untitled
+ukraine
+tuxedo
+tttttttt
+troy
+tommy1
+tommie
+timothy1
+ticket
 systems
-supernova
-stone1
-stephen1
-stang
-stan
-spot
-sparkles
-soul
-snowbird
-snicker
-slonik
-slayer1
-sixsix
-singapor
-shauna
-scissors
-savior
-samm
-rumble
-rrrrr
-robin1
-renato
-redstar
-raphael
-q1w2e3r
-pressure
-poptart
-playball
-pizzaman
-pinetree
+sushi
+summers
+stickman
+starlite
+spawn
+southwest
+snoopy1
+smarties
+sexyboy
+seaside
+sarita
+sanfran
+sailormoon
+robins
+report
+pickup
+penthouse
+peanutbutter
+oxymoron
+options
+onetime
+oleander
+ohmygod
+ocelot
+oceans
+nightfall
+nicky
+newjersey
+new
+ncc1701a
+musashi
+mullen
+muhammed
+morphine
+moritz
+mohawk
+mobydick
+merlot
+meltdown
+medieval
+martian
+marlins
+mahogany
+magic123
+lucinda
+lonnie
+longshot
+lockheed
+lkjhgf
+livewire
+lister
+lakeland
+konrad
+kokoko
+kleenex
+killian
+kenworth
+interpol
+integrity
+hunter12
+hibernia
+hermann
+helpdesk
+havefun
+harbor
+gymnast
+guatemala
+gospel
+godofwar
+godiva
+gidget
+genuine
+fruity
+frost
+fishhead
+everybody
+ethernet
+erin
+emmett
+elemental
+ecstasy
+duracell
+dogfood
+dempsey
+delicious
+daniel123
+custard
+cthulhu
+crystals
+cool123
+confidence
+comet
+comeon
+colossus
+cirrus
+chappy
+callofduty
+burner
+bulls
+buffett
+bowwow
+besiktas
+belladonna
+backlash
+asylum
+asdf12
+asddsa
+anime
+alanis
+airforce1
+academic
+abnormal
+Jordan
+Andrew
+5555555555
+19901990
+1989
+1973
+123qwe123
+123987
+1234566
+zeus
+wrestle
+wendell
+watch
+violetta
+vineyard
+truffle
+tigger1
+three
+thistle
+therese
+terrible
+tamtam
+tabatha
+sverige
+suburban
+stocking
+steven1
+starbucks
+stanton
+springfield
+spider1
+snuffles
+smalls
+sideways
+sharma
+sensation
+schwartz
+scania
+salasana
+runescape
+rubbish
+rosalind
+rocking
+rockie
+robots
+ringer
+rhubarb
+radiation
+q1w2e3r4t5y6
+pussy1
+purple1
+purchase
+protection
+practice
+poiuytre
+piramide
 phyllis
-pathfind
-papamama
-panter
-pandas
-panda1
-pajero
-pacino
-orchard
-olive
-nightmar
-nico
-Mustang1
-mooses
+patrol
+panacea
+ninjas
+nashville
+naked
+muriel
 montrose
-montecar
-montag
-melrose
-masterbating
-maserati
-marshal
-makaka
+mondeo
+molly123
+mercer
+medion
+maximus1
+maryam
+martine
+mammamia
 macmac
-mackie
-lockdown
-liverpool1
-link
-lemans
-leinad
-lagnaf
-kingking
+mac
+lunchbox
+lucky13
+lookout
+lonesome
+limerick
+liberty1
+lexus
+kitty1
+kissing
 killer123
-kaboom
-jeter2
-jeremy1
-jeepster
-jabber
-itisme
-italy
-ilovegod
-idefix
-howell
-hores
-HIZIAD
-hewitt
-hellsing
-Heather
-gonzo1
-golden1
-GEORGE
-generic
-gatsby
-fujitsu
-frodo1
-frederik
-forlife
-fitter
-feelgood
-fallon
-escalade
-enters
-emil
-eleonora
-earl
-dummy
-donner
-dominiqu
-dnsadm
-dickens
-deville
-delldell
-daughter
+jill
+jaybird
+insight
+imagination
+ignition
+homebrew
+higher
+hellos
+helicopter
+harry123
+guido
+guadalupe
+groucho
+greenman
+godsmack
+glory
+gilmore
+gerardo
+fucku2
+flossie
+firefire
+fergie
+faisal
+empress
+electronic
+economics
+doug
+doris
+don
+disco
+dino
+declan
+dayton
+danzig
+daniel12
+damon
+damned
+cricket1
+correct
+cookie1
 contract
 contra
-conquest
-compact
-christi
-chill
-chavez
-chaos1
-chains
-casio
-carrots
-building
-buffalo1
-brennan
-boubou
-bonner
-blubber
-blacklab
-behappy
-barbar
-bambi
-babycake
-aprilia
-ANDREW
-allgood
-alive
-adriano
-808080
-7777777a
-777666
-31121986
-31121985
-31051991
-31051987
-30121988
-30121985
-30101988
-30061988
-29041988
-27091991
-26121989
-26061989
-26031991
-25111991
-25031984
-25021986
-24121989
-24121988
-24101990
-24101984
-24071992
-24051989
-24041986
-23091991
-23061987
-23041988
-23021992
-23021983
-22111988
-22091990
-22091984
-22051988
-21111986
-21101988
-21101987
-21091989
-21051990
-21021989
-20101987
-20071984
-20051983
-20031990
-20031985
-20011983
-1passwor
-19111985
-19081987
-19051983
-19041985
-18121990
-18121985
-18121812
-18091987
-17121985
-17111987
-17071987
-17071986
-17061987
-17041986
-17041985
-16121991
-16101986
-16041988
-16041985
-16031986
-16021988
-16011986
-15121983
-15101991
-15061984
-15011988
-14091987
-14061988
-14051983
-13101992
-13101988
-13101982
-13071989
-13071985
-13061991
-13051990
-13031989
-123456n
-1234567890-
-123450
-1216
-12101989
-1208
-12071984
-12061987
-12041991
-12031990
-12021984
-1117
-11091986
-11091985
-11081986
-1026
-10101988
-10101980
-10091986
-10091985
-10081987
-10051988
-10021987
-10021986
-09041985
-09031987
-08041985
-08031987
-07061988
-07041989
-07021980
-06011982
-05121988
-05061989
-05051986
-04031991
-03071985
-03061986
-03061985
-03031987
-03031984
-03011991
-02111987
-02061990
-02011971
-01091988
-01071990
-01061983
-01051980
-01022010
-000777
-000123
-young1
-yamato
-winona
-winner1
-whatthe
-weiner
-weekend
-volleyba
-volcano
-virginie
-videos
-vegitto
-uptown
-tycoon
-treefrog
-trauma
-town
-toast
-titts
-these
-therock1
-tetsuo
-tennesse
-tanya1
-success1
-stupid1
-stockton
-stock
-stellar
-springs
-spoiled
-someday
-skinhead
-sick
-shyshy
-shojou
-shampoo
-sexman
-sex69
-saskia
-Sandra
-s123456
-russel
-rudeboy
-rollin
-ridge
-ride
-rfgecnf
-qwqwqwqw
-pushkin
-puck
-probes
-pong
-playmate
-planes
-piercing
-phat
-pearls
-password9
-painting
-nineball
-navajo
-napalm
-mohammad
-miller1
-matchbox
-marie1
-mariam
-mamas
-malish
-maison
-logger
-locks
-lister
-lfitymrf
-legos
-lander
-laetitia
-kenken
-kane
-johnny5
-jjjjjjj
-jesper
-jerk
-jellybean
-jeeper
-jakarta
-instant
-ilikeit
-icecube
-hotass
-hogtied
-having
-harman
-hanuman
-hair
-hacking
-gumby
-gramma
-GOLF
-goldeneye
-gladys
-furball
-fuckme2
-franks
-fick
-fduecn
-farmboy
-eunice
-erection
-entrance
-elisabet
-elements
-eclipse1
-eatmenow
-duane
-dooley
-dome
-doktor
-dimitri
-dental
-delaney
-Dallas
-cyrano
-cubs
-crappy
-cloudy
-clips
-cliff
-clemente
-charlie2
-cassandra
-cashmoney
-camil
-burning
-buckley
-booyah
-boobear
-bonanza
-bobmarley
-bleach
-bedford
-bathing
-baracuda
-antony
-ananas
-alinka
-alcatraz
-aisan
-5000
-49ers
-334455
-31051982
-30051988
-30051986
-29111988
-29051992
-29041989
-29031990
-28121989
-28071985
-28021983
-27111990
-27071988
-26071984
-26061991
-26021992
-26011990
-26011986
-25091991
-25091989
-25081989
-25071987
-25071985
-25071983
-25051988
-25051980
-25041987
-25021985
-24101991
-24101988
-24071990
-24061985
-24041985
-24041984
-23456
-23111986
-23101987
-23041991
-23031983
-22071992
-22071988
-21121989
-21111989
-21111983
-21101983
-21041991
-21041987
-21031986
-21021990
-21021988
-20081990
-20061991
-20061987
-20032003
-20031992
-1qw23er4
-1q1q1q1q
-1Master
-19121988
-19081986
-19071989
-19041986
-18111983
-18071990
-18071989
-18071986
-18031986
-17121987
-17091985
-17071990
-17051983
-16091990
-15081989
-15071990
-15051992
-15051989
-15031991
-15011990
-14031986
-13091988
-13091987
-13091986
-13081986
-13071982
-13051986
-13041989
-13021991
-1269
-123890
-1234rewq
-12345r
-1231234
-12111984
-12091986
-12081993
-12071992
-1206
-12021990
-111555
-11111991
-11091990
-11061987
-11061986
-11061984
-11041985
-11031986
-1030
-1029
-1014
-101091m
-10041984
-10031980
-10011980
-09051984
-08071985
-07081984
-07041988
-06101989
-06061988
-06041984
-05091987
-05081992
-05081986
-05071985
-05041985
-04111991
-04071987
-04021990
-03091988
-03061988
-03041989
-03041984
-03031991
-02091978
-01071988
-01061992
-01041993
-01041983
-01031981
-0069
-zyjxrf
-xian
-wizard1
-winger
-wilder
-welkom
-wearing
-weare138
-vanessa1
-usmarine
-unlock
-thumb
-this
-tasha1
-talks
-talbot
-summers
-sucked
-storage
-sqdwfe
-socce
-sniffing
-smirnov
-shovel
-shopper
-shady
-semper
-screwy
-schatz
-samanth
-salman
-rugby1
-rjhjkm
-rita
-rfhfylfi
-retire
-ratboy
-rachelle
-qwerasdfzxcv
-purple1
-prince1
-pookey
-picks
-perkins
-patches1
+conflict
+comeback
+coldplay
+cocoa
+coach
+clock
+clara
+civic
+cheeseburger
+chachi
+carmine
+cantona
+braveheart
+bramble
+boohoo
+bongo
+bingo1
+beyond
+bert
+believer
+bedroom
+beaumont
+bangladesh
+banger
+athlon
+arrowhead
+anytime
+angelita
+amores
+alternative
+aileen
+agent
+Thomas
+456321
+23456789
+2002
+1999
+1971
+135792468
+112211
+1122
+woodward
+woodie
+wolverin
+whatever1
+werdna
+wellness
+webcam
+vishnu
+tripper
+torrent
+timberlake
+terrorist
+temptation
+teapot
+swingers
+supergirl
+style
+starman
+squeak
+solstice
+snake1
+smooch
+skylark
+sheryl
+scratchy
+salinas
+ruth
+roosevelt
+rockport
+return
+reilly
+redlight
+quake
+puppy123
+puddles
+pretzel
+post
+pompey
+poker
+pocket
+play
+persona
+perfection
+penny1
+pavlov
+paulette
 password99
-oyster
-olenka
-nympho
-nikolas
-neon
-muslim
-muhammad
-morrowind
-monk
-missie
-mierda
-mercede
-melina
-maximo
-matrix1
-Martin
-mariner
-mantle
-mammoth
-mallrats
-madcow
-macintos
-macaroni
-lunchbox
-lucas1
-london1
-lilbit
-leoleo
-KILLER
-kerry
-kcchiefs
-juniper
-jonas
-jazzy
-istheman
-implants
-hyundai
-hfytnrb
-herring
-grunt
-grimace
-granite
-grace1
-gotenks
-glasses
-giggle
-ghjcnbnenrf
-garnet
-gabriele
-gabby
-fosters
-forever1
-fluff
-Fktrcfylh
-finder
-experienced
-dunlop
-duffer
-driven
-dragonballz
-draco
-downer
-douche
-doom
-discus
-darina
-daman
-daisey
-clement
-chouchou
-cheerleaers
-Charles
-charisma
-celebrity
-cardinals
-captain1
+panther1
+paisley
+overtime
+outback
+orbital
+omega1
+ollie
+nopassword
+nikolai
+neutron
+nazareth
+mudvayne
+movement
+mother1
+mmmmmmm
+miracles
+milo
+mike1234
+mikado
+maxell
+matisse
+maserati
+marihuana
+marbella
+luciana
+lily
+lifestyle
+leroy
+lamont
+kiwikiwi
+jurassic
+jules
+jim
+jacky
+infernal
+hereford
+guiness
+goodtime
+goodlife
+goodgirl
+garlic
+gamecock
+galadriel
+gabriell
+friends1
+foofoo
+flatron
+firefighter
+ferreira
+fenerbahce
+farley
+fanny
+ethiopia
+elektra
+edgar
+dogface
+dionysus
+different
+devin
+debora
+deadpool
+crossroads
+colgate
+closer
+clint
+clapton
+christos
+chauncey
+catalog
+castaway
+carling
+carefree
+byteme
+burnside
+brewer
+boulder
+borussia
+border
+boomerang
+bohemian
+blueboy
+blackice
+blackhole
+billy1
+billion
+bigmouth
+benji
+barley
+baptiste
+bahamas
+augustin
+atticus
+asian
+asdfg123
+arlington
+ambassador
+alistair
+alias
+agustin
+agamemnon
+advocate
+adgjmptw
+acoustic
+Princess
+7894561230
+6666666
+666
+235689
+1qwerty
+19811981
+1981
+1968
+123456q
+122333
+11221122
+0
+zimmerman
+youandme
+yorkshire
+wallpaper
+vinicius
+version
+veronique
+vauxhall
+utility
+understand
+tyler123
+tiptop
+the
+terminus
+sweeney
+susie
+surround
+suckmydick
+stronghold
+storage
+spurs
+spice
+sonora
+soccer13
+snicker
+sneaky
+smokin
+slipknot1
+slim
+shauna
+shaun
+shades
+sexylady
+sessions
+scirocco
+schiller
+schedule
+sasha1
+sapper
+sanjay
+ruthie
+rosebud1
+repair
+regional
+rainman
+radiance
+quarter
+quaker
+punk
+portia
+popo
+poiuy
+pioneers
+phantasy
+peaches1
+p@ssw0rd
+orpheus
+one
+obsession
+nigel
+neutrino
+mountains
+moore
+model
+mike123
+marta
+marmalade
+maribel
+mariano
+malaga
+lourdes
+llamas
+linda1
+lavinia
+larkin
+kilroy
+kendrick
+jamesbond007
+irvine
+image
+hogwarts
+helloo
+heinlein
+hatred
+harlem
+hard
+haley
+guitarra
+guitar1
+grande
+gillette
+germania
+fun
+fruitcake
+flowers1
+fighters
+field
+feeling
+fastback
+farrell
+fabrizio
+export
+exercise
+essence
+envelope
+element1
+eeeeeeee
+e
+dynamo
+doraemon
+divorce
+dickie
+diabetes
+destination
+death1
+davenport
+danish
+damascus
+cutlass
+cubbies
+corpse
+coronado
+cook
+cloud9
+christo
+chevalier
+cheese1
+cashflow
+carola
+cardigan
+canary
 caca
-c2h5oh
-bubbles1
-brook
+buddah
+british
+boyfriend
+books
+bogdan
+blueprint
+blackboy
+bitchy
+bitchass
+beacon
+bbbbb
+bball
+backpack
+babycakes
+austin1
+arschloch
+arielle
+aquila
+aquamarine
+anakonda
+aimee
+adrien
+abcxyz
+Victoria
+911turbo
+8888888
+4runner
+258963
+1993
+19851985
+19721972
+1234567899
+yogurt
+worldwide
+woody1
+witches
+wiseman
+water123
+vivien
+viscount
+violette
+venezuela
+vegas
+undertow
+traveller
+transformer
+topaz
+toni
+tombstone
+tits
+think
+tessie
+tennis1
+teacher1
+tank
+tacoma
+sword
+surgery
+surfboard
+success1
+stuff
+stratocaster
+stephani
+stainless
+spikes
+siobhan
+silva
+shania
+sergey
+seaman
+scorpions
+rudolph
+rosanna
+romain
+rolando
+ritchie
+redstone
+ready
+premiere
+planning
+piranha
+piper
+peacemaker
+paramore
+panter
+packers1
+outcast
+numberone
+nitrogen
+natascha
+mutter
+munich
+moonwalk
+midori
+meme
+maurizio
+matty
+marzipan
+mandolin
+mamamama
+maintain
+macgyver
+ludacris
+loredana
+london1
+logout
+lillie
+lexington
+landscape
+lahore
+ladder
+kristie
+kodak
+kim
+killkill
+khalil
+justice1
+judy
+joachim
+jazmin
+jailbird
+ilovemyself
+iiiiii
+harrier
+google123
+goodnews
+golden1
+glass
+gene
+gatekeeper
+gandhi
+freshman
+frankfurt
+frankenstein
+flower1
+flavia
+firestar
+etienne
+erik
+eleonora
+dumdum
+dreamland
+dragon11
+domenico
+dog123
+django
+discreet
+detective
+darian
+dalila
+crossbow
+crispy
+creative1
+cordoba
+cola
+cock
+clown
+cleaner
+citroen
+christi
+choppers
+cheesy
+canela
+buddie
+bryce
+breathe
+brando
+bowman
+bollox
+bloom
+betrayed
+bernice
+bernhard
+benton
+basilisk
+bahamut
+augusto
+asdqwe123
+asdqwe
+asdasd123
+armadillo
+aries
+antigone
+annabel
+altima
+alterego
+allie
+alhambra
+aladin
+aerobics
+advantage
+adelina
+Superman
+Dragon
+888999
+224466
+20012001
+1million
+1983
+143143
+123qaz
+yyyyyyyy
+yellowstone
+www
+workout
+woodruff
+woodrow
+woodman
+verena
+vampire1
+trout
+treetop
+tickle
+texas1
+terra
+tequiero
+sylvie
+surf
+sunnyboy
+star69
+spot
+spence
+specialk
+sorrento
+socks
+snyder
+smokie
+simsim
+simba1
+short
+shiva
+sevilla
+school1
+salazar
+sabres
+rolex
+rhino
+reliance
+ratchet
+rajesh
+qqqq
+q2w3e4r5
+proverbs
+prime
+policeman
+point
+playgirl
+pitcher
+petra
+persian
+pentium4
+pedigree
+partners
+overdrive
+oswald
+origami
+orange12
+observer
+nomad
+nolimit
+noah
+nnnnnnnn
+nicholas1
+newworld
+needle
+navarro
+morrow
+morley
+moriarty
+more
+mommy1
+mmmmm
+misty1
+missing
+minotaur
+mikaela
+metro
+mazda
+maya
+margo
+manunited
+malaka
+lydia
+lori
+location
+leo
+leavemealone
+larry1
+komodo
+knockout
+knickers
+kerrie
+keepout
+katie1
+kassandra
+kamila
+july
+joelle
+jemima
+jelly
+jeffrey1
+jajaja
+ismael
+ignacio
+iforget
+hi
+hellyeah
+harald
+griffey
+greentea
+goodgood
+giselle
+gisela
+germany1
+gasoline
+garret
+fugazi
+fuck123
+fox
+flashman
+five
+firestarter
+fatty
+fatality
+fallon
+evan
+emiliano
+ellipsis
+doom
+dogwood
+disorder
+dianna
+device
+deadlock
+davidoff
+dasher
+couscous
+county
+construction
+congress
+comics
+cloudy
+cleaning
+clarkson
+christoph
+cheerleader
+charlie2
+ceramics
+catnip
+casandra
+carman
+carlson
+caramba
+cancun
+campus
+cambodia
+budman
+bridges
+brain
+blackstar
+bigmoney
+bigbang
+ballerina
+backbone
+aurelie
+astra
+aragon
+anfield
+ananas
+amnesia
+alexandru
+alexa
+alessio
+airhead
+90210
+7895123
+74108520
+24681012
+24242424
+1password
+1995
+19881988
+123zxc
+123456123456
+12
+yesyes
+yamato
+x
+wraith
+whatwhat
+westcoast
+watching
+underwear
+truth
+treble
+tortuga
+tomatoes
+tiramisu
+tiberian
+thurston
+tanaka
+tammie
+taffy
+sutton
+sun
+stream
+steffen
+spinning
+slippers
+slave
+slapper
+simon123
+shayne
+shasha
+serene
+sequoia
+scuba
+sadie1
+romana
+review
+response
+reindeer
+ransom
+rambler
+raccoon
+qwertyuio
+quinton
+prosperity
+porsche1
+pinguin
+phones
+payday
+patch
+password1234
+panchito
+onions
+nuggets
+nottingham
+noreen
+niagara
+nessie
+mythology
+mummy
+muller
+montana1
+medium
+mayfield
+marquise
+manifest
+mammoth
+magnetic
+lumina
+lovelace
+loser1
+letmein123
+lesbians
+leinad
+kosmos
+kids
+kane
+joystick
+jonny
+johndoe
+iris
+inspector
+industry
+ilovejesus
+husker
+hunters
+hola
+herring
+henry1
+hardy
+hannes
+hambone
+gulliver
+ground
+griffon
+goldman
+gogo
+gianna
+getlost
+gaylord
+ganymede
+ganja
+galactic
+furniture
+forums
+flashback
+flanker
+firenze
+felix1
+fedora
+fast
+eyeball
+esoteric
+emmitt
+elvis1
+elias
+dropdead
+drinking
+diving
+dingle
+digimon
+devildog
+cullen
+courier
+copeland
+cobain
+christop
+christian1
+chess
+cherish
+cheerios
+cheerio
+chatting
+chantelle
+changeit
+chang
+chad
+cerulean
+carrots
+carmelo
+carmela
+cabernet
+buckley
+brendon
+boiler
+blackheart
+bizkit
+bizarre
+bionicle
+bertram
+barron
+bandit1
+baltazar
+babes
+auto
+as
+archery
+amoremio
+alpha123
+alleycat
+allah
+accident
+abraxas
+Joshua
+353535
+1994
+19771977
+1970
+1964
+147369
+123mudar
+wrigley
+warfare
+viola
+veteran
+tulips
+trickster
+trailer
+todd
+toast
+tingting
+thething
+testing1
+tallulah
+talking
+taiwan
+symmetry
+sweeper
+summer69
+sugars
+stubby
+stroke
+stonehenge
+ssss
+spoiled
+spark
+smartass
+sliver
+sissy
+shortcake
+shakur
+shadow11
+sex123
+series
+seaweed
+sarina
+salesman
+rushmore
+royalty
+roxana
+rodolfo
+resource
+replay
+rebirth
+rayman
+racoon
+privet
+pride
+pregnant
+praxis
+pleasant
+playground
+platoon
+plankton
+peoples
+pendulum
+peabody
+paterson
+password8
+partizan
+outlook
+ottawa
+olympics
+nursing
+northwest
+networks
+nederland
+nate
+napalm
+mystique
+mouser
+mosaic
+monte
+models
+mischa
+mini
+mickey1
+metallica1
+mendoza
+mckinley
+mcgregor
+maxpower
+matias
+mathematics
+marita
+love12
+longhorns
+longer
+lombard
+livelife
+leoleo
+lamer
+lafayette
+kokakola
+kleopatra
+kimkim
+khan
+keywest
+katherin
+kaboom
+justina
+julianna
+jezebel
+jessika
+jeannine
+j
+horseman
+homeland
+holiday1
+hidalgo
+hennessy
+healthy
+hazel
+gunman
+guesswho
+greywolf
+grand
+gilligan
+gifted
+gentle
+gasman
+gallardo
+freewill
+franks
+francisca
+francis1
+fordf150
+fleetwood
+flamer
+fantomas
+exotic
+evil
+eightball
+eddy
+echo
+ebony
+dutchman
+drummer1
+diamant
+dementia
+deaths
+data
+cygnus
+cousin
+copycat
+coolest
+concert
+compaq1
+coming
+clay
+citron
+chaotic
+cellphone
+cattle
+carissa
+cadence
+budgie
+breanna
+breakdown
+bread
+boring
+blitz
+blessings
+binder
+bethel
+berliner
+bengal
+barnaby
+atlas
+ashraf
+arnaud
+antonella
+anthem
+andrew123
+aleksandra
+adrenaline
+acmilan
+achtung
+abrakadabra
+Shadow
+QWERTY
+George
+20002000
+1996
+19951995
+1967
+007
+zoltan
+yoshi
+yoda
+woodwork
+women
+winifred
+welkom
+welcome2
+waterboy
+wakeup
+vargas
+troopers
+trees
+torture
+theodora
+taylor1
+styles
+stick
+starlet
+sphere
+sound
+sonoma
+sometime
+smackdown
+skillet
+shayla
+sharp
+sandeep
+sagittarius
+sadness
+russell1
+rocketman
+roadking
+rifleman
+riders
+refresh
+raymond1
+ramon
+racer
+qwerty13
+priyanka
+private1
+pop
+pizzaman
+phantasm
+pathetic
+parliament
+park
+p
+oldschool
+norwood
+norwich
+norfolk
+nicotine
+nefertiti
+nadia
+motherlode
+mormon
+moose1
+mollydog
+modena
+mocha
+minstrel
+minicooper
+milwaukee
+millionaire
+milk
+midnight1
+matthieu
+maroon
+markie
+marisol
+maria123
+logical
+logic
+live
+lipton
+lemming
+lebron23
+lander
+lakshmi
+lakers24
+kitty123
+kindness
+kent
+karla
+javelin
+java
+invest
+insurance
+independence
+homer1
+hippo
+hero
+heller
+hatter
+hatfield
+hangman
+gymnastics
+gonzalo
+goat
+glover
+gigi
+getmoney
+general1
+fuckin
+fubar
+freelance
+forsythe
+fontaine
+final
+fiddle
+feelgood
+fart
+experience
+evidence
+erickson
+enter123
+energizer
+enable
+dupont
+downfall
+develop
+delores
+delgado
+deadwood
+dani
+dandelion
+damaris
+cumshot
+crusty
+crazyman
+corporate
+corinna
+commandos
+clarice
+citation
+chinchilla
+changed
+champions
+ceasar
+calliope
+byron
+broccoli
+brenna
+boozer
+bone
+bleeding
+bigben
+berserker
+bergkamp
+belfast
+backstreet
+asmodeus
+asia
+asdfgh1
+artistic
+antilles
+anteater
+anhyeuem
+amy
+alameda
+aaaa1111
+a1a2a3
+Sunshine
+Jonathan
+789654
+585858
+414141
+321321321
+1qa2ws
+19731973
+19691969
+112112
+000000000
+wrinkles
+wowwow
+wishes
+winter1
+website
+vanity
+trumpet1
+trotter
+triplets
+towers
+totoro
+toolbox
+tomboy
+terran
+telecaster
+tandem
+talbot
+sunnyday
+summer12
+students
+stockholm
+steward
+start123
+starshine
+spam
+spain
+sopranos
+slipper
+sleep
+slappy
+sigma
+siberian
+shetland
+sheppard
+shamus
+senate
+scrapper
+schooner
+salina
+rush
+rosa
+rogue
+robby
+ritter
+rhodes
+restart
+regent
+rebellion
+qqq111
+qazwsx1
+psyche
+poochie
+pigpen
+pershing
+pecker
+password7
+parasite
+pantera1
+palmetto
+overture
+odysseus
+notredame
+noisette
+nibbles
+narayana
+nakamura
+mushrooms
+mongol
+moderator
+metalgear
+mediator
+mcintosh
+mazda626
+mayflower
+massey
+marykate
+manpower
+malamute
+macaco
+lukas
+louisiana
+look
+loki
+little1
+libra
+lena
+kryptonite
+keaton
+kathmandu
+justin12
+junkie
+jumping
+jumbo
+joker1
+jewel
+jeronimo
+jeremy1
+jeremias
+jamaican
+imperium
+hurricanes
+humberto
+hotmail1
+horton
+hoosiers
+holly1
+henning
+helmut
+harpoon
+goldmine
+futurama
+fulcrum
+erotic
+elisabet
+effect
+eden
+earthquake
+dumpling
+dragster
+dragon13
+doubled
+dominica
+dominate
+didier
+dictator
+desperate
+denton
+darnell
+corwin
+corbin
+cookbook
+confusion
+concerto
+cole
+christel
+charge
+chaplin
+caster
+cashmoney
+cartier
+breast
+branden
+book
+boating
+blank
+blacksmith
+bilbo
+biker
+bigone
+bigcock
+beholder
+beebee
+baddog
+babushka
+autobahn
+audia4
+attention
+atmosphere
+anywhere
+anjali
+ancient
+analsex
+amateur
+alright
+allyson
+aftermath
+afrika
+acidburn
+abhishek
+aaron1
+789987
+789654123
+44444
+321456
+123123a
+100100
+zippy
+zapata
+z1x2c3v4
+winslow
+whiteout
+wertyu
+welder
+vickie
+vicki
+typewriter
+trauma
+topolino
+thousand
+thorsten
+thematrix
+tetris
+symbol
+symantec
+sugar1
+stanley1
+stacie
+splatter
+spiderman1
+sorry
+sonysony
+smegma
+slaughter
+skull
+shady
+setter
+seth
+sensitive
+schaefer
+saphire
+samsara
+robbins
+reddwarf
+puddin
+providence
+position
+popopopo
+policy
+pikapika
+piercing
+performance
+pebble
+pearls
+peanut1
+pasquale
+paramedic
+pakistani
+paddy
+neil
+neighbor
+motorcycle
+mireille
+mierda
+marcie
+mantle
+manga
+manatee
+makoto
+makeup
+lyndon
+lucia
+lovesick
+loverman
+london12
+lockwood
+lockout
+loading
+lllllll
+lifeguard
+kowalski
+kerberos
+kellyann
+karaoke
+julie1
+jughead
+johnny1
+jimmy123
+jayhawks
+jarred
+jarhead
+ipswich
+invalid
+innuendo
+incorrect
+ilovemom
+iiiiiiii
+hummingbird
+houston1
+horrible
+hooter
+himalaya
+hill
+highlife
+hetfield
+heartbeat
+guitarist
+graphite
+gorgon
+goodies
+godisgood
+ghostrider
+gerhard
+gamble
+furball
+funnyman
+frenzy
+frenchy
+foreman
+flip
+flasher
+f00tball
+estate
+erotica
+epiphany
+elvis123
+dogshit
+discount
+dipshit
+danny123
+danielle1
+cristi
+creepy
+copyright
+consumer
+conquer
+concordia
+conan
+complicated
+clyde
+clothes
+clementine
+city
+chouette
+chosen
+chip
+chinchin
+chinatown
+chinaman
+chicco
+chesterfield
+cervantes
+celestial
+caracas
+calderon
+caitlyn
+c
+bullhead
+buffer
+brussels
+broadband
+brian1
+brasilia
+boy
+boricua
+bookie
+bobby123
+bluedog
+bellevue
+bank
+bang
+bagpipes
+baby123
+aurelius
+aristotle
+altitude
+althea
+aloysius
+alabama1
+airwolf
+affinity
+abcdefg1
+Password123
+Hunter
+969696
+292929
+20102010
+09876543
+030303
+zxasqw12
+winters
+winnipeg
+whistle
+wannabe
+ultraman
+treefrog
+totally
+tongue
+tigercat
+terrier
+taratara
+tactical
+system32
+swastika
+suzette
+starr
+spades
+sneaker
+smokes
+skipper1
+simple1
+simeon
+shaker
+session
+searcher
+salem
+rules
+rodger
+riviera
+reserved
+release
+reject
+redbeard
+rebeca
+realtime
+rasmus
+qwqwqw
+qwert1234
+qwer123
+qwe123qwe
+pyramids
+provider
+projects
+production
+poptart
+poontang
+planeta
+pippo
+pippen
+pinecone
+photon
+pericles
+pereira
+pennywise
+peavey
+passing
+paradiso
+parachute
+parabola
+pants
+palestine
+overflow
+nico
+motorbike
+mom
+merrill
+merlin1
+meeting
+mechanical
+mazdarx7
+mavericks
+matrix1
+marybeth
+marriott
+marko
+mario1
+manzana
+madeira
+madalena
+mack
+loophole
+lonsdale
+lolly
+lingerie
+libertad
+leigh
+ledzeppelin
+lavalamp
+kuwait
+klaus
+kkkkk
+julieta
+joselito
+joker123
+johan
+jerrylee
+jan
+jamison
+jamboree
+interest
+inlove
+imissyou
+imation
+human
+hugoboss
+hoosier
+holahola
+heythere
+hellen
+hehehehe
+hate
+hangover
+guerrero
+grinder
+greatone
+grammy
+gianluca
+giacomo
+gardener
+gangsta1
+galina
+funeral
+frieda
+frantic
+fields
+farside
+exorcist
+espana
+elizabeth1
+dressage
+donner
+dominic1
+dominator
+domination
+dodgeram
+diver
+display
+devine
+daisey
+dada
+dabomb
+d
+cyprus
+cummings
+crosby
+corrie
+corndog
+commodore
+colby
+clemens
+christen
+chevy1
+callahan
+calcutta
+burberry
+bumper
+bulletproof
+breezy
 brady
+bombshell
+blackburn
+bimbo
+betsy
+betrayal
+bearcat
+avenue
+atkinson
+athletic
+army
+arachnid
+arabian
+angela1
+amaranth
+alyson
+altair
+almost
+allsop
+alisa
+algernon
+alastair
+alanna
+absinthe
+98765
+543210
+258258
+2020
+2005
+1965
+01020304
+zoomzoom
+zimmer
+wysiwyg
+wonderboy
+wiseguy
+whatthefuck
+watchman
+warhead
+vanilla1
+update
+tugboat
+trouble1
+troll
+trivial
+tripod
+transform
+trampoline
+tortilla
+torino
+thunderbolt
+termite
+superduper
+steaua
+starry
+squeaky
+squadron
+smile123
+skylight
+skates
+shower
+shield
+serial
+score
+schatz
+sanfrancisco
+salamandra
+romario
+rising
+ricardo1
+reunion
+resistance
+reliable
+recorder
+radius
+qwertyqwerty
+quasar
+puffin
+provence
+porsche9
+plato
+pietro
+piedmont
+pentagram
+patches1
+password9
+passed
+parsons
+paige
+paco
+overdose
+omicron
+oktober
+oksana
+nuts
+nightman
+nightingale
+name
+mymother
+morgen
+monument
+missy1
+miamia
+medicina
+majesty
+madonna1
+longtime
+lolololo
+lokiloki
+littleman
+lebanon
+laughing
+kilgore
+kerrigan
+karin
+jordon
+jeopardy
+janjan
+jamie1
+jackie1
+irina
+iomega
+inspiration
+ibelieve
+iamgod
+houghton
+horsemen
+hootie
+hondas
+hologram
+hideaway
+hawaii50
+happydays
+handicap
+hamsters
+hack
+guillermo
+gucci
+gohome
+gerber
+georgia1
+geezer
+gamma
+fungus
+freddie1
+forklift
+food
+flubber
+finished
+feeder
+fairway
+elefant
+dorothea
+dinero
+devotion
+deathstar
+davies
+darkknight
+corsica
+conchita
+cocacola1
+classy
+classics
+chowder
+chopper1
+choose
+cecil
+candies
+burn
+bumbum
+buffalo1
+bubba123
+bridgette
+brenden
+bloods
+blingbling
+bigblue
+bigballs
+bebe
+bean
+barnyard
+baphomet
+badlands
+badgirl
+asterisk
+arcangel
+aol123
+antoinette
+annemarie
+anette
+aditya
+Richard
+Master
+Christian
+4444444
+415263
+333666
+20022002
+200000
+19971997
+1966
+1963
+1960
+1234567891
+100200
+zzzzzzz
+zxcv
+zebras
+wizzard
+wild
+whoknows
+weirdo
+weed420
+wazzup
+victoria1
+useless
+uniform
+ulrich
+tulip
+trousers
+treehouse
+tranquil
+tower
+toriamos
+tenten
+temppass
+temp123
+teardrop
+superboy
+stories
+states
+srinivas
+solange
+snowman1
+slammer
+skills
+shuffle
+shortcut
+shockwave
+shocking
+shelton
+shelter
+senha123
+scranton
+sandoval
+sandie
+roseanne
+riddler
+rewind
+red12345
+recycle
+punjabi
+prospero
+pronto
+products
+process
+pokey
+playing
+pepe
+patrik
+paperclip
+papamama
+paolo
+padres
+outdoors
+otter
+osborne
+organic
+nightwish
+nemesis1
+nanook
+nagasaki
+mousepad
+morrissey
+morgan1
+monkeyman
+modeling
+minute
+microlab
+mick
+mariel
+margaux
+maranatha
+manish
+mamma
+makeitso
+maine
+maelstrom
+luck
+lineage
+limpbizkit
+lightbulb
+lettuce
+lalakers
+kiwi
+kirk
+katharina
+kakaroto
+kaitlin
+juggalo
+jjjjjjj
+jimjim
+jewell
+jesse1
+jeannette
+jay
+jaeger
+jack123
+investor
+insecure
+ice
+humanoid
+hotline
+hotel
+hotboy
+hondacivic
+holler
+holiness
+hiroshi
+high
+hewitt
+helpless
+hello2
+healing
+halo
+hallelujah
+haircut
+guilty
+greenhouse
+great1
+graphic
+grace1
+gigolo
+ggggggg
+germaine
+georges
+garland
+gamer
+gallagher
+freefree
+francais
+forbes
+follow
+flora
+flicker
+firestone
+firebolt
+filipino
+federica
+fathead
+fantom
+falstaff
+extra
+evening
+eleven11
+electronics
+economist
+durham
+dunlop
+dummy
+dominant
+dogcat
+dogbert
+diabolic
+diablo2
+descent
+degree
+deadbeat
+crockett
+crazycat
+comrade
+composer
+colombo
+collier
+coleslaw
+citrus
+cincinnati
+chloe1
+cheval
+cherub
+chatter
+cesare
+cayenne
+cascades
+cantor
+camilo
+brook
+bretagne
+breasts
+breaking
+boxers
+bourbon
+bluenose
+bluegrass
+block
+bisexual
+binky
+billions
+billbill
+bigbrother
+belgium
+beckham7
+avengers
+athletics
+assembly
+asasasas
+apple2
+anal
+amore
+allstars
+ali
+alakazam
+agosto
+adamant
+activate
+abcde12345
+abbey
+Pa55word
+Computer
+794613
+777
+369258147
+1q2w3e4r5
+1997
+192837
+125125
+123456qwerty
+zzzz
+zoom
+zombies
+zerozero
+zapper
+windowsxp
+whopper
+whales
+wachtwoord
+voyage
+vitamin
+vigilant
+verygood
+vandal
+under
+trustnoone
+truffles
+trash
+toothpaste
+tigris
+tigerman
+thirty
+thinker
+thankgod
+test12
+terrell
+telefono
+sweetwater
+swatch
+summoner
+suicidal
+strummer
+striper
+stiletto
+start1
+stadium
+squishy
+squire
+squeaker
+springs
+sixtynine
+sithlord
+siegfried
+showcase
+shibby
+shandy
+serenade
+sepultura
+secret123
+scrooge
+rudy
+rotation
+romulus
+rockhard
+reserve
+reeves
+raisin
+raining
+quintana
+pussies
+purity
+player1
+pepsicola
+passenger
+paris1
+papito
+pacifica
+orwell
+ortega
+optical
+omsairam
+obelix
+nonstop
+nightshade
+newhouse
+nazgul
+napster
+nairobi
+nacional
+muenchen
+movie
+mousey
+motorhead
+motley
+morrigan
+montecarlo
+minette
+michael2
+metroid
+memememe
+maybe
+maximize
+marino13
+marciano
+manual
+macdonald
+lovegod
+loveable
+long
+logan1
+loco
+linux
+lethal
+lampard
+lakeview
+kurtis
+konstantin
+kenneth1
+junior1
+jukebox
+jamal
+ilikepie
+hyderabad
+hotspur
+historia
+highschool
+hiawatha
+hermitage
+hendrik
+haggard
+grunge
+gromit
+gretel
+goodtimes
+getsome
+gerry
+gatsby
+funk
+freeport
+flathead
+fishy
+filippo
+faulkner
+falcon1
+explode
+evelina
+endymion
+emirates
+edition
+dresden
+dreamers
+dragon69
+douche
+dooley
+district
+dingbat
+dildo
+dietrich
+demonic
+deicide
+dannie
+cyrano
+crayola
+cranberry
+colibri
+cockroach
+cliff
+clemence
+claudia1
+classified
+chriss
+chocolate1
+chemist
+chelle
+chateau
+cellular
+catherin
+carmella
+canucks
+calibra
+butterfly1
+burgundy
+bugaboo
+brutal
+brother1
+breath
+branch
+bonzai
+bolivia
+blooming
+blitzkrieg
+blender
+bladerunner
+bigboobs
+bible
+beijing
+beavers
+beachbum
+barclay
+barbara1
+balder
+badgers
+backyard
+backward
+babybear
+argonaut
+appleton
+amour
+alonzo
+allied
+aliyah
+alina
+aguilera
+adonai
+abundance
+Nicholas
+Michael1
+Anthony
+9999999999
+676767
+373737
+321
+258369
+2009
+1qazzaq1
+172839
+13243546
+12qw34er
+123456ab
+000007
+zelda
+zealot
+zaragoza
+worlds
+woodcock
+wolfen
+wisteria
+wilma
+westlake
+wert
+vitoria
+victoire
+untouchable
+tyrant
+trapdoor
+torment
+tom123
+tigereye
+thetruth
+testicle
+teste
+team
+talon
+tabby
+superbowl
+student1
+stripe
+store
+sprinkle
+snakebite
+smart1
+silencer
+sheeba
+sharpie
+shakti
+shade
+servant
+sector
+secreto
+secretary
+scottish
+sanderson
+sanandreas
+sage
+rockies
+robertson
+riddick
+richelle
+richardson
+retire
+rene
+religion
+redmond
+rastafari
+rashid
+quiksilver
+queenbee
+pugsley
+psychology
+pool
+playhouse
+planes
+physical
+philipp
+pensacola
+pedersen
+peace1
+pat
+password0
+paperboy
+pandemonium
+outkast
+origin
+optima
+nikolaus
+nickie
+newyear
+newuser
+murderer
+morten
+montero
+montague
+mockingbird
+mindy
+milagros
+mercutio
+mercurio
+mcknight
+maxpayne
+mature
+marmar
+marie1
+mari
+marcin
+mandragora
+manager1
+mamacita
+malika
+magics
+madhatter
+lucretia
+loveya
+love4ever
+lorenz
+lol12345
+logger
+leilani
+lauren1
+laura123
+kusanagi
+knoxville
+kira
+kemper
+katmandu
+katina
+kamala
+kaka
+julianne
+juju
+joseluis
+jiujitsu
+jingles
+jeanpaul
+ivanhoe
+inspire
+infrared
+industrial
+ichigo
+hustle
+humbug
+humanity
+house1
+hotwheels
+hot
+honeypot
+honeybun
+hester
+heroin
+herkules
+heartbreaker
+hawkeyes
+hattie
+hank
+gregory1
+gilgamesh
+ghost1
+geometry
+garner
+gaming
+g
+friedman
+freiheit
+freezer
+foghorn
+flashy
+firework
+finley
+federation
+fear
+family1
+exeter
+executive
+exclusive
+excellence
+esprit
+emotional
+elohim
+elbereth
+edith
+dylan1
+dragon99
+draco
+dominus
+dollface
+devilish
+derby
+democrat
+darkmoon
+cretin
+creeper
+creamy
+crackpot
+cracked
+costarica
+costanza
+cortina
+corky
+core
+consuelo
+clarisse
+clarion
+citibank
+cingular
+chrystal
+channing
+casio
+carvalho
+carolin
+buffy1
+brownie1
+bluebear
+birgit
+billyjoe
+beyonce
+benedikt
+beaufort
+batman12
+barnabas
+baracuda
+banks
+banana1
+baggio
+augustine
+assault
+armitage
+angell
+alex12
+alcapone
+afterlife
+adrianne
+acacia
+a1a2a3a4
+Internet
+Football
+1998
+12345q
+zappa
+zack
+yourself
+yorktown
+yeahyeah
+xyzzy
+winning
+wildflower
+weiner
+web
+waffles
+victor1
+vantage
+valdemar
+unlocked
+unleashed
+twinkles
+trujillo
+torrents
+tootie
+tonyhawk
+tobacco
+tiny
+tanzania
+takedown
+takamine
+suresh
+supra
+supercool
+subwoofer
+storms
+stitches
+steiner
+steeler
+standing
+stalingrad
+srilanka
+spliff
+spirits
+sparhawk
+slowpoke
+sizzle
+shoelace
+shiraz
+service1
+senorita
+seashore
+sandstorm
+sachin
+sable
+roulette
+rocky123
+reboot
+rambo1
+ralphie
+radiator
+quinn
+q1q1q1
+problems
+powerhouse
+powered
+postmaster
+platform
+plague
+picnic
+penner
+paulo
+parallax
+outlaws
+ostrich
+obvious
+oakwood
+noel
+niklas
+nepenthe
+naples
+moonmoon
+merrick
+megan1
+mason1
+marconi
+mansion
+malik
+mackie
+lovehate
+lovable
+livingston
+lifesucks
+lickme
+leo123
+leandro
+labyrinth
+kookie
+komputer
+kikiki
+kerouac
+joy
+jeep
+jazzy
+jackhammer
+intrigue
+interface
+interact
+insider
+imogen
+hummel
+honeymoon
+hikaru
+helium
+hejsan
+hayward
+hansel
+grapefruit
+government
+gossip
+godfrey
+ggggg
+geology
+geography
+garnett
+galloway
+fullback
+fuckhead
+finder
+fellow
+faith1
+fairview
+fabio
+example
+ella
+eliana
+edwina
+eating
+down
+dondon
+divorced
+disabled
+deputy
+defiance
+deeznutz
+deep
+ddddd
+daniel01
+dan123
+cristy
+cristo
+council
+cookies1
+communication
+cocksucker
+chocho
+cheating
+chakra
+catalin
+casper1
+casimir
+carlin
+carcass
+candles
+bush
+buckwheat
+break
+bozo
+boob
+boner
+boat
+boarding
+blackdragon
+bergen
+batata
+basic
+baseline
+bandicoot
+baldrick
+back
+arcane
+apollo11
+annamaria
+angola
+ambulance
+alvarez
+aluminum
+ahmed
+acer
+abercrombie
+852963
+777888
+727272
+6543210
+357159
+2468
+19931993
+19791979
+zach
+yugioh
+youyou
+woodwind
+woodpecker
+woodbury
+whoami
+watchdog
+vikings1
+videos
+vicente
+vedder
+vanille
+unhappy
+turbo1
+tribunal
+total
+toreador
+tigerwoods
+thinkpad
+thebeach
+test12345
+terrific
+teaching
+tantra
+syzygy
+supper
+supermario
+sunfire
+sundown
+successful
+stud
+stringer
+stop
+star123
+sovereign
+souvenir
+sombrero
+skip
+sk8board
+sincere
+simons
+siberia
+shuriken
+shotokan
+shock
+shinichi
+shawnee
+sevens
+scouts
+scooters
+schroeder
+schnitzel
+sargent
+sanford
+rugrats
+rosalinda
+rob
+riches
+rhinos
+regiment
+redbone
+reaver
+ramrod
+rainfall
+qwerty78
+qweasd123
+qpalzm
+q123456
+puertorico
+ppppppp
+pop123
+plokij
+planner
+piston
+pistache
+pianoman
+payment
+paddle
+paddington
+overseas
+orville
+orthodox
+nietzsche
+nettie
+needles
+nachos
+motor
+mooses
+moonman
+monorail
+momdad
+missie
+miss
+minemine
+milhouse
+mickie
+mermaids
+memento
+melon
+maverick1
+margarida
+mansfield
+malena
+madrigal
+london22
+linus
+lima
+leander
+lasalle
+krakatoa
+korea
+karen1
+junction
+joyful
+joseph1
+jolene
+johnboy
+jenjen
+jello
+jamess
+intranet
+impreza
+imperator
+hunter123
+humility
+hubbard
+hotsex
+horney
+holy
+hermit
+hedwig
+harmless
+harlan
+graves
+grass
+graeme
+grace123
+googoo
+giuliana
+gauntlet
+ganesha
+fugitive
+fuckyou123
+frazier
+flatland
+fenris
+feelings
+fabregas
+esquire
+escobar
+entertainment
+emanuele
+elodie
+election
+dumpster
+douglas1
+cruzeiro
+crowley
+crafty
+cracking
+cooper1
+control1
+compute
+code
+cobra1
+chillin
+cheaters
+centrino
+carrier
+captain1
+canberra
+calling
+caliban
+bricks
+botswana
+bobber
+blockbuster
+blahblahblah
+blackfire
+blackbelt
+bestfriend
+base
+banjo
+bailey1
+autocad
+atreides
+athlete
+asuncion
+astronomy
+astroboy
+assist
+aqualung
+annie1
+andrej
+amnesiac
+amiga
+allgood
+adorable
+Patrick
+Matthew
+David
+3edc4rfv
+2003
+1z2x3c4v
+19921992
+14141414
+12211221
+120120
+zinger
+yankees2
+yahoo1
+wrench
+worldcup
+witch
+winger
+wholesale
+wendy1
+vulture
+vittorio
+vishal
+vera
+uuuuuu
+underwood
+underwater
+ulises
+tupac
+trial
+track
+tracie
+trace
+toxic
+touchdown
+tonton
+theworld
+thebeast
+thaddeus
+telemark
+tango1
+sylvania
+surveyor
+suitcase
+sucks
+stroller
+stripped
+stratford
+stallone
+spock
+speedster
+sniffer
+smoke420
+shop
+septembe
+scales
+saviour
+sasa
+sandbox
+sandberg
+samira
+saber
+rowland
+rousseau
+robin1
+revenant
+redford
+rattler
+raffles
+purdue
+protector
+protected
+product
+prasad
+poppet
+pianos
+pepsi123
+pembroke
+password4
+password13
+parkside
+paint
+outbreak
+ohyeah
+ocarina
+obsolete
+nyquist
+nutshell
+nounours
+nonenone
+nine
+nigger1
+nielsen
+nichols
+nada
+multisync
+mueller
+mousse
+momentum
+microwave
+michele1
+mehmet
+marguerite
+maldives
+magdalen
+longbeach
+lockhart
+lawless
+lantern
+land
+krokodil
+kraken
+khaled
+kensington
+kenken
+just4me
+junker
+illegal
+igor
+icetea
+i
+humboldt
+homebase
+hippos
+hhhh
+headshot
+headless
+hazelnut
+harmon
+hades
+guru
+gremlins
+golfer1
+geordie
+frankie1
+frank123
+fireman1
+fireblade
+faceoff
+fabiola
+external
+entering
+ellis
+elegant
+electrical
+east
+eagles1
+dulcinea
+duffer
+drums
+dropkick
+draconis
+dont4get
+domestic
+dododo
+doc
+dirk
+dimple
+diddle
+delmar
+delano
+daydreamer
+darkwing
+curly
+cummins
+corporal
+colour
+cocorico
+closed
+cleo
+chino
+chimaera
+cheyanne
+chavez
+centre
+centaur
+celebrate
+cashew
+carsten
+caballero
+bully
+breakers
+braxton
+brainstorm
+boys
+boogers
+bluesman
+blackpool
+bethesda
+beluga
+beatle
+bavaria
+basketba
+ballin
+aviator
+ashish
+around
+aprilia
+antichrist
+andyandy
+allison1
+aisling
+agnes
+adolfo
+accent
+abcdefghi
+William
+Garfield
+Abcd1234
+797979
+656565
+646464
+2010
+1236987
+050505
+yummy
+yoyoyoyo
+yeahbaby
+yahweh
+wwwww
+wilfred
+whites
+wetter
+wetpussy
+wanda
+villa
+vergessen
+vaughan
+variable
+urchin
+unicorn1
+ttttttt
+trustme
+trillium
+trey
+tralala
+torrance
+tool
+tikitiki
+tiger2
+thumper1
+thesaint
+theforce
+thecat
+tessa
+teiubesc
+tables
+sweet123
+survey
+sunbird
+sunbeam
+suck
+succubus
+stockman
+steve123
+stefani
+spleen
+speeding
+sonya
+solitaire
+sokrates
+slut
+slingshot
+slayers
+skateboarding
+silverfox
+showboat
+shifty
+sherwin
+sexy123
+sequence
+schultz
+satanas
+sandra1
+samuel1
+sambo
+rottweiler
+roma
+rita
+rincewind
+rimmer
+rico
+ribbon
+reveal
+redhat
+rainmaker
+racers
+qwerty99
+punker
+postcard
+polkadot
+photoshop
+persimmon
+perfume
+passes
+parole
+paradis
+pandabear
+panda1
+outland
+orlando1
+open123
+nymets
+nutrition
+nowhere
+nora
+no
+niggers
+nicolas1
+nicknick
+nectar
+navajo
+naughty1
+mysterious
+murdock
+mortis
+morocco
+montoya
+momomo
+miller1
+micky
+mercy
+meaghan
+maxi
+mauser
+marine1
+marielle
+maneater
+lucian
+loves
+lizzy
+lions
+lionlion
+liberal
+leningrad
+leapfrog
+larsson
+langley
+kristopher
+korn
+koolaid
+kool
+kirkwood
+kilkenny
+kidney
+kalle
+jordan12
+joe123
+jerry1
+jediknight
+jazmine
+jacket
+jabberwocky
+intercom
+intense
+ingram
+informix
+include
+illini
+ib6ub9
+hunger
+howdy
+hounddog
+hoops
+homicide
+hijack
+herschel
+hermosa
+henrietta
+hellcat
+hatteras
+harakiri
+halfmoon
+gunslinger
+guide
+gretzky
+greeny
+goodwin
+gomez
+glider
+fremont
+four
+forgive
+flint
+flavor
+fivestar
+firewood
+expedition
+executor
+euclid
+elcamino
+egyptian
+edmond
+eclipse1
+duckling
+drumming
+drifting
+dorado
+door
+donny
+dodo
+denny
+debra
+davida
+daisydog
+dagmar
+cute
+crisis
+court
+cortney
+coolgirl
+contrast
+collector
+club
+close
+ciccio
+choclate
+chilling
+channels
+cerise
+catapult
+careless
+capitan
+californ
+cadbury
+bullets
+brunswick
+brick
+brendan1
+braindead
+bored
+blunts
+bluedragon
+bloodline
+blind
+binary
+bimmer
+beverley
+becca
+bbbbbbb
+barrel
+baptist
+audio
+audi
+atalanta
+astonvilla
+assword
+ashley12
+asdfghjkl1
+art
+arizona1
+antihero
+andrew12
+andrea1
+anabel
+allright
+akasha
+airman
+ab123456
+aaasss
+43214321
+369852
+2525
+2222222222
+2121
+1a2s3d
+1974
+1961
+18436572
+162534
+123567
+123456654321
+1234561
+1231234
+1000
+youssef
+yeah
+woodlands
+windows7
+wilkinson
+wibble
+white1
+wellcome
+walters
+waldemar
+vanish
+valerian
+true
+tristan1
+trilogy
+tricks
+trekker
+tornado1
+thunders
+thomas123
+testament
+tennyson
+taxman
+tarragon
+tapestry
+tajmahal
+sunny123
+struggle
+storm1
+starling
+starchild
+spoons
+spaniel
+sodapop
+sobriety
+snowfall
+snickers1
+skyline1
+skyhawk
+shirley1
+shalimar
+sexyman
+settings
+sebastian1
+schnecke
+satriani
+sasha123
+sameer
+sailfish
+roserose
+robson
+rickey
+restore
+rejoice
+reference
+raiden
+rafaela
+qwerty22
+qwedsa
+qqqqqqqqqq
+puffer
+proteus
+print
+princes
+prashant
+prancer
+ppppp
+powerman
+powerade
+playstation2
+plastics
+planets
+plane
+pinkpink
+pieman
+patron
+patate
+parents
+parallel
+papercut
+p4ssword
+olympic
+offline
+nutella
+numlock
+norma
+nicolai
+navyseal
+mufasa
+monopoli
+moises
+mnemonic
+millenia
+mercenary
+membrane
+mayfair
+manitoba
+magyar
+magda
+maddox
+madcat
+lineage2
+limelight
+leopards
+leeann
+lasers
+kurdistan
+kittys
+kindred
+kimball
+kidrock
+kassie
+karoline
+kali
+johnpaul
+jenson
+jeanine
+jasmina
+jamila
+jaguars
+jackman
+ismail
+interior
+interesting
+insomniac
+idiots
+homepage
+hello1234
+hello12
+heavymetal
+headhunter
+harvester
+hartman
+halcyon
+guitars
+greeting
+gray
+goodie
+goodday
+golfgolf
+godson
+go
+glassman
+gladstone
+galatasaray
+galahad
+fruit
+friction
+foot
+florin
+filthy
+filomena
+fffff
+felice
+fabien
+eulalia
+ethereal
+emotions
+dudedude
+drizzle
+drive
+douglass
+doofus
+dominika
+doll
+divers
+diva
+dipper
+desperados
+demetrio
+demented
+deliver
+deepak
+decision
+datsun
+darrel
+cuthbert
+culture
+crunchy
+crappy
+cornel
+consult
+compound
+comatose
+clocks
+civilwar
+circuit
+chessie
+charleston
+chariot
+chan
+castello
+caspar
+carioca
+candie
+cachorro
+bushman
+bulletin
+brown1
+britain
+brandnew
+braden
+boswell
+bogus
+bluegill
+blue32
+bloodhound
+blondy
+bliss
+blanket
+blader
+billing
+beautiful1
+baywatch
+bastardo
+baraka
+bagheera
+babette
+avanti
+aurore
+aspirin
+asimov
+arrows
+arcade
+april1
+annalisa
+anatomy
+allstate
+allegra
+algeria
+alfaromeo
+aldebaran
+alberto1
+agenda
+actress
+accept
+Samantha
+Jackson
+Elizabeth
+963963
+78945612
+654654
+2fast4u
+2cool4u
+2006
+1957
+1598753
+159632
+1234568
+01010101
+0007
+zxzxzx
+yellow12
+woman
+wolverines
+wolfhound
+wildbill
+whittier
+werty
+watkins
+warrant
+vittoria
+virgilio
+vegetable
+vangogh
+uptown
+upgrade
+unbreakable
+umberto
+trusting
+troubles
+triplex
+trading
+tonytony
+times
+tiamat
+thebest1
+terriers
+template
+temper
+telefoon
+talented
+table
+superpower
+supermen
+sugarplum
+steroid
+starting
+sprout
+spartan117
+sowhat
+sophie1
+snowball1
+smurf
+slimjim
+sixpence
+simplicity
+sigmund
+sidewalk
+shoshana
+shivers
+shammy
+seville
+setup
+serrano
+section
+schools
+sasquatch
+samtron
+rugrat
+roxane
+rowing
+rotary
+rodent
+rocky2
+resist
+repeat
+renate
+relax
+read
+rattlesnake
+rainbow7
+rafferty
+qwerty77
+qwerty00
+pussys
+promotion
+pokemon123
+pinocchio
+philosophy
+philippines
+pheasant
+petter
+pentium3
+pawpaw
+patrizia
+parking
+parade
+overlook
+overhead
+operations
+okokokok
+ohshit
+oddball
+nwo4life
+novembre
+nostradamus
+niggas
+nexus
+newlife1
+newdelhi
+nervous
+myspace1
+myfriend
+munchies
+mouses
+mountaindew
+moneybag
+molecule
+mistake
+miki
+midnite
+mercury1
+melville
+mcintyre
+mattress
+marylou
+martino
+marshmallow
+marmite
+maritime
+mariachi
+maple
+makemoney
+magali
+maddy
+luckie
+lucien
+loveyou2
+lovesong
+lolalola
+lindsey1
+lifeboat
+lana
+kitties
+kimono
+katie123
+kasandra
+kara
+kaplan
+kalamazoo
+jupiter1
+jump
+julia123
+judge
+jordan123
+jockey
+jenni
+jackrabbit
+isabela
+intelligent
+innocence
+india123
+iamthebest
+hundred
+hollis
+heyman
+henry123
+henrique
+hellion
+hardball
+handbook
+hacienda
+guilherme
+grenoble
+gotmilk
+goodmorning
+goddamn
+giuliano
+genie
+geisha
+fudge
+frostbite
+fresno
+freehand
+fragment
+foreskin
+folder
+fido
+f
+explosion
+experiment
+erwin
+erasure
+ensemble
+elisa
+eclectic
+duffy
+ducky
+dotcom
+dong
+dogger
+dogfight
+dodgers1
+disease
+diogenes
+dillweed
+dickinson
+derick
+demon666
+demetrius
+daybreak
+darrin
+dapper
+dagobert
+curtain
+culinary
+cuervo
+crossing
+cronos
+croatia
+coolboy
+controls
+consulting
+cobblers
+coaster
+climax
+click
+clare
+cindy1
+chrono
+chill
+chatterbox
+charlie123
+charissa
+changer
+celebrity
+campos
+cable
+buster12
+bungle
+bungalow
+bullit
+brock
+broadcast
+brianna1
+boxcar
+bootleg
+bodyguard
+bella123
+belkin
+belize
+beaker
+barnett
+ballroom
+azrael
+artur
+aria
+arbiter
+andrzej
+andre123
+analysis
+ana
+amber123
+all4one
+alegria
+albania
+afghanistan
+addiction
+abc321
+aa123456
+Phoenix
+686868
+434343
+2wsx3edc
+2bornot2b
+225588
+147741
+12131213
+zxcasdqwe
+yes
+yannick
+wyvern
+wwwwwww
+writing
+witchcraft
+wertwert
+weight
+warcraft1
+wallet
+vivienne
+vivaldi
+virago
+versus
+vermilion
+vega
+usarmy
+unity
+ultrasound
+tweeter
+tuppence
+tropicana
+trafford
+tototo
+teddy123
+t
+survive
+summer123
+strife
+streamer
+strato
+stifler
+starburst
+star1234
+stapler
+ssssssssss
+spotlight
+specialized
+sparrows
+songoku
+solomon1
+soloman
+solid
+sloppy
+simply
+sideshow
+shimmer
+sherpa
+sherbert
+sentry
+seminoles
+sebastia
+seagate
+scribble
+sarasota
+sarasara
+sarah123
+sanguine
+sandy123
+sand
+samwise
+samsung123
+saibaba
+robert12
+rhythm
+request
+reflection
+redhorse
+rational
+raptors
+ramiro
+rakesh
+radioman
+qwerty01
+punjab
+protein
+progressive
+poophead
+plutonium
+phantoms
+pepino
+peddler
+password00
+passage
+paperino
+panic
+panache
+page
+ozzy
+osprey
+organize
+optiplex
+october1
+null
+nokia1
+niki
+neverdie
+nantucket
+munch
+mothers
+moron
+morbid
+mooney
+moondog
+monsieur
+monkfish
+monica1
+modem
+mmmm
+minimal
+mineral
+midland
+melodie
+megane
+mauritius
+master01
+marymary
+marvelous
+marnie
+mark123
+marduk
+mann
+manifesto
+mahesh
+macleod
+machete
+macedonia
+lumber
+lullaby
+luckyme
+lucas123
+loyalty
+lovejoy
+logistic
+locker
+llama
+lili
+libido
+leprechaun
+lemmings
+langston
+krusty
+kipling
+killer11
+killah
+karl
+kappa
+joyride
+joking
+jimenez
+jeffry
+jayhawk
+jack1234
+itsme
+ireland1
+invent
+innovation
+import
+iiyama
+ihateu
+hungary
+house123
+honeys
+holla
+hihihihi
+hhhhh
+hemlock
+hellhole
+healer
+hardwood
+grandad
+govinda
+ginny
+gentry
+generator
+gazelle
+gaspar
+funhouse
+fullhouse
+fulham
+freebie
+franny
+foxfire
+flowerpower
+fiorella
+farewell
+fantasma
+fall
+faithless
+fairy
+failsafe
+explicit
+esposito
+enters
+enchanted
+elissa
+duckduck
+drilling
+drawing
+dragon10
+doremi
+doors
+doodlebug
+donjuan
+dickweed
+dewey
+denial
+demon1
+dallas1
+crunchie
+crawfish
+craft
+conker
+condition
+chessman
+charter
+chanelle
+chamonix
+celebration
+candys
+candy123
+brotherhood
+briggs
+brewers
+brainiac
+borneo
+bomb
+bluewater
+blocked
+birdland
+binladen
+billings
+before
+barlow
+bareback
+bacteria
+authority
+astronaut
+asdfqwer
+asd12345
+arrakis
+arpeggio
+appleseed
+anthony2
+animator
+analyst
+amazonas
+alpacino
+ajax
+airline
+adelaida
+adamadam
+aaron123
+Einstein
+Buster
+Bailey
+Ashley
+90909090
+741963
+5150
+444555
+369258
+1962
+12qwas
+1234zxcv
+101101
+zebulon
+youtube
+yasmeen
+yamamoto
+wormhole
+witness
+windows98
+wiggle
+whiteman
+westgate
+watchmen
+walden
+visa
+virgo
+vergeten
+veracruz
+vanquish
+uuuuuuuu
+urban
+undefined
+tugger
+trucking
+trooper1
+tramp
+tosser
+tormentor
+tomate
+timelord
+timberwolf
+thrust
+tangent
+taichi
+synapse
+supers
+stupid1
+strings
+strangle
+stoneman
+stokes
+starless
+spiritual
+spinach
+spagetti
+soviet
+sorensen
+somethin
+snuggle
+snowhite
+snooze
+smiler
+slovakia
+sledge
+skydiver
+skunk
+sinful
+silvester
+silicone
+silencio
+siamese
+shevchenko
+shayna
+shaved
+shanty
+selector
+scumbag
+scramble
+scott123
+schalke
+scarab
+saracen
+salinger
+rosette
+revival
+renoir
+rendezvous
+reminder
+redheads
+rage
+qwerty321
+qwe
+propaganda
+pringle
+presidente
+prakash
+points
+pocahontas
+pierrot
+photography
+phaedrus
+permanent
+peeper
+paulchen
+password5
+passion1
+paraguay
+panda123
+palacios
+pain
+pacino
+osbourne
+orange123
+opus
+onepiece
+nolan
+nitrous
+nippon
+ninja1
+mutation
+murcielago
+murakami
+mongo
+mitchel
+mina
+mike1
+mercator
+matematica
+mario123
+marin
+marcy
+manticore
+mahler
+lynnette
+luigi
+lucero
+loyola
+lookatme
+lock
+lllll
+linda123
+lightnin
+lifeless
+libby
+leopoldo
+lenore
+lenin
+lawman
+latisha
+latin
+kristin1
+knitting
+kinetic
+killerbee
+killa
+kawaii
+katrina1
+kabuki
+julia1
+journal
+jabber
+iridium
+interactive
+hussein
+hunt
+hotdogs
+holding
+hickory
+hershey1
+hellhound
+haunted
+happening
+hansol
+hanover
+gutter
+gussie
+gridlock
+greatness
+grape
+grandam
+goethe
+gigantic
+getaway
+gemma
+garvey
+gaby
+fred1234
+florent
+flavio
+flatline
+firehouse
+firehawk
+filbert
+fight
+fellatio
+faraway
+face
+excite
+eugenio
+eruption
+erasmus
+encounter
+dragons1
+dragon88
+doktor
+dogfish
+dionne
+delorean
+decipher
+dddd
+davidb
+darken
+darkblue
+dario
+danika
+crush
+creed
+creatine
+craven
+couple
+counting
+cornbread
+coolidge
+cookie12
+converge
+contest
+clubbing
+clear
+cigars
+charmaine
+charade
+chair
+chains
+cement
+cbr600rr
+casual
+carnegie
+caribbean
+capcom
+canton
+calabria
+buttfuck
+butterflies
+broncos1
+brindle
+bowie
+bonfire
+blueball
+blister
+blair
+bigcat
+biatch
+beware
+beemer
+beautifu
+bbbb
+batter
+bateman
+barnacle
+barman
+barbarossa
+banking
+bach
+babygurl
+azazel
+azalea
+avocado
+automatic
+asturias
+assasin
+ashwin
+armchair
+archives
+aperture
+andree
+amos
+amandine
+ally
+alexei
+agnieszka
+aggie
+ace
+Liverpool
+Killer
+717171
+535353
+515151
+474747
+22446688
+20032003
+1qaz
+1a2b3c4d5e
+19641964
+12141214
+101112
+01230123
+zarina
+yourname
+yahooo
+wxcvbn
+woods
+wilkins
+whores
+whitewolf
+warszawa
+warsaw
+viviana
+vista
+visionary
+viagra
+vette
+versailles
+valera
+twist
+trophy
+tribble
+trapped
+toothpick
+tillie
+tigress
+therock1
+there
+theory
+testuser
+temp1234
+taipan
+swordfis
+swiss
+superdog
+sunflowers
+sunflowe
+stevenson
+sportsman
+somewhere
+solar
+soccer22
+snoopdogg
+slovenia
+slide
+slayer666
+sinfonia
+silverfish
+shells
+sexybitch
+sexbomb
+seadog
+scrotum
+scribe
+scimitar
+sceptre
+sassy1
+sandal
+sally1
+rossi
+rosebush
+rodeo
+reznor
+resonance
+resolution
+reno
+registration
+redriver
+redeemed
+ranger1
+ramstein
+ram
+rahman
+radish
+radiant
+qweasdzx
+quick
+qazzaq
+q12345
+q
+purpose
+puppy1
+proper
+prince1
+primetime
+precision
+plumbing
+pirata
+pimping
+pickwick
+pavel
+password22
+parsifal
+paramount
+pajero
+overcome
+otis
+onetwo
+olga
+octagon
+nutcracker
+ninjutsu
+newport1
+newcomer
+net
+neon
+narayan
+nanana
+motmot
+mostafa
+monkey01
+minority
+minion
+midwest
+marques
+mariette
+manu
+manitou
+manage
+maldini
+malawi
+mahmoud
+mafalda
+lover1
+loveland
+lottery
+localhost
+llcoolj
+like
+leona
+league
+leadership
+lagrange
+kenton
+kelli
+kanada
+kaitlynn
+justin123
+joshua123
+john1234
+joan
+jjjj
+jedi
+janette
+jamjam
+isis
+irish1
+invictus
+inventor
+inspired
+inform
+icecold
+iamcool
+hurrican
+hotness
+honey123
+holbrook
+hiroshima
+heracles
+hehe
+hawthorne
+hathaway
+grey
+governor
+goody
+goodrich
+gizmo123
+garion
+front
+friday13
+fortytwo
+foreplay
+foolproof
+flash1
+flakes
+fishhook
+fishfish
+fishers
+financial
+fillmore
+figure
+figment
+fiddler
+ferrets
+fake
+evangeline
+espinoza
+enough
+emerald1
+electricity
+ekaterina
+edgewood
+duisburg
+drummers
+dowjones
+dopey
+dodge1
+dizzy
+delbert
+dantes
+danmark
+crow
+corrina
+convict
+continental
+cococo
+clinic
+cipher
+chewy
+charmer
+cards
+cameroon
+bunnie
+buddyboy
+bruno1
+britta
+britt
+bracelet
+booter
+bonner
+bolivar
+bogeyman
+board
+bluerose
+birdcage
+billy123
+billgates
+bikers
+bigfish
+benny1
+bennet
+benjie
+beepbeep
+batman123
+barret
+barney1
+austen
+ashtray
+asdfgh12
+armenia
+archive
+architecture
+anyone
+antonina
+andi
+anaheim
+anabolic
+amor
+alma
+allister
+aliali
+albacore
+airedale
+aguilar
+again
+activity
+Patricia
+Nicole
+Justin
+99887766
+987321
+963258
+808080
+757575
+741741
+333
+20202020
+19701970
+153624
+1357924680
+1231
+115599
+080808
+yessir
+yardbird
+xcountry
+wine
+wildrose
+waves
+watanabe
+wareagle
+wanderlust
+waldo
+wakefield
+volker
+verity
+verify
+velcro
+validate
+unix
+union
+twin
+tripping
+tripleh
+trip
+treetree
+timbuktu
+tilly
+tight
+tesoro
+teaser
+taytay
+tarantino
+syndicate
+sylvan
+sylvain
+swifty
+swift
+swansea
+sunburn
+summer00
+sultana
+stuntman
+strokes
+stroker
+strata
+stlouis
+stetson
+steelman
+steamer
+spartan1
+spaceship
+snowshoe
+smuggler
+slowhand
+skynet
+simcity
+shorter
+shift
+sharpshooter
+shanice
+shadow01
+sensor
+senna
+seasons
+schuster
+schumi
+schalke04
+satelite
+sarge
+samir
+saddam
+russ
+romeo1
+rockin
+rightnow
+resume
+reset
+regret
+reese
+reactor
+r4e3w2q1
+quagmire
+punch
+price
+prefect
+prague
+portsmouth
+porridge
+pollock
+plummer
+platon
+pinkerton
+perseus
+period
+percy
+peerless
+paxton
+paganini
+orchestra
+optional
+opera
+oioioi
+nowayout
+nounou
+nintendo64
+nickle
+nicaragua
+newstart
+neworder
+neumann
+monty1
+monkey13
+momoney
+mom123
+moimoi
+mission1
+michelangelo
+menthol
+mega
+mcmillan
+may
+maxx
+mara
+manana
+machado
+m123456
+lurker
+lucky777
+lotion
+loren
+lombardo
+lisette
+lindberg
+leah
+launch
+larkspur
+laredo
+landing
+lancia
+lambchop
+lalaland
+lachlan
+kosova
+kirakira
+kamehameha
+just
+jurgen
+juneau
+juggler
+juanito
+joshua12
+jonah
+jetaime
+jesper
+jellybeans
+january1
+itachi
+innovision
+infinito
+index
+indeed
+identify
+hostile
+hgfdsa
+here
+hellomoto
+hellgate
+heatwave
+heater
+hartley
+harlequin
+hardon
+hall
+grounded
+greenish
+grandmother
+gorillaz
+goldsmith
+gloves
+glen
+gerhardt
+generous
+gauthier
+gator1
+gardens
+frontera
+fridge
+freezing
+franz
+fracture
+fourth
+forces
+fool
+firewater
+fellowship
+fastlane
+explosive
+environment
+embassy
+elmo
+elmer
+eeeeeee
+dummies
+duane
+drunk
+drum
+draven
+drafting
+donnelly
+dolomite
+direction
+devlin
+deviant
+deception
+daytime
+darien
+darby
+damocles
+cyanide
+cunningham
+crossroad
+critters
+crickets
+crabtree
+cowboy1
+cortland
+cooley
+convert
+constantin
+connected
+confidential
+comrades
+codered
+clothing
+cleric
+classical
+chuchu
+chiller
+checking
+chase1
+charmed1
+cathleen
+carter15
+carleton
+caribou
+car123
+capella
+candela
+camelia
+caboose
+butterscotch
+butterball
+burgers
+bulldozer
+browny
+brenner
+borland
+bomberman
+blueline
+blue11
+blondes
+blaise
+bittersweet
+bigblack
+berries
+belial
+beehive
+bauer
+bastard1
+baobab
+bagger
+backspin
+babababa
+audition
+auction
+ass123
+asians
+argentum
+antonius
+antiques
+ann
+animate
+angelfish
+americana
+ambush
+aluminium
+alfa
+alain
+abigail1
+abc123abc
+abbie
+aassdd
+Brandon
+666777
+636363
+575757
+369963
+2hot4u
+147963
+14531453
+000
+wwww
+worthy
+woodlawn
+woodchuck
+winwin
+windward
+wind
+warranty
+wander
+visitors
+vertex
+vanderbilt
+valdez
+turquoise
+triathlon
+trespass
+trashcan
+traitor
+trade
+tori
+topnotch
+tokyo
+titania
+tigger12
+thongs
+theron
+theo
+thedog
+tatjana
+switzerland
+suzie
+surgeon
+supply
+summer05
+summer01
+sturgeon
+studioworks
+strikers
+state
+spook
+sparky1
+sounds
+solidus
+soft
+snowy
+smoke1
+skipjack
+simulator
+silverman
+shipyard
+shimano
+shekinah
+sexy69
+severin
+scouting
+satanic
+sanpedro
+sandrock
+rubicon
+rootroot
+ronaldo9
+romina
+roger1
+rocco
+riptide
+riley1
+reynaldo
+renaissance
+rembrandt
+relentless
+relative
+recover
+ray
+randy1
+rancho
+rainier
+radagast
+qwertzui
+qwe321
+quiet
+quack
+puddle
+presidio
+presence
+prentice
+porcupine
+poppy1
+polar
+playback
+playa
+place
+ping
+pilsner
+philippa
+peterman
+persia
+perrin
+peregrin
+peaceman
+papabear
+pagoda
+organist
+optimum
+ok
+octavio
+octavian
+northside
+nnnnnnn
+nikhil
+nightwing
+niceday
+next
+nathanael
+nascar24
+muscles
+multipass
+mostwanted
+monteiro
+monkeys1
+monk
+monet
+monday1
+molina
+mirella
+minnow
+millhouse
+mikhail
+micaela
+metaphor
+mervin
+merida
+matilde
+masterp
+manifold
+mangos
+mandala
+mancity
+maltese
+makelove
+makayla
+mahoney
+lysander
+love69
+louisville
+london123
+logistics
+lobsters
+line
+lifesaver
+liana
+levi
+layla
+lagoon
+kylie
+kristofer
+kinky
+kimmy
+kilimanjaro
+kellogg
+karmen
+kalvin
+julie123
+jolly
+johngalt
+jamaica1
+jalapeno
+jakob
+jacobsen
+islanders
+isengard
+idefix
+icecream1
+hutchins
+hotlips
+horizons
+holger
+hitchcock
+hemingway
+heavens
+heartland
+haynes
+hawkwind
+hasan
+harding
+happyboy
+happy2
+halima
+habitat
+gwendolyn
+gutentag
+grunt
+grenade
+graveyard
+gracious
+godislove
+glenwood
+girlie
+ghbdtn
+gggg
+frogs
+frogfrog
+freelancer
+franck
+fraction
+foxy
+forgetful
+foreigner
+folklore
+flaming
+firetruck
+fever
+fender1
+fantasy1
+fahrenheit
+express1
+exposure
+everton1
+ericson
+eragon
+enfield
+endurance
+employee
+embrace
+elysium
+elektro
+economic
+dunhill
+ducksoup
+dragonslayer
+doggystyle
+diskette
+devious
+destin
+despair
+descartes
+delacruz
+davina
+dashboard
+damnation
+daisies
+custer
+crissy
+creepers
+copperhead
+colony
+cognac
+cobras
+clements
+cheerful
+characters
+chantel
+certified
+cecily
+cathedral
+catering
+career
+caracol
+capucine
+capacity
+calvary
+cabinet
+bypass
+bugs
+buffet
+budget
+bridgett
+breakaway
+brat
+boyscout
+bourne
+bogota
+blue42
+bloomer
+bloodlust
+bling
+blackstone
+bird33
+bingo123
+bibi
+belgrade
+beginner
+bavarian
+band
+baloo
+bagels
+backfire
+astaroth
+asswipe
+asphalt
+asdfg12345
+arsehole
+argent
+ararat
+anselmo
+annelise
+andrew01
+anabelle
+amherst
+albright
+airlines
+adminadmin
+adelante
+adam12
+acrobat
+account1
+abdulla
+Maverick
+Maggie
+London
+Dennis
+998877
+85208520
+555
+357951
+2323
+2007
+1q2w3e4
+145236
+14121412
+134679852
+132435
+123456789abc
+zzzzzzzzzz
+zouzou
+zazaza
+yakuza
+yahoo123
+wretched
+winthrop
+wildone
+whirlwind
+westwind
+wendel
+weinberg
+weewee
+wade
+vacuum
+upyours
+tumbleweed
+trashman
+toronto1
+tissue
+timtim
+tigger2
+threesome
+thomas01
+thibault
+thesims
+thekid
+test11
+teller
+tata
+tartar
+taco
+system1
+syndrome
+swinging
+sweetiepie
+sweetest
+suspect
+superwoman
+sunita
+sunburst
+streak
+strauss
+sperma
+sperling
+spectral
+soul
+song
+soldier1
+solace
+smasher
+sky
+sixpack
+simplex
+silmaril
+shoulder
+shortie
+shahrukh
+settlers
+semper
+seduction
+searching
+scotsman
+scofield
+schumann
+schule
+scholar
+satisfaction
+santamaria
+sandals
+safeway
+rudeboy
+rossignol
+ronny
+rodrigues
+rockrock
+rockland
+robyn
+retriever
+resurrection
+restaurant
+regine
+redwine
+redcar
+rebelde
+race
+r
+qwerty69
+qaywsx
+prozac
+promises
+priscila
+priority
+principal
+poop123
+pookie1
+polina
+playoffs
+persephone
+peregrine
+pebbles1
+pearl1
+patter
+pasha
+owner
+owned
+overseer
+orleans
+orion1
+order
+orbit
+opposite
+oldsmobile
+okay
+octavius
+oconnor
+obscure
+nikko
+nikenike
+nightcrawler
+nehemiah
+navy
+nasser
+nassau
+mystery1
+myriam
+mylene
+moving
+morticia
+morrowind
+moonraker
+monkey11
+mogul
+modest
+mobster
+mithrandir
+misty123
+mingus
+milenium
+microphone
+michael3
+miamor
+mendez
+matt123
+matrix123
+math
+markos
+marcio
+maisie
+mailer
+lollollol
+loader
+lizbeth
+lincoln1
+lilwayne
+leanna
+lawton
+lausanne
+lasher
+lake
+kokokoko
+kobold
+kisser
+kilowatt
+killall
+kidding
+kick
+k
+juggle
+judson
+joanie
+jjjjj
+jessy
+jelena
+jacob123
+issues
+ishmael
+isadora
+interval
+insect
+ignorant
+huntsman
+hubble
+hothot
+host
+hooligans
+homo
+homesick
+holycow
+hobgoblin
+highlands
+highbury
+hhhhhhh
+herrera
+hellbent
+hawks
+hands
+handle
+hallie
+halibut
+hackman
+guerilla
+graywolf
+grandson
+goonies
+gmoney
+gizzmo
+gertie
+georgetown
+gentleman
+gecko
+gargamel
+gangsters
+gameplay
+galway
+fractal
+foryou
+fortis
+flowerpot
+firefly1
+fighter1
+fielding
+fermat
+felony
+favour
+faramir
+familiar
+falconer
+factor
+ezequiel
+ester
+endgame
+emotion
+eeeee
+edward1
+dynamics
+dougal
+dominican
+dingo
+dickson
+demolition
+demetria
+demeter
+dede
+deathnote
+david2
+daryl
+darkroom
+curtains
+currency
+crocodil
+creativity
+crawling
+cranky
+cory
+commercial
+cold
+cigarette
+ciao
+christy1
+chivalry
+charlie7
+chapter
+chance1
+celestine
+cecelia
+ccccc
+catriona
+cassiopeia
+carolann
+carlie
+card
+cantona7
+cannonball
+canfield
+camber
+buttocks
+buller
+brinkley
+bribri
+brianne
+boromir
+bordello
+bonny
+blissful
+blast
+blackwell
+blackbox
+billiard
+bigbooty
+bergman
+belvedere
+bauhaus
+bastille
+bashful
+barbershop
+background
+avril
+australian
+atreyu
+astalavista
+assassins
+ashes
+asdfg1
+as123456
+artofwar
+artichoke
+aptiva
+antique
+annalena
+animated
+angle
+alvarado
+alternate
+alive
+alicante
+alex2000
+aleksandr
+alabaster
+aerospace
+accurate
+aabbcc
+852852
+2008
+2
+17171717
+159159159
+141516
+123456as
+00112233
+00001111

From a14916d10676e9d139cd94a1da9cfbf96524bed2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 11:03:29 -0700
Subject: [PATCH 0470/1013] Minor dep upgrades

---
 package-lock.json | 26 +++++++++++++-------------
 package.json      |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae264090..be373f20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -773,9 +773,9 @@
       }
     },
     "fs-extra": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
-      "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
@@ -1627,7 +1627,7 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-tmpdir": {
@@ -2098,9 +2098,9 @@
       }
     },
     "sqlite3": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.3.tgz",
-      "integrity": "sha512-nuWqc26oiJZXyY5MEz+rQbiki1BTibnXsy8Kqo7QD/ut6eksOWi6uWwFMbdnFNME7CZyplWdDXj2fbdQVaEfuA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.4.tgz",
+      "integrity": "sha512-CO8vZMyUXBPC+E3iXOCc7Tz2pAdq5BWfLcQmOokCOZW5S5sZ/paijiPOCdvzpdP83RroWHYa5xYlVqCxSqpnQg==",
       "requires": {
         "nan": "~2.10.0",
         "node-pre-gyp": "^0.10.3",
@@ -2219,14 +2219,14 @@
       }
     },
     "tar": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz",
-      "integrity": "sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==",
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
       "requires": {
-        "chownr": "^1.0.1",
+        "chownr": "^1.1.1",
         "fs-minipass": "^1.2.5",
-        "minipass": "^2.3.3",
-        "minizlib": "^1.1.0",
+        "minipass": "^2.3.4",
+        "minizlib": "^1.1.1",
         "mkdirp": "^0.5.0",
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.2"
diff --git a/package.json b/package.json
index 0d4e4a9f..73fd9ebc 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "^7.0.0",
+    "fs-extra": "^7.0.1",
     "glob": "^7.1.2",
     "graceful-fs": "^4.1.15",
     "hashids": "^1.1.1",
@@ -44,7 +44,7 @@
     "rlogin": "^1.0.0",
     "sane": "^4.0.2",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^4.0.3",
+    "sqlite3": "^4.0.4",
     "sqlite3-trans": "^1.2.0",
     "ssh2": "^0.6.1",
     "temptmp": "^1.0.0",

From 23aa3d0bd35b761e409d7ba968119437b7f5df9c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 18:11:00 -0700
Subject: [PATCH 0471/1013] Full source build for ARM/pi

---
 misc/install.sh | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index 42cbbd0d..f4084928 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -9,6 +9,16 @@ ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
 WAIT_BEFORE_INSTALL=10
 
+is_arch_arm()
+{
+    local ARCH=`arch`
+    if [[ $ARCH == "arm"* ]]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
 enigma_header() {
     clear
     cat << EndOfMessage
@@ -31,18 +41,19 @@ EndOfMessage
     sleep ${WAIT_BEFORE_INSTALL}
 }
 
+fatal_error() {
+    printf  "${TIME_FORMAT} \e[41mERROR:\033[0m %b\n" "$*" >&2;
+    exit 1
+}
+
 enigma_install_needs() {
-    command -v $1 >/dev/null 2>&1 || { log_error "ENiGMA½ requires $1 but it's not installed. Please install it and restart the installer."; exit 1; }
+    command -v $1 >/dev/null 2>&1 || { fatal_error "ENiGMA½ requires $1 but it's not installed. Please install it and restart the installer." }
 }
 
 log()  {
     printf "${TIME_FORMAT} %b\n" "$*";
 }
 
-log_error() {
-    printf  "${TIME_FORMAT} \e[41mERROR:\033[0m %b\n" "$*" >&2;
-}
-
 enigma_install_init() {
     log "Checking git installation"
     enigma_install_needs git
@@ -73,28 +84,35 @@ download_enigma_source() {
   if [ -d "$INSTALL_DIR/.git" ]; then
     log "ENiGMA½ is already installed in $INSTALL_DIR, trying to update using git"
     command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch 2> /dev/null || {
-      log_error "Failed to update ENiGMA½, run 'git fetch' in $INSTALL_DIR yourself."
-      exit 1
+      fatal_error "Failed to update ENiGMA½, run 'git fetch' in $INSTALL_DIR yourself."
     }
   else
     log "Downloading ENiGMA½ from git to '$INSTALL_DIR'"
     mkdir -p "$INSTALL_DIR"
     command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" || {
-      log_error "Failed to clone ENiGMA½ repo. Please report this!"
-      exit 1
+      fatal_error "Failed to clone ENiGMA½ repo. Please report this!"
     }
   fi
 }
 
+extra_npm_install_args()
+{
+    if is_arch_arm; then
+        echo "--build-from-source"
+    else
+        echo ""
+    fi
+}
+
 install_node_packages() {
     log "Installing required Node packages"
     cd ${ENIGMA_INSTALL_DIR}
-    git checkout ${ENIGMA_BRANCH} && npm install
+    local EXTRA_NPM_ARGS=$(extra_npm_install_args)
+    git checkout ${ENIGMA_BRANCH} && npm install ${EXTRA_NPM_ARGS}
     if [ $? -eq 0 ]; then
       log "npm package installation complete"
     else
-      log_error "Failed to install ENiGMA½ npm packages. Please report this!"
-      exit 1
+      fatal_error "Failed to install ENiGMA½ npm packages. Please report this!"
     fi
 }
 

From 6c50b640dbcd92bd55e8ede361dc102d81e060cf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 18:19:38 -0700
Subject: [PATCH 0472/1013] Fixes

---
 misc/install.sh | 54 +++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index f4084928..0b100edb 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -9,16 +9,6 @@ ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
 WAIT_BEFORE_INSTALL=10
 
-is_arch_arm()
-{
-    local ARCH=`arch`
-    if [[ $ARCH == "arm"* ]]; then
-        return 1
-    else
-        return 0
-    fi
-}
-
 enigma_header() {
     clear
     cat << EndOfMessage
@@ -47,7 +37,7 @@ fatal_error() {
 }
 
 enigma_install_needs() {
-    command -v $1 >/dev/null 2>&1 || { fatal_error "ENiGMA½ requires $1 but it's not installed. Please install it and restart the installer." }
+    command -v $1 >/dev/null 2>&1 || fatal_error "ENiGMA½ requires $1 but it's not installed. Please install it and restart the installer."
 }
 
 log()  {
@@ -78,25 +68,31 @@ configure_nvm() {
 }
 
 download_enigma_source() {
-  local INSTALL_DIR
-  INSTALL_DIR=${ENIGMA_INSTALL_DIR}
+    local INSTALL_DIR
+    INSTALL_DIR=${ENIGMA_INSTALL_DIR}
 
-  if [ -d "$INSTALL_DIR/.git" ]; then
-    log "ENiGMA½ is already installed in $INSTALL_DIR, trying to update using git"
-    command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch 2> /dev/null || {
-      fatal_error "Failed to update ENiGMA½, run 'git fetch' in $INSTALL_DIR yourself."
-    }
-  else
-    log "Downloading ENiGMA½ from git to '$INSTALL_DIR'"
-    mkdir -p "$INSTALL_DIR"
-    command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" || {
-      fatal_error "Failed to clone ENiGMA½ repo. Please report this!"
-    }
-  fi
+    if [ -d "$INSTALL_DIR/.git" ]; then
+        log "ENiGMA½ is already installed in $INSTALL_DIR, trying to update using git"
+        command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch 2> /dev/null ||
+            fatal_error "Failed to update ENiGMA½, run 'git fetch' in $INSTALL_DIR yourself."
+    else
+        log "Downloading ENiGMA½ from git to '$INSTALL_DIR'"
+        mkdir -p "$INSTALL_DIR"
+        command git clone ${ENIGMA_SOURCE} "$INSTALL_DIR" ||
+            fatal_error "Failed to clone ENiGMA½ repo. Please report this!"
+    fi
 }
 
-extra_npm_install_args()
-{
+is_arch_arm() {
+    local ARCH=`arch`
+    if [[ $ARCH == "arm"* ]]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+extra_npm_install_args() {
     if is_arch_arm; then
         echo "--build-from-source"
     else
@@ -110,9 +106,9 @@ install_node_packages() {
     local EXTRA_NPM_ARGS=$(extra_npm_install_args)
     git checkout ${ENIGMA_BRANCH} && npm install ${EXTRA_NPM_ARGS}
     if [ $? -eq 0 ]; then
-      log "npm package installation complete"
+        log "npm package installation complete"
     else
-      fatal_error "Failed to install ENiGMA½ npm packages. Please report this!"
+        fatal_error "Failed to install ENiGMA½ npm packages. Please report this!"
     fi
 }
 

From 713329b5d3a79a2cf966e62914e60a697c5142d0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 18:46:43 -0700
Subject: [PATCH 0473/1013] More fixes

---
 misc/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index 0b100edb..b471124e 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -86,14 +86,14 @@ download_enigma_source() {
 is_arch_arm() {
     local ARCH=`arch`
     if [[ $ARCH == "arm"* ]]; then
-        return 1
+        true
     else
-        return 0
+        false
     fi
 }
 
 extra_npm_install_args() {
-    if is_arch_arm; then
+    if is_arch_arm ; then
         echo "--build-from-source"
     else
         echo ""

From 0058d544241c0b5cfe8f89e89231edb898664ec8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 20:00:25 -0700
Subject: [PATCH 0474/1013] More updates on config template stuff

---
 core/oputil/oputil_config.js  |   2 +
 misc/config_template.in.hjson | 152 ++++++++++++++++++++++++++++------
 2 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 66b11fa6..de4731f7 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -32,6 +32,8 @@ function getAnswers(questions, cb) {
 
 const ConfigIncludeKeys = [
     'theme',
+    'loginServers',
+    'contentServers',
 ];
 
 const QUESTIONS = {
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 79bc2bbf..901bd0c2 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -57,6 +57,100 @@
 
 		//	Theme applied before a user has logged in. "*" indicates random.
 		preLogin: XXXXX
+
+		//
+		//	dateFormat, timeFormat, and dateTimeFormat blocks configure
+		//	moment.js (https://momentjs.com/docs/#/displaying/) style formats
+		//	for dates and times. Short and long versions are available.
+		//	Note that themes may override these settings.
+		//
+	}
+
+	//
+	//	Login servers represent available servers (or protocols) in which
+	//	users are permitted to access your system.
+	//
+	loginServers: {
+		//	Remember kids, Telnet is insecure!
+		telnet: {
+		}
+
+		//	...but SSH *is* secure!
+		ssh: {
+			//
+			//	To enable SSH:
+			//	1) Generate a Private Key (PK):
+			//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+			//	2) Set "privateKeyPass" below
+			//
+			enabled: XXXXX
+
+			//	set this to your PK's password, generated in step #1 above
+			privateKeyPass: SuperSecretPasswordChangeMe!
+
+			//
+			//	It's possible to lock down various algorithms available to
+			//	SSH, but be aware this may limit the clients that can connect!
+			//
+			algorithms: {}
+		}
+
+		webSocket: {
+			//
+			//	Setting "proxied" to true allows non-secure (ws://) WebSockets
+			//	to be considered secure when the X-Fowarded-Proto HTTP header
+			//	is set to "https". This is helpful when ENiGMA is running behind
+			//	another web server doing SSL/TLS termination.
+			//
+			proxied: false
+
+			//	Non-secure WebSockets, or ws://
+			ws: {}
+
+			//	Secure WebSockets, or wss://
+			wss: {}
+		}
+	}
+
+	//
+	//	Content Servers expose content from the system
+	//
+	contentServers: {
+		//
+		//	The Web Content Server can expose content over HTTP (http://) and
+		//	HTTPS (https://) for (but not limited to) the following purposes:
+		//	* Static content
+		//	* Web downloads from the file base
+		//	* Password reset forms (sent to users in PW reset emails; see
+		//	  "email" block below)
+		//
+		web: {
+			//	Set to your public FQDN
+			domain: XXXXX
+		}
+	}
+
+	//
+	//	Currently, ENiGMA½ can use external email to mail
+	//	users for password resets. Additional functionality will
+	//	be added in the future.
+	//
+	email: {
+		//
+		//	Set the following keys to configure:
+		//	* "defaultFrom" to the reply address
+		//	* "transport" to a configuration block that meets the
+		//	  requirements of Nodemailer (https://nodemailer.com/)
+		//
+		//	Example:
+		//  transport: {
+		//		service: Zoho
+		//		auth: {
+		//			user: myuser@myhost.com
+		//			pass: supersecretpassword
+		//		}
+		//	}
+		//
 	}
 
 	//	Message conferences and areas are within this block
@@ -77,30 +171,6 @@
 		}
 	}
 
-	//	Archive files and related
-	archives: {
-		//
-		//	External utilities used for import & upload processing archives such
-		//	as .zip, .rar, .arj, etc.
-		//
-		//	You'll want to have archivers configured for the many old-school archive
-		//	formats that a BBS may encounter!
-		//
-		//	See config.js for additional configuration
-		//
-		archivers: {
-			//
-			//	Each key in the "archivers" configuration block represents a specific
-			//	external archive utility. ENiGMA½ has sane configuration by default
-			//	for many archivers, but the tools themselves are likely not yet installed
-			//	on your system!
-			//
-			//	Please consult the documentation on information as to where to find and
-			//	install these utilities!
-			//			
-		}
-	}
-
 	users: {
 		//
 		//	ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups
@@ -108,5 +178,39 @@
 		//	groups to the system as well by adding a 'groups' key in this section:
 		//	groups: [ "leet", "lamerz" ]
 		//
+
+		//	Set default group(s) new users should automatically be assigned to
+		//	defaultGroups : [ "lamerz" ]
+
+		//	Should new users require +op activation?
+		requireActivation: false,
+	}
+
+	//	Archive files and related
+	archives: {
+		archivers: {
+			//
+			//	Each key in the "archivers" configuration block represents a specific
+			//	external archive utility. ENiGMA½ has sane configuration by default
+			//	for many archivers, but the tools themselves are likely not yet installed
+			//	on your system!
+			//
+			//	You'll want to have archivers configured for the many old-school archive
+			//	formats that a BBS may encounter! Please consult the documentation on
+			//	information as to where to find and install these utilities!
+			//
+		}
+	}
+
+	fileTransferProtocols: {
+		//
+		//	Each key in the "fileTransferProtocols" configuration block defines
+		//	an external file transfer utility for legacy protocols such as
+		//	X, Y, and Z-Modem.
+		//
+		//	You will want to ensure your system has these external utilities
+		//	installed and/or define new or additional protocols. Please
+		//	see the documentation for more information!
+		//
 	}
 }
\ No newline at end of file

From f00dfea84dba3214c39ebc07e3425c52b8fad712 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 20:26:11 -0700
Subject: [PATCH 0475/1013] Log that it can take a while!

---
 misc/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/misc/install.sh b/misc/install.sh
index b471124e..aa2b3d9b 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -101,7 +101,9 @@ extra_npm_install_args() {
 }
 
 install_node_packages() {
-    log "Installing required Node packages"
+    log "Installing required Node packages..."
+    log "Note that on some systems such as RPi, this can take a VERY long time. Be patient!"
+
     cd ${ENIGMA_INSTALL_DIR}
     local EXTRA_NPM_ARGS=$(extra_npm_install_args)
     git checkout ${ENIGMA_BRANCH} && npm install ${EXTRA_NPM_ARGS}

From 99893b0bd1e9ef72fec8becd125898a4c0a229a9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 20:26:23 -0700
Subject: [PATCH 0476/1013] Yet more updates with config new

---
 core/oputil/oputil_config.js  |  1 +
 misc/config_template.in.hjson | 47 +++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index de4731f7..eade918b 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -34,6 +34,7 @@ const ConfigIncludeKeys = [
     'theme',
     'loginServers',
     'contentServers',
+    'fileBase.areaStoragePrefix',
 ];
 
 const QUESTIONS = {
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 901bd0c2..b20b21a9 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -171,6 +171,53 @@
 		}
 	}
 
+	//
+	//	ENiGMA½ comes with a very powerful File Base, but may be a bit strange
+	//	until you get used to it. Please see the documentation!
+	//
+	fileBase: {
+		//
+		//	Storage tags with relative paths (that is, paths that do not start
+		//	with a "/") are relative to the following path:
+		//
+		areaStoragePrefix: XXXXX
+
+		//
+		//	Storage tags create a tag -> directory (relative or full path)
+		//	that can be used in areas.
+		//
+		storageTags: {
+			//
+			//	Example storage tag: "super_l33t_warez":
+			//	super_l33t_warez: "/path/to/super/l33t/warez"
+			//
+		}
+
+		areas: {
+			//
+			//	Example area with the areaTag of "an_example_area":
+			//	an_example_area: {
+			//		name: "Example File Area"
+			//		desc: "It's just an example, yo!"
+			//		storageTags: [
+			//			"super_l33t_warez"
+			//		]
+			//	}
+			//
+			//	File Base Areas are read-only (ie: download only) by default.
+			//	To make a uploadable area, set ACS as you like. For example,
+			//	to allow all users to upload to an area:
+			//
+			//	an_example_area: {
+			//		// ...
+			//		acs: {
+			//			write: GM[users]
+			//		}
+			//	}
+		}
+	}
+
+	//	General user configuration
 	users: {
 		//
 		//	ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups

From 82cfdc978fd161d2755b7608e17b88b378a0e5b6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 22:04:59 -0700
Subject: [PATCH 0477/1013] Put ports at top of blocks

---
 misc/config_template.in.hjson | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index b20b21a9..c8c9bebb 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -73,10 +73,14 @@
 	loginServers: {
 		//	Remember kids, Telnet is insecure!
 		telnet: {
+			//	It's best to use non-privileged ports and NAT/foward to them
+			port: XXXXX
 		}
 
 		//	...but SSH *is* secure!
 		ssh: {
+			port: XXXXX
+
 			//
 			//	To enable SSH:
 			//	1) Generate a Private Key (PK):
@@ -105,10 +109,24 @@
 			proxied: false
 
 			//	Non-secure WebSockets, or ws://
-			ws: {}
+			ws: {
+				port: XXXXX
+			}
 
 			//	Secure WebSockets, or wss://
-			wss: {}
+			wss: {
+				port: XXXXX
+				enabled: XXXXX
+
+				//
+				//	Certificate and Key in PEM format.
+				//	Note that web browsers will not trust self-signed certs. Look
+				//	into Let's Encrypt and perhaps running ENiGMA behind another
+				//	web server such as Caddy.
+				//
+				certPem: XXXXX
+				keyPem: XXXXX
+			}
 		}
 	}
 

From c24695e9988e6eabaef3838609125a8731f8ef38 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Nov 2018 23:59:26 -0700
Subject: [PATCH 0478/1013] + oputil.js config cat * Many updates to config gen
 y

---
 WHATSNEW.md                   |   3 +
 core/config.js                |  13 +
 core/oputil/oputil_config.js  |  47 ++-
 core/oputil/oputil_help.js    |   5 +
 misc/config_template.in.hjson | 523 ++++++++++++++++++----------------
 5 files changed, 337 insertions(+), 254 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index de8b6383..90b9e374 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -19,6 +19,9 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Any module may now register for a system startup intiialization via the `initializeModules(initInfo, cb)` export.
 * User event log is now functional. Various events a user performs will be persisted to the `system.db` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
 * New MCI codes including general purpose movement codes. See [MCI codes](docs/art/mci.md)
+* `install.sh` will now attempt to use NPM's `--build-from-source` option when ARM is detected.
+* `oputil.js config new` will now generate a much more complete configuration file with comments, examples, etc. `oputil.js config cat` dumps your current config to stdout.
+
 
 
 ## 0.0.8-alpha
diff --git a/core/config.js b/core/config.js
index bc6be381..f6adaa35 100644
--- a/core/config.js
+++ b/core/config.js
@@ -346,6 +346,19 @@ function getDefaultConfig() {
                     certPem : paths.join(__dirname, './../config/https_cert.pem'),
                     keyPem  : paths.join(__dirname, './../config/https_cert_key.pem'),
                 }
+            },
+
+            gopher : {
+                enabled         : false,
+                port            : 8070,
+                publicHostname  : 'another-fine-enigma-bbs.org',
+                publicPort      : 8080, //  adjust if behind NAT/etc.
+                bannerFile      : 'gopher_banner.asc',
+
+                //
+                //  Set messageConferences{} to maps of confTag -> [ areaTag1, areaTag2, ... ]
+                //  to export message confs/areas
+                //
             }
         },
 
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index eade918b..b25441d8 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -4,12 +4,14 @@
 
 //	ENiGMA½
 const resolvePath				= require('../../core/misc_util.js').resolvePath;
-const printUsageAndSetExitCode	= require('./oputil_common.js').printUsageAndSetExitCode;
-const ExitCodes					= require('./oputil_common.js').ExitCodes;
-const argv						= require('./oputil_common.js').argv;
-const getConfigPath				= require('./oputil_common.js').getConfigPath;
+const {
+    printUsageAndSetExitCode,
+    getConfigPath,
+    argv,
+    ExitCodes,
+    initConfigAndDatabases
+}                               = require('./oputil_common.js');
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
-const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const Errors					= require('../../core/enig_error.js').Errors;
 
 //	deps
@@ -21,6 +23,8 @@ const hjson			= require('hjson');
 const paths			= require('path');
 const _				= require('lodash');
 
+const packageJson   = require('../../package.json');
+
 exports.handleConfigCommand				= handleConfigCommand;
 
 
@@ -37,6 +41,15 @@ const ConfigIncludeKeys = [
     'fileBase.areaStoragePrefix',
 ];
 
+const HJSONStringifyComonOpts = {
+    emitRootBraces  : true,
+    bracesSameLine  : true,
+    space           : 4,
+    keepWsc         : true,
+    quotes          : 'min',
+    eol             : '\n',
+};
+
 const QUESTIONS = {
     Intro		: [
         {
@@ -214,7 +227,10 @@ function askNewConfigQuestions(cb) {
 }
 
 function writeConfig(config, path) {
-    config = hjson.stringify(config, { bracesSameLine : true, space : '\t', keepWsc : true, quotes : 'strings' } );
+    config = hjson.stringify(config, HJSONStringifyComonOpts)
+        .replace(/%ENIG_VERSION%/g,     packageJson.version)
+        .replace(/%HJSON_VERSION%/g,    hjson.version)
+        ;
 
     try {
         fs.writeFileSync(path, config, 'utf8');
@@ -522,6 +538,24 @@ function getImportEntries(importType, importData) {
     return importEntries;
 }
 
+function catCurrentConfig() {
+    try {
+        const config    = hjson.rt.parse(fs.readFileSync(getConfigPath(), 'utf8'));
+        const hjsonOpts = Object.assign({}, HJSONStringifyComonOpts, {
+            colors  : false === argv.colors ? false : true,
+            keepWsc : false === argv.comments ? false : true,
+        });
+
+        console.log(hjson.stringify(config, hjsonOpts));
+    } catch(e) {
+        if('ENOENT' == e.code) {
+            console.error(`File not found: ${getConfigPath()}`);
+        } else {
+            console.error(e);
+        }
+    }
+}
+
 function handleConfigCommand() {
     if(true === argv.help) {
         return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
@@ -532,6 +566,7 @@ function handleConfigCommand() {
     switch(action) {
         case 'new' 			: return buildNewConfig();
         case 'import-areas' : return importAreas();
+        case 'cat'          : return catCurrentConfig();
 
         default : return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
     }
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 4981f922..7c96d171 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -39,12 +39,17 @@ actions:
 actions:
   new                      generate a new/initial configuration
   import-areas PATH        import areas using fidonet *.NA or AREAS.BBS file from PATH
+  cat                      cat current configuration to stdout
 
 import-areas args:
   --conf CONF_TAG          specify conference tag in which to import areas
   --network NETWORK        specify network name/key to associate FTN areas
   --uplinks UL1,UL2,...    specify one or more comma separated uplinks
   --type TYPE              specifies area import type. valid options are "bbs" and "na"
+
+cat args:
+  --no-color               disable color
+  --no-comments            strip any comments
 `,
     FileBase :
 `usage: oputil.js fb <action> [<args>]
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index c8c9bebb..b05fa057 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -1,281 +1,308 @@
 {
-	/*
-		./\/\.' ENiGMA½ System Configuration -/--/-------- - --   - 
+    /*
+        ./\/\.' ENiGMA½ System Configuration -/--/-------- - --   -
 
-		_____________________   _____  ____________________    __________\_   /
-		\__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
-		//   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
-		/____       _____|      __________       ___|__|      ____|     \   /  _____  \
-		---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
-		                                                                 /__   _\
-		<*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+        _____________________   _____  ____________________    __________\_   /
+        \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+        //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+        /____       _____|      __________       ___|__|      ____|     \   /  _____  \
+        ---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                         /__   _\
+        <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
 
-		-------------------------------------------------------------------------------
+        *-----------------------------------------------------------------------------*
+        Generated by ENiGMA½ v%ENIG_VERSION% / hjson v%HJSON_VERSION%
+        *-----------------------------------------------------------------------------*
 
-		General Information
-		-------------------------------
-		This configuration is in HJSON (http://hjson.org/) format.  Strict to-spec 
-		JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
-		
-		See http://hjson.org/ for more information and syntax.
 
-		Various editors and IDEs have plugins for the HJSON format which can be
-		very useful.
+        ------------------------------- -- -    -
+        General Information
+        ------------------------------- -   -
+        This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
+        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
 
-		Available Configuration
-		-------------------------------
-		ENiGMA½ is highly configurable! By default, this file contains common
-		configuration elements, examples, etc. To see a full list of settings
-		available to this file, don't be afraid to open up core/config.js and
-		look around. Do not make changes there however, you may override any
-		of the configuration from within this file!
+        See http://hjson.org/ for more information and syntax.
 
-		See the documentation for more information, and don't be shy to ask
-		for help!
-	*/
+        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
+        on have syntax highlighting for the HJSON format which are highly recommended.
 
-	general: {
-		//	Your BBS Name!
-		boardName: XXXXX
-	}
 
-	logging: {
-		//
-		//	By default, the system will rotate logs.
-		//	Remember you can pipe logs through bunyan to pretty-print:
-		//	> tail -F enigma/logs/enigma-bbs.log | enigma/node_modules/bunyan/bin/bunyan
-		//
-		rotatingFile: {
-			//	If you're having trouble, try setting this to "trace"
-			level: XXXXX
-		}
-	}
+        ------------------------------- -- -    -
+        Configuration
+        ------------------------------- -   -
+        ENiGMA½ is *highly* configurable, and thus can be overwhelming at first!
 
-	theme: {
-		//	Default theme applied to new users. "*" indicates random.
-		default: XXXXX
+        By default, this file contains common configuration elements, examples, etc.
+        To see a more complete view of settings available to the system, don't be
+        afraid to open up core/config.js and look around. Do not make changes there
+        however! All system configuration can be extended and defaults overridden
+        via this file!
 
-		//	Theme applied before a user has logged in. "*" indicates random.
-		preLogin: XXXXX
+        Please see RTFM ...er, uh... see the documentation for more information, and
+        don't be shy to ask for help:
 
-		//
-		//	dateFormat, timeFormat, and dateTimeFormat blocks configure
-		//	moment.js (https://momentjs.com/docs/#/displaying/) style formats
-		//	for dates and times. Short and long versions are available.
-		//	Note that themes may override these settings.
-		//
-	}
+        BBS     : Xibalba @ xibalba.l33t.codes
+        FTN     : BBS Discussion on fsxNet
+        IRC     : #enigma-bbs / FreeNode
+        Email   : bryan@leet.codes
+    */
 
-	//
-	//	Login servers represent available servers (or protocols) in which
-	//	users are permitted to access your system.
-	//
-	loginServers: {
-		//	Remember kids, Telnet is insecure!
-		telnet: {
-			//	It's best to use non-privileged ports and NAT/foward to them
-			port: XXXXX
-		}
+    general: {
+        //  Your BBS Name!
+        boardName: XXXXX
+    }
 
-		//	...but SSH *is* secure!
-		ssh: {
-			port: XXXXX
+    logging: {
+        //
+        //  By default, the system will rotate logs.
+        //  Remember you can pipe logs through bunyan to pretty-print:
+        //  > tail -F enigma/logs/enigma-bbs.log | enigma/node_modules/bunyan/bin/bunyan
+        //
+        rotatingFile: {
+            //  If you're having trouble, try setting this to "trace"
+            level: XXXXX
+        }
+    }
 
-			//
-			//	To enable SSH:
-			//	1) Generate a Private Key (PK):
-			//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
-			//	2) Set "privateKeyPass" below
-			//
-			enabled: XXXXX
+    theme: {
+        //  Default theme applied to new users. "*" indicates random.
+        default: XXXXX
+        //  Theme applied before a user has logged in. "*" indicates random.
+        preLogin: XXXXX
 
-			//	set this to your PK's password, generated in step #1 above
-			privateKeyPass: SuperSecretPasswordChangeMe!
+        //
+        //  dateFormat, timeFormat, and dateTimeFormat blocks configure
+        //  moment.js (https://momentjs.com/docs/#/displaying/) style formats
+        //  for dates and times. Short and long versions are available.
+        //  Note that themes may override these settings.
+        //
+    }
 
-			//
-			//	It's possible to lock down various algorithms available to
-			//	SSH, but be aware this may limit the clients that can connect!
-			//
-			algorithms: {}
-		}
+    //
+    //  Login servers represent available servers (or protocols) in which
+    //  users are permitted to access your system.
+    //
+    loginServers: {
+        //  Remember kids, Telnet is insecure!
+        telnet: {
+            //  It's best to use non-privileged ports and NAT/foward to them
+            port: XXXXX
+        }
 
-		webSocket: {
-			//
-			//	Setting "proxied" to true allows non-secure (ws://) WebSockets
-			//	to be considered secure when the X-Fowarded-Proto HTTP header
-			//	is set to "https". This is helpful when ENiGMA is running behind
-			//	another web server doing SSL/TLS termination.
-			//
-			proxied: false
+        //  ...but SSH *is* secure!
+        ssh: {
+            port: XXXXX
 
-			//	Non-secure WebSockets, or ws://
-			ws: {
-				port: XXXXX
-			}
+            //
+            //  To enable SSH:
+            //  1) Generate a Private Key (PK):
+            //  > openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+            //  2) Set "privateKeyPass" below
+            //
+            enabled: XXXXX
 
-			//	Secure WebSockets, or wss://
-			wss: {
-				port: XXXXX
-				enabled: XXXXX
+            //  set this to your PK's password, generated in step #1 above
+            privateKeyPass: SuperSecretPasswordChangeMe!
 
-				//
-				//	Certificate and Key in PEM format.
-				//	Note that web browsers will not trust self-signed certs. Look
-				//	into Let's Encrypt and perhaps running ENiGMA behind another
-				//	web server such as Caddy.
-				//
-				certPem: XXXXX
-				keyPem: XXXXX
-			}
-		}
-	}
+            //
+            //  It's possible to lock down various algorithms available to
+            //  SSH, but be aware this may limit the clients that can connect!
+            //
+            algorithms: {}
+        }
 
-	//
-	//	Content Servers expose content from the system
-	//
-	contentServers: {
-		//
-		//	The Web Content Server can expose content over HTTP (http://) and
-		//	HTTPS (https://) for (but not limited to) the following purposes:
-		//	* Static content
-		//	* Web downloads from the file base
-		//	* Password reset forms (sent to users in PW reset emails; see
-		//	  "email" block below)
-		//
-		web: {
-			//	Set to your public FQDN
-			domain: XXXXX
-		}
-	}
+        webSocket: {
+            //
+            //  Setting "proxied" to true allows non-secure (ws://) WebSockets
+            //  to be considered secure when the X-Fowarded-Proto HTTP header
+            //  is set to "https". This is helpful when ENiGMA is running behind
+            //  another web server doing SSL/TLS termination.
+            //
+            proxied: false
 
-	//
-	//	Currently, ENiGMA½ can use external email to mail
-	//	users for password resets. Additional functionality will
-	//	be added in the future.
-	//
-	email: {
-		//
-		//	Set the following keys to configure:
-		//	* "defaultFrom" to the reply address
-		//	* "transport" to a configuration block that meets the
-		//	  requirements of Nodemailer (https://nodemailer.com/)
-		//
-		//	Example:
-		//  transport: {
-		//		service: Zoho
-		//		auth: {
-		//			user: myuser@myhost.com
-		//			pass: supersecretpassword
-		//		}
-		//	}
-		//
-	}
+            //  Non-secure WebSockets, or ws://
+            ws: {
+                port: XXXXX
+            }
 
-	//	Message conferences and areas are within this block
-	messageConferences: {
-		//	An entry here prepresents a conference taka aka confTag
-		another_sample_conf: {
-			name: "Another Sample Conference"
-			desc: "Another conf sample. Change me!"
-			areas: {
-				//	Similar to confTags, this is a areaTag
-				another_sample_area: {
-					name: "Another Sample Area"
-					desc: "Another area example. Change me!"
-					//	The 'sort' key can override natural sort order and can live at the conference and area levels
-					sort: 2
-				}
-			}
-		}
-	}
+            //  Secure WebSockets, or wss://
+            wss: {
+                port: XXXXX
+                enabled: XXXXX
 
-	//
-	//	ENiGMA½ comes with a very powerful File Base, but may be a bit strange
-	//	until you get used to it. Please see the documentation!
-	//
-	fileBase: {
-		//
-		//	Storage tags with relative paths (that is, paths that do not start
-		//	with a "/") are relative to the following path:
-		//
-		areaStoragePrefix: XXXXX
+                //
+                //  Certificate and Key in PEM format.
+                //  Note that web browsers will not trust self-signed certs. Look
+                //  into Let's Encrypt and perhaps running ENiGMA behind another
+                //  web server such as Caddy.
+                //
+                certPem: XXXXX
+                keyPem: XXXXX
+            }
+        }
+    }
 
-		//
-		//	Storage tags create a tag -> directory (relative or full path)
-		//	that can be used in areas.
-		//
-		storageTags: {
-			//
-			//	Example storage tag: "super_l33t_warez":
-			//	super_l33t_warez: "/path/to/super/l33t/warez"
-			//
-		}
+    //
+    //  Content Servers expose content from the system
+    //
+    contentServers: {
+        //
+        //  The Web Content Server can expose content over HTTP (http://) and
+        //  HTTPS (https://) for (but not limited to) the following purposes:
+        //  * Static content
+        //  * Web downloads from the file base
+        //  * Password reset forms (sent to users in PW reset emails; see
+        //    "email" block below)
+        //
+        web: {
+            //  Set to your public FQDN
+            domain: XXXXX
+        }
 
-		areas: {
-			//
-			//	Example area with the areaTag of "an_example_area":
-			//	an_example_area: {
-			//		name: "Example File Area"
-			//		desc: "It's just an example, yo!"
-			//		storageTags: [
-			//			"super_l33t_warez"
-			//		]
-			//	}
-			//
-			//	File Base Areas are read-only (ie: download only) by default.
-			//	To make a uploadable area, set ACS as you like. For example,
-			//	to allow all users to upload to an area:
-			//
-			//	an_example_area: {
-			//		// ...
-			//		acs: {
-			//			write: GM[users]
-			//		}
-			//	}
-		}
-	}
+        //  Ladies and gentlemen, a Gopher server!
+        gopher: {
+            port: XXXXX
+            enabled: false
 
-	//	General user configuration
-	users: {
-		//
-		//	ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups
-		//	include "users" (for regular users) and "sysops" for +ops. You can add other
-		//	groups to the system as well by adding a 'groups' key in this section:
-		//	groups: [ "leet", "lamerz" ]
-		//
+            //
+            //  The Gopher Content Server can export message base
+            //  conferences and areas via the "messageConferences" key.
+            //
+            //  Example:
+            //  messageConferences: {
+            //      some_conf: [ "area_tag1", "area_tag2" ]
+            //  }
+        }
+    }
 
-		//	Set default group(s) new users should automatically be assigned to
-		//	defaultGroups : [ "lamerz" ]
+    //
+    //  Currently, ENiGMA½ can use external email to mail
+    //  users for password resets. Additional functionality will
+    //  be added in the future.
+    //
+    email: {
+        //
+        //  Set the following keys to configure:
+        //  * "defaultFrom" to the reply address
+        //  * "transport" to a configuration block that meets the
+        //    requirements of Nodemailer (https://nodemailer.com/)
+        //
+        //  Example:
+        //  transport: {
+        //      service: Zoho
+        //      auth: {
+        //          user: myuser@myhost.com
+        //          pass: supersecretpassword
+        //      }
+        //  }
+        //
+    }
 
-		//	Should new users require +op activation?
-		requireActivation: false,
-	}
+    //  Message conferences and areas are within this block
+    messageConferences: {
+        //  An entry here prepresents a conference taka aka confTag
+        another_sample_conf: {
+            name: "Another Sample Conference"
+            desc: "Another conf sample. Change me!"
+            areas: {
+                //  Similar to confTags, this is a areaTag
+                another_sample_area: {
+                    name: "Another Sample Area"
+                    desc: "Another area example. Change me!"
+                    //  The 'sort' key can override natural sort order and can live at the conference and area levels
+                    sort: 2
+                }
+            }
+        }
+    }
 
-	//	Archive files and related
-	archives: {
-		archivers: {
-			//
-			//	Each key in the "archivers" configuration block represents a specific
-			//	external archive utility. ENiGMA½ has sane configuration by default
-			//	for many archivers, but the tools themselves are likely not yet installed
-			//	on your system!
-			//
-			//	You'll want to have archivers configured for the many old-school archive
-			//	formats that a BBS may encounter! Please consult the documentation on
-			//	information as to where to find and install these utilities!
-			//
-		}
-	}
+    //
+    //  ENiGMA½ comes with a very powerful File Base, but may be a bit strange
+    //  until you get used to it. Please see the documentation!
+    //
+    fileBase: {
+        //
+        //  Storage tags with relative paths (that is, paths that do not start
+        //  with a "/") are relative to the following path:
+        //
+        areaStoragePrefix: XXXXX
 
-	fileTransferProtocols: {
-		//
-		//	Each key in the "fileTransferProtocols" configuration block defines
-		//	an external file transfer utility for legacy protocols such as
-		//	X, Y, and Z-Modem.
-		//
-		//	You will want to ensure your system has these external utilities
-		//	installed and/or define new or additional protocols. Please
-		//	see the documentation for more information!
-		//
-	}
+        //
+        //  Storage tags create a tag -> directory (relative or full path)
+        //  that can be used in areas.
+        //
+        storageTags: {
+            //
+            //  Example storage tag: "super_l33t_warez":
+            //  super_l33t_warez: "/path/to/super/l33t/warez"
+            //
+        }
+
+        areas: {
+            //
+            //  Example area with the areaTag of "an_example_area":
+            //  an_example_area: {
+            //      name: "Example File Area"
+            //      desc: "It's just an example, yo!"
+            //      storageTags: [
+            //          "super_l33t_warez"
+            //      ]
+            //  }
+            //
+            //  File Base Areas are read-only (ie: download only) by default.
+            //  To make a uploadable area, set ACS as you like. For example,
+            //  to allow all users to upload to an area:
+            //
+            //  an_example_area: {
+            //      // ...
+            //      acs: {
+            //          write: GM[users]
+            //      }
+            //  }
+        }
+    }
+
+    //  General user configuration
+    users: {
+        //
+        //  ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups
+        //  include "users" (for regular users) and "sysops" for +ops. You can add other
+        //  groups to the system as well by adding a 'groups' key in this section:
+        //  groups: [ "leet", "lamerz" ]
+        //
+
+        //  Set default group(s) new users should automatically be assigned to
+        //  defaultGroups : [ "lamerz" ]
+
+        //  Should new users require +op activation?
+        requireActivation: false,
+    }
+
+    //  Archive files and related
+    archives: {
+        archivers: {
+            //
+            //  Each key in the "archivers" configuration block represents a specific
+            //  external archive utility. ENiGMA½ has sane configuration by default
+            //  for many archivers, but the tools themselves are likely not yet installed
+            //  on your system!
+            //
+            //  You'll want to have archivers configured for the many old-school archive
+            //  formats that a BBS may encounter! Please consult the documentation on
+            //  information as to where to find and install these utilities!
+            //
+        }
+    }
+
+    fileTransferProtocols: {
+        //
+        //  Each key in the "fileTransferProtocols" configuration block defines
+        //  an external file transfer utility for legacy protocols such as
+        //  X, Y, and Z-Modem.
+        //
+        //  You will want to ensure your system has these external utilities
+        //  installed and/or define new or additional protocols. Please
+        //  see the documentation for more information!
+        //
+    }
 }
\ No newline at end of file

From f592da26451a76c8da1dc8dc93689edc4c962c8b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Nov 2018 00:19:01 -0700
Subject: [PATCH 0479/1013] oputil.js config new now preps 'menuFile' and
 'promptFile'

---
 core/oputil/oputil_config.js | 39 +++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index b25441d8..95bb4155 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -15,13 +15,14 @@ const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const Errors					= require('../../core/enig_error.js').Errors;
 
 //	deps
-const async			= require('async');
-const inq			= require('inquirer');
-const mkdirsSync	= require('fs-extra').mkdirsSync;
-const fs			= require('graceful-fs');
-const hjson			= require('hjson');
-const paths			= require('path');
-const _				= require('lodash');
+const async			    = require('async');
+const inq			    = require('inquirer');
+const mkdirsSync	    = require('fs-extra').mkdirsSync;
+const fs			    = require('graceful-fs');
+const hjson			    = require('hjson');
+const paths			    = require('path');
+const _				    = require('lodash');
+const sanatizeFilename  = require('sanitize-filename');
 
 const packageJson   = require('../../package.json');
 
@@ -240,12 +241,36 @@ function writeConfig(config, path) {
     }
 }
 
+const copyFileSyncSilent = (to, from, flags) => {
+    try {
+        fs.copyFileSync(to, from, flags);
+    } catch(e) {}
+};
+
 function buildNewConfig() {
     askNewConfigQuestions( (err, configPath, config) => {
         if(err) {
             return;
         }
 
+        const bn = sanatizeFilename(config.general.boardName).replace(/ /g, '_').toLowerCase();
+        const menuFile = `${bn}.hjson`;
+        copyFileSyncSilent(
+            paths.join(__dirname, '../../config/menu.hjson'),
+            paths.join(__dirname, '../../config/', menuFile),
+            fs.constants.COPYFILE_EXCL
+        );
+
+        const promptFile = `${bn}_prompt.hjson`;
+        copyFileSyncSilent(
+            paths.join(__dirname, '../../config/prompt.hjson'),
+            paths.join(__dirname, '../../config/', promptFile),
+            fs.constants.COPYFILE_EXCL
+        )
+
+        config.general.menuFile     = menuFile;
+        config.general.promptFile   = promptFile;
+
         if(writeConfig(config, configPath)) {
             console.info('Configuration generated');
         } else {

From e8e9df767f0be02fec4c2fbb2fd5156e769db513 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Nov 2018 01:00:42 -0700
Subject: [PATCH 0480/1013] * Move idle config to user * More 'config new'
 enhancements

---
 core/client.js                |  4 +-
 core/config.js                | 10 ++---
 core/oputil/oputil_config.js  |  4 ++
 misc/config_template.in.hjson | 75 +++++++++++++++++++++++++++++++----
 4 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/core/client.js b/core/client.js
index ec10947f..1caaa85d 100644
--- a/core/client.js
+++ b/core/client.js
@@ -441,8 +441,8 @@ Client.prototype.startIdleMonitor = function() {
         const nowMs = Date.now();
 
         const idleLogoutSeconds = this.user.isAuthenticated() ?
-            Config().misc.idleLogoutSeconds :
-            Config().misc.preAuthIdleLogoutSeconds;
+            Config().users.idleLogoutSeconds :
+            Config().users.preAuthIdleLogoutSeconds;
 
         if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
             this.emit('idle timeout');
diff --git a/core/config.js b/core/config.js
index f6adaa35..b8692a7c 100644
--- a/core/config.js
+++ b/core/config.js
@@ -178,6 +178,9 @@ function getDefaultConfig() {
                 'sysop', 'admin', 'administrator', 'root', 'all',
                 'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
             ],
+
+            preAuthIdleLogoutSeconds    : 60 * 3,   //  3m
+            idleLogoutSeconds           : 60 * 6,   //  6m
         },
 
         theme : {
@@ -906,14 +909,7 @@ function getDefaultConfig() {
             }
         },
 
-        misc : {
-            preAuthIdleLogoutSeconds    : 60 * 3,   //  3m
-            idleLogoutSeconds           : 60 * 6,   //  6m
-        },
-
         logging : {
-            level   : 'debug',
-
             rotatingFile    : { //  set to 'disabled' or false to disable
                 type        : 'rotating-file',
                 fileName    : 'enigma-bbs.log',
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 95bb4155..2e8b0add 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -37,9 +37,13 @@ function getAnswers(questions, cb) {
 
 const ConfigIncludeKeys = [
     'theme',
+    'users.preAuthIdleLogoutSeconds', 'users.idleLogoutSeconds',
+    'users.newUserNames',
+    'paths.logs',
     'loginServers',
     'contentServers',
     'fileBase.areaStoragePrefix',
+    'logging.rotatingFile',
 ];
 
 const HJSONStringifyComonOpts = {
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index b05fa057..731f1965 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -52,11 +52,26 @@
         boardName: XXXXX
     }
 
+    paths: {
+        //
+        //  Other paths can also be configured as well,
+        //  but generally unnecessary
+        //
+        logs: XXXXX
+    }
+
     logging: {
         //
-        //  By default, the system will rotate logs.
-        //  Remember you can pipe logs through bunyan to pretty-print:
-        //  > tail -F enigma/logs/enigma-bbs.log | enigma/node_modules/bunyan/bin/bunyan
+        //  Each block here represents a Bunyan style config.
+        //  See https://github.com/trentm/node-bunyan#streams
+        //
+        //  Remember you can pipe logs through Bunyan to pretty-print:
+        //  tail -F ./logs/enigma-bbs.log | bunyan
+        //
+        //  (npm install -g bunyan to get the binary)
+        //
+        //  We default to a rotating-file stream:
+        //  https://github.com/trentm/node-bunyan#stream-type-rotating-file
         //
         rotatingFile: {
             //  If you're having trouble, try setting this to "trace"
@@ -156,7 +171,38 @@
         //
         web: {
             //  Set to your public FQDN
-            domain: XXXXX
+            domain: another-fine-enigma-bbs.org
+
+            //  Standard issue "www" folder. Place static content here
+            staticRoot: XXXXX
+
+            //
+            //  This block configures password reset emails. Template files
+            //  support the following variables:
+            //  * %BOARDNAME%       : Name of BBS
+            //  * %USERNAME%        : Username of whom to reset password
+            //  * %TOKEN%           : Reset token
+            //  * %RESET_URL%       : In case of email, the link to follow
+            //    for reset. In case of landing page, URL to POST submit reset form.
+            //
+            resetPassword: {
+
+            }
+
+            http: {
+                port: XXXXX
+            }
+
+            https: {
+                port: XXXXX
+                enabled: XXXXX
+
+                //
+                //  Note that web browsers will not trust self-signed certs. Look
+                //  into Let's Encrypt and perhaps running ENiGMA behind another
+                //  web server such as Caddy.
+                //
+            }
         }
 
         //  Ladies and gentlemen, a Gopher server!
@@ -268,14 +314,29 @@
         //  ENiGMA½ utilizes user groups similar to Windows and *nix. Built in groups
         //  include "users" (for regular users) and "sysops" for +ops. You can add other
         //  groups to the system as well by adding a 'groups' key in this section:
-        //  groups: [ "leet", "lamerz" ]
+        //  groups: [
+        //      "leet", "lamerz"
+        //  ]
+        //
         //
-
         //  Set default group(s) new users should automatically be assigned to
-        //  defaultGroups : [ "lamerz" ]
+        //  defaultGroups : [
+        //      "lamerz"
+        //  ]
+        //
 
         //  Should new users require +op activation?
         requireActivation: false,
+
+        //  How long pre-authenticated users (have not logged in) can idle
+        preAuthIdleLogoutSeconds: XXXXX
+
+        //  How long authenticated users (logged in) can idle
+        idleLogoutSeconds: XXXXX
+
+        //  Usernames reserved for applying to your system
+        newUserNames: []
+
     }
 
     //  Archive files and related

From 322274a115b0ff8058427dc7fa31e3ce4f4c00c6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Nov 2018 01:55:38 -0700
Subject: [PATCH 0481/1013] System keeps login history events forever by
 default -- override in config

---
 core/config.js     | 6 ++++++
 core/user_login.js | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index b8692a7c..c1fffc45 100644
--- a/core/config.js
+++ b/core/config.js
@@ -923,6 +923,12 @@ function getDefaultConfig() {
 
         debug : {
             assertsEnabled  : false,
+        },
+
+        statLog : {
+            systemEvents : {
+                loginHistoryMax: -1 //  forever
+            }
         }
     };
 }
diff --git a/core/user_login.js b/core/user_login.js
index 2030152d..e64d20a9 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -7,6 +7,7 @@ const clientConnections = require('./client_connections.js').clientConnections;
 const StatLog           = require('./stat_log.js');
 const logger            = require('./logger.js');
 const Events            = require('./events.js');
+const Config            = require('./config.js').get;
 
 //  deps
 const async             = require('async');
@@ -86,12 +87,12 @@ function userLogin(client, username, password, cb) {
                     return StatLog.incrementUserStat(user, 'login_count', 1, callback);
                 },
                 function recordLoginHistory(callback) {
-                    const LOGIN_HISTORY_MAX = 200;  //  history of up to last 200 callers
+                    const loginHistoryMax = Config().statLog.systemEvents.loginHistoryMax;
                     const historyItem = JSON.stringify({
                         userId      : user.userId,
                         sessionId   : user.sessionId,
                     });
-                    return StatLog.appendSystemLogEntry('user_login_history', historyItem, LOGIN_HISTORY_MAX, StatLog.KeepType.Max, callback);
+                    return StatLog.appendSystemLogEntry('user_login_history', historyItem, loginHistoryMax, StatLog.KeepType.Max, callback);
                 }
             ],
             err => {

From 00a0e131b45bf2c5d4eeed5b5f6c3093a73a1238 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 11 Nov 2018 01:58:49 -0700
Subject: [PATCH 0482/1013] Statlog to config

---
 core/user_login.js            | 9 ++++++++-
 misc/config_template.in.hjson | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/user_login.js b/core/user_login.js
index e64d20a9..a3b2089b 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -92,7 +92,14 @@ function userLogin(client, username, password, cb) {
                         userId      : user.userId,
                         sessionId   : user.sessionId,
                     });
-                    return StatLog.appendSystemLogEntry('user_login_history', historyItem, loginHistoryMax, StatLog.KeepType.Max, callback);
+
+                    return StatLog.appendSystemLogEntry(
+                        'user_login_history',
+                        historyItem,
+                        loginHistoryMax,
+                        StatLog.KeepType.Max,
+                        callback
+                    );
                 }
             ],
             err => {
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 731f1965..e24b4e92 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -366,4 +366,11 @@
         //  see the documentation for more information!
         //
     }
+
+    statLog: {
+        systemEvents: {
+            //  Max login history event records kept. -1 = unlimited
+            loginHistoryMax: -1
+        }
+    }
 }
\ No newline at end of file

From 2b97ee4b8a4ca031b3ec06ffae78c4c23eaa9264 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 11:30:35 -0700
Subject: [PATCH 0483/1013] Point to 0.0.9-alpha for install.sh

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0b70f71b..c2056a33 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * [MCI support](docs/art/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
- * [SyncTerm](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior
+ * [SyncTERM](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior
  * Full [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support
  * Renegade style pipe color codes
  * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
@@ -55,14 +55,15 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 * [MagiTerm](https://magickabbs.com/index.php/magiterm/)
 
 ## Boards
-* WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**telnet://xibalba.l33t.codes:44510** or via SSH secure on port 44511)
+* WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**ssh://xibalba.l33t.codes:44511** or **telnet://xibalba.l33t.codes:44510**)
 * [fORCE9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
 * [Undercurrents](https://undercurrents.io): (**ssh://undercurrents.io**)
+* [PlaneT Afr0](https://planetafr0.org/): (**ssh://planetafr0.org:8889**)
 
 
 ## Installation
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
 ```
 
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) in the docs for more information.

From 14095d8f036eebdf73f8da1a83b78fc17a4dee90 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 11:30:52 -0700
Subject: [PATCH 0484/1013] Updates RE message networks

---
 docs/messageareas/message-networks.md | 105 +++++++++++++++++++-------
 misc/config_template.in.hjson         |  11 +++
 2 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index a334ab94..fec31a08 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -2,29 +2,33 @@
 layout: page
 title: Message Networks
 ---
-Configuring message networks in ENiGMA½ requires three specific pieces of config - the network and your 
-assigned address on it, the message areas (echos) of the network you wish to map to ENiGMA½ message areas, 
-then the schedule and routes to send mail packets on the network.
+ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, such as FTN "external". That is, messages are only imported and exported from/to such a networks. Configuring such external message networks in ENiGMA½ requires three sections in your `config.hjson`.
+
+1. `messageNetworks.<networkType>.networks`: declares available networks.
+2. `messageNetworks.<networkType>.areas`: establishes local area mappings and per-area specifics.
+3. `scannerTossers.<name>`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
 
 ## FTN Networks 
- 
-FTN networks are configured under the `messageNetworks::ftn` section of `config.hjson`.
+FidoNet and FidoNet style (FTN) networks as well as a FTN/BSO scanner/tosser (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
 
-The `networks` section contains a sub section for each network you wish you join your board to. 
-Each entry's key name is referenced elsewhere in `config.hjson` for FTN oriented configurations.
+:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this
 
-### Example Configuration
+### Networks
+The `networks` block a per-network configuration where each entry's key may be referenced elswhere in `config.hjson`.
 
+Example: the following example declares two networks: `agoranet` and `fsxnet`:
 ```hjson
 {
   messageNetworks: {
     ftn: {
       networks: {
-        agoranet: { 
-          localAddress: "46:3/102"
+        araknet: {
+          defaultZone: 10
+          localAddress: "10:101/9"
         }
-        fsxnet: { 
-          localAddress: "21:4/333"
+        fsxnet: {
+          defaultZone: 21
+          localAddress: "21:1/121"
         }
       }
     }
@@ -32,36 +36,79 @@ Each entry's key name is referenced elsewhere in `config.hjson` for FTN oriented
 }
 ```
 
-## Message Areas
+### Areas
+The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see [Configuring a Message Area](configuring-a-message-area.md)) to a message network (described above), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
 
-The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see
-[Configuring a Message Area](configuring-a-message-area.md)) to a message network (described 
-above), a FTN specific area tag, and remote uplink address(s). 
-
-This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
-
-When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas`.
+When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas` while exported messages will be sent to the relevant `network`.
 
 | Config Item | Required | Description                                              |
 |-------------|----------|----------------------------------------------------------|
-| `network`   | :+1:     | Associated network from the `networks` section above     |            
-| `tag`       | :+1:     | FTN area tag                                             |
-| `uplinks`   | :+1:     | An array of FTN address uplink(s) for this network       |
-
-### Example Configuration
+| `network`   | :+1:     | Associated network from the `networks` section above |    
+| `tag`       | :+1:     | FTN area tag (ie: `FSX_GEN`) |
+| `uplinks`   | :+1:     | An array of FTN address uplink(s) for this network |
 
+Example:
 ```hjson
 {
   messageNetworks: {
     ftn: {
       areas: {
-        agoranet_bbs: {          // tag found within messageConferences
-          network: agoranet
-          tag: AGN_BBS
-          uplinks: "46:1/100"
+        fsx_general:        //  *local* tag found within messageConferences
+          network: fsxnet   //  that we are mapping to this network
+          tag: FSX_GEN      //  ...and this remote FTN-specific tag
+          uplinks: [ "21:1/100" ] // a single string also allowed here
         }
       }
     }
   }
 }
 ```
+
+### FTN/BSO Scanner Tosser
+
+| Config Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `schedule`  | :+1:     | Sets `import` and `export` schedules. [Later style text parsing](https://bunkat.github.io/later/parsers.html#text) supported. `import` also can utilize a `@watch:<path/to/file>` syntax while `export` additionally supports `@immediate`.  |
+| `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
+| `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
+| `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
+
+Example:
+```hjson
+scannerTossers: {
+  ftn_bso: {
+    schedule: {
+      //  Check every 30m, or whenever the "toss!.now" file is touched (ie: by Binkd)
+      import: every 30 minutes or @watch:/enigma-bbs/mail/ftn_in/toss!.now
+
+      //  Export immediately, but also check every 15m to be sure
+      export: every 15 minutes or @immediate
+    }
+
+    //  Override default FTN/BSO packet encoding. Defaults to 'utf8'
+    packetMsgEncoding: utf8
+
+    defaultNetwork: fsxnet
+
+    nodes: {
+      "21:1/100" : {            //  May also contain wildcards, ie: "21:1/*"
+        archiveType: ZIP        //  By-ext archive type: ZIP, ARJ, ..., optional.
+        encoding: utf8          //  Encoding for exported messages
+        packetPassword: MUHPA55 //  FTN .PKT password, optional
+
+        tic: {
+          //  See TIC docs
+        }
+      }
+    }
+
+    netMail: {
+      //  See NetMail docs
+    }
+
+    ticAreas: {
+      //  See TIC docs
+    }
+  }
+}
+```
\ No newline at end of file
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index e24b4e92..296e7826 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -262,6 +262,17 @@
         }
     }
 
+    //  Configuration block for scanner/tosser modules
+    scannerTossers: {
+        //  The most popular being FTN/BSO style networks
+        ftn_bso: {
+            //
+            //  When you're ready to hook up to FTN networks, please
+            //  see the documentation on message networks.
+            //
+        }
+    }
+
     //
     //  ENiGMA½ comes with a very powerful File Base, but may be a bit strange
     //  until you get used to it. Please see the documentation!

From 2b36693240f48967b24b4896988ca1528f51ecdd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 22:03:28 -0700
Subject: [PATCH 0485/1013] WIP: User Interrupt Queue * All queueing of
 messages/etc. * Queueing across nodes * Start on interruption points for
 displaying queued items * Start on a multi-node messaging system using such a
 queue

---
 art/themes/luciano_blocktronics/theme.hjson |  15 +++
 core/ansi_term.js                           |   2 +-
 core/client.js                              |  16 +--
 core/client_connections.js                  |  19 +--
 core/menu_module.js                         |  83 ++++++++++---
 core/node_msg.js                            | 126 ++++++++++++++++++++
 core/user_interrupt_queue.js                |  58 +++++++++
 7 files changed, 290 insertions(+), 29 deletions(-)
 create mode 100644 core/node_msg.js
 create mode 100644 core/user_interrupt_queue.js

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index aa720934..f359539f 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -353,6 +353,21 @@
 				}
 			}
 
+			nodeMessage: {
+				0: {
+					mci: {
+						SM1: {
+							width: 22
+							itemFormat: "|00|07{text} |08(|07{userName}|08)"
+							focusItemFormat: "|00|15{text} |07(|15{userName}|07)"
+						}
+						ET2: {
+							width: 70
+						}
+					}
+				}
+			}
+
 
 			messageAreaViewPost: {
 				0: {
diff --git a/core/ansi_term.js b/core/ansi_term.js
index 44c82464..f00fd011 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -56,7 +56,7 @@ exports.getSyncTERMFontFromAlias    = getSyncTERMFontFromAlias;
 exports.setSyncTermFontWithAlias    = setSyncTermFontWithAlias;
 exports.setCursorStyle              = setCursorStyle;
 exports.setEmulatedBaudRate         = setEmulatedBaudRate;
-exports.vtxHyperlink        = vtxHyperlink;
+exports.vtxHyperlink                = vtxHyperlink;
 
 //
 //  See also
diff --git a/core/client.js b/core/client.js
index 1caaa85d..6f4aec79 100644
--- a/core/client.js
+++ b/core/client.js
@@ -32,13 +32,14 @@
     ----/snip/----------------------
 */
 //  ENiGMA½
-const term      = require('./client_term.js');
-const ansi      = require('./ansi_term.js');
-const User      = require('./user.js');
-const Config    = require('./config.js').get;
-const MenuStack = require('./menu_stack.js');
-const ACS       = require('./acs.js');
-const Events    = require('./events.js');
+const term                  = require('./client_term.js');
+const ansi                  = require('./ansi_term.js');
+const User                  = require('./user.js');
+const Config                = require('./config.js').get;
+const MenuStack             = require('./menu_stack.js');
+const ACS                   = require('./acs.js');
+const Events                = require('./events.js');
+const UserInterruptQueue    = require('./user_interrupt_queue.js');
 
 //  deps
 const stream    = require('stream');
@@ -84,6 +85,7 @@ function Client(/*input, output*/) {
     this.menuStack          = new MenuStack(this);
     this.acs                = new ACS(this);
     this.mciCache           = {};
+    this.interruptQueue     = new UserInterruptQueue(this);
 
     this.clearMciCache = function() {
         this.mciCache = {};
diff --git a/core/client_connections.js b/core/client_connections.js
index 93bb9465..f0bca4d7 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -15,11 +15,16 @@ exports.getActiveNodeList       = getActiveNodeList;
 exports.addNewClient            = addNewClient;
 exports.removeClient            = removeClient;
 exports.getConnectionByUserId   = getConnectionByUserId;
+exports.getConnectionByNodeId   = getConnectionByNodeId;
 
 const clientConnections = [];
-exports.clientConnections       = clientConnections;
+exports.clientConnections = clientConnections;
 
-function getActiveConnections() { return clientConnections; }
+function getActiveConnections(authUsersOnly = false) {
+    return clientConnections.filter(conn => {
+        return ((authUsersOnly && conn.user.isAuthenticated()) || !authUsersOnly);
+    });
+}
 
 function getActiveNodeList(authUsersOnly) {
 
@@ -29,11 +34,7 @@ function getActiveNodeList(authUsersOnly) {
 
     const now = moment();
 
-    const activeConnections = getActiveConnections().filter(ac => {
-        return ((authUsersOnly && ac.user.isAuthenticated()) || !authUsersOnly);
-    });
-
-    return _.map(activeConnections, ac => {
+    return _.map(getActiveConnections(authUsersOnly), ac => {
         const entry = {
             node            : ac.node,
             authenticated   : ac.user.isAuthenticated(),
@@ -118,3 +119,7 @@ function removeClient(client) {
 function getConnectionByUserId(userId) {
     return getActiveConnections().find( ac => userId === ac.user.userId );
 }
+
+function getConnectionByNodeId(nodeId) {
+    return getActiveConnections().find( ac => nodeId == ac.node );
+}
diff --git a/core/menu_module.js b/core/menu_module.js
index ee1502cb..ce8eb556 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -25,15 +25,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.menuName           = options.menuName;
         this.menuConfig         = options.menuConfig;
         this.client             = options.client;
-        //this.menuConfig.options = options.menuConfig.options || {};
         this.menuMethods        = {};   //  methods called from @method's
         this.menuConfig.config  = this.menuConfig.config || {};
-
         this.cls                = _.get(this.menuConfig.config, 'cls', Config().menus.cls);
-
-        //this.cls = _.isBoolean(this.menuConfig.options.cls) ? this.menuConfig.options.cls : Config().menus.cls;
-
         this.viewControllers    = {};
+
+        //  *initial* interruptable state for this menu
+        this.disableInterruption();
     }
 
     enter() {
@@ -44,6 +42,14 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.detachViewControllers();
     }
 
+    toggleInterruptionAndDisplayQueued(cb) {
+        this.enableInterruption();
+        this.displayQueuedInterruptions( () => {
+            this.disableInterruption();
+            return cb(null);
+        });
+    }
+
     initSequence() {
         const self      = this;
         const mciData   = {};
@@ -51,8 +57,11 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
         async.series(
             [
+                function beforeArtInterrupt(callback) {
+                    return self.toggleInterruptionAndDisplayQueued(callback);
+                },
                 function beforeDisplayArt(callback) {
-                    self.beforeArt(callback);
+                    return self.beforeArt(callback);
                 },
                 function displayMenuArt(callback) {
                     if(!_.isString(self.menuConfig.art)) {
@@ -160,6 +169,48 @@ exports.MenuModule = class MenuModule extends PluginModule {
         //  nothing in base
     }
 
+    neverInterruptable() {
+        return this.menuConfig.config.interruptable === 'never';
+    }
+
+    enableInterruption() {
+        if(!this.neverInterruptable()) {
+            this.interruptable = true;
+        }
+    }
+
+    disableInterruption() {
+        if(!this.neverInterruptable()) {
+            this.interruptable = false;
+        }
+    }
+
+    displayQueuedInterruptions(cb) {
+        if(true !== this.interruptable) {
+            return cb(null);
+        }
+
+        async.whilst(
+            () => this.client.interruptQueue.hasItems(),
+            next => {
+                this.client.interruptQueue.display( (err, interruptItem) => {
+                    if(err) {
+                        return next(err);
+                    }
+
+                    if(interruptItem.pause) {
+                        return this.pausePrompt(next);
+                    }
+
+                    return next(null);
+                });
+            },
+            err => {
+                return cb(err);
+            }
+        )
+    }
+
     getSaveState() {
         //  nothing in base
     }
@@ -178,11 +229,15 @@ exports.MenuModule = class MenuModule extends PluginModule {
             return this.prevMenu(cb);   //  no next, go to prev
         }
 
-        return this.client.menuStack.next(cb);
+        this.displayQueuedInterruptions( () => {
+            return this.client.menuStack.next(cb);
+        });
     }
 
     prevMenu(cb) {
-        return this.client.menuStack.prev(cb);
+        this.displayQueuedInterruptions( () => {
+            return this.client.menuStack.prev(cb);
+        });
     }
 
     gotoMenu(name, options, cb) {
@@ -234,13 +289,13 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     autoNextMenu(cb) {
-        const self = this;
-
-        function gotoNextMenu() {
-            if(self.haveNext()) {
-                return menuUtil.handleNext(self.client, self.menuConfig.next, {}, cb);
+        const gotoNextMenu = () => {
+            if(this.haveNext()) {
+                this.displayQueuedInterruptions( () => {
+                    return menuUtil.handleNext(this.client, this.menuConfig.next, {}, cb);
+                });
             } else {
-                return self.prevMenu(cb);
+                return this.prevMenu(cb);
             }
         }
 
diff --git a/core/node_msg.js b/core/node_msg.js
new file mode 100644
index 00000000..2c6f23ed
--- /dev/null
+++ b/core/node_msg.js
@@ -0,0 +1,126 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const { MenuModule }        = require('./menu_module.js');
+const { Errors }            = require('./enig_error.js');
+const {
+    getActiveNodeList,
+    getConnectionByNodeId,
+}                           = require('./client_connections.js');
+const UserInterruptQueue    = require('./user_interrupt_queue.js');
+
+//  deps
+const series            = require('async/series');
+const _                 = require('lodash');
+
+exports.moduleInfo = {
+    name    : 'Node Message',
+    desc    : 'Multi-node messaging',
+    author  : 'NuSkooler',
+};
+
+const FormIds = {
+    sendMessage : 0,
+};
+
+const MciViewIds = {
+    sendMessage : {
+        nodeSelect          : 1,
+        message             : 2,
+        preview             : 3,
+
+        customRangeStart    : 10,
+    }
+}
+
+exports.getModule = class NodeMessageModule extends MenuModule {
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+
+        this.menuMethods = {
+            sendMessage : (formData, extraArgs, cb) => {
+                const nodeId    = formData.value.node;
+                const message   = formData.value.message;
+
+                const interruptItem = {
+                    contents    : message,
+                }
+
+                if(0 === nodeId) {
+                    //  ALL nodes
+                    UserInterruptQueue.queueGlobalOtherActive(interruptItem, this.client);
+                } else {
+                    UserInterruptQueue.queueGlobal(interruptItem, [ getConnectionByNodeId(nodeId) ]);
+                }
+
+                return this.prevMenu(cb);
+            },
+        }
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            series(
+                [
+                    (next) => {
+                        return this.prepViewController('sendMessage', FormIds.sendMessage, mciData.menu, next);
+                    },
+                    (next) => {
+                        const nodeSelectView = this.viewControllers.sendMessage.getView(MciViewIds.sendMessage.nodeSelect);
+                        if(!nodeSelectView) {
+                            return next(Errors.MissingMci(`Missing node selection MCI ${MciViewIds.sendMessage.nodeSelect}`));
+                        }
+
+                        this.prepareNodeList();
+
+                        nodeSelectView.on('index update', idx => {
+                            this.nodeListSelectionIndexUpdate(idx);
+                        });
+
+                        nodeSelectView.setItems(this.nodeList);
+                        nodeSelectView.redraw();
+                        this.nodeListSelectionIndexUpdate(0);
+                        return next(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    prepareNodeList() {
+        //  standard node list with {text} field added for compliance
+        this.nodeList = [{
+            text            :  '-ALL-',
+            //  dummy fields:
+            node            : 0,
+            authenticated   : false,
+            userId          : 0,
+            action          : 'N/A',
+            userName        : 'Everyone',
+            realName        : 'All Users',
+            location        : 'N/A',
+            affils          : 'N/A',
+            timeOn          : 'N/A',
+        }].concat(getActiveNodeList(true)
+            .map(node => Object.assign(node, { text : node.node.toString() } ))
+        ).filter(node => node.node !== this.client.node);   //  remove our client's node
+        this.nodeList.sort( (a, b) => a.node - b.node );    //  sort by node
+    }
+
+    nodeListSelectionIndexUpdate(idx) {
+        const node = this.nodeList[idx];
+        if(!node) {
+            return;
+        }
+        this.updateCustomViewTextsWithFilter('sendMessage', MciViewIds.sendMessage.customRangeStart, node);
+    }
+}
\ No newline at end of file
diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
new file mode 100644
index 00000000..a29fd4df
--- /dev/null
+++ b/core/user_interrupt_queue.js
@@ -0,0 +1,58 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Art                   = require('./art.js');
+const {
+    getActiveConnections
+}                           = require('./client_connections.js');
+const ANSI                  = require('./ansi_term.js');
+
+//  deps
+const _     = require('lodash');
+
+module.exports = class UserInterruptQueue
+{
+    constructor(client) {
+        this.client         = client;
+        this.queue          = [];
+    }
+
+    static queueGlobal(interruptItem, connections) {
+        connections.forEach(conn => {
+            conn.interruptQueue.queueItem(interruptItem);
+        });
+    }
+
+    //  common shortcut: queue global, all active clients minus |client|
+    static queueGlobalOtherActive(interruptItem, client) {
+        const otherConnections = getActiveConnections(true).filter(ac => ac.node !== client.node);
+        return UserInterruptQueue.queueGlobal(interruptItem, otherConnections );
+    }
+
+    queueItem(interruptItem) {
+        interruptItem.pause = _.get(interruptItem, 'pause', true);
+        this.queue.push(interruptItem);
+    }
+
+    hasItems() {
+        return this.queue.length > 0;
+    }
+
+    display(cb) {
+        const interruptItem = this.queue.pop();
+        if(!interruptItem) {
+            return cb(null);
+        }
+
+        if(interruptItem.cls) {
+            this.client.term.rawWrite(ANSI.clearScreen());
+        } else {
+            this.client.term.rawWrite('\r\n\r\n');
+        }
+
+        Art.display(this.client, interruptItem.contents, err => {
+            return cb(err, interruptItem);
+        });
+    }
+};
\ No newline at end of file

From 516116f83efddf5ed751a2a8b1d7144e72ff259c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 22:05:21 -0700
Subject: [PATCH 0486/1013] Spinner Menu now supports itemFormat and
 focusItemFormat

---
 core/spinner_menu_view.js | 52 ++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index 7c38b195..f4517807 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -1,9 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-const MenuView      = require('./menu_view.js').MenuView;
-const ansi          = require('./ansi_term.js');
-const strUtil       = require('./string_util.js');
+const MenuView          = require('./menu_view.js').MenuView;
+const ansi              = require('./ansi_term.js');
+const strUtil           = require('./string_util.js');
+const { pipeToAnsi }    = require('./color_codes.js');
+const formatString      = require('./string_format');
 
 const util          = require('util');
 const assert        = require('assert');
@@ -36,40 +38,47 @@ function SpinnerMenuView(options) {
         this.emit('index update', this.focusedItemIndex);
     };
 
-    this.drawItem = function() {
-        var item = self.items[this.focusedItemIndex];
+    this.drawItem = function(index) {
+        const item = this.items[index];
         if(!item) {
             return;
         }
 
-        this.client.term.write(ansi.goto(this.position.row, this.position.col));
-        this.client.term.write(self.hasFocus ? self.getFocusSGR() : self.getSGR());
+        const cached = this.getRenderCacheItem(index, this.hasFocus);
+        if(cached) {
+            return this.client.term.write(`${ansi.goto(this.position.row, this.position.col)}${cached}`);
+        }
 
-        var text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
+        let text;
+        let sgr;
+        if(this.complexItems) {
+            text    = pipeToAnsi(formatString(this.hasFocus && this.focusItemFormat ? this.focusItemFormat : this.itemFormat, item));
+            sgr     = this.focusItemFormat ? '' : (this.hasFocus ? this.getFocusSGR() : self.getSGR());
+        } else {
+            text    = strUtil.stylizeString(item.text, this.hasFocus ? self.focusTextStyle : self.textStyle);
+            sgr     = this.hasFocus ? this.getFocusSGR() : this.getSGR();
+        }
 
-        self.client.term.write(
-            strUtil.pad(text, this.dimens.width + 1, this.fillChar, this.justify));
-    };
+        text = `${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`;
+        this.client.term.write(`${ansi.goto(this.position.row, this.position.col)}${text}`);
+        this.setRenderCacheItem(index, text, this.hasFocus);
+   }
 }
 
 util.inherits(SpinnerMenuView, MenuView);
 
 SpinnerMenuView.prototype.redraw = function() {
     SpinnerMenuView.super_.prototype.redraw.call(this);
-
-    //this.cachePositions();
     this.drawItem(this.focusedItemIndex);
 };
 
 SpinnerMenuView.prototype.setFocus = function(focused) {
     SpinnerMenuView.super_.prototype.setFocus.call(this, focused);
-
     this.redraw();
 };
 
 SpinnerMenuView.prototype.setFocusItemIndex = function(index) {
     SpinnerMenuView.super_.prototype.setFocusItemIndex.call(this, index);   //  sets this.focusedItemIndex
-
     this.updateSelection(); //  will redraw
 };
 
@@ -103,16 +112,3 @@ SpinnerMenuView.prototype.getData = function() {
     const item = this.getItem(this.focusedItemIndex);
     return _.isString(item.data) ? item.data : this.focusedItemIndex;
 };
-
-SpinnerMenuView.prototype.setItems = function(items) {
-    SpinnerMenuView.super_.prototype.setItems.call(this, items);
-
-    var longest = 0;
-    for(var i = 0; i < this.items.length; ++i) {
-        if(longest < this.items[i].text.length) {
-            longest = this.items[i].text.length;
-        }
-    }
-
-    this.dimens.width = longest;
-};
\ No newline at end of file

From 74b03fe846199cac9c296baff2db474d72f02f78 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 22:05:36 -0700
Subject: [PATCH 0487/1013] Fix exception when no SSH stuff is configured

---
 core/servers/login/ssh.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index f9186cf9..72f91a2a 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -241,6 +241,10 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 
     createServer() {
         const config = Config();
+        if(true != config.loginServers.ssh.enabled) {
+            return;
+        }
+
         const serverConf = {
             hostKeys : [
                 {
@@ -269,6 +273,10 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
 
     listen() {
         const config = Config();
+        if(true != config.loginServers.ssh.enabled) {
+            return true;    //  no server, but not an error
+        }
+
         const port = parseInt(config.loginServers.ssh.port);
         if(isNaN(port)) {
             Log.error( { server : ModuleInfo.name, port : config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );

From 308f09b2919ec99c670b66de92529907e852a273 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 12 Nov 2018 22:05:49 -0700
Subject: [PATCH 0488/1013] Proper callback when missing MCI

---
 core/msg_conf_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/msg_conf_list.js b/core/msg_conf_list.js
index 3c9d7152..7ba75376 100644
--- a/core/msg_conf_list.js
+++ b/core/msg_conf_list.js
@@ -73,7 +73,7 @@ exports.getModule = class MessageConfListModule extends MenuModule {
                     (next) => {
                         const confListView = this.viewControllers.confList.getView(MciViewIds.confList);
                         if(!confListView) {
-                            return cb(Errors.MissingMci(`Missing conf list MCI ${MciViewIds.confList}`));
+                            return next(Errors.MissingMci(`Missing conf list MCI ${MciViewIds.confList}`));
                         }
 
                         confListView.on('index update', idx => {

From c1f7eb05cae1860b4da9da1f94cb089b616f4be1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 19:40:48 -0700
Subject: [PATCH 0489/1013] Better sanatization of menu/prompt.hjson files
 based on board name

---
 core/oputil/oputil_config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 2e8b0add..dd6fc783 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -257,7 +257,7 @@ function buildNewConfig() {
             return;
         }
 
-        const bn = sanatizeFilename(config.general.boardName).replace(/ /g, '_').toLowerCase();
+        const bn = sanatizeFilename(config.general.boardName).replace(/[^a-z0-9_\-]/ig, '_').toLowerCase();
         const menuFile = `${bn}.hjson`;
         copyFileSyncSilent(
             paths.join(__dirname, '../../config/menu.hjson'),

From d28b5ce3b2a0cbe0d9cf5dc4a627f4431a097cb5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 19:44:27 -0700
Subject: [PATCH 0490/1013] Even better file name generation for new configs

---
 core/oputil/oputil_config.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index dd6fc783..40644dee 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -257,15 +257,18 @@ function buildNewConfig() {
             return;
         }
 
-        const bn = sanatizeFilename(config.general.boardName).replace(/[^a-z0-9_\-]/ig, '_').toLowerCase();
-        const menuFile = `${bn}.hjson`;
+        const bn = sanatizeFilename(config.general.boardName)
+            .replace(/[^a-z0-9_\-]/ig, '_')
+            .replace(/_+/g, '_')
+            .toLowerCase();
+        const menuFile = `${bn}-menu.hjson`;
         copyFileSyncSilent(
             paths.join(__dirname, '../../config/menu.hjson'),
             paths.join(__dirname, '../../config/', menuFile),
             fs.constants.COPYFILE_EXCL
         );
 
-        const promptFile = `${bn}_prompt.hjson`;
+        const promptFile = `${bn}-prompt.hjson`;
         copyFileSyncSilent(
             paths.join(__dirname, '../../config/prompt.hjson'),
             paths.join(__dirname, '../../config/', promptFile),

From 5b1412aa319f4e6908a8cb4dd97a869df0f59b22 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 19:59:56 -0700
Subject: [PATCH 0491/1013] * Clean up door examples in menu.hjson * Remove
 specific doors in default door menu; +op will need to add them as they
 configure them

---
 art/themes/luciano_blocktronics/DOORMNU.ANS | Bin 3953 -> 3859 bytes
 config/menu.hjson                           |  76 ++++++++++++--------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/art/themes/luciano_blocktronics/DOORMNU.ANS b/art/themes/luciano_blocktronics/DOORMNU.ANS
index bcd28f390209baf3ae6ea09321286f828d64cccd..9621ec1d74d03dfffa28a31135e3ab86377de1d9 100644
GIT binary patch
delta 271
zcmew;H(74OQ6?7YXcL3YKbRyLosG?N6{MpLt&I&pw6R&Pf~#MqyRV}{acMz8eo;xW
zLT+MSr9ydPWwAnj8c>Nru5`4iGgu2yF_3RPIgq8uzyc<elUSOUoROKAu8@+SUsSA+
zSgcT<nv(;f!6t!BP*6~q%*+~X0y8Bqu_UuB6|6y_IJKxOwMZd1KczG$wOCKVu{c|y
zGQYG4s!w6^5>{7hpaD?55XXQVWd?JBc7B0ENxnjIeqLH;dTCLrLUDd>s-ko>$cYBl
Rn@!lnIhj`QP4?wi0RRF-QDp!C

delta 365
zcmbO%_fc-cQ6^&r1?gx*Yh#04AZ=`xtB{kQoR}jWZIBBTHg^WgndK%W73XB;WkZC`
zH=ksZWOM*(GS4*x3R#1+6=dcXD3m7_6$4E%2kA8g>CH6(X@QtrQk0mI3R0n9WME(<
z9X(l<rO3eytP043n3AKHuUDj(q6ag?2rO+1Gyp80U!ag*mRgjZnUkXc)C06=@^O}E
zH;50+bBz&}73Y=~r70xm=O!hVKn=41n`H(w3(YDE=gDELuHMqoU_a-&AdE^W%}Y<s
p&r`@vEG|hcf*J;Kw>i3D3PwN?ptC@My7?NbI42Vu|K#_4DgfNpXLbMp

diff --git a/config/menu.hjson b/config/menu.hjson
index 3d651412..1c48ef63 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -1564,43 +1564,48 @@
 					value: { command: "Q" }
 					action: @systemMethod:prevMenu
 				}
+				//
+				//	The system supports many ways of launching doors including
+				//	modules for DoorParty!, BBSLink, etc.
+				//
+				//	Below are some examples. See the documentation for more info.
+				//
 				{
-					value: { command: "PW" }
-					action: @menu:doorPimpWars
+					value: { command: "ABRACADABRA" }
+					action: @menu:doorAbracadabraExample
 				}
 				{
-					value: { command: "TW" }
-					action: @menu:doorTradeWars2002BBSLink
-				}
-				{
-					value: { command: "DL" }
-					action: @menu:doorDarkLands
+					value: { command: "TWBBLINK" }
+					action: @menu:doorTradeWars2002BBSLinkExample
 				}
 				{
 					value: { command: "DP" }
-					action: @menu:doorParty
+					action: @menu:doorPartyExample
 				}
 				{
                     value: { command: "CN" }
-                    action: @menu:combatNet
+                    action: @menu:doorCombatNetExample
                 }
 				{
-					value: { command: "AGENT" }
-					action: @menu:telnetBridgeAgency
+					value: { command: "EXODUS" }
+					action: @menu:doorExodusCataclysm
 				}
 			]
 		}
 
 		//
-		//	Example using the abracadabra module for a retro DOS door
+		//	Local Door Example via abracadabra module
 		//
-		doorPimpWars: {
-			desc: Playing PimpWars
+		//	This example assumes launch_door.sh (which is passed args)
+		//	launches the door.
+		//
+		doorAbracadabraExample: {
+			desc: Abracadabra Example
 			module: abracadabra
 			config: {
-				name: PimpWars
+				name: Example Door
 				dropFileType: DORINFO
-				cmd: /home/enigma/DOS/scripts/pimpwars.sh
+				cmd: /home/enigma/DOS/scripts/launch_door.sh
 				args: [
 					"{node}",
 					"{dropFile}",
@@ -1613,11 +1618,11 @@
 		}
 
 		//
-		//	TradeWars 2000 example via BBSLink
+		//	BBSLink Example (TradeWars 2000)
 		//
-		//	You will need to register with BBSLink to obtain sysCode, authCode and schemeCode
+		//	Register @ https://bbslink.net/
 		//
-		doorTradeWars2002BBSLink: {
+		doorTradeWars2002BBSLinkExample: {
 			desc: Playing TW 2002 (BBSLink)
 			module: bbs_link
 			config: {
@@ -1628,8 +1633,12 @@
 			}
 		}
 
-		//	DoorParty! support. You'll need to register to obtain credentials
-		doorParty: {
+		//
+		//	DoorParty! Example
+		//
+		//	Register @ http://throwbackbbs.com/
+		//
+		doorPartyExample: {
 			desc: Using DoorParty!
 			module: door_party
 			config: {
@@ -1639,8 +1648,12 @@
 			}
 		}
 
-        //	CombatNet support. You'll need to register at http://combatnet.us/ to obtain credentials
-        combatNet: {
+		//
+        //	CombatNet Example
+        //
+        //	Register @ http://combatnet.us/
+        //
+        doorCombatNetExample: {
             desc: Using CombatNet
             module: combatnet
             config: {
@@ -1649,11 +1662,18 @@
             }
         }
 
-		telnetBridgeAgency: {
-			desc: Connected to HappyLand BBS
-			module: telnet_bridge
+        //
+        //	Exodus Example (cataclysm)
+        //	Register @ https://oddnetwork.org/exodus/
+        //
+        doorExodusCataclysm: {
+			desc: Cataclysm
+			module: exodus
 			config: {
-				host: agency.bbs.geek.nz
+				rejectUnauthorized: false
+				board: XXX
+				key: XXXXXXXX
+				door: cataclysm
 			}
 		}
 

From d8f07083108935a7ffb47919266d247b2b71df65 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 20:03:54 -0700
Subject: [PATCH 0492/1013] getActiveNodeList -> getActiveConnectionList (be
 consistent)

---
 core/client_connections.js | 4 ++--
 core/node_msg.js           | 4 ++--
 core/whos_online.js        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index f0bca4d7..6b8faf65 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -11,7 +11,7 @@ const moment            = require('moment');
 const hashids           = require('hashids');
 
 exports.getActiveConnections    = getActiveConnections;
-exports.getActiveNodeList       = getActiveNodeList;
+exports.getActiveConnectionList = getActiveConnectionList;
 exports.addNewClient            = addNewClient;
 exports.removeClient            = removeClient;
 exports.getConnectionByUserId   = getConnectionByUserId;
@@ -26,7 +26,7 @@ function getActiveConnections(authUsersOnly = false) {
     });
 }
 
-function getActiveNodeList(authUsersOnly) {
+function getActiveConnectionList(authUsersOnly) {
 
     if(!_.isBoolean(authUsersOnly)) {
         authUsersOnly = true;
diff --git a/core/node_msg.js b/core/node_msg.js
index 2c6f23ed..276dae2f 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -5,7 +5,7 @@
 const { MenuModule }        = require('./menu_module.js');
 const { Errors }            = require('./enig_error.js');
 const {
-    getActiveNodeList,
+    getActiveConnectionList,
     getConnectionByNodeId,
 }                           = require('./client_connections.js');
 const UserInterruptQueue    = require('./user_interrupt_queue.js');
@@ -110,7 +110,7 @@ exports.getModule = class NodeMessageModule extends MenuModule {
             location        : 'N/A',
             affils          : 'N/A',
             timeOn          : 'N/A',
-        }].concat(getActiveNodeList(true)
+        }].concat(getActiveConnectionList(true)
             .map(node => Object.assign(node, { text : node.node.toString() } ))
         ).filter(node => node.node !== this.client.node);   //  remove our client's node
         this.nodeList.sort( (a, b) => a.node - b.node );    //  sort by node
diff --git a/core/whos_online.js b/core/whos_online.js
index 0ea2321a..5910bd29 100644
--- a/core/whos_online.js
+++ b/core/whos_online.js
@@ -2,9 +2,9 @@
 'use strict';
 
 //  ENiGMA½
-const { MenuModule }        = require('./menu_module.js');
-const { getActiveNodeList } = require('./client_connections.js');
-const { Errors }            = require('./enig_error.js');
+const { MenuModule }            = require('./menu_module.js');
+const { getActiveConnectionList } = require('./client_connections.js');
+const { Errors }                = require('./enig_error.js');
 
 //  deps
 const async                 = require('async');
@@ -43,7 +43,7 @@ exports.getModule = class WhosOnlineModule extends MenuModule {
                             return cb(Errors.MissingMci(`Missing online list MCI ${MciViewIds.onlineList}`));
                         }
 
-                        const onlineList = getActiveNodeList(true).slice(0, onlineListView.height).map(
+                        const onlineList = getActiveConnectionList(true).slice(0, onlineListView.height).map(
                             oe => Object.assign(oe, { text : oe.userName, timeOn : _.upperFirst(oe.timeOn.humanize()) })
                         );
 

From 330e1efa781544d96bec3552f9b478d25747f51c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 21:11:33 -0700
Subject: [PATCH 0493/1013] Updates to user interruptions & node-to-node
 message module * Can now have header/footer art on node-to-node messages *
 'text' and more advanced 'contents' fields * format via 'messageFormat'

---
 core/node_msg.js             | 86 ++++++++++++++++++++++++++++++------
 core/user_interrupt_queue.js | 15 +++++--
 2 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/core/node_msg.js b/core/node_msg.js
index 276dae2f..fde5f35e 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -9,10 +9,14 @@ const {
     getConnectionByNodeId,
 }                           = require('./client_connections.js');
 const UserInterruptQueue    = require('./user_interrupt_queue.js');
+const { getThemeArt }       = require('./theme.js');
+const { pipeToAnsi }        = require('./color_codes.js');
+const stringFormat          = require('./string_format.js');
 
 //  deps
-const series            = require('async/series');
-const _                 = require('lodash');
+const series                = require('async/series');
+const _                     = require('lodash');
+const async                 = require('async');
 
 exports.moduleInfo = {
     name    : 'Node Message',
@@ -44,18 +48,16 @@ exports.getModule = class NodeMessageModule extends MenuModule {
                 const nodeId    = formData.value.node;
                 const message   = formData.value.message;
 
-                const interruptItem = {
-                    contents    : message,
-                }
+                this.createInterruptItem(message, (err, interruptItem) => {
+                    if(0 === nodeId) {
+                        //  ALL nodes
+                        UserInterruptQueue.queueGlobalOtherActive(interruptItem, this.client);
+                    } else {
+                        UserInterruptQueue.queueGlobal(interruptItem, [ getConnectionByNodeId(nodeId) ]);
+                    }
 
-                if(0 === nodeId) {
-                    //  ALL nodes
-                    UserInterruptQueue.queueGlobalOtherActive(interruptItem, this.client);
-                } else {
-                    UserInterruptQueue.queueGlobal(interruptItem, [ getConnectionByNodeId(nodeId) ]);
-                }
-
-                return this.prevMenu(cb);
+                    return this.prevMenu(cb);
+                });
             },
         }
     }
@@ -96,6 +98,64 @@ exports.getModule = class NodeMessageModule extends MenuModule {
         });
     }
 
+    createInterruptItem(message, cb) {
+        const textFormatObj = {
+            fromUserName    : this.client.user.username,
+            fromRealName    : this.client.user.properties.real_name,
+            fromNodeId      : this.client.node,
+            message         : message,
+        };
+
+        const messageFormat =
+            this.config.messageFormat ||
+            'Message from {fromUserName} on node {fromNodeId}:\r\n{message}';
+
+        const item = {
+            text        : stringFormat(messageFormat, textFormatObj),
+            pause       : true,
+        };
+
+        const getArt = (name, callback) => {
+            const spec = _.get(this.config, `art.${name}`);
+            if(!spec) {
+                return callback(null);
+            }
+            const getArtOpts = {
+                name    : spec,
+                client  : this.client,
+                random  : false,
+            };
+            getThemeArt(getArtOpts, (err, artInfo) => {
+                //  ignore errors
+                return callback(artInfo ? artInfo.data : null);
+            });
+        };
+
+        async.waterfall(
+            [
+                (callback) => {
+                    getArt('header', headerArt => {
+                        return callback(null, headerArt);
+                    });
+                },
+                (headerArt, callback) => {
+                    getArt('footer', footerArt => {
+                        return callback(null, headerArt, footerArt);
+                    });
+                },
+                (headerArt, footerArt, callback) => {
+                    if(headerArt || footerArt) {
+                        item.contents = `${headerArt || ''}\r\n${pipeToAnsi(item.text)}\r\n${footerArt || ''}`;
+                    }
+                    return callback(null);
+                }
+            ],
+            err => {
+                return cb(err, item);
+            }
+        );
+    }
+
     prepareNodeList() {
         //  standard node list with {text} field added for compliance
         this.nodeList = [{
diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index a29fd4df..be6767d5 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -7,6 +7,7 @@ const {
     getActiveConnections
 }                           = require('./client_connections.js');
 const ANSI                  = require('./ansi_term.js');
+const { pipeToAnsi }        = require('./color_codes.js');
 
 //  deps
 const _     = require('lodash');
@@ -31,6 +32,9 @@ module.exports = class UserInterruptQueue
     }
 
     queueItem(interruptItem) {
+        if(!_.isString(interruptItem.contents) && !_.isString(interruptItem.text)) {
+            return;
+        }
         interruptItem.pause = _.get(interruptItem, 'pause', true);
         this.queue.push(interruptItem);
     }
@@ -51,8 +55,13 @@ module.exports = class UserInterruptQueue
             this.client.term.rawWrite('\r\n\r\n');
         }
 
-        Art.display(this.client, interruptItem.contents, err => {
-            return cb(err, interruptItem);
-        });
+        if(interruptItem.contents) {
+            Art.display(this.client, interruptItem.contents, err => {
+                this.client.term.rawWrite('\r\n\r\n');
+                return cb(err, interruptItem);
+            });
+        } else {
+            return this.client.term.write(pipeToAnsi(`${interruptItem.text}\r\n\r\n`, this.client), cb);
+        }
     }
 };
\ No newline at end of file

From f59b4b883f3edcaeee504f909ffea15f76999866 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 21:25:46 -0700
Subject: [PATCH 0494/1013] Update basic info in menu.hjson, fix email addr

---
 config/menu.hjson             | 45 ++++++++++++++++++++++++++---------
 misc/config_template.in.hjson |  2 +-
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/config/menu.hjson b/config/menu.hjson
index 1c48ef63..8f1aca3b 100644
--- a/config/menu.hjson
+++ b/config/menu.hjson
@@ -10,20 +10,43 @@
 		                                                                 /__   _\
 		<*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
 
-		-------------------------------------------------------------------------------
+		*-----------------------------------------------------------------------------*
 
-		This configuration is in HJSON (http://hjson.org/) format.  Strict to-spec 
-		JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
-		
-		See http://hjson.org/ for more information and syntax.
+        General Information
+        ------------------------------- -   -
+        This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
+        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
 
+        See http://hjson.org/ for more information and syntax.
 
-		If you haven't yet, copy the conents of this file to something like 
-		sick_board.hjson. Point to it via config.hjson using the 
-		'general.menuFile' key:
-		
-			general: { menuFile: "sick_board.hjson" } 	
-		
+        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
+        on have syntax highlighting for the HJSON format which are highly recommended.
+
+        ------------------------------- -- -    -
+        Menu Configuration
+        ------------------------------- -   -
+        ENiGMA½ makes no assumptions about specific menu types (main, doors, etc.), 
+        but instead allows full customization of all menus throughout the system.
+        Some menus such as a main menu are considered "standard" while others are
+        backed by a specific module. SysOps can tweak various settings about these
+        modules (look & feel, keyboard interation, and so on) or even fully replace
+        the module with something else.
+
+        This file starts out as an example setup. Look at the examples, change
+        settings, menu ordering/flow, add/remove menus, implement ACS control,
+        etc.!
+
+        Remember you can *live edit* this file. That is, make a change and save
+        while you're logged into the system and it will take effect on the next
+        menu change or screen refresh.
+
+        Please see RTFM ...er, uh... see the documentation for more information, and
+        don't be shy to ask for help:
+
+        BBS     : Xibalba @ xibalba.l33t.codes
+        FTN     : BBS Discussion on fsxNet
+        IRC     : #enigma-bbs / FreeNode
+        Email   : bryan@l33t.codes
 	*/
 	menus: {
 		//
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 296e7826..3acb0823 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -44,7 +44,7 @@
         BBS     : Xibalba @ xibalba.l33t.codes
         FTN     : BBS Discussion on fsxNet
         IRC     : #enigma-bbs / FreeNode
-        Email   : bryan@leet.codes
+        Email   : bryan@l33t.codes
     */
 
     general: {

From 96d30af5d2cf0480f798adaf201467a8b18dbb4a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 13 Nov 2018 21:32:22 -0700
Subject: [PATCH 0495/1013] POSSIBLY BREAKING: config/menu.hjson and
 config/prompt.hjson are now moved to misc/menu_template.in.hjson and
 config/prompt_template.in.hjson. These are now simply used as template files
 and copied to config/ with proper naming when issuing 'oputil.js config new'

---
 core/config.js                                       | 4 ++--
 core/oputil/oputil_config.js                         | 4 ++--
 config/menu.hjson => misc/menu_template.in.hjson     | 0
 config/prompt.hjson => misc/prompt_template.in.hjson | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename config/menu.hjson => misc/menu_template.in.hjson (100%)
 rename config/prompt.hjson => misc/prompt_template.in.hjson (100%)

diff --git a/core/config.js b/core/config.js
index c1fffc45..97091be5 100644
--- a/core/config.js
+++ b/core/config.js
@@ -138,8 +138,8 @@ function getDefaultConfig() {
             closedSystem    : false,                    //  is the system closed to new users?
             loginAttempts   : 3,
 
-            menuFile        : 'menu.hjson',             //  Override to use something else, e.g. demo.hjson. Can be a full path (defaults to ./config)
-            promptFile      : 'prompt.hjson',           //  Override to use soemthing else, e.g. myprompt.hjson. Can be a full path (defaults to ./config)
+            menuFile        : 'menu.hjson',     //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
+            promptFile      : 'prompt.hjson',   //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
         },
 
         users : {
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 40644dee..83ac5232 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -263,14 +263,14 @@ function buildNewConfig() {
             .toLowerCase();
         const menuFile = `${bn}-menu.hjson`;
         copyFileSyncSilent(
-            paths.join(__dirname, '../../config/menu.hjson'),
+            paths.join(__dirname, '../../misc/menu_template.in.hjson'),
             paths.join(__dirname, '../../config/', menuFile),
             fs.constants.COPYFILE_EXCL
         );
 
         const promptFile = `${bn}-prompt.hjson`;
         copyFileSyncSilent(
-            paths.join(__dirname, '../../config/prompt.hjson'),
+            paths.join(__dirname, '../../misc/prompt_template.in.hjson'),
             paths.join(__dirname, '../../config/', promptFile),
             fs.constants.COPYFILE_EXCL
         )
diff --git a/config/menu.hjson b/misc/menu_template.in.hjson
similarity index 100%
rename from config/menu.hjson
rename to misc/menu_template.in.hjson
diff --git a/config/prompt.hjson b/misc/prompt_template.in.hjson
similarity index 100%
rename from config/prompt.hjson
rename to misc/prompt_template.in.hjson

From 23c9e89849d349aba06d85196cf60bf6afd1ba42 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 19:16:54 -0700
Subject: [PATCH 0496/1013] Add default keys to menu

---
 art/themes/luciano_blocktronics/MSGMNU.ANS | Bin 3510 -> 3660 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index ce6f4815645341d1f226f2de457a4156a048fe62..3585799b98f1e143184bf8efa54e5da16bfccba8 100644
GIT binary patch
delta 294
zcmdlceMV-32MeR=<Zmo)lLJ{oSq!a>%_l3fDKZ%uPhQL7!Duqslr=^rOF=r?z}na>
zH#s9QFFjQuIX^EgwJ0?&IaNB^*gRJ{+Q`Ux@;O#NO9cg>O2b?mps+!%K3LKYs#T$&
zD78#KFSVisi+0n=iENpZC$dU285>Q0$ChjiH7FX%pjb?U5{pt3VJ@(o9Lnw|Xk_6G
z6fnyLIs@!5v&rjN<ynAkGMl`V-Hp+5@=-Q<6{ws!P^n>VI?UMglC*q9m}$nF-?A@e
LWqde!BCjd{cdAv1

delta 151
zcmX>jvrT$~2Mec(sk3ynu~F{*$^9&$?8fG~($OY{let+v7|kYovbar-W(}QugiV^s
z(0KASc6mmH$yZqYChuY6nEaAOLDmAO*DyC-I@-Y6*eq8ey(BGP5oj975JQv6(QKKM
vT{)z<6re&zrjsACC9_CJn;J|mXZK?=GoAdC-3>@>Zsu6b%IG~=olg}26uT=H


From 23af00e7ec0145c0a89c1afae8916adea81cacd2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 19:52:55 -0700
Subject: [PATCH 0497/1013] Add timestamp

---
 core/node_msg.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/node_msg.js b/core/node_msg.js
index fde5f35e..f98db5f1 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -17,6 +17,7 @@ const stringFormat          = require('./string_format.js');
 const series                = require('async/series');
 const _                     = require('lodash');
 const async                 = require('async');
+const moment                = require('moment');
 
 exports.moduleInfo = {
     name    : 'Node Message',
@@ -104,6 +105,7 @@ exports.getModule = class NodeMessageModule extends MenuModule {
             fromRealName    : this.client.user.properties.real_name,
             fromNodeId      : this.client.node,
             message         : message,
+            timestamp       : moment(),
         };
 
         const messageFormat =

From 941e7d0a03b50aa9df96c6584a48d5704c4d79e0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 19:53:14 -0700
Subject: [PATCH 0498/1013] Fix ./main.js --version

---
 core/bbs.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/bbs.js b/core/bbs.js
index f3d59200..b4f88296 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -45,6 +45,10 @@ function printHelpAndExit() {
     process.exit();
 }
 
+function printVersionAndExit() {
+    console.info(require('../package.json').version);
+}
+
 function main() {
     async.waterfall(
         [
@@ -52,7 +56,11 @@ function main() {
                 const argv = require('minimist')(process.argv.slice(2));
 
                 if(argv.help) {
-                    printHelpAndExit();
+                    return printHelpAndExit();
+                }
+
+                if(argv.version) {
+                    return printVersionAndExit();
                 }
 
                 const configOverridePath = argv.config;

From b3930d1999d04808ca9743b2109f0c86458fc7f1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 20:51:11 -0700
Subject: [PATCH 0499/1013] WIP on node-to-node msg + Preview * Fix node IDs +
 Add new MenuModule method for validating MCI codes

---
 core/menu_module.js     | 16 ++++++++++++++
 core/node_msg.js        | 49 ++++++++++++++++++++++++++++++-----------
 core/view_controller.js |  4 ++++
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index ce8eb556..2dd40b9e 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -549,4 +549,20 @@ exports.MenuModule = class MenuModule extends PluginModule {
             });
         }
     }
+
+    validateMCIByViewIds(formName, viewIds, cb) {
+        if(!Array.isArray(viewIds)) {
+            viewIds = [ viewIds ];
+        }
+        const form = _.get(this, [ 'viewControllers', formName ] );
+        if(!form) {
+            return cb(Errors.DoesNotExist(`Form does not exist: ${formName}`));
+        }
+        for(let i = 0; i < viewIds.length; ++i) {
+            if(!form.hasView(viewIds[i])) {
+                return cb(Errors.MissingMci(`Missing MCI ${viewIds[i]}`));
+            }
+        }
+        return cb(null);
+    }
 };
diff --git a/core/node_msg.js b/core/node_msg.js
index f98db5f1..412e14ab 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -46,15 +46,18 @@ exports.getModule = class NodeMessageModule extends MenuModule {
 
         this.menuMethods = {
             sendMessage : (formData, extraArgs, cb) => {
-                const nodeId    = formData.value.node;
+                const nodeId    = this.nodeList[formData.value.node].node;  //  index from from -> node!
                 const message   = formData.value.message;
 
                 this.createInterruptItem(message, (err, interruptItem) => {
-                    if(0 === nodeId) {
+                    if(-1 === nodeId) {
                         //  ALL nodes
                         UserInterruptQueue.queueGlobalOtherActive(interruptItem, this.client);
                     } else {
-                        UserInterruptQueue.queueGlobal(interruptItem, [ getConnectionByNodeId(nodeId) ]);
+                        const conn = getConnectionByNodeId(nodeId);
+                        if(conn) {
+                            UserInterruptQueue.queueGlobal(interruptItem, [ conn ]);
+                        }
                     }
 
                     return this.prevMenu(cb);
@@ -71,15 +74,18 @@ exports.getModule = class NodeMessageModule extends MenuModule {
 
             series(
                 [
-                    (next) => {
-                        return this.prepViewController('sendMessage', FormIds.sendMessage, mciData.menu, next);
+                    (callback) => {
+                        return this.prepViewController('sendMessage', FormIds.sendMessage, mciData.menu, callback);
                     },
-                    (next) => {
+                    (callback) => {
+                        return this.validateMCIByViewIds(
+                            'sendMessage',
+                            [ MciViewIds.sendMessage.nodeSelect, MciViewIds.sendMessage.message ],
+                            callback
+                        );
+                    },
+                    (callback) => {
                         const nodeSelectView = this.viewControllers.sendMessage.getView(MciViewIds.sendMessage.nodeSelect);
-                        if(!nodeSelectView) {
-                            return next(Errors.MissingMci(`Missing node selection MCI ${MciViewIds.sendMessage.nodeSelect}`));
-                        }
-
                         this.prepareNodeList();
 
                         nodeSelectView.on('index update', idx => {
@@ -89,7 +95,24 @@ exports.getModule = class NodeMessageModule extends MenuModule {
                         nodeSelectView.setItems(this.nodeList);
                         nodeSelectView.redraw();
                         this.nodeListSelectionIndexUpdate(0);
-                        return next(null);
+                        return callback(null);
+                    },
+                    (callback) => {
+                        const previewView = this.viewControllers.sendMessage.getView(MciViewIds.sendMessage.preview);
+                        if(!previewView) {
+                            return callback(null);  //  preview is optional
+                        }
+
+                        const messageView = this.viewControllers.sendMessage.getView(MciViewIds.sendMessage.message);
+                        let timerId;
+                        messageView.on('key press', () => {
+                            clearTimeout(timerId);
+                            const focused = this.viewControllers.sendMessage.getFocusedView();
+                            if(focused === messageView) {
+                                previewView.setText(messageView.getData());
+                                focused.setFocus(true);
+                            }
+                        }, 500);
                     }
                 ],
                 err => {
@@ -163,7 +186,7 @@ exports.getModule = class NodeMessageModule extends MenuModule {
         this.nodeList = [{
             text            :  '-ALL-',
             //  dummy fields:
-            node            : 0,
+            node            : -1,
             authenticated   : false,
             userId          : 0,
             action          : 'N/A',
@@ -173,7 +196,7 @@ exports.getModule = class NodeMessageModule extends MenuModule {
             affils          : 'N/A',
             timeOn          : 'N/A',
         }].concat(getActiveConnectionList(true)
-            .map(node => Object.assign(node, { text : node.node.toString() } ))
+            .map(node => Object.assign(node, { text : -1 == node.node ? '-ALL-' : node.node.toString() } ))
         ).filter(node => node.node !== this.client.node);   //  remove our client's node
         this.nodeList.sort( (a, b) => a.node - b.node );    //  sort by node
     }
diff --git a/core/view_controller.js b/core/view_controller.js
index cd0dd3b0..de6f1f05 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -431,6 +431,10 @@ ViewController.prototype.getView = function(id) {
     return this.views[id];
 };
 
+ViewController.prototype.hasView = function(id) {
+    return this.getView(id) ? true : false;
+}
+
 ViewController.prototype.getViewsByMciCode = function(mciCode) {
     if(!Array.isArray(mciCode)) {
         mciCode = [ mciCode ];

From ea4fb090e25ff2c1c6543d450e3a2d1aa1ddcf66 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 21:00:21 -0700
Subject: [PATCH 0500/1013] Better error report from spawn() fail in
 extractTo()

---
 core/archive_util.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 6a58f935..b10f364f 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -272,7 +272,9 @@ module.exports = class ArchiveUtil {
         try {
             proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts(extractPath));
         } catch(e) {
-            return cb(e);
+            return cb(Errors.ExternalProcess(
+                `Error spawning archiver process "${archiver[action].cmd}" with args "${args.join(' ')}": ${e.message}`)
+            );
         }
 
         return this.spawnHandler(proc, (haveFileList ? 'Extraction' : 'Decompression'), cb);

From b48f3f3d420c130102602ef0fd41c8c3f6c39ba6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 21:05:48 -0700
Subject: [PATCH 0501/1013] Better reject/retain notes

---
 docs/messageareas/message-networks.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index fec31a08..1c251712 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -72,6 +72,7 @@ Example:
 | `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
 | `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
 | `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
+| `paths` | :-1: | An optional configuration block that can set a `retain` path and/or a `reject` path. These will be used for archiving processed packets. |
 
 Example:
 ```hjson
@@ -85,6 +86,12 @@ scannerTossers: {
       export: every 15 minutes or @immediate
     }
 
+    // optional
+    paths: {
+      reject: /path/to/store/bad/packets/
+      retain: /path/to/store/good/packets/
+    }
+
     //  Override default FTN/BSO packet encoding. Defaults to 'utf8'
     packetMsgEncoding: utf8
 

From e4cb93a17c224c0aa9fc2ed5e8238560204e76f1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 21:24:15 -0700
Subject: [PATCH 0502/1013] Use better logging for archiver spawn()

---
 core/archive_util.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index b10f364f..8549cd12 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -222,7 +222,9 @@ module.exports = class ArchiveUtil {
         try {
             proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts());
         } catch(e) {
-            return cb(e);
+            return cb(Errors.ExternalProcess(
+                `Error spawning archiver process "${archiver.compress.cmd}" with args "${args.join(' ')}": ${e.message}`)
+            );
         }
 
         return this.spawnHandler(proc, 'Compression', cb);
@@ -297,7 +299,9 @@ module.exports = class ArchiveUtil {
         try {
             proc = pty.spawn(archiver.list.cmd, args, this.getPtyOpts());
         } catch(e) {
-            return cb(e);
+            return cb(Errors.ExternalProcess(
+                `Error spawning archiver process "${archiver.list.cmd}" with args "${args.join(' ')}": ${e.message}`)
+            );
         }
 
         let output = '';

From 2c6ba680dc0acec2a62ee38fd4262d0274a1d598 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 21:45:20 -0700
Subject: [PATCH 0503/1013] Fix up FTN/BSO vs Message Network docs a bit more

---
 docs/messageareas/bso-import-export.md | 85 ++++++++++++++++++++------
 docs/messageareas/message-networks.md  | 13 +---
 2 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index 49e533d8..106fd65a 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -2,24 +2,24 @@
 layout: page
 title: BSO Import / Export
 ---
-The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and 
-scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` 
-under `scannerTossers::ftn_bso`.
+The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
 
-| Config Item             | Required | Description                                                                     |
-|-------------------------|----------|---------------------------------------------------------------------------------|
-| `defaultZone`           | :+1:     | Sets the default BSO outbound zone
-| `defaultNetwork`        | :-1:     | Sets the default network name from `messageNetworks.ftn.networks`. **Required if more than one network is defined**.
-| `paths`                 | :-1:     | Override default paths set by the system. This section may contain `outbound`, `inbound`, and `secInbound`.
-| `packetTargetByteSize`  | :-1:     | Overrides the system *target* packet (.pkt) size of 512000 bytes (512k)
-| `bundleTargetByteSize`  | :-1:     | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M)
-| `schedule`              | :+1:     | See Scheduling
-| `nodes`                 | :+1:     | See Nodes
+:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this!
+
+Let's look at some of the basic configuration:
+
+| Config Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `schedule`  | :+1:     | Sets `import` and `export` schedules. [Later style text parsing](https://bunkat.github.io/later/parsers.html#text) supported. `import` also can utilize a `@watch:<path/to/file>` syntax while `export` additionally supports `@immediate`.  |
+| `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
+| `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
+| `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
+| `paths` | :-1: | An optional configuration block that can set a `retain` path and/or a `reject` path. These will be used for archiving processed packets. You may additionally override the default `outbound`, `inbound`, and `secInbound` (secure inbound) *base* paths for packet processing. |
+| `packetTargetByteSize`  | :-1: | Overrides the system *target* packet (.pkt) size of 512000 bytes (512k) |
+| `bundleTargetByteSize`  | :-1: | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M) | 
 
 ## Scheduling
-Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. 
-Each entry is allowed a "free form" text and/or special indicators for immediate export or watch 
-file triggers.
+Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.
 
   * `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
   * `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
@@ -27,7 +27,7 @@ file triggers.
   
 See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
 
-### Example Configuration
+### Example Schedule Configuration
 
 ```hjson
 {
@@ -45,8 +45,7 @@ See [Later text parsing documentation](http://bunkat.github.io/later/parsers.htm
 ## Nodes
 The `nodes` section defines how to export messages for one or more uplinks. 
 
-A node entry starts with a FTN style address (up to 5D) **as a key** in `config.hjson`. This key may 
-contain wildcard(s) for net/zone/node/point/domain. 
+A node entry starts with a FTN style address (up to 5D) **as a key** in `config.hjson`. This key may contain wildcard(s) for net/zone/node/point/domain. 
 
 | Config Item      | Required | Description                                                                     |
 |------------------|----------|---------------------------------------------------------------------------------|
@@ -61,7 +60,7 @@ contain wildcard(s) for net/zone/node/point/domain.
   scannerTossers: {
     ftn_bso: {
       nodes: {
-        "46:*": {
+        "21:*": {
           packetType: 2+
           packetPassword: mypass
           encoding: cp437
@@ -71,4 +70,52 @@ contain wildcard(s) for net/zone/node/point/domain.
     }
   }
 }
+```
+
+## A More Complete Example
+Below is a more complete example showing the sections described above.
+
+```hjson
+scannerTossers: {
+  ftn_bso: {
+    schedule: {
+      //  Check every 30m, or whenever the "toss!.now" file is touched (ie: by Binkd)
+      import: every 30 minutes or @watch:/enigma-bbs/mail/ftn_in/toss!.now
+
+      //  Export immediately, but also check every 15m to be sure
+      export: every 15 minutes or @immediate
+    }
+
+    // optional
+    paths: {
+      reject: /path/to/store/bad/packets/
+      retain: /path/to/store/good/packets/
+    }
+
+    //  Override default FTN/BSO packet encoding. Defaults to 'utf8'
+    packetMsgEncoding: utf8
+
+    defaultNetwork: fsxnet
+
+    nodes: {
+      "21:1/100" : {            //  May also contain wildcards, ie: "21:1/*"
+        archiveType: ZIP        //  By-ext archive type: ZIP, ARJ, ..., optional.
+        encoding: utf8          //  Encoding for exported messages
+        packetPassword: MUHPA55 //  FTN .PKT password, optional
+
+        tic: {
+          //  See TIC docs
+        }
+      }
+    }
+
+    netMail: {
+      //  See NetMail docs
+    }
+
+    ticAreas: {
+      //  See TIC docs
+    }
+  }
+}
 ```
\ No newline at end of file
diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index 1c251712..10904cab 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -9,9 +9,9 @@ ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, suc
 3. `scannerTossers.<name>`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
 
 ## FTN Networks 
-FidoNet and FidoNet style (FTN) networks as well as a FTN/BSO scanner/tosser (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
+FidoNet and FidoNet style (FTN) networks as well as a [FTN/BSO scanner/tosser](bso-import-export.md) (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
 
-:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this
+:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this!
 
 ### Networks
 The `networks` block a per-network configuration where each entry's key may be referenced elswhere in `config.hjson`.
@@ -65,14 +65,7 @@ Example:
 ```
 
 ### FTN/BSO Scanner Tosser
-
-| Config Item | Required | Description                                              |
-|-------------|----------|----------------------------------------------------------|
-| `schedule`  | :+1:     | Sets `import` and `export` schedules. [Later style text parsing](https://bunkat.github.io/later/parsers.html#text) supported. `import` also can utilize a `@watch:<path/to/file>` syntax while `export` additionally supports `@immediate`.  |
-| `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
-| `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
-| `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
-| `paths` | :-1: | An optional configuration block that can set a `retain` path and/or a `reject` path. These will be used for archiving processed packets. |
+Please see the [FTN/BSO Scanner/Tosser](bso-import-export.md) documentation for information on this area.
 
 Example:
 ```hjson

From cc9c1439273346f09909ed15f2219e9f8e76fa1d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:04:29 -0700
Subject: [PATCH 0504/1013] Cleanup & prep for real-time interrupt

---
 core/menu_module.js          | 22 +++++++++++++---------
 core/user_interrupt_queue.js |  6 +++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 2dd40b9e..1e68823c 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -42,14 +42,6 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.detachViewControllers();
     }
 
-    toggleInterruptionAndDisplayQueued(cb) {
-        this.enableInterruption();
-        this.displayQueuedInterruptions( () => {
-            this.disableInterruption();
-            return cb(null);
-        });
-    }
-
     initSequence() {
         const self      = this;
         const mciData   = {};
@@ -185,6 +177,14 @@ exports.MenuModule = class MenuModule extends PluginModule {
         }
     }
 
+    toggleInterruptionAndDisplayQueued(cb) {
+        this.enableInterruption();
+        this.displayQueuedInterruptions( () => {
+            this.disableInterruption();
+            return cb(null);
+        });
+    }
+
     displayQueuedInterruptions(cb) {
         if(true !== this.interruptable) {
             return cb(null);
@@ -193,7 +193,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         async.whilst(
             () => this.client.interruptQueue.hasItems(),
             next => {
-                this.client.interruptQueue.display( (err, interruptItem) => {
+                this.client.interruptQueue.displayNext( (err, interruptItem) => {
                     if(err) {
                         return next(err);
                     }
@@ -211,6 +211,10 @@ exports.MenuModule = class MenuModule extends PluginModule {
         )
     }
 
+    attemptInterruptNow(interruptItem, cb) {
+        return cb(null, false);
+    }
+
     getSaveState() {
         //  nothing in base
     }
diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index be6767d5..1a62e063 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -43,12 +43,16 @@ module.exports = class UserInterruptQueue
         return this.queue.length > 0;
     }
 
-    display(cb) {
+    displayNext(cb) {
         const interruptItem = this.queue.pop();
         if(!interruptItem) {
             return cb(null);
         }
 
+        return interruptItem ? this.displayWithItem(interruptItem, cb) : cb(null);
+    }
+
+    displayWithItem(interruptItem, cb) {
         if(interruptItem.cls) {
             this.client.term.rawWrite(ANSI.clearScreen());
         } else {

From c5100d741a8349b0fdd85ccbc4505e11ebfd2110 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:05:05 -0700
Subject: [PATCH 0505/1013] Del dupe config example

---
 docs/messageareas/message-networks.md | 46 ---------------------------
 1 file changed, 46 deletions(-)

diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index 10904cab..84b7859e 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -66,49 +66,3 @@ Example:
 
 ### FTN/BSO Scanner Tosser
 Please see the [FTN/BSO Scanner/Tosser](bso-import-export.md) documentation for information on this area.
-
-Example:
-```hjson
-scannerTossers: {
-  ftn_bso: {
-    schedule: {
-      //  Check every 30m, or whenever the "toss!.now" file is touched (ie: by Binkd)
-      import: every 30 minutes or @watch:/enigma-bbs/mail/ftn_in/toss!.now
-
-      //  Export immediately, but also check every 15m to be sure
-      export: every 15 minutes or @immediate
-    }
-
-    // optional
-    paths: {
-      reject: /path/to/store/bad/packets/
-      retain: /path/to/store/good/packets/
-    }
-
-    //  Override default FTN/BSO packet encoding. Defaults to 'utf8'
-    packetMsgEncoding: utf8
-
-    defaultNetwork: fsxnet
-
-    nodes: {
-      "21:1/100" : {            //  May also contain wildcards, ie: "21:1/*"
-        archiveType: ZIP        //  By-ext archive type: ZIP, ARJ, ..., optional.
-        encoding: utf8          //  Encoding for exported messages
-        packetPassword: MUHPA55 //  FTN .PKT password, optional
-
-        tic: {
-          //  See TIC docs
-        }
-      }
-    }
-
-    netMail: {
-      //  See NetMail docs
-    }
-
-    ticAreas: {
-      //  See TIC docs
-    }
-  }
-}
-```
\ No newline at end of file

From 4d5b8c0dd94fd9b4d5cc33cdcf0c0d0153fe44ed Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:10:03 -0700
Subject: [PATCH 0506/1013] Not official links, but better than nothing for now

---
 docs/messageareas/bso-import-export.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index 106fd65a..af8784d1 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -4,7 +4,7 @@ title: BSO Import / Export
 ---
 The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
 
-:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this!
+:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external [mailer](http://www.filegate.net/bbsmailers.htm) such as [Binkd](https://github.com/pgul/binkd) is required for this!
 
 Let's look at some of the basic configuration:
 

From 7f67e9adc7243208f8c151415681b26a4144fd98 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:14:08 -0700
Subject: [PATCH 0507/1013] Add link to Binkd blog

---
 docs/messageareas/bso-import-export.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index af8784d1..ac645c63 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -118,4 +118,7 @@ scannerTossers: {
     }
   }
 }
-```
\ No newline at end of file
+```
+
+## Additional Resources
+* [Blog entry on setting up ENiGMA + Binkd on CentOS7](http2://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` refernces!

From f4e710b37903cf7c1fbab861bf9d80545b4da0ce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:15:19 -0700
Subject: [PATCH 0508/1013] Typo fix

---
 docs/messageareas/bso-import-export.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index ac645c63..88b36a25 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -121,4 +121,4 @@ scannerTossers: {
 ```
 
 ## Additional Resources
-* [Blog entry on setting up ENiGMA + Binkd on CentOS7](http2://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` refernces!
+* [Blog entry on setting up ENiGMA + Binkd on CentOS7](https://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` refernces!

From 080d1727c2b12ea218ef75f96d9307b993f551d2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 14 Nov 2018 22:47:20 -0700
Subject: [PATCH 0509/1013] WIP on real-time interruptions (ie: incoming
 message) Still need work on *when* they are allowed with good defaults, etc.

---
 core/menu_module.js          | 32 ++++++++++++++++++--------------
 core/user_interrupt_queue.js | 20 +++++++++++++++++---
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 1e68823c..bd75c94c 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -192,19 +192,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
 
         async.whilst(
             () => this.client.interruptQueue.hasItems(),
-            next => {
-                this.client.interruptQueue.displayNext( (err, interruptItem) => {
-                    if(err) {
-                        return next(err);
-                    }
-
-                    if(interruptItem.pause) {
-                        return this.pausePrompt(next);
-                    }
-
-                    return next(null);
-                });
-            },
+            next => this.client.interruptQueue.displayNext(next),
             err => {
                 return cb(err);
             }
@@ -212,7 +200,21 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     attemptInterruptNow(interruptItem, cb) {
-        return cb(null, false);
+        if(true !== this.interruptable) {
+            return cb(null, false); //  don't eat up the item; queue for later
+        }
+
+        //
+        //  Default impl: clear screen -> standard display -> reload menu
+        //
+        this.client.interruptQueue.displayWithItem(Object.assign({}, interruptItem, { cls : true }), err => {
+            if(err) {
+                return cb(err, false);
+            }
+            this.reload(err => {
+                return cb(err, err ? false : true);
+            });
+        });
     }
 
     getSaveState() {
@@ -311,6 +313,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
             } else {
                 return gotoNextMenu();
             }
+        } else {
+            this.enableInterruption();
         }
     }
 
diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index 1a62e063..e48fc2ea 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -35,8 +35,17 @@ module.exports = class UserInterruptQueue
         if(!_.isString(interruptItem.contents) && !_.isString(interruptItem.text)) {
             return;
         }
+
+        //  pause defaulted on
         interruptItem.pause = _.get(interruptItem, 'pause', true);
-        this.queue.push(interruptItem);
+
+        this.client.currentMenuModule.attemptInterruptNow(interruptItem, (err, ateIt) => {
+            if(err) {
+                //  :TODO: Log me
+            } else if(true !== ateIt) {
+                this.queue.push(interruptItem);
+            }
+        });
     }
 
     hasItems() {
@@ -61,8 +70,13 @@ module.exports = class UserInterruptQueue
 
         if(interruptItem.contents) {
             Art.display(this.client, interruptItem.contents, err => {
-                this.client.term.rawWrite('\r\n\r\n');
-                return cb(err, interruptItem);
+                if(err) {
+                    return cb(err);
+                }
+                //this.client.term.rawWrite('\r\n\r\n');  //  :TODO: Prob optional based on contents vs text
+                this.client.currentMenuModule.pausePrompt( () => {
+                    return cb(null);
+                });
             });
         } else {
             return this.client.term.write(pipeToAnsi(`${interruptItem.text}\r\n\r\n`, this.client), cb);

From 3b0a872eaf61205b5b1a23ff126da359cc59718b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan.ashby@storagecraft.com>
Date: Thu, 15 Nov 2018 16:42:40 -0700
Subject: [PATCH 0510/1013] Basic updates. WIP

---
 docs/art/themes.md | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/docs/art/themes.md b/docs/art/themes.md
index 9ef482b6..7fb02ef2 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -2,9 +2,29 @@
 layout: page
 title: Themes
 ---
-# Creating Your Own
-:warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included 
-`luciano_blocktronics' theme. Create your own and make changes to that instead:
+## Themes
+ENiGMA½ comes with an advanced theming system allowing system operators to highly customize the look and feel of their boards. A given installation can have as many themes as you like for your users to choose from.
+
+## General Information
+Themes live in `art/themes/`. Each theme (and thus it's *theme ID*) is a directory within the `themes` directory. The theme itself is simply a collection of art files, and a `theme.hjson` file that further defines layout, colors & formatting, etc. ENiGMA½ comes with a default theme by [Luciano Ayres](http://blocktronics.org/tag/luciano-ayres/) of [Blocktronics](http://blocktronics.org/) called Mystery Skull. This theme is in `art/themes/luciano_blocktronics`, and thus it's *theme ID* is `luciano_blocktronics`.
+
+## Theme Sections
+Themes are have some important sections to be aware of:
+
+* `info`: This section describes the theme. You may set the `enabled` field to `false` to disable it (Users assigned to this theme fall back to the default set in your `config.hjson`).
+* `customization`: The beef!
+
+### Theme Section: Customization
+The `customization` block in `theme.hjson` is itself broken up into major parts:
+* `defaults`: Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme.
+* `menus`: The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked.
+* `prompts`: Similar to `menus`, this file themes prompts found in `prompts.hjson`.
+
+TODO: More information about theming!
+
+
+## Creating Your Own
+:warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included `luciano_blocktronics' theme. Create your own and make changes to that instead:
 
 1. Copy `/art/themes/luciano_blocktronics` to `art/themes/your_board_theme`
 2. Update the `info` block at the top of the theme.hjson file:
@@ -17,13 +37,10 @@ title: Themes
     }
 ```
 
-3. Specify it in the `defaults` section of `config.hjson`. The name supplied should match the name of the 
-directory you created in step 1:
-
+3. If desired, you may make this the default system theme in `config.hjson` via `theme.default`. `theme.preLogin` may be set if you want this theme used for pre-authenticated users. Both of these values also accept `*` if you want the system to radomly pick.
 ``` hjson
-    defaults: {
-        theme: your_board_theme
-    }
+  theme: {
+    default: your_board_theme
+    preLogin: *
+  }
 ```
-
-# General Theme Info
\ No newline at end of file

From f9429dd2e666034324e3f50c6ec8c8ccb64cdc8e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 15 Nov 2018 20:32:08 -0700
Subject: [PATCH 0511/1013] Move where passwordChar lives

---
 art/themes/luciano_blocktronics/theme.hjson | 4 +---
 core/theme.js                               | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index aa720934..d23904af 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -9,9 +9,7 @@
 	customization: {
 
 		defaults: {
-			general: {
-				passwordChar: *
-			}
+			passwordChar: *
 
 			dateTimeFormat: {
 				short: MMM Do h:mm a
diff --git a/core/theme.js b/core/theme.js
index 2f88027e..6414da62 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -38,7 +38,7 @@ function refreshThemeHelpers(theme) {
         getPasswordChar : function() {
             let pwChar = _.get(
                 theme,
-                'customization.defaults.general.passwordChar',
+                'customization.defaults.passwordChar',
                 Config().theme.passwordChar
             );
 

From 3313421341b8407e5d092fdb485027f30f44b14c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 15 Nov 2018 20:32:19 -0700
Subject: [PATCH 0512/1013] Yet more docs on themes... more to come!

---
 docs/art/themes.md | 101 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 92 insertions(+), 9 deletions(-)

diff --git a/docs/art/themes.md b/docs/art/themes.md
index 7fb02ef2..c3ac38cf 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -8,19 +8,102 @@ ENiGMA½ comes with an advanced theming system allowing system operators to high
 ## General Information
 Themes live in `art/themes/`. Each theme (and thus it's *theme ID*) is a directory within the `themes` directory. The theme itself is simply a collection of art files, and a `theme.hjson` file that further defines layout, colors & formatting, etc. ENiGMA½ comes with a default theme by [Luciano Ayres](http://blocktronics.org/tag/luciano-ayres/) of [Blocktronics](http://blocktronics.org/) called Mystery Skull. This theme is in `art/themes/luciano_blocktronics`, and thus it's *theme ID* is `luciano_blocktronics`.
 
+## Art
+Of course one of the most basic elements of BBS theming is art. ENiGMA½ uses a fallback system for art selection by default (you may override this in a `menu.hjson` entry if desired). When a menu entry calls for a piece of art, the following search is made:
+
+1. If a direct or relative path is supplied, look there first.
+2. In the users current theme directory.
+3. In the system default theme directory.
+4. In the `art/general` directory.
+
+TL;DR: In general, to theme a piece of art, create a version of it in your themes directory.
+
+:information: Remember that by default, the system will allow for randomly selecting art (in one of the directories mentioned above) by numbering it: `FOO1.ANS`, `FOO2.ANS`, etc.!
+
 ## Theme Sections
-Themes are have some important sections to be aware of:
+Themes are some important sections to be aware of:
 
-* `info`: This section describes the theme. You may set the `enabled` field to `false` to disable it (Users assigned to this theme fall back to the default set in your `config.hjson`).
-* `customization`: The beef!
+| Config Item | Description                                              |
+|-------------|----------------------------------------------------------|
+| `info` | This section describes the theme. |
+| `customization` | The beef! |
 
-### Theme Section: Customization
-The `customization` block in `theme.hjson` is itself broken up into major parts:
-* `defaults`: Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme.
-* `menus`: The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked.
-* `prompts`: Similar to `menus`, this file themes prompts found in `prompts.hjson`.
+### Info Block
+The `info` configuration block describes the theme itself.
 
-TODO: More information about theming!
+| Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `name`   | :+1: | Name of the theme. Be creative! |
+| `author` | :+1: | Author of the theme/artwork. |
+| `group` | :-1: | Group/affils of author. |
+| `enabled` | :-1: | Boolean of enabled state. If set to `false`, this theme will not be available to your users. If a user currently has this theme selected, the system default will be selected for them at next login. |
+
+### Customization Block
+The `customization` block in is itself broken up into major parts:
+
+| Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `defaults` | :-1: | Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme. |
+| `menus` | :-1: | The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked. |
+| `prompts` | :-1: | Similar to `menus`, this file themes prompts found in `prompts.hjson`. |
+
+#### Defaults
+| Item | Description                                              |
+|-------------|---------------------------------------------------|
+| `passwordChar` | Character to display in password fields |
+| `dateFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for dates. |
+| `timeFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for times. |
+| `dateTimeFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for date/time combinations. | 
+
+Example:
+```hjson
+defaults: {
+  dateTimeFormat: {
+    short:  MMM Do h:mm a
+  }
+}
+```
+
+#### Menus Block
+Each *key* in the `menus` block matches up with a key found in your `menu.hjson`. For example, consider a `matrix` menu defined in `menu.hjson`. In addition to perhaps providing a `MATRIX.ANS` in your themes directory, you can also theme other parts of the menu via a `matrix` entry in `theme.hjson`.
+
+Major areas to override/theme:
+* `config`: Override and/or provide additional theme information over that found in the `menu.hjson`'s entry. Common entries here are for further overriding date/time formats, and custom range info formats (`<someFormName>InfoFormat<num>`).
+* `mci`: Set `height`, `width`, override `text`, `textStyle`/`focusTextStyle`, `itemFormat`/`focusItemFormat`, etc.
+
+Two main formats for `mci` are allowed:
+* Verbose where a form ID(s) are supplied.
+* Shorthand if only a single/first form is needed.
+
+Example: Verbose `mci` with form IDs:
+```hjson
+newUserFeedbackToSysOp: {
+  0: {
+    mci: {
+      TL1: { width: 19, textOverflow: "..." }
+      ET2: { width: 19, textOverflow: "..." }
+      ET3: { width: 19, textOverflow: "..." }
+    }
+  }
+  1: {
+    mci: {
+      MT1: { height: 14 }
+    }
+  }
+}
+```
+
+Example: Shorthand `mci` format:
+```hjson
+matrix: {
+  mci: {
+    VM1: {
+      itemFormat: "|03{text}"
+      focusItemFormat: "|11{text!styleFirstLower}"
+    }
+  }
+}
+```
 
 
 ## Creating Your Own

From fbf07cda0cfab1a6ca1e4662ef68e969875ef1cd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 15 Nov 2018 21:38:19 -0700
Subject: [PATCH 0513/1013] Doc updates

---
 UPGRADE.md                             |  1 +
 docs/messageareas/bso-import-export.md | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 8cb98e13..359abec1 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -61,6 +61,7 @@ webSocket: {
 * The `system.db` `user_event_log` table has been updated to include a unique session ID. Previously this table was not used, but you will need to perform a slight maintenance task before it can be properly used. After updating to `0.0.9-alpha`, please run the following: `sqlite3 db/system.db DROP TABLE user_event_log;`. The new table format will be created and used at startup.
 * If you have art configured for message conference or area selection via the `art` configuration value, you will need to include a `show_art` menu reference. Defaulted to `changeMessageConfPreArt` for conferences and `changeMessageAreaPreArt` for areas & included in the example `menu.hjson`.
 * Config `defaults` section was theme related and as such, has been renamed to `theme`. `defaults.theme` is now `theme.default`, and `preLoginTheme` is now `theme.preLogin`. See `config.js` if this isn't clear as mud.
+* Similar to the last item, `defaults.general.passwordChar` in `theme.hjson` is now just `defaults.passwordChar`.
 
 
 # 0.0.7-alpha to 0.0.8-alpha
diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index 88b36a25..ad189bbc 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -23,7 +23,7 @@ Schedules can be defined for importing and exporting via `import` and `export` u
 
   * `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
   * `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
-  * Free form text can be things like `at 5:00 pm` or `every 2 hours`. 
+  * Free form [Later style](https://bunkat.github.io/later/parsers.html#text) text — can be things like `at 5:00 pm` or `every 2 hours`. 
   
 See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
 
@@ -45,14 +45,14 @@ See [Later text parsing documentation](http://bunkat.github.io/later/parsers.htm
 ## Nodes
 The `nodes` section defines how to export messages for one or more uplinks. 
 
-A node entry starts with a FTN style address (up to 5D) **as a key** in `config.hjson`. This key may contain wildcard(s) for net/zone/node/point/domain. 
+A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001) (up to 5D) **as a key** in `config.hjson`. This key may contain wildcard(s) for net/zone/node/point/domain.
 
 | Config Item      | Required | Description                                                                     |
 |------------------|----------|---------------------------------------------------------------------------------|
-| `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability          |
-| `packetPassword` | :-1:     | Password for the packet                                                         |
-| `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`                         |
-| `archiveType`    | :-1:     | Specifies the archive type for ArcMail bundles. Must be a valid archiver name such as `zip` (See archiver configuration) |
+| `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability. |
+| `packetPassword` | :-1:     | Optional password for the packet |
+| `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`. |
+| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See docs on archiver configuration for more information. |
 
 **Example**:
 ```hjson
@@ -60,9 +60,9 @@ A node entry starts with a FTN style address (up to 5D) **as a key** in `config.
   scannerTossers: {
     ftn_bso: {
       nodes: {
-        "21:*": {
+        "21:*": { // wildcard address
           packetType: 2+
-          packetPassword: mypass
+          packetPassword: D@TP4SS
           encoding: cp437
           archiveType: zip
         }

From f4b03826b07e0380747779e7af79bd43cd9f498d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 15 Nov 2018 22:21:45 -0700
Subject: [PATCH 0514/1013] Fix --version

---
 core/oputil/oputil_main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/oputil/oputil_main.js b/core/oputil/oputil_main.js
index d9492c0d..aafc8ef1 100644
--- a/core/oputil/oputil_main.js
+++ b/core/oputil/oputil_main.js
@@ -17,7 +17,7 @@ module.exports = function() {
     process.exitCode = ExitCodes.SUCCESS;
 
     if(true === argv.version) {
-        return console.info(require('../package.json').version);
+        return console.info(require('../../package.json').version);
     }
 
     if(0 === argv._.length ||

From f1f749499ff4a8c679e1b2b98a40cf3d3c25de59 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 16 Nov 2018 18:30:44 -0700
Subject: [PATCH 0515/1013] More doc updates

---
 docs/art/mci.md               |  5 +++--
 docs/art/themes.md            | 24 +++++++++++++++++-------
 docs/modding/msg-area-list.md |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/art/mci.md b/docs/art/mci.md
index f5876105..36ca4aa6 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -71,6 +71,7 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
 
+
 Some additional special case codes also exist:
 | Code   | Description  |
 |--------|--------------|
@@ -78,7 +79,7 @@ Some additional special case codes also exist:
 | `CB##` | Moves the cursor position back _##_ characters |
 | `CU##` | Moves the cursor position up _##_ characters |
 | `CD##` | Moves the cursor position down _##_ characters |
-| `XY`   | A special code that may be utilized for placement identification when creating menus or to extend an otherwise empty space in an art file down the screen.
+| `XY`   | A special code that may be utilized for placement identification when creating menus or to extend an otherwise empty space in an art file down the screen. |
 
 
 ## Views
@@ -104,7 +105,7 @@ see additional information.
 
 
 ## Properties & Theming
-Predefined MCI codes and other Views can have properties set via `menu.hjson` and further *themed* via `theme.hjson`.
+Predefined MCI codes and other Views can have properties set via `menu.hjson` and further *themed* via `theme.hjson`. See [Themes](themes.md) for more information on this subject.
 
 ### Common Properties
 
diff --git a/docs/art/themes.md b/docs/art/themes.md
index c3ac38cf..f0093897 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -41,11 +41,11 @@ The `info` configuration block describes the theme itself.
 ### Customization Block
 The `customization` block in is itself broken up into major parts:
 
-| Item | Required | Description                                              |
+| Item | Description                                              |
 |-------------|----------|----------------------------------------------------------|
-| `defaults` | :-1: | Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme. |
-| `menus` | :-1: | The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked. |
-| `prompts` | :-1: | Similar to `menus`, this file themes prompts found in `prompts.hjson`. |
+| `defaults` | Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme. |
+| `menus` | The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked. |
+| `prompts` | Similar to `menus`, this file themes prompts found in `prompts.hjson`. |
 
 #### Defaults
 | Item | Description                                              |
@@ -68,10 +68,10 @@ defaults: {
 Each *key* in the `menus` block matches up with a key found in your `menu.hjson`. For example, consider a `matrix` menu defined in `menu.hjson`. In addition to perhaps providing a `MATRIX.ANS` in your themes directory, you can also theme other parts of the menu via a `matrix` entry in `theme.hjson`.
 
 Major areas to override/theme:
-* `config`: Override and/or provide additional theme information over that found in the `menu.hjson`'s entry. Common entries here are for further overriding date/time formats, and custom range info formats (`<someFormName>InfoFormat<num>`).
-* `mci`: Set `height`, `width`, override `text`, `textStyle`/`focusTextStyle`, `itemFormat`/`focusItemFormat`, etc.
+* `config`: Override and/or provide additional theme information over that found in the `menu.hjson`'s entry. Common entries here are for further overriding date/time formats, and custom range info formats (`<someFormName>InfoFormat<num>`). See Entry Formatting in [MCI Codes](mci.md) and Custom Range Info Formatting below.
+* `mci`: Set per-MCI code properties such as `height`, `width`, text styles, etc. See [MCI Codes](mci.md) for a more information.
 
-Two main formats for `mci` are allowed:
+Two formats for `mci` blocks are allowed:
 * Verbose where a form ID(s) are supplied.
 * Shorthand if only a single/first form is needed.
 
@@ -105,6 +105,16 @@ matrix: {
 }
 ```
 
+##### Custom Range Info Formatting
+Many modules support "custom range" MCI items. These are MCI codes that are left to the user to define using a format object specific to the module. For example, consider the `msg_area_list` module: This module sets MCI codes 10+ (`%TL10`, `%TL11`, etc.) as "custom range". When theming you can place these MCI codes in your artwork then define the format in `theme.hjson`:
+
+```hjson
+messageAreaChangeCurrentArea: {
+  config: {
+    areaListInfoFormat10: "|15{name}|07: |03{desc}"
+  }
+}
+```
 
 ## Creating Your Own
 :warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included `luciano_blocktronics' theme. Create your own and make changes to that instead:
diff --git a/docs/modding/msg-area-list.md b/docs/modding/msg-area-list.md
index e3f5cde1..499b7fa6 100644
--- a/docs/modding/msg-area-list.md
+++ b/docs/modding/msg-area-list.md
@@ -14,4 +14,4 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 
 The following additional MCIs are updated as the user changes selections in the main list:
 * MCI 2 (ie: `%TL2` or `%M%2`) is updated with the area description.
-* MCI 10+ (ie `%TL10`...) are custom ranges updated with the same information available above in `itemFormat`.
+* MCI 10+ (ie `%TL10`...) are custom ranges updated with the same information available above in `itemFormat`. Use `areaListItemFormat##`.

From d83201248ac328252b2f5b57a41e89870f9c8997 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 16 Nov 2018 18:42:04 -0700
Subject: [PATCH 0516/1013] Fix tables hopefully

---
 docs/art/mci.md    | 2 +-
 docs/art/themes.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/art/mci.md b/docs/art/mci.md
index 36ca4aa6..bc6bab5a 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -71,8 +71,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
 
-
 Some additional special case codes also exist:
+
 | Code   | Description  |
 |--------|--------------|
 | `CF##` | Moves the cursor position forward _##_ characters |
diff --git a/docs/art/themes.md b/docs/art/themes.md
index f0093897..713e2d72 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -42,7 +42,7 @@ The `info` configuration block describes the theme itself.
 The `customization` block in is itself broken up into major parts:
 
 | Item | Description                                              |
-|-------------|----------|----------------------------------------------------------|
+|-------------|---------------------------------------------------|
 | `defaults` | Default values to use when this theme is active. These values override system defaults, but can still be overridden themselves in specific areas of your theme. |
 | `menus` | The bulk of what you theme in the system will be here. Any menu (that is, anything you find in `menu.hjson`) can be tweaked. |
 | `prompts` | Similar to `menus`, this file themes prompts found in `prompts.hjson`. |

From cf64be3550725150f9c2bf105ba0ec72b28062b6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 01:21:11 -0700
Subject: [PATCH 0517/1013] docs

---
 docs/art/themes.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/art/themes.md b/docs/art/themes.md
index 713e2d72..9bc0eb9e 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -18,7 +18,7 @@ Of course one of the most basic elements of BBS theming is art. ENiGMA½ uses a
 
 TL;DR: In general, to theme a piece of art, create a version of it in your themes directory.
 
-:information: Remember that by default, the system will allow for randomly selecting art (in one of the directories mentioned above) by numbering it: `FOO1.ANS`, `FOO2.ANS`, etc.!
+:information_source: Remember that by default, the system will allow for randomly selecting art (in one of the directories mentioned above) by numbering it: `FOO1.ANS`, `FOO2.ANS`, etc.!
 
 ## Theme Sections
 Themes are some important sections to be aware of:
@@ -50,7 +50,7 @@ The `customization` block in is itself broken up into major parts:
 #### Defaults
 | Item | Description                                              |
 |-------------|---------------------------------------------------|
-| `passwordChar` | Character to display in password fields |
+| `passwordChar` | Character to display in password fields. Defaults to `*` |
 | `dateFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for dates. |
 | `timeFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for times. |
 | `dateTimeFormat` | Sets the [moment.js](https://momentjs.com/docs/#/displaying/) style `short` and/or `long` format for date/time combinations. | 
@@ -117,16 +117,16 @@ messageAreaChangeCurrentArea: {
 ```
 
 ## Creating Your Own
-:warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included `luciano_blocktronics' theme. Create your own and make changes to that instead:
+:warning: ***IMPORTANT!*** It is recommended you don't make any customisations to the included `luciano_blocktronics' theme. Instead, create your own and make changes to that instead:
 
 1. Copy `/art/themes/luciano_blocktronics` to `art/themes/your_board_theme`
 2. Update the `info` block at the top of the theme.hjson file:
 ``` hjson
     info: {
-        name: Awesome Theme
-        author: Cool Artist
-        group: Sick Group
-        enabled: true
+      name: Awesome Theme
+      author: Cool Artist
+      group: Sick Group
+      enabled: true // default
     }
 ```
 

From 0891fffc67da2a7ddb97f694f6132184280d7174 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 01:52:17 -0700
Subject: [PATCH 0518/1013] Docs

---
 docs/art/general.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/art/general.md b/docs/art/general.md
index f08994e8..fa6d623a 100644
--- a/docs/art/general.md
+++ b/docs/art/general.md
@@ -2,4 +2,5 @@
 layout: page
 title: General
 ---
-General art lives in the `art/general` directory. 'General' art is ANSI you want to stay consistent across themes, such as a welcome ANSI or a rotation of logoff ANSIs. 
+## General Art
+General art lives in the `art/general` directory. This is art (ANSI, ASCII, ...) you want to stay consistent across themes, such as a login croller or a set of logoff screens to pick randomly.

From b4b20e4972d6c11aafe80d52363a6986bc106cdc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 11:44:27 -0700
Subject: [PATCH 0519/1013] Lots of doc updates around art

---
 docs/art/general.md              | 111 ++++++++++++++++++++++++++++++-
 docs/art/themes.md               |   9 +--
 docs/configuration/menu-hjson.md |   4 +-
 3 files changed, 111 insertions(+), 13 deletions(-)

diff --git a/docs/art/general.md b/docs/art/general.md
index fa6d623a..a0620de3 100644
--- a/docs/art/general.md
+++ b/docs/art/general.md
@@ -1,6 +1,111 @@
 ---
 layout: page
-title: General
+title: General Art Information
 ---
-## General Art
-General art lives in the `art/general` directory. This is art (ANSI, ASCII, ...) you want to stay consistent across themes, such as a login croller or a set of logoff screens to pick randomly.
+## General Art Information
+One of the most basic elements of BBS customization is through it's artwork. ENiGMA½ supports a variety of ways to select, display, and manage art.
+
+As a general rule, art files live in one of two places:
+
+1. The `art/general` directory. This is where you place command non-themed art files.
+2. Within a theme such as `art/themes/super_fancy_theme`.
+
+### Menu Entries
+While art can be displayed programmatically such as from a custom module, the most basic and common form is via `menu.hjson` entries. This usually falls into one of two forms: a "standard" entry where a single `art` spec is utilized or a entry for a custom module where multiple pieces are declared and used. The second style usually takes the form of a `config.art` block with two or more entries.
+
+A menu entry has a few elements that control how art is choosen and displayed. First, the `art` *spec* tells teh system how to look for the art asset. Second, the `config` block can further control aspecs of lookup and display:
+
+| Item | Description|
+|------|------------|
+| `font` | Sets the [SyncTERM](http://syncterm.bbsdev.net/) style font to use when displaying this art. If unset, the system will use the art's embedded [SAUCE](http://www.acid.org/info/sauce/sauce.htm) record if present or simply use the current font. See Fonts below. |
+| `pause` | If set to `true`, pause after displaying. |
+| `baudRate` | Set a [SyncTERM](http://syncterm.bbsdev.net/) style emulated baud rate when displaying this art. In other words, slow down the display. |
+| `cls` | Clear the screen before display if set to `true`. |
+| `random` | Set to `false` to explicitly disable random lookup. |
+| `types` | An optional array of types (aka file extensions) to consider for lookup. For example : `[ '.ans', '.asc' ]` |
+| `readSauce` | May be set to `false` if you need to explictly disable SAUCE support. |
+
+#### Art Spec
+It was mentioned that the `art` member is a *spec*. The value of a `art` member controls how the system looks for an asset. The following forms are supported:
+
+* `FOO`: The system will look for `FOO.ANS`, `FOO.ASC`, `FOO.TXT`, etc. using the default search path. Unless otherwise specified if `FOO1.ANS`, `FOO2.ANS`, and so on exist, a random selection will be made.
+* `FOO.ANS`: By specifying an extension, only that type will be searched for.
+* `rel/path/to/BAR.ANS`: Only match a path (relative to the system's `art` directory).
+* `/path/to/BAZ.ANS`: Exact path only.
+
+ENiGMA½ uses a fallback system for art selection. When a menu entry calls for a piece of art, the following search is made:
+
+1. If a direct or relative path is supplied, look there first.
+2. In the users current theme directory.
+3. In the system default theme directory.
+4. In the `art/general` directory.
+
+#### SyncTERM Style Fonts
+ENiGMA½ can set a [SyncTERM](http://syncterm.bbsdev.net/) style font for art display. This is supported by many popular BBS terminals besides just SyncTERM and is common for displaying Amiga style fonts for example. The system will use the `font` specifier or look for a font declared in an artworks SAUCE record (unless `readSauce` is `false`).
+
+The most common fonts are probably as follows:
+
+* `cp437`
+* `c64_upper`
+* `c64_lower`
+* `c128_upper`
+* `c128_lower`
+* `atari`
+* `pot_noodle`
+* `mo_soul`
+* `microknight_plus`
+* `topaz_plus`
+* `microknight`
+* `topaz`
+
+Other fonts fonts also available:
+* `cp1251`
+* `koi8_r`
+* `iso8859_2`
+* `iso8859_4`
+* `cp866`
+* `iso8859_9`
+* `haik8`
+* `iso8859_8`
+* `koi8_u`
+* `iso8859_15`
+* `iso8859_4`
+* `koi8_r_b`
+* `iso8859_4`
+* `iso8859_5`
+* `ARMSCII_8`
+* `iso8859_15`
+* `cp850`
+* `cp850`
+* `cp885`
+* `cp1251`
+* `iso8859_7`
+* `koi8-r_c`
+* `iso8859_4`
+* `iso8859_1`
+* `cp866`
+* `cp437`
+* `cp866`
+* `cp885`
+* `cp866_u`
+* `iso8859_1`
+* `cp1131`
+
+See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
+
+#### SyncTERM Style Baud Rates
+The `baudRate` member can set a [SyncTERM](http://syncterm.bbsdev.net/) style emulated baud rate. May be `300`, `600`, `1200`, `2400`, `4800`, `9600`, `19200`, `38400`, `57600`, `76800`, or `115200`. A value of `ulimited`, `off`, or `0` resets (disables) the rate.  See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
+
+## Common Example
+```hjson
+fullLogoffSequenceRandomBoardAd: {
+    art: OTHRBBS
+    desc: Logging Off
+    next: logoff
+    config: {
+        baudRate: 57600
+        pause: true
+        cls: true
+    }
+}
+```
\ No newline at end of file
diff --git a/docs/art/themes.md b/docs/art/themes.md
index 9bc0eb9e..577a95fe 100644
--- a/docs/art/themes.md
+++ b/docs/art/themes.md
@@ -9,14 +9,7 @@ ENiGMA½ comes with an advanced theming system allowing system operators to high
 Themes live in `art/themes/`. Each theme (and thus it's *theme ID*) is a directory within the `themes` directory. The theme itself is simply a collection of art files, and a `theme.hjson` file that further defines layout, colors & formatting, etc. ENiGMA½ comes with a default theme by [Luciano Ayres](http://blocktronics.org/tag/luciano-ayres/) of [Blocktronics](http://blocktronics.org/) called Mystery Skull. This theme is in `art/themes/luciano_blocktronics`, and thus it's *theme ID* is `luciano_blocktronics`.
 
 ## Art
-Of course one of the most basic elements of BBS theming is art. ENiGMA½ uses a fallback system for art selection by default (you may override this in a `menu.hjson` entry if desired). When a menu entry calls for a piece of art, the following search is made:
-
-1. If a direct or relative path is supplied, look there first.
-2. In the users current theme directory.
-3. In the system default theme directory.
-4. In the `art/general` directory.
-
-TL;DR: In general, to theme a piece of art, create a version of it in your themes directory.
+For information on art files, see [General Art Information](general.md). TL;DR: In general, to theme a piece of art, create a version of it in your themes directory.
 
 :information_source: Remember that by default, the system will allow for randomly selecting art (in one of the directories mentioned above) by numbering it: `FOO1.ANS`, `FOO2.ANS`, etc.!
 
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 7d1bbed4..336c9878 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -33,8 +33,8 @@ Menu entries live under the `menus` section of `menu.hjson`. The *key* for a men
     * `cls`: If `true` the screen will be cleared before showing this menu.
     * `pause`: If `true` a pause will occur after showing this menu. Useful for simple menus such as displaying art or status screens.
     * `nextTimeout`: Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu.
-    * `baudRate`: Sets the SyncTERM style emulated baud rate. May be `300`, `600`, `1200`, `2400`, `4800`, `9600`, `19200`, `38400`, `57600`, `76800`, or `115200`. A value of `ulimited`, `off`, or `0` resets (disables) the rate.  See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
-    * `font`: Sets the SyncTERM style font. May be one of the following: `cp437`, `cp1251`, `koi8_r`,  `iso8859_2`, `iso8859_4`, `cp866`, `iso8859_9`, `haik8`, `iso8859_8`, `koi8_u`, `iso8859_15`, `iso8859_4`, `koi8_r_b`, `iso8859_4`, `iso8859_5`, `ARMSCII_8`, `iso8859_15`, `cp850`, `cp850`, `cp885`, `cp1251`, `iso8859_7`, `koi8-r_c`, `iso8859_4`, `iso8859_1`, `cp866`, `cp437`, `cp866`, `cp885`, `cp866_u`, `iso8859_1`, `cp1131`, `c64_upper`, `c64_lower`, `c128_upper`, `c128_lower`, `atari`, `pot_noodle`, `mo_soul`, `microknight_plus`, `topaz_plus`, `microknight`, `topaz`. See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
+    * `baudRate`: See baud rate information in [General Art Information](docs/art/general.md).
+    * `font`: See font listing in [General Art Information](docs/art/general.md).
 
 ## Forms
 TODO

From 8702e309aed34b4ca72f173b634244da1233c255 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 13:14:51 -0700
Subject: [PATCH 0520/1013] Fix bug in default config / user config merging:
 Some arrays should be replaced while others should be merged

---
 core/config.js | 48 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/core/config.js b/core/config.js
index 97091be5..3799d538 100644
--- a/core/config.js
+++ b/core/config.js
@@ -42,17 +42,53 @@ function hasMessageConferenceAndArea(config) {
     return result;
 }
 
+const ArrayReplaceKeyPaths = [
+    'loginServers.ssh.algorithms.kex',
+    'loginServers.ssh.algorithms.cipher',
+    'loginServers.ssh.algorithms.hmac',
+    'loginServers.ssh.algorithms.compress',
+];
+
+const ArrayReplaceKeys = [
+    'args',
+    'sendArgs', 'recvArgs', 'recvArgsNonBatch',
+];
+
 function mergeValidateAndFinalize(config, cb) {
+    const defaultConfig = getDefaultConfig();
+
+    const arrayReplaceKeyPathsMutable = _.clone(ArrayReplaceKeyPaths);
+    const shouldReplaceArray = (arr, key) => {
+        if(ArrayReplaceKeys.includes(key)) {
+            return true;
+        }
+        for(let i = 0; i < arrayReplaceKeyPathsMutable.length; ++i) {
+            const o = _.get(defaultConfig, arrayReplaceKeyPathsMutable[i]);
+            if(_.isEqual(o, arr)) {
+                arrayReplaceKeyPathsMutable.splice(i, 1);
+                return true;
+            }
+        }
+        return false;
+    };
+
     async.waterfall(
         [
             function mergeWithDefaultConfig(callback) {
                 const mergedConfig = _.mergeWith(
-                    getDefaultConfig(),
-                    config, (conf1, conf2) => {
-                        //  Arrays should always concat
-                        if(_.isArray(conf1)) {
-                            //  :TODO: look for collisions & override dupes
-                            return conf1.concat(conf2);
+                    defaultConfig,
+                    config,
+                    (defConfig, userConfig, key) => {
+                        if(Array.isArray(defConfig) && Array.isArray(userConfig)) {
+                            //
+                            //  Arrays are special: Some we merge, while others
+                            //  we simply replace.
+                            //
+                            if(shouldReplaceArray(defConfig, key)) {
+                                return userConfig;
+                            } else {
+                                return _.uniq(defConfig.concat(userConfig));
+                            }
                         }
                     }
                 );

From ac0f54dc9ba9f1b9eb035b7a40d9f5be3b4babc2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 13:24:16 -0700
Subject: [PATCH 0521/1013] Better MCI handling

---
 core/color_codes.js    | 3 ++-
 core/predefined_mci.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index 2032f057..e07b805e 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -110,7 +110,8 @@ function renegadeToAnsi(s, client) {
             result += s.substr(lastIndex, m.index - lastIndex) + attr;
         } else if(m[4] || m[1]) {
             //  |AA MCI code or |Cx## movement where ## is in m[1]
-            const val = getPredefinedMCIValue(client, m[4] || m[1], m[2]) || (m[0]);  //  value itself or literal
+            let val = getPredefinedMCIValue(client, m[4] || m[1], m[2]);
+            val = _.isString(val) ? val : m[0];  //  value itself or literal
             result += s.substr(lastIndex, m.index - lastIndex) + val;
         } else if(m[5]) {
             //  || -- literal '|', that is.
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 9888ba5e..5a04ff07 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -95,7 +95,7 @@ const PREDEFINED_MCI_GENERATORS = {
     ST  : function serverName(client) { return client.session.serverName; },
     FN  : function activeFileBaseFilterName(client) {
         const activeFilter = FileBaseFilters.getActiveFilter(client);
-        return activeFilter ? activeFilter.name : '';
+        return activeFilter ? activeFilter.name : '(Unknown)';
     },
     DN  : function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },      //  Obv/2
     DK  : function userByteDownload(client) {   //  Obv/2 uses DK=downloaded Kbytes

From 36e1456b47510d97109a9205dea4b625f5e79c48 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 18:03:54 -0700
Subject: [PATCH 0522/1013] More doc updates of course

---
 docs/configuration/menu-hjson.md | 127 +++++++++++++++++--------------
 1 file changed, 68 insertions(+), 59 deletions(-)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 336c9878..34114573 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -2,19 +2,10 @@
 layout: page
 title: menu.hjson
 ---
-:warning: ***IMPORTANT!*** Before making any customisations, create your own copy of `/config/menu.hjson`, and specify it in the `general` section of `config.hjson`:
+## Menu HJSON
+The core of a ENiGMA½ based BBS is `menu.hjson`. Note that when `menu.hjson` is referenced, we're actually talking about `config/yourboardname-menu.hjson` or similar. This file determines the menus (or screens) a user can see, the order they come in and how they interact with each other, ACS configuration, etc. Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
 
-````hjson
-general: {
-    menuFile: yourboardname.hjson
-}
-````
-This document and others will refer to `menu.hjson`. This should be seen as an alias to `yourboardname.hjson`
-
-## The Basics
-Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
-
-Entries in `menu.hjson` are objects or _sections_ defining a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
+Entries in `menu.hjson` are often referred to as *blocks* or *sections*. Each entry defines a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
 
 * Classical Main, Messages, and File menus
 * Art file display
@@ -23,21 +14,38 @@ Entries in `menu.hjson` are objects or _sections_ defining a menu. A menu in thi
 Menu entries live under the `menus` section of `menu.hjson`. The *key* for a menu is it's name that can be referenced by other menus and areas of the system.
 
 ## Common Menu Entry Members
-* `desc`: A friendly description that can be found in places such as "Who's Online" or the `%MD` MCI code.
-* `art`: An art file specification.
-* `next`: Specifies the next menu to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below.
-* `prompt`: Specifies a prompt, by name, to use along with this menu.
-* `form`: Defines one or more forms available on this menu.
-* `submit`: Defines a submit handler when using `prompt`.
-* `config`: May contain any of the following standard configuration members in addition to per-module defined types (see appropriate module for more information):
-    * `cls`: If `true` the screen will be cleared before showing this menu.
-    * `pause`: If `true` a pause will occur after showing this menu. Useful for simple menus such as displaying art or status screens.
-    * `nextTimeout`: Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu.
-    * `baudRate`: See baud rate information in [General Art Information](docs/art/general.md).
-    * `font`: See font listing in [General Art Information](docs/art/general.md).
+Below is a table of **common** menu entry members. These members apply to most entries, though entries that are backed by a specialized module (ie: `module: bbs_list`) may differ. See documentation for the module in question for particulars.
+
+| Item   | Description  |
+|--------|--------------|
+| `desc` | A friendly description that can be found in places such as "Who's Online" or wherever the `%MD` MCI code is used. |
+| `art`: | An art file *spec*. See [General Art Information](docs/art/general.md). |
+| `next`: Specifies the next menu entry to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
+| `prompt` | Specifies a prompt, by name, to use along with this menu. Prompts are configured in `prompt.hjson`. |
+| `submit` | Defines a submit handler when using `prompt`.
+| `form` | An object defining one or more *forms* available on this menu. |
+| `module` | Sets the module name to use for this menu. |
+| `config` | An object containing additional configuration. See **Config Block** below. |
+
+### Config Block
+The `config` block for a menu entry can contain common members as well as a per-module (when `module` is used) settings.
+
+| Item | Description |
+|------|-------------|
+| `cls` | If `true` the screen will be cleared before showing this menu. |
+| `pause` | If `true` a pause will occur after showing this menu. Useful for simple menus such as displaying art or status screens. |
+| `nextTimeout` | Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu. |
+| `baudRate` | See baud rate information in [General Art Information](docs/art/general.md). |
+| `font` | Sets a SyncTERM style font to use when displaying this menus `art`. See font listing in [General Art Information](docs/art/general.md). |
+
+
 
 ## Forms
-TODO
+ENiGMA½ uses a concept of *forms* in menus. A form is a collection of associated *views*. Consider a New User Application using the `nua` module: The default implementation utilizes a single form with multiple EditTextView views, a submit button, etc. Forms are identified by number starting with `0`. A given menu may have mutiple forms (often associated with different states or screens within the menu).
+
+Menus may also support more than one layout type by using a *MCI key*. A MCI key is a alpha-numerically sorted key made from 1:n MCI codes. This lets the system choose the appropriate set of form(s) based on theme or random art. An example of this may be a matrix menu: Perhaps one style of your matrix uses a vertical light bar (`VM` key) while another uses a horizontal (`HM` key). The system can discover the correct form to use by matching MCI codes found in the art to that of the available forms defined in `menu.hjson`.
+
+For more information on views and associated MCI codes, see [MCI Codes](docs/art/mci.md).
 
 ## Submit Handlers
 TODO
@@ -49,17 +57,14 @@ Let's look a couple basic menu entries:
 telnetConnected: {
     art: CONNECT
     next: matrix
-    options: { nextTimeout: 1500 }
+    config: { nextTimeout: 1500 }
 }
 ```
 
-The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config).
-
-An art pattern of `CONNECT` is set telling the system to look for `CONNECT<n>.*` where `<n>` represents a optional integer in art files to cause randomness, e.g. `CONNECT1.ANS`, `CONNECT2.ANS`, and so on. If desired, you can also be explicit by supplying a full filename with an extention such as `CONNECT.ANS`.
-
-The entry `next` sets up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
-
-Finally, an `options` object may contain various common options for menus. In this case, `nextTimeout` tells the system to proceed to the `next` entry automatically after 1500ms.
+The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config). The entry sets up a few things:
+* A `art` spec of `CONNECT`. (See [General Art Information](docs/art/general.md)).
+* A `next` entry up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
+* An `config` block containing a single `nextTimeout` field telling the system to proceed to the `next` (`matrix`) entry automatically after 1500ms.
 
 Now let's look at `matrix`, the `next` entry from `telnetConnected`:
 
@@ -68,34 +73,38 @@ matrix: {
     art: matrix
     desc: Login Matrix
     form: {
-    0: {
-        VM: {
-        mci: {
-            VM1:  {
-            submit: true
-            focus:  true            
-            items: [ "login", "apply", "log off" ]
-            argName: matrixSubmit
+        0: {
+            //
+            //  Here we have a MCI key of "VM". In this case we could
+            //  omit this level since no other keys are present.
+            //
+            VM: {
+                mci: {
+                    VM1:  {
+                        submit: true
+                        focus:  true
+                        items: [ "login", "apply", "log off" ]
+                        argName: matrixSubmit
+                    }
+                }
+                submit: {
+                    *: [
+                        {
+                            value: { matrixSubmit: 0 }
+                            action: @menu:login
+                        }
+                        {
+                            value: { matrixSubmit: 1 },
+                            action: @menu:newUserApplication
+                        }
+                        {
+                            value: { matrixSubmit: 2 },
+                            action: @menu:logoff
+                        }
+                    ]
+                }
             }
         }
-        submit: {
-            *: [
-                {
-                    value: { matrixSubmit: 0 }
-                    action: @menu:login
-                }
-                {
-                    value: { matrixSubmit: 1 },
-                    action: @menu:newUserApplication
-                }
-                {
-                    value: { matrixSubmit: 2 },
-                    action: @menu:logoff
-                }
-            ]
-        }
-        }
-    }
     }
 }
 ```

From 7f55dae27f7d1ad2c73d8c5c16073d55a6645aa7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 18:04:45 -0700
Subject: [PATCH 0523/1013] Fix typos

---
 docs/configuration/menu-hjson.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 34114573..3fb6a7dd 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -19,8 +19,8 @@ Below is a table of **common** menu entry members. These members apply to most e
 | Item   | Description  |
 |--------|--------------|
 | `desc` | A friendly description that can be found in places such as "Who's Online" or wherever the `%MD` MCI code is used. |
-| `art`: | An art file *spec*. See [General Art Information](docs/art/general.md). |
-| `next`: Specifies the next menu entry to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
+| `art` | An art file *spec*. See [General Art Information](docs/art/general.md). |
+| `next` | Specifies the next menu entry to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
 | `prompt` | Specifies a prompt, by name, to use along with this menu. Prompts are configured in `prompt.hjson`. |
 | `submit` | Defines a submit handler when using `prompt`.
 | `form` | An object defining one or more *forms* available on this menu. |

From 0f35b0c58e2aaa34af1efff3ceb04e52b0d9934b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 18:05:42 -0700
Subject: [PATCH 0524/1013] Fix paths?

---
 docs/configuration/menu-hjson.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 3fb6a7dd..4f932696 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -35,8 +35,8 @@ The `config` block for a menu entry can contain common members as well as a per-
 | `cls` | If `true` the screen will be cleared before showing this menu. |
 | `pause` | If `true` a pause will occur after showing this menu. Useful for simple menus such as displaying art or status screens. |
 | `nextTimeout` | Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu. |
-| `baudRate` | See baud rate information in [General Art Information](docs/art/general.md). |
-| `font` | Sets a SyncTERM style font to use when displaying this menus `art`. See font listing in [General Art Information](docs/art/general.md). |
+| `baudRate` | See baud rate information in [General Art Information](/docs/art/general.md). |
+| `font` | Sets a SyncTERM style font to use when displaying this menus `art`. See font listing in [General Art Information](/docs/art/general.md). |
 
 
 
@@ -45,7 +45,7 @@ ENiGMA½ uses a concept of *forms* in menus. A form is a collection of associate
 
 Menus may also support more than one layout type by using a *MCI key*. A MCI key is a alpha-numerically sorted key made from 1:n MCI codes. This lets the system choose the appropriate set of form(s) based on theme or random art. An example of this may be a matrix menu: Perhaps one style of your matrix uses a vertical light bar (`VM` key) while another uses a horizontal (`HM` key). The system can discover the correct form to use by matching MCI codes found in the art to that of the available forms defined in `menu.hjson`.
 
-For more information on views and associated MCI codes, see [MCI Codes](docs/art/mci.md).
+For more information on views and associated MCI codes, see [MCI Codes](/docs/art/mci.md).
 
 ## Submit Handlers
 TODO
@@ -62,7 +62,7 @@ telnetConnected: {
 ```
 
 The above entry `telnetConnected` is set as the Telnet server's first menu entry (set by `firstMenu` in the Telnet server's config). The entry sets up a few things:
-* A `art` spec of `CONNECT`. (See [General Art Information](docs/art/general.md)).
+* A `art` spec of `CONNECT`. (See [General Art Information](/docs/art/general.md)).
 * A `next` entry up the next menu, by name, in the stack (`matrix`) that we'll go to after `telnetConnected`.
 * An `config` block containing a single `nextTimeout` field telling the system to proceed to the `next` (`matrix`) entry automatically after 1500ms.
 

From b3ec97cc5cc635a73c78138bc83b56783e70297f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 18:56:09 -0700
Subject: [PATCH 0525/1013] Art asset ACS conditional cleanup: Make more
 general purpose

---
 core/fse.js         | 4 ++--
 core/menu_module.js | 7 ++++++-
 core/theme.js       | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index fcf27ad4..98065b58 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -542,7 +542,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         theme.displayThemedAsset(
                             art[n],
                             self.client,
-                            { font : self.menuConfig.font, acsCondMember : 'art' },
+                            { font : self.menuConfig.font },
                             function displayed(err) {
                                 next(err);
                             }
@@ -622,7 +622,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         theme.displayThemedAsset(
                             art[n],
                             self.client,
-                            { font : self.menuConfig.font, acsCondMember : 'art' },
+                            { font : self.menuConfig.font },
                             function displayed(err, artData) {
                                 if(artData) {
                                     mciData[n] = artData;
diff --git a/core/menu_module.js b/core/menu_module.js
index ee1502cb..0ce2a2a6 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -49,13 +49,18 @@ exports.MenuModule = class MenuModule extends PluginModule {
         const mciData   = {};
         let pausePosition;
 
+        const hasArt = () => {
+            return _.isString(self.menuConfig.art) ||
+                (Array.isArray(self.menuConfig.art) && _.has(self.menuConfig.art[0], 'acs'));
+        };
+
         async.series(
             [
                 function beforeDisplayArt(callback) {
                     self.beforeArt(callback);
                 },
                 function displayMenuArt(callback) {
-                    if(!_.isString(self.menuConfig.art)) {
+                    if(!hasArt()) {
                         return callback(null);
                     }
 
diff --git a/core/theme.js b/core/theme.js
index 6414da62..052eeac7 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -682,8 +682,9 @@ function displayThemedAsset(assetSpec, client, options, cb) {
         options = {};
     }
 
-    if(Array.isArray(assetSpec) && _.isString(options.acsCondMember)) {
-        assetSpec = client.acs.getConditionalValue(assetSpec, options.acsCondMember);
+    if(Array.isArray(assetSpec)) {
+        const acsCondMember = options.acsCondMember || 'art';
+        assetSpec = client.acs.getConditionalValue(assetSpec, acsCondMember);
     }
 
     const artAsset = asset.getArtAsset(assetSpec);

From bf43766355f142a9e465b27e975e41122482e845 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 18:56:36 -0700
Subject: [PATCH 0526/1013] More doc updates!

---
 docs/configuration/acs.md        |  3 ++-
 docs/configuration/menu-hjson.md | 44 +++++++++++++++++++++++---------
 docs/filebase/acs.md             |  4 +--
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index eeab8e9c..dde55709 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -61,6 +61,7 @@ The following touch points exist in the system. Many more are planned:
 
 * Message conferences and areas
 * File base areas
-* Menus within `menu.hjson`. See [menu.hjson](menu-hjson.md).
+* Menus within `menu.hjson`. See [Menu HJSON](menu-hjson.md).
+
 
 See the specific areas documentation for information on available ACS checks.
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 4f932696..87cee85e 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -19,7 +19,7 @@ Below is a table of **common** menu entry members. These members apply to most e
 | Item   | Description  |
 |--------|--------------|
 | `desc` | A friendly description that can be found in places such as "Who's Online" or wherever the `%MD` MCI code is used. |
-| `art` | An art file *spec*. See [General Art Information](docs/art/general.md). |
+| `art` | An art file *spec*. See [General Art Information](/docs/art/general.md). |
 | `next` | Specifies the next menu entry to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
 | `prompt` | Specifies a prompt, by name, to use along with this menu. Prompts are configured in `prompt.hjson`. |
 | `submit` | Defines a submit handler when using `prompt`.
@@ -70,7 +70,7 @@ Now let's look at `matrix`, the `next` entry from `telnetConnected`:
 
 ```hjson
 matrix: {
-    art: matrix
+    art: MATRIX
     desc: Login Matrix
     form: {
         0: {
@@ -104,21 +104,22 @@ matrix: {
                     ]
                 }
             }
+
+            //
+            //  If we wanted, we could declare a "HM" MCI key block here.
+            //  This would allow a horizontal matrix style when the matrix art
+            //  loaded contained a %HM code.
+            //
         }
     }
 }
 ```
 
-In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form 
-by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` 
-(*VerticalMenuView*) MCI entry. `VM1` is then setup to `submit` and start focused via `focus: true` 
-as well as have some menu entries ("login", "apply", ...) defined. We provide an `argName` for this 
-action as `matrixSubmit`.
+In the above entry, you'll notice `form`. This defines a form(s) object. In this case, a single form by ID of `0`. The system is then told to use a block only when the resulting art provides a `VM` (*VerticalMenuView*) MCI entry. Some other bits about the form:
 
-The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`).
- Upon submit, the first match will be executed. For example, if the user selects "login", the first entry 
- with a value of `{ matrixSubmit: 0 }` will match causing `action` of `@menu:login` to be executed (go 
- to `login` menu).
+* `VM1` is then setup to `submit` and start focused via `focus: true` as well as have some menu entries ("login", "apply", ...) defined. We provide an `argName` of `matrixSubmit` for this element view.
+* The `submit` object tells the system to attempt to apply provided match entries from any view ID (`*`).
+* Upon submit, the first match will be executed. For example, if the user selects "login", the first entry with a value of `{ matrixSubmit: 0 }` will match (due to 0 being the first index in the list and `matrixSubmit` being the arg name in question) causing `action` of `@menu:login` to be executed (go to `login` menu).
 
 ## ACS Checks
 Menu modules can check user ACS in order to restrict areas and perform flow control. See [ACS](acs.md) for available ACS syntax.
@@ -150,4 +151,23 @@ login: {
         }
     ]
 }
-```
\ No newline at end of file
+```
+
+### Art Asset Selection
+Another area in which you can apply ACS in a menu is art asset specs.
+
+```hjson
+someMenu: {
+    desc: Neato Dorito
+    art: [
+        {
+            acs: GM[couriers]
+            art: COURIERINFO
+        }
+        {
+            //  show ie: EVERYONEELSE.ANS to everyone else
+            art: EVERYONEELSE
+        }
+    ]
+}
+```
diff --git a/docs/filebase/acs.md b/docs/filebase/acs.md
index 50527928..63884c71 100644
--- a/docs/filebase/acs.md
+++ b/docs/filebase/acs.md
@@ -2,8 +2,8 @@
 layout: page
 title: ACS
 ---
-
-If no `acs` block is supplied in a file area definition, the following defaults apply to an area:
+## File Base ACS
+[ACS Codes](/docs/configuration/acs.md) may be used to control acess to File Base areas by specifying an `acs` string in a file area's definition. If no `acs` is supplied in a file area definition, the following defaults apply to an area:
 * `read` (list, download, etc.): `GM[users]`
 * `write` (upload): `GM[sysops]`
 

From 2a95849f7de4ecf54978dff26ab3a45d01022d91 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 21:04:00 -0700
Subject: [PATCH 0527/1013] Add default keys for show art by message/file
 conf/areas

---
 core/show_art.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/show_art.js b/core/show_art.js
index 30b6e56e..a480fa05 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -68,7 +68,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByExtraArgs(cb) {
-        this.getArtKeyValue( (err, artSpec) => {
+        this.getArtKeyValue(this.config.key, (err, artSpec) => {
             if(err) {
                 return cb(err);
             }
@@ -89,7 +89,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByFileBaseArea(cb) {
-        this.getArtKeyValue( (err, key) => {
+        this.getArtKeyValue('areaTag', (err, key) => {
             if(err) {
                 return cb(err);
             }
@@ -98,7 +98,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByMessageConf(cb) {
-        this.getArtKeyValue( (err, key) => {
+        this.getArtKeyValue('confTag', (err, key) => {
             if(err) {
                 return cb(err);
             }
@@ -107,7 +107,7 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByMessageArea(cb) {
-        this.getArtKeyValue( (err, key) => {
+        this.getArtKeyValue('areaTag', (err, key) => {
             if(err) {
                 return cb(err);
             }
@@ -133,8 +133,8 @@ exports.getModule = class ShowArtModule extends MenuModule {
         return this.displaySingleArtWithOptions(artSpec, options, cb);
     }
 
-    getArtKeyValue(cb) {
-        const key = this.config.key;
+    getArtKeyValue(defaultKey, cb) {
+        const key = this.config.key || defaultKey;
         if(!_.isString(key)) {
             return cb(Errors.MissingConfig('Config option "key" is required for method "extraArgs"'));
         }

From 780e2231d349c0b1b412219c1137814a32b99815 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 21:04:16 -0700
Subject: [PATCH 0528/1013] Add menuFlags docs

---
 docs/configuration/menu-hjson.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 87cee85e..1956252c 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -37,7 +37,16 @@ The `config` block for a menu entry can contain common members as well as a per-
 | `nextTimeout` | Sets the number of **milliseconds** before the system will automatically advanced to the `next` menu. |
 | `baudRate` | See baud rate information in [General Art Information](/docs/art/general.md). |
 | `font` | Sets a SyncTERM style font to use when displaying this menus `art`. See font listing in [General Art Information](/docs/art/general.md). |
+| `menuFlags` | An array of menu flag(s) controlling menu behavior. See **Menu Flags** below.
 
+#### Menu Flags
+The `menuFlags` field of a `config` block can change default behavior of a particular menu.
+
+| Flag | Description |
+|------|-------------|
+| `noHistory` | Prevents the menu from remaining in the menu stack / history. When this flag is set, when the **next** menu falls back, this menu will be skipped and the previous menu again displayed instead. Example: menuA -> menuB(noHistory) -> menuC: Exiting menuC returns the user to menuA. |
+| `popParent` | When *this* menu is exited, fall back beyond the parent as well. Often used in combination with `noHistory`. |
+| `forwardArgs` | If set, when the next menu is entered, forward any `extraArgs` arguments to *this* menu on to it. |
 
 
 ## Forms

From 6a01c05ec9f75a8aece6e964c92d22b470b69214 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 17 Nov 2018 21:04:44 -0700
Subject: [PATCH 0529/1013] Show art docs

---
 docs/_includes/nav.md    |  1 +
 docs/modding/show-art.md | 70 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 docs/modding/show-art.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index c8cb67c9..4c2fc0f6 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -73,6 +73,7 @@
     - [Rumorz]({{ site.baseurl }}{% link modding/rumorz.md %})
     - [File Transfer Protocol Select]({{ site.baseurl }}{% link modding/file-transfer-protocol-select.md %})
     - [Onelinerz]({{ site.baseurl }}{% link modding/onelinerz.md %})
+    - [Show Art]({{ site.baseurl }}{% link modding/show-art.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/show-art.md b/docs/modding/show-art.md
new file mode 100644
index 00000000..c00d7009
--- /dev/null
+++ b/docs/modding/show-art.md
@@ -0,0 +1,70 @@
+---
+layout: page
+title: User List
+---
+## The Show Art Module
+The built in `show_art` module add some advanced ways in which you can configure your system to display art assets beyond what a standard menu entry can provide. For example, based on user selection of a file or message base area.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `method`: Set the method in which to show art. See **Methods** below.
+* `optional`: Is this art required or optional? If non-optional and we cannot show art based on `method`, it is an error.
+* `key`: Used for some `method`s. See **Methods**
+
+### Methods
+#### Extra Args
+When `method` is `extraArgs`, the module selects an *art spec* from a value found within `extraArgs` that were passed to `show_art` by `key`. Consider the following:
+
+Given an `menu.hjson` entry:
+```hjson
+showWithExtraArgs: {
+    module: show_art
+    config: {
+        method: extraArgs
+        key: fooBaz
+    }
+}
+```
+If the `showWithExtraArgs` menu was entered and passed `extraArgs` as the following:
+```json
+{
+    fizzBang : true,
+    fooBaz : "LOLART"
+}
+```
+
+...then the system would use the *art spec* of `LOLART`.
+
+#### Area & Conferences
+Handy for inserting into File Base, Message Conferences, or Mesage Area selections selections. When `method` is `fileBaseArea`, `messageConf`, or `messageArea` the selected conf/area's associated *art spec* is utilized. Example:
+
+Given a file base entry in `config.hjson`:
+```hjson
+areas: {
+    all_ur_base: {
+        name: All Your Base
+        desc: chown -r us ./base
+        art: ALLBASE
+    }
+}
+```
+
+A menu entry may look like this:
+```hjson
+showFileBaseAreaArt: {
+    module: show_art
+    config: {
+        method: fileBaseArea
+        cls: true
+        pause: true
+        menuFlags: [ "popParent", "noHistory" ]
+    }
+}
+```
+
+...if the user choose the "All Your Base" area, the *art spec* of `ALLBASE` would be selected and displayed.
+
+The only difference for `messageConf` or `messageArea` methods are where the art is defined (which is always next to the conf or area declaration in `config.hjson`).
+
+While `key` can be overridden, the system uses `areaTag` for message/file area selections, and `confTag` for conference selections by default.

From 05804206ee0a729aa4d54c0219ec90cecdf4f93d Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sun, 18 Nov 2018 01:40:08 -0500
Subject: [PATCH 0530/1013] Windows logging hint

---
 misc/config_template.in.hjson | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 3acb0823..48a4a8c4 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -66,7 +66,8 @@
         //  See https://github.com/trentm/node-bunyan#streams
         //
         //  Remember you can pipe logs through Bunyan to pretty-print:
-        //  tail -F ./logs/enigma-bbs.log | bunyan
+        //  Linux   : tail -F ./logs/enigma-bbs.log | bunyan
+        //  Windows : "Get-Content .\enigma-bbs.log | bunyan.cmd"
         //
         //  (npm install -g bunyan to get the binary)
         //
@@ -384,4 +385,4 @@
             loginHistoryMax: -1
         }
     }
-}
\ No newline at end of file
+}

From f567ef645218e922308ca13ace107e16027906a1 Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sun, 18 Nov 2018 01:41:06 -0500
Subject: [PATCH 0531/1013] Update config_template.in.hjson

---
 misc/config_template.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 48a4a8c4..9facd9e3 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -67,7 +67,7 @@
         //
         //  Remember you can pipe logs through Bunyan to pretty-print:
         //  Linux   : tail -F ./logs/enigma-bbs.log | bunyan
-        //  Windows : "Get-Content .\enigma-bbs.log | bunyan.cmd"
+        //  Windows : Get-Content .\enigma-bbs.log  | bunyan.cmd
         //
         //  (npm install -g bunyan to get the binary)
         //

From e316b5fe8083e11392c0d64ef63ca0256aeedfa9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 18 Nov 2018 01:56:40 -0700
Subject: [PATCH 0532/1013] Add File Base Download Manager docs

---
 art/themes/luciano_blocktronics/theme.hjson |  7 ++-----
 core/file_base_download_manager.js          |  6 +-----
 docs/_includes/nav.md                       |  1 +
 docs/modding/file-base-download-manager.md  | 22 +++++++++++++++++++++
 4 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 docs/modding/file-base-download-manager.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index d23904af..acc3c845 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -783,16 +783,13 @@
 			}
 
 			fileBaseDownloadManager: {
-				config: {
-					queueListFormat: "|00|03{fileName:<61.60} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
-					focusQueueListFormat: "|00|19|15{fileName:<61.60} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
-				}
-
 				0: {
 					mci: {
 						VM1: {
 							height: 11
 							width: 69
+							itemFormat: "|00|03{fileName:<61.60} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
+							focusItemFormat: "|00|19|15{fileName:<61.60} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
 						}
 						HM2: {
 							width: 50
diff --git a/core/file_base_download_manager.js b/core/file_base_download_manager.js
index f590ebd3..50abd6da 100644
--- a/core/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -150,11 +150,7 @@ exports.getModule = class FileBaseDownloadQueueManager extends MenuModule {
             return cb(Errors.DoesNotExist('Queue view does not exist'));
         }
 
-        const queueListFormat       = this.menuConfig.config.queueListFormat || '{fileName} {byteSize}';
-        const focusQueueListFormat  = this.menuConfig.config.focusQueueListFormat || queueListFormat;
-
-        queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
-        queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
+        queueView.setItems(this.dlQueue.items);
 
         queueView.on('index update', idx => {
             const fileEntry = this.dlQueue.items[idx];
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 4c2fc0f6..d0a4e7eb 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -74,6 +74,7 @@
     - [File Transfer Protocol Select]({{ site.baseurl }}{% link modding/file-transfer-protocol-select.md %})
     - [Onelinerz]({{ site.baseurl }}{% link modding/onelinerz.md %})
     - [Show Art]({{ site.baseurl }}{% link modding/show-art.md %})
+    - [Download Manager]({{ site.baseurl }}{% link modding/file_base_download_manager.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/file-base-download-manager.md b/docs/modding/file-base-download-manager.md
new file mode 100644
index 00000000..c454de8a
--- /dev/null
+++ b/docs/modding/file-base-download-manager.md
@@ -0,0 +1,22 @@
+---
+layout: page
+title: File Transfer Protocol Select
+---
+## File Base Download Manager Module
+The `file_base_download_manager` module provides a download queue manager for "legacy" (X/Y/Z-Modem, etc.) downloads.
+
+## Configuration
+### Configuration Block
+Available `config` block entries:
+* `webDlExpireTimeFormat`: Sets the moment.js style format for web download expiration date/time.
+* `fileTransferProtocolSelection`: Overrides the default `fileTransferProtocolSelection` target for a protocol selection menu.
+* `emptyQueueMenu`: Overrides the default `fileBaseDownloadManagerEmptyQueue` target for menu to show when the users D/L queue is empty.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) and MCI 10+ custom fields:
+* `fileId`: File ID.
+* `areaTag`: Area tag.
+* `fileName`: Entry filename.
+* `path`: Full file path.
+* `byteSize`: Size in bytes of file.
+

From b34294fbefa83bee10b562c5a4437a40ab64f871 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 18 Nov 2018 12:02:57 -0700
Subject: [PATCH 0533/1013] * Docs + itemFormat/focusItem format for web
 download manager * Fix some typos

---
 art/themes/luciano_blocktronics/theme.hjson   |  4 +--
 core/file_base_web_download_manager.js        |  6 +----
 docs/_includes/nav.md                         |  3 ++-
 docs/modding/file-base-download-manager.md    |  7 ++---
 .../modding/file-base-web-download-manager.md | 26 +++++++++++++++++++
 5 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 docs/modding/file-base-web-download-manager.md

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index acc3c845..2316eac9 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -801,8 +801,6 @@
 
 			fileBaseWebDownloadManager: {
 				config: {
-					queueListFormat: "|00|03{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
-					focusQueueListFormat: "|00|19|15{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
 					queueManagerInfoFormat10: "|03batch|08: |03{webBatchDlLink}"
 					queueManagerInfoFormat11: "|03exp  |08: |03{webBatchDlExpire}"
 				}
@@ -811,6 +809,8 @@
 					mci: {
 						VM1: {
 							height: 8
+							itemFormat: "|00|03{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} |11{byteSize!sizeAbbr}"
+							focusItemFormat: "|00|19|15{webDlLink:<36.35} {fileName:<26.25} {byteSize!sizeWithoutAbbr:>7.6} {byteSize!sizeAbbr}"
 						}
 						HM2: {
 							width: 50
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index 02bffa3e..62ee02eb 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -121,11 +121,7 @@ exports.getModule = class FileBaseWebDownloadQueueManager extends MenuModule {
             return cb(Errors.DoesNotExist('Queue view does not exist'));
         }
 
-        const queueListFormat       = this.menuConfig.config.queueListFormat || '{webDlLink}';
-        const focusQueueListFormat  = this.menuConfig.config.focusQueueListFormat || queueListFormat;
-
-        queueView.setItems(this.dlQueue.items.map( queueItem => stringFormat(queueListFormat, queueItem) ) );
-        queueView.setFocusItems(this.dlQueue.items.map( queueItem => stringFormat(focusQueueListFormat, queueItem) ) );
+        queueView.setItems(this.dlQueue.items);
 
         queueView.on('index update', idx => {
             const fileEntry = this.dlQueue.items[idx];
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index d0a4e7eb..a42520bb 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -74,7 +74,8 @@
     - [File Transfer Protocol Select]({{ site.baseurl }}{% link modding/file-transfer-protocol-select.md %})
     - [Onelinerz]({{ site.baseurl }}{% link modding/onelinerz.md %})
     - [Show Art]({{ site.baseurl }}{% link modding/show-art.md %})
-    - [Download Manager]({{ site.baseurl }}{% link modding/file_base_download_manager.md %})
+    - [Download Manager]({{ site.baseurl }}{% link modding/file-base-download-manager.md %})
+    - [Web Download Manager]({{ site.baseurl }}{% link modding/file-base-web-download-manager.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/file-base-download-manager.md b/docs/modding/file-base-download-manager.md
index c454de8a..22d634a0 100644
--- a/docs/modding/file-base-download-manager.md
+++ b/docs/modding/file-base-download-manager.md
@@ -1,9 +1,9 @@
 ---
 layout: page
-title: File Transfer Protocol Select
+title: File Base Download Manager
 ---
 ## File Base Download Manager Module
-The `file_base_download_manager` module provides a download queue manager for "legacy" (X/Y/Z-Modem, etc.) downloads.
+The `file_base_download_manager` module provides a download queue manager for "legacy" (X/Y/Z-Modem, etc.) downloads. Web (HTTP/HTTPS) download functionality can be optionally available when the web content server is enabled.
 
 ## Configuration
 ### Configuration Block
@@ -19,4 +19,5 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) and MCI 10+
 * `fileName`: Entry filename.
 * `path`: Full file path.
 * `byteSize`: Size in bytes of file.
-
+* `webDlLink`: Web download link including VTX style ANSI ESC sequences.
+* `webDlExpire`: Expiration date/time for this link. Formatted using `webDlExpireTimeFormat`.
\ No newline at end of file
diff --git a/docs/modding/file-base-web-download-manager.md b/docs/modding/file-base-web-download-manager.md
new file mode 100644
index 00000000..09b8f22c
--- /dev/null
+++ b/docs/modding/file-base-web-download-manager.md
@@ -0,0 +1,26 @@
+---
+layout: page
+title: File Base Web Download Manager
+---
+## File Base Web Download Manager Module
+The `file_base_web_download_manager` module provides a download queue manager for web (HTTP/HTTPS) based downloads. This module relies on having the web server enabled at a minimum.
+
+Web downloads can be a convienent way for users to download larger (100+ MiB) files where legacy protocols often have trouble. Additionally, batch downloads can be streamed to users in a single zip archive.
+
+## Configuration
+### Configuration Block
+Available `config` block entries:
+* `webDlExpireTimeFormat`: Sets the moment.js style format for web download expiration date/time.
+* `emptyQueueMenu`: Overrides the default `fileBaseDownloadManagerEmptyQueue` target for menu to show when the users D/L queue is empty.
+
+### Theming
+The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) and custom range MCI 10+ custom fields:
+* `fileId`: File ID.
+* `areaTag`: Area tag.
+* `fileName`: Entry filename.
+* `path`: Full file path.
+* `byteSize`: Size in bytes of file.
+* `webDlLinkRaw`: Web download link.
+* `webDlLink`: Web download link including VTX style ANSI ESC sequences.
+* `webDlExpire`: Expiration date/time for this link. Formatted using `webDlExpireTimeFormat`.
+

From 7cd0b3b393666120f49391f92287b029c59dc8f1 Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sun, 18 Nov 2018 14:06:46 -0500
Subject: [PATCH 0534/1013] Update config_template.in.hjson

Changed to PowerShell. Added -F equivalent (-wait) and Tail
---
 misc/config_template.in.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 9facd9e3..cde8284b 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -66,8 +66,8 @@
         //  See https://github.com/trentm/node-bunyan#streams
         //
         //  Remember you can pipe logs through Bunyan to pretty-print:
-        //  Linux   : tail -F ./logs/enigma-bbs.log | bunyan
-        //  Windows : Get-Content .\enigma-bbs.log  | bunyan.cmd
+        //  Linux      : tail -F ./logs/enigma-bbs.log | bunyan
+        //  Powershell : Get-Content .\enigma-bbs.log -Wait -Tail 15 | bunyan.cmd
         //
         //  (npm install -g bunyan to get the binary)
         //

From 7410862f5707350d45ec783ef7f62e694c220532 Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sun, 18 Nov 2018 14:10:11 -0500
Subject: [PATCH 0535/1013] Update config_template.in.hjson

Cap S
---
 misc/config_template.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index cde8284b..0c0e40c1 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -67,7 +67,7 @@
         //
         //  Remember you can pipe logs through Bunyan to pretty-print:
         //  Linux      : tail -F ./logs/enigma-bbs.log | bunyan
-        //  Powershell : Get-Content .\enigma-bbs.log -Wait -Tail 15 | bunyan.cmd
+        //  PowerShell : Get-Content .\enigma-bbs.log -Wait -Tail 15 | bunyan.cmd
         //
         //  (npm install -g bunyan to get the binary)
         //

From 5f4e129369c25016f659526ff0ac473c1410b6a0 Mon Sep 17 00:00:00 2001
From: SemperFu <jason.windisch@gmail.com>
Date: Sun, 18 Nov 2018 14:17:42 -0500
Subject: [PATCH 0536/1013] Remove -Wait

-Wait doesn't work. It sits there waiting for completion before forwarding.
---
 misc/config_template.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 0c0e40c1..ba3e8937 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -67,7 +67,7 @@
         //
         //  Remember you can pipe logs through Bunyan to pretty-print:
         //  Linux      : tail -F ./logs/enigma-bbs.log | bunyan
-        //  PowerShell : Get-Content .\enigma-bbs.log -Wait -Tail 15 | bunyan.cmd
+        //  PowerShell : Get-Content .\enigma-bbs.log -Tail 15 | bunyan.cmd
         //
         //  (npm install -g bunyan to get the binary)
         //

From 370f8039db0abf1a8445baca339c9544c71a9876 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 18 Nov 2018 14:19:34 -0700
Subject: [PATCH 0537/1013] * Use itemFormat/focusItemFormat for set newscan
 message/file conf/areas * Docs for set_newscan_date module

---
 .../luciano_blocktronics/SETMNSDATE.ANS       | Bin 512 -> 526 bytes
 art/themes/luciano_blocktronics/theme.hjson   |  10 ++++++
 core/set_newscan_date.js                      |  11 +++----
 docs/_includes/nav.md                         |   1 +
 docs/modding/file-base-download-manager.md    |   2 +-
 .../modding/file-base-web-download-manager.md |   2 +-
 docs/modding/set-newscan-date.md              |  29 ++++++++++++++++++
 misc/menu_template.in.hjson                   |   1 -
 8 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 docs/modding/set-newscan-date.md

diff --git a/art/themes/luciano_blocktronics/SETMNSDATE.ANS b/art/themes/luciano_blocktronics/SETMNSDATE.ANS
index 4d3b43a314582ba6d98d9721010a2432cb717c88..61cbb3daa0239aa4e58983984875677507959ae2 100644
GIT binary patch
delta 33
ocmZo*>0_A?EMV#^9c^fBY?Lb}FCA@=tFSS&m637k<lBs@0G3<{TmS$7

delta 19
acmeBUX<(TU%w*xbF}anIv3>GOMpXbjr3O0y

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 2316eac9..31a67054 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -254,6 +254,16 @@
 				}
 			}
 
+			messageAreaSetNewScanDate: {
+				mci: {
+					SM2: {
+						width: 54
+						itemFormat: "|00|07{conf.name} |08- |07{area.name}"
+						focusItemFormat: "|00|15{conf.name} |07- |15{area.name}"
+					}
+				}
+			}
+
 			mailMenuCreateMessage: {
 				0: {
 					mci: {
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
index 27a27c21..c86b8e26 100644
--- a/core/set_newscan_date.js
+++ b/core/set_newscan_date.js
@@ -153,11 +153,13 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                 selections.push({
                     conf    : {
                         confTag : conf.confTag,
+                        text    : conf.conf.name,   //  standard
                         name    : conf.conf.name,
                         desc    : conf.conf.desc,
                     },
                     area    : {
                         areaTag : area.areaTag,
+                        text    : area.area.name,   //  standard
                         name    : area.area.name,
                         desc    : area.area.desc,
                     }
@@ -168,11 +170,13 @@ exports.getModule = class SetNewScanDate extends MenuModule {
         selections.unshift({
             conf : {
                 confTag : '',
+                text    : 'All conferences',
                 name    : 'All conferences',
                 desc    : 'All conferences',
             },
             area    : {
                 areaTag : '',
+                text    : 'All areas',
                 name    : 'All areas',
                 desc    : 'All areas',
             }
@@ -236,14 +240,9 @@ exports.getModule = class SetNewScanDate extends MenuModule {
                         scanDateView.setText(today.format(scanDateFormat));
 
                         if('message' === self.target) {
-                            const messageSelectionsFormat       = self.menuConfig.config.messageSelectionsFormat || '{conf.name} - {area.name}';
-                            const messageSelectionFocusFormat   = self.menuConfig.config.messageSelectionFocusFormat || messageSelectionsFormat;
-
                             const targetSelectionView = vc.getView(MciViewIds.main.targetSelection);
 
-                            targetSelectionView.setItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
-                            targetSelectionView.setFocusItems(self.targetSelections.map(targetSelection => stringFormat(messageSelectionFocusFormat, targetSelection)));
-
+                            targetSelectionView.setItems(self.targetSelections);
                             targetSelectionView.setFocusItemIndex(0);
                         }
 
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index a42520bb..fe587900 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -76,6 +76,7 @@
     - [Show Art]({{ site.baseurl }}{% link modding/show-art.md %})
     - [Download Manager]({{ site.baseurl }}{% link modding/file-base-download-manager.md %})
     - [Web Download Manager]({{ site.baseurl }}{% link modding/file-base-web-download-manager.md %})
+    - [Set Newscan Date]({{ site.baseurl }}{% link modding/set-newscan-date.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/file-base-download-manager.md b/docs/modding/file-base-download-manager.md
index 22d634a0..023ae478 100644
--- a/docs/modding/file-base-download-manager.md
+++ b/docs/modding/file-base-download-manager.md
@@ -19,5 +19,5 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) and MCI 10+
 * `fileName`: Entry filename.
 * `path`: Full file path.
 * `byteSize`: Size in bytes of file.
-* `webDlLink`: Web download link including VTX style ANSI ESC sequences.
+* `webDlLink`: Web download link including [VTX style ANSI ESC sequences](https://raw.githubusercontent.com/codewar65/VTX_ClientServer/master/vtx.txt).
 * `webDlExpire`: Expiration date/time for this link. Formatted using `webDlExpireTimeFormat`.
\ No newline at end of file
diff --git a/docs/modding/file-base-web-download-manager.md b/docs/modding/file-base-web-download-manager.md
index 09b8f22c..1dadca00 100644
--- a/docs/modding/file-base-web-download-manager.md
+++ b/docs/modding/file-base-web-download-manager.md
@@ -21,6 +21,6 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`) and custom r
 * `path`: Full file path.
 * `byteSize`: Size in bytes of file.
 * `webDlLinkRaw`: Web download link.
-* `webDlLink`: Web download link including VTX style ANSI ESC sequences.
+* `webDlLink`: Web download link including [VTX style ANSI ESC sequences](https://raw.githubusercontent.com/codewar65/VTX_ClientServer/master/vtx.txt).
 * `webDlExpire`: Expiration date/time for this link. Formatted using `webDlExpireTimeFormat`.
 
diff --git a/docs/modding/set-newscan-date.md b/docs/modding/set-newscan-date.md
new file mode 100644
index 00000000..5649edac
--- /dev/null
+++ b/docs/modding/set-newscan-date.md
@@ -0,0 +1,29 @@
+---
+layout: page
+title: Set Newscan Date Module
+---
+## Set Newscan Date Module
+The `set_newscan_date` module allows setting newscan dates (aka pointers) for message conferences and areas as well as within the file base. Users can select specific conferences/areas or all (where applicable).
+
+## Configuration
+### Configuration Block
+Available `config` block entries are as follows:
+* `target`: Choose from `message` for message conferences & areas, or `file` for file base areas.
+* `scanDateFormat`: Format for scan date. This format must align with the **output** of the MaskEditView (`%ME1`) MCI utilized for input. Defaults to `YYYYMMDD` (which matches mask of `####/##/##`).
+
+### Theming
+#### Message Conference & Areas
+When `target` is `message`, the following `itemFormat` object is provided to MCI 2 (ie: `%SM2`):
+* `conf`: An object containing:
+    * `confTag`: Conference tag.
+    * `name`: Conference name. Also available in `{text}`.
+    * `desc`: Conference description.
+* `area`: An object containing:
+    * `areaTag`: Area tag.
+    * `name`: Area name. Also available in `{text}`.
+    * `desc`: Area description.
+
+When dealing with the file base, ENiGMA½ does not currently have the ability to set newscan dates for specific areas. No `%SM2` is used in this case.
+
+### Submit Actions
+Submit action should map to `@method:scanDateSubmit` and provide `scanDate` in form data. For message conf/areas (`target` of `message`), `targetSelection` should be also be provided in form data: An index to the selected conf/area.
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 8f1aca3b..e7653081 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1921,7 +1921,6 @@
 						SM2: {
 							argName: targetSelection
 							submit: false
-							justify: right
 						}
 					}
 					submit: {

From 53a23c51634c828da5f1d14b66e219e184d220f4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 19:08:01 -0700
Subject: [PATCH 0538/1013] Notes on binkd

---
 docs/messageareas/bso-import-export.md | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index ad189bbc..aab72429 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -120,5 +120,34 @@ scannerTossers: {
 }
 ```
 
+## Binkd
+Since Binkd is a very common mailer, a few tips on integrating it with ENiGMA½:
+
+### Scheduling Polls
+Binkd does not have it's own scheduler. Instead, you'll need to set up an Event Scheduler entry or perhaps a cron job:
+
+First, create a script that runs through all of your uplinks. For example:
+```bash
+#!/bin/bash
+UPLINKS=("21:1/100@fsxnet" "80:774/1@retronet" "10:101/0@araknet")
+for uplink in "${UPLINKS[@]}"
+do
+	/usr/local/sbin/binkd -p -P $uplink /home/enigma/xibalba/misc/binkd_xibalba.conf
+done
+```
+
+Now, create an Event Scheuler entry in your `config.hjson`. As an example:
+```hjson
+eventScheduler: {
+  events: {
+    pollWithBink: {
+      //  execute the script above very 1 hours
+      schedule: every 1 hours
+      action: @execute:/path/to/poll_bink.sh
+    }
+  }
+}
+```
+
 ## Additional Resources
 * [Blog entry on setting up ENiGMA + Binkd on CentOS7](https://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` refernces!

From 16474c885fe551596be826d540150fc5df408662 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 20:00:29 -0700
Subject: [PATCH 0539/1013] Initial Event Scheduler docs

---
 docs/configuration/event-scheduler.md | 79 +++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 docs/configuration/event-scheduler.md

diff --git a/docs/configuration/event-scheduler.md b/docs/configuration/event-scheduler.md
new file mode 100644
index 00000000..77b56f15
--- /dev/null
+++ b/docs/configuration/event-scheduler.md
@@ -0,0 +1,79 @@
+---
+layout: page
+title: Event Scheduler
+---
+## Event Scheduler
+The ENiGMA½ scheduler allows system operators to configure arbitrary events that can can fire based on date and/or time, or by watching for changes in a file. Events can kick off internal handlers, custom modules, or binaries & scripts.
+
+## Scheduling Events
+To create a scheduled event, create a new configuration block in `config.hjson` under `eventScheduler.events`. 
+
+Events can have the following members:
+
+| Item | Required | Description |
+|------|----------|-------------|
+| `schedule` | :+1: | A [Later style](https://bunkat.github.io/later/parsers.html#text) parsable schedule string such as `at 4:00 am`, or `every 24 hours`. Can also be (or contain) an `@watch` clause. See **Schedules** below for details. |
+| `action` | :+1: | Action to perform when the schedule is triggered. May be an `@method` or `@execute` spec. See **Actions** below. |
+| `args` | :-1: | An array of arguments to pass along to the method or binary specified in `action`. |
+
+### Schedules
+As mentioned above, `schedule` may contain a [Later style](https://bunkat.github.io/later/parsers.html#text) parsable schedule string and/or an `@watch` clause. 
+
+`schedule` examples:
+* `every 2 hours`
+* `on the last day of the week`
+* `after 12th hour`
+
+An `@watch` clause monitors a specified file for changes and takes the following form: `@watch:<path>` where `<path>` is a fully qualified path.
+
+:information_source: If you would like to have a schedule **and** watch a file for changes, place the `@watch` clause second and seperated with the word `or`. For example: `every 24 hours or @watch:/path/to/somefile.txt`.
+
+### Actions
+Events can kick off actions by calling a method (function) provided by the system or custom module in addition to executing arbritary binaries or scripts.
+
+#### Methods
+An action with a `@method` can take the following forms:
+
+* `@method:/full/path/to/module.js:methodName`: Executes `methodName` at `/full/path/to/module.js`.
+* `@method:rel/path/to/module.js:methodName`: Executes `methodName` using the *relative* path `rel/path/to/module.js`. Paths for `@method` are relative to the ENiGMA½ installation directory.
+
+Methods are passed any supplied `args` in the order they are provided.
+
+##### Method Signature
+To create your own method, simply `export` a method with the following signature: `(args, callback)`. Methods are executed asynchronously.
+
+Example:
+```javascript
+// my_custom_mod.js
+exports.myCustomMethod = (args, cb) => {
+    console.log(`Hello, ${args[0]}!`);
+    return cb(null);
+}
+```
+
+#### Executables
+When using the `@execute` action, a binary or script can be executed. A full path or just the binary name is acceptable. If using the form without a path, the binary much be in ENiGMA½'s `PATH`.
+
+Examples:
+* `@execute:/usr/bin/foo`
+* `@execute:foo`
+
+Just like with methods, any supplied `args` will be passed along.
+
+## Example Entries
+
+Post a message to supplied networks every Monday night using the message post mod (see modding):
+```hjson
+eventScheduler: {
+    events: {
+        enigmaAdToNetworks: {
+            schedule: at 10:35 pm on Mon
+            action: @method:mods/message_post_evt/message_post_evt.js:messagePostEvent
+            args: [
+                "fsx_bot"
+                "/home/enigma-bbs/ad.asc"
+            ]
+        }
+    }
+}
+```
\ No newline at end of file

From ec1f437dd92ea8f37551676bb73cf2f750d45e59 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 20:16:30 -0700
Subject: [PATCH 0540/1013] Fix DEP0005 during file base scan

---
 core/file_base_area.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 78450501..a684f575 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -705,7 +705,7 @@ function scanFile(filePath, options, iterator, cb) {
                 //  up to many seconds in time for larger files.
                 //
                 const chunkSize = 1024 * 64;
-                const buffer = new Buffer(chunkSize);
+                const buffer = Buffer.allocUnsafe(chunkSize);
 
                 fs.open(filePath, 'r', (err, fd) => {
                     if(err) {

From df82868ddf7c5ce789c6b9798dc0b9f6d83aa4b2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 20:40:02 -0700
Subject: [PATCH 0541/1013] Minor dependency updates

---
 package-lock.json | 69 +++++++++++++++++++++++++----------------------
 package.json      |  8 +++---
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be373f20..a3bc6f81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,11 +94,6 @@
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -494,16 +489,15 @@
       }
     },
     "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "requires": {
-        "globby": "^5.0.0",
+        "globby": "^6.1.0",
         "is-path-cwd": "^1.0.0",
         "is-path-in-cwd": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
         "rimraf": "^2.2.8"
       }
     },
@@ -878,16 +872,22 @@
       }
     },
     "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "version": "6.1.0",
+      "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "requires": {
         "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
         "glob": "^7.0.3",
         "object-assign": "^4.0.1",
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        }
       }
     },
     "graceful-fs": {
@@ -954,9 +954,9 @@
       "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
     },
     "hjson": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.1.1.tgz",
-      "integrity": "sha512-1oGkOq4sssz7HFZ8Is9HuTR47r8gSC46qAzQxVlAkj0lNKpS+W5Lv2eci+c5+fFqL+Idtj5EvprFreUwH29a8A=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.1.2.tgz",
+      "integrity": "sha512-2ILrho8eRl2Bniy61mDFiXRAloYqH2T6OwWkoF/8y55DPFgG2RcqQGNXIfBLp432dnAbLOpBJ4pJs63W3X27EA=="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -1649,6 +1649,11 @@
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -1675,9 +1680,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -2233,11 +2238,11 @@
       }
     },
     "temptmp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.0.0.tgz",
-      "integrity": "sha1-M7Djbh8nMXyKKBIO6Wufj+tw2UM=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.1.0.tgz",
+      "integrity": "sha512-gHelQlePUzxRmodWL1uJ9LiwI+a7a3rkFGS9azTf4noPZgGOlx0dOPV9tZs5+QwGc4Nm8BfFxL9cfvV42GNxPQ==",
       "requires": {
-        "del": "^2.2.2"
+        "del": "^3.0.0"
       }
     },
     "through": {
@@ -2493,9 +2498,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz",
-      "integrity": "sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
+      "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
       "requires": {
         "async-limiter": "~1.0.0"
       }
@@ -2514,9 +2519,9 @@
       "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
     },
     "yazl": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
-      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.0.tgz",
+      "integrity": "sha512-rgptqKwX/f1/7bIRF1FHb4HGsP5k11QyxBpDl1etUDfNpTa7CNjDOYNPFnIaEzZ9dRq0c47IEJS+sy+T39JCLw==",
       "requires": {
         "buffer-crc32": "~0.2.3"
       }
diff --git a/package.json b/package.json
index 73fd9ebc..f6425f01 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "glob": "^7.1.2",
     "graceful-fs": "^4.1.15",
     "hashids": "^1.1.1",
-    "hjson": "^3.1.1",
+    "hjson": "^3.1.2",
     "iconv-lite": "^0.4.23",
     "inquirer": "^6.0.0",
     "later": "1.2.0",
@@ -47,12 +47,12 @@
     "sqlite3": "^4.0.4",
     "sqlite3-trans": "^1.2.0",
     "ssh2": "^0.6.1",
-    "temptmp": "^1.0.0",
+    "temptmp": "^1.1.0",
     "uuid": "^3.2.1",
     "uuid-parse": "^1.0.0",
-    "ws": "^6.1.0",
+    "ws": "^6.1.2",
     "xxhash": "^0.2.4",
-    "yazl": "^2.4.2"
+    "yazl": "^2.5.0"
   },
   "devDependencies": {},
   "engines": {

From 5ea6f5e1f89d8d0f966b4bdb7be480650d2c69e8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 20:40:20 -0700
Subject: [PATCH 0542/1013] Sample event scheduler entry

---
 misc/config_template.in.hjson | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index ba3e8937..8a474779 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -331,7 +331,7 @@
         //  ]
         //
         //
-        //  Set default group(s) new users should automatically be assigned to
+        //  Set default group(s) new users should automatically be assigned to:
         //  defaultGroups : [
         //      "lamerz"
         //  ]
@@ -379,6 +379,25 @@
         //
     }
 
+    //
+    //  Use the Event Scheduler to set up arbitrary scheduled events
+    //  using Later style syntax and/or @watch files.
+    //  See docs/event-scheduler.md for more information.
+    //
+    eventScheduler: {
+        events: {
+            //  Example:
+            //
+            //  sampleEvent: {
+            //    schedule: every 2 hours
+            //    action: @execute:/path/to/some/script.sh
+            //    args: [
+            //        "--foo", "--bar"
+            //    ]
+            //  }
+        }
+    }
+
     statLog: {
         systemEvents: {
             //  Max login history event records kept. -1 = unlimited

From 284151a0c94e22d55040d8ce5494550fd9845359 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 19 Nov 2018 21:16:37 -0700
Subject: [PATCH 0543/1013] Many doc updates RE: HJSON/general config

---
 docs/_includes/nav.md                 |  8 +++---
 docs/configuration/config-hjson.md    |  4 ++-
 docs/configuration/creating-config.md | 23 ++++------------
 docs/configuration/hjson.md           | 39 +++++++++++++++++++++++++++
 docs/configuration/menu-hjson.md      |  6 ++---
 docs/configuration/prompt-hjson.md    |  4 ++-
 6 files changed, 58 insertions(+), 26 deletions(-)
 create mode 100644 docs/configuration/hjson.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index fe587900..728e5444 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -14,15 +14,17 @@
     - [Creating Config Files]({{ site.baseurl }}{% link configuration/creating-config.md %})
     - [SysOp Setup]({{ site.baseurl }}{% link configuration/sysop-setup.md %})
     - [Editing hjson]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
-    - [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %})
-    - [menu.hjson]({{ site.baseurl }}{% link configuration/menu-hjson.md %})
-    - [prompt.hjson]({{ site.baseurl }}{% link configuration/prompt-hjson.md %})
+    - [System Configuration]({{ site.baseurl }}{% link configuration/config-hjson.md %})
+    - [HJSON General]({{ site.baseurl }}{% link configuration/hjson.md %})
+    - [Menus]({{ site.baseurl }}{% link configuration/menu-hjson.md %})
+    - [Prompts]({{ site.baseurl }}{% link configuration/prompt-hjson.md %})
     - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
     - [Archivers]({{ site.baseurl }}{% link configuration/archivers.md %})
     - [File Transfer Protocols]({{ site.baseurl }}{% link configuration/file-transfer-protocols.md %})
     - [Email]({{ site.baseurl }}{% link configuration/email.md %})
     - [Colour Codes]({{ site.baseurl }}{% link configuration/colour-codes.md %})
     - [Access Condition System (ACS)]({{ site.baseurl }}{% link configuration/acs.md %})
+    - [Event Scheduler]({{ site.baseurl }}{% link configuration/event-scheduler.md %})
     - Scheduled jobs
 
   - File Base
diff --git a/docs/configuration/config-hjson.md b/docs/configuration/config-hjson.md
index 37d07beb..4ebfd030 100644
--- a/docs/configuration/config-hjson.md
+++ b/docs/configuration/config-hjson.md
@@ -1,10 +1,12 @@
 ---
 layout: page
-title: config.hjson
+title: System Configuration
 ---
 ## System Configuration
 The main system configuration file, `config.hjson` both overrides defaults and provides additional configuration such as message areas. The default path is `/enigma-bbs-install-path/config/config.hjson` though you can override the `config.hjson` location with the `--config` parameter when invoking `main.js`. Values found in `core/config.js` may be overridden by simply providing the object members you wish replace.
 
+See also [HJSON General Information](hjson.md) for more information on the HJSON format.
+
 ### Creating a Configuration
 Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
 ```
diff --git a/docs/configuration/creating-config.md b/docs/configuration/creating-config.md
index c8495f1c..5d845d5e 100644
--- a/docs/configuration/creating-config.md
+++ b/docs/configuration/creating-config.md
@@ -2,26 +2,13 @@
 layout: page
 title: Creating Initial Config Files
 ---
-Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just 
-like JSON but simplified and much more resilient to human error.
+Configuration files in ENiGMA½ are simple UTF-8 encoded [HJSON](http://hjson.org/) files. HJSON is just like JSON but simplified and much more resilient to human error.
 
-## config.hjson
-Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your 
-enigma-bbs root directory:
-```
+## Initial Configuration
+Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
+```bash
 ./oputil.js config new
 ```
 
-You will be asked a series of questions to create an initial configuration.
+You will be asked a series of questions to create an initial configuration, which will be saved to `/enigma-bbs-install-path/config/config.hjson`. This will also produce `config/<bbsName>-menu.hjson` and `config/<bbsName>-prompt.hjson` files (where `<bbsName>` is replaced by the name you provided in the steps above). See [Menu HJSON](menu-hjson.md) and [Prompt HJSON](prompt-hjson.md) for more information.
 
-## menu.hjson and prompt.hjson
-
-Create your own copy of `/config/menu.hjson` and `/config/prompt.hjson`, and specify it in the
-`general` section of `config.hjson`:
-
-````hjson
-general: {
-    menuFile: my-menu.hjson
-    promptFile: my-prompt.hjson
-}
-````
\ No newline at end of file
diff --git a/docs/configuration/hjson.md b/docs/configuration/hjson.md
new file mode 100644
index 00000000..a4eda583
--- /dev/null
+++ b/docs/configuration/hjson.md
@@ -0,0 +1,39 @@
+---
+layout: page
+title: HJSON General Information
+---
+## JSON for Humans!
+HJSON is the configuration file format used by ENiGMA½ for [System Configuration](config-hjson.md), [Menus](menu-hjson.md), [Prompts](prompt-hjson.md), etc. [HJSON](https://hjson.org/) is is [JSON](https://json.org/) for humans!
+
+For those completely unfamiliar, JSON stands for JavaScript Object Notation. But don't let that scare you! JSON is simply a text file format with a bit of structure ― kind of like a fancier INI file. HJSON on the other hand as mentioned previously, is JSON for humans. That is, it has the following features and more:
+
+* More resilliant to syntax errors such as missing a comma
+* Strings generally do not need to be quoted. Multi-line strings are also supported!
+* Comments are supported (JSON doesn't allow this!): `#`, `//` and `/* ... */` style comments are allowed.
+* Keys never need to be quoted
+* ...much more! See [the official HJSON website](https://hjson.org/).
+
+## Terminology
+Through the documentation, some terms regarding HJSON and configuration files will be used:
+
+* `config.hjson`: Refers to `/path/to/enigma-bbs/config/config.hjson`. See [System Configuration](config-hjson.md).
+* `menu.hjson`: Refers to `/path/to/enigma-bbs/config/<yourBBSName>-menu.hjson`. See [Menus](menu-hjson.md).
+* `prompt.hjson`: Refers to `/path/to/enigma-bbs/config/<yourBBSName>-prompt.hjson`. See [Prompts](prompt-hjson.md).
+* Configuration *key*: Elements in HJSON are name-value pairs where the name is the *key*. For example, provided `foo: bar`, `foo` is the key.
+* Configuration *section* or *block* (also commonly called an "Object" in code): This is referring to a section in a HJSON file that starts with a *key*. For example:
+```hjson
+someSection: {
+    foo: bar
+}
+```
+Note that `someSection` is the configuration *section* (or *block*) and `foo: bar` is within it.
+
+## Editing HJSON
+HJSON is a text file format, and ENiGMA½ configuration files **should always be saved as UTF-8**.
+
+It is **highly** recommended to use a text editor that has HJSON support. A few (but not all!) examples include:
+* Sublime Text 3 via the `sublime-hjson` package.
+* Visual Studio code via the `vscode-hjson` plugin.
+* Notepad++ via the `npp-hjson` plugin.
+
+See https://hjson.org/users.html for more information.
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 1956252c..d5e9b66d 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -1,9 +1,9 @@
 ---
 layout: page
-title: menu.hjson
+title: Menus
 ---
-## Menu HJSON
-The core of a ENiGMA½ based BBS is `menu.hjson`. Note that when `menu.hjson` is referenced, we're actually talking about `config/yourboardname-menu.hjson` or similar. This file determines the menus (or screens) a user can see, the order they come in and how they interact with each other, ACS configuration, etc. Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format.
+## Menus
+The core of a ENiGMA½ based BBS is `menu.hjson`. Note that when `menu.hjson` is referenced, we're actually talking about `config/yourboardname-menu.hjson` or similar. This file determines the menus (or screens) a user can see, the order they come in and how they interact with each other, ACS configuration, etc. Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format. See [HJSON General Information](hjson.md) for more information.
 
 Entries in `menu.hjson` are often referred to as *blocks* or *sections*. Each entry defines a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
 
diff --git a/docs/configuration/prompt-hjson.md b/docs/configuration/prompt-hjson.md
index 7b7a3ab5..993e5b8e 100644
--- a/docs/configuration/prompt-hjson.md
+++ b/docs/configuration/prompt-hjson.md
@@ -3,4 +3,6 @@ layout: page
 title: prompt.hjson
 ---
 :zap: This page is to describe general information the `prompt.hjson` file. It
-needs fleshing out, please submit a PR if you'd like to help!
\ No newline at end of file
+needs fleshing out, please submit a PR if you'd like to help!
+
+See [HJSON General Information](hjson.md) for more information.

From ce9a3c29b4baf31ad8b52300e4d5b980b1356e31 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 20 Nov 2018 18:45:01 -0700
Subject: [PATCH 0544/1013] More notes on HJSON

---
 docs/configuration/hjson.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/hjson.md b/docs/configuration/hjson.md
index a4eda583..509c2980 100644
--- a/docs/configuration/hjson.md
+++ b/docs/configuration/hjson.md
@@ -7,7 +7,7 @@ HJSON is the configuration file format used by ENiGMA½ for [System Configuratio
 
 For those completely unfamiliar, JSON stands for JavaScript Object Notation. But don't let that scare you! JSON is simply a text file format with a bit of structure ― kind of like a fancier INI file. HJSON on the other hand as mentioned previously, is JSON for humans. That is, it has the following features and more:
 
-* More resilliant to syntax errors such as missing a comma
+* More resilient to syntax errors such as missing a comma
 * Strings generally do not need to be quoted. Multi-line strings are also supported!
 * Comments are supported (JSON doesn't allow this!): `#`, `//` and `/* ... */` style comments are allowed.
 * Keys never need to be quoted
@@ -36,4 +36,23 @@ It is **highly** recommended to use a text editor that has HJSON support. A few
 * Visual Studio code via the `vscode-hjson` plugin.
 * Notepad++ via the `npp-hjson` plugin.
 
-See https://hjson.org/users.html for more information.
+See https://hjson.org/users.html for more more editors & plugins.
+
+### Hot-Reload A.K.A. Live Editing
+ENiGMA½'s configuration, menu, and theme files can edited while your BBS is running. When a file is saved, it is hot-reloaded into the running system. If users are currently connected and you change a menu for example, the next reload of that menu will show the changes.
+
+### CaSe SeNsiTiVE
+Configuration keys are **case sensitive**. That means if a configuration key is `boardName` for example, `boardname`, or `BOARDNAME` **will not work**.
+
+## Tips & Tricks
+### JSON Compatibility
+Remember that standard JSON is fully compatible with HJSON. If you are more comfortable with JSON (or have an editor that works with JSON that you prefer) simply convert your config file(s) to JSON and use that instead!
+
+HJSON can be converted to JSON with the `hjson` CLI:
+```bash
+cd /path/to/enigma-bbs
+cp ./config/config.hjson ./config/config.hjson.backup
+./node_modules/hjson/bin/hjson ./config/config.hjson.backup -j > ./config/config.hjson
+```
+
+You can always convert back to HJSON by omitting `-j` in the command above.

From 3fd526da6fdf994980d1f50d36fbc51f9cf2594d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 20 Nov 2018 21:01:39 -0700
Subject: [PATCH 0545/1013] Fix some spelling

---
 core/oputil/oputil_help.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 7c96d171..273bd787 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -26,9 +26,9 @@ commands:
 
 actions:
   pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
-  rm USERNAME                  permanantely removes USERNAME user from system
+  rm USERNAME                  permanently removes USERNAME user from system
   activate USERNAME            sets USERNAME's status to active
-  deactivate USERNAME          sets USERNAME's status to deactive
+  deactivate USERNAME          sets USERNAME's status to inactive
   disable USERNAME             sets USERNAME's status to disabled
   group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
 `,
@@ -57,7 +57,7 @@ cat args:
 actions:
   scan AREA_TAG[@STORAGE_TAG]  scan specified area
                                may also contain optional GLOB as last parameter,
-                               for examle: scan some_area *.zip
+                               for example: scan some_area *.zip
 
   info CRITERIA                display information about areas and/or files
                                where CRITERIA is one of the following:

From c1c4f80a18fd948596e244c12bcc59222442f57a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 20 Nov 2018 21:02:01 -0700
Subject: [PATCH 0546/1013] Note on oputil config cat

---
 docs/configuration/hjson.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/configuration/hjson.md b/docs/configuration/hjson.md
index 509c2980..f29aaddb 100644
--- a/docs/configuration/hjson.md
+++ b/docs/configuration/hjson.md
@@ -56,3 +56,6 @@ cp ./config/config.hjson ./config/config.hjson.backup
 ```
 
 You can always convert back to HJSON by omitting `-j` in the command above.
+
+### oputil
+You can easily dump out your current configuration in a pretty-printed style using oputil: ```./oputil.js config cat```

From 37914b8f717ef51138d9a6674a0191014aba9a71 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 20 Nov 2018 21:02:19 -0700
Subject: [PATCH 0547/1013] Fix spelling

---
 docs/configuration/menu-hjson.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index d5e9b66d..4d8dec9b 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -20,7 +20,7 @@ Below is a table of **common** menu entry members. These members apply to most e
 |--------|--------------|
 | `desc` | A friendly description that can be found in places such as "Who's Online" or wherever the `%MD` MCI code is used. |
 | `art` | An art file *spec*. See [General Art Information](/docs/art/general.md). |
-| `next` | Specifies the next menu entry to go to next. Can be explicit or an array of possibilites dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
+| `next` | Specifies the next menu entry to go to next. Can be explicit or an array of possibilities dependent on ACS. See **Flow Control** in the **ACS Checks** section below. If `next` is not supplied, the next menu is this menus parent. |
 | `prompt` | Specifies a prompt, by name, to use along with this menu. Prompts are configured in `prompt.hjson`. |
 | `submit` | Defines a submit handler when using `prompt`.
 | `form` | An object defining one or more *forms* available on this menu. |

From 3af5b6f509ba84036b01a54286f7fbf147d33a03 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 20 Nov 2018 21:02:30 -0700
Subject: [PATCH 0548/1013] * Word wrap messages when output via Gopher server
 * Fix Gopher startup banner default

---
 core/servers/content/gopher.js | 38 +++++++++++++++++++++++++++-------
 misc/config_template.in.hjson  |  3 +++
 misc/gopher_banner.asc         |  9 ++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 misc/gopher_banner.asc

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 240236d1..37cd9adb 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -17,6 +17,7 @@ const {
 }                           = require('../../message_area.js');
 const { sortAreasOrConfs }  = require('../../conf_area_util.js');
 const AnsiPrep              = require('../../ansi_prep.js');
+const { wordWrapText }      = require('../../word_wrap.js');
 
 //  deps
 const net                   = require('net');
@@ -27,9 +28,10 @@ const moment                = require('moment');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'Gopher',
-    desc        : 'Gopher Server',
+    desc        : 'A RFC-1436-ish Gopher Server',
     author      : 'NuSkooler',
     packageName : 'codes.l33t.enigma.gopher.server',
+    notes       : 'https://tools.ietf.org/html/rfc1436',
 };
 
 const Message               = require('../../message.js');
@@ -158,7 +160,7 @@ exports.getModule = class GopherModule extends ServerModule {
     defaultGenerator(selectorMatch, cb) {
         this.log.debug( { selector : selectorMatch[0] }, 'Serving default content');
 
-        let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'startup_banner.asc');
+        let bannerFile = _.get(Config(), 'contentServers.gopher.bannerFile', 'gopher_banner.asc');
         bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
         fs.readFile(bannerFile, 'utf8', (err, banner) => {
             if(err) {
@@ -182,21 +184,43 @@ exports.getModule = class GopherModule extends ServerModule {
     }
 
     prepareMessageBody(body, cb) {
+        //
+        //  From RFC-1436:
+        //  "User display strings are intended to be displayed on a line on a
+        //   typical screen for a user's viewing pleasure.  While many screens can
+        //   accommodate 80 character lines, some space is needed to display a tag
+        //   of some sort to tell the user what sort of item this is.  Because of
+        //   this, the user display string should be kept under 70 characters in
+        //   length.  Clients may truncate to a length convenient to them."
+        //
+        //  Messages on BBSes however, have generally been <= 79 characters. If we
+        //  start wrapping earlier, things will generally be OK except:
+        //  * When we're doing with FTN-style quoted lines
+        //  * When dealing with ANSI/ASCII art
+        //
+        //  Anyway, the spec says "should" and not MUST or even SHOULD! ...so, to
+        //  to follow the KISS principle: Wrap at 79.
+        //
+        const WordWrapColumn = 79;
         if(isAnsi(body)) {
             AnsiPrep(
                 body,
                 {
-                    cols            : 79,               //  Gopher std. wants 70, but we'll have to deal with it.
-                    forceLineTerm   : true,             //  ensure each line is term'd
-                    asciiMode       : true,             //  export to ASCII
-                    fillLines       : false,            //  don't fill up to |cols|
+                    cols            : WordWrapColumn,   //  See notes above
+                    forceLineTerm   : true,             //  Ensure each line is term'd
+                    asciiMode       : true,             //  Export to ASCII
+                    fillLines       : false,            //  Don't fill up to |cols|
                 },
                 (err, prepped) => {
                     return cb(prepped || body);
                 }
             );
         } else {
-            return cb(cleanControlCodes(body, { all : true } ));
+            const prepped = splitTextAtTerms(cleanControlCodes(body, { all : true } ) )
+                .map(l => (wordWrapText(l, { width : WordWrapColumn } ).wrapped || []).join('\n'))
+                .join('\n');
+
+            return cb(prepped);
         }
     }
 
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 8a474779..ab1b37b8 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -211,6 +211,9 @@
             port: XXXXX
             enabled: false
 
+            //  bannerFile path in misc/ by default. Full paths allowed.
+            bannerFile: XXXXX
+
             //
             //  The Gopher Content Server can export message base
             //  conferences and areas via the "messageConferences" key.
diff --git a/misc/gopher_banner.asc b/misc/gopher_banner.asc
new file mode 100644
index 00000000..b758e066
--- /dev/null
+++ b/misc/gopher_banner.asc
@@ -0,0 +1,9 @@
+_____________________   _____  ____________________    __________\_   /
+\__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+//   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+/____       _____|      __________       ___|__|      ____|     \   /  _____  \
+---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                     /__   _\
+ <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+
+-------------------------------------------------------------------------------

From ebc70907d4c3b6ebb0b940a721dede7c9694d986 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 17:55:31 -0700
Subject: [PATCH 0549/1013] Newest messages first when listing msgs from Gopher

---
 core/message_area.js           | 20 +++++++++++++-------
 core/servers/content/gopher.js | 11 +++++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index e5227ef0..98647cfd 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -353,13 +353,19 @@ function getNewMessagesInAreaForUser(userId, areaTag, cb) {
     });
 }
 
-function getMessageListForArea(client, areaTag, cb) {
-    const filter = {
-        areaTag,
-        resultType  : 'messageList',
-        sort        : 'messageId',
-        order       : 'ascending',
-    };
+function getMessageListForArea(client, areaTag, filter, cb)
+{
+    if(!cb && _.isFunction(filter)) {
+        cb = filter;
+        filter = {
+            areaTag,
+            resultType  : 'messageList',
+            sort        : 'messageId',
+            order       : 'ascending'
+        };
+    } else {
+        Object.assign(filter, { areaTag } );
+    }
 
     if(Message.isPrivateAreaTag(areaTag)) {
         filter.privateTagUserId = client.user.userId;
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 37cd9adb..da09acd9 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -249,7 +249,7 @@ exports.getModule = class GopherModule extends ServerModule {
 
             return message.load( { uuid : msgUuid }, err => {
                 if(err) {
-                    this.log.debug( { uuid : msgUuid }, 'Attempted access to non-existant message UUID!');
+                    this.log.debug( { uuid : msgUuid }, 'Attempted access to non-existent message UUID!');
                     return this.notFoundGenerator(selectorMatch, cb);
                 }
 
@@ -292,10 +292,17 @@ ${msgBody}
                 return this.notFoundGenerator(selectorMatch, cb);
             }
 
-            return getMessageListForArea(null, areaTag, (err, msgList) => {
+            const filter = {
+                resultType  : 'messageList',
+                sort        : 'messageId',
+                order       : 'descending',  //  we want newest messages first for Gopher
+            };
+
+            return getMessageListForArea(null, areaTag, filter, (err, msgList) => {
                 const response = [
                     this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
                     this.makeItem(ItemTypes.InfoMessage, `Messages in ${area.name}`),
+                    this.makeItem(ItemTypes.InfoMessage, '(newest first)'),
                     this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
                     ...msgList.map(msg => this.makeItem(
                         ItemTypes.TextFile,

From 9fd819d608be567acfc69ae06f7b1e9e3c49ee7e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 19:43:50 -0700
Subject: [PATCH 0550/1013] Resolve TODO RE using EnigError for bad login
 attempts

---
 core/enig_error.js         |  4 +++-
 core/servers/login/ssh.js  |  5 +++--
 core/system_menu_method.js | 15 +++++++++------
 core/user.js               |  7 ++++---
 core/user_login.js         | 14 ++++++++------
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/core/enig_error.js b/core/enig_error.js
index 3f189dd7..01e62c40 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -34,8 +34,9 @@ exports.Errors = {
     ExternalProcess     : (reason, reasonCode)  => new EnigError('External process error', -32005, reason, reasonCode),
     MissingConfig       : (reason, reasonCode)  => new EnigError('Missing configuration', -32006, reason, reasonCode),
     UnexpectedState     : (reason, reasonCode)  => new EnigError('Unexpected state', -32007, reason, reasonCode),
-    MissingParam        : (reason, reasonCode)  => new EnigError('Missing paramater(s)', -32008, reason, reasonCode),
+    MissingParam        : (reason, reasonCode)  => new EnigError('Missing paramter(s)', -32008, reason, reasonCode),
     MissingMci          : (reason, reasonCode)  => new EnigError('Missing required MCI code(s)', -32009, reason, reasonCode),
+    BadLogin            : (reason, reasonCode)  => new EnigError('Bad login attempt', -32010, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
@@ -44,4 +45,5 @@ exports.ErrorReasons = {
     NoPreviousMenu      : 'NOPREV',
     NoConditionMatch    : 'NOCONDMATCH',
     NotEnabled          : 'NOTENABLED',
+    AlreadyLoggedIn     : 'ALREADYLOGGEDIN',
 };
\ No newline at end of file
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 72f91a2a..5f0ff05f 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -10,6 +10,7 @@ const userLogin         = require('../../user_login.js').userLogin;
 const enigVersion       = require('../../../package.json').version;
 const theme             = require('../../theme.js');
 const stringFormat      = require('../../string_format.js');
+const { ErrorReasons }  = require('../../enig_error.js');
 
 //  deps
 const ssh2          = require('ssh2');
@@ -70,7 +71,7 @@ function SSHClient(clientConn) {
 
             userLogin(self, ctx.username, ctx.password, function authResult(err) {
                 if(err) {
-                    if(err.existingConn) {
+                    if(ErrorReasons.AlreadyLoggedIn === err.reasonCode) {
                         return alreadyLoggedIn(username);
                     }
 
@@ -96,7 +97,7 @@ function SSHClient(clientConn) {
 
                 userLogin(self, username, (answers[0] || ''), err => {
                     if(err) {
-                        if(err.existingConn) {
+                        if(ErrorReasons.AlreadyLoggedIn === err.reasonCode) {
                             return alreadyLoggedIn(username);
                         }
 
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 9218e34a..8485a90f 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -2,10 +2,11 @@
 'use strict';
 
 //  ENiGMA½
-const removeClient      = require('./client_connections.js').removeClient;
+const { removeClient }  = require('./client_connections.js');
 const ansiNormal        = require('./ansi_term.js').normal;
-const userLogin         = require('./user_login.js').userLogin;
+const { userLogin }     = require('./user_login.js');
 const messageArea       = require('./message_area.js');
+const { ErrorReasons }  = require('./enig_error.js');
 
 //  deps
 const _                 = require('lodash');
@@ -26,12 +27,14 @@ function login(callingMenu, formData, extraArgs, cb) {
     userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
         if(err) {
             //  login failure
-            if(err.existingConn && _.has(callingMenu, 'menuConfig.config.tooNodeMenu')) {
+            if(ErrorReasons.AlreadyLoggedIn === err.reasonCode &&
+                _.has(callingMenu, 'menuConfig.config.tooNodeMenu'))
+            {
                 return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
-            } else {
-                //  Other error
-                return callingMenu.prevMenu(cb);
             }
+
+            //  Other error
+            return callingMenu.prevMenu(cb);
         }
 
         //  success!
diff --git a/core/user.js b/core/user.js
index 6c2b964d..27f4775a 100644
--- a/core/user.js
+++ b/core/user.js
@@ -45,9 +45,10 @@ module.exports = class User {
 
     static get AccountStatus() {
         return {
-            disabled    : 0,
-            inactive    : 1,
-            active      : 2,
+            disabled    : 0,    //  +op disabled
+            inactive    : 1,    //  inactive, aka requires +op approval/activation
+            active      : 2,    //  standard, active
+            locked      : 3,    //  locked out (too many bad login attempts, etc.)
         };
     }
 
diff --git a/core/user_login.js b/core/user_login.js
index a3b2089b..c4f1bcf1 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -8,6 +8,10 @@ const StatLog           = require('./stat_log.js');
 const logger            = require('./logger.js');
 const Events            = require('./events.js');
 const Config            = require('./config.js').get;
+const {
+    Errors,
+    ErrorReasons
+}                       = require('./enig_error.js');
 
 //  deps
 const async             = require('async');
@@ -48,12 +52,10 @@ function userLogin(client, username, password, cb) {
                 'Already logged in'
             );
 
-            const existingConnError = new Error('Already logged in as supplied user');
-            existingConnError.existingConn = true;
-
-            //  :TODO: We should use EnigError & pass existing connection as second param
-
-            return cb(existingConnError);
+            return cb(Errors.BadLogin(
+                `User ${user.username} already logged in.`,
+                ErrorReasons.AlreadyLoggedIn
+            ));
         }
 
         //  update client logger with addition of username

From 472968e81d08da6100f6158968821c1430af19de Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 19:50:03 -0700
Subject: [PATCH 0551/1013] Cleaner code

---
 core/user_login.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/user_login.js b/core/user_login.js
index c4f1bcf1..d08788f3 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -32,14 +32,10 @@ function userLogin(client, username, password, cb) {
 
         //
         //  Ensure this user is not already logged in.
-        //  Loop through active connections -- which includes the current --
-        //  and check for matching user ID. If the count is > 1, disallow.
         //
-        let existingClientConnection;
-        clientConnections.forEach(function connEntry(cc) {
-            if(cc.user !== user && cc.user.userId === user.userId) {
-                existingClientConnection = cc;
-            }
+        const existingClientConnection = clientConnections.find(cc => {
+            return user !== cc.user &&          //  not current connection
+                user.userId === cc.user.userId; //  ...but same user
         });
 
         if(existingClientConnection) {

From 0721a7201c3d88fea8b4f0530f4078ff8c813771 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 19:51:03 -0700
Subject: [PATCH 0552/1013] Default to logging user off if a 2nd login attempt
 is made while they're on

---
 misc/menu_template.in.hjson | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index e7653081..7a0fbcfa 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -185,6 +185,7 @@
 				cls: true
 				nextTimeout: 2000
 			}
+			next: logoff
 		}
 
 		forgotPassword: {

From ec1ce3062ec7a51702e90353119482ac230420a4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 21:24:11 -0700
Subject: [PATCH 0553/1013] Catch bad spawn

---
 core/event_scheduler.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 22c2d58d..e6592d1b 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -5,6 +5,7 @@
 const PluginModule          = require('./plugin_module.js').PluginModule;
 const Config                = require('./config.js').get;
 const Log                   = require('./logger.js').log;
+const { Errors }            = require('./enig_error.js');
 
 const _                     = require('lodash');
 const later                 = require('later');
@@ -138,7 +139,14 @@ class ScheduledEvent {
                 env     : process.env,
             };
 
-            const proc = pty.spawn(this.action.what, this.action.args, opts);
+            let proc;
+            try {
+                proc = pty.spawn(this.action.what, this.action.args, opts);
+            } catch(e) {
+                return cb(Errors.ExternalProcess(
+                    `Error spawning @execute process "${this.action.what}" with args "${this.action.args.join(' ')}": ${e.message}`)
+                );
+            }
 
             proc.once('exit', exitCode => {
                 if(exitCode) {

From 20e9d9ad7e0ab9ef37a47bc2001f1c935cd74305 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 21 Nov 2018 22:21:24 -0700
Subject: [PATCH 0554/1013] Actually log spawn() failure in Event Scheduler

---
 core/event_scheduler.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index e6592d1b..95de5a97 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -117,7 +117,7 @@ class ScheduledEvent {
                 methodModule[this.action.what](this.action.args, err => {
                     if(err) {
                         Log.debug(
-                            { error : err.toString(), eventName : this.name, action : this.action },
+                            { error : err.message, eventName : this.name, action : this.action },
                             'Error performing scheduled event action');
                     }
 
@@ -125,7 +125,7 @@ class ScheduledEvent {
                 });
             } catch(e) {
                 Log.warn(
-                    { error : e.toString(), eventName : this.name, action : this.action },
+                    { error : e.message, eventName : this.name, action : this.action },
                     'Failed to perform scheduled event action');
 
                 return cb(e);
@@ -143,9 +143,17 @@ class ScheduledEvent {
             try {
                 proc = pty.spawn(this.action.what, this.action.args, opts);
             } catch(e) {
-                return cb(Errors.ExternalProcess(
-                    `Error spawning @execute process "${this.action.what}" with args "${this.action.args.join(' ')}": ${e.message}`)
+                Log.warn(
+                    {
+                        error       : 'Failed to spawn @execute process',
+                        reason      : e.message,
+                        eventName   : this.name,
+                        action      : this.action,
+                        what        : this.action.what,
+                        args        : this.action.args
+                    }
                 );
+                return cb(e);
             }
 
             proc.once('exit', exitCode => {

From 1f9b963e769c2749297d5012981d9f0b843b4f0e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 22 Nov 2018 10:10:53 -0700
Subject: [PATCH 0555/1013] Fix typo

---
 core/scanner_tossers/ftn_bso.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index e2260d93..3292588d 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1746,7 +1746,7 @@ function FTNMessageScanTossModule() {
                                 }
                                 return callback(null, localInfo);   //  continue even if we couldn't find an old match
                             });
-                        } else if(fileIds.legnth > 1) {
+                        } else if(fileIds.length > 1) {
                             return callback(Errors.General(`More than one existing entry for TIC in ${localInfo.areaTag} ([${fileIds.join(', ')}])`));
                         } else {
                             return callback(null, localInfo);

From f18b02365231068dd9790d05be9972674b413f58 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 22 Nov 2018 10:11:04 -0700
Subject: [PATCH 0556/1013] Notes on escaping

---
 docs/configuration/hjson.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/configuration/hjson.md b/docs/configuration/hjson.md
index f29aaddb..cc8fa26d 100644
--- a/docs/configuration/hjson.md
+++ b/docs/configuration/hjson.md
@@ -44,6 +44,14 @@ ENiGMA½'s configuration, menu, and theme files can edited while your BBS is run
 ### CaSe SeNsiTiVE
 Configuration keys are **case sensitive**. That means if a configuration key is `boardName` for example, `boardname`, or `BOARDNAME` **will not work**.
 
+### Escaping
+Some values need escaped. This is especially important to remember on Windows machines where file paths contain backslashes (`\`). To specify a path to `C:\foo\bar\baz.exe` for example, an entry may look like this in your configuration file:
+```hjson
+something: {
+    path: "C:\\foo\\bar\\baz.exe" // note the extra \'s!
+}
+```
+
 ## Tips & Tricks
 ### JSON Compatibility
 Remember that standard JSON is fully compatible with HJSON. If you are more comfortable with JSON (or have an editor that works with JSON that you prefer) simply convert your config file(s) to JSON and use that instead!

From df2bf4477e5ff839bec0bcec3ab68b7e8b8f4dd9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 22 Nov 2018 23:07:37 -0700
Subject: [PATCH 0557/1013] SECURITY UPDATE * Handle failed login attempts via
 Telnet * New lockout features for >= N failed attempts * New auto-unlock over
 email feature * New auto-unlock after N minutes feature * Code cleanup in
 users * Add user_property.js - start using consts for user properties. Clean
 up over time. * Update email docs

---
 .../luciano_blocktronics/ACCOUNTINACTIVE.ANS  | Bin 0 -> 207 bytes
 .../luciano_blocktronics/ACCOUNTLOCKED.ANS    | Bin 0 -> 197 bytes
 core/config.js                                |   8 +-
 core/enig_error.js                            |   6 +-
 core/oputil/oputil_config.js                  |   2 +-
 core/oputil/oputil_help.js                    |   1 +
 core/oputil/oputil_user.js                    |  32 +--
 core/servers/login/ssh.js                     |  59 +++--
 core/stat_log.js                              |   1 +
 core/system_menu_method.js                    |  10 +-
 core/tic_file_info.js                         |   4 +-
 core/user.js                                  | 247 ++++++++++++++----
 core/user_login.js                            |  18 +-
 core/user_property.js                         |  25 ++
 core/web_password_reset.js                    |   9 +-
 docs/configuration/email.md                   |  32 ++-
 misc/config_template.in.hjson                 |  17 ++
 misc/menu_template.in.hjson                   |  30 +++
 18 files changed, 401 insertions(+), 100 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/ACCOUNTINACTIVE.ANS
 create mode 100644 art/themes/luciano_blocktronics/ACCOUNTLOCKED.ANS
 create mode 100644 core/user_property.js

diff --git a/art/themes/luciano_blocktronics/ACCOUNTINACTIVE.ANS b/art/themes/luciano_blocktronics/ACCOUNTINACTIVE.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..d0d2cd0e4f93f105a20f26af99667fea5639d6a6
GIT binary patch
literal 207
zcmb1+Hn27^ur@Z&<pKifXhTb9>1boKT*u_({L;J<h0J1w#PY<<lFYnx1)yxMc7B00
zPzz9nLSk}BW?5oMW_}(}!rIs%SCLC9*fG@E)xbc3dcerQ(8AEr$S9bBfq{`RfPocA
R1A(xoldnRUyCZ}LCjkMQCBFaw

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/ACCOUNTLOCKED.ANS b/art/themes/luciano_blocktronics/ACCOUNTLOCKED.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..b743a3cf6e5bb44eba8add1e8678b84ec52d4ae1
GIT binary patch
literal 197
zcmb1+Hn27^ur@Z&<pKifXhUmbgIpkG<SZQxW>^3j#%8&W$;tVpc_j*&#R@>#+?@R6
z?9>#Xj6tp<msGH0sI#kqfdch_k%6Iwp`nqHCj$cmBVzyqE06{PVNWMtg)nzV2oFvI
E0G1UY6aWAK

literal 0
HcmV?d00001

diff --git a/core/config.js b/core/config.js
index 3799d538..701c8494 100644
--- a/core/config.js
+++ b/core/config.js
@@ -172,7 +172,6 @@ function getDefaultConfig() {
 
             //  :TODO: closedSystem and loginAttemps prob belong under users{}?
             closedSystem    : false,                    //  is the system closed to new users?
-            loginAttempts   : 3,
 
             menuFile        : 'menu.hjson',     //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
             promptFile      : 'prompt.hjson',   //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
@@ -217,6 +216,13 @@ function getDefaultConfig() {
 
             preAuthIdleLogoutSeconds    : 60 * 3,   //  3m
             idleLogoutSeconds           : 60 * 6,   //  6m
+
+            failedLogin : {
+                disconnect          : 3,            //  0=disabled
+                lockAccount         : 9,            //  0=disabled; Mark user status as "locked" if >= N
+                autoUnlockMinutes   : 60 * 6,       //  0=disabled; Auto unlock after N minutes.
+            },
+            unlockAtEmailPwReset    : true,         //  if true, password reset via email will unlock locked accounts
         },
 
         theme : {
diff --git a/core/enig_error.js b/core/enig_error.js
index 01e62c40..78798a4a 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -46,4 +46,8 @@ exports.ErrorReasons = {
     NoConditionMatch    : 'NOCONDMATCH',
     NotEnabled          : 'NOTENABLED',
     AlreadyLoggedIn     : 'ALREADYLOGGEDIN',
-};
\ No newline at end of file
+    TooMany             : 'TOOMANY',
+    Disabled            : 'DISABLED',
+    Inactive            : 'INACTIVE',
+    Locked              : 'LOCKED',
+};
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 83ac5232..52c388f7 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -38,7 +38,7 @@ function getAnswers(questions, cb) {
 const ConfigIncludeKeys = [
     'theme',
     'users.preAuthIdleLogoutSeconds', 'users.idleLogoutSeconds',
-    'users.newUserNames',
+    'users.newUserNames', 'users.failedLogin', 'users.unlockAtEmailPwReset',
     'paths.logs',
     'loginServers',
     'contentServers',
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 273bd787..4d7931e0 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -30,6 +30,7 @@ actions:
   activate USERNAME            sets USERNAME's status to active
   deactivate USERNAME          sets USERNAME's status to inactive
   disable USERNAME             sets USERNAME's status to disabled
+  lock USERNAME                sets USERNAME's status to locked
   group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
 `,
 
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 60d3888d..d1f21408 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -55,6 +55,14 @@ function setAccountStatus(user, status) {
     }
 
     const AccountStatus = require('../../core/user.js').AccountStatus;
+
+    status = {
+        activate    : AccountStatus.active,
+        deactivate  : AccountStatus.inactive,
+        disable     : AccountStatus.disabled,
+        lock        : AccountStatus.locked,
+    }[status];
+
     const statusDesc = _.invert(AccountStatus)[status];
     user.persistProperty('account_status', status, err => {
         if(err) {
@@ -147,21 +155,6 @@ function modUserGroups(user) {
     }
 }
 
-function activateUser(user) {
-    const AccountStatus = require('../../core/user.js').AccountStatus;
-    return setAccountStatus(user, AccountStatus.active);
-}
-
-function deactivateUser(user) {
-    const AccountStatus = require('../../core/user.js').AccountStatus;
-    return setAccountStatus(user, AccountStatus.inactive);
-}
-
-function disableUser(user) {
-    const AccountStatus = require('../../core/user.js').AccountStatus;
-    return setAccountStatus(user, AccountStatus.disabled);
-}
-
 function handleUserCommand() {
     function errUsage()  {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
@@ -195,11 +188,12 @@ function handleUserCommand() {
             del			: removeUser,
             delete		: removeUser,
 
-            activate	: activateUser,
-            deactivate	: deactivateUser,
-            disable		: disableUser,
+            activate	: setAccountStatus,
+            deactivate	: setAccountStatus,
+            disable		: setAccountStatus,
+            lock        : setAccountStatus,
 
             group		: modUserGroups,
-        }[action] || errUsage)(user);
+        }[action] || errUsage)(user, action);
     });
 }
\ No newline at end of file
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 5f0ff05f..f626cb79 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -10,7 +10,10 @@ const userLogin         = require('../../user_login.js').userLogin;
 const enigVersion       = require('../../../package.json').version;
 const theme             = require('../../theme.js');
 const stringFormat      = require('../../string_format.js');
-const { ErrorReasons }  = require('../../enig_error.js');
+const {
+    Errors,
+    ErrorReasons
+}                       = require('../../enig_error.js');
 
 //  deps
 const ssh2          = require('ssh2');
@@ -37,8 +40,6 @@ function SSHClient(clientConn) {
 
     const self = this;
 
-    let loginAttempts = 0;
-
     clientConn.on('authentication', function authAttempt(ctx) {
         const username  = ctx.username || '';
         const password  = ctx.password || '';
@@ -53,26 +54,56 @@ function SSHClient(clientConn) {
             return clientConn.end();
         }
 
-        function alreadyLoggedIn(username) {
-            ctx.prompt(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
+        function promptAndTerm(msg) {
+            if('keyboard-interactive' === ctx.method) {
+                ctx.prompt(msg);
+            }
             return terminateConnection();
         }
 
+        function accountAlreadyLoggedIn(username) {
+            return promptAndTerm(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
+        }
+
+        function accountDisabled(username) {
+            return promptAndTerm(`${username} is disabled.\n(Press any key to continue)`);
+        }
+
+        function accountInactive(username) {
+            return promptAndTerm(`${username} is waiting for +op activation.\n(Press any key to continue)`);
+        }
+
+        function accountLocked(username) {
+            return promptAndTerm(`${username} is locked.\n(Press any key to continue)`);
+        }
+
+        function isSpecialHandleError(err) {
+            return [ ErrorReasons.AlreadyLoggedIn, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked ].includes(err.reasonCode);
+        }
+
+        function handleSpecialError(err, username) {
+            switch(err.reasonCode) {
+                case ErrorReasons.AlreadyLoggedIn   : return accountAlreadyLoggedIn(username);
+                case ErrorReasons.Inactive          : return accountInactive(username);
+                case ErrorReasons.Disabled          : return accountDisabled(username);
+                case ErrorReasons.Locked            : return accountLocked(username);
+                default                             : return terminateConnection();
+            }
+        }
+
         //
         //  If the system is open and |isNewUser| is true, the login
-        //  sequence is hijacked in order to start the applicaiton process.
+        //  sequence is hijacked in order to start the application process.
         //
         if(false === config.general.closedSystem && self.isNewUser) {
             return ctx.accept();
         }
 
         if(username.length > 0 && password.length > 0) {
-            loginAttempts += 1;
-
             userLogin(self, ctx.username, ctx.password, function authResult(err) {
                 if(err) {
-                    if(ErrorReasons.AlreadyLoggedIn === err.reasonCode) {
-                        return alreadyLoggedIn(username);
+                    if(isSpecialHandleError(err)) {
+                        return handleSpecialError(err, username);
                     }
 
                     return ctx.reject(SSHClient.ValidAuthMethods);
@@ -93,15 +124,13 @@ function SSHClient(clientConn) {
             const interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };
 
             ctx.prompt(interactivePrompt, function retryPrompt(answers) {
-                loginAttempts += 1;
-
                 userLogin(self, username, (answers[0] || ''), err => {
                     if(err) {
-                        if(ErrorReasons.AlreadyLoggedIn === err.reasonCode) {
-                            return alreadyLoggedIn(username);
+                        if(isSpecialHandleError(err)) {
+                            return handleSpecialError(err, username);
                         }
 
-                        if(loginAttempts >= config.general.loginAttempts) {
+                        if(Errors.BadLogin().code === err.code) {
                             return terminateConnection();
                         }
 
diff --git a/core/stat_log.js b/core/stat_log.js
index 9e655999..4ee4c53b 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -68,6 +68,7 @@ class StatLog {
         };
     }
 
+    //  :TODO: fix spelling :)
     setNonPeristentSystemStat(statName, statValue) {
         this.systemStats[statName] = statValue;
     }
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 8485a90f..7c135f22 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -26,13 +26,21 @@ function login(callingMenu, formData, extraArgs, cb) {
 
     userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
         if(err) {
-            //  login failure
+            //  already logged in with this user?
             if(ErrorReasons.AlreadyLoggedIn === err.reasonCode &&
                 _.has(callingMenu, 'menuConfig.config.tooNodeMenu'))
             {
                 return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
             }
 
+            const ReasonsMenus = [
+                ErrorReasons.TooMany, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked
+            ];
+            if(ReasonsMenus.includes(err.reasonCode)) {
+                const menu = _.get(callingMenu, [ 'menuConfig', 'config', err.reasonCode.toLowerCase() ]);
+                return menu ? callingMenu.gotoMenu(menu, cb) : logoff(callingMenu, {}, {}, cb);
+            }
+
             //  Other error
             return callingMenu.prevMenu(cb);
         }
diff --git a/core/tic_file_info.js b/core/tic_file_info.js
index 5db24cc2..fd3c7572 100644
--- a/core/tic_file_info.js
+++ b/core/tic_file_info.js
@@ -187,10 +187,10 @@ module.exports = class TicFileInfo {
         //  send the file to be distributed and the accompanying TIC file.
         //  Some File processors (Allfix) only insert a line with this
         //  keyword when the file and the associated TIC file are to be
-        //  file routed through a third sysem instead of being processed
+        //  file routed through a third system instead of being processed
         //  by a file processor on that system. Others always insert it.
         //  Note that the To keyword may cause problems when the TIC file
-        //  is proecessed by software that does not recognise it and
+        //  is processed by software that does not recognize it and
         //  passes the line "as is" to other systems.
         //
         //  Example:  To 292/854
diff --git a/core/user.js b/core/user.js
index 27f4775a..a712829c 100644
--- a/core/user.js
+++ b/core/user.js
@@ -1,11 +1,18 @@
 /* jslint node: true */
 'use strict';
 
+//  ENiGMA½
 const userDb        = require('./database.js').dbs.user;
 const Config        = require('./config.js').get;
 const userGroup     = require('./user_group.js');
-const Errors        = require('./enig_error.js').Errors;
+const {
+    Errors,
+    ErrorReasons
+}                   = require('./enig_error.js');
 const Events        = require('./events.js');
+const UserProps     = require('./user_property.js');
+const Log           = require('./logger.js').log;
+const StatLog       = require('./stat_log.js');
 
 //  deps
 const crypto        = require('crypto');
@@ -39,7 +46,7 @@ module.exports = class User {
 
     static get StandardPropertyGroups() {
         return {
-            password    : [ 'pw_pbkdf2_salt', 'pw_pbkdf2_dk' ],
+            password    : [ UserProps.PassPbkdf2Salt, UserProps.PassPbkdf2Dk ],
         };
     }
 
@@ -52,6 +59,18 @@ module.exports = class User {
         };
     }
 
+    static isSamePasswordSlowCompare(passBuf1, passBuf2) {
+        if(passBuf1.length !== passBuf2.length) {
+            return false;
+        }
+
+        let c = 0;
+        for(let i = 0; i < passBuf1.length; i++) {
+            c |= passBuf1[i] ^ passBuf2[i];
+        }
+        return 0 === c;
+    }
+
     isAuthenticated() {
         return true === this.authenticated;
     }
@@ -61,16 +80,21 @@ module.exports = class User {
             return false;
         }
 
-        return this.hasValidPassword();
+        return this.hasValidPasswordProperties();
     }
 
-    hasValidPassword() {
-        if(!this.properties || !this.properties.pw_pbkdf2_salt || !this.properties.pw_pbkdf2_dk) {
+    hasValidPasswordProperties() {
+        const salt  = this.getProperty(UserProps.PassPbkdf2Salt);
+        const dk    = this.getProperty(UserProps.PassPbkdf2Dk);
+
+        if(!salt || !dk ||
+            (salt.length !== User.PBKDF2.saltLen * 2) ||
+            (dk.length !== User.PBKDF2.keyLen * 2))
+        {
             return false;
         }
 
-        return ((this.properties.pw_pbkdf2_salt.length === User.PBKDF2.saltLen * 2) &&
-            (this.properties.pw_pbkdf2_dk.length === User.PBKDF2.keyLen * 2));
+        return true;
     }
 
     isRoot() {
@@ -102,24 +126,77 @@ module.exports = class User {
         return 10;  //  :TODO: Is this what we want?
     }
 
+    processFailedLogin(userId, cb) {
+        async.waterfall(
+            [
+                (callback) => {
+                    return User.getUser(userId, callback);
+                },
+                (tempUser, callback) => {
+                    return StatLog.incrementUserStat(
+                        tempUser,
+                        UserProps.FailedLoginAttempts,
+                        1,
+                        (err, failedAttempts) => {
+                            return callback(null, tempUser, failedAttempts);
+                        }
+                    );
+                },
+                (tempUser, failedAttempts, callback) => {
+                    const lockAccount = _.get(Config(), 'users.failedLogin.lockAccount');
+                    if(lockAccount > 0 && failedAttempts >= lockAccount) {
+                        const props = {
+                            [ UserProps.AccountStatus ]     : User.AccountStatus.locked,
+                            [ UserProps.AccountLockedTs ]   : StatLog.now,
+                        };
+                        if(!_.has(tempUser.properties, UserProps.AccountLockedPrevStatus)) {
+                            props[UserProps.AccountLockedPrevStatus] = tempUser.getProperty(UserProps.AccountStatus);
+                        }
+                        return tempUser.persistProperties(props, callback);
+                    }
+
+                    return cb(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    unlockAccount(cb) {
+        const prevStatus = this.getProperty(UserProps.AccountLockedPrevStatus);
+        if(!prevStatus) {
+            return cb(null);    //  nothing to do
+        }
+
+        this.persistProperty(UserProps.AccountStatus, prevStatus, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            return this.removeProperties( [ UserProps.AccountLockedPrevStatus, UserProps.AccountLockedTs ], cb);
+        });
+    }
+
     authenticate(username, password, cb) {
         const self = this;
-        const cachedInfo = {};
+        const tempAuthInfo = {};
 
         async.waterfall(
             [
                 function fetchUserId(callback) {
                     //  get user ID
                     User.getUserIdAndName(username, (err, uid, un) => {
-                        cachedInfo.userId   = uid;
-                        cachedInfo.username = un;
+                        tempAuthInfo.userId   = uid;
+                        tempAuthInfo.username = un;
 
                         return callback(err);
                     });
                 },
                 function getRequiredAuthProperties(callback) {
                     //  fetch properties required for authentication
-                    User.loadProperties(cachedInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
+                    User.loadProperties(tempAuthInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
                         return callback(err, props);
                     });
                 },
@@ -136,30 +213,53 @@ module.exports = class User {
                     const passDkBuf     = Buffer.from(passDk,   'hex');
                     const propsDkBuf    = Buffer.from(propsDk,  'hex');
 
-                    if(passDkBuf.length !== propsDkBuf.length) {
-                        return callback(Errors.AccessDenied('Invalid password'));
-                    }
-
-                    let c = 0;
-                    for(let i = 0; i < passDkBuf.length; i++) {
-                        c |= passDkBuf[i] ^ propsDkBuf[i];
-                    }
-
-                    return callback(0 === c ? null : Errors.AccessDenied('Invalid password'));
+                    return callback(User.isSamePasswordSlowCompare(passDkBuf, propsDkBuf) ?
+                        null :
+                        Errors.AccessDenied('Invalid password')
+                    );
                 },
                 function initProps(callback) {
-                    User.loadProperties(cachedInfo.userId, (err, allProps) => {
+                    User.loadProperties(tempAuthInfo.userId, (err, allProps) => {
                         if(!err) {
-                            cachedInfo.properties = allProps;
+                            tempAuthInfo.properties = allProps;
                         }
 
                         return callback(err);
                     });
                 },
+                function checkAccountStatus(callback) {
+                    const accountStatus = parseInt(tempAuthInfo.properties[UserProps.AccountStatus], 10);
+                    if(User.AccountStatus.disabled === accountStatus) {
+                        return callback(Errors.AccessDenied('Account disabled', ErrorReasons.Disabled));
+                    }
+                    if(User.AccountStatus.inactive === accountStatus) {
+                        return callback(Errors.AccessDenied('Account inactive', ErrorReasons.Inactive));
+                    }
+
+                    if(User.AccountStatus.locked === accountStatus) {
+                        const autoUnlockMinutes = _.get(Config(), 'users.failedLogin.autoUnlockMinutes');
+                        const lockedTs          = moment(tempAuthInfo.properties[UserProps.AccountLockedTs]);
+                        if(autoUnlockMinutes && lockedTs.isValid()) {
+                            const minutesSinceLocked = moment().diff(lockedTs, 'minutes');
+                            if(minutesSinceLocked >= autoUnlockMinutes) {
+                                //  allow the login - we will clear any lock there
+                                return callback(null);
+                            }
+                        }
+                        return callback(Errors.AccessDenied('Account is locked', ErrorReasons.Locked));
+                    }
+
+                    //  anything else besides active is still not allowed
+                    if(User.AccountStatus.active !== accountStatus) {
+                        return callback(Errors.AccessDenied('Account is not active'));
+                    }
+
+                    return callback(null);
+                },
                 function initGroups(callback) {
-                    userGroup.getGroupsForUser(cachedInfo.userId, (err, groups) => {
+                    userGroup.getGroupsForUser(tempAuthInfo.userId, (err, groups) => {
                         if(!err) {
-                            cachedInfo.groups = groups;
+                            tempAuthInfo.groups = groups;
                         }
 
                         return callback(err);
@@ -167,15 +267,44 @@ module.exports = class User {
                 }
             ],
             err => {
-                if(!err) {
-                    self.userId         = cachedInfo.userId;
-                    self.username       = cachedInfo.username;
-                    self.properties     = cachedInfo.properties;
-                    self.groups         = cachedInfo.groups;
+                if(err) {
+                    //
+                    //  If we failed login due to something besides an inactive or disabled account,
+                    //  we need to update failure status and possibly lock the account.
+                    //
+                    //  If locked already, update the lock timestamp -- ie, extend the lockout period.
+                    //
+                    if(![ErrorReasons.Disabled, ErrorReasons.Inactive].includes(err.reasonCode) && tempAuthInfo.userId) {
+                        self.processFailedLogin(tempAuthInfo.userId, persistErr => {
+                            if(persistErr) {
+                                Log.warn( { error : persistErr.message }, 'Failed to persist failed login information');
+                            }
+                            return cb(err); //  pass along original error
+                        });
+                    } else {
+                        return cb(err);
+                    }
+                } else {
+                    //  everything checks out - load up info
+                    self.userId         = tempAuthInfo.userId;
+                    self.username       = tempAuthInfo.username;
+                    self.properties     = tempAuthInfo.properties;
+                    self.groups         = tempAuthInfo.groups;
                     self.authenticated  = true;
-                }
 
-                return cb(err);
+                    self.removeProperty(UserProps.FailedLoginAttempts);
+
+                    //
+                    //  We need to *revert* any locked status back to
+                    //  the user's previous status & clean up props.
+                    //
+                    self.unlockAccount(unlockErr => {
+                        if(unlockErr) {
+                            Log.warn( { error : unlockErr.message }, 'Failed to unlock account');
+                        }
+                        return cb(null);
+                    });
+                }
             }
         );
     }
@@ -191,7 +320,7 @@ module.exports = class User {
         const self = this;
 
         //  :TODO: set various defaults, e.g. default activation status, etc.
-        self.properties.account_status = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
+        self.properties[UserProps.AccountStatus] = config.users.requireActivation ? User.AccountStatus.inactive : User.AccountStatus.active;
 
         async.waterfall(
             [
@@ -212,7 +341,7 @@ module.exports = class User {
 
                             //  Do not require activation for userId 1 (root/admin)
                             if(User.RootUserID === self.userId) {
-                                self.properties.account_status = User.AccountStatus.active;
+                                self.properties[UserProps.AccountStatus] = User.AccountStatus.active;
                             }
 
                             return callback(null, trans);
@@ -225,8 +354,8 @@ module.exports = class User {
                             return callback(err);
                         }
 
-                        self.properties.pw_pbkdf2_salt  = info.salt;
-                        self.properties.pw_pbkdf2_dk    = info.dk;
+                        self.properties[UserProps.PassPbkdf2Salt]   = info.salt;
+                        self.properties[UserProps.PassPbkdf2Dk]     = info.dk;
                         return callback(null, trans);
                     });
                 },
@@ -290,20 +419,32 @@ module.exports = class User {
         );
     }
 
+    static persistPropertyByUserId(userId, propName, propValue, cb) {
+        userDb.run(
+            `REPLACE INTO user_property (user_id, prop_name, prop_value)
+            VALUES (?, ?, ?);`,
+            [ userId, propName, propValue ],
+            err => {
+                if(cb) {
+                    return cb(err, propValue);
+                }
+            }
+        );
+    }
+
+    getProperty(propName) {
+        return this.properties[propName];
+    }
+
+    getPropertyAsNumber(propName) {
+        return parseInt(this.getProperty(propName), 10);
+    }
+
     persistProperty(propName, propValue, cb) {
         //  update live props
         this.properties[propName] = propValue;
 
-        userDb.run(
-            `REPLACE INTO user_property (user_id, prop_name, prop_value)
-            VALUES (?, ?, ?);`,
-            [ this.userId, propName, propValue ],
-            err => {
-                if(cb) {
-                    return cb(err);
-                }
-            }
-        );
+        return User.persistPropertyByUserId(this.userId, propName, propValue, cb);
     }
 
     removeProperty(propName, cb) {
@@ -322,6 +463,15 @@ module.exports = class User {
         );
     }
 
+    removeProperties(propNames, cb) {
+        async.each(propNames, (name, next) => {
+            return this.removeProperty(name, next);
+        },
+        err => {
+            return cb(err);
+        });
+    }
+
     persistProperties(properties, transOrDb, cb) {
         if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
             cb = transOrDb;
@@ -372,8 +522,9 @@ module.exports = class User {
     }
 
     getAge() {
-        if(_.has(this.properties, 'birthdate')) {
-            return moment().diff(this.properties.birthdate, 'years');
+        const birthdate = this.getProperty(UserProps.Birthdate);
+        if(birthdate) {
+            return moment().diff(birthdate, 'years');
         }
     }
 
diff --git a/core/user_login.js b/core/user_login.js
index d08788f3..be2a99a1 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -15,20 +15,30 @@ const {
 
 //  deps
 const async             = require('async');
+const _                 = require('lodash');
 
 exports.userLogin       = userLogin;
 
 function userLogin(client, username, password, cb) {
-    client.user.authenticate(username, password, function authenticated(err) {
+    client.user.authenticate(username, password, err => {
+        const config = Config();
+
         if(err) {
             client.log.info( { username : username, error : err.message }, 'Failed login attempt');
 
-            //  :TODO: if username exists, record failed login attempt to properties
-            //  :TODO: check Config max failed logon attempts/etc. - set err.maxAttempts = true
+            client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
+            const disconnect = config.users.failedLogin.disconnect;
+            if(disconnect > 0 && client.user.sessionFailedLoginAttempts >= disconnect) {
+                return cb(Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany));
+            }
 
             return cb(err);
         }
-        const user  = client.user;
+
+        const user = client.user;
+
+        //  Good login; reset any failed attempts
+        delete user.sessionFailedLoginAttempts;
 
         //
         //  Ensure this user is not already logged in.
diff --git a/core/user_property.js b/core/user_property.js
new file mode 100644
index 00000000..04f8f0c9
--- /dev/null
+++ b/core/user_property.js
@@ -0,0 +1,25 @@
+/* jslint node: true */
+'use strict';
+
+//
+//  Common user properties used throughout the system.
+//
+//  This IS NOT a full list. For example, custom modules
+//  can utilize their own properties as well!
+//
+module.exports = {
+    PassPbkdf2Salt          : 'pw_pbkdf2_salt',
+    PassPbkdf2Dk            : 'pw_pbkdf2_dk',
+
+    AccountStatus           : 'account_status',
+
+    Birthdate               : 'birthdate',
+
+    FailedLoginAttempts     : 'failed_login_attempts',
+    AccountLockedTs         : 'account_locked_timestamp',
+    AccountLockedPrevStatus : 'account_locked_prev_status', //  previous account status
+
+    EmailPwResetToken       : 'email_password_reset_token',
+    EmailPwResetTokenTs     : 'email_password_reset_token_ts',
+};
+
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 6ca916da..06fd7838 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -10,6 +10,7 @@ const User                  = require('./user.js');
 const userDb                = require('./database.js').dbs.user;
 const getISOTimestampString = require('./database.js').getISOTimestampString;
 const Log                   = require('./logger.js').log;
+const UserProps             = require('./user_property.js');
 
 //  deps
 const async                 = require('async');
@@ -17,6 +18,7 @@ const crypto                = require('crypto');
 const fs                    = require('graceful-fs');
 const url                   = require('url');
 const querystring           = require('querystring');
+const _                     = require('lodash');
 
 const PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT =
     `%USERNAME%:
@@ -283,8 +285,11 @@ class WebPasswordReset {
                     }
 
                     //  delete assoc properties - no need to wait for completion
-                    user.removeProperty('email_password_reset_token');
-                    user.removeProperty('email_password_reset_token_ts');
+                    user.removeProperties([ UserProps.EmailPwResetToken, UserProps.EmailPwResetTokenTs ]);
+
+                    if(true === _.get(config, 'users.unlockAtEmailPwReset')) {
+                        user.unlockAccount( () => { /* dummy */ } );
+                    }
 
                     resp.writeHead(200);
                     return resp.end('Password changed successfully');
diff --git a/docs/configuration/email.md b/docs/configuration/email.md
index 5bc4d4c8..eb13ef71 100644
--- a/docs/configuration/email.md
+++ b/docs/configuration/email.md
@@ -2,16 +2,18 @@
 layout: page
 title: Email
 ---
-ENiGMA½ uses email to send password reset information to users. For it to work, you need to provide valid SMTP 
-config in your [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %})
+## Email Support
+ENiGMA½ uses email to send password reset information to users. For it to work, you need to provide valid [Nodemailer](https://nodemailer.com/about/) compatible `email` block in your [config.hjson]({{ site.baseurl }}{% link configuration/config-hjson.md %}). Nodemailer supports SMTP in addition to many pre-defined services for ease of use. The `transport` block within `email` must be Nodemailer compatible.
 
-## SMTP Services
+Additional email support will come in the near future.
 
-If you don't have an SMTP server to send from, [Sendgrid](https://sendgrid.com/) provide a reliable free
-service.
+## Services
 
-## Example SMTP Configuration
+If you don't have an SMTP server to send from, [Sendgrid](https://sendgrid.com/) and [Zoho](https://www.zoho.com/mail/) both provide reliable and free services.
 
+## Example Configurations
+
+Example 1 - SMTP:
 ```hjson
 email: {
     defaultFrom: sysop@bbs.awesome.com
@@ -27,3 +29,21 @@ email: {
         }
     }
 ```
+
+Example 2 - Zoho
+```hjson
+email: {
+    defaultFrom: sysop@bbs.awesome.com
+
+    transport: {
+        service: Zoho
+        auth: {
+            user: noreply@bbs.awesome.com
+            pass: yuspymypass
+        }
+    }
+}
+```
+
+## Lockout Reset
+If email is available on your system and you allow email-driven password resets, you may elect to allow unlocking accounts at the time of a password reset. This is controlled by the `users.unlockAtEmailPwReset` configuration option. If an account is locked due to too many failed login attempts, a user may reset their password to remedy the situation themselves.
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index ab1b37b8..489a7cb3 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -352,6 +352,23 @@
         //  Usernames reserved for applying to your system
         newUserNames: []
 
+        //  Handling of failed logins
+        failedLogin : {
+            //  disconnect after N failed attempts. 0=disabled.
+            disconnect          : XXXXX
+
+            //  Lock the user out after N failed attempts. 0=disabled.
+            lockAccount         : XXXXX
+
+            //
+            //  If locked out, how long until the user can login again?
+            //  Set to 0 to disable auto-unlock
+            //
+            autoUnlockMinutes   : XXXXX
+        },
+
+        //  Allow email driven password resets to unlock accounts?
+        unlockAtEmailPwReset    : XXXXX
     }
 
     //  Archive files and related
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 7a0fbcfa..6e1d889d 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -145,6 +145,9 @@
 			next: fullLoginSequenceLoginArt
 			config: {
 				tooNodeMenu: loginAttemptTooNode
+				inactive: loginAttemptAccountInactive
+				disabled: loginAttemptAccountDisabled
+				locked: loginAttemptAccountLocked
 			}
 			form: {
 				0: {
@@ -188,6 +191,33 @@
 			next: logoff
 		}
 
+		loginAttemptAccountLocked: {
+			art: ACCOUNTLOCKED
+			config: {
+				cls: true
+				nextTimeout: 2000
+			}
+			next: logoff
+		}
+
+		loginAttemptAccountDisabled: {
+			art: ACCOUNTDISABLED
+			config: {
+				cls: true
+				nextTimeout: 2000
+			}
+			next: logoff
+		}
+
+		loginAttemptAccountInactive: {
+			art: ACCOUNTINACTIVE
+			config: {
+				cls: true
+				nextTimeout: 2000
+			}
+			next: logoff
+		}
+
 		forgotPassword: {
 			desc: Forgot password
 			prompt: forgotPasswordPrompt

From f0e7b46a2f548893e44f166226c5a606ebb1f5c9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 11:05:51 -0700
Subject: [PATCH 0558/1013] Moarrrrrr doc updates

---
 docs/_includes/nav.md                   |  2 --
 docs/admin/oputil.md                    | 14 +++++-----
 docs/configuration/config-hjson.md      | 15 +++++++++--
 docs/configuration/sysop-setup.md       |  3 +--
 docs/installation/manual.md             | 35 ++++++++++++-------------
 docs/installation/os-hardware.md        | 15 ++++++-----
 docs/installation/windows.md            |  6 +++--
 docs/oputil/index.md                    | 17 ------------
 docs/troubleshooting/monitoring-logs.md | 17 ++++++++----
 9 files changed, 64 insertions(+), 60 deletions(-)
 delete mode 100644 docs/oputil/index.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 728e5444..84785dbe 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -82,8 +82,6 @@
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
- 
-  - [Oputil]({{ site.baseurl }}{% link oputil/index.md %})
 
   - Troubleshooting
     - [Monitoring Logs]({{ site.baseurl }}{% link troubleshooting/monitoring-logs.md %})
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 8fbf0a46..9db1439c 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -27,7 +27,7 @@ Commands break up operations by groups:
 | Command   | Description   |
 |-----------|---------------|
 | `user`    | User management   |
-| `config`  | System configuration and maintentance |
+| `config`  | System configuration and maintenance |
 | `fb`      | File base configuration and management    |
 | `mb`      | Message base configuration and management |
 
@@ -45,11 +45,12 @@ usage: optutil.js user <action> [<args>]
 
 actions:
   pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
-  rm USERNAME                  permanantely removes USERNAME user from system
+  rm USERNAME                  permanently removes USERNAME user from system
   activate USERNAME            sets USERNAME's status to active
-  deactivate USERNAME          sets USERNAME's status to deactive
+  deactivate USERNAME          sets USERNAME's status to inactive
   disable USERNAME             sets USERNAME's status to disabled
-  group USERNAME [+|-]GROUP    adds (+) or removes (-) USERNAME from GROUP
+  lock USERNAME                sets USERNAME's status to locked
+  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
 ```
 
 | Action    | Description       | Examples                              | Aliases   |
@@ -59,6 +60,7 @@ actions:
 | `activate` | Activates user    | `./oputil.js user activate joeuser`   | N/A   |
 | `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |
 | `disable`   | Disables user (user will not be able to login)    | `./oputil.js user disable joeuser`    | N/A   |
+| `lock` | Locks the user account (prevents logins) | `./oputil.js user lock joeuser` | N/A |
 | `group`   | Modifies users group membership   | Add to group: `./oputil.js user group joeuser +derp`<br/>Remove from group: `./oputil.js user group joeuser -derp`   | N/A    |
 
 ## Configuration
@@ -82,7 +84,7 @@ import-areas args:
 | Action    | Description       | Examples                              |
 |-----------|-------------------|---------------------------------------|
 | `new`     | Generates a new/initial configuration | `./oputil.js config new` (follow the prompts) |
-| `import-areas`    | Imports areas using a Fidonet style *.NA or AREAS.BBS formatted file  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
+| `import-areas`    | Imports areas using a FidoNet style *.NA or AREAS.BBS formatted file  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
 
 When using the `import-areas` action, you will be prompted for any missing additional arguments described in "import-areas args".
 
@@ -138,7 +140,7 @@ general information:
 The `scan` action can (re)scan a file area for new entries as well as update (`--update`) existing entry records (description, etc.). When scanning, a valid area tag must be specified. Optionally, storage tag may also be supplied in order to scan a specific filesystem location using the `@the_storage_tag` syntax. If a [GLOB](http://man7.org/linux/man-pages/man7/glob.7.html) is supplied as the last argument, only file entries with filenames matching will be processed.
 
 ##### Examples
-Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extentions:
+Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extensions:
 ```
 $ ./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
 ```
diff --git a/docs/configuration/config-hjson.md b/docs/configuration/config-hjson.md
index 4ebfd030..7aae987f 100644
--- a/docs/configuration/config-hjson.md
+++ b/docs/configuration/config-hjson.md
@@ -8,7 +8,7 @@ The main system configuration file, `config.hjson` both overrides defaults and p
 See also [HJSON General Information](hjson.md) for more information on the HJSON format.
 
 ### Creating a Configuration
-Your initial configuration skeleton can be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
+Your initial configuration skeleton should be created using the `oputil.js` command line utility. From your enigma-bbs root directory:
 ```
 ./oputil.js config new
 ```
@@ -30,10 +30,21 @@ general: {
 }
 ```
 
-(Note the very slightly different syntax. **You can use standard JSON if you wish**)
+(Note the very slightly [HJSON](hjson.md) different syntax. **You can use standard JSON if you wish!**)
 
 While not everything that is available in your `config.hjson` file can be found defaulted in `core/config.js`, a lot is. [Poke around and see what you can find](https://github.com/NuSkooler/enigma-bbs/blob/master/core/config.js)!
 
+### Configuration Sections
+Below is a list of various configuration sections. There are many more, but this should get you started:
+
+* [ACS](acs.md)
+* [Archivers](archivers.md): Set up external archive utilities for handling things like ZIP, ARJ, RAR, and so on.
+* [Email](email.md): System email support.
+* [Event Scheduler](event-scheduler.md): Set up events as you see fit!
+* [File Base](/docs/filebase/index.md)
+* [File Transfer Protocols](file-transfer-protocols.md): Oldschool file transfer protocols such as X/Y/Z-Modem!
+* [Message Areas](/docs/messageareas/configuring-a-message-area.md), [Networks](/docs/messageareas/message-networks.md), [NetMail](/docs/messageareas/netmail.md), etc.
+
 
 ### A Sample Configuration
 Below is a **sample** `config.hjson` illustrating various (but certainly not all!) elements that can be configured / tweaked.
diff --git a/docs/configuration/sysop-setup.md b/docs/configuration/sysop-setup.md
index b8c4beb6..502f412e 100644
--- a/docs/configuration/sysop-setup.md
+++ b/docs/configuration/sysop-setup.md
@@ -2,5 +2,4 @@
 layout: page
 title: SysOp Setup
 ---
-SySop privileges will be granted to the first user to log into a fresh ENiGMA½ installation.
-
+SySop privileges will be granted to the first user to log into a fresh ENiGMA½ installation. +ops belong to the `sysop` user group by default.
\ No newline at end of file
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
index 01c5ca47..a24cd3eb 100644
--- a/docs/installation/manual.md
+++ b/docs/installation/manual.md
@@ -19,16 +19,21 @@ are OK) for Windows users. Note that you **should only need the Visual C++ compo
 * [git](https://git-scm.com/downloads) to check out the ENiGMA source code.  
  
 ## Node.js
-If you're new to Node.js and/or do not care about Node itself and just want to get ENiGMA½ running 
-these steps should get you going on most \*nix type environments:
+### With NVM
+Node Version Manager (NVM) is an excellent way to install and manage Node.js versions on most UNIX-like environments. [Get the latest version here](https://github.com/creationix/nvm). The install should look something like this:
 
 ```bash
-curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
-nvm install 6
-nvm use 6
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
 ```
 
-If the above completed without errors, you should now have `nvm`, `node`, and `npm` installed and in your environment.
+Next, install Node.js with NVM:
+```bash
+nvm install 10
+nvm use 10
+nvm alias default 10
+```
+
+If the above steps completed without errors, you should now have `nvm`, `node`, and `npm` installed and in your environment.
 
 For Windows nvm-like systems exist ([nvm-windows](https://github.com/coreybutler/nvm-windows), ...) or [just download the installer](https://nodejs.org/en/download/).
 
@@ -41,31 +46,25 @@ git clone https://github.com/NuSkooler/enigma-bbs.git
 ## Install Node Packages
 ```bash
 cd enigma-bbs
-npm install
+npm install # yarn also works
 ```
 
 ## Other Recommended Packages
+ENiGMA BBS makes use of a few packages for archive and legacy protocol support. They're not pre-requisites for running ENiGMA, but without them you'll miss certain functionality. Once installed, they should be made available on your system path.
 
-ENiGMA BBS makes use of a few packages for unarchiving and modem support. They're not pre-requisites for
-running ENiGMA, but without them you'll miss certain functionality. Once installed, they should be made 
-available on your system path.
-
-| Package    | Description                       | Debian/Ubuntu Package (APT/DEP)                             | Red Hat Package (YUM/RPM)                               | Windows Package                                                  |
+| Package    | Description | Debian/Ubuntu Package (APT/DEP) | Red Hat Package (YUM/RPM) | Windows Package                                                  |
 |------------|-----------------------------------|--------------------------------------------|---------------------------------------------------|------------------------------------------------------------------|
 | arj        | Unpacking arj archives            | `arj`                                      | n/a, binaries [here](http://arj.sourceforge.net/) | [ARJ](http://arj.sourceforge.net/)                               |
 | 7zip       | Unpacking zip, rar, archives  | `p7zip-full`                               | `p7zip-full`                                      | [7-zip](http://www.7-zip.org/)                                   |
 | lha        | Unpacking lha archives  | `lhasa`                               | n/a, source [here](http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm)                                      | Unknown                                   |
 | Rar        | Unpacking rar archives  | `unrar`                               | n/a, binaries [here](https://www.rarlab.com/download.htm)                                      | Unknown                                   |
-| lrzsz      | sz/rz: X/Y/Z modem support        | `lrzsz`                                    | `lrzsz`                                           | Unknown                                                          | 
-| sexyz      | SexyZ modem support               | [sexyz](https://l33t.codes/outgoing/sexyz) | [sexyz](https://l33t.codes/outgoing/sexyz)        | Available with [Synchronet](http://wiki.synchro.net/install:win) |
+| lrzsz      | sz/rz: X/Y/Z protocol support        | `lrzsz`                                    | `lrzsz`                                           | Unknown                                                          | 
+| sexyz      | SexyZ protocol support               | [sexyz](https://l33t.codes/outgoing/sexyz) | [sexyz](https://l33t.codes/outgoing/sexyz)        | Available with [Synchronet](http://wiki.synchro.net/install:win) |
 | exiftool   | [ExifTool](https://www.sno.phy.queensu.ca/~phil/exiftool/)    | libimage-exiftool-perl | perl-Image-ExifTool | Unknown
 | xdms  | Unpack/view Amiga DMS | [xdms](http://manpages.ubuntu.com/manpages/trusty/man1/xdms.1.html)  | xdms | Unknown
 
 ## Config Files
-
-You'll need a basic configuration to get started. The main system configuration is handled via 
-`config/config.hjson`. This is an [HJSON](http://hjson.org/) file (compiliant JSON is also OK). 
-See [Configuration](../configuration/) for more information.
+You'll need a basic configuration to get started. The main system configuration is handled via `config/config.hjson`. This is an [HJSON](http://hjson.org/) file (compiliant JSON is also OK). See [Configuration](../configuration/) for more information.
 
 Use `oputil.js` to generate your **initial** configuration: 
 
diff --git a/docs/installation/os-hardware.md b/docs/installation/os-hardware.md
index a49283b4..6332ee82 100644
--- a/docs/installation/os-hardware.md
+++ b/docs/installation/os-hardware.md
@@ -2,10 +2,13 @@
 layout: page
 title: OS & Hardware Specific Information
 ---
-There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do 
-things manually versus have it automated for you.
+There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do things manually versus have it automated for you.
 
-| Method                                 | Notes                                                                                       |     
-|----------------------------------------|---------------------------------------------------------------------------------------------|
-| [Raspberry Pi](rpi)  | All Raspberry Pi models work great with ENiGMA½! |
-| [Windows](windows)   | Compatible with all Windows Operating Systems    |
+In general, please see [Installation Methods](installation-methods.md) and [Install Script](install-script.md).
+
+Below are some special cases:
+
+| Method | Notes |
+|--------|-------|
+| [Raspberry Pi](rpi.md)  | All Raspberry Pi models work great with ENiGMA½! |
+| [Windows](windows.md)   | Compatible with all Windows Operating Systems    |
diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 4eaed906..a68afe97 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -36,11 +36,13 @@ ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit door
 
 	*Add 7zip to your path so `7z` can be called from the console
 	1. Right click `This PC` and Select `Properties`
-	2. Go to the `Advanced` Tab and click on `Enviromental Varibles`
-	3. Select `Path` under `System Varibles` and click `Edit`
+	2. Go to the `Advanced` Tab and click on `Environment Variables`
+	3. Select `Path` under `System Variables` and click `Edit`
 	4. Click `New` and paste the path to 7zip
 	5. Close your console window and reopen. You can type `7z` to make sure it's working.
 
+(Please see [Archivers](/docs/archivers.md) for additional archive utilities!)
+
 3. Install [Git](https://git-scm.com/downloads) and optionally [TortoiseGit](https://tortoisegit.org/download/). 
 
 4. Clone ENiGMA½ - browse to the directory you want and run 
diff --git a/docs/oputil/index.md b/docs/oputil/index.md
deleted file mode 100644
index b23a7362..00000000
--- a/docs/oputil/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: page
-title: oputil
----
-
-oputil is the ENiGMA½ command line utility for maintaining users, file areas and message areas, as well as 
-generating your initial ENiGMA½ config. 
-
-## File areas
-The `oputil.js` +op utilty `fb` command has tools for managing file bases. For example, to import existing 
-files found within **all** storage locations tied to an area and set tags `tag1` and `tag2` to each import:
-
-```bash
-oputil.js fb scan some_area --tags tag1,tag2
-```
-
-See `oputil.js fb --help` for additional information.
\ No newline at end of file
diff --git a/docs/troubleshooting/monitoring-logs.md b/docs/troubleshooting/monitoring-logs.md
index 7c04cb40..dd665f5c 100644
--- a/docs/troubleshooting/monitoring-logs.md
+++ b/docs/troubleshooting/monitoring-logs.md
@@ -2,14 +2,21 @@
 layout: page
 title: Monitoring Logs
 ---
-ENiGMA½ does not produce much to stdout. Logs are produced by Bunyan which outputs each entry as a 
-JSON object. 
+ENiGMA½ does not produce much to stdout. Logs are produced by Bunyan which outputs each entry as a JSON object. 
 
 Start by installing bunyan and making it available on your path:
 
-    npm install bunyan -g
+```bash
+npm install bunyan -g
+```
+
+or with Yarn:
+```bash
+yarn global add bunyan
+```
     
 To tail logs in a colorized and pretty format, issue the following command:
-    
-    tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan
+```bash
+tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan
+```
 

From a4823c0c4a8bc9c93f58f4cc99bd433ac94798f0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 11:44:46 -0700
Subject: [PATCH 0559/1013] Logging around accoung lock/unlocking

---
 core/user.js               | 5 +++++
 core/user_login.js         | 5 ++---
 core/web_password_reset.js | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/user.js b/core/user.js
index a712829c..609a9e43 100644
--- a/core/user.js
+++ b/core/user.js
@@ -152,6 +152,7 @@ module.exports = class User {
                         if(!_.has(tempUser.properties, UserProps.AccountLockedPrevStatus)) {
                             props[UserProps.AccountLockedPrevStatus] = tempUser.getProperty(UserProps.AccountStatus);
                         }
+                        Log.info( { userId, failedAttempts }, '(Re)setting account to locked due to failed logins');
                         return tempUser.persistProperties(props, callback);
                     }
 
@@ -243,6 +244,10 @@ module.exports = class User {
                             const minutesSinceLocked = moment().diff(lockedTs, 'minutes');
                             if(minutesSinceLocked >= autoUnlockMinutes) {
                                 //  allow the login - we will clear any lock there
+                                Log.info(
+                                    { username, userId : tempAuthInfo.userId, lockedAt : lockedTs.format() },
+                                    'Locked account will now be unlocked due to auto-unlock minutes policy'
+                                );
                                 return callback(null);
                             }
                         }
diff --git a/core/user_login.js b/core/user_login.js
index be2a99a1..fa9ae676 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -24,14 +24,13 @@ function userLogin(client, username, password, cb) {
         const config = Config();
 
         if(err) {
-            client.log.info( { username : username, error : err.message }, 'Failed login attempt');
-
             client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
             const disconnect = config.users.failedLogin.disconnect;
             if(disconnect > 0 && client.user.sessionFailedLoginAttempts >= disconnect) {
-                return cb(Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany));
+                err = Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany);
             }
 
+            client.log.info( { username : username, error : err.message }, 'Failed login attempt');
             return cb(err);
         }
 
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 06fd7838..ceefe9c5 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -288,6 +288,10 @@ class WebPasswordReset {
                     user.removeProperties([ UserProps.EmailPwResetToken, UserProps.EmailPwResetTokenTs ]);
 
                     if(true === _.get(config, 'users.unlockAtEmailPwReset')) {
+                        Log.info(
+                            { username : user.username, userId : user.userId },
+                            'Remove any lock on account due to password reset policy'
+                        );
                         user.unlockAccount( () => { /* dummy */ } );
                     }
 

From f45e785da12aa482d3d0a18d650ed742419f5dc9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 12:02:41 -0700
Subject: [PATCH 0560/1013] oputil.js user activate <name> will now unlock
 accounts

---
 core/oputil/oputil_user.js | 49 ++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index d1f21408..18519b06 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -8,25 +8,13 @@ const argv						= require('./oputil_common.js').argv;
 const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const Errors					= require('../enig_error.js').Errors;
+const UserProps                 = require('../user_property.js');
 
 const async						= require('async');
 const _							= require('lodash');
 
 exports.handleUserCommand		= handleUserCommand;
 
-function getUser(userName, cb) {
-    const User = require('../../core/user.js');
-    User.getUserIdAndName(userName, (err, userId) => {
-        if(err) {
-            process.exitCode = ExitCodes.BAD_ARGS;
-            return cb(err);
-        }
-        const u = new User();
-        u.userId = userId;
-        return cb(null, u);
-    });
-}
-
 function initAndGetUser(userName, cb) {
     async.waterfall(
         [
@@ -34,12 +22,12 @@ function initAndGetUser(userName, cb) {
                 initConfigAndDatabases(callback);
             },
             function getUserObject(callback) {
-                getUser(userName, (err, user) => {
+                const User = require('../../core/user.js');
+                User.getUserIdAndName(userName, (err, userId) => {
                     if(err) {
-                        process.exitCode = ExitCodes.BAD_ARGS;
                         return callback(err);
                     }
-                    return callback(null, user);
+                    return User.getUser(userId, callback);
                 });
             }
         ],
@@ -64,14 +52,29 @@ function setAccountStatus(user, status) {
     }[status];
 
     const statusDesc = _.invert(AccountStatus)[status];
-    user.persistProperty('account_status', status, err => {
-        if(err) {
-            process.exitCode = ExitCodes.ERROR;
-            console.error(err.message);
-        } else {
-            console.info(`User status set to ${statusDesc}`);
+
+    async.series(
+        [
+            (callback) => {
+                return user.persistProperty(UserProps.AccountStatus, status, callback);
+            },
+            (callback) => {
+                if(AccountStatus.active !== status) {
+                    return callback(null);
+                }
+
+                return user.unlockAccount(callback);
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            } else {
+                console.info(`User status set to ${statusDesc}`);
+            }
         }
-    });
+    );
 }
 
 function setUserPassword(user) {

From 4bd340a48032ee8d33dfceb4f9ed7a24241bf369 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 13:51:24 -0700
Subject: [PATCH 0561/1013] Add notes to WHATSNEW

---
 WHATSNEW.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 90b9e374..191f1c7b 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -21,7 +21,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * New MCI codes including general purpose movement codes. See [MCI codes](docs/art/mci.md)
 * `install.sh` will now attempt to use NPM's `--build-from-source` option when ARM is detected.
 * `oputil.js config new` will now generate a much more complete configuration file with comments, examples, etc. `oputil.js config cat` dumps your current config to stdout.
-
+* Handling of failed login attempts is now fully in. Disconnect clients, lock out accounts, ability to auto or unlock at (email-driven) password reset, etc. See `users.failedLogin` in `config.hjson`.
 
 
 ## 0.0.8-alpha

From b82c6400140b515b166c9af84698e63101b33f54 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 14:47:18 -0700
Subject: [PATCH 0562/1013] Work on using UserProps, fix up ISO timestamps,
 etc.

---
 core/database.js           |  8 +++++++-
 core/file_base_area.js     |  5 +++--
 core/file_base_filter.js   | 12 +++++++-----
 core/message_area.js       |  9 +++++----
 core/misc_util.js          |  4 +++-
 core/nua.js                | 35 ++++++++++++++++++++---------------
 core/stat_log.js           |  8 ++++++--
 core/user_config.js        | 24 +++++++++++++++---------
 core/user_property.js      | 36 +++++++++++++++++++++++++++---------
 core/web_password_reset.js |  4 ++--
 10 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/core/database.js b/core/database.js
index 8bae6a87..017aa949 100644
--- a/core/database.js
+++ b/core/database.js
@@ -67,7 +67,13 @@ function loadDatabaseForMod(modInfo, cb) {
 
 function getISOTimestampString(ts) {
     ts = ts || moment();
-    return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+    if(!moment.isMoment(ts)) {
+        if(_.isString(ts)) {
+            ts = ts.replace(/\//g, '-');
+        }
+        ts = moment(ts);
+    }
+    return ts.utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
 }
 
 function sanatizeString(s) {
diff --git a/core/file_base_area.js b/core/file_base_area.js
index a684f575..760eb87c 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -14,6 +14,7 @@ const resolveMimeType   = require('./mime_util.js').resolveMimeType;
 const stringFormat      = require('./string_format.js');
 const wordWrapText      = require('./word_wrap.js').wordWrapText;
 const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const _             = require('lodash');
@@ -136,11 +137,11 @@ function changeFileAreaWithOptions(client, areaTag, options, cb) {
             },
             function changeArea(area, callback) {
                 if(true === options.persist) {
-                    client.user.persistProperty('file_area_tag', areaTag, err => {
+                    client.user.persistProperty(UserProps.FileAreaTag, areaTag, err => {
                         return callback(err, area);
                     });
                 } else {
-                    client.user.properties['file_area_tag'] = areaTag;
+                    client.user.properties[UserProps.FileAreaTag] = areaTag;
                     return callback(null, area);
                 }
             }
diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index 82a75986..0ff19b94 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -1,9 +1,11 @@
 /* jslint node: true */
 'use strict';
 
+const UserProps = require('./user_property.js');
+
 //  deps
-const _                     = require('lodash');
-const uuidV4                = require('uuid/v4');
+const _         = require('lodash');
+const uuidV4    = require('uuid/v4');
 
 module.exports = class FileBaseFilters {
     constructor(client) {
@@ -90,7 +92,7 @@ module.exports = class FileBaseFilters {
     }
 
     persist(cb) {
-        return this.client.user.persistProperty('file_base_filters', JSON.stringify(this.filters), cb);
+        return this.client.user.persistProperty(UserProps.FileBaseFilters, JSON.stringify(this.filters), cb);
     }
 
     cleanTags(tags) {
@@ -102,7 +104,7 @@ module.exports = class FileBaseFilters {
 
         if(activeFilter) {
             this.activeFilter = activeFilter;
-            this.client.user.persistProperty('file_base_filter_active_uuid', filterUuid);
+            this.client.user.persistProperty(UserProps.FileBaseFilterActiveUuid, filterUuid);
             return true;
         }
 
@@ -150,6 +152,6 @@ module.exports = class FileBaseFilters {
             return;
         }
 
-        return user.persistProperty('user_file_base_last_viewed', fileId, cb);
+        return user.persistProperty(UserProps.FileBaseLastViewedId, fileId, cb);
     }
 };
diff --git a/core/message_area.js b/core/message_area.js
index 98647cfd..ea6b4a87 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -8,6 +8,7 @@ const Message                   = require('./message.js');
 const Log                       = require('./logger.js').log;
 const msgNetRecord              = require('./msg_network.js').recordMessage;
 const sortAreasOrConfs          = require('./conf_area_util.js').sortAreasOrConfs;
+const UserProps                 = require('./user_property.js');
 
 //  deps
 const async         = require('async');
@@ -222,8 +223,8 @@ function changeMessageConference(client, confTag, cb) {
             },
             function changeConferenceAndArea(conf, areaInfo, callback) {
                 const newProps = {
-                    message_conf_tag    : confTag,
-                    message_area_tag    : areaInfo.areaTag,
+                    [ UserProps.MessageConfTag ]    : confTag,
+                    [ UserProps.MessageAreaTag ]    : areaInfo.areaTag,
                 };
                 client.user.persistProperties(newProps, err => {
                     callback(err, conf, areaInfo);
@@ -262,11 +263,11 @@ function changeMessageAreaWithOptions(client, areaTag, options, cb) {
             },
             function changeArea(area, callback) {
                 if(true === options.persist) {
-                    client.user.persistProperty('message_area_tag', areaTag, function persisted(err) {
+                    client.user.persistProperty(UserProps.MessageAreaTag, areaTag, function persisted(err) {
                         return callback(err, area);
                     });
                 } else {
-                    client.user.properties['message_area_tag'] = areaTag;
+                    client.user.properties[UserProps.MessageAreaTag] = areaTag;
                     return callback(null, area);
                 }
             }
diff --git a/core/misc_util.js b/core/misc_util.js
index 6e477821..62a3967d 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -4,6 +4,8 @@
 const paths         = require('path');
 
 const os            = require('os');
+const moment        = require('moment');
+
 const packageJson   = require('../package.json');
 
 exports.isProduction            = isProduction;
@@ -57,4 +59,4 @@ function valueAsArray(value) {
         return [];
     }
     return Array.isArray(value) ? value : [ value ];
-}
\ No newline at end of file
+}
diff --git a/core/nua.js b/core/nua.js
index 2d838fcb..42c63895 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -8,9 +8,14 @@ const theme         = require('./theme.js');
 const login         = require('./system_menu_method.js').login;
 const Config        = require('./config.js').get;
 const messageArea   = require('./message_area.js');
+const {
+    getISOTimestampString
+}                   = require('./database.js');
+const UserProps     = require('./user_property.js');
 
 //  deps
 const _             = require('lodash');
+const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'NUA',
@@ -80,20 +85,20 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                 areaTag = areaTag || '';
 
                 newUser.properties = {
-                    real_name           : formData.value.realName,
-                    birthdate           : new Date(Date.parse(formData.value.birthdate)).toISOString(),     //  :TODO: Use moment & explicit ISO string format
-                    sex                 : formData.value.sex,
-                    location            : formData.value.location,
-                    affiliation         : formData.value.affils,
-                    email_address       : formData.value.email,
-                    web_address         : formData.value.web,
-                    account_created     : new Date().toISOString(), //  :TODO: Use moment & explicit ISO string format
+                    [ UserProps.RealName ]          : formData.value.realName,
+                    [ UserProps.Birthdate ]         : getISOTimestampString(formData.value.birthdate),
+                    [ UserProps.Sex ]               : formData.value.sex,
+                    [ UserProps.Location ]          : formData.value.location,
+                    [ UserProps.Affiliations ]      : formData.value.affils,
+                    [ UserProps.EmailAddress ]      : formData.value.email,
+                    [ UserProps.WebAddress ]        : formData.value.web,
+                    [ UserProps.AccountCreated ]    : getISOTimestampString(),
 
-                    message_conf_tag    : confTag,
-                    message_area_tag    : areaTag,
+                    [ UserProps.MessageConfTag ]    : confTag,
+                    [ UserProps.MessageAreaTag ]    : areaTag,
 
-                    term_height         : self.client.term.termHeight,
-                    term_width          : self.client.term.termWidth,
+                    [ UserProps.TermHeight ]        : self.client.term.termHeight,
+                    [ UserProps.TermWidth ]         : self.client.term.termWidth,
 
                     //  :TODO: Other defaults
                     //  :TODO: should probably have a place to create defaults/etc.
@@ -101,9 +106,9 @@ exports.getModule = class NewUserAppModule extends MenuModule {
 
                 const defaultTheme = _.get(config, 'theme.default');
                 if('*' === defaultTheme) {
-                    newUser.properties.theme_id = theme.getRandomTheme();
+                    newUser.properties[UserProps.ThemeId] = theme.getRandomTheme();
                 } else {
-                    newUser.properties.theme_id = defaultTheme;
+                    newUser.properties[UserProps.ThemeId] = defaultTheme;
                 }
 
                 //  :TODO: User.create() should validate email uniqueness!
@@ -133,7 +138,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
                             };
                         }
 
-                        if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
+                        if(User.AccountStatus.inactive === self.client.user.properties[UserProps.AccountStatus]) {
                             return self.gotoMenu(extraArgs.inactive, cb);
                         } else {
                             //
diff --git a/core/stat_log.js b/core/stat_log.js
index 4ee4c53b..173222b9 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -2,10 +2,12 @@
 'use strict';
 
 const sysDb     = require('./database.js').dbs.system;
+const {
+    getISOTimestampString
+}               = require('./database.js');
 
 //  deps
 const _         = require('lodash');
-const moment    = require('moment');
 
 /*
     System Event Log & Stats
@@ -149,7 +151,9 @@ class StatLog {
     }
 
     //  the time "now" in the ISO format we use and love :)
-    get now() { return moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); }
+    get now() {
+        return getISOTimestampString();
+    }
 
     appendSystemLogEntry(logName, logValue, keep, keepType, cb) {
         sysDb.run(
diff --git a/core/user_config.js b/core/user_config.js
index f9aad6c4..ef72e1ad 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -1,11 +1,17 @@
 /* jslint node: true */
 'use strict';
 
+//  ENiGMA½
 const MenuModule        = require('./menu_module.js').MenuModule;
 const ViewController    = require('./view_controller.js').ViewController;
 const theme             = require('./theme.js');
 const sysValidate       = require('./system_view_validate.js');
+const UserProps         = require('./user_property.js');
+const {
+    getISOTimestampString
+}                       = require('./database.js');
 
+//  deps
 const async             = require('async');
 const assert            = require('assert');
 const _                 = require('lodash');
@@ -101,15 +107,15 @@ exports.getModule = class UserConfigModule extends MenuModule {
                 assert(formData.value.password === formData.value.passwordConfirm);
 
                 const newProperties = {
-                    real_name           : formData.value.realName,
-                    birthdate           : new Date(Date.parse(formData.value.birthdate)).toISOString(),
-                    sex                 : formData.value.sex,
-                    location            : formData.value.location,
-                    affiliation         : formData.value.affils,
-                    email_address       : formData.value.email,
-                    web_address         : formData.value.web,
-                    term_height         : formData.value.termHeight.toString(),
-                    theme_id            : self.availThemeInfo[formData.value.theme].themeId,
+                    [ UserProps.RealName ]      : formData.value.realName,
+                    [ UserProps.Birthdate ]     : getISOTimestampString(formData.value.birthdate),
+                    [ UserProps.Sex ]           : formData.value.sex,
+                    [ UserProps.Location ]      : formData.value.location,
+                    [ UserProps.Affiliations ]  : formData.value.affils,
+                    [ UserProps.EmailAddress ]  : formData.value.email,
+                    [ UserProps.WebAddress ]    : formData.value.web,
+                    [ UserProps.TermHeight ]    : formData.value.termHeight.toString(),
+                    [ UserProps.ThemeId ]       : self.availThemeInfo[formData.value.theme].themeId,
                 };
 
                 //  runtime set theme
diff --git a/core/user_property.js b/core/user_property.js
index 04f8f0c9..bbb36928 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -8,18 +8,36 @@
 //  can utilize their own properties as well!
 //
 module.exports = {
-    PassPbkdf2Salt          : 'pw_pbkdf2_salt',
-    PassPbkdf2Dk            : 'pw_pbkdf2_dk',
+    PassPbkdf2Salt              : 'pw_pbkdf2_salt',
+    PassPbkdf2Dk                : 'pw_pbkdf2_dk',
 
-    AccountStatus           : 'account_status',
+    AccountStatus               : 'account_status',
 
-    Birthdate               : 'birthdate',
+    RealName                    : 'real_name',
+    Sex                         : 'sex',
+    Birthdate                   : 'birthdate',
+    Location                    : 'location',
+    Affiliations                : 'affiliation',
+    EmailAddress                : 'email_address',
+    WebAddress                  : 'web_address',
+    TermHeight                  : 'term_height',
+    TermWidth                   : 'term_width',
+    ThemeId                     : 'theme_id',
+    AccountCreated              : 'account_created',
 
-    FailedLoginAttempts     : 'failed_login_attempts',
-    AccountLockedTs         : 'account_locked_timestamp',
-    AccountLockedPrevStatus : 'account_locked_prev_status', //  previous account status
+    FailedLoginAttempts         : 'failed_login_attempts',
+    AccountLockedTs             : 'account_locked_timestamp',
+    AccountLockedPrevStatus     : 'account_locked_prev_status', //  previous account status
 
-    EmailPwResetToken       : 'email_password_reset_token',
-    EmailPwResetTokenTs     : 'email_password_reset_token_ts',
+    EmailPwResetToken           : 'email_password_reset_token',
+    EmailPwResetTokenTs         : 'email_password_reset_token_ts',
+
+    FileAreaTag                 : 'file_area_tag',
+    FileBaseFilters             : 'file_base_filters',
+    FileBaseFilterActiveUuid    : 'file_base_filter_active_uuid',
+    FileBaseLastViewedId        : 'user_file_base_last_viewed',
+
+    MessageConfTag              : 'message_conf_tag',
+    MessageAreaTag              : 'message_area_tag',
 };
 
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index ceefe9c5..c76a232c 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -79,8 +79,8 @@ class WebPasswordReset {
                         token = token.toString('hex');
 
                         const newProperties = {
-                            email_password_reset_token      : token,
-                            email_password_reset_token_ts   : getISOTimestampString(),
+                            [ UserProps.EmailPwResetToken ]     : token,
+                            [ UserProps.EmailPwResetTokenTs ]   : getISOTimestampString(),
                         };
 
                         //  we simply place the reset token in the user's properties

From 4050affedf4e775f3a12c8ca514ece8eae84beda Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 17:41:16 -0700
Subject: [PATCH 0563/1013] More conversion to UserProps

---
 core/client_connections.js    | 23 +++++++++++----------
 core/download_queue.js        |  5 +++--
 core/dropfile.js              | 30 ++++++++++++++-------------
 core/file_area_filter_edit.js |  3 ++-
 core/file_base_filter.js      |  6 +++---
 core/fse.js                   |  3 ++-
 core/login_server_module.js   |  7 ++++---
 core/message_area.js          |  4 ++--
 core/mod_mixins.js            | 12 ++++++-----
 core/msg_area_list.js         |  3 ++-
 core/msg_area_post_fse.js     |  7 +++++--
 core/msg_list.js              |  3 ++-
 core/predefined_mci.js        | 38 ++++++++++++++++++++---------------
 core/set_newscan_date.js      |  6 +++---
 core/system_menu_method.js    | 13 ++++++------
 core/theme.js                 |  6 ++++--
 core/user_config.js           | 22 ++++++++++----------
 core/user_login.js            | 11 +++++-----
 core/user_property.js         |  8 ++++++--
 core/web_password_reset.js    |  8 ++++----
 20 files changed, 123 insertions(+), 95 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 93bb9465..334fa69e 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -2,13 +2,14 @@
 'use strict';
 
 //  ENiGMA½
-const logger            = require('./logger.js');
-const Events            = require('./events.js');
+const logger        = require('./logger.js');
+const Events        = require('./events.js');
+const UserProps     = require('./user_property.js');
 
 //  deps
-const _                 = require('lodash');
-const moment            = require('moment');
-const hashids           = require('hashids');
+const _             = require('lodash');
+const moment        = require('moment');
+const hashids       = require('hashids');
 
 exports.getActiveConnections    = getActiveConnections;
 exports.getActiveNodeList       = getActiveNodeList;
@@ -17,7 +18,7 @@ exports.removeClient            = removeClient;
 exports.getConnectionByUserId   = getConnectionByUserId;
 
 const clientConnections = [];
-exports.clientConnections       = clientConnections;
+exports.clientConnections = clientConnections;
 
 function getActiveConnections() { return clientConnections; }
 
@@ -46,11 +47,11 @@ function getActiveNodeList(authUsersOnly) {
         //
         if(ac.user.isAuthenticated()) {
             entry.userName  = ac.user.username;
-            entry.realName  = ac.user.properties.real_name;
-            entry.location  = ac.user.properties.location;
-            entry.affils    = entry.affiliation = ac.user.properties.affiliation;
+            entry.realName  = ac.user.properties[UserProps.RealName];
+            entry.location  = ac.user.properties[UserProps.Location];
+            entry.affils    = entry.affiliation = ac.user.properties[UserProps.Affiliations];
 
-            const diff      = now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
+            const diff      = now.diff(moment(ac.user.properties[UserProps.LastLoginTs]), 'minutes');
             entry.timeOn    = moment.duration(diff, 'minutes');
         }
         return entry;
@@ -61,7 +62,7 @@ function addNewClient(client, clientSock) {
     const id            = client.session.id     = clientConnections.push(client) - 1;
     const remoteAddress = client.remoteAddress  = clientSock.remoteAddress;
 
-    //  create a uniqe identifier one-time ID for this session
+    //  create a unique identifier one-time ID for this session
     client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
 
     //  Create a client specific logger
diff --git a/core/download_queue.js b/core/download_queue.js
index 0d1e3847..28ca3aac 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -2,6 +2,7 @@
 'use strict';
 
 const FileEntry     = require('./file_entry.js');
+const UserProps     = require('./user_property.js');
 
 //  deps
 const { partition } = require('lodash');
@@ -11,8 +12,8 @@ module.exports = class DownloadQueue {
         this.client = client;
 
         if(!Array.isArray(this.client.user.downloadQueue)) {
-            if(this.client.user.properties.dl_queue) {
-                this.loadFromProperty(this.client.user.properties.dl_queue);
+            if(this.client.user.properties[UserProps.DownloadQueue]) {
+                this.loadFromProperty(this.client.user.properties[UserProps.DownloadQueue]);
             } else {
                 this.client.user.downloadQueue = [];
             }
diff --git a/core/dropfile.js b/core/dropfile.js
index 345a031a..4c6a9c0b 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -4,6 +4,7 @@
 //  ENiGMA½
 const Config        = require('./config.js').get;
 const StatLog       = require('./stat_log.js');
+const UserProps     = require('./user_property.js');
 
 //  deps
 const fs            = require('graceful-fs');
@@ -168,7 +169,7 @@ module.exports = class DropFile {
             '115200',
             Config().general.boardName,
             this.client.user.userId.toString(),
-            this.client.user.properties.real_name || this.client.user.username,
+            this.client.user.properties[UserProps.RealName] || this.client.user.username,
             this.client.user.username,
             this.client.user.getLegacySecurityLevel().toString(),
             '546',  //  :TODO: Minutes left!
@@ -189,21 +190,22 @@ module.exports = class DropFile {
         const opUserName    = /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
         const userName      = /[^\s]*/.exec(this.client.user.username)[0];
         const secLevel      = this.client.user.getLegacySecurityLevel().toString();
+        const location      = this.client.user.properties[UserProps.Location];
 
         return iconv.encode( [
-            Config().general.boardName,                         //  "The name of the system."
-            opUserName,                                         //  "The sysop's name up to the first space."
-            opUserName,                                         //  "The sysop's name following the first space."
-            'COM1',                                             //  "The serial port the modem is connected to, or 0 if logged in on console."
-            '57600',                                            //  "The current port (DTE) rate."
-            '0',                                                //  "The number "0""
-            userName,                                           //  "The current user's name, up to the first space."
-            userName,                                           //  "The current user's name, following the first space."
-            this.client.user.properties.location || '',         //  "Where the user lives, or a blank line if unknown."
-            '1',                                                //  "The number "0" if TTY, or "1" if ANSI."
-            secLevel,                                           //  "The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
-            '546',                                              //  "The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
-            '-1'                                                //  "The number "-1" if using an external serial driver or "0" if using internal serial routines."
+            Config().general.boardName, //  "The name of the system."
+            opUserName,                 //  "The sysop's name up to the first space."
+            opUserName,                 //  "The sysop's name following the first space."
+            'COM1',                     //  "The serial port the modem is connected to, or 0 if logged in on console."
+            '57600',                    //  "The current port (DTE) rate."
+            '0',                        //  "The number "0""
+            userName,                   //  "The current user's name, up to the first space."
+            userName,                   //  "The current user's name, following the first space."
+            location || '',             //  "Where the user lives, or a blank line if unknown."
+            '1',                        //  "The number "0" if TTY, or "1" if ANSI."
+            secLevel,                   //  "The number 5 for problem users, 30 for regular users, 80 for Aides, and 100 for Sysops."
+            '546',                      //  "The number of minutes left in the current user's account, limited to 546 to keep from overflowing other software."
+            '-1'                        //  "The number "-1" if using an external serial driver or "0" if using internal serial routines."
         ].join('\r\n') + '\r\n', 'cp437');
     }
 
diff --git a/core/file_area_filter_edit.js b/core/file_area_filter_edit.js
index 06c0fd6e..e20d766b 100644
--- a/core/file_area_filter_edit.js
+++ b/core/file_area_filter_edit.js
@@ -7,6 +7,7 @@ const ViewController                = require('./view_controller.js').ViewContro
 const getSortedAvailableFileAreas   = require('./file_base_area.js').getSortedAvailableFileAreas;
 const FileBaseFilters               = require('./file_base_filter.js');
 const stringFormat                  = require('./string_format.js');
+const UserProps                     = require('./user_property.js');
 
 //  deps
 const async             = require('async');
@@ -111,7 +112,7 @@ exports.getModule = class FileAreaFilterEdit extends MenuModule {
                     //
                     //  If the item was also the active filter, we need to make a new one active
                     //
-                    if(filterUuid === this.client.user.properties.file_base_filter_active_uuid) {
+                    if(filterUuid === this.client.user.properties[UserProps.FileBaseFilterActiveUuid]) {
                         const newActive = this.filtersArray[this.currentFilterIndex];
                         if(newActive) {
                             filters.setActive(newActive.uuid);
diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index 0ff19b94..d72b3eea 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -66,7 +66,7 @@ module.exports = class FileBaseFilters {
     }
 
     load() {
-        let filtersProperty = this.client.user.properties.file_base_filters;
+        let filtersProperty = this.client.user.properties[UserProps.FileBaseFilters];
         let defaulted;
         if(!filtersProperty) {
             filtersProperty = JSON.stringify(FileBaseFilters.getBuiltInSystemFilters());
@@ -131,11 +131,11 @@ module.exports = class FileBaseFilters {
     }
 
     static getActiveFilter(client) {
-        return new FileBaseFilters(client).get(client.user.properties.file_base_filter_active_uuid);
+        return new FileBaseFilters(client).get(client.user.properties[UserProps.FileBaseFilterActiveUuid]);
     }
 
     static getFileBaseLastViewedFileIdByUser(user) {
-        return parseInt((user.properties.user_file_base_last_viewed || 0));
+        return parseInt((user.properties[UserProps.FileBaseLastViewedId] || 0));
     }
 
     static setFileBaseLastViewedFileIdForUser(user, fileId, allowOlder, cb) {
diff --git a/core/fse.js b/core/fse.js
index 98065b58..3529935d 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -24,6 +24,7 @@ const {
 const Config                    = require('./config.js').get;
 const { getAddressedToInfo }    = require('./mail_util.js');
 const Events                    = require('./events.js');
+const UserProps                 = require('./user_property.js');
 
 //  deps
 const async                     = require('async');
@@ -738,7 +739,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                                 const fromView = self.viewControllers.header.getView(MciViewIds.header.from);
                                 const area = getMessageAreaByTag(self.messageAreaTag);
                                 if(area && area.realNames) {
-                                    fromView.setText(self.client.user.properties.real_name || self.client.user.username);
+                                    fromView.setText(self.client.user.properties[UserProps.RealName] || self.client.user.username);
                                 } else {
                                     fromView.setText(self.client.user.username);
                                 }
diff --git a/core/login_server_module.js b/core/login_server_module.js
index d1a3552f..e5fccb39 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -6,6 +6,7 @@ const conf          = require('./config.js');
 const logger        = require('./logger.js');
 const ServerModule  = require('./server_module.js').ServerModule;
 const clientConns   = require('./client_connections.js');
+const UserProps     = require('./user_property.js');
 
 //  deps
 const _         = require('lodash');
@@ -25,12 +26,12 @@ module.exports = class LoginServerModule extends ServerModule {
         //
         const preLoginTheme = _.get(conf.config, 'theme.preLogin');
         if('*' === preLoginTheme) {
-            client.user.properties.theme_id = theme.getRandomTheme() || '';
+            client.user.properties[UserProps.ThemeId] = theme.getRandomTheme() || '';
         } else {
-            client.user.properties.theme_id = preLoginTheme;
+            client.user.properties[UserProps.ThemeId] = preLoginTheme;
         }
 
-        theme.setClientTheme(client, client.user.properties.theme_id);
+        theme.setClientTheme(client, client.user.properties[UserProps.ThemeId]);
         return cb(null);   //  note: currently useless to use cb here - but this may change...again...
     }
 
diff --git a/core/message_area.js b/core/message_area.js
index ea6b4a87..a465b235 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -304,8 +304,8 @@ function tempChangeMessageConfAndArea(client, areaTag) {
         return false;
     }
 
-    client.user.properties.message_conf_tag = confTag;
-    client.user.properties.message_area_tag = areaTag;
+    client.user.properties[UserProps.MessageConfTag] = confTag;
+    client.user.properties[UserProps.MessageAreaTag] = areaTag;
 
     return true;
 }
diff --git a/core/mod_mixins.js b/core/mod_mixins.js
index f3d9d5ad..22e49407 100644
--- a/core/mod_mixins.js
+++ b/core/mod_mixins.js
@@ -2,8 +2,10 @@
 'use strict';
 
 const messageArea   = require('../core/message_area.js');
-const { get }       = require('lodash');
+const UserProps     = require('./user_property.js');
 
+//  deps
+const { get }       = require('lodash');
 
 exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
@@ -15,8 +17,8 @@ exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
         if(recordPrevious) {
             this.prevMessageConfAndArea = {
-                confTag : this.client.user.properties.message_conf_tag,
-                areaTag : this.client.user.properties.message_area_tag,
+                confTag : this.client.user.properties[UserProps.MessageConfTag],
+                areaTag : this.client.user.properties[UserProps.MessageAreaTag],
             };
         }
 
@@ -27,8 +29,8 @@ exports.MessageAreaConfTempSwitcher = Sup => class extends Sup {
 
     tempMessageConfAndAreaRestore() {
         if(this.prevMessageConfAndArea) {
-            this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
-            this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
+            this.client.user.properties[UserProps.MessageConfTag] = this.prevMessageConfAndArea.confTag;
+            this.client.user.properties[UserProps.MessageAreaTag] = this.prevMessageConfAndArea.areaTag;
         }
     }
 };
diff --git a/core/msg_area_list.js b/core/msg_area_list.js
index 97a2e16e..1d47f76c 100644
--- a/core/msg_area_list.js
+++ b/core/msg_area_list.js
@@ -5,6 +5,7 @@
 const { MenuModule }        = require('./menu_module.js');
 const messageArea           = require('./message_area.js');
 const { Errors }            = require('./enig_error.js');
+const UserProps             = require('./user_property.js');
 
 //  deps
 const async             = require('async');
@@ -110,7 +111,7 @@ exports.getModule = class MessageAreaListModule extends MenuModule {
     initList() {
         let index = 1;
         this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
-            this.client.user.properties.message_conf_tag,
+            this.client.user.properties[UserProps.MessageConfTag],
             { client : this.client }
         ).map(area => {
             return {
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 8e4d9f3f..123ce13c 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -3,6 +3,7 @@
 
 const FullScreenEditorModule    = require('./fse.js').FullScreenEditorModule;
 const persistMessage            = require('./message_area.js').persistMessage;
+const UserProps                 = require('./user_property.js');
 
 const _                         = require('lodash');
 const async                     = require('async');
@@ -58,8 +59,10 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
     }
 
     enter() {
-        if(_.isString(this.client.user.properties.message_area_tag) && !_.isString(this.messageAreaTag)) {
-            this.messageAreaTag = this.client.user.properties.message_area_tag;
+        if(_.isString(this.client.user.properties[UserProps.MessageAreaTag]) &&
+            !_.isString(this.messageAreaTag))
+        {
+            this.messageAreaTag = this.client.user.properties[UserProps.MessageAreaTag];
         }
 
         super.enter();
diff --git a/core/msg_list.js b/core/msg_list.js
index 2796db88..f73dae8a 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -8,6 +8,7 @@ const messageArea                   = require('./message_area.js');
 const MessageAreaConfTempSwitcher   = require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 const Errors                        = require('./enig_error.js').Errors;
 const Message                       = require('./message.js');
+const UserProps                     = require('./user_property.js');
 
 //  deps
 const async             = require('async');
@@ -167,7 +168,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
             if(this.config.messageAreaTag) {
                 this.tempMessageConfAndAreaSwitch(this.config.messageAreaTag);
             } else {
-                this.config.messageAreaTag = this.client.user.properties.message_area_tag;
+                this.config.messageAreaTag = this.client.user.properties[UserProps.MessageAreaTag];
             }
         }
     }
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 5a04ff07..1622bd03 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -2,17 +2,18 @@
 'use strict';
 
 //  ENiGMA½
-const Config                            = require('./config.js').get;
-const Log                               = require('./logger.js').log;
+const Config                    = require('./config.js').get;
+const Log                       = require('./logger.js').log;
 const {
     getMessageAreaByTag,
     getMessageConferenceByTag
-}                                       = require('./message_area.js');
-const clientConnections                 = require('./client_connections.js');
-const StatLog                           = require('./stat_log.js');
-const FileBaseFilters                   = require('./file_base_filter.js');
-const { formatByteSize }                = require('./string_util.js');
-const ANSI                              = require('./ansi_term.js');
+}                               = require('./message_area.js');
+const clientConnections         = require('./client_connections.js');
+const StatLog                   = require('./stat_log.js');
+const FileBaseFilters           = require('./file_base_filter.js');
+const { formatByteSize }        = require('./string_util.js');
+const ANSI                      = require('./ansi_term.js');
+const UserProps                 = require('./user_property.js');
 
 //  deps
 const packageJson           = require('../package.json');
@@ -83,7 +84,9 @@ const PREDEFINED_MCI_GENERATORS = {
     UR  : function realName(client) { return userStatAsString(client, 'real_name', ''); },
     LO  : function location(client) { return userStatAsString(client, 'location', ''); },
     UA  : function age(client) { return client.user.getAge().toString(); },
-    BD  : function birthdate(client) { return moment(client.user.properties.birthdate).format(client.currentTheme.helpers.getDateFormat()); },  //  iNiQUiTY
+    BD  : function birthdate(client) {  //  iNiQUiTY
+        return moment(client.user.properties[UserProps.Birthdate]).format(client.currentTheme.helpers.getDateFormat());
+    },
     US  : function sex(client) { return userStatAsString(client, 'sex', ''); },
     UE  : function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
     UW  : function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
@@ -114,7 +117,9 @@ const PREDEFINED_MCI_GENERATORS = {
         return getUserRatio(client, 'ul_total_bytes', 'dl_total_bytes');
     },
 
-    MS  : function accountCreatedclient(client) { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
+    MS  : function accountCreatedclient(client) {
+        return moment(client.user.properties[UserProps.AccountCreated]).format(client.currentTheme.helpers.getDateFormat());
+    },
     PS  : function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
     PC  : function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
 
@@ -123,19 +128,19 @@ const PREDEFINED_MCI_GENERATORS = {
     },
 
     MA  : function messageAreaName(client) {
-        const area = getMessageAreaByTag(client.user.properties.message_area_tag);
+        const area = getMessageAreaByTag(client.user.properties[UserProps.MessageAreaTag]);
         return area ? area.name : '';
     },
     MC  : function messageConfName(client) {
-        const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
+        const conf = getMessageConferenceByTag(client.user.properties[UserProps.MessageConfTag]);
         return conf ? conf.name : '';
     },
     ML  : function messageAreaDescription(client) {
-        const area = getMessageAreaByTag(client.user.properties.message_area_tag);
+        const area = getMessageAreaByTag(client.user.properties[UserProps.MessageAreaTag]);
         return area ? area.desc : '';
     },
     CM  : function messageConfDescription(client) {
-        const conf = getMessageConferenceByTag(client.user.properties.message_conf_tag);
+        const conf = getMessageConferenceByTag(client.user.properties[UserProps.MessageConfTag]);
         return conf ? conf.desc : '';
     },
 
@@ -169,8 +174,9 @@ const PREDEFINED_MCI_GENERATORS = {
         //  Clean up CPU strings a bit for better display
         //
         return os.cpus()[0].model
-            .replace(/\(R\)|\(TM\)|processor|CPU/g, '')
-            .replace(/\s+(?= )/g, '');
+            .replace(/\(R\)|\(TM\)|processor|CPU/ig, '')
+            .replace(/\s+(?= )/g, '')
+            .trim();
     },
 
     //  :TODO: MCI for core count, e.g. os.cpus().length
diff --git a/core/set_newscan_date.js b/core/set_newscan_date.js
index c86b8e26..7713f647 100644
--- a/core/set_newscan_date.js
+++ b/core/set_newscan_date.js
@@ -14,7 +14,7 @@ const {
     updateMessageAreaLastReadId,
     getMessageIdNewerThanTimestampByArea
 }                                   = require('./message_area.js');
-const stringFormat                  = require('./string_format.js');
+const UserProps                     = require('./user_property.js');
 
 //  deps
 const async                 = require('async');
@@ -183,8 +183,8 @@ exports.getModule = class SetNewScanDate extends MenuModule {
         });
 
         //  Find current conf/area & move it directly under "All"
-        const currConfTag   = this.client.user.properties.message_conf_tag;
-        const currAreaTag   = this.client.user.properties.message_area_tag;
+        const currConfTag   = this.client.user.properties[UserProps.MessageConfTag];
+        const currAreaTag   = this.client.user.properties[UserProps.MessageAreaTag];
         if(currConfTag && currAreaTag) {
             const confAreaIndex = selections.findIndex( confArea => {
                 return confArea.conf.confTag === currConfTag && confArea.area.areaTag === currAreaTag;
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 7c135f22..5e7b651b 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -7,6 +7,7 @@ const ansiNormal        = require('./ansi_term.js').normal;
 const { userLogin }     = require('./user_login.js');
 const messageArea       = require('./message_area.js');
 const { ErrorReasons }  = require('./enig_error.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const _                 = require('lodash');
@@ -105,7 +106,7 @@ function reloadMenu(menu, cb) {
 
 function prevConf(callingMenu, formData, extraArgs, cb) {
     const confs     = messageArea.getSortedAvailMessageConferences(callingMenu.client);
-    const currIndex = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag) || confs.length;
+    const currIndex = confs.findIndex( e => e.confTag === callingMenu.client.user.properties[UserProps.MessageConfTag]) || confs.length;
 
     messageArea.changeMessageConference(callingMenu.client, confs[currIndex - 1].confTag, err => {
         if(err) {
@@ -118,7 +119,7 @@ function prevConf(callingMenu, formData, extraArgs, cb) {
 
 function nextConf(callingMenu, formData, extraArgs, cb) {
     const confs     = messageArea.getSortedAvailMessageConferences(callingMenu.client);
-    let currIndex   = confs.findIndex( e => e.confTag === callingMenu.client.user.properties.message_conf_tag);
+    let currIndex   = confs.findIndex( e => e.confTag === callingMenu.client.user.properties[UserProps.MessageConfTag]);
 
     if(currIndex === confs.length - 1) {
         currIndex = -1;
@@ -134,8 +135,8 @@ function nextConf(callingMenu, formData, extraArgs, cb) {
 }
 
 function prevArea(callingMenu, formData, extraArgs, cb) {
-    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
-    const currIndex = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag) || areas.length;
+    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties[UserProps.MessageConfTag]);
+    const currIndex = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties[UserProps.MessageAreaTag]) || areas.length;
 
     messageArea.changeMessageArea(callingMenu.client, areas[currIndex - 1].areaTag, err => {
         if(err) {
@@ -147,8 +148,8 @@ function prevArea(callingMenu, formData, extraArgs, cb) {
 }
 
 function nextArea(callingMenu, formData, extraArgs, cb) {
-    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties.message_conf_tag);
-    let currIndex   = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties.message_area_tag);
+    const areas     = messageArea.getSortedAvailMessageAreasByConfTag(callingMenu.client.user.properties[UserProps.MessageConfTag]);
+    let currIndex   = areas.findIndex( e => e.areaTag === callingMenu.client.user.properties[UserProps.MessageAreaTag]);
 
     if(currIndex === areas.length - 1) {
         currIndex = -1;
diff --git a/core/theme.js b/core/theme.js
index 052eeac7..6dfee685 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -13,7 +13,9 @@ const Errors            = require('./enig_error.js').Errors;
 const ErrorReasons      = require('./enig_error.js').ErrorReasons;
 const Events            = require('./events.js');
 const AnsiPrep          = require('./ansi_prep.js');
+const UserProps         = require('./user_property.js');
 
+//  deps
 const fs                = require('graceful-fs');
 const paths             = require('path');
 const async             = require('async');
@@ -427,8 +429,8 @@ function getThemeArt(options, cb) {
     //      random
     //
     const config = Config();
-    if(!options.themeId && _.has(options, 'client.user.properties.theme_id')) {
-        options.themeId = options.client.user.properties.theme_id;
+    if(!options.themeId && _.has(options, [ 'client', 'user', 'properties', UserProps.ThemeId ])) {
+        options.themeId = options.client.user.properties[UserProps.ThemeId];
     } else {
         options.themeId = config.theme.default;
     }
diff --git a/core/user_config.js b/core/user_config.js
index ef72e1ad..d2748c4b 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -55,7 +55,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
                 //
                 //  If nothing changed, we know it's OK
                 //
-                if(self.client.user.properties.email_address.toLowerCase() === data.toLowerCase()) {
+                if(self.client.user.properties[UserProps.EmailAddress].toLowerCase() === data.toLowerCase()) {
                     return cb(null);
                 }
 
@@ -182,22 +182,22 @@ exports.getModule = class UserConfigModule extends MenuModule {
                         }), 'name');
 
                         currentThemeIdIndex = Math.max(0, _.findIndex(self.availThemeInfo, function cmp(ti) {
-                            return ti.themeId === self.client.user.properties.theme_id;
+                            return ti.themeId === self.client.user.properties[UserProps.ThemeId];
                         }));
 
                         callback(null);
                     },
                     function populateViews(callback) {
-                        var user = self.client.user;
+                        const user = self.client.user;
 
-                        self.setViewText('menu', MciCodeIds.RealName, user.properties.real_name);
-                        self.setViewText('menu', MciCodeIds.BirthDate, moment(user.properties.birthdate).format('YYYYMMDD'));
-                        self.setViewText('menu', MciCodeIds.Sex, user.properties.sex);
-                        self.setViewText('menu', MciCodeIds.Loc, user.properties.location);
-                        self.setViewText('menu', MciCodeIds.Affils, user.properties.affiliation);
-                        self.setViewText('menu', MciCodeIds.Email, user.properties.email_address);
-                        self.setViewText('menu', MciCodeIds.Web, user.properties.web_address);
-                        self.setViewText('menu', MciCodeIds.TermHeight, user.properties.term_height.toString());
+                        self.setViewText('menu', MciCodeIds.RealName, user.properties[UserProps.RealName]);
+                        self.setViewText('menu', MciCodeIds.BirthDate, moment(user.properties[UserProps.Birthdate]).format('YYYYMMDD'));
+                        self.setViewText('menu', MciCodeIds.Sex, user.properties[UserProps.Sex]);
+                        self.setViewText('menu', MciCodeIds.Loc, user.properties[UserProps.Location]);
+                        self.setViewText('menu', MciCodeIds.Affils, user.properties[UserProps.Affiliations]);
+                        self.setViewText('menu', MciCodeIds.Email, user.properties[UserProps.EmailAddress]);
+                        self.setViewText('menu', MciCodeIds.Web, user.properties[UserProps.WebAddress]);
+                        self.setViewText('menu', MciCodeIds.TermHeight, user.properties[UserProps.TermHeight].toString());
 
 
                         var themeView = self.getView(MciCodeIds.Theme);
diff --git a/core/user_login.js b/core/user_login.js
index fa9ae676..a46be5b1 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -12,6 +12,7 @@ const {
     Errors,
     ErrorReasons
 }                       = require('./enig_error.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async             = require('async');
@@ -74,24 +75,24 @@ function userLogin(client, username, password, cb) {
         client.log.info('Successful login');
 
         //  User's unique session identifier is the same as the connection itself
-        user.sessionId = client.session.uniqueId;   //  convienence
+        user.sessionId = client.session.uniqueId;   //  convenience
 
         Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
         async.parallel(
             [
                 function setTheme(callback) {
-                    setClientTheme(client, user.properties.theme_id);
+                    setClientTheme(client, user.properties[UserProps.ThemeId]);
                     return callback(null);
                 },
                 function updateSystemLoginCount(callback) {
-                    return StatLog.incrementSystemStat('login_count', 1, callback);
+                    return StatLog.incrementSystemStat('login_count', 1, callback); //  :TODO: create system_property.js
                 },
                 function recordLastLogin(callback) {
-                    return StatLog.setUserStat(user, 'last_login_timestamp', StatLog.now, callback);
+                    return StatLog.setUserStat(user, UserProps.LastLoginTs, StatLog.now, callback);
                 },
                 function updateUserLoginCount(callback) {
-                    return StatLog.incrementUserStat(user, 'login_count', 1, callback);
+                    return StatLog.incrementUserStat(user, UserProps.LoginCount, 1, callback);
                 },
                 function recordLoginHistory(callback) {
                     const loginHistoryMax = Config().statLog.systemEvents.loginHistoryMax;
diff --git a/core/user_property.js b/core/user_property.js
index bbb36928..3c2f4f12 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -11,7 +11,7 @@ module.exports = {
     PassPbkdf2Salt              : 'pw_pbkdf2_salt',
     PassPbkdf2Dk                : 'pw_pbkdf2_dk',
 
-    AccountStatus               : 'account_status',
+    AccountStatus               : 'account_status',             //  See User.AccountStatus enum
 
     RealName                    : 'real_name',
     Sex                         : 'sex',
@@ -24,10 +24,14 @@ module.exports = {
     TermWidth                   : 'term_width',
     ThemeId                     : 'theme_id',
     AccountCreated              : 'account_created',
+    LastLoginTs                 : 'last_login_timestamp',
+    LoginCount                  : 'login_count',
+
+    DownloadQueue               : 'dl_queue',                   // download_queue.js
 
     FailedLoginAttempts         : 'failed_login_attempts',
     AccountLockedTs             : 'account_locked_timestamp',
-    AccountLockedPrevStatus     : 'account_locked_prev_status', //  previous account status
+    AccountLockedPrevStatus     : 'account_locked_prev_status', //  previous account status before lock out
 
     EmailPwResetToken           : 'email_password_reset_token',
     EmailPwResetTokenTs         : 'email_password_reset_token_ts',
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index c76a232c..90c5f57c 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -59,7 +59,7 @@ class WebPasswordReset {
                         }
 
                         User.getUser(userId, (err, user) => {
-                            if(err || !user.properties.email_address) {
+                            if(err || !user.properties[UserProps.EmailAddress]) {
                                 return callback(Errors.DoesNotExist('No email address associated with this user'));
                             }
 
@@ -105,13 +105,13 @@ class WebPasswordReset {
                 function buildAndSendEmail(user, textTemplate, htmlTemplate, callback) {
                     const sendMail = require('./email.js').sendMail;
 
-                    const resetUrl = webServer.instance.buildUrl(`/reset_password?token=${user.properties.email_password_reset_token}`);
+                    const resetUrl = webServer.instance.buildUrl(`/reset_password?token=${user.properties[UserProps.EmailPwResetToken]}`);
 
                     function replaceTokens(s) {
                         return s
                             .replace(/%BOARDNAME%/g,    Config().general.boardName)
                             .replace(/%USERNAME%/g,     user.username)
-                            .replace(/%TOKEN%/g,        user.properties.email_password_reset_token)
+                            .replace(/%TOKEN%/g,        user.properties[UserProps.EmailPwResetToken])
                             .replace(/%RESET_URL%/g,    resetUrl)
                         ;
                     }
@@ -122,7 +122,7 @@ class WebPasswordReset {
                     }
 
                     const message = {
-                        to      : `${user.properties.display_name||user.username} <${user.properties.email_address}>`,
+                        to      : `${user.properties[UserProps.RealName]||user.username} <${user.properties[UserProps.EmailAddress]}>`,
                         //  from will be filled in
                         subject : 'Forgot Password',
                         text    : textTemplate,

From d11aca571e003b0f6d7ee1588bd28f21f667f306 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 22:02:36 -0700
Subject: [PATCH 0564/1013] Yet more UserProps usage

---
 core/acs_parser.js     | 30 ++++++++++++++++--------------
 core/dropfile.js       | 12 +++++++-----
 core/fse.js            |  2 +-
 core/predefined_mci.js | 32 ++++++++++++++++----------------
 core/user_property.js  |  6 ++++++
 misc/acs_parser.pegjs  | 30 ++++++++++++++++--------------
 6 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/core/acs_parser.js b/core/acs_parser.js
index 3025f654..6e32cb06 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -847,6 +847,8 @@ function peg$parse(input, options) {
   	const client	= options.client;
   	const user		= options.client.user;
 
+  	const UserProps	= require('./user_property.js');
+
   	const moment	= require('moment');
 
   	function checkAccess(acsCode, value) {
@@ -863,7 +865,7 @@ function peg$parse(input, options) {
   						value = [ value ];
   					}
 
-  					const userAccountStatus = parseInt(user.properties.account_status, 10);
+  					const userAccountStatus = user.getPropertyAsNumber(UserProps.AccountStatus);
   					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
   				},
   				EC	: function isEncoding() {
@@ -888,15 +890,15 @@ function peg$parse(input, options) {
   					return value.map(n => parseInt(n, 10)).includes(client.node);
   				},
   				NP	: function numberOfPosts() {
-  					const postCount = parseInt(user.properties.post_count, 10) || 0;
+  					const postCount = user.getPropertyAsNumber(UserProps.PostCount) || 0;
   					return !isNaN(value) && postCount >= value;
   				},
   				NC	: function numberOfCalls() {
-  					const loginCount = parseInt(user.properties.login_count, 10);
+  					const loginCount = user.getPropertyAsNumber(UserProps.LoginCount);
   					return !isNaN(value) && loginCount >= value;
   				},
   				AA	: function accountAge() {
-  					const accountCreated = moment(user.properties.account_created);
+  					const accountCreated = moment(user.getProperty(UserProps.AccountCreated));
   					const now = moment();
   					const daysOld = accountCreated.diff(moment(), 'days');
   					return !isNaN(value) &&
@@ -905,36 +907,36 @@ function peg$parse(input, options) {
   						daysOld >= value;
   				},
   				BU	: function bytesUploaded() {
-  					const bytesUp = parseInt(user.properties.ul_total_bytes, 10) || 0;
+  					const bytesUp = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
   					return !isNaN(value) && bytesUp >= value;
   				},
   				UP	: function uploads() {
-  					const uls = parseInt(user.properties.ul_total_count, 10) || 0;
+  					const uls = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
   					return !isNaN(value) && uls >= value;
   				},
   				BD	: function bytesDownloaded() {
-  					const bytesDown = parseInt(user.properties.dl_total_bytes, 10) || 0;
+  					const bytesDown = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
   					return !isNaN(value) && bytesDown >= value;
   				},
   				DL	: function downloads() {
-  					const dls = parseInt(user.properties.dl_total_count, 10) || 0;
+  					const dls = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
   					return !isNaN(value) && dls >= value;
   				},
   				NR	: function uploadDownloadRatioGreaterThan() {
-  					const ulCount = parseInt(user.properties.ul_total_count, 10) || 0;
-  					const dlCount = parseInt(user.properties.dl_total_count, 10) || 0;
+  					const ulCount = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
+  					const dlCount = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
   					const ratio = ~~((ulCount / dlCount) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
   				KR	: function uploadDownloadByteRatioGreaterThan() {
-  					const ulBytes = parseInt(user.properties.ul_total_bytes, 10) || 0;
-  					const dlBytes = parseInt(user.properties.dl_total_bytes, 10) || 0;
+  					const ulBytes = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
+  					const dlBytes = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
   					const ratio = ~~((ulBytes / dlBytes) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
   				PC	: function postCallRatio() {					
-  					const postCount		= parseInt(user.properties.post_count, 10) || 0;
-  					const loginCount	= parseInt(user.properties.login_count, 10);
+  					const postCount		= user.getPropertyAsNumber(UserProps.PostCount) || 0;
+  					const loginCount	= user.getPropertyAsNumber(UserProps.LoginCount) || 0;
   					const ratio = ~~((postCount / loginCount) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
diff --git a/core/dropfile.js b/core/dropfile.js
index 4c6a9c0b..a23c5c1c 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -85,6 +85,8 @@ module.exports = class DropFile {
         const prop      = this.client.user.properties;
         const now       = moment();
         const secLevel  = this.client.user.getLegacySecurityLevel().toString();
+        const fullName  = prop[UserProps.RealName] || this.client.user.username;
+        const bd        = moment(prop[UserProp.Birthdate).format('MM/DD/YY');
 
         //  :TODO: fix time remaining
         //  :TODO: fix default protocol -- user prop: transfer_protocol
@@ -98,13 +100,13 @@ module.exports = class DropFile {
             'Y',                                                //  "Printer Toggle - Y=On  N=Off             (Default to Y)"
             'Y',                                                //  "Page Bell      - Y=On  N=Off             (Default to Y)"
             'Y',                                                //  "Caller Alarm   - Y=On  N=Off             (Default to Y)"
-            prop.real_name || this.client.user.username,        //  "User Full Name"
-            prop.location || 'Anywhere',                        //  "Calling From"
+            fullName,                                           //  "User Full Name"
+            prop[UserProps.Location]|| 'Anywhere',              //  "Calling From"
             '123-456-7890',                                     //  "Home Phone"
             '123-456-7890',                                     //  "Work/Data Phone"
             'NOPE',                                             //  "Password" (Note: this is never given out or even stored plaintext)
             secLevel,                                           //  "Security Level"
-            prop.login_count.toString(),                        //  "Total Times On"
+            prop[UserProps.LoginCount].toString(),              //  "Total Times On"
             now.format('MM/DD/YY'),                             //  "Last Date Called"
             '15360',                                            //  "Seconds Remaining THIS call (for those that particular)"
             '256',                                              //  "Minutes Remaining THIS call"
@@ -121,7 +123,7 @@ module.exports = class DropFile {
             '0',                                                //  "Total Downloads"
             '0',                                                //  "Daily Download "K" Total"
             '999999',                                           //  "Daily Download Max. "K" Limit"
-            moment(prop.birthdate).format('MM/DD/YY'),          //  "Caller's Birthdate"
+            bd,                                                 //  "Caller's Birthdate"
             'X:\\MAIN\\',                                       //  "Path to the MAIN directory (where User File is)"
             'X:\\GEN\\',                                        //  "Path to the GEN directory"
             StatLog.getSystemStat('sysop_username'),            //  "Sysop's Name (name BBS refers to Sysop as)"
@@ -142,7 +144,7 @@ module.exports = class DropFile {
             '0',                                                //  "Files d/led so far today"          
             '0',                                                //  "Total "K" Bytes Uploaded"
             '0',                                                //  "Total "K" Bytes Downloaded"
-            prop.user_comment || 'None',                        //  "User Comment"
+            prop[UserProps.UserComment] || 'None',              //  "User Comment"
             '0',                                                //  "Total Doors Opened"
             '0',                                                //  "Total Messages Left"
 
diff --git a/core/fse.js b/core/fse.js
index 3529935d..9ecf3bdd 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -480,7 +480,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         }
 
         Events.emit(Events.getSystemEvents().UserPostMessage, { user : this.client.user, areaTag : this.message.areaTag });
-        return StatLog.incrementUserStat(this.client.user, 'post_count', 1, cb);
+        return StatLog.incrementUserStat(this.client.user, UserProps.MessagePostCount, 1, cb);
     }
 
     redrawFooter(options, cb) {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 1622bd03..c83f8353 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -81,18 +81,18 @@ const PREDEFINED_MCI_GENERATORS = {
     UN  : function userName(client) { return client.user.username; },
     UI  : function userId(client) { return client.user.userId.toString(); },
     UG  : function groups(client) { return _.values(client.user.groups).join(', '); },
-    UR  : function realName(client) { return userStatAsString(client, 'real_name', ''); },
-    LO  : function location(client) { return userStatAsString(client, 'location', ''); },
+    UR  : function realName(client) { return userStatAsString(client, UserProps.RealName, ''); },
+    LO  : function location(client) { return userStatAsString(client, UserProps.Location, ''); },
     UA  : function age(client) { return client.user.getAge().toString(); },
     BD  : function birthdate(client) {  //  iNiQUiTY
         return moment(client.user.properties[UserProps.Birthdate]).format(client.currentTheme.helpers.getDateFormat());
     },
-    US  : function sex(client) { return userStatAsString(client, 'sex', ''); },
-    UE  : function emailAddres(client) { return userStatAsString(client, 'email_address', ''); },
-    UW  : function webAddress(client) { return userStatAsString(client, 'web_address', ''); },
-    UF  : function affils(client) { return userStatAsString(client, 'affiliation', ''); },
-    UT  : function themeId(client) { return userStatAsString(client, 'theme_id', ''); },
-    UC  : function loginCount(client) { return userStatAsString(client, 'login_count', 0); },
+    US  : function sex(client) { return userStatAsString(client, UserProps.Sex, ''); },
+    UE  : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); },
+    UW  : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); },
+    UF  : function affils(client) { return userStatAsString(client, UserProps.Affiliations, ''); },
+    UT  : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); },
+    UC  : function loginCount(client) { return userStatAsString(client, UserProps.LoginCount, 0); },
     ND  : function connectedNode(client) { return client.node.toString(); },
     IP  : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },    //  convert any :ffff: IPv4's to 32bit version
     ST  : function serverName(client) { return client.session.serverName; },
@@ -100,28 +100,28 @@ const PREDEFINED_MCI_GENERATORS = {
         const activeFilter = FileBaseFilters.getActiveFilter(client);
         return activeFilter ? activeFilter.name : '(Unknown)';
     },
-    DN  : function userNumDownloads(client) { return userStatAsString(client, 'dl_total_count', 0); },      //  Obv/2
+    DN  : function userNumDownloads(client) { return userStatAsString(client, UserProps.FileDlTotalCount, 0); },      //  Obv/2
     DK  : function userByteDownload(client) {   //  Obv/2 uses DK=downloaded Kbytes
-        const byteSize = StatLog.getUserStatNum(client.user, 'dl_total_bytes');
+        const byteSize = StatLog.getUserStatNum(client.user, UserProps.FileDlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    UP  : function userNumUploads(client) { return userStatAsString(client, 'ul_total_count', 0); },            //  Obv/2
+    UP  : function userNumUploads(client) { return userStatAsString(client, UserProps.FileUlTotalCount, 0); },            //  Obv/2
     UK  : function userByteUpload(client) { //  Obv/2 uses UK=uploaded Kbytes
-        const byteSize = StatLog.getUserStatNum(client.user, 'ul_total_bytes');
+        const byteSize = StatLog.getUserStatNum(client.user, UserProps.FileUlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
     },
     NR  : function userUpDownRatio(client) {    //  Obv/2
-        return getUserRatio(client, 'ul_total_count', 'dl_total_count');
+        return getUserRatio(client, UserProps.FileUlTotalCount, UserProps.FileDlTotalCount);
     },
     KR  : function userUpDownByteRatio(client) {    //  Obv/2 uses KR=upload/download Kbyte ratio
-        return getUserRatio(client, 'ul_total_bytes', 'dl_total_bytes');
+        return getUserRatio(client, UserProps.FileUlTotalBytes, UserProps.FileDlTotalBytes);
     },
 
     MS  : function accountCreatedclient(client) {
         return moment(client.user.properties[UserProps.AccountCreated]).format(client.currentTheme.helpers.getDateFormat());
     },
-    PS  : function userPostCount(client) { return userStatAsString(client, 'post_count', 0); },
-    PC  : function userPostCallRatio(client) { return getUserRatio(client, 'post_count', 'login_count'); },
+    PS  : function userPostCount(client) { return userStatAsString(client, UserProps.MessagePostCount, 0); },
+    PC  : function userPostCallRatio(client) { return getUserRatio(client, UserProps.MessagePostCount, UserProps.LoginCount); },
 
     MD  : function currentMenuDescription(client) {
         return _.has(client, 'currentMenuModule.menuConfig.desc') ? client.currentMenuModule.menuConfig.desc : '';
diff --git a/core/user_property.js b/core/user_property.js
index 3c2f4f12..7f2bf6c5 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -26,6 +26,7 @@ module.exports = {
     AccountCreated              : 'account_created',
     LastLoginTs                 : 'last_login_timestamp',
     LoginCount                  : 'login_count',
+    UserComment                 : 'user_comment',               //  NYI
 
     DownloadQueue               : 'dl_queue',                   // download_queue.js
 
@@ -40,8 +41,13 @@ module.exports = {
     FileBaseFilters             : 'file_base_filters',
     FileBaseFilterActiveUuid    : 'file_base_filter_active_uuid',
     FileBaseLastViewedId        : 'user_file_base_last_viewed',
+    FileDlTotalCount            : 'dl_total_count',
+    FileUlTotalCount            : 'ul_total_count',
+    FileDlTotalBytes            : 'dl_total_bytes',
+    FileUlTotalBytes            : 'ul_total_bytes',
 
     MessageConfTag              : 'message_conf_tag',
     MessageAreaTag              : 'message_area_tag',
+    MessagePostCount            : 'post_count',
 };
 
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index 4c9bc37b..ed6089ba 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -3,6 +3,8 @@
 	const client	= options.client;
 	const user		= options.client.user;
 
+	const UserProps	= require('./user_property.js');
+
 	const moment	= require('moment');
 
 	function checkAccess(acsCode, value) {
@@ -19,7 +21,7 @@
 						value = [ value ];
 					}
 
-					const userAccountStatus = parseInt(user.properties.account_status, 10);
+					const userAccountStatus = user.getPropertyAsNumber(UserProps.AccountStatus);
 					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
 				},
 				EC	: function isEncoding() {
@@ -44,15 +46,15 @@
 					return value.map(n => parseInt(n, 10)).includes(client.node);
 				},
 				NP	: function numberOfPosts() {
-					const postCount = parseInt(user.properties.post_count, 10) || 0;
+					const postCount = user.getPropertyAsNumber(UserProps.PostCount) || 0;
 					return !isNaN(value) && postCount >= value;
 				},
 				NC	: function numberOfCalls() {
-					const loginCount = parseInt(user.properties.login_count, 10);
+					const loginCount = user.getPropertyAsNumber(UserProps.LoginCount);
 					return !isNaN(value) && loginCount >= value;
 				},
 				AA	: function accountAge() {
-					const accountCreated = moment(user.properties.account_created);
+					const accountCreated = moment(user.getProperty(UserProps.AccountCreated));
 					const now = moment();
 					const daysOld = accountCreated.diff(moment(), 'days');
 					return !isNaN(value) &&
@@ -61,36 +63,36 @@
 						daysOld >= value;
 				},
 				BU	: function bytesUploaded() {
-					const bytesUp = parseInt(user.properties.ul_total_bytes, 10) || 0;
+					const bytesUp = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
 					return !isNaN(value) && bytesUp >= value;
 				},
 				UP	: function uploads() {
-					const uls = parseInt(user.properties.ul_total_count, 10) || 0;
+					const uls = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
 					return !isNaN(value) && uls >= value;
 				},
 				BD	: function bytesDownloaded() {
-					const bytesDown = parseInt(user.properties.dl_total_bytes, 10) || 0;
+					const bytesDown = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
 					return !isNaN(value) && bytesDown >= value;
 				},
 				DL	: function downloads() {
-					const dls = parseInt(user.properties.dl_total_count, 10) || 0;
+					const dls = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
 					return !isNaN(value) && dls >= value;
 				},
 				NR	: function uploadDownloadRatioGreaterThan() {
-					const ulCount = parseInt(user.properties.ul_total_count, 10) || 0;
-					const dlCount = parseInt(user.properties.dl_total_count, 10) || 0;
+					const ulCount = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
+					const dlCount = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
 					const ratio = ~~((ulCount / dlCount) * 100);
 					return !isNaN(value) && ratio >= value;
 				},
 				KR	: function uploadDownloadByteRatioGreaterThan() {
-					const ulBytes = parseInt(user.properties.ul_total_bytes, 10) || 0;
-					const dlBytes = parseInt(user.properties.dl_total_bytes, 10) || 0;
+					const ulBytes = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
+					const dlBytes = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
 					const ratio = ~~((ulBytes / dlBytes) * 100);
 					return !isNaN(value) && ratio >= value;
 				},
 				PC	: function postCallRatio() {					
-					const postCount		= parseInt(user.properties.post_count, 10) || 0;
-					const loginCount	= parseInt(user.properties.login_count, 10);
+					const postCount		= user.getPropertyAsNumber(UserProps.PostCount) || 0;
+					const loginCount	= user.getPropertyAsNumber(UserProps.LoginCount) || 0;
 					const ratio = ~~((postCount / loginCount) * 100);
 					return !isNaN(value) && ratio >= value;
 				},

From f80e07fcf959d5510dafa2c2450a321f9018482c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 23 Nov 2018 22:18:15 -0700
Subject: [PATCH 0565/1013] ...and more UserProps

---
 core/bbs.js          | 12 ++++++++----
 core/last_callers.js |  9 +++++----
 core/user.js         | 10 +++++-----
 core/user_list.js    |  3 ++-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index b4f88296..76b7138b 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -10,6 +10,7 @@ const conf          = require('./config.js');
 const logger        = require('./logger.js');
 const database      = require('./database.js');
 const resolvePath   = require('./misc_util.js').resolvePath;
+const UserProps     = require('./user_property.js');
 
 //  deps
 const async         = require('async');
@@ -229,18 +230,21 @@ function initialize(cb) {
                         },
                         function getOpProps(opUserName, next) {
                             const propLoadOpts = {
-                                names   : [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
+                                names   : [
+                                    UserProps.RealName, UserProps.Sex, UserProps.EmailAddress,
+                                    UserProps.Location, UserProps.Affiliations,
+                                ],
                             };
                             User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
-                                return next(err, opUserName, opProps);
+                                return next(err, opUserName, opProps, propLoadOpts);
                             });
                         }
                     ],
-                    (err, opUserName, opProps) => {
+                    (err, opUserName, opProps, propLoadOpts) => {
                         const StatLog = require('./stat_log.js');
 
                         if(err) {
-                            [ 'username', 'real_name', 'sex', 'email_address', 'location', 'affiliation' ].forEach(v => {
+                            propLoadOpts.concat('username').forEach(v => {
                                 StatLog.setNonPeristentSystemStat(`sysop_${v}`, 'N/A');
                             });
                         } else {
diff --git a/core/last_callers.js b/core/last_callers.js
index 08eb7b71..6b25caf6 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -7,6 +7,7 @@ const StatLog           = require('./stat_log.js');
 const User              = require('./user.js');
 const sysDb             = require('./database.js').dbs.system;
 const { Errors }        = require('./enig_error.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const moment            = require('moment');
@@ -165,7 +166,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
 
     loadUserForHistoryItems(loginHistory, cb) {
         const getPropOpts = {
-            names : [  'real_name', 'location', 'affiliation' ]
+            names : [ UserProps.RealName, UserProps.Location, UserProps.Affiliations ]
         };
 
         const actionIndicatorNames = _.map(this.actionIndicators, (v, k) => k);
@@ -185,9 +186,9 @@ exports.getModule = class LastCallersModule extends MenuModule {
                 item.userName = item.text = userName;
 
                 User.loadProperties(item.userId, getPropOpts, (err, props) => {
-                    item.location       = (props && props.location) || '';
-                    item.affiliation    = item.affils = (props && props.affiliation) || '';
-                    item.realName       = (props && props.real_name) || '';
+                    item.location       = (props && props[UserProps.Location]) || '';
+                    item.affiliation    = item.affils = (props && props[UserProps.Affiliations]) || '';
+                    item.realName       = (props && props[UserProps.RealName]) || '';
 
                     if(!indicatorSumsSql) {
                         return next(null, item);
diff --git a/core/user.js b/core/user.js
index 609a9e43..307dbacc 100644
--- a/core/user.js
+++ b/core/user.js
@@ -203,8 +203,8 @@ module.exports = class User {
                 },
                 function getDkWithSalt(props, callback) {
                     //  get DK from stored salt and password provided
-                    User.generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, (err, dk) => {
-                        return callback(err, dk, props.pw_pbkdf2_dk);
+                    User.generatePasswordDerivedKey(password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
+                        return callback(err, dk, props[UserProps.PassPbkdf2Dk]);
                     });
                 },
                 function validateAuth(passDk, propsDk, callback) {
@@ -516,8 +516,8 @@ module.exports = class User {
             }
 
             const newProperties = {
-                pw_pbkdf2_salt  : info.salt,
-                pw_pbkdf2_dk    : info.dk,
+                [ UserProps.PassPbkdf2Salt ]    : info.salt,
+                [ UserProps.PassPbkdf2Dk ]      : info.dk,
             };
 
             this.persistProperties(newProperties, err => {
@@ -596,7 +596,7 @@ module.exports = class User {
             WHERE id = (
                 SELECT user_id
                 FROM user_property
-                WHERE prop_name='real_name' AND prop_value LIKE ?
+                WHERE prop_name='${UserProps.RealName}' AND prop_value LIKE ?
             );`,
             [ realName ],
             (err, row) => {
diff --git a/core/user_list.js b/core/user_list.js
index 6f005432..3b342fab 100644
--- a/core/user_list.js
+++ b/core/user_list.js
@@ -5,6 +5,7 @@
 const { MenuModule }    = require('./menu_module.js');
 const { getUserList }   = require('./user.js');
 const { Errors }        = require('./enig_error.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const moment            = require('moment');
@@ -44,7 +45,7 @@ exports.getModule = class UserListModule extends MenuModule {
                         }
 
                         const fetchOpts = {
-                            properties      : [ 'real_name', 'location', 'affiliation', 'last_login_timestamp' ],
+                            properties      : [ UserProps.RealName, UserProps.Location, UserProps.Affiliations, UserProps.LastLoginTs ],
                             propsCamelCase  : true, //  e.g. real_name -> realName
                         };
                         getUserList(fetchOpts, (err, userList) => {

From 2fb3ce83a34019ee01ca7eaa88f01598d4eef665 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 24 Nov 2018 09:33:20 -0700
Subject: [PATCH 0566/1013] Spelling...

---
 core/menu_module.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 2ad30b8a..87f96dc0 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -30,7 +30,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.cls                = _.get(this.menuConfig.config, 'cls', Config().menus.cls);
         this.viewControllers    = {};
 
-        //  *initial* interruptable state for this menu
+        //  *initial* Interruptible state for this menu
         this.disableInterruption();
     }
 
@@ -167,18 +167,18 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     neverInterruptable() {
-        return this.menuConfig.config.interruptable === 'never';
+        return this.menuConfig.config.Interruptible === 'never';
     }
 
     enableInterruption() {
         if(!this.neverInterruptable()) {
-            this.interruptable = true;
+            this.Interruptible = true;
         }
     }
 
     disableInterruption() {
         if(!this.neverInterruptable()) {
-            this.interruptable = false;
+            this.Interruptible = false;
         }
     }
 
@@ -191,7 +191,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     displayQueuedInterruptions(cb) {
-        if(true !== this.interruptable) {
+        if(true !== this.Interruptible) {
             return cb(null);
         }
 
@@ -205,7 +205,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     attemptInterruptNow(interruptItem, cb) {
-        if(true !== this.interruptable) {
+        if(true !== this.Interruptible) {
             return cb(null, false); //  don't eat up the item; queue for later
         }
 

From 1dafa2854ba02ae3c1a9d7bd858cb16fa9a0e2d4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 24 Nov 2018 09:39:53 -0700
Subject: [PATCH 0567/1013] Fix initial load introduced last nigth :(

---
 core/bbs.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 76b7138b..05168e72 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -223,28 +223,29 @@ function initialize(cb) {
                 //
                 const User = require('./user.js');
 
+                const propLoadOpts = {
+                    names   : [
+                        UserProps.RealName, UserProps.Sex, UserProps.EmailAddress,
+                        UserProps.Location, UserProps.Affiliations,
+                    ],
+                };
+
                 async.waterfall(
                     [
                         function getOpUserName(next) {
                             return User.getUserName(1, next);
                         },
                         function getOpProps(opUserName, next) {
-                            const propLoadOpts = {
-                                names   : [
-                                    UserProps.RealName, UserProps.Sex, UserProps.EmailAddress,
-                                    UserProps.Location, UserProps.Affiliations,
-                                ],
-                            };
                             User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
-                                return next(err, opUserName, opProps, propLoadOpts);
+                                return next(err, opUserName, opProps);
                             });
-                        }
+                        },
                     ],
-                    (err, opUserName, opProps, propLoadOpts) => {
+                    (err, opUserName, opProps) => {
                         const StatLog = require('./stat_log.js');
 
                         if(err) {
-                            propLoadOpts.concat('username').forEach(v => {
+                            propLoadOpts.names.concat('username').forEach(v => {
                                 StatLog.setNonPeristentSystemStat(`sysop_${v}`, 'N/A');
                             });
                         } else {

From a5f3a65faa5dc41a5db46affb55df245d6788099 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 24 Nov 2018 10:33:33 -0700
Subject: [PATCH 0568/1013] Doc update

---
 docs/configuration/config-hjson.md | 87 +-----------------------------
 1 file changed, 1 insertion(+), 86 deletions(-)

diff --git a/docs/configuration/config-hjson.md b/docs/configuration/config-hjson.md
index 7aae987f..38392943 100644
--- a/docs/configuration/config-hjson.md
+++ b/docs/configuration/config-hjson.md
@@ -44,90 +44,5 @@ Below is a list of various configuration sections. There are many more, but this
 * [File Base](/docs/filebase/index.md)
 * [File Transfer Protocols](file-transfer-protocols.md): Oldschool file transfer protocols such as X/Y/Z-Modem!
 * [Message Areas](/docs/messageareas/configuring-a-message-area.md), [Networks](/docs/messageareas/message-networks.md), [NetMail](/docs/messageareas/netmail.md), etc.
+* ...and a **lot** more! Explore the docs! If you can't find something, please contact us!
 
-
-### A Sample Configuration
-Below is a **sample** `config.hjson` illustrating various (but certainly not all!) elements that can be configured / tweaked.
-
-**This is for illustration purposes! Do not cut & paste this configuration!**
-
-
-```hjson
-{
-	general: {
-		boardName: A Sample BBS
-		menuFile: "your_bbs.hjson" // copy of menu.hjson file (and adapt to your needs)
-	}
-
-	theme: {
-		default: "super-fancy-theme" // default-assigned theme (for new users) 
-	}
-
-	messageConferences: {
-		local_general: {
-			name: Local
-			desc: Local Discussions
-			default: true
-
-			areas: {
-				local_enigma_dev: {
-					name: ENiGMA 1/2 Development
-					desc: Discussion related to development and features of ENiGMA 1/2!
-					default: true
-				}
-			}
-		}
-
-		agoranet: {
-			name: Agoranet
-			desc: This network is for blatant exploitation of the greatest BBS scene art group ever.. ACiD.
-
-			areas: {
-				agoranet_bbs: {
-					name: BBS Discussion
-					desc: Discussion related to BBSs
-				}
-			}
-		}
-	}
-
-	messageNetworks: {
-		ftn: {
-			areas: {
-				agoranet_bbs: { /* hey kids, this matches above! */
-
-					// oh oh oh, and this one pairs up with a network below
-					network: agoranet
-					tag: AGN_BBS
-					uplinks: "46:1/100"
-				}
-			}
-
-			networks: {
-				agoranet: {
-					localAddress: "46:3/102"
-				}
-			}
-		}
-	}
-
-	scannerTossers: {
-		ftn_bso: {
-			schedule: {
-				import: every 1 hours or @watch:/home/enigma/bink/watchfile.txt
-				export: every 1 hours or @immediate
-			}
-
-			defaultZone: 46
-			defaultNetwork: agoranet
-
-			nodes: {
-				"46:*": {
-					archiveType: ZIP
-					encoding: utf8
-				}
-			}
-		}
-	}
-}
-```

From 2c4fdfdd5f427ecddf47dd6329dfcc997c05e3c8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 24 Nov 2018 20:02:19 -0700
Subject: [PATCH 0569/1013] * Moved oputil.js config import-areas to 'oputil.js
 mb import-areas' * 'oputil.js mb import-areas' now *optionally* binds areas
 to FTN networks. Otherwise only areas are imported

---
 core/bbs.js                        |   2 +-
 core/oputil/oputil_common.js       |  35 +++
 core/oputil/oputil_config.js       | 339 +----------------------------
 core/oputil/oputil_help.js         |  18 +-
 core/oputil/oputil_message_base.js | 324 ++++++++++++++++++++++++++-
 docs/admin/oputil.md               |  42 +++-
 6 files changed, 407 insertions(+), 353 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 05168e72..ede2b82e 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -216,7 +216,7 @@ function initialize(cb) {
             },
             function loadSysOpInformation(callback) {
                 //
-                //  Copy over some +op information from the user DB -> system propertys.
+                //  Copy over some +op information from the user DB -> system properties.
                 //  * Makes this accessible for MCI codes, easy non-blocking access, etc.
                 //  * We do this every time as the op is free to change this information just
                 //    like any other user
diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js
index 90328b07..e1d6c962 100644
--- a/core/oputil/oputil_common.js
+++ b/core/oputil/oputil_common.js
@@ -7,6 +7,11 @@ const db				= require('../../core/database.js');
 
 const _					= require('lodash');
 const async				= require('async');
+const inq			    = require('inquirer');
+const fs                = require('fs');
+const hjson             = require('hjson');
+
+const packageJson       = require('../../package.json');
 
 exports.printUsageAndSetExitCode		= printUsageAndSetExitCode;
 exports.getDefaultConfigPath			= getDefaultConfigPath;
@@ -14,6 +19,17 @@ exports.getConfigPath					= getConfigPath;
 exports.initConfigAndDatabases			= initConfigAndDatabases;
 exports.getAreaAndStorage				= getAreaAndStorage;
 exports.looksLikePattern				= looksLikePattern;
+exports.getAnswers                      = getAnswers;
+exports.writeConfig                     = writeConfig;
+
+const HJSONStringifyCommonOpts = exports.HJSONStringifyCommonOpts = {
+    emitRootBraces  : true,
+    bracesSameLine  : true,
+    space           : 4,
+    keepWsc         : true,
+    quotes          : 'min',
+    eol             : '\n',
+};
 
 const exitCodes = exports.ExitCodes = {
     SUCCESS		: 0,
@@ -100,4 +116,23 @@ function looksLikePattern(tag) {
     }
 
     return /[*?[\]!()+|^]/.test(tag);
+}
+
+function getAnswers(questions, cb) {
+    inq.prompt(questions).then( answers => {
+        return cb(answers);
+    });
+}
+
+function writeConfig(config, path) {
+    config = hjson.stringify(config, HJSONStringifyCommonOpts)
+        .replace(/%ENIG_VERSION%/g,     packageJson.version)
+        .replace(/%HJSON_VERSION%/g,    hjson.version);
+
+    try {
+        fs.writeFileSync(path, config, 'utf8');
+        return true;
+    } catch(e) {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_config.js b/core/oputil/oputil_config.js
index 52c388f7..8a51fdb5 100644
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -9,10 +9,11 @@ const {
     getConfigPath,
     argv,
     ExitCodes,
-    initConfigAndDatabases
+    getAnswers,
+    writeConfig,
+    HJSONStringifyCommonOpts,
 }                               = require('./oputil_common.js');
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
-const Errors					= require('../../core/enig_error.js').Errors;
 
 //	deps
 const async			    = require('async');
@@ -24,17 +25,8 @@ const paths			    = require('path');
 const _				    = require('lodash');
 const sanatizeFilename  = require('sanitize-filename');
 
-const packageJson   = require('../../package.json');
-
 exports.handleConfigCommand				= handleConfigCommand;
 
-
-function getAnswers(questions, cb) {
-    inq.prompt(questions).then( answers => {
-        return cb(answers);
-    });
-}
-
 const ConfigIncludeKeys = [
     'theme',
     'users.preAuthIdleLogoutSeconds', 'users.idleLogoutSeconds',
@@ -46,15 +38,6 @@ const ConfigIncludeKeys = [
     'logging.rotatingFile',
 ];
 
-const HJSONStringifyComonOpts = {
-    emitRootBraces  : true,
-    bracesSameLine  : true,
-    space           : 4,
-    keepWsc         : true,
-    quotes          : 'min',
-    eol             : '\n',
-};
-
 const QUESTIONS = {
     Intro		: [
         {
@@ -231,34 +214,21 @@ function askNewConfigQuestions(cb) {
     );
 }
 
-function writeConfig(config, path) {
-    config = hjson.stringify(config, HJSONStringifyComonOpts)
-        .replace(/%ENIG_VERSION%/g,     packageJson.version)
-        .replace(/%HJSON_VERSION%/g,    hjson.version)
-        ;
-
-    try {
-        fs.writeFileSync(path, config, 'utf8');
-        return true;
-    } catch(e) {
-        return false;
-    }
-}
-
 const copyFileSyncSilent = (to, from, flags) => {
     try {
         fs.copyFileSync(to, from, flags);
-    } catch(e) {}
+    } catch(e) {
+        /* absorb! */
+    }
 };
 
 function buildNewConfig() {
     askNewConfigQuestions( (err, configPath, config) => {
-        if(err) {
-            return;
+        if(err) {            return;
         }
 
         const bn = sanatizeFilename(config.general.boardName)
-            .replace(/[^a-z0-9_\-]/ig, '_')
+            .replace(/[^a-z0-9_-]/ig, '_')
             .replace(/_+/g, '_')
             .toLowerCase();
         const menuFile = `${bn}-menu.hjson`;
@@ -273,7 +243,7 @@ function buildNewConfig() {
             paths.join(__dirname, '../../misc/prompt_template.in.hjson'),
             paths.join(__dirname, '../../config/', promptFile),
             fs.constants.COPYFILE_EXCL
-        )
+        );
 
         config.general.menuFile     = menuFile;
         config.general.promptFile   = promptFile;
@@ -286,294 +256,10 @@ function buildNewConfig() {
     });
 }
 
-function validateUplinks(uplinks) {
-    const ftnAddress = require('../../core/ftn_address.js');
-    const valid = uplinks.every(ul => {
-        const addr = ftnAddress.fromString(ul);
-        return addr;
-    });
-    return valid;
-}
-
-function getMsgAreaImportType(path) {
-    if(argv.type) {
-        return argv.type.toLowerCase();
-    }
-
-    const ext = paths.extname(path).toLowerCase().substr(1);
-    return ext;	//	.bbs|.na|...
-}
-
-function importAreas() {
-    const importPath = argv._[argv._.length - 1];
-    if(argv._.length < 3 || !importPath || 0 === importPath.length) {
-        return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
-    }
-
-    const importType = getMsgAreaImportType(importPath);
-    if('na' !== importType && 'bbs' !== importType) {
-        return console.error(`"${importType}" is not a recognized import file type`);
-    }
-
-    //	optional data - we'll prompt if for anything not found
-    let confTag		= argv.conf;
-    let networkName	= argv.network;
-    let uplinks		= argv.uplinks;
-    if(uplinks) {
-        uplinks = uplinks.split(/[\s,]+/);
-    }
-
-    let importEntries;
-
-    async.waterfall(
-        [
-            function readImportFile(callback) {
-                fs.readFile(importPath, 'utf8', (err, importData) => {
-                    if(err) {
-                        return callback(err);
-                    }
-
-                    importEntries = getImportEntries(importType, importData);
-                    if(0 === importEntries.length) {
-                        return callback(Errors.Invalid('Invalid or empty import file'));
-                    }
-
-                    //	We should have enough to validate uplinks
-                    if('bbs' === importType) {
-                        for(let i = 0; i < importEntries.length; ++i) {
-                            if(!validateUplinks(importEntries[i].uplinks)) {
-                                return callback(Errors.Invalid('Invalid uplink(s)'));
-                            }
-                        }
-                    } else {
-                        if(!validateUplinks(uplinks)) {
-                            return callback(Errors.Invalid('Invalid uplink(s)'));
-                        }
-                    }
-
-                    return callback(null);
-                });
-            },
-            function init(callback) {
-                return initConfigAndDatabases(callback);
-            },
-            function validateAndCollectInput(callback) {
-                const msgArea	= require('../../core/message_area.js');
-                const sysConfig	= require('../../core/config.js').get();
-
-                let msgConfs = msgArea.getSortedAvailMessageConferences(null, { noClient : true } );
-                if(!msgConfs) {
-                    return callback(Errors.DoesNotExist('No conferences exist in your configuration'));
-                }
-
-                msgConfs = msgConfs.map(mc => {
-                    return {
-                        name	: mc.conf.name,
-                        value	: mc.confTag,
-                    };
-                });
-
-                if(confTag && !msgConfs.find(mc => {
-                    return confTag === mc.value;
-                }))
-                {
-                    return callback(Errors.DoesNotExist(`Conference "${confTag}" does not exist`));
-                }
-
-                let existingNetworkNames = [];
-                if(_.has(sysConfig, 'messageNetworks.ftn.networks')) {
-                    existingNetworkNames = Object.keys(sysConfig.messageNetworks.ftn.networks);
-                }
-
-                if(0 === existingNetworkNames.length) {
-                    return callback(Errors.DoesNotExist('No FTN style networks exist in your configuration'));
-                }
-
-                if(networkName && !existingNetworkNames.find(net => networkName === net)) {
-                    return callback(Errors.DoesNotExist(`FTN style Network "${networkName}" does not exist`));
-                }
-
-                getAnswers([
-                    {
-                        name		: 'confTag',
-                        message		: 'Message conference:',
-                        type		: 'list',
-                        choices		: msgConfs,
-                        pageSize	: 10,
-                        when		: !confTag,
-                    },
-                    {
-                        name		: 'networkName',
-                        message		: 'Network name:',
-                        type		: 'list',
-                        choices		: existingNetworkNames,
-                        when		: !networkName,
-                    },
-                    {
-                        name		: 'uplinks',
-                        message		: 'Uplink(s) (comma separated):',
-                        type		: 'input',
-                        validate	: (input) => {
-                            const inputUplinks = input.split(/[\s,]+/);
-                            return validateUplinks(inputUplinks) ? true : 'Invalid uplink(s)';
-                        },
-                        when		: !uplinks && 'bbs' !== importType,
-                    }
-                ],
-                answers => {
-                    confTag			= confTag || answers.confTag;
-                    networkName		= networkName || answers.networkName;
-                    uplinks			= uplinks || answers.uplinks;
-
-                    importEntries.forEach(ie => {
-                        ie.areaTag = ie.ftnTag.toLowerCase();
-                    });
-
-                    return callback(null);
-                });
-            },
-            function confirmWithUser(callback) {
-                const sysConfig	= require('../../core/config.js').get();
-
-                console.info(`Importing the following for "${confTag}" - (${sysConfig.messageConferences[confTag].name} - ${sysConfig.messageConferences[confTag].desc})`);
-                importEntries.forEach(ie => {
-                    console.info(`  ${ie.ftnTag} - ${ie.name}`);
-                });
-
-                console.info('');
-                console.info('Importing will NOT create required FTN network configurations.');
-                console.info('If you have not yet done this, you will need to complete additional steps after importing.');
-                console.info('See docs/msg_networks.md for details.');
-                console.info('');
-
-                getAnswers([
-                    {
-                        name	: 'proceed',
-                        message	: 'Proceed?',
-                        type	: 'confirm',
-                    }
-                ],
-                answers => {
-                    return callback(answers.proceed ? null : Errors.General('User canceled'));
-                });
-
-            },
-            function loadConfigHjson(callback) {
-                const configPath = getConfigPath();
-                fs.readFile(configPath, 'utf8', (err, confData) => {
-                    if(err) {
-                        return callback(err);
-                    }
-
-                    let config;
-                    try {
-                        config = hjson.parse(confData, { keepWsc : true } );
-                    } catch(e) {
-                        return callback(e);
-                    }
-                    return callback(null, config);
-
-                });
-            },
-            function performImport(config, callback) {
-                const confAreas = { messageConferences : {} };
-                confAreas.messageConferences[confTag] = { areas : {} };
-
-                const msgNetworks = { messageNetworks : { ftn : { areas : {} } } };
-
-                importEntries.forEach(ie => {
-                    const specificUplinks = ie.uplinks || uplinks;	//	AREAS.BBS has specific uplinks per area
-
-                    confAreas.messageConferences[confTag].areas[ie.areaTag] = {
-                        name : ie.name,
-                        desc : ie.name,
-                    };
-
-                    msgNetworks.messageNetworks.ftn.areas[ie.areaTag] = {
-                        network	: networkName,
-                        tag		: ie.ftnTag,
-                        uplinks	: specificUplinks
-                    };
-                });
-
-
-                const newConfig = _.defaultsDeep(config, confAreas, msgNetworks);
-                const configPath = getConfigPath();
-
-                if(!writeConfig(newConfig, configPath)) {
-                    return callback(Errors.UnexpectedState('Failed writing configuration'));
-                }
-
-                return callback(null);
-            }
-        ],
-        err => {
-            if(err) {
-                console.error(err.reason ? err.reason : err.message);
-            } else {
-                const addFieldUpd = 'bbs' === importType ? '"name" and "desc"' : '"desc"';
-                console.info('Configuration generated.');
-                console.info(`You may wish to validate changes made to ${getConfigPath()}`);
-                console.info(`as well as update ${addFieldUpd} fields, sorting, etc.`);
-                console.info('');
-            }
-        }
-    );
-
-}
-
-function getImportEntries(importType, importData) {
-    let importEntries = [];
-
-    if('na' === importType) {
-        //
-        //	parse out
-        //	TAG		DESC
-        //
-        const re = /^([^\s]+)\s+([^\r\n]+)/gm;
-        let m;
-
-        while( (m = re.exec(importData) )) {
-            importEntries.push({
-                ftnTag		: m[1],
-                name		: m[2],
-            });
-        }
-    } else if ('bbs' === importType) {
-        //
-        //	Various formats for AREAS.BBS seem to exist. We want to support as much as possible.
-        //
-        //	SBBS http://www.synchro.net/docs/sbbsecho.html#AREAS.BBS
-        //	CODE	TAG		UPLINKS
-        //
-        //	VADV https://www.vadvbbs.com/products/vadv/support/docs/docs_vfido.php#AREAS.BBS
-        //	TAG		UPLINKS
-        //
-        //	Misc
-        //	PATH|OTHER	TAG		UPLINKS
-        //
-        //	Assume the second item is TAG and 1:n UPLINKS (space and/or comma sep) after (at the end)
-        //
-        const re = /^[^\s]+\s+([^\s]+)\s+([^\n]+)$/gm;
-        let m;
-        while ( (m = re.exec(importData) )) {
-            const tag = m[1];
-
-            importEntries.push({
-                ftnTag		: tag,
-                name		: `Area: ${tag}`,
-                uplinks		: m[2].split(/[\s,]+/),
-            });
-        }
-    }
-
-    return importEntries;
-}
-
 function catCurrentConfig() {
     try {
         const config    = hjson.rt.parse(fs.readFileSync(getConfigPath(), 'utf8'));
-        const hjsonOpts = Object.assign({}, HJSONStringifyComonOpts, {
+        const hjsonOpts = Object.assign({}, HJSONStringifyCommonOpts, {
             colors  : false === argv.colors ? false : true,
             keepWsc : false === argv.comments ? false : true,
         });
@@ -596,9 +282,8 @@ function handleConfigCommand() {
     const action = argv._[1];
 
     switch(action) {
-        case 'new' 			: return buildNewConfig();
-        case 'import-areas' : return importAreas();
-        case 'cat'          : return catCurrentConfig();
+        case 'new'  : return buildNewConfig();
+        case 'cat'  : return catCurrentConfig();
 
         default : return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
     }
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 4d7931e0..f6ac84ba 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -39,15 +39,8 @@ actions:
 
 actions:
   new                      generate a new/initial configuration
-  import-areas PATH        import areas using fidonet *.NA or AREAS.BBS file from PATH
   cat                      cat current configuration to stdout
 
-import-areas args:
-  --conf CONF_TAG          specify conference tag in which to import areas
-  --network NETWORK        specify network name/key to associate FTN areas
-  --uplinks UL1,UL2,...    specify one or more comma separated uplinks
-  --type TYPE              specifies area import type. valid options are "bbs" and "na"
-
 cat args:
   --no-color               disable color
   --no-comments            strip any comments
@@ -99,12 +92,19 @@ general information:
   FILE_ID                      a file identifier. see file.sqlite3
 `,
     MessageBase :
-  `usage: oputil.js mb <action> [<args>]
+`usage: oputil.js mb <action> [<args>]
 
-  actions:
+actions:
   areafix CMD1 CMD2 ... ADDR  sends an AreaFix NetMail to ADDR with the supplied command(s)
                               one or more commands may be supplied. commands that are multi
                               part such as "%COMPRESS ZIP" should be quoted.
+  import-areas PATH           import areas using fidonet *.NA or AREAS.BBS file from PATH
+
+import-areas args:
+  --conf CONF_TAG             conference tag in which to import areas
+  --network NETWORK           network name/key to associate FTN areas
+  --uplinks UL1,UL2,...       one or more comma separated uplinks
+  --type TYPE                 area import type. valid options are "bbs" and "na"
 `
 };
 
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 60a99a2a..d3653caf 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -2,16 +2,25 @@
 /* eslint-disable no-console */
 'use strict';
 
-const printUsageAndSetExitCode	= require('./oputil_common.js').printUsageAndSetExitCode;
-const ExitCodes					= require('./oputil_common.js').ExitCodes;
-const argv						= require('./oputil_common.js').argv;
-const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
+const {
+    printUsageAndSetExitCode,
+    getConfigPath,
+    ExitCodes,
+    argv,
+    initConfigAndDatabases,
+    getAnswers,
+    writeConfig,
+}                               = require('./oputil_common.js');
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const Address					= require('../ftn_address.js');
 const Errors					= require('../enig_error.js').Errors;
 
 //	deps
 const async						= require('async');
+const paths                     = require('path');
+const fs                        = require('fs');
+const hjson                     = require('hjson');
+const _                         = require('lodash');
 
 exports.handleMessageBaseCommand	= handleMessageBaseCommand;
 
@@ -121,6 +130,310 @@ function areaFix() {
     );
 }
 
+function validateUplinks(uplinks) {
+    const ftnAddress = require('../../core/ftn_address.js');
+    const valid = uplinks.every(ul => {
+        const addr = ftnAddress.fromString(ul);
+        return addr;
+    });
+    return valid;
+}
+
+function getMsgAreaImportType(path) {
+    if(argv.type) {
+        return argv.type.toLowerCase();
+    }
+
+    return paths.extname(path).substr(1).toLowerCase(); //  bbs|na|...
+}
+
+function importAreas() {
+    const importPath = argv._[argv._.length - 1];
+    if(argv._.length < 3 || !importPath || 0 === importPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('Config'), ExitCodes.ERROR);
+    }
+
+    const importType = getMsgAreaImportType(importPath);
+    if('na' !== importType && 'bbs' !== importType) {
+        return console.error(`"${importType}" is not a recognized import file type`);
+    }
+
+    //	optional data - we'll prompt if for anything not found
+    let confTag		= argv.conf;
+    let networkName	= argv.network;
+    let uplinks		= argv.uplinks;
+    if(uplinks) {
+        uplinks = uplinks.split(/[\s,]+/);
+    }
+
+    let importEntries;
+
+    async.waterfall(
+        [
+            function readImportFile(callback) {
+                fs.readFile(importPath, 'utf8', (err, importData) => {
+                    if(err) {
+                        return callback(err);
+                    }
+
+                    importEntries = getImportEntries(importType, importData);
+                    if(0 === importEntries.length) {
+                        return callback(Errors.Invalid('Invalid or empty import file'));
+                    }
+
+                    //	We should have enough to validate uplinks
+                    if('bbs' === importType) {
+                        for(let i = 0; i < importEntries.length; ++i) {
+                            if(!validateUplinks(importEntries[i].uplinks)) {
+                                return callback(Errors.Invalid('Invalid uplink(s)'));
+                            }
+                        }
+                    } else {
+                        if(!validateUplinks(uplinks || [])) {
+                            return callback(Errors.Invalid('Invalid uplink(s)'));
+                        }
+                    }
+
+                    return callback(null);
+                });
+            },
+            function init(callback) {
+                return initConfigAndDatabases(callback);
+            },
+            function validateAndCollectInput(callback) {
+                const msgArea	= require('../../core/message_area.js');
+                const sysConfig	= require('../../core/config.js').get();
+
+                let msgConfs = msgArea.getSortedAvailMessageConferences(null, { noClient : true } );
+                if(!msgConfs) {
+                    return callback(Errors.DoesNotExist('No conferences exist in your configuration'));
+                }
+
+                msgConfs = msgConfs.map(mc => {
+                    return {
+                        name	: mc.conf.name,
+                        value	: mc.confTag,
+                    };
+                });
+
+                if(confTag && !msgConfs.find(mc => {
+                    return confTag === mc.value;
+                }))
+                {
+                    return callback(Errors.DoesNotExist(`Conference "${confTag}" does not exist`));
+                }
+
+                const existingNetworkNames = Object.keys(_.get(sysConfig, 'messageNetworks.ftn.networks', {}));
+
+                if(networkName && !existingNetworkNames.find(net => networkName === net)) {
+                    return callback(Errors.DoesNotExist(`FTN style Network "${networkName}" does not exist`));
+                }
+
+                //  can't use --uplinks without a network
+                if(!networkName && 0 === existingNetworkNames.length && uplinks) {
+                    return callback(Errors.Invalid('Cannot use --uplinks without an FTN network to import to'));
+                }
+
+                getAnswers([
+                    {
+                        name		: 'confTag',
+                        message		: 'Message conference:',
+                        type		: 'list',
+                        choices		: msgConfs,
+                        pageSize	: 10,
+                        when		: !confTag,
+                    },
+                    {
+                        name		: 'networkName',
+                        message		: 'FTN network name:',
+                        type		: 'list',
+                        choices		: [ '-None-' ].concat(existingNetworkNames),
+                        pageSize    : 10,
+                        when		: !networkName && existingNetworkNames.length > 0,
+                        filter	    : (choice) => {
+                            return '-None-' === choice ? undefined : choice;
+                        }
+                    },
+                ],
+                answers => {
+                    confTag			= confTag || answers.confTag;
+                    networkName		= networkName || answers.networkName;
+                    uplinks			= uplinks || answers.uplinks;
+
+                    importEntries.forEach(ie => {
+                        ie.areaTag = ie.ftnTag.toLowerCase();
+                    });
+
+                    return callback(null);
+                });
+            },
+            function collectUplinks(callback) {
+                if(!networkName || uplinks || 'bbs' === importType) {
+                    return callback(null);
+                }
+
+                getAnswers([
+                    {
+                        name		: 'uplinks',
+                        message		: 'Uplink(s) (comma separated):',
+                        type		: 'input',
+                        validate	: (input) => {
+                            const inputUplinks = input.split(/[\s,]+/);
+                            return validateUplinks(inputUplinks) ? true : 'Invalid uplink(s)';
+                        },
+                    }
+                ],
+                answers => {
+                    uplinks = answers.uplinks;
+                    return callback(null);
+                });
+            },
+            function confirmWithUser(callback) {
+                const sysConfig	= require('../../core/config.js').get();
+
+                console.info(`Importing the following for "${confTag}"`);
+                console.info(`(${sysConfig.messageConferences[confTag].name} - ${sysConfig.messageConferences[confTag].desc})`);
+                console.info('');
+                importEntries.forEach(ie => {
+                    console.info(`  ${ie.ftnTag} - ${ie.name}`);
+                });
+
+                if(networkName) {
+                    console.info('');
+                    console.info(`For FTN network: ${networkName}`);
+                    console.info(`Uplinks: ${uplinks}`);
+                    console.info('');
+                    console.info('Importing will NOT create required FTN network configurations.');
+                    console.info('If you have not yet done this, you will need to complete additional steps after importing.');
+                    console.info('See Message Networks docs for details.');
+                    console.info('');
+                }
+
+                getAnswers([
+                    {
+                        name	: 'proceed',
+                        message	: 'Proceed?',
+                        type	: 'confirm',
+                    }
+                ],
+                answers => {
+                    return callback(answers.proceed ? null : Errors.General('User canceled'));
+                });
+
+            },
+            function loadConfigHjson(callback) {
+                const configPath = getConfigPath();
+                fs.readFile(configPath, 'utf8', (err, confData) => {
+                    if(err) {
+                        return callback(err);
+                    }
+
+                    let config;
+                    try {
+                        config = hjson.parse(confData, { keepWsc : true } );
+                    } catch(e) {
+                        return callback(e);
+                    }
+                    return callback(null, config);
+
+                });
+            },
+            function performImport(config, callback) {
+                const confAreas = { messageConferences : {} };
+                confAreas.messageConferences[confTag] = { areas : {} };
+
+                const msgNetworks = { messageNetworks : { ftn : { areas : {} } } };
+
+                importEntries.forEach(ie => {
+                    const specificUplinks = ie.uplinks || uplinks;	//	AREAS.BBS has specific uplinks per area
+
+                    confAreas.messageConferences[confTag].areas[ie.areaTag] = {
+                        name : ie.name,
+                        desc : ie.name,
+                    };
+
+                    if(networkName) {
+                        msgNetworks.messageNetworks.ftn.areas[ie.areaTag] = {
+                            network	: networkName,
+                            tag		: ie.ftnTag,
+                            uplinks	: specificUplinks
+                        };
+                    }
+                });
+
+
+                const newConfig = _.defaultsDeep(config, confAreas, msgNetworks);
+                const configPath = getConfigPath();
+
+                if(!writeConfig(newConfig, configPath)) {
+                    return callback(Errors.UnexpectedState('Failed writing configuration'));
+                }
+
+                return callback(null);
+            }
+        ],
+        err => {
+            if(err) {
+                console.error(err.reason ? err.reason : err.message);
+            } else {
+                const addFieldUpd = 'bbs' === importType ? '"name" and "desc"' : '"desc"';
+                console.info('Configuration generated.');
+                console.info(`You may wish to validate changes made to ${getConfigPath()}`);
+                console.info(`as well as update ${addFieldUpd} fields, sorting, etc.`);
+                console.info('');
+            }
+        }
+    );
+}
+
+function getImportEntries(importType, importData) {
+    let importEntries = [];
+
+    if('na' === importType) {
+        //
+        //	parse out
+        //	TAG		DESC
+        //
+        const re = /^([^\s]+)\s+([^\r\n]+)/gm;
+        let m;
+
+        while( (m = re.exec(importData) )) {
+            importEntries.push({
+                ftnTag		: m[1].trim(),
+                name		: m[2].trim(),
+            });
+        }
+    } else if ('bbs' === importType) {
+        //
+        //	Various formats for AREAS.BBS seem to exist. We want to support as much as possible.
+        //
+        //	SBBS http://www.synchro.net/docs/sbbsecho.html#AREAS.BBS
+        //	CODE	TAG		UPLINKS
+        //
+        //	VADV https://www.vadvbbs.com/products/vadv/support/docs/docs_vfido.php#AREAS.BBS
+        //	TAG		UPLINKS
+        //
+        //	Misc
+        //	PATH|OTHER	TAG		UPLINKS
+        //
+        //	Assume the second item is TAG and 1:n UPLINKS (space and/or comma sep) after (at the end)
+        //
+        const re = /^[^\s]+\s+([^\s]+)\s+([^\n]+)$/gm;
+        let m;
+        while ( (m = re.exec(importData) )) {
+            const tag = m[1].trim();
+
+            importEntries.push({
+                ftnTag		: tag,
+                name		: `Area: ${tag}`,
+                uplinks		: m[2].trim().split(/[\s,]+/),
+            });
+        }
+    }
+
+    return importEntries;
+}
+
 function handleMessageBaseCommand() {
 
     function errUsage() {
@@ -137,6 +450,7 @@ function handleMessageBaseCommand() {
     const action = argv._[1];
 
     return({
-        areafix	: areaFix,
+        areafix	        : areaFix,
+        'import-areas'  : importAreas,
     }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 9db1439c..1e081afb 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -70,23 +70,18 @@ The `config` command allows sysops to perform various system configuration and m
 usage: optutil.js config <action> [<args>]
 
 actions:
-  new                      generate a new/initial configuration
-  import-areas PATH        import areas using fidonet *.NA or AREAS.BBS file from PATH
+  new                      generate a new/initial configuration  
+  cat                      cat current configuration to stdout
 
-import-areas args:
-  --conf CONF_TAG          specify conference tag in which to import areas
-  --network NETWORK        specify network name/key to associate FTN areas
-  --uplinks UL1,UL2,...    specify one or more comma separated uplinks
-  --type TYPE              specifies area import type. valid options are "bbs" and "na"
+cat args:
+  --no-color               disable color
+  --no-comments            strip any comments
 ```
 
-
 | Action    | Description       | Examples                              |
 |-----------|-------------------|---------------------------------------|
 | `new`     | Generates a new/initial configuration | `./oputil.js config new` (follow the prompts) |
-| `import-areas`    | Imports areas using a FidoNet style *.NA or AREAS.BBS formatted file  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
-
-When using the `import-areas` action, you will be prompted for any missing additional arguments described in "import-areas args".
+| `cat` | Pretty prints current `config.hjson` configuration to stdout. | `./oputil.js config cat` |
 
 ## File Base Management
 The `fb` command provides a powerful file base management interface.
@@ -189,3 +184,28 @@ file_crc32: fc6655d
 file_md5: 3455f74bbbf9539e69bd38f45e039a4e
 file_sha1: 558fab3b49a8ac302486e023a3c2a86bd4e4b948
 ```
+
+## Message Base Management
+The `mb` command provides various Message Base related tools:
+
+```
+usage: oputil.js mb <action> [<args>]
+
+actions:
+  areafix CMD1 CMD2 ... ADDR  sends an AreaFix NetMail to ADDR with the supplied command(s)
+                              one or more commands may be supplied. commands that are multi
+                              part such as "%COMPRESS ZIP" should be quoted.
+  import-areas PATH           import areas using fidonet *.NA or AREAS.BBS file from PATH
+
+import-areas args:
+  --conf CONF_TAG             conference tag in which to import areas
+  --network NETWORK           network name/key to associate FTN areas
+  --uplinks UL1,UL2,...       one or more comma separated uplinks
+  --type TYPE                 area import type. valid options are "bbs" and "na"
+```
+
+| Action    | Description       | Examples                              |
+|-----------|-------------------|---------------------------------------|
+| `import-areas`    | Imports areas using a FidoNet style *.NA or AREAS.BBS formatted file. Optionally maps areas to FTN networks.  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
+
+When using the `import-areas` action, you will be prompted for any missing additional arguments described in "import-areas args".

From a520b26b893e0362891f3ce3f92947993946243d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 24 Nov 2018 20:12:45 -0700
Subject: [PATCH 0570/1013] Doc updates on message conf/areas

---
 .../configuring-a-message-area.md             | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md
index 5ba396ea..8e8b5a33 100644
--- a/docs/messageareas/configuring-a-message-area.md
+++ b/docs/messageareas/configuring-a-message-area.md
@@ -2,29 +2,28 @@
 layout: page
 title: Configuring a Message Area
 ---
+## Message Conferences
 **Message Conferences** and **Areas** allow for grouping of message base topics.
 
-## Message Conferences
-Message Conferences are the top level container for 1:n Message Areas via the `messageConferences` section 
-in `config.hjson`. Common message conferences may include a local conference and one or more conferences 
-each dedicated to a particular message network such as FsxNet, AgoraNet, etc.
+## Conferences
+Message Conferences are the top level container for *1:n* Message *Areas* via the `messageConferences` block in `config.hjson`. A common setup may include a local conference and one or more conferences each dedicated to a particular message network such as fsxNet, ArakNet, etc.
 
-Each conference is represented by a entry under `messageConferences`. **The areas key is the conferences tag**.
+Each conference is represented by a entry under `messageConferences`. Each entries top level key is it's *conference tag*.
 
 | Config Item | Required | Description                                                                     |
 |-------------|----------|---------------------------------------------------------------------------------|
-| `name`      | :+1:     | Friendly conference name                                                        |
-| `desc`      | :+1:     | Friendly conference description                                                 |
-| `sort`      | :-1:     | If supplied, provides a key used for sorting                                    |
+| `name`      | :+1:     | Friendly conference name |
+| `desc`      | :+1:     | Friendly conference description. |
+| `sort`      | :-1:     | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
 | `default`   | :-1:     | Specify `true` to make this the default conference (e.g. assigned to new users) |
-| `areas`     | :+1:     | Container of 1:n areas described below                                          |
+| `areas`     | :+1:     | Container of 1:n areas described below |
 
 ### Example
 
 ```hjson
 {
   messageConferences: {
-    local: {
+    local: { // conference tag
       name: Local
       desc: Local discussion
       sort: 1
@@ -35,16 +34,14 @@ Each conference is represented by a entry under `messageConferences`. **The area
 ```
 
 ## Message Areas
-Message Areas are topic specific containers for messages that live within a particular conference. #
-**The area's key is its area tag**. For example, "General Discussion" may live under a Local conference 
-while an AgoraNet conference may contain "BBS Discussion".
+Message Areas are topic specific containers for messages that live within a particular conference. The top level key for an area sets it's *area tag*. For example, "General Discussion" may live under a Local conference while an fsxNet conference may contain "BBS Discussion".
 
 | Config Item | Required | Description                                                                     |
 |-------------|----------|---------------------------------------------------------------------------------|
-| `name`      | :+1:     | Friendly area name                                                              |
-| `desc`      | :+1:     | Friendly area discription                                                       |
-| `sort`      | :-1:     | If supplied, provides a key used for sorting                                    |
-| `default`   | :-1:     | Specify `true` to make this the default area (e.g. assigned to new users)       |
+| `name`      | :+1:     | Friendly area name. |
+| `desc`      | :+1:     | Friendly area description. |
+| `sort`      | :-1:     | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
+| `default`   | :-1:     | Specify `true` to make this the default area (e.g. assigned to new users) |
 
 ### Example
 
@@ -62,4 +59,7 @@ messageConferences: {
     }
   }
 }
-```
\ No newline at end of file
+```
+
+## Importing
+FidoNet style `.na` files as well as legacy `AREAS.BBS` files in common formats can be imported using `oputil.js mb import-areas`. See [The oputil CLI](/docs/admin/oputil.md) for more information and usage.

From 546fbbd53316287a0c2c5a664e4b354e7350c1e1 Mon Sep 17 00:00:00 2001
From: Mike Ralphson <mike.ralphson@gmail.com>
Date: Sun, 25 Nov 2018 13:59:12 +0000
Subject: [PATCH 0571/1013] oputil_help; correct references to optutil

---
 core/oputil/oputil_help.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index b4c48267..5c7d202a 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -8,7 +8,7 @@ exports.getHelpFor				= getHelpFor;
 
 const usageHelp = exports.USAGE_HELP = {
 	General :
-`usage: optutil.js [--version] [--help]
+`usage: oputil.js [--version] [--help]
                   <command> [<args>]
 
 global args:
@@ -21,7 +21,7 @@ commands:
   fb                        file base management
 `,
 	User : 
-`usage: optutil.js user --user USERNAME <args>
+`usage: oputil.js user --user USERNAME <args>
 
 valid args:
   --user USERNAME       specify username for further actions
@@ -32,7 +32,7 @@ valid args:
 `,
 
 	Config : 
-`usage: optutil.js config <action> [<args>]
+`usage: oputil.js config <action> [<args>]
 
 actions:
   new                      generate a new/initial configuration
@@ -97,4 +97,4 @@ general information:
 
 function getHelpFor(command) {
 	return usageHelp[command];
-}
\ No newline at end of file
+}

From 4ee7d7a5409b28ac5fe0c0b959b6f5f635bd36e5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 10:26:42 -0700
Subject: [PATCH 0572/1013] Arrange a bit and add global newscan

---
 art/themes/luciano_blocktronics/MMENU.ANS | Bin 3492 -> 3527 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
index 4a058fc910136e6839ec43a91e6b84fb2c5ac686..75251877665dfef7961dfa9376f8ed1b294279ad 100644
GIT binary patch
delta 146
zcmZ1?eO!9ORSq#jGiT{&!(3G-KaCts1?gymT<K^dlg+O=%$O%n;;~?~m~73XXa!bf
zY?OQZHkZQfJJQj{=0IhJhG4CVAYInRX1VD(`ALa63VEsJ#mR|zU_}ZFlVy2i#f?pX
bDxuo%!?c@NOpfJIoBW1n5@XEddR|okp=T`6

delta 114
zcmX>uy+nG$RSq#D183=I!(3G-KaCts1?gymT<K^dgUzow%$TL}L40dtv)uf=)SS$`
z)S@csXk&Ar0@KM+Jc^8#lV9?vP43{~pRCAZA#Q92G|1Q}_x5crh5L7)3e8O>v+&LZ
Js$9gY3IMYXB5nWx


From e464f95924204863c0bfb4617583d7db16d03af8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 10:35:05 -0700
Subject: [PATCH 0573/1013] UT MCI now displays theme name, UD displays ID

---
 core/predefined_mci.js | 5 ++++-
 docs/art/mci.md        | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index c83f8353..cda9f5b4 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -91,7 +91,10 @@ const PREDEFINED_MCI_GENERATORS = {
     UE  : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); },
     UW  : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); },
     UF  : function affils(client) { return userStatAsString(client, UserProps.Affiliations, ''); },
-    UT  : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); },
+    UT  : function themeName(client) {
+        return _.get(client, 'currentTheme.info.name', userStatAsString(client, UserProps.ThemeId, ''));
+    },
+    UD  : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); },
     UC  : function loginCount(client) { return userStatAsString(client, UserProps.LoginCount, 0); },
     ND  : function connectedNode(client) { return client.node.toString(); },
     IP  : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },    //  convert any :ffff: IPv4's to 32bit version
diff --git a/docs/art/mci.md b/docs/art/mci.md
index bc6bab5a..04e177c2 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -35,7 +35,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `UE` | Current user's email address |
 | `UW` | Current user's web address |
 | `UF` | Current user's affiliations |
-| `UT` | Current user's *theme ID* (e.g. "luciano_blocktronics") |
+| `UT` | Current user's theme name |
+| `UD` | Current user's *theme ID* (e.g. "luciano_blocktronics") |
 | `UC` | Current user's login/call count |
 | `ND` | Current user's connected node number |
 | `IP` | Current user's IP address |

From ec97b3e8d405ea62b1f862be9b6b9c88da015ebc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 19:05:16 -0700
Subject: [PATCH 0574/1013] More user/system stat constants & usage

---
 core/bbs.js                   |  7 ++++---
 core/config.js                |  2 +-
 core/database.js              |  8 --------
 core/file_area_web.js         | 11 +++++++----
 core/file_base_area.js        |  3 ++-
 core/file_base_area_select.js |  3 ++-
 core/file_transfer.js         | 20 ++++++++++++--------
 core/last_callers.js          |  3 ++-
 core/predefined_mci.js        | 29 +++++++++++++++--------------
 core/rumorz.js                | 21 +++++++++++++--------
 core/stat_log.js              |  3 +--
 core/system_log.js            | 11 +++++++++++
 core/system_property.js       | 25 +++++++++++++++++++++++++
 core/user_login.js            |  6 ++++--
 14 files changed, 99 insertions(+), 53 deletions(-)
 create mode 100644 core/system_log.js
 create mode 100644 core/system_property.js

diff --git a/core/bbs.js b/core/bbs.js
index ede2b82e..000b19a8 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -11,6 +11,7 @@ const logger        = require('./logger.js');
 const database      = require('./database.js');
 const resolvePath   = require('./misc_util.js').resolvePath;
 const UserProps     = require('./user_property.js');
+const SysProps      = require('./system_property.js');
 
 //  deps
 const async         = require('async');
@@ -246,13 +247,13 @@ function initialize(cb) {
 
                         if(err) {
                             propLoadOpts.names.concat('username').forEach(v => {
-                                StatLog.setNonPeristentSystemStat(`sysop_${v}`, 'N/A');
+                                StatLog.setNonPersistentSystemStat(`sysop_${v}`, 'N/A');
                             });
                         } else {
                             opProps.username = opUserName;
 
                             _.each(opProps, (v, k) => {
-                                StatLog.setNonPeristentSystemStat(`sysop_${k}`, v);
+                                StatLog.setNonPersistentSystemStat(`sysop_${k}`, v);
                             });
                         }
 
@@ -265,7 +266,7 @@ function initialize(cb) {
                 getAreaStats( (err, stats) => {
                     if(!err) {
                         const StatLog = require('./stat_log.js');
-                        StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
+                        StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
                     }
 
                     return callback(null);
diff --git a/core/config.js b/core/config.js
index 701c8494..a90ff50d 100644
--- a/core/config.js
+++ b/core/config.js
@@ -969,7 +969,7 @@ function getDefaultConfig() {
 
         statLog : {
             systemEvents : {
-                loginHistoryMax: -1 //  forever
+                loginHistoryMax: 5000, //  set to -1 for forever
             }
         }
     };
diff --git a/core/database.js b/core/database.js
index 017aa949..90f15692 100644
--- a/core/database.js
+++ b/core/database.js
@@ -189,14 +189,6 @@ const DB_INIT_TABLE = {
             );`
         );
 
-        dbs.user.run(
-            `CREATE TABLE IF NOT EXISTS user_login_history (    
-                user_id     INTEGER NOT NULL,
-                user_name   VARCHAR NOT NULL,
-                timestamp   DATETIME NOT NULL
-            );`
-        );
-
         return cb(null);
     },
 
diff --git a/core/file_area_web.js b/core/file_area_web.js
index a1d12989..b36c8b72 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -15,6 +15,8 @@ const Log                   = require('./logger.js').log;
 const getConnectionByUserId = require('./client_connections.js').getConnectionByUserId;
 const webServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
 const Events                = require('./events.js');
+const UserProps             = require('./user_property.js');
+const SysProps              = require('./system_menu_method.js');
 
 //  deps
 const hashids       = require('hashids');
@@ -470,10 +472,11 @@ class FileAreaWebAccess {
                     });
                 },
                 function updateStats(user, callback) {
-                    StatLog.incrementUserStat(user, 'dl_total_count', 1);
-                    StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
-                    StatLog.incrementSystemStat('dl_total_count', 1);
-                    StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
+                    StatLog.incrementUserStat(user, UserProps.FileDlTotalCount, 1);
+                    StatLog.incrementUserStat(user, UserProps.FileDlTotalBytes, dlBytes);
+
+                    StatLog.incrementSystemStat(SysProps.FileDlTotalCount, 1);
+                    StatLog.incrementSystemStat(SysProps.FileDlTotalBytes, dlBytes);
 
                     return callback(null, user);
                 },
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 760eb87c..f699a543 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -15,6 +15,7 @@ const stringFormat      = require('./string_format.js');
 const wordWrapText      = require('./word_wrap.js').wordWrapText;
 const StatLog           = require('./stat_log.js');
 const UserProps         = require('./user_property.js');
+const SysProps          = require('./system_property.js');
 
 //  deps
 const _             = require('lodash');
@@ -1012,7 +1013,7 @@ function getAreaStats(cb) {
 function updateAreaStatsScheduledEvent(args, cb) {
     getAreaStats( (err, stats) => {
         if(!err) {
-            StatLog.setNonPeristentSystemStat('file_base_area_stats', stats);
+            StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
         }
 
         return cb(err);
diff --git a/core/file_base_area_select.js b/core/file_base_area_select.js
index 1b77eb21..a8f74322 100644
--- a/core/file_base_area_select.js
+++ b/core/file_base_area_select.js
@@ -5,6 +5,7 @@
 const MenuModule                        = require('./menu_module.js').MenuModule;
 const { getSortedAvailableFileAreas }   = require('./file_base_area.js');
 const StatLog                           = require('./stat_log.js');
+const SysProps                          = require('./system_property.js');
 
 //  deps
 const async                             = require('async');
@@ -52,7 +53,7 @@ exports.getModule = class FileAreaSelectModule extends MenuModule {
             async.waterfall(
                 [
                     function mergeAreaStats(callback) {
-                        const areaStats = StatLog.getSystemStat('file_base_area_stats') || { areas : {} };
+                        const areaStats = StatLog.getSystemStat(SysProps.FileBaseAreaStats) || { areas : {} };
 
                         //  we could use 'sort' alone, but area/conf sorting has some special properties; user can still override
                         const availAreas = getSortedAvailableFileAreas(self.client);
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 340ca6b9..83dedc13 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -11,6 +11,8 @@ const StatLog           = require('./stat_log.js');
 const FileEntry         = require('./file_entry.js');
 const Log               = require('./logger.js').log;
 const Events            = require('./events.js');
+const UserProps         = require('./user_property.js');
+const SysProps          = require('./system_property.js');
 
 //  deps
 const async         = require('async');
@@ -479,10 +481,11 @@ exports.getModule = class TransferFileModule extends MenuModule {
             });
         }, () => {
             //  All stats/meta currently updated via fire & forget - if this is ever a issue, we can wait for callbacks
-            StatLog.incrementUserStat(this.client.user, 'dl_total_count', downloadCount);
-            StatLog.incrementUserStat(this.client.user, 'dl_total_bytes', downloadBytes);
-            StatLog.incrementSystemStat('dl_total_count', downloadCount);
-            StatLog.incrementSystemStat('dl_total_bytes', downloadBytes);
+            StatLog.incrementUserStat(this.client.user, UserProps.FileDlTotalCount, downloadCount);
+            StatLog.incrementUserStat(this.client.user, UserProps.FileDlTotalBytes, downloadBytes);
+
+            StatLog.incrementSystemStat(SysProps.FileDlTotalCount, downloadCount);
+            StatLog.incrementSystemStat(SysProps.FileDlTotalBytes, downloadBytes);
 
             fileIds.forEach(fileId => {
                 FileEntry.incrementAndPersistMetaValue(fileId, 'dl_count', 1);
@@ -509,10 +512,11 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 return next(null);
             });
         }, () => {
-            StatLog.incrementUserStat(this.client.user, 'ul_total_count', uploadCount);
-            StatLog.incrementUserStat(this.client.user, 'ul_total_bytes', uploadBytes);
-            StatLog.incrementSystemStat('ul_total_count', uploadCount);
-            StatLog.incrementSystemStat('ul_total_bytes', uploadBytes);
+            StatLog.incrementUserStat(this.client.user, UserProps.FileUlTotalCount, uploadCount);
+            StatLog.incrementUserStat(this.client.user, UserProps.FileUlTotalBytes, uploadBytes);
+
+            StatLog.incrementSystemStat(SysProps.FileUlTotalCount, uploadCount);
+            StatLog.incrementSystemStat(SysProps.FileUlTotalBytes, uploadBytes);
 
             return cb(null);
         });
diff --git a/core/last_callers.js b/core/last_callers.js
index 6b25caf6..c80ce336 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -8,6 +8,7 @@ const User              = require('./user.js');
 const sysDb             = require('./database.js').dbs.system;
 const { Errors }        = require('./enig_error.js');
 const UserProps         = require('./user_property.js');
+const SysLogKeys        = require('./system_log.js');
 
 //  deps
 const moment            = require('moment');
@@ -91,7 +92,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
         }
 
         StatLog.getSystemLogEntries(
-            'user_login_history',
+            SysLogKeys.UserLoginHistory,
             StatLog.Order.TimestampDesc,
             200,    //  max items to fetch - we need more than max displayed for filtering/etc.
             (err, loginHistory) => {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index cda9f5b4..5b92e0e3 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -14,6 +14,7 @@ const FileBaseFilters           = require('./file_base_filter.js');
 const { formatByteSize }        = require('./string_util.js');
 const ANSI                      = require('./ansi_term.js');
 const UserProps                 = require('./user_property.js');
+const SysProps                  = require('./system_property.js');
 
 //  deps
 const packageJson           = require('../package.json');
@@ -34,7 +35,7 @@ function setNextRandomRumor(cb) {
             entry = entry[0];
         }
         const randRumor = entry && entry.log_value ? entry.log_value : '';
-        StatLog.setNonPeristentSystemStat('random_rumor', randRumor);
+        StatLog.setNonPersistentSystemStat(SysProps.NextRandomRumor, randRumor);
         if(cb) {
             return cb(null);
         }
@@ -67,12 +68,12 @@ const PREDEFINED_MCI_GENERATORS = {
     VN  : function version() { return packageJson.version; },
 
     //  +op info
-    SN  : function opUserName() { return StatLog.getSystemStat('sysop_username'); },
-    SR  : function opRealName() { return StatLog.getSystemStat('sysop_real_name'); },
-    SL  : function opLocation() { return StatLog.getSystemStat('sysop_location'); },
-    SA  : function opAffils() { return StatLog.getSystemStat('sysop_affiliation'); },
-    SS  : function opSex() { return StatLog.getSystemStat('sysop_sex'); },
-    SE  : function opEmail() { return StatLog.getSystemStat('sysop_email_address'); },
+    SN  : function opUserName() { return StatLog.getSystemStat(SysProps.SysOpUsername); },
+    SR  : function opRealName() { return StatLog.getSystemStat(SysProps.SysOpRealName); },
+    SL  : function opLocation() { return StatLog.getSystemStat(SysProps.SysOpLocation); },
+    SA  : function opAffils() { return StatLog.getSystemStat(SysProps.SysOpAffiliations); },
+    SS  : function opSex() { return StatLog.getSystemStat(SysProps.SysOpSex); },
+    SE  : function opEmail() { return StatLog.getSystemStat(SysProps.SysOpEmailAddress); },
     //  :TODO: op age, web, ?????
 
     //
@@ -189,7 +190,7 @@ const PREDEFINED_MCI_GENERATORS = {
 
     AN  : function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
 
-    TC  : function totalCalls() { return StatLog.getSystemStat('login_count').toLocaleString(); },
+    TC  : function totalCalls() { return StatLog.getSystemStat(SysProps.LoginCount).toLocaleString(); },
 
     RR  : function randomRumor() {
         //  start the process of picking another random one
@@ -203,22 +204,22 @@ const PREDEFINED_MCI_GENERATORS = {
     //
     //  :TODO: DD - Today's # of downloads (iNiQUiTY)
     //
-    SD  : function systemNumDownloads() { return sysStatAsString('dl_total_count', 0); },
+    SD  : function systemNumDownloads() { return sysStatAsString(SysProps.FileDlTotalCount, 0); },
     SO  : function systemByteDownload() {
-        const byteSize = StatLog.getSystemStatNum('dl_total_bytes');
+        const byteSize = StatLog.getSystemStatNum(SysProps.FileDlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    SU  : function systemNumUploads() { return sysStatAsString('ul_total_count', 0); },
+    SU  : function systemNumUploads() { return sysStatAsString(SysProps.FileUlTotalCount, 0); },
     SP  : function systemByteUpload() {
-        const byteSize = StatLog.getSystemStatNum('ul_total_bytes');
+        const byteSize = StatLog.getSystemStatNum(SysProps.FileUlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
     },
     TF  : function totalFilesOnSystem() {
-        const areaStats = StatLog.getSystemStat('file_base_area_stats');
+        const areaStats = StatLog.getSystemStat(SysProps.FileBaseAreaStats);
         return _.get(areaStats, 'totalFiles', 0).toLocaleString();
     },
     TB  : function totalBytesOnSystem() {
-        const areaStats     = StatLog.getSystemStat('file_base_area_stats');
+        const areaStats     = StatLog.getSystemStat(SysProps.FileBaseAreaStats);
         const totalBytes    = parseInt(_.get(areaStats, 'totalBytes', 0));
         return formatByteSize(totalBytes, true);    //  true=withAbbr
     },
diff --git a/core/rumorz.js b/core/rumorz.js
index 31aea104..51e58d53 100644
--- a/core/rumorz.js
+++ b/core/rumorz.js
@@ -8,6 +8,7 @@ const theme                 = require('./theme.js');
 const resetScreen           = require('./ansi_term.js').resetScreen;
 const StatLog               = require('./stat_log.js');
 const renderStringLength    = require('./string_util.js').renderStringLength;
+const SystemLogKeys         = require('./system_log.js');
 
 //  deps
 const async                 = require('async');
@@ -20,8 +21,6 @@ exports.moduleInfo = {
     packageName : 'codes.l33t.enigma.rumorz',
 };
 
-const STATLOG_KEY_RUMORZ    = 'system_rumorz';
-
 const FormIds = {
     View    : 0,
     Add     : 1,
@@ -52,10 +51,16 @@ exports.getModule = class RumorzModule extends MenuModule {
                 if(_.isString(formData.value.rumor) && renderStringLength(formData.value.rumor) > 0) {
                     const rumor = formData.value.rumor.trim();  //  remove any trailing ws
 
-                    StatLog.appendSystemLogEntry(STATLOG_KEY_RUMORZ, rumor, StatLog.KeepDays.Forever, StatLog.KeepType.Forever, () => {
-                        this.clearAddForm();
-                        return this.displayViewScreen(true, cb);    //  true=cls
-                    });
+                    StatLog.appendSystemLogEntry(
+                        SystemLogKeys.UserAddedRumorz,
+                        rumor,
+                        StatLog.KeepDays.Forever,
+                        StatLog.KeepType.Forever,
+                        () => {
+                            this.clearAddForm();
+                            return this.displayViewScreen(true, cb);    //  true=cls
+                        }
+                    );
                 } else {
                     //  empty message - treat as if cancel was hit
                     return this.displayViewScreen(true, cb);    //  true=cls
@@ -149,7 +154,7 @@ exports.getModule = class RumorzModule extends MenuModule {
                 function fetchEntries(callback) {
                     const entriesView = self.viewControllers.view.getView(MciCodeIds.ViewForm.Entries);
 
-                    StatLog.getSystemLogEntries(STATLOG_KEY_RUMORZ, StatLog.Order.Timestamp, (err, entries) => {
+                    StatLog.getSystemLogEntries(SystemLogKeys.UserAddedRumorz, StatLog.Order.Timestamp, (err, entries) => {
                         return callback(err, entriesView, entries);
                     });
                 },
@@ -158,7 +163,7 @@ exports.getModule = class RumorzModule extends MenuModule {
                         return {
                             text    : e.log_value,  //  standard
                             rumor   : e.log_value,
-                        }
+                        };
                     }));
 
                     entriesView.redraw();
diff --git a/core/stat_log.js b/core/stat_log.js
index 173222b9..80840ddb 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -70,8 +70,7 @@ class StatLog {
         };
     }
 
-    //  :TODO: fix spelling :)
-    setNonPeristentSystemStat(statName, statValue) {
+    setNonPersistentSystemStat(statName, statValue) {
         this.systemStats[statName] = statValue;
     }
 
diff --git a/core/system_log.js b/core/system_log.js
new file mode 100644
index 00000000..e753c68b
--- /dev/null
+++ b/core/system_log.js
@@ -0,0 +1,11 @@
+/* jslint node: true */
+'use strict';
+
+//
+//  Common SYSTEM/global log keys
+//
+module.exports = {
+    UserAddedRumorz     : 'system_rumorz',
+    UserLoginHistory    : 'user_login_history',
+};
+
diff --git a/core/system_property.js b/core/system_property.js
new file mode 100644
index 00000000..f2743088
--- /dev/null
+++ b/core/system_property.js
@@ -0,0 +1,25 @@
+/* jslint node: true */
+'use strict';
+
+//
+//  Common SYSTEM/global properties/stats used throughout the system.
+//
+//  This IS NOT a full list. Custom modules & the like can create
+//  their own!
+//
+module.exports = {
+    LoginCount          : 'login_count',
+
+    FileBaseAreaStats   : 'file_base_area_stats',   //  object - see file_base_area.js::getAreaStats
+    FileUlTotalCount    : 'ul_total_count',
+    FileUlTotalBytes    : 'ul_total_bytes',
+
+    SysOpUsername       : 'sysop_username',
+    SysOpRealName       : 'sysop_real_name',
+    SysOpLocation       : 'sysop_location',
+    SysOpAffiliations   : 'sysop_affiliation',
+    SysOpSex            : 'sysop_sex',
+    SysOpEmailAddress   : 'sysop_email_address',
+
+    NextRandomRumor     : 'random_rumor',
+};
diff --git a/core/user_login.js b/core/user_login.js
index a46be5b1..b02066a1 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -13,6 +13,8 @@ const {
     ErrorReasons
 }                       = require('./enig_error.js');
 const UserProps         = require('./user_property.js');
+const SysProps          = require('./system_property.js');
+const SystemLogKeys     = require('./system_log.js');
 
 //  deps
 const async             = require('async');
@@ -86,7 +88,7 @@ function userLogin(client, username, password, cb) {
                     return callback(null);
                 },
                 function updateSystemLoginCount(callback) {
-                    return StatLog.incrementSystemStat('login_count', 1, callback); //  :TODO: create system_property.js
+                    return StatLog.incrementSystemStat(SysProps.LoginCount, 1, callback);
                 },
                 function recordLastLogin(callback) {
                     return StatLog.setUserStat(user, UserProps.LastLoginTs, StatLog.now, callback);
@@ -102,7 +104,7 @@ function userLogin(client, username, password, cb) {
                     });
 
                     return StatLog.appendSystemLogEntry(
-                        'user_login_history',
+                        SystemLogKeys.UserLoginHistory,
                         historyItem,
                         loginHistoryMax,
                         StatLog.KeepType.Max,

From f471fd0ebecbd38b7c0c523c8dc37517ffd8d2e0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 20:13:48 -0700
Subject: [PATCH 0575/1013] Finally implement "Total Calls Today" MCI: TT + Add
 findSystemLogEntries() to StatLog amongst others

---
 art/themes/luciano_blocktronics/SYSSTAT.ANS | Bin 2860 -> 2877 bytes
 art/themes/luciano_blocktronics/theme.hjson |   1 +
 core/bbs.js                                 |  17 +++
 core/database.js                            |   2 +-
 core/predefined_mci.js                      |   7 +-
 core/stat_log.js                            | 130 ++++++++++++++------
 core/system_property.js                     |   3 +
 core/user_login.js                          |   1 +
 docs/art/mci.md                             |   3 +-
 9 files changed, 121 insertions(+), 43 deletions(-)

diff --git a/art/themes/luciano_blocktronics/SYSSTAT.ANS b/art/themes/luciano_blocktronics/SYSSTAT.ANS
index 97beb53d8a39949e2982fb876b065d599cc6d492..19a3d39e0b11353a7c8b7415742ea3870a3c6fcb 100644
GIT binary patch
delta 42
xcmZ1@wpVOJJ*SX#v_Y<dYDkEoA(wQtp|!C=?&b#0Mn*OZLqj9etCQKeRRIEH3t|8O

delta 25
hcmdlhwnl72JtrgA=82q*jBKWc28QNGCQERu0sv`H2TK3|

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 31a67054..a5100e6b 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -135,6 +135,7 @@
 					AN7: { width: 6 }
 					ND8: { width: 6 }
 					TC9: { width: 6 }
+					TT11: { width: 6 }
 				}
 			}
 
diff --git a/core/bbs.js b/core/bbs.js
index 000b19a8..c154f285 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -12,6 +12,7 @@ const database      = require('./database.js');
 const resolvePath   = require('./misc_util.js').resolvePath;
 const UserProps     = require('./user_property.js');
 const SysProps      = require('./system_property.js');
+const SysLogKeys    = require('./system_log.js');
 
 //  deps
 const async         = require('async');
@@ -20,6 +21,7 @@ const _             = require('lodash');
 const mkdirs        = require('fs-extra').mkdirs;
 const fs            = require('graceful-fs');
 const paths         = require('path');
+const moment        = require('moment');
 
 //  our main entry point
 exports.main    = main;
@@ -272,6 +274,21 @@ function initialize(cb) {
                     return callback(null);
                 });
             },
+            function initCallsToday(callback) {
+                const StatLog = require('./stat_log.js');
+                const filter = {
+                    logName     : SysLogKeys.UserLoginHistory,
+                    resultType  : 'count',
+                    date        : moment(),
+                };
+
+                StatLog.findSystemLogEntries(filter, (err, callsToday) => {
+                    if(!err) {
+                        StatLog.setNonPersistentSystemStat(SysProps.LoginsToday, callsToday);
+                    }
+                    return callback(null);
+                });
+            },
             function initMCI(callback) {
                 return require('./predefined_mci.js').init(callback);
             },
diff --git a/core/database.js b/core/database.js
index 90f15692..55fdb1c7 100644
--- a/core/database.js
+++ b/core/database.js
@@ -73,7 +73,7 @@ function getISOTimestampString(ts) {
         }
         ts = moment(ts);
     }
-    return ts.utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+    return ts.format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
 }
 
 function sanatizeString(s) {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 5b92e0e3..39310559 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -15,6 +15,7 @@ const { formatByteSize }        = require('./string_util.js');
 const ANSI                      = require('./ansi_term.js');
 const UserProps                 = require('./user_property.js');
 const SysProps                  = require('./system_property.js');
+const SysLogKeys                = require('./system_log.js');
 
 //  deps
 const packageJson           = require('../package.json');
@@ -30,7 +31,7 @@ function init(cb) {
 }
 
 function setNextRandomRumor(cb) {
-    StatLog.getSystemLogEntries('system_rumorz', StatLog.Order.Random, 1, (err, entry) => {
+    StatLog.getSystemLogEntries(SysLogKeys.UserAddedRumorz, StatLog.Order.Random, 1, (err, entry) => {
         if(entry) {
             entry = entry[0];
         }
@@ -191,6 +192,9 @@ const PREDEFINED_MCI_GENERATORS = {
     AN  : function activeNodes() { return clientConnections.getActiveConnections().length.toString(); },
 
     TC  : function totalCalls() { return StatLog.getSystemStat(SysProps.LoginCount).toLocaleString(); },
+    TT  : function totalCallsToday() {
+        return StatLog.getSystemStat(SysProps.LoginsToday).toLocaleString();
+    },
 
     RR  : function randomRumor() {
         //  start the process of picking another random one
@@ -227,7 +231,6 @@ const PREDEFINED_MCI_GENERATORS = {
     //  :TODO: PT - Messages posted *today* (Obv/2)
     //      -> Include FTN/etc.
     //  :TODO: NT - New users today (Obv/2)
-    //  :TODO: CT - Calls *today* (Obv/2)
     //  :TODO: FT - Files uploaded/added *today* (Obv/2)
     //  :TODO: DD - Files downloaded *today* (iNiQUiTY)
     //  :TODO: TP - total message/posts on the system (Obv/2)
diff --git a/core/stat_log.js b/core/stat_log.js
index 80840ddb..805198bd 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -5,9 +5,11 @@ const sysDb     = require('./database.js').dbs.system;
 const {
     getISOTimestampString
 }               = require('./database.js');
+const Errors    = require('./enig_error.js');
 
 //  deps
 const _         = require('lodash');
+const moment    = require('moment');
 
 /*
     System Event Log & Stats
@@ -74,6 +76,19 @@ class StatLog {
         this.systemStats[statName] = statValue;
     }
 
+    incrementNonPersistentSystemStat(statName, incrementBy) {
+        incrementBy = incrementBy || 1;
+
+        let newValue = parseInt(this.systemStats[statName]);
+        if(!isNaN(newValue)) {
+            newValue += incrementBy;
+        } else {
+            newValue = incrementBy;
+        }
+        this.setNonPersistentSystemStat(statName, newValue);
+        return newValue;
+    }
+
     setSystemStat(statName, statValue, cb) {
         //  live stats
         this.systemStats[statName] = statValue;
@@ -99,19 +114,7 @@ class StatLog {
     }
 
     incrementSystemStat(statName, incrementBy, cb) {
-        incrementBy = incrementBy || 1;
-
-        let newValue = parseInt(this.systemStats[statName]);
-        if(newValue) {
-            if(!_.isNumber(newValue)) {
-                return cb(new Error(`Value for ${statName} is not a number!`));
-            }
-
-            newValue += incrementBy;
-        } else {
-            newValue = incrementBy;
-        }
-
+        const newValue = this.incrementNonPersistentSystemStat(statName, incrementBy);
         return this.setSystemStat(statName, newValue, cb);
     }
 
@@ -216,26 +219,78 @@ class StatLog {
         );
     }
 
-    getSystemLogEntries(logName, order, limit, cb) {
-        let sql =
-            `SELECT timestamp, log_value
-            FROM system_event_log
-            WHERE log_name = ?`;
+    /*
+        Find System Log entries by |filter|:
 
-        switch(order) {
-            case 'timestamp' :
-            case 'timestamp_asc' :
-                sql += ' ORDER BY timestamp ASC';
-                break;
-
-            case 'timestamp_desc' :
-                sql += ' ORDER BY timestamp DESC';
-                break;
-
-            case 'random'   :
-                sql += ' ORDER BY RANDOM()';
+        filter.logName (required)
+        filter.resultType = (obj) | count
+            where obj contains timestamp and log_value
+        filter.limit
+        filter.date - exact date to filter against
+        filter.order = (timestamp) | timestamp_asc | timestamp_desc | random
+    */
+    findSystemLogEntries(filter, cb) {
+        filter = filter || {};
+        if(!_.isString(filter.logName)) {
+            return cb(Errors.MissingParam('filter.logName is required'));
         }
 
+        filter.resultType   = filter.resultType || 'obj';
+        filter.order        = filter.order || 'timestamp';
+
+        let sql;
+        if('count' === filter.resultType) {
+            sql =
+                `SELECT COUNT() AS count
+                FROM system_event_log`;
+        } else {
+            sql =
+                `SELECT timestamp, log_value
+                FROM system_event_log`;
+        }
+
+        sql += ' WHERE log_name = ?';
+
+        if(filter.date) {
+            filter.date = moment(filter.date);
+            sql += ` AND DATE(timestamp) = DATE("${filter.date.format('YYYY-MM-DD')}")`;
+        }
+
+        if('count' !== filter.resultType) {
+            switch(filter.order) {
+                case 'timestamp' :
+                case 'timestamp_asc' :
+                    sql += ' ORDER BY timestamp ASC';
+                    break;
+
+                case 'timestamp_desc' :
+                    sql += ' ORDER BY timestamp DESC';
+                    break;
+
+                case 'random'   :
+                    sql += ' ORDER BY RANDOM()';
+                    break;
+            }
+        }
+
+        if(_.isNumber(filter.limit) && 0 !== filter.limit) {
+            sql += ` LIMIT ${filter.limit}`;
+        }
+
+        sql += ';';
+
+        if('count' === filter.resultType) {
+            sysDb.get(sql, [ filter.logName ], (err, row) => {
+                return cb(err, row ? row.count : 0);
+            });
+        } else {
+            sysDb.all(sql, [ filter.logName ], (err, rows) => {
+                return cb(err, rows);
+            });
+        }
+    }
+
+    getSystemLogEntries(logName, order, limit, cb) {
         if(!cb && _.isFunction(limit)) {
             cb      = limit;
             limit   = 0;
@@ -243,15 +298,12 @@ class StatLog {
             limit = limit || 0;
         }
 
-        if(0 !== limit) {
-            sql += ` LIMIT ${limit}`;
-        }
-
-        sql += ';';
-
-        sysDb.all(sql, [ logName ], (err, rows) => {
-            return cb(err, rows);
-        });
+        const filter = {
+            logName,
+            order,
+            limit,
+        };
+        return this.findSystemLogEntries(filter, cb);
     }
 
     appendUserLogEntry(user, logName, logValue, keepDays, cb) {
diff --git a/core/system_property.js b/core/system_property.js
index f2743088..52830a06 100644
--- a/core/system_property.js
+++ b/core/system_property.js
@@ -9,17 +9,20 @@
 //
 module.exports = {
     LoginCount          : 'login_count',
+    LoginsToday         : 'logins_today',   //  non-persistent
 
     FileBaseAreaStats   : 'file_base_area_stats',   //  object - see file_base_area.js::getAreaStats
     FileUlTotalCount    : 'ul_total_count',
     FileUlTotalBytes    : 'ul_total_bytes',
 
+    //  begin +op non-persistent...
     SysOpUsername       : 'sysop_username',
     SysOpRealName       : 'sysop_real_name',
     SysOpLocation       : 'sysop_location',
     SysOpAffiliations   : 'sysop_affiliation',
     SysOpSex            : 'sysop_sex',
     SysOpEmailAddress   : 'sysop_email_address',
+    //  end +op non-persistent
 
     NextRandomRumor     : 'random_rumor',
 };
diff --git a/core/user_login.js b/core/user_login.js
index b02066a1..2959e3a7 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -88,6 +88,7 @@ function userLogin(client, username, password, cb) {
                     return callback(null);
                 },
                 function updateSystemLoginCount(callback) {
+                    StatLog.incrementNonPersistentSystemStat(SysProps.LoginsToday, 1);
                     return StatLog.incrementSystemStat(SysProps.LoginCount, 1, callback);
                 },
                 function recordLastLogin(callback) {
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 04e177c2..4f351dad 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -65,7 +65,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SC` | System CPU model |
 | `NV` | System underlying Node.js version |
 | `AN` | Current active node count |
-| `TC` | Total login/calls to system |
+| `TC` | Total login/calls to the system *ever* |
+| `TT` | Total login/calls to the system *today* |
 | `RR` | Displays a random rumor |
 | `SD` | Total downloads, system wide |
 | `SO` | Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.) |

From e606ec6f63f42f409bc8229f9c33c0e3414d2467 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 20:29:36 -0700
Subject: [PATCH 0576/1013] Fix ISO timestamps hopefully

---
 core/database.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/database.js b/core/database.js
index 55fdb1c7..7193adee 100644
--- a/core/database.js
+++ b/core/database.js
@@ -73,7 +73,7 @@ function getISOTimestampString(ts) {
         }
         ts = moment(ts);
     }
-    return ts.format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+    return ts.format('YYYY-MM-DDTHH:mm:ss.SSS');
 }
 
 function sanatizeString(s) {

From 4b5f26b31bdcf7d84aa463613b526e411e15ae44 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 25 Nov 2018 20:31:25 -0700
Subject: [PATCH 0577/1013] Record offeset again... dur

---
 core/database.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/database.js b/core/database.js
index 7193adee..e4a812d4 100644
--- a/core/database.js
+++ b/core/database.js
@@ -73,7 +73,7 @@ function getISOTimestampString(ts) {
         }
         ts = moment(ts);
     }
-    return ts.format('YYYY-MM-DDTHH:mm:ss.SSS');
+    return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 }
 
 function sanatizeString(s) {

From fb13381bb5daeb3c55d24addfd221a37ffae9762 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 19:45:36 -0700
Subject: [PATCH 0578/1013] Default back to 'forever' for login history. It's
 small data...

---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index a90ff50d..3f4aeb61 100644
--- a/core/config.js
+++ b/core/config.js
@@ -969,7 +969,7 @@ function getDefaultConfig() {
 
         statLog : {
             systemEvents : {
-                loginHistoryMax: 5000, //  set to -1 for forever
+                loginHistoryMax: -1, //  set to -1 for forever
             }
         }
     };

From 6cce013187df1fcaff85ce862a21275e377f52cc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 21:21:00 -0700
Subject: [PATCH 0579/1013] + MCI: PT - total messages posted today
 (non-private) + MCI: TP - total messages/posts on system (non-private,
 includes imports, only counts *current*, not all of time) * Move some stats
 to startup() calls * Fix some DATE() comparisons in SQL to use 'localtime' as
 our timestamps include TZ * Update luciano_blocktronics SYSSTAT to show more
 info

---
 art/themes/luciano_blocktronics/SYSSTAT.ANS | Bin 2877 -> 3066 bytes
 art/themes/luciano_blocktronics/theme.hjson |   7 ++--
 core/bbs.js                                 |  14 ++------
 core/file_base_area.js                      |  20 ++++++++++-
 core/fse.js                                 |   6 +++-
 core/message.js                             |   8 ++++-
 core/message_area.js                        |  36 ++++++++++++++++++++
 core/msg_area_post_fse.js                   |   2 +-
 core/predefined_mci.js                      |  16 ++++++---
 core/scanner_tossers/ftn_bso.js             |  10 ++++--
 core/stat_log.js                            |   2 +-
 core/system_property.js                     |   3 ++
 12 files changed, 98 insertions(+), 26 deletions(-)

diff --git a/art/themes/luciano_blocktronics/SYSSTAT.ANS b/art/themes/luciano_blocktronics/SYSSTAT.ANS
index 19a3d39e0b11353a7c8b7415742ea3870a3c6fcb..a76e3bd654c45d46566905990ca88b74c0b5e868 100644
GIT binary patch
delta 493
zcmdlh_Dg(1qn~uNv3ag^w3#!IVU(-j3KTHR&6JKdum*D7eH}sE)ljZNS!z*nW_})*
zf&y3@h%(Gob@DR=DgYW{XgRUhLLVXpF%HaD4f8YN0`q}N41g9H<|+UIM33dfi{X+G
z<A4$tP-nm_m~6zD0#*ug8`v;pMPLC1h0U`Wi&?o0poSXeP8MaKGI<WCER&(p<Q?qs
zj0%&taVQ&0N1KAIwl+4%-3W9I$i0>z+stxHGILX*G745;XQ?`em;ps5>u|VofRuuq
zJDHDDO~@D&PGB?c-?^`FN8vu#<W3Hw$yuD*lWjS9Cx7BloP3Z|&H!jWSP@9yMj!^8
z0k$i-pcF0#wJX@!WU@S$9+!e@K!~9cNXz8MoN7*a`6;PDjbL-2D*eI?O@O9=f)M2F
l{F1~Rg@XLzl45W~fP4m37!qJ;3^XQ?>lo7{?#YteDgfF0f*t?>

delta 261
zcmew*zE^BQBM+B?f^@X8d9HM{k?F+q7RY?V$!3h<TrgQ<=gG?$Q&>UjoHuJR6|=Gf
zb*Vb}8BSi#K84@dELSzm$4ENb0BDk-<>V-icu}xYAkW&^Aa^6s9FUapWC2cBRxoFB
zBd5sZX`F_W_jAZie#U7vIf+wI2dr2D2q4N$oq<}+a+3>6q2?$kSb?QfgPlz#@8vX|
zY{H?!WNbKDic5t>I@%QIMlLn6lFZyxn0lyk=Mb~Wd0cuxH5Sg3`M8fUUFDj5javl(
DX{|*^

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index a5100e6b..330075ff 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -127,15 +127,16 @@
 			mainMenuSystemStats: {
 				mci: {
 					BN1: { width: 17 }
-					VL2: { width: 17 }
+					VN2: { width: 17 }
 					OS3: { width: 33 }
 					SC4: { width: 33 }
-					DT5: { width: 33 }
-					CT6: { width: 33 }
 					AN7: { width: 6 }
 					ND8: { width: 6 }
 					TC9: { width: 6 }
 					TT11: { width: 6 }
+					PT12: { width: 6 }
+					TP13: { width: 6 }
+					NV14: { width: 17 }
 				}
 			}
 
diff --git a/core/bbs.js b/core/bbs.js
index c154f285..4d371fb3 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -263,17 +263,6 @@ function initialize(cb) {
                     }
                 );
             },
-            function initFileAreaStats(callback) {
-                const getAreaStats = require('./file_base_area.js').getAreaStats;
-                getAreaStats( (err, stats) => {
-                    if(!err) {
-                        const StatLog = require('./stat_log.js');
-                        StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
-                    }
-
-                    return callback(null);
-                });
-            },
             function initCallsToday(callback) {
                 const StatLog = require('./stat_log.js');
                 const filter = {
@@ -289,6 +278,9 @@ function initialize(cb) {
                     return callback(null);
                 });
             },
+            function initMessageStats(callback) {
+                return require('./message_area.js').startup(callback);
+            },
             function initMCI(callback) {
                 return require('./predefined_mci.js').init(callback);
             },
diff --git a/core/file_base_area.js b/core/file_base_area.js
index f699a543..293ab265 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -57,7 +57,25 @@ const WellKnownAreaTags                 = exports.WellKnownAreaTags = {
 };
 
 function startup(cb) {
-    return cleanUpTempSessionItems(cb);
+    async.series(
+        [
+            (callback) => {
+                return cleanUpTempSessionItems(callback);
+            },
+            (callback) => {
+                getAreaStats( (err, stats) => {
+                    if(!err) {
+                        StatLog.setNonPersistentSystemStat(SysProps.FileBaseAreaStats, stats);
+                    }
+
+                    return callback(null);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
 }
 
 function isInternalArea(areaTag) {
diff --git a/core/fse.js b/core/fse.js
index 9ecf3bdd..d294f10b 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -25,6 +25,7 @@ const Config                    = require('./config.js').get;
 const { getAddressedToInfo }    = require('./mail_util.js');
 const Events                    = require('./events.js');
 const UserProps                 = require('./user_property.js');
+const SysProps                  = require('./system_property.js');
 
 //  deps
 const async                     = require('async');
@@ -470,7 +471,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         );
     }
 
-    updateUserStats(cb) {
+    updateUserAndSystemStats(cb) {
         if(Message.isPrivateAreaTag(this.message.areaTag)) {
             Events.emit(Events.getSystemEvents().UserSendMail, { user : this.client.user });
             if(cb) {
@@ -480,6 +481,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         }
 
         Events.emit(Events.getSystemEvents().UserPostMessage, { user : this.client.user, areaTag : this.message.areaTag });
+
+        StatLog.incrementNonPersistentSystemStat(SysProps.MessageTotalCount, 1);
+        StatLog.incrementNonPersistentSystemStat(SysProps.MessagesToday, 1);
         return StatLog.incrementUserStat(this.client.user, UserProps.MessagePostCount, 1, cb);
     }
 
diff --git a/core/message.js b/core/message.js
index 768cd116..df0804d5 100644
--- a/core/message.js
+++ b/core/message.js
@@ -239,7 +239,10 @@ module.exports = class Message {
         filter.toUserName
         filter.fromUserName
         filter.replyToMesageId
-        filter.newerThanTimestamp
+
+        filter.newerThanTimestamp - may not be used with |date|
+        filter.date - moment object - may not be used with |newerThanTimestamp|
+
         filter.newerThanMessageId
         filter.areaTag - note if you want by conf, send in all areas for a conf
         *filter.metaTuples - {category, name, value}
@@ -356,7 +359,10 @@ module.exports = class Message {
         });
 
         if(_.isString(filter.newerThanTimestamp) && filter.newerThanTimestamp.length > 0) {
+            //  :TODO: should be using "localtime" here?
             appendWhereClause(`DATETIME(m.modified_timestamp) > DATETIME("${filter.newerThanTimestamp}", "+1 seconds")`);
+        } else if(moment.isMoment(filter.date)) {
+            appendWhereClause(`DATE(m.modified_timestamp, "localtime") = DATE("${filter.date.format('YYYY-MM-DD')}")`);
         }
 
         if(_.isNumber(filter.newerThanMessageId)) {
diff --git a/core/message_area.js b/core/message_area.js
index a465b235..7f4993ec 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -9,12 +9,17 @@ const Log                       = require('./logger.js').log;
 const msgNetRecord              = require('./msg_network.js').recordMessage;
 const sortAreasOrConfs          = require('./conf_area_util.js').sortAreasOrConfs;
 const UserProps                 = require('./user_property.js');
+const StatLog                   = require('./stat_log.js');
+const SysProps                  = require('./system_property.js');
 
 //  deps
 const async         = require('async');
 const _             = require('lodash');
 const assert        = require('assert');
+const moment        = require('moment');
 
+exports.startup                             = startup;
+exports.shutdown                            = shutdown;
 exports.getAvailableMessageConferences      = getAvailableMessageConferences;
 exports.getSortedAvailMessageConferences    = getSortedAvailMessageConferences;
 exports.getAvailableMessageAreasByConfTag   = getAvailableMessageAreasByConfTag;
@@ -35,6 +40,37 @@ exports.updateMessageAreaLastReadId         = updateMessageAreaLastReadId;
 exports.persistMessage                      = persistMessage;
 exports.trimMessageAreasScheduledEvent      = trimMessageAreasScheduledEvent;
 
+function startup(cb) {
+    //  by default, private messages are NOT included
+    async.series(
+        [
+            (callback) => {
+                Message.findMessages( { resultType : 'count' }, (err, count) => {
+                    if(count) {
+                        StatLog.setNonPersistentSystemStat(SysProps.MessageTotalCount, count);
+                    }
+                    return callback(err);
+                });
+            },
+            (callback) => {
+                Message.findMessages( { resultType : 'count', date : moment() }, (err, count) => {
+                    if(count) {
+                        StatLog.setNonPersistentSystemStat(SysProps.MessagesToday, count);
+                    }
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function shutdown(cb) {
+    return cb(null);
+}
+
 function getAvailableMessageConferences(client, options) {
     options = options || { includeSystemInternal : false };
 
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 123ce13c..613cee04 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -38,7 +38,7 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                         return persistMessage(msg, callback);
                     },
                     function updateStats(callback) {
-                        self.updateUserStats(callback);
+                        self.updateUserAndSystemStats(callback);
                     }
                 ],
                 function complete(err) {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 39310559..76b34fd5 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -155,13 +155,14 @@ const PREDEFINED_MCI_GENERATORS = {
     //
     //  Date/Time
     //
-    //  :TODO: change to CD for 'Current Date'
     DT  : function date(client) { return moment().format(client.currentTheme.helpers.getDateFormat()); },
     CT  : function time(client) { return moment().format(client.currentTheme.helpers.getTimeFormat()) ;},
 
     //
     //  OS/System Info
     //
+    //  https://github.com/nodejs/node-v0.x-archive/issues/25769
+    //
     OS  : function operatingSystem() {
         return {
             linux   : 'Linux',
@@ -169,6 +170,9 @@ const PREDEFINED_MCI_GENERATORS = {
             win32   : 'Windows',
             sunos   : 'SunOS',
             freebsd : 'FreeBSD',
+            android : 'Android',
+            openbsd : 'OpenBSD',
+            aix     : 'IBM AIX',
         }[os.platform()] || os.type();
     },
 
@@ -227,14 +231,16 @@ const PREDEFINED_MCI_GENERATORS = {
         const totalBytes    = parseInt(_.get(areaStats, 'totalBytes', 0));
         return formatByteSize(totalBytes, true);    //  true=withAbbr
     },
+    PT  : function messagesPostedToday() {  //  Obv/2
+        return sysStatAsString(SysProps.MessagesToday, 0);
+    },
+    TP  : function totalMessagesOnSystem() {    //  Obv/2
+        return sysStatAsString(SysProps.MessageTotalCount, 0);
+    },
 
-    //  :TODO: PT - Messages posted *today* (Obv/2)
-    //      -> Include FTN/etc.
     //  :TODO: NT - New users today (Obv/2)
     //  :TODO: FT - Files uploaded/added *today* (Obv/2)
     //  :TODO: DD - Files downloaded *today* (iNiQUiTY)
-    //  :TODO: TP - total message/posts on the system (Obv/2)
-    //      -> Include FTN/etc.
     //  :TODO: LC - name of last caller to system (Obv/2)
     //  :TODO: TZ - Average *system* post/call ratio (iNiQUiTY)
 
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 3292588d..36f0d769 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -21,6 +21,8 @@ const copyFileWithCollisionHandling     = require('../file_util.js').copyFileWit
 const getAreaStorageDirectoryByTag      = require('../file_base_area.js').getAreaStorageDirectoryByTag;
 const isValidStorageTag                 = require('../file_base_area.js').isValidStorageTag;
 const User                              = require('../user.js');
+const StatLog                           = require('../stat_log.js');
+const SysProps                          = require('../system_property.js');
 
 //  deps
 const moment                = require('moment');
@@ -1261,12 +1263,12 @@ function FTNMessageScanTossModule() {
                             }
                         }
 
-                        //  we do this after such that error cases can be preseved above
+                        //  we do this after such that error cases can be preserved above
                         if(lookupName !== message.toUserName) {
                             message.toUserName = localUserName;
                         }
 
-                        //  set the meta information - used elsehwere for retrieval
+                        //  set the meta information - used elsewhere for retrieval
                         message.meta.System[Message.SystemMetaNames.LocalToUserID] = localToUserId;
                         return callback(null);
                     });
@@ -1277,6 +1279,10 @@ function FTNMessageScanTossModule() {
 
                     //  save to disc
                     message.persist(err => {
+                        if(!message.isPrivate()) {
+                            StatLog.incrementNonPersistentSystemStat(SysProps.MessageTotalCount, 1);
+                            StatLog.incrementNonPersistentSystemStat(SysProps.MessagesToday, 1);
+                        }
                         return callback(err);
                     });
                 }
diff --git a/core/stat_log.js b/core/stat_log.js
index 805198bd..b97ea417 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -253,7 +253,7 @@ class StatLog {
 
         if(filter.date) {
             filter.date = moment(filter.date);
-            sql += ` AND DATE(timestamp) = DATE("${filter.date.format('YYYY-MM-DD')}")`;
+            sql += ` AND DATE(timestamp, "localtime") = DATE("${filter.date.format('YYYY-MM-DD')}")`;
         }
 
         if('count' !== filter.resultType) {
diff --git a/core/system_property.js b/core/system_property.js
index 52830a06..28250f20 100644
--- a/core/system_property.js
+++ b/core/system_property.js
@@ -15,6 +15,9 @@ module.exports = {
     FileUlTotalCount    : 'ul_total_count',
     FileUlTotalBytes    : 'ul_total_bytes',
 
+    MessageTotalCount   : 'message_post_total_count',   //  total non-private messages on the system; non-persistent
+    MessagesToday       : 'message_post_today',         //  non-private messages posted/imported today; non-persistent
+
     //  begin +op non-persistent...
     SysOpUsername       : 'sysop_username',
     SysOpRealName       : 'sysop_real_name',

From 098c24e48a22ce11e62e0c23d533a5cf123e239b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 21:29:35 -0700
Subject: [PATCH 0580/1013] Fix D/L stats

---
 core/system_property.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/system_property.js b/core/system_property.js
index 28250f20..ca3cf7cd 100644
--- a/core/system_property.js
+++ b/core/system_property.js
@@ -14,6 +14,8 @@ module.exports = {
     FileBaseAreaStats   : 'file_base_area_stats',   //  object - see file_base_area.js::getAreaStats
     FileUlTotalCount    : 'ul_total_count',
     FileUlTotalBytes    : 'ul_total_bytes',
+    FileDlTotalCount    : 'dl_total_count',
+    FileDlTotalBytes    : 'dl_total_bytes',
 
     MessageTotalCount   : 'message_post_total_count',   //  total non-private messages on the system; non-persistent
     MessagesToday       : 'message_post_today',         //  non-private messages posted/imported today; non-persistent

From 6d2c0959766ef5e26a3c30c83a908e4402b9b43c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 22:01:14 -0700
Subject: [PATCH 0581/1013] Fix cb

---
 core/user.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/user.js b/core/user.js
index 307dbacc..0121133a 100644
--- a/core/user.js
+++ b/core/user.js
@@ -473,7 +473,9 @@ module.exports = class User {
             return this.removeProperty(name, next);
         },
         err => {
-            return cb(err);
+            if(cb) {
+                return cb(err);
+            }
         });
     }
 

From 965c7b9ed1fc3ef8578ddf42333251141319c003 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 22:59:26 -0700
Subject: [PATCH 0582/1013] Update MCI docs

---
 docs/art/mci.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/art/mci.md b/docs/art/mci.md
index 4f351dad..e365f393 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -72,6 +72,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SO` | Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.) |
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
+| `TP` | Total messages posted/imported to the system *currently* |
+| `PT` | Total messages posted/imported to the system *today* |
 
 Some additional special case codes also exist:
 

From e1862e6916af70a478c734549ebc4504af9a045a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 23:22:09 -0700
Subject: [PATCH 0583/1013] Improve ACS & uploads docs around FB

---
 docs/filebase/acs.md     | 16 +++++++++++-----
 docs/filebase/uploads.md | 21 +++++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/docs/filebase/acs.md b/docs/filebase/acs.md
index 63884c71..618c1843 100644
--- a/docs/filebase/acs.md
+++ b/docs/filebase/acs.md
@@ -3,9 +3,10 @@ layout: page
 title: ACS
 ---
 ## File Base ACS
-[ACS Codes](/docs/configuration/acs.md) may be used to control acess to File Base areas by specifying an `acs` string in a file area's definition. If no `acs` is supplied in a file area definition, the following defaults apply to an area:
-* `read` (list, download, etc.): `GM[users]`
-* `write` (upload): `GM[sysops]`
+[ACS Codes](/docs/configuration/acs.md) may be used to control access to File Base areas by specifying an `acs` string in a file area's definition. If no `acs` is supplied in a file area definition, the following defaults apply to an area:
+* `read` : `GM[users]`: List/view the area and it's contents.
+* `write` : `GM[sysops]`: Upload.
+* `download` : `GM[users]`: Download.
 
 To override read and/or write ACS, supply a valid `acs` member.
 
@@ -18,8 +19,13 @@ areas: {
 		desc: Oldschool PC/DOS
 		storageTags: [ "retro_pc", "retro_pc_bbs" ]
 		acs: {
-			write: GM[users]
+			//	only users of the "l33t" group or those who have
+			//	uploaded 10+ files can download from here...
+			download: GM[l33t]|UP10
 		}
 	}
 }
-```
\ No newline at end of file
+```
+
+## See Also
+[Access Condition System (ACS)](/docs/configuration/acs.md)
diff --git a/docs/filebase/uploads.md b/docs/filebase/uploads.md
index 4b1e9c38..8e1e2530 100644
--- a/docs/filebase/uploads.md
+++ b/docs/filebase/uploads.md
@@ -2,7 +2,24 @@
 layout: page
 title: Uploads
 ---
+## Uploads
+The default ACS for file areas areas in ENiGMA½ is to allow read (viewing of the area), and downloads for users while only permitting SysOps to write (upload). See [File Base ACS](acs.md) for more information.
 
-Note that `storageTags` may contain *1:n* storage tag references. 
+To allow uploads to a particular area, change the ACS level for `write`. For example:
+```hjson
+uploads: {
+    name: Uploads
+    desc: User Uploads
+    storageTags: [
+        "uploads"
+    ]
+    acs: {
+        write: GM[users]
+    }
+}
+````
+
+:information_source: Remember that uploads in a particular area are stored **using the first storage tag defined in that area.**
+
+:information_source: Any ACS checks are allowed. See [ACS](/docs/acs.md)
 
-**Uploads in a particular area are stored in the first storage tag defined in an area.**

From 555326771a32305926d1a7222b152f9feed43a1f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 27 Nov 2018 23:36:45 -0700
Subject: [PATCH 0584/1013] About File Areas updates

---
 docs/filebase/index.md | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/docs/filebase/index.md b/docs/filebase/index.md
index c225338e..6557d7cc 100644
--- a/docs/filebase/index.md
+++ b/docs/filebase/index.md
@@ -2,18 +2,21 @@
 layout: page
 title: About File Areas
 ---
-## A Different Approach
-ENiGMA½ has strayed away from the old familure setup here and instead takes a more modern approach:
-* [Gazelle](https://whatcd.github.io/Gazelle/) inspired system for searching & browsing files
-* No File Conferences (just areas!)
-* File Areas are still around but should generally be used less. Instead, files can have one or more tags. Think things like `dos.retro`, `pc.warez`, `games`, etc.
-* Temporary web (http:// or https://) download links in additional to standard X/Y/Z protocol support
-* Users can star rate files & search/filter by ratings
-* Concept of user defined filters
+## About File Areas
 
-## Other bells and whistles
-* A given area can span one to many physical storage locations
-* Upload processor can extract and use `FILE_ID.DIZ`/`DESC.SDI`, for standard descriptions as well as `README.TXT`, `*.NFO`, and so on for longer descriptions
-* Upload processor also attempts release year estimation by scanning prementioned description file(s)
-* Fast indexed Full Text Search (FTS)
-* Duplicates validated by SHA-256
\ No newline at end of file
+### A Different Approach
+ENiGMA½ has strayed away from the old familiar setup here and instead takes a more modern approach:
+* [Gazelle](https://whatcd.github.io/Gazelle/) inspired system for searching & browsing files.
+* No conferences (just areas!)
+* File areas are still around but should *generally* be used less. Instead, files can have one or more tags. Think things like `dos.retro`, `pc.warez`, `games`, etc.
+
+### Other bells and whistles
+* Temporary web (http:// or https://) download links in additional to standard X/Y/Z protocol support. Batch downloads of many files can be downloaded as a single ZIP archive.
+* Users can star rate files & search/filter by ratings
+* Concept of user defined filters/searches including the ability to save them. For example, "Latest Artscene Releases".
+* A given area can span one to many physical storage locations.
+* Upload processor can extract and use `FILE_ID.DIZ`/`DESC.SDI`, for standard descriptions as well as `README.TXT`, `*.NFO`, and so on for longer descriptions. The processor also attempts release year estimation by scanning aforementioned description file(s).
+* Fast indexed Full Text Search (FTS) across descriptions and filenames.
+* Duplicates are checked for by SHA-256.
+* Support for many archive and file formats. External utilities can easily be added to the configuration to extend for additional formats.
+* Much, much more!

From 6335483a6739834b8518c6691aff10f23279c259 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 28 Nov 2018 18:55:48 -0700
Subject: [PATCH 0585/1013] About File Areas updates...again

---
 docs/filebase/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/filebase/index.md b/docs/filebase/index.md
index 6557d7cc..d5dac134 100644
--- a/docs/filebase/index.md
+++ b/docs/filebase/index.md
@@ -12,11 +12,11 @@ ENiGMA½ has strayed away from the old familiar setup here and instead takes a m
 
 ### Other bells and whistles
 * Temporary web (http:// or https://) download links in additional to standard X/Y/Z protocol support. Batch downloads of many files can be downloaded as a single ZIP archive.
-* Users can star rate files & search/filter by ratings
-* Concept of user defined filters/searches including the ability to save them. For example, "Latest Artscene Releases".
+* Users can rate files & search/filter by ratings.
+* Users can also create and save their own filters for later use such as "Latest Artscene Releases" or "C64 SIDs".
 * A given area can span one to many physical storage locations.
 * Upload processor can extract and use `FILE_ID.DIZ`/`DESC.SDI`, for standard descriptions as well as `README.TXT`, `*.NFO`, and so on for longer descriptions. The processor also attempts release year estimation by scanning aforementioned description file(s).
-* Fast indexed Full Text Search (FTS) across descriptions and filenames.
-* Duplicates are checked for by SHA-256.
+* Fast indexed [Full Text Search (FTS)](https://sqlite.org/fts3.html) across descriptions and filenames.
+* Duplicates are checked for by cryptographically secure [SHA-256](https://en.wikipedia.org/wiki/SHA-2) hashes.
 * Support for many archive and file formats. External utilities can easily be added to the configuration to extend for additional formats.
 * Much, much more!

From fe44f2c4d6bbfa619210bf6cd371ba90d6e5019e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 30 Nov 2018 23:20:44 -0700
Subject: [PATCH 0586/1013] User interrupts & node module ready to rock.
 ...maybe with bugs?

---
 art/themes/luciano_blocktronics/MMENU.ANS   | Bin 3527 -> 3574 bytes
 art/themes/luciano_blocktronics/theme.hjson |  14 ++--
 core/menu_module.js                         |  71 +++++++++-----------
 core/node_msg.js                            |  32 +++++----
 core/user_interrupt_queue.js                |  33 ++++++---
 docs/_includes/nav.md                       |   1 +
 docs/misc/user-interrupt.md                 |  17 +++++
 docs/modding/node-msg.md                    |  41 +++++++++++
 misc/menu_template.in.hjson                 |  57 ++++++++++++++++
 9 files changed, 198 insertions(+), 68 deletions(-)
 create mode 100644 docs/misc/user-interrupt.md
 create mode 100644 docs/modding/node-msg.md

diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
index 75251877665dfef7961dfa9376f8ed1b294279ad..ad029e33f765113432e247acfd1b6a04a6e67e4d 100644
GIT binary patch
delta 118
zcmX>u{Y`p97$>WAw2^`H<Zw<|CL@E*Wt=h0erC?n(T2IX#pw#t(FWGWX1RI!DXF?8
z`MMxlAvd+SI59m{I@;JgR{;os45QrJx49JV-vNtBN1K}f4S)*XzCHN?kKSZu-a5wa
I$%}YZ0fT=gj{pDw

delta 62
zcmew+eO!7&7$>8`<Y-P=CS%LZRh%)*e8wiu($U67xwmg~Dcrv^S%p`R`}S?1h<UDb
Rw7JP-58e*On8_D;RRM8Z6dC{k

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index d336c2a4..b1fe8aec 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -364,15 +364,21 @@
 			}
 
 			nodeMessage: {
+				config: {
+					messageFormat: "|00|08 :: |03message from |11{fromUserName} |08/ |03node |11{fromNodeId}|08 @ |11{timestamp} |08::\r\n|07    {message}"
+				}
 				0: {
 					mci: {
 						SM1: {
-							width: 22
-							itemFormat: "|00|07{text} |08(|07{userName}|08)"
-							focusItemFormat: "|00|15{text} |07(|15{userName}|07)"
+							width: 25
+							itemFormat: "|00|03node |07{text} |08(|07{userName}|08)"
+							focusItemFormat: "|00|11node |15{text} |07(|15{userName}|07)"
 						}
 						ET2: {
-							width: 70
+							width: 65
+						}
+						TL3: {
+							width: 65
 						}
 					}
 				}
diff --git a/core/menu_module.js b/core/menu_module.js
index 87f96dc0..9bac7b03 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -29,9 +29,15 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.menuConfig.config  = this.menuConfig.config || {};
         this.cls                = _.get(this.menuConfig.config, 'cls', Config().menus.cls);
         this.viewControllers    = {};
+        this.interrupt          = (_.get(this.menuConfig.config, 'interrupt', MenuModule.InterruptTypes.Queued)).toLowerCase();
+    }
 
-        //  *initial* Interruptible state for this menu
-        this.disableInterruption();
+    static get InterruptTypes() {
+        return {
+            Never       : 'never',
+            Queued      : 'queued',
+            Realtime    : 'realtime',
+        };
     }
 
     enter() {
@@ -55,7 +61,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         async.series(
             [
                 function beforeArtInterrupt(callback) {
-                    return self.toggleInterruptionAndDisplayQueued(callback);
+                    return self.displayQueuedInterruptions(callback);
                 },
                 function beforeDisplayArt(callback) {
                     return self.beforeArt(callback);
@@ -166,60 +172,45 @@ exports.MenuModule = class MenuModule extends PluginModule {
         //  nothing in base
     }
 
-    neverInterruptable() {
-        return this.menuConfig.config.Interruptible === 'never';
-    }
-
-    enableInterruption() {
-        if(!this.neverInterruptable()) {
-            this.Interruptible = true;
-        }
-    }
-
-    disableInterruption() {
-        if(!this.neverInterruptable()) {
-            this.Interruptible = false;
-        }
-    }
-
-    toggleInterruptionAndDisplayQueued(cb) {
-        this.enableInterruption();
-        this.displayQueuedInterruptions( () => {
-            this.disableInterruption();
-            return cb(null);
-        });
-    }
-
     displayQueuedInterruptions(cb) {
-        if(true !== this.Interruptible) {
+        if(MenuModule.InterruptTypes.Never === this.interrupt) {
             return cb(null);
         }
 
+        let opts = { cls : true };  //  clear screen for first message
+
         async.whilst(
             () => this.client.interruptQueue.hasItems(),
-            next => this.client.interruptQueue.displayNext(next),
+            next => {
+                this.client.interruptQueue.displayNext(opts, err => {
+                    opts = {};
+                    return next(err);
+                });
+            },
             err => {
                 return cb(err);
             }
-        )
+        );
     }
 
     attemptInterruptNow(interruptItem, cb) {
-        if(true !== this.Interruptible) {
+        if(MenuModule.InterruptTypes.Realtime !== this.interrupt) {
             return cb(null, false); //  don't eat up the item; queue for later
         }
 
         //
         //  Default impl: clear screen -> standard display -> reload menu
         //
-        this.client.interruptQueue.displayWithItem(Object.assign({}, interruptItem, { cls : true }), err => {
-            if(err) {
-                return cb(err, false);
-            }
-            this.reload(err => {
-                return cb(err, err ? false : true);
+        this.client.interruptQueue.displayWithItem(
+            Object.assign({}, interruptItem, { cls : true }),
+            err => {
+                if(err) {
+                    return cb(err, false);
+                }
+                this.reload(err => {
+                    return cb(err, err ? false : true);
+                });
             });
-        });
     }
 
     getSaveState() {
@@ -308,7 +299,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
             } else {
                 return this.prevMenu(cb);
             }
-        }
+        };
 
         if(_.has(this.menuConfig, 'runtime.autoNext') && true === this.menuConfig.runtime.autoNext) {
             if(this.hasNextTimeout()) {
@@ -318,8 +309,6 @@ exports.MenuModule = class MenuModule extends PluginModule {
             } else {
                 return gotoNextMenu();
             }
-        } else {
-            this.enableInterruption();
         }
     }
 
diff --git a/core/node_msg.js b/core/node_msg.js
index 412e14ab..72c54430 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -2,16 +2,16 @@
 'use strict';
 
 //  ENiGMA½
-const { MenuModule }        = require('./menu_module.js');
-const { Errors }            = require('./enig_error.js');
+const { MenuModule }            = require('./menu_module.js');
 const {
     getActiveConnectionList,
     getConnectionByNodeId,
-}                           = require('./client_connections.js');
-const UserInterruptQueue    = require('./user_interrupt_queue.js');
-const { getThemeArt }       = require('./theme.js');
-const { pipeToAnsi }        = require('./color_codes.js');
-const stringFormat          = require('./string_format.js');
+}                               = require('./client_connections.js');
+const UserInterruptQueue        = require('./user_interrupt_queue.js');
+const { getThemeArt }           = require('./theme.js');
+const { pipeToAnsi }            = require('./color_codes.js');
+const stringFormat              = require('./string_format.js');
+const { renderStringLength }    = require('./string_util.js');
 
 //  deps
 const series                = require('async/series');
@@ -47,23 +47,27 @@ exports.getModule = class NodeMessageModule extends MenuModule {
         this.menuMethods = {
             sendMessage : (formData, extraArgs, cb) => {
                 const nodeId    = this.nodeList[formData.value.node].node;  //  index from from -> node!
-                const message   = formData.value.message;
+                const message   = _.get(formData.value, 'message', '').trim();
+
+                if(0 === renderStringLength(message)) {
+                    return this.prevMenu(cb);
+                }
 
                 this.createInterruptItem(message, (err, interruptItem) => {
                     if(-1 === nodeId) {
                         //  ALL nodes
-                        UserInterruptQueue.queueGlobalOtherActive(interruptItem, this.client);
+                        UserInterruptQueue.queue(interruptItem, { omit : this.client });
                     } else {
                         const conn = getConnectionByNodeId(nodeId);
                         if(conn) {
-                            UserInterruptQueue.queueGlobal(interruptItem, [ conn ]);
+                            UserInterruptQueue.queue(interruptItem, { clients : conn } );
                         }
                     }
 
                     return this.prevMenu(cb);
                 });
             },
-        }
+        };
     }
 
     mciReady(mciData, cb) {
@@ -123,12 +127,14 @@ exports.getModule = class NodeMessageModule extends MenuModule {
     }
 
     createInterruptItem(message, cb) {
+        const dateTimeFormat = this.config.dateTimeFormat || this.client.currentTheme.helpers.getDateTimeFormat();
+
         const textFormatObj = {
             fromUserName    : this.client.user.username,
             fromRealName    : this.client.user.properties.real_name,
             fromNodeId      : this.client.node,
             message         : message,
-            timestamp       : moment(),
+            timestamp       : moment().format(dateTimeFormat),
         };
 
         const messageFormat =
@@ -208,4 +214,4 @@ exports.getModule = class NodeMessageModule extends MenuModule {
         }
         this.updateCustomViewTextsWithFilter('sendMessage', MciViewIds.sendMessage.customRangeStart, node);
     }
-}
\ No newline at end of file
+};
diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index e48fc2ea..2e72bbd1 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -19,18 +19,26 @@ module.exports = class UserInterruptQueue
         this.queue          = [];
     }
 
-    static queueGlobal(interruptItem, connections) {
-        connections.forEach(conn => {
-            conn.interruptQueue.queueItem(interruptItem);
+    static queue(interruptItem, opts) {
+        opts = opts || {};
+        if(!opts.clients) {
+            let omitNodes = [];
+            if(Array.isArray(opts.omit)) {
+                omitNodes = opts.omit;
+            } else if(opts.omit) {
+                omitNodes = [ opts.omit ];
+            }
+            omitNodes = omitNodes.map(n => _.isNumber(n) ? n : n.node);
+            opts.clients = getActiveConnections(true).filter(ac => !omitNodes.includes(ac.node));
+        }
+        if(!Array.isArray(opts.clients)) {
+            opts.clients = [ opts.clients ];
+        }
+        opts.clients.forEach(c => {
+            c.interruptQueue.queueItem(interruptItem);
         });
     }
 
-    //  common shortcut: queue global, all active clients minus |client|
-    static queueGlobalOtherActive(interruptItem, client) {
-        const otherConnections = getActiveConnections(true).filter(ac => ac.node !== client.node);
-        return UserInterruptQueue.queueGlobal(interruptItem, otherConnections );
-    }
-
     queueItem(interruptItem) {
         if(!_.isString(interruptItem.contents) && !_.isString(interruptItem.text)) {
             return;
@@ -52,12 +60,17 @@ module.exports = class UserInterruptQueue
         return this.queue.length > 0;
     }
 
-    displayNext(cb) {
+    displayNext(options, cb) {
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
         const interruptItem = this.queue.pop();
         if(!interruptItem) {
             return cb(null);
         }
 
+        Object.assign(interruptItem, options);
         return interruptItem ? this.displayWithItem(interruptItem, cb) : cb(null);
     }
 
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 84785dbe..b6303960 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -79,6 +79,7 @@
     - [Download Manager]({{ site.baseurl }}{% link modding/file-base-download-manager.md %})
     - [Web Download Manager]({{ site.baseurl }}{% link modding/file-base-web-download-manager.md %})
     - [Set Newscan Date]({{ site.baseurl }}{% link modding/set-newscan-date.md %})
+    - [Node to Node Messaging]({{ site.baseurl }}{% link modding/node-msg.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/misc/user-interrupt.md b/docs/misc/user-interrupt.md
new file mode 100644
index 00000000..fe20fdd9
--- /dev/null
+++ b/docs/misc/user-interrupt.md
@@ -0,0 +1,17 @@
+---
+layout: page
+title: User Interruptions
+---
+## User Interruptions
+ENiGMA½ provides functionality to "interrupt" a user for various purposes such as a [node-to-node message](/docs/modding/node-msg.md). User interruptions can be queued and displayed at the next opportune time such as when switching to a new menu, or realtime if appropriate.
+
+## Standard Menu Behavior
+Standard menus control interruption by the `interrupt` config block option, which may be set to one of the following values:
+* `never`: Never interrupt the user when on this menu.
+* `queued`: Queue interrupts for the next opportune time. Any queued message(s) will then be shown. This is the default.
+* `realtime`: If possible, display messages in realtime. That is, show them right away. Standard menus that do not override default behavior will show the message then reload.
+
+
+## See Also
+See [user_interrupt_queue.js](/core/user_interrupt_queue.js) as well as usage within [menu_module.js](/core/menu_module.js).
+
diff --git a/docs/modding/node-msg.md b/docs/modding/node-msg.md
new file mode 100644
index 00000000..5377e68a
--- /dev/null
+++ b/docs/modding/node-msg.md
@@ -0,0 +1,41 @@
+---
+layout: page
+title: Node to Node Messaging
+---
+## The Node to Node Messaging Module
+The node to node messaging (`node_msg`) module allows users to send messages to one or more users on different nodes. Messages delivered to nodes follow standard [User Interruption](/docs/misc/user-interrupt.md) rules.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `dateTimeFormat`: [moment.js](https://momentjs.com) style format. Defaults to current theme → system `short` format.
+* `messageFormat`: Format string for sent messages. Defaults to `Message from {fromUserName} on node {fromNodeId}:\r\n{message}`. The following format object members are available:
+    * `fromUserName`: Username who sent the message.
+    * `fromRealName`: Real name of user who sent the message.
+    * `fromNodeId`: Node ID where the message was sent from.
+    * `message`: User entered message. May contain pipe color codes.
+    * `timestamp`: A timestamp formatted using `dateTimeFormat` above.
+* `art`: Block containing:
+    * `header`: Art spec for header to display with message.
+    * `footer`: Art spec for footer to display with message.
+
+## Theming
+### MCI Codes
+1. Node selection. Must be a View that allows lists such as `SpinnerMenuView` (`%SM1`), `HorizontalMenuView` (`%HM1`), etc.
+2. Message entry (`%ET2`).
+3. Message preview (`%TL3`). A rendered (that is, pipe codes resolved) preview of the text in `%ET2`.
+
+10+: Custom using `itemFormat`. See below.
+
+### Item Format
+The following `itemFormat` object is provided for MCI 1 and 10+ for the currently selected item/node:
+* `text`: Node ID or "-ALL-" (All nodes).
+* `node`: Node ID or `-1` in the case of all nodes.
+* `userId`: User ID.
+* `action`: User's action.
+* `userName`: Username.
+* `realName`: Real name.
+* `location`: User's location.
+* `affils`: Affiliations.
+* `timeOn`: How long the user has been online (approx).
+
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 6e1d889d..27ad3003 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -991,8 +991,13 @@
 			prompt: menuCommand
 			config: {
 				font: cp437
+				interrupt: realtime
 			}
 			submit: [
+				{
+					value: { command: "MSG" }
+					action: @menu:nodeMessage
+				}
 				{
 					value: { command: "G" }
 					action: @menu:fullLogoffSequence
@@ -1064,6 +1069,46 @@
 			]
 		}
 
+		nodeMessage: {
+			desc: Node Messaging
+			module: node_msg
+			art: NODEMSG
+			config: {
+				cls: true
+				art: {
+					header: NODEMSGHDR
+					footer: NODEMSGFTR
+				}
+			}
+			form: {
+				0: {
+					mci: {
+						SM1: {
+							argName: node
+						}
+						ET2: {
+							argName: message
+							submit: true
+						}
+					}
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @systemMethod:prevMenu
+						}
+					]
+					submit: {
+						*: [
+							{
+								value: { message: null }
+								action: @method:sendMessage
+							}
+						]
+					}
+				}
+			}
+		}
+
 		mainMenuLastCallers: {
 			desc: Last Callers
 			module: last_callers
@@ -1609,6 +1654,9 @@
 			desc: Doors Menu
 			art: DOORMNU
 			prompt: menuCommand
+			config: {
+				interrupt: realtime
+			}
 			submit: [
 				{
 					value: { command: "G" }
@@ -1738,6 +1786,9 @@
 			art: MSGMNU
 			desc: Message Area
 			prompt: messageMenuCommand
+			config: {
+				interrupt: realtime
+			}
 			submit: [
 				{
 					value: { command: "P" }
@@ -2464,6 +2515,9 @@
 			art: MAILMNU
 			desc: Mail Menu
 			prompt: menuCommand
+			config: {
+				interrupt: realtime
+			}
 			submit: [
 				{
 					value: { command: "C" }
@@ -2666,6 +2720,9 @@
 			desc: File Base
 			art: FMENU
 			prompt: fileMenuCommand
+			config: {
+				interrupt: realtime
+			}
 			submit: [
 				{
 					value: { menuOption: "L" }

From eec06e70042562eb166ff6b31f345a39903dd791 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 1 Dec 2018 16:59:47 -0700
Subject: [PATCH 0587/1013] Fix oops!

---
 core/dropfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dropfile.js b/core/dropfile.js
index a23c5c1c..6595aa1a 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -86,7 +86,7 @@ module.exports = class DropFile {
         const now       = moment();
         const secLevel  = this.client.user.getLegacySecurityLevel().toString();
         const fullName  = prop[UserProps.RealName] || this.client.user.username;
-        const bd        = moment(prop[UserProp.Birthdate).format('MM/DD/YY');
+        const bd        = moment(prop[UserProps.Birthdate]).format('MM/DD/YY');
 
         //  :TODO: fix time remaining
         //  :TODO: fix default protocol -- user prop: transfer_protocol

From 36d55a409e61f4fbf5391f0296fc6ace1482d1c3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 1 Dec 2018 17:00:07 -0700
Subject: [PATCH 0588/1013] Add send node msg event

---
 core/module_util.js          | 2 +-
 core/node_msg.js             | 5 ++++-
 core/stat_log.js             | 2 +-
 core/system_events.js        | 1 +
 docs/modding/last-callers.md | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/module_util.js b/core/module_util.js
index ae342d4b..273ddaf0 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -149,7 +149,7 @@ function initializeModules(cb) {
                         return nextModule(null);
                     }
                 } catch(e) {
-                    Log.warn( { error : e }, 'Exception during "moduleInitialize"');
+                    Log.warn( { error : e.message, fullModulePath }, 'Exception during "moduleInitialize"');
                     return nextModule(null);
                 }
             },
diff --git a/core/node_msg.js b/core/node_msg.js
index 72c54430..bf22e24a 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -12,6 +12,7 @@ const { getThemeArt }           = require('./theme.js');
 const { pipeToAnsi }            = require('./color_codes.js');
 const stringFormat              = require('./string_format.js');
 const { renderStringLength }    = require('./string_util.js');
+const Events                    = require('./events.js');
 
 //  deps
 const series                = require('async/series');
@@ -37,7 +38,7 @@ const MciViewIds = {
 
         customRangeStart    : 10,
     }
-}
+};
 
 exports.getModule = class NodeMessageModule extends MenuModule {
     constructor(options) {
@@ -64,6 +65,8 @@ exports.getModule = class NodeMessageModule extends MenuModule {
                         }
                     }
 
+                    Events.emit(Events.getSystemEvents().UserSendNodeMsg, { user : this.client.user } );
+
                     return this.prevMenu(cb);
                 });
             },
diff --git a/core/stat_log.js b/core/stat_log.js
index b97ea417..6cf6198b 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -355,7 +355,7 @@ class StatLog {
             systemEvents.NewUser,
             systemEvents.UserUpload, systemEvents.UserDownload,
             systemEvents.UserPostMessage, systemEvents.UserSendMail,
-            systemEvents.UserRunDoor,
+            systemEvents.UserRunDoor, systemEvents.UserSendNodeMsg,
         ];
 
         Events.addListenerMultipleEvents(interestedEvents, (eventName, event) => {
diff --git a/core/system_events.js b/core/system_events.js
index c8345160..0f8118a2 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -20,4 +20,5 @@ module.exports = {
     UserPostMessage     : 'codes.l33t.enigma.system.user_post_msg',     //  { areaTag }
     UserSendMail        : 'codes.l33t.enigma.system.user_send_mail',
     UserRunDoor         : 'codes.l33t.enigma.system.user_run_door',
+    UserSendNodeMsg     : 'codes.l33t.enigma.system.user_send_node_msg',
 };
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
index f754a912..830244d7 100644
--- a/docs/modding/last-callers.md
+++ b/docs/modding/last-callers.md
@@ -20,6 +20,7 @@ Available `config` block entries:
     * `userPostMsg`
     * `userSendMail`
     * `userRunDoor`
+    * `userSendNodeMsg`
 * `actionIndicatorDefault`: Default indicator when an action is not set. Defaults to "-".
 
 Remember that entries such as `actionIndicators` and `actionIndicatorDefault` may contain pipe color codes!
@@ -32,6 +33,6 @@ The following `itemFormat` object is provided to MCI 1 (ie: `%VM1`):
 * `ts`: Timestamp in `dateTimeFormat` format.
 * `location`: User's location.
 * `affiliation` or `affils`: Users affiliations.
-* `actions`: A string built by concatenating action indicators for a users logged in session. For example, given a indincator of `userDownload` mapped to "D", the string may be "-D----". The format was made popular on Amiga style boards.
+* `actions`: A string built by concatenating action indicators for a users logged in session. For example, given a indicator of `userDownload` mapped to "D", the string may be "-D----". The format was made popular on Amiga style boards.
 
 

From 5dea13e652f6d7ceebc90600d37cbcee5f27a0f1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 2 Dec 2018 19:30:50 -0700
Subject: [PATCH 0589/1013] + validateConfigFields() for 'config' block
 validation

---
 core/menu_module.js | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/core/menu_module.js b/core/menu_module.js
index 9bac7b03..bc631feb 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -567,4 +567,55 @@ exports.MenuModule = class MenuModule extends PluginModule {
         }
         return cb(null);
     }
+
+    validateConfigFields(fields, cb) {
+        //
+        //  fields is expected to be { key : type || validator(key, config) }
+        //  where |type| is 'string', 'array', object', 'number'
+        //
+        if(!_.isObject(fields)) {
+            return cb(Errors.Invalid('Invalid validator!'));
+        }
+
+        const config = this.config || this.menuConfig.config;
+        let firstBadKey;
+        let badReason;
+        const good = _.every(fields, (type, key) => {
+            if(_.isFunction(type)) {
+                if(!type(key, config)) {
+                    firstBadKey = key;
+                    badReason   = 'Validate failure';
+                    return false;
+                }
+                return true;
+            }
+
+            const c = config[key];
+            let typeOk;
+            if(_.isUndefined(c)) {
+                typeOk = false;
+                badReason = `Missing "${key}", expected ${type}`;
+            } else {
+                switch(type) {
+                    case 'string'   : typeOk = _.isString(c); break;
+                    case 'object'   : typeOk = _.isObject(c); break;
+                    case 'array'    : typeOk = Array.isArray(c); break;
+                    case 'number'   : typeOk = !isNaN(parseInt(c)); break;
+                    default :
+                        typeOk = false;
+                        badReason = `Don't know how to validate ${type}`;
+                        break;
+                }
+            }
+            if(!typeOk) {
+                firstBadKey = key;
+                if(!badReason) {
+                    badReason = `Expected ${type}`;
+                }
+            }
+            return typeOk;
+        });
+
+        return cb(good ? null : Errors.Invalid(`Invalid or missing config option "${firstBadKey}" (${badReason})`));
+    }
 };

From 8f9f4227c134b3938f8434210088f1f417e440d2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 2 Dec 2018 19:31:27 -0700
Subject: [PATCH 0590/1013] Fix typo

---
 misc/menu_template.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 27ad3003..82a3893f 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1677,7 +1677,7 @@
 					action: @menu:doorAbracadabraExample
 				}
 				{
-					value: { command: "TWBBLINK" }
+					value: { command: "TWBBSLINK" }
 					action: @menu:doorTradeWars2002BBSLinkExample
 				}
 				{

From 0c23339a2d95acdbe7b89e3c7cc5da9687b04510 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 2 Dec 2018 19:33:07 -0700
Subject: [PATCH 0591/1013] Code cleanup: Use EnigError's vs standard Error.
 WIP...

---
 core/abracadabra.js      |  5 +++--
 core/art.js              | 15 ++++++++-------
 core/bbs_link.js         | 34 ++++++++++++++++++----------------
 core/combatnet.js        | 37 ++++++++++++++++++++-----------------
 core/connect.js          | 19 +++++++++----------
 core/door_party.js       | 29 +++++++++++++++--------------
 core/event_scheduler.js  |  2 +-
 core/fnv1a.js            |  6 ++++--
 core/listening_server.js |  4 ++--
 core/module_util.js      | 14 ++++++++------
 10 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 1ddec925..32c4466a 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -7,6 +7,7 @@ const Door              = require('./door.js');
 const theme             = require('./theme.js');
 const ansi              = require('./ansi_term.js');
 const Events            = require('./events.js');
+const { Errors }        = require('./enig_error.js');
 
 const async             = require('async');
 const assert            = require('assert');
@@ -98,7 +99,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
                         if(_.isString(self.config.tooManyArt)) {
                             theme.displayThemeArt( { client : self.client, name : self.config.tooManyArt }, function displayed() {
                                 self.pausePrompt( () => {
-                                    callback(new Error('Too many active instances'));
+                                    return callback(Errors.AccessDenied('Too many active instances'));
                                 });
                             });
                         } else {
@@ -106,7 +107,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
                             //  :TODO: Use MenuModule.pausePrompt()
                             self.pausePrompt( () => {
-                                callback(new Error('Too many active instances'));
+                                return callback(Errors.AccessDenied('Too many active instances'));
                             });
                         }
                     } else {
diff --git a/core/art.js b/core/art.js
index 315950e1..d709d366 100644
--- a/core/art.js
+++ b/core/art.js
@@ -2,11 +2,12 @@
 'use strict';
 
 //  ENiGMA½
-const Config    = require('./config.js').get;
-const miscUtil  = require('./misc_util.js');
-const ansi      = require('./ansi_term.js');
-const aep       = require('./ansi_escape_parser.js');
-const sauce     = require('./sauce.js');
+const Config        = require('./config.js').get;
+const miscUtil      = require('./misc_util.js');
+const ansi          = require('./ansi_term.js');
+const aep           = require('./ansi_escape_parser.js');
+const sauce         = require('./sauce.js');
+const { Errors }    = require('./enig_error.js');
 
 //  deps
 const fs        = require('graceful-fs');
@@ -209,7 +210,7 @@ function getArt(name, options, cb) {
             return getArtFromPath(readPath, options, cb);
         }
 
-        return cb(new Error(`No matching art for supplied criteria: ${name}`));
+        return cb(Errors.DoesNotExist(`No matching art for supplied criteria: ${name}`));
     });
 }
 
@@ -236,7 +237,7 @@ function display(client, art, options, cb) {
     }
 
     if(!art || !art.length) {
-        return cb(new Error('Empty art'));
+        return cb(Errors.Invalid('No art supplied!'));
     }
 
     options.mciReplaceChar  = options.mciReplaceChar || ' ';
diff --git a/core/bbs_link.js b/core/bbs_link.js
index cbb7c036..71fa04c1 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -1,11 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule    = require('./menu_module.js').MenuModule;
-const resetScreen   = require('./ansi_term.js').resetScreen;
+const { MenuModule }    = require('./menu_module.js');
+const { resetScreen }   = require('./ansi_term.js');
+const { Errors }        = require('./enig_error.js');
 
+//  deps
 const async         = require('async');
-const _             = require('lodash');
 const http          = require('http');
 const net           = require('net');
 const crypto        = require('crypto');
@@ -60,15 +61,17 @@ exports.getModule = class BBSLinkModule extends MenuModule {
         async.series(
             [
                 function validateConfig(callback) {
-                    if(_.isString(self.config.sysCode) &&
-                        _.isString(self.config.authCode) &&
-                        _.isString(self.config.schemeCode) &&
-                        _.isString(self.config.door))
-                    {
-                        callback(null);
-                    } else {
-                        callback(new Error('Configuration is missing option(s)'));
-                    }
+                    return self.validateConfigFields(
+                        {
+                            host        : 'string',
+                            sysCode     : 'string',
+                            authCode    : 'string',
+                            schemeCode  : 'string',
+                            door        : 'string',
+                            port        : 'number',
+                        },
+                        callback
+                    );
                 },
                 function acquireToken(callback) {
                     //
@@ -112,10 +115,9 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                         var status = body.trim();
 
                         if('complete' === status) {
-                            callback(null);
-                        } else {
-                            callback(new Error('Bad authentication status: ' + status));
+                            return callback(null);
                         }
+                        return callback(Errors.AccessDenied(`Bad authentication status: ${status}`));
                     });
                 },
                 function createTelnetBridge(callback) {
@@ -158,7 +160,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
 
                     bridgeConnection.on('end', function connectionEnd() {
                         restorePipe();
-                        callback(clientTerminated ? new Error('Client connection terminated') : null);
+                        return callback(clientTerminated ? Errors.General('Client connection terminated') : null);
                     });
 
                     bridgeConnection.on('error', function error(err) {
diff --git a/core/combatnet.js b/core/combatnet.js
index 1b53a153..abb9a889 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //  enigma-bbs
-const MenuModule    = require('../core/menu_module.js').MenuModule;
-const resetScreen   = require('../core/ansi_term.js').resetScreen;
+const { MenuModule }    = require('../core/menu_module.js');
+const { resetScreen }   = require('../core/ansi_term.js');
+const { Errors }        = require('./enig_error.js');
 
 //  deps
 const async         = require('async');
-const _             = require('lodash');
 const RLogin        = require('rlogin');
 
 exports.moduleInfo = {
@@ -32,13 +32,15 @@ exports.getModule = class CombatNetModule extends MenuModule {
         async.series(
             [
                 function validateConfig(callback) {
-                    if(!_.isString(self.config.password)) {
-                        return callback(new Error('Config requires "password"!'));
-                    }
-                    if(!_.isString(self.config.bbsTag)) {
-                        return callback(new Error('Config requires "bbsTag"!'));
-                    }
-                    return callback(null);
+                    return self.validateConfigFields(
+                        {
+                            host        : 'string',
+                            password    : 'string',
+                            bbsTag      : 'string',
+                            rloginPort  : 'number',
+                        },
+                        callback
+                    );
                 },
                 function establishRloginConnection(callback) {
                     self.client.term.write(resetScreen());
@@ -51,12 +53,13 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     };
 
                     const rlogin = new RLogin(
-                        {   'clientUsername' : self.config.password,
-                            'serverUsername' : `${self.config.bbsTag}${self.client.user.username}`,
-                            'host' : self.config.host,
-                            'port' : self.config.rloginPort,
-                            'terminalType' : self.client.term.termClient,
-                            'terminalSpeed' : 57600
+                        {
+                            clientUsername  : self.config.password,
+                            serverUsername  : `${self.config.bbsTag}${self.client.user.username}`,
+                            host            : self.config.host,
+                            port            : self.config.rloginPort,
+                            terminalType    : self.client.term.termClient,
+                            terminalSpeed   : 57600
                         }
                     );
 
@@ -88,7 +91,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                                 self.client.term.output.on('data', sendToRloginBuffer);
 
                             } else {
-                                return callback(new Error('Failed to establish establish CombatNet connection'));
+                                return callback(Errors.General('Failed to establish establish CombatNet connection'));
                             }
                         }
                     );
diff --git a/core/connect.js b/core/connect.js
index 44277813..0b83f7f0 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -2,8 +2,9 @@
 'use strict';
 
 //  ENiGMA½
-const ansi      = require('./ansi_term.js');
-const Events    = require('./events.js');
+const ansi          = require('./ansi_term.js');
+const Events        = require('./events.js');
+const { Errors }    = require('./enig_error.js');
 
 //  deps
 const async     = require('async');
@@ -15,7 +16,7 @@ function ansiDiscoverHomePosition(client, cb) {
     //  We want to find the home position. ANSI-BBS and most terminals
     //  utilize 1,1 as home. However, some terminals such as ConnectBot
     //  think of home as 0,0. If this is the case, we need to offset
-    //  our positioning to accomodate for such.
+    //  our positioning to accommodate for such.
     //
     const done = function(err) {
         client.removeListener('cursor position report', cprListener);
@@ -32,7 +33,7 @@ function ansiDiscoverHomePosition(client, cb) {
         //
         if(h > 1 || w > 1) {
             client.log.warn( { height : h, width : w }, 'Ignoring ANSI home position CPR due to unexpected values');
-            return done(new Error('Home position CPR expected to be 0,0, or 1,1'));
+            return done(Errors.UnexpectedState('Home position CPR expected to be 0,0, or 1,1'));
         }
 
         if(0 === h & 0 === w) {
@@ -49,7 +50,7 @@ function ansiDiscoverHomePosition(client, cb) {
     client.once('cursor position report', cprListener);
 
     const giveUpTimer = setTimeout( () => {
-        return done(new Error('Giving up on home position CPR'));
+        return done(Errors.General('Giving up on home position CPR'));
     }, 3000);   //  3s
 
     client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);    //  go home, query pos
@@ -78,14 +79,14 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
         const w = pos[1];
 
         //
-        //  Netrunner for example gives us 1x1 here. Not really useful. Ignore
+        //  NetRunner for example gives us 1x1 here. Not really useful. Ignore
         //  values that seem obviously bad.
         //
         if(h < 10 || w < 10) {
             client.log.warn(
                 { height : h, width : w },
                 'Ignoring ANSI CPR screen size query response due to very small values');
-            return done(new Error('Term size <= 10 considered invalid'));
+            return done(Errors.Invalid('Term size <= 10 considered invalid'));
         }
 
         client.term.termHeight  = h;
@@ -107,7 +108,7 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 
     //  give up after 2s
     const giveUpTimer = setTimeout( () => {
-        return done(new Error('No term size established by CPR within timeout'));
+        return done(Errors.General('No term size established by CPR within timeout'));
     }, 2000);
 
     //  Start the process: Query for CPR
@@ -116,8 +117,6 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 
 function prepareTerminal(term) {
     term.rawWrite(ansi.normal());
-    //term.rawWrite(ansi.disableVT100LineWrapping());
-    //  :TODO: set xterm stuff -- see x84/others
 }
 
 function displayBanner(term) {
diff --git a/core/door_party.js b/core/door_party.js
index 63247f69..f6bc7be9 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -2,12 +2,12 @@
 'use strict';
 
 //  enigma-bbs
-const MenuModule    = require('../core/menu_module.js').MenuModule;
-const resetScreen   = require('../core/ansi_term.js').resetScreen;
+const { MenuModule }    = require('./menu_module.js');
+const { resetScreen }   = require('./ansi_term.js');
+const { Errors }        = require('./enig_error.js');
 
 //  deps
 const async         = require('async');
-const _             = require('lodash');
 const SSHClient     = require('ssh2').Client;
 
 exports.moduleInfo = {
@@ -34,16 +34,17 @@ exports.getModule = class DoorPartyModule extends MenuModule {
         async.series(
             [
                 function validateConfig(callback) {
-                    if(!_.isString(self.config.username)) {
-                        return callback(new Error('Config requires "username"!'));
-                    }
-                    if(!_.isString(self.config.password)) {
-                        return callback(new Error('Config requires "password"!'));
-                    }
-                    if(!_.isString(self.config.bbsTag)) {
-                        return callback(new Error('Config requires "bbsTag"!'));
-                    }
-                    return callback(null);
+                    return self.validateConfigFields(
+                        {
+                            host        : 'string',
+                            username    : 'string',
+                            password    : 'string',
+                            bbsTag      : 'string',
+                            sshPort     : 'number',
+                            rloginPort  : 'number',
+                        },
+                        callback
+                    );
                 },
                 function establishSecureConnection(callback) {
                     self.client.term.write(resetScreen());
@@ -71,7 +72,7 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                         //  establish tunnel for rlogin
                         sshClient.forwardOut('127.0.0.1', self.config.sshPort, self.config.host, self.config.rloginPort, (err, stream) => {
                             if(err) {
-                                return callback(new Error('Failed to establish tunnel'));
+                                return callback(Errors.General('Failed to establish tunnel'));
                             }
 
                             //
diff --git a/core/event_scheduler.js b/core/event_scheduler.js
index 95de5a97..4b7da062 100644
--- a/core/event_scheduler.js
+++ b/core/event_scheduler.js
@@ -162,7 +162,7 @@ class ScheduledEvent {
                         { eventName : this.name, action : this.action, exitCode : exitCode },
                         'Bad exit code while performing scheduled event action');
                 }
-                return cb(exitCode ? new Error(`Bad exit code while performing scheduled event action: ${exitCode}`) : null);
+                return cb(exitCode ? Errors.ExternalProcess(`Bad exit code while performing scheduled event action: ${exitCode}`) : null);
             });
         }
     }
diff --git a/core/fnv1a.js b/core/fnv1a.js
index 9acc8f27..b85e4241 100644
--- a/core/fnv1a.js
+++ b/core/fnv1a.js
@@ -1,7 +1,9 @@
 /* jslint node: true */
 'use strict';
 
-let _       = require('lodash');
+const { Errors } = require('./enig_error.js');
+
+const _       = require('lodash');
 
 //  FNV-1a based on work here: https://github.com/wiedi/node-fnv
 module.exports = class FNV1a {
@@ -23,7 +25,7 @@ module.exports = class FNV1a {
         }
 
         if(!Buffer.isBuffer(data)) {
-            throw new Error('data must be String or Buffer!');
+            throw Errors.Invalid('data must be String or Buffer!');
         }
 
         for(let b of data) {
diff --git a/core/listening_server.js b/core/listening_server.js
index 00cf0a86..f28bea7f 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -3,6 +3,7 @@
 
 //  ENiGMA½
 const logger            = require('./logger.js');
+const { ErrorReasons }  = require('./enig_error.js');
 
 //  deps
 const async             = require('async');
@@ -30,9 +31,8 @@ function startListening(cb) {
 
     async.each( [ 'login', 'content' ], (category, next) => {
         moduleUtil.loadModulesForCategory(`${category}Servers`, (err, module) => {
-            //  :TODO: use enig error here!
             if(err) {
-                if('EENIGMODDISABLED' === err.code) {
+                if(ErrorReasons.Disabled === err.reasonCode) {
                     logger.log.debug(err.message);
                 } else {
                     logger.log.info( { err : err }, 'Failed loading module');
diff --git a/core/module_util.js b/core/module_util.js
index 273ddaf0..0e8e5976 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -4,6 +4,10 @@
 //  ENiGMA½
 const Config    = require('./config.js').get;
 const Log       = require('./logger.js').log;
+const {
+    Errors,
+    ErrorReasons
+}               = require('./enig_error.js');
 
 //  deps
 const fs        = require('graceful-fs');
@@ -28,9 +32,7 @@ function loadModuleEx(options, cb) {
     const modConfig = _.isObject(Config[options.category]) ? Config[options.category][options.name] : null;
 
     if(_.isObject(modConfig) && false === modConfig.enabled) {
-        const err   = new Error(`Module "${options.name}" is disabled`);
-        err.code    = 'EENIGMODDISABLED';
-        return cb(err);
+        return cb(Errors.AccessDenied(`Module "${options.name}" is disabled`, ErrorReasons.Disabled));
     }
 
     //
@@ -56,11 +58,11 @@ function loadModuleEx(options, cb) {
     }
 
     if(!_.isObject(mod.moduleInfo)) {
-        return cb(new Error('Module is missing "moduleInfo" section'));
+        return cb(Errors.Invalid(`No exported "moduleInfo" block for module ${modPath}!`));
     }
 
     if(!_.isFunction(mod.getModule)) {
-        return cb(new Error('Invalid or missing "getModule" method for module!'));
+        return cb(Errors.Invalid(`No exported "getModule" method for module ${modPath}!`));
     }
 
     return cb(null, mod);
@@ -70,7 +72,7 @@ function loadModule(name, category, cb) {
     const path = Config().paths[category];
 
     if(!_.isString(path)) {
-        return cb(new Error(`Not sure where to look for "${name}" of category "${category}"`));
+        return cb(Errors.DoesNotExist(`Not sure where to look for module "${name}" of category "${category}"`));
     }
 
     loadModuleEx( { name : name, path : path, category : category }, function loaded(err, mod) {

From 7deb202623e34c8965c8b01e545ff473680aa158 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 2 Dec 2018 20:59:40 -0700
Subject: [PATCH 0592/1013] Slight cleanup

---
 docs/configuration/file-transfer-protocols.md | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/configuration/file-transfer-protocols.md b/docs/configuration/file-transfer-protocols.md
index fd21a938..2f7d48ac 100644
--- a/docs/configuration/file-transfer-protocols.md
+++ b/docs/configuration/file-transfer-protocols.md
@@ -2,10 +2,10 @@
 layout: page
 title: File Transfer Protocols
 ---
-ENiGMA½ currently relies on external executables for "legacy" file transfer protocols such as X, Y, and ZModem. The `fileTransferProtocols` section of `config.hjson` is used to override defaults, add new handlers, etc. Remember that ENiGMA½ also support modern web (HTTP/HTTPS) downloads!
+ENiGMA½ currently relies on external executable binaries for "legacy" file transfer protocols such as X, Y, and ZModem. Remember that ENiGMA½ also support modern web (HTTP/HTTPS) downloads!
 
 ## File Transfer Protocols
-File transfer protocols are managed via the `fileTransferProtocols` configuration block of `config.hjson`. Each entry defines an **external** protocol that can be used for uploads (recv), downloads (send), or both. Depending on the protocol and handler, batch receiving of files (uploads) may also be available.
+File transfer protocols are managed via the `fileTransferProtocols` configuration block of `config.hjson`. Each entry defines an **external** protocol handler that can be used for uploads (recv), downloads (send), or both. Depending on the protocol and handler, batch receiving of files (uploads) may also be available.
 
 ### Predefined File Transfer Protocols
 The following file transfer protocols are pre-configured in ENiGMA½ as of this writing. System operators may override or extend this list. PRs are welcome for pre-configured additions!
@@ -32,18 +32,21 @@ For protocols of type `external` the following members may be defined:
 * `recvArgsNonBatch`: Required if using `recvCmd` and supporting non-batch (single file) uploads; A placeholder of `{fileName}` may be supplied to indicate to the protocol what the uploaded file should be named (this will be collected from the user before the upload starts).
 * `escapeTelnet`: Optional; If set to `true`, escape all internal Telnet related codes such as IAC's. This option is required for external protocol handlers such as `sz` and `rz` that do not escape themselves.
 
+### Adding Your Own
+Take a look a the example below as well as [core/config.js](/core/config.js).
+
 #### Example File Transfer Protocol Configuration
 ```
 zmodem8kSexyz : {
-	name		: 'ZModem 8k (SEXYZ)',
-	type		: 'external',
-	sort		: 1,
-	external	: {
-		sendCmd				: 'sexyz',
-		sendArgs			: [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
-		recvCmd				: 'sexyz',
-		recvArgs			: [ '-telnet', '-8', 'rz', '{uploadDir}' ],
-		recvArgsNonBatch	: [ '-telnet', '-8', 'rz', '{fileName}' ],
-	}
+    name		: 'ZModem 8k (SEXYZ)',
+    type		: 'external',
+    sort		: 1,
+    external	: {
+        sendCmd             : 'sexyz',
+        sendArgs            : [ '-telnet', '-8', 'sz', '@{fileListPath}' ],
+        recvCmd             : 'sexyz',
+        recvArgs            : [ '-telnet', '-8', 'rz', '{uploadDir}' ],
+        recvArgsNonBatch    : [ '-telnet', '-8', 'rz', '{fileName}' ],
+    }
 }
-```
\ No newline at end of file
+```

From 1c911fe086bbc1e00907a869e173299eebcf4a74 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 20:01:24 -0700
Subject: [PATCH 0593/1013] Minor local door doc updates

---
 docs/modding/local-doors.md | 38 +++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index 719a992b..9322e970 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -2,10 +2,13 @@
 layout: page
 title: Local Doors
 ---
-## The abracadabra Module
-The `abracadabra` module provides a generic and flexible solution for many door types. Through this module you can execute native processes & scripts directly, and process I/O through stdio or a temporary TCP server.
+## Local Doors
+ENiGMA½ has many ways to add doors to your system. In addition to the many built in door server modules, local doors are of course also supported using the ! The `abracadabra` module!
 
-## Configuration
+## The abracadabra Module
+The `abracadabra` module provides a generic and flexible solution for many door types. Through this module you can execute native processes & scripts directly, and perform I/O through standard I/O (stdio) or a temporary TCP server.
+
+### Configuration
 The `abracadabra` `config` block can contain the following members:
 * `name`: Used as a key for tracking number of clients using a particular door.
 * `dropFileType`: Specifies the type of drop file to generate (See **Argument Variables** below).
@@ -14,24 +17,24 @@ The `abracadabra` `config` block can contain the following members:
 * `cwd`: Set the Current Working Directory for `cmd`. Defaults to the directory of `cmd`.
 * `nodeMax`: Max number of nodes that can access this door at once. Uses `name` as a mapping key
 * `tooManyArt`: Art file spec to display if too many instances are already in use
-* `io`: Where to process I/O. Can be `stdio` or `socket`
+* `io`: Where to process I/O. Can be `stdio` or `socket`. When using `stdio`, I/O is input/output from stdin/stdout. When using `socket` a temporary socket server is spawned that can be connected to. The server listens on localhost on `{srvPort}` (see below under Argument Variables).
 * `encoding`: Specify the door's encoding. Defaults to `cp437`. Linux binaries for example, often produce `utf8`.
 
-### Drop File Types
+#### Drop File Types
 Drop file types specified by `dropFileType`:
 * `DOOR`: [DOOR.SYS](http://goldfndr.home.mindspring.com/dropfile/doorsys.htm)
-* `DOOR32`: [DOOR32.SYS](http://wiki.bbses.info/index.php/DOOR32.SYS)
+* `DOOR32`: [DOOR32.SYS](https://raw.githubusercontent.com/NuSkooler/ansi-bbs/master/docs/dropfile_formats/door32_sys.txt)
 * `DORINFO`: [DORINFOx.DEF](http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm)
 
-### Argument Variables
-The following variables may be used in `{args}` entries:
+#### Argument Variables
+The following variables may be used in `args` entries:
 * `{node}`: Current node number.
 * `{dropFile}`: Drop _filename_ only.
 * `{dropFilePath}`: Full path to generated drop file.
 * `{userId}`: Current user ID.
-* `{userName}`: _Sanatized_ username. Safe for filenames, etc.
+* `{userName}`: _Sanitized_ username. Safe for filenames, etc.
 * `{userNameRaw}`: _Raw_ username. May not be safe for filenames!
-* `{srvPort}`: Tempoary server port when `io` is set to `socket`.
+* `{srvPort}`: Temporary server port when `io` is set to `socket`.
 * `{cwd}`: Current Working Directory.
 
 Example:
@@ -41,7 +44,7 @@ args: [
 ]
 ```
 
-## DOSEMU with abracadabra
+### DOSEMU with abracadabra
 [DOSEMU](http://www.dosemu.org/) can provide a good solution for running legacy DOS doors when running on Linux systems. For this, we will create a virtual serial port (COM1) that communicates via stdio.
 
 As an example, here are the steps for setting up Pimp Wars:
@@ -97,12 +100,12 @@ doorPimpWars: {
 
 ```
 
-## QEMU with abracadabra
+### QEMU with abracadabra
 [QEMU](http://wiki.qemu.org/Main_Page) provides a robust, cross platform solution for launching doors under many platforms (likely anwywhere Node.js is supported and ENiGMA½ can run). Note however that there is an important and major caveat: **Multiple instances of a particular door/OS image should not be run at once!** Being more flexible means being a bit more complex. Let's look at an example for running L.O.R.D. under a UNIX like system such as Linux or FreeBSD.
 
 Basically we'll be creating a bootstrap shell script that generates a temporary node specific `go.bat` to launch our door. This will be called from `autoexec.bat` within our QEMU FreeDOS partition.
 
-### Step 1: Create a FreeDOS image
+#### Step 1: Create a FreeDOS image
 [FreeDOS](http://www.freedos.org/) is a free mostly MS-DOS compatible DOS package that works well for running 16bit doors. Follow the [QEMU/FreeDOS](https://en.wikibooks.org/wiki/QEMU/FreeDOS) guide for creating an `freedos_c.img`. This will contain FreeDOS itself and installed BBS doors.
 
 After this is complete, copy LORD to C:\DOORS\LORD within FreeDOS. An easy way to tranfer files from host to DOS is to use QEMU's vfat as a drive. For example:
@@ -115,7 +118,7 @@ With the above you can now copy files from D: to C: within FreeDOS and add the f
 CALL E:\GO.BAT
 ```
 
-### Step 2: Create a bootstrap script
+#### Step 2: Create a bootstrap script
 Our bootstrap script will prepare `GO.BAT` and launch FreeDOS. Below is an example:
 
 
@@ -147,7 +150,7 @@ Note the `qemu-system-i386` line. We're telling QEMU to launch and use localtime
 
 For doors that do not *require* a FOSSIL driver, it is recommended to not load or use one unless you are having issues.
 
-#### Step 3: Create a menu entry
+##### Step 3: Create a menu entry
 Finally we can create a `menu.hjson` entry using the `abracadabra` module:
 ```hjson
 doorLORD: {
@@ -169,7 +172,10 @@ doorLORD: {
 }
 ```
 
-## Resources
+## Shared Socket Descriptors
+As of this writing `DOOR32.SYS` style socket descriptor sharing is **not** supported. Workarounds include using the Telnet Bridge (`telnet_bridge` module) to hook up to local Telnet-accessible door servers such as [NET2BBS](http://pcmicro.com/netfoss/guide/net2bbs.html).
+
+## Additional Resources
 
 ### DOSBox
 * Custom DOSBox builds http://home.arcor.de/h-a-l-9000/

From 8744226c15d9fb3454b6427020ed8d2e4487690d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 20:06:01 -0700
Subject: [PATCH 0594/1013] Dosbox-x

---
 docs/modding/local-doors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index 9322e970..b5c56f9c 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -178,7 +178,7 @@ As of this writing `DOOR32.SYS` style socket descriptor sharing is **not** suppo
 ## Additional Resources
 
 ### DOSBox
-* Custom DOSBox builds http://home.arcor.de/h-a-l-9000/
+* [DOSBox-X](https://github.com/joncampbell123/dosbox-x)
 
 ### Door Downloads & Support Sites
 #### General

From 929ec7a4ab1c627551e44f8ca8fcce49b4bd12ce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 20:17:27 -0700
Subject: [PATCH 0595/1013] WIP doc on updating installations

---
 docs/_includes/nav.md  |  1 +
 docs/admin/updating.md | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 docs/admin/updating.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index b6303960..0c0cd945 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -83,6 +83,7 @@
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
+    - [Updating]({{ site.baseurl }}{% link admin/updating.md %})
 
   - Troubleshooting
     - [Monitoring Logs]({{ site.baseurl }}{% link troubleshooting/monitoring-logs.md %})
diff --git a/docs/admin/updating.md b/docs/admin/updating.md
new file mode 100644
index 00000000..71a3d794
--- /dev/null
+++ b/docs/admin/updating.md
@@ -0,0 +1,16 @@
+---
+layout: page
+title: Updating
+---
+## Updating your Installation
+Updating ENiGMA½ can be a bit of a learning curve compared to other systems. Especially when running off of a development branch (such as `0.0.9-alpha` being the recommended branch as of this writing), you'll want frequent updates.
+
+## Steps
+In general the steps are as follows:
+1. `cd /path/to/enigma-bbs`
+2. `git pull`
+3. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file.
+4. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you way wan to look at them as well.
+
+Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
+

From 66ea15e3aa81ddbed775399d55e744eb4f0caadb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 20:18:07 -0700
Subject: [PATCH 0596/1013] Note on updating modules

---
 docs/admin/updating.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index 71a3d794..a6199ba5 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -9,8 +9,9 @@ Updating ENiGMA½ can be a bit of a learning curve compared to other systems. Es
 In general the steps are as follows:
 1. `cd /path/to/enigma-bbs`
 2. `git pull`
-3. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file.
-4. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you way wan to look at them as well.
+3. `npm update` or `yarn` to refresh any new or updated modules.
+4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file.
+5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you way wan to look at them as well.
 
 Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
 

From 104f6aeda962f346177fb1028a2b7da635eadc0a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 21:33:55 -0700
Subject: [PATCH 0597/1013] Dur

---
 docs/admin/updating.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index a6199ba5..310b6313 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -11,7 +11,10 @@ In general the steps are as follows:
 2. `git pull`
 3. `npm update` or `yarn` to refresh any new or updated modules.
 4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file.
-5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you way wan to look at them as well.
+5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you may want to look at them as well.
 
 Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
 
+Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGARDE](/UPGRADE.md)!
+
+

From 9c835af0001dd17af9fc58034713080761bcf7ef Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 3 Dec 2018 23:51:43 -0700
Subject: [PATCH 0598/1013] Initial support for FILEGATE.ZXX / RAID style
 import of file areas

---
 core/oputil/oputil_file_base.js    | 205 +++++++++++++++++++++++++++--
 core/oputil/oputil_help.js         |   4 +
 core/oputil/oputil_message_base.js |   2 +-
 3 files changed, 201 insertions(+), 10 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 9dfcdeca..9d847968 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -9,7 +9,10 @@ const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDataba
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const {
     getAreaAndStorage,
-    looksLikePattern
+    looksLikePattern,
+    getConfigPath,
+    getAnswers,
+    writeConfig
 }								= require('./oputil_common.js');
 const Errors					= require('../enig_error.js').Errors;
 
@@ -20,6 +23,9 @@ const _							= require('lodash');
 const moment					= require('moment');
 const inq						= require('inquirer');
 const glob						= require('glob');
+const sanatizeFilename          = require('sanitize-filename');
+const hjson                     = require('hjson');
+const { mkdirs }                = require('fs-extra');
 
 exports.handleFileBaseCommand			= handleFileBaseCommand;
 
@@ -692,6 +698,185 @@ function removeFiles() {
     );
 }
 
+function getFileBaseImportType(path) {
+    if(argv.type) {
+        return argv.type.toLowerCase();
+    }
+
+    return paths.extname(path).substr(1).toLowerCase(); //  zxx, ...
+}
+
+function importFileAreas() {
+    //
+    //  FILEGATE.ZXX "RAID" format currently the only supported format.
+    //
+    //  See http://www.filegate.net/info/filegate.zxx
+    //
+    const importPath = argv._[argv._.length - 1];
+    if(argv._.length < 3 || !importPath || 0 === importPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('FileBase'), ExitCodes.ERROR);
+    }
+
+    const importType = getFileBaseImportType(importPath);
+    if('zxx' !== importType) {
+        return console.error(`"${importType}" is not a recognized import file type`);
+    }
+
+    const createDirs = argv['create-dirs'];
+    //  :TODO: --base-dir (override config base/relative dir; use full paths)
+
+    async.waterfall(
+        [
+            (callback) => {
+                fs.readFile(importPath, 'utf8', (err, importData) => {
+                    if(err) {
+                        return callback(err);
+                    }
+
+                    const importInfo = {
+                        storageTags : {},
+                        areas : {},
+                        count : 0,
+                    };
+
+                    const re = /Area\s+([^\s]+)\s+[0-9]\s+(?:!|\*&)\s+([^\r\n]+)/gm;
+                    let m;
+                    while((m = re.exec(importData))) {
+                        const dir           = m[1].trim();
+                        const name          = m[2].trim();
+                        const safeName      = sanatizeFilename(name);
+
+                        const stPrefix      = _.snakeCase(sanatizeFilename(safeName));
+                        const storageTag    = `${stPrefix}__${_.snakeCase(sanatizeFilename(dir))}`;
+                        const areaTag       = _.snakeCase(safeName);
+
+                        if(!dir || !name || !storageTag || !areaTag) {
+                            console.info(`Skipping entry: ${m[0]}`);
+                            continue;
+                        }
+
+                        importInfo.storageTags[storageTag] = dir;
+                        importInfo.areas[areaTag] = {
+                            name        : name,
+                            desc        : name,
+                            storageTags : [ storageTag ],
+                        };
+                        ++importInfo.count;
+                    }
+
+                    if(0 === importInfo.count) {
+                        return callback(new Error('Nothing to import'));
+                    }
+
+                    return callback(null, importInfo);
+                });
+            },
+            (importInfo, callback) => {
+                return initConfigAndDatabases(err => {
+                    return callback(err, importInfo);
+                });
+            },
+            (importInfo, callback) => {
+                console.info(`Read to import the following ${importInfo.count} areas:`);
+                console.info('');
+                _.each(importInfo.areas, (area, areaTag) => {
+                    console.info(`${area.name} (${areaTag}):`);
+                    const dir = importInfo.storageTags[area.storageTags[0]];
+                    console.info(`  storage: ${area.storageTags[0]} => ${dir}`);
+                });
+
+                getAnswers([
+                    {
+                        name	: 'proceed',
+                        message	: 'Proceed?',
+                        type	: 'confirm',
+                    }
+                ],
+                answers => {
+                    if(answers.proceed) {
+                        return callback(null, importInfo);
+                    }
+                    return callback(Errors.General('User canceled'));
+                });
+            },
+            (importInfo, callback) => {
+                fs.readFile(getConfigPath(), 'utf8', (err, configData) => {
+                    if(err) {
+                        return callback(err);
+                    }
+                    let config;
+                    try {
+                        config = hjson.rt.parse(configData);
+                    } catch(e) {
+                        return callback(e);
+                    }
+                    return callback(null, importInfo, config);
+                });
+            },
+            (importInfo, config, callback) => {
+                const newStorageTagDirs = [];
+                _.each(importInfo.areas, (area, areaTag) => {
+                    const existingArea = _.get(config, [ 'fileBase', 'areas', areaTag ]);
+                    if(existingArea) {
+                        return console.info(`Skipping ${area.name}. Area tag "${areaTag}" already exists.`);
+                    }
+
+                    const storageTag = area.storageTags[0];
+                    const existingStorageTag = _.get(config, [ 'fileBase', 'storageTags', storageTag ]);
+                    if(existingStorageTag) {
+                        return console.info(`Skipping ${area.name} (${areaTag}). Storage tag "${storageTag}" already exists`);
+                    }
+
+                    const dir = importInfo.storageTags[storageTag];
+                    newStorageTagDirs.push(dir);
+
+                    config.fileBase.storageTags[storageTag] = dir;
+                    config.fileBase.areas[areaTag] = area;
+                });
+
+                return callback(null, newStorageTagDirs, config);
+            },
+            (newStorageTagDirs, config, callback) => {
+                if(!createDirs) {
+                    return callback(null, config);
+                }
+
+                //
+                //  Create all directories
+                //
+                const prefixDir = config.fileBase.areaStoragePrefix;
+                async.eachSeries(newStorageTagDirs, (dir, nextDir) => {
+                    const isAbs = paths.isAbsolute(dir);
+                    if(!isAbs) {
+                        dir = paths.join(prefixDir, dir);
+                    }
+                    mkdirs(dir, err => {
+                        if(!err) {
+                            console.log(`Created ${dir}`);
+                        }
+                        return nextDir(err);
+                    });
+                },
+                err => {
+                    return callback(err, config);
+                });
+            },
+            (config, callback) => {
+                const written = writeConfig(config, getConfigPath());
+                return callback(written ? null : new Error('Failed to write config!'));
+            }
+        ],
+        err => {
+            if(err) {
+                return console.error(err.reason ? err.reason : err.message);
+            }
+
+            console.info('Import complete.');
+            console.info(`You may wish to validate changes made to ${getConfigPath()}`);
+        }
+    );
+}
+
 function handleFileBaseCommand() {
 
     function errUsage()  {
@@ -708,15 +893,17 @@ function handleFileBaseCommand() {
     const action = argv._[1];
 
     return ({
-        info	: displayFileAreaInfo,
-        scan	: scanFileAreas,
+        info	        : displayFileAreaInfo,
+        scan	        : scanFileAreas,
 
-        mv		: moveFiles,
-        move	: moveFiles,
+        mv		        : moveFiles,
+        move	        : moveFiles,
 
-        rm		: removeFiles,
-        remove	: removeFiles,
-        del		: removeFiles,
-        delete	: removeFiles,
+        rm		        : removeFiles,
+        remove	        : removeFiles,
+        del		        : removeFiles,
+        delete	        : removeFiles,
+
+        'import-areas'  : importFileAreas,
     }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index f6ac84ba..04e79f34 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -64,6 +64,7 @@ actions:
 
   rm SRC [SRC...]              remove entry(s) from the system matching SRC
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+  import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
 
 scan args:
   --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
@@ -80,6 +81,9 @@ info args:
 
 remove args:
   --phys-file                  also remove underlying physical file
+
+import-areas args:
+  --create-dirs                create backing storage directories
 `,
     FileOpsInfo :
 `
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index d3653caf..0f1b5cfb 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -377,7 +377,7 @@ function importAreas() {
                 console.error(err.reason ? err.reason : err.message);
             } else {
                 const addFieldUpd = 'bbs' === importType ? '"name" and "desc"' : '"desc"';
-                console.info('Configuration generated.');
+                console.info('Import complete.');
                 console.info(`You may wish to validate changes made to ${getConfigPath()}`);
                 console.info(`as well as update ${addFieldUpd} fields, sorting, etc.`);
                 console.info('');

From 1520d46763397172410e269d59e0cd7281a04494 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan.ashby@storagecraft.com>
Date: Tue, 4 Dec 2018 16:56:05 -0700
Subject: [PATCH 0599/1013] File base doc updates

---
 docs/filebase/first-file-area.md | 58 +++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 7d7a133d..c494bbe8 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -2,34 +2,38 @@
 layout: page
 title: Configuring a File Base
 ---
+## Configuring a File Base
+ENiGMA½ offers a powerful and flexible file base. Configuration of file the file base and areas is handled via the `fileBase` section of `config.hjson`. 
+
 ## ENiGMA½ File Base Key Concepts
-Like many things in ENiGMA½, configuration of file base(s) is handled via `config.hjson` — specifically 
-in the `fileBase` section. First, there are a couple of concepts you should understand:
+First, there are some core concepts you should understand:
+* Storage Tags
+* Areas (and Area Tags)
 
+### Storage Tags
+*Storage Tags* define paths to physical (file) storage locations that are referenced in a file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths are relative to the value set by the `areaStoragePrefix` key (defaults to `/path/to/enigma-bbs/file_base`). 
 
-### Storage tags
-
-**Storage Tags** define paths to physical (file) storage locations that are referenced in a 
-file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths 
-are relative to the value set by the `areaStoragePrefix` key (defaults to `<enigma_install_dir/file_base`). 
-Below is an example defining a both a relative and fully qualified path each attached to a storage tag:
+Below is an example defining some storage tags using the relative and fully qualified forms:
 
 ```hjson
 storageTags: {
-	retro_pc: "retro_pc" // relative
-	retro_pc_bbs: "retro_pc/bbs" // still relative!
+	retro_pc_dos: "dos" // relative
+	retro_pc_bbs: "pc/bbs" // still relative!
 	bbs_stuff: "/path/to/bbs_stuff_storage" // fully qualified
 }
 ```
 
-Note that on their own, storage tags don't do anything — they are simply pointers to storage locations on your system. 
+:information_source: On their own, storage tags don't do anything — they are simply pointers to storage locations on your system.
 
 ### Areas
+File base *Areas* are configured using the `fileBase::areas` configuration block in `config.hjson`. Valid members for an area are as follows:
 
-File base **Areas** are configured using the `fileBase::areas` configuration block in `config.hjson`. 
-Each entry within `areas` must contain a `name`, `desc`, and `storageTags`. Remember that in ENiGMA½ 
-while areas are important, they should generally be used less than in tradditional BBS software. It is 
-recommended to favor the use of more **tags** over more areas. 
+| Item | Required | Description |
+|--------|---------------|------------------|
+| `name` | :+1: | Friendly area name. |
+| `desc` | :-1: | Friendly area description. |
+| `storageTags` : | :+1: | An array of storage tags for physical storage backing of the files in this area. If uploads are enabled for this area, **first ** storage tag location is utilized!** |
+| `sort` | :-1: | If present, provides the sort key for ordering. `name` is used otherwise. |
 
 Example areas section:
 
@@ -38,31 +42,39 @@ areas: {
 	retro_pc: {
 		name: Retro PC
 		desc: Oldschool PC/DOS
-		storageTags: [ "retro_pc", "retro_pc_bbs" ]
+		storageTags: [ "retro_pc_dos", "retro_pc_bbs" ]
 	}
 }
 ```
+The above example defines an area called "Retro PC" which is referenced via the *area tag* of `retro_pc`. Two storage tags are used: `retro_pc_dos`, and `retro_pc_bbs`. These storage tags can be seen in the Storage Tags example above.
 
 ## Example Configuration
-
-This combines the two concepts described above. When viewing the file areas from ENiGMA½ a user will 
-only see the "Retro PC" area, but the files in the area are stored in the two locations defined in the 
-`storageTags` section.
+This combines the two concepts described above. When viewing the file areas from ENiGMA½ a user will only see the "Retro PC" area, but the files in the area are stored in the two locations defined in the `storageTags` section. We also show a uploads area. Uploads are allowed do to the [ACS](acs.md) block. See [Uploads](uploads.md) for more information.
 
 ```hjson
 fileBase: {
 	areaStoragePrefix: /enigma-bbs/file_base
 
 	storageTags: {
-		retro_pc: "retro_pc"
-		retro_pc_bbs: "retro_pc/bbs"
+		retro_pc_dos: "dos"
+		retro_pc_bbs: "pc/bbs"
 	}
 
 	areas: {
 		retro_pc: {
 			name: Retro PC
 			desc: Oldschool PC/DOS
-			storageTags: [ "retro_pc", "retro_pc_bbs" ]
+			storageTags: [ "retro_pc_dos", "retro_pc_bbs" ]
+		}
+
+		uploads: {
+			name: Uploads
+			desc: User uploads
+			acs: {
+				// allow any user to upload here
+				write: GM[users]
+			}
+			storageTags: [ "user_uploads" ]
 		}
 	}
 }

From 1ea81a422629b3d1f6dcda537989721a31323347 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan.ashby@storagecraft.com>
Date: Tue, 4 Dec 2018 16:57:11 -0700
Subject: [PATCH 0600/1013] Minor typo

---
 docs/filebase/first-file-area.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index c494bbe8..810ec925 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -32,7 +32,7 @@ File base *Areas* are configured using the `fileBase::areas` configuration block
 |--------|---------------|------------------|
 | `name` | :+1: | Friendly area name. |
 | `desc` | :-1: | Friendly area description. |
-| `storageTags` : | :+1: | An array of storage tags for physical storage backing of the files in this area. If uploads are enabled for this area, **first ** storage tag location is utilized!** |
+| `storageTags` | :+1: | An array of storage tags for physical storage backing of the files in this area. If uploads are enabled for this area, **first ** storage tag location is utilized!** |
 | `sort` | :-1: | If present, provides the sort key for ordering. `name` is used otherwise. |
 
 Example areas section:

From 351807deb1d1abb8ccd0863d538be07aaa68dc26 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan.ashby@storagecraft.com>
Date: Tue, 4 Dec 2018 16:58:21 -0700
Subject: [PATCH 0601/1013] Another minor typo

---
 docs/filebase/first-file-area.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 810ec925..22c71aa4 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -32,7 +32,7 @@ File base *Areas* are configured using the `fileBase::areas` configuration block
 |--------|---------------|------------------|
 | `name` | :+1: | Friendly area name. |
 | `desc` | :-1: | Friendly area description. |
-| `storageTags` | :+1: | An array of storage tags for physical storage backing of the files in this area. If uploads are enabled for this area, **first ** storage tag location is utilized!** |
+| `storageTags` | :+1: | An array of storage tags for physical storage backing of the files in this area. If uploads are enabled for this area, **first** storage tag location is utilized! |
 | `sort` | :-1: | If present, provides the sort key for ordering. `name` is used otherwise. |
 
 Example areas section:

From 6f15622f2c67ba95afb6e207320ce7a70cbbea57 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan.ashby@storagecraft.com>
Date: Tue, 4 Dec 2018 16:59:56 -0700
Subject: [PATCH 0602/1013] Yet another...

---
 docs/filebase/first-file-area.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 22c71aa4..59e1e56b 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -49,7 +49,7 @@ areas: {
 The above example defines an area called "Retro PC" which is referenced via the *area tag* of `retro_pc`. Two storage tags are used: `retro_pc_dos`, and `retro_pc_bbs`. These storage tags can be seen in the Storage Tags example above.
 
 ## Example Configuration
-This combines the two concepts described above. When viewing the file areas from ENiGMA½ a user will only see the "Retro PC" area, but the files in the area are stored in the two locations defined in the `storageTags` section. We also show a uploads area. Uploads are allowed do to the [ACS](acs.md) block. See [Uploads](uploads.md) for more information.
+This combines the two concepts described above. When viewing the file areas from ENiGMA½ a user will only see the "Retro PC" area, but the files in the area are stored in the two locations defined in the `storageTags` section. We also show a uploads area. Uploads are allowed due to the [ACS](acs.md) block. See [Uploads](uploads.md) for more information.
 
 ```hjson
 fileBase: {

From 32986fa60b36235a92431899a7af40fe448bfb99 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 4 Dec 2018 18:24:43 -0700
Subject: [PATCH 0603/1013] Case sensitive note

---
 docs/filebase/first-file-area.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 59e1e56b..9879cd86 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -25,6 +25,8 @@ storageTags: {
 
 :information_source: On their own, storage tags don't do anything — they are simply pointers to storage locations on your system.
 
+:information_source: Remember that paths are case sensitive on most non-Windows systems!
+
 ### Areas
 File base *Areas* are configured using the `fileBase::areas` configuration block in `config.hjson`. Valid members for an area are as follows:
 

From dbc60e8746425ab9fe9437d76ea4fa0825045508 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 4 Dec 2018 19:39:00 -0700
Subject: [PATCH 0604/1013] Notes on oputil fb import-areas

---
 docs/admin/oputil.md | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 1e081afb..d7e69b0f 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -92,7 +92,7 @@ usage: oputil.js fb <action> [<args>]
 actions:
   scan AREA_TAG[@STORAGE_TAG]  scan specified area
                                may also contain optional GLOB as last parameter,
-                               for examle: scan some_area *.zip
+                               for example: scan some_area *.zip
 
   info CRITERIA                display information about areas and/or files
                                where CRITERIA is one of the following:
@@ -105,6 +105,7 @@ actions:
 
   rm SRC [SRC...]              remove entry(s) from the system matching SRC
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+  import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
 
 scan args:
   --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
@@ -122,6 +123,9 @@ info args:
 remove args:
   --phys-file                  also remove underlying physical file
 
+import-areas args:
+  --create-dirs                create backing storage directories
+
 general information:
   AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
                                example: retro@bbs
@@ -136,12 +140,12 @@ The `scan` action can (re)scan a file area for new entries as well as update (`-
 
 ##### Examples
 Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extensions:
-```
+```bash
 $ ./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
 ```
 
 Update all entries in the "artscene" area supplying the file tags "artscene", and "textmode".
-```
+```bash
 $ ./oputil.js fb scan --update --quick --tags artscene,textmode artscene`
 ```
 
@@ -155,8 +159,8 @@ The `info` action can retrieve information about an area or file entry(s).
 
 ##### Examples
 Information about a particular area:
-```
-$ ./oputil.js fb info retro_pc
+```bash
+./oputil.js fb info retro_pc
 areaTag: retro_pc
 name: Retro PC
 desc: Oldschool / retro PC
@@ -167,8 +171,8 @@ storageTag: retro_pc_tdc_1993 => /file_base/dos/tdc/1993
 ```
 
 Perhaps we want to fetch some information about a file in which we know piece of the filename:
-```
-$ ./oputil.js fb info "impulse*"
+```bash
+./oputil.js fb info "impulse*"
 file_id: 143
 sha_256: 547299301254ccd73eba4c0ec9cd6ab8c5929fbb655e72c4cc842f11332792d4
 area_tag: impulse_project
@@ -185,6 +189,16 @@ file_md5: 3455f74bbbf9539e69bd38f45e039a4e
 file_sha1: 558fab3b49a8ac302486e023a3c2a86bd4e4b948
 ```
 
+### Importing FileGate RAID Style Areas
+Given a FileGate "RAID" style `FILEGATE.ZXX` file, one can import areas.
+
+#### Example
+```bash
+./oputil.js fb import-areas FILEGATE.ZXX --create-dirs
+```
+
+The above command will process FILEGATE.ZXX creating areas and backing directories. Directories created are relative to the `fileBase.areaStoragePrefix` `config.hjson` setting.
+
 ## Message Base Management
 The `mb` command provides various Message Base related tools:
 

From 60369ea378be82cd76ba954577b9bd34dec919a3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 4 Dec 2018 20:42:56 -0700
Subject: [PATCH 0605/1013] * Note on FILEBONE.NA support * Notes on importing
 in file area docs

---
 core/oputil/oputil_file_base.js  | 4 +++-
 core/oputil/oputil_help.js       | 1 +
 docs/admin/oputil.md             | 1 +
 docs/filebase/first-file-area.md | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 9d847968..2077b385 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -711,6 +711,8 @@ function importFileAreas() {
     //  FILEGATE.ZXX "RAID" format currently the only supported format.
     //
     //  See http://www.filegate.net/info/filegate.zxx
+    //  ...same format as FILEBONE.NA:
+    //  http://wiki.mysticbbs.com/doku.php?id=mutil_import_filebone_na
     //
     const importPath = argv._[argv._.length - 1];
     if(argv._.length < 3 || !importPath || 0 === importPath.length) {
@@ -718,7 +720,7 @@ function importFileAreas() {
     }
 
     const importType = getFileBaseImportType(importPath);
-    if('zxx' !== importType) {
+    if(!['zxx', 'na'].includes(importType)) {
         return console.error(`"${importType}" is not a recognized import file type`);
     }
 
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 04e79f34..8b946edd 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -83,6 +83,7 @@ remove args:
   --phys-file                  also remove underlying physical file
 
 import-areas args:
+  --type TYPE                  sets import areas type. valid options are "zxx" or "na"
   --create-dirs                create backing storage directories
 `,
     FileOpsInfo :
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index d7e69b0f..c733070f 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -124,6 +124,7 @@ remove args:
   --phys-file                  also remove underlying physical file
 
 import-areas args:
+  --type TYPE                  sets import areas type. valid options are "zxx" or "na"
   --create-dirs                create backing storage directories
 
 general information:
diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 9879cd86..ab76fe24 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -82,3 +82,5 @@ fileBase: {
 }
 ```
 
+## Importing Areas
+Areas can also be imported using [oputil](/docs/admin/oputil.md) using proper FileGate "RAID" aka `FILEBONE.NA` style files. After importing areas, you may wish to tweak configuration such as better `desc` fields, ACS, or sorting.

From 0e2593bd1c6e7123d4f33170b7d1703e223baf63 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 4 Dec 2018 20:47:29 -0700
Subject: [PATCH 0606/1013] More notes on importing file areas

---
 docs/admin/oputil.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index c733070f..285d96fa 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -191,13 +191,20 @@ file_sha1: 558fab3b49a8ac302486e023a3c2a86bd4e4b948
 ```
 
 ### Importing FileGate RAID Style Areas
-Given a FileGate "RAID" style `FILEGATE.ZXX` file, one can import areas.
+Given a FileGate "RAID" style `FILEGATE.ZXX` file, one can import areas. This format also often comes in FTN-style info packs in the form of a `.NA` file i.e.: `FILEBONE.NA`.
 
 #### Example
 ```bash
 ./oputil.js fb import-areas FILEGATE.ZXX --create-dirs
 ```
 
+-or-
+
+```bash
+# fsxNet info packs contain a FSX_FILE.NA file
+./oputil.js fb import-areas FSX_FILE.NA --create-dirs --type NA
+```
+
 The above command will process FILEGATE.ZXX creating areas and backing directories. Directories created are relative to the `fileBase.areaStoragePrefix` `config.hjson` setting.
 
 ## Message Base Management

From ecb0cd89412c5ffecb5711450e7e91a8cf1e491f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Dec 2018 00:43:20 -0700
Subject: [PATCH 0607/1013] Minor door updates

---
 core/abracadabra.js |  4 +++-
 core/door.js        | 24 +++++++++++++++++-------
 core/dropfile.js    |  4 +++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 32c4466a..e448315b 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -9,9 +9,11 @@ const ansi              = require('./ansi_term.js');
 const Events            = require('./events.js');
 const { Errors }        = require('./enig_error.js');
 
+//  deps
 const async             = require('async');
 const assert            = require('assert');
 const _                 = require('lodash');
+const paths             = require('path');
 
 const activeDoorNodeInstances = {};
 
@@ -153,7 +155,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
         const exeInfo = {
             cmd             : this.config.cmd,
-            cwd             : this.config.cwd,  //  null/undefined = parent_of(cmd)
+            cwd             : this.config.cwd || paths.dirname(this.config.cmd),
             args            : this.config.args,
             io              : this.config.io || 'stdio',
             encoding        : this.config.encoding || 'cp437',
diff --git a/core/door.js b/core/door.js
index d6326cbe..eb01d6fa 100644
--- a/core/door.js
+++ b/core/door.js
@@ -71,13 +71,23 @@ module.exports = class Door {
 
         const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
 
-        const door = pty.spawn(exeInfo.cmd, args, {
-            cols        : this.client.term.termWidth,
-            rows        : this.client.term.termHeight,
-            cwd         : cwd,
-            env         : exeInfo.env,
-            encoding    : null, //  we want to handle all encoding ourself
-        });
+        this.client.log.debug(
+            { cmd : exeInfo.cmd, args, io : this.io },
+            'Executing door'
+        );
+
+        let door;
+        try {
+            door = pty.spawn(exeInfo.cmd, args, {
+                cols        : this.client.term.termWidth,
+                rows        : this.client.term.termHeight,
+                cwd         : cwd,
+                env         : exeInfo.env,
+                encoding    : null, //  we want to handle all encoding ourself
+            });
+        } catch(e) {
+            return cb(e);
+        }
 
         if('stdio' === this.io) {
             this.client.log.debug('Using stdio for door I/O');
diff --git a/core/dropfile.js b/core/dropfile.js
index 6595aa1a..eb3d9136 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -16,6 +16,7 @@ const { mkdirs }    = require('fs-extra');
 
 //
 //  Resources
+//  * https://github.com/NuSkooler/ansi-bbs/tree/master/docs/dropfile_formats
 //  * http://goldfndr.home.mindspring.com/dropfile/
 //  * https://en.wikipedia.org/wiki/Talk%3ADropfile
 //  * http://thoughtproject.com/libraries/bbs/Sysop/Doors/DropFiles/index.htm
@@ -36,7 +37,7 @@ module.exports = class DropFile {
     get fileName() {
         return {
             DOOR            : 'DOOR.SYS',                   //  GAP BBS, many others
-            DOOR32          : 'DOOR32.SYS',                 //  EleBBS / Mystic, Syncronet, Maximus, Telegard, AdeptXBBS, ...
+            DOOR32          : 'door32.sys',                 //  Mystic, EleBBS, Syncronet, Maximus, Telegard, AdeptXBBS (lowercase name as per spec)
             CALLINFO        : 'CALLINFO.BBS',               //  Citadel?
             DORINFO         : this.getDoorInfoFileName(),   //  RBBS, RemoteAccess, QBBS, ...
             CHAIN           : 'CHAIN.TXT',                  //  WWIV
@@ -155,6 +156,7 @@ module.exports = class DropFile {
         //
         //  Resources:
         //  * http://wiki.bbses.info/index.php/DOOR32.SYS
+        //  * https://github.com/NuSkooler/ansi-bbs/blob/master/docs/dropfile_formats/door32_sys.txt
         //
         //  :TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
         const Door32CommTypes = {

From 2474e82829184289b0c9ea0da12d1511199612b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Dec 2018 23:41:42 -0700
Subject: [PATCH 0608/1013] Change default dropfile path to just
 ./enigma-bbs/drop/ so we can have a shorter name for Win16 binaries

---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 3f4aeb61..345f4c09 100644
--- a/core/config.js
+++ b/core/config.js
@@ -261,7 +261,7 @@ function getDefaultConfig() {
             logs                : paths.join(__dirname, './../logs/'),  //  :TODO: set up based on system, e.g. /var/logs/enigmabbs or such
             db                  : paths.join(__dirname, './../db/'),
             modsDb              : paths.join(__dirname, './../db/mods/'),
-            dropFiles           : paths.join(__dirname, './../dropfiles/'), //  + "/node<x>/
+            dropFiles           : paths.join(__dirname, './../drop/'), //  + "/node<x>/
             misc                : paths.join(__dirname, './../misc/'),
         },
 

From fd59a8512b708e756859869c3756d22670df2941 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Dec 2018 23:42:14 -0700
Subject: [PATCH 0609/1013] Lots of local door doc cleanup + notes on bivrost!
 / shared file descriptor usage

---
 docs/modding/local-doors.md | 171 +++++++++++++++++++++++-------------
 1 file changed, 109 insertions(+), 62 deletions(-)

diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index b5c56f9c..06b80ac1 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -10,37 +10,48 @@ The `abracadabra` module provides a generic and flexible solution for many door
 
 ### Configuration
 The `abracadabra` `config` block can contain the following members:
-* `name`: Used as a key for tracking number of clients using a particular door.
-* `dropFileType`: Specifies the type of drop file to generate (See **Argument Variables** below).
-* `cmd`: Path to executable to launch.
-* `args`: Array of argument(s) to pass to `cmd`. See below for information on variables that can be used here.
-* `cwd`: Set the Current Working Directory for `cmd`. Defaults to the directory of `cmd`.
-* `nodeMax`: Max number of nodes that can access this door at once. Uses `name` as a mapping key
-* `tooManyArt`: Art file spec to display if too many instances are already in use
-* `io`: Where to process I/O. Can be `stdio` or `socket`. When using `stdio`, I/O is input/output from stdin/stdout. When using `socket` a temporary socket server is spawned that can be connected to. The server listens on localhost on `{srvPort}` (see below under Argument Variables).
-* `encoding`: Specify the door's encoding. Defaults to `cp437`. Linux binaries for example, often produce `utf8`.
 
-#### Drop File Types
-Drop file types specified by `dropFileType`:
-* `DOOR`: [DOOR.SYS](http://goldfndr.home.mindspring.com/dropfile/doorsys.htm)
-* `DOOR32`: [DOOR32.SYS](https://raw.githubusercontent.com/NuSkooler/ansi-bbs/master/docs/dropfile_formats/door32_sys.txt)
-* `DORINFO`: [DORINFOx.DEF](http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm)
+| Item | Required | Description |
+|------|----------|-------------|
+| `name` | :+1: | Used as a key for tracking number of clients using a particular door. |
+| `dropFileType` | :+1: | Specifies the type of dropfile to generate (See **Dropfile Types** below). |
+| `cmd` | :+1: | Path to executable to launch. |
+| `args` | :-1: | Array of argument(s) to pass to `cmd`. See **Argument Variables** below for information on variables that can be used here.
+| `cwd` | :-1: | Sets the Current Working Directory (CWD) for `cmd`. Defaults to the directory of `cmd`. | 
+| `nodeMax` | :-1: | Max number of nodes that can access this door at once. Uses `name` as a tracking key. |
+| `tooManyArt` | :-1: | Art spec to display if too many instances are already in use. |
+| `io` | :-1: | How to process input/output (I/O). Can be `stdio` or `socket`. When using `stdio`, I/O is handled via standard stdin/stdout. When using `socket` a temporary socket server is spawned that can be connected back to. The server listens on localhost on `{srvPort}` (See **Argument Variables** below for more information). Default value is `stdio`. |
+| `encoding` | :-1: | Sets the **door's** encoding. Defaults to `cp437`. Linux binaries often produce `utf8`. |
+
+#### Dropfile Types
+Dropfile types specified by `dropFileType`:
+
+| Value | Description |
+|-------|-------------|
+| `DOOR` | [DOOR.SYS](http://goldfndr.home.mindspring.com/dropfile/doorsys.htm)
+| `DOOR32` | [DOOR32.SYS](https://raw.githubusercontent.com/NuSkooler/ansi-bbs/master/docs/dropfile_formats/door32_sys.txt)
+| `DORINFO` | [DORINFOx.DEF](http://goldfndr.home.mindspring.com/dropfile/dorinfo.htm)
 
 #### Argument Variables
 The following variables may be used in `args` entries:
-* `{node}`: Current node number.
-* `{dropFile}`: Drop _filename_ only.
-* `{dropFilePath}`: Full path to generated drop file.
-* `{userId}`: Current user ID.
-* `{userName}`: _Sanitized_ username. Safe for filenames, etc.
-* `{userNameRaw}`: _Raw_ username. May not be safe for filenames!
-* `{srvPort}`: Temporary server port when `io` is set to `socket`.
-* `{cwd}`: Current Working Directory.
 
-Example:
+| Variable | Description | Example |
+|----------|-------------|---------|
+| `{node}` | Current node number. | `1` |
+| `{dropFile}` | Dropfile _filename_ only. | `DOOR.SYS` |
+| `{dropFilePath}` | Full path to generated dropfile. The system places dropfiles in the path set by `paths.dropFiles` in `config.hjson`. | `C:\enigma-bbs\drop\node1\DOOR.SYS` |
+| `{userId}` | Current user ID. | `420` |
+| `{userName}` | _Sanitized_ username. Safe for filenames, etc. | `izard` |
+| `{userNameRaw}` | _Raw_ username. May not be safe for filenames! | `\/\/izard` |
+| `{srvPort}` | Temporary server port when `io` is set to `socket`. | `1234` |
+| `{cwd}` | Current Working Directory. | `/home/enigma-bbs/doors/foo/` |
+
+Example `args` member using some variables described above:
 ```hjson
 args: [
-    "-D", "{dropFile}", "-N", "{node}"
+    "-D", "{dropFilePath}",
+    "-N", "{node}"
+    "-U", "{userId}"
 ]
 ```
 
@@ -63,7 +74,7 @@ $_com1 = "virtual"
 
 The line `$_com1 = "virtual"` tells DOSEMU to use `stdio` as a virtual serial port on COM1.
 
-Next, we create a virtual **X** drive for Pimp Wars to live such as `/enigma-bbs/DOS/X/PW` and map it with a custom `autoexec.bat` file within DOSEMU:
+Next, we create a virtual **X** drive for Pimp Wars to live such as `/enigma-bbs/DOS/X/PW` and map it with a custom `AUTOEXEC.BAT` file within DOSEMU:
 ```
 @echo off
 path d:\bin;d:\gnu;d:\dosemu
@@ -80,30 +91,70 @@ Note that we also have the [BNU](http://www.pcmicro.com/bnu/) FOSSIL driver inst
 Finally, let's create a `menu.hjson` entry to launch the game:
 ```hjson
 doorPimpWars: {
-	desc: Playing PimpWars
-	module: abracadabra			
-	config: {
-		name: PimpWars
-		dropFileType: DORINFO
-		cmd: /usr/bin/dosemu
-		args: [ 
-			"-quiet", 
+    desc: Playing PimpWars
+    module: abracadabra
+    config: {
+        name: PimpWars
+        dropFileType: DORINFO
+        cmd: /usr/bin/dosemu
+        args: [
+            "-quiet",
             "-f", 
             "/path/to/dosemu.conf", 
             "X:\\PW\\START.BAT {dropFile} {node}"
-		],
-		nodeMax: 1
-		tooManyArt: DOORMANY
+        ],
+        nodeMax: 1
+        tooManyArt: DOORMANY
         io: stdio
-	}
+    }
 }
-
 ```
 
-### QEMU with abracadabra
-[QEMU](http://wiki.qemu.org/Main_Page) provides a robust, cross platform solution for launching doors under many platforms (likely anwywhere Node.js is supported and ENiGMA½ can run). Note however that there is an important and major caveat: **Multiple instances of a particular door/OS image should not be run at once!** Being more flexible means being a bit more complex. Let's look at an example for running L.O.R.D. under a UNIX like system such as Linux or FreeBSD.
+### Shared Socket Descriptors
+Due to Node.js limitations, ENiGMA½ does not _directly_ support `DOOR32.SYS` style socket descriptor sharing (other `DOOR32.SYS` features are fully supported). However, a separate binary called [bivrost!](https://github.com/NuSkooler/bivrost) can be used. bivrost! is available for Windows and Linux x86/i686 and x86_64/AMD64. Other platforms where [Rust](https://www.rust-lang.org/) builds are likely to work as well.
 
-Basically we'll be creating a bootstrap shell script that generates a temporary node specific `go.bat` to launch our door. This will be called from `autoexec.bat` within our QEMU FreeDOS partition.
+#### Example configuration
+Below is an example `menu.hjson` entry using bivrost! to launch a door:
+
+```hjson
+doorWithBivrost: {
+    desc: Bivrost Example
+    module: abracadabra
+    config: {
+        name: BivrostExample
+        dropFileType: DOOR32
+        cmd: "C:\\enigma-bbs\\utils\\bivrost.exe"
+        args: [
+            "--port", "{srvPort}",          //  bivrost! will connect this port on localhost
+            "--dropfile", "{dropFilePath}", //  ...and read this DOOR32.SYS produced by ENiGMA½
+            "--out", "C:\\doors\\jezebel",  //  ...and produce a NEW DOOR32.SYS here.
+
+            //
+            //  Note that the final <target> params bivrost! will use to
+            //  launch the door are grouped here. The {fd} variable could
+            //  also be supplied here if needed.
+            //
+            "C:\\door\\door.exe C:\\door\\door32.sys"
+        ],
+        nodeMax: 1
+        tooManyArt: DOORMANY
+        io: socket
+    }
+}
+```
+
+Please see the [bivrost!](https://github.com/NuSkooler/bivrost) documentation for more information.
+
+#### Phenom Productions Releases
+Pre-built binaries of bivrost! have been released under [Phenom Productions](https://www.phenomprod.com/) and can be found on various boards.
+
+#### Alternative Workarounds
+Alternative workarounds include Telnet Bridge (`telnet_bridge` module) to hook up Telnet-accessible (including local) door servers -- It may also be possible bridge via [NET2BBS](http://pcmicro.com/netfoss/guide/net2bbs.html).
+
+### QEMU with abracadabra
+[QEMU](http://wiki.qemu.org/Main_Page) provides a robust, cross platform solution for launching doors under many platforms (likely anywhere Node.js is supported and ENiGMA½ can run). Note however that there is an important and major caveat: **Multiple instances of a particular door/OS image should not be run at once!** Being more flexible means being a bit more complex. Let's look at an example for running L.O.R.D. under a UNIX like system such as Linux or FreeBSD.
+
+Basically we'll be creating a bootstrap shell script that generates a temporary node specific `GO.BAT` to launch our door. This will be called from `AUTOEXEC.BAT` within our QEMU FreeDOS partition.
 
 #### Step 1: Create a FreeDOS image
 [FreeDOS](http://www.freedos.org/) is a free mostly MS-DOS compatible DOS package that works well for running 16bit doors. Follow the [QEMU/FreeDOS](https://en.wikibooks.org/wiki/QEMU/FreeDOS) guide for creating an `freedos_c.img`. This will contain FreeDOS itself and installed BBS doors.
@@ -114,7 +165,7 @@ qemu-system-i386 -localtime /home/enigma/dos/images/freedos_c.img -hdb fat:/path
 ```
 
 With the above you can now copy files from D: to C: within FreeDOS and add the following to it's `autoexec.bat`:
-```batch
+```bat
 CALL E:\GO.BAT
 ```
 
@@ -146,7 +197,7 @@ unix2dos /home/enigma/dos/go/node$NODE/GO.BAT
 qemu-system-i386 -localtime /home/enigma/dos/images/freedos_c.img -chardev socket,port=$SRVPORT,nowait,host=localhost,id=s0 -device isa-serial,chardev=s0 -hdb fat:/home/enigma/xibalba/dropfiles/node$NODE -hdc fat:/home/enigma/dos/go/node$NODE -nographic
 ```
 
-Note the `qemu-system-i386` line. We're telling QEMU to launch and use localtime for the clock, create a character device that connects to our temporary server port on localhost and map that to a serial device. The `-hdb` entry will represent the D: drive where our drop file is generated, while `-hdc` is the path that `GO.BAT` is generated in (`E:\GO.BAT`). Finally we specify `-nographic` to run headless.
+Note the `qemu-system-i386` line. We're telling QEMU to launch and use localtime for the clock, create a character device that connects to our temporary server port on localhost and map that to a serial device. The `-hdb` entry will represent the D: drive where our dropfile is generated, while `-hdc` is the path that `GO.BAT` is generated in (`E:\GO.BAT`). Finally we specify `-nographic` to run headless.
 
 For doors that do not *require* a FOSSIL driver, it is recommended to not load or use one unless you are having issues.
 
@@ -154,29 +205,25 @@ For doors that do not *require* a FOSSIL driver, it is recommended to not load o
 Finally we can create a `menu.hjson` entry using the `abracadabra` module:
 ```hjson
 doorLORD: {
-	desc: Playing L.O.R.D.
-	module: abracadabra			
-	config: {
-		name: LORD
-		dropFileType: DOOR
-		cmd: /home/enigma/dos/scripts/lord.sh
-		args: [ 
-			"{node}",
-			"{dropFile}",
-			"{srvPort}",
-		],
-		nodeMax: 1
-		tooManyArt: DOORMANY
-		io: socket
-	}
+    desc: Playing L.O.R.D.
+    module: abracadabra
+    config: {
+        name: LORD
+        dropFileType: DOOR
+        cmd: /home/enigma/dos/scripts/lord.sh
+        args: [
+            "{node}",
+            "{dropFile}",
+            "{srvPort}",
+        ],
+        nodeMax: 1
+        tooManyArt: DOORMANY
+        io: socket
+    }
 }
 ```
 
-## Shared Socket Descriptors
-As of this writing `DOOR32.SYS` style socket descriptor sharing is **not** supported. Workarounds include using the Telnet Bridge (`telnet_bridge` module) to hook up to local Telnet-accessible door servers such as [NET2BBS](http://pcmicro.com/netfoss/guide/net2bbs.html).
-
 ## Additional Resources
-
 ### DOSBox
 * [DOSBox-X](https://github.com/joncampbell123/dosbox-x)
 

From a8604ece5479ec253dc6a41121122864162d3a79 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 00:17:03 -0700
Subject: [PATCH 0610/1013] Ensure 'userName' has _something_ if sanatized all
 the way out

---
 core/door.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/door.js b/core/door.js
index eb01d6fa..120bd6f3 100644
--- a/core/door.js
+++ b/core/door.js
@@ -64,7 +64,7 @@ module.exports = class Door {
             node            : exeInfo.node.toString(),
             srvPort         : this.sockServer ? this.sockServer.address().port.toString() : '-1',
             userId          : this.client.user.userId.toString(),
-            userName        : sanatizeFilename(this.client.user.username),
+            userName        : sanatizeFilename(this.client.user.username) || `user${this.client.user.userId.toString()}`,
             userNameRaw     : this.client.user.username,
             cwd             : cwd,
         };

From 8652b35b46873ff12081f84eec15f4933d02c1d3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 01:01:55 -0700
Subject: [PATCH 0611/1013] Code cleanup & resolve some minor TODO's in
 dropfile gen

---
 core/door.js     |  3 +--
 core/dropfile.js | 33 ++++++++++++++++++---------------
 core/user.js     | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/core/door.js b/core/door.js
index 120bd6f3..b07c89bc 100644
--- a/core/door.js
+++ b/core/door.js
@@ -9,7 +9,6 @@ const pty               = require('node-pty');
 const decode            = require('iconv-lite').decode;
 const createServer      = require('net').createServer;
 const paths             = require('path');
-const sanatizeFilename  = require('sanitize-filename');
 
 module.exports = class Door {
     constructor(client) {
@@ -64,7 +63,7 @@ module.exports = class Door {
             node            : exeInfo.node.toString(),
             srvPort         : this.sockServer ? this.sockServer.address().port.toString() : '-1',
             userId          : this.client.user.userId.toString(),
-            userName        : sanatizeFilename(this.client.user.username) || `user${this.client.user.userId.toString()}`,
+            userName        : this.client.user.getSanitizedName(),
             userNameRaw     : this.client.user.username,
             cwd             : cwd,
         };
diff --git a/core/dropfile.js b/core/dropfile.js
index eb3d9136..0c66d38a 100644
--- a/core/dropfile.js
+++ b/core/dropfile.js
@@ -5,6 +5,7 @@
 const Config        = require('./config.js').get;
 const StatLog       = require('./stat_log.js');
 const UserProps     = require('./user_property.js');
+const SysProps      = require('./system_property.js');
 
 //  deps
 const fs            = require('graceful-fs');
@@ -86,9 +87,14 @@ module.exports = class DropFile {
         const prop      = this.client.user.properties;
         const now       = moment();
         const secLevel  = this.client.user.getLegacySecurityLevel().toString();
-        const fullName  = prop[UserProps.RealName] || this.client.user.username;
+        const fullName  = this.client.user.getSanitizedName('real');
         const bd        = moment(prop[UserProps.Birthdate]).format('MM/DD/YY');
 
+        const upK   = Math.floor((parseInt(prop[UserProps.FileUlTotalBytes]) || 0) / 1024);
+        const downK = Math.floor((parseInt(prop[UserProps.FileDlTotalBytes]) || 0) / 1024);
+
+        const timeOfCall = moment(prop[UserProps.LastLoginTs] || moment()).format('hh:mm');
+
         //  :TODO: fix time remaining
         //  :TODO: fix default protocol -- user prop: transfer_protocol
         return iconv.encode( [
@@ -127,8 +133,8 @@ module.exports = class DropFile {
             bd,                                                 //  "Caller's Birthdate"
             'X:\\MAIN\\',                                       //  "Path to the MAIN directory (where User File is)"
             'X:\\GEN\\',                                        //  "Path to the GEN directory"
-            StatLog.getSystemStat('sysop_username'),            //  "Sysop's Name (name BBS refers to Sysop as)"
-            this.client.user.username,                          //  "Alias name"
+            StatLog.getSystemStat(SysProps.SysOpUsername),      //  "Sysop's Name (name BBS refers to Sysop as)"
+            this.client.user.getSanitizedName(),                //  "Alias name"
             '00:05',                                            //  "Event time                        (hh:mm)" (note: wat?)
             'Y',                                                //  "If its an error correcting connection (Y/N)"
             'Y',                                                //  "ANSI supported & caller using NG mode (Y/N)"
@@ -137,18 +143,15 @@ module.exports = class DropFile {
             //  :TODO: fix minutes here also:
             '256',                                              //  "Time Credits In Minutes (positive/negative)"
             '07/07/90',                                         //  "Last New Files Scan Date          (mm/dd/yy)"
-            //  :TODO: fix last vs now times:
-            now.format('hh:mm'),                                //  "Time of This Call"
-            now.format('hh:mm'),                                //  "Time of Last Call                 (hh:mm)"
+            timeOfCall,                                         //  "Time of This Call"
+            timeOfCall,                                         //  "Time of Last Call                 (hh:mm)"
             '9999',                                             //  "Maximum daily files available"
-            //  :TODO: fix these stats:
-            '0',                                                //  "Files d/led so far today"          
-            '0',                                                //  "Total "K" Bytes Uploaded"
-            '0',                                                //  "Total "K" Bytes Downloaded"
+            '0',                                                //  "Files d/led so far today"
+            upK.toString(),                                     //  "Total "K" Bytes Uploaded"
+            downK.toString(),                                   //  "Total "K" Bytes Downloaded"
             prop[UserProps.UserComment] || 'None',              //  "User Comment"
             '0',                                                //  "Total Doors Opened"
             '0',                                                //  "Total Messages Left"
-
         ].join('\r\n') + '\r\n', 'cp437');
     }
 
@@ -173,8 +176,8 @@ module.exports = class DropFile {
             '115200',
             Config().general.boardName,
             this.client.user.userId.toString(),
-            this.client.user.properties[UserProps.RealName] || this.client.user.username,
-            this.client.user.username,
+            this.client.user.getSanitizedName('real'),
+            this.client.user.getSanitizedName(),
             this.client.user.getLegacySecurityLevel().toString(),
             '546',  //  :TODO: Minutes left!
             '1',    //  ANSI
@@ -191,8 +194,8 @@ module.exports = class DropFile {
         //
         //  Note that usernames are just used for first/last names here
         //
-        const opUserName    = /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0];
-        const userName      = /[^\s]*/.exec(this.client.user.username)[0];
+        const opUserName    = /[^\s]*/.exec(StatLog.getSystemStat(SysProps.SysOpUsername))[0];
+        const userName      = /[^\s]*/.exec(this.client.user.getSanitizedName())[0];
         const secLevel      = this.client.user.getLegacySecurityLevel().toString();
         const location      = this.client.user.properties[UserProps.Location];
 
diff --git a/core/user.js b/core/user.js
index 0121133a..ba89b387 100644
--- a/core/user.js
+++ b/core/user.js
@@ -15,11 +15,12 @@ const Log           = require('./logger.js').log;
 const StatLog       = require('./stat_log.js');
 
 //  deps
-const crypto        = require('crypto');
-const assert        = require('assert');
-const async         = require('async');
-const _             = require('lodash');
-const moment        = require('moment');
+const crypto            = require('crypto');
+const assert            = require('assert');
+const async             = require('async');
+const _                 = require('lodash');
+const moment            = require('moment');
+const sanatizeFilename  = require('sanitize-filename');
 
 exports.isRootUserId = function(id) { return 1 === id; };
 
@@ -114,6 +115,11 @@ module.exports = class User {
         return isMember;
     }
 
+    getSanitizedName(type='username') {
+        const name = 'real' === type ? this.getProperty(UserProps.RealName) : this.username;
+        return sanatizeFilename(name) || `user${this.userId.toString()}`;
+    }
+
     getLegacySecurityLevel() {
         if(this.isRoot() || this.isGroupMember('sysops')) {
             return 100;

From 4bceb74cc405ee53ca81381ff950000bdcf4de29 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 01:22:33 -0700
Subject: [PATCH 0612/1013] ACS doc improvements

---
 docs/configuration/acs.md                     | 22 +++++++++----
 .../configuring-a-message-area.md             | 32 ++++++++++++++-----
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index dde55709..1ed83bb5 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -4,7 +4,7 @@ title: Access Condition System (ACS)
 ---
 
 ## Access Condition System (ACS)
-ENiGMA½ uses an Access Condition System (ACS) that is both familure to oldschool BBS operators and has it's own style. With ACS, SysOp's are able to control access to various areas of the system based on various conditions such as group membership, connection type, etc. Various touch points in the system are configured to allow for `acs` checks. In some cases ACS is a simple boolean check while others (via ACS blocks) allow to define what conditions must be true for certain _rights_ such as `read` and `write` (though others exist as well).
+ENiGMA½ uses an Access Condition System (ACS) that is both familiar to oldschool BBS operators and has it's own style. With ACS, SysOp's are able to control access to various areas of the system based on various conditions such as group membership, connection type, etc. Various touch points in the system are configured to allow for `acs` checks. In some cases ACS is a simple boolean check while others (via ACS blocks) allow to define what conditions must be true for certain _rights_ such as `read` and `write` (though others exist as well).
 
 ## ACS Codes
 The following are ACS codes available as of this writing:
@@ -48,20 +48,30 @@ The following logical operators are supported:
 
 ENiGMA½ also supports groupings using `(` and `)`. Lastly, some ACS codes allow for lists of acceptable values using `[` and `]` — for example, `GM[users,sysops]`.
 
-### Examples
+### Example ACS Strings
 * `NC2`: User must have called two more more times for the check to return true (to pass)
 * `ID1`: User must be ID 1 (the +op)
 * `GM[elite,power]`: User must be a member of the `elite` or `power` user group (they could be both)
 * `ID1|GM[co-op]`: User must be ID 1 (SysOp!) or belong to the `co-op` group
 * `!TH24`: Terminal height must NOT be 24
 
+## ACS Blocks
+Some areas of the system require more than a single ACS string. In these situations an *ACS block* is used to allow for finer grain control. As an example, consider the following file area `acs` block:
+```hjson
+acs: {
+    read: GM[users]
+    write: GM[sysops,co-ops]
+    download: GM[elite-users]
+}
+```
+
+All `users` can read (see) the area, `sysops` and `co-ops` can write (upload), and only members of the `elite-users` group can download.
 
 ## ACS Touch Points
 The following touch points exist in the system. Many more are planned:
 
-* Message conferences and areas
-* File base areas
-* Menus within `menu.hjson`. See [Menu HJSON](menu-hjson.md).
-
+* [Message conferences and areas](/docs/messageareas/configuring-a-message-area.md)
+* [File base areas](/docs/filebase/first-file-area.md) and [Uploads](/docs/filebase/uploads.md)
+* Menus within [Menu HJSON (menu.hjson)](menu-hjson.md)
 
 See the specific areas documentation for information on available ACS checks.
diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md
index 8e8b5a33..63af2826 100644
--- a/docs/messageareas/configuring-a-message-area.md
+++ b/docs/messageareas/configuring-a-message-area.md
@@ -10,13 +10,18 @@ Message Conferences are the top level container for *1:n* Message *Areas* via th
 
 Each conference is represented by a entry under `messageConferences`. Each entries top level key is it's *conference tag*.
 
-| Config Item | Required | Description                                                                     |
-|-------------|----------|---------------------------------------------------------------------------------|
-| `name`      | :+1:     | Friendly conference name |
-| `desc`      | :+1:     | Friendly conference description. |
-| `sort`      | :-1:     | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
-| `default`   | :-1:     | Specify `true` to make this the default conference (e.g. assigned to new users) |
-| `areas`     | :+1:     | Container of 1:n areas described below |
+| Config Item | Required | Description |
+|-------------|----------|-------------|
+| `name`      | :+1: | Friendly conference name |
+| `desc`      | :+1: | Friendly conference description. |
+| `sort`      | :-1: | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
+| `default`   | :-1: | Specify `true` to make this the default conference (e.g. assigned to new users) |
+| `areas`     | :+1: | Container of 1:n areas described below |
+| `acs`       | :-1: | A standard [ACS](/docs/configuration/acs.md) block. See **ACS** below. |
+
+### ACS
+An optional standard [ACS](/docs/configuration/acs.md) block can be supplied with the following rules:
+* `read`: ACS require to read (see) this conference. Defaults to `GM[users]`.
 
 ### Example
 
@@ -28,6 +33,9 @@ Each conference is represented by a entry under `messageConferences`. Each entri
       desc: Local discussion
       sort: 1
       default: true
+      acs: {
+        read: GM[users] // default
+      }
     }
   }
 }
@@ -42,6 +50,11 @@ Message Areas are topic specific containers for messages that live within a part
 | `desc`      | :+1:     | Friendly area description. |
 | `sort`      | :-1:     | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
 | `default`   | :-1:     | Specify `true` to make this the default area (e.g. assigned to new users) |
+| `acs`       | :-1: | A standard [ACS](/docs/configuration/acs.md) block. See **ACS** below. |
+
+### ACS
+An optional standard [ACS](/docs/configuration/acs.md) block can be supplied with the following rules:
+* `read`: ACS require to read (see) this conference. Defaults to `GM[users]`.
 
 ### Example
 
@@ -54,7 +67,10 @@ messageConferences: {
         name: ENiGMA 1/2 Development   
         desc: ENiGMA 1/2 discussion!   
         sort: 1                        
-        default: true                   
+        default: true
+        acs: {
+          read: GM[users] // default
+        }
       }
     }
   }

From 167916e8dd47070e4c79051ea3a1f194ce6afb85 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 02:20:50 -0700
Subject: [PATCH 0613/1013] Fix bug in findByFullPath()

---
 core/file_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_entry.js b/core/file_entry.js
index bb7a4e12..9ba1c692 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -401,7 +401,7 @@ module.exports = class FileEntry {
     //  Checkums may have changed and are not validated here.
     static findByFullPath(fullPath, cb) {
         //  first, basic by-filename lookup.
-        FileEntry.findByFileNameWildcard(paths.basename(fuillPath), (err, entries) => {
+        FileEntry.findByFileNameWildcard(paths.basename(fullPath), (err, entries) => {
             if(err) {
                 return cb(err);
             }

From 704c242aa442f220a3a95deb49e95cdb98ae0c97 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 02:32:20 -0700
Subject: [PATCH 0614/1013] Fix bug in newScanMessageArea()

---
 core/new_scan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/new_scan.js b/core/new_scan.js
index 55cbedc3..ac741ab3 100644
--- a/core/new_scan.js
+++ b/core/new_scan.js
@@ -113,7 +113,7 @@ exports.getModule = class NewScanModule extends MenuModule {
         //  :TODO: it would be nice to cache this - must be done by conf!
         const omitMessageAreaTags = valueAsArray(_.get(this, 'menuConfig.config.omitMessageAreaTags', []));
         const sortedAreas = msgArea.getSortedAvailMessageAreasByConfTag(conf.confTag, { client : this.client } ).filter(area => {
-            return area => !omitMessageAreaTags.includes(area.areaTag);
+            return !omitMessageAreaTags.includes(area.areaTag);
         });
         const currentArea = sortedAreas[this.currentScanAux.area];
 

From 844286ea1ce1d4ded8728eda085c5007821da476 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 02:32:41 -0700
Subject: [PATCH 0615/1013] Use constants

---
 core/menu_stack.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/menu_stack.js b/core/menu_stack.js
index 3e9c455b..080d0efa 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -3,7 +3,10 @@
 
 //  ENiGMA½
 const loadMenu  = require('./menu_util.js').loadMenu;
-const Errors    = require('./enig_error.js').Errors;
+const {
+    Errors,
+    ErrorReasons
+}               = require('./enig_error.js');
 
 //  deps
 const _         = require('lodash');
@@ -43,26 +46,23 @@ module.exports = class MenuStack {
 
     get currentModule() {
         const top = this.top();
-        if(top) {
-            return top.instance;
-        }
+        assert(top, 'Empty menu stack!');
+        return top.instance;
     }
 
     next(cb) {
         const currentModuleInfo = this.top();
-        assert(currentModuleInfo, 'Empty menu stack!');
-
-        const menuConfig    = currentModuleInfo.instance.menuConfig;
-        const nextMenu      = this.client.acs.getConditionalValue(menuConfig.next, 'next');
+        const menuConfig        = currentModuleInfo.instance.menuConfig;
+        const nextMenu          = this.client.acs.getConditionalValue(menuConfig.next, 'next');
         if(!nextMenu) {
             return cb(Array.isArray(menuConfig.next) ?
-                Errors.MenuStack('No matching condition for "next"', 'NOCONDMATCH') :
-                Errors.MenuStack('Invalid or missing "next" member in menu config', 'BADNEXT')
+                Errors.MenuStack('No matching condition for "next"', ErrorReasons.NoConditionMatch) :
+                Errors.MenuStack('Invalid or missing "next" member in menu config', ErrorReasons.InvalidNextMenu)
             );
         }
 
         if(nextMenu === currentModuleInfo.name) {
-            return cb(Errors.MenuStack('Menu config "next" specifies current menu', 'ALREADYTHERE'));
+            return cb(Errors.MenuStack('Menu config "next" specifies current menu', ErrorReasons.AlreadyThere));
         }
 
         this.goto(nextMenu, { }, cb);
@@ -86,7 +86,7 @@ module.exports = class MenuStack {
             return this.goto(previousModuleInfo.name, opts, cb);
         }
 
-        return cb(Errors.MenuStack('No previous menu available', 'NOPREV'));
+        return cb(Errors.MenuStack('No previous menu available', ErrorReasons.NoPreviousMenu));
     }
 
     goto(name, options, cb) {
@@ -102,7 +102,7 @@ module.exports = class MenuStack {
 
         if(currentModuleInfo && name === currentModuleInfo.name) {
             if(cb) {
-                cb(Errors.MenuStack('Already at supplied menu', 'ALREADYTHERE'));
+                cb(Errors.MenuStack('Already at supplied menu', ErrorReasons.AlreadyThere));
             }
             return;
         }

From a70d865d74c024db282a4cb88f2518fde4a2cfc1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 02:33:48 -0700
Subject: [PATCH 0616/1013] Code tidy

---
 core/client.js                         | 10 +++++++---
 core/file_base_download_manager.js     |  1 -
 core/file_base_web_download_manager.js |  1 -
 core/misc_util.js                      |  3 +--
 core/nua.js                            |  1 -
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/client.js b/core/client.js
index 6f4aec79..60a04af7 100644
--- a/core/client.js
+++ b/core/client.js
@@ -54,6 +54,7 @@ exports.Client  = Client;
 //  Resources & Standards:
 //  * http://www.ansi-bbs.org/ansi-bbs-core-server.html
 //
+/* eslint-disable no-control-regex */
 const RE_DSR_RESPONSE_ANYWHERE      = /(?:\u001b\[)([0-9;]+)(R)/;
 const RE_DEV_ATTR_RESPONSE_ANYWHERE = /(?:\u001b\[)[=?]([0-9a-zA-Z;]+)(c)/;
 const RE_META_KEYCODE_ANYWHERE      = /(?:\u001b)([a-zA-Z0-9])/;
@@ -63,6 +64,7 @@ const RE_FUNCTION_KEYCODE_ANYWHERE  = new RegExp('(?:\u001b+)(O|N|\\[|\\[\\[)(?:
     '(?:M([@ #!a`])(.)(.))',        // mouse stuff
     '(?:1;)?(\\d+)?([a-zA-Z@])'
 ].join('|') + ')');
+/* eslint-enable no-control-regex */
 
 const RE_FUNCTION_KEYCODE           = new RegExp('^' + RE_FUNCTION_KEYCODE_ANYWHERE.source);
 const RE_ESC_CODE_ANYWHERE          = new RegExp( [
@@ -70,7 +72,7 @@ const RE_ESC_CODE_ANYWHERE          = new RegExp( [
     RE_META_KEYCODE_ANYWHERE.source,
     RE_DSR_RESPONSE_ANYWHERE.source,
     RE_DEV_ATTR_RESPONSE_ANYWHERE.source,
-    /\u001b./.source
+    /\u001b./.source    //  eslint-disable-line no-control-regex
 ].join('|'));
 
 
@@ -158,15 +160,17 @@ function Client(/*input, output*/) {
         return termClient;
     };
 
+    /* eslint-disable no-control-regex */
     this.isMouseInput = function(data) {
-        return /\x1b\[M/.test(data) ||                          //  eslint-disable-line no-control-regex
-            /\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||   //  eslint-disable-line no-control-regex
+        return /\x1b\[M/.test(data) ||
+            /\u001b\[M([\x00\u0020-\uffff]{3})/.test(data) ||
             /\u001b\[(\d+;\d+;\d+)M/.test(data) ||
             /\u001b\[<(\d+;\d+;\d+)([mM])/.test(data) ||
             /\u001b\[<(\d+;\d+;\d+;\d+)&w/.test(data) ||
             /\u001b\[24([0135])~\[(\d+),(\d+)\]\r/.test(data) ||
             /\u001b\[(O|I)/.test(data);
     };
+    /* eslint-enable no-control-regex */
 
     this.getKeyComponentsFromCode = function(code) {
         return {
diff --git a/core/file_base_download_manager.js b/core/file_base_download_manager.js
index 50abd6da..8487697f 100644
--- a/core/file_base_download_manager.js
+++ b/core/file_base_download_manager.js
@@ -8,7 +8,6 @@ const DownloadQueue         = require('./download_queue.js');
 const theme                 = require('./theme.js');
 const ansi                  = require('./ansi_term.js');
 const Errors                = require('./enig_error.js').Errors;
-const stringFormat          = require('./string_format.js');
 const FileAreaWeb           = require('./file_area_web.js');
 
 //  deps
diff --git a/core/file_base_web_download_manager.js b/core/file_base_web_download_manager.js
index 62ee02eb..cf509cd9 100644
--- a/core/file_base_web_download_manager.js
+++ b/core/file_base_web_download_manager.js
@@ -8,7 +8,6 @@ const DownloadQueue         = require('./download_queue.js');
 const theme                 = require('./theme.js');
 const ansi                  = require('./ansi_term.js');
 const Errors                = require('./enig_error.js').Errors;
-const stringFormat          = require('./string_format.js');
 const FileAreaWeb           = require('./file_area_web.js');
 const ErrNotEnabled         = require('./enig_error.js').ErrorReasons.NotEnabled;
 const Config                = require('./config.js').get;
diff --git a/core/misc_util.js b/core/misc_util.js
index 62a3967d..78c76719 100644
--- a/core/misc_util.js
+++ b/core/misc_util.js
@@ -1,10 +1,9 @@
 /* jslint node: true */
 'use strict';
 
+//  deps
 const paths         = require('path');
-
 const os            = require('os');
-const moment        = require('moment');
 
 const packageJson   = require('../package.json');
 
diff --git a/core/nua.js b/core/nua.js
index 42c63895..2cb4c26b 100644
--- a/core/nua.js
+++ b/core/nua.js
@@ -15,7 +15,6 @@ const UserProps     = require('./user_property.js');
 
 //  deps
 const _             = require('lodash');
-const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'NUA',

From a036f6c6bf5e730662ca415a96a4b18fe8538da6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 02:35:34 -0700
Subject: [PATCH 0617/1013] Minor code tidy

---
 core/spinner_menu_view.js | 2 +-
 core/view_controller.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/spinner_menu_view.js b/core/spinner_menu_view.js
index f4517807..9547c9b8 100644
--- a/core/spinner_menu_view.js
+++ b/core/spinner_menu_view.js
@@ -62,7 +62,7 @@ function SpinnerMenuView(options) {
         text = `${sgr}${strUtil.pad(text, this.dimens.width, this.fillChar, this.justify)}`;
         this.client.term.write(`${ansi.goto(this.position.row, this.position.col)}${text}`);
         this.setRenderCacheItem(index, text, this.hasFocus);
-   }
+    };
 }
 
 util.inherits(SpinnerMenuView, MenuView);
diff --git a/core/view_controller.js b/core/view_controller.js
index de6f1f05..84f33756 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -433,7 +433,7 @@ ViewController.prototype.getView = function(id) {
 
 ViewController.prototype.hasView = function(id) {
     return this.getView(id) ? true : false;
-}
+};
 
 ViewController.prototype.getViewsByMciCode = function(mciCode) {
     if(!Array.isArray(mciCode)) {

From 008cc00742d92162bc8e3d8fdcba282f8ffd659e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 14:47:37 -0700
Subject: [PATCH 0618/1013] Some cleanup/updates

---
 README.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index c2056a33..230878ed 100644
--- a/README.md
+++ b/README.md
@@ -12,29 +12,26 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * [MCI support](docs/art/mci.md) for lightbars, toggles, input areas, and so on plus many other other bells and whistles
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
- * [SyncTERM](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior
+ * [SyncTERM](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior.
  * Full [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support
- * Renegade style pipe color codes
- * [SQLite](http://sqlite.org/) storage of users, message areas, and so on
- * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption
+ * Renegade style [pipe color codes](/docs/configuration/colour-codes.md).
+ * [SQLite](http://sqlite.org/) storage of users, message areas, etc.
+ * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption.
  * [Door support](docs/modding/door-servers.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
- * [Bunyan](https://github.com/trentm/node-bunyan) logging
+ * [Bunyan](https://github.com/trentm/node-bunyan) logging!
  * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export. Messages Bases can also be set to read-only viewable using a built in Gopher server!
  * [Gazelle](https://github.com/WhatCD/Gazelle) inspired File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
- * ANSI support in the Full Screen Editor (FSE), file descriptions, and so on
+ * ANSI support in the Full Screen Editor (FSE), file descriptions, etc.
  
 ## Documentation
-[Browse the docs online](https://nuskooler.github.io/enigma-bbs/)
+[Browse the docs online](https://nuskooler.github.io/enigma-bbs/). Be sure to checkout the [/docs/](/docs/) folder as well for the latest and greatest documentation.
  
 ## In the Works
-* More ACS support coverage
-* SysOp dashboard (ye ol' WFC)
-* Native DOS emulation
-* A lot more! Feel free to request features via [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues)
+Many more features are in the pipeline. Checkout the [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues) and feel free to request features (or contribute!) features.
 
 ## Known Issues
-As of now this is considered **alpha** code! Please **expect bugs** :bug: -- and when you find them, log issues and/or submit pull requests. Feature requests, suggestions, and so on are always welcome! I am also **looking for semi dedicated testers, artists, etc**!
+As of now this is considered **alpha** code! Please **expect bugs** :bug: -- and when you find them, log issues and/or submit pull requests. With that said, the code is actually quite stable and is used by a number of boards.
 
 See [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues) for more information.
 
@@ -62,11 +59,12 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 
 
 ## Installation
+On *nix type systems:
 ```
 curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
 ```
 
-Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) in the docs for more information.
+Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) for Windows, Docker, and so on...
 
 ## Special Thanks
 * [Dave Stephens aka RiPuk](https://github.com/davestephens) for the awesome [ENiGMA website](https://enigma-bbs.github.io/) and [KICK ASS documentation](https://nuskooler.github.io/enigma-bbs/), code contributions, etc.

From ebc129b17bb4743765f5ed44a633a9a3e8eb5654 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 14:47:51 -0700
Subject: [PATCH 0619/1013] Update to reflect realitiy

---
 art/themes/luciano_blocktronics/MSGVHLP.ANS | Bin 1098 -> 1023 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSGVHLP.ANS b/art/themes/luciano_blocktronics/MSGVHLP.ANS
index 0320614d7a30c83170ba7829d117b6ac86d94bb9..6c79cbe2199177aa04d7b065fb64d76bfed9468b 100644
GIT binary patch
delta 252
zcmX@b@t<8lI@-Y6#K79vJeNy4+SuHAqP&ETv6-`Uw4t?$xwWxD?tPGO?w$L0?%$S<
zHZjP(4OC~4D;;fQ0ai4z;3+SNYYyfC)o%`G6l9z%!t6A8DU+0_5m4CJ45Zu;#4-o6
z3@s<WWYUQPTL<ETBn)#4fwBg<`d~FVV73Ct9v}hKURau00+s=C4MC352T583Ws(w;
zvlUA66>>6*OEUA)!HR%tOeT9UD{+=&WELxAq~;V%KEWKrIf0phfsrwQL1?lri!1=r
CjYi1;

delta 282
zcmey*eu_h0I@-Y6#K79vJeNy4+R)NjI@;JE7s#>zvCMNP3P|vQMGZlM=0L%T`f|K*
z5s><cAy1jioj1EN3NosJ^#Bzb1H}z<bAX2DDkuO2&2n>7i;EM}Qx$SDi%TXSU=*J`
zlSxVoqAUwZSypLofkH{X0#rHFJR`%&Czy05M=&`~PGA;M&q&QF0J;|FJh)Xr7Tl_W
z{NfUYywvi^RZQ}Xg_9GRg;@$qGfO7dGRLUhVrF1qWDH;sWB>zUPbXi6Fn31?4^9FA
DGXO{g


From 8549fa7ac43eaee0eb1d2532f3fde94ed8466998 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Dec 2018 20:06:34 -0700
Subject: [PATCH 0620/1013] Typos/etc.

---
 WHATSNEW.md                 | 4 ++--
 docs/modding/local-doors.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 191f1c7b..f78bf6c3 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -15,8 +15,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * The old concept of `autoScale` has been removed. See https://github.com/NuSkooler/enigma-bbs/issues/166
 * Ability to delete from personal mailbox (finally!)
 * Add ability to skip file and/or message areas during newscan. Set config.omitFileAreaTags and config.omitMessageAreaTags in new_scan configuration of your menu.hjson
-* `{userName}` (sanatized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
-* Any module may now register for a system startup intiialization via the `initializeModules(initInfo, cb)` export.
+* `{userName}` (sanitized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
+* Any module may now register for a system startup initialization via the `initializeModules(initInfo, cb)` export.
 * User event log is now functional. Various events a user performs will be persisted to the `system.db` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
 * New MCI codes including general purpose movement codes. See [MCI codes](docs/art/mci.md)
 * `install.sh` will now attempt to use NPM's `--build-from-source` option when ARM is detected.
diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index 06b80ac1..4ab8037b 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -41,7 +41,7 @@ The following variables may be used in `args` entries:
 | `{dropFile}` | Dropfile _filename_ only. | `DOOR.SYS` |
 | `{dropFilePath}` | Full path to generated dropfile. The system places dropfiles in the path set by `paths.dropFiles` in `config.hjson`. | `C:\enigma-bbs\drop\node1\DOOR.SYS` |
 | `{userId}` | Current user ID. | `420` |
-| `{userName}` | _Sanitized_ username. Safe for filenames, etc. | `izard` |
+| `{userName}` | [Sanitized](https://www.npmjs.com/package/sanitize-filename) username. Safe for filenames, etc. If the full username is sanitized away, this will resolve to something like "user_1234". | `izard` |
 | `{userNameRaw}` | _Raw_ username. May not be safe for filenames! | `\/\/izard` |
 | `{srvPort}` | Temporary server port when `io` is set to `socket`. | `1234` |
 | `{cwd}` | Current Working Directory. | `/home/enigma-bbs/doors/foo/` |

From cde329b4390caf985325e1eb66175e7d6aad4b3c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 10 Dec 2018 21:54:59 -0700
Subject: [PATCH 0621/1013] Spelling

---
 core/file_base_area.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index 293ab265..95040791 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -239,7 +239,7 @@ function getExistingFileEntriesBySha256(sha256, cb) {
     );
 }
 
-//  :TODO: This is bascially sliceAtEOF() from art.js .... DRY!
+//  :TODO: This is basically sliceAtEOF() from art.js .... DRY!
 function sliceAtSauceMarker(data) {
     let eof         = data.length;
     const stopPos   = Math.max(data.length - (256), 0); //  256 = 2 * sizeof(SAUCE)

From 23d70773e2a37ceee95d3b644a1f069212d158f4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 10 Dec 2018 22:29:28 -0700
Subject: [PATCH 0622/1013] Some fixes / clarifications

---
 docs/installation/install-script.md | 4 ++--
 docs/installation/manual.md         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index d0ce2a89..6481360e 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -6,10 +6,10 @@ Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can s
 `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
 ```
 
-It is recommended you review the [installation script](https://github.com/NuSkooler/enigma-bbs/blob/master/misc/install.sh) 
+It is recommended you review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh) 
 on GitHub before running it. 
 
 The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you 
diff --git a/docs/installation/manual.md b/docs/installation/manual.md
index a24cd3eb..0a8a8f1d 100644
--- a/docs/installation/manual.md
+++ b/docs/installation/manual.md
@@ -20,11 +20,12 @@ are OK) for Windows users. Note that you **should only need the Visual C++ compo
  
 ## Node.js
 ### With NVM
-Node Version Manager (NVM) is an excellent way to install and manage Node.js versions on most UNIX-like environments. [Get the latest version here](https://github.com/creationix/nvm). The install should look something like this:
+Node Version Manager (NVM) is an excellent way to install and manage Node.js versions on most UNIX-like environments. [Get the latest version here](https://github.com/creationix/nvm). The nvm install may look _something_ like this:
 
 ```bash
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
 ```
+:information_source: Do not cut+paste the above command! Visit the [NVM](https://github.com/creationix/nvm) page and run the latest version!
 
 Next, install Node.js with NVM:
 ```bash

From 772022f0d00642458dc2c93409eecb2dcca8354f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Dec 2018 22:21:57 -0700
Subject: [PATCH 0623/1013] + NNTP Content Server * Read-only to public
 conf/areas only for now * Missing some protocol support * Could use better
 encoding practices and ANSI prep

---
 core/config.js                |  27 ++
 core/exodus.js                |   2 +-
 core/message.js               |  14 +-
 core/servers/content/nntp.js  | 769 ++++++++++++++++++++++++++++++++++
 misc/config_template.in.hjson |  33 ++
 package.json                  |   4 +-
 6 files changed, 840 insertions(+), 9 deletions(-)
 create mode 100644 core/servers/content/nntp.js

diff --git a/core/config.js b/core/config.js
index 345f4c09..f75be3de 100644
--- a/core/config.js
+++ b/core/config.js
@@ -404,6 +404,33 @@ function getDefaultConfig() {
                 //  Set messageConferences{} to maps of confTag -> [ areaTag1, areaTag2, ... ]
                 //  to export message confs/areas
                 //
+            },
+
+            nntp : {
+                //  internal caching of groups, message lists, etc.
+                cache : {
+                    maxItems    : 200,
+                    maxAge      : 1000 * 30,    //  30s
+                },
+
+                //
+                //  Set publicMessageConferences{} to a map of confTag -> [ areaTag1, areaTag2, ... ]
+                //  in order to export *public* conf/areas that are available to anonymous
+                //  NNTP users. Other conf/areas: Standard ACS rules apply.
+                //
+                publicMessageConferences: {},
+
+                nntp : {
+                    enabled     : false,
+                    port        : 8119,
+                },
+
+                nntps : {
+                    enabled     : false,
+                    port        : 8563,
+                    certPem     : paths.join(__dirname, './../config/nntps_cert.pem'),
+                    keyPem      : paths.join(__dirname, './../config/nntps_key.pem'),
+                }
             }
         },
 
diff --git a/core/exodus.js b/core/exodus.js
index e25b4973..0d439392 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -17,7 +17,7 @@ const crypto        = require('crypto');
 const moment        = require('moment');
 const https         = require('https');
 const querystring   = require('querystring');
-const fs            = require('fs');
+const fs            = require('fs-extra');
 const SSHClient     = require('ssh2').Client;
 
 /*
diff --git a/core/message.js b/core/message.js
index df0804d5..34c590bb 100644
--- a/core/message.js
+++ b/core/message.js
@@ -238,7 +238,7 @@ module.exports = class Message {
         filter.ids - use with resultType='uuid'
         filter.toUserName
         filter.fromUserName
-        filter.replyToMesageId
+        filter.replyToMessageId
 
         filter.newerThanTimestamp - may not be used with |date|
         filter.date - moment object - may not be used with |newerThanTimestamp|
@@ -253,7 +253,7 @@ module.exports = class Message {
         filter.order = ascending | (descending)
 
         filter.limit
-        filter.resultType = (id) | uuid | count
+        filter.resultType = (id) | uuid | count | messageList
         filter.extraFields = []
 
         filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
@@ -529,22 +529,22 @@ module.exports = class Message {
         });
     }
 
-    //  :TODO: this should only take a UUID...
-    load(options, cb) {
-        assert(_.isString(options.uuid));
+    load(loadWith, cb) {
+        assert(_.isString(loadWith.uuid) || _.isNumber(loadWith.messageId));
 
         const self = this;
 
         async.series(
             [
                 function loadMessage(callback) {
+                    const whereField = loadWith.uuid ? 'message_uuid' : 'message_id';
                     msgDb.get(
                         `SELECT message_id, area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject,
                         message, modified_timestamp, view_count
                         FROM message
-                        WHERE message_uuid=?
+                        WHERE ${whereField} = ?
                         LIMIT 1;`,
-                        [ options.uuid ],
+                        [ loadWith.uuid || loadWith.messageId ],
                         (err, msgRow) => {
                             if(err) {
                                 return callback(err);
diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
new file mode 100644
index 00000000..cf2a43b2
--- /dev/null
+++ b/core/servers/content/nntp.js
@@ -0,0 +1,769 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Log                   = require('../../logger.js').log;
+const { ServerModule }      = require('../../server_module.js');
+const Config                = require('../../config.js').get;
+const {
+    getMessageAreaByTag,
+    getMessageConferenceByTag,
+    getMessageListForArea,
+}                           = require('../../message_area.js');
+const User                  = require('../../user.js');
+const Errors                = require('../../enig_error.js').Errors;
+const Message               = require('../../message.js');
+const FTNAddress            = require('../../ftn_address.js');
+const {
+    isAnsi,
+    cleanControlCodes,
+    splitTextAtTerms,
+}                           = require('../../string_util.js');
+const AnsiPrep              = require('../../ansi_prep.js');
+
+//  deps
+const NNTPServerBase        = require('nntp-server');
+const _                     = require('lodash');
+const fs                    = require('fs-extra');
+const asyncReduce           = require('async/reduce');
+const asyncMap              = require('async/map');
+const asyncSeries           = require('async/series');
+const LRU                   = require('lru-cache');
+const iconv                 = require('iconv-lite');
+
+//
+//  Network News Transfer Protocol (NNTP)
+//
+//  RFCS
+//  - https://www.w3.org/Protocols/rfc977/rfc977
+//  - https://tools.ietf.org/html/rfc3977
+//  - https://tools.ietf.org/html/rfc2980
+//  - https://tools.ietf.org/html/rfc5536
+
+//
+exports.moduleInfo = {
+    name        : 'NNTP',
+    desc        : 'Network News Transfer Protocol (NNTP) Server',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.nntp.server',
+};
+
+/*
+    General TODO
+    - ACS checks need worked out. Currently ACS relies on |client|. We need a client
+      spec that can be created even without a login server. Some checks and simply
+      return false/fail. 
+*/
+
+
+class NNTPServer extends NNTPServerBase {
+    constructor(options, serverName) {
+        super(options);
+
+        this.log = Log.child( { server : serverName } );
+
+        const config = Config();
+        this.groupCache = new LRU({
+            max     : _.get(config, 'contentServers.nntp.cache.maxItems', 200),
+            maxAge  : _.get(config, 'contentServers.nntp.cache.maxAge', 1000 * 30), //  default=30s
+        });
+    }
+
+    _needAuth(session, command) {
+        return super._needAuth(session, command);
+    }
+
+    _authenticate(session) {
+        const username  = session.authinfo_user;
+        const password  = session.authinfo_pass;
+
+        this.log.trace( { username }, 'Authentication request');
+
+        return new Promise( resolve => {
+            const user = new User();
+            user.authenticate(username, password, err => {
+                if(err) {
+                    this.log.debug( { username, reason : err.message }, 'Authentication failure');
+                    return resolve(false);
+                }
+
+                session.authUser = user;
+
+                this.log.debug( { username }, 'User authenticated successfully');
+                return resolve(true);
+            });
+        });
+    }
+
+    getMessageListIndexByMessageID(id, session) {
+        return id - _.get(session.groupInfo.messageList, [ 0, 'messageId' ]);
+    }
+
+    isGroupSelected(session) {
+        return Array.isArray(_.get(session, 'groupInfo.messageList'));
+    }
+
+    getJAMStyleFrom(message, fromName) {
+        //
+        //  Try to to create a (JamNTTPd) JAM style "From" field:
+        //
+        //  -   If we're dealing with a FTN address, create an email-like format
+        //      but do not include ':' or '/' characters as it may cause clients
+        //      to puke. FTN addresses are formatted how JamNTTPd does it for
+        //      some sort of compliance. We also extend up to 5D addressing.
+        //  -   If we have an email address, then it's ready to go.
+        //
+        const remoteFrom = _.get(message.meta, [ 'System', Message.SystemMetaNames.RemoteFromUser ]);
+        let jamStyleFrom;
+        if(remoteFrom) {
+            const flavor = _.get(message.meta, [ 'System', Message.SystemMetaNames.ExternalFlavor ]);
+            switch(flavor) {
+                case [ Message.AddressFlavor.FTN ] :
+                    {
+                        let ftnAddr = FTNAddress.fromString(remoteFrom);
+                        if(ftnAddr && ftnAddr.isValid()) {
+                            //  In general, addresses are in point, node, net, zone, domain order
+                            if(ftnAddr.domain) { //  5D
+                                // point.node.net.zone@domain or node.net.zone@domain
+                                jamStyleFrom = `${ftnAddr.node}.${ftnAddr.net}.${ftnAddr.zone}@${ftnAddr.domain}`;
+                                if(ftnAddr.point) {
+                                    jamStyleFrom = `${ftnAddr.point}.` + jamStyleFrom;
+                                }
+                            } else {
+                                if(ftnAddr.point) {
+                                    jamStyleFrom = `${ftnAddr.point}@${ftnAddr.node}.${ftnAddr.net}.${ftnAddr.zone}`;
+                                } else {
+                                    jamStyleFrom = `0@${ftnAddr.node}.${ftnAddr.net}.${ftnAddr.zone}`;
+                                }
+                            }
+                        }
+                    }
+                    break;
+
+                case [ Message.AddressFlavor.Email ] :
+                    jamStyleFrom = `${fromName} <${remoteFrom}>`;
+                    break;
+            }           
+        }
+
+        if(!jamStyleFrom) {
+            jamStyleFrom = fromName;
+        }
+
+        return jamStyleFrom;
+    }
+
+    populateNNTPHeaders(session, message, cb) {
+        //
+        //  Build compliant headers
+        //
+        //  Resources:
+        //  - https://tools.ietf.org/html/rfc5536#section-3.1
+        //  - https://github.com/ftnapps/jamnntpd/blob/master/src/nntpserv.c#L962
+        //
+        const toName    = this.getMessageTo(message);
+        const fromName  = this.getMessageFrom(message);
+
+        message.nntpHeaders = {
+            From            : this.getJAMStyleFrom(message, fromName),
+            'X-Comment-To'  : toName,
+            Newsgroups      : session.group.name,
+            Subject         : message.subject,
+            Date            : this.getMessageDate(message),
+            'Message-ID'    : this.getMessageIdentifier(message),
+            Path            : 'ENiGMA1/2!not-for-mail',
+            'Content-Type'  : 'text/plain; charset=utf-8',
+        };
+
+        const externalFlavor = _.get(message.meta.System, [ Message.SystemMetaNames.ExternalFlavor ]);
+        if(externalFlavor) {
+            message.nntpHeaders['X-ENiG-MessageFlavor'] = externalFlavor;
+        }
+
+        //  Any FTN properties -> X-FTN-*
+        _.each(message.meta.FtnProperty, (v, k) => {
+            const suffix = {
+                [ Message.FtnPropertyNames.FtnTearLine ]    : 'Tearline',
+                [ Message.FtnPropertyNames.FtnOrigin ]      : 'Origin',
+                [ Message.FtnPropertyNames.FtnArea ]        : 'AREA',
+                [ Message.FtnPropertyNames.FtnSeenBy ]      : 'SEEN-BY',
+            }[k];
+
+            if(suffix) {
+                //  some special treatment.
+                if('Tearline' === suffix) {
+                    v = v.replace(/^--- /, '');
+                } else if('Origin' === suffix) {
+                    v = v.replace(/^[ ]{1,2}\* Origin: /, '');
+                }
+                if(Array.isArray(v)) {  //  ie: SEEN-BY[] -> one big list
+                    v = v.join(' ');
+                }
+                message.nntpHeaders[`X-FTN-${suffix}`] = v.trim();
+            }
+        });
+
+        //  Other FTN kludges
+        _.each(message.meta.FtnKludge, (v, k) => {
+            if(Array.isArray(v)) {
+                v = v.join(' ');    //  same as above
+            }
+            message.nntpHeaders[`X-FTN-${k.toUpperCase()}`] = v.toString().trim();
+        });
+
+        //
+        //  Set X-FTN-To and X-FTN-From:
+        //  - If remote to/from : joeuser <remoteAddr>
+        //  - Without remote    : joeuser
+        //
+        const remoteFrom = _.get(message.meta, [ 'System', Message.SystemMetaNames.RemoteFromUser ]);
+        message.nntpHeaders['X-FTN-From'] = remoteFrom ? `${fromName} <${remoteFrom}>` : fromName;
+        const  remoteTo = _.get(message.meta [ 'System', Message.SystemMetaNames.RemoteToUser ]);
+        message.nntpHeaders['X-FTN-To'] = remoteTo ? `${toName} <${remoteTo}>` : toName;
+
+        if(!message.replyToMsgId) {
+            return cb(null);
+        }
+
+        //  replyToMessageId -> Message-ID formatted ID
+        const filter = {
+            resultType          : 'uuid',
+            ids                 : [ parseInt(message.replyToMsgId) ],
+            limit               : 1,
+        };
+        Message.findMessages(filter, (err, uuids) => {
+            if(!err && Array.isArray(uuids)) {
+                message.nntpHeaders.References = this.makeMessageIdentifier(message.replyToMsgId, uuids[0]);
+            }
+            return cb(null);
+        });
+    }
+
+    getMessageUUIDFromMessageID(session, messageId) {
+        let messageUuid;
+
+        //  Direct ID request
+        if((_.isString(messageId) && '<' !== messageId.charAt(0)) || _.isNumber(messageId)) {
+            //  group must be in session
+            if(!this.isGroupSelected(session)) {
+                return null;
+            }
+
+            messageId = parseInt(messageId);
+            if(isNaN(messageId)) {
+                return null;
+            }
+
+            //
+            //  Adjust to offset in message list & get UUID
+            //  This works since we create "pseudo IDs" to return to NNTP
+            //  by using firstRealID + index. A find on |index| member would
+            //  also work, but would be O(n).
+            //
+            const mlIndex = this.getMessageListIndexByMessageID(messageId, session);
+            messageUuid = _.get(session.groupInfo.messageList, [ mlIndex, 'messageUuid']);
+        } else {
+            //  <Message-ID> request
+            [ , messageUuid ] = this.getMessageIdentifierParts(messageId);
+        }
+
+        if(!_.isString(messageUuid)) {
+            return null;
+        }
+
+        return messageUuid;
+    }
+
+    _getArticle(session, messageId) {
+        return new Promise( resolve => {
+            this.log.trace( { messageId }, 'Get article request');
+
+            const messageUuid = this.getMessageUUIDFromMessageID(session, messageId);
+            if(!messageUuid) {
+                this.log.debug( { messageId }, 'Unable to retrieve message UUID for article request');
+                return resolve(null);
+            }
+
+            const message = new Message();
+            asyncSeries(
+                [
+                    (callback) => {
+                        return message.load( { uuid : messageUuid }, callback);
+                    },
+                    (callback) => {
+                        //  :TODO: Must validate access! See Gopher, etc. !!!!!
+                        //  :TODO: we can only do this if a <message-id> style was sent in, not a direct ID ??????
+                        if(session.groupInfo.areaTag !== message.areaTag) {
+                            return resolve(null);
+                        }
+
+                        if(!this.hasConfAndAreaReadAccess(session, session.groupInfo.confTag, session.groupInfo.areaTag)) {
+                            this.log.info(`Access denied to message ${messageUuid}`);
+                            return resolve(null);
+                        }
+
+                        return callback(null);
+                    },
+                    (callback) => {
+                        return this.populateNNTPHeaders(session, message, callback);
+                    },
+                    (callback) => {
+                        return this.prepareMessageBody(message, callback);
+                    }
+                ],
+                err => {
+                    if(err) {
+                        this.log.error( { error : err.message, messageId }, 'Failed to load article');
+                        return resolve(null);
+                    }
+                    return resolve(message);
+                }
+            );
+        });
+    }
+
+    _getRange(session, first, last, options) {
+        return new Promise(resolve => {
+            //
+            //  Build an array of message objects that can later
+            //  be used with the various _build* methods.
+            //
+            //  Messages must belong to the range of *pseudo IDs*
+            //  aka |index|.
+            //
+            //  :TODO: Handle |options|
+            if(!this.isGroupSelected(session)) {
+                return resolve(null);
+            }
+
+            const uuids = session.groupInfo.messageList.filter(m => {
+                if(m.areaTag !== session.groupInfo.areaTag) {
+                    return false;
+                }
+                if(m.index < first || m.index > last) {
+                    return false;
+                }
+                return true;
+            }).map(m => {
+                return { uuid : m.messageUuid, index : m.index }
+            });
+
+            asyncMap(uuids, (msgInfo, nextMessageUuid) => {
+                const message = new Message();
+                message.load( { uuid : msgInfo.uuid }, err => {
+                    if(err) {
+                        return nextMessageUuid(err);
+                    }
+
+                    message.index = msgInfo.index;
+
+                    this.populateNNTPHeaders(session, message, () => {
+                        this.prepareMessageBody(message, () => {
+                            return nextMessageUuid(null, message);
+                        });
+                    });
+                });
+            },
+            (err, messages) => {
+                return resolve(err ? null : messages);
+            });
+        });
+    }
+
+    _selectGroup (session, groupName) {
+        this.log.trace( { groupName }, 'Select group request');
+
+        return new Promise( resolve => {
+            this.getGroup(session, groupName, (err, group) => {
+                if(err) {
+                    return resolve(false);
+                }
+
+                session.group = Object.assign(
+                    {}, //  start clean
+                    {
+                        description     : group.friendlyDesc || group.friendlyName,
+                        current_article : group.nntp.total ? group.nntp.min_index : 0,
+                    },
+                    group.nntp
+                );
+
+                session.groupInfo = group;  //  full set of info
+
+                return resolve(true);
+            });
+        });
+    }
+
+    _getGroups(session, time, wildmat) {
+        this.log.trace( { time, wildmat }, 'Get groups request');
+
+        //  :TODO: handle time - probably use as caching mechanism - must consider user/auth/rights
+        //  :TODO: handle |time| if possible.
+        return new Promise( (resolve, reject) => {
+            const config = Config();
+
+            //  :TODO: merge confs avail to authenticated user
+            const publicConfs = _.get(config, 'contentServers.nntp.publicMessageConferences', {});
+
+            asyncReduce(Object.keys(publicConfs), [], (groups, confTag, nextConfTag) => {
+                const areaTags = publicConfs[confTag];
+                //  :TODO: merge area tags available to authenticated user
+                asyncMap(areaTags, (areaTag, nextAreaTag) => {
+                    const groupName = this.getGroupName(confTag, areaTag);
+
+                    //  filter on |wildmat| if supplied. We will remove
+                    //  empty areas below in the final results.
+                    if(wildmat && !wildmat.test(groupName)) {
+                        return nextAreaTag(null, null);
+                    }
+
+                    this.getGroup(session, groupName, (err, group) => {
+                        if(err) {
+                            return nextAreaTag(null, null); //  try others
+                        }
+                        return nextAreaTag(null, group.nntp);
+                    });
+                },
+                (err, areas) => {
+                    if(err) {
+                        return nextConfTag(err);
+                    }
+
+                    areas = areas.filter(a => a && Object.keys(a).length > 0);  //  remove empty
+                    groups.push(...areas);
+
+                    return nextConfTag(null, groups);
+                });
+            },
+            (err, groups) => {
+                if(err) {
+                    return reject(err);
+                }
+                return resolve(groups);
+            });
+        });
+    }
+
+    isConfAndAreaPubliclyExposed(confTag, areaTag) {
+        const publicAreaTags = _.get(Config(), [ 'contentServers', 'nntp', 'publicMessageConferences', confTag ] );
+        return Array.isArray(publicAreaTags) && publicAreaTags.includes(areaTag);
+    }
+
+    hasConfAndAreaReadAccess(session, confTag, areaTag) {
+        if(Message.isPrivateAreaTag(areaTag)) {
+            return false;
+        }
+
+        if(this.isConfAndAreaPubliclyExposed(confTag, areaTag)) {
+            return true;
+        }
+
+        //  further checks require an authenticated user & ACS
+        if(!session || !session.authUser) {
+            return false;
+        }
+
+        const conf = getMessageConferenceByTag(confTag);
+        if(!conf) {
+            return false;
+        }
+        //  :TODO: validate ACS
+
+        const area = getMessageAreaByTag(areaTag, confTag);
+        if(!area) {
+            return false;
+        }
+        //  :TODO: validate ACS
+
+        return false;
+    }
+
+    getGroup(session, groupName, cb) {
+        let group = this.groupCache.get(groupName);
+        if(group) {
+            return cb(null, group);
+        }
+
+        const [ confTag, areaTag ] = groupName.split('.');
+        if(!confTag || !areaTag) {
+            return cb(Errors.UnexpectedState(`Invalid NNTP group name: ${groupName}`));
+        }
+
+        if(!this.hasConfAndAreaReadAccess(session, confTag, areaTag)) {
+            return cb(Errors.AccessDenied(`No access to conference ${confTag} and/or area ${areaTag}`));
+        }
+
+        const area = getMessageAreaByTag(areaTag, confTag);
+        if(!area) {
+            return cb(Errors.DoesNotExist(`No area for areaTag "${areaTag}" / confTag "${confTag}"`));
+        }
+
+        getMessageListForArea(null, areaTag, (err, messageList) => {
+            if(err) {
+                return cb(err);
+            }
+
+            if(0 === messageList.length) {
+                //
+                //  Handle empty group
+                //  See https://tools.ietf.org/html/rfc3977#section-6.1.1.2
+                //
+                return cb(null, {
+                    messageList : [],
+                    confTag,
+                    areaTag,
+                    friendlyName    : area.name,
+                    friendlyDesc    : area.desc,
+                    nntp : {
+                        name        : groupName,
+                        min_index   : 0,
+                        max_index   : 0,
+                        total       : 0,
+                    }
+                });
+            }
+
+            const firstMsg = messageList[0];
+
+            //  node-nntp wants "index"
+            let index = firstMsg.messageId;
+            messageList.forEach(m => {
+                m.index = index;
+                ++index;
+            });
+
+            group = {
+                messageList,
+                confTag,
+                areaTag,
+                friendlyName    : area.name,
+                friendlyDesc    : area.desc,
+                nntp : {
+                    name        : groupName,
+                    min_index   : firstMsg.messageId,
+                    max_index   : firstMsg.messageId + messageList.length - 1,
+                    total       : messageList.length,
+                },
+            };
+
+            this.groupCache.set(groupName, group);
+
+            return cb(null, group);
+        });
+    }
+
+    _buildHead(session, message) {
+        return _.map(message.nntpHeaders, (v, k) => `${k}: ${v}`).join('\r\n');
+    }
+
+    _buildBody(session, message) {
+        return message.preparedBody;
+    }
+
+    _buildHeaderField(session, message, field) {
+        const body = message.preparedBody || message.message;
+        const value = {
+            ':bytes'        : Buffer.byteLength(body).toString(),
+            ':lines'        : splitTextAtTerms(body).length.toString(),
+        }[field] || _.find(message.nntpHeaders, (v, k) => {
+            return k.toLowerCase() === field;
+        });
+
+        if(!value) {
+            this.log.debug(`No value for requested header field "${field}"`);
+        }
+
+        return value;
+    }
+
+    _getOverviewFmt(session) {
+        return super._getOverviewFmt(session);
+    }
+
+    _getNewNews(session, time, wildmat) {
+        throw new Error('method `nntp._getNewNews` is not implemented');
+    }
+
+    getMessageDate(message) {
+        //  https://tools.ietf.org/html/rfc5536#section-3.1.1 -> https://tools.ietf.org/html/rfc5322#section-3.3
+        return message.modTimestamp.format('ddd, D MMM YYYY HH:mm:ss ZZ');
+    }
+
+    makeMessageIdentifier(messageId, messageUuid) {
+        //
+        //  Spec        : RFC-5536 Section 3.1.3 @ https://tools.ietf.org/html/rfc5536#section-3.1.3
+        //  Example     : <2456.0f6587f7-5512-4d03-8740-4d592190145a@enigma-bbs>
+        //
+        return `<${messageId}.${messageUuid}@enigma-bbs>`;
+    }
+
+    getMessageIdentifier(message) {
+        return this.makeMessageIdentifier(message.messageId, message.messageUuid);
+    }
+
+    getMessageIdentifierParts(messageId) {
+        const m = messageId.match(/<([0-9]+)\.([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})@enigma-bbs>/);
+        if(m) {
+            return [ m[1], m[2] ];
+        }
+        return [];
+    }
+
+    getMessageTo(message) {
+        //  :TODO: same as From -- check config
+        return message.toUserName;
+    }
+
+    getMessageFrom(message) {
+        //  :TODO: NNTP config > conf > area config for real names
+        return message.fromUserName;
+    }
+
+    prepareMessageBody(message, cb) {
+        if(isAnsi(message.message)) {
+            AnsiPrep(
+                message.message,
+                {
+                    termWidth       : 1000,     //  unrealistically long; don't want to wrap, really.
+                    cols            : 1000,     //  ...see above.
+                    rows            : 'auto',
+                    asciiMode       : true,     //  Export to ASCII
+                    fillLines       : false,    //  Don't fill up columns
+                },
+                (err, prepped) => {
+                    message.preparedBody = prepped || message.message;
+                    return cb(null);
+                }
+            );
+        } else {
+            message.preparedBody = cleanControlCodes(message.message, { all : true });
+            return cb(null);
+        }
+    }
+
+    getGroupName(confTag, areaTag) {
+        //
+        //  Example:
+        //  input : fsxNet (confTag) fsx_bbs (areaTag)
+        //  output: fsx_net.fsx_bbs
+        //
+        //  Note also that periods are replaced in conf and area
+        //  tags such that we *only* have a period separator
+        //  between the two for a group name!
+        //
+        return `${_.snakeCase(confTag).replace(/\./g, '_')}.${_.snakeCase(areaTag).replace(/\./g, '_')}`;
+    }
+}
+
+exports.getModule = class NNTPServerModule extends ServerModule {
+    constructor() {
+        super();
+    }
+
+    isEnabled() {
+        return this.enableNntp || this.enableNttps;
+    }
+
+    get enableNntp() {
+        return _.get(Config(), 'contentServers.nntp.nntp.enabled', false);
+    }
+
+    get enableNttps() {
+        return _.get(Config(), 'contentServers.nntp.nntps.enabled', false);
+    }
+
+    isConfigured() {
+        const config = Config();
+
+        //
+        //  Any conf/areas exposed?
+        //
+        const publicConfs = _.get(config, 'contentServers.nntp.publicMessageConferences', {});
+        const areasExposed = _.some(publicConfs, areas => {
+            return Array.isArray(areas) && areas.length > 0;
+        });
+
+        if(!areasExposed) {
+            return false;
+        }
+
+        const nntp = _.get(config, 'contentServers.nntp.nntp');
+        if(nntp && this.enableNntp) {
+            if(isNaN(nntp.port)) {
+                return false;
+            }
+        }
+
+        const nntps = _.get(config, 'contentServers.nntp.nntps');
+        if(nntps && this.enableNttps) {
+            if(isNaN(nntps.port)) {
+                return false;
+            }
+
+            if(!_.isString(nntps.certPem) || !_.isString(nntps.keyPem)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    createServer() {
+        if(!this.isEnabled() || !this.isConfigured()) {
+            return;
+        }
+
+        const config = Config();
+
+        const commonOptions = {
+            //requireAuth : true,   //  :TODO: re-enable!
+            //  :TODO: override |session| - use our own debug to Bunyan, etc.
+        };
+
+        if(this.enableNntp) {
+            this.nntpServer = new NNTPServer(
+                //  :TODO: according to docs: if connection is non-tls, but behind proxy (assuming TLS termination?!!) then set this to true
+                Object.assign( { secure : false }, commonOptions),
+                'NNTP'
+            );
+        }
+
+        if(this.enableNttps) {
+            this.nntpsServer  = new NNTPServer(
+                Object.assign(
+                    {
+                        secure  : true,
+                        tls : {
+                            cert    : fs.readFileSync(config.contentServers.nntp.nntps.certPem),
+                            key     : fs.readFileSync(config.contentServers.nntp.nntps.keyPem),
+                        }
+                    },
+                    commonOptions
+                ),
+                'NTTPS'
+            );
+        }
+    }
+
+    listen() {
+        const config = Config();
+        [ 'nntp', 'nntps' ].forEach( service => {
+            const server = this[`${service}Server`];
+            if(server) {
+                const port = config.contentServers.nntp[service].port;
+                server.listen(this.listenURI(port, service))
+                    .catch(e => {
+                        Log.warn( { error : e.message, port }, `${service.toUpperCase()} failed to listen`);
+                    });
+            }
+        });
+
+        //  :TODO: listen() needs to be async. I always should have been...
+        return true;
+    }
+
+    listenURI(port, service = 'nntp') {
+        return `${service}://localhost:${port}`;
+    }
+};
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 489a7cb3..504cd02d 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -222,6 +222,39 @@
             //  messageConferences: {
             //      some_conf: [ "area_tag1", "area_tag2" ]
             //  }
+            //
+        }
+
+        //  You may also wish to enable NNTP services
+        nntp: {
+            //
+            //  Set publicMessageConferences{} to configure
+            //  publicly exposed conferences & areas.
+            //
+            //  Example:
+            //  publicMessageConferences: {
+            //      some_conf: [ "area_tag1", "area_tag2" ]
+            //  }
+            //
+            publicMessageConferences: {}
+
+            // non-secure
+            nntp: {
+                enabled: false
+                port: XXXXX
+            }
+
+            //  secure (TLS)
+            nntps: {
+                enabled: false
+                port: XXXXX
+
+                //
+                //  You will need a SSL/TLS certificate and key
+                //
+                certPem: XXXXX
+                keyPem: XXXXX
+            }
         }
     }
 
diff --git a/package.json b/package.json
index f6425f01..89f99a00 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,9 @@
     "uuid-parse": "^1.0.0",
     "ws": "^6.1.2",
     "xxhash": "^0.2.4",
-    "yazl": "^2.5.0"
+    "yazl": "^2.5.0",
+    "nntp-server": "^1.0.3",
+    "lru-cache" : "^5.1.1"
   },
   "devDependencies": {},
   "engines": {

From 874aee5baa7f7e4b85992b2b10052123a8c093d5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Dec 2018 23:03:10 -0700
Subject: [PATCH 0624/1013] Change listen addr

---
 core/servers/content/nntp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index cf2a43b2..6420f1c0 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -764,6 +764,6 @@ exports.getModule = class NNTPServerModule extends ServerModule {
     }
 
     listenURI(port, service = 'nntp') {
-        return `${service}://localhost:${port}`;
+        return `${service}://0.0.0.0:${port}`;
     }
 };

From b903b2ee82e030f5709069767e5609365a5eb870 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Dec 2018 23:08:53 -0700
Subject: [PATCH 0625/1013] Better logging

---
 core/servers/content/nntp.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 6420f1c0..380f9f21 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -313,9 +313,11 @@ class NNTPServer extends NNTPServerBase {
                 ],
                 err => {
                     if(err) {
-                        this.log.error( { error : err.message, messageId }, 'Failed to load article');
+                        this.log.error( { error : err.message, messageUuid }, 'Failed to load article');
                         return resolve(null);
                     }
+
+                    this.log.info( { messageUuid, messageId, areaTag : message.areaTag }, 'Serving article');
                     return resolve(message);
                 }
             );

From a3ba57b0b831333d4ac42fcb96c021aa0c59816a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Dec 2018 23:21:33 -0700
Subject: [PATCH 0626/1013] Fix schedule issue

---
 core/scanner_tossers/ftn_bso.js | 8 ++++----
 core/servers/login/websocket.js | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 36f0d769..47184ea9 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -2177,8 +2177,8 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
                 Log.debug(
                     {
                         schedule    : this.moduleConfig.schedule.export,
-                        schedOK     : -1 === exportSchedule.sched.error,
-                        next        : moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        schedOK     : -1 === _.get(exportSchedule, 'sched.error'),
+                        next        : exportSchedule.sched ? moment(later.schedule(exportSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
                         immediate   : exportSchedule.immediate ? true : false,
                     },
                     'Export schedule loaded'
@@ -2206,8 +2206,8 @@ FTNMessageScanTossModule.prototype.startup = function(cb) {
                 Log.debug(
                     {
                         schedule    : this.moduleConfig.schedule.import,
-                        schedOK     : -1 === importSchedule.sched.error,
-                        next        : moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a'),
+                        schedOK     : -1 === _.get(importSchedule, 'sched.error'),
+                        next        : importSchedule.sched ? moment(later.schedule(importSchedule.sched).next(1)).format('ddd, MMM Do, YYYY @ h:m:ss a') : 'N/A',
                         watchFile   : _.isString(importSchedule.watchFile) ? importSchedule.watchFile : 'None',
                     },
                     'Import schedule loaded'
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 3fc16343..43245e74 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -203,7 +203,11 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
                         ws.isConnectionAlive = false;   //  pong will reset this
 
                         Log.trace('Ping to remote WebSocket client');
-                        return ws.ping('', false);  //  false=don't mask
+                        try {
+                            ws.ping('', false);  //  false=don't mask
+                        } catch(e) {    //  don't barf on closing state
+                            /* nothing */
+                        }
                     });
                 }
             });

From dba2fc18f6cb4632c9fa65e70ab211ec8afdacba Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 01:55:38 -0700
Subject: [PATCH 0627/1013] Strip MCI/Pipe codes

---
 core/servers/content/gopher.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index da09acd9..47fc3c6e 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -2,22 +2,23 @@
 'use strict';
 
 //  ENiGMA½
-const Log                   = require('../../logger.js').log;
-const { ServerModule }      = require('../../server_module.js');
-const Config                = require('../../config.js').get;
+const Log                       = require('../../logger.js').log;
+const { ServerModule }          = require('../../server_module.js');
+const Config                    = require('../../config.js').get;
 const {
     splitTextAtTerms,
     isAnsi,
     cleanControlCodes
-}                           = require('../../string_util.js');
+}                               = require('../../string_util.js');
 const {
     getMessageConferenceByTag,
     getMessageAreaByTag,
     getMessageListForArea,
-}                           = require('../../message_area.js');
-const { sortAreasOrConfs }  = require('../../conf_area_util.js');
-const AnsiPrep              = require('../../ansi_prep.js');
-const { wordWrapText }      = require('../../word_wrap.js');
+}                               = require('../../message_area.js');
+const { sortAreasOrConfs }      = require('../../conf_area_util.js');
+const AnsiPrep                  = require('../../ansi_prep.js');
+const { wordWrapText }          = require('../../word_wrap.js');
+const { stripMciColorCodes }    = require('../../color_codes.js');
 
 //  deps
 const net                   = require('net');
@@ -216,9 +217,13 @@ exports.getModule = class GopherModule extends ServerModule {
                 }
             );
         } else {
-            const prepped = splitTextAtTerms(cleanControlCodes(body, { all : true } ) )
-                .map(l => (wordWrapText(l, { width : WordWrapColumn } ).wrapped || []).join('\n'))
-                .join('\n');
+            const cleaned = stripMciColorCodes(
+                cleanControlCodes(body, { all : true } )
+            );
+            const prepped =
+                splitTextAtTerms(cleaned)
+                    .map(l => (wordWrapText(l, { width : WordWrapColumn } ).wrapped || []).join('\n'))
+                    .join('\n');
 
             return cb(prepped);
         }

From 4b2771012b08680cb7adf9c843ab3074540e66cf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 02:06:15 -0700
Subject: [PATCH 0628/1013] Show desc if set

---
 core/servers/content/gopher.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 47fc3c6e..f5ae9cfa 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -341,7 +341,7 @@ ${msgBody}
                 this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
                 this.makeItem(ItemTypes.InfoMessage, `Message areas in ${conf.name}`),
                 this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
-                ...areas.map(area => this.makeItem(ItemTypes.SubMenu, area.name, `/msgarea/${confTag}/${area.areaTag}`))
+                ...areas.map(area => this.makeItem(ItemTypes.SubMenu, `${area.name} ${area.desc ? '- ' + area.desc : ''}`, `/msgarea/${confTag}/${area.areaTag}`))
             ].join('');
 
             return cb(response);
@@ -362,7 +362,7 @@ ${msgBody}
                 this.makeItem(ItemTypes.InfoMessage, 'Available Message Conferences'),
                 this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
                 this.makeItem(ItemTypes.InfoMessage, ''),
-                ...confs.map(conf => this.makeItem(ItemTypes.SubMenu, conf.name, `/msgarea/${conf.confTag}`))
+                ...confs.map(conf => this.makeItem(ItemTypes.SubMenu, `${conf.name} ${conf.desc ? '- ' + conf.desc : ''}`, `/msgarea/${conf.confTag}`))
             ].join('');
 
             return cb(response);

From 615edac7cd2396a928054a6a313d3c2ce3ea77fc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 02:39:36 -0700
Subject: [PATCH 0629/1013] docs/_includes/nav.md

Tidy up + add link to updating
---
 docs/installation/installation-methods.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/installation/installation-methods.md b/docs/installation/installation-methods.md
index 99a1db6c..bb55dcce 100644
--- a/docs/installation/installation-methods.md
+++ b/docs/installation/installation-methods.md
@@ -2,12 +2,15 @@
 layout: page
 title: Installation Methods
 ---
+## Installation Methods
 There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do 
 things manually versus have it automated for you.
 
-| Method                                 | Operating System Compatibility                 | Notes                                                                                       |     
-|----------------------------------------|------------------------------------------------|---------------------------------------------------------------------------------------------|
-| [Installation Script](install-script)  | Linux, BSD, OSX                                | Quick and easy installation under most Linux/UNIX like environments (Linux, BSD, OS X, ...) |
-| [Docker Images](docker)                | Linux, BSD, OSX, Windows                       | Easy upgrades, compatible with all operating systems, no dependencies to install            |
-| [Manual Installation](manual)          | Linux, Windows (probably others but untested!  | If you like doing things manually, or are running Windows                                   |
+| Method | Operating System Compatibility | Notes |
+|--------|--------------------------------|-------|
+| [Installation Script](install-script)  | Linux, BSD, OSX | Quick and easy installation under most Linux/UNIX like environments (Linux, BSD, OS X, ...) |
+| [Docker Images](docker) | Linux, BSD, OSX, Windows | Easy upgrades, compatible with all operating systems, no dependencies to install            |
+| [Manual](manual) | Linux, Windows (probably others but untested!  | If you like doing things manually, or are running Windows |
 
+## Keeping Up To Date
+After installing, you'll want to [keep your system updated](/docs/admin/updating.md).
\ No newline at end of file

From b89096fd990f09d35edefd4ff77e2b81083e67fa Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 02:39:57 -0700
Subject: [PATCH 0630/1013] publicPort typo

---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index f75be3de..90e641d6 100644
--- a/core/config.js
+++ b/core/config.js
@@ -397,7 +397,7 @@ function getDefaultConfig() {
                 enabled         : false,
                 port            : 8070,
                 publicHostname  : 'another-fine-enigma-bbs.org',
-                publicPort      : 8080, //  adjust if behind NAT/etc.
+                publicPort      : 8070, //  adjust if behind NAT/etc.
                 bannerFile      : 'gopher_banner.asc',
 
                 //

From faf076f3e3779a0d2e3cc3b61b6c4b7eb536197e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 02:40:13 -0700
Subject: [PATCH 0631/1013] Fix case

---
 docs/_includes/nav.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 0c0cd945..326ebaad 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -13,7 +13,7 @@
   - Configuration
     - [Creating Config Files]({{ site.baseurl }}{% link configuration/creating-config.md %})
     - [SysOp Setup]({{ site.baseurl }}{% link configuration/sysop-setup.md %})
-    - [Editing hjson]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
+    - [Editing HJSON]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
     - [System Configuration]({{ site.baseurl }}{% link configuration/config-hjson.md %})
     - [HJSON General]({{ site.baseurl }}{% link configuration/hjson.md %})
     - [Menus]({{ site.baseurl }}{% link configuration/menu-hjson.md %})

From cf6e3d3ba8aa4c9ad9d1e5fcd370f705b7d1e6ea Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 02:40:36 -0700
Subject: [PATCH 0632/1013] Better logging

---
 core/servers/content/nntp.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 380f9f21..9963a566 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -276,7 +276,7 @@ class NNTPServer extends NNTPServerBase {
 
     _getArticle(session, messageId) {
         return new Promise( resolve => {
-            this.log.trace( { messageId }, 'Get article request');
+            this.log.trace( { messageId }, 'Get article');
 
             const messageUuid = this.getMessageUUIDFromMessageID(session, messageId);
             if(!messageUuid) {
@@ -291,14 +291,18 @@ class NNTPServer extends NNTPServerBase {
                         return message.load( { uuid : messageUuid }, callback);
                     },
                     (callback) => {
-                        //  :TODO: Must validate access! See Gopher, etc. !!!!!
-                        //  :TODO: we can only do this if a <message-id> style was sent in, not a direct ID ??????
+                        if(!_.has(session, 'groupInfo.areaTag')) {
+                            //  :TODO: if this is needed, how to validate properly?
+                            this.log.warn( { messageUuid, messageId }, 'Get article request without group selection');
+                            return resolve(null);
+                        }
+
                         if(session.groupInfo.areaTag !== message.areaTag) {
                             return resolve(null);
                         }
 
                         if(!this.hasConfAndAreaReadAccess(session, session.groupInfo.confTag, session.groupInfo.areaTag)) {
-                            this.log.info(`Access denied to message ${messageUuid}`);
+                            this.log.info( { messageUuid, messageId}, 'Access denied for message');
                             return resolve(null);
                         }
 
@@ -519,6 +523,7 @@ class NNTPServer extends NNTPServerBase {
                     friendlyDesc    : area.desc,
                     nntp : {
                         name        : groupName,
+                        description : area.desc,
                         min_index   : 0,
                         max_index   : 0,
                         total       : 0,
@@ -566,14 +571,15 @@ class NNTPServer extends NNTPServerBase {
     _buildHeaderField(session, message, field) {
         const body = message.preparedBody || message.message;
         const value = {
-            ':bytes'        : Buffer.byteLength(body).toString(),
-            ':lines'        : splitTextAtTerms(body).length.toString(),
-        }[field] || _.find(message.nntpHeaders, (v, k) => {
-            return k.toLowerCase() === field;
-        });
+            ':bytes'    : Buffer.byteLength(body).toString(),
+            ':lines'    : splitTextAtTerms(body).length.toString(),
+        }[field]
+            || _.find(message.nntpHeaders, (v, k) => {
+                return k.toLowerCase() === field;
+            });
 
         if(!value) {
-            this.log.debug(`No value for requested header field "${field}"`);
+            this.log.trace(`No value for requested header field "${field}"`);
         }
 
         return value;

From fd5b50fc08a141e40c3365d8403cade4858d1cbe Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 21:41:58 -0700
Subject: [PATCH 0633/1013] Various doc updates

---
 docs/installation/install-script.md     | 12 +++---
 docs/messageareas/message-networks.md   | 57 ++++++++++++++++++++-----
 docs/troubleshooting/monitoring-logs.md | 30 +++++++++++++
 3 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index 6481360e..61930c93 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -2,15 +2,17 @@
 layout: page
 title: Install Script
 ---
-Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the 
-`install.sh` script to get everything up and running. Cut + paste the following into your terminal:
+## Install Script
+Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
 curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
 ```
 
-It is recommended you review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh) 
+You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh) 
 on GitHub before running it. 
 
-The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you 
-through creating a basic configuration file, and recommend some packages to install.  
+The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you through creating a basic configuration file, and recommend some packages to install.
+
+After installing, see [Updating](/docs/admin/updating.md).
+
diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index 84b7859e..5838da53 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -2,41 +2,44 @@
 layout: page
 title: Message Networks
 ---
+## Message Networks
 ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, such as FTN "external". That is, messages are only imported and exported from/to such a networks. Configuring such external message networks in ENiGMA½ requires three sections in your `config.hjson`.
 
 1. `messageNetworks.<networkType>.networks`: declares available networks.
 2. `messageNetworks.<networkType>.areas`: establishes local area mappings and per-area specifics.
 3. `scannerTossers.<name>`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
 
-## FTN Networks 
+### FTN Networks 
 FidoNet and FidoNet style (FTN) networks as well as a [FTN/BSO scanner/tosser](bso-import-export.md) (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
 
-:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external utility such as Binkd is required for this!
+:information_source: ENiGMA½'s `ftn_bso` module is **not a mailer** and makes **no attempts** to perform packet transport! An external utility such as Binkd is required for this!
 
-### Networks
-The `networks` block a per-network configuration where each entry's key may be referenced elswhere in `config.hjson`.
+#### Networks
+The `networks` block a per-network configuration where each entry's key may be referenced elsewhere in `config.hjson`.
 
-Example: the following example declares two networks: `agoranet` and `fsxnet`:
+Example: the following example declares two networks: `araknet` and `fsxnet`:
 ```hjson
 {
   messageNetworks: {
     ftn: {
       networks: {
-        araknet: {
-          defaultZone: 10
-          localAddress: "10:101/9"
-        }
+        // it is recommended to use lowercase network tags
         fsxnet: {
           defaultZone: 21
           localAddress: "21:1/121"
         }
+
+        araknet: {
+          defaultZone: 10
+          localAddress: "10:101/9"
+        }
       }
     }
   }
 }
 ```
 
-### Areas
+#### Areas
 The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see [Configuring a Message Area](configuring-a-message-area.md)) to a message network (described above), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
 
 When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas` while exported messages will be sent to the relevant `network`.
@@ -53,6 +56,7 @@ Example:
   messageNetworks: {
     ftn: {
       areas: {
+        // it is recommended to use lowercase area tags
         fsx_general:        //  *local* tag found within messageConferences
           network: fsxnet   //  that we are mapping to this network
           tag: FSX_GEN      //  ...and this remote FTN-specific tag
@@ -64,5 +68,38 @@ Example:
 }
 ```
 
+:information_source: You can import `AREAS.BBS` or FTN style `.NA` files using [oputil](/docs/admin/oputil.md)!
+
+### A More Complete Example
+Below is a more complete *example* illustrating some of the concepts above:
+
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      networks: {        
+        fsxnet: {
+          defaultZone: 21
+          localAddress: "21:1/121"
+        }
+      }
+
+      areas: {        
+        fsx_general: {
+          network: fsxnet
+
+          //  ie as found in your info packs .NA file
+          tag: FSX_GEN
+
+          uplinks: [ "21:1/100" ]
+        }
+      }
+    }
+  }
+}
+```
+
+:information_source: Remember for a complete FTN experience, you'll probably also want to configure [FTN/BSO scanner/tosser](bso-import-export.md) settings.
+
 ### FTN/BSO Scanner Tosser
 Please see the [FTN/BSO Scanner/Tosser](bso-import-export.md) documentation for information on this area.
diff --git a/docs/troubleshooting/monitoring-logs.md b/docs/troubleshooting/monitoring-logs.md
index dd665f5c..28a3773a 100644
--- a/docs/troubleshooting/monitoring-logs.md
+++ b/docs/troubleshooting/monitoring-logs.md
@@ -2,6 +2,7 @@
 layout: page
 title: Monitoring Logs
 ---
+## Monitoring Logs
 ENiGMA½ does not produce much to stdout. Logs are produced by Bunyan which outputs each entry as a JSON object. 
 
 Start by installing bunyan and making it available on your path:
@@ -20,3 +21,32 @@ To tail logs in a colorized and pretty format, issue the following command:
 tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan
 ```
 
+See `bunyan --help` for more information on what you can do!
+
+### Example
+Logs _without_ Bunyan:
+```bash
+tail -F /path/to/enigma-bbs/logs/enigma-bbs.log
+{"name":"ENiGMA½ BBS","hostname":"nu-dev","pid":25002,"level":30,"eventName":"updateFileAreaStats","action":{"type":"method","location":"core/file_base_area.js","what":"updateAreaStatsScheduledEvent","args":[]},"reason":"Schedule","msg":"Executing scheduled event action...","time":"2018-12-15T16:00:00.001Z","v":0}
+{"name":"ENiGMA½ BBS","hostname":"nu-dev","pid":25002,"level":30,"module":"FTN BSO","msg":"Performing scheduled message import/toss...","time":"2018-12-15T16:00:00.002Z","v":0}
+{"name":"ENiGMA½ BBS","hostname":"nu-dev","pid":25002,"level":30,"module":"FTN BSO","msg":"Performing scheduled message import/toss...","time":"2018-12-15T16:30:00.008Z","v":0}
+```
+
+Oof!
+
+Logs _with_ Bunyan:
+```bash
+tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan
+[2018-12-15T16:00:00.001Z]  INFO: ENiGMA½ BBS/25002 on nu-dev: Executing scheduled event action... (eventName=updateFileAreaStats, reason=Schedule)
+    action: {
+      "type": "method",
+      "location": "core/file_base_area.js",
+      "what": "updateAreaStatsScheduledEvent",
+      "args": []
+    }
+[2018-12-15T16:00:00.002Z]  INFO: ENiGMA½ BBS/25002 on nu-dev: Performing scheduled message import/toss... (module="FTN BSO")
+[2018-12-15T16:30:00.008Z]  INFO: ENiGMA½ BBS/25002 on nu-dev: Performing scheduled message import/toss... (module="FTN BSO")
+```
+
+Much better!
+

From 3eaf4dd0d80a973e489878ffd22cca8061f23ef7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 23:42:19 -0700
Subject: [PATCH 0634/1013] + oputil.js user rm USERNAME * Fix some of my
 horrid spelling...

---
 core/database.js           |   4 +-
 core/file_entry.js         |   6 +-
 core/message.js            |   6 +-
 core/oputil/oputil_user.js | 116 +++++++++++++++++++++++++++++++++++--
 4 files changed, 118 insertions(+), 14 deletions(-)

diff --git a/core/database.js b/core/database.js
index e4a812d4..040cc1de 100644
--- a/core/database.js
+++ b/core/database.js
@@ -20,7 +20,7 @@ exports.getTransactionDatabase      = getTransactionDatabase;
 exports.getModDatabasePath          = getModDatabasePath;
 exports.loadDatabaseForMod          = loadDatabaseForMod;
 exports.getISOTimestampString       = getISOTimestampString;
-exports.sanatizeString              = sanatizeString;
+exports.sanitizeString              = sanitizeString;
 exports.initializeDatabases         = initializeDatabases;
 
 exports.dbs                         = dbs;
@@ -76,7 +76,7 @@ function getISOTimestampString(ts) {
     return ts.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
 }
 
-function sanatizeString(s) {
+function sanitizeString(s) {
     return s.replace(/[\0\x08\x09\x1a\n\r"'\\%]/g, c => {   //  eslint-disable-line no-control-regex
         switch (c) {
             case '\0'   : return '\\0';
diff --git a/core/file_entry.js b/core/file_entry.js
index 9ba1c692..4f5e47d1 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -5,7 +5,7 @@ const fileDb                = require('./database.js').dbs.file;
 const Errors                = require('./enig_error.js').Errors;
 const {
     getISOTimestampString,
-    sanatizeString
+    sanitizeString
 }                           = require('./database.js');
 const Config                = require('./config.js').get;
 
@@ -565,14 +565,14 @@ module.exports = class FileEntry {
                 `f.file_id IN (
                     SELECT rowid
                     FROM file_fts
-                    WHERE file_fts MATCH ":${sanatizeString(filter.terms)}"
+                    WHERE file_fts MATCH ":${sanitizeString(filter.terms)}"
                 )`
             );
         }
 
         if(filter.tags && filter.tags.length > 0) {
             //  build list of quoted tags; filter.tags comes in as a space and/or comma separated values
-            const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanatizeString(tag)}"` ).join(',');
+            const tags = filter.tags.replace(/,/g, ' ').replace(/\s{2,}/g, ' ').split(' ').map( tag => `"${sanitizeString(tag)}"` ).join(',');
 
             appendWhereClause(
                 `f.file_id IN (
diff --git a/core/message.js b/core/message.js
index 34c590bb..7a30fb02 100644
--- a/core/message.js
+++ b/core/message.js
@@ -8,7 +8,7 @@ const createNamedUUID       = require('./uuid_util.js').createNamedUUID;
 const Errors                = require('./enig_error.js').Errors;
 const ANSI                  = require('./ansi_term.js');
 const {
-    sanatizeString,
+    sanitizeString,
     getISOTimestampString } = require('./database.js');
 
 const {
@@ -354,7 +354,7 @@ module.exports = class Message {
 
         [ 'toUserName', 'fromUserName' ].forEach(field => {
             if(_.isString(filter[field]) && filter[field].length > 0) {
-                appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanatizeString(filter[field])}"`);
+                appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanitizeString(filter[field])}"`);
             }
         });
 
@@ -375,7 +375,7 @@ module.exports = class Message {
                 `m.message_id IN (
                     SELECT rowid
                     FROM message_fts
-                    WHERE message_fts MATCH ":${sanatizeString(filter.terms)}"
+                    WHERE message_fts MATCH ":${sanitizeString(filter.terms)}"
                 )`
             );
         }
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 18519b06..3f169607 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -2,10 +2,13 @@
 /* eslint-disable no-console */
 'use strict';
 
-const printUsageAndSetExitCode	= require('./oputil_common.js').printUsageAndSetExitCode;
-const ExitCodes					= require('./oputil_common.js').ExitCodes;
-const argv						= require('./oputil_common.js').argv;
-const initConfigAndDatabases	= require('./oputil_common.js').initConfigAndDatabases;
+const {
+    printUsageAndSetExitCode,
+    getAnswers,
+    ExitCodes,
+    argv,
+    initConfigAndDatabases
+}                               = require('./oputil_common.js');
 const getHelpFor				= require('./oputil_help.js').getHelpFor;
 const Errors					= require('../enig_error.js').Errors;
 const UserProps                 = require('../user_property.js');
@@ -111,8 +114,109 @@ function setUserPassword(user) {
     );
 }
 
-function removeUser() {
-    console.error('NOT YET IMPLEMENTED');
+function removeUserRecordsFromDbAndTable(dbName, tableName, userId, col, cb) {
+    const db = require('../../core/database.js').dbs[dbName];
+    db.run(
+        `DELETE FROM ${tableName}
+        WHERE ${col} = ?;`,
+        [ userId ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function removeUser(user) {
+    async.series(
+        [
+            (callback) => {
+                if(false === argv.prompt) {
+                    return callback(null);
+                }
+
+                console.info('About to permanently delete the following user:');
+                console.info(`Username : ${user.username}`);
+                console.info(`Real name: ${user.properties[UserProps.RealName] || 'N/A'}`);
+                console.info(`User ID  : ${user.userId}`);
+                console.info('WARNING: This cannot be undone!');
+                getAnswers([
+                    {
+                        name    : 'proceed',
+                        message : `Proceed in deleting ${user.username}?`,
+                        type    : 'confirm',
+                    }
+                ],
+                answers => {
+                    if(answers.proceed) {
+                        return callback(null);
+                    }
+                    return callback(Errors.General('User canceled'));
+                });
+            },
+            (callback) => {
+                //  op has confirmed they are wanting ready to proceed (or passed --no-prompt)
+                const DeleteFrom = {
+                    message : [ 'user_message_area_last_read' ],
+                    system  : [ 'user_event_log', ],
+                    user    : [ 'user_group_member', 'user' ],
+                };
+
+                async.eachSeries(Object.keys(DeleteFrom), (dbName, nextDbName) => {
+                    const tables = DeleteFrom[dbName];
+                    async.eachSeries(tables, (tableName, nextTableName) => {
+                        const col = ('user' === dbName && 'user' === tableName) ? 'id' : 'user_id';
+                        removeUserRecordsFromDbAndTable(dbName, tableName, user.userId, col, err => {
+                            return nextTableName(err);
+                        });
+                    },
+                    err => {
+                        return nextDbName(err);
+                    });
+                },
+                err => {
+                    return callback(err);
+                });
+            },
+            (callback) => {
+                //
+                //  Clean up *private* messages *to* this user
+                //
+                const Message   = require('../../core/message.js');
+                const MsgDb     = require('../../core/database.js').dbs.message;
+
+                const filter = {
+                    resultType          : 'id',
+                    privateTagUserId    : user.userId,
+                };
+                Message.findMessages(filter, (err, ids) => {
+                    if(err) {
+                        return callback(err);
+                    }
+
+                    async.eachSeries(ids, (messageId, nextMessageId) => {
+                        MsgDb.run(
+                            `DELETE FROM message
+                            WHERE message_id = ?;`,
+                            [ messageId ],
+                            err => {
+                                return nextMessageId(err);
+                            }
+                        );
+                    },
+                    err => {
+                        return callback(err);
+                    });
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                return console.error(err.reason ? err.reason : err.message);
+            }
+
+            console.info('User has been deleted.');
+        }
+    );
 }
 
 function modUserGroups(user) {

From 6d45d74a47b8b3a34b058d6fdb7eb61f3ae401ef Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Dec 2018 23:52:59 -0700
Subject: [PATCH 0635/1013] Little better NNTP config

---
 core/servers/content/nntp.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 9963a566..98dbdca7 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -29,7 +29,6 @@ const asyncReduce           = require('async/reduce');
 const asyncMap              = require('async/map');
 const asyncSeries           = require('async/series');
 const LRU                   = require('lru-cache');
-const iconv                 = require('iconv-lite');
 
 //
 //  Network News Transfer Protocol (NNTP)
@@ -589,8 +588,9 @@ class NNTPServer extends NNTPServerBase {
         return super._getOverviewFmt(session);
     }
 
-    _getNewNews(session, time, wildmat) {
-        throw new Error('method `nntp._getNewNews` is not implemented');
+    _getNewNews(/*session, time, wildmat*/) {
+        //  Currently seems pointless to implement. No semi-modern clients seem to use it anyway.
+        throw new Errors.Invalid('NEWNEWS is not enabled on this server');
     }
 
     getMessageDate(message) {
@@ -633,11 +633,11 @@ class NNTPServer extends NNTPServerBase {
             AnsiPrep(
                 message.message,
                 {
-                    termWidth       : 1000,     //  unrealistically long; don't want to wrap, really.
-                    cols            : 1000,     //  ...see above.
                     rows            : 'auto',
-                    asciiMode       : true,     //  Export to ASCII
-                    fillLines       : false,    //  Don't fill up columns
+                    cols            : 79,
+                    forceLineTerm   : true,
+                    asciiMode       : true,
+                    fillLines       : false,
                 },
                 (err, prepped) => {
                     message.preparedBody = prepped || message.message;

From 422a925daaadd62d178b305bd8d6c9552564c872 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Dec 2018 00:26:28 -0700
Subject: [PATCH 0636/1013] + oputil.js user info * Fix up some help messaging
 * Don't allow del of +op

---
 core/oputil/oputil_help.js | 17 ++++++++-----
 core/oputil/oputil_user.js | 52 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 8b946edd..36002245 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -25,13 +25,16 @@ commands:
 `usage: optutil.js user <action> [<args>]
 
 actions:
-  pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
-  rm USERNAME                  permanently removes USERNAME user from system
-  activate USERNAME            sets USERNAME's status to active
-  deactivate USERNAME          sets USERNAME's status to inactive
-  disable USERNAME             sets USERNAME's status to disabled
-  lock USERNAME                sets USERNAME's status to locked
-  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
+  info USERNAME                display information about a user
+  pw USERNAME PASSWORD         set a user's password
+                               aliases: password, passwd
+  rm USERNAME                  permanently removes user from system
+                               aliases: remove, delete, del
+  activate USERNAME            set status to active
+  deactivate USERNAME          set status to inactive
+  disable USERNAME             set status to disabled
+  lock USERNAME                set status to locked
+  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from a group
 `,
 
     Config :
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 3f169607..a52facfb 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -15,6 +15,7 @@ const UserProps                 = require('../user_property.js');
 
 const async						= require('async');
 const _							= require('lodash');
+const moment                    = require('moment');
 
 exports.handleUserCommand		= handleUserCommand;
 
@@ -129,6 +130,13 @@ function removeUserRecordsFromDbAndTable(dbName, tableName, userId, col, cb) {
 function removeUser(user) {
     async.series(
         [
+            (callback) => {
+                if(user.isRoot()) {
+                    return callback(Errors.Invalid('Cannot delete root/SysOp user!'));
+                }
+
+                return callback(null);
+            },
             (callback) => {
                 if(false === argv.prompt) {
                     return callback(null);
@@ -262,6 +270,44 @@ function modUserGroups(user) {
     }
 }
 
+function showUserInfo(user) {
+
+    const User = require('../../core/user.js');
+
+    const statusDesc = () => {
+        const status = user.properties[UserProps.AccountStatus];
+        return _.invert(User.AccountStatus)[status] || 'unknown';
+    };
+
+    const created = () => {
+        const ac = user.properties[UserProps.AccountCreated];
+        return ac ? moment(ac).format() : 'N/A';
+    };
+
+    const lastLogin = () => {
+        const ll = user.properties[UserProps.LastLoginTs];
+        return ll ? moment(ll).format() : 'N/A';
+    };
+
+    const propOrNA = p => {
+        return user.properties[p] || 'N/A';
+    };
+
+    console.info(`User information:
+Username     : ${user.username}${user.isRoot() ? ' (root/SysOp)' : ''}
+Real name    : ${propOrNA(UserProps.RealName)}
+ID           : ${user.userId}
+Status       : ${statusDesc()}
+Groups       : ${user.groups.join(', ')}
+Created      : ${created()}
+Last login   : ${lastLogin()}
+Login count  : ${propOrNA(UserProps.LoginCount)}
+Email        : ${propOrNA(UserProps.EmailAddress)}
+Location     : ${propOrNA(UserProps.Location)}
+Affiliations : ${propOrNA(UserProps.Affiliations)}
+`);
+}
+
 function handleUserCommand() {
     function errUsage()  {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
@@ -272,7 +318,7 @@ function handleUserCommand() {
     }
 
     const action		= argv._[1];
-    const usernameIdx	= [ 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
+    const usernameIdx	= [ 'pw', 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
     const userName		= argv._[usernameIdx];
 
     if(!userName) {
@@ -286,7 +332,7 @@ function handleUserCommand() {
         }
 
         return ({
-            pass		: setUserPassword,
+            pw          : setUserPassword,
             passwd		: setUserPassword,
             password	: setUserPassword,
 
@@ -301,6 +347,8 @@ function handleUserCommand() {
             lock        : setAccountStatus,
 
             group		: modUserGroups,
+
+            info        : showUserInfo,
         }[action] || errUsage)(user, action);
     });
 }
\ No newline at end of file

From 320ac1fc36cef3ffe64d2fcf8c8e7074f848be79 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Dec 2018 00:38:49 -0700
Subject: [PATCH 0637/1013] Doc update

---
 docs/admin/oputil.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 285d96fa..881514ce 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -44,18 +44,22 @@ The `user` command covers various user operations.
 usage: optutil.js user <action> [<args>]
 
 actions:
-  pw USERNAME PASSWORD         set password to PASSWORD for USERNAME
-  rm USERNAME                  permanently removes USERNAME user from system
-  activate USERNAME            sets USERNAME's status to active
-  deactivate USERNAME          sets USERNAME's status to inactive
-  disable USERNAME             sets USERNAME's status to disabled
-  lock USERNAME                sets USERNAME's status to locked
-  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from GROUP
+  info USERNAME                display information about a user
+  pw USERNAME PASSWORD         set a user's password
+                               aliases: password, passwd
+  rm USERNAME                  permanently removes user from system
+                               aliases: remove, delete, del
+  activate USERNAME            set status to active
+  deactivate USERNAME          set status to inactive
+  disable USERNAME             set status to disabled
+  lock USERNAME                set status to locked
+  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from a group
 ```
 
 | Action    | Description       | Examples                              | Aliases   |
 |-----------|-------------------|---------------------------------------|-----------|
-| `pw`        | Set password      | `./oputil.js user pw joeuser s3cr37`  | `pass`, `passwd`, `password` |
+| `info` | Display user information| `./oputil.js user info joeuser` | N/A |
+| `pw`        | Set password      | `./oputil.js user pw joeuser s3cr37`  | `passwd`, `password` |
 | `rm`        | Removes user      | `./oputil.js user del joeuser`        | `remove`, `del`, `delete` |
 | `activate` | Activates user    | `./oputil.js user activate joeuser`   | N/A   |
 | `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |

From 12a1809a886d258c8baa2014c7813630cecf26b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Dec 2018 00:40:14 -0700
Subject: [PATCH 0638/1013] lol fail

---
 core/oputil/oputil_help.js | 6 +++---
 docs/admin/oputil.md       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 36002245..8e2bc2c2 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -8,7 +8,7 @@ exports.getHelpFor				= getHelpFor;
 
 const usageHelp = exports.USAGE_HELP = {
     General :
-`usage: optutil.js [--version] [--help]
+`usage: oputil.js [--version] [--help]
                   <command> [<args>]
 
 global args:
@@ -22,7 +22,7 @@ commands:
   mb                        message base management
 `,
     User :
-`usage: optutil.js user <action> [<args>]
+`usage: oputil.js user <action> [<args>]
 
 actions:
   info USERNAME                display information about a user
@@ -38,7 +38,7 @@ actions:
 `,
 
     Config :
-`usage: optutil.js config <action> [<args>]
+`usage: oputil.js config <action> [<args>]
 
 actions:
   new                      generate a new/initial configuration
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 881514ce..dd989a5a 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -8,7 +8,7 @@ ENiGMA½ comes with `oputil.js` henceforth known as `oputil`, a command line int
 Let's look the main help output as per this writing:
 
 ```
-usage: optutil.js [--version] [--help]
+usage: oputil.js [--version] [--help]
                   <command> [<args>]
 
 global args:
@@ -41,7 +41,7 @@ Type `./oputil.js <command> --help` for additional help on a particular command.
 The `user` command covers various user operations.
 
 ```
-usage: optutil.js user <action> [<args>]
+usage: oputil.js user <action> [<args>]
 
 actions:
   info USERNAME                display information about a user
@@ -71,7 +71,7 @@ actions:
 The `config` command allows sysops to perform various system configuration and maintenance tasks.
 
 ```
-usage: optutil.js config <action> [<args>]
+usage: oputil.js config <action> [<args>]
 
 actions:
   new                      generate a new/initial configuration  

From e0f6847581c30fb2e1a922b3e9172aae82eb4396 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 11:09:42 -0700
Subject: [PATCH 0639/1013] + NNTP docs + Gopher docs * Minor doc cleanup

---
 WHATSNEW.md                    |  2 ++
 docs/_includes/nav.md          |  2 ++
 docs/modding/file-area-list.md |  2 +-
 docs/servers/gopher.md         | 40 +++++++++++++++++++++
 docs/servers/nntp.md           | 66 ++++++++++++++++++++++++++++++++++
 docs/servers/ssh.md            | 47 ++++++++++++------------
 docs/servers/telnet.md         | 30 +++++++++-------
 docs/servers/websocket.md      |  3 ++
 8 files changed, 156 insertions(+), 36 deletions(-)
 create mode 100644 docs/servers/gopher.md
 create mode 100644 docs/servers/nntp.md

diff --git a/WHATSNEW.md b/WHATSNEW.md
index f78bf6c3..d7c26361 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -22,6 +22,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * `install.sh` will now attempt to use NPM's `--build-from-source` option when ARM is detected.
 * `oputil.js config new` will now generate a much more complete configuration file with comments, examples, etc. `oputil.js config cat` dumps your current config to stdout.
 * Handling of failed login attempts is now fully in. Disconnect clients, lock out accounts, ability to auto or unlock at (email-driven) password reset, etc. See `users.failedLogin` in `config.hjson`.
+* NNTP support! See [NNTP docs](/docs/servers/nntp.md) for more information.
+* `oputil.js user rm` and `oputil.js user info` are in! See [oputil CLI](/docs/admin/oputil.md).
 
 
 ## 0.0.8-alpha
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 326ebaad..79ce2f31 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -56,6 +56,8 @@
       - Build your own
     - Content Servers
       - [Web]({{ site.baseurl }}{% link servers/web-server.md %})
+      - [Gopher]({{ site.baseurl }}{% link servers/gopher.md %})
+      - [NNTP]({{ site.baseurl }}{% link servers/nntp.md %})
               
   - Modding
     - [Local Doors]({{ site.baseurl }}{% link modding/local-doors.md %})
diff --git a/docs/modding/file-area-list.md b/docs/modding/file-area-list.md
index 735986a0..dcc0b958 100644
--- a/docs/modding/file-area-list.md
+++ b/docs/modding/file-area-list.md
@@ -6,7 +6,7 @@ title: File Area List
 The built in `file_area_list` module provides a very flexible file listing UI.
 
 ## Configuration
-## Config Block
+### Config Block
 Available `config` block entries:
 * `art`: Sub-configuration block used to establish art files used for file browsing:
     * `browse`: The main browse screen.
diff --git a/docs/servers/gopher.md b/docs/servers/gopher.md
new file mode 100644
index 00000000..343c7d80
--- /dev/null
+++ b/docs/servers/gopher.md
@@ -0,0 +1,40 @@
+---
+layout: page
+title: Gopher Server
+---
+## The Gopher Content Server
+The Gopher *content server* provides access to publicly exposed message conferences and areas over Gopher (gopher://).
+
+## Configuration
+Gopher configuration is found in `contentServers.gopher` in `config.hjson`.
+
+| Item | Required | Description |
+|------|----------|-------------|
+| `enabled` | :+1: | Set to `true` to enable Gopher |
+| `port` | :-1: | Override the default port of `8070` |
+| `publicHostName` | :+1: | Set the **public** hostname/domain that Gopher will serve to the outside world. Example: `myfancybbs.com` |
+| `publicPort` | :+1: | Set the **public** port that Gopher will serve to the outside world. |
+| `messageConferences` | :+1: | An map of *conference tags* to *area tags* that are publicly exposed via Gopher. See example below. |
+
+Notes on `publicHostName` and `publicPort`:
+The Gopher protocol serves content that contains host/domain and port even when referencing it's own documents. Due to this, these members must be set to your publicly addressable Gopher server!
+
+### Example
+Let's suppose you are serving Gopher for your BBS at `myfancybbs.com`. Your ENiGMA½ system is listening on the default Gopher `port` of 8070 but you're behind a firewall and want port 70 exposed to the public. Lastly, you want to expose some fsxNet areas:
+
+```hjson
+contentServers: {
+    gopher: {
+        enabled: true
+        publicHostName: myfancybbs.com
+        publicPort: 70
+
+        messageConferences: {
+            fsxnet: { // fsxNet's conf tag
+                // Areas of fsxNet we want to expose:
+                "fsx_gen", "fsx_bbs"
+            }
+        }
+    }
+}
+```
diff --git a/docs/servers/nntp.md b/docs/servers/nntp.md
new file mode 100644
index 00000000..c6ceaf2e
--- /dev/null
+++ b/docs/servers/nntp.md
@@ -0,0 +1,66 @@
+---
+layout: page
+title: NNTP Server
+---
+## The NNTP Content Server
+The NNTP *content server* provides access to publicly exposed message conferences and areas over either **secure** NNTPS (NNTP over TLS or nttps://) and/or non-secure NNTP (nntp://).
+
+## Configuration
+| Item | Required | Description |
+|------|----------|-------------|
+| `nntp` | :-1: | Configuration block for non-secure NNTP. See Non-Secure NNTP Configuration below. |
+| `nntps` | :-1: | Configuration block for secure NNTP. See Secure NNTPS Configuration below. |
+| `publicMessageConferences` | :+1: | A map of *conference tags* to *area tags* that are publicly exposed over NNTP. Anonymous users will get read-only access to these areas. |
+
+### See Non-Secure NNTP Configuration
+Under `contentServers.nntp.nntp` the following configuration is allowed:
+
+| Item | Required | Description |
+|------|----------|-------------|
+| `enabled` | :+1: | Set to `true` to enable non-secure NNTP access. |
+| `port` | :-1: | Override the default port of `8119`. |
+
+### Secure NNTPS Configuration
+Under `contentServers.nntp.nntps` the following configuration is allowed:
+
+| Item | Required | Description |
+|------|----------|-------------|
+| `enabled` | :+1: | Set to `true` to enable secure NNTPS access. |
+| `port` | :-1: | Override the default port of `8565`. |
+| `certPem` | :-1: | Override the default certificate file path of `./config/nntps_cert.pem` |
+| `keyPem` | :-1: | Override the default certificate key file path of `./config/nntps_key.pem` |
+
+#### Certificates and Keys
+In order to use secure NNTPS, a TLS certificate and key pair must be provided. You may generate your own but most clients **will not trust** them. A certificate and key from a trusted Certificate Authority is recommended. [Let's Encrypt](https://letsencrypt.org/) provides free TLS certificates. Certificates and private keys must be in [PEM format](https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail).
+
+##### Generating Your Own
+An example of generating your own cert/key pair:
+```bash
+openssl req -newkey rsa:2048 -nodes -keyout ./config/nntps_key.pem -x509 -days 3050 -out ./config/nntps_cert.pem
+```
+
+### Example Configuration
+```hjson
+contentServers: {
+    nntp: {
+        publicMessageConferences: {
+            fsxnet: [
+                // Expose these areas of fsxNet
+                "fsx_gen", "fsx_bbs"
+            ]
+        }
+
+        nntp: {
+            enabled: true
+        }
+
+        nntps: {
+            enabled: true
+
+            // These could point to Let's Encrypt provided pairs for example:
+            certPem: /path/to/some/tls_cert.pem
+            keyPem: /path/to/some/tls_private_key.pem
+        }
+    }
+}
+```
diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
index 51471e28..a71f8250 100644
--- a/docs/servers/ssh.md
+++ b/docs/servers/ssh.md
@@ -2,38 +2,41 @@
 layout: page
 title: SSH Server
 ---
-## Generate a SSH Private Key
+## SSH Login Server
+The ENiGMA½ SSH *login server* allows secure user logins over SSH (ssh://).
 
-To utilize the SSH server, an SSH Private Key will need generated. From the ENiGMA installation directory:
+## Configuration
+Entries available under `config.loginServers.ssh`:
 
-```bash
-openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
-```
+| Item | Required | Description |
+|------|----------|-------------|
+| `privateKeyPem` | :-1: | Path to private key file. If not set, defaults to `./config/ssh_private_key.pem` |
+| `privateKeyPass` | :+1: | Password to private key file.
+| `firstMenu` | :-1: | First menu an SSH connected user is presented with. Defaults to `sshConnected`. |
+| `firstMenuNewUser` | :-1: | Menu presented to user when logging in with one of the usernames found within `users.newUserNames` in your `config.hjson`. Examples include `new` and `apply`. |
+| `enabled` | :+1: | Set to `true` to enable the SSH server. |
+| `port` | :-1: | Override the default port of `8443`. | 
+| `algorithms` | :-1: | Configuration block for SSH algorithms. Includes keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config.js`.
+| `traceConnections` | :-1: | Set to `true` to enable full trace-level information on SSH connections.
 
-You then need to enable the SSH server in your `config.hjson`:
+### Example Configuration
 
 ```hjson
 {
-	loginServers: {
-		ssh: {
+    loginServers: {
+        ssh: {
             enabled: true
-		    port: 8889
-		    privateKeyPem: /path/to/ssh_private_key.pem
-            privateKeyPass: YOUR_PK_PASS
+            port: 8889
+            privateKeyPem: /path/to/ssh_private_key.pem
+            privateKeyPass: sup3rs3kr3tpa55
         }                                                             
     }
 }
 ```
 
-### SSH Server Options
+## Generate a SSH Private Key
+To utilize the SSH server, an SSH Private Key will need generated. OpenSSL can be used for this task:
 
-| Option              | Description
-|---------------------|--------------------------------------------------------------------------------------|
-| `privateKeyPem`	  | Path to private key file.
-| `privateKeyPass`    | Password to private key file.
-| `firstMenu`		  | First menu an SSH connected user is presented with.
-| `firstMenuNewUser`  | Menu presented to user when logging in with `users::newUserNames` in your config.hjson (defaults to `new` and `apply`).
-| `enabled`           | Enable/disable SSH server.
-| `port`              | Configure a custom port for the SSH server.
-| `algorithms`        | Configuration block for SSH algoritms. Includes arrays with keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config.js`.
-| `traceConnections`  | Set to `true` to enable full trace-level information on SSH connections.
+```bash
+openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+```
diff --git a/docs/servers/telnet.md b/docs/servers/telnet.md
index 47aba591..ccefc966 100644
--- a/docs/servers/telnet.md
+++ b/docs/servers/telnet.md
@@ -2,24 +2,28 @@
 layout: page
 title: Telnet Server
 ---
+## Telnet Login Server
+The Telnet *login server* provides a standard **non-secure** Telnet login experience.
 
-Telnet is enabled by default on port `8888` in `config.hjson`:
+## Configuration
+The following configuration can be made in `config.hjson` under the `loginServers.telnet` block:
 
+| Item | Required | Description |
+|------|----------|-------------|
+| `enabled` | :-1: Defaults to `true`. Set to `false` to disable Telnet |
+| `port` | :-1: | Override the default port of `8888`. |
+| `firstMenu` | :-1: | First menu a telnet connected user is presented with. Defaults to `telnetConnected`. |
+
+### Example Configuration
 ```hjson
 {
-    loginServers: {
-      telnet: {
-        enabled: true
-        port: 8888
-      }                                                                                                        
-    }
+  loginServers: {
+    telnet: {
+      enabled: true
+      port: 8888
+    }          
+  }
 }
 ```
 
-### Telnet Server Options
 
-| Option              | Description
-|---------------------|--------------------------------------------------------------------------------------|
-| `firstMenu`		  | First menu a telnet connected user is presented with
-| `enabled`           | Enable/disable telnet server
-| `port`              | Configure a custom port for the telnet server
diff --git a/docs/servers/websocket.md b/docs/servers/websocket.md
index 18271d6f..98f867e7 100644
--- a/docs/servers/websocket.md
+++ b/docs/servers/websocket.md
@@ -2,6 +2,9 @@
 layout: page
 title: Web Socket / Web Interface Server
 ---
+## WebSocket Login Server
+The WebSocket Login Server provides **secure** (wss://) as well as non-secure (ws://) WebSocket login access. This is often combined with a browser based WebSocket client such as VTX or fTelnet.
+
 # VTX Web Client
 ENiGMA supports the VTX websocket client for connecting to your BBS from a web page. Example usage can be found at 
 [Xibalba](https://l33t.codes/vtx/xibalba.html) and [fORCE9](https://bbs.force9.org/vtx/force9.html).

From b1eea4f4b7e0eda122219abbc89a019394795d79 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 11:20:14 -0700
Subject: [PATCH 0640/1013] Some logging updates

---
 core/servers/content/nntp.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 98dbdca7..14d5fe9d 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -578,7 +578,13 @@ class NNTPServer extends NNTPServerBase {
             });
 
         if(!value) {
-            this.log.trace(`No value for requested header field "${field}"`);
+            //
+            //  Clients will check some headers just to see if they exist.
+            //  Don't spam logs with these. For others, it's good to know.
+            //
+            if(!['references', 'xref'].includes(field)) {
+                this.log.trace(`No value for requested header field "${field}"`);
+            }
         }
 
         return value;
@@ -588,8 +594,9 @@ class NNTPServer extends NNTPServerBase {
         return super._getOverviewFmt(session);
     }
 
-    _getNewNews(/*session, time, wildmat*/) {
+    _getNewNews(session, time, wildmat) {
         //  Currently seems pointless to implement. No semi-modern clients seem to use it anyway.
+        this.log.debug( { time, wildmat }, 'Request made using unsupported NEWNEWS command');
         throw new Errors.Invalid('NEWNEWS is not enabled on this server');
     }
 

From 8356f00ba6d66715a8791bb5b1648cd5e920143f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 11:56:07 -0700
Subject: [PATCH 0641/1013] Fix bug when user has been nuked

---
 core/last_callers.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/last_callers.js b/core/last_callers.js
index c80ce336..f7c2552e 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -42,29 +42,29 @@ exports.getModule = class LastCallersModule extends MenuModule {
 
             async.waterfall(
                 [
-                    (next) => {
+                    (callback) => {
                         this.prepViewController('callers', 0, mciData.menu, err => {
-                            return next(err);
+                            return callback(err);
                         });
                     },
-                    (next) => {
+                    (callback) => {
                         this.fetchHistory( (err, loginHistory) => {
-                            return next(err, loginHistory);
+                            return callback(err, loginHistory);
                         });
                     },
-                    (loginHistory, next) => {
+                    (loginHistory, callback) => {
                         this.loadUserForHistoryItems(loginHistory, (err, updatedHistory) => {
-                            return next(err, updatedHistory);
+                            return callback(err, updatedHistory);
                         });
                     },
-                    (loginHistory, next) => {
+                    (loginHistory, callback) => {
                         const callersView = this.viewControllers.callers.getView(MciViewIds.callerList);
                         if(!callersView) {
                             return cb(Errors.MissingMci(`Missing caller list MCI ${MciViewIds.callerList}`));
                         }
                         callersView.setItems(loginHistory);
                         callersView.redraw();
-                        return next(null);
+                        return callback(null);
                     }
                 ],
                 err => {
@@ -178,10 +178,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
             });
         }
 
-        async.map(loginHistory, (item, next) => {
+        async.map(loginHistory, (item, nextHistoryItem) => {
             User.getUserName(item.userId, (err, userName) => {
                 if(err) {
-                    return cb(null, null);
+                    return nextHistoryItem(null, null);
                 }
 
                 item.userName = item.text = userName;
@@ -192,7 +192,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
                     item.realName       = (props && props[UserProps.RealName]) || '';
 
                     if(!indicatorSumsSql) {
-                        return next(null, item);
+                        return nextHistoryItem(null, item);
                     }
 
                     sysDb.get(
@@ -210,7 +210,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
                                     item.actions += indicator;
                                 });
                             }
-                            return next(null, item);
+                            return nextHistoryItem(null, item);
                         }
                     );
                 });

From 832e04cdf00dea2a9f489f3fdc3f8f0c414b1f98 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 12:08:06 -0700
Subject: [PATCH 0642/1013] + Initial FILES.BBS support during file scan: A few
 formats supported so far, more to come... * Detect DESCRIPT.ION, FILES.BBS,
 etc. during scans

---
 core/descript_ion_file.js       |   7 +-
 core/files_bbs_file.js          | 158 ++++++++++++++++++++++++++++++++
 core/oputil/oputil_file_base.js |  41 +++++++--
 3 files changed, 199 insertions(+), 7 deletions(-)
 create mode 100644 core/files_bbs_file.js

diff --git a/core/descript_ion_file.js b/core/descript_ion_file.js
index a5d68e1d..d34551ba 100644
--- a/core/descript_ion_file.js
+++ b/core/descript_ion_file.js
@@ -1,6 +1,8 @@
 /* jslint node: true */
 'use strict';
 
+const { Errors }    = require('./enig_error.js');
+
 //  deps
 const fs            = require('graceful-fs');
 const iconv         = require('iconv-lite');
@@ -64,7 +66,10 @@ module.exports = class DescriptIonFile {
                 return nextLine(null);
             },
             () => {
-                return cb(null, descIonFile);
+                return cb(
+                    descIonFile.entries.size > 0 ? null : Errors.Invalid('Invalid or unrecognized DESCRIPT.ION format'),
+                    descIonFile
+                );
             });
         });
     }
diff --git a/core/files_bbs_file.js b/core/files_bbs_file.js
new file mode 100644
index 00000000..989068a6
--- /dev/null
+++ b/core/files_bbs_file.js
@@ -0,0 +1,158 @@
+/* jslint node: true */
+'use strict';
+
+const { Errors }    = require('./enig_error.js');
+
+//  deps
+const fs            = require('graceful-fs');
+const iconv         = require('iconv-lite');
+const moment        = require('moment');
+
+module.exports = class FilesBBSFile {
+    constructor() {
+        this.entries = new Map();
+    }
+
+    get(fileName) {
+        return this.entries.get(fileName);
+    }
+
+    getDescription(fileName) {
+        const entry = this.get(fileName);
+        if(entry) {
+            return entry.desc;
+        }
+    }
+
+    static createFromFile(path, cb) {
+        fs.readFile(path, (err, descData) => {
+            if(err) {
+                return cb(err);
+            }
+
+            //  :TODO: encoding should be default to CP437, but allowed to change - ie for Amiga/etc.
+            const lines = iconv.decode(descData, 'cp437').split(/\r?\n/g);
+            const filesBbs = new FilesBBSFile();
+
+            //
+            //  Contrary to popular belief, there is not a FILES.BBS standard. Instead,
+            //  many formats have been used over the years. We'll try to support as much
+            //  as we can within reason.
+            //
+            //  Resources:
+            //  - Great info from Mystic @ http://wiki.mysticbbs.com/doku.php?id=mutil_import_files.bbs
+            //  - https://alt.bbs.synchronet.narkive.com/I6Vrxq6q/format-of-files-bbs
+            //
+            //  Example files:
+            //  - https://github.com/NuSkooler/ansi-bbs/tree/master/ancient_formats/files_bbs
+            //
+            const detectDecoder = () => {
+                //
+                //  Try to figure out which decoder to use
+                //
+                const decoders = [
+                    {
+                        //  I've been told this is what Syncrhonet uses
+                        tester  : /^([^ ]{1,12})\s{1,11}([0-3][0-9]\/[0-3][0-9]\/[1789][0-9]) ([^\r\n]+)$/,
+                        extract : function() {
+                            for(let i = 0; i < lines.length; ++i) {
+                                let line = lines[i];
+                                const hdr = line.match(this.tester);
+                                if(!hdr) {
+                                    continue;
+                                }
+                                const long = [];
+                                for(let j = i + 1; j < lines.length; ++j) {
+                                    line = lines[j];
+                                    if(!line.startsWith(' ')) {
+                                        break;
+                                    }
+                                    long.push(line.trim());
+                                    ++i;
+                                }
+                                const desc      = long.join('\r\n') || hdr[3] || '';
+                                const fileName  = hdr[1];
+                                const timestamp = moment(hdr[2], 'MM/DD/YY');
+
+                                filesBbs.entries.set(fileName, { timestamp, desc } );
+                            }
+                        }
+                    },
+
+                    {
+                        //
+                        //  Aminet Amiga CDROM, March 1994.  Walnut Creek CDROM.
+                        //  CP/M CDROM, Sep. 1994.  Walnut Creek CDROM.
+                        //  ...and many others. Basically: <8.3 filename> <description>
+                        //
+                        //  May contain headers, but we'll just skip 'em.
+                        //
+                        tester  : /^([^ ]{1,12})\s{1,11}([^\r\n]+)$/,
+                        extract : function() {
+                            lines.forEach(line => {
+                                const hdr = line.match(this.tester);
+                                if(!hdr) {
+                                    return; //  forEach
+                                }
+
+                                const fileName  = hdr[1].trim();
+                                const desc      = hdr[2].trim();
+
+                                if(desc) {
+                                    filesBbs.entries.set(fileName, { desc } );
+                                }
+                            });
+                        }
+                    },
+
+                    {
+                        //  Found on AMINET CD's & similar
+                        tester  : /^(.{1,22}) ([0-9]+)K ([^\r\n]+)$/,
+                        extract : function() {
+                            lines.forEach(line => {
+                                const hdr = line.match(this.tester);
+                                if(!hdr) {
+                                    return; //  forEach
+                                }
+
+                                const fileName  = hdr[1].trim();
+                                let size        = parseInt(hdr[2]);
+                                const desc      = hdr[3].trim();
+
+                                if(!isNaN(size)) {
+                                    size *= 1024;   //  K->bytes.
+                                }
+
+                                if(desc) {  //  omit empty entries
+                                    filesBbs.entries.set(fileName, { size, desc } );
+                                }
+                            });
+                        }
+                    },
+                ];
+
+                const decoder = decoders.find(d => {
+                    return lines
+                        .slice(0, 10)   //  10 lines in should be enough to detect - skipping headers/etc.
+                        .some(l => d.tester.test(l));
+                });
+
+                return decoder;
+            };
+
+            const decoder = detectDecoder();
+            if(!decoder) {
+                return cb(Errors.Invalid('Invalid or unrecognized FILES.BBS format'));
+            }
+
+            decoder.extract(decoder);
+
+            return cb(
+                filesBbs.entries.size > 0 ? null : Errors.Invalid('Invalid or unrecognized FILES.BBS format'),
+                filesBbs
+            );
+        });
+    }
+
+
+};
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 2077b385..18113cc0 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -48,7 +48,7 @@ function finalizeEntryAndPersist(isUpdate, fileEntry, descHandler, cb) {
     async.series(
         [
             function getDescFromHandlerIfNeeded(callback) {
-                if((fileEntry.desc && fileEntry.desc.length > 0 ) && !argv['desc-file']) {
+                if((fileEntry.desc && fileEntry.descSrc != 'fileName' && fileEntry.desc.length > 0 ) && !argv['desc-file']) {
                     return callback(null);	//	we have a desc already and are NOT overriding with desc file
                 }
 
@@ -101,18 +101,47 @@ function finalizeEntryAndPersist(isUpdate, fileEntry, descHandler, cb) {
     );
 }
 
-const SCAN_EXCLUDE_FILENAMES = [ 'DESCRIPT.ION', 'FILES.BBS' ];
+const SCAN_EXCLUDE_FILENAMES = [
+    'DESCRIPT.ION',
+    'FILES.BBS',
+    'ALLFILES.TXT',
+];
 
 function loadDescHandler(path, cb) {
-    const DescIon = require('../../core/descript_ion_file.js');
+    const handlerClassFromFileName = {
+        'descript.ion'  : require('../../core/descript_ion_file.js'),
+        'files.bbs'     : require('../../core/files_bbs_file.js'),
+    }[paths.basename(path).toLowerCase()];
 
-    //	:TODO: support FILES.BBS also
+    if(!handlerClassFromFileName) {
+        return cb(Errors.DoesNotExist(`No handlers registered for ${paths.basename(path)}`));
+    }
 
-    DescIon.createFromFile(path, (err, descHandler) => {
+    handlerClassFromFileName.createFromFile(path, (err, descHandler) => {
         return cb(err, descHandler);
     });
 }
 
+//
+//  Try to find a suitable description handler by
+//  checking for common filenames.
+//
+function findSuitableDescHandler(basePath, cb) {
+    const commonFiles = [ 'FILES.BBS', 'DESCRIPT.ION' ];
+
+    async.eachSeries(commonFiles, (fileName, nextFileName) => {
+        loadDescHandler(paths.join(basePath, fileName), (err, handler) => {
+            if(!err && handler) {
+                return cb(null, handler);
+            }
+            return nextFileName(null);
+        });
+    },
+    () => {
+        return cb(Errors.DoesNotExist('No suitable description handler available'));
+    });
+}
+
 function scanFileAreaForChanges(areaInfo, options, cb) {
 
     const storageLocations = fileArea.getAreaStorageLocations(areaInfo).filter(sl => {
@@ -145,7 +174,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                         return callback(null, options.descFileHandler);	//	we're going to use the global handler
                     }
 
-                    loadDescHandler(paths.join(storageLoc.dir, 'DESCRIPT.ION'), (err, descHandler) => {
+                    findSuitableDescHandler(storageLoc.dir, (err, descHandler) => {
                         return callback(null, descHandler);
                     });
                 },

From 996fcb389e08fac4cb50df35bad9ca46e6754e9b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 12:10:55 -0700
Subject: [PATCH 0643/1013] Minor help update

---
 core/oputil/oputil_help.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 8e2bc2c2..59693ad3 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -72,10 +72,9 @@ actions:
 scan args:
   --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
 
-  --desc-file [PATH]           prefer file descriptions from DESCRIPT.ION file over
-                               other sources such as FILE_ID.DIZ.
-                               if PATH is specified, use DESCRIPT.ION at PATH instead
-                               of looking in specific storage locations
+  --desc-file [PATH]           prefer file descriptions from supplied path over other
+                               other sources such as FILE_ID.DIZ. Path must point to
+                               a valid FILES.BBS or DESCRIPT.ION file.
   --update                     attempt to update information for existing entries
   --quick                      perform quick scan
 

From 2bca9c29776ad5569a03f7dfef6764dab37652be Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 12:11:45 -0700
Subject: [PATCH 0644/1013] Minor doc update

---
 docs/admin/oputil.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index dd989a5a..dae9b44c 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -114,10 +114,9 @@ actions:
 scan args:
   --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
 
-  --desc-file [PATH]           prefer file descriptions from DESCRIPT.ION file over
-                               other sources such as FILE_ID.DIZ.
-                               if PATH is specified, use DESCRIPT.ION at PATH instead
-                               of looking in specific storage locations
+  --desc-file [PATH]           prefer file descriptions from supplied path over other
+                               other sources such as FILE_ID.DIZ. Path must point to
+                               a valid FILES.BBS or DESCRIPT.ION file.
   --update                     attempt to update information for existing entries
   --quick                      perform quick scan
 

From 84ca97e936231c6609ad8e526c21f5298fb6ee8d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 15:56:09 -0700
Subject: [PATCH 0645/1013] FILES.BBS handling improvements - WIP

---
 WHATSNEW.md            |  1 +
 core/files_bbs_file.js | 80 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index d7c26361..61b7235f 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -24,6 +24,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Handling of failed login attempts is now fully in. Disconnect clients, lock out accounts, ability to auto or unlock at (email-driven) password reset, etc. See `users.failedLogin` in `config.hjson`.
 * NNTP support! See [NNTP docs](/docs/servers/nntp.md) for more information.
 * `oputil.js user rm` and `oputil.js user info` are in! See [oputil CLI](/docs/admin/oputil.md).
+* Performing a file scan/import using `oputil.js fb scan` now recognizes various `FILES.BBS` formats.
 
 
 ## 0.0.8-alpha
diff --git a/core/files_bbs_file.js b/core/files_bbs_file.js
index 989068a6..34483e48 100644
--- a/core/files_bbs_file.js
+++ b/core/files_bbs_file.js
@@ -47,17 +47,27 @@ module.exports = class FilesBBSFile {
             //  - https://github.com/NuSkooler/ansi-bbs/tree/master/ancient_formats/files_bbs
             //
             const detectDecoder = () => {
+                //  helpers
+                const regExpTestUpTo = (n, re) => {
+                    return lines
+                        .slice(0, n)
+                        .some(l => re.test(l));
+                };
+
                 //
                 //  Try to figure out which decoder to use
                 //
                 const decoders = [
                     {
                         //  I've been told this is what Syncrhonet uses
-                        tester  : /^([^ ]{1,12})\s{1,11}([0-3][0-9]\/[0-3][0-9]\/[1789][0-9]) ([^\r\n]+)$/,
+                        lineRegExp : /^([^ ]{1,12})\s{1,11}([0-3][0-9]\/[0-3][0-9]\/[1789][0-9]) ([^\r\n]+)$/,
+                        detect : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
                         extract : function() {
                             for(let i = 0; i < lines.length; ++i) {
                                 let line = lines[i];
-                                const hdr = line.match(this.tester);
+                                const hdr = line.match(this.lineRegExp);
                                 if(!hdr) {
                                     continue;
                                 }
@@ -81,16 +91,55 @@ module.exports = class FilesBBSFile {
 
                     {
                         //
-                        //  Aminet Amiga CDROM, March 1994.  Walnut Creek CDROM.
-                        //  CP/M CDROM, Sep. 1994.  Walnut Creek CDROM.
-                        //  ...and many others. Basically: <8.3 filename> <description>
+                        //  Examples:
+                        //  - Night Owl CD #7, 1992
+                        //
+                        lineRegExp  : /^([^\s]{1,12})\s{2,14}\[0\]\s\s([^\r\n]+)$/,
+                        detect : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
+                        extract : function() {
+                            for(let i = 0; i < lines.length; ++i) {
+                                let line = lines[i];
+                                const hdr = line.match(this.lineRegExp);
+                                if(!hdr) {
+                                    continue;
+                                }
+                                const long = [ hdr[2].trim() ];
+                                for(let j = i + 1; j < lines.length; ++j) {
+                                    line = lines[j];
+                                    if(!line.startsWith('                               | ')) {
+                                        break;
+                                    }
+                                    long.push(line.substr(33));
+                                    ++i;
+                                }
+                                const desc      = long.join('\r\n');
+                                const fileName  = hdr[1];
+
+                                filesBbs.entries.set(fileName, { desc } );
+                            }
+                        }
+                    },
+
+                    {
+                        //
+                        //  Examples:
+                        //  - Aminet Amiga CDROM, March 1994.  Walnut Creek CDROM.
+                        //  - CP/M CDROM, Sep. 1994.  Walnut Creek CDROM.
+                        //  - ...and many others.
+                        //
+                        //  Basically: <8.3 filename> <description>
                         //
                         //  May contain headers, but we'll just skip 'em.
                         //
-                        tester  : /^([^ ]{1,12})\s{1,11}([^\r\n]+)$/,
+                        lineRegExp : /^([^ ]{1,12})\s{1,11}([^\r\n]+)$/,
+                        detect : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
                         extract : function() {
                             lines.forEach(line => {
-                                const hdr = line.match(this.tester);
+                                const hdr = line.match(this.lineRegExp);
                                 if(!hdr) {
                                     return; //  forEach
                                 }
@@ -106,8 +155,14 @@ module.exports = class FilesBBSFile {
                     },
 
                     {
-                        //  Found on AMINET CD's & similar
-                        tester  : /^(.{1,22}) ([0-9]+)K ([^\r\n]+)$/,
+                        //
+                        //  Examples:
+                        //  - AMINET CD's & similar
+                        //
+                        lineRegExp : /^(.{1,22}) ([0-9]+)K ([^\r\n]+)$/,
+                        detect : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
                         extract : function() {
                             lines.forEach(line => {
                                 const hdr = line.match(this.tester);
@@ -131,12 +186,7 @@ module.exports = class FilesBBSFile {
                     },
                 ];
 
-                const decoder = decoders.find(d => {
-                    return lines
-                        .slice(0, 10)   //  10 lines in should be enough to detect - skipping headers/etc.
-                        .some(l => d.tester.test(l));
-                });
-
+                const decoder = decoders.find(d => d.detect());
                 return decoder;
             };
 

From 098e3c2fba37e318cc5d2206808a13bb8b18aad1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 17:23:02 -0700
Subject: [PATCH 0646/1013] More FILES.BBS support

---
 core/files_bbs_file.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/files_bbs_file.js b/core/files_bbs_file.js
index 34483e48..fcafd165 100644
--- a/core/files_bbs_file.js
+++ b/core/files_bbs_file.js
@@ -108,6 +108,7 @@ module.exports = class FilesBBSFile {
                                 const long = [ hdr[2].trim() ];
                                 for(let j = i + 1; j < lines.length; ++j) {
                                     line = lines[j];
+                                    // -------------------------------------------------v 32
                                     if(!line.startsWith('                               | ')) {
                                         break;
                                     }
@@ -122,6 +123,42 @@ module.exports = class FilesBBSFile {
                         }
                     },
 
+                    {
+                        //
+                        //  Simple first line with partial description,
+                        //  secondary description lines tabbed out.
+                        //
+                        //  Examples
+                        //  - GUS archive @ dk.toastednet.org
+                        //
+                        lineRegExp : /^([^\s]{1,12})\s+\[00\]\s([^\r\n]+)$/,
+                        detect  : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
+                        extract : function() {
+                            for(let i = 0; i < lines.length; ++i) {
+                                let line = lines[i];
+                                const hdr = line.match(this.lineRegExp);
+                                if(!hdr) {
+                                    continue;
+                                }
+                                const long = [ hdr[2].trimRight() ];
+                                for(let j = i + 1; j < lines.length; ++j) {
+                                    line = lines[j];
+                                    if(!line.startsWith('\t\t  ')) {
+                                        break;
+                                    }
+                                    long.push(line.substr(4));
+                                    ++i;
+                                }
+                                const desc      = long.join('\r\n');
+                                const fileName  = hdr[1];
+
+                                filesBbs.entries.set(fileName, { desc } );
+                            }
+                        }
+                    },
+
                     {
                         //
                         //  Examples:

From 03662dc05603ae408d50395e3545c7d13f0e5cee Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 21:38:09 -0700
Subject: [PATCH 0647/1013] Fix major durp in code with CNET codes

---
 core/color_codes.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index e07b805e..4119a8ce 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -245,20 +245,24 @@ function controlCodesToAnsi(s, client) {
                 }
 
                 result += s.substr(lastIndex, m.index - lastIndex) + v;
-
                 break;
 
             case '\x19'     :
             case '\0x11'    :
                 //  CNET "Y-Style" & "Q-Style"
                 v = m[9] || m[11];
-                if('n1' === v) {
-                    result += '\n';
-                } else if('f1' === v) {
-                    result += ANSI.clearScreen();
+                if(v) {
+                    if('n1' === v) {
+                        v = '\n';
+                    } else if('f1' === v) {
+                        v = ANSI.clearScreen();
+                    } else {
+                        v = ansiSgrFromCnetStyleColorCode(v);
+                    }
                 } else {
-                    result += ansiSgrFromCnetStyleColorCode(v);
+                    v = m[0];
                 }
+                result += s.substr(lastIndex, m.index - lastIndex) + v;
                 break;
         }
 

From 1f5ec39778eab6af8b19246d203d018ae4a9d6d8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 21:39:10 -0700
Subject: [PATCH 0648/1013] Strip pipe codes!

---
 core/servers/content/nntp.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 14d5fe9d..cbb4d629 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -20,6 +20,9 @@ const {
     splitTextAtTerms,
 }                           = require('../../string_util.js');
 const AnsiPrep              = require('../../ansi_prep.js');
+const {
+    stripMciColorCodes
+}                           = require('../../color_codes.js');
 
 //  deps
 const NNTPServerBase        = require('nntp-server');
@@ -652,7 +655,7 @@ class NNTPServer extends NNTPServerBase {
                 }
             );
         } else {
-            message.preparedBody = cleanControlCodes(message.message, { all : true });
+            message.preparedBody = stripMciColorCodes(cleanControlCodes(message.message, { all : true }));
             return cb(null);
         }
     }

From eeaeef9a8c4cea99564b4c57989025413d4a6ba3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 21:39:25 -0700
Subject: [PATCH 0649/1013] Yet another FILES.BBS type

---
 core/files_bbs_file.js | 56 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/core/files_bbs_file.js b/core/files_bbs_file.js
index fcafd165..cfbd5a96 100644
--- a/core/files_bbs_file.js
+++ b/core/files_bbs_file.js
@@ -84,6 +84,9 @@ module.exports = class FilesBBSFile {
                                 const fileName  = hdr[1];
                                 const timestamp = moment(hdr[2], 'MM/DD/YY');
 
+                                if(!timestamp.isValid()) {
+                                    continue;
+                                }
                                 filesBbs.entries.set(fileName, { timestamp, desc } );
                             }
                         }
@@ -159,6 +162,54 @@ module.exports = class FilesBBSFile {
                         }
                     },
 
+                    {
+                        //
+                        //  <8.3FileName> <size> <MM-DD-YY> <desc first line>
+                        //                                  <desc...>
+                        //  Examples:
+                        //  - Expanding Your BBS CD by David Wolfe, 1995
+                        //
+                        lineRegExp : /^([^ ]{1,12})\s{1,20}([0-9]+)\s\s([0-3][0-9]-[0-3][0-9]-[1789][0-9])\s\s([^\r\n]+)$/,
+                        detect  : function() {
+                            return regExpTestUpTo(10, this.lineRegExp);
+                        },
+                        extract : function() {
+                            for(let i = 0; i < lines.length; ++i) {
+                                let line = lines[i];
+                                const hdr = line.match(this.lineRegExp);
+                                if(!hdr) {
+                                    continue;
+                                }
+
+                                const firstDescLine = hdr[4].trimRight();
+                                //  ugly kludge:
+                                if('No ID File Found For This Archive File.' === firstDescLine) {
+                                    continue;
+                                }
+                                const long = [ firstDescLine ];
+                                for(let j = i + 1; j < lines.length; ++j) {
+                                    line = lines[j];
+                                    if(!line.startsWith(' '.repeat(34))) {
+                                        break;
+                                    }
+                                    long.push(line.substr(34).trimRight());
+                                    ++i;
+                                }
+
+                                const desc      = long.join('\r\n');
+                                const fileName  = hdr[1];
+                                const size      = parseInt(hdr[2]);
+                                const timestamp = moment(hdr[3], 'MM-DD-YY');
+
+                                if(isNaN(size) || !timestamp.isValid()) {
+                                    continue;
+                                }
+
+                                filesBbs.entries.set(fileName, { desc, size, timestamp });
+                            }
+                        }
+                    },
+
                     {
                         //
                         //  Examples:
@@ -211,9 +262,10 @@ module.exports = class FilesBBSFile {
                                 let size        = parseInt(hdr[2]);
                                 const desc      = hdr[3].trim();
 
-                                if(!isNaN(size)) {
-                                    size *= 1024;   //  K->bytes.
+                                if(isNaN(size)) {
+                                    return; //  forEach
                                 }
+                                size *= 1024;   //  K->bytes.
 
                                 if(desc) {  //  omit empty entries
                                     filesBbs.entries.set(fileName, { size, desc } );

From f4088303ca40f8e33b1437cf19fbeb7241d57e67 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Dec 2018 22:08:59 -0700
Subject: [PATCH 0650/1013] cleanControlCodes -> stripAnsiControlCodes

---
 core/fse.js                    | 6 +++---
 core/servers/content/gopher.js | 4 ++--
 core/servers/content/nntp.js   | 4 ++--
 core/string_util.js            | 6 ++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index d294f10b..1d9d6dd7 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -18,7 +18,7 @@ const {
     MessageAreaConfTempSwitcher
 }                               = require('./mod_mixins.js');
 const {
-    isAnsi, cleanControlCodes,
+    isAnsi, stripAnsiControlCodes,
     insert
 }                               = require('./string_util.js');
 const Config                    = require('./config.js').get;
@@ -400,7 +400,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                             }
                         );
                     } else {
-                        bodyMessageView.setText(cleanControlCodes(msg));
+                        bodyMessageView.setText(stripAnsiControlCodes(msg));
                     }
                 }
             }
@@ -733,7 +733,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                                 var bodyMessageView = self.viewControllers.body.getView(MciViewIds.body.message);
                                 if(bodyMessageView && _.has(self, 'message.message')) {
                                     //self.setBodyMessageViewText();
-                                    bodyMessageView.setText(cleanControlCodes(self.message.message));
+                                    bodyMessageView.setText(stripAnsiControlCodes(self.message.message));
                                 }
                             }
                             break;
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index f5ae9cfa..c47efc5c 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -8,7 +8,7 @@ const Config                    = require('../../config.js').get;
 const {
     splitTextAtTerms,
     isAnsi,
-    cleanControlCodes
+    stripAnsiControlCodes
 }                               = require('../../string_util.js');
 const {
     getMessageConferenceByTag,
@@ -218,7 +218,7 @@ exports.getModule = class GopherModule extends ServerModule {
             );
         } else {
             const cleaned = stripMciColorCodes(
-                cleanControlCodes(body, { all : true } )
+                stripAnsiControlCodes(body, { all : true } )
             );
             const prepped =
                 splitTextAtTerms(cleaned)
diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index cbb4d629..7135a585 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -16,7 +16,7 @@ const Message               = require('../../message.js');
 const FTNAddress            = require('../../ftn_address.js');
 const {
     isAnsi,
-    cleanControlCodes,
+    stripAnsiControlCodes,
     splitTextAtTerms,
 }                           = require('../../string_util.js');
 const AnsiPrep              = require('../../ansi_prep.js');
@@ -655,7 +655,7 @@ class NNTPServer extends NNTPServerBase {
                 }
             );
         } else {
-            message.preparedBody = stripMciColorCodes(cleanControlCodes(message.message, { all : true }));
+            message.preparedBody = stripMciColorCodes(stripAnsiControlCodes(message.message, { all : true }));
             return cb(null);
         }
     }
diff --git a/core/string_util.js b/core/string_util.js
index 8fab88b8..4f7741ae 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -23,7 +23,7 @@ exports.formatByteSizeAbbr          = formatByteSizeAbbr;
 exports.formatByteSize              = formatByteSize;
 exports.formatCountAbbr             = formatCountAbbr;
 exports.formatCount                 = formatCount;
-exports.cleanControlCodes           = cleanControlCodes;
+exports.stripAnsiControlCodes       = stripAnsiControlCodes;
 exports.isAnsi                      = isAnsi;
 exports.isAnsiLine                  = isAnsiLine;
 exports.isFormattedLine             = isFormattedLine;
@@ -218,8 +218,6 @@ function stringToNullTermBuffer(s, options = { encoding : 'utf8', maxBufLen : -1
 }
 
 const PIPE_REGEXP           = /(\|[A-Z\d]{2})/g;
-//const ANSI_REGEXP         = /[\u001b\u009b][[()#;?]*([0-9]{1,4}(?:;[0-9]{0,4})*)?([0-9A-ORZcf-npqrsuy=><])/g;
-//const ANSI_OR_PIPE_REGEXP = new RegExp(PIPE_REGEXP.source + '|' + ANSI_REGEXP.source, 'g');
 const ANSI_OR_PIPE_REGEXP   = new RegExp(PIPE_REGEXP.source + '|' + ANSI.getFullMatchRegExp().source, 'g');
 
 //
@@ -357,7 +355,7 @@ const ANSI_OPCODES_ALLOWED_CLEAN    = [
     'm',        //  color
 ];
 
-function cleanControlCodes(input, options) {
+function stripAnsiControlCodes(input, options) {
     let m;
     let pos;
     let cleaned = '';

From c6e176f5bd3285c10b4c8bdd47a1fe5a01fe440b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 21 Dec 2018 14:39:57 -0700
Subject: [PATCH 0651/1013] Add oputil fb desc

---
 WHATSNEW.md                     |  3 +-
 core/files_bbs_file.js          | 28 +++++++++---
 core/oputil/oputil_file_base.js | 80 +++++++++++++++++++++++++++++++--
 core/oputil/oputil_help.js      | 10 +++--
 docs/admin/oputil.md            | 10 +++--
 5 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 61b7235f..5b08e2b8 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -41,7 +41,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Correly parse oddball `INTL`, `TOPT`, `FMPT`, `Via`, etc. FTN kludge lines
 * NetMail support! You can now send and receive NetMail. To send a NetMail address a external user using `Name <address>` format from your personal email menu. For example, `Foo Bar <123:123/123>`. The system also detects other formats such asa `Name @ address` (`Foo Bar@123:123/123`)
 * `oputil.js`: Added `mb areafix` command to quickly send AreaFix messages from the command line. You can manually send them from personal mail as well.
-* `oputil.js fb rm|remove|del|delete` functionality to remove file base entries
+* `oputil.js fb rm|remove|del|delete` functionality to remove file base entries.
+* `oputil.js fb desc` for setting/updating a file entry description.
 * Users can now (re)set File and Message base pointers
 * Add `--update` option to `oputil.js fb scan`
 * Fix @watch path support for event scheduler including FTN, e.g. when looking for a `toss!.now` file produced by Binkd.
diff --git a/core/files_bbs_file.js b/core/files_bbs_file.js
index cfbd5a96..6e186ab4 100644
--- a/core/files_bbs_file.js
+++ b/core/files_bbs_file.js
@@ -8,6 +8,12 @@ const fs            = require('graceful-fs');
 const iconv         = require('iconv-lite');
 const moment        = require('moment');
 
+//  Descriptions found in the wild that mean "no description" /facepalm.
+const IgnoredDescriptions = [
+    'No description available',
+    'No ID File Found For This Archive File.',
+];
+
 module.exports = class FilesBBSFile {
     constructor() {
         this.entries = new Map();
@@ -34,6 +40,10 @@ module.exports = class FilesBBSFile {
             const lines = iconv.decode(descData, 'cp437').split(/\r?\n/g);
             const filesBbs = new FilesBBSFile();
 
+            const isBadDescription = (desc) => {
+                return IgnoredDescriptions.find(d => desc.startsWith(d)) ? true : false;
+            };
+
             //
             //  Contrary to popular belief, there is not a FILES.BBS standard. Instead,
             //  many formats have been used over the years. We'll try to support as much
@@ -84,7 +94,7 @@ module.exports = class FilesBBSFile {
                                 const fileName  = hdr[1];
                                 const timestamp = moment(hdr[2], 'MM/DD/YY');
 
-                                if(!timestamp.isValid()) {
+                                if(isBadDescription(desc) || !timestamp.isValid()) {
                                     continue;
                                 }
                                 filesBbs.entries.set(fileName, { timestamp, desc } );
@@ -121,6 +131,10 @@ module.exports = class FilesBBSFile {
                                 const desc      = long.join('\r\n');
                                 const fileName  = hdr[1];
 
+                                if(isBadDescription(desc)) {
+                                    continue;
+                                }
+
                                 filesBbs.entries.set(fileName, { desc } );
                             }
                         }
@@ -157,6 +171,10 @@ module.exports = class FilesBBSFile {
                                 const desc      = long.join('\r\n');
                                 const fileName  = hdr[1];
 
+                                if(isBadDescription(desc)) {
+                                    continue;
+                                }
+
                                 filesBbs.entries.set(fileName, { desc } );
                             }
                         }
@@ -182,10 +200,6 @@ module.exports = class FilesBBSFile {
                                 }
 
                                 const firstDescLine = hdr[4].trimRight();
-                                //  ugly kludge:
-                                if('No ID File Found For This Archive File.' === firstDescLine) {
-                                    continue;
-                                }
                                 const long = [ firstDescLine ];
                                 for(let j = i + 1; j < lines.length; ++j) {
                                     line = lines[j];
@@ -201,7 +215,7 @@ module.exports = class FilesBBSFile {
                                 const size      = parseInt(hdr[2]);
                                 const timestamp = moment(hdr[3], 'MM-DD-YY');
 
-                                if(isNaN(size) || !timestamp.isValid()) {
+                                if(isBadDescription(desc) || isNaN(size) || !timestamp.isValid()) {
                                     continue;
                                 }
 
@@ -235,7 +249,7 @@ module.exports = class FilesBBSFile {
                                 const fileName  = hdr[1].trim();
                                 const desc      = hdr[2].trim();
 
-                                if(desc) {
+                                if(desc && !isBadDescription(desc)) {
                                     filesBbs.entries.set(fileName, { desc } );
                                 }
                             });
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 18113cc0..b12c4d69 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -413,11 +413,11 @@ function dumpFileInfo(shaOrFileId, cb) {
     );
 }
 
-function displayFileAreaInfo() {
+function displayFileOrAreaInfo() {
     //	AREA_TAG[@STORAGE_TAG]
-    //	SHA256|PARTIAL
+    //	SHA256|PARTIAL|FILE_ID|FILENAME_WILDCARD
     //	if sha: dump file info
-    //	if area/stoarge dump area(s) +
+    //	if area/storage dump area(s) +
 
     async.series(
         [
@@ -908,6 +908,75 @@ function importFileAreas() {
     );
 }
 
+function setFileDescription() {
+    //
+    //  ./oputil.js fb set-desc CRITERIA # will prompt
+    //  ./oputil.js fb set-desc CRITERIA "The new description"
+    //
+    let fileCriteria;
+    let desc;
+    if(argv._.length > 3) {
+        fileCriteria    = argv._[argv._.length - 2];
+        desc            = argv._[argv._.length - 1];
+    } else {
+        fileCriteria = argv._[argv._.length - 1];
+    }
+
+    async.waterfall(
+        [
+            (callback) => {
+                return initConfigAndDatabases(callback);
+            },
+            (callback) => {
+                getFileEntries(fileCriteria, (err, entries) => {
+                    if(err) {
+                        return callback(err);
+                    }
+
+                    if(entries.length > 1) {
+                        return callback(Errors.General('Criteria not specific enough.'));
+                    }
+
+                    return callback(null, entries[0]);
+                });
+            },
+            (fileEntry, callback) => {
+                if(desc) {
+                    return callback(null, fileEntry, desc);
+                }
+
+                getAnswers([
+                    {
+                        name    : 'userDesc',
+                        message : 'Description:',
+                        type    : 'editor',
+                    }
+                ],
+                answers => {
+                    if(!answers.userDesc) {
+                        return callback(Errors.General('User canceled'));
+                    }
+                    return callback(null, fileEntry, answers.userDesc);
+                });
+            },
+            (fileEntry, newDesc, callback) => {
+                fileEntry.desc = newDesc;
+                fileEntry.persist(true, err => {    //  true=isUpdate
+                    return callback(err);
+                });
+            }
+        ],
+        err => {
+            if(err) {
+                process.exitCode = ExitCodes.ERROR;
+                console.error(err.message);
+            } else {
+                console.info('Description updated.');
+            }
+        }
+    );
+}
+
 function handleFileBaseCommand() {
 
     function errUsage()  {
@@ -924,7 +993,7 @@ function handleFileBaseCommand() {
     const action = argv._[1];
 
     return ({
-        info	        : displayFileAreaInfo,
+        info	        : displayFileOrAreaInfo,
         scan	        : scanFileAreas,
 
         mv		        : moveFiles,
@@ -936,5 +1005,8 @@ function handleFileBaseCommand() {
         delete	        : removeFiles,
 
         'import-areas'  : importFileAreas,
+
+        desc            : setFileDescription,
+        description     : setFileDescription,
     }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 59693ad3..f8a0d42c 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -57,9 +57,7 @@ actions:
                                for example: scan some_area *.zip
 
   info CRITERIA                display information about areas and/or files
-                               where CRITERIA is one of the following:
-                               AREA_TAG|SHA|FILE_ID|FILENAME_WC
-                               SHA may be a full or partial SHA-256
+                               matching CRITERIA.
 
   mv SRC [SRC...] DST          move entry(s) from SRC to DST
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
@@ -67,6 +65,9 @@ actions:
 
   rm SRC [SRC...]              remove entry(s) from the system matching SRC
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+  desc CRITERIA                sets a new file description for file base entry
+                               matching CRITERIA. Launches an external editor using
+                               $VISUAL, $EDITOR, or vim/notepad.
   import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
 
 scan args:
@@ -93,6 +94,9 @@ import-areas args:
 general information:
   AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
                                example: retro@bbs
+
+  CRITERIA                     file base entry criteria. in general, can be AREA_TAG, SHA,
+                               FILE_ID, or FILENAME_WC.
   
   FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
   SHA                          full or partial SHA-256
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index dae9b44c..bb6dcacf 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -99,9 +99,7 @@ actions:
                                for example: scan some_area *.zip
 
   info CRITERIA                display information about areas and/or files
-                               where CRITERIA is one of the following:
-                               AREA_TAG|SHA|FILE_ID|FILENAME_WC
-                               SHA may be a full or partial SHA-256
+                               matching CRITERIA.
 
   mv SRC [SRC...] DST          move entry(s) from SRC to DST
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
@@ -109,6 +107,9 @@ actions:
 
   rm SRC [SRC...]              remove entry(s) from the system matching SRC
                                SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
+  desc CRITERIA                sets a new file description for file base entry
+                               matching CRITERIA. Launches an external editor using
+                               $VISUAL, $EDITOR, or vim/notepad.
   import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
 
 scan args:
@@ -133,6 +134,9 @@ import-areas args:
 general information:
   AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
                                example: retro@bbs
+
+  CRITERIA                     file base entry criteria. in general, can be AREA_TAG, SHA,
+                               FILE_ID, or FILENAME_WC.
   
   FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
   SHA                          full or partial SHA-256

From 73e8b0454e3f103df9ecea9bd5e97f3298b81c16 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 24 Dec 2018 15:14:37 -0700
Subject: [PATCH 0652/1013] Wrap ctx.reject() and catch throws

---
 core/servers/login/ssh.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index f626cb79..ca1922ca 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -49,8 +49,16 @@ function SSHClient(clientConn) {
 
         self.log.trace( { method : ctx.method, username : username, newUser : self.isNewUser }, 'SSH authentication attempt');
 
+        const safeContextReject = (param) => {
+            try {
+                return ctx.reject(param);
+            } catch(e) {
+                return;
+            }
+        };
+
         function terminateConnection() {
-            ctx.reject();
+            safeContextReject();
             return clientConn.end();
         }
 
@@ -106,19 +114,19 @@ function SSHClient(clientConn) {
                         return handleSpecialError(err, username);
                     }
 
-                    return ctx.reject(SSHClient.ValidAuthMethods);
+                    return safeContextReject(SSHClient.ValidAuthMethods);
                 }
 
                 ctx.accept();
             });
         } else {
             if(-1 === SSHClient.ValidAuthMethods.indexOf(ctx.method)) {
-                return ctx.reject(SSHClient.ValidAuthMethods);
+                return safeContextReject(SSHClient.ValidAuthMethods);
             }
 
             if(0 === username.length) {
                 //  :TODO: can we display something here?
-                return ctx.reject();
+                return safeContextReject();
             }
 
             const interactivePrompt = { prompt : `${ctx.username}'s password: `, echo : false };

From 06a1925288fe7730d75ab9be9fa8b97809fcbf4f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 24 Dec 2018 15:32:38 -0700
Subject: [PATCH 0653/1013] Check bad usernames @ login

---
 core/enig_error.js        | 1 +
 core/servers/login/ssh.js | 4 ++++
 core/user_login.js        | 9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/enig_error.js b/core/enig_error.js
index 78798a4a..33771564 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -50,4 +50,5 @@ exports.ErrorReasons = {
     Disabled            : 'DISABLED',
     Inactive            : 'INACTIVE',
     Locked              : 'LOCKED',
+    NotAllowed          : 'NOTALLOWED',
 };
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index ca1922ca..6c270378 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -114,6 +114,10 @@ function SSHClient(clientConn) {
                         return handleSpecialError(err, username);
                     }
 
+                    if(Errors.BadLogin().code === err.code) {
+                        return terminateConnection();
+                    }
+
                     return safeContextReject(SSHClient.ValidAuthMethods);
                 }
 
diff --git a/core/user_login.js b/core/user_login.js
index 2959e3a7..af764208 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -23,9 +23,14 @@ const _                 = require('lodash');
 exports.userLogin       = userLogin;
 
 function userLogin(client, username, password, cb) {
-    client.user.authenticate(username, password, err => {
-        const config = Config();
+    const config = Config();
 
+    if(config.users.badUserNames.includes(username.toLowerCase())) {
+        client.log.info( { username : username }, 'Attempt to login with banned username');
+        return cb(Errors.BadLogin(ErrorReasons.NotAllowed));
+    }
+
+    client.user.authenticate(username, password, err => {
         if(err) {
             client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
             const disconnect = config.users.failedLogin.disconnect;

From ee93035bb85ad1c5ef0657d76ba2c5be0210e064 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 25 Dec 2018 00:18:04 -0700
Subject: [PATCH 0654/1013] * Disconnect clients that attempt to login with
 banned usernames for Telnet as well * Slow disconnects to thwart brute force
 attacks - these names won't exist anyway,   but we want the attacking client
 to not DoS us

---
 WHATSNEW.md                |  1 +
 core/servers/login/ssh.js  | 47 ++++++++++++++++++++++----------------
 core/system_menu_method.js |  5 ++++
 core/user_login.js         |  6 ++++-
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 5b08e2b8..01fc8edc 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -25,6 +25,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * NNTP support! See [NNTP docs](/docs/servers/nntp.md) for more information.
 * `oputil.js user rm` and `oputil.js user info` are in! See [oputil CLI](/docs/admin/oputil.md).
 * Performing a file scan/import using `oputil.js fb scan` now recognizes various `FILES.BBS` formats.
+* Usernames found in the `config.users.badUserNames` are now not only disallowed from applying, but disconnected at any login attempt.
 
 
 ## 0.0.8-alpha
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 6c270378..27b5aed9 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -57,39 +57,46 @@ function SSHClient(clientConn) {
             }
         };
 
-        function terminateConnection() {
+        const terminateConnection = () => {
             safeContextReject();
             return clientConn.end();
-        }
+        };
 
-        function promptAndTerm(msg) {
+        //  slow version to thwart brute force attacks
+        const slowTerminateConnection = () => {
+            setTimeout( () => {
+                return terminateConnection();
+            }, 2000);
+        };
+
+        const promptAndTerm = (msg, method = 'standard') => {
             if('keyboard-interactive' === ctx.method) {
                 ctx.prompt(msg);
             }
-            return terminateConnection();
-        }
+            return 'slow' === method ? slowTerminateConnection() : terminateConnection();
+        };
 
-        function accountAlreadyLoggedIn(username) {
+        const accountAlreadyLoggedIn = (username) => {
             return promptAndTerm(`${username} is already connected to the system. Terminating connection.\n(Press any key to continue)`);
-        }
+        };
 
-        function accountDisabled(username) {
+        const accountDisabled = (username) => {
             return promptAndTerm(`${username} is disabled.\n(Press any key to continue)`);
-        }
+        };
 
-        function accountInactive(username) {
+        const accountInactive = (username) => {
             return promptAndTerm(`${username} is waiting for +op activation.\n(Press any key to continue)`);
-        }
+        };
 
-        function accountLocked(username) {
-            return promptAndTerm(`${username} is locked.\n(Press any key to continue)`);
-        }
+        const accountLocked = (username) => {
+            return promptAndTerm(`${username} is locked.\n(Press any key to continue)`, 'slow');
+        };
 
-        function isSpecialHandleError(err) {
+        const isSpecialHandleError = (err) => {
             return [ ErrorReasons.AlreadyLoggedIn, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked ].includes(err.reasonCode);
-        }
+        };
 
-        function handleSpecialError(err, username) {
+        const handleSpecialError = (err, username) => {
             switch(err.reasonCode) {
                 case ErrorReasons.AlreadyLoggedIn   : return accountAlreadyLoggedIn(username);
                 case ErrorReasons.Inactive          : return accountInactive(username);
@@ -97,7 +104,7 @@ function SSHClient(clientConn) {
                 case ErrorReasons.Locked            : return accountLocked(username);
                 default                             : return terminateConnection();
             }
-        }
+        };
 
         //
         //  If the system is open and |isNewUser| is true, the login
@@ -115,7 +122,7 @@ function SSHClient(clientConn) {
                     }
 
                     if(Errors.BadLogin().code === err.code) {
-                        return terminateConnection();
+                        return slowTerminateConnection();
                     }
 
                     return safeContextReject(SSHClient.ValidAuthMethods);
@@ -143,7 +150,7 @@ function SSHClient(clientConn) {
                         }
 
                         if(Errors.BadLogin().code === err.code) {
-                            return terminateConnection();
+                            return slowTerminateConnection();
                         }
 
                         const artOpts = {
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index 5e7b651b..ea2cbc09 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -34,6 +34,11 @@ function login(callingMenu, formData, extraArgs, cb) {
                 return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
             }
 
+            //  banned username results in disconnect
+            if(ErrorReasons.NotAllowed === err.reasonCode) {
+                return logoff(callingMenu, {}, {}, cb);
+            }
+
             const ReasonsMenus = [
                 ErrorReasons.TooMany, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked
             ];
diff --git a/core/user_login.js b/core/user_login.js
index af764208..395c446d 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -27,7 +27,11 @@ function userLogin(client, username, password, cb) {
 
     if(config.users.badUserNames.includes(username.toLowerCase())) {
         client.log.info( { username : username }, 'Attempt to login with banned username');
-        return cb(Errors.BadLogin(ErrorReasons.NotAllowed));
+
+        //  slow down a bit to thwart brute force attacks
+        return setTimeout( () => {
+            return cb(Errors.BadLogin('Disallowed username', ErrorReasons.NotAllowed));
+        }, 2000);
     }
 
     client.user.authenticate(username, password, err => {

From 346815a4f2e71002aab1d31765c38c504a80ce2c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 27 Dec 2018 02:14:50 -0700
Subject: [PATCH 0655/1013] Update to sqlite3-trans 1.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89f99a00..a5dcaf3a 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "sane": "^4.0.2",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^4.0.4",
-    "sqlite3-trans": "^1.2.0",
+    "sqlite3-trans": "^1.2.1",
     "ssh2": "^0.6.1",
     "temptmp": "^1.1.0",
     "uuid": "^3.2.1",

From 9d1815682d2e5b0878be049a47c76212fb50d54a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 27 Dec 2018 02:19:26 -0700
Subject: [PATCH 0656/1013] * ServerModule's createServer() is now async *
 Re-write of NNTP Message-ID <> internal message UUIDs

---
 core/config.js                  |   9 +-
 core/listening_server.js        |  31 ++--
 core/module_util.js             |  11 +-
 core/msg_network.js             |  21 ++-
 core/server_module.js           |  19 ++-
 core/servers/content/gopher.js  |   6 +-
 core/servers/content/nntp.js    | 272 ++++++++++++++++++++++++++++----
 core/servers/content/web.js     |   4 +-
 core/servers/login/ssh.js       |   6 +-
 core/servers/login/telnet.js    |   4 +-
 core/servers/login/websocket.js |   6 +-
 11 files changed, 305 insertions(+), 84 deletions(-)

diff --git a/core/config.js b/core/config.js
index 90e641d6..9c9c4cd4 100644
--- a/core/config.js
+++ b/core/config.js
@@ -170,7 +170,7 @@ function getDefaultConfig() {
         general : {
             boardName       : 'Another Fine ENiGMA½ BBS',
 
-            //  :TODO: closedSystem and loginAttemps prob belong under users{}?
+            //  :TODO: closedSystem prob belongs under users{}?
             closedSystem    : false,                    //  is the system closed to new users?
 
             menuFile        : 'menu.hjson',     //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
@@ -947,13 +947,18 @@ function getDefaultConfig() {
 
                     //  action:
                     //  - @method:path/to/module.js:theMethodName
-                    //    (path is relative to engima base dir)
+                    //    (path is relative to ENiGMA base dir)
                     //
                     //  - @execute:/path/to/something/executable.sh
                     //
                     action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
                 },
 
+                nntpMaintenance : {
+                    schedule    : 'every 12 hours', //  should generally be < trimMessageAreas interval
+                    action      : '@method:core/servers/content/nntp.js:performMaintenanceTask',
+                },
+
                 updateFileAreaStats : {
                     schedule    : 'every 1 hours',
                     action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
diff --git a/core/listening_server.js b/core/listening_server.js
index f28bea7f..8743d6ce 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -30,30 +30,23 @@ function startListening(cb) {
     const moduleUtil = require('./module_util.js'); //  late load so we get Config
 
     async.each( [ 'login', 'content' ], (category, next) => {
-        moduleUtil.loadModulesForCategory(`${category}Servers`, (err, module) => {
-            if(err) {
-                if(ErrorReasons.Disabled === err.reasonCode) {
-                    logger.log.debug(err.message);
-                } else {
-                    logger.log.info( { err : err }, 'Failed loading module');
-                }
-                return;
-            }
-
+        moduleUtil.loadModulesForCategory(`${category}Servers`, (module, nextModule) => {
             const moduleInst = new module.getModule();
             try {
-                moduleInst.createServer();
-                if(!moduleInst.listen()) {
-                    throw new Error('Failed listening');
-                }
-
-                listeningServers[module.moduleInfo.packageName] = {
-                    instance    : moduleInst,
-                    info        : module.moduleInfo,
-                };
+                moduleInst.createServer(err => {
+                    if(!moduleInst.listen()) {
+                        throw new Error('Failed listening');
+                    }
 
+                    listeningServers[module.moduleInfo.packageName] = {
+                        instance    : moduleInst,
+                        info        : module.moduleInfo,
+                    };
+                    return nextModule(err);
+                });
             } catch(e) {
                 logger.log.error(e, 'Exception caught creating server!');
+                return nextModule(e);
             }
         }, err => {
             return next(err);
diff --git a/core/module_util.js b/core/module_util.js
index 0e8e5976..f61929d2 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -93,8 +93,15 @@ function loadModulesForCategory(category, iterator, complete) {
 
         async.each(jsModules, (file, next) => {
             loadModule(paths.basename(file, '.js'), category, (err, mod) => {
-                iterator(err, mod);
-                return next();
+                if(err) {
+                    if(ErrorReasons.Disabled === err.reasonCode) {
+                        Log.debug(err.message);
+                    } else {
+                        Log.info( { err : err }, 'Failed loading module');
+                    }
+                    return next(null);  //  continue no matter what
+                }
+                return iterator(mod, next);
             });
         }, err => {
             if(complete) {
diff --git a/core/msg_network.js b/core/msg_network.js
index b26d5f1b..e0018ece 100644
--- a/core/msg_network.js
+++ b/core/msg_network.js
@@ -2,10 +2,10 @@
 'use strict';
 
 //  ENiGMA½
-let loadModulesForCategory  = require('./module_util.js').loadModulesForCategory;
+const loadModulesForCategory  = require('./module_util.js').loadModulesForCategory;
 
 //  standard/deps
-let async               = require('async');
+const async               = require('async');
 
 exports.startup         = startup;
 exports.shutdown        = shutdown;
@@ -17,16 +17,15 @@ function startup(cb) {
     async.series(
         [
             function loadModules(callback) {
-                loadModulesForCategory('scannerTossers', (err, module) => {
-                    if(!err) {
-                        const modInst = new module.getModule();
+                loadModulesForCategory('scannerTossers', (module, nextModule) => {
+                    const modInst = new module.getModule();
 
-                        modInst.startup(err => {
-                            if(!err) {
-                                msgNetworkModules.push(modInst);
-                            }
-                        });
-                    }
+                    modInst.startup(err => {
+                        if(!err) {
+                            msgNetworkModules.push(modInst);
+                        }
+                    });
+                    return nextModule(null);
                 }, err => {
                     callback(err);
                 });
diff --git a/core/server_module.js b/core/server_module.js
index c9ba1cab..9ba522bf 100644
--- a/core/server_module.js
+++ b/core/server_module.js
@@ -1,15 +1,18 @@
 /* jslint node: true */
 'use strict';
 
-var PluginModule        = require('./plugin_module.js').PluginModule;
+const PluginModule = require('./plugin_module.js').PluginModule;
 
-exports.ServerModule    = ServerModule;
+exports.ServerModule = class ServerModule extends PluginModule {
+    constructor(options) {
+        super(options);
+    }
 
-function ServerModule() {
-    PluginModule.call(this);
-}
+    createServer(cb) {
+        return cb(null);
+    }
 
-require('util').inherits(ServerModule, PluginModule);
-
-ServerModule.prototype.createServer = function() {
+    listen(cb) {
+        return cb(null);
+    }
 };
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index c47efc5c..7553793e 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -71,9 +71,9 @@ exports.getModule = class GopherModule extends ServerModule {
         this.log = Log.child( { server : 'Gopher' } );
     }
 
-    createServer() {
+    createServer(cb) {
         if(!this.enabled) {
-            return;
+            return cb(null);
         }
 
         const config = Config();
@@ -96,6 +96,8 @@ exports.getModule = class GopherModule extends ServerModule {
                 }
             });
         });
+
+        return cb(null);
     }
 
     listen() {
diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 7135a585..7f20cba7 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -5,10 +5,13 @@
 const Log                   = require('../../logger.js').log;
 const { ServerModule }      = require('../../server_module.js');
 const Config                = require('../../config.js').get;
+const {
+    getTransactionDatabase,
+    getModDatabasePath
+}                           = require('../../database.js');
 const {
     getMessageAreaByTag,
     getMessageConferenceByTag,
-    getMessageListForArea,
 }                           = require('../../message_area.js');
 const User                  = require('../../user.js');
 const Errors                = require('../../enig_error.js').Errors;
@@ -28,10 +31,14 @@ const {
 const NNTPServerBase        = require('nntp-server');
 const _                     = require('lodash');
 const fs                    = require('fs-extra');
+const forEachSeries         = require('async/forEachSeries');
 const asyncReduce           = require('async/reduce');
 const asyncMap              = require('async/map');
 const asyncSeries           = require('async/series');
+const asyncWaterfall        = require('async/waterfall');
 const LRU                   = require('lru-cache');
+const sqlite3               = require('sqlite3');
+const paths                 = require('path');
 
 //
 //  Network News Transfer Protocol (NNTP)
@@ -50,13 +57,64 @@ exports.moduleInfo = {
     packageName : 'codes.l33t.enigma.nntp.server',
 };
 
+exports.performMaintenanceTask  = performMaintenanceTask;
+
 /*
     General TODO
     - ACS checks need worked out. Currently ACS relies on |client|. We need a client
       spec that can be created even without a login server. Some checks and simply
-      return false/fail. 
+      return false/fail.
 */
 
+//  simple DB maps NNTP Message-ID's which are
+//  sequential per group -> ENiG messages
+//  A single instance is shared across NNTP and/or NNTPS
+class NNTPDatabase
+{
+    constructor() {
+    }
+
+    init(cb) {
+        asyncSeries(
+            [
+                (callback) => {
+                    this.db = getTransactionDatabase(new sqlite3.Database(
+                        getModDatabasePath(exports.moduleInfo),
+                        err => {
+                            return callback(err);
+                        }
+                    ));
+                },
+                (callback) => {
+                    this.db.serialize( () => {
+                        this.db.run(
+                            `CREATE TABLE IF NOT EXISTS nntp_area_message (
+                                nntp_message_id     INTEGER NOT NULL,
+                                message_id          INTEGER NOT NULL,
+                                message_area_tag    VARCHAR NOT NULL,
+                                message_uuid        VARCHAR NOT NULL,
+
+                                UNIQUE(nntp_message_id, message_area_tag)
+                            );`
+                        );
+
+                        this.db.run(
+                            `CREATE INDEX IF NOT EXISTS nntp_area_message_by_uuid_index
+                            ON nntp_area_message (message_uuid);`
+                        );
+
+                        return callback(null);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+}
+
+let nntpDatabase;
 
 class NNTPServer extends NNTPServerBase {
     constructor(options, serverName) {
@@ -97,10 +155,6 @@ class NNTPServer extends NNTPServerBase {
         });
     }
 
-    getMessageListIndexByMessageID(id, session) {
-        return id - _.get(session.groupInfo.messageList, [ 0, 'messageId' ]);
-    }
-
     isGroupSelected(session) {
         return Array.isArray(_.get(session, 'groupInfo.messageList'));
     }
@@ -145,7 +199,7 @@ class NNTPServer extends NNTPServerBase {
                 case [ Message.AddressFlavor.Email ] :
                     jamStyleFrom = `${fromName} <${remoteFrom}>`;
                     break;
-            }           
+            }
         }
 
         if(!jamStyleFrom) {
@@ -256,14 +310,11 @@ class NNTPServer extends NNTPServerBase {
                 return null;
             }
 
-            //
-            //  Adjust to offset in message list & get UUID
-            //  This works since we create "pseudo IDs" to return to NNTP
-            //  by using firstRealID + index. A find on |index| member would
-            //  also work, but would be O(n).
-            //
-            const mlIndex = this.getMessageListIndexByMessageID(messageId, session);
-            messageUuid = _.get(session.groupInfo.messageList, [ mlIndex, 'messageUuid']);
+            const msg = session.groupInfo.messageList.find(m => {
+                return m.index === messageId;
+            });
+
+            messageUuid = msg && msg.messageUuid;
         } else {
             //  <Message-ID> request
             [ , messageUuid ] = this.getMessageIdentifierParts(messageId);
@@ -330,15 +381,12 @@ class NNTPServer extends NNTPServerBase {
         });
     }
 
-    _getRange(session, first, last, options) {
+    _getRange(session, first, last /*options*/) {
         return new Promise(resolve => {
             //
             //  Build an array of message objects that can later
             //  be used with the various _build* methods.
             //
-            //  Messages must belong to the range of *pseudo IDs*
-            //  aka |index|.
-            //
             //  :TODO: Handle |options|
             if(!this.isGroupSelected(session)) {
                 return resolve(null);
@@ -353,7 +401,7 @@ class NNTPServer extends NNTPServerBase {
                 }
                 return true;
             }).map(m => {
-                return { uuid : m.messageUuid, index : m.index }
+                return { uuid : m.messageUuid, index : m.index };
             });
 
             asyncMap(uuids, (msgInfo, nextMessageUuid) => {
@@ -507,7 +555,7 @@ class NNTPServer extends NNTPServerBase {
             return cb(Errors.DoesNotExist(`No area for areaTag "${areaTag}" / confTag "${confTag}"`));
         }
 
-        getMessageListForArea(null, areaTag, (err, messageList) => {
+        this.getMappedMessageListForArea(areaTag, (err, messageList) => {
             if(err) {
                 return cb(err);
             }
@@ -533,15 +581,6 @@ class NNTPServer extends NNTPServerBase {
                 });
             }
 
-            const firstMsg = messageList[0];
-
-            //  node-nntp wants "index"
-            let index = firstMsg.messageId;
-            messageList.forEach(m => {
-                m.index = index;
-                ++index;
-            });
-
             group = {
                 messageList,
                 confTag,
@@ -550,8 +589,8 @@ class NNTPServer extends NNTPServerBase {
                 friendlyDesc    : area.desc,
                 nntp : {
                     name        : groupName,
-                    min_index   : firstMsg.messageId,
-                    max_index   : firstMsg.messageId + messageList.length - 1,
+                    min_index   : messageList[0].index,
+                    max_index   : messageList[messageList.length - 1].index,
                     total       : messageList.length,
                 },
             };
@@ -562,6 +601,115 @@ class NNTPServer extends NNTPServerBase {
         });
     }
 
+    getMappedMessageListForArea(areaTag, cb) {
+        //
+        //  Get all messages in mapped database. Then, find any messages that are not
+        //  yet mapped with ID's > the highest ID we have. Any new messages will have
+        //  new mappings created.
+        //
+        //  :TODO: introduce caching
+        asyncWaterfall(
+            [
+                (callback) => {
+                    nntpDatabase.db.all(
+                        `SELECT nntp_message_id, message_id, message_uuid
+                        FROM nntp_area_message
+                        WHERE message_area_tag = ?
+                        ORDER BY nntp_message_id;`,
+                        [ areaTag ],
+                        (err, rows) => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            let messageList;
+                            const lastMessageId = rows.length > 0 ? rows[rows.length - 1].message_id : 0;
+                            if(!lastMessageId) {
+                                messageList = [];
+                            } else {
+                                messageList = rows.map(r => {
+                                    return {
+                                        areaTag,
+                                        index       : r.nntp_message_id,    //  node-nntp wants this name
+                                        messageUuid : r.message_uuid,
+                                    };
+                                });
+                            }
+
+                            return callback(null, messageList, lastMessageId);
+                        }
+                    );
+                },
+                (messageList, lastMessageId, callback) => {
+                    //  Find any new entries
+                    const filter = {
+                        areaTag,
+                        newerThanMessageId  : lastMessageId,
+                        sort                : 'messageId',
+                        order               : 'ascending',
+                        resultType          : 'messageList',
+                    };
+                    Message.findMessages(filter, (err, newMessageList) => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        let index = messageList.length > 0 ?
+                            messageList[messageList.length - 1].index + 1
+                            : 1;
+                        newMessageList = newMessageList.map(m => {
+                            return Object.assign(m, { index : index++ } );
+                        });
+
+                        if(0 === newMessageList.length) {
+                            return callback(null, messageList);
+                        }
+
+                        //  populate mapping DB with any new entries
+                        nntpDatabase.db.beginTransaction( (err, trans) => {
+                            if(err) {
+                                return callback(err);
+                            }
+
+                            forEachSeries(newMessageList, (newMessage, nextNewMessage) => {
+                                trans.run(
+                                    `INSERT INTO nntp_area_message (nntp_message_id, message_id, message_area_tag, message_uuid)
+                                    VALUES (?, ?, ?, ?);`,
+                                    [ newMessage.index, newMessage.messageId, areaTag, newMessage.messageUuid ],
+                                    err => {
+                                        return nextNewMessage(err);
+                                    }
+                                );
+                            },
+                            err => {
+                                if(err) {
+                                    return trans.rollback( () => {
+                                        return callback(err);
+                                    });
+                                }
+
+                                trans.commit( () => {
+                                    messageList.push(...newMessageList.map(m => {
+                                        return {
+                                            areaTag,
+                                            index       : m.nntpMessageId,
+                                            messageUuid : m.messageUuid,
+                                        };
+                                    }));
+
+                                    return callback(null, messageList);
+                                });
+                            });
+                        });
+                    });
+                }
+            ],
+            (err, messageList) => {
+                return cb(err, messageList);
+            }
+        );
+    }
+
     _buildHead(session, message) {
         return _.map(message.nntpHeaders, (v, k) => `${k}: ${v}`).join('\r\n');
     }
@@ -617,6 +765,7 @@ class NNTPServer extends NNTPServerBase {
     }
 
     getMessageIdentifier(message) {
+        //  note that we use the *real* message ID here, not the NNTP-specific index.
         return this.makeMessageIdentifier(message.messageId, message.messageUuid);
     }
 
@@ -727,9 +876,9 @@ exports.getModule = class NNTPServerModule extends ServerModule {
         return true;
     }
 
-    createServer() {
+    createServer(cb) {
         if(!this.isEnabled() || !this.isConfigured()) {
-            return;
+            return cb(null);
         }
 
         const config = Config();
@@ -762,6 +911,11 @@ exports.getModule = class NNTPServerModule extends ServerModule {
                 'NTTPS'
             );
         }
+
+        nntpDatabase = new NNTPDatabase();
+        nntpDatabase.init(err => {
+            return cb(err);
+        });
     }
 
     listen() {
@@ -785,3 +939,53 @@ exports.getModule = class NNTPServerModule extends ServerModule {
         return `${service}://0.0.0.0:${port}`;
     }
 };
+
+function performMaintenanceTask(args, cb) {
+    //
+    //  Delete any message mapping that no longer have
+    //  an actual message associated with them.
+    //
+    if(!nntpDatabase) {
+        Log.trace('Cannot perform NNTP maintenance without NNTP database initialized');
+        return cb(null);
+    }
+
+    let attached = false;
+    asyncSeries(
+        [
+            (callback) => {
+                const messageDbPath = paths.join(Config().paths.db, 'message.sqlite3');
+                nntpDatabase.db.run(
+                    `ATTACH DATABASE "${messageDbPath}" AS msgdb;`,
+                    err => {
+                        attached = !err;
+                        return callback(err);
+                    }
+                );
+            },
+            (callback) => {
+                nntpDatabase.db.run(
+                    `DELETE FROM nntp_area_message
+                    WHERE message_uuid NOT IN (
+                        SELECT message_uuid
+                        FROM msgdb.message
+                    );`,
+                    function result(err) {  //  no arrow func; need |this.changes|
+                        if(err) {
+                            Log.warn( { error : err.message }, 'Failed to delete from NNTP database');
+                        } else {
+                            Log.debug( { count : this.changes }, 'Deleted mapped message IDs from NNTP database');
+                        }
+                        return callback(err);
+                    }
+                );
+            }
+        ],
+        err => {
+            if(attached) {
+                nntpDatabase.db.run('DETACH DATABASE msgdb;');
+            }
+            return cb(err);
+        }
+    );
+}
\ No newline at end of file
diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 7088b8f9..f0e0d903 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -104,7 +104,7 @@ exports.getModule = class WebServerModule extends ServerModule {
         return this.enableHttp || this.enableHttps;
     }
 
-    createServer() {
+    createServer(cb) {
         if(this.enableHttp) {
             this.httpServer = http.createServer( (req, resp) => this.routeRequest(req, resp) );
         }
@@ -121,6 +121,8 @@ exports.getModule = class WebServerModule extends ServerModule {
 
             this.httpsServer = https.createServer(options, (req, resp) => this.routeRequest(req, resp) );
         }
+
+        return cb(null);
     }
 
     listen() {
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 27b5aed9..263a3929 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -288,10 +288,10 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
         super();
     }
 
-    createServer() {
+    createServer(cb) {
         const config = Config();
         if(true != config.loginServers.ssh.enabled) {
-            return;
+            return cb(null);
         }
 
         const serverConf = {
@@ -318,6 +318,8 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
             Log.info(info, 'New SSH connection');
             this.handleNewClient(new SSHClient(conn), conn._sock, ModuleInfo);
         });
+
+        return cb(null);
     }
 
     listen() {
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 1f8afa6a..ae1ecbe9 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -852,7 +852,7 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
         super();
     }
 
-    createServer() {
+    createServer(cb) {
         this.server = net.createServer( sock => {
             const client = new TelnetClient(sock, sock);
 
@@ -876,6 +876,8 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
         this.server.on('error', err => {
             Log.info( { error : err.message }, 'Telnet server error');
         });
+
+        return cb(null);
     }
 
     listen() {
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 43245e74..b27aaf6d 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -123,7 +123,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
         super();
     }
 
-    createServer() {
+    createServer(cb) {
         //
         //  We will actually create up to two servers:
         //  * insecure websocket (ws://)
@@ -131,7 +131,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
         //
         const config = _.get(Config(), 'loginServers.webSocket');
         if(!_.isObject(config)) {
-            return;
+            return cb(null);
         }
 
         const wsPort    = _.get(config, 'ws.port');
@@ -161,6 +161,8 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
                 wsServer    : new WebSocketServer( { server : httpServer } ),
             };
         }
+
+        return cb(null);
     }
 
     listen() {

From 3864d957c93e63c8202900e7c6fa7817701ff72c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 27 Dec 2018 02:46:16 -0700
Subject: [PATCH 0657/1013] * Servers now use async listen()

---
 core/listening_server.js        | 26 ++++++++------
 core/servers/content/gopher.js  |  9 ++---
 core/servers/content/nntp.js    | 15 +++++---
 core/servers/content/web.js     | 26 ++++++++------
 core/servers/login/ssh.js       | 15 ++++----
 core/servers/login/telnet.js    | 14 +++++---
 core/servers/login/websocket.js | 61 +++++++++++++++++++--------------
 7 files changed, 100 insertions(+), 66 deletions(-)

diff --git a/core/listening_server.js b/core/listening_server.js
index 8743d6ce..aa573fa1 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -2,11 +2,10 @@
 'use strict';
 
 //  ENiGMA½
-const logger            = require('./logger.js');
-const { ErrorReasons }  = require('./enig_error.js');
+const logger    = require('./logger.js');
 
 //  deps
-const async             = require('async');
+const async     = require('async');
 
 const listeningServers = {};    //  packageName -> info
 
@@ -34,15 +33,22 @@ function startListening(cb) {
             const moduleInst = new module.getModule();
             try {
                 moduleInst.createServer(err => {
-                    if(!moduleInst.listen()) {
-                        throw new Error('Failed listening');
+                    if(err) {
+                        return nextModule(err);
                     }
 
-                    listeningServers[module.moduleInfo.packageName] = {
-                        instance    : moduleInst,
-                        info        : module.moduleInfo,
-                    };
-                    return nextModule(err);
+                    moduleInst.listen( err => {
+                        if(err) {
+                            return nextModule(err);
+                        }
+
+                        listeningServers[module.moduleInfo.packageName] = {
+                            instance    : moduleInst,
+                            info        : module.moduleInfo,
+                        };
+
+                        return nextModule(null);
+                    });
                 });
             } catch(e) {
                 logger.log.error(e, 'Exception caught creating server!');
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 7553793e..ee889b8c 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -5,6 +5,7 @@
 const Log                       = require('../../logger.js').log;
 const { ServerModule }          = require('../../server_module.js');
 const Config                    = require('../../config.js').get;
+const { Errors }                = require('../../enig_error.js');
 const {
     splitTextAtTerms,
     isAnsi,
@@ -100,19 +101,19 @@ exports.getModule = class GopherModule extends ServerModule {
         return cb(null);
     }
 
-    listen() {
+    listen(cb) {
         if(!this.enabled) {
-            return true;    //  nothing to do, but not an error
+            return cb(null);
         }
 
         const config = Config();
         const port = parseInt(config.contentServers.gopher.port);
         if(isNaN(port)) {
             this.log.warn( { port : config.contentServers.gopher.port, server : ModuleInfo.name }, 'Invalid port' );
-            return false;
+            return cb(Errors.Invalid(`Invalid port: ${config.contentServers.gopher.port}`));
         }
 
-        return this.server.listen(port);
+        return this.server.listen(port, cb);
     }
 
     get enabled() {
diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 7f20cba7..41dda2e8 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -918,21 +918,26 @@ exports.getModule = class NNTPServerModule extends ServerModule {
         });
     }
 
-    listen() {
+    listen(cb) {
         const config = Config();
-        [ 'nntp', 'nntps' ].forEach( service => {
+        forEachSeries([ 'nntp', 'nntps' ], (service, nextService) => {
             const server = this[`${service}Server`];
             if(server) {
                 const port = config.contentServers.nntp[service].port;
                 server.listen(this.listenURI(port, service))
                     .catch(e => {
                         Log.warn( { error : e.message, port }, `${service.toUpperCase()} failed to listen`);
+                        return nextService(null);   //  try next anyway
+                    }).then( () => {
+                        return nextService(null);
                     });
+            } else {
+                return nextService(null);
             }
+        },
+        err => {
+            return cb(err);
         });
-
-        //  :TODO: listen() needs to be async. I always should have been...
-        return true;
     }
 
     listenURI(port, service = 'nntp') {
diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index f0e0d903..1a09aace 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -5,6 +5,7 @@
 const Log           = require('../../logger.js').log;
 const ServerModule  = require('../../server_module.js').ServerModule;
 const Config        = require('../../config.js').get;
+const { Errors }    = require('../../enig_error.js');
 
 //  deps
 const http          = require('http');
@@ -13,6 +14,7 @@ const _             = require('lodash');
 const fs            = require('graceful-fs');
 const paths         = require('path');
 const mimeTypes     = require('mime-types');
+const forEachSeries = require('async/forEachSeries');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'Web',
@@ -125,23 +127,27 @@ exports.getModule = class WebServerModule extends ServerModule {
         return cb(null);
     }
 
-    listen() {
-        let ok = true;
-
+    listen(cb) {
         const config = Config();
-        [ 'http', 'https' ].forEach(service => {
+        forEachSeries([ 'http', 'https' ], (service, nextService) => {
             const name = `${service}Server`;
             if(this[name]) {
                 const port = parseInt(config.contentServers.web[service].port);
                 if(isNaN(port)) {
-                    ok = false;
-                    return Log.warn( { port : config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
+                    Log.warn( { port : config.contentServers.web[service].port, server : ModuleInfo.name }, `Invalid port (${service})` );
+                    return nextService(Errors.Invalid(`Invalid port: ${config.contentServers.web[service].port}`));
                 }
-                return this[name].listen(port);
-            }
-        });
 
-        return ok;
+                this[name].listen(port, err => {
+                    return nextService(err);
+                });
+            } else {
+                return nextService(null);
+            }
+        },
+        err => {
+            return cb(err);
+        });
     }
 
     addRoute(route) {
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 263a3929..d67bbafa 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -322,20 +322,23 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
         return cb(null);
     }
 
-    listen() {
+    listen(cb) {
         const config = Config();
         if(true != config.loginServers.ssh.enabled) {
-            return true;    //  no server, but not an error
+            return cb(null);
         }
 
         const port = parseInt(config.loginServers.ssh.port);
         if(isNaN(port)) {
             Log.error( { server : ModuleInfo.name, port : config.loginServers.ssh.port }, 'Cannot load server (invalid port)' );
-            return false;
+            return cb(Errors.Invalid(`Invalid port: ${config.loginServers.ssh.port}`));
         }
 
-        this.server.listen(port);
-        Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
-        return true;
+        this.server.listen(port, err => {
+            if(!err) {
+                Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
+            }
+            return cb(err);
+        });
     }
 };
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index ae1ecbe9..ff21b602 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -8,6 +8,7 @@ const LoginServerModule             = require('../../login_server_module.js');
 const Config                        = require('../../config.js').get;
 const EnigAssert                    = require('../../enigma_assert.js');
 const { stringFromNullTermBuffer }  = require('../../string_util.js');
+const { Errors }                    = require('../../enig_error.js');
 
 //  deps
 const net           = require('net');
@@ -880,16 +881,19 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
         return cb(null);
     }
 
-    listen() {
+    listen(cb) {
         const config = Config();
         const port = parseInt(config.loginServers.telnet.port);
         if(isNaN(port)) {
             Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
-            return false;
+            return cb(Errors.Invalid(`Invalid port: ${config.loginServers.telnet.port}`));
         }
 
-        this.server.listen(port);
-        Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
-        return true;
+        this.server.listen(port, err => {
+            if(!err) {
+                Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
+            }
+            return cb(err);
+        });
     }
 };
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index b27aaf6d..35bc0757 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -6,6 +6,7 @@ const Config            = require('../../config.js').get;
 const TelnetClient      = require('./telnet.js').TelnetClient;
 const Log               = require('../../logger.js').log;
 const LoginServerModule = require('../../login_server_module.js');
+const { Errors }        = require('../../enig_error.js');
 
 //  deps
 const _                 = require('lodash');
@@ -14,6 +15,7 @@ const http              = require('http');
 const https             = require('https');
 const fs                = require('graceful-fs');
 const Writable          = require('stream');
+const forEachSeries     = require('async/forEachSeries');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'WebSocket',
@@ -165,31 +167,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
         return cb(null);
     }
 
-    listen() {
-        WSS_SERVER_TYPES.forEach(serverType => {
-            const server = this[serverType];
-            if(!server) {
-                return;
-            }
-
-            const serverName    = `${ModuleInfo.name} (${serverType})`;
-            const port          = parseInt(_.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] ));
-
-            if(isNaN(port)) {
-                Log.error( { server : serverName, port : port }, 'Cannot load server (invalid port)' );
-                return;
-            }
-
-            server.httpServer.listen(port);
-
-            server.wsServer.on('connection', (ws, req) => {
-                const webSocketClient = new WebSocketClient(ws, req, serverType);
-                this.handleNewClient(webSocketClient, webSocketClient.socketBridge, ModuleInfo);
-            });
-
-            Log.info( { server : serverName, port : port }, 'Listening for connections' );
-        });
-
+    listen(cb) {
         //
         //  Send pings every 30s
         //
@@ -215,7 +193,38 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
             });
         }, 30000);
 
-        return true;
+        forEachSeries(WSS_SERVER_TYPES, (serverType, nextServerType) => {
+            const server = this[serverType];
+            if(!server) {
+                return nextServerType(null);
+            }
+
+            const serverName    = `${ModuleInfo.name} (${serverType})`;
+            const confPort      = _.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] );
+            const port          = parseInt(confPort);
+
+            if(isNaN(port)) {
+                Log.error( { server : serverName, port : confPort }, 'Cannot load server (invalid port)' );
+                return nextServerType(Errors.Invalid(`Invalid port: ${confPort}`));
+            }
+
+            server.httpServer.listen(port, err => {
+                if(err) {
+                    return nextServerType(err);
+                }
+
+                server.wsServer.on('connection', (ws, req) => {
+                    const webSocketClient = new WebSocketClient(ws, req, serverType);
+                    this.handleNewClient(webSocketClient, webSocketClient.socketBridge, ModuleInfo);
+                });
+
+                Log.info( { server : serverName, port : port }, 'Listening for connections' );
+                return nextServerType(null);
+            });
+        },
+        err => {
+            cb(err);
+        });
     }
 
     webSocketConnection(conn) {

From 8d46a305c51216f4e39e9887588ddf301cd9b745 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 27 Dec 2018 14:16:59 -0700
Subject: [PATCH 0658/1013] Add IP address to failed login attempts

---
 core/user_login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/user_login.js b/core/user_login.js
index 395c446d..3e3f5f04 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -26,7 +26,7 @@ function userLogin(client, username, password, cb) {
     const config = Config();
 
     if(config.users.badUserNames.includes(username.toLowerCase())) {
-        client.log.info( { username : username }, 'Attempt to login with banned username');
+        client.log.info( { username, ip : client.remoteAddress }, 'Attempt to login with banned username');
 
         //  slow down a bit to thwart brute force attacks
         return setTimeout( () => {
@@ -42,7 +42,7 @@ function userLogin(client, username, password, cb) {
                 err = Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany);
             }
 
-            client.log.info( { username : username, error : err.message }, 'Failed login attempt');
+            client.log.info( { username, ip : client.remoteAddress, reason : err.message }, 'Failed login attempt');
             return cb(err);
         }
 

From 046550842b897cc4e9b4d08514d4bb2d70f29137 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 28 Dec 2018 10:39:41 -0700
Subject: [PATCH 0659/1013] ACS changes in prep for checking from ie content
 servers such as NNTP * ACS now takes subject { client, user } * ACS checks
 now consider client/user optional & checks fail (return false) if an object
 is not available

---
 core/acs.js           | 10 +++---
 core/acs_parser.js    | 78 ++++++++++++++++++++++++++++++++-----------
 core/client.js        |  2 +-
 misc/acs_parser.pegjs | 78 ++++++++++++++++++++++++++++++++-----------
 4 files changed, 124 insertions(+), 44 deletions(-)

diff --git a/core/acs.js b/core/acs.js
index a86db329..1ae4fa93 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -10,15 +10,15 @@ const assert    = require('assert');
 const _         = require('lodash');
 
 class ACS {
-    constructor(client) {
-        this.client = client;
+    constructor(subject) {
+        this.subject = subject;
     }
 
     check(acs, scope, defaultAcs) {
         acs = acs ? acs[scope] : defaultAcs;
         acs = acs || defaultAcs;
         try {
-            return checkAcs(acs, { client : this.client } );
+            return checkAcs(acs, { subject : this.subject } );
         } catch(e) {
             Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
             return false;
@@ -57,7 +57,7 @@ class ACS {
             return true;    //  no ACS check req.
         }
         try {
-            return checkAcs(acs, { client : this.client } );
+            return checkAcs(acs, { subject : this.subject } );
         } catch(e) {
             Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
             return false;
@@ -75,7 +75,7 @@ class ACS {
         const matchCond = condArray.find( cond => {
             if(_.has(cond, 'acs')) {
                 try {
-                    return checkAcs(cond.acs, { client : this.client } );
+                    return checkAcs(cond.acs, { subject : this.subject } );
                 } catch(e) {
                     Log.warn( { exception : e, acs : cond }, 'Exception caught checking ACS');
                     return false;
diff --git a/core/acs_parser.js b/core/acs_parser.js
index 6e32cb06..d6983b17 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -844,32 +844,36 @@ function peg$parse(input, options) {
   }
 
 
-  	const client	= options.client;
-  	const user		= options.client.user;
-
   	const UserProps	= require('./user_property.js');
+  	const Log       = require('./logger.js').log;
 
+  	const _			= require('lodash');
   	const moment	= require('moment');
 
+  	const client	= _.get(options, 'subject.client');
+  	const user		= _.get(options, 'subject.user');
+
   	function checkAccess(acsCode, value) {
   		try {
   			return {
   				LC	: function isLocalConnection() {
-  					return client.isLocal();
+  					return client && client.isLocal();
   				},
   				AG	: function ageGreaterOrEqualThan() {
-  					return !isNaN(value) && user.getAge() >= value;
+  					return !isNaN(value) && user && user.getAge() >= value;
   				},
   				AS	: function accountStatus() {
+  					if(!user) {
+  						return false;
+  					}
   					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
-
   					const userAccountStatus = user.getPropertyAsNumber(UserProps.AccountStatus);
   					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
   				},
   				EC	: function isEncoding() {
-  					const encoding = client.term.outputEncoding.toLowerCase();
+  					const encoding = _.get(client, 'term.outputEncoding', '').toLowerCase();
   					switch(value) {
   						case 0	: return 'cp437' === encoding;
   						case 1	: return 'utf-8' === encoding;
@@ -877,27 +881,41 @@ function peg$parse(input, options) {
   					}
   				},
   				GM	: function isOneOfGroups() {
+  					if(!user) {
+  						return false;
+  					}
   					if(!Array.isArray(value)) {
   						return false;
   					}
-
   					return value.some(groupName => user.isGroupMember(groupName));
   				},
   				NN	: function isNode() {
+  					if(!client) {
+  						return false;
+  					}
   					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
   					return value.map(n => parseInt(n, 10)).includes(client.node);
   				},
   				NP	: function numberOfPosts() {
+  					if(!user) {
+  						return false;
+  					}
   					const postCount = user.getPropertyAsNumber(UserProps.PostCount) || 0;
   					return !isNaN(value) && postCount >= value;
   				},
   				NC	: function numberOfCalls() {
+  					if(!user) {
+  						return false;
+  					}
   					const loginCount = user.getPropertyAsNumber(UserProps.LoginCount);
   					return !isNaN(value) && loginCount >= value;
   				},
   				AA	: function accountAge() {
+  					if(!user) {
+  						return false;
+  					}
   					const accountCreated = moment(user.getProperty(UserProps.AccountCreated));
   					const now = moment();
   					const daysOld = accountCreated.diff(moment(), 'days');
@@ -907,78 +925,98 @@ function peg$parse(input, options) {
   						daysOld >= value;
   				},
   				BU	: function bytesUploaded() {
+  					if(!user) {
+  						return false;
+  					}
   					const bytesUp = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
   					return !isNaN(value) && bytesUp >= value;
   				},
   				UP	: function uploads() {
+  					if(!user) {
+  						return false;
+  					}
   					const uls = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
   					return !isNaN(value) && uls >= value;
   				},
   				BD	: function bytesDownloaded() {
+  					if(!user) {
+  						return false;
+  					}
   					const bytesDown = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
   					return !isNaN(value) && bytesDown >= value;
   				},
   				DL	: function downloads() {
+  					if(!user) {
+  						return false;
+  					}
   					const dls = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
   					return !isNaN(value) && dls >= value;
   				},
   				NR	: function uploadDownloadRatioGreaterThan() {
+  					if(!user) {
+  						return false;
+  					}
   					const ulCount = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
   					const dlCount = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
   					const ratio = ~~((ulCount / dlCount) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
   				KR	: function uploadDownloadByteRatioGreaterThan() {
+  					if(!user) {
+  						return false;
+  					}
   					const ulBytes = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
   					const dlBytes = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
   					const ratio = ~~((ulBytes / dlBytes) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
-  				PC	: function postCallRatio() {					
+  				PC	: function postCallRatio() {
+  					if(!user) {
+  						return false;
+  					}
   					const postCount		= user.getPropertyAsNumber(UserProps.PostCount) || 0;
   					const loginCount	= user.getPropertyAsNumber(UserProps.LoginCount) || 0;
   					const ratio = ~~((postCount / loginCount) * 100);
   					return !isNaN(value) && ratio >= value;
   				},
   				SC 	: function isSecureConnection() {
-  					return client.session.isSecure;
+  					return _.get(client, 'session.isSecure', false);
   				},
   				ML	: function minutesLeft() {
   					//	:TODO: implement me!
   					return false;
   				},
   				TH	: function termHeight() {
-  					return !isNaN(value) && client.term.termHeight >= value;
+  					return !isNaN(value) && _.get(client, 'term.termHeight', 0) >= value;
   				},
   				TM	: function isOneOfThemes() {
   					if(!Array.isArray(value)) {
   						return false;
   					}
-
-  					return value.includes(client.currentTheme.name);
+  					return value.includes(_.get(client, 'currentTheme.name'));
   				},
   				TT	: function isOneOfTermTypes() {
   					if(!Array.isArray(value)) {
   						return false;
   					}
-
-  					return value.includes(client.term.termType);
+  					return value.includes(_.get(client, 'term.termType'));
   				},
   				TW	: function termWidth() {
-  					return !isNaN(value) && client.term.termWidth >= value;
+  					return !isNaN(value) && _.get(client, 'term.termWidth', 0) >= value;
   				},
   				ID	: function isUserId(value) {
+  					if(!user) {
+  						return false;
+  					}
   					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
-
   					return value.map(n => parseInt(n, 10)).includes(user.userId);
   				},
   				WD	: function isOneOfDayOfWeek() {
   					if(!Array.isArray(value)) {
   						value = [ value ];
   					}
-
   					return value.map(n => parseInt(n, 10)).includes(new Date().getDay());
   				},
   				MM	: function isMinutesPastMidnight() {
@@ -989,7 +1027,9 @@ function peg$parse(input, options) {
   				}
   			}[acsCode](value);
   		} catch (e) {
-  			client.log.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!');
+  			const logger = _.get(client, 'log', Log);
+  			logger.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!');
+
   			return false;
   		}
   	}
diff --git a/core/client.js b/core/client.js
index 60a04af7..300285a3 100644
--- a/core/client.js
+++ b/core/client.js
@@ -85,7 +85,7 @@ function Client(/*input, output*/) {
     this.currentTheme       = { info : { name : 'N/A', description : 'None' } };
     this.lastKeyPressMs     = Date.now();
     this.menuStack          = new MenuStack(this);
-    this.acs                = new ACS(this);
+    this.acs                = new ACS( { client : this, user : this.user } );
     this.mciCache           = {};
     this.interruptQueue     = new UserInterruptQueue(this);
 
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index ed6089ba..bd6a8d96 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -1,31 +1,35 @@
 
 {
-	const client	= options.client;
-	const user		= options.client.user;
-
 	const UserProps	= require('./user_property.js');
+	const Log       = require('./logger.js').log;
 
+	const _			= require('lodash');
 	const moment	= require('moment');
 
+	const client	= _.get(options, 'subject.client');
+	const user		= _.get(options, 'subject.user');
+
 	function checkAccess(acsCode, value) {
 		try {
 			return {
 				LC	: function isLocalConnection() {
-					return client.isLocal();
+					return client && client.isLocal();
 				},
 				AG	: function ageGreaterOrEqualThan() {
-					return !isNaN(value) && user.getAge() >= value;
+					return !isNaN(value) && user && user.getAge() >= value;
 				},
 				AS	: function accountStatus() {
+					if(!user) {
+						return false;
+					}
 					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
-
 					const userAccountStatus = user.getPropertyAsNumber(UserProps.AccountStatus);
 					return value.map(n => parseInt(n, 10)).includes(userAccountStatus);
 				},
 				EC	: function isEncoding() {
-					const encoding = client.term.outputEncoding.toLowerCase();
+					const encoding = _.get(client, 'term.outputEncoding', '').toLowerCase();
 					switch(value) {
 						case 0	: return 'cp437' === encoding;
 						case 1	: return 'utf-8' === encoding;
@@ -33,27 +37,41 @@
 					}
 				},
 				GM	: function isOneOfGroups() {
+					if(!user) {
+						return false;
+					}
 					if(!Array.isArray(value)) {
 						return false;
 					}
-
 					return value.some(groupName => user.isGroupMember(groupName));
 				},
 				NN	: function isNode() {
+					if(!client) {
+						return false;
+					}
 					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
 					return value.map(n => parseInt(n, 10)).includes(client.node);
 				},
 				NP	: function numberOfPosts() {
+					if(!user) {
+						return false;
+					}
 					const postCount = user.getPropertyAsNumber(UserProps.PostCount) || 0;
 					return !isNaN(value) && postCount >= value;
 				},
 				NC	: function numberOfCalls() {
+					if(!user) {
+						return false;
+					}
 					const loginCount = user.getPropertyAsNumber(UserProps.LoginCount);
 					return !isNaN(value) && loginCount >= value;
 				},
 				AA	: function accountAge() {
+					if(!user) {
+						return false;
+					}
 					const accountCreated = moment(user.getProperty(UserProps.AccountCreated));
 					const now = moment();
 					const daysOld = accountCreated.diff(moment(), 'days');
@@ -63,78 +81,98 @@
 						daysOld >= value;
 				},
 				BU	: function bytesUploaded() {
+					if(!user) {
+						return false;
+					}
 					const bytesUp = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
 					return !isNaN(value) && bytesUp >= value;
 				},
 				UP	: function uploads() {
+					if(!user) {
+						return false;
+					}
 					const uls = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
 					return !isNaN(value) && uls >= value;
 				},
 				BD	: function bytesDownloaded() {
+					if(!user) {
+						return false;
+					}
 					const bytesDown = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
 					return !isNaN(value) && bytesDown >= value;
 				},
 				DL	: function downloads() {
+					if(!user) {
+						return false;
+					}
 					const dls = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
 					return !isNaN(value) && dls >= value;
 				},
 				NR	: function uploadDownloadRatioGreaterThan() {
+					if(!user) {
+						return false;
+					}
 					const ulCount = user.getPropertyAsNumber(UserProps.FileUlTotalCount) || 0;
 					const dlCount = user.getPropertyAsNumber(UserProps.FileDlTotalCount) || 0;
 					const ratio = ~~((ulCount / dlCount) * 100);
 					return !isNaN(value) && ratio >= value;
 				},
 				KR	: function uploadDownloadByteRatioGreaterThan() {
+					if(!user) {
+						return false;
+					}
 					const ulBytes = user.getPropertyAsNumber(UserProps.FileUlTotalBytes) || 0;
 					const dlBytes = user.getPropertyAsNumber(UserProps.FileDlTotalBytes) || 0;
 					const ratio = ~~((ulBytes / dlBytes) * 100);
 					return !isNaN(value) && ratio >= value;
 				},
-				PC	: function postCallRatio() {					
+				PC	: function postCallRatio() {
+					if(!user) {
+						return false;
+					}
 					const postCount		= user.getPropertyAsNumber(UserProps.PostCount) || 0;
 					const loginCount	= user.getPropertyAsNumber(UserProps.LoginCount) || 0;
 					const ratio = ~~((postCount / loginCount) * 100);
 					return !isNaN(value) && ratio >= value;
 				},
 				SC 	: function isSecureConnection() {
-					return client.session.isSecure;
+					return _.get(client, 'session.isSecure', false);
 				},
 				ML	: function minutesLeft() {
 					//	:TODO: implement me!
 					return false;
 				},
 				TH	: function termHeight() {
-					return !isNaN(value) && client.term.termHeight >= value;
+					return !isNaN(value) && _.get(client, 'term.termHeight', 0) >= value;
 				},
 				TM	: function isOneOfThemes() {
 					if(!Array.isArray(value)) {
 						return false;
 					}
-
-					return value.includes(client.currentTheme.name);
+					return value.includes(_.get(client, 'currentTheme.name'));
 				},
 				TT	: function isOneOfTermTypes() {
 					if(!Array.isArray(value)) {
 						return false;
 					}
-
-					return value.includes(client.term.termType);
+					return value.includes(_.get(client, 'term.termType'));
 				},
 				TW	: function termWidth() {
-					return !isNaN(value) && client.term.termWidth >= value;
+					return !isNaN(value) && _.get(client, 'term.termWidth', 0) >= value;
 				},
 				ID	: function isUserId(value) {
+					if(!user) {
+						return false;
+					}
 					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
-
 					return value.map(n => parseInt(n, 10)).includes(user.userId);
 				},
 				WD	: function isOneOfDayOfWeek() {
 					if(!Array.isArray(value)) {
 						value = [ value ];
 					}
-
 					return value.map(n => parseInt(n, 10)).includes(new Date().getDay());
 				},
 				MM	: function isMinutesPastMidnight() {
@@ -145,7 +183,9 @@
 				}
 			}[acsCode](value);
 		} catch (e) {
-			client.log.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!');
+			const logger = _.get(client, 'log', Log);
+			logger.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!');
+
 			return false;
 		}
 	}

From 6b02ddbdae252ac7318e4ade486c9484b84f9bfc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 29 Dec 2018 13:15:58 -0700
Subject: [PATCH 0660/1013] Fix FILE_ID.DIZ (and other) display issues when
 ANSI is stored with specific term width in SAUCE + Preserve SAUCE records of
 desc/long_desc during import (in meta) * Use SAUCE term width for ANSI Prep
 when displaying desc

---
 core/file_area_list.js            | 27 +++++++++++++++++----------
 core/file_base_area.js            | 26 +++++++++++++++++++-------
 core/file_entry.js                |  2 ++
 core/multi_line_edit_text_view.js |  4 ++--
 core/oputil/oputil_file_base.js   | 10 ++++++++--
 core/sauce.js                     | 12 +++++++++++-
 6 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/core/file_area_list.js b/core/file_area_list.js
index 35ce3ea6..a62271ca 100644
--- a/core/file_area_list.js
+++ b/core/file_area_list.js
@@ -413,16 +413,23 @@ exports.getModule = class FileAreaList extends MenuModule {
                             //
                             const desc = controlCodesToAnsi(self.currentFileEntry.desc);
                             if(desc.length != self.currentFileEntry.desc.length || isAnsi(desc)) {
-                                descView.setAnsi(
-                                    desc,
-                                    {
-                                        prepped         : false,
-                                        forceLineTerm   : true
-                                    },
-                                    () => {
-                                        return callback(null);
-                                    }
-                                );
+                                const opts = {
+                                    prepped         : false,
+                                    forceLineTerm   : true
+                                };
+
+                                //
+                                //  if SAUCE states a term width, honor it else we may see
+                                //  display corruption
+                                //
+                                const sauceTermWidth = _.get(self.currentFileEntry.meta, 'desc_sauce.Character.characterWidth');
+                                if(_.isNumber(sauceTermWidth)) {
+                                    opts.termWidth = sauceTermWidth;
+                                }
+
+                                descView.setAnsi(desc, opts, () => {
+                                    return callback(null);
+                                });
                             } else {
                                 descView.setText(self.currentFileEntry.desc);
                                 return callback(null);
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 95040791..44ecb406 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -16,6 +16,7 @@ const wordWrapText      = require('./word_wrap.js').wordWrapText;
 const StatLog           = require('./stat_log.js');
 const UserProps         = require('./user_property.js');
 const SysProps          = require('./system_property.js');
+const SAUCE             = require('./sauce.js');
 
 //  deps
 const _             = require('lodash');
@@ -386,13 +387,24 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                                 return next(null);
                             }
 
-                            //
-                            //  Assume FILE_ID.DIZ, NFO files, etc. are CP437.
-                            //
-                            //  :TODO: This isn't really always the case - how to handle this? We could do a quick detection...
-                            fileEntry[descType]         = iconv.decode(sliceAtSauceMarker(data, 0x1a), 'cp437');
-                            fileEntry[`${descType}Src`] = 'descFile';
-                            return next(null);
+                            SAUCE.readSAUCE(data, (err, sauce) => {
+                                if(sauce) {
+                                    //  if we have SAUCE, this information will be kept as well,
+                                    //  but separate/pre-parsed.
+                                    const metaKey = `desc${'descLong' === descType ? '_long' : ''}_sauce`;
+                                    fileEntry.meta[metaKey] = JSON.stringify(sauce);
+                                }
+
+                                //
+                                //  Assume FILE_ID.DIZ, NFO files, etc. are CP437; we need
+                                //  to decode to a native format for storage
+                                //
+                                //  :TODO: This isn't really always the case - how to handle this? We could do a quick detection...
+                                const decodedData           = iconv.decode(data, 'cp437');
+                                fileEntry[descType]         = sliceAtSauceMarker(decodedData, 0x1a);
+                                fileEntry[`${descType}Src`] = 'descFile';
+                                return next(null);
+                            });
                         });
                     });
                 }, () => {
diff --git a/core/file_entry.js b/core/file_entry.js
index 4f5e47d1..0539f137 100644
--- a/core/file_entry.js
+++ b/core/file_entry.js
@@ -39,6 +39,8 @@ const FILE_WELL_KNOWN_META = {
     tic_desc            : null, //  TIC "Desc"
     tic_ldesc           : null, //  TIC "Ldesc" joined by '\n'
     session_temp_dl     : (v) => parseInt(v) ? true : false,
+    desc_sauce          : (s) => JSON.parse(s) || {},
+    desc_long_sauce     : (s) => JSON.parse(s) || {},
 };
 
 module.exports = class FileEntry {
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index bd49a73f..9f099b16 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -567,8 +567,8 @@ function MultiLineEditTextView(options) {
         ansiPrep(
             ansi,
             {
-                termWidth           : this.client.term.termWidth,
-                termHeight          : this.client.term.termHeight,
+                termWidth           : options.termWidth || this.client.term.termWidth,
+                termHeight          : options.termHeight || this.client.term.termHeight,
                 cols                : this.dimens.width,
                 rows                : 'auto',
                 startCol            : this.position.col,
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index b12c4d69..f1956cce 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -259,8 +259,10 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
 
                                                             if( tagsEq &&
 																fileEntry.desc === existingEntry.desc &&
-																fileEntry.descLong == existingEntry.descLong &&
-																fileEntry.meta.est_release_year == existingEntry.meta.est_release_year)
+																fileEntry.descLong === existingEntry.descLong &&
+                                                                fileEntry.meta.est_release_year === existingEntry.meta.est_release_year &&
+                                                                fileEntry.meta.desc_sauce === existingEntry.meta.desc_sauce
+                                                            )
                                                             {
                                                                 console.info('Dupe');
                                                                 return nextFile(null);
@@ -276,6 +278,10 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                                                                 existingEntry.meta.est_release_year	= fileEntry.meta.est_release_year;
                                                             }
 
+                                                            if(fileEntry.meta.desc_sauce) {
+                                                                existingEntry.meta.desc_sauce = fileEntry.meta.desc_sauce;
+                                                            }
+
                                                             updateTags(existingEntry);
 
                                                             finalizeEntryAndPersist(true, existingEntry, descHandler, err => {
diff --git a/core/sauce.js b/core/sauce.js
index 6291c16e..7d5f52fd 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -163,7 +163,7 @@ function parseCharacterSAUCE(sauce) {
     result.fileType = SAUCE_CHARACTER_FILE_TYPES[sauce.fileType] || 'Unknown';
 
     if(sauce.fileType === 0 || sauce.fileType === 1 || sauce.fileType === 2) {
-        //  convience: create ansiFlags
+        //  convenience: create ansiFlags
         sauce.ansiFlags = sauce.flags;
 
         let i = 0;
@@ -175,6 +175,16 @@ function parseCharacterSAUCE(sauce) {
         if(fontName.length > 0) {
             result.fontName = fontName;
         }
+
+        const setDimen = (v, field) => {
+            const i = parseInt(v, 10);
+            if(!isNaN(i)) {
+                result[field] = i;
+            }
+        };
+
+        setDimen(sauce.tinfo1, 'characterWidth');
+        setDimen(sauce.tinfo2, 'characterHeight');
     }
 
     return result;

From 78484a235292cf46013dd14bd27d79c3c6d9d16f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 29 Dec 2018 13:28:08 -0700
Subject: [PATCH 0661/1013] Compare SAUCE for --update propertly

---
 core/oputil/oputil_file_base.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index f1956cce..4dc25fd2 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -257,11 +257,16 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                                                             const optTags	= Array.isArray(options.tags) ? new Set(options.tags) : existingEntry.hashTags;
                                                             const tagsEq	= _.isEqual(optTags, existingEntry.hashTags);
 
+                                                            let descSauceCompare;
+                                                            if(existingEntry.meta.desc_sauce) {
+                                                                descSauceCompare = JSON.stringify(existingEntry.meta.desc_sauce);
+                                                            }
+
                                                             if( tagsEq &&
 																fileEntry.desc === existingEntry.desc &&
 																fileEntry.descLong === existingEntry.descLong &&
                                                                 fileEntry.meta.est_release_year === existingEntry.meta.est_release_year &&
-                                                                fileEntry.meta.desc_sauce === existingEntry.meta.desc_sauce
+                                                                fileEntry.meta.desc_sauce === descSauceCompare
                                                             )
                                                             {
                                                                 console.info('Dupe');

From 7450b653fa901a86bd5276a4dca45b0cbd1f64a8 Mon Sep 17 00:00:00 2001
From: FrozenFOXX <frozenfoxx@churchoffoxx.net>
Date: Sat, 29 Dec 2018 16:00:06 -0600
Subject: [PATCH 0662/1013] Update docker.md

Updated the command to reflect current syntax.
---
 docs/installation/docker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/docker.md b/docs/installation/docker.md
index 878c9b33..82e03e5c 100644
--- a/docs/installation/docker.md
+++ b/docs/installation/docker.md
@@ -11,11 +11,11 @@ Download and run the ENiGMA½ BBS image:
 
     docker run -d \
       -p 8888:8888 \
-      davestephens\enigma-bbs
+      davestephens/enigma-bbs:latest
 
 As no config has been supplied the container will use a basic one so that it starts successfully. Note that as no persistence 
 directory has been supplied, once the container stops any changes made will be lost!
 
 ## Customised Docker Setup
 
-TBC using Docker Compose
\ No newline at end of file
+TBC using Docker Compose

From 0230d9958c8a2e5e088c710e53c34cf08f48f35b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 31 Dec 2018 11:30:40 -0700
Subject: [PATCH 0663/1013] Better screen size detection when NAWS/etc. fails:
 Ask to move cursor to 999,999. We expect that we'll really get something like
 80x25 generally. *Then* issue special DSR that should give us screen size. We
 should get a good "bottom right" aka screen size either way.

---
 core/connect.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/connect.js b/core/connect.js
index 0b83f7f0..b9316a3e 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -80,12 +80,13 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
 
         //
         //  NetRunner for example gives us 1x1 here. Not really useful. Ignore
-        //  values that seem obviously bad.
+        //  values that seem obviously bad. Included in the set is the explicit
+        //  999x999 values we asked to move to.
         //
-        if(h < 10 || w < 10) {
+        if(h < 10 || h === 999 || w < 10 || w === 999) {
             client.log.warn(
                 { height : h, width : w },
-                'Ignoring ANSI CPR screen size query response due to very small values');
+                'Ignoring ANSI CPR screen size query response due to non-sane values');
             return done(Errors.Invalid('Term size <= 10 considered invalid'));
         }
 
@@ -111,12 +112,20 @@ function ansiQueryTermSizeIfNeeded(client, cb) {
         return done(Errors.General('No term size established by CPR within timeout'));
     }, 2000);
 
-    //  Start the process: Query for CPR
-    client.term.rawWrite(ansi.queryScreenSize());
+    //  Start the process:
+    //  1 - Ask to goto 999,999 -- a very much "bottom right" (generally 80x25 for example
+    //      is the real size)
+    //  2 - Query for screen size with bansi.txt style specialized Device Status Report (DSR)
+    //      request. We expect a CPR of:
+    //      a - Terms that support bansi.txt style: Screen size
+    //      b - Terms that do not support bansi.txt style: Since we moved to the bottom right
+    //          we should still be able to determine a screen size.
+    //
+    client.term.rawWrite(`${ansi.goto(999, 999)}${ansi.queryScreenSize()}`);
 }
 
 function prepareTerminal(term) {
-    term.rawWrite(ansi.normal());
+    term.rawWrite(`${ansi.normal()}${ansi.clearScreen()}`);
 }
 
 function displayBanner(term) {

From 4fb7c4bf532e94db3e8166e224818b3b8ed03364 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 31 Dec 2018 11:33:14 -0700
Subject: [PATCH 0664/1013] Some minor cleanup

---
 core/servers/login/telnet.js | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index ff21b602..29d766ba 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -16,8 +16,6 @@ const buffers       = require('buffers');
 const { Parser }    = require('binary-parser');
 const util          = require('util');
 
-//var debug = require('debug')('telnet');
-
 const ModuleInfo = exports.moduleInfo = {
     name        : 'Telnet',
     desc        : 'Telnet Server',
@@ -36,24 +34,7 @@ exports.TelnetClient    = TelnetClient;
 
 /*
     TODO:
-    * Document COMMANDS -- add any missing
-    * Document OPTIONS -- add any missing
-    * Internally handle OPTIONS:
-        * Some should be emitted generically
-        * Some should be handled internally -- denied, handled, etc.
-        *
-
-    * Allow term (ttype) to be set by environ sub negotiation
-
-    * Process terms in loop.... research needed
-
-    * Handle will/won't
-    * Handle do's, ..
-    * Some won't should close connection
-
-    * Options/Commands we don't understand shouldn't crash the server!!
-
-
+    * Various (much lesser used) Telnet command coverage
 */
 
 const COMMANDS = {
@@ -299,10 +280,7 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
 };
 
 //  Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
-const NEW_ENVIRONMENT_DELIMITERS = [];
-Object.keys(NEW_ENVIRONMENT_COMMANDS).forEach(function onKey(k) {
-    NEW_ENVIRONMENT_DELIMITERS.push(NEW_ENVIRONMENT_COMMANDS[k]);
-});
+//const NEW_ENVIRONMENT_DELIMITERS = _.values(NEW_ENVIRONMENT_COMMANDS);
 
 //  Handle the deprecated RFC 1408 & the updated RFC 1572:
 OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]   =
@@ -727,10 +705,9 @@ TelnetClient.prototype.handleSbCommand = function(evt) {
     }
 };
 
-const IGNORED_COMMANDS = [];
-[ COMMANDS.EL, COMMANDS.GA, COMMANDS.NOP, COMMANDS.DM, COMMANDS.BRK ].forEach(function onCommandCode(cc) {
-    IGNORED_COMMANDS.push(cc);
-});
+const IGNORED_COMMANDS = [
+    COMMANDS.EL, COMMANDS.GA, COMMANDS.NOP, COMMANDS.DM, COMMANDS.BRK
+];
 
 
 TelnetClient.prototype.handleMiscCommand = function(evt) {
@@ -750,7 +727,7 @@ TelnetClient.prototype.handleMiscCommand = function(evt) {
 
         this.log.debug('Are You There (AYT) - Replied "\\b"');
     } else if(IGNORED_COMMANDS.indexOf(evt.commandCode)) {
-        this.log.debug({ evt : evt }, 'Ignoring command');
+        this.log.trace({ command : evt.command, commandCode : evt.commandCode }, 'Ignoring command');
     } else {
         this.log.warn({ evt : evt }, 'Unknown command');
     }

From b23cdd20bfea362c947c31e1ebeb20e971f02e04 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 2 Jan 2019 19:52:15 -0700
Subject: [PATCH 0665/1013] Listen to 'env' events

---
 core/servers/login/ssh.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index d67bbafa..c05e9294 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -238,6 +238,14 @@ function SSHClient(clientConn) {
                 }
             });
 
+            session.on('env', (accept, reject, info) => {
+                self.log.debug(info, 'SSH env event');
+
+                if(_.isFunction(accept)) {
+                    accept();
+                }
+            });
+
             session.on('shell', accept => {
                 self.log.debug('SSH shell event');
 

From eaace9a81d797971cd2c3621f76d6228f24a73c0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 2 Jan 2019 20:07:46 -0700
Subject: [PATCH 0666/1013] TODO notes

---
 core/scanner_tossers/ftn_bso.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 47184ea9..3fec4fc3 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1677,7 +1677,7 @@ function FTNMessageScanTossModule() {
                         localAreaTags   : self.getLocalAreaTagsForTic(),
                     };
 
-                    return ticFileInfo.validate(config, (err, localInfo) => {
+                    ticFileInfo.validate(config, (err, localInfo) => {
                         if(err) {
                             Log.trace( { reason : err.message }, 'Validation failure');
                             return callback(err);
@@ -1893,7 +1893,7 @@ function FTNMessageScanTossModule() {
             ],
             (err, localInfo) => {
                 if(err) {
-                    Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed import/update TIC record' );
+                    Log.error( { error : err.message, reason : err.reason, tic : ticFileInfo.filePath }, 'Failed to import/update TIC' );
                 } else {
                     Log.info(
                         { tic : ticFileInfo.path, file : ticFileInfo.filePath, area : localInfo.areaTag },
@@ -2109,6 +2109,8 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
                 async.eachSeries(ticFilesInfo, (ticFileInfo, nextTicInfo) => {
                     self.processSingleTicFile(ticFileInfo, err => {
                         if(err) {
+                            //  :TODO: If ENOENT -OR- failed due to CRC mismatch: create a pending state & try again later; the "attached" file may not yet be ready.
+
                             //  archive rejected TIC stuff (.TIC + attach)
                             async.each( [ ticFileInfo.path, ticFileInfo.filePath ], (path, nextPath) => {
                                 if(!path) { //  possibly rejected due to "File" not existing/etc.

From c5a72c7356cfbafed32f2777f324cb05837e6461 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 2 Jan 2019 20:08:00 -0700
Subject: [PATCH 0667/1013] TODO notes

---
 core/servers/content/nntp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 41dda2e8..4959dc64 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -143,6 +143,7 @@ class NNTPServer extends NNTPServerBase {
             const user = new User();
             user.authenticate(username, password, err => {
                 if(err) {
+                    //  :TODO: Log IP address
                     this.log.debug( { username, reason : err.message }, 'Authentication failure');
                     return resolve(false);
                 }

From a34dab6a73326c9241dbb702654a50c7497a0862 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 2 Jan 2019 22:13:42 -0700
Subject: [PATCH 0668/1013] WIP on user achievements * Hook up events for
 testing * Start to plug in experimental interrupt

---
 core/achievement.js   | 103 ++++++++++++++++++++++++++++++++++++++++++
 core/config.js        |  35 ++++++++++++++
 core/database.js      |  12 +++++
 core/stat_log.js      |   7 ++-
 core/system_events.js |   1 +
 5 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 core/achievement.js

diff --git a/core/achievement.js b/core/achievement.js
new file mode 100644
index 00000000..bb11e3c4
--- /dev/null
+++ b/core/achievement.js
@@ -0,0 +1,103 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Events                = require('./events.js');
+const Config                = require('./config.js').get;
+const UserDb                = require('./database.js').dbs.user;
+const UserInterruptQueue    = require('./user_interrupt_queue.js');
+const {
+    getConnectionByUserId
+}                           = require('./client_connections.js');
+
+//  deps
+const _             = require('lodash');
+
+class Achievements {
+    constructor(events) {
+        this.events = events;
+    }
+
+    init(cb) {
+        this.monitorUserStatUpdateEvents();
+        return cb(null);
+    }
+
+    loadAchievementHitCount(user, achievementTag, field, value, cb) {
+        UserDb.get(
+            `SELECT COUNT() AS count
+            FROM user_achievement
+            WHERE user_id = ? AND achievement_tag = ? AND match_field = ? AND match_value >= ?;`,
+            [ user.userId, achievementTag, field, value ],
+            (err, row) => {
+                return cb(err, row && row.count || 0);
+            }
+        );
+    }
+
+    monitorUserStatUpdateEvents() {
+        this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
+            const statValue = parseInt(userStatEvent.statValue, 10);
+            if(isNaN(statValue)) {
+                return;
+            }
+
+            const config = Config();
+            const achievementTag = _.findKey(
+                _.get(config, 'userAchievements.achievements', {}),
+                achievement => {
+                    if(false === achievement.enabled) {
+                        return false;
+                    }
+                    return 'userStat' === achievement.type &&
+                        achievement.statName === userStatEvent.statName;
+                }
+            );
+
+            if(!achievementTag) {
+                return;
+            }
+
+            const achievement = config.userAchievements.achievements[achievementTag];
+            let matchValue = Object.keys(achievement.match || {}).sort( (a, b) => b - a).find(v => statValue >= v);
+            if(matchValue) {
+                const match = achievement.match[matchValue];
+
+                //
+                //  Check if we've triggered this event before
+                //
+                this.loadAchievementHitCount(userStatEvent.user, achievementTag, null, matchValue, (err, count) => {
+                    if(count > 0) {
+                        return;
+                    }
+
+                    const conn = getConnectionByUserId(userStatEvent.user.userId);
+                    if(!conn) {
+                        return;
+                    }
+
+                    const interruptItem = {
+                        text : match.text,
+                        pause : true,
+                    };
+
+                    UserInterruptQueue.queue(interruptItem, { omit : conn} );
+                });
+            }
+        });
+    }
+}
+
+let achievements;
+
+exports.moduleInitialize = (initInfo, cb) => {
+
+    if(false === _.get(Config(), 'userAchievements.enabled')) {
+        //  :TODO: Log disabled
+        return cb(null);
+    }
+
+    achievements = new Achievements(initInfo.events);
+    return achievements.init(cb);
+};
+
diff --git a/core/config.js b/core/config.js
index 9c9c4cd4..f854e2f5 100644
--- a/core/config.js
+++ b/core/config.js
@@ -1003,6 +1003,41 @@ function getDefaultConfig() {
             systemEvents : {
                 loginHistoryMax: -1, //  set to -1 for forever
             }
+        },
+
+        userAchievements : {
+            enabled : true,
+
+            artHeader : 'achievement_header',
+            artFooter : 'achievement_footer',
+
+            achievements : {
+                user_login_count : {
+                    type        : 'userStat',
+                    statName    : 'login_count',
+                    retroactive : true,
+                    match : {
+                        10 : {
+                            title       : 'Return Caller',
+                            globalText  : '{userName} has logged in {statValue} times!',
+                            text        : 'You\'ve logged in {statValue} times!',
+                            points      : 5,
+                        },
+                        25 : {
+                            title       : 'Seems To Like It!',
+                            globalText  : '{userName} has logged in {statValue} times!',
+                            text        : 'You\'ve logged in {statValue} times!',
+                            points      : 10,
+                        },
+                        100 : {
+                            title       : '{boardName} Addict',
+                            globalText  : '{userName} the BBS {boardName} addict has logged in {statValue} times!',
+                            text        : 'You\'re a {boardName} addict! You\'ve logged in {statValue} times!',
+                            points      : 10,
+                        }
+                    }
+                }
+            }
         }
     };
 }
diff --git a/core/database.js b/core/database.js
index 040cc1de..4cf2513c 100644
--- a/core/database.js
+++ b/core/database.js
@@ -189,6 +189,18 @@ const DB_INIT_TABLE = {
             );`
         );
 
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user_achievement (
+                user_id             INTEGER NOT NULL,
+                achievement_tag     VARCHAR NOT NULL,
+                timestamp           DATETIME NOT NULL,
+                match_field         VARCHAR NOT NULL,
+                match_value         VARCHAR NOT NULL,
+                UNIQUE(user_id, achievement_tag, match_field, match_value),
+                FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
+            );`
+        );
+
         return cb(null);
     },
 
diff --git a/core/stat_log.js b/core/stat_log.js
index 6cf6198b..ffe099ae 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -120,11 +120,14 @@ class StatLog {
 
     //
     //  User specific stats
-    //  These are simply convience methods to the user's properties
+    //  These are simply convenience methods to the user's properties
     //
     setUserStat(user, statName, statValue, cb) {
         //  note: cb is optional in PersistUserProperty
-        return user.persistProperty(statName, statValue, cb);
+        user.persistProperty(statName, statValue, cb);
+
+        const Events = require('./events.js');  //  we need to late load currently
+        return Events.emit(Events.getSystemEvents().UserStatUpdate, { user, statName, statValue } );
     }
 
     getUserStat(user, statName) {
diff --git a/core/system_events.js b/core/system_events.js
index 0f8118a2..80612195 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -21,4 +21,5 @@ module.exports = {
     UserSendMail        : 'codes.l33t.enigma.system.user_send_mail',
     UserRunDoor         : 'codes.l33t.enigma.system.user_run_door',
     UserSendNodeMsg     : 'codes.l33t.enigma.system.user_send_node_msg',
+    UserStatUpdate      : 'codes.l33t.enigma.system.user_stat_set',     //  { ..., statName, statValue }
 };

From 9f728a2e94ba17a59063bf072e41833b2f81b909 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 3 Jan 2019 21:02:21 -0700
Subject: [PATCH 0669/1013] Fix longstanding bug with node IDs

---
 core/client_connections.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 558d0a0f..33f1df8a 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -60,12 +60,25 @@ function getActiveConnectionList(authUsersOnly) {
 }
 
 function addNewClient(client, clientSock) {
-    const id            = client.session.id     = clientConnections.push(client) - 1;
-    const remoteAddress = client.remoteAddress  = clientSock.remoteAddress;
+    //
+    //  Assign ID/client ID to next lowest & available #
+    //
+    let id = 0;
+    for(let i = 0; i < clientConnections.length; ++i) {
+        if(clientConnections[i].id > id) {
+            break;
+        }
+        id++;
+    }
 
+    client.session.id = id;
+    const remoteAddress = client.remoteAddress  = clientSock.remoteAddress;
     //  create a unique identifier one-time ID for this session
     client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
 
+    clientConnections.push(client);
+    clientConnections.sort( (c1, c2) => c1.session.id - c2.session.id);
+
     //  Create a client specific logger
     //  Note that this will be updated @ login with additional information
     client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );

From ea055ab58bf35994d20feeba098979d3659ad204 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 3 Jan 2019 21:02:42 -0700
Subject: [PATCH 0670/1013] Handle pause for text-only interruptions also

---
 core/user_interrupt_queue.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index 2e72bbd1..29a52685 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -81,18 +81,28 @@ module.exports = class UserInterruptQueue
             this.client.term.rawWrite('\r\n\r\n');
         }
 
+        const maybePauseAndFinish = () => {
+            if(interruptItem.pause) {
+                this.client.currentMenuModule.pausePrompt( () => {
+                    return cb(null);
+                });
+            } else {
+                return cb(null);
+            }
+        };
+
         if(interruptItem.contents) {
             Art.display(this.client, interruptItem.contents, err => {
                 if(err) {
                     return cb(err);
                 }
                 //this.client.term.rawWrite('\r\n\r\n');  //  :TODO: Prob optional based on contents vs text
-                this.client.currentMenuModule.pausePrompt( () => {
-                    return cb(null);
-                });
+                maybePauseAndFinish();
             });
         } else {
-            return this.client.term.write(pipeToAnsi(`${interruptItem.text}\r\n\r\n`, this.client), cb);
+            this.client.term.write(pipeToAnsi(`${interruptItem.text}\r\n\r\n`, this.client), true, () => {
+                maybePauseAndFinish();
+            });
         }
     }
 };
\ No newline at end of file

From bd03d7a79bf45df0a3603659ebfdcb1f831b6be5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 3 Jan 2019 21:02:57 -0700
Subject: [PATCH 0671/1013] Fix comment

---
 core/login_server_module.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/login_server_module.js b/core/login_server_module.js
index e5fccb39..8ba1d978 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -37,8 +37,8 @@ module.exports = class LoginServerModule extends ServerModule {
 
     handleNewClient(client, clientSock, modInfo) {
         //
-        //  Start tracking the client. We'll assign it an ID which is
-        //  just the index in our connections array.
+        //  Start tracking the client. A session ID aka client ID
+        //  will be established in addNewClient() below.
         //
         if(_.isUndefined(client.session)) {
             client.session = {};

From 10517b1060073df954569e10ae62f983b99d31d0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 3 Jan 2019 21:03:08 -0700
Subject: [PATCH 0672/1013] Progress on achivements * Fetch art if available *
 Queue local and/or global interrupts * Apply text formatting * Bug exists
 with interruptions in certain scenarios that needs worked out

---
 core/achievement.js | 155 +++++++++++++++++++++++++++++++++++++++-----
 core/config.js      |  20 +++---
 2 files changed, 149 insertions(+), 26 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index bb11e3c4..46f97e03 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -9,9 +9,16 @@ const UserInterruptQueue    = require('./user_interrupt_queue.js');
 const {
     getConnectionByUserId
 }                           = require('./client_connections.js');
+const UserProps             = require('./user_property.js');
+const { Errors }            = require('./enig_error.js');
+const { getThemeArt }       = require('./theme.js');
+const { pipeToAnsi }        = require('./color_codes.js');
+const stringFormat          = require('./string_format.js');
 
 //  deps
 const _             = require('lodash');
+const async         = require('async');
+const moment        = require('moment');
 
 class Achievements {
     constructor(events) {
@@ -61,31 +68,143 @@ class Achievements {
             const achievement = config.userAchievements.achievements[achievementTag];
             let matchValue = Object.keys(achievement.match || {}).sort( (a, b) => b - a).find(v => statValue >= v);
             if(matchValue) {
-                const match = achievement.match[matchValue];
+                const details = achievement.match[matchValue];
+                matchValue = parseInt(matchValue);
 
-                //
-                //  Check if we've triggered this event before
-                //
-                this.loadAchievementHitCount(userStatEvent.user, achievementTag, null, matchValue, (err, count) => {
-                    if(count > 0) {
-                        return;
-                    }
+                async.series(
+                    [
+                        (callback) => {
+                            this.loadAchievementHitCount(userStatEvent.user, achievementTag, null, matchValue, (err, count) => {
+                                if(err) {
+                                    return callback(err);
+                                }
+                                return callback(count > 0 ? Errors.General('Achievement already acquired') : null);
+                            });
+                        },
+                        (callback) => {
+                            const client = getConnectionByUserId(userStatEvent.user.userId);
+                            if(!client) {
+                                return callback(Errors.UnexpectedState('Failed to get client for user ID'));
+                            }
 
-                    const conn = getConnectionByUserId(userStatEvent.user.userId);
-                    if(!conn) {
-                        return;
-                    }
+                            const info = {
+                                achievement,
+                                details,
+                                client,
+                                value       : matchValue,
+                                user        : userStatEvent.user,
+                                timestamp   : moment(),
+                            };
 
-                    const interruptItem = {
-                        text : match.text,
-                        pause : true,
-                    };
+                            this.createAchievementInterruptItems(info, (err, interruptItems) => {
+                                if(err) {
+                                    return callback(err);
+                                }
 
-                    UserInterruptQueue.queue(interruptItem, { omit : conn} );
-                });
+                                if(interruptItems.local) {
+                                    UserInterruptQueue.queue(interruptItems.local, { clients : client } );
+                                }
+
+                                if(interruptItems.global) {
+                                    UserInterruptQueue.queue(interruptItems.global, { omit : client } );
+                                }
+                            });
+                        }
+                    ]
+                );
             }
         });
     }
+
+    createAchievementInterruptItems(info, cb) {
+        const dateTimeFormat =
+            info.details.dateTimeFormat ||
+            info.achievement.dateTimeFormat ||
+            info.client.currentTheme.helpers.getDateTimeFormat();
+
+        const config = Config();
+
+        const formatObj = {
+            userName        : info.user.username,
+            userRealName    : info.user.properties[UserProps.RealName],
+            userLocation    : info.user.properties[UserProps.Location],
+            userAffils      : info.user.properties[UserProps.Affiliations],
+            nodeId          : info.client.node,
+            title           : info.details.title,
+            text            : info.global ? info.details.globalText : info.details.text,
+            points          : info.details.points,
+            value           : info.value,
+            timestamp       : moment(info.timestamp).format(dateTimeFormat),
+            boardName       : config.general.boardName,
+        };
+
+        const title = stringFormat(info.details.title, formatObj);
+        const text  = stringFormat(info.details.text, formatObj);
+
+        let globalText;
+        if(info.details.globalText) {
+            globalText = stringFormat(info.details.globalText, formatObj);
+        }
+
+        const getArt = (name, callback) => {
+            const spec =
+                _.get(info.details, `art.${name}`) ||
+                _.get(info.achievement, `art.${name}`) ||
+                _.get(config, `userAchievements.art.${name}`);
+            if(!spec) {
+                return callback(null);
+            }
+            const getArtOpts = {
+                name    : spec,
+                client  : this.client,
+                random  : false,
+            };
+            getThemeArt(getArtOpts, (err, artInfo) => {
+                //  ignore errors
+                return callback(artInfo ? artInfo.data : null);
+            });
+        };
+
+        const interruptItems = {};
+        let itemTypes = [ 'local' ];
+        if(globalText) {
+            itemTypes.push('global');
+        }
+
+        async.each(itemTypes, (itemType, nextItemType) => {
+            async.waterfall(
+                [
+                    (callback) => {
+                        getArt('header', headerArt => {
+                            return callback(null, headerArt);
+                        });
+                    },
+                    (headerArt, callback) => {
+                        getArt('footer', footerArt => {
+                            return callback(null, headerArt, footerArt);
+                        });
+                    },
+                    (headerArt, footerArt, callback) => {
+                        const itemText = 'global' === itemType ? globalText : text;
+                        interruptItems[itemType] = {
+                            text    : `${title}\r\n${itemText}`,
+                            pause   : true,
+                        };
+                        if(headerArt || footerArt) {
+                            interruptItems[itemType].contents = `${headerArt || ''}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
+                        }
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return nextItemType(err);
+                }
+            );
+        },
+        err => {
+            return cb(err, interruptItems);
+        });
+    }
 }
 
 let achievements;
diff --git a/core/config.js b/core/config.js
index f854e2f5..b73490cc 100644
--- a/core/config.js
+++ b/core/config.js
@@ -1008,8 +1008,12 @@ function getDefaultConfig() {
         userAchievements : {
             enabled : true,
 
-            artHeader : 'achievement_header',
-            artFooter : 'achievement_footer',
+            art : {
+                header : 'achievement_header',
+                footer : 'achievement_footer',
+            },
+
+            //  :TODO: achievements should be a path/filename -> achievements.hjson & allow override/theming
 
             achievements : {
                 user_login_count : {
@@ -1019,20 +1023,20 @@ function getDefaultConfig() {
                     match : {
                         10 : {
                             title       : 'Return Caller',
-                            globalText  : '{userName} has logged in {statValue} times!',
-                            text        : 'You\'ve logged in {statValue} times!',
+                            globalText  : '{userName} has logged in {value} times!',
+                            text        : 'You\'ve logged in {value} times!',
                             points      : 5,
                         },
                         25 : {
                             title       : 'Seems To Like It!',
-                            globalText  : '{userName} has logged in {statValue} times!',
-                            text        : 'You\'ve logged in {statValue} times!',
+                            globalText  : '{userName} has logged in {value} times!',
+                            text        : 'You\'ve logged in {value} times!',
                             points      : 10,
                         },
                         100 : {
                             title       : '{boardName} Addict',
-                            globalText  : '{userName} the BBS {boardName} addict has logged in {statValue} times!',
-                            text        : 'You\'re a {boardName} addict! You\'ve logged in {statValue} times!',
+                            globalText  : '{userName} the BBS {boardName} addict has logged in {value} times!',
+                            text        : 'You\'re a {boardName} addict! You\'ve logged in {value} times!',
                             points      : 10,
                         }
                     }

From 64106373593aabb818be1b7389b337bf52b5ee52 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 3 Jan 2019 22:03:00 -0700
Subject: [PATCH 0673/1013] Don't allow real time interrupt until ready

---
 core/menu_module.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index bc631feb..15e7ebce 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -30,6 +30,10 @@ exports.MenuModule = class MenuModule extends PluginModule {
         this.cls                = _.get(this.menuConfig.config, 'cls', Config().menus.cls);
         this.viewControllers    = {};
         this.interrupt          = (_.get(this.menuConfig.config, 'interrupt', MenuModule.InterruptTypes.Queued)).toLowerCase();
+
+        if(MenuModule.InterruptTypes.Realtime === this.interrupt) {
+            this.realTimeInterrupt  = 'blocked';
+        }
     }
 
     static get InterruptTypes() {
@@ -137,6 +141,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
                 },
                 function finishAndNext(callback) {
                     self.finishedLoading();
+                    self.realTimeInterrupt = 'allowed';
                     return self.autoNextMenu(callback);
                 }
             ],
@@ -194,7 +199,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     attemptInterruptNow(interruptItem, cb) {
-        if(MenuModule.InterruptTypes.Realtime !== this.interrupt) {
+        if(this.realTimeInterrupt !== 'allowed' || MenuModule.InterruptTypes.Realtime !== this.interrupt) {
             return cb(null, false); //  don't eat up the item; queue for later
         }
 

From c332b0f3ec6f2cc85b6b8d08eb425d71e3071f91 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 10:49:19 -0700
Subject: [PATCH 0674/1013] WIP on user achievements + Add MCI codes for
 points/count + Add docs for MCI codes + Record in stats, stat log, etc. * Do
 not trigger more than once * Code cleanup & organization, add classes, etc. *
 Tweaks to DB table

---
 core/achievement.js    | 253 ++++++++++++++++++++++++++++++++---------
 core/config.js         |  18 +--
 core/database.js       |   2 +-
 core/predefined_mci.js |   9 +-
 core/stat_log.js       |   1 +
 core/system_events.js  |  35 +++---
 core/user_property.js  |   3 +
 docs/art/mci.md        |  10 +-
 8 files changed, 242 insertions(+), 89 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index 46f97e03..21cc7ae4 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -5,58 +5,192 @@
 const Events                = require('./events.js');
 const Config                = require('./config.js').get;
 const UserDb                = require('./database.js').dbs.user;
+const {
+    getISOTimestampString
+}                           = require('./database.js');
 const UserInterruptQueue    = require('./user_interrupt_queue.js');
 const {
     getConnectionByUserId
 }                           = require('./client_connections.js');
 const UserProps             = require('./user_property.js');
-const { Errors }            = require('./enig_error.js');
+const {
+    Errors,
+    ErrorReasons
+}                           = require('./enig_error.js');
 const { getThemeArt }       = require('./theme.js');
 const { pipeToAnsi }        = require('./color_codes.js');
 const stringFormat          = require('./string_format.js');
+const StatLog               = require('./stat_log.js');
+const Log                   = require('./logger.js').log;
 
 //  deps
 const _             = require('lodash');
 const async         = require('async');
 const moment        = require('moment');
 
+class Achievement {
+    constructor(data) {
+        this.data = data;
+    }
+
+    static factory(data) {
+        let achievement;
+        switch(data.type) {
+            case Achievement.Types.UserStat : achievement = new UserStatAchievement(data); break;
+            default : return;
+        }
+
+        if(achievement.isValid()) {
+            return achievement;
+        }
+    }
+
+    static get Types() {
+        return {
+            UserStat    : 'userStat',
+        };
+    }
+
+    isValid() {
+        switch(this.data.type) {
+            case Achievement.Types.UserStat :
+                if(!_.isString(this.data.statName)) {
+                    return false;
+                }
+                if(!_.isObject(this.data.match)) {
+                    return false;
+                }
+                break;
+
+            default : return false;
+        }
+        return true;
+    }
+
+    getMatchDetails(/*matchAgainst*/) {
+    }
+
+    isValidMatchDetails(details) {
+        if(!_.isString(details.title) || !_.isString(details.text) || !_.isNumber(details.points)) {
+            return false;
+        }
+        return (_.isString(details.globalText) || !details.globalText);
+    }
+}
+
+class UserStatAchievement extends Achievement {
+    constructor(data) {
+        super(data);
+    }
+
+    isValid() {
+        if(!super.isValid()) {
+            return false;
+        }
+        return !Object.keys(this.data.match).some(k => !parseInt(k));
+    }
+
+    getMatchDetails(matchValue) {
+        let matchField = Object.keys(this.data.match || {}).sort( (a, b) => b - a).find(v => matchValue >= v);
+        if(matchField) {
+            const match = this.data.match[matchField];
+            if(this.isValidMatchDetails(match)) {
+                return [ match, parseInt(matchField), matchValue ];
+            }
+        }
+    }
+}
+
 class Achievements {
     constructor(events) {
         this.events = events;
     }
 
     init(cb) {
+        //  :TODO: if enabled/etc., load achievements.hjson -> if theme achievements.hjson{}, merge @ display time?
+        //  merge for local vs global (per theme) clients
+        //  ...only merge/override text
         this.monitorUserStatUpdateEvents();
         return cb(null);
     }
 
-    loadAchievementHitCount(user, achievementTag, field, value, cb) {
+    loadAchievementHitCount(user, achievementTag, field, cb) {
         UserDb.get(
             `SELECT COUNT() AS count
             FROM user_achievement
-            WHERE user_id = ? AND achievement_tag = ? AND match_field = ? AND match_value >= ?;`,
-            [ user.userId, achievementTag, field, value ],
+            WHERE user_id = ? AND achievement_tag = ? AND match_field = ?;`,
+            [ user.userId, achievementTag, field],
             (err, row) => {
                 return cb(err, row && row.count || 0);
             }
         );
     }
 
+    record(info, cb) {
+        StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalCount, 1);
+        StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
+
+        UserDb.run(
+            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match_field, match_value)
+            VALUES (?, ?, ?, ?, ?);`,
+            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField, info.matchValue ],
+            err => {
+                if(err) {
+                    return cb(err);
+                }
+
+                Events.emit(
+                    Events.getSystemEvents().UserAchievementEarned,
+                    {
+                        user            : info.client.user,
+                        achievementTag  : info.achievementTag,
+                        points          : info.details.points,
+                    }
+                );
+
+                return cb(null);
+            }
+        );
+    }
+
+    display(info, cb) {
+        this.createAchievementInterruptItems(info, (err, interruptItems) => {
+            if(err) {
+                return cb(err);
+            }
+
+            if(interruptItems.local) {
+                UserInterruptQueue.queue(interruptItems.local, { clients : info.client } );
+            }
+
+            if(interruptItems.global) {
+                UserInterruptQueue.queue(interruptItems.global, { omit : info.client } );
+            }
+
+            return cb(null);
+        });
+    }
+
     monitorUserStatUpdateEvents() {
         this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
+            if([ UserProps.AchievementTotalCount, UserProps.AchievementTotalPoints ].includes(userStatEvent.statName)) {
+                return;
+            }
+
             const statValue = parseInt(userStatEvent.statValue, 10);
             if(isNaN(statValue)) {
                 return;
             }
 
             const config = Config();
+            //  :TODO: Make this code generic - find + return factory created object
             const achievementTag = _.findKey(
                 _.get(config, 'userAchievements.achievements', {}),
                 achievement => {
                     if(false === achievement.enabled) {
                         return false;
                     }
-                    return 'userStat' === achievement.type &&
+                    return Achievement.Types.UserStat === achievement.type &&
                         achievement.statName === userStatEvent.statName;
                 }
             );
@@ -65,54 +199,60 @@ class Achievements {
                 return;
             }
 
-            const achievement = config.userAchievements.achievements[achievementTag];
-            let matchValue = Object.keys(achievement.match || {}).sort( (a, b) => b - a).find(v => statValue >= v);
-            if(matchValue) {
-                const details = achievement.match[matchValue];
-                matchValue = parseInt(matchValue);
-
-                async.series(
-                    [
-                        (callback) => {
-                            this.loadAchievementHitCount(userStatEvent.user, achievementTag, null, matchValue, (err, count) => {
-                                if(err) {
-                                    return callback(err);
-                                }
-                                return callback(count > 0 ? Errors.General('Achievement already acquired') : null);
-                            });
-                        },
-                        (callback) => {
-                            const client = getConnectionByUserId(userStatEvent.user.userId);
-                            if(!client) {
-                                return callback(Errors.UnexpectedState('Failed to get client for user ID'));
-                            }
-
-                            const info = {
-                                achievement,
-                                details,
-                                client,
-                                value       : matchValue,
-                                user        : userStatEvent.user,
-                                timestamp   : moment(),
-                            };
-
-                            this.createAchievementInterruptItems(info, (err, interruptItems) => {
-                                if(err) {
-                                    return callback(err);
-                                }
-
-                                if(interruptItems.local) {
-                                    UserInterruptQueue.queue(interruptItems.local, { clients : client } );
-                                }
-
-                                if(interruptItems.global) {
-                                    UserInterruptQueue.queue(interruptItems.global, { omit : client } );
-                                }
-                            });
-                        }
-                    ]
-                );
+            const achievement = Achievement.factory(config.userAchievements.achievements[achievementTag]);
+            if(!achievement) {
+                return;
             }
+
+            const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
+            if(!details || _.isUndefined(matchField) || _.isUndefined(matchValue)) {
+                return;
+            }
+
+            async.waterfall(
+                [
+                    (callback) => {
+                        this.loadAchievementHitCount(userStatEvent.user, achievementTag, matchField, (err, count) => {
+                            if(err) {
+                                return callback(err);
+                            }
+                            return callback(count > 0 ? Errors.General('Achievement already acquired', ErrorReasons.TooMany) : null);
+                        });
+                    },
+                    (callback) => {
+                        const client = getConnectionByUserId(userStatEvent.user.userId);
+                        if(!client) {
+                            return callback(Errors.UnexpectedState('Failed to get client for user ID'));
+                        }
+
+                        const info = {
+                            achievementTag,
+                            achievement,
+                            details,
+                            client,
+                            matchField,
+                            matchValue,
+                            user        : userStatEvent.user,
+                            timestamp   : moment(),
+                        };
+
+                        return callback(null, info);
+                    },
+                    (info, callback) => {
+                        this.record(info, err => {
+                            return callback(err, info);
+                        });
+                    },
+                    (info, callback) => {
+                        return this.display(info, callback);
+                    }
+                ],
+                err => {
+                    if(err && ErrorReasons.TooMany !== err.reasonCode) {
+                        Log.warn( { error : err.message, userStatEvent }, 'Error handling achievement for user stat event');
+                    }
+                }
+            );
         });
     }
 
@@ -133,7 +273,8 @@ class Achievements {
             title           : info.details.title,
             text            : info.global ? info.details.globalText : info.details.text,
             points          : info.details.points,
-            value           : info.value,
+            matchField      : info.matchField,
+            matchValue      : info.matchValue,
             timestamp       : moment(info.timestamp).format(dateTimeFormat),
             boardName       : config.general.boardName,
         };
@@ -175,12 +316,12 @@ class Achievements {
             async.waterfall(
                 [
                     (callback) => {
-                        getArt('header', headerArt => {
+                        getArt(`${itemType}Header`, headerArt => {
                             return callback(null, headerArt);
                         });
                     },
                     (headerArt, callback) => {
-                        getArt('footer', footerArt => {
+                        getArt(`${itemType}Footer`, footerArt => {
                             return callback(null, headerArt, footerArt);
                         });
                     },
@@ -191,7 +332,7 @@ class Achievements {
                             pause   : true,
                         };
                         if(headerArt || footerArt) {
-                            interruptItems[itemType].contents = `${headerArt || ''}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
+                            interruptItems[itemType].contents = `${headerArt || ''}\r\n${pipeToAnsi(title)}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
                         }
                         return callback(null);
                     }
diff --git a/core/config.js b/core/config.js
index b73490cc..a74b124c 100644
--- a/core/config.js
+++ b/core/config.js
@@ -1009,8 +1009,10 @@ function getDefaultConfig() {
             enabled : true,
 
             art : {
-                header : 'achievement_header',
-                footer : 'achievement_footer',
+                localHeader     : 'achievement_local_header',
+                localFooter     : 'achievement_local_footer',
+                globalHeader    : 'achievement_global_header',
+                globalFooter    : 'achievement_global_footer',
             },
 
             //  :TODO: achievements should be a path/filename -> achievements.hjson & allow override/theming
@@ -1023,20 +1025,20 @@ function getDefaultConfig() {
                     match : {
                         10 : {
                             title       : 'Return Caller',
-                            globalText  : '{userName} has logged in {value} times!',
-                            text        : 'You\'ve logged in {value} times!',
+                            globalText  : '{userName} has logged in {matchValue} times!',
+                            text        : 'You\'ve logged in {matchValue} times!',
                             points      : 5,
                         },
                         25 : {
                             title       : 'Seems To Like It!',
-                            globalText  : '{userName} has logged in {value} times!',
-                            text        : 'You\'ve logged in {value} times!',
+                            globalText  : '{userName} has logged in {matchValue} times!',
+                            text        : 'You\'ve logged in {matchValue} times!',
                             points      : 10,
                         },
                         100 : {
                             title       : '{boardName} Addict',
-                            globalText  : '{userName} the BBS {boardName} addict has logged in {value} times!',
-                            text        : 'You\'re a {boardName} addict! You\'ve logged in {value} times!',
+                            globalText  : '{userName} the BBS {boardName} addict has logged in {matchValue} times!',
+                            text        : 'You\'re a {boardName} addict! You\'ve logged in {matchValue} times!',
                             points      : 10,
                         }
                     }
diff --git a/core/database.js b/core/database.js
index 4cf2513c..371af1ae 100644
--- a/core/database.js
+++ b/core/database.js
@@ -196,7 +196,7 @@ const DB_INIT_TABLE = {
                 timestamp           DATETIME NOT NULL,
                 match_field         VARCHAR NOT NULL,
                 match_value         VARCHAR NOT NULL,
-                UNIQUE(user_id, achievement_tag, match_field, match_value),
+                UNIQUE(user_id, achievement_tag, match_field),
                 FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
             );`
         );
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 76b34fd5..01b1e285 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -90,7 +90,7 @@ const PREDEFINED_MCI_GENERATORS = {
         return moment(client.user.properties[UserProps.Birthdate]).format(client.currentTheme.helpers.getDateFormat());
     },
     US  : function sex(client) { return userStatAsString(client, UserProps.Sex, ''); },
-    UE  : function emailAddres(client) { return userStatAsString(client, UserProps.EmailAddress, ''); },
+    UE  : function emailAddress(client) { return userStatAsString(client, UserProps.EmailAddress, ''); },
     UW  : function webAddress(client) { return userStatAsString(client, UserProps.WebAddress, ''); },
     UF  : function affils(client) { return userStatAsString(client, UserProps.Affiliations, ''); },
     UT  : function themeName(client) {
@@ -122,7 +122,7 @@ const PREDEFINED_MCI_GENERATORS = {
         return getUserRatio(client, UserProps.FileUlTotalBytes, UserProps.FileDlTotalBytes);
     },
 
-    MS  : function accountCreatedclient(client) {
+    MS  : function accountCreated(client) {
         return moment(client.user.properties[UserProps.AccountCreated]).format(client.currentTheme.helpers.getDateFormat());
     },
     PS  : function userPostCount(client) { return userStatAsString(client, UserProps.MessagePostCount, 0); },
@@ -152,6 +152,9 @@ const PREDEFINED_MCI_GENERATORS = {
     SH  : function termHeight(client) { return client.term.termHeight.toString(); },
     SW  : function termWidth(client) { return client.term.termWidth.toString(); },
 
+    AC  : function achievementCount(client) { return userStatAsString(client, UserProps.AchievementTotalCount, 0); },
+    AP  : function achievementPoints(client) { return userStatAsString(client, UserProps.AchievementTotalPoints, 0); },
+
     //
     //  Date/Time
     //
@@ -166,7 +169,7 @@ const PREDEFINED_MCI_GENERATORS = {
     OS  : function operatingSystem() {
         return {
             linux   : 'Linux',
-            darwin  : 'Mac OS X',
+            darwin  : 'OS X',
             win32   : 'Windows',
             sunos   : 'SunOS',
             freebsd : 'FreeBSD',
diff --git a/core/stat_log.js b/core/stat_log.js
index ffe099ae..8627b6f2 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -359,6 +359,7 @@ class StatLog {
             systemEvents.UserUpload, systemEvents.UserDownload,
             systemEvents.UserPostMessage, systemEvents.UserSendMail,
             systemEvents.UserRunDoor, systemEvents.UserSendNodeMsg,
+            systemEvents.UserAchievementEarned,
         ];
 
         Events.addListenerMultipleEvents(interestedEvents, (eventName, event) => {
diff --git a/core/system_events.js b/core/system_events.js
index 80612195..50a0c464 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -2,24 +2,25 @@
 'use strict';
 
 module.exports = {
-    ClientConnected     : 'codes.l33t.enigma.system.connected',         //  { client, connectionCount }
-    ClientDisconnected  : 'codes.l33t.enigma.system.disconnected',      //  { client, connectionCount }
-    TermDetected        : 'codes.l33t.enigma.system.term_detected',     //  { client }
+    ClientConnected         : 'codes.l33t.enigma.system.connected',         //  { client, connectionCount }
+    ClientDisconnected      : 'codes.l33t.enigma.system.disconnected',      //  { client, connectionCount }
+    TermDetected            : 'codes.l33t.enigma.system.term_detected',     //  { client }
 
-    ThemeChanged        : 'codes.l33t.enigma.system.theme_changed',     //  (theme.hjson): { themeId }
-    ConfigChanged       : 'codes.l33t.enigma.system.config_changed',    //  (config.hjson)
-    MenusChanged        : 'codes.l33t.enigma.system.menus_changed',     //  (menu.hjson)
-    PromptsChanged      : 'codes.l33t.enigma.system.prompts_changed',   //  (prompt.hjson)
+    ThemeChanged            : 'codes.l33t.enigma.system.theme_changed',     //  (theme.hjson): { themeId }
+    ConfigChanged           : 'codes.l33t.enigma.system.config_changed',    //  (config.hjson)
+    MenusChanged            : 'codes.l33t.enigma.system.menus_changed',     //  (menu.hjson)
+    PromptsChanged          : 'codes.l33t.enigma.system.prompts_changed',   //  (prompt.hjson)
 
     //  User - includes { user, ...}
-    NewUser             : 'codes.l33t.enigma.system.user_new',
-    UserLogin           : 'codes.l33t.enigma.system.user_login',
-    UserLogoff          : 'codes.l33t.enigma.system.user_logoff',
-    UserUpload          : 'codes.l33t.enigma.system.user_upload',       //  {..., files[ fileEntry, ...] }
-    UserDownload        : 'codes.l33t.enigma.system.user_download',     //  {..., files[ fileEntry, ...] }
-    UserPostMessage     : 'codes.l33t.enigma.system.user_post_msg',     //  { areaTag }
-    UserSendMail        : 'codes.l33t.enigma.system.user_send_mail',
-    UserRunDoor         : 'codes.l33t.enigma.system.user_run_door',
-    UserSendNodeMsg     : 'codes.l33t.enigma.system.user_send_node_msg',
-    UserStatUpdate      : 'codes.l33t.enigma.system.user_stat_set',     //  { ..., statName, statValue }
+    NewUser                 : 'codes.l33t.enigma.system.user_new',
+    UserLogin               : 'codes.l33t.enigma.system.user_login',
+    UserLogoff              : 'codes.l33t.enigma.system.user_logoff',
+    UserUpload              : 'codes.l33t.enigma.system.user_upload',       //  {..., files[ fileEntry, ...] }
+    UserDownload            : 'codes.l33t.enigma.system.user_download',     //  {..., files[ fileEntry, ...] }
+    UserPostMessage         : 'codes.l33t.enigma.system.user_post_msg',     //  { areaTag }
+    UserSendMail            : 'codes.l33t.enigma.system.user_send_mail',
+    UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',
+    UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',
+    UserStatUpdate          : 'codes.l33t.enigma.system.user_stat_set',     //  { ..., statName, statValue }
+    UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  {..., achievementTag, points }
 };
diff --git a/core/user_property.js b/core/user_property.js
index 7f2bf6c5..dafd7170 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -49,5 +49,8 @@ module.exports = {
     MessageConfTag              : 'message_conf_tag',
     MessageAreaTag              : 'message_area_tag',
     MessagePostCount            : 'post_count',
+
+    AchievementTotalCount       : 'achievement_total_count',
+    AchievementTotalPoints      : 'achievement_total_points',
 };
 
diff --git a/docs/art/mci.md b/docs/art/mci.md
index e365f393..5ec86805 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -16,8 +16,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | Code | Description  |
 |------|--------------|
 | `BN` | Board Name |
-| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.3-alpha" |
-| `VN` | Version *number*, eg.. "0.0.3-alpha" |
+| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.9-alpha" |
+| `VN` | Version *number*, eg.. "0.0.9-alpha" |
 | `SN` | SysOp username |
 | `SR` | SysOp real name |
 | `SL` | SysOp location |
@@ -30,7 +30,7 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `UR` | Current user's real name |
 | `LO` | Current user's location |
 | `UA` | Current user's age |
-| `BD` | Current user's birthdate (using theme date format) |
+| `BD` | Current user's birthday (using theme date format) |
 | `US` | Current user's sex |
 | `UE` | Current user's email address |
 | `UW` | Current user's web address |
@@ -58,6 +58,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `CM` | Current user's active message conference description |
 | `SH` | Current user's term height |
 | `SW` | Current user's term width |
+| `AC` | Current user's total achievements |
+| `AP` | Current user's total achievement points |
 | `DT` | Current date (using theme date format) |
 | `CT` | Current time (using theme time format) |
 | `OS` | System OS (Linux, Windows, etc.) |
@@ -149,7 +151,7 @@ Standard style types available for `textStyle` and `focusTextStyle`:
 | `mixed` | EnIGma BUlLEtIn BoaRd SOfTWarE (randomly assigned) |
 | `l33t` | 3n1gm4 bull371n b04rd 50f7w4r3 |
 
-### Entry Fromatting
+### Entry Formatting
 Various strings can be formatted using a syntax that allows width & precision specifiers, text styling, etc. Depending on the context, various elements can be referenced by `{name}`. Additional text styles can be supplied as well. The syntax is largely modeled after Python's [string format mini language](https://docs.python.org/3/library/string.html#format-specification-mini-language).
 
 ### Additional Text Styles

From 2bd51c07250ac93807c9eccb5cf9b1e05c89b30f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 12:18:44 -0700
Subject: [PATCH 0675/1013] Achievements are now in 'achievements.hjson' +
 Config.general.achievementFile * Implement (re)caching (aka hot-reload) *
 Update values a bit

---
 config/achievements.hjson | 53 ++++++++++++++++++++++
 core/achievement.js       | 94 +++++++++++++++++++++++++++++++--------
 core/config.js            | 42 +----------------
 core/config_util.js       |  1 +
 4 files changed, 130 insertions(+), 60 deletions(-)
 create mode 100644 config/achievements.hjson

diff --git a/config/achievements.hjson b/config/achievements.hjson
new file mode 100644
index 00000000..cb58ddd1
--- /dev/null
+++ b/config/achievements.hjson
@@ -0,0 +1,53 @@
+{
+    enabled : true,
+
+    art : {
+        localHeader     : 'achievement_local_header',
+        localFooter     : 'achievement_local_footer',
+        globalHeader    : 'achievement_global_header',
+        globalFooter    : 'achievement_global_footer',
+    },
+
+    //  :TODO: achievements should be a path/filename -> achievements.hjson & allow override/theming
+
+    achievements : {
+        user_login_count : {
+            type        : 'userStat',
+            statName    : 'login_count',
+            retroactive : true,
+
+            match : {
+                2 : {
+                    title       : 'Return Caller',
+                    globalText  : '{userName} has returned to {boardName}!',
+                    text        : 'You\'ve returned to {boardName}!',
+                    points      : 5,
+                },
+                10 : {
+                    title       : '{achievedValue} Logins',
+                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
+                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
+                    points      : 5,
+                },
+                25 : {
+                    title       : '{achievedValue} Logins',
+                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
+                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
+                    points      : 10,
+                },
+                100 : {
+                    title       : '{boardName} Regular',
+                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
+                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
+                    points      : 10,
+                },
+                500 :  {
+                    title       : '{boardName} Addict',
+                    globalText  : '{userName} the BBS {boardName} addict has logged in {achievedValue} times!',
+                    text        : 'You\'re a {boardName} addict! You\'ve logged in {achievedValue} times!',
+                    points      : 25,
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/achievement.js b/core/achievement.js
index 21cc7ae4..bcd6860f 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -4,6 +4,10 @@
 //  ENiGMA½
 const Events                = require('./events.js');
 const Config                = require('./config.js').get;
+const {
+    getConfigPath,
+    getFullConfig,
+}                           = require('./config_util.js');
 const UserDb                = require('./database.js').dbs.user;
 const {
     getISOTimestampString
@@ -22,11 +26,13 @@ const { pipeToAnsi }        = require('./color_codes.js');
 const stringFormat          = require('./string_format.js');
 const StatLog               = require('./stat_log.js');
 const Log                   = require('./logger.js').log;
+const ConfigCache           = require('./config_cache.js');
 
 //  deps
 const _             = require('lodash');
 const async         = require('async');
 const moment        = require('moment');
+const paths         = require('path');
 
 class Achievement {
     constructor(data) {
@@ -107,11 +113,56 @@ class Achievements {
     }
 
     init(cb) {
+        let achievementConfigPath = _.get(Config(), 'general.achievementFile');
+        if(!achievementConfigPath) {
+            //  :TODO: Log me
+            return cb(null);
+        }
+        achievementConfigPath = getConfigPath(achievementConfigPath);   //  qualify
+
+        //  :TODO: Log enabled        
+
+        const configLoaded = (achievementConfig) => {
+            if(true !== achievementConfig.enabled) {
+                this.stopMonitoringUserStatUpdateEvents();
+                delete this.achievementConfig;
+            } else {
+                this.achievementConfig = achievementConfig;
+                this.monitorUserStatUpdateEvents();
+            }
+        };
+
+        const changed = ( { fileName, fileRoot } ) => {
+            const reCachedPath = paths.join(fileRoot, fileName);
+            if(reCachedPath === achievementConfigPath) {
+                getFullConfig(achievementConfigPath, (err, achievementConfig) => {
+                    if(err) {
+                        return Log.error( { error : err.message }, 'Failed to reload achievement config from cache');
+                    }
+                    configLoaded(achievementConfig);
+                });
+            }
+        };
+
+        ConfigCache.getConfigWithOptions(
+            {
+                filePath        : achievementConfigPath,
+                forceReCache    : true,
+                callback        : changed,
+            },
+            (err, achievementConfig) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                configLoaded(achievementConfig);
+                return cb(null);
+            }
+        );
+
         //  :TODO: if enabled/etc., load achievements.hjson -> if theme achievements.hjson{}, merge @ display time?
         //  merge for local vs global (per theme) clients
-        //  ...only merge/override text
-        this.monitorUserStatUpdateEvents();
-        return cb(null);
+        //  ...only merge/override text        
     }
 
     loadAchievementHitCount(user, achievementTag, field, cb) {
@@ -139,7 +190,7 @@ class Achievements {
                     return cb(err);
                 }
 
-                Events.emit(
+                this.events.emit(
                     Events.getSystemEvents().UserAchievementEarned,
                     {
                         user            : info.client.user,
@@ -172,7 +223,11 @@ class Achievements {
     }
 
     monitorUserStatUpdateEvents() {
-        this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
+        if(this.userStatEventListener) {
+            return; //  already listening
+        }
+
+        this.userStatEventListener = this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
             if([ UserProps.AchievementTotalCount, UserProps.AchievementTotalPoints ].includes(userStatEvent.statName)) {
                 return;
             }
@@ -182,10 +237,9 @@ class Achievements {
                 return;
             }
 
-            const config = Config();
             //  :TODO: Make this code generic - find + return factory created object
             const achievementTag = _.findKey(
-                _.get(config, 'userAchievements.achievements', {}),
+                _.get(this.achievementConfig, 'achievements', {}),
                 achievement => {
                     if(false === achievement.enabled) {
                         return false;
@@ -199,7 +253,7 @@ class Achievements {
                 return;
             }
 
-            const achievement = Achievement.factory(config.userAchievements.achievements[achievementTag]);
+            const achievement = Achievement.factory(this.achievementConfig.achievements[achievementTag]);
             if(!achievement) {
                 return;
             }
@@ -230,10 +284,11 @@ class Achievements {
                             achievement,
                             details,
                             client,
-                            matchField,
-                            matchValue,
-                            user        : userStatEvent.user,
-                            timestamp   : moment(),
+                            matchField,                     //  match - may be in odd format
+                            matchValue,                     //  actual value
+                            achievedValue   : matchField,   //  achievement value met
+                            user            : userStatEvent.user,
+                            timestamp       : moment(),
                         };
 
                         return callback(null, info);
@@ -256,6 +311,13 @@ class Achievements {
         });
     }
 
+    stopMonitoringUserStatUpdateEvents() {
+        if(this.userStatEventListener) {
+            this.events.removeListener(Events.getSystemEvents().UserStatUpdate, this.userStatEventListener);
+            delete this.userStatEventListener;
+        }
+    }
+
     createAchievementInterruptItems(info, cb) {
         const dateTimeFormat =
             info.details.dateTimeFormat ||
@@ -291,7 +353,7 @@ class Achievements {
             const spec =
                 _.get(info.details, `art.${name}`) ||
                 _.get(info.achievement, `art.${name}`) ||
-                _.get(config, `userAchievements.art.${name}`);
+                _.get(this.achievementConfig, `art.${name}`);
             if(!spec) {
                 return callback(null);
             }
@@ -351,12 +413,6 @@ class Achievements {
 let achievements;
 
 exports.moduleInitialize = (initInfo, cb) => {
-
-    if(false === _.get(Config(), 'userAchievements.enabled')) {
-        //  :TODO: Log disabled
-        return cb(null);
-    }
-
     achievements = new Achievements(initInfo.events);
     return achievements.init(cb);
 };
diff --git a/core/config.js b/core/config.js
index a74b124c..fa99d5da 100644
--- a/core/config.js
+++ b/core/config.js
@@ -175,6 +175,7 @@ function getDefaultConfig() {
 
             menuFile        : 'menu.hjson',     //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
             promptFile      : 'prompt.hjson',   //  'oputil.js config new' will set this appropriately in config.hjson; may be full path
+            achievementFile : 'achievements.hjson',
         },
 
         users : {
@@ -1004,46 +1005,5 @@ function getDefaultConfig() {
                 loginHistoryMax: -1, //  set to -1 for forever
             }
         },
-
-        userAchievements : {
-            enabled : true,
-
-            art : {
-                localHeader     : 'achievement_local_header',
-                localFooter     : 'achievement_local_footer',
-                globalHeader    : 'achievement_global_header',
-                globalFooter    : 'achievement_global_footer',
-            },
-
-            //  :TODO: achievements should be a path/filename -> achievements.hjson & allow override/theming
-
-            achievements : {
-                user_login_count : {
-                    type        : 'userStat',
-                    statName    : 'login_count',
-                    retroactive : true,
-                    match : {
-                        10 : {
-                            title       : 'Return Caller',
-                            globalText  : '{userName} has logged in {matchValue} times!',
-                            text        : 'You\'ve logged in {matchValue} times!',
-                            points      : 5,
-                        },
-                        25 : {
-                            title       : 'Seems To Like It!',
-                            globalText  : '{userName} has logged in {matchValue} times!',
-                            text        : 'You\'ve logged in {matchValue} times!',
-                            points      : 10,
-                        },
-                        100 : {
-                            title       : '{boardName} Addict',
-                            globalText  : '{userName} the BBS {boardName} addict has logged in {matchValue} times!',
-                            text        : 'You\'re a {boardName} addict! You\'ve logged in {matchValue} times!',
-                            points      : 10,
-                        }
-                    }
-                }
-            }
-        }
     };
 }
diff --git a/core/config_util.js b/core/config_util.js
index bda0e1bd..d64c7a24 100644
--- a/core/config_util.js
+++ b/core/config_util.js
@@ -10,6 +10,7 @@ const paths             = require('path');
 const async             = require('async');
 
 exports.init            = init;
+exports.getConfigPath   = getConfigPath;
 exports.getFullConfig   = getFullConfig;
 
 function getConfigPath(filePath) {

From 3cc905ea84146fee919dbcbd27a5ec986ede1ef6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 16:55:25 -0700
Subject: [PATCH 0676/1013] Notes on Gopher and NNTP

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 230878ed..a0bde9d0 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,13 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Telnet, **SSH**, and both secure and non-secure [WebSocket](https://en.wikipedia.org/wiki/WebSocket) access built in! Additional servers are easy to implement
  * [CP437](http://www.ascii-codes.com/) and UTF-8 output
  * [SyncTERM](http://syncterm.bbsdev.net/) style font and baud emulation support. Display PC/DOS and Amiga style artwork as it's intended! In general, ANSI-BBS / [cterm.txt](http://cvs.synchro.net/cgi-bin/viewcvs.cgi/*checkout*/src/conio/cterm.txt?content-type=text%2Fplain&revision=HEAD) / [bansi.txt](http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/bansi.txt) are followed for expected BBS behavior.
- * Full [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support
+ * Full [SAUCE](http://www.acid.org/info/sauce/sauce.htm) support.
  * Renegade style [pipe color codes](/docs/configuration/colour-codes.md).
  * [SQLite](http://sqlite.org/) storage of users, message areas, etc.
  * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption.
  * [Door support](docs/modding/door-servers.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging!
- * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export. Messages Bases can also be set to read-only viewable using a built in Gopher server!
+ * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export. Messages Bases can also be exposed via [Gopher](docs/servers/gopher.md), or [NNTP](docs/servers/nntp.md)!
  * [Gazelle](https://github.com/WhatCD/Gazelle) inspired File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, etc.

From f56a72e0c3aa76ccfa3bca2fd0a576f13ea31160 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 16:55:37 -0700
Subject: [PATCH 0677/1013] Start of theming of achievements + default text/SGR
 styles can now be set for quick customization of colors

---
 art/themes/luciano_blocktronics/theme.hjson | 23 ++++++++
 core/achievement.js                         | 59 ++++++++++++---------
 core/theme.js                               |  7 +--
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index b1fe8aec..d38137c8 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -980,5 +980,28 @@
 				}
 			}
 		}
+
+		achievements: {
+			defaults: {
+				titleSGR: "|11"
+				textSGR: "|00|03"
+				globalTextSGR: "|03"
+				boardName: "|10"
+				userName: "|11"
+				achievedValue: "|15"
+			}
+
+			overrides: {
+				user_login_count: {
+					match: {
+						2: {
+							//
+							//	You may override title, text, and globalText here
+							//
+						}
+					}
+				}
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/core/achievement.js b/core/achievement.js
index bcd6860f..cc64779c 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -115,18 +115,18 @@ class Achievements {
     init(cb) {
         let achievementConfigPath = _.get(Config(), 'general.achievementFile');
         if(!achievementConfigPath) {
-            //  :TODO: Log me
+            Log.info('Achievements are not configured');
             return cb(null);
         }
         achievementConfigPath = getConfigPath(achievementConfigPath);   //  qualify
 
-        //  :TODO: Log enabled        
-
         const configLoaded = (achievementConfig) => {
             if(true !== achievementConfig.enabled) {
+                Log.info('Achievements are not enabled');
                 this.stopMonitoringUserStatUpdateEvents();
                 delete this.achievementConfig;
             } else {
+                Log.info('Achievements are enabled');
                 this.achievementConfig = achievementConfig;
                 this.monitorUserStatUpdateEvents();
             }
@@ -318,35 +318,45 @@ class Achievements {
         }
     }
 
+    getFormattedTextFor(info, textType) {
+        const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
+        const defSgr        = themeDefaults[`${textType}SGR`] || '|07';
+
+        const wrap = (fieldName, value) => {
+            return `${themeDefaults[fieldName] || defSgr}${value}${defSgr}`;
+        };
+
+        const formatObj = {
+            userName        : wrap('userName', info.user.username),
+            userRealName    : wrap('userRealName', info.user.properties[UserProps.RealName]),
+            userLocation    : wrap('userLocation', info.user.properties[UserProps.Location]),
+            userAffils      : wrap('userAffils', info.user.properties[UserProps.Affiliations]),
+            nodeId          : wrap('nodeId', info.client.node),
+            title           : wrap('title', info.details.title),
+            text            : wrap('text', info.global ? info.details.globalText : info.details.text),
+            points          : wrap('points', info.details.points),
+            achievedValue   : wrap('achievedValue', info.achievedValue),
+            matchField      : wrap('matchField', info.matchField),
+            matchValue      : wrap('matchValue', info.matchValue),
+            timestamp       : wrap('timestamp', moment(info.timestamp).format(info.dateTimeFormat)),
+            boardName       : wrap('boardName', Config().general.boardName),
+        };
+
+        return stringFormat(`${defSgr}${info.details[textType]}`, formatObj);
+    }
+
     createAchievementInterruptItems(info, cb) {
-        const dateTimeFormat =
+        info.dateTimeFormat =
             info.details.dateTimeFormat ||
             info.achievement.dateTimeFormat ||
             info.client.currentTheme.helpers.getDateTimeFormat();
 
-        const config = Config();
-
-        const formatObj = {
-            userName        : info.user.username,
-            userRealName    : info.user.properties[UserProps.RealName],
-            userLocation    : info.user.properties[UserProps.Location],
-            userAffils      : info.user.properties[UserProps.Affiliations],
-            nodeId          : info.client.node,
-            title           : info.details.title,
-            text            : info.global ? info.details.globalText : info.details.text,
-            points          : info.details.points,
-            matchField      : info.matchField,
-            matchValue      : info.matchValue,
-            timestamp       : moment(info.timestamp).format(dateTimeFormat),
-            boardName       : config.general.boardName,
-        };
-
-        const title = stringFormat(info.details.title, formatObj);
-        const text  = stringFormat(info.details.text, formatObj);
+        const title = this.getFormattedTextFor(info, 'title');
+        const text  = this.getFormattedTextFor(info, 'text');
 
         let globalText;
         if(info.details.globalText) {
-            globalText = stringFormat(info.details.globalText, formatObj);
+            globalText = this.getFormattedTextFor(info, 'globalText');
         }
 
         const getArt = (name, callback) => {
@@ -416,4 +426,3 @@ exports.moduleInitialize = (initInfo, cb) => {
     achievements = new Achievements(initInfo.events);
     return achievements.init(cb);
 };
-
diff --git a/core/theme.js b/core/theme.js
index 6dfee685..9978fde3 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -96,7 +96,7 @@ function loadTheme(themeId, cb) {
         }
 
         if(false === _.get(theme, 'info.enabled')) {
-            return cb(Errors.General('Theme is not enalbed', ErrorReasons.ErrNotEnabled));
+            return cb(Errors.General('Theme is not enabled', ErrorReasons.ErrNotEnabled));
         }
 
         refreshThemeHelpers(theme);
@@ -131,8 +131,9 @@ function getMergedTheme(menuConfig, promptConfig, theme) {
     //
     //  Add in data we won't be altering directly from the theme
     //
-    mergedTheme.info    = theme.info;
-    mergedTheme.helpers = theme.helpers;
+    mergedTheme.info            = theme.info;
+    mergedTheme.helpers         = theme.helpers;
+    mergedTheme.achievements    = _.get(theme, 'customization.achievements');
 
     //
     //  merge customizer to disallow immutable MCI properties

From 43bbc3733cb334a87dc56f383430f95ca1692899 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 17:07:36 -0700
Subject: [PATCH 0678/1013] Tabs -> Spaces

---
 misc/menu_template.in.hjson | 8044 +++++++++++++++++------------------
 1 file changed, 4022 insertions(+), 4022 deletions(-)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 82a3893f..e3b76c21 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1,16 +1,16 @@
 {
-	/*
-		./\/\.' ENiGMA½ Menu Configuration -/--/-------- - --   - 
+    /*
+        ./\/\.' ENiGMA½ Menu Configuration -/--/-------- - --   - 
 
-		_____________________   _____  ____________________    __________\_   /
-		\__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
-		//   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
-		/____       _____|      __________       ___|__|      ____|     \   /  _____  \
-		---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
-		                                                                 /__   _\
-		<*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+        _____________________   _____  ____________________    __________\_   /
+        \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+        //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+        /____       _____|      __________       ___|__|      ____|     \   /  _____  \
+        ---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                         /__   _\
+        <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
 
-		*-----------------------------------------------------------------------------*
+        *-----------------------------------------------------------------------------*
 
         General Information
         ------------------------------- -   -
@@ -47,1713 +47,1713 @@
         FTN     : BBS Discussion on fsxNet
         IRC     : #enigma-bbs / FreeNode
         Email   : bryan@l33t.codes
-	*/
-	menus: {
-		//
-		//	Send telnet connections to matrix where users can login, apply, etc.
-		//
-		telnetConnected: {
-			art: CONNECT
-			next: matrix
-			config: { nextTimeout: 1500 }
-		}
-
-		//
-		//	SSH connections are pre-authenticated via the SSH server itself.
-		//	Jump directly to the login sequence
-		//
-		sshConnected: {
-			art: CONNECT
-			next: fullLoginSequenceLoginArt
-			config: { nextTimeout: 1500 }
-		}
-
-		//
-		//	Another SSH specialization: If the user logs in with a new user
-		//	name (e.g. "new", "apply", ...) they will be directed to the
-		//	application process.
-		//
-		sshConnectedNewUser: {
-			art: CONNECT
-			next: newUserApplicationPreSsh
-			config: { nextTimeout: 1500 }
-		}
-
-		//	Ye ol' standard matrix
-		matrix: {
-			art: matrix
-			form: {
-				0: {
-					VM: {
-						mci: {
-							VM1:  {
-								submit:	true
-								focus:	true
-								argName: navSelect
-								//
-								//	To enable forgot password, you will need to have the web server
-								//	enabled and mail/SMTP configured. Once that is in place, swap out
-								//	the commented lines below as well as in the submit block
-								//
-								items: [
-									{
-										text: login
-										data: login
-									}
-									{
-										text: apply
-										data: apply
-									}
-									{
-										text: forgot pass
-										data: forgot
-									}
-									{
-										text: log off
-										data: logoff
-									}
-								]
-							}
-						}
-						submit: {
-							*: [
-								{
-									value: { navSelect: "login" }
-									action:	@menu:login
-								}
-								{
-									value: { navSelect: "apply" }
-									action: @menu:newUserApplicationPre
-								}
-								{
-									value: { navSelect: "forgot" }
-									action: @menu:forgotPassword
-								}
-								{
-									value: { navSelect: "logoff" }
-									action: @menu:logoff
-								}
-							]
-						}
-					}
-				}
-			}
-		}
-
-		login: {
-			art: USERLOG
-			next: fullLoginSequenceLoginArt
-			config: {
-				tooNodeMenu: loginAttemptTooNode
-				inactive: loginAttemptAccountInactive
-				disabled: loginAttemptAccountDisabled
-				locked: loginAttemptAccountLocked
-			}
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							maxLength: @config:users.usernameMax
-							argName: username
-							focus: true
-						}
-						ET2: {
-							password: true
-							maxLength: @config:users.passwordMax
-							argName: password
-							submit: true
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { password: null }
-								action: @systemMethod:login
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		loginAttemptTooNode: {
-			art: TOONODE
-			config: {
-				cls: true
-				nextTimeout: 2000
-			}
-			next: logoff
-		}
-
-		loginAttemptAccountLocked: {
-			art: ACCOUNTLOCKED
-			config: {
-				cls: true
-				nextTimeout: 2000
-			}
-			next: logoff
-		}
-
-		loginAttemptAccountDisabled: {
-			art: ACCOUNTDISABLED
-			config: {
-				cls: true
-				nextTimeout: 2000
-			}
-			next: logoff
-		}
-
-		loginAttemptAccountInactive: {
-			art: ACCOUNTINACTIVE
-			config: {
-				cls: true
-				nextTimeout: 2000
-			}
-			next: logoff
-		}
-
-		forgotPassword: {
-			desc: Forgot password
-			prompt: forgotPasswordPrompt
-			submit: [
-				{
-					value: { username: null }
-					action: @systemMethod:sendForgotPasswordEmail
-					extraArgs: { next: "forgotPasswordSubmitted" }
-				}
-			]
-		}
-
-		forgotPasswordSubmitted: {
-			desc: Forgot password
-			art: FORGOTPWSENT
-			config: {
-				cls: true
-				pause: true
-			}
-			next: @systemMethod:logoff
-		}
-
-		//	:TODO: Prompt Yes/No for logoff confirm
-		fullLogoffSequence: {
-			desc: Logging Off
-			prompt: logoffConfirmation
-			submit:	[
-				{
-					value: { promptValue: 0 }
-					action: @menu:fullLogoffSequencePreAd
-				}
-				{
-					value: { promptValue: 1 }
-					action: @systemMethod:prevMenu
-				}
-			]
-		}
-
-		fullLogoffSequencePreAd: {
-			art: PRELOGAD
-			desc: Logging Off
-			next: fullLogoffSequenceRandomBoardAd
-			config: {
-				cls: true
-				nextTimeout: 1500
-			}
-		}
-
-		fullLogoffSequenceRandomBoardAd: {
-			art: OTHRBBS
-			desc: Logging Off
-			next: logoff
-			config: {
-				baudRate: 57600
-				pause: true
-				cls: true
-			}
-		}
-
-		logoff: {
-			art: LOGOFF
-			desc: Logging Off
-			next: @systemMethod:logoff
-		}
-
-		//	A quick preamble - defaults to warning about broken terminals
-		newUserApplicationPre: {
-			art: NEWUSER1
-			next: newUserApplication
-			desc: Applying
-			config: {
-				pause: true
-				cls: true
-				menuFlags: [ "noHistory" ]
-			}
-		}
-
-		newUserApplication: {
-			module: nua
-			art: NUA
-			next: [
-				{
-					//	Initial SysOp does not send feedback to themselves
-					acs: ID1
-					next: fullLoginSequenceLoginArt
-				}
-				{
-					//	...everyone else does
-					next: newUserFeedbackToSysOpPreamble
-				}
-			]
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							focus: true
-							argName: username
-							maxLength: @config:users.usernameMax
-							validate: @systemMethod:validateUserNameAvail
-						}
-						ET2: {
-							argName: realName
-							maxLength: @config:users.realNameMax
-							validate: @systemMethod:validateNonEmpty
-						}
-						MET3: {
-							argName: birthdate
-							maskPattern: "####/##/##"
-							validate: @systemMethod:validateBirthdate
-						}
-						ME4: {
-							argName: sex
-							maskPattern: A
-							textStyle: upper
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET5: {
-							argName: location
-							maxLength: @config:users.locationMax
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET6: {
-							argName: affils
-							maxLength: @config:users.affilsMax
-						}
-						ET7: {
-							argName: email
-							maxLength: @config:users.emailMax
-							validate: @systemMethod:validateEmailAvail
-						}
-						ET8: {
-							argName: web
-							maxLength: @config:users.webMax
-						}
-						ET9: {
-							argName: password
-							password: true
-							maxLength: @config:users.passwordMax
-							validate: @systemMethod:validatePasswordSpec
-						}
-						ET10: {
-							argName: passwordConfirm
-							password: true
-							maxLength: @config:users.passwordMax
-							validate: @method:validatePassConfirmMatch
-						}
-						TM12: {
-							argName: submission
-							items: [ "apply", "cancel" ]
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { "submission" : 0 }
-								action: @method:submitApplication
-								extraArgs: {
-									inactive: userNeedsActivated
-									error: newUserCreateError
-								}
-							}
-							{
-								value: { "submission" : 1 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		//	A quick preamble - defaults to warning about broken terminals (SSH version)
-		newUserApplicationPreSsh: {
-			art: NEWUSER1
-			next: newUserApplicationSsh
-			desc: Applying
-			config: {
-				pause: true
-				cls: true
-				menuFlags: [ "noHistory" ]
-			}
-		}
-
-		//
-		//	SSH specialization of NUA
-		//	Canceling this form logs off vs falling back to matrix
-		//
-		newUserApplicationSsh: {
-			module: nua
-			art: NUA
-			fallback: logoff
-			next: newUserFeedbackToSysOpPreamble
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							focus: true
-							argName: username
-							maxLength: @config:users.usernameMax
-							validate: @systemMethod:validateUserNameAvail
-						}
-						ET2: {
-							argName: realName
-							maxLength: @config:users.realNameMax
-							validate: @systemMethod:validateNonEmpty
-						}
-						MET3: {
-							argName: birthdate
-							maskPattern: "####/##/##"
-							validate: @systemMethod:validateBirthdate
-						}
-						ME4: {
-							argName: sex
-							maskPattern: A
-							textStyle: upper
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET5: {
-							argName: location
-							maxLength: @config:users.locationMax
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET6: {
-							argName: affils
-							maxLength: @config:users.affilsMax
-						}
-						ET7: {
-							argName: email
-							maxLength: @config:users.emailMax
-							validate: @systemMethod:validateEmailAvail
-						}
-						ET8: {
-							argName: web
-							maxLength: @config:users.webMax
-						}
-						ET9: {
-							argName: password
-							password: true
-							maxLength: @config:users.passwordMax
-							validate: @systemMethod:validatePasswordSpec
-						}
-						ET10: {
-							argName: passwordConfirm
-							password: true
-							maxLength: @config:users.passwordMax
-							validate: @method:validatePassConfirmMatch
-						}
-						TM12: {
-							argName: submission
-							items: [ "apply", "cancel" ]
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { "submission" : 0 }
-								action: @method:submitApplication
-								extraArgs: {
-									inactive: userNeedsActivated
-									error: newUserCreateError
-								}
-							}
-							{
-								value: { "submission" : 1 }
-								action: @systemMethod:logoff
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:logoff
-						}
-					]
-				}
-			}
-		}
-
-		newUserFeedbackToSysOpPreamble: {
-			art: LETTER
-			config: { pause: true }
-			next: newUserFeedbackToSysOp
-		}
-
-		newUserFeedbackToSysOp: {
-			desc: Feedback to SysOp
-			module: msg_area_post_fse
-			next: [
-				{
-					acs: AS2
-					next: fullLoginSequenceLoginArt
-				}
-				{
-					next: newUserInactiveDone
-				}
-			]
-			config: {
-				art: {
-					header:				MSGEHDR
-					body:				MSGBODY
-					footerEditor:		MSGEFTR
-					footerEditorMenu:	MSGEMFT
-					help:				MSGEHLP
-				},
-				editorMode: edit
-				editorType: email
-				messageAreaTag: private_mail
-				toUserId: 1 /* always to +op */
-			}
-			form: {
-				0: {
-					mci: {
-						TL1: {
-							argName: from
-						}
-						ET2: {
-							argName: to
-							focus: true
-							text: @sysStat:sysop_username
-							//	:TODO: readOnly: true
-						}
-						ET3: {
-							argName: subject
-							maxLength: 72
-							submit: true
-							text: New user feedback
-							validate: @systemMethod:validateMessageSubject
-						}
-					}
-					submit: {
-						3: [
-							{
-								value: { subject: null }
-								action: @method:headerSubmit
-							}
-						]
-					}
-				}
-				1: {
-					mci: {
-						MT1: {
-							width: 79
-							argName: message
-							mode: edit
-						}
-					}
-
-					submit: {
-						*: [ { value: "message", action: "@method:editModeEscPressed" } ]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							viewId: 1
-						}
-					]
-				},
-				2: {
-					TLTL:  {
-						mci: {
-							TL1: {
-								width: 5
-							}
-							TL2: {
-								width: 4
-							}
-						}
-					}
-				}
-				3: {
-					HM: {
-						mci: {
-							HM1: {
-								//	:TODO: clear
-								items: [ "save", "help" ]
-							}
-						}
-						submit: {
-							*: [
-								{
-									value: { 1: 0 }
-									action: @method:editModeMenuSave
-								}
-								{
-									value: { 1: 1 }
-									action: @method:editModeMenuHelp
-								}
-							]
-						}
-						actionKeys: [
-							{
-								keys: [ "escape" ]
-								action: @method:editModeEscPressed
-							}
-							{
-								keys: [ "?" ]
-								action: @method:editModeMenuHelp
-							}
-						]
-					}
-				}
-			}
-		}
-
-		newUserInactiveDone: {
-			desc: Finished with NUA
-			art: DONE
-			config: { pause: true }
-			next: @menu:logoff
-		}
-
-		fullLoginSequenceLoginArt: {
-			desc: Logging In
-			art: WELCOME
-			config: { pause: true }
-			next: fullLoginSequenceLastCallers
-		}
-
-		fullLoginSequenceLastCallers: {
-			desc: Last Callers
-			module: last_callers
-			art: LASTCALL
-			config: {
-				pause: true
-				font: cp437
-			}
-			next: fullLoginSequenceWhosOnline
-		}
-		fullLoginSequenceWhosOnline: {
-			desc: Who's Online
-			module: whos_online
-			art: WHOSON
-			config: { pause: true }
-			next: fullLoginSequenceOnelinerz
-		}
-
-		fullLoginSequenceOnelinerz: {
-			desc: Viewing Onelinerz
-			module: onelinerz
-			next: [
-				{
-					//	calls >= 2
-					acs: NC2
-					next: fullLoginSequenceNewScanConfirm
-				}
-				{
-					// new users - skip new scan
-					next: fullLoginSequenceUserStats
-				}
-			]
-			config: {
-				cls: true
-				art: {
-					view: ONELINER
-					add: ONEADD
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: false
-							height: 10
-						}
-						TM2: {
-							argName: addOrExit
-							items: [ "yeah!", "nah" ]
-							"hotKeys"	: { "Y" : 0, "N" : 1, "Q" : 1 }
-							submit: true
-							focus: true
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { addOrExit: 0 }
-								action: @method:viewAddScreen
-							}
-							{
-								value: { addOrExit: null }
-								action: @systemMethod:nextMenu
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:nextMenu
-						}
-					]
-				},
-				1: {
-					mci: {
-						ET1: {
-							focus: true
-							maxLength: 70
-							argName: oneliner
-						}
-						TL2: {
-							width: 60
-						}
-						TM3: {
-							argName: addOrCancel
-							items: [ "add", "cancel" ]
-							"hotKeys"	: { "A" : 0, "C" : 1, "Q" : 1 }
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { addOrCancel: 0 }
-								action: @method:addEntry
-							}
-							{
-								value: { addOrCancel: 1 }
-								action: @method:cancelAdd
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:cancelAdd
-						}
-					]
-				}
-			}
-		}	
-
-		fullLoginSequenceNewScanConfirm: {
-			desc: Logging In
-			prompt: loginGlobalNewScan
-			submit: [
-				{
-					value: { promptValue: 0 }
-					action: @menu:fullLoginSequenceNewScan
-				}
-				{
-					value: { promptValue: 1 }
-					action: @menu:fullLoginSequenceUserStats
-				}
-			]
-		}
-
-		fullLoginSequenceNewScan: {
-			desc: Performing New Scan
-			module: new_scan
-			art: NEWSCAN
-			next: fullLoginSequenceSysStats
-			config: {
-				messageListMenu: newScanMessageList
-			}
-		}
-
-		fullLoginSequenceSysStats: {
-			desc: System Stats
-			art: SYSSTAT
-			config: { pause: true }
-			next: fullLoginSequenceUserStats
-		}
-		fullLoginSequenceUserStats: {
-			desc: User Stats
-			art: STATUS
-			config: { pause: true }
-			next: mainMenu
-		}
-
-		newScanMessageList: {
-			desc: New Messages
-			module: msg_list
-			art: NEWMSGS
-			config: {
-				menuViewPost: messageAreaViewPost
-			}
-			form: {
-				0: {
-					mci:  {
-						VM1: {
-							focus: true
-							submit: true
-							argName: message
-						}
-						TL6: {
-							//	theme me!
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { message: null }
-								action: @method:selectMessage
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "x", "shift + x" ]
-							action: @method:fullExit
-						}
-						{
-							keys: [ "m", "shift + m" ]
-							action: @method:markAllRead
-						}
-					]
-				}
-			}
-		}
-
-		newScanFileBaseList: {
-			module: file_area_list
-			desc: New Files
-			config: {
-				art: {
-					browse: FNEWBRWSE
-					details: FDETAIL
-					detailsGeneral: FDETGEN
-					detailsNfo: FDETNFO
-					detailsFileList: FDETLST
-					help: FBHELP
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						MT1: {
-							mode: preview
-							ansiView: true
-						}
-
-						HM2: {
-							focus: true
-							submit: true
-							argName: navSelect							
-							items: [
-								"prev", "next", "details", "toggle queue", "rate", "help", "quit"
-							]
-							focusItemIndex: 1
-						}
-					}
-					
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:prevFile
-							}
-							{
-								value: { navSelect: 1 }
-								action: @method:nextFile
-							}
-							{
-								value: { navSelect: 2 }
-								action: @method:viewDetails
-							}
-							{
-								value: { navSelect: 3 }
-								action: @method:toggleQueue
-							}
-							{
-								value: { navSelect: 4 }
-								action: @menu:fileBaseGetRatingForSelectedEntry
-							}							
-							{
-								value: { navSelect: 5 }
-								action: @method:displayHelp
-							}
-							{
-								value: { navSelect: 6 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "w", "shift + w" ]
-							action: @method:showWebDownloadLink
-						}
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "t", "shift + t" ]
-							action: @method:toggleQueue
-						}
-						{
-							keys: [ "v", "shift + v" ]
-							action: @method:viewDetails
-						}
-						{
-							keys: [ "r", "shift + r" ]
-							action: @menu:fileBaseGetRatingForSelectedEntry
-						}
-						{
-							keys: [ "?" ]
-							action: @method:displayHelp
-						}
-					]
-				}
-
-				1: {
-					mci: {
-						HM1: {
-							focus: true
-							submit: true
-							argName: navSelect
-							items: [
-								"general", "nfo/readme", "file listing"
-							]
-						}
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @method:detailsQuit
-						}
-					]
-				}
-
-				2: {
-					//	details - general
-					mci: {}					
-				}
-
-				3: {
-					//	details - nfo/readme
-					mci: {
-						MT1: {
-							mode: preview
-						}
-					}
-				}
-
-				4: {
-					//	details - file listing
-					mci: {
-						VM1: {
-
-						}
-					}
-				}
-			}
-		}
-
-		///////////////////////////////////////////////////////////////////////
-		//	Main Menu
-		///////////////////////////////////////////////////////////////////////
-		mainMenu: {
-			art: MMENU
-			desc: Main Menu
-			prompt: menuCommand
-			config: {
-				font: cp437
-				interrupt: realtime
-			}
-			submit: [
-				{
-					value: { command: "MSG" }
-					action: @menu:nodeMessage
-				}
-				{
-					value: { command: "G" }
-					action: @menu:fullLogoffSequence
-				}
-				{
-					value: { command: "D" }
-					action: @menu:doorMenu
-				}
-				{
-					value: { command: "F" }
-					action: @menu:fileBase
-				}
-				{
-					value: { command: "U" }
-					action: @menu:mainMenuUserList
-				}
-				{
-					value: { command: "L" }
-					action: @menu:mainMenuLastCallers
-				}
-				{
-					value: { command: "W" }
-					action: @menu:mainMenuWhosOnline
-				}
-				{
-					value: { command: "Y" }
-					action: @menu:mainMenuUserStats
-				}
-				{
-					value: { command: "M" }
-					action: @menu:messageArea
-				}
-				{
-					value: { command: "E" }
-					action: @menu:mailMenu
-				}
-				{
-					value: { command: "C" }
-					action: @menu:mainMenuUserConfig
-				}
-				{
-					value: { command: "S" }
-					action: @menu:mainMenuSystemStats
-				}
-				{
-					value: { command: "!" }
-					action: @menu:mainMenuGlobalNewScan
-				}
-				{
-					value: { command: "K" }
-					action: @menu:mainMenuFeedbackToSysOp
-				}
-				{
-					value: { command: "O" }
-					action: @menu:mainMenuOnelinerz
-				}
-				{
-					value: { command: "R" }
-					action: @menu:mainMenuRumorz
-				}
-				{
-					value: { command: "BBS"}
-					action: @menu:bbsList
-				}
-				{
-					value: 1
-					action: @menu:mainMenu
-				}
-			]
-		}
-
-		nodeMessage: {
-			desc: Node Messaging
-			module: node_msg
-			art: NODEMSG
-			config: {
-				cls: true
-				art: {
-					header: NODEMSGHDR
-					footer: NODEMSGFTR
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						SM1: {
-							argName: node
-						}
-						ET2: {
-							argName: message
-							submit: true
-						}
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-					submit: {
-						*: [
-							{
-								value: { message: null }
-								action: @method:sendMessage
-							}
-						]
-					}
-				}
-			}
-		}
-
-		mainMenuLastCallers: {
-			desc: Last Callers
-			module: last_callers
-			art: LASTCALL
-			config: { pause: true }
-		}
-
-		mainMenuWhosOnline: {
-			desc: Who's Online
-			module: whos_online
-			art: WHOSON
-			config: { pause: true }
-		}
-
-		mainMenuUserStats: {
-			desc: User Stats
-			art: STATUS
-			config: { pause: true }
-		}
-
-		mainMenuSystemStats: {
-			desc: System Stats
-			art: SYSSTAT
-			config: { pause: true }
-		}
-
-		mainMenuUserList: {
-			desc: User Listing
-			module: user_list
-			art: USERLST
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: true
-							submit: true
-						}
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		mainMenuUserConfig: {
-			module: user_config
-			art: CONFSCR
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							argName: realName
-							maxLength: @config:users.realNameMax
-							validate: @systemMethod:validateNonEmpty
-							focus: true
-						}
-						ME2: {
-							argName: birthdate
-							maskPattern: "####/##/##"
-						}
-						ME3: {
-							argName: sex
-							maskPattern: A
-							textStyle: upper
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET4: {
-							argName: location
-							maxLength: @config:users.locationMax
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET5: {
-							argName: affils
-							maxLength: @config:users.affilsMax
-						}
-						ET6: {
-							argName: email
-							maxLength: @config:users.emailMax
-							validate: @method:validateEmailAvail
-						}
-						ET7: {
-							argName: web
-							maxLength: @config:users.webMax
-						}
-						ME8: {
-							maskPattern: "##"
-							argName: termHeight
-							validate: @systemMethod:validateNonEmpty
-						}
-						SM9: {
-							argName: theme
-						}
-						ET10: {
-							argName: password
-							maxLength: @config:users.passwordMax
-							password: true
-							validate: @method:validatePassword
-						}
-						ET11: {
-							argName: passwordConfirm
-							maxLength: @config:users.passwordMax
-							password: true
-							validate: @method:validatePassConfirmMatch
-						}
-						TM25: {
-							argName: submission
-							items: [ "save", "cancel" ]
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { submission: 0 }
-								action: @method:saveChanges
-							}
-							{
-								value: { submission: 1 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		mainMenuGlobalNewScan: {
-			desc: Performing New Scan
-			module: new_scan
-			art: NEWSCAN
-			config: {
-				messageListMenu: newScanMessageList
-			}
-		}
-
-		mainMenuFeedbackToSysOp: {
-			desc: Feedback to SysOp
-			module: msg_area_post_fse
-			config: {
-				art: {
-					header:				MSGEHDR
-					body:				MSGBODY
-					footerEditor:		MSGEFTR
-					footerEditorMenu:	MSGEMFT
-					help:				MSGEHLP
-				},
-				editorMode: edit
-				editorType: email
-				messageAreaTag: private_mail
-				toUserId: 1 /* always to +op */
-			}
-			form: {
-				0: {
-					mci: {
-						TL1: {
-							argName: 	from
-						}
-						ET2: {
-							argName: to
-							focus: true
-							text: @sysStat:sysop_username
-							//	:TODO: readOnly: true
-						}
-						ET3: {
-							argName: subject
-							maxLength: 72
-							submit: true
-							validate: @systemMethod:validateMessageSubject
-						}
-					}
-					submit: {
-						3: [
-							{
-								value: { subject: null }
-								action: @method:headerSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-				1: {
-					mci: {
-						MT1: {
-							width: 79
-							argName: message
-							mode: edit
-						}
-					}
-
-					submit: {
-						*: [ { value: "message", action: "@method:editModeEscPressed" } ]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							viewId: 1
-						}
-					]
-				},
-				2: {
-					TLTL:  {
-						mci: {
-							TL1: {
-								width: 5
-							}
-							TL2: {
-								width: 4
-							}
-						}
-					}
-				}
-				3: {
-					HM: {
-						mci: {
-							HM1: {
-								//	:TODO: clear
-								items: [ "save", "discard", "help" ]
-							}
-						}
-						submit: {
-							*: [
-								{
-									value: { 1: 0 }
-									action: @method:editModeMenuSave
-								}
-								{
-									value: { 1: 1 }
-									action: @systemMethod:prevMenu
-								}
-								{
-									value: { 1: 2 }
-									action: @method:editModeMenuHelp
-								}
-							]
-						}
-						actionKeys: [
-							{
-								keys: [ "escape" ]
-								action: @method:editModeEscPressed
-							}
-							{
-								keys: [ "?" ]
-								action: @method:editModeMenuHelp
-							}
-						]
-					}
-				}
-			}
-		}
-
-		mainMenuOnelinerz: {
-			desc: Viewing Onelinerz
-			module: onelinerz
-			config: {
-				cls: true
-				art: {
-					view: ONELINER
-					add: ONEADD
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: false
-							height: 10
-						}
-						TM2: {
-							argName: addOrExit
-							items: [ "yeah!", "nah" ]
-							"hotKeys"	: { "Y" : 0, "N" : 1, "Q" : 1 }
-							submit: true
-							focus: true
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { addOrExit: 0 }
-								action: @method:viewAddScreen
-							}
-							{
-								value: { addOrExit: null }
-								action: @systemMethod:nextMenu
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:nextMenu
-						}
-					]
-				},
-				1: {
-					mci: {
-						ET1: {
-							focus: true
-							maxLength: 70
-							argName: oneliner
-						}
-						TL2: {
-							width: 60
-						}
-						TM3: {
-							argName: addOrCancel
-							items: [ "add", "cancel" ]
-							"hotKeys"	: { "A" : 0, "C" : 1, "Q" : 1 }
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { addOrCancel: 0 }
-								action: @method:addEntry
-							}
-							{
-								value: { addOrCancel: 1 }
-								action: @method:cancelAdd
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:cancelAdd
-						}
-					]
-				}
-			}
-		}
-
-		mainMenuRumorz: {
-			desc: Rumorz
-			module: rumorz
-			config: {
-				cls: true
-				art: {
-					entries: RUMORS
-					add: RUMORADD
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: false
-							height: 10
-						}
-						TM2: {
-							argName: addOrExit
-							items: [ "yeah!", "nah" ]
-							"hotKeys"	: { "Y" : 0, "N" : 1, "Q" : 1 }
-							submit: true
-							focus: true
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { addOrExit: 0 }
-								action: @method:viewAddScreen
-							}
-							{
-								value: { addOrExit: null }
-								action: @systemMethod:nextMenu
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:nextMenu
-						}
-					]
-				},
-				1: {
-					mci: {
-						ET1: {
-							focus: true
-							maxLength: 70
-							argName: rumor
-						}
-						TL2: {
-							width: 60
-						}
-						TM3: {
-							argName: addOrCancel
-							items: [ "add", "cancel" ]
-							"hotKeys"	: { "A" : 0, "C" : 1, "Q" : 1 }
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { addOrCancel: 0 }
-								action: @method:addEntry
-							}
-							{
-								value: { addOrCancel: 1 }
-								action: @method:cancelAdd
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:cancelAdd
-						}
-					]
-				}
-			}
-		}
-
-		bbsList: {
-			desc: Viewing BBS List
-			module: bbs_list
-			config: {
-				cls: true
-				art: {
-					entries: BBSLIST
-					add: BBSADD
-				}
-			}
-
-			form: {
-				0: {
-					mci: {
-						VM1: { maxLength: 32 }
-						TL2: { maxLength: 32 }
-						TL3: { maxLength: 32 }
-						TL4: { maxLength: 32 }
-						TL5: { maxLength: 32 }
-						TL6: { maxLength: 32 }
-						TL7: { maxLength: 32 }
-						TL8: { maxLength: 32 }
-						TL9: { maxLength: 32 }
-					}
-					actionKeys: [
-						{
-							keys: [ "a" ]
-							action: @method:addBBS
-						}
-						{
-							//	:TODO: add delete key
-							keys: [ "d" ]
-							action: @method:deleteBBS
-						}
-						{
-							keys: [ "q", "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-				1: {
-					mci: {
-						ET1: {
-							argName: name
-							maxLength: 32
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET2: {
-							argName: sysop
-							maxLength: 32
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET3: {
-							argName: telnet
-							maxLength: 32
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET4: {
-							argName: www
-							maxLength: 32
-						}
-						ET5: {
-							argName: location
-							maxLength: 32
-						}
-						ET6: {
-							argName: software
-							maxLength: 32
-						}
-						ET7:  {
-							argName: notes
-							maxLength: 32
-						}
-						TM17: {
-							argName: submission
-							items: [ "save", "cancel" ]
-							submit: true
-						}
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:cancelSubmit
-						}
-					]
-
-					submit: {
-						*: [
-							{
-								value: { "submission" : 0 }
-								action: @method:submitBBS
-							}
-							{
-								value: { "submission" : 1 }
-								action: @method:cancelSubmit
-							}
-						]
-					}
-				}
-			}
-		}
-
-		///////////////////////////////////////////////////////////////////////
-		//	Doors Menu
-		///////////////////////////////////////////////////////////////////////
-		doorMenu: {
-			desc: Doors Menu
-			art: DOORMNU
-			prompt: menuCommand
-			config: {
-				interrupt: realtime
-			}
-			submit: [
-				{
-					value: { command: "G" }
-					action: @menu:logoff
-				}
-				{
-					value: { command: "Q" }
-					action: @systemMethod:prevMenu
-				}
-				//
-				//	The system supports many ways of launching doors including
-				//	modules for DoorParty!, BBSLink, etc.
-				//
-				//	Below are some examples. See the documentation for more info.
-				//
-				{
-					value: { command: "ABRACADABRA" }
-					action: @menu:doorAbracadabraExample
-				}
-				{
-					value: { command: "TWBBSLINK" }
-					action: @menu:doorTradeWars2002BBSLinkExample
-				}
-				{
-					value: { command: "DP" }
-					action: @menu:doorPartyExample
-				}
-				{
+    */
+    menus: {
+        //
+        //  Send telnet connections to matrix where users can login, apply, etc.
+        //
+        telnetConnected: {
+            art: CONNECT
+            next: matrix
+            config: { nextTimeout: 1500 }
+        }
+
+        //
+        //  SSH connections are pre-authenticated via the SSH server itself.
+        //  Jump directly to the login sequence
+        //
+        sshConnected: {
+            art: CONNECT
+            next: fullLoginSequenceLoginArt
+            config: { nextTimeout: 1500 }
+        }
+
+        //
+        //  Another SSH specialization: If the user logs in with a new user
+        //  name (e.g. "new", "apply", ...) they will be directed to the
+        //  application process.
+        //
+        sshConnectedNewUser: {
+            art: CONNECT
+            next: newUserApplicationPreSsh
+            config: { nextTimeout: 1500 }
+        }
+
+        //  Ye ol' standard matrix
+        matrix: {
+            art: matrix
+            form: {
+                0: {
+                    VM: {
+                        mci: {
+                            VM1:  {
+                                submit: true
+                                focus:  true
+                                argName: navSelect
+                                //
+                                //  To enable forgot password, you will need to have the web server
+                                //  enabled and mail/SMTP configured. Once that is in place, swap out
+                                //  the commented lines below as well as in the submit block
+                                //
+                                items: [
+                                    {
+                                        text: login
+                                        data: login
+                                    }
+                                    {
+                                        text: apply
+                                        data: apply
+                                    }
+                                    {
+                                        text: forgot pass
+                                        data: forgot
+                                    }
+                                    {
+                                        text: log off
+                                        data: logoff
+                                    }
+                                ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { navSelect: "login" }
+                                    action: @menu:login
+                                }
+                                {
+                                    value: { navSelect: "apply" }
+                                    action: @menu:newUserApplicationPre
+                                }
+                                {
+                                    value: { navSelect: "forgot" }
+                                    action: @menu:forgotPassword
+                                }
+                                {
+                                    value: { navSelect: "logoff" }
+                                    action: @menu:logoff
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+
+        login: {
+            art: USERLOG
+            next: fullLoginSequenceLoginArt
+            config: {
+                tooNodeMenu: loginAttemptTooNode
+                inactive: loginAttemptAccountInactive
+                disabled: loginAttemptAccountDisabled
+                locked: loginAttemptAccountLocked
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            maxLength: @config:users.usernameMax
+                            argName: username
+                            focus: true
+                        }
+                        ET2: {
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            argName: password
+                            submit: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { password: null }
+                                action: @systemMethod:login
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        loginAttemptTooNode: {
+            art: TOONODE
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountLocked: {
+            art: ACCOUNTLOCKED
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountDisabled: {
+            art: ACCOUNTDISABLED
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountInactive: {
+            art: ACCOUNTINACTIVE
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        forgotPassword: {
+            desc: Forgot password
+            prompt: forgotPasswordPrompt
+            submit: [
+                {
+                    value: { username: null }
+                    action: @systemMethod:sendForgotPasswordEmail
+                    extraArgs: { next: "forgotPasswordSubmitted" }
+                }
+            ]
+        }
+
+        forgotPasswordSubmitted: {
+            desc: Forgot password
+            art: FORGOTPWSENT
+            config: {
+                cls: true
+                pause: true
+            }
+            next: @systemMethod:logoff
+        }
+
+        //  :TODO: Prompt Yes/No for logoff confirm
+        fullLogoffSequence: {
+            desc: Logging Off
+            prompt: logoffConfirmation
+            submit: [
+                {
+                    value: { promptValue: 0 }
+                    action: @menu:fullLogoffSequencePreAd
+                }
+                {
+                    value: { promptValue: 1 }
+                    action: @systemMethod:prevMenu
+                }
+            ]
+        }
+
+        fullLogoffSequencePreAd: {
+            art: PRELOGAD
+            desc: Logging Off
+            next: fullLogoffSequenceRandomBoardAd
+            config: {
+                cls: true
+                nextTimeout: 1500
+            }
+        }
+
+        fullLogoffSequenceRandomBoardAd: {
+            art: OTHRBBS
+            desc: Logging Off
+            next: logoff
+            config: {
+                baudRate: 57600
+                pause: true
+                cls: true
+            }
+        }
+
+        logoff: {
+            art: LOGOFF
+            desc: Logging Off
+            next: @systemMethod:logoff
+        }
+
+        //  A quick preamble - defaults to warning about broken terminals
+        newUserApplicationPre: {
+            art: NEWUSER1
+            next: newUserApplication
+            desc: Applying
+            config: {
+                pause: true
+                cls: true
+                menuFlags: [ "noHistory" ]
+            }
+        }
+
+        newUserApplication: {
+            module: nua
+            art: NUA
+            next: [
+                {
+                    //  Initial SysOp does not send feedback to themselves
+                    acs: ID1
+                    next: fullLoginSequenceLoginArt
+                }
+                {
+                    //  ...everyone else does
+                    next: newUserFeedbackToSysOpPreamble
+                }
+            ]
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: username
+                            maxLength: @config:users.usernameMax
+                            validate: @systemMethod:validateUserNameAvail
+                        }
+                        ET2: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        MET3: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                            validate: @systemMethod:validateBirthdate
+                        }
+                        ME4: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET6: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET7: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @systemMethod:validateEmailAvail
+                        }
+                        ET8: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ET9: {
+                            argName: password
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @systemMethod:validatePasswordSpec
+                        }
+                        ET10: {
+                            argName: passwordConfirm
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM12: {
+                            argName: submission
+                            items: [ "apply", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitApplication
+                                extraArgs: {
+                                    inactive: userNeedsActivated
+                                    error: newUserCreateError
+                                }
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        //  A quick preamble - defaults to warning about broken terminals (SSH version)
+        newUserApplicationPreSsh: {
+            art: NEWUSER1
+            next: newUserApplicationSsh
+            desc: Applying
+            config: {
+                pause: true
+                cls: true
+                menuFlags: [ "noHistory" ]
+            }
+        }
+
+        //
+        //  SSH specialization of NUA
+        //  Canceling this form logs off vs falling back to matrix
+        //
+        newUserApplicationSsh: {
+            module: nua
+            art: NUA
+            fallback: logoff
+            next: newUserFeedbackToSysOpPreamble
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: username
+                            maxLength: @config:users.usernameMax
+                            validate: @systemMethod:validateUserNameAvail
+                        }
+                        ET2: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        MET3: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                            validate: @systemMethod:validateBirthdate
+                        }
+                        ME4: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET6: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET7: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @systemMethod:validateEmailAvail
+                        }
+                        ET8: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ET9: {
+                            argName: password
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @systemMethod:validatePasswordSpec
+                        }
+                        ET10: {
+                            argName: passwordConfirm
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM12: {
+                            argName: submission
+                            items: [ "apply", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitApplication
+                                extraArgs: {
+                                    inactive: userNeedsActivated
+                                    error: newUserCreateError
+                                }
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @systemMethod:logoff
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:logoff
+                        }
+                    ]
+                }
+            }
+        }
+
+        newUserFeedbackToSysOpPreamble: {
+            art: LETTER
+            config: { pause: true }
+            next: newUserFeedbackToSysOp
+        }
+
+        newUserFeedbackToSysOp: {
+            desc: Feedback to SysOp
+            module: msg_area_post_fse
+            next: [
+                {
+                    acs: AS2
+                    next: fullLoginSequenceLoginArt
+                }
+                {
+                    next: newUserInactiveDone
+                }
+            ]
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+                toUserId: 1 /* always to +op */
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: @sysStat:sysop_username
+                            //  :TODO: readOnly: true
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            text: New user feedback
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        newUserInactiveDone: {
+            desc: Finished with NUA
+            art: DONE
+            config: { pause: true }
+            next: @menu:logoff
+        }
+
+        fullLoginSequenceLoginArt: {
+            desc: Logging In
+            art: WELCOME
+            config: { pause: true }
+            next: fullLoginSequenceLastCallers
+        }
+
+        fullLoginSequenceLastCallers: {
+            desc: Last Callers
+            module: last_callers
+            art: LASTCALL
+            config: {
+                pause: true
+                font: cp437
+            }
+            next: fullLoginSequenceWhosOnline
+        }
+        fullLoginSequenceWhosOnline: {
+            desc: Who's Online
+            module: whos_online
+            art: WHOSON
+            config: { pause: true }
+            next: fullLoginSequenceOnelinerz
+        }
+
+        fullLoginSequenceOnelinerz: {
+            desc: Viewing Onelinerz
+            module: onelinerz
+            next: [
+                {
+                    //  calls >= 2
+                    acs: NC2
+                    next: fullLoginSequenceNewScanConfirm
+                }
+                {
+                    // new users - skip new scan
+                    next: fullLoginSequenceUserStats
+                }
+            ]
+            config: {
+                cls: true
+                art: {
+                    view: ONELINER
+                    add: ONEADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: oneliner
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }   
+
+        fullLoginSequenceNewScanConfirm: {
+            desc: Logging In
+            prompt: loginGlobalNewScan
+            submit: [
+                {
+                    value: { promptValue: 0 }
+                    action: @menu:fullLoginSequenceNewScan
+                }
+                {
+                    value: { promptValue: 1 }
+                    action: @menu:fullLoginSequenceUserStats
+                }
+            ]
+        }
+
+        fullLoginSequenceNewScan: {
+            desc: Performing New Scan
+            module: new_scan
+            art: NEWSCAN
+            next: fullLoginSequenceSysStats
+            config: {
+                messageListMenu: newScanMessageList
+            }
+        }
+
+        fullLoginSequenceSysStats: {
+            desc: System Stats
+            art: SYSSTAT
+            config: { pause: true }
+            next: fullLoginSequenceUserStats
+        }
+        fullLoginSequenceUserStats: {
+            desc: User Stats
+            art: STATUS
+            config: { pause: true }
+            next: mainMenu
+        }
+
+        newScanMessageList: {
+            desc: New Messages
+            module: msg_list
+            art: NEWMSGS
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                        TL6: {
+                            //  theme me!
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "x", "shift + x" ]
+                            action: @method:fullExit
+                        }
+                        {
+                            keys: [ "m", "shift + m" ]
+                            action: @method:markAllRead
+                        }
+                    ]
+                }
+            }
+        }
+
+        newScanFileBaseList: {
+            module: file_area_list
+            desc: New Files
+            config: {
+                art: {
+                    browse: FNEWBRWSE
+                    details: FDETAIL
+                    detailsGeneral: FDETGEN
+                    detailsNfo: FDETNFO
+                    detailsFileList: FDETLST
+                    help: FBHELP
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+                            mode: preview
+                            ansiView: true
+                        }
+
+                        HM2: {
+                            focus: true
+                            submit: true
+                            argName: navSelect                          
+                            items: [
+                                "prev", "next", "details", "toggle queue", "rate", "help", "quit"
+                            ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFile
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFile
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:viewDetails
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:toggleQueue
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @menu:fileBaseGetRatingForSelectedEntry
+                            }                           
+                            {
+                                value: { navSelect: 5 }
+                                action: @method:displayHelp
+                            }
+                            {
+                                value: { navSelect: 6 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "w", "shift + w" ]
+                            action: @method:showWebDownloadLink
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "t", "shift + t" ]
+                            action: @method:toggleQueue
+                        }
+                        {
+                            keys: [ "v", "shift + v" ]
+                            action: @method:viewDetails
+                        }
+                        {
+                            keys: [ "r", "shift + r" ]
+                            action: @menu:fileBaseGetRatingForSelectedEntry
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:displayHelp
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: {
+                        HM1: {
+                            focus: true
+                            submit: true
+                            argName: navSelect
+                            items: [
+                                "general", "nfo/readme", "file listing"
+                            ]
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @method:detailsQuit
+                        }
+                    ]
+                }
+
+                2: {
+                    //  details - general
+                    mci: {}                 
+                }
+
+                3: {
+                    //  details - nfo/readme
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+                    }
+                }
+
+                4: {
+                    //  details - file listing
+                    mci: {
+                        VM1: {
+
+                        }
+                    }
+                }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Main Menu
+        ///////////////////////////////////////////////////////////////////////
+        mainMenu: {
+            art: MMENU
+            desc: Main Menu
+            prompt: menuCommand
+            config: {
+                font: cp437
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "MSG" }
+                    action: @menu:nodeMessage
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { command: "D" }
+                    action: @menu:doorMenu
+                }
+                {
+                    value: { command: "F" }
+                    action: @menu:fileBase
+                }
+                {
+                    value: { command: "U" }
+                    action: @menu:mainMenuUserList
+                }
+                {
+                    value: { command: "L" }
+                    action: @menu:mainMenuLastCallers
+                }
+                {
+                    value: { command: "W" }
+                    action: @menu:mainMenuWhosOnline
+                }
+                {
+                    value: { command: "Y" }
+                    action: @menu:mainMenuUserStats
+                }
+                {
+                    value: { command: "M" }
+                    action: @menu:messageArea
+                }
+                {
+                    value: { command: "E" }
+                    action: @menu:mailMenu
+                }
+                {
+                    value: { command: "C" }
+                    action: @menu:mainMenuUserConfig
+                }
+                {
+                    value: { command: "S" }
+                    action: @menu:mainMenuSystemStats
+                }
+                {
+                    value: { command: "!" }
+                    action: @menu:mainMenuGlobalNewScan
+                }
+                {
+                    value: { command: "K" }
+                    action: @menu:mainMenuFeedbackToSysOp
+                }
+                {
+                    value: { command: "O" }
+                    action: @menu:mainMenuOnelinerz
+                }
+                {
+                    value: { command: "R" }
+                    action: @menu:mainMenuRumorz
+                }
+                {
+                    value: { command: "BBS"}
+                    action: @menu:bbsList
+                }
+                {
+                    value: 1
+                    action: @menu:mainMenu
+                }
+            ]
+        }
+
+        nodeMessage: {
+            desc: Node Messaging
+            module: node_msg
+            art: NODEMSG
+            config: {
+                cls: true
+                art: {
+                    header: NODEMSGHDR
+                    footer: NODEMSGFTR
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        SM1: {
+                            argName: node
+                        }
+                        ET2: {
+                            argName: message
+                            submit: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:sendMessage
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mainMenuLastCallers: {
+            desc: Last Callers
+            module: last_callers
+            art: LASTCALL
+            config: { pause: true }
+        }
+
+        mainMenuWhosOnline: {
+            desc: Who's Online
+            module: whos_online
+            art: WHOSON
+            config: { pause: true }
+        }
+
+        mainMenuUserStats: {
+            desc: User Stats
+            art: STATUS
+            config: { pause: true }
+        }
+
+        mainMenuSystemStats: {
+            desc: System Stats
+            art: SYSSTAT
+            config: { pause: true }
+        }
+
+        mainMenuUserList: {
+            desc: User Listing
+            module: user_list
+            art: USERLST
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuUserConfig: {
+            module: user_config
+            art: CONFSCR
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                            focus: true
+                        }
+                        ME2: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                        }
+                        ME3: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET4: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET6: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @method:validateEmailAvail
+                        }
+                        ET7: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ME8: {
+                            maskPattern: "##"
+                            argName: termHeight
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        SM9: {
+                            argName: theme
+                        }
+                        ET10: {
+                            argName: password
+                            maxLength: @config:users.passwordMax
+                            password: true
+                            validate: @method:validatePassword
+                        }
+                        ET11: {
+                            argName: passwordConfirm
+                            maxLength: @config:users.passwordMax
+                            password: true
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM25: {
+                            argName: submission
+                            items: [ "save", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { submission: 0 }
+                                action: @method:saveChanges
+                            }
+                            {
+                                value: { submission: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuGlobalNewScan: {
+            desc: Performing New Scan
+            module: new_scan
+            art: NEWSCAN
+            config: {
+                messageListMenu: newScanMessageList
+            }
+        }
+
+        mainMenuFeedbackToSysOp: {
+            desc: Feedback to SysOp
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+                toUserId: 1 /* always to +op */
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName:    from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: @sysStat:sysop_username
+                            //  :TODO: readOnly: true
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mainMenuOnelinerz: {
+            desc: Viewing Onelinerz
+            module: onelinerz
+            config: {
+                cls: true
+                art: {
+                    view: ONELINER
+                    add: ONEADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: oneliner
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuRumorz: {
+            desc: Rumorz
+            module: rumorz
+            config: {
+                cls: true
+                art: {
+                    entries: RUMORS
+                    add: RUMORADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: rumor
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }
+
+        bbsList: {
+            desc: Viewing BBS List
+            module: bbs_list
+            config: {
+                cls: true
+                art: {
+                    entries: BBSLIST
+                    add: BBSADD
+                }
+            }
+
+            form: {
+                0: {
+                    mci: {
+                        VM1: { maxLength: 32 }
+                        TL2: { maxLength: 32 }
+                        TL3: { maxLength: 32 }
+                        TL4: { maxLength: 32 }
+                        TL5: { maxLength: 32 }
+                        TL6: { maxLength: 32 }
+                        TL7: { maxLength: 32 }
+                        TL8: { maxLength: 32 }
+                        TL9: { maxLength: 32 }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "a" ]
+                            action: @method:addBBS
+                        }
+                        {
+                            //  :TODO: add delete key
+                            keys: [ "d" ]
+                            action: @method:deleteBBS
+                        }
+                        {
+                            keys: [ "q", "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        ET1: {
+                            argName: name
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET2: {
+                            argName: sysop
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: telnet
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET4: {
+                            argName: www
+                            maxLength: 32
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: 32
+                        }
+                        ET6: {
+                            argName: software
+                            maxLength: 32
+                        }
+                        ET7:  {
+                            argName: notes
+                            maxLength: 32
+                        }
+                        TM17: {
+                            argName: submission
+                            items: [ "save", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelSubmit
+                        }
+                    ]
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitBBS
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @method:cancelSubmit
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Doors Menu
+        ///////////////////////////////////////////////////////////////////////
+        doorMenu: {
+            desc: Doors Menu
+            art: DOORMNU
+            prompt: menuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "G" }
+                    action: @menu:logoff
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                //
+                //  The system supports many ways of launching doors including
+                //  modules for DoorParty!, BBSLink, etc.
+                //
+                //  Below are some examples. See the documentation for more info.
+                //
+                {
+                    value: { command: "ABRACADABRA" }
+                    action: @menu:doorAbracadabraExample
+                }
+                {
+                    value: { command: "TWBBSLINK" }
+                    action: @menu:doorTradeWars2002BBSLinkExample
+                }
+                {
+                    value: { command: "DP" }
+                    action: @menu:doorPartyExample
+                }
+                {
                     value: { command: "CN" }
                     action: @menu:doorCombatNetExample
                 }
-				{
-					value: { command: "EXODUS" }
-					action: @menu:doorExodusCataclysm
-				}
-			]
-		}
+                {
+                    value: { command: "EXODUS" }
+                    action: @menu:doorExodusCataclysm
+                }
+            ]
+        }
 
-		//
-		//	Local Door Example via abracadabra module
-		//
-		//	This example assumes launch_door.sh (which is passed args)
-		//	launches the door.
-		//
-		doorAbracadabraExample: {
-			desc: Abracadabra Example
-			module: abracadabra
-			config: {
-				name: Example Door
-				dropFileType: DORINFO
-				cmd: /home/enigma/DOS/scripts/launch_door.sh
-				args: [
-					"{node}",
-					"{dropFile}",
-					"{srvPort}",
-				],
-				nodeMax: 1
-				tooManyArt: DOORMANY
-				io: socket
-			}
-		}
-
-		//
-		//	BBSLink Example (TradeWars 2000)
-		//
-		//	Register @ https://bbslink.net/
-		//
-		doorTradeWars2002BBSLinkExample: {
-			desc: Playing TW 2002 (BBSLink)
-			module: bbs_link
-			config: {
-				sysCode: XXXXXXXX
-				authCode: XXXXXXXX
-				schemeCode: XXXXXXXX
-				door: tw
-			}
-		}
-
-		//
-		//	DoorParty! Example
-		//
-		//	Register @ http://throwbackbbs.com/
-		//
-		doorPartyExample: {
-			desc: Using DoorParty!
-			module: door_party
-			config: {
-				username: XXXXXXXX
-				password: XXXXXXXX
-				bbsTag: XX
-			}
-		}
-
-		//
-        //	CombatNet Example
         //
-        //	Register @ http://combatnet.us/
+        //  Local Door Example via abracadabra module
+        //
+        //  This example assumes launch_door.sh (which is passed args)
+        //  launches the door.
+        //
+        doorAbracadabraExample: {
+            desc: Abracadabra Example
+            module: abracadabra
+            config: {
+                name: Example Door
+                dropFileType: DORINFO
+                cmd: /home/enigma/DOS/scripts/launch_door.sh
+                args: [
+                    "{node}",
+                    "{dropFile}",
+                    "{srvPort}",
+                ],
+                nodeMax: 1
+                tooManyArt: DOORMANY
+                io: socket
+            }
+        }
+
+        //
+        //  BBSLink Example (TradeWars 2000)
+        //
+        //  Register @ https://bbslink.net/
+        //
+        doorTradeWars2002BBSLinkExample: {
+            desc: Playing TW 2002 (BBSLink)
+            module: bbs_link
+            config: {
+                sysCode: XXXXXXXX
+                authCode: XXXXXXXX
+                schemeCode: XXXXXXXX
+                door: tw
+            }
+        }
+
+        //
+        //  DoorParty! Example
+        //
+        //  Register @ http://throwbackbbs.com/
+        //
+        doorPartyExample: {
+            desc: Using DoorParty!
+            module: door_party
+            config: {
+                username: XXXXXXXX
+                password: XXXXXXXX
+                bbsTag: XX
+            }
+        }
+
+        //
+        //  CombatNet Example
+        //
+        //  Register @ http://combatnet.us/
         //
         doorCombatNetExample: {
             desc: Using CombatNet
@@ -1765,2316 +1765,2316 @@
         }
 
         //
-        //	Exodus Example (cataclysm)
-        //	Register @ https://oddnetwork.org/exodus/
+        //  Exodus Example (cataclysm)
+        //  Register @ https://oddnetwork.org/exodus/
         //
         doorExodusCataclysm: {
-			desc: Cataclysm
-			module: exodus
-			config: {
-				rejectUnauthorized: false
-				board: XXX
-				key: XXXXXXXX
-				door: cataclysm
-			}
-		}
-
-		///////////////////////////////////////////////////////////////////////
-		//	Message Area Menu
-		///////////////////////////////////////////////////////////////////////
-		messageArea: {
-			art: MSGMNU
-			desc: Message Area
-			prompt: messageMenuCommand
-			config: {
-				interrupt: realtime
-			}
-			submit: [
-				{
-					value: { command: "P" }
-					action: @menu:messageAreaNewPost
-				}
-				{
-					value: { command: "J" }
-					action: @menu:messageAreaChangeCurrentConference
-				}
-				{
-					value: { command: "C" }
-					action: @menu:messageAreaChangeCurrentArea
-				}
-				{
-					value: { command: "L" }
-					action: @menu:messageAreaMessageList
-				}
-				{
-					value: { command: "Q" }
-					action: @systemMethod:prevMenu
-				}
-				{
-					value: { command: "G" }
-					action: @menu:fullLogoffSequence
-				}
-				{
-					value: { command: "<" }
-					action: @systemMethod:prevConf
-				}
-				{
-					value: { command: ">" }
-					action: @systemMethod:nextConf
-				}
-				{
-					value: { command: "[" }
-					action: @systemMethod:prevArea
-				}
-				{
-					value: { command: "]" }
-					action: @systemMethod:nextArea
-				}
-				{
-					value: { command: "D" }
-					action: @menu:messageAreaSetNewScanDate
-				}
-				{
-					value: { command: "S" }
-					action: @menu:messageSearch
-				}
-				{
-					value: 1
-					action: @menu:messageArea
-				}
-			]
-		}
-
-		messageSearch: {
-			desc: Message Search
-			module: message_base_search
-			art: MSEARCH
-			config: {
-				messageListMenu: messageAreaSearchMessageList
-			}
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							focus: true
-							argName: searchTerms
-						}
-						BT2: {
-							argName: search
-							text: search
-							submit: true
-						}
-						SM3: {
-							argName: confTag
-						}
-						SM4: {
-							argName: areaTag
-						}
-						ET5: {
-							argName: toUserName
-							maxLength: @config:users.usernameMax
-						}
-						ET6: {
-							argName: fromUserName
-							maxLength: @config:users.usernameMax
-						}
-						BT7: {
-							argName: advancedSearch
-							text: advanced search
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { search: null }
-								action: @method:search
-							}
-							{
-								value: { advancedSearch: null }
-								action: @method:search
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		messageAreaSearchMessageList: {
-			desc: Message Search
-			module: msg_list
-			art: MSRCHLST
-			config: {
-				menuViewPost: messageAreaViewPost
-			}
-			form: {
-				0: {
-					mci:  {
-						VM1: {
-							focus: true
-							submit: true
-							argName: message
-						}
-						TL6: {
-							//	theme me!
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { message: null }
-								action: @method:selectMessage
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		messageSearchNoResults: {
-			desc: Message Search
-			art: MSRCNORES
-			config: {
-				pause: true
-			}
-		}
-
-		messageAreaChangeCurrentConference: {
-			art: CCHANGE
-			module: msg_conf_list
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: true
-							submit: true
-							argName: conf
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { conf: null }
-								action: @method:changeConference
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		messageAreaSetNewScanDate: {
-			module: set_newscan_date
-			desc: Message Base
-			art: SETMNSDATE
-			config: {
-				target: message
-				scanDateFormat: YYYYMMDD
-			}
-			form: {
-				0: {
-					mci: {
-						ME1: {
-							focus: true
-							submit: true
-							argName: scanDate
-							maskPattern: "####/##/##"
-						}
-						SM2: {
-							argName: targetSelection
-							submit: false
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { scanDate: null }
-								action: @method:scanDateSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		changeMessageConfPreArt: {
-			module: show_art
-			config: {
-				method: messageConf
-				key: confTag
-				pause: true
-				cls: true
-				menuFlags: [ "popParent", "noHistory" ]
-			}
-		}
-
-		messageAreaChangeCurrentArea: {
-			//	:TODO: rename this art to ACHANGE
-			art: CHANGE
-			module: msg_area_list
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: true
-							submit: true
-							argName: area
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { area: null }
-								action: @method:changeArea
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		changeMessageAreaPreArt: {
-			module: show_art
-			config: {
-				method: messageArea
-				key: areaTag
-				pause: true
-				cls: true
-				menuFlags: [ "popParent", "noHistory" ]
-			}
-		}
-
-		messageAreaMessageList: {
-			module: msg_list
-			art: MSGLIST
-			config: {
-				menuViewPost: messageAreaViewPost
-			}
-			form: {
-				0: {
-					mci:  {
-						VM1: {
-							focus: true
-							submit: true
-							argName: message
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { message: null }
-								action: @method:selectMessage
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		messageAreaViewPost:  {
-			module: msg_area_view_fse
-			config: {
-				art: {
-					header:		MSGVHDR
-					body: 		MSGBODY
-					footerView:	MSGVFTR
-					help:		MSGVHLP
-				},
-				editorMode: view
-				editorType: area
-			}
-			form: {
-				0: {
-					mci: {
-						//	:TODO: ensure this block isn't even req. for theme to apply...
-					}
-				}
-				1: {
-					mci: {
-						MT1: {
-							width: 79
-							mode: preview
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: message
-								action: @method:editModeEscPressed
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							viewId: 1
-						}
-					]
-				}
-				2: {
-					TLTL:  {
-						mci: {
-							TL1: { width: 5	}
-							TL2: { width: 4	}
-						}
-					}
-				}
-				4: {
-					mci: {
-						HM1: {
-							//	:TODO: (#)Jump/(L)Index (msg list)/Last
-							items: [ "prev", "next", "reply", "quit", "help" ]
-							focusItemIndex: 1
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { 1: 0 }
-								action: @method:prevMessage
-							}
-							{
-								value: { 1: 1 }
-								action: @method:nextMessage
-							}
-							{
-								value: { 1: 2 }
-								action: @method:replyMessage
-								extraArgs: {
-									menu: messageAreaReplyPost
-								}
-							}
-							{
-								value: { 1: 3 }
-								action: @systemMethod:prevMenu
-							}
-							{
-								value: { 1: 4 }
-								action: @method:viewModeMenuHelp
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "p", "shift + p" ]
-							action: @method:prevMessage
-						}
-						{
-							keys: [ "n", "shift + n" ]
-							action: @method:nextMessage
-						}
-						{
-							keys:	[ "r", "shift + r" ]
-							action: @method:replyMessage
-							extraArgs: {
-								menu: messageAreaReplyPost
-							}
-						}
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "?" ]
-							action: @method:viewModeMenuHelp
-						}
-						{
-							keys: [ "down arrow", "up arrow", "page up", "page down" ]
-							action: @method:movementKeyPressed
-						}
-					]
-				}
-			}
-		}
-
-		messageAreaReplyPost: {
-			module: msg_area_post_fse
-			config: {
-				art: {
-					header:				MSGEHDR
-					body: 				MSGBODY
-					quote:				MSGQUOT
-					footerEditor:		MSGEFTR
-					footerEditorMenu:	MSGEMFT
-					help:				MSGEHLP
-				}
-				editorMode: edit
-				editorType: area
-			}
-			form: {
-				0: {
-					mci: {
-						//	:TODO: use appropriate system properties for max lengths
-						TL1: {
-							argName: from
-						}
-						ET2: {
-							argName: to
-							focus: true
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET3: {
-							argName: subject
-							maxLength: 72
-							submit: true
-							validate: @systemMethod:validateNonEmpty
-						}
-						TL4: {
-							//	:TODO: this is for RE: line (NYI)
-							//width: 27
-							//textOverflow: ...
-						}
-					}
-					submit: {
-						3: [
-							{
-								value: { subject: null }
-								action: @method:headerSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-				1: {
-					mci: {
-						MT1: {
-							width: 79
-							height: 14
-							argName: message
-							mode: edit
-						}
-					}
-					submit: {
-						*: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ],
-							viewId: 1
-						}
-					]
-				}
-
-				3: {
-					mci: {
-						HM1: {
-							items: [ "save", "discard", "quote", "help" ]
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { 1: 0 }
-								action: @method:editModeMenuSave
-							}
-							{
-								value: { 1: 1 }
-								action: @systemMethod:prevMenu
-							}
-							{
-								value: { 1: 2 },
-								action: @method:editModeMenuQuote
-							}
-							{
-								value: { 1: 3 }
-								action: @method:editModeMenuHelp
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:editModeEscPressed
-						}
-						{
-							keys: [ "s", "shift + s" ]
-							action: @method:editModeMenuSave
-						}
-						{
-							keys: [ "d", "shift + d" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "q", "shift + q" ]
-							action: @method:editModeMenuQuote
-						}
-						{
-							keys: [ "?" ]
-							action: @method:editModeMenuHelp
-						}
-					]
-				}
-
-				//	Quote builder
-				5: {
-					mci: {
-						MT1: {
-							width: 79
-							height: 7
-						}
-						VM3: {
-							width: 79
-							height: 4
-							argName: quote
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { quote: null }
-								action: @method:appendQuoteEntry
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:quoteBuilderEscPressed
-						}
-					]
-				}
-			}
-		}
-		//	:TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
-		messageAreaNewPost: {
-			desc: Posting message,
-			module: msg_area_post_fse
-			config: {
-				art: {
-					header:				MSGEHDR
-					body:				MSGBODY
-					footerEditor:		MSGEFTR
-					footerEditorMenu:	MSGEMFT
-					help:				MSGEHLP
-				}
-				editorMode: edit
-				editorType: area
-			}
-			form: {
-				0: {
-					mci: {
-						TL1: {
-							argName: from
-						}
-						ET2: {
-							argName: to
-							focus: true
-							text: All
-							validate: @systemMethod:validateNonEmpty
-						}
-						ET3: {
-							argName: subject
-							maxLength: 72
-							submit: true
-							validate: @systemMethod:validateNonEmpty
-							//	:TODO: Validate -> close/cancel if empty
-						}
-					}
-					submit: {
-						3: [
-							{
-								value: { subject: null }
-								action: @method:headerSubmit
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-
-				1: {
-					"mci" : {
-						MT1: {
-							width: 79
-							argName: message
-							mode: edit
-						}
-					}
-
-					submit: {
-						*: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							viewId: 1
-						}
-					]
-				}
-				2: {
-					TLTL:  {
-						mci: {
-							TL1: { width: 5 }
-							TL2: { width: 4	}
-						}
-					}
-				}
-				3: {
-					HM: {
-						mci: {
-							HM1: {
-								//	:TODO: clear
-								"items" : [ "save", "discard", "help" ]
-							}
-						}
-						submit: {
-							*: [
-								{
-									value: { 1: 0 }
-									action: @method:editModeMenuSave
-								}
-								{
-									value: { 1: 1 }
-									action: @systemMethod:prevMenu
-								}
-								{
-									value: { 1: 2 }
-									action: @method:editModeMenuHelp
-								}
-							]
-						}
-						actionKeys: [
-							{
-								keys: [ "escape" ]
-								action: @method:editModeEscPressed
-							}
-							{
-								keys: [ "?" ]
-								action: @method:editModeMenuHelp
-							}
-						]
-						//	:TODO: something like the following for overriding keymap
-						//	this should only override specified entries. others will default
-						/*
-						"keyMap" : {
-							"accept" : [ "return" ]
-						}
-						*/
-					}
-				}
-			}
-		}
-
-
-		//
-		//	User to User mail aka Email Menu
-		//
-		mailMenu: {
-			art: MAILMNU
-			desc: Mail Menu
-			prompt: menuCommand
-			config: {
-				interrupt: realtime
-			}
-			submit: [
-				{
-					value: { command: "C" }
-					action: @menu:mailMenuCreateMessage
-				}
-				{
-					value: { command: "I" }
-					action: @menu:mailMenuInbox
-				}
-				{
-					value: { command: "Q" }
-					action: @systemMethod:prevMenu
-				}
-				{
-					value: { command: "G" }
-					action: @menu:fullLogoffSequence
-				}				
-				{
-					value: 1
-					action: @menu:mailMenu
-				}
-			]
-		}
-
-		mailMenuCreateMessage: {
-			desc: Mailing Someone
-			module: msg_area_post_fse
-			config: {
-				art: {
-					header:				MSGEHDR
-					body:				MSGBODY
-					footerEditor:		MSGEFTR
-					footerEditorMenu:	MSGEMFT
-					help:				MSGEHLP
-				},
-				editorMode: edit
-				editorType: email
-				messageAreaTag: private_mail
-			}
-			form: {
-				0: {
-					mci: {
-						TL1: {
-							argName: 	from
-						}
-						ET2: {
-							argName: to
-							focus: true
-							validate: @systemMethod:validateGeneralMailAddressedTo
-						}
-						ET3: {
-							argName: subject
-							maxLength: 72
-							submit: true
-							validate: @systemMethod:validateMessageSubject
-						}
-					}
-					submit: {
-						3: [
-							{
-								value: { subject: null }
-								action: @method:headerSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-				1: {
-					mci: {
-						MT1: {
-							width: 79
-							argName: message
-							mode: edit
-						}
-					}
-
-					submit: {
-						*: [ { value: "message", action: "@method:editModeEscPressed" } ]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							viewId: 1
-						}
-					]
-				},
-				2: {
-					TLTL:  {
-						mci: {
-							TL1: {
-								width: 5
-							}
-							TL2: {
-								width: 4
-							}
-						}
-					}
-				}
-				3: {
-					HM: {
-						mci: {
-							HM1: {
-								//	:TODO: clear
-								items: [ "save", "discard", "help" ]
-							}
-						}
-						submit: {
-							*: [
-								{
-									value: { 1: 0 }
-									action: @method:editModeMenuSave
-								}
-								{
-									value: { 1: 1 }
-									action: @systemMethod:prevMenu
-								}
-								{
-									value: { 1: 2 }
-									action: @method:editModeMenuHelp
-								}
-							]
-						}
-						actionKeys: [
-							{
-								keys: [ "escape" ]
-								action: @method:editModeEscPressed
-							}
-							{
-								keys: [ "?" ]
-								action: @method:editModeMenuHelp
-							}
-						]
-					}
-				}
-			}
-		}
-
-		mailMenuInbox: {
-			module: msg_list
-			art: PRVMSGLIST
-			config: {
-				menuViewPost: messageAreaViewPost
-				messageAreaTag: private_mail
-			}
-			form: {
-				0: {	//	main list
-					mci:  {
-						VM1: {
-							focus: true
-							submit: true
-							argName: message
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { message: null }
-								action: @method:selectMessage
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "delete", "d", "shift + d" ]
-							action: @method:deleteSelected
-						}
-					]
-				}
-				1: {	//	delete prompt form
-					submit: {
-						*: [
-							{
-								value: { promptValue: 0 }
-								action: @method:deleteMessageYes
-							}
-							{
-								value: { promptValue: 1 }
-								action: @method:deleteMessageNo
-							}
-						]
-					}
-				}
-			}
-		}
-
-		////////////////////////////////////////////////////////////////////////
-		//	File Base
-		////////////////////////////////////////////////////////////////////////
-
-		fileBase: {
-			desc: File Base
-			art: FMENU
-			prompt: fileMenuCommand
-			config: {
-				interrupt: realtime
-			}
-			submit: [
-				{
-					value: { menuOption: "L" }
-					action: @menu:fileBaseListEntries
-				}
-				{
-					value: { menuOption: "B" }
-					action: @menu:fileBaseBrowseByAreaSelect
-				}
-				{
-					value: { menuOption: "F" }
-					action: @menu:fileAreaFilterEditor
-				}
-				{
-					value: { menuOption: "Q" }
-					action: @systemMethod:prevMenu
-				}
-				{
-					value: { menuOption: "G" }
-					action: @menu:fullLogoffSequence
-				}
-				{
-					value: { menuOption: "D" }
-					action: @menu:fileBaseDownloadManager
-				}
-				{
-					value: { menuOption: "W" }
-					action: @menu:fileBaseWebDownloadManager
-				}
-				{
-					value: { menuOption: "U" }
-					action: @menu:fileBaseUploadFiles
-				}
-				{
-					value: { menuOption: "S" }
-					action: @menu:fileBaseSearch
-				}
-				{
-					value: { menuOption: "P" }
-					action: @menu:fileBaseSetNewScanDate
-				}
-				{
-					value: { menuOption: "E" }
-					action: @menu:fileBaseExportListFilter
-				}
-			]
-		}
-
-		fileBaseExportListFilter: {
-			module: file_base_search
-			//	:TODO: fixme:
-			art: FSEARCH
-			config: {
-				fileBaseListEntriesMenu: fileBaseExportList
-			}
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							focus: true
-							argName: searchTerms
-						}
-						BT2: {
-							argName: search
-							text: search
-							submit: true
-						}
-						ET3: {
-							maxLength: 64
-							argName: tags
-						}
-						SM4: {
-							maxLength: 64
-							argName: areaIndex
-						}
-						SM5: {
-							items: [
-								"upload date",
-								"uploaded by",
-								"downloads",
-								"rating",
-								"estimated year",
-								"size",
-								"filename"
-							]
-							argName: sortByIndex
-						}
-						SM6: {
-							items: [
-								"decending",
-								"ascending"
-							]
-							argName: orderByIndex
-						}
-						BT7: {
-							argName: advancedSearch
-							text: advanced search
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { search: null }
-								action: @method:search
-							}
-							{
-								value: { advancedSearch: null }
-								action: @method:search
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseExportList: {
-			module: file_base_user_list_export
-			art: FBLISTEXP
-			config: {
-				pause: true
-				templates: {
-					entry: file_list_entry.asc
-				}
-			}
-			form: {
-				0: {
-					mci:  {
-						TL1: { }
-						TL2: { }
-					}
-				}
-			}
-		}
-
-		fileBaseExportListNoResults: {
-			desc: Browsing Files
-			art: FBNORES
-			config: {
-				pause: true
-				menuFlags: [ "noHistory", "popParent" ]
-			}
-		}
-
-		fileBaseSetNewScanDate: {
-			module: set_newscan_date
-			desc: File Base
-			art: SETFNSDATE
-			config: {
-				target: file
-				scanDateFormat: YYYYMMDD
-			}
-			form: {
-				0: {
-					mci: {
-						ME1: {
-							focus: true
-							submit: true
-							argName: scanDate
-							maskPattern: "####/##/##"
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { scanDate: null }
-								action: @method:scanDateSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseListEntries: {
-			module: file_area_list
-			desc: Browsing Files
-			config: {
-				art: {
-					browse: FBRWSE
-					details: FDETAIL
-					detailsGeneral: FDETGEN
-					detailsNfo: FDETNFO
-					detailsFileList: FDETLST
-					help: FBHELP
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						MT1: {
-							mode: preview
-						}
-
-						HM2: {
-							focus: true
-							submit: true
-							argName: navSelect							
-							items: [
-								"prev", "next", "details", "toggle queue", "rate", "change filter", "help", "quit"
-							]
-							focusItemIndex: 1
-						}
-					}
-					
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:prevFile
-							}
-							{
-								value: { navSelect: 1 }
-								action: @method:nextFile
-							}
-							{
-								value: { navSelect: 2 }
-								action: @method:viewDetails
-							}
-							{
-								value: { navSelect: 3 }
-								action: @method:toggleQueue
-							}
-							{
-								value: { navSelect: 4 }
-								action: @menu:fileBaseGetRatingForSelectedEntry
-							}							
-							{
-								value: { navSelect: 5 }
-								action: @menu:fileAreaFilterEditor
-							}
-							{
-								value: { navSelect: 6 }
-								action: @method:displayHelp
-							}
-							{
-								value: { navSelect: 7 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "w", "shift + w" ]
-							action: @method:showWebDownloadLink
-						}
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-						{
-							keys: [ "t", "shift + t" ]
-							action: @method:toggleQueue
-						}
-						{
-							keys: [ "f", "shift + f" ]
-							action: @menu:fileAreaFilterEditor
-						}
-						{
-							keys: [ "v", "shift + v" ]
-							action: @method:viewDetails
-						}
-						{
-							keys: [ "r", "shift + r" ]
-							action: @menu:fileBaseGetRatingForSelectedEntry
-						}
-						{
-							keys: [ "?" ]
-							action: @method:displayHelp
-						}
-					]
-				}
-
-				1: {
-					mci: {
-						HM1: {
-							focus: true
-							submit: true
-							argName: navSelect
-							items: [
-								"general", "nfo/readme", "file listing"
-							]
-						}
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @method:detailsQuit
-						}
-					]
-				}
-
-				2: {
-					//	details - general
-					mci: {}					
-				}
-
-				3: {
-					//	details - nfo/readme
-					mci: {
-						MT1: {
-							mode: preview
-						}
-					}
-				}
-
-				4: {
-					//	details - file listing
-					mci: {
-						VM1: {
-
-						}
-					}
-				}
-			}
-		}
-
-		fileBaseBrowseByAreaSelect: {
-			desc: Browsing File Areas
-			module: file_base_area_select
-			art: FAREASEL
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: true
-							argName: areaTag
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { areaTag: null }
-								action: @method:selectArea
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseGetRatingForSelectedEntry: {
-			desc: Rating a File
-			prompt: fileBaseRateEntryPrompt
-			config: {
-				cls: true
-			}
-			submit: [
-			//	:TODO: handle esc/q
-				{
-					//	pass data back to caller
-					value: { rating: null }
-					action: @systemMethod:prevMenu
-				}
-			]
-		}
-
-		fileBaseListEntriesNoResults: {
-			desc: Browsing Files
-			art: FBNORES
-			config: {
-				pause: true
-				menuFlags: [ "noHistory", "popParent" ]
-			}
-		}
-
-		fileBaseSearch: {
-			module: file_base_search
-			desc: Searching Files
-			art: FSEARCH
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							focus: true
-							argName: searchTerms
-						}
-						BT2: {
-							argName: search
-							text: search
-							submit: true
-						}
-						ET3: {
-							maxLength: 64
-							argName: tags
-						}
-						SM4: {
-							maxLength: 64
-							argName: areaIndex
-						}
-						SM5: {
-							items: [
-								"upload date",
-								"uploaded by",
-								"downloads",
-								"rating",
-								"estimated year",
-								"size",
-								"filename",
-							]
-							argName: sortByIndex
-						}
-						SM6: {
-							items: [
-								"decending",
-								"ascending"
-							]
-							argName: orderByIndex
-						}
-						BT7: {
-							argName: advancedSearch
-							text: advanced search
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { search: null }
-								action: @method:search
-							}
-							{
-								value: { advancedSearch: null }
-								action: @method:search
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileAreaFilterEditor: {
-			desc: File Filter Editor
-			module: file_area_filter_edit
-			art: FFILEDT
-			form: {
-				0: {
-					mci: {
-						ET1: {
-							argName: searchTerms
-						}
-						ET2: {
-							maxLength: 64
-							argName: tags
-						}
-						SM3: {
-							maxLength: 64
-							argName: areaIndex
-						}
-						SM4: {
-							items: [
-								"upload date",
-								"uploaded by",
-								"downloads",
-								"rating",
-								"estimated year",
-								"size",
-							]
-							argName: sortByIndex
-						}
-						SM5: {
-							items: [
-								"decending",
-								"ascending"
-							]
-							argName: orderByIndex
-						}
-						ET6: {
-							maxLength: 64
-							argName: name
-							validate: @systemMethod:validateNonEmpty
-						}
-						HM7: {
-							focus: true
-							items: [
-								"prev", "next", "make active", "save", "new", "delete"
-							]
-							argName: navSelect
-							focusItemIndex: 1
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:prevFilter
-							}
-							{
-								value: { navSelect: 1 }
-								action: @method:nextFilter
-							}
-							{
-								value: { navSelect: 2 }
-								action: @method:makeFilterActive
-							}
-							{
-								value: { navSelect: 3 }
-								action: @method:saveFilter
-							}
-							{
-								value: { navSelect: 4 }
-								action: @method:newFilter
-							}
-							{
-								value: { navSelect: 5 }
-								action: @method:deleteFilter
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseDownloadManager: {
-			desc: Download Manager
-			module: file_base_download_manager
-			config: {
-				art: {
-					queueManager: FDLMGR
-					/*
-					NYI
-					details: FDLDET
-					*/
-				}
-				emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							argName: queueItem
-						}
-						HM2: {
-							focus: true
-							items: [ "download all", "quit" ]
-							argName: navSelect
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:downloadAll
-							}
-							{
-								value: { navSelect: 1 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "a", "shift + a" ]
-							action: @method:downloadAll
-						}
-						{
-							keys: [ "delete", "r", "shift + r" ]
-							action: @method:removeItem
-						}
-						{
-							keys: [ "c", "shift + c" ]
-							action: @method:clearQueue
-						}
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseWebDownloadManager: {
-			desc: Web D/L Manager
-			module: file_base_web_download_manager
-			config: {
-				art: {
-					queueManager: FWDLMGR
-					batchList: BATDLINF
-				}
-				emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							argName: queueItem
-						}
-						HM2: {
-							focus: true
-							items: [ "get batch link", "quit", "help" ]
-							argName: navSelect
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:getBatchLink
-							}
-							{
-								value: { navSelect: 1 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "b", "shift + b" ]
-							action: @method:getBatchLink
-						}
-						{
-							keys: [ "delete", "r", "shift + r" ]
-							action: @method:removeItem
-						}
-						{
-							keys: [ "c", "shift + c" ]
-							action: @method:clearQueue
-						}
-						{
-							keys: [ "escape", "q", "shift + q" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseDownloadManagerEmptyQueue: {
-			desc: Empty Download Queue
-			art: FEMPTYQ
-			config: {
-				pause: true
-				menuFlags: [ "noHistory", "popParent" ]
-			}
-		}
-
-		fileTransferProtocolSelection: {
-			desc: Protocol selection
-			module: file_transfer_protocol_select
-			art: FPROSEL
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: true
-							argName: protocol
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { protocol: null }
-								action: @method:selectProtocol
-							}
-						]
-					}
-
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-			}
-		}
-
-		fileBaseUploadFiles: {
-			desc: Uploading
-			module: upload
-			config: {
-				art: {
-					options: ULOPTS
-					fileDetails: ULDETAIL
-					processing: ULCHECK
-					dupes: ULDUPES
-				}
-			}
-
-			form: {
-				//	options
-				0: {
-					mci: {
-						SM1: {
-							argName: areaSelect
-							focus: true
-						}
-						TM2: {
-							argName: uploadType
-							items: [ "blind", "supply filename" ]
-						}
-						ET3: {
-							argName: fileName
-							maxLength: 255
-							validate: @method:validateNonBlindFileName
-						}
-						HM4: {
-							argName: navSelect
-							items: [ "continue", "cancel" ]
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { navSelect: 0 }
-								action: @method:optionsNavContinue
-							}
-							{
-								value: { navSelect: 1 }
-								action: @systemMethod:prevMenu
-							}
-						]
-					}
-
-					"actionKeys" : [
-						{
-							"keys"		: [ "escape" ],
-							action: @systemMethod:prevMenu
-						}
-					]
-				}
-
-				1: {
-					mci: { }
-				}
-
-				//	file details entry
-				2: {
-					mci: {
-						MT1: {
-							argName: shortDesc
-							tabSwitchesView: true
-							focus: true
-						}
-
-						ET2: {
-							argName: tags
-						}
-
-						ME3: {
-							argName: estYear
-							maskPattern: "####"
-						}
-
-						BT4: {
-							argName: continue
-							text: continue
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { continue: null }
-								action: @method:fileDetailsContinue
-							}
-						]
-					}
-				}
-
-				//	dupes
-				3: {
-					mci: {
-						VM1: {
-							/*
-							Use 'dupeInfoFormat' to custom format:
-
-							areaDesc
-							areaName
-							areaTag
-							desc
-							descLong
-							fileId
-							fileName
-							fileSha256
-							storageTag
-							uploadTimestamp
-
-							*/
-
-							mode: preview
-						}
-					}
-				}
-			}
-		}
-
-		fileBaseNoUploadAreasAvail: {
-			desc: File Base
-			art: ULNOAREA
-			config: {
-				pause: true
-				menuFlags: [ "noHistory", "popParent" ]
-			}
-		}
-
-		sendFilesToUser: {
-			desc: Downloading
-			module: file_transfer
-			config: {
-				//	defaults - generally use extraArgs
-				protocol: zmodem8kSexyz
-				direction: send
-			}
-		}
-
-		recvFilesFromUser: {
-			desc: Uploading
-			module: file_transfer
-			config: {
-				//	defaults - generally use extraArgs
-				protocol: zmodem8kSexyz
-				direction: recv
-			}	
-		}
-
-
-		////////////////////////////////////////////////////////////////////////
-		//	Required entries
-		////////////////////////////////////////////////////////////////////////
-		idleLogoff: {
-			art:	IDLELOG
-			next:	@systemMethod:logoff
-		}
-		////////////////////////////////////////////////////////////////////////
-		//	Demo Section
-		//	:TODO: This entire section needs updated!!!
-		////////////////////////////////////////////////////////////////////////
-		"demoMain" : {
-			"art" : "demo_selection_vm.ans",
-			"form" : {
-				"0" : {
-					"VM" : {
-						"mci" : {
-							"VM1" : {
-								"items" : [
-									"Single Line Text Editing Views",
-									"Spinner & Toggle Views",
-									"Mask Edit Views",
-									"Multi Line Text Editor",
-									"Vertical Menu Views",
-									"Horizontal Menu Views",
-									"Art Display",
-									"Full Screen Editor"
-								],
-								"height" : 10,
-								"itemSpacing" : 1,
-								"justify" : "center",
-								"focusTextStyle" : "small i"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : { "1" : 0 },
-									"action" : "@menu:demoEditTextView"
-								},
-								{
-									"value" : { "1" : 1 },
-									"action" : "@menu:demoSpinAndToggleView"
-								},
-								{
-									"value" : { "1" : 2 },
-									"action" : "@menu:demoMaskEditView"
-								},
-								{
-									"value" : { "1" : 3 },
-									"action" : "@menu:demoMultiLineEditTextView"
-								},
-								{
-									"value"	: { "1" : 4 },
-									"action"	: "@menu:demoVerticalMenuView"
-								},
-								{
-									"value"		: { "1" : 5 },
-									"action"	: "@menu:demoHorizontalMenuView"
-								},
-								{
-									"value" : { "1" : 6 },
-									"action" : "@menu:demoArtDisplay"
-								},
-								{
-									"value" : { "1" : 7 },
-									"action" : "@menu:demoFullScreenEditor"
-								}
-							]
-						}
-					}
-				}
-			}
-		},
-		"demoEditTextView" : {
-			"art" : "demo_edit_text_view1.ans",
-			"form" : {
-				"0" : {
-					"BTETETETET" : {
-						"mci" : {
-							"ET1" : {
-								"width"		: 20,
-								"maxLength" : 20
-							},
-							"ET2" : {
-								"width"		: 20,
-								"maxLength" : 40,
-								"textOverflow" : "..."
-							},
-							"ET3" : {
-								"width"		: 20,
-								"fillChar" : "-",
-								"styleSGR1" : "|00|36",
-								"maxLength" : 20
-							},
-							"ET4" : {
-								"width"		: 20,
-								"maxLength"	: 20,
-								"password"	: true
-							},
-							"BT5" : {
-								"width" : 8,
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : 5,
-									"action" : "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 5
-							}
-						]
-					}
-				}
-			}
-		},
-		"demoSpinAndToggleView" : {
-			"art" : "demo_spin_and_toggle.ans",
-			"form" : {
-				"0" : {
-					"BTSMSMTM" : {
-						"mci" : {
-							"SM1" : {
-								"items" : [ "Henry Morgan", "François l'Ollonais", "Roche Braziliano", "Black Bart", "Blackbeard" ]
-							},
-							"SM2" : {
-								"items" : [ "Razor 1911", "DrinkOrDie", "TRSI" ]
-							},
-							"TM3" : {
-								"items" 	: [ "Yarly", "Nowaii" ],
-								"styleSGR1" : "|00|30|01",
-								"hotKeys"	: { "Y" : 0, "N" : 1 }
-							},
-							"BT8" : {
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : 8,
-									"action" : "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 8
-							}
-						]
-					}
-				}
-			}
-		},
-		"demoMaskEditView" : {
-			"art" : "demo_mask_edit_text_view1.ans",
-			"form" : {
-				"0" : {
-					"BTMEME" : {
-						"mci" : {
-							"ME1" : {
-								"maskPattern"	: "##/##/##",
-								"styleSGR1"		: "|00|30|01",
-								//"styleSGR2"		: "|00|45|01",
-								"styleSGR3"		: "|00|30|35",
-								"fillChar"		: "#"
-							},
-							"BT5" : {
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : 5,
-									"action" : "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 5
-							}
-						]
-					}
-				}
-			}
-		},
-		"demoMultiLineEditTextView" : {
-			"art" : "demo_multi_line_edit_text_view1.ans",
-			"form" : {
-				"0" : {
-					"BTMT" : {
-						"mci" : {
-							"MT1" : {
-								"width"		: 70,
-								"height"	: 17,
-								//"text"		: "@art:demo_multi_line_edit_text_view_text.txt",
-								// "text" : "@systemMethod:textFromFile"
-								text: "Hints:\n\t* Insert / CTRL-V toggles overtype mode\n\t* CTRL-Y deletes the current line\n\t* Try Page Up / Page Down\n\t* Home goes to the start of line text\n\t* End goes to the end of a line\n\n\nTab handling:\n-------------------------------------------------\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\nA0\tBB\t1\tCCC\t2\tDDD\t3EEEE\nW\t\tX\t\tY\t\tZ\n\nAn excerpt from A Clockwork Orange:\n\"What sloochatted then, of course, was that my cellmates woke up and started joining in, tolchocking a bit wild in the near-dark, and the shoom seemed to wake up the whole tier, so that you could slooshy a lot of creeching and banging about with tin mugs on the wall, as though all the plennies in all the cells thought a big break was about to commence, O my brothers.\n",
-								"focus"		: true
-							},
-							"BT5" : {
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : 5,
-									"action" : "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 5
-							}
-						]
-					}
-				}
-			}
-		},
-		"demoHorizontalMenuView" : {
-			"art" : "demo_horizontal_menu_view1.ans",
-			"form" : {
-				"0" : {
-					"BTHMHM" : {
-						"mci" : {
-							"HM1" : {
-								"items" : [ "One", "Two", "Three" ],
-								"hotKeys" : { "1" : 0, "2" : 1, "3" : 2 }
-							},
-							"HM2" : {
-								"items" : [ "Uno", "Dos", "Tres" ],
-								"hotKeys" : { "U" : 0, "D" : 1, "T" : 2 }
-							},
-							"BT5" : {
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : 5,
-									"action" : "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 5
-							}
-						]
-					}
-				}
-			}
-		},
-		"demoVerticalMenuView" : {
-			"art"		: "demo_vertical_menu_view1.ans",
-			"form"		: {
-				"0"	: {
-					"BTVM" : {
-						"mci" : {
-							"VM1" : {
-								"items" : [
-									"|33Oblivion/2",
-									"|33iNiQUiTY",
-									"|33ViSiON/X"
-								],
-								"focusItems" : [
-									"|33Oblivion|01/|00|332",
-									"|01|33i|00|33N|01i|00|33QU|01i|00|33TY",
-									"|33ViSiON/X"
-								]
-								//
-								//	:TODO: how to do the following:
-								//	1) Supply a view a string for a standard vs focused item
-								//		"items" : [...], "focusItems" : [ ... ] ?
-								//		"draw" : "@method:drawItemX", then items: [...]
-							},
-							"BT5" : {
-								"text" : "< Back"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value"		: 5,
-									"action"	: "@menu:demoMain"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 5
-							}
-						]
-					}
-				}
-			}
-
-		},
-		"demoArtDisplay" : {
-			"art" : "demo_selection_vm.ans",
-			"form" : {
-				"0" : {
-					"VM" : {
-						"mci" : {
-							"VM1" : {
-								"items" : [
-									"Defaults - DOS ANSI",
-									"bw_mindgames.ans - DOS",
-									"test.ans - DOS",
-									"Defaults - Amiga",
-									"Pause at Term Height"
-								],
-								//	:TODO: justify not working??
-								"focusTextStyle" : "small i"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value" : { "1" : 0 },
-									"action" : "@menu:demoDefaultsDosAnsi"
-								},
-								{
-									"value" : { "1" : 1 },
-									"action" : "@menu:demoDefaultsDosAnsi_bw_mindgames"
-								},
-								{
-									"value" : { "1" : 2 },
-									"action" : "@menu:demoDefaultsDosAnsi_test"
-								}
-							]
-						}
-					}
-				}
-			}
-		},
-		"demoDefaultsDosAnsi" : {
-			"art" : "DM-ENIG2.ANS"
-		},
-		"demoDefaultsDosAnsi_bw_mindgames" : {
-			"art" : "bw_mindgames.ans"
-		},
-		"demoDefaultsDosAnsi_test" : {
-			"art" : "test.ans"
-		},
-		"demoFullScreenEditor" : {
-			"module"	: "fse",
-			"config"	: {
-				"editorType"	: "netMail",
-				"art"			: {
-					"header"			: "demo_fse_netmail_header.ans",
-					"body"				: "demo_fse_netmail_body.ans",
-					"footerEditor"		: "demo_fse_netmail_footer_edit.ans",
-					"footerEditorMenu"	: "demo_fse_netmail_footer_edit_menu.ans",
-					"footerView"		: "demo_fse_netmail_footer_view.ans",
-					"help"				: "demo_fse_netmail_help.ans"
-				}
-			},
-			"form" : {
-				"0" : {
-					"ETETET" : {
-						"mci" : {
-							"ET1" : {
-								//	:TODO: from/to may be set by args
-								//	:TODO: focus may change dep on view vs edit
-								"width"		: 36,
-								"focus"		: true,
-								"argName"	: "to"
-							},
-							"ET2" : {
-								"width"		: 36,
-								"argName"	: "from"
-							},
-							"ET3" : {
-								"width"		: 65,
-								"maxLength"	: 72,
-								"submit"	: [ "enter" ],
-								"argName"	: "subject"
-							}
-						},
-						"submit" : {
-							"3" : [
-								{
-									"value"	: { "subject" : null },
-									"action" : "@method:headerSubmit"
-								}
-							]
-						}
-					}
-				},
-				"1" : {
-					"MT" : {
-						"mci" : {
-							"MT1" : {
-								"width"		: 79,
-								"height"	: 17,
-								"text"		: "",	//	:TODO: should not be req.
-								"argName"	: "message"
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value"		: "message",
-									"action"	: "@method:editModeEscPressed"
-								}
-							]
-						},
-						"actionKeys" : [
-							{
-								"keys"		: [ "escape" ],
-								"viewId"	: 1
-							}
-						]
-					}
-				},
-				"2" : {
-					"TLTL" :  {
-						"mci" : {
-							"TL1" : {
-								"width"	: 5
-							},
-							"TL2" : {
-								"width" : 4
-							}
-						}
-					}
-				},
-				"3" : {
-					"HM" : {
-						"mci" : {
-							"HM1" : {
-								//	:TODO: Continue, Save, Discard, Clear, Quote, Help
-								"items" : [ "Save", "Discard", "Quote", "Help" ]
-							}
-						},
-						"submit" : {
-							"*" : [
-								{
-									"value"		: { "1" : 0 },
-									"action"	: "@method:editModeMenuSave"
-								},
-								{
-									"value"		: { "1" : 1 },
-									"action"	: "@menu:demoMain"
-								},
-								{
-									"value"		: { "1" : 2 },
-									"action"	: "@method:editModeMenuQuote"
-								},
-								{
-									"value"		: { "1" : 3 },
-									"action"	: "@method:editModeMenuHelp"
-								},
-								{
-									"value"		: 1,
-									"action"	: "@method:editModeEscPressed"
-								}
-							]
-						},
-						"actionKeys" : [	//	:TODO: Need better name
-							{
-								"keys"		: [ "escape" ],
-								"action"	: "@method:editModeEscPressed"
-							}
-						]
-					}
-				}
-			}
-		}
-	}
+            desc: Cataclysm
+            module: exodus
+            config: {
+                rejectUnauthorized: false
+                board: XXX
+                key: XXXXXXXX
+                door: cataclysm
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Message Area Menu
+        ///////////////////////////////////////////////////////////////////////
+        messageArea: {
+            art: MSGMNU
+            desc: Message Area
+            prompt: messageMenuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "P" }
+                    action: @menu:messageAreaNewPost
+                }
+                {
+                    value: { command: "J" }
+                    action: @menu:messageAreaChangeCurrentConference
+                }
+                {
+                    value: { command: "C" }
+                    action: @menu:messageAreaChangeCurrentArea
+                }
+                {
+                    value: { command: "L" }
+                    action: @menu:messageAreaMessageList
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { command: "<" }
+                    action: @systemMethod:prevConf
+                }
+                {
+                    value: { command: ">" }
+                    action: @systemMethod:nextConf
+                }
+                {
+                    value: { command: "[" }
+                    action: @systemMethod:prevArea
+                }
+                {
+                    value: { command: "]" }
+                    action: @systemMethod:nextArea
+                }
+                {
+                    value: { command: "D" }
+                    action: @menu:messageAreaSetNewScanDate
+                }
+                {
+                    value: { command: "S" }
+                    action: @menu:messageSearch
+                }
+                {
+                    value: 1
+                    action: @menu:messageArea
+                }
+            ]
+        }
+
+        messageSearch: {
+            desc: Message Search
+            module: message_base_search
+            art: MSEARCH
+            config: {
+                messageListMenu: messageAreaSearchMessageList
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        SM3: {
+                            argName: confTag
+                        }
+                        SM4: {
+                            argName: areaTag
+                        }
+                        ET5: {
+                            argName: toUserName
+                            maxLength: @config:users.usernameMax
+                        }
+                        ET6: {
+                            argName: fromUserName
+                            maxLength: @config:users.usernameMax
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaSearchMessageList: {
+            desc: Message Search
+            module: msg_list
+            art: MSRCHLST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                        TL6: {
+                            //  theme me!
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageSearchNoResults: {
+            desc: Message Search
+            art: MSRCNORES
+            config: {
+                pause: true
+            }
+        }
+
+        messageAreaChangeCurrentConference: {
+            art: CCHANGE
+            module: msg_conf_list
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: conf
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { conf: null }
+                                action: @method:changeConference
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaSetNewScanDate: {
+            module: set_newscan_date
+            desc: Message Base
+            art: SETMNSDATE
+            config: {
+                target: message
+                scanDateFormat: YYYYMMDD
+            }
+            form: {
+                0: {
+                    mci: {
+                        ME1: {
+                            focus: true
+                            submit: true
+                            argName: scanDate
+                            maskPattern: "####/##/##"
+                        }
+                        SM2: {
+                            argName: targetSelection
+                            submit: false
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { scanDate: null }
+                                action: @method:scanDateSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        changeMessageConfPreArt: {
+            module: show_art
+            config: {
+                method: messageConf
+                key: confTag
+                pause: true
+                cls: true
+                menuFlags: [ "popParent", "noHistory" ]
+            }
+        }
+
+        messageAreaChangeCurrentArea: {
+            //  :TODO: rename this art to ACHANGE
+            art: CHANGE
+            module: msg_area_list
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: area
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { area: null }
+                                action: @method:changeArea
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        changeMessageAreaPreArt: {
+            module: show_art
+            config: {
+                method: messageArea
+                key: areaTag
+                pause: true
+                cls: true
+                menuFlags: [ "popParent", "noHistory" ]
+            }
+        }
+
+        messageAreaMessageList: {
+            module: msg_list
+            art: MSGLIST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaViewPost:  {
+            module: msg_area_view_fse
+            config: {
+                art: {
+                    header:     MSGVHDR
+                    body:       MSGBODY
+                    footerView: MSGVFTR
+                    help:       MSGVHLP
+                },
+                editorMode: view
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        //  :TODO: ensure this block isn't even req. for theme to apply...
+                    }
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            mode: preview
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: message
+                                action: @method:editModeEscPressed
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                }
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: { width: 5 }
+                            TL2: { width: 4 }
+                        }
+                    }
+                }
+                4: {
+                    mci: {
+                        HM1: {
+                            //  :TODO: (#)Jump/(L)Index (msg list)/Last
+                            items: [ "prev", "next", "reply", "quit", "help" ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { 1: 0 }
+                                action: @method:prevMessage
+                            }
+                            {
+                                value: { 1: 1 }
+                                action: @method:nextMessage
+                            }
+                            {
+                                value: { 1: 2 }
+                                action: @method:replyMessage
+                                extraArgs: {
+                                    menu: messageAreaReplyPost
+                                }
+                            }
+                            {
+                                value: { 1: 3 }
+                                action: @systemMethod:prevMenu
+                            }
+                            {
+                                value: { 1: 4 }
+                                action: @method:viewModeMenuHelp
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "p", "shift + p" ]
+                            action: @method:prevMessage
+                        }
+                        {
+                            keys: [ "n", "shift + n" ]
+                            action: @method:nextMessage
+                        }
+                        {
+                            keys:   [ "r", "shift + r" ]
+                            action: @method:replyMessage
+                            extraArgs: {
+                                menu: messageAreaReplyPost
+                            }
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:viewModeMenuHelp
+                        }
+                        {
+                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
+                            action: @method:movementKeyPressed
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaReplyPost: {
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    quote:              MSGQUOT
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                }
+                editorMode: edit
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        //  :TODO: use appropriate system properties for max lengths
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        TL4: {
+                            //  :TODO: this is for RE: line (NYI)
+                            //width: 27
+                            //textOverflow: ...
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            height: 14
+                            argName: message
+                            mode: edit
+                        }
+                    }
+                    submit: {
+                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ],
+                            viewId: 1
+                        }
+                    ]
+                }
+
+                3: {
+                    mci: {
+                        HM1: {
+                            items: [ "save", "discard", "quote", "help" ]
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { 1: 0 }
+                                action: @method:editModeMenuSave
+                            }
+                            {
+                                value: { 1: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                            {
+                                value: { 1: 2 },
+                                action: @method:editModeMenuQuote
+                            }
+                            {
+                                value: { 1: 3 }
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:editModeEscPressed
+                        }
+                        {
+                            keys: [ "s", "shift + s" ]
+                            action: @method:editModeMenuSave
+                        }
+                        {
+                            keys: [ "d", "shift + d" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "q", "shift + q" ]
+                            action: @method:editModeMenuQuote
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:editModeMenuHelp
+                        }
+                    ]
+                }
+
+                //  Quote builder
+                5: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            height: 7
+                        }
+                        VM3: {
+                            width: 79
+                            height: 4
+                            argName: quote
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { quote: null }
+                                action: @method:appendQuoteEntry
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:quoteBuilderEscPressed
+                        }
+                    ]
+                }
+            }
+        }
+        //  :TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
+        messageAreaNewPost: {
+            desc: Posting message,
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                }
+                editorMode: edit
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: All
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateNonEmpty
+                            //  :TODO: Validate -> close/cancel if empty
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+
+                1: {
+                    "mci" : {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                }
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: { width: 5 }
+                            TL2: { width: 4 }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                "items" : [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                        //  :TODO: something like the following for overriding keymap
+                        //  this should only override specified entries. others will default
+                        /*
+                        "keyMap" : {
+                            "accept" : [ "return" ]
+                        }
+                        */
+                    }
+                }
+            }
+        }
+
+
+        //
+        //  User to User mail aka Email Menu
+        //
+        mailMenu: {
+            art: MAILMNU
+            desc: Mail Menu
+            prompt: menuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "C" }
+                    action: @menu:mailMenuCreateMessage
+                }
+                {
+                    value: { command: "I" }
+                    action: @menu:mailMenuInbox
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }               
+                {
+                    value: 1
+                    action: @menu:mailMenu
+                }
+            ]
+        }
+
+        mailMenuCreateMessage: {
+            desc: Mailing Someone
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName:    from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            validate: @systemMethod:validateGeneralMailAddressedTo
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mailMenuInbox: {
+            module: msg_list
+            art: PRVMSGLIST
+            config: {
+                menuViewPost: messageAreaViewPost
+                messageAreaTag: private_mail
+            }
+            form: {
+                0: {    //  main list
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "delete", "d", "shift + d" ]
+                            action: @method:deleteSelected
+                        }
+                    ]
+                }
+                1: {    //  delete prompt form
+                    submit: {
+                        *: [
+                            {
+                                value: { promptValue: 0 }
+                                action: @method:deleteMessageYes
+                            }
+                            {
+                                value: { promptValue: 1 }
+                                action: @method:deleteMessageNo
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //  File Base
+        ////////////////////////////////////////////////////////////////////////
+
+        fileBase: {
+            desc: File Base
+            art: FMENU
+            prompt: fileMenuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { menuOption: "L" }
+                    action: @menu:fileBaseListEntries
+                }
+                {
+                    value: { menuOption: "B" }
+                    action: @menu:fileBaseBrowseByAreaSelect
+                }
+                {
+                    value: { menuOption: "F" }
+                    action: @menu:fileAreaFilterEditor
+                }
+                {
+                    value: { menuOption: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { menuOption: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { menuOption: "D" }
+                    action: @menu:fileBaseDownloadManager
+                }
+                {
+                    value: { menuOption: "W" }
+                    action: @menu:fileBaseWebDownloadManager
+                }
+                {
+                    value: { menuOption: "U" }
+                    action: @menu:fileBaseUploadFiles
+                }
+                {
+                    value: { menuOption: "S" }
+                    action: @menu:fileBaseSearch
+                }
+                {
+                    value: { menuOption: "P" }
+                    action: @menu:fileBaseSetNewScanDate
+                }
+                {
+                    value: { menuOption: "E" }
+                    action: @menu:fileBaseExportListFilter
+                }
+            ]
+        }
+
+        fileBaseExportListFilter: {
+            module: file_base_search
+            //  :TODO: fixme:
+            art: FSEARCH
+            config: {
+                fileBaseListEntriesMenu: fileBaseExportList
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        ET3: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM4: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM5: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                                "filename"
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM6: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseExportList: {
+            module: file_base_user_list_export
+            art: FBLISTEXP
+            config: {
+                pause: true
+                templates: {
+                    entry: file_list_entry.asc
+                }
+            }
+            form: {
+                0: {
+                    mci:  {
+                        TL1: { }
+                        TL2: { }
+                    }
+                }
+            }
+        }
+
+        fileBaseExportListNoResults: {
+            desc: Browsing Files
+            art: FBNORES
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileBaseSetNewScanDate: {
+            module: set_newscan_date
+            desc: File Base
+            art: SETFNSDATE
+            config: {
+                target: file
+                scanDateFormat: YYYYMMDD
+            }
+            form: {
+                0: {
+                    mci: {
+                        ME1: {
+                            focus: true
+                            submit: true
+                            argName: scanDate
+                            maskPattern: "####/##/##"
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { scanDate: null }
+                                action: @method:scanDateSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseListEntries: {
+            module: file_area_list
+            desc: Browsing Files
+            config: {
+                art: {
+                    browse: FBRWSE
+                    details: FDETAIL
+                    detailsGeneral: FDETGEN
+                    detailsNfo: FDETNFO
+                    detailsFileList: FDETLST
+                    help: FBHELP
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+
+                        HM2: {
+                            focus: true
+                            submit: true
+                            argName: navSelect                          
+                            items: [
+                                "prev", "next", "details", "toggle queue", "rate", "change filter", "help", "quit"
+                            ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFile
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFile
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:viewDetails
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:toggleQueue
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @menu:fileBaseGetRatingForSelectedEntry
+                            }                           
+                            {
+                                value: { navSelect: 5 }
+                                action: @menu:fileAreaFilterEditor
+                            }
+                            {
+                                value: { navSelect: 6 }
+                                action: @method:displayHelp
+                            }
+                            {
+                                value: { navSelect: 7 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "w", "shift + w" ]
+                            action: @method:showWebDownloadLink
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "t", "shift + t" ]
+                            action: @method:toggleQueue
+                        }
+                        {
+                            keys: [ "f", "shift + f" ]
+                            action: @menu:fileAreaFilterEditor
+                        }
+                        {
+                            keys: [ "v", "shift + v" ]
+                            action: @method:viewDetails
+                        }
+                        {
+                            keys: [ "r", "shift + r" ]
+                            action: @menu:fileBaseGetRatingForSelectedEntry
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:displayHelp
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: {
+                        HM1: {
+                            focus: true
+                            submit: true
+                            argName: navSelect
+                            items: [
+                                "general", "nfo/readme", "file listing"
+                            ]
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @method:detailsQuit
+                        }
+                    ]
+                }
+
+                2: {
+                    //  details - general
+                    mci: {}                 
+                }
+
+                3: {
+                    //  details - nfo/readme
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+                    }
+                }
+
+                4: {
+                    //  details - file listing
+                    mci: {
+                        VM1: {
+
+                        }
+                    }
+                }
+            }
+        }
+
+        fileBaseBrowseByAreaSelect: {
+            desc: Browsing File Areas
+            module: file_base_area_select
+            art: FAREASEL
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            argName: areaTag
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { areaTag: null }
+                                action: @method:selectArea
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseGetRatingForSelectedEntry: {
+            desc: Rating a File
+            prompt: fileBaseRateEntryPrompt
+            config: {
+                cls: true
+            }
+            submit: [
+            //  :TODO: handle esc/q
+                {
+                    //  pass data back to caller
+                    value: { rating: null }
+                    action: @systemMethod:prevMenu
+                }
+            ]
+        }
+
+        fileBaseListEntriesNoResults: {
+            desc: Browsing Files
+            art: FBNORES
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileBaseSearch: {
+            module: file_base_search
+            desc: Searching Files
+            art: FSEARCH
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        ET3: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM4: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM5: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                                "filename",
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM6: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileAreaFilterEditor: {
+            desc: File Filter Editor
+            module: file_area_filter_edit
+            art: FFILEDT
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            argName: searchTerms
+                        }
+                        ET2: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM3: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM4: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM5: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        ET6: {
+                            maxLength: 64
+                            argName: name
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        HM7: {
+                            focus: true
+                            items: [
+                                "prev", "next", "make active", "save", "new", "delete"
+                            ]
+                            argName: navSelect
+                            focusItemIndex: 1
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFilter
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFilter
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:makeFilterActive
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:saveFilter
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @method:newFilter
+                            }
+                            {
+                                value: { navSelect: 5 }
+                                action: @method:deleteFilter
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseDownloadManager: {
+            desc: Download Manager
+            module: file_base_download_manager
+            config: {
+                art: {
+                    queueManager: FDLMGR
+                    /*
+                    NYI
+                    details: FDLDET
+                    */
+                }
+                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            argName: queueItem
+                        }
+                        HM2: {
+                            focus: true
+                            items: [ "download all", "quit" ]
+                            argName: navSelect
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:downloadAll
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "a", "shift + a" ]
+                            action: @method:downloadAll
+                        }
+                        {
+                            keys: [ "delete", "r", "shift + r" ]
+                            action: @method:removeItem
+                        }
+                        {
+                            keys: [ "c", "shift + c" ]
+                            action: @method:clearQueue
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseWebDownloadManager: {
+            desc: Web D/L Manager
+            module: file_base_web_download_manager
+            config: {
+                art: {
+                    queueManager: FWDLMGR
+                    batchList: BATDLINF
+                }
+                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            argName: queueItem
+                        }
+                        HM2: {
+                            focus: true
+                            items: [ "get batch link", "quit", "help" ]
+                            argName: navSelect
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:getBatchLink
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "b", "shift + b" ]
+                            action: @method:getBatchLink
+                        }
+                        {
+                            keys: [ "delete", "r", "shift + r" ]
+                            action: @method:removeItem
+                        }
+                        {
+                            keys: [ "c", "shift + c" ]
+                            action: @method:clearQueue
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseDownloadManagerEmptyQueue: {
+            desc: Empty Download Queue
+            art: FEMPTYQ
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileTransferProtocolSelection: {
+            desc: Protocol selection
+            module: file_transfer_protocol_select
+            art: FPROSEL
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            argName: protocol
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { protocol: null }
+                                action: @method:selectProtocol
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseUploadFiles: {
+            desc: Uploading
+            module: upload
+            config: {
+                art: {
+                    options: ULOPTS
+                    fileDetails: ULDETAIL
+                    processing: ULCHECK
+                    dupes: ULDUPES
+                }
+            }
+
+            form: {
+                //  options
+                0: {
+                    mci: {
+                        SM1: {
+                            argName: areaSelect
+                            focus: true
+                        }
+                        TM2: {
+                            argName: uploadType
+                            items: [ "blind", "supply filename" ]
+                        }
+                        ET3: {
+                            argName: fileName
+                            maxLength: 255
+                            validate: @method:validateNonBlindFileName
+                        }
+                        HM4: {
+                            argName: navSelect
+                            items: [ "continue", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:optionsNavContinue
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    "actionKeys" : [
+                        {
+                            "keys"      : [ "escape" ],
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: { }
+                }
+
+                //  file details entry
+                2: {
+                    mci: {
+                        MT1: {
+                            argName: shortDesc
+                            tabSwitchesView: true
+                            focus: true
+                        }
+
+                        ET2: {
+                            argName: tags
+                        }
+
+                        ME3: {
+                            argName: estYear
+                            maskPattern: "####"
+                        }
+
+                        BT4: {
+                            argName: continue
+                            text: continue
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { continue: null }
+                                action: @method:fileDetailsContinue
+                            }
+                        ]
+                    }
+                }
+
+                //  dupes
+                3: {
+                    mci: {
+                        VM1: {
+                            /*
+                            Use 'dupeInfoFormat' to custom format:
+
+                            areaDesc
+                            areaName
+                            areaTag
+                            desc
+                            descLong
+                            fileId
+                            fileName
+                            fileSha256
+                            storageTag
+                            uploadTimestamp
+
+                            */
+
+                            mode: preview
+                        }
+                    }
+                }
+            }
+        }
+
+        fileBaseNoUploadAreasAvail: {
+            desc: File Base
+            art: ULNOAREA
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        sendFilesToUser: {
+            desc: Downloading
+            module: file_transfer
+            config: {
+                //  defaults - generally use extraArgs
+                protocol: zmodem8kSexyz
+                direction: send
+            }
+        }
+
+        recvFilesFromUser: {
+            desc: Uploading
+            module: file_transfer
+            config: {
+                //  defaults - generally use extraArgs
+                protocol: zmodem8kSexyz
+                direction: recv
+            }   
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //  Required entries
+        ////////////////////////////////////////////////////////////////////////
+        idleLogoff: {
+            art:    IDLELOG
+            next:   @systemMethod:logoff
+        }
+        ////////////////////////////////////////////////////////////////////////
+        //  Demo Section
+        //  :TODO: This entire section needs updated!!!
+        ////////////////////////////////////////////////////////////////////////
+        "demoMain" : {
+            "art" : "demo_selection_vm.ans",
+            "form" : {
+                "0" : {
+                    "VM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "Single Line Text Editing Views",
+                                    "Spinner & Toggle Views",
+                                    "Mask Edit Views",
+                                    "Multi Line Text Editor",
+                                    "Vertical Menu Views",
+                                    "Horizontal Menu Views",
+                                    "Art Display",
+                                    "Full Screen Editor"
+                                ],
+                                "height" : 10,
+                                "itemSpacing" : 1,
+                                "justify" : "center",
+                                "focusTextStyle" : "small i"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : { "1" : 0 },
+                                    "action" : "@menu:demoEditTextView"
+                                },
+                                {
+                                    "value" : { "1" : 1 },
+                                    "action" : "@menu:demoSpinAndToggleView"
+                                },
+                                {
+                                    "value" : { "1" : 2 },
+                                    "action" : "@menu:demoMaskEditView"
+                                },
+                                {
+                                    "value" : { "1" : 3 },
+                                    "action" : "@menu:demoMultiLineEditTextView"
+                                },
+                                {
+                                    "value" : { "1" : 4 },
+                                    "action"    : "@menu:demoVerticalMenuView"
+                                },
+                                {
+                                    "value"     : { "1" : 5 },
+                                    "action"    : "@menu:demoHorizontalMenuView"
+                                },
+                                {
+                                    "value" : { "1" : 6 },
+                                    "action" : "@menu:demoArtDisplay"
+                                },
+                                {
+                                    "value" : { "1" : 7 },
+                                    "action" : "@menu:demoFullScreenEditor"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "demoEditTextView" : {
+            "art" : "demo_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTETETETET" : {
+                        "mci" : {
+                            "ET1" : {
+                                "width"     : 20,
+                                "maxLength" : 20
+                            },
+                            "ET2" : {
+                                "width"     : 20,
+                                "maxLength" : 40,
+                                "textOverflow" : "..."
+                            },
+                            "ET3" : {
+                                "width"     : 20,
+                                "fillChar" : "-",
+                                "styleSGR1" : "|00|36",
+                                "maxLength" : 20
+                            },
+                            "ET4" : {
+                                "width"     : 20,
+                                "maxLength" : 20,
+                                "password"  : true
+                            },
+                            "BT5" : {
+                                "width" : 8,
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoSpinAndToggleView" : {
+            "art" : "demo_spin_and_toggle.ans",
+            "form" : {
+                "0" : {
+                    "BTSMSMTM" : {
+                        "mci" : {
+                            "SM1" : {
+                                "items" : [ "Henry Morgan", "François l'Ollonais", "Roche Braziliano", "Black Bart", "Blackbeard" ]
+                            },
+                            "SM2" : {
+                                "items" : [ "Razor 1911", "DrinkOrDie", "TRSI" ]
+                            },
+                            "TM3" : {
+                                "items"     : [ "Yarly", "Nowaii" ],
+                                "styleSGR1" : "|00|30|01",
+                                "hotKeys"   : { "Y" : 0, "N" : 1 }
+                            },
+                            "BT8" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 8,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 8
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoMaskEditView" : {
+            "art" : "demo_mask_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTMEME" : {
+                        "mci" : {
+                            "ME1" : {
+                                "maskPattern"   : "##/##/##",
+                                "styleSGR1"     : "|00|30|01",
+                                //"styleSGR2"       : "|00|45|01",
+                                "styleSGR3"     : "|00|30|35",
+                                "fillChar"      : "#"
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoMultiLineEditTextView" : {
+            "art" : "demo_multi_line_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTMT" : {
+                        "mci" : {
+                            "MT1" : {
+                                "width"     : 70,
+                                "height"    : 17,
+                                //"text"        : "@art:demo_multi_line_edit_text_view_text.txt",
+                                // "text" : "@systemMethod:textFromFile"
+                                text: "Hints:\n\t* Insert / CTRL-V toggles overtype mode\n\t* CTRL-Y deletes the current line\n\t* Try Page Up / Page Down\n\t* Home goes to the start of line text\n\t* End goes to the end of a line\n\n\nTab handling:\n-------------------------------------------------\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\nA0\tBB\t1\tCCC\t2\tDDD\t3EEEE\nW\t\tX\t\tY\t\tZ\n\nAn excerpt from A Clockwork Orange:\n\"What sloochatted then, of course, was that my cellmates woke up and started joining in, tolchocking a bit wild in the near-dark, and the shoom seemed to wake up the whole tier, so that you could slooshy a lot of creeching and banging about with tin mugs on the wall, as though all the plennies in all the cells thought a big break was about to commence, O my brothers.\n",
+                                "focus"     : true
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoHorizontalMenuView" : {
+            "art" : "demo_horizontal_menu_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTHMHM" : {
+                        "mci" : {
+                            "HM1" : {
+                                "items" : [ "One", "Two", "Three" ],
+                                "hotKeys" : { "1" : 0, "2" : 1, "3" : 2 }
+                            },
+                            "HM2" : {
+                                "items" : [ "Uno", "Dos", "Tres" ],
+                                "hotKeys" : { "U" : 0, "D" : 1, "T" : 2 }
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoVerticalMenuView" : {
+            "art"       : "demo_vertical_menu_view1.ans",
+            "form"      : {
+                "0" : {
+                    "BTVM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "|33Oblivion/2",
+                                    "|33iNiQUiTY",
+                                    "|33ViSiON/X"
+                                ],
+                                "focusItems" : [
+                                    "|33Oblivion|01/|00|332",
+                                    "|01|33i|00|33N|01i|00|33QU|01i|00|33TY",
+                                    "|33ViSiON/X"
+                                ]
+                                //
+                                //  :TODO: how to do the following:
+                                //  1) Supply a view a string for a standard vs focused item
+                                //      "items" : [...], "focusItems" : [ ... ] ?
+                                //      "draw" : "@method:drawItemX", then items: [...]
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : 5,
+                                    "action"    : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+
+        },
+        "demoArtDisplay" : {
+            "art" : "demo_selection_vm.ans",
+            "form" : {
+                "0" : {
+                    "VM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "Defaults - DOS ANSI",
+                                    "bw_mindgames.ans - DOS",
+                                    "test.ans - DOS",
+                                    "Defaults - Amiga",
+                                    "Pause at Term Height"
+                                ],
+                                //  :TODO: justify not working??
+                                "focusTextStyle" : "small i"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : { "1" : 0 },
+                                    "action" : "@menu:demoDefaultsDosAnsi"
+                                },
+                                {
+                                    "value" : { "1" : 1 },
+                                    "action" : "@menu:demoDefaultsDosAnsi_bw_mindgames"
+                                },
+                                {
+                                    "value" : { "1" : 2 },
+                                    "action" : "@menu:demoDefaultsDosAnsi_test"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "demoDefaultsDosAnsi" : {
+            "art" : "DM-ENIG2.ANS"
+        },
+        "demoDefaultsDosAnsi_bw_mindgames" : {
+            "art" : "bw_mindgames.ans"
+        },
+        "demoDefaultsDosAnsi_test" : {
+            "art" : "test.ans"
+        },
+        "demoFullScreenEditor" : {
+            "module"    : "fse",
+            "config"    : {
+                "editorType"    : "netMail",
+                "art"           : {
+                    "header"            : "demo_fse_netmail_header.ans",
+                    "body"              : "demo_fse_netmail_body.ans",
+                    "footerEditor"      : "demo_fse_netmail_footer_edit.ans",
+                    "footerEditorMenu"  : "demo_fse_netmail_footer_edit_menu.ans",
+                    "footerView"        : "demo_fse_netmail_footer_view.ans",
+                    "help"              : "demo_fse_netmail_help.ans"
+                }
+            },
+            "form" : {
+                "0" : {
+                    "ETETET" : {
+                        "mci" : {
+                            "ET1" : {
+                                //  :TODO: from/to may be set by args
+                                //  :TODO: focus may change dep on view vs edit
+                                "width"     : 36,
+                                "focus"     : true,
+                                "argName"   : "to"
+                            },
+                            "ET2" : {
+                                "width"     : 36,
+                                "argName"   : "from"
+                            },
+                            "ET3" : {
+                                "width"     : 65,
+                                "maxLength" : 72,
+                                "submit"    : [ "enter" ],
+                                "argName"   : "subject"
+                            }
+                        },
+                        "submit" : {
+                            "3" : [
+                                {
+                                    "value" : { "subject" : null },
+                                    "action" : "@method:headerSubmit"
+                                }
+                            ]
+                        }
+                    }
+                },
+                "1" : {
+                    "MT" : {
+                        "mci" : {
+                            "MT1" : {
+                                "width"     : 79,
+                                "height"    : 17,
+                                "text"      : "",   //  :TODO: should not be req.
+                                "argName"   : "message"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : "message",
+                                    "action"    : "@method:editModeEscPressed"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 1
+                            }
+                        ]
+                    }
+                },
+                "2" : {
+                    "TLTL" :  {
+                        "mci" : {
+                            "TL1" : {
+                                "width" : 5
+                            },
+                            "TL2" : {
+                                "width" : 4
+                            }
+                        }
+                    }
+                },
+                "3" : {
+                    "HM" : {
+                        "mci" : {
+                            "HM1" : {
+                                //  :TODO: Continue, Save, Discard, Clear, Quote, Help
+                                "items" : [ "Save", "Discard", "Quote", "Help" ]
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : { "1" : 0 },
+                                    "action"    : "@method:editModeMenuSave"
+                                },
+                                {
+                                    "value"     : { "1" : 1 },
+                                    "action"    : "@menu:demoMain"
+                                },
+                                {
+                                    "value"     : { "1" : 2 },
+                                    "action"    : "@method:editModeMenuQuote"
+                                },
+                                {
+                                    "value"     : { "1" : 3 },
+                                    "action"    : "@method:editModeMenuHelp"
+                                },
+                                {
+                                    "value"     : 1,
+                                    "action"    : "@method:editModeEscPressed"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [    //  :TODO: Need better name
+                            {
+                                "keys"      : [ "escape" ],
+                                "action"    : "@method:editModeEscPressed"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
 }

From 33478354488a3a42cfe31a57b53cd9f0633fff94 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 17:07:48 -0700
Subject: [PATCH 0679/1013] Header to achievements.hjson

---
 config/achievements.hjson | 42 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index cb58ddd1..4100d2dd 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -1,3 +1,43 @@
+    /*
+        ./\/\.' ENiGMA½ Achievement Configuration -/--/-------- - --   - 
+
+        _____________________   _____  ____________________    __________\_   /
+        \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+        //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+        /____       _____|      __________       ___|__|      ____|     \   /  _____  \
+        ---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                         /__   _\
+        <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+
+        *-----------------------------------------------------------------------------*
+
+        General Information
+        ------------------------------- -   -
+        This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
+        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
+
+        See http://hjson.org/ for more information and syntax.
+
+        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
+        on have syntax highlighting for the HJSON format which are highly recommended.
+
+        ------------------------------- -- -    -
+        Achievement Configuration
+        ------------------------------- -   -
+        Achievements are currently fairly limited in what can trigger them. This is
+        being expanded upon and more will be available in the near future. For now
+        you should mostly be interested in:
+        - Perhaps adding additional *levels* of triggers & points
+        - Applying customizations via the achievements section in theme.hjson
+
+        Don't forget to RTFM ...er, uh... see the documentation for more information, and
+        don't be shy to ask for help:
+
+        BBS     : Xibalba @ xibalba.l33t.codes
+        FTN     : BBS Discussion on fsxNet or ArakNet
+        IRC     : #enigma-bbs / FreeNode
+        Email   : bryan@l33t.codes
+*/
 {
     enabled : true,
 
@@ -8,8 +48,6 @@
         globalFooter    : 'achievement_global_footer',
     },
 
-    //  :TODO: achievements should be a path/filename -> achievements.hjson & allow override/theming
-
     achievements : {
         user_login_count : {
             type        : 'userStat',

From 3d07f763d1861c0821042c60ebe607c75ab6d95d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 19:04:19 -0700
Subject: [PATCH 0680/1013] Achievement improvement & more achievements

---
 art/themes/luciano_blocktronics/STATUS.ANS | Bin 4517 -> 4686 bytes
 config/achievements.hjson                  | 203 ++++++++++++++++-----
 core/achievement.js                        |   7 +-
 3 files changed, 159 insertions(+), 51 deletions(-)

diff --git a/art/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS
index b90ed2d9ffede5f3db62c67ff44131899d870bca..679e21d691e6973dfd63e41c32257b29735eff56 100644
GIT binary patch
delta 526
zcmZ3gd`@M;5lIE<Xk)Y7y!@0@Aj>dU)z8IDI@%ytI(p)9Ep=l<XP}_9u|e+b+gu8_
zZ-Zn&%0MF0(H1~S5N)<unK7AJL;)gWma6~+5E;|ST`aBk5I#^7SPE(ekds*;9c>D;
zzzQf1RsnW}XMiEp8HNUv7x0Tr_GNA20b2|-1Eg~DBsQDLd~A&zK<68QgeF(8YfL`C
zwwWDj{$yJYeMZB{3)$ySHsn;8oXT;O4{8@!InabRoLZA3IH$9g>gN<IOrFms!5m;{
zJei+sq9DX0K(9jlp`b81hg%aAQeck*X^2mN43PItCtu`RG+CZUT@j)J;zDRBKz$8%
z6wsVm+|?}7(MINzy?Ev`85vCe%X0&&3u>FOd2V8IMrLYRYHn&?2}IlETfEOyK#m7m
zo19;oR|0d16~rm3j^Ky@8h@DYrZz+j6y^mb#c-8ClMtcn7yvPN^Fsc6jEqkwHwdZ%
E0Ky)RGynhq

delta 335
zcmX@7vQ&A(5oYOV!-;pbj0{bkfh=odvs?w~Xaj3wBM@zDo(mK-fyfx--oDMHaQik;
z8YF7ES&uQ9nFYu)oV=8!RZBYB0;mqCKQBKeRY3u$8)%wAt`*1_vs_g_7c;0v!^xSf
z(*z;HnFUZwOr0kmWEW-e3@|jCypTg=vKw0yGf>H7ZZ@0AZ0t)}fouco$rso(7>y=B
zVxK>GE4$9*6&(9m%z$=IuH#UiJe_kMW6I>eT+%Eq-iAh#L%Ak0OGlec*5^{=fZJ=y
zy=d}3E+tlwo1G^s^Hehf-8uORx8CHX9Q>2l@=Or{83zso>1a@RfIMnB*_rnSNQ=4i
gWE;L`%!U@ulim1lf<(-mH+u=(V`Q|MtSO`l0RH`7od5s;

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 4100d2dd..8f1babfe 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -1,5 +1,5 @@
     /*
-        ./\/\.' ENiGMA½ Achievement Configuration -/--/-------- - --   - 
+        ./\/\." ENiGMA½ Achievement Configuration -/--/-------- - --   -
 
         _____________________   _____  ____________________    __________\_   /
         \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
@@ -14,11 +14,11 @@
         General Information
         ------------------------------- -   -
         This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
-        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
+        JSON is also perfectly valid. Use "hjson" from npm to convert to/from JSON.
 
         See http://hjson.org/ for more information and syntax.
 
-        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
+        Various editors and IDEs such as Sublime Text 3 Visual Studio Code and so
         on have syntax highlighting for the HJSON format which are highly recommended.
 
         ------------------------------- -- -    -
@@ -30,8 +30,11 @@
         - Perhaps adding additional *levels* of triggers & points
         - Applying customizations via the achievements section in theme.hjson
 
-        Don't forget to RTFM ...er, uh... see the documentation for more information, and
-        don't be shy to ask for help:
+        Some tips:
+        - For 'userStat' types, see user_property.js
+
+        Don"t forget to RTFM ...er uh... see the documentation for more information and
+        don"t be shy to ask for help:
 
         BBS     : Xibalba @ xibalba.l33t.codes
         FTN     : BBS Discussion on fsxNet or ArakNet
@@ -39,51 +42,159 @@
         Email   : bryan@l33t.codes
 */
 {
-    enabled : true,
+    enabled : true
 
     art : {
-        localHeader     : 'achievement_local_header',
-        localFooter     : 'achievement_local_footer',
-        globalHeader    : 'achievement_global_header',
-        globalFooter    : 'achievement_global_footer',
-    },
+        localHeader: achievement_local_header
+        localFooter: achievement_local_footer
+        globalHeader: achievement_global_header
+        globalFooter: achievement_global_footer
+    }
 
-    achievements : {
-        user_login_count : {
-            type        : 'userStat',
-            statName    : 'login_count',
-            retroactive : true,
+    achievements: {
+        user_login_count: {
+            type: userStat
+            statName: login_count
+            retroactive: true
+            match: {
+                2: {
+                    title: "Return Caller"
+                    globalText: "{userName} has returned to {boardName}!"
+                    text: "You\"ve returned to {boardName}!"
+                    points: 5
+                }
+                10: {
+                    title: "{boardName} Curious"
+                    globalText: "{userName} has logged into {boardName} {achievedValue} times!"
+                    text: "You've logged into {boardName} {achievedValue} times!"
+                    points: 5
+                }
+                25: {
+                    title: "{boardName} Inquisitive"
+                    globalText: "{userName} has logged into {boardName} {achievedValue} times!"
+                    text: "You've logged into {boardName} {achievedValue} times!"
+                    points: 10
+                }
+                100: {
+                    title: "{boardName} Regular"
+                    globalText: "{userName} has logged into {boardName} {achievedValue} times!"
+                    text: "You've logged into {boardName} {achievedValue} times!"
+                    points: 10
+                }
+                500:  {
+                    title: "{boardName} Addict"
+                    globalText: "{userName} the BBS {boardName} addict has logged in {achievedValue} times!"
+                    text: "You're a {boardName} addict! You've logged in {achievedValue} times!"
+                    points: 25
+                }
+            }
+        }
 
-            match : {
-                2 : {
-                    title       : 'Return Caller',
-                    globalText  : '{userName} has returned to {boardName}!',
-                    text        : 'You\'ve returned to {boardName}!',
-                    points      : 5,
-                },
-                10 : {
-                    title       : '{achievedValue} Logins',
-                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
-                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
-                    points      : 5,
-                },
-                25 : {
-                    title       : '{achievedValue} Logins',
-                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
-                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
-                    points      : 10,
-                },
-                100 : {
-                    title       : '{boardName} Regular',
-                    globalText  : '{userName} has logged into {boardName} {achievedValue} times!',
-                    text        : 'You\'ve logged into {boardName} {achievedValue} times!',
-                    points      : 10,
-                },
-                500 :  {
-                    title       : '{boardName} Addict',
-                    globalText  : '{userName} the BBS {boardName} addict has logged in {achievedValue} times!',
-                    text        : 'You\'re a {boardName} addict! You\'ve logged in {achievedValue} times!',
-                    points      : 25,
+        user_post_count: {
+            type: userStat
+            statName: post_count
+            retroactive: true
+            match: {
+                5: {
+                    title: "Poster"
+                    globalText: "{userName} has posted {achievedValue} messages!"
+                    text: "You've posted {achievedValue} messages!"
+                    points: 5
+                }
+                20: {
+                    title: "Poster... again!",
+                    globalText: "{userName} has posted {achievedValue} messages!"
+                    text: "You've posted {achievedValue} messages!"
+                    points: 10
+                }
+                100: {
+                    title: "Frequent Poster",
+                    globalText: "{userName} has posted {achievedValue} messages!"
+                    text: "You've posted {achievedValue} messages!"
+                    points: 15
+                }
+                500: {
+                    title: "Scribe"
+                    globalText: "{userName} the scribe has posted {achievedValue} messages!"
+                    text: "Such a scribe! You've posted {achievedValue} messages!"
+                    points: 25
+                }
+            }
+        }
+
+        user_upload_count: {
+            type: userStat
+            statName: ul_total_count
+            retroactive: true
+            match: {
+                1: {
+                    title: "Uploader"
+                    globalText: "{userName} has uploaded a file!"
+                    text: "You've uploaded somthing!"
+                    points: 5
+                }
+                10: {
+                    title: "Moar Uploads!"
+                    globalText: "{userName} has uploaded {achievedValue} files!"
+                    text: "You've uploaded {achievedValue} files!"
+                    points: 10
+                }
+                50: {
+                    title: "Contributor"
+                    globalText: "{userName} has uploaded {achievedValue} files!"
+                    text: "You've uploaded {achievedValue} files!"
+                    points: 20
+
+                }
+                100: {
+                    title: "Courier"
+                    globalText: "Courier {userName} has uploaded {achievedValue} files!"
+                    text: "You've uploaded {achievedValue} files!"
+                    points: 25
+                }
+                200: {
+                    title: "Must Be a Drop Site"
+                    globalText: "{userName} has uploaded a whomping {achievedValue} files!"
+                    text: "You've uploaded a whomping {achievedValue} files!"
+                    points: 50
+                }
+            }
+        }
+
+        user_download_count: {
+            type: userStat
+            statName: dl_total_count
+            retroactive: true
+            match: {
+                1: {
+                    title: "Downloader"
+                    globalText: "{userName} has downloaded a file!"
+                    text: "You've downloaded somthing!"
+                    points: 5
+                }
+                10: {
+                    title: "Moar Downloads!"
+                    globalText: "{userName} has downloaded {achievedValue} files!"
+                    text: "You've downloaded {achievedValue} files!"
+                    points: 10
+                }
+                50: {
+                    title: "Leecher"
+                    globalText: "{userName} has leeched {achievedValue} files!"
+                    text: "You've leeched... er... downloaded {achievedValue} files!"
+                    points: 15
+                }
+                100: {
+                    title: "Hoarder"
+                    globalText: "{userName} has downloaded {achievedValue} files!"
+                    text: "Hoarding files? You've downloaded {achievedValue} files!"
+                    points: 20
+                }
+                200: {
+                    title: "Digital Archivist"
+                    globalText: "{userName} the digital archivist has {achievedValue} files!"
+                    text: "Building an archive? You've downloaded {achievedValue} files!"
+                    points: 25
                 }
             }
         }
diff --git a/core/achievement.js b/core/achievement.js
index cc64779c..e5eecd87 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -159,10 +159,6 @@ class Achievements {
                 return cb(null);
             }
         );
-
-        //  :TODO: if enabled/etc., load achievements.hjson -> if theme achievements.hjson{}, merge @ display time?
-        //  merge for local vs global (per theme) clients
-        //  ...only merge/override text        
     }
 
     loadAchievementHitCount(user, achievementTag, field, cb) {
@@ -404,7 +400,8 @@ class Achievements {
                             pause   : true,
                         };
                         if(headerArt || footerArt) {
-                            interruptItems[itemType].contents = `${headerArt || ''}\r\n${pipeToAnsi(title)}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
+                            interruptItems[itemType].contents =
+                                `${headerArt || ''}\r\n${pipeToAnsi(title)}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
                         }
                         return callback(null);
                     }

From 209e3f1f1d6e6868a589461bde5df57d072c6a82 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 21:16:57 -0700
Subject: [PATCH 0681/1013] Update copyright

---
 LICENSE.TXT                  | 2 +-
 README.md                    | 3 ++-
 docs/installation/testing.md | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 8db0cf42..74697ba9 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018, Bryan D. Ashby
+Copyright (c) 2015-2019, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index a0bde9d0..1d178892 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * [Gazelle](https://github.com/WhatCD/Gazelle) inspired File Bases including fast fully indexed full text search (FTS), #tags, and HTTP(S) temporary download URLs using a built in [web server](docs/servers/web-server.md). Legacy X/Y/Z modem also supported!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, etc.
+ * A built in achievement system. BBSing gamified!
  
 ## Documentation
 [Browse the docs online](https://nuskooler.github.io/enigma-bbs/). Be sure to checkout the [/docs/](/docs/) folder as well for the latest and greatest documentation.
@@ -84,7 +85,7 @@ Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/install
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:
 
-Copyright (c) 2015-2018, Bryan D. Ashby
+Copyright (c) 2015-2019, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/docs/installation/testing.md b/docs/installation/testing.md
index 9238fc61..b23616f2 100644
--- a/docs/installation/testing.md
+++ b/docs/installation/testing.md
@@ -13,7 +13,7 @@ _Note that if you've used the [Docker](docker) installation method, you've alrea
 If everything went OK: 
 
 ```bash
-ENiGMA½ Copyright (c) 2014-2018 Bryan Ashby
+ENiGMA½ Copyright (c) 2014-2019 Bryan Ashby
 _____________________   _____  ____________________    __________\_   /
 \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
 //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____

From 9d39e99c5a71fc3fda593b8a84bf7bb38b60b4ee Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 21:17:18 -0700
Subject: [PATCH 0682/1013] Update copyright

---
 core/connect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/connect.js b/core/connect.js
index b9316a3e..cda3fe8a 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -132,7 +132,7 @@ function displayBanner(term) {
     //  note: intentional formatting:
     term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
-|06Copyright (c) 2014-2018 Bryan Ashby |14- |12http://l33t.codes/
+|06Copyright (c) 2014-2019 Bryan Ashby |14- |12http://l33t.codes/
 |06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/
 |00`
     );

From 22b7fdd65c9107be8be3e3cbe2f94bb7dcc8adb1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 21:17:53 -0700
Subject: [PATCH 0683/1013] Add door stats & new mini format styles + Door runs
 stat + Door run minutes stat + Door runs MCI + Door run friendly duration MCI
 + durationHours/Minutes/Seconds mini format styles

---
 config/achievements.hjson | 70 +++++++++++++++++++++++++++++++++++++++
 core/abracadabra.js       | 12 +++++++
 core/predefined_mci.js    |  6 ++++
 core/string_format.js     |  5 +++
 core/user_property.js     |  3 ++
 docs/art/mci.md           | 20 +++++++++++
 6 files changed, 116 insertions(+)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 8f1babfe..ce841e93 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -198,5 +198,75 @@
                 }
             }
         }
+
+        user_door_runs: {
+            type: userStat
+            statName: door_run_total_count
+            retroactive: true
+            match: {
+                1: {
+                    title: "Nostalgia Toe Dip",
+                    globalText: "{userName} ran a door!"
+                    text: "You ran a door!"
+                    points: 5
+                },
+                10: {
+                    title: "This is Kinda Fun"
+                    globalText: "{userName} ran {achievedValue} doors!"
+                    text: "You've run {achievedValue} doors!"
+                    points: 10
+                }
+                50: {
+                    title: "Gamer"
+                    globalText: "{userName} ran {achievedValue} doors!"
+                    text: "You've run {achievedValue} doors!"
+                    points: 15
+                }
+                100: {
+                    title: "Textmode is All You Need"
+                    globalText: "{userName} must really like textmode and has run {achievedValue} doors!"
+                    text: "You've run {achievedValue} doors! You must really like textmode!"
+                    points: 25
+                }
+                200: {
+                    title: "Dropfile Enthusiast"
+                    globalText: "{userName} the dropfile enthusiast ran {achievedValue} doors!"
+                    text: "You're a dropfile enthusiast! You've run {achievedValue} doors!"
+                    points: 50
+                }
+            }
+        }
+
+        user_door_total_minutes: {
+            type: userStat
+            statName: door_run_total_minutes
+            retroactive: true
+            match: {
+                1: {
+                    title: "Nevermind!"
+                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}. Guess it's not their thing!"
+                    text: "You ran a door for only {achievedValue!durationSeconds}. Not your thing?"
+                    points: 5
+                }
+                10: {
+                    title: "It's OK I Guess"
+                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}!"
+                    text: "You ran a door for {achievedValue!durationSeconds}!"
+                    points: 10
+                }
+                30: {
+                    title: "Good Game"
+                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}!"
+                    text: "You ran a door for {achievedValue!durationSeconds}!"
+                    points: 20
+                }
+                60: {
+                    title: "Textmode Dragon Slayer"
+                    globalText: "{userName} has spent {achievedValue!durationSeconds} in a door!"
+                    text: "You've spent {achievedValue!durationSeconds} in a door!"
+                    points: 25
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/core/abracadabra.js b/core/abracadabra.js
index e448315b..42731ac0 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -8,12 +8,15 @@ const theme             = require('./theme.js');
 const ansi              = require('./ansi_term.js');
 const Events            = require('./events.js');
 const { Errors }        = require('./enig_error.js');
+const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async             = require('async');
 const assert            = require('assert');
 const _                 = require('lodash');
 const paths             = require('path');
+const moment            = require('moment');
 
 const activeDoorNodeInstances = {};
 
@@ -149,6 +152,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
     }
 
     runDoor() {
+        StatLog.incrementUserStat(this.client.user, UserProps.DoorRunTotalCount, 1);
         Events.emit(Events.getSystemEvents().UserRunDoor, { user : this.client.user } );
 
         this.client.term.write(ansi.resetScreen());
@@ -164,7 +168,15 @@ exports.getModule = class AbracadabraModule extends MenuModule {
             node            : this.client.node,
         };
 
+        const startTime = moment();
+
         this.doorInstance.run(exeInfo, () => {
+            const endTime = moment();
+            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+            if(runTimeMinutes > 0) {
+                StatLog.incrementUserStat(this.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+            }
+
             //
             //  Try to clean up various settings such as scroll regions that may
             //  have been set within the door
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 01b1e285..39e339cc 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -155,6 +155,12 @@ const PREDEFINED_MCI_GENERATORS = {
     AC  : function achievementCount(client) { return userStatAsString(client, UserProps.AchievementTotalCount, 0); },
     AP  : function achievementPoints(client) { return userStatAsString(client, UserProps.AchievementTotalPoints, 0); },
 
+    DR  : function doorRuns(client) { return userStatAsString(client, UserProps.DoorRunTotalCount, 0); },
+    DM  : function doorFriendlyRunTime(client) {
+        const minutes = client.user.properties[UserProps.DoorRunTotalMinutes] || 0;
+        return moment.duration(minutes, 'minutes').humanize();
+    },
+
     //
     //  Date/Time
     //
diff --git a/core/string_format.js b/core/string_format.js
index a756db72..4a5b110c 100644
--- a/core/string_format.js
+++ b/core/string_format.js
@@ -14,6 +14,7 @@ const {
 
 //  deps
 const _             = require('lodash');
+const moment        = require('moment');
 
 /*
     String formatting HEAVILY inspired by David Chambers string-format library
@@ -281,6 +282,10 @@ const transformers = {
     countWithAbbr       : (n) => formatCount(n, true, 0),
     countWithoutAbbr    : (n) => formatCount(n, false, 0),
     countAbbr           : (n) => formatCountAbbr(n),
+
+    durationHours       : (h) => moment.duration(h, 'hours').humanize(),
+    durationMinutes     : (m) => moment.duration(m, 'minutes').humanize(),
+    durationSeconds     : (s) => moment.duration(s, 'seconds').humanize(),
 };
 
 function transformValue(transformerName, value) {
diff --git a/core/user_property.js b/core/user_property.js
index dafd7170..a1489e82 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -50,6 +50,9 @@ module.exports = {
     MessageAreaTag              : 'message_area_tag',
     MessagePostCount            : 'post_count',
 
+    DoorRunTotalCount           : 'door_run_total_count',
+    DoorRunTotalMinutes         : 'door_run_total_minutes',
+
     AchievementTotalCount       : 'achievement_total_count',
     AchievementTotalPoints      : 'achievement_total_points',
 };
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 5ec86805..3e5e18c5 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -60,6 +60,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SW` | Current user's term width |
 | `AC` | Current user's total achievements |
 | `AP` | Current user's total achievement points |
+| `DR` | Current user's number of door runs |
+| `DM` | Current user's total amount of time spent in doors |
 | `DT` | Current date (using theme date format) |
 | `CT` | Current time (using theme time format) |
 | `OS` | System OS (Linux, Windows, etc.) |
@@ -155,6 +157,21 @@ Standard style types available for `textStyle` and `focusTextStyle`:
 Various strings can be formatted using a syntax that allows width & precision specifiers, text styling, etc. Depending on the context, various elements can be referenced by `{name}`. Additional text styles can be supplied as well. The syntax is largely modeled after Python's [string format mini language](https://docs.python.org/3/library/string.html#format-specification-mini-language).
 
 ### Additional Text Styles
+Some of the text styles mentioned above are also available in the mini format language:
+
+| Style | Description |
+|-------|-------------|
+| `normal` | Leaves text as-is. This is the default. |
+| `toUpperCase` or `styleUpper` | ENIGMA BULLETIN BOARD SOFTWARE |
+| `toLowerCase` or `styleLower` | enigma bulletin board software |
+| `styleTitle` | Enigma Bulletin Board Software |
+| `styleFirstLower` | eNIGMA bULLETIN bOARD sOFTWARE |
+| `styleSmallVowels` | eNiGMa BuLLeTiN BoaRD SoFTWaRe |
+| `styleBigVowels` | EniGMa bUllEtIn bOArd sOftwArE |
+| `styleSmallI` | ENiGMA BULLETiN BOARD SOFTWARE |
+| `styleMixed` | EnIGma BUlLEtIn BoaRd SOfTWarE (randomly assigned) |
+| `styleL33t` | 3n1gm4 bull371n b04rd 50f7w4r3 |
+
 Additional text styles are available for numbers:
 
 | Style             | Description   |
@@ -165,6 +182,9 @@ Additional text styles are available for numbers:
 | `countWithAbbr`   | Count with abbreviation such as `100 K`, `4.3 B`, etc.  |
 | `countWithoutAbbr`    | Just the count |
 | `countAbbr`       | Just the abbreviation such as `M` for millions.   |
+| `durationHours` | Converts the provided *hours* value to something friendly such as `4 hours`, or `4 days`. |
+| `durationMinutes` | Converts the provided *minutes* to something friendly such as `10 minutes` or `2 hours` |
+| `durationSeconds` | Converts the provided *seconds* to something friendly such as `23 seconds` or `2 minutes` |
 
 
 #### Examples

From 6496fd931aa5ed07ce5fdeea7fd989c47164105e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 21:19:43 -0700
Subject: [PATCH 0684/1013] + Missing art for luciano_blocktronics - node
 messaging & new achievement stuff. Placeholder mostly for now.

---
 art/themes/luciano_blocktronics/NODEMSG.ANS      | Bin 0 -> 1696 bytes
 art/themes/luciano_blocktronics/NODEMSGFTR.ANS   | Bin 0 -> 221 bytes
 art/themes/luciano_blocktronics/NODEMSGHDR.ANS   | Bin 0 -> 249 bytes
 .../achievement_global_footer.ans                | Bin 0 -> 221 bytes
 .../achievement_global_header.ans                | Bin 0 -> 247 bytes
 .../achievement_local_footer.ans                 | Bin 0 -> 221 bytes
 .../achievement_local_header.ans                 | Bin 0 -> 247 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/NODEMSG.ANS
 create mode 100644 art/themes/luciano_blocktronics/NODEMSGFTR.ANS
 create mode 100644 art/themes/luciano_blocktronics/NODEMSGHDR.ANS
 create mode 100644 art/themes/luciano_blocktronics/achievement_global_footer.ans
 create mode 100644 art/themes/luciano_blocktronics/achievement_global_header.ans
 create mode 100644 art/themes/luciano_blocktronics/achievement_local_footer.ans
 create mode 100644 art/themes/luciano_blocktronics/achievement_local_header.ans

diff --git a/art/themes/luciano_blocktronics/NODEMSG.ANS b/art/themes/luciano_blocktronics/NODEMSG.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..ebe742df8fce316add2404cc4ff8a93a102cfc65
GIT binary patch
literal 1696
zcmb_c!EVz)5KS)}a^S)ZOR$$7k=E;ALoE(zi7F%lNC{kgszNA8-Et@&R`qvmY5xTA
z-psDOiF(A5lI+gR+xOngy69}Xux-`&dC@f&MOW2+7zSfZ(UooGurRX3df|NE;|Ce|
zww^gCm1Ws3>X<GuWJo9gs>edH1XfFW{0DN1Al(<;YY-@j&c$1@asIEQ)ZTph{C;KD
zn@c?v0Wbz^10Ihu0gncR@hBrI;D)RMOSp_NihM*(EXic2l91AY0PzjQ<FATFY}|_k
z#3jn2$>IjBfkFVvFB0aHkQ`Mskb;0qgpJAgOC9<W#=SZ!GY4r1Yk)rJgDrGY>i`|w
zs#tm+l}>6>zIIU}+V}`T)Cfa$P!)1nK_4nU#!Mm}9?}_8yO^)mPA5jOsiE=wycYk}
zlWbPe_@lEYS7R4PXH=t+S&>N#Y(kpTwz3e1Pd`Wn+cyqTfbVE+(be%zWxR2|*i0fI
zcz>UFR<F_6NF|5m2nO54aO@>V03w<=72KW}%1lNZN2m-zLhP6Lq<Cu2!5O@)6u@DP
zx3i=$>{v_^E}}XtYo#C+Xn&yLAqn6GkDEtZ!@xvyv>RytR36PtNzNt?VVED1kb$8q
zIPK5x$kd!g&$!?C)6KdpI_DIm_Ag$lcNO0}A_cHGU9k9`^LN)Va0UeHPgh%q4p(D3
zvt<N$&m%5|1lv7dspg%QZ9i6dncNV$-v?y|#u87*5p#y=B5~)p%X9p~a-qRD&+g~d
z?e*UL__e?JewWk=bxx?5sHLk7$V#bL;k?;h-R|}`V~tL<o*L%QH_NXVD{D#qKRwQt
fZ_2W=ub#|iCnsNKPiOKx`*6NC-!7NB8o&Pmi7X%)

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/NODEMSGFTR.ANS b/art/themes/luciano_blocktronics/NODEMSGFTR.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..8cb30568bc48597a44aa443e7be088ff6e00d505
GIT binary patch
literal 221
zcmb1+Hn29dHZia^Hpo@DLsh^f73>)5>}p`3Ks{h&U}#}zXlNYEz`(%B7{I^?q=7)#
O)5%vM%-s>fgOdPMvQ=aN

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/NODEMSGHDR.ANS b/art/themes/luciano_blocktronics/NODEMSGHDR.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..9e38285aaea354711e7f6bd00807e17cc7e35a76
GIT binary patch
literal 249
zcmb1+Hn27^ur@Z&<>Hc#HncW2$W^#=|IY2(_Z2|2f;3Rx*eLfOkO7o5%k}ejaaHhj
z4Gwm6cSVyl$h{BL0fM(N08kWe<Q)Zt`&?4Nj-k%31_lb$14agh7KVm~#?=fA42+Bc
V49q|p2!uVId=<jn9U(k82>_EfNa_Fp

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/achievement_global_footer.ans b/art/themes/luciano_blocktronics/achievement_global_footer.ans
new file mode 100644
index 0000000000000000000000000000000000000000..8cb30568bc48597a44aa443e7be088ff6e00d505
GIT binary patch
literal 221
zcmb1+Hn29dHZia^Hpo@DLsh^f73>)5>}p`3Ks{h&U}#}zXlNYEz`(%B7{I^?q=7)#
O)5%vM%-s>fgOdPMvQ=aN

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/achievement_global_header.ans b/art/themes/luciano_blocktronics/achievement_global_header.ans
new file mode 100644
index 0000000000000000000000000000000000000000..87592fa3fcc8fda4bdcde2b176a922a0355a26b4
GIT binary patch
literal 247
zcmb1+Hn27^ur@Z&<>Hc#HncW2$W^#=|IY2(_Z2|2f;3Rx*eLfOkO7o5%XM`2@C<YH
zb@dBDlQPJ?4^$6=w=n=v6mH-h1%>-uQo)X)&aMUq3e*Ee28I@fhK9zK3=9m6i~$VH
TKpF^yJ)L|N!rUDpJU9seA0$YD

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/achievement_local_footer.ans b/art/themes/luciano_blocktronics/achievement_local_footer.ans
new file mode 100644
index 0000000000000000000000000000000000000000..8cb30568bc48597a44aa443e7be088ff6e00d505
GIT binary patch
literal 221
zcmb1+Hn29dHZia^Hpo@DLsh^f73>)5>}p`3Ks{h&U}#}zXlNYEz`(%B7{I^?q=7)#
O)5%vM%-s>fgOdPMvQ=aN

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/achievement_local_header.ans b/art/themes/luciano_blocktronics/achievement_local_header.ans
new file mode 100644
index 0000000000000000000000000000000000000000..87592fa3fcc8fda4bdcde2b176a922a0355a26b4
GIT binary patch
literal 247
zcmb1+Hn27^ur@Z&<>Hc#HncW2$W^#=|IY2(_Z2|2f;3Rx*eLfOkO7o5%XM`2@C<YH
zb@dBDlQPJ?4^$6=w=n=v6mH-h1%>-uQo)X)&aMUq3e*Ee28I@fhK9zK3=9m6i~$VH
TKpF^yJ)L|N!rUDpJU9seA0$YD

literal 0
HcmV?d00001


From 2b802cb53439c2448b096cf105a2440fc4a9efce Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 5 Jan 2019 22:51:16 -0700
Subject: [PATCH 0685/1013] Better theming for achievements

---
 .../achievement_global_header.ans             | Bin 247 -> 240 bytes
 .../achievement_local_header.ans              | Bin 247 -> 240 bytes
 art/themes/luciano_blocktronics/theme.hjson   |   5 +-
 config/achievements.hjson                     |   8 +--
 core/achievement.js                           |  57 ++++++++++++------
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/art/themes/luciano_blocktronics/achievement_global_header.ans b/art/themes/luciano_blocktronics/achievement_global_header.ans
index 87592fa3fcc8fda4bdcde2b176a922a0355a26b4..6104c2caccd3734f4fe8705453da53311734ffab 100644
GIT binary patch
delta 19
bcmey)_<?bP_(XY8M%RfZa~X>!UQz`BM@9zu

delta 44
zcmeys_?>Zrxa{rQ_Z1ZG+`pqB9c^H3Y?S*C$S|}vHp_K%_VApjJD0I?;%QX?pYIVa

diff --git a/art/themes/luciano_blocktronics/achievement_local_header.ans b/art/themes/luciano_blocktronics/achievement_local_header.ans
index 87592fa3fcc8fda4bdcde2b176a922a0355a26b4..6104c2caccd3734f4fe8705453da53311734ffab 100644
GIT binary patch
delta 19
bcmey)_<?bP_(XY8M%RfZa~X>!UQz`BM@9zu

delta 44
zcmeys_?>Zrxa{rQ_Z1ZG+`pqB9c^H3Y?S*C$S|}vHp_K%_VApjJD0I?;%QX?pYIVa

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index d38137c8..28f17ff9 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -983,7 +983,10 @@
 
 		achievements: {
 			defaults: {
-				titleSGR: "|11"
+				format: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n   {message}"
+				globalFformat: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n  {message}"
+				titleSGR: "|10"
+				pointsSGR: "|12"
 				textSGR: "|00|03"
 				globalTextSGR: "|03"
 				boardName: "|10"
diff --git a/config/achievements.hjson b/config/achievements.hjson
index ce841e93..41bfd4c1 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -64,25 +64,25 @@
                     points: 5
                 }
                 10: {
-                    title: "{boardName} Curious"
+                    title: "Curious Caller"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 5
                 }
                 25: {
-                    title: "{boardName} Inquisitive"
+                    title: "Inquisitive Caller"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 10
                 }
                 100: {
-                    title: "{boardName} Regular"
+                    title: "Regular Customer"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 10
                 }
                 500:  {
-                    title: "{boardName} Addict"
+                    title: "System Addict"
                     globalText: "{userName} the BBS {boardName} addict has logged in {achievedValue} times!"
                     text: "You're a {boardName} addict! You've logged in {achievedValue} times!"
                     points: 25
diff --git a/core/achievement.js b/core/achievement.js
index e5eecd87..adfae332 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -314,29 +314,37 @@ class Achievements {
         }
     }
 
-    getFormattedTextFor(info, textType) {
+    getFormatObject(info) {
+        return {
+            userName        : info.user.username,
+            userRealName    : info.user.properties[UserProps.RealName],
+            userLocation    : info.user.properties[UserProps.Location],
+            userAffils      : info.user.properties[UserProps.Affiliations],
+            nodeId          : info.client.node,
+            title           : info.details.title,
+            text            : info.global ? info.details.globalText : info.details.text,
+            points          : info.details.points,
+            achievedValue   : info.achievedValue,
+            matchField      : info.matchField,
+            matchValue      : info.matchValue,
+            timestamp       : moment(info.timestamp).format(info.dateTimeFormat),
+            boardName       : Config().general.boardName,
+        };
+    }
+
+    getFormattedTextFor(info, textType, defaultSgr = '|07') {
         const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
-        const defSgr        = themeDefaults[`${textType}SGR`] || '|07';
+        const defSgr        = themeDefaults[`${textType}SGR`] || defaultSgr;
 
         const wrap = (fieldName, value) => {
             return `${themeDefaults[fieldName] || defSgr}${value}${defSgr}`;
         };
 
-        const formatObj = {
-            userName        : wrap('userName', info.user.username),
-            userRealName    : wrap('userRealName', info.user.properties[UserProps.RealName]),
-            userLocation    : wrap('userLocation', info.user.properties[UserProps.Location]),
-            userAffils      : wrap('userAffils', info.user.properties[UserProps.Affiliations]),
-            nodeId          : wrap('nodeId', info.client.node),
-            title           : wrap('title', info.details.title),
-            text            : wrap('text', info.global ? info.details.globalText : info.details.text),
-            points          : wrap('points', info.details.points),
-            achievedValue   : wrap('achievedValue', info.achievedValue),
-            matchField      : wrap('matchField', info.matchField),
-            matchValue      : wrap('matchValue', info.matchValue),
-            timestamp       : wrap('timestamp', moment(info.timestamp).format(info.dateTimeFormat)),
-            boardName       : wrap('boardName', Config().general.boardName),
-        };
+        let formatObj = this.getFormatObject(info);
+        formatObj = _.reduce(formatObj, (out, v, k) => {
+            out[k] = wrap(k, v);
+            return out;
+        }, {});
 
         return stringFormat(`${defSgr}${info.details[textType]}`, formatObj);
     }
@@ -400,8 +408,21 @@ class Achievements {
                             pause   : true,
                         };
                         if(headerArt || footerArt) {
+                            const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
+                            const defaultContentsFormat = '{title}\r\n${message}';
+                            const contentsFormat = 'global' === itemType ?
+                                themeDefaults.globalFormat || defaultContentsFormat :
+                                themeDefaults.format || defaultContentsFormat;
+
+                            const formatObj = Object.assign(this.getFormatObject(info), {
+                                title   : this.getFormattedTextFor(info, 'title', ''),  //  ''=defaultSgr
+                                message : itemText,
+                            });
+
+                            const contents = pipeToAnsi(stringFormat(contentsFormat, formatObj));
+
                             interruptItems[itemType].contents =
-                                `${headerArt || ''}\r\n${pipeToAnsi(title)}\r\n${pipeToAnsi(itemText)}\r\n${footerArt || ''}`;
+                                `${headerArt || ''}\r\n${contents}\r\n${footerArt || ''}`;
                         }
                         return callback(null);
                     }

From f653d83c1447c9aef69b3891bbc51072094484d9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 6 Jan 2019 10:41:04 -0700
Subject: [PATCH 0686/1013] Implement retroactive achievements (for userStat
 types so far)

---
 art/themes/luciano_blocktronics/STATUS.ANS  | Bin 4686 -> 4638 bytes
 art/themes/luciano_blocktronics/theme.hjson |   2 +-
 config/achievements.hjson                   |   8 +--
 core/achievement.js                         |  56 ++++++++++++++++----
 4 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/art/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS
index 679e21d691e6973dfd63e41c32257b29735eff56..6871ff457b0b3d44ec533e785fac3b02aa03586e 100644
GIT binary patch
delta 253
zcmX@7GEZf~5oYOV!-;q8r4^*3jm>iN@>5cQEW=z?KNmCUXoFk@AegMr=*$6@F4fPQ
ze1S=ZH&->(&k!UHRBAMN31bnX!DMkJ!^w*o#U{rwWiT2}KF(yqXf*i`Q`6*nW-TCV
z74!DV=`1>vC$X&Lwgy_1SpYQ9Ja@7Ss|rwcChLsJ+-!P4byjQ>CtqY!2eN*$ZDq8c
zyop^O$bQ5=eR36t-sB%_ypy+bY-Ir&kTUr%m-OVxoU<9tC+l+^pZuLmYqA3OCPvfA
nm$?l#Gw~=h34(1%OwPzmElbT!%_}M1Y{vJAnQ`l6O(9hPb2v~S

delta 293
zcmbQIa!zH!5lIE<Xk)Y7y!@0@Aj>dU)z8IDI@%ytI(p)9dtso6wK0fe;S3QpbDpfo
z=*$VxRH~mh`5=?b<PJt2M#ITd8H<1<2a_SA!DK6@T1KPEJD5y>B5#?RCg(A0PYz`j
zpS*#2A*)d?Q1|2j7Tw8pEGsxc9H9M~1(OX~Re(CfSZ8nn?KA_48(2?%$EpW3LY8eJ
z(72UsIzaX{wyi8+6MES7f!sap(<cXU=mT{&aU2u|>I55a05Ty(KS!asYH|XH_~c~H
zS&SBw|8X9le1uDT@&~SsjAoM;aT{#D%&o*E2y%gWZensqW@=e#Zfai1W;VW0%#2Sb
I{}faO0Q$^X9{>OV

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 28f17ff9..1dfeac55 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -984,7 +984,7 @@
 		achievements: {
 			defaults: {
 				format: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n   {message}"
-				globalFformat: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n  {message}"
+				globalformat: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n  {message}"
 				titleSGR: "|10"
 				pointsSGR: "|12"
 				textSGR: "|00|03"
diff --git a/config/achievements.hjson b/config/achievements.hjson
index 41bfd4c1..a711bff4 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -55,12 +55,11 @@
         user_login_count: {
             type: userStat
             statName: login_count
-            retroactive: true
             match: {
                 2: {
                     title: "Return Caller"
                     globalText: "{userName} has returned to {boardName}!"
-                    text: "You\"ve returned to {boardName}!"
+                    text: "You've returned to {boardName}!"
                     points: 5
                 }
                 10: {
@@ -93,7 +92,6 @@
         user_post_count: {
             type: userStat
             statName: post_count
-            retroactive: true
             match: {
                 5: {
                     title: "Poster"
@@ -125,7 +123,6 @@
         user_upload_count: {
             type: userStat
             statName: ul_total_count
-            retroactive: true
             match: {
                 1: {
                     title: "Uploader"
@@ -164,7 +161,6 @@
         user_download_count: {
             type: userStat
             statName: dl_total_count
-            retroactive: true
             match: {
                 1: {
                     title: "Downloader"
@@ -202,7 +198,6 @@
         user_door_runs: {
             type: userStat
             statName: door_run_total_count
-            retroactive: true
             match: {
                 1: {
                     title: "Nostalgia Toe Dip",
@@ -240,7 +235,6 @@
         user_door_total_minutes: {
             type: userStat
             statName: door_run_total_minutes
-            retroactive: true
             match: {
                 1: {
                     title: "Nevermind!"
diff --git a/core/achievement.js b/core/achievement.js
index adfae332..f3a04f1f 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -37,6 +37,9 @@ const paths         = require('path');
 class Achievement {
     constructor(data) {
         this.data = data;
+
+        //  achievements are retroactive by default
+        this.data.retroactive = _.get(this.data, 'retroactive', true);
     }
 
     static factory(data) {
@@ -87,6 +90,9 @@ class Achievement {
 class UserStatAchievement extends Achievement {
     constructor(data) {
         super(data);
+
+        //  sort match keys for quick match lookup
+        this.matchKeys = Object.keys(this.data.match || {}).map(k => parseInt(k)).sort( (a, b) => b - a);
     }
 
     isValid() {
@@ -97,7 +103,7 @@ class UserStatAchievement extends Achievement {
     }
 
     getMatchDetails(matchValue) {
-        let matchField = Object.keys(this.data.match || {}).sort( (a, b) => b - a).find(v => matchValue >= v);
+        let matchField = this.matchKeys.find(v => matchValue >= v);
         if(matchField) {
             const match = this.data.match[matchField];
             if(this.isValidMatchDetails(match)) {
@@ -218,6 +224,22 @@ class Achievements {
         });
     }
 
+    recordAndDisplayAchievement(info, cb) {
+        async.series(
+            [
+                (callback) => {
+                    return this.record(info, callback);
+                },
+                (callback) => {
+                    return this.display(info, callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
     monitorUserStatUpdateEvents() {
         if(this.userStatEventListener) {
             return; //  already listening
@@ -287,15 +309,31 @@ class Achievements {
                             timestamp       : moment(),
                         };
 
-                        return callback(null, info);
-                    },
-                    (info, callback) => {
-                        this.record(info, err => {
-                            return callback(err, info);
+                        const achievementsInfo = [ info ];
+                        if(true === achievement.data.retroactive) {
+                            //  For userStat, any lesser match keys(values) are also met. Example:
+                            //  matchKeys: [ 500, 200, 100, 20, 10, 2 ]
+                            //                    ^---- we met here
+                            //                         ^------------^ retroactive range
+                            //
+                            const index = achievement.matchKeys.findIndex(v => v < matchField);
+                            if(index > -1) {
+                                achievementsInfo.push(...achievement.matchKeys.slice(index).map(k => {
+                                    const [ d, f, v ] = achievement.getMatchDetails(k);
+                                    return Object.assign({}, info, { details : d, matchField : f, achievedValue : f, matchValue : v } );
+                                }));
+                            }
+                        }
+
+                        //  reverse achievementsInfo so we display smallest > largest
+                        achievementsInfo.reverse();
+
+                        async.each(achievementsInfo, (achInfo, nextAchInfo) => {
+                            return this.recordAndDisplayAchievement(achInfo, nextAchInfo);
+                        },
+                        err => {
+                            return callback(err);
                         });
-                    },
-                    (info, callback) => {
-                        return this.display(info, callback);
                     }
                 ],
                 err => {

From 8315b6219965b78960f1fa100d642a70479b23c6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 6 Jan 2019 17:42:07 -0700
Subject: [PATCH 0687/1013] Door stats to BBSLink module

---
 core/bbs_link.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/bbs_link.js b/core/bbs_link.js
index 71fa04c1..9144cf0a 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -4,12 +4,16 @@
 const { MenuModule }    = require('./menu_module.js');
 const { resetScreen }   = require('./ansi_term.js');
 const { Errors }        = require('./enig_error.js');
+const Events            = require('./events.js');
+const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async         = require('async');
 const http          = require('http');
 const net           = require('net');
 const crypto        = require('crypto');
+const moment        = require('moment');
 
 const packageJson   = require('../package.json');
 
@@ -98,7 +102,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     //
                     //  Authenticate the token we acquired previously
                     //
-                    var headers = {
+                    const headers = {
                         'X-User'    : self.client.user.userId.toString(),
                         'X-System'  : self.config.sysCode,
                         'X-Auth'    : crypto.createHash('md5').update(self.config.authCode + token).digest('hex'),
@@ -125,17 +129,23 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     //  Authentication with BBSLink successful. Now, we need to create a telnet
                     //  bridge from us to them
                     //
-                    var connectOpts = {
+                    const connectOpts = {
                         port    : self.config.port,
                         host    : self.config.host,
                     };
 
-                    var clientTerminated;
+                    let clientTerminated;
 
                     self.client.term.write(resetScreen());
                     self.client.term.write('  Connecting to BBSLink.net, please wait...\n');
 
-                    var bridgeConnection = net.createConnection(connectOpts, function connected() {
+                    const startTime = moment();
+
+                    const bridgeConnection = net.createConnection(connectOpts, function connected() {
+                        //  bump stats, fire events, etc.
+                        StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
+                        Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
+
                         self.client.log.info(connectOpts, 'BBSLink bridge connection established');
 
                         self.client.term.output.pipe(bridgeConnection);
@@ -147,9 +157,15 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                         });
                     });
 
-                    var restorePipe = function() {
+                    const restorePipe = function() {
                         self.client.term.output.unpipe(bridgeConnection);
                         self.client.term.output.resume();
+
+                        const endTime = moment();
+                        const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+                        if(runTimeMinutes > 0) {
+                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                        }
                     };
 
                     bridgeConnection.on('data', function incomingData(data) {

From 99a95e7648cf63acb32c3eda16074b41adeb8746 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 6 Jan 2019 17:50:22 -0700
Subject: [PATCH 0688/1013] Door stats to Exodus module

---
 core/exodus.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/core/exodus.js b/core/exodus.js
index 0d439392..eaf4c9a5 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -2,12 +2,17 @@
 'use strict';
 
 //  ENiGMA½
-const MenuModule            = require('./menu_module.js').MenuModule;
-const resetScreen           = require('./ansi_term.js').resetScreen;
-const Config                = require('./config.js').get;
-const Errors                = require('./enig_error.js').Errors;
-const Log                   = require('./logger.js').log;
-const getEnigmaUserAgent    = require('./misc_util.js').getEnigmaUserAgent;
+const { MenuModule }    = require('./menu_module.js');
+const { resetScreen }   = require('./ansi_term.js');
+const Config            = require('./config.js').get;
+const { Errors }        = require('./enig_error.js');
+const Log               = require('./logger.js').log;
+const {
+    getEnigmaUserAgent
+}                       = require('./misc_util.js');
+const Events            = require('./events.js');
+const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async         = require('async');
@@ -151,11 +156,18 @@ exports.getModule = class ExodusModule extends MenuModule {
 
                     let pipeRestored = false;
                     let pipedStream;
+                    const startTime = moment();
 
                     function restorePipe() {
                         if(pipedStream && !pipeRestored && !clientTerminated) {
                             self.client.term.output.unpipe(pipedStream);
                             self.client.term.output.resume();
+
+                            const endTime = moment();
+                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+                            if(runTimeMinutes > 0) {
+                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            }
                         }
                     }
 
@@ -186,6 +198,9 @@ exports.getModule = class ExodusModule extends MenuModule {
                         });
 
                         sshClient.shell(window, options, (err, stream) => {
+                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
+                            Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
+
                             pipedStream = stream;   //  :TODO: ewwwwwwwww hack
                             self.client.term.output.pipe(stream);
 

From 925ca134c6d83705bb5eacc7353e5a78044a1c6a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 6 Jan 2019 18:01:03 -0700
Subject: [PATCH 0689/1013] Door stats for CombatNet module

---
 core/combatnet.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/combatnet.js b/core/combatnet.js
index abb9a889..bfd98103 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -5,10 +5,14 @@
 const { MenuModule }    = require('../core/menu_module.js');
 const { resetScreen }   = require('../core/ansi_term.js');
 const { Errors }        = require('./enig_error.js');
+const Events            = require('./events.js');
+const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async         = require('async');
 const RLogin        = require('rlogin');
+const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'CombatNet',
@@ -46,9 +50,17 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     self.client.term.write(resetScreen());
                     self.client.term.write('Connecting to CombatNet, please wait...\n');
 
+                    const startTime = moment();
+
                     const restorePipeToNormal = function() {
                         if(self.client.term.output) {
                             self.client.term.output.removeListener('data', sendToRloginBuffer);
+
+                            const endTime = moment();
+                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+                            if(runTimeMinutes > 0) {
+                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            }
                         }
                     };
 
@@ -90,6 +102,8 @@ exports.getModule = class CombatNetModule extends MenuModule {
                                 self.client.log.info('Connected to CombatNet');
                                 self.client.term.output.on('data', sendToRloginBuffer);
 
+                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
+                                Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
                             } else {
                                 return callback(Errors.General('Failed to establish establish CombatNet connection'));
                             }

From 34c91780994eddabc9b93def65fe0faa42655b9b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 6 Jan 2019 21:56:12 -0700
Subject: [PATCH 0690/1013] Achievement & Event improvements * User stat set vs
 user stat increment system events * Proper addMultipleEventListener() and
 removeMultipleEventListener() Events APIs * userStatSet vs userStatInc user
 stat achievement types. userStatInc for example can be used for door minutes
 used

---
 config/achievements.hjson | 14 ++++++------
 core/achievement.js       | 48 +++++++++++++++++++++++++++------------
 core/door_party.js        | 15 ++++++++++++
 core/events.js            | 31 +++++++++++++++++++++----
 core/stat_log.js          | 31 +++++++++++++++++++------
 core/system_events.js     |  3 ++-
 6 files changed, 107 insertions(+), 35 deletions(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index a711bff4..8dbcb637 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -31,7 +31,7 @@
         - Applying customizations via the achievements section in theme.hjson
 
         Some tips:
-        - For 'userStat' types, see user_property.js
+        - For 'userStatSet' types, see user_property.js
 
         Don"t forget to RTFM ...er uh... see the documentation for more information and
         don"t be shy to ask for help:
@@ -53,7 +53,7 @@
 
     achievements: {
         user_login_count: {
-            type: userStat
+            type: userStatSet
             statName: login_count
             match: {
                 2: {
@@ -90,7 +90,7 @@
         }
 
         user_post_count: {
-            type: userStat
+            type: userStatSet
             statName: post_count
             match: {
                 5: {
@@ -121,7 +121,7 @@
         }
 
         user_upload_count: {
-            type: userStat
+            type: userStatSet
             statName: ul_total_count
             match: {
                 1: {
@@ -159,7 +159,7 @@
         }
 
         user_download_count: {
-            type: userStat
+            type: userStatSet
             statName: dl_total_count
             match: {
                 1: {
@@ -196,7 +196,7 @@
         }
 
         user_door_runs: {
-            type: userStat
+            type: userStatSet
             statName: door_run_total_count
             match: {
                 1: {
@@ -233,7 +233,7 @@
         }
 
         user_door_total_minutes: {
-            type: userStat
+            type: userStatInc
             statName: door_run_total_minutes
             match: {
                 1: {
diff --git a/core/achievement.js b/core/achievement.js
index f3a04f1f..96975628 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -45,7 +45,11 @@ class Achievement {
     static factory(data) {
         let achievement;
         switch(data.type) {
-            case Achievement.Types.UserStat : achievement = new UserStatAchievement(data); break;
+            case Achievement.Types.UserStatSet :
+            case Achievement.Types.UserStatInc :
+                achievement = new UserStatAchievement(data);
+                break;
+
             default : return;
         }
 
@@ -56,13 +60,15 @@ class Achievement {
 
     static get Types() {
         return {
-            UserStat    : 'userStat',
+            UserStatSet : 'userStatSet',
+            UserStatInc : 'userStatInc',
         };
     }
 
     isValid() {
         switch(this.data.type) {
-            case Achievement.Types.UserStat :
+            case Achievement.Types.UserStatSet :
+            case Achievement.Types.UserStatInc :
                 if(!_.isString(this.data.statName)) {
                     return false;
                 }
@@ -129,12 +135,12 @@ class Achievements {
         const configLoaded = (achievementConfig) => {
             if(true !== achievementConfig.enabled) {
                 Log.info('Achievements are not enabled');
-                this.stopMonitoringUserStatUpdateEvents();
+                this.stopMonitoringUserStatEvents();
                 delete this.achievementConfig;
             } else {
                 Log.info('Achievements are enabled');
                 this.achievementConfig = achievementConfig;
-                this.monitorUserStatUpdateEvents();
+                this.monitorUserStatEvents();
             }
         };
 
@@ -240,18 +246,22 @@ class Achievements {
         );
     }
 
-    monitorUserStatUpdateEvents() {
-        if(this.userStatEventListener) {
+    monitorUserStatEvents() {
+        if(this.userStatEventListeners) {
             return; //  already listening
         }
 
-        this.userStatEventListener = this.events.on(Events.getSystemEvents().UserStatUpdate, userStatEvent => {
+        const listenEvents = [
+            Events.getSystemEvents().UserStatSet,
+            Events.getSystemEvents().UserStatIncrement
+        ];
+
+        this.userStatEventListeners = this.events.addMultipleEventListener(listenEvents, userStatEvent => {
             if([ UserProps.AchievementTotalCount, UserProps.AchievementTotalPoints ].includes(userStatEvent.statName)) {
                 return;
             }
 
-            const statValue = parseInt(userStatEvent.statValue, 10);
-            if(isNaN(statValue)) {
+            if(!_.isNumber(userStatEvent.statValue) && !_.isNumber(userStatEvent.statIncrementBy)) {
                 return;
             }
 
@@ -262,7 +272,7 @@ class Achievements {
                     if(false === achievement.enabled) {
                         return false;
                     }
-                    return Achievement.Types.UserStat === achievement.type &&
+                    return [ Achievement.Types.UserStatSet, Achievement.Types.UserStatInc ].includes(achievement.type) &&
                         achievement.statName === userStatEvent.statName;
                 }
             );
@@ -276,6 +286,14 @@ class Achievements {
                 return;
             }
 
+            const statValue = parseInt(
+                Achievement.Types.UserStatSet === achievement.data.type ? userStatEvent.statValue : userStatEvent.statIncrementBy,
+                10
+            );
+            if(isNaN(statValue)) {
+                return;
+            }
+
             const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
             if(!details || _.isUndefined(matchField) || _.isUndefined(matchValue)) {
                 return;
@@ -345,10 +363,10 @@ class Achievements {
         });
     }
 
-    stopMonitoringUserStatUpdateEvents() {
-        if(this.userStatEventListener) {
-            this.events.removeListener(Events.getSystemEvents().UserStatUpdate, this.userStatEventListener);
-            delete this.userStatEventListener;
+    stopMonitoringUserStatEvents() {
+        if(this.userStatEventListeners) {
+            this.events.removeMultipleEventListener(this.userStatEventListeners);
+            delete this.userStatEventListeners;
         }
     }
 
diff --git a/core/door_party.js b/core/door_party.js
index f6bc7be9..dcd6037e 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -5,10 +5,14 @@
 const { MenuModule }    = require('./menu_module.js');
 const { resetScreen }   = require('./ansi_term.js');
 const { Errors }        = require('./enig_error.js');
+const Events            = require('./events.js');
+const StatLog           = require('./stat_log.js');
+const UserProps         = require('./user_property.js');
 
 //  deps
 const async         = require('async');
 const SSHClient     = require('ssh2').Client;
+const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'DoorParty',
@@ -54,10 +58,18 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 
                     let pipeRestored = false;
                     let pipedStream;
+                    const startTime = moment();
+
                     const restorePipe = function() {
                         if(pipedStream && !pipeRestored && !clientTerminated) {
                             self.client.term.output.unpipe(pipedStream);
                             self.client.term.output.resume();
+
+                            const endTime = moment();
+                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+                            if(runTimeMinutes > 0) {
+                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            }
                         }
                     };
 
@@ -83,6 +95,9 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                             const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
                             stream.write(rlogin);
 
+                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
+                            Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
+
                             pipedStream = stream;   //  :TODO: this is hacky...
                             self.client.term.output.pipe(stream);
 
diff --git a/core/events.js b/core/events.js
index 73253fe3..541a5cae 100644
--- a/core/events.js
+++ b/core/events.js
@@ -5,6 +5,9 @@ const events            = require('events');
 const Log               = require('./logger.js').log;
 const SystemEvents      = require('./system_events.js');
 
+//  deps
+const _                 = require('lodash');
+
 module.exports = new class Events extends events.EventEmitter {
     constructor() {
         super();
@@ -35,12 +38,30 @@ module.exports = new class Events extends events.EventEmitter {
         return super.once(event, listener);
     }
 
-    addListenerMultipleEvents(events, listener) {
-        Log.trace( { events }, 'Registring event listeners');
+    //
+    //  Listen to multiple events for a single listener.
+    //  Called with: listener(event, eventName)
+    //
+    //  The returned object must be used with removeMultipleEventListener()
+    //
+    addMultipleEventListener(events, listener) {
+        Log.trace( { events }, 'Registering event listeners');
+
+        const listeners = [];
+
         events.forEach(eventName => {
-            this.on(eventName, event => {
-                listener(eventName, event);
-            });
+            const listenWrapper = _.partial(listener, _, eventName);
+            this.on(eventName, listenWrapper);
+            listeners.push( { eventName, listenWrapper } );
+        });
+
+        return listeners;
+    }
+
+    removeMultipleEventListener(listeners) {
+        Log.trace( { events }, 'Removing listeners');
+        listeners.forEach(listener => {
+            this.removeListener(listener.eventName, listener.listenWrapper);
         });
     }
 
diff --git a/core/stat_log.js b/core/stat_log.js
index 8627b6f2..0ff6aff6 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -122,12 +122,18 @@ class StatLog {
     //  User specific stats
     //  These are simply convenience methods to the user's properties
     //
-    setUserStat(user, statName, statValue, cb) {
+    setUserStatWithOptions(user, statName, statValue, options, cb) {
         //  note: cb is optional in PersistUserProperty
         user.persistProperty(statName, statValue, cb);
 
-        const Events = require('./events.js');  //  we need to late load currently
-        return Events.emit(Events.getSystemEvents().UserStatUpdate, { user, statName, statValue } );
+        if(!options.noEvent) {
+            const Events = require('./events.js');  //  we need to late load currently
+            Events.emit(Events.getSystemEvents().UserStatSet, { user, statName, statValue } );
+        }
+    }
+
+    setUserStat(user, statName, statValue, cb) {
+        return this.setUserStatWithOptions(user, statName, statValue, {}, cb);
     }
 
     getUserStat(user, statName) {
@@ -143,16 +149,27 @@ class StatLog {
 
         let newValue = parseInt(user.properties[statName]);
         if(newValue) {
-            if(!_.isNumber(newValue)) {
+            if(!_.isNumber(newValue) && cb) {
                 return cb(new Error(`Value for ${statName} is not a number!`));
             }
-
             newValue += incrementBy;
         } else {
             newValue = incrementBy;
         }
 
-        return this.setUserStat(user, statName, newValue, cb);
+        this.setUserStatWithOptions(user, statName, newValue, { noEvent : true }, err => {
+            if(!err) {
+                const Events = require('./events.js');  //  we need to late load currently
+                Events.emit(
+                    Events.getSystemEvents().UserStatIncrement,
+                    { user, statName, statIncrementBy: incrementBy, statValue : newValue }
+                );
+            }
+
+            if(cb) {
+                return cb(err);
+            }
+        });
     }
 
     //  the time "now" in the ISO format we use and love :)
@@ -362,7 +379,7 @@ class StatLog {
             systemEvents.UserAchievementEarned,
         ];
 
-        Events.addListenerMultipleEvents(interestedEvents, (eventName, event) => {
+        Events.addMultipleEventListener(interestedEvents, (event, eventName) => {
             this.appendUserLogEntry(
                 event.user,
                 'system_event',
diff --git a/core/system_events.js b/core/system_events.js
index 50a0c464..c0c09f35 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -21,6 +21,7 @@ module.exports = {
     UserSendMail            : 'codes.l33t.enigma.system.user_send_mail',
     UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',
     UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',
-    UserStatUpdate          : 'codes.l33t.enigma.system.user_stat_set',     //  { ..., statName, statValue }
+    UserStatSet             : 'codes.l33t.enigma.system.user_stat_set',             //  { ..., statName, statValue }
+    UserStatIncrement       : 'codes.l33t.enigma.system.user_stat_increment',       //  {..., statName, statIncrementBy, statValue }
     UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  {..., achievementTag, points }
 };

From c9af0edef83d5a417e31f637f24733a69a2311d1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 9 Jan 2019 20:06:30 -0700
Subject: [PATCH 0691/1013] resetScreen() vs clearScreen()

---
 core/user_interrupt_queue.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index 29a52685..f1aee626 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -76,7 +76,7 @@ module.exports = class UserInterruptQueue
 
     displayWithItem(interruptItem, cb) {
         if(interruptItem.cls) {
-            this.client.term.rawWrite(ANSI.clearScreen());
+            this.client.term.rawWrite(ANSI.resetScreen());
         } else {
             this.client.term.rawWrite('\r\n\r\n');
         }

From 83c57926d346437d2ebfcea4d38b1e08f7ec758f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 9 Jan 2019 20:06:55 -0700
Subject: [PATCH 0692/1013] Never interrupt during upload

---
 core/upload.js              | 2 ++
 misc/menu_template.in.hjson | 1 +
 2 files changed, 3 insertions(+)

diff --git a/core/upload.js b/core/upload.js
index a2f2c9ea..6eaff2ab 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -73,6 +73,8 @@ exports.getModule = class UploadModule extends MenuModule {
     constructor(options) {
         super(options);
 
+        this.interrupt = MenuModule.InterruptTypes.Never;
+
         if(_.has(options, 'lastMenuResult.recvFilePaths')) {
             this.recvFilePaths = options.lastMenuResult.recvFilePaths;
         }
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index e3b76c21..60c57605 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -3440,6 +3440,7 @@
             desc: Uploading
             module: upload
             config: {
+                interrupt: never
                 art: {
                     options: ULOPTS
                     fileDetails: ULDETAIL

From b96fa154c0fdf5006ffe5bcc97fe89ae84a823fb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 9 Jan 2019 20:07:27 -0700
Subject: [PATCH 0693/1013] Spelling

---
 core/door_party.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/door_party.js b/core/door_party.js
index dcd6037e..df3d189f 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -137,7 +137,7 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                     self.client.log.warn( { error : err.message }, 'DoorParty error');
                 }
 
-                //  if the client is stil here, go to previous
+                //  if the client is still here, go to previous
                 if(!clientTerminated) {
                     self.prevMenu();
                 }

From 2726a7becc1dd6d8290d915f3011781a644d7262 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 9 Jan 2019 20:07:46 -0700
Subject: [PATCH 0694/1013] New achivements

---
 config/achievements.hjson | 71 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 8dbcb637..ba050673 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -42,6 +42,7 @@
         Email   : bryan@l33t.codes
 */
 {
+    //  Set to false to disable the achievement system
     enabled : true
 
     art : {
@@ -158,6 +159,43 @@
             }
         }
 
+        user_upload_bytes: {
+            type: userStatSet
+            statName: ul_total_bytes
+            match: {
+                524288: {
+                    title: "Kickstart"
+                    globalText: "{userName} has uploaded 512KB, enough for a Kickstart!"
+                    text: "You've uploaded 512KB, enough for a Kickstart!"
+                    points: 10
+                }
+                1474560: {
+                    title: "America Online 2.5?"
+                    globalText: "{userName} has uploaded 1.44M worth of data. Hopefully it's not AOL 2.5."
+                    title: "You've uploaded 1.44M worth of data. Hopefully it's not AOL 2.5."
+                    points: 15
+                }
+                6291456: {
+                    title: "A Quake of a Upload"
+                    globalText: "{userName} has uploaded 6 x 1.44MB disks worth of data. That's the size of Quake for DOS!"
+                    text: "You've uploaded 6 x 1.44MB disks worth of data. That's the size of Quake for DOS!"
+                    points: 25
+                }
+                1073741824: {
+                    title: "Gigabyte!"
+                    globalText: "{userName} has uploaded a Gigabyte worth of data!"
+                    text: "You've uploaded a Gigabyte worth of data!"
+                    points: 50
+                }
+                3407872000: {
+                    title: "Encarta"
+                    globalText: "{userName} has uploaded 5 x CD-ROM disks worth of data. That's the size of Encarta!"
+                    text: "You've uploaded 5 x CD-ROM disks worth of data. That's the size of Encarta!"
+                    points: 100
+                }
+            }
+        }
+
         user_download_count: {
             type: userStatSet
             statName: dl_total_count
@@ -195,6 +233,37 @@
             }
         }
 
+        user_download_bytes: {
+            type: userStatSet
+            statName: dl_total_bytes
+            match: {
+                655360: {
+                    title: "Ought to be Enough"
+                    globalText: "{userName} has downloaded 640K. Ought to be enough for anyone!"
+                    text: "You've downloaded 640K. Ought to be enough for anyone!"
+                    points: 5
+                }
+                1474560: {
+                    title: "Fits on a Floppy"
+                    globalText: "{userName} has downloaded 1.44MB worth of data!"
+                    text: "You've downloaded 1.44MB of data!"
+                    points: 10
+                }
+                104857600: {
+                    title: "Click of Death"
+                    globalText: "{userName} has downloaded 100MB... perhaps to a Zip Disk?"
+                    text: "You've downloaded 100MB of data... perhaps to a Zip Disk?"
+                    points: 15
+                }
+                681574400: {
+                    title: "A CD-ROM Worth"
+                    globalText: "{userName} has downloaded a CD-ROM's worth of data!"
+                    text: "You've downloaded a CD-ROM's worth of data!"
+                    points: 20
+                }
+            }
+        }
+
         user_door_runs: {
             type: userStatSet
             statName: door_run_total_count
@@ -227,7 +296,7 @@
                     title: "Dropfile Enthusiast"
                     globalText: "{userName} the dropfile enthusiast ran {achievedValue} doors!"
                     text: "You're a dropfile enthusiast! You've run {achievedValue} doors!"
-                    points: 50
+                    points: 100
                 }
             }
         }

From 091a9ae2c7c8b6c4e9c76b47b17b2c06accee0a0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 9 Jan 2019 20:07:59 -0700
Subject: [PATCH 0695/1013] Fix some bugs, clean up, etc. in achievements

---
 core/achievement.js | 48 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index 96975628..ccd43a54 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -86,7 +86,7 @@ class Achievement {
     }
 
     isValidMatchDetails(details) {
-        if(!_.isString(details.title) || !_.isString(details.text) || !_.isNumber(details.points)) {
+        if(!details || !_.isString(details.title) || !_.isString(details.text) || !_.isNumber(details.points)) {
             return false;
         }
         return (_.isString(details.globalText) || !details.globalText);
@@ -109,13 +109,16 @@ class UserStatAchievement extends Achievement {
     }
 
     getMatchDetails(matchValue) {
+        let ret = [];
         let matchField = this.matchKeys.find(v => matchValue >= v);
         if(matchField) {
             const match = this.data.match[matchField];
-            if(this.isValidMatchDetails(match)) {
-                return [ match, parseInt(matchField), matchValue ];
+            matchField = parseInt(matchField);
+            if(this.isValidMatchDetails(match) && !isNaN(matchField)) {
+                ret = [ match, matchField, matchValue ];
             }
         }
+        return ret;
     }
 }
 
@@ -180,7 +183,7 @@ class Achievements {
             WHERE user_id = ? AND achievement_tag = ? AND match_field = ?;`,
             [ user.userId, achievementTag, field],
             (err, row) => {
-                return cb(err, row && row.count || 0);
+                return cb(err, row ? row.count : 0);
             }
         );
     }
@@ -286,20 +289,20 @@ class Achievements {
                 return;
             }
 
-            const statValue = parseInt(
-                Achievement.Types.UserStatSet === achievement.data.type ? userStatEvent.statValue : userStatEvent.statIncrementBy,
-                10
+            const statValue = parseInt(Achievement.Types.UserStatSet === achievement.data.type ?
+                userStatEvent.statValue :
+                userStatEvent.statIncrementBy
             );
             if(isNaN(statValue)) {
                 return;
             }
 
             const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
-            if(!details || _.isUndefined(matchField) || _.isUndefined(matchValue)) {
+            if(!details) {
                 return;
             }
 
-            async.waterfall(
+            async.series(
                 [
                     (callback) => {
                         this.loadAchievementHitCount(userStatEvent.user, achievementTag, matchField, (err, count) => {
@@ -335,19 +338,32 @@ class Achievements {
                             //                         ^------------^ retroactive range
                             //
                             const index = achievement.matchKeys.findIndex(v => v < matchField);
-                            if(index > -1) {
-                                achievementsInfo.push(...achievement.matchKeys.slice(index).map(k => {
-                                    const [ d, f, v ] = achievement.getMatchDetails(k);
-                                    return Object.assign({}, info, { details : d, matchField : f, achievedValue : f, matchValue : v } );
-                                }));
+                            if(index > -1 && Array.isArray(achievement.matchKeys)) {
+                                achievement.matchKeys.slice(index).forEach(k => {
+                                    const [ det, fld, val ] = achievement.getMatchDetails(k);
+                                    if(det) {
+                                        achievementsInfo.push(Object.assign(
+                                            {},
+                                            info,
+                                            {
+                                                details         : det,
+                                                matchField      : fld,
+                                                achievedValue   : fld,
+                                                matchValue      : val,
+                                            }
+                                        ));
+                                    }
+                                });
                             }
                         }
 
                         //  reverse achievementsInfo so we display smallest > largest
                         achievementsInfo.reverse();
 
-                        async.each(achievementsInfo, (achInfo, nextAchInfo) => {
-                            return this.recordAndDisplayAchievement(achInfo, nextAchInfo);
+                        async.eachSeries(achievementsInfo, (achInfo, nextAchInfo) => {
+                            return this.recordAndDisplayAchievement(achInfo, err => {
+                                return nextAchInfo(err);
+                            });
                         },
                         err => {
                             return callback(err);

From 2788c37492777c69b904d0380b493041261717f6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 10 Jan 2019 20:34:52 -0700
Subject: [PATCH 0696/1013] + ACS: AC for achievement count check + ACS: AP for
 achievement point check + User minutes used on the system are now tracked +
 MCI: TO for total time spent online system (friendly format) * Fix up a
 couple ACS bugs with |value| * Fix formatting of achievement text + Add more
 achievements * Fix achievement duration formatting

---
 WHATSNEW.md                                 |  1 +
 art/themes/luciano_blocktronics/theme.hjson |  6 +--
 config/achievements.hjson                   | 47 +++++++++++++++++----
 core/achievement.js                         | 24 ++++++-----
 core/acs_parser.js                          | 16 ++++++-
 core/ansi_term.js                           |  2 +
 core/client.js                              | 38 +++++++++++++++--
 core/predefined_mci.js                      |  4 ++
 core/user.js                                | 16 +++++++
 core/user_property.js                       |  2 +
 docs/configuration/acs.md                   |  4 +-
 misc/acs_parser.pegjs                       | 16 ++++++-
 12 files changed, 149 insertions(+), 27 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 01fc8edc..39dfca49 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -26,6 +26,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * `oputil.js user rm` and `oputil.js user info` are in! See [oputil CLI](/docs/admin/oputil.md).
 * Performing a file scan/import using `oputil.js fb scan` now recognizes various `FILES.BBS` formats.
 * Usernames found in the `config.users.badUserNames` are now not only disallowed from applying, but disconnected at any login attempt.
+* Total minutes online is now tracked for users. Of course, it only starts after you get the update :)
 
 
 ## 0.0.8-alpha
diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 1dfeac55..99164a2b 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -989,9 +989,9 @@
 				pointsSGR: "|12"
 				textSGR: "|00|03"
 				globalTextSGR: "|03"
-				boardName: "|10"
-				userName: "|11"
-				achievedValue: "|15"
+				boardNameSGR: "|10"
+				userNameSGR: "|11"
+				achievedValueSGR: "|15"
 			}
 
 			overrides: {
diff --git a/config/achievements.hjson b/config/achievements.hjson
index ba050673..63ea5ee1 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -307,29 +307,60 @@
             match: {
                 1: {
                     title: "Nevermind!"
-                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}. Guess it's not their thing!"
-                    text: "You ran a door for only {achievedValue!durationSeconds}. Not your thing?"
+                    globalText: "{userName} ran a door for {achievedValue!durationMinutes}. Guess it's not their thing!"
+                    text: "You ran a door for only {achievedValue!durationMinutes}. Not your thing?"
                     points: 5
                 }
                 10: {
                     title: "It's OK I Guess"
-                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}!"
-                    text: "You ran a door for {achievedValue!durationSeconds}!"
+                    globalText: "{userName} ran a door for {achievedValue!durationMinutes}!"
+                    text: "You ran a door for {achievedValue!durationMinutes}!"
                     points: 10
                 }
                 30: {
                     title: "Good Game"
-                    globalText: "{userName} ran a door for {achievedValue!durationSeconds}!"
-                    text: "You ran a door for {achievedValue!durationSeconds}!"
+                    globalText: "{userName} ran a door for {achievedValue!durationMinutes}!"
+                    text: "You ran a door for {achievedValue!durationMinutes}!"
                     points: 20
                 }
                 60: {
                     title: "Textmode Dragon Slayer"
-                    globalText: "{userName} has spent {achievedValue!durationSeconds} in a door!"
-                    text: "You've spent {achievedValue!durationSeconds} in a door!"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} in a door!"
+                    text: "You've spent {achievedValue!durationMinutes} in a door!"
                     points: 25
                 }
             }
         }
+
+        user_total_system_online_minutes: {
+            type: userStatSet
+            statName: minutes_online_total_count
+            match: {
+                30: {
+                    title: "Just Poking Around"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} on {boardName}!"
+                    text: "You've been on {boardName} for a total of {achievedValue!durationMinutes}!"
+                    points: 5
+                }
+                60: {
+                    title: "Mildly Interesting"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} on {boardName}!"
+                    text: "You've been on {boardName} for a total of {achievedValue!durationMinutes}!"
+                    points: 15
+                }
+                120: {
+                    title: "Nothing Better to Do"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} on {boardName}!"
+                    text: "You've been on {boardName} for a total of {achievedValue!durationMinutes}!"
+                    points: 25
+                }
+                1440: {
+                    title: "Idle Bot"
+                    globalText: "{userName} is probably a bot. They've spent {achievedValue!durationMinutes} on {boardName}!"
+                    text: "You're a bot, aren't you? You've been on {boardName} for a total of {achievedValue!durationMinutes}!"
+                    points: 50
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/core/achievement.js b/core/achievement.js
index ccd43a54..ad7644ba 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -406,19 +406,23 @@ class Achievements {
 
     getFormattedTextFor(info, textType, defaultSgr = '|07') {
         const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
-        const defSgr        = themeDefaults[`${textType}SGR`] || defaultSgr;
+        const textTypeSgr   = themeDefaults[`${textType}SGR`] || defaultSgr;
 
-        const wrap = (fieldName, value) => {
-            return `${themeDefaults[fieldName] || defSgr}${value}${defSgr}`;
+        const formatObj = this.getFormatObject(info);
+
+        const wrap = (input) => {
+            const re = new RegExp(`{(${Object.keys(formatObj).join('|')})([^}]*)}`, 'g');
+            return input.replace(re, (m, formatVar, formatOpts) => {
+                const varSgr = themeDefaults[`${formatVar}SGR`] || textTypeSgr;
+                let r = `${varSgr}{${formatVar}`;
+                if(formatOpts) {
+                    r += formatOpts;
+                }
+                return `${r}}${textTypeSgr}`;
+            });
         };
 
-        let formatObj = this.getFormatObject(info);
-        formatObj = _.reduce(formatObj, (out, v, k) => {
-            out[k] = wrap(k, v);
-            return out;
-        }, {});
-
-        return stringFormat(`${defSgr}${info.details[textType]}`, formatObj);
+        return stringFormat(`${textTypeSgr}${wrap(info.details[textType])}`, formatObj);
     }
 
     createAchievementInterruptItems(info, cb) {
diff --git a/core/acs_parser.js b/core/acs_parser.js
index d6983b17..d4084b95 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -1004,7 +1004,7 @@ function peg$parse(input, options) {
   				TW	: function termWidth() {
   					return !isNaN(value) && _.get(client, 'term.termWidth', 0) >= value;
   				},
-  				ID	: function isUserId(value) {
+  				ID	: function isUserId() {
   					if(!user) {
   						return false;
   					}
@@ -1024,6 +1024,20 @@ function peg$parse(input, options) {
   					const midnight = now.clone().startOf('day')
   					const minutesPastMidnight = now.diff(midnight, 'minutes');
   					return !isNaN(value) && minutesPastMidnight >= value;
+  				},
+  				AC	: function achievementCount() {
+  					if(!user) {
+  						return false;
+  					}
+  					const count = user.getPropertyAsNumber(UserProps.AchievementTotalCount) || 0;
+  					return !isNan(value) && points >= value;
+  				},
+  				AP	: function achievementPoints() {
+  					if(!user) {
+  						return false;
+  					}
+  					const points = user.getPropertyAsNumber(UserProps.AchievementTotalPoints) || 0;
+  					return !isNan(value) && points >= value;
   				}
   			}[acsCode](value);
   		} catch (e) {
diff --git a/core/ansi_term.js b/core/ansi_term.js
index f00fd011..353c46c8 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -23,6 +23,8 @@
 //  General
 //      * http://en.wikipedia.org/wiki/ANSI_escape_code
 //      * http://www.inwap.com/pdp10/ansicode.txt
+//      * Excellent information with many standards covered (for hterm):
+//        https://chromium.googlesource.com/apps/libapps/+/master/hterm/doc/ControlSequences.md
 //
 //  Other Implementations
 //      * https://github.com/chjj/term.js/blob/master/src/term.js
diff --git a/core/client.js b/core/client.js
index 300285a3..894119bf 100644
--- a/core/client.js
+++ b/core/client.js
@@ -40,6 +40,7 @@ const MenuStack             = require('./menu_stack.js');
 const ACS                   = require('./acs.js');
 const Events                = require('./events.js');
 const UserInterruptQueue    = require('./user_interrupt_queue.js');
+const UserProps             = require('./user_property.js');
 
 //  deps
 const stream    = require('stream');
@@ -442,13 +443,36 @@ Client.prototype.startIdleMonitor = function() {
 
     //
     //  Every 1m, check for idle.
+    //  We also update minutes spent online the system here,
+    //  if we have a authenticated user.
     //
     this.idleCheck = setInterval( () => {
         const nowMs = Date.now();
 
-        const idleLogoutSeconds = this.user.isAuthenticated() ?
-            Config().users.idleLogoutSeconds :
-            Config().users.preAuthIdleLogoutSeconds;
+        let idleLogoutSeconds;
+        if(this.user.isAuthenticated()) {
+            idleLogoutSeconds = Config().users.idleLogoutSeconds;
+
+            //
+            //  We don't really want to be firing off an event every 1m for
+            //  every user, but want at least some updates for various things
+            //  such as achievements. Send off every 5m.
+            //
+            const minOnline = this.user.incrementProperty(UserProps.MinutesOnlineTotalCount, 1);
+            if(0 === (minOnline % 5)) {
+                Events.emit(
+                    Events.getSystemEvents().UserStatIncrement,
+                    {
+                        user            : this.user,
+                        statName        : UserProps.MinutesOnlineTotalCount,
+                        statIncrementBy : 1,
+                        statValue       : minOnline
+                    }
+                );
+            }
+        } else {
+            idleLogoutSeconds = Config().users.preAuthIdleLogoutSeconds;
+        }
 
         if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
             this.emit('idle timeout');
@@ -473,6 +497,14 @@ Client.prototype.end = function () {
         currentModule.leave();
     }
 
+    //  persist time online for authenticated users
+    if(this.user.isAuthenticated()) {
+        this.user.persistProperty(
+            UserProps.MinutesOnlineTotalCount,
+            this.user.getProperty(UserProps.MinutesOnlineTotalCount)
+        );
+    }
+
     this.stopIdleMonitor();
 
     try {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 39e339cc..2e7ed5ff 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -160,6 +160,10 @@ const PREDEFINED_MCI_GENERATORS = {
         const minutes = client.user.properties[UserProps.DoorRunTotalMinutes] || 0;
         return moment.duration(minutes, 'minutes').humanize();
     },
+    TO  : function friendlyTotalTimeOnSystem(client) {
+        const minutes = client.user.properties[UserProps.MinutesOnlineTotalCount] || 0;
+        return moment.duration(minutes, 'minutes').humanize();
+    },
 
     //
     //  Date/Time
diff --git a/core/user.js b/core/user.js
index ba89b387..3b261dc6 100644
--- a/core/user.js
+++ b/core/user.js
@@ -443,6 +443,22 @@ module.exports = class User {
         );
     }
 
+    setProperty(propName, propValue) {
+        this.properties[propName] = propValue;
+    }
+
+    incrementProperty(propName, incrementBy) {
+        incrementBy = incrementBy || 1;
+        let newValue = parseInt(this.getProperty(propName));
+        if(newValue) {
+            newValue += incrementBy;
+        } else {
+            newValue = incrementBy;
+        }
+        this.setProperty(propName, newValue);
+        return newValue;
+    }
+
     getProperty(propName) {
         return this.properties[propName];
     }
diff --git a/core/user_property.js b/core/user_property.js
index a1489e82..56e47e66 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -55,5 +55,7 @@ module.exports = {
 
     AchievementTotalCount       : 'achievement_total_count',
     AchievementTotalPoints      : 'achievement_total_points',
+
+    MinutesOnlineTotalCount     : 'minutes_online_total_count',
 };
 
diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index 1ed83bb5..d0a45d06 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -34,7 +34,9 @@ The following are ACS codes available as of this writing:
 | NR<i>ratio</i> | User has upload/download count ratio >= _ratio_ |
 | KR<i>ratio</i> | User has a upload/download byte ratio >= _ratio_ |
 | PC<i>ratio</i> | User has a post/call ratio >= _ratio_ |
-| MM<i>minutes</i> | It is currently >= _minutes_ past midnight (system time)
+| MM<i>minutes</i> | It is currently >= _minutes_ past midnight (system time) |
+| AC<i>achievementCount</i> | User has >= _achievementCount_ achievements |
+| AP<i>achievementPoints</i> | User has >= _achievementPoints_ achievement points |
 
 \* Many more ACS codes are planned for the near future.
 
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index bd6a8d96..8a39deea 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -160,7 +160,7 @@
 				TW	: function termWidth() {
 					return !isNaN(value) && _.get(client, 'term.termWidth', 0) >= value;
 				},
-				ID	: function isUserId(value) {
+				ID	: function isUserId() {
 					if(!user) {
 						return false;
 					}
@@ -180,6 +180,20 @@
 					const midnight = now.clone().startOf('day')
 					const minutesPastMidnight = now.diff(midnight, 'minutes');
 					return !isNaN(value) && minutesPastMidnight >= value;
+				},
+				AC	: function achievementCount() {
+					if(!user) {
+						return false;
+					}
+					const count = user.getPropertyAsNumber(UserProps.AchievementTotalCount) || 0;
+					return !isNan(value) && points >= value;
+				},
+				AP	: function achievementPoints() {
+					if(!user) {
+						return false;
+					}
+					const points = user.getPropertyAsNumber(UserProps.AchievementTotalPoints) || 0;
+					return !isNan(value) && points >= value;
 				}
 			}[acsCode](value);
 		} catch (e) {

From 3f2e836a83ae810840c13351ca08f7f016ca3b26 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 10 Jan 2019 21:41:32 -0700
Subject: [PATCH 0697/1013] Minor fixes

---
 art/themes/luciano_blocktronics/theme.hjson | 2 +-
 core/achievement.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 99164a2b..f3871ce8 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -984,7 +984,7 @@
 		achievements: {
 			defaults: {
 				format: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n   {message}"
-				globalformat: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n  {message}"
+				globalFormat: "|08 > |10{title} |08(|11{points} |03points|08)\r\n\r\n  {message}"
 				titleSGR: "|10"
 				pointsSGR: "|12"
 				textSGR: "|00|03"
diff --git a/core/achievement.js b/core/achievement.js
index ad7644ba..f57e2f06 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -485,7 +485,7 @@ class Achievements {
                         };
                         if(headerArt || footerArt) {
                             const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
-                            const defaultContentsFormat = '{title}\r\n${message}';
+                            const defaultContentsFormat = '{title}\r\n{message}';
                             const contentsFormat = 'global' === itemType ?
                                 themeDefaults.globalFormat || defaultContentsFormat :
                                 themeDefaults.format || defaultContentsFormat;

From 372494e376bb584a1e43fe3cf413b5d74769981a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 12 Jan 2019 09:39:06 -0700
Subject: [PATCH 0698/1013] Dependency updates

---
 package-lock.json | 2530 ---------------------------------------------
 package.json      |   18 +-
 yarn.lock         | 2231 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 2240 insertions(+), 2539 deletions(-)
 delete mode 100644 package-lock.json
 create mode 100644 yarn.lock

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index a3bc6f81..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,2530 +0,0 @@
-{
-  "name": "enigma-bbs",
-  "version": "0.0.9-alpha",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      }
-    },
-    "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
-    },
-    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
-    },
-    "async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-      "requires": {
-        "lodash": "^4.17.10"
-      }
-    },
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "binary-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/binary-parser/-/binary-parser-1.3.2.tgz",
-      "integrity": "sha512-VDhHcpeF1/ZZy1XvDmYD67bBjRNm1gacw+772xNd5BnTH6ax5TzlDV5dl7216/UlQXQoN9vug07ehk7e0PhNUw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "bser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
-      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-    },
-    "bunyan": {
-      "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
-      "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
-      "requires": {
-        "dtrace-provider": "~0.8",
-        "moment": "^2.10.6",
-        "mv": "~2",
-        "safe-json-stringify": "~1"
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "capture-exit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
-      "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
-      "requires": {
-        "rsvp": "^3.3.3"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chownr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-      "requires": {
-        "color-name": "^1.1.1"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
-    },
-    "dtrace-provider": {
-      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz",
-      "integrity": "sha1-QooiOv4DQl0s1tY0f99AxmkDVj0=",
-      "optional": true,
-      "requires": {
-        "nan": "^2.3.3"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "exec-sh": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
-      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "exiftool": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/exiftool/-/exiftool-0.0.3.tgz",
-      "integrity": "sha1-9YqSvXcnCtxU8xUc7WGko6tp1wc="
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fb-watchman": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
-      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
-      "requires": {
-        "bser": "^2.0.0"
-      }
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "globby": {
-      "version": "6.1.0",
-      "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "requires": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
-      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
-      "requires": {
-        "ajv": "^5.3.0",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hashids": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
-      "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
-    },
-    "hjson": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/hjson/-/hjson-3.1.2.tgz",
-      "integrity": "sha512-2ILrho8eRl2Bniy61mDFiXRAloYqH2T6OwWkoF/8y55DPFgG2RcqQGNXIfBLp432dnAbLOpBJ4pJs63W3X27EA=="
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore-walk": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-    },
-    "inquirer": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz",
-      "integrity": "sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==",
-      "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "chardet": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz",
-          "integrity": "sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="
-        },
-        "external-editor": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz",
-          "integrity": "sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==",
-          "requires": {
-            "chardet": "^0.5.0",
-            "iconv-lite": "^0.4.22",
-            "tmp": "^0.0.33"
-          }
-        },
-        "rxjs": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz",
-          "integrity": "sha512-qBzf5uu6eOKiCZuAE0SgZ0/Qp+l54oeVxFfC2t+mJ2SFI6IB8gmMdJHs5DUMu5kqifqcCtsKS2XHjhZu6RKvAw==",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        }
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-    },
-    "later": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/later/-/later-1.2.0.tgz",
-      "integrity": "sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8="
-    },
-    "lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-    },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "mime-db": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
-    },
-    "mime-types": {
-      "version": "2.1.21",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
-      "requires": {
-        "mime-db": "~1.37.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "minipass": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz",
-      "integrity": "sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==",
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
-      }
-    },
-    "moment": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
-    "mv": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
-      "optional": true,
-      "requires": {
-        "mkdirp": "~0.5.1",
-        "ncp": "~2.0.0",
-        "rimraf": "~2.4.0"
-      }
-    },
-    "nan": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "ncp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-      "optional": true
-    },
-    "needle": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-      "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-      "requires": {
-        "debug": "^2.1.2",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      }
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
-    },
-    "node-pre-gyp": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-      "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-      "requires": {
-        "detect-libc": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "needle": "^2.2.1",
-        "nopt": "^4.0.1",
-        "npm-packlist": "^1.1.6",
-        "npmlog": "^4.0.2",
-        "rc": "^1.2.7",
-        "rimraf": "^2.6.1",
-        "semver": "^5.3.0",
-        "tar": "^4"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        }
-      }
-    },
-    "node-pty": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.7.4.tgz",
-      "integrity": "sha512-WxMY1BsGcHJ2Z2qWpYL7QbfOSnkkCzV0H/9+dJ7uQEIJyz0A4fVBLymswBCTc7RoweY5ingib2gNvf87KvJxuA==",
-      "requires": {
-        "nan": "^2.6.2"
-      }
-    },
-    "nodemailer": {
-      "version": "4.6.5",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.5.tgz",
-      "integrity": "sha512-+bt+BgmnOXDz1uIaWXfXuTESth8UHkhtu7+X8+X2W+CHAn0AuuCyCk854qnathYQLWEC2jkpx7/pkVHcfmLKDw=="
-    },
-    "nopt": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-      "requires": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "npm-bundled": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-      "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="
-    },
-    "npm-packlist": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
-      "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
-      "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-    },
-    "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        }
-      }
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
-    },
-    "rimraf": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-      "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
-      "requires": {
-        "glob": "^6.0.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "rlogin": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rlogin/-/rlogin-1.0.0.tgz",
-      "integrity": "sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM="
-    },
-    "rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safe-json-stringify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz",
-      "integrity": "sha512-EzBtUaFH9bHYPc69wqjp0efJI/DPNHdFbGE3uIMn4sVbO0zx8vZ8cG4WKxQfOpUOKsQyGBiT2mTqnCw+6nLswA==",
-      "optional": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sane": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.0.2.tgz",
-      "integrity": "sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==",
-      "requires": {
-        "anymatch": "^2.0.0",
-        "capture-exit": "^1.2.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5",
-        "watch": "~0.18.0"
-      }
-    },
-    "sanitize-filename": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
-      "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
-      "requires": {
-        "truncate-utf8-bytes": "^1.0.0"
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sqlite3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.4.tgz",
-      "integrity": "sha512-CO8vZMyUXBPC+E3iXOCc7Tz2pAdq5BWfLcQmOokCOZW5S5sZ/paijiPOCdvzpdP83RroWHYa5xYlVqCxSqpnQg==",
-      "requires": {
-        "nan": "~2.10.0",
-        "node-pre-gyp": "^0.10.3",
-        "request": "^2.87.0"
-      }
-    },
-    "sqlite3-trans": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/sqlite3-trans/-/sqlite3-trans-1.2.0.tgz",
-      "integrity": "sha1-E8/K2wk+1I5m+U7IlWq3RU3clgg=",
-      "requires": {
-        "lodash": "^4.17.4"
-      }
-    },
-    "ssh2": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.6.1.tgz",
-      "integrity": "sha512-fNvocq+xetsaAZtBG/9Vhh0GDjw1jQeW7Uq/DPh4fVrJd0XxSfXAqBjOGVk4o2jyWHvyC6HiaPFpfHlR12coDw==",
-      "requires": {
-        "ssh2-streams": "~0.2.0"
-      },
-      "dependencies": {
-        "ssh2-streams": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.2.1.tgz",
-          "integrity": "sha512-3zCOsmunh1JWgPshfhKmBCL3lUtHPoh+a/cyQ49Ft0Q0aF7xgN06b76L+oKtFi0fgO57FLjFztb1GlJcEZ4a3Q==",
-          "requires": {
-            "asn1": "~0.2.0",
-            "semver": "^5.1.0",
-            "streamsearch": "~0.1.2"
-          }
-        }
-      }
-    },
-    "sshpk": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
-      "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "streamsearch": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
-      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "tar": {
-      "version": "4.4.8",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.3.4",
-        "minizlib": "^1.1.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.2"
-      }
-    },
-    "temptmp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/temptmp/-/temptmp-1.1.0.tgz",
-      "integrity": "sha512-gHelQlePUzxRmodWL1uJ9LiwI+a7a3rkFGS9azTf4noPZgGOlx0dOPV9tZs5+QwGc4Nm8BfFxL9cfvV42GNxPQ==",
-      "requires": {
-        "del": "^3.0.0"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      }
-    },
-    "truncate-utf8-bytes": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
-      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
-      "requires": {
-        "utf8-byte-length": "^1.0.1"
-      }
-    },
-    "tslib": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz",
-      "integrity": "sha512-AVP5Xol3WivEr7hnssHDsaM+lVrVXWUvd1cfXTRkTj80b//6g2wIFEH6hZG0muGZRnHGrfttpdzRk3YlBkWjKw=="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-        }
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-    },
-    "utf8-byte-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-    },
-    "uuid-parse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.0.0.tgz",
-      "integrity": "sha1-9GV3F2JLDkuIrzb5jYlYmlu+5Wk="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "requires": {
-        "makeerror": "1.0.x"
-      }
-    },
-    "watch": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
-      "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
-      "requires": {
-        "exec-sh": "^0.2.0",
-        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "exec-sh": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
-          "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
-          "requires": {
-            "merge": "^1.2.0"
-          }
-        }
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "ws": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
-      "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xxhash": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/xxhash/-/xxhash-0.2.4.tgz",
-      "integrity": "sha1-i4pIFiz8zCG5IPpQAmEYfUAhbDk=",
-      "requires": {
-        "nan": "^2.4.0"
-      }
-    },
-    "yallist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-      "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
-    },
-    "yazl": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.0.tgz",
-      "integrity": "sha512-rgptqKwX/f1/7bIRF1FHb4HGsP5k11QyxBpDl1etUDfNpTa7CNjDOYNPFnIaEzZ9dRq0c47IEJS+sy+T39JCLw==",
-      "requires": {
-        "buffer-crc32": "~0.2.3"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index a5dcaf3a..f700ce4d 100644
--- a/package.json
+++ b/package.json
@@ -33,28 +33,28 @@
     "hashids": "^1.1.1",
     "hjson": "^3.1.2",
     "iconv-lite": "^0.4.23",
-    "inquirer": "^6.0.0",
+    "inquirer": "^6.2.1",
     "later": "1.2.0",
     "lodash": "^4.17.10",
+    "lru-cache": "^5.1.1",
     "mime-types": "^2.1.21",
     "minimist": "1.2.x",
-    "moment": "^2.22.2",
-    "node-pty": "^0.7.4",
-    "nodemailer": "^4.6.5",
+    "moment": "^2.23.0",
+    "nntp-server": "^1.0.3",
+    "node-pty": "^0.8.0",
+    "nodemailer": "^5.1.1",
     "rlogin": "^1.0.0",
     "sane": "^4.0.2",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^4.0.4",
+    "sqlite3": "^4.0.6",
     "sqlite3-trans": "^1.2.1",
-    "ssh2": "^0.6.1",
+    "ssh2": "^0.7.1",
     "temptmp": "^1.1.0",
     "uuid": "^3.2.1",
     "uuid-parse": "^1.0.0",
     "ws": "^6.1.2",
     "xxhash": "^0.2.4",
-    "yazl": "^2.5.0",
-    "nntp-server": "^1.0.3",
-    "lru-cache" : "^5.1.1"
+    "yazl": "^2.5.1"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000..96d5a9a2
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,2231 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+asn1@~0.2.0, asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+
+async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+  dependencies:
+    lodash "^4.17.10"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+binary-parser@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.3.2.tgz#5bd04f948ada1a6d78c528762308a9a335d63db9"
+  integrity sha512-VDhHcpeF1/ZZy1XvDmYD67bBjRNm1gacw+772xNd5BnTH6ax5TzlDV5dl7216/UlQXQoN9vug07ehk7e0PhNUw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
+"buffers@github:NuSkooler/node-buffers":
+  version "0.1.1"
+  resolved "https://codeload.github.com/NuSkooler/node-buffers/tar.gz/cd0855598f7048b02f0a51c90e22573973e9e2c2"
+
+bunyan@^1.8.12:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
+  integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=
+  optionalDependencies:
+    dtrace-provider "~0.8"
+    moment "^2.10.6"
+    mv "~2"
+    safe-json-stringify "~1"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+  dependencies:
+    rsvp "^3.3.3"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^2.0.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chownr@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+combined-stream@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
+  dependencies:
+    delayed-stream "~1.0.0"
+
+combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
+  dependencies:
+    ms "^2.1.1"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+denque@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.0.tgz#79e2f0490195502107f24d9553f374837dabc916"
+  integrity sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==
+
+destroy@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+dtrace-provider@~0.8:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
+  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  dependencies:
+    nan "^2.10.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+exec-sh@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
+exec-sh@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+exiftool@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/exiftool/-/exiftool-0.0.3.tgz#f58a92bd77270adc54f3151ced61a4a3ab69d707"
+  integrity sha1-9YqSvXcnCtxU8xUc7WGko6tp1wc=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+fb-watchman@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
+  dependencies:
+    bser "^2.0.0"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+from2@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  dependencies:
+    minipass "^2.2.1"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.15:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  dependencies:
+    ajv "^5.3.0"
+    har-schema "^2.0.0"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+hashids@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/hashids/-/hashids-1.2.2.tgz#28635c7f2f7360ba463686078eee837479e8eafb"
+  integrity sha512-dEHCG2LraR6PNvSGxosZHIRgxF5sNLOIBFEHbj8lfP9WWmu/PWPMzsip1drdVSOFi51N2pU7gZavrgn7sbGFuw==
+
+hjson@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.1.2.tgz#1ae8a3a897a1fab8d45180f98e9abf9b56f95b55"
+  integrity sha512-2ILrho8eRl2Bniy61mDFiXRAloYqH2T6OwWkoF/8y55DPFgG2RcqQGNXIfBLp432dnAbLOpBJ4pJs63W3X27EA==
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+iconv-lite@^0.4.23, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+inquirer@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.0.0"
+    through "^2.3.6"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+isarray@1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+
+later@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/later/-/later-1.2.0.tgz#f2cf6c4dd7956dd2f520adf0329836e9876bad0f"
+  integrity sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8=
+
+lodash@^4.17.10, lodash@^4.17.4:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+merge@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
+
+micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.20"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+  dependencies:
+    mime-db "~1.36.0"
+
+mime-types@^2.1.21:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
+  dependencies:
+    mime-db "~1.37.0"
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+"minimatch@2 || 3", minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@1.2.x, minimist@^1.1.1, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
+  dependencies:
+    minipass "^2.2.1"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+moment@^2.10.6:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+
+moment@^2.23.0:
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
+  integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mv@~2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
+  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  dependencies:
+    mkdirp "~0.5.1"
+    ncp "~2.0.0"
+    rimraf "~2.4.0"
+
+nan@2.10.0, nan@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+
+nan@^2.10.0, nan@^2.4.0:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
+  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+ncp@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+
+needle@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+nntp-server@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/nntp-server/-/nntp-server-1.0.3.tgz#c556dc0d3481d52d49b1389c0e5d0889d3865088"
+  integrity sha512-I30wXcciO937DeADhuTkAtqL+FXHcmwKwUbqMhpr69RKlQl5PRfZMm/WNtOoLBta+b55ED/VqBvMmlasE3z4BA==
+  dependencies:
+    debug "^4.0.0"
+    denque "^1.1.1"
+    destroy "^1.0.4"
+    end-of-stream "^1.4.0"
+    from2 "^2.3.0"
+    glob "^7.1.2"
+    pump "^3.0.0"
+    serialize-error "^2.1.0"
+    split2 "^3.0.0"
+    through2 "^2.0.3"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-pre-gyp@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
+  integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+node-pty@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.0.tgz#08bccb633f49e2e3f7245eb56ea6b40f37ccd64f"
+  integrity sha512-g5ggk3gN4gLrDmAllee5ScFyX3YzpOC/U8VJafha4pE7do0TIE1voiIxEbHSRUOPD1xYqmY+uHhOKAd3avbxGQ==
+  dependencies:
+    nan "2.10.0"
+
+nodemailer@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-5.1.1.tgz#0c48d1ecab02e86d9ff6c620ee75ed944b763505"
+  integrity sha512-hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ==
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+npm-bundled@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
+
+npm-packlist@^1.1.6:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+psl@^1.1.24:
+  version "1.1.29"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.0:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
+  integrity sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+rimraf@^2.2.8, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+  dependencies:
+    glob "^7.0.5"
+
+rimraf@~2.4.0:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  dependencies:
+    glob "^6.0.1"
+
+rlogin@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rlogin/-/rlogin-1.0.0.tgz#db07322b31219126625d9d0aa9872d7ebe8ac403"
+  integrity sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM=
+
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+  dependencies:
+    is-promise "^2.1.0"
+
+rxjs@^6.1.0:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-json-stringify@~1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
+  integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.2.tgz#5bd4a3f1268fd7a921a2dc657047de635c8f8f25"
+  integrity sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==
+  dependencies:
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.18.0"
+
+sanitize-filename@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
+  integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=
+  dependencies:
+    truncate-utf8-bytes "^1.0.0"
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+semver@^5.3.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
+
+semver@^5.5.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
+serialize-error@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
+  integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+split2@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.0.0.tgz#55057cd560687a7ef6464471597404577ff1735d"
+  integrity sha512-Cp7G+nUfKJyHCrAI8kze3Q00PFGEG1pMgrAlTFlDbn+GW24evSZHJuMl+iUJx1w/NTRDeBiTgvwnf6YOt94FMw==
+  dependencies:
+    readable-stream "^3.0.0"
+
+sqlite3-trans@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/sqlite3-trans/-/sqlite3-trans-1.2.1.tgz#642dff9f6da53d533ccd264b49e68c8818542255"
+  integrity sha512-KLtR+PBZN/moxDTKWTwWypkunDCJ0oi5vknjht8omjUXswwUEf+MX2DKtgQB1V5Tsjgc4mL4mHjv9zp7+FHs5g==
+  dependencies:
+    lodash "^4.17.4"
+
+sqlite3@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.6.tgz#e587b583b5acc6cb38d4437dedb2572359c080ad"
+  integrity sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw==
+  dependencies:
+    nan "~2.10.0"
+    node-pre-gyp "^0.11.0"
+    request "^2.87.0"
+
+ssh2-streams@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.3.1.tgz#65d78447628d3fd2bbcfa1a8e73a06755bd62a1a"
+  integrity sha512-8lVQaN3FNBCoQdnMEsIpD8X1QN/5V8Cyd9TQhAvw4eD/vfuk/o3eikh3rdnf5HUi3TD7SM1bbM/ZTzjNIRmSFw==
+  dependencies:
+    asn1 "~0.2.0"
+    bcrypt-pbkdf "^1.0.2"
+    streamsearch "~0.1.2"
+
+ssh2@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.7.1.tgz#0dcafd75c4e30606d380d0bd57448e8c0efdd718"
+  integrity sha512-+ZFoxMXMXq/OyDbE7AwJjsYwk300PD4N1xphYrUttsSzqchWz/3BF7X+La8Jq29Y2QTanojuV/vPFjRsyUGaoA==
+  dependencies:
+    ssh2-streams "~0.3.1"
+
+sshpk@^1.7.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+    safer-buffer "^2.0.2"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+streamsearch@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+  dependencies:
+    ansi-regex "^4.0.0"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+tar@^4:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+temptmp@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/temptmp/-/temptmp-1.1.0.tgz#bfbbff858d7f7d59c563fbf069758a7775ecd431"
+  integrity sha512-gHelQlePUzxRmodWL1uJ9LiwI+a7a3rkFGS9azTf4noPZgGOlx0dOPV9tZs5+QwGc4Nm8BfFxL9cfvV42GNxPQ==
+  dependencies:
+    del "^3.0.0"
+
+through2@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+truncate-utf8-bytes@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
+  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  dependencies:
+    utf8-byte-length "^1.0.1"
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+utf8-byte-length@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+uuid-parse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.0.0.tgz#f4657717624b0e4b88af36f98d89589a5bbee569"
+  integrity sha1-9GV3F2JLDkuIrzb5jYlYmlu+5Wk=
+
+uuid@^3.2.1, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+ws@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  dependencies:
+    async-limiter "~1.0.0"
+
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+
+xxhash@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/xxhash/-/xxhash-0.2.4.tgz#8b8a48162cfccc21b920fa500261187d40216c39"
+  integrity sha1-i4pIFiz8zCG5IPpQAmEYfUAhbDk=
+  dependencies:
+    nan "^2.4.0"
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+
+yazl@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
+  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
+  dependencies:
+    buffer-crc32 "~0.2.3"

From d5bd2d5adf53e904eb3e4d14cfc12815df025c38 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 12 Jan 2019 10:31:03 -0700
Subject: [PATCH 0699/1013] Experimental UTF-8 -> CP437 (aka nix -> ansi)
 override to work around terms such as NR that report 'xterm' but want CP437

---
 core/connect.js | 73 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/core/connect.js b/core/connect.js
index b9316a3e..f4645133 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -56,6 +56,74 @@ function ansiDiscoverHomePosition(client, cb) {
     client.term.write(`${ansi.goHome()}${ansi.queryPos()}`);    //  go home, query pos
 }
 
+function ansiAttemptDetectUTF8(client, cb) {
+    //
+    //  Trick to attempt and detect UTF-8. While there is a lot more than
+    //  just UTF-8 and CP437, many those are the main concerns, when it comes
+    //  terminals that for example tell us they are "xterm" but still want CP437.
+    //
+    //  Try to detect UTF-8 by discovering the cursor position, writing some
+    //  multi-byte UTF-8, and checking the position again. If the term is really
+    //  UTF-8, we should get a proper position, otherwise we'll be further out.
+    //
+    //  We currently only do this if the term hasn't already been ID'd as a
+    //  "*nix" terminal -- that is, xterm, etc.
+    //
+    if(!client.term.isNixTerm()) {
+        return cb(null);
+    }
+
+    let posStage = 1;
+    let initialPosition;
+    let giveUpTimer;
+
+    const giveUp = () => {
+        client.removeListener('cursor position report', cprListener);
+        clearTimeout(giveUpTimer);
+        return cb(null);
+    };
+
+    const ASCIIPortion = ' Character encoding detection ';
+
+    const cprListener = (pos) => {
+        switch(posStage) {
+            case 1 :
+                posStage = 2;
+
+                initialPosition = pos;
+                clearTimeout(giveUpTimer);
+
+                giveUpTimer = setTimeout( () => {
+                    return giveUp();
+                }, 2000);
+
+                client.once('cursor position report', cprListener);
+                client.term.rawWrite(`\u9760${ASCIIPortion}\u9760`);    //  Unicode skulls on each side
+                client.term.rawWrite(ansi.queryPos());
+                break;
+
+            case 2 :
+                {
+                    clearTimeout(giveUpTimer);
+                    const len = pos[1] - initialPosition[1];
+                    if(!isNaN(len) && len >= ASCIIPortion.length + 6) {  //  CP437 displays 3 chars each Unicode skull
+                        client.log.info('Terminal identified as UTF-8 but does not appear to be. Overriding to "ansi".');
+                        client.setTermType('ansi');
+                    }
+                }
+                return cb(null);
+
+        }
+    };
+
+    giveUpTimer = setTimeout( () => {
+        return giveUp();
+    }, 2000);
+
+    client.once('cursor position report', cprListener);
+    client.term.rawWrite(ansi.goHome() + ansi.queryPos());
+}
+
 function ansiQueryTermSizeIfNeeded(client, cb) {
     if(client.term.termHeight > 0 || client.term.termWidth > 0) {
         return cb(null);
@@ -164,7 +232,7 @@ function connectEntry(client, nextMenu) {
                             //  We still don't have something good for term height/width.
                             //  Default to DOS size 80x25.
                             //
-                            //  :TODO: Netrunner is currenting hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
+                            //  :TODO: Netrunner is currently hitting this and it feels wrong. Why is NAWS/ENV/CPR all failing???
                             client.log.warn( { reason : err.message }, 'Failed to negotiate term size; Defaulting to 80x25!');
 
                             term.termHeight = 25;
@@ -175,6 +243,9 @@ function connectEntry(client, nextMenu) {
                     return callback(null);
                 });
             },
+            function checkUtf8IfNeeded(callback) {
+                return ansiAttemptDetectUTF8(client, callback);
+            }
         ],
         () => {
             prepareTerminal(term);

From 403ee891d55eec802182d3215447e30e2b418f76 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 13 Jan 2019 18:19:00 -0700
Subject: [PATCH 0700/1013] Change column name, drop a useless one

---
 config/achievements.hjson | 2 +-
 core/achievement.js       | 8 ++++----
 core/database.js          | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 63ea5ee1..d5099f8c 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -70,7 +70,7 @@
                     points: 5
                 }
                 25: {
-                    title: "Inquisitive Caller"
+                    title: "Inquisitive"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 10
diff --git a/core/achievement.js b/core/achievement.js
index f57e2f06..333b968c 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -180,7 +180,7 @@ class Achievements {
         UserDb.get(
             `SELECT COUNT() AS count
             FROM user_achievement
-            WHERE user_id = ? AND achievement_tag = ? AND match_field = ?;`,
+            WHERE user_id = ? AND achievement_tag = ? AND match = ?;`,
             [ user.userId, achievementTag, field],
             (err, row) => {
                 return cb(err, row ? row.count : 0);
@@ -193,9 +193,9 @@ class Achievements {
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
 
         UserDb.run(
-            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match_field, match_value)
-            VALUES (?, ?, ?, ?, ?);`,
-            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField, info.matchValue ],
+            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match)
+            VALUES (?, ?, ?, ?);`,
+            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField ],
             err => {
                 if(err) {
                     return cb(err);
diff --git a/core/database.js b/core/database.js
index 371af1ae..a6af1930 100644
--- a/core/database.js
+++ b/core/database.js
@@ -194,9 +194,8 @@ const DB_INIT_TABLE = {
                 user_id             INTEGER NOT NULL,
                 achievement_tag     VARCHAR NOT NULL,
                 timestamp           DATETIME NOT NULL,
-                match_field         VARCHAR NOT NULL,
-                match_value         VARCHAR NOT NULL,
-                UNIQUE(user_id, achievement_tag, match_field),
+                match               VARCHAR NOT NULL,
+                UNIQUE(user_id, achievement_tag, match),
                 FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
             );`
         );

From 6408e406044a105cc6b95518ff56adcae8e2d7cd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 13 Jan 2019 19:10:54 -0700
Subject: [PATCH 0701/1013] Fix minor typo

---
 core/servers/login/ssh.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index c05e9294..c94267c4 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -167,7 +167,7 @@ function SSHClient(clientConn) {
                                     config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
                                     '(No new user names enabled!)';
 
-                                interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
+                                interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password:`;
                             }
                             return ctx.prompt(interactivePrompt, retryPrompt);
                         });

From 680898b56bf63f1b99a30e6cbad8ac0d35fddfd2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 20:13:49 -0700
Subject: [PATCH 0702/1013] Add minutes used to logoff event

---
 core/client_connections.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 33f1df8a..21aa5c1c 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -120,7 +120,8 @@ function removeClient(client) {
         );
 
         if(client.user && client.user.isValid()) {
-            Events.emit(Events.getSystemEvents().UserLogoff, { user : client.user } );
+            const minutesOnline = moment().diff(moment(client.user.properties[UserProps.LastLoginTs]), 'minutes');
+            Events.emit(Events.getSystemEvents().UserLogoff, { user : client.user, minutesOnline } );
         }
 
         Events.emit(

From 483e7f4ee96c14cae48e16a0467ec157529ea2bf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 20:14:33 -0700
Subject: [PATCH 0703/1013] Add global boolean to node sent event

---
 core/node_msg.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/node_msg.js b/core/node_msg.js
index bf22e24a..bb64757c 100644
--- a/core/node_msg.js
+++ b/core/node_msg.js
@@ -65,7 +65,7 @@ exports.getModule = class NodeMessageModule extends MenuModule {
                         }
                     }
 
-                    Events.emit(Events.getSystemEvents().UserSendNodeMsg, { user : this.client.user } );
+                    Events.emit(Events.getSystemEvents().UserSendNodeMsg, { user : this.client.user, global : -1 === nodeId } );
 
                     return this.prevMenu(cb);
                 });

From 7c6e3e3ad4499416f06ae763c9fc7f313728d483 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 20:14:59 -0700
Subject: [PATCH 0704/1013] Cleanup, notes, etc.

---
 core/system_events.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/system_events.js b/core/system_events.js
index c0c09f35..1bed2d13 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -2,26 +2,26 @@
 'use strict';
 
 module.exports = {
-    ClientConnected         : 'codes.l33t.enigma.system.connected',         //  { client, connectionCount }
-    ClientDisconnected      : 'codes.l33t.enigma.system.disconnected',      //  { client, connectionCount }
-    TermDetected            : 'codes.l33t.enigma.system.term_detected',     //  { client }
+    ClientConnected         : 'codes.l33t.enigma.system.connected',                 //  { client, connectionCount }
+    ClientDisconnected      : 'codes.l33t.enigma.system.disconnected',              //  { client, connectionCount }
+    TermDetected            : 'codes.l33t.enigma.system.term_detected',             //  { client }
 
-    ThemeChanged            : 'codes.l33t.enigma.system.theme_changed',     //  (theme.hjson): { themeId }
-    ConfigChanged           : 'codes.l33t.enigma.system.config_changed',    //  (config.hjson)
-    MenusChanged            : 'codes.l33t.enigma.system.menus_changed',     //  (menu.hjson)
-    PromptsChanged          : 'codes.l33t.enigma.system.prompts_changed',   //  (prompt.hjson)
+    ThemeChanged            : 'codes.l33t.enigma.system.theme_changed',             //  (theme.hjson): { themeId }
+    ConfigChanged           : 'codes.l33t.enigma.system.config_changed',            //  (config.hjson)
+    MenusChanged            : 'codes.l33t.enigma.system.menus_changed',             //  (menu.hjson)
+    PromptsChanged          : 'codes.l33t.enigma.system.prompts_changed',           //  (prompt.hjson)
 
     //  User - includes { user, ...}
-    NewUser                 : 'codes.l33t.enigma.system.user_new',
-    UserLogin               : 'codes.l33t.enigma.system.user_login',
-    UserLogoff              : 'codes.l33t.enigma.system.user_logoff',
-    UserUpload              : 'codes.l33t.enigma.system.user_upload',       //  {..., files[ fileEntry, ...] }
-    UserDownload            : 'codes.l33t.enigma.system.user_download',     //  {..., files[ fileEntry, ...] }
-    UserPostMessage         : 'codes.l33t.enigma.system.user_post_msg',     //  { areaTag }
-    UserSendMail            : 'codes.l33t.enigma.system.user_send_mail',
-    UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',
-    UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',
+    NewUser                 : 'codes.l33t.enigma.system.user_new',                  //  { ... }
+    UserLogin               : 'codes.l33t.enigma.system.user_login',                //  { ... }
+    UserLogoff              : 'codes.l33t.enigma.system.user_logoff',               //  { ... }
+    UserUpload              : 'codes.l33t.enigma.system.user_upload',               //  { ..., files[ fileEntry, ...] }
+    UserDownload            : 'codes.l33t.enigma.system.user_download',             //  { ..., files[ fileEntry, ...] }
+    UserPostMessage         : 'codes.l33t.enigma.system.user_post_msg',             //  { ..., areaTag }
+    UserSendMail            : 'codes.l33t.enigma.system.user_send_mail',            //  { ... }
+    UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',             //  { ... }
+    UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',        //  { ..., global }
     UserStatSet             : 'codes.l33t.enigma.system.user_stat_set',             //  { ..., statName, statValue }
-    UserStatIncrement       : 'codes.l33t.enigma.system.user_stat_increment',       //  {..., statName, statIncrementBy, statValue }
-    UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  {..., achievementTag, points }
+    UserStatIncrement       : 'codes.l33t.enigma.system.user_stat_increment',       //  { ..., statName, statIncrementBy, statValue }
+    UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  { ..., achievementTag, points }
 };

From dc7052105785c9508c3ceac0089adf5066768e9f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 20:18:02 -0700
Subject: [PATCH 0705/1013] + New, more detailed user event log entries that
 can be summed/etc. * Last callers indicators now use new user event log
 entries

---
 core/last_callers.js         |  2 +-
 core/stat_log.js             | 26 ++------------
 core/sys_event_user_log.js   | 69 ++++++++++++++++++++++++++++++++++++
 core/user_log_name.js        | 21 +++++++++++
 docs/modding/last-callers.md | 16 +++++----
 5 files changed, 102 insertions(+), 32 deletions(-)
 create mode 100644 core/sys_event_user_log.js
 create mode 100644 core/user_log_name.js

diff --git a/core/last_callers.js b/core/last_callers.js
index f7c2552e..9d875b2e 100644
--- a/core/last_callers.js
+++ b/core/last_callers.js
@@ -174,7 +174,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
         let indicatorSumsSql;
         if(actionIndicatorNames.length > 0) {
             indicatorSumsSql = actionIndicatorNames.map(i => {
-                return `SUM(CASE WHEN log_value='${_.snakeCase(i)}' THEN 1 ELSE 0 END) AS ${i}`;
+                return `SUM(CASE WHEN log_name='${_.snakeCase(i)}' THEN 1 ELSE 0 END) AS ${i}`;
             });
         }
 
diff --git a/core/stat_log.js b/core/stat_log.js
index 0ff6aff6..f03319d0 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -364,30 +364,8 @@ class StatLog {
     }
 
     initUserEvents(cb) {
-        //
-        //  We map some user events directly to user stat log entries such that they
-        //  are persisted for a time.
-        //
-        const Events = require('./events.js');
-        const systemEvents = Events.getSystemEvents();
-
-        const interestedEvents = [
-            systemEvents.NewUser,
-            systemEvents.UserUpload, systemEvents.UserDownload,
-            systemEvents.UserPostMessage, systemEvents.UserSendMail,
-            systemEvents.UserRunDoor, systemEvents.UserSendNodeMsg,
-            systemEvents.UserAchievementEarned,
-        ];
-
-        Events.addMultipleEventListener(interestedEvents, (event, eventName) => {
-            this.appendUserLogEntry(
-                event.user,
-                'system_event',
-                eventName.replace(/^codes\.l33t\.enigma\.system\./, ''),    //  strip package name prefix
-                90
-            );
-        });
-
+        const systemEventUserLogInit = require('./sys_event_user_log.js');
+        systemEventUserLogInit(this);
         return cb(null);
     }
 }
diff --git a/core/sys_event_user_log.js b/core/sys_event_user_log.js
new file mode 100644
index 00000000..8b9b3f22
--- /dev/null
+++ b/core/sys_event_user_log.js
@@ -0,0 +1,69 @@
+/* jslint node: true */
+'use strict';
+
+const Events    = require('./events.js');
+const LogNames  = require('./user_log_name.js');
+
+const DefaultKeepForDays = 365;
+
+module.exports = function systemEventUserLogInit(statLog) {
+    const systemEvents = Events.getSystemEvents();
+
+    const interestedEvents = [
+        systemEvents.NewUser,
+        systemEvents.UserLogin, systemEvents.UserLogoff,
+        systemEvents.UserUpload, systemEvents.UserDownload,
+        systemEvents.UserPostMessage, systemEvents.UserSendMail,
+        systemEvents.UserRunDoor, systemEvents.UserSendNodeMsg,
+        systemEvents.UserAchievementEarned,
+    ];
+
+    const append = (e, n, v) => {
+        statLog.appendUserLogEntry(e.user, n, v, DefaultKeepForDays);
+    };
+
+    Events.addMultipleEventListener(interestedEvents, (event, eventName) => {
+        const detailHandler = {
+            [ systemEvents.NewUser ] : (e) => {
+                append(e, LogNames.NewUser, 1);
+            },
+            [ systemEvents.UserLogin ] : (e) => {
+                append(e, LogNames.Login, 1);
+            },
+            [ systemEvents.UserLogoff ] : (e) => {
+                append(e, LogNames.Logoff, e.minutesOnline);
+            },
+            [ systemEvents.UserUpload ] : (e) => {
+                append(e, LogNames.UlFiles, e.files.length);
+                const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.meta.byte_size, 0);
+                append(e, LogNames.UlFileBytes, totalBytes);
+            },
+            [ systemEvents.UserDownload ] : (e) => {
+                append(e, LogNames.DlFiles, e.files.length);
+                const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.meta.byte_size, 0);
+                append(e, LogNames.DlFileBytes, totalBytes);
+            },
+            [ systemEvents.UserPostMessage ] : (e) => {
+                append(e, LogNames.PostMessage, e.areaTag);
+            },
+            [ systemEvents.UserSendMail ] : (e) => {
+                append(e, LogNames.SendMail, 1);
+            },
+            [ systemEvents.UserRunDoor ] : (e) => {
+                //  :TODO: store door tag, else '-' ?
+                append(e, LogNames.RunDoor, 1);
+            },
+            [ systemEvents.UserSendNodeMsg ] : (e) => {
+                append(e, LogNames.SendNodeMsg, e.global ? 'global' : 'direct');
+            },
+            [ systemEvents.UserAchievementEarned ] : (e) => {
+                append(e, LogNames.AchievementEarned, e.achievementTag);
+                append(e, LogNames.AchievementPointsEarned, e.points);
+            }
+        }[eventName];
+
+        if(detailHandler) {
+            detailHandler(event);
+        }
+    });
+};
diff --git a/core/user_log_name.js b/core/user_log_name.js
new file mode 100644
index 00000000..6186d326
--- /dev/null
+++ b/core/user_log_name.js
@@ -0,0 +1,21 @@
+/* jslint node: true */
+'use strict';
+
+//
+//  Common (but not all!) user log names
+//
+module.exports = {
+    NewUser                 : 'new_user',
+    Login                   : 'login',
+    Logoff                  : 'logoff',
+    UlFiles                 : 'ul_files',               //  value=count
+    UlFileBytes             : 'ul_file_bytes',          //  value=total bytes
+    DlFiles                 : 'dl_files',               //  value=count
+    DlFileBytes             : 'dl_file_bytes',          //  value=total bytes
+    PostMessage             : 'post_msg',               //  value=areaTag
+    SendMail                : 'send_mail',
+    RunDoor                 : 'run_door',
+    SendNodeMsg             : 'send_node_msg',          //  value=global|direct
+    AchievementEarned       : 'achievement_earned',     //  value=achievementTag
+    AchievementPointsEarned : 'achievement_pts_earned', //  value=points earned
+};
diff --git a/docs/modding/last-callers.md b/docs/modding/last-callers.md
index 830244d7..0e15b4f8 100644
--- a/docs/modding/last-callers.md
+++ b/docs/modding/last-callers.md
@@ -14,13 +14,15 @@ Available `config` block entries:
 * `sysop`: Sysop options:
     * `collapse`: Collapse or roll up entries that fall within the period specified. May be a string in the form of `30 minutes`, `3 weeks`, `1 hour`, etc.
     * `hide`: Hide all +op logins
-* `actionIndicators`: Maps user actions to indicators. For example: `userDownload` to "D". Available indicators:
-    * `userDownload`
-    * `userUpload`
-    * `userPostMsg`
-    * `userSendMail`
-    * `userRunDoor`
-    * `userSendNodeMsg`
+* `actionIndicators`: Maps user events/actions to indicators. For example: `userDownload` to "D". Available indicators:
+    * `newUser`: User is new.
+    * `dlFiles`: User downloaded file(s).
+    * `ulFiles`: User uploaded file(s).
+    * `postMsg`: User posted message(s) to the message base, EchoMail, etc.
+    * `sendMail`: User sent _private_ mail.
+    * `runDoor`: User ran door(s).
+    * `sendNodeMsg`: User sent a node message(s).
+    * `achievementEarned`: User earned an achievement(s).
 * `actionIndicatorDefault`: Default indicator when an action is not set. Defaults to "-".
 
 Remember that entries such as `actionIndicators` and `actionIndicatorDefault` may contain pipe color codes!

From 39e7fe5d69811473fb0ccd31190342dcb555e54d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 20:18:23 -0700
Subject: [PATCH 0706/1013] + WIP TopX module

---
 core/top_x.js | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 core/top_x.js

diff --git a/core/top_x.js b/core/top_x.js
new file mode 100644
index 00000000..7034a3d6
--- /dev/null
+++ b/core/top_x.js
@@ -0,0 +1,222 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const { MenuModule }    = require('./menu_module.js');
+const UserProps         = require('./user_property.js');
+const UserLogNames      = require('./user_log_name.js');
+const { Errors }        = require('./enig_error.js');
+const UserDb            = require('./database.js').dbs.user;
+const SysDb             = require('./database.js').dbs.system;
+const User              = require('./user.js');
+const stringFormat          = require('./string_format.js');
+
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
+
+exports.moduleInfo = {
+    name        : 'TopX',
+    desc        : 'Displays users top X stats',
+    author      : 'NuSkooler',
+    packageName : 'codes.l33t.enigma.topx',
+};
+
+const FormIds = {
+    menu    : 0,
+};
+
+exports.getModule = class TopXModule extends MenuModule {
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            async.series(
+                [
+                    (callback) => {
+                        const userPropValues    = _.values(UserProps);
+                        const userLogValues     = _.values(UserLogNames);
+
+                        return this.validateConfigFields(
+                            {
+                                mciMap  : (key, config) => {
+                                    const mciCodes = Object.keys(config.mciMap).map(mci => {
+                                        return parseInt(mci);
+                                    }).filter(mci => !isNaN(mci));
+                                    if(0 === mciCodes.length) {
+                                        return false;
+                                    }
+                                    return mciCodes.every(mci => {
+                                        const o = config.mciMap[mci];
+                                        if(!_.isObject(o)) {
+                                            return false;
+                                        }
+                                        const type = o.type;
+                                        switch(type) {
+                                            case 'userProp' :
+                                                if(!userPropValues.includes(o.propName)) {
+                                                    return false;
+                                                }
+                                                //  VM# must exist for this mci
+                                                if(!_.isObject(mciData, [ 'menu', `VM${mci}` ])) {
+                                                    return false;
+                                                }
+                                                break;
+
+                                            case 'userEventLog' :
+                                                if(!userLogValues.includes(o.logName)) {
+                                                    return false;
+                                                }
+                                                //  VM# must exist for this mci
+                                                if(!_.isObject(mciData, [ 'menu', `VM${mci}` ])) {
+                                                    return false;
+                                                }
+                                                break;
+
+                                            default :
+                                                return false;
+                                        }
+                                        return true;
+                                    });
+                                }
+                            },
+                            callback
+                        );
+                    },
+                    (callback) => {
+                        return this.prepViewController('menu', FormIds.menu, mciData.menu, callback);
+                    },
+                    (callback) => {
+                        async.forEachSeries(Object.keys(this.config.mciMap), (mciCode, nextMciCode) => {
+                            return this.populateTopXList(mciCode, nextMciCode);
+                        },
+                        err => {
+                            return callback(err);
+                        });
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    populateTopXList(mciCode, cb) {
+        const listView = this.viewControllers.menu.getView(mciCode);
+        if(!listView) {
+            return cb(Errors.UnexpectedState(`Failed to get view for MCI ${mciCode}`));
+        }
+
+        const type = this.config.mciMap[mciCode].type;        
+        switch(type) {
+            case 'userProp'     : return this.populateTopXUserProp(listView, mciCode, cb);
+            case 'userEventLog' : return this.populateTopXUserEventLog(listView, mciCode, cb);
+
+            //  we should not hit here; validation happens up front
+            default         : return cb(Errors.UnexpectedState(`Unexpected type: ${type}`));
+        }
+    }
+
+    rowsToItems(rows, cb) {
+        async.map(rows, (row, nextRow) => {
+            this.loadUserInfo(row.user_id, (err, userInfo) => {
+                if(err) {
+                    return nextRow(err);
+                }
+                return nextRow(null, Object.assign(userInfo, { value : row.value }));
+            });
+        },
+        (err, items) => {
+            return cb(err, items);
+        });
+    }
+
+    populateTopXUserEventLog(listView, mciCode, cb) {
+        const count = listView.dimens.height || 1;
+        const daysBack = this.config.mciMap[mciCode].daysBack;
+        const whereDate = daysBack ? `AND DATETIME(timestamp) >= DATETIME('now', '-${daysBack} days')` : '';
+
+        SysDb.all(
+            `SELECT user_id, SUM(CASE WHEN typeof(log_value) IS 'text' THEN 1 ELSE CAST(log_value AS INTEGER) END) AS value
+            FROM user_event_log
+            WHERE log_name = ? ${whereDate}
+            GROUP BY user_id
+            ORDER BY value DESC
+            LIMIT ${count};`,
+            [ this.config.mciMap[mciCode].logName ],
+            (err, rows) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                this.rowsToItems(rows, (err, items) => {
+                    if(err) {
+                        return cb(err);
+                    }
+                    listView.setItems(items);
+                    listView.redraw();
+                });
+            }
+        );
+    }
+
+    populateTopXUserProp(listView, mciCode, cb) {
+        const count = listView.dimens.height || 1;
+        UserDb.all(
+            `SELECT user_id, CAST(prop_value AS INTEGER) AS value
+            FROM user_property
+            WHERE prop_name = ?
+            ORDER BY value DESC
+            LIMIT ${count};`,
+            [ this.config.mciMap[mciCode].propName ],
+            (err, rows) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                this.rowsToItems(rows, (err, items) => {
+                    if(err) {
+                        return cb(err);
+                    }
+                    listView.setItems(items);
+                    listView.redraw();
+                });
+            }
+        );
+    }
+
+    loadUserInfo(userId, cb) {
+        const getPropOpts = {
+            names : [ UserProps.RealName, UserProps.Location, UserProps.Affiliations ]
+        };
+
+        const userInfo = { userId };
+        User.getUserName(userId, (err, userName) => {
+            if(err) {
+                return cb(err);
+            }
+
+            userInfo.userName = userName;
+
+            User.loadProperties(userId, getPropOpts, (err, props) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                userInfo.location   = props[UserProps.Location] || '';
+                userInfo.affils     = userInfo.affiliation = props[UserProps.Affiliations] || '';
+                userInfo.realName   = props[UserProps.RealName] || '';
+
+                return cb(null, userInfo);
+            });
+        });
+    }
+};

From 2a3271ef4e23f2a4345e49f56c25fe59690cd5e0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 21:27:25 -0700
Subject: [PATCH 0707/1013] Fix some events

---
 core/sys_event_user_log.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/sys_event_user_log.js b/core/sys_event_user_log.js
index 8b9b3f22..39120987 100644
--- a/core/sys_event_user_log.js
+++ b/core/sys_event_user_log.js
@@ -34,14 +34,18 @@ module.exports = function systemEventUserLogInit(statLog) {
                 append(e, LogNames.Logoff, e.minutesOnline);
             },
             [ systemEvents.UserUpload ] : (e) => {
-                append(e, LogNames.UlFiles, e.files.length);
-                const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.meta.byte_size, 0);
-                append(e, LogNames.UlFileBytes, totalBytes);
+                if(e.files.length) {    //  we can get here for dupe uploads
+                    append(e, LogNames.UlFiles, e.files.length);
+                    const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.meta.byte_size, 0);
+                    append(e, LogNames.UlFileBytes, totalBytes);
+                }
             },
             [ systemEvents.UserDownload ] : (e) => {
-                append(e, LogNames.DlFiles, e.files.length);
-                const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.meta.byte_size, 0);
-                append(e, LogNames.DlFileBytes, totalBytes);
+                if(e.files.length) {
+                    append(e, LogNames.DlFiles, e.files.length);
+                    const totalBytes = e.files.reduce( (bytes, fileEntry) => bytes + fileEntry.byteSize, 0);
+                    append(e, LogNames.DlFileBytes, totalBytes);
+                }
             },
             [ systemEvents.UserPostMessage ] : (e) => {
                 append(e, LogNames.PostMessage, e.areaTag);

From 4e1997302e07f1bfce918e99d0aa7a1cf1f0b57a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 17 Jan 2019 21:27:37 -0700
Subject: [PATCH 0708/1013] Fairly functional

---
 core/top_x.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/core/top_x.js b/core/top_x.js
index 7034a3d6..37b4f4bd 100644
--- a/core/top_x.js
+++ b/core/top_x.js
@@ -44,6 +44,13 @@ exports.getModule = class TopXModule extends MenuModule {
                         const userPropValues    = _.values(UserProps);
                         const userLogValues     = _.values(UserLogNames);
 
+                        const hasMci = (c, t) => {
+                            if(!Array.isArray(t)) {
+                                t = [ t ];
+                            }
+                            return t.some(t => _.isObject(mciData, [ 'menu', `${t}${c}` ]));
+                        };
+
                         return this.validateConfigFields(
                             {
                                 mciMap  : (key, config) => {
@@ -75,7 +82,7 @@ exports.getModule = class TopXModule extends MenuModule {
                                                     return false;
                                                 }
                                                 //  VM# must exist for this mci
-                                                if(!_.isObject(mciData, [ 'menu', `VM${mci}` ])) {
+                                                if(!hasMci(mci, ['VM'])) {
                                                     return false;
                                                 }
                                                 break;
@@ -121,17 +128,18 @@ exports.getModule = class TopXModule extends MenuModule {
             case 'userEventLog' : return this.populateTopXUserEventLog(listView, mciCode, cb);
 
             //  we should not hit here; validation happens up front
-            default         : return cb(Errors.UnexpectedState(`Unexpected type: ${type}`));
+            default             : return cb(Errors.UnexpectedState(`Unexpected type: ${type}`));
         }
     }
 
     rowsToItems(rows, cb) {
-        async.map(rows, (row, nextRow) => {
+        let position = 1;
+        async.mapSeries(rows, (row, nextRow) => {
             this.loadUserInfo(row.user_id, (err, userInfo) => {
                 if(err) {
                     return nextRow(err);
                 }
-                return nextRow(null, Object.assign(userInfo, { value : row.value }));
+                return nextRow(null, Object.assign(userInfo, { position : position++, value : row.value }));
             });
         },
         (err, items) => {
@@ -142,12 +150,15 @@ exports.getModule = class TopXModule extends MenuModule {
     populateTopXUserEventLog(listView, mciCode, cb) {
         const count = listView.dimens.height || 1;
         const daysBack = this.config.mciMap[mciCode].daysBack;
-        const whereDate = daysBack ? `AND DATETIME(timestamp) >= DATETIME('now', '-${daysBack} days')` : '';
+        const shouldSum = _.get(this.config.mciMap[mciCode], 'sum', true);
+
+        const valueSql  = shouldSum ? 'SUM(CAST(log_value AS INTEGER))' : 'COUNT()';
+        const dateSql   = daysBack ? `AND DATETIME(timestamp) >= DATETIME('now', '-${daysBack} days')` : '';
 
         SysDb.all(
-            `SELECT user_id, SUM(CASE WHEN typeof(log_value) IS 'text' THEN 1 ELSE CAST(log_value AS INTEGER) END) AS value
+            `SELECT user_id, ${valueSql} AS value
             FROM user_event_log
-            WHERE log_name = ? ${whereDate}
+            WHERE log_name = ? ${dateSql}
             GROUP BY user_id
             ORDER BY value DESC
             LIMIT ${count};`,
@@ -163,6 +174,7 @@ exports.getModule = class TopXModule extends MenuModule {
                     }
                     listView.setItems(items);
                     listView.redraw();
+                    return cb(null);
                 });
             }
         );
@@ -188,6 +200,7 @@ exports.getModule = class TopXModule extends MenuModule {
                     }
                     listView.setItems(items);
                     listView.redraw();
+                    return cb(null);
                 });
             }
         );

From 77763911842043610de0875060fa43916b207542 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 18 Jan 2019 22:09:10 -0700
Subject: [PATCH 0709/1013] Door utility and door tracking * Require >= 45s of
 time in a door before it counts as "run"

---
 core/bbs_link.js   | 22 +++++++---------------
 core/combatnet.js  | 19 ++++++++-----------
 core/door_party.js | 22 ++++++++++------------
 core/door_util.js  | 41 +++++++++++++++++++++++++++++++++++++++++
 core/exodus.js     | 18 ++++++++----------
 5 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 core/door_util.js

diff --git a/core/bbs_link.js b/core/bbs_link.js
index 9144cf0a..01eb3bfe 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -4,16 +4,16 @@
 const { MenuModule }    = require('./menu_module.js');
 const { resetScreen }   = require('./ansi_term.js');
 const { Errors }        = require('./enig_error.js');
-const Events            = require('./events.js');
-const StatLog           = require('./stat_log.js');
-const UserProps         = require('./user_property.js');
+const {
+    trackDoorRunBegin,
+    trackDoorRunEnd
+}                       = require('./door_util.js');
 
 //  deps
 const async         = require('async');
 const http          = require('http');
 const net           = require('net');
 const crypto        = require('crypto');
-const moment        = require('moment');
 
 const packageJson   = require('../package.json');
 
@@ -139,13 +139,9 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     self.client.term.write(resetScreen());
                     self.client.term.write('  Connecting to BBSLink.net, please wait...\n');
 
-                    const startTime = moment();
+                    const doorTracking = trackDoorRunBegin(self.client, `bbslink_${self.config.door}`);
 
                     const bridgeConnection = net.createConnection(connectOpts, function connected() {
-                        //  bump stats, fire events, etc.
-                        StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
-                        Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
-
                         self.client.log.info(connectOpts, 'BBSLink bridge connection established');
 
                         self.client.term.output.pipe(bridgeConnection);
@@ -153,7 +149,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                         self.client.once('end', function clientEnd() {
                             self.client.log.info('Connection ended. Terminating BBSLink connection');
                             clientTerminated = true;
-                            bridgeConnection.end();
+                            bridgeConnection.end();                            
                         });
                     });
 
@@ -161,11 +157,7 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                         self.client.term.output.unpipe(bridgeConnection);
                         self.client.term.output.resume();
 
-                        const endTime = moment();
-                        const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
-                        if(runTimeMinutes > 0) {
-                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
-                        }
+                        trackDoorRunEnd(doorTracking);
                     };
 
                     bridgeConnection.on('data', function incomingData(data) {
diff --git a/core/combatnet.js b/core/combatnet.js
index bfd98103..8f1a5623 100644
--- a/core/combatnet.js
+++ b/core/combatnet.js
@@ -5,14 +5,14 @@
 const { MenuModule }    = require('../core/menu_module.js');
 const { resetScreen }   = require('../core/ansi_term.js');
 const { Errors }        = require('./enig_error.js');
-const Events            = require('./events.js');
-const StatLog           = require('./stat_log.js');
-const UserProps         = require('./user_property.js');
+const {
+    trackDoorRunBegin,
+    trackDoorRunEnd
+}                       = require('./door_util.js');
 
 //  deps
 const async         = require('async');
 const RLogin        = require('rlogin');
-const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'CombatNet',
@@ -50,16 +50,14 @@ exports.getModule = class CombatNetModule extends MenuModule {
                     self.client.term.write(resetScreen());
                     self.client.term.write('Connecting to CombatNet, please wait...\n');
 
-                    const startTime = moment();
+                    let doorTracking;
 
                     const restorePipeToNormal = function() {
                         if(self.client.term.output) {
                             self.client.term.output.removeListener('data', sendToRloginBuffer);
 
-                            const endTime = moment();
-                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
-                            if(runTimeMinutes > 0) {
-                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            if(doorTracking) {
+                                trackDoorRunEnd(doorTracking);
                             }
                         }
                     };
@@ -102,8 +100,7 @@ exports.getModule = class CombatNetModule extends MenuModule {
                                 self.client.log.info('Connected to CombatNet');
                                 self.client.term.output.on('data', sendToRloginBuffer);
 
-                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
-                                Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
+                                doorTracking = trackDoorRunBegin(self.client);
                             } else {
                                 return callback(Errors.General('Failed to establish establish CombatNet connection'));
                             }
diff --git a/core/door_party.js b/core/door_party.js
index df3d189f..184416f7 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -5,14 +5,14 @@
 const { MenuModule }    = require('./menu_module.js');
 const { resetScreen }   = require('./ansi_term.js');
 const { Errors }        = require('./enig_error.js');
-const Events            = require('./events.js');
-const StatLog           = require('./stat_log.js');
-const UserProps         = require('./user_property.js');
+const {
+    trackDoorRunBegin,
+    trackDoorRunEnd
+}                       = require('./door_util.js');
 
 //  deps
 const async         = require('async');
 const SSHClient     = require('ssh2').Client;
-const moment        = require('moment');
 
 exports.moduleInfo = {
     name    : 'DoorParty',
@@ -58,17 +58,15 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 
                     let pipeRestored = false;
                     let pipedStream;
-                    const startTime = moment();
+                    let doorTracking;
 
                     const restorePipe = function() {
                         if(pipedStream && !pipeRestored && !clientTerminated) {
                             self.client.term.output.unpipe(pipedStream);
                             self.client.term.output.resume();
 
-                            const endTime = moment();
-                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
-                            if(runTimeMinutes > 0) {
-                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            if(doorTracking) {
+                                trackDoorRunEnd(doorTracking);
                             }
                         }
                     };
@@ -87,6 +85,8 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                                 return callback(Errors.General('Failed to establish tunnel'));
                             }
 
+                            doorTracking = trackDoorRunBegin(self.client);
+
                             //
                             //  Send rlogin
                             //  DoorParty wants the "server username" portion to be in the format of [BBS_TAG]USERNAME, e.g.
@@ -95,9 +95,6 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                             const rlogin = `\x00${self.client.user.username}\x00[${self.config.bbsTag}]${self.client.user.username}\x00${self.client.term.termType}\x00`;
                             stream.write(rlogin);
 
-                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
-                            Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
-
                             pipedStream = stream;   //  :TODO: this is hacky...
                             self.client.term.output.pipe(stream);
 
@@ -115,6 +112,7 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 
                     sshClient.on('error', err => {
                         self.client.log.info(`DoorParty SSH client error: ${err.message}`);
+                        trackDoorRunEnd(doorTracking);
                     });
 
                     sshClient.on('close', () => {
diff --git a/core/door_util.js b/core/door_util.js
new file mode 100644
index 00000000..c1681058
--- /dev/null
+++ b/core/door_util.js
@@ -0,0 +1,41 @@
+/* jslint node: true */
+'use strict';
+
+const UserProps     = require('./user_property.js');
+const Events        = require('./events.js');
+const StatLog       = require('./stat_log.js');
+
+const moment        = require('moment');
+
+exports.trackDoorRunBegin   = trackDoorRunBegin;
+exports.trackDoorRunEnd     = trackDoorRunEnd;
+
+
+function trackDoorRunBegin(client, doorTag) {
+    const startTime = moment();
+
+    //  door must be running for >= 45s for us to officially record it
+    const timeout   = setTimeout( () => {
+        StatLog.incrementUserStat(client.user, UserProps.DoorRunTotalCount, 1);
+
+        const eventInfo = { user : client.user };
+        if(doorTag) {
+            eventInfo.doorTag = doorTag;
+        }
+        Events.emit(Events.getSystemEvents().UserRunDoor, eventInfo);
+    }, 45 * 1000);
+
+    return { startTime, timeout, client, doorTag };
+}
+
+function trackDoorRunEnd(trackInfo) {
+    const { startTime, timeout, client } = trackInfo;
+
+    clearTimeout(timeout);
+
+    const endTime = moment();
+    const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+    if(runTimeMinutes > 0) {
+        StatLog.incrementUserStat(client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+    }
+}
\ No newline at end of file
diff --git a/core/exodus.js b/core/exodus.js
index eaf4c9a5..5ed29a4e 100644
--- a/core/exodus.js
+++ b/core/exodus.js
@@ -10,9 +10,10 @@ const Log               = require('./logger.js').log;
 const {
     getEnigmaUserAgent
 }                       = require('./misc_util.js');
-const Events            = require('./events.js');
-const StatLog           = require('./stat_log.js');
-const UserProps         = require('./user_property.js');
+const {
+    trackDoorRunBegin,
+    trackDoorRunEnd
+}                       = require('./door_util.js');
 
 //  deps
 const async         = require('async');
@@ -156,17 +157,15 @@ exports.getModule = class ExodusModule extends MenuModule {
 
                     let pipeRestored = false;
                     let pipedStream;
-                    const startTime = moment();
+                    let doorTracking;
 
                     function restorePipe() {
                         if(pipedStream && !pipeRestored && !clientTerminated) {
                             self.client.term.output.unpipe(pipedStream);
                             self.client.term.output.resume();
 
-                            const endTime = moment();
-                            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
-                            if(runTimeMinutes > 0) {
-                                StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+                            if(doorTracking) {
+                                trackDoorRunEnd(doorTracking);
                             }
                         }
                     }
@@ -198,8 +197,7 @@ exports.getModule = class ExodusModule extends MenuModule {
                         });
 
                         sshClient.shell(window, options, (err, stream) => {
-                            StatLog.incrementUserStat(self.client.user, UserProps.DoorRunTotalCount, 1);
-                            Events.emit(Events.getSystemEvents().UserRunDoor, { user : self.client.user } );
+                            doorTracking = trackDoorRunBegin(self.client, `exodus_${self.config.door}`);
 
                             pipedStream = stream;   //  :TODO: ewwwwwwwww hack
                             self.client.term.output.pipe(stream);

From 0457a6601fd72ce60dba12c1c790bfbb75dd01b4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 18 Jan 2019 23:12:01 -0700
Subject: [PATCH 0710/1013] Better door tracking * Send event info with door
 run time & door tag * Only if >= 45s * Only log minutes if >= 1 * No timer
 required; track only @ door exit time

---
 core/abracadabra.js        | 19 ++++++-------------
 core/door_util.js          | 33 +++++++++++++++------------------
 core/sys_event_user_log.js |  4 ++--
 core/system_events.js      |  2 +-
 core/user_log_name.js      |  3 ++-
 5 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 42731ac0..34374049 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -6,17 +6,17 @@ const DropFile          = require('./dropfile.js');
 const Door              = require('./door.js');
 const theme             = require('./theme.js');
 const ansi              = require('./ansi_term.js');
-const Events            = require('./events.js');
 const { Errors }        = require('./enig_error.js');
-const StatLog           = require('./stat_log.js');
-const UserProps         = require('./user_property.js');
+const {
+    trackDoorRunBegin,
+    trackDoorRunEnd
+}                       = require('./door_util.js');
 
 //  deps
 const async             = require('async');
 const assert            = require('assert');
 const _                 = require('lodash');
 const paths             = require('path');
-const moment            = require('moment');
 
 const activeDoorNodeInstances = {};
 
@@ -152,9 +152,6 @@ exports.getModule = class AbracadabraModule extends MenuModule {
     }
 
     runDoor() {
-        StatLog.incrementUserStat(this.client.user, UserProps.DoorRunTotalCount, 1);
-        Events.emit(Events.getSystemEvents().UserRunDoor, { user : this.client.user } );
-
         this.client.term.write(ansi.resetScreen());
 
         const exeInfo = {
@@ -168,14 +165,10 @@ exports.getModule = class AbracadabraModule extends MenuModule {
             node            : this.client.node,
         };
 
-        const startTime = moment();
+        const doorTracking = trackDoorRunBegin(this.client, this.config.name);
 
         this.doorInstance.run(exeInfo, () => {
-            const endTime = moment();
-            const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
-            if(runTimeMinutes > 0) {
-                StatLog.incrementUserStat(this.client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
-            }
+            trackDoorRunEnd(doorTracking);
 
             //
             //  Try to clean up various settings such as scroll regions that may
diff --git a/core/door_util.js b/core/door_util.js
index c1681058..6517f1be 100644
--- a/core/door_util.js
+++ b/core/door_util.js
@@ -10,32 +10,29 @@ const moment        = require('moment');
 exports.trackDoorRunBegin   = trackDoorRunBegin;
 exports.trackDoorRunEnd     = trackDoorRunEnd;
 
-
 function trackDoorRunBegin(client, doorTag) {
     const startTime = moment();
-
-    //  door must be running for >= 45s for us to officially record it
-    const timeout   = setTimeout( () => {
-        StatLog.incrementUserStat(client.user, UserProps.DoorRunTotalCount, 1);
-
-        const eventInfo = { user : client.user };
-        if(doorTag) {
-            eventInfo.doorTag = doorTag;
-        }
-        Events.emit(Events.getSystemEvents().UserRunDoor, eventInfo);
-    }, 45 * 1000);
-
-    return { startTime, timeout, client, doorTag };
+    return { startTime, client, doorTag };
 }
 
 function trackDoorRunEnd(trackInfo) {
-    const { startTime, timeout, client } = trackInfo;
+    const { startTime, client, doorTag } = trackInfo;
 
-    clearTimeout(timeout);
+    const diff = moment.duration(moment().diff(startTime));
+    if(diff.asSeconds() >= 45) {
+        StatLog.incrementUserStat(client.user, UserProps.DoorRunTotalCount, 1);
+    }
 
-    const endTime = moment();
-    const runTimeMinutes = Math.floor(moment.duration(endTime.diff(startTime)).asMinutes());
+    const runTimeMinutes = Math.floor(diff.asMinutes());
     if(runTimeMinutes > 0) {
         StatLog.incrementUserStat(client.user, UserProps.DoorRunTotalMinutes, runTimeMinutes);
+
+        const eventInfo = {
+            runTimeMinutes,
+            user    : client.user,
+            doorTag : doorTag || 'unknown',
+        };
+
+        Events.emit(Events.getSystemEvents().UserRunDoor, eventInfo);
     }
 }
\ No newline at end of file
diff --git a/core/sys_event_user_log.js b/core/sys_event_user_log.js
index 39120987..63ae0e55 100644
--- a/core/sys_event_user_log.js
+++ b/core/sys_event_user_log.js
@@ -54,8 +54,8 @@ module.exports = function systemEventUserLogInit(statLog) {
                 append(e, LogNames.SendMail, 1);
             },
             [ systemEvents.UserRunDoor ] : (e) => {
-                //  :TODO: store door tag, else '-' ?
-                append(e, LogNames.RunDoor, 1);
+                append(e, LogNames.RunDoor, e.doorTag);
+                append(e, LogNames.RunDoorMinutes, e.runTimeMinutes);
             },
             [ systemEvents.UserSendNodeMsg ] : (e) => {
                 append(e, LogNames.SendNodeMsg, e.global ? 'global' : 'direct');
diff --git a/core/system_events.js b/core/system_events.js
index 1bed2d13..173f753b 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -19,7 +19,7 @@ module.exports = {
     UserDownload            : 'codes.l33t.enigma.system.user_download',             //  { ..., files[ fileEntry, ...] }
     UserPostMessage         : 'codes.l33t.enigma.system.user_post_msg',             //  { ..., areaTag }
     UserSendMail            : 'codes.l33t.enigma.system.user_send_mail',            //  { ... }
-    UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',             //  { ... }
+    UserRunDoor             : 'codes.l33t.enigma.system.user_run_door',             //  { ..., runTimeMinutes, doorTag|unknown }
     UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',        //  { ..., global }
     UserStatSet             : 'codes.l33t.enigma.system.user_stat_set',             //  { ..., statName, statValue }
     UserStatIncrement       : 'codes.l33t.enigma.system.user_stat_increment',       //  { ..., statName, statIncrementBy, statValue }
diff --git a/core/user_log_name.js b/core/user_log_name.js
index 6186d326..77fa996c 100644
--- a/core/user_log_name.js
+++ b/core/user_log_name.js
@@ -14,7 +14,8 @@ module.exports = {
     DlFileBytes             : 'dl_file_bytes',          //  value=total bytes
     PostMessage             : 'post_msg',               //  value=areaTag
     SendMail                : 'send_mail',
-    RunDoor                 : 'run_door',
+    RunDoor                 : 'run_door',               //  value=doorTag|unknown
+    RunDoorMinutes          : 'run_door_minutes',       //  value=minutes ran
     SendNodeMsg             : 'send_node_msg',          //  value=global|direct
     AchievementEarned       : 'achievement_earned',     //  value=achievementTag
     AchievementPointsEarned : 'achievement_pts_earned', //  value=points earned

From 4173a2e6db9e55595b14845c20edc2f481b60fa1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 18 Jan 2019 23:13:22 -0700
Subject: [PATCH 0711/1013] Add docs for TopX module

---
 docs/_includes/nav.md |  1 +
 docs/modding/top-x.md | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 docs/modding/top-x.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 79ce2f31..e67f1163 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -82,6 +82,7 @@
     - [Web Download Manager]({{ site.baseurl }}{% link modding/file-base-web-download-manager.md %})
     - [Set Newscan Date]({{ site.baseurl }}{% link modding/set-newscan-date.md %})
     - [Node to Node Messaging]({{ site.baseurl }}{% link modding/node-msg.md %})
+    - [Top X]({{ site.baseurl }}{% link modding/top-x.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/top-x.md b/docs/modding/top-x.md
new file mode 100644
index 00000000..6ab9c545
--- /dev/null
+++ b/docs/modding/top-x.md
@@ -0,0 +1,60 @@
+---
+layout: page
+title: TopX
+---
+## The TopX Module
+The built in `top_x` module allows for displaying oldschool top user stats for the week, month, etc. Ops can configure what stat(s) are displayed and how far back in days the stats are considered.
+
+## Configuration
+### Config Block
+Available `config` block entries:
+* `mciMap`: Supplies a mapping of MCI code to data source. See `mciMap` below.
+
+#### MCI Map (mciMap)
+The `mciMap` `config` block configures MCI code mapping to data sources. Currently the following data sources (determined by `type`) are available:
+
+| Type | Description |
+|-------------|-------------|
+| `userEventLog` | Top counts or sum of values found in the User Event Log. |
+| `userProp` | Top values (aka "scores") from user properties. |
+
+##### User Event Log (userEventLog)
+When `type` is set to `userEventLog`, entries from the User Event Log can be counted (ie: individual instances of a particular log item) or summed in the case of log items that have numeric values. The default is to sum.
+
+Some current User Event Log `logName` examples include `ul_files`, `dl_file_bytes`, or `achievement_earned`. See [user_log_name.js](/core/user_log_name.js) for additional information.
+
+Example `userEventLog` entry:
+```hjson
+mciMap: {
+    1: { //  e.g.: %VM1
+        type: userEventLog
+        logName: achievement_pts_earned // top achievement points earned
+        sum: true // this is the default
+        daysBack: 7 // omit daysBack for all-of-time
+    }
+}
+```
+
+#### User Properties (userProp)
+When `type` is set to `userProp`, data is collected from individual user's properties. For example a `propName` of `minutes_online_total_count`. See [user_property.js](/core/user_property.js) for more information.
+
+Example `userProp` entry:
+```hjson
+mciMap: {
+    2: { // e.g.: %VM2
+        type: userProp
+        propName: minutes_online_total_count // top users by minutes spent on the board
+    }
+}
+```
+
+### Theming
+Generally `mciMap` entries will point to a Vertical List View Menu (`%VM1`, `%VM2`, etc.). The following `itemFormat` object is provided:
+* `value`: The value acquired from the supplied data source.
+* `userName`: User's username.
+* `realName`: User's real name.
+* `location`: User's location.
+* `affils` or `affiliation`: Users affiliations.
+* `position`: Rank position (numeric).
+
+Remember that string format rules apply, so for example, if displaying top uploaded bytes (`ul_file_bytes`), a `itemFormat` may be `{userName} - {value!sizeWithAbbr}` yielding something like "TopDude - 4 GB". See [MCI](/docs/art/mci.md) for additional information.

From 4696bd9ff27a9ab70a3a3ae913e65750bdd12a8f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 18 Jan 2019 23:46:15 -0700
Subject: [PATCH 0712/1013] Fix PCBoard/WildCat! color codes

---
 core/color_codes.js | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/color_codes.js b/core/color_codes.js
index 4119a8ce..ff08275e 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -131,7 +131,7 @@ function renegadeToAnsi(s, client) {
 //
 //  Supported control code formats:
 //  * Renegade      : |##
-//  * PCBoard       : @X## where the first number/char is FG color, and second is BG
+//  * PCBoard       : @X## where the first number/char is BG color, and second is FG
 //  * WildCat!      : @##@ the same as PCBoard without the X prefix, but with a @ suffix
 //  * WWIV          : ^#
 //  * CNET Y-Style  : 0x19## where ## is a specific set of codes -- this is the older format
@@ -179,26 +179,6 @@ function controlCodesToAnsi(s, client) {
                     v = m[4];
                 }
 
-                fg = {
-                    0   : [ 'reset', 'black' ],
-                    1   : [ 'reset', 'blue' ],
-                    2   : [ 'reset', 'green' ],
-                    3   : [ 'reset', 'cyan' ],
-                    4   : [ 'reset', 'red' ],
-                    5   : [ 'reset', 'magenta' ],
-                    6   : [ 'reset', 'yellow' ],
-                    7   : [ 'reset', 'white' ],
-
-                    8   : [ 'blink', 'black' ],
-                    9   : [ 'blink', 'blue' ],
-                    A   : [ 'blink', 'green' ],
-                    B   : [ 'blink', 'cyan' ],
-                    C   : [ 'blink', 'red' ],
-                    D   : [ 'blink', 'magenta' ],
-                    E   : [ 'blink', 'yellow' ],
-                    F   : [ 'blink', 'white' ],
-                }[v.charAt(0)] || ['normal'];
-
                 bg = {
                     0   : [ 'blackBG' ],
                     1   : [ 'blueBG' ],
@@ -217,7 +197,27 @@ function controlCodesToAnsi(s, client) {
                     D   : [ 'bold', 'magentaBG' ],
                     E   : [ 'bold', 'yellowBG' ],
                     F   : [ 'bold', 'whiteBG' ],
-                }[v.charAt(1)] || [ 'normal' ];
+                }[v.charAt(0)] || [ 'normal' ];
+
+                fg = {
+                    0   : [ 'reset', 'black' ],
+                    1   : [ 'reset', 'blue' ],
+                    2   : [ 'reset', 'green' ],
+                    3   : [ 'reset', 'cyan' ],
+                    4   : [ 'reset', 'red' ],
+                    5   : [ 'reset', 'magenta' ],
+                    6   : [ 'reset', 'yellow' ],
+                    7   : [ 'reset', 'white' ],
+
+                    8   : [ 'blink', 'black' ],
+                    9   : [ 'blink', 'blue' ],
+                    A   : [ 'blink', 'green' ],
+                    B   : [ 'blink', 'cyan' ],
+                    C   : [ 'blink', 'red' ],
+                    D   : [ 'blink', 'magenta' ],
+                    E   : [ 'blink', 'yellow' ],
+                    F   : [ 'blink', 'white' ],
+                }[v.charAt(1)] || ['normal'];
 
                 v = ANSI.sgr(fg.concat(bg));
                 result += s.substr(lastIndex, m.index - lastIndex) + v;

From 9b7b5c6fffa9c1c6c260934a8313e4bbe87fc3b3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 18 Jan 2019 23:47:00 -0700
Subject: [PATCH 0713/1013] Initial to_ansi util for color codes -> ANSI

---
 util/to_ansi.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100755 util/to_ansi.js

diff --git a/util/to_ansi.js b/util/to_ansi.js
new file mode 100755
index 00000000..72838493
--- /dev/null
+++ b/util/to_ansi.js
@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+/* jslint node: true */
+/* eslint-disable no-console */
+'use strict';
+
+const { controlCodesToAnsi } = require('../core/color_codes.js');
+
+const fs    = require('graceful-fs');
+const iconv = require('iconv-lite');
+
+const ToolVersion = '1.0.0';
+
+function main() {
+    const argv = exports.argv = require('minimist')(process.argv.slice(2), {
+        alias : {
+            h		: 'help',
+            v		: 'version',
+        }
+    });
+
+    if(argv.version) {
+        console.info(ToolVersion);
+        return 0;
+    }
+
+    if(0 === argv._.length || argv.help) {
+        console.info('usage: to_ansi.js [--version] [--help] PATH');
+        return 0;
+    }
+
+    const path = argv._[0];
+
+    fs.readFile(path, (err, data) => {
+        if(err) {
+            console.error(err.message);
+            return -1;
+        }
+
+        data = iconv.decode(data, 'cp437');
+        console.info(controlCodesToAnsi(data));
+        return 0;
+    });
+}
+
+main();

From 34f0afc1752ac022f184e45c2b0b62483dfa9a13 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 20 Jan 2019 12:22:42 -0700
Subject: [PATCH 0714/1013] Fix INSERT clause for cases of overlap

---
 core/achievement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/achievement.js b/core/achievement.js
index 333b968c..d2ac2508 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -193,7 +193,7 @@ class Achievements {
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
 
         UserDb.run(
-            `INSERT INTO user_achievement (user_id, achievement_tag, timestamp, match)
+            `INSERT OR IGNORE INTO user_achievement (user_id, achievement_tag, timestamp, match)
             VALUES (?, ?, ?, ?);`,
             [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField ],
             err => {

From 18a7a79f14e264bc6826b36aa340efb254d1e3a2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 20 Jan 2019 21:57:31 -0700
Subject: [PATCH 0715/1013] TopX mciMap standardized on "value" vs (propName,
 logName, etc.)

---
 core/top_x.js         | 18 +++++++++---------
 docs/modding/top-x.md | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/top_x.js b/core/top_x.js
index 37b4f4bd..2403c380 100644
--- a/core/top_x.js
+++ b/core/top_x.js
@@ -9,7 +9,6 @@ const { Errors }        = require('./enig_error.js');
 const UserDb            = require('./database.js').dbs.user;
 const SysDb             = require('./database.js').dbs.system;
 const User              = require('./user.js');
-const stringFormat          = require('./string_format.js');
 
 //  deps
 const _                 = require('lodash');
@@ -68,7 +67,7 @@ exports.getModule = class TopXModule extends MenuModule {
                                         const type = o.type;
                                         switch(type) {
                                             case 'userProp' :
-                                                if(!userPropValues.includes(o.propName)) {
+                                                if(!userPropValues.includes(o.value)) {
                                                     return false;
                                                 }
                                                 //  VM# must exist for this mci
@@ -78,7 +77,7 @@ exports.getModule = class TopXModule extends MenuModule {
                                                 break;
 
                                             case 'userEventLog' :
-                                                if(!userLogValues.includes(o.logName)) {
+                                                if(!userLogValues.includes(o.value)) {
                                                     return false;
                                                 }
                                                 //  VM# must exist for this mci
@@ -122,7 +121,7 @@ exports.getModule = class TopXModule extends MenuModule {
             return cb(Errors.UnexpectedState(`Failed to get view for MCI ${mciCode}`));
         }
 
-        const type = this.config.mciMap[mciCode].type;        
+        const type = this.config.mciMap[mciCode].type;
         switch(type) {
             case 'userProp'     : return this.populateTopXUserProp(listView, mciCode, cb);
             case 'userEventLog' : return this.populateTopXUserEventLog(listView, mciCode, cb);
@@ -148,9 +147,10 @@ exports.getModule = class TopXModule extends MenuModule {
     }
 
     populateTopXUserEventLog(listView, mciCode, cb) {
-        const count = listView.dimens.height || 1;
-        const daysBack = this.config.mciMap[mciCode].daysBack;
-        const shouldSum = _.get(this.config.mciMap[mciCode], 'sum', true);
+        const mciMap    = this.config.mciMap[mciCode];
+        const count     = listView.dimens.height || 1;
+        const daysBack  = mciMap.daysBack;
+        const shouldSum = _.get(mciMap, 'sum', true);
 
         const valueSql  = shouldSum ? 'SUM(CAST(log_value AS INTEGER))' : 'COUNT()';
         const dateSql   = daysBack ? `AND DATETIME(timestamp) >= DATETIME('now', '-${daysBack} days')` : '';
@@ -162,7 +162,7 @@ exports.getModule = class TopXModule extends MenuModule {
             GROUP BY user_id
             ORDER BY value DESC
             LIMIT ${count};`,
-            [ this.config.mciMap[mciCode].logName ],
+            [ mciMap.value ],
             (err, rows) => {
                 if(err) {
                     return cb(err);
@@ -188,7 +188,7 @@ exports.getModule = class TopXModule extends MenuModule {
             WHERE prop_name = ?
             ORDER BY value DESC
             LIMIT ${count};`,
-            [ this.config.mciMap[mciCode].propName ],
+            [ this.config.mciMap[mciCode].value ],
             (err, rows) => {
                 if(err) {
                     return cb(err);
diff --git a/docs/modding/top-x.md b/docs/modding/top-x.md
index 6ab9c545..50d69bee 100644
--- a/docs/modding/top-x.md
+++ b/docs/modding/top-x.md
@@ -3,7 +3,7 @@ layout: page
 title: TopX
 ---
 ## The TopX Module
-The built in `top_x` module allows for displaying oldschool top user stats for the week, month, etc. Ops can configure what stat(s) are displayed and how far back in days the stats are considered.
+The built in `top_x` module allows for displaying oLDSKOOL (?!) top user stats for the week, month, etc. Ops can configure what stat(s) are displayed and how far back in days the stats are considered.
 
 ## Configuration
 ### Config Block
@@ -21,14 +21,14 @@ The `mciMap` `config` block configures MCI code mapping to data sources. Current
 ##### User Event Log (userEventLog)
 When `type` is set to `userEventLog`, entries from the User Event Log can be counted (ie: individual instances of a particular log item) or summed in the case of log items that have numeric values. The default is to sum.
 
-Some current User Event Log `logName` examples include `ul_files`, `dl_file_bytes`, or `achievement_earned`. See [user_log_name.js](/core/user_log_name.js) for additional information.
+Some current User Event Log `value` examples include `ul_files`, `dl_file_bytes`, or `achievement_earned`. See [user_log_name.js](/core/user_log_name.js) for additional information.
 
 Example `userEventLog` entry:
 ```hjson
 mciMap: {
     1: { //  e.g.: %VM1
         type: userEventLog
-        logName: achievement_pts_earned // top achievement points earned
+        value: achievement_pts_earned // top achievement points earned
         sum: true // this is the default
         daysBack: 7 // omit daysBack for all-of-time
     }
@@ -36,14 +36,14 @@ mciMap: {
 ```
 
 #### User Properties (userProp)
-When `type` is set to `userProp`, data is collected from individual user's properties. For example a `propName` of `minutes_online_total_count`. See [user_property.js](/core/user_property.js) for more information.
+When `type` is set to `userProp`, data is collected from individual user's properties. For example a `value` of `minutes_online_total_count`. See [user_property.js](/core/user_property.js) for more information.
 
 Example `userProp` entry:
 ```hjson
 mciMap: {
     2: { // e.g.: %VM2
         type: userProp
-        propName: minutes_online_total_count // top users by minutes spent on the board
+        value: minutes_online_total_count // top users by minutes spent on the board
     }
 }
 ```

From 16e903d4c67bee9222161ca3c844ae36cae1e2e7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 20 Jan 2019 21:58:00 -0700
Subject: [PATCH 0716/1013] Achievements are now recorded in more detail such
 that they can be retrieved *as they were* at the time of earning

---
 core/achievement.js | 120 ++++++++++++++++++++++++++++++++++----------
 core/database.js    |   3 ++
 2 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index d2ac2508..3c200c9b 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -22,7 +22,10 @@ const {
     ErrorReasons
 }                           = require('./enig_error.js');
 const { getThemeArt }       = require('./theme.js');
-const { pipeToAnsi }        = require('./color_codes.js');
+const {
+    pipeToAnsi,
+    stripMciColorCodes
+}                           = require('./color_codes.js');
 const stringFormat          = require('./string_format.js');
 const StatLog               = require('./stat_log.js');
 const Log                   = require('./logger.js').log;
@@ -127,6 +130,56 @@ class Achievements {
         this.events = events;
     }
 
+    getAchievementsEarnedByUser(userId, cb) {
+        if(!this.isEnabled()) {
+            return cb(Errors.General('Achievements not enabled', ErrorReasons.Disabled));
+        }
+
+        UserDb.all(
+            `SELECT achievement_tag, timestamp, match, title, text, points
+            FROM user_achievement
+            WHERE user_id = ?
+            ORDER BY DATETIME(timestamp);`,
+            [ userId ],
+            (err, rows) => {
+                if(err) {
+                    return cb(err);
+                }
+
+                const earned = rows.map(row => {
+                    const achievement = Achievement.factory(this.achievementConfig.achievements[row.achievement_tag]);
+                    if(!achievement) {
+                        return;
+                    }
+
+                    const earnedInfo = {
+                        achievementTag  : row.achievement_tag,
+                        type            : achievement.data.type,
+                        retroactive     : achievement.data.retroactive,
+                        title           : row.title,
+                        text            : row.text,
+                        points          : row.points,
+                    };
+
+                    switch(earnedInfo.type) {
+                        case [ Achievement.Types.UserStatSet ] :
+                        case [ Achievement.Types.UserStatInc ] :
+                            earnedInfo.statName = achievement.data.statName;
+                            break;
+                    }
+
+                    return earnedInfo;
+                }).filter(a => a);  //  remove any empty records (ie: no achievement.hjson entry exists anymore).
+
+                return cb(null, earned);
+            }
+        );
+    }
+
+    isEnabled() {
+        return !_.isUndefined(this.achievementConfig);
+    }
+
     init(cb) {
         let achievementConfigPath = _.get(Config(), 'general.achievementFile');
         if(!achievementConfigPath) {
@@ -188,14 +241,19 @@ class Achievements {
         );
     }
 
-    record(info, cb) {
+    record(info, localInterruptItem, cb) {
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalCount, 1);
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
 
+        const recordData = [
+            info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField,
+            stripMciColorCodes(localInterruptItem.title), stripMciColorCodes(localInterruptItem.achievText), info.details.points,
+        ];
+
         UserDb.run(
-            `INSERT OR IGNORE INTO user_achievement (user_id, achievement_tag, timestamp, match)
-            VALUES (?, ?, ?, ?);`,
-            [ info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField ],
+            `INSERT OR IGNORE INTO user_achievement (user_id, achievement_tag, timestamp, match, title, text, points)
+            VALUES (?, ?, ?, ?, ?, ?, ?);`,
+            recordData,
             err => {
                 if(err) {
                     return cb(err);
@@ -215,32 +273,31 @@ class Achievements {
         );
     }
 
-    display(info, cb) {
-        this.createAchievementInterruptItems(info, (err, interruptItems) => {
-            if(err) {
-                return cb(err);
-            }
+    display(info, interruptItems, cb) {
+        if(interruptItems.local) {
+            UserInterruptQueue.queue(interruptItems.local, { clients : info.client } );
+        }
 
-            if(interruptItems.local) {
-                UserInterruptQueue.queue(interruptItems.local, { clients : info.client } );
-            }
+        if(interruptItems.global) {
+            UserInterruptQueue.queue(interruptItems.global, { omit : info.client } );
+        }
 
-            if(interruptItems.global) {
-                UserInterruptQueue.queue(interruptItems.global, { omit : info.client } );
-            }
-
-            return cb(null);
-        });
+        return cb(null);
     }
 
     recordAndDisplayAchievement(info, cb) {
-        async.series(
+        async.waterfall(
             [
                 (callback) => {
-                    return this.record(info, callback);
+                    return this.createAchievementInterruptItems(info, callback);
                 },
-                (callback) => {
-                    return this.display(info, callback);
+                (interruptItems, callback) => {
+                    this.record(info, interruptItems.local, err => {
+                        return callback(err, interruptItems);
+                    });
+                },
+                (interruptItems, callback) => {
+                    return this.display(info, interruptItems, callback);
                 }
             ],
             err => {
@@ -394,7 +451,7 @@ class Achievements {
             userAffils      : info.user.properties[UserProps.Affiliations],
             nodeId          : info.client.node,
             title           : info.details.title,
-            text            : info.global ? info.details.globalText : info.details.text,
+            //text            : info.global ? info.details.globalText : info.details.text,
             points          : info.details.points,
             achievedValue   : info.achievedValue,
             matchField      : info.matchField,
@@ -480,8 +537,10 @@ class Achievements {
                     (headerArt, footerArt, callback) => {
                         const itemText = 'global' === itemType ? globalText : text;
                         interruptItems[itemType] = {
-                            text    : `${title}\r\n${itemText}`,
-                            pause   : true,
+                            title,
+                            achievText  : itemText,
+                            text        : `${title}\r\n${itemText}`,
+                            pause       : true,
                         };
                         if(headerArt || footerArt) {
                             const themeDefaults = _.get(info.client.currentTheme, 'achievements.defaults', {});
@@ -518,5 +577,12 @@ let achievements;
 
 exports.moduleInitialize = (initInfo, cb) => {
     achievements = new Achievements(initInfo.events);
-    return achievements.init(cb);
+    achievements.init( err => {
+        if(err) {
+            return cb(err);
+        }
+
+        exports.achievements = achievements;
+        return cb(null);
+    });
 };
diff --git a/core/database.js b/core/database.js
index a6af1930..91f56a04 100644
--- a/core/database.js
+++ b/core/database.js
@@ -195,6 +195,9 @@ const DB_INIT_TABLE = {
                 achievement_tag     VARCHAR NOT NULL,
                 timestamp           DATETIME NOT NULL,
                 match               VARCHAR NOT NULL,
+                title               VARCHAR NOT NULL,
+                text                VARCHAR NOT NULL,
+                points              INTEGER NOT NULL,
                 UNIQUE(user_id, achievement_tag, match),
                 FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
             );`

From 94609eef3c1b4f490f7569d40bf18518c6b850b0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Jan 2019 20:18:38 -0700
Subject: [PATCH 0717/1013] Minor updates

---
 docs/installation/windows.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index a68afe97..a9fcf060 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -1,14 +1,14 @@
 ---
 layout: page
-title: Windows Full Install
+title: Installation Under Windows
 ---
+## Installation Under Windows
 
-ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit doors natively then you should use a 32bit Windows.  
-
+ENiGMA½ will run on both 32bit and 64bit Windows. If you want to run 16bit doors natively then you should use a 32bit Windows.
 
 ### Basic Instructions
 
-1. Download and Install [Node.JS](https://nodejs.org/en/download/). 
+1. Download and Install [Node.JS](https://nodejs.org/).
 
 	1. Upgrade NPM : At this time node comes with NPM 5.6 preinstalled. To upgrade to a newer version now or in the future on windows follow this method. `*Run PowerShell as Administrator`
 

From b45cccaef711a29651671cd1337b8c8fb7275ff9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Jan 2019 20:19:05 -0700
Subject: [PATCH 0718/1013] Don't real-time interrupt while you interrupt... yo
 dawg.

---
 core/menu_module.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 15e7ebce..52784042 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -203,17 +203,24 @@ exports.MenuModule = class MenuModule extends PluginModule {
             return cb(null, false); //  don't eat up the item; queue for later
         }
 
+        this.realTimeInterrupt = 'blocked';
+
         //
         //  Default impl: clear screen -> standard display -> reload menu
         //
+        const done = (err, removeFromQueue) => {
+            this.realTimeInterrupt = 'allowed';
+            return cb(err, removeFromQueue);
+        };
+
         this.client.interruptQueue.displayWithItem(
             Object.assign({}, interruptItem, { cls : true }),
             err => {
                 if(err) {
-                    return cb(err, false);
+                    return done(err, false);
                 }
                 this.reload(err => {
-                    return cb(err, err ? false : true);
+                    return done(err, err ? false : true);
                 });
             });
     }

From 4b763cc3692803f284075f8794ae5cf0b51c3c88 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Jan 2019 21:54:12 -0700
Subject: [PATCH 0719/1013] Spelling

---
 core/menu_module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 52784042..06c0f6d7 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -329,7 +329,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         //  A quick rundown:
         //  *   We may have mciData.menu, mciData.prompt, or both.
         //  *   Prompt form is favored over menu form if both are present.
-        //  *   Standard/prefdefined MCI entries must load both (e.g. %BN is expected to resolve)
+        //  *   Standard/predefined MCI entries must load both (e.g. %BN is expected to resolve)
         //
         const self = this;
 

From 4f0ade6ce139d30007d7529842748033c9a90757 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Jan 2019 21:54:37 -0700
Subject: [PATCH 0720/1013] * getAchievementsEarnedByUser() exported as
 standard method using global inst * Added timestamp info

---
 core/achievement.js | 105 +++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 49 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index 3c200c9b..dc933151 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -37,6 +37,8 @@ const async         = require('async');
 const moment        = require('moment');
 const paths         = require('path');
 
+exports.getAchievementsEarnedByUser  = getAchievementsEarnedByUser;
+
 class Achievement {
     constructor(data) {
         this.data = data;
@@ -130,50 +132,8 @@ class Achievements {
         this.events = events;
     }
 
-    getAchievementsEarnedByUser(userId, cb) {
-        if(!this.isEnabled()) {
-            return cb(Errors.General('Achievements not enabled', ErrorReasons.Disabled));
-        }
-
-        UserDb.all(
-            `SELECT achievement_tag, timestamp, match, title, text, points
-            FROM user_achievement
-            WHERE user_id = ?
-            ORDER BY DATETIME(timestamp);`,
-            [ userId ],
-            (err, rows) => {
-                if(err) {
-                    return cb(err);
-                }
-
-                const earned = rows.map(row => {
-                    const achievement = Achievement.factory(this.achievementConfig.achievements[row.achievement_tag]);
-                    if(!achievement) {
-                        return;
-                    }
-
-                    const earnedInfo = {
-                        achievementTag  : row.achievement_tag,
-                        type            : achievement.data.type,
-                        retroactive     : achievement.data.retroactive,
-                        title           : row.title,
-                        text            : row.text,
-                        points          : row.points,
-                    };
-
-                    switch(earnedInfo.type) {
-                        case [ Achievement.Types.UserStatSet ] :
-                        case [ Achievement.Types.UserStatInc ] :
-                            earnedInfo.statName = achievement.data.statName;
-                            break;
-                    }
-
-                    return earnedInfo;
-                }).filter(a => a);  //  remove any empty records (ie: no achievement.hjson entry exists anymore).
-
-                return cb(null, earned);
-            }
-        );
+    getAchievementByTag(tag) {
+        return this.achievementConfig.achievements[tag];
     }
 
     isEnabled() {
@@ -341,7 +301,7 @@ class Achievements {
                 return;
             }
 
-            const achievement = Achievement.factory(this.achievementConfig.achievements[achievementTag]);
+            const achievement = Achievement.factory(this.getAchievementByTag(achievementTag));
             if(!achievement) {
                 return;
             }
@@ -573,16 +533,63 @@ class Achievements {
     }
 }
 
-let achievements;
+let achievementsInstance;
+
+function getAchievementsEarnedByUser(userId, cb) {
+    if(!achievementsInstance) {
+        return cb(Errors.UnexpectedState('Achievements not initialized'));
+    }
+
+    UserDb.all(
+        `SELECT achievement_tag, timestamp, match, title, text, points
+        FROM user_achievement
+        WHERE user_id = ?
+        ORDER BY DATETIME(timestamp);`,
+        [ userId ],
+        (err, rows) => {
+            if(err) {
+                return cb(err);
+            }
+
+            const earned = rows.map(row => {
+
+                const achievement = Achievement.factory(achievementsInstance.getAchievementByTag(row.achievement_tag));
+                if(!achievement) {
+                    return;
+                }
+
+                const earnedInfo = {
+                    achievementTag  : row.achievement_tag,
+                    type            : achievement.data.type,
+                    retroactive     : achievement.data.retroactive,
+                    title           : row.title,
+                    text            : row.text,
+                    points          : row.points,
+                    timestamp       : moment(row.timestamp),
+                };
+
+                switch(earnedInfo.type) {
+                    case [ Achievement.Types.UserStatSet ] :
+                    case [ Achievement.Types.UserStatInc ] :
+                        earnedInfo.statName = achievement.data.statName;
+                        break;
+                }
+
+                return earnedInfo;
+            }).filter(a => a);  //  remove any empty records (ie: no achievement.hjson entry exists anymore).
+
+            return cb(null, earned);
+        }
+    );
+}
 
 exports.moduleInitialize = (initInfo, cb) => {
-    achievements = new Achievements(initInfo.events);
-    achievements.init( err => {
+    achievementsInstance = new Achievements(initInfo.events);
+    achievementsInstance.init( err => {
         if(err) {
             return cb(err);
         }
 
-        exports.achievements = achievements;
         return cb(null);
     });
 };

From ae2a225e3a2c131e82cd5da5f6b8e44d136271bf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Jan 2019 21:55:28 -0700
Subject: [PATCH 0721/1013] Module for listing user achievements earned

---
 core/user_achievements_earned.js | 101 +++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 core/user_achievements_earned.js

diff --git a/core/user_achievements_earned.js b/core/user_achievements_earned.js
new file mode 100644
index 00000000..b6aee4f8
--- /dev/null
+++ b/core/user_achievements_earned.js
@@ -0,0 +1,101 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const { MenuModule }    = require('./menu_module.js');
+const { Errors }        = require('./enig_error.js');
+const {
+    getAchievementsEarnedByUser
+}                       = require('./achievement.js');
+const UserProps         = require('./user_property.js');
+
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
+
+exports.moduleInfo = {
+    name    : 'User Achievements Earned',
+    desc    : 'Lists achievements earned by a user',
+    author  : 'NuSkooler',
+};
+
+const MciViewIds = {
+    achievementList     : 1,
+    customRangeStart    : 10,   //  updated @ index update
+};
+
+exports.getModule = class UserAchievementsEarned extends MenuModule {
+    constructor(options) {
+        super(options);
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            async.waterfall(
+                [
+                    (callback) => {
+                        this.prepViewController('achievements', 0, mciData.menu, err => {
+                            return callback(err);
+                        });
+                    },
+                    (callback) => {
+                        return this.validateMCIByViewIds('achievements', MciViewIds.achievementList, callback);
+                    },
+                    (callback) => {
+                        return getAchievementsEarnedByUser(this.client.user.userId, callback);
+                    },
+                    (achievementsEarned, callback) => {
+                        this.achievementsEarned = achievementsEarned;
+
+                        const achievementListView = this.viewControllers.achievements.getView(MciViewIds.achievementList);
+
+                        achievementListView.on('index update', idx => {
+                            this.selectionIndexUpdate(idx);
+                        });
+
+                        const dateTimeFormat = _.get(
+                            this, 'menuConfig.config.dateTimeFormat', this.client.currentTheme.helpers.getDateFormat('short'));
+
+                        achievementListView.setItems(achievementsEarned.map(achiev => Object.assign(
+                            achiev,
+                            this.getUserInfo(),
+                            {
+                                ts : achiev.timestamp.format(dateTimeFormat),
+                            }
+                        )));
+                        achievementListView.redraw();
+                        this.selectionIndexUpdate(0);
+
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    getUserInfo() {
+        //  :TODO: allow args to pass in a different user - ie from user list -> press A for achievs, so on...
+        return {
+            userId      : this.client.user.userId,
+            userName    : this.client.user.username,
+            realName    : this.client.user.getProperty(UserProps.RealName),
+            location    : this.client.user.getProperty(UserProps.Location),
+            affils      : this.client.user.getProperty(UserProps.Affiliations),
+        };
+    }
+
+    selectionIndexUpdate(index) {
+        const achiev = this.achievementsEarned[index];
+        if(!achiev) {
+            return;
+        }
+        this.updateCustomViewTextsWithFilter('achievements', MciViewIds.customRangeStart, achiev);
+    }
+};

From aa9cd8899c4bbea5fd3892cb8e6b87702fbe0264 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:53:31 -0700
Subject: [PATCH 0722/1013] New 'userStatIncNewVal' achievement type

---
 core/achievement.js | 142 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 134 insertions(+), 8 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index dc933151..7b6a4b16 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -52,6 +52,7 @@ class Achievement {
         switch(data.type) {
             case Achievement.Types.UserStatSet :
             case Achievement.Types.UserStatInc :
+            case Achievement.Types.UserStatIncNewVal :
                 achievement = new UserStatAchievement(data);
                 break;
 
@@ -65,8 +66,9 @@ class Achievement {
 
     static get Types() {
         return {
-            UserStatSet : 'userStatSet',
-            UserStatInc : 'userStatInc',
+            UserStatSet         : 'userStatSet',
+            UserStatInc         : 'userStatInc',
+            UserStatIncNewVal   : 'userStatIncNewVal',
         };
     }
 
@@ -74,6 +76,7 @@ class Achievement {
         switch(this.data.type) {
             case Achievement.Types.UserStatSet :
             case Achievement.Types.UserStatInc :
+            case Achievement.Types.UserStatIncNewVal :
                 if(!_.isString(this.data.statName)) {
                     return false;
                 }
@@ -286,14 +289,135 @@ class Achievements {
             }
 
             //  :TODO: Make this code generic - find + return factory created object
+            const achievementTags = Object.keys(_.pickBy(
+                _.get(this.achievementConfig, 'achievements', {}),
+                achievement => {
+                    if(false === achievement.enabled) {
+                        return false;
+                    }
+                    const acceptedTypes = [
+                        Achievement.Types.UserStatSet,
+                        Achievement.Types.UserStatInc,
+                        Achievement.Types.UserStatIncNewVal,
+                    ];
+                    return acceptedTypes.includes(achievement.type) && achievement.statName === userStatEvent.statName;
+                }
+            ));
+
+            if(0 === achievementTags.length) {
+                return;
+            }
+
+            async.eachSeries(achievementTags, (achievementTag, nextAchievementTag) => {
+                const achievement = Achievement.factory(this.getAchievementByTag(achievementTag));
+                if(!achievement) {
+                    return nextAchievementTag(null);
+                }
+
+                const statValue = parseInt(
+                    [ Achievement.Types.UserStatSet, Achievement.Types.UserStatIncNewVal ].includes(achievement.data.type) ?
+                        userStatEvent.statValue :
+                        userStatEvent.statIncrementBy
+                );
+                if(isNaN(statValue)) {
+                    return nextAchievementTag(null);
+                }
+
+                const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
+                if(!details) {
+                    return nextAchievementTag(null);
+                }
+
+                async.series(
+                    [
+                        (callback) => {
+                            this.loadAchievementHitCount(userStatEvent.user, achievementTag, matchField, (err, count) => {
+                                if(err) {
+                                    return callback(err);
+                                }
+                                return callback(count > 0 ? Errors.General('Achievement already acquired', ErrorReasons.TooMany) : null);
+                            });
+                        },
+                        (callback) => {
+                            const client = getConnectionByUserId(userStatEvent.user.userId);
+                            if(!client) {
+                                return callback(Errors.UnexpectedState('Failed to get client for user ID'));
+                            }
+
+                            const info = {
+                                achievementTag,
+                                achievement,
+                                details,
+                                client,
+                                matchField,                     //  match - may be in odd format
+                                matchValue,                     //  actual value
+                                achievedValue   : matchField,   //  achievement value met
+                                user            : userStatEvent.user,
+                                timestamp       : moment(),
+                            };
+
+                            const achievementsInfo = [ info ];
+                            if(true === achievement.data.retroactive) {
+                                //  For userStat, any lesser match keys(values) are also met. Example:
+                                //  matchKeys: [ 500, 200, 100, 20, 10, 2 ]
+                                //                    ^---- we met here
+                                //                         ^------------^ retroactive range
+                                //
+                                const index = achievement.matchKeys.findIndex(v => v < matchField);
+                                if(index > -1 && Array.isArray(achievement.matchKeys)) {
+                                    achievement.matchKeys.slice(index).forEach(k => {
+                                        const [ det, fld, val ] = achievement.getMatchDetails(k);
+                                        if(det) {
+                                            achievementsInfo.push(Object.assign(
+                                                {},
+                                                info,
+                                                {
+                                                    details         : det,
+                                                    matchField      : fld,
+                                                    achievedValue   : fld,
+                                                    matchValue      : val,
+                                                }
+                                            ));
+                                        }
+                                    });
+                                }
+                            }
+
+                            //  reverse achievementsInfo so we display smallest > largest
+                            achievementsInfo.reverse();
+
+                            async.eachSeries(achievementsInfo, (achInfo, nextAchInfo) => {
+                                return this.recordAndDisplayAchievement(achInfo, err => {
+                                    return nextAchInfo(err);
+                                });
+                            },
+                            err => {
+                                return callback(err);
+                            });
+                        }
+                    ],
+                    err => {
+                        if(err && ErrorReasons.TooMany !== err.reasonCode) {
+                            Log.warn( { error : err.message, userStatEvent }, 'Error handling achievement for user stat event');
+                        }
+                        return nextAchievementTag(null);    //  always try the next, regardless
+                    }
+                );
+            });
+
+            /*
             const achievementTag = _.findKey(
                 _.get(this.achievementConfig, 'achievements', {}),
                 achievement => {
                     if(false === achievement.enabled) {
                         return false;
                     }
-                    return [ Achievement.Types.UserStatSet, Achievement.Types.UserStatInc ].includes(achievement.type) &&
-                        achievement.statName === userStatEvent.statName;
+                    const acceptedTypes = [
+                        Achievement.Types.UserStatSet,
+                        Achievement.Types.UserStatInc,
+                        Achievement.Types.UserStatIncNewVal,
+                    ];
+                    return acceptedTypes.includes(achievement.type) && achievement.statName === userStatEvent.statName;
                 }
             );
 
@@ -306,9 +430,10 @@ class Achievements {
                 return;
             }
 
-            const statValue = parseInt(Achievement.Types.UserStatSet === achievement.data.type ?
-                userStatEvent.statValue :
-                userStatEvent.statIncrementBy
+            const statValue = parseInt(
+                [ Achievement.Types.UserStatSet, Achievement.Types.UserStatIncNewVal ].includes(achievement.data.type) ?
+                    userStatEvent.statValue :
+                    userStatEvent.statIncrementBy
             );
             if(isNaN(statValue)) {
                 return;
@@ -392,7 +517,7 @@ class Achievements {
                         Log.warn( { error : err.message, userStatEvent }, 'Error handling achievement for user stat event');
                     }
                 }
-            );
+            );*/
         });
     }
 
@@ -571,6 +696,7 @@ function getAchievementsEarnedByUser(userId, cb) {
                 switch(earnedInfo.type) {
                     case [ Achievement.Types.UserStatSet ] :
                     case [ Achievement.Types.UserStatInc ] :
+                    case [ Achievement.Types.UserStatIncNewVal ] :
                         earnedInfo.statName = achievement.data.statName;
                         break;
                 }

From eea9e7b5e68931403bde859f261414f92ad75706 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:53:45 -0700
Subject: [PATCH 0723/1013] Don't use Errors

---
 core/user_achievements_earned.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/user_achievements_earned.js b/core/user_achievements_earned.js
index b6aee4f8..ef793023 100644
--- a/core/user_achievements_earned.js
+++ b/core/user_achievements_earned.js
@@ -3,7 +3,6 @@
 
 //  ENiGMA½
 const { MenuModule }    = require('./menu_module.js');
-const { Errors }        = require('./enig_error.js');
 const {
     getAchievementsEarnedByUser
 }                       = require('./achievement.js');

From 0efa148f63e52d6ca3a8cfd8c0d7ed0a12b8de44 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:54:16 -0700
Subject: [PATCH 0724/1013] Better incrementUserStat()

---
 core/stat_log.js | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/core/stat_log.js b/core/stat_log.js
index f03319d0..af88ff57 100644
--- a/core/stat_log.js
+++ b/core/stat_log.js
@@ -147,29 +147,34 @@ class StatLog {
     incrementUserStat(user, statName, incrementBy, cb) {
         incrementBy = incrementBy || 1;
 
-        let newValue = parseInt(user.properties[statName]);
-        if(newValue) {
-            if(!_.isNumber(newValue) && cb) {
-                return cb(new Error(`Value for ${statName} is not a number!`));
-            }
-            newValue += incrementBy;
-        } else {
-            newValue = incrementBy;
-        }
+        const oldValue = user.getPropertyAsNumber(statName) || 0;
+        const newValue = oldValue + incrementBy;
 
-        this.setUserStatWithOptions(user, statName, newValue, { noEvent : true }, err => {
-            if(!err) {
-                const Events = require('./events.js');  //  we need to late load currently
-                Events.emit(
-                    Events.getSystemEvents().UserStatIncrement,
-                    { user, statName, statIncrementBy: incrementBy, statValue : newValue }
-                );
-            }
+        this.setUserStatWithOptions(
+            user,
+            statName,
+            newValue,
+            { noEvent : true },
+            err => {
+                if(!err) {
+                    const Events = require('./events.js');  //  we need to late load currently
+                    Events.emit(
+                        Events.getSystemEvents().UserStatIncrement,
+                        {
+                            user,
+                            statName,
+                            oldValue,
+                            statIncrementBy : incrementBy,
+                            statValue       : newValue
+                        }
+                    );
+                }
 
-            if(cb) {
-                return cb(err);
+                if(cb) {
+                    return cb(err);
+                }
             }
-        });
+        );
     }
 
     //  the time "now" in the ISO format we use and love :)

From 69247eadf13153b4f1b812de2190cfdec13d1b5b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:54:56 -0700
Subject: [PATCH 0725/1013] Minor adjust

---
 art/themes/luciano_blocktronics/STATUS.ANS | Bin 4638 -> 4639 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS
index 6871ff457b0b3d44ec533e785fac3b02aa03586e..dc2b0ca88cc1f74e440a91bba90cf1758ad776d4 100644
GIT binary patch
delta 47
zcmbQIGGArG2R;@BAej7xPie9!|6}HYlH$p6EMn}A0n*V1xeA*l1RgLlZkzm5P!#}o
CLl15M

delta 47
zcmbQQGEZg02R;_*XjA9OU-*<Ji}OEXQ79-Wo*c&_#^x9x9c_@iSyJEuBjeV|zXVkQ
Dg&hyx


From e7344fac292b837c4e6758e2699a0e6b16a8b3e4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:55:03 -0700
Subject: [PATCH 0726/1013] Many updates + user_door_run_total_minutes with new
 userStatIncNewVal type * Balance & add some new brackets to existing

---
 config/achievements.hjson | 144 ++++++++++++++++++++++++++++++--------
 1 file changed, 114 insertions(+), 30 deletions(-)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index d5099f8c..4ad30565 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -67,7 +67,7 @@
                     title: "Curious Caller"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
-                    points: 5
+                    points: 10
                 }
                 25: {
                     title: "Inquisitive"
@@ -75,17 +75,29 @@
                     text: "You've logged into {boardName} {achievedValue} times!"
                     points: 10
                 }
+                75: {
+                    title: "Still Interested!"
+                    globalText: "{userName} has logged into {boardName} {achievedValue} times!"
+                    text: "You've logged into {boardName} {achievedValue} times!"
+                    points: 15
+                }
                 100: {
                     title: "Regular Customer"
                     globalText: "{userName} has logged into {boardName} {achievedValue} times!"
                     text: "You've logged into {boardName} {achievedValue} times!"
-                    points: 10
+                    points: 25
+                }
+                250: {
+                    title: "Speed Dial",
+                    globalText: "{userName} has logged into {boardName} {achievedValue} times!"
+                    text: "You've logged into {boardName} {achievedValue} times!"
+                    points: 50
                 }
                 500:  {
                     title: "System Addict"
                     globalText: "{userName} the BBS {boardName} addict has logged in {achievedValue} times!"
                     text: "You're a {boardName} addict! You've logged in {achievedValue} times!"
-                    points: 25
+                    points: 50
                 }
             }
         }
@@ -94,29 +106,41 @@
             type: userStatSet
             statName: post_count
             match: {
-                5: {
+                2: {
                     title: "Poster"
                     globalText: "{userName} has posted {achievedValue} messages!"
                     text: "You've posted {achievedValue} messages!"
                     points: 5
                 }
-                20: {
+                5: {
                     title: "Poster... again!",
                     globalText: "{userName} has posted {achievedValue} messages!"
                     text: "You've posted {achievedValue} messages!"
+                    points: 5
+                }
+                20: {
+                    title: "Just Want to Talk",
+                    globalText: "{userName} has posted {achievedValue} messages!"
+                    text: "You've posted {achievedValue} messages!"
                     points: 10
                 }
                 100: {
-                    title: "Frequent Poster",
+                    title: "Probably Just Spam",
                     globalText: "{userName} has posted {achievedValue} messages!"
                     text: "You've posted {achievedValue} messages!"
-                    points: 15
+                    points: 25
                 }
-                500: {
+                250: {
                     title: "Scribe"
                     globalText: "{userName} the scribe has posted {achievedValue} messages!"
                     text: "Such a scribe! You've posted {achievedValue} messages!"
-                    points: 25
+                    points: 50
+                }
+                500: {
+                    title: "Writing a Book"
+                    globalText: "{userName} is writing a book and has posted {achievedValue} messages!"
+                    text: "You've posted {achievedValue} messages!"
+                    points: 50
                 }
             }
         }
@@ -141,20 +165,20 @@
                     title: "Contributor"
                     globalText: "{userName} has uploaded {achievedValue} files!"
                     text: "You've uploaded {achievedValue} files!"
-                    points: 20
+                    points: 25
 
                 }
                 100: {
                     title: "Courier"
                     globalText: "Courier {userName} has uploaded {achievedValue} files!"
                     text: "You've uploaded {achievedValue} files!"
-                    points: 25
+                    points: 50
                 }
                 200: {
                     title: "Must Be a Drop Site"
                     globalText: "{userName} has uploaded a whomping {achievedValue} files!"
                     text: "You've uploaded a whomping {achievedValue} files!"
-                    points: 50
+                    points: 55
                 }
             }
         }
@@ -170,15 +194,21 @@
                     points: 10
                 }
                 1474560: {
-                    title: "America Online 2.5?"
-                    globalText: "{userName} has uploaded 1.44M worth of data. Hopefully it's not AOL 2.5."
-                    title: "You've uploaded 1.44M worth of data. Hopefully it's not AOL 2.5."
-                    points: 15
+                    title: "AOL Disk Anyone?"
+                    globalText: "{userName} has uploaded 1.44M worth of data. Hopefully it's not AOL!"
+                    title: "You've uploaded 1.44M worth of data. Hopefully it's not AOL!"
+                    points: 10
                 }
                 6291456: {
                     title: "A Quake of a Upload"
                     globalText: "{userName} has uploaded 6 x 1.44MB disks worth of data. That's the size of Quake for DOS!"
                     text: "You've uploaded 6 x 1.44MB disks worth of data. That's the size of Quake for DOS!"
+                    points: 20
+                }
+                104857600: {
+                    title: "Zip 100"
+                    globalText: "{userName} has uploaded a Zip 100 disk's worth of data!"
+                    text: "You've uploaded a Zip 100 disk's worth of data!"
                     points: 25
                 }
                 1073741824: {
@@ -189,8 +219,8 @@
                 }
                 3407872000: {
                     title: "Encarta"
-                    globalText: "{userName} has uploaded 5 x CD-ROM disks worth of data. That's the size of Encarta!"
-                    text: "You've uploaded 5 x CD-ROM disks worth of data. That's the size of Encarta!"
+                    globalText: "{userName} has uploaded 5xCD discs worth of data. That's the size of Encarta!"
+                    text: "You've uploaded 5xCD discs worth of data. That's the size of Encarta!"
                     points: 100
                 }
             }
@@ -247,19 +277,30 @@
                     title: "Fits on a Floppy"
                     globalText: "{userName} has downloaded 1.44MB worth of data!"
                     text: "You've downloaded 1.44MB of data!"
-                    points: 10
+                    points: 5
                 }
                 104857600: {
                     title: "Click of Death"
                     globalText: "{userName} has downloaded 100MB... perhaps to a Zip Disk?"
                     text: "You've downloaded 100MB of data... perhaps to a Zip Disk?"
-                    points: 15
+                    points: 10
                 }
                 681574400: {
-                    title: "A CD-ROM Worth"
+                    title: "CD Rip"
                     globalText: "{userName} has downloaded a CD-ROM's worth of data!"
                     text: "You've downloaded a CD-ROM's worth of data!"
-                    points: 20
+                    points: 15
+                }
+                1073741824: {
+                    title: "Like One Hundred Floppys, Man"
+                    globalText: "{userName} has downloaded {achievedValue!sizeWithAbbr} of data!"
+                    text: "You've downloaded {achievedValue!sizeWithAbbr} of data!"
+                    points: 25
+                }
+                5368709120: {
+                    title: "That's a Lot of Bits!"
+                    globalText: "{userName} has downloaded {achievedValue!sizeWithAbbr} of data!"
+                    text: "You've downloaded {achievedValue!sizeWithAbbr} of data!"
                 }
             }
         }
@@ -284,24 +325,24 @@
                     title: "Gamer"
                     globalText: "{userName} ran {achievedValue} doors!"
                     text: "You've run {achievedValue} doors!"
-                    points: 15
+                    points: 20
                 }
                 100: {
-                    title: "Textmode is All You Need"
+                    title: "Trying Them All"
                     globalText: "{userName} must really like textmode and has run {achievedValue} doors!"
                     text: "You've run {achievedValue} doors! You must really like textmode!"
-                    points: 25
+                    points: 50
                 }
                 200: {
                     title: "Dropfile Enthusiast"
                     globalText: "{userName} the dropfile enthusiast ran {achievedValue} doors!"
                     text: "You're a dropfile enthusiast! You've run {achievedValue} doors!"
-                    points: 100
+                    points: 55
                 }
             }
         }
 
-        user_door_total_minutes: {
+        user_individual_door_run_minutes: {
             type: userStatInc
             statName: door_run_total_minutes
             match: {
@@ -324,11 +365,54 @@
                     points: 20
                 }
                 60: {
-                    title: "Textmode Dragon Slayer"
+                    title: "What? Limited Turns?!"
                     globalText: "{userName} has spent {achievedValue!durationMinutes} in a door!"
                     text: "You've spent {achievedValue!durationMinutes} in a door!"
                     points: 25
                 }
+                120: {
+                    title: "It's the Only One I Know!"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} in a door!"
+                    text: "You've spent {achievedValue!durationMinutes} in a door!"
+                    points: 50
+                }
+                240: {
+                    title: "Possible Addict"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} in a door!"
+                    text: "You've spent {achievedValue!durationMinutes} in a door!"
+                    points: 55
+                }
+            }
+        }
+
+        user_door_run_total_minutes: {
+            type: userStatIncNewVal
+            statName: door_run_total_minutes
+            match: {
+                10: {
+                    title: "Enough for the Instructions"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} playing doors!"
+                    text: "You've spent {achievedValue!durationMinutes} playing doors!"
+                    points: 10
+                }
+                30: {
+                    title: "Probably Just L.O.R.D."
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} playing doors!"
+                    text: "You've spent {achievedValue!durationMinutes} playing doors!"
+                    points: 20
+                }
+                60: {
+                    title: "Retro or Bust"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} playing doors!"
+                    text: "You've spent {achievedValue!durationMinutes} playing doors!"
+                    points: 25
+                }
+                240: {
+                    title: "Textmode Dragon Slayer"
+                    globalText: "{userName} has spent {achievedValue!durationMinutes} playing doors!"
+                    text: "You've spent {achievedValue!durationMinutes} playing doors!"
+                    points: 50
+                }
             }
         }
 
@@ -358,9 +442,9 @@
                     title: "Idle Bot"
                     globalText: "{userName} is probably a bot. They've spent {achievedValue!durationMinutes} on {boardName}!"
                     text: "You're a bot, aren't you? You've been on {boardName} for a total of {achievedValue!durationMinutes}!"
-                    points: 50
+                    points: 55
                 }
             }
         }
     }
-}
\ No newline at end of file
+}

From 289e49f0b986aada60ca212ef64e3b63b2a67012 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 24 Jan 2019 21:56:30 -0700
Subject: [PATCH 0727/1013] User achievements list

---
 art/themes/luciano_blocktronics/USERACHIEV.ANS | Bin 0 -> 492 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/USERACHIEV.ANS

diff --git a/art/themes/luciano_blocktronics/USERACHIEV.ANS b/art/themes/luciano_blocktronics/USERACHIEV.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..f061f04a5ee37b07fa8bd60bc7d131aeb63b642a
GIT binary patch
literal 492
zcmb_YJx{|h6iimH419R;(wS!`Gy+c{SWu~{Xj8IyMBRAmfW!~rZ#KgJ1aWpkg%Bfe
zc(UJ}@9tT8vL)G~Vxgojh-0sKI7qK;iNhd$NjwPY6BdUSv@p`b5WoZh9XK9qTNwU~
zDs!%zhlT51>sH%Nxq7p5cM$;oTMjPB0c8Wnq%wwr%`{DZxKawLV@{+v3?D&Ew(t)s
zh;L~~safA@@uQN+7$NqGXWONwv^m(v3EoJ5HE*VE&dz}l-=HTJzRNK0-*&*Uv+F<v
xewpy~AKd4c{p(I#boEo?h}8d;A$?8SnD;!(^87J7%~G8#Zd=vg*W>NjzW~Hjbo~GT

literal 0
HcmV?d00001


From 3450500d273c246d073b0b439a5c2e175d818acc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:04:59 -0700
Subject: [PATCH 0728/1013] factory() should not crash if data is null

---
 core/achievement.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/achievement.js b/core/achievement.js
index 7b6a4b16..a5de541f 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -48,6 +48,9 @@ class Achievement {
     }
 
     static factory(data) {
+        if(!data) {
+            return;
+        }
         let achievement;
         switch(data.type) {
             case Achievement.Types.UserStatSet :

From c98e1474d026ea864b813149703ce1b79431c38a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:05:07 -0700
Subject: [PATCH 0729/1013] Add totalPoints, totalCount

---
 core/user_achievements_earned.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/user_achievements_earned.js b/core/user_achievements_earned.js
index ef793023..4292cb91 100644
--- a/core/user_achievements_earned.js
+++ b/core/user_achievements_earned.js
@@ -87,6 +87,8 @@ exports.getModule = class UserAchievementsEarned extends MenuModule {
             realName    : this.client.user.getProperty(UserProps.RealName),
             location    : this.client.user.getProperty(UserProps.Location),
             affils      : this.client.user.getProperty(UserProps.Affiliations),
+            totalCount  : this.client.user.getProperty(UserProps.AchievementTotalCount),
+            totalPoints : this.client.user.getProperty(UserProps.AchievementTotalPoints),
         };
     }
 

From 301aacd9d8ba50b278f47ce72a000ebecc08c981 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:55:25 -0700
Subject: [PATCH 0730/1013] Add mainMenuUserAchievementsEarned

---
 misc/menu_template.in.hjson | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 60c57605..d303f452 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1062,6 +1062,10 @@
                     value: { command: "BBS"}
                     action: @menu:bbsList
                 }
+                {
+                    value: { command: "UA" }
+                    action: @menu:mainMenuUserAchievementsEarned
+                }
                 {
                     value: 1
                     action: @menu:mainMenu
@@ -1069,6 +1073,27 @@
             ]
         }
 
+        mainMenuUserAchievementsEarned: {
+            desc: Achievements
+            module: user_achievements_earned
+            art: USERACHIEV
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
         nodeMessage: {
             desc: Node Messaging
             module: node_msg

From 207711f1d144b15789d680ac97c4fca49782c9a5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:56:45 -0700
Subject: [PATCH 0731/1013] Achievements earned

---
 art/themes/luciano_blocktronics/MMENU.ANS   | Bin 3574 -> 3610 bytes
 art/themes/luciano_blocktronics/theme.hjson |  22 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
index ad029e33f765113432e247acfd1b6a04a6e67e4d..bd8a483f56406abf49f17d727730aab0a4a157ff 100644
GIT binary patch
delta 56
zcmew+JxgYT7_XY4fwOe9VQy)nf^@WjwXs=lVsb`iYFTP-YF<gPbhNQ~u5`4C<zxxo
M9gOQIU*uH<0QM~s2mk;8

delta 20
ccmbOw^G$k#7%!8#$z&Ve9gN+Rzw)XA07#++;s5{u

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index f3871ce8..bd9de965 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -111,6 +111,28 @@
 				}
 			}
 
+			mainMenuUserAchievementsEarned: {
+				config: {
+					dateTimeFormat: MMM Do h:mma
+					achievementsInfoFormat10: "|00|07\"|11{title}|07\""
+					achievementsInfoFormat11: "|00|03{text}"
+				}
+				mci: {
+					VM1: {
+						height: 11
+						width: 76
+						itemFormat: "|00|15{ts} |07- |03{title:<47.46} |15{points:,}|07 pts"
+						focusItemFormat: "|00|19|15{ts} - {title:<47.46} {points:,} pts"
+					}
+					TL10: {
+						width: 76
+					}
+					TL11: {
+						width: 76
+					}
+				}
+			}
+
 			mainMenuUserStats: {
 				mci: {
 					UN1: { width: 15 }

From bec497b209a5cbe8c9fb765086ce19e168357cec Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:57:07 -0700
Subject: [PATCH 0732/1013] totalCount & totalPoints should be numbers

---
 core/user_achievements_earned.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/user_achievements_earned.js b/core/user_achievements_earned.js
index 4292cb91..1004a9d0 100644
--- a/core/user_achievements_earned.js
+++ b/core/user_achievements_earned.js
@@ -87,8 +87,8 @@ exports.getModule = class UserAchievementsEarned extends MenuModule {
             realName    : this.client.user.getProperty(UserProps.RealName),
             location    : this.client.user.getProperty(UserProps.Location),
             affils      : this.client.user.getProperty(UserProps.Affiliations),
-            totalCount  : this.client.user.getProperty(UserProps.AchievementTotalCount),
-            totalPoints : this.client.user.getProperty(UserProps.AchievementTotalPoints),
+            totalCount  : this.client.user.getPropertyAsNumber(UserProps.AchievementTotalCount),
+            totalPoints : this.client.user.getPropertyAsNumber(UserProps.AchievementTotalPoints),
         };
     }
 

From 6193dca58a712fa3ae5cb6fc7c24b1ee87a598f9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 26 Jan 2019 12:57:29 -0700
Subject: [PATCH 0733/1013] Stats that are numbers should be formatted

---
 core/predefined_mci.js | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index 2e7ed5ff..a1182a79 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -11,7 +11,9 @@ const {
 const clientConnections         = require('./client_connections.js');
 const StatLog                   = require('./stat_log.js');
 const FileBaseFilters           = require('./file_base_filter.js');
-const { formatByteSize }        = require('./string_util.js');
+const {
+    formatByteSize,
+}                               = require('./string_util.js');
 const ANSI                      = require('./ansi_term.js');
 const UserProps                 = require('./user_property.js');
 const SysProps                  = require('./system_property.js');
@@ -54,6 +56,15 @@ function userStatAsString(client, statName, defaultValue) {
     return (StatLog.getUserStat(client.user, statName) || defaultValue).toLocaleString();
 }
 
+function toNumberWithCommas(x) {
+    return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+}
+
+function userStatAsCountString(client, statName, defaultValue) {
+    const value = StatLog.getUserStatNum(client.user, statName) || defaultValue;
+    return toNumberWithCommas(value);
+}
+
 function sysStatAsString(statName, defaultValue) {
     return (StatLog.getSystemStat(statName) || defaultValue).toLocaleString();
 }
@@ -97,7 +108,7 @@ const PREDEFINED_MCI_GENERATORS = {
         return _.get(client, 'currentTheme.info.name', userStatAsString(client, UserProps.ThemeId, ''));
     },
     UD  : function themeId(client) { return userStatAsString(client, UserProps.ThemeId, ''); },
-    UC  : function loginCount(client) { return userStatAsString(client, UserProps.LoginCount, 0); },
+    UC  : function loginCount(client) { return userStatAsCountString(client, UserProps.LoginCount, 0); },
     ND  : function connectedNode(client) { return client.node.toString(); },
     IP  : function clientIpAddress(client) { return client.remoteAddress.replace(/^::ffff:/, ''); },    //  convert any :ffff: IPv4's to 32bit version
     ST  : function serverName(client) { return client.session.serverName; },
@@ -105,12 +116,12 @@ const PREDEFINED_MCI_GENERATORS = {
         const activeFilter = FileBaseFilters.getActiveFilter(client);
         return activeFilter ? activeFilter.name : '(Unknown)';
     },
-    DN  : function userNumDownloads(client) { return userStatAsString(client, UserProps.FileDlTotalCount, 0); },      //  Obv/2
+    DN  : function userNumDownloads(client) { return userStatAsCountString(client, UserProps.FileDlTotalCount, 0); },      //  Obv/2
     DK  : function userByteDownload(client) {   //  Obv/2 uses DK=downloaded Kbytes
         const byteSize = StatLog.getUserStatNum(client.user, UserProps.FileDlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
     },
-    UP  : function userNumUploads(client) { return userStatAsString(client, UserProps.FileUlTotalCount, 0); },            //  Obv/2
+    UP  : function userNumUploads(client) { return userStatAsCountString(client, UserProps.FileUlTotalCount, 0); },            //  Obv/2
     UK  : function userByteUpload(client) { //  Obv/2 uses UK=uploaded Kbytes
         const byteSize = StatLog.getUserStatNum(client.user, UserProps.FileUlTotalBytes);
         return formatByteSize(byteSize, true);  //  true=withAbbr
@@ -125,7 +136,7 @@ const PREDEFINED_MCI_GENERATORS = {
     MS  : function accountCreated(client) {
         return moment(client.user.properties[UserProps.AccountCreated]).format(client.currentTheme.helpers.getDateFormat());
     },
-    PS  : function userPostCount(client) { return userStatAsString(client, UserProps.MessagePostCount, 0); },
+    PS  : function userPostCount(client) { return userStatAsCountString(client, UserProps.MessagePostCount, 0); },
     PC  : function userPostCallRatio(client) { return getUserRatio(client, UserProps.MessagePostCount, UserProps.LoginCount); },
 
     MD  : function currentMenuDescription(client) {
@@ -152,10 +163,10 @@ const PREDEFINED_MCI_GENERATORS = {
     SH  : function termHeight(client) { return client.term.termHeight.toString(); },
     SW  : function termWidth(client) { return client.term.termWidth.toString(); },
 
-    AC  : function achievementCount(client) { return userStatAsString(client, UserProps.AchievementTotalCount, 0); },
-    AP  : function achievementPoints(client) { return userStatAsString(client, UserProps.AchievementTotalPoints, 0); },
+    AC  : function achievementCount(client) { return userStatAsCountString(client, UserProps.AchievementTotalCount, 0); },
+    AP  : function achievementPoints(client) { return userStatAsCountString(client, UserProps.AchievementTotalPoints, 0); },
 
-    DR  : function doorRuns(client) { return userStatAsString(client, UserProps.DoorRunTotalCount, 0); },
+    DR  : function doorRuns(client) { return userStatAsCountString(client, UserProps.DoorRunTotalCount, 0); },
     DM  : function doorFriendlyRunTime(client) {
         const minutes = client.user.properties[UserProps.DoorRunTotalMinutes] || 0;
         return moment.duration(minutes, 'minutes').humanize();

From a4f60dd574f659bc6579d465cdaf7df5197df6cc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 29 Jan 2019 20:36:35 -0700
Subject: [PATCH 0734/1013] Update packages

---
 package.json |  8 ++++----
 yarn.lock    | 57 ++++++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index f700ce4d..15add31e 100644
--- a/package.json
+++ b/package.json
@@ -39,20 +39,20 @@
     "lru-cache": "^5.1.1",
     "mime-types": "^2.1.21",
     "minimist": "1.2.x",
-    "moment": "^2.23.0",
+    "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
-    "node-pty": "^0.8.0",
+    "node-pty": "^0.8.1",
     "nodemailer": "^5.1.1",
     "rlogin": "^1.0.0",
     "sane": "^4.0.2",
     "sanitize-filename": "^1.6.1",
     "sqlite3": "^4.0.6",
     "sqlite3-trans": "^1.2.1",
-    "ssh2": "^0.7.1",
+    "ssh2": "^0.8.2",
     "temptmp": "^1.1.0",
     "uuid": "^3.2.1",
     "uuid-parse": "^1.0.0",
-    "ws": "^6.1.2",
+    "ws": "^6.1.3",
     "xxhash": "^0.2.4",
     "yazl": "^2.5.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 96d5a9a2..8a18bc57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1234,10 +1234,10 @@ moment@^2.10.6:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
-moment@^2.23.0:
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
-  integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==
+moment@^2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
 ms@2.0.0:
   version "2.0.0"
@@ -1263,16 +1263,21 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@2.10.0, nan@~2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+nan@2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
 
 nan@^2.10.0, nan@^2.4.0:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
   integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
+nan@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -1346,12 +1351,12 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pty@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.0.tgz#08bccb633f49e2e3f7245eb56ea6b40f37ccd64f"
-  integrity sha512-g5ggk3gN4gLrDmAllee5ScFyX3YzpOC/U8VJafha4pE7do0TIE1voiIxEbHSRUOPD1xYqmY+uHhOKAd3avbxGQ==
+node-pty@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.1.tgz#94b457bec013e7a09b8d9141f63b0787fa25c23f"
+  integrity sha512-j+/g0Q5dR+vkELclpJpz32HcS3O/3EdPSGPvDXJZVJQLCvgG0toEbfmymxAEyQyZEpaoKHAcoL+PvKM+4N9nlw==
   dependencies:
-    nan "2.10.0"
+    nan "2.12.1"
 
 nodemailer@^5.1.1:
   version "5.1.1"
@@ -1887,21 +1892,21 @@ sqlite3@^4.0.6:
     node-pre-gyp "^0.11.0"
     request "^2.87.0"
 
-ssh2-streams@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.3.1.tgz#65d78447628d3fd2bbcfa1a8e73a06755bd62a1a"
-  integrity sha512-8lVQaN3FNBCoQdnMEsIpD8X1QN/5V8Cyd9TQhAvw4eD/vfuk/o3eikh3rdnf5HUi3TD7SM1bbM/ZTzjNIRmSFw==
+ssh2-streams@~0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.2.tgz#bac0d18727396d16049f5f0c8517a46516b45719"
+  integrity sha512-2rSj3oTIJnbAIzR3+XwIYef9wCOVrPQZNLL+fFPPjnPxf09tKkAbgrlYgh/1qynBTz65AUOS+s1zuko4M/GKCw==
   dependencies:
     asn1 "~0.2.0"
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.7.1.tgz#0dcafd75c4e30606d380d0bd57448e8c0efdd718"
-  integrity sha512-+ZFoxMXMXq/OyDbE7AwJjsYwk300PD4N1xphYrUttsSzqchWz/3BF7X+La8Jq29Y2QTanojuV/vPFjRsyUGaoA==
+ssh2@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.2.tgz#f7a172458d3a7a13d520438264f90de8a3ee72af"
+  integrity sha512-oaXu7faddvPFGavnLBkk0RFwLXvIzCPq6KqAC3ExlnFPAVIE1uo7pWHe9xmhNHXm+nIe7yg9qsssOm+ip2jijw==
   dependencies:
-    ssh2-streams "~0.3.1"
+    ssh2-streams "~0.4.2"
 
 sshpk@^1.7.0:
   version "1.14.2"
@@ -2199,10 +2204,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
-  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+ws@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
+  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
   dependencies:
     async-limiter "~1.0.0"
 

From f15629682c5682f173c3932f43c5a5ad09160cf1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 29 Jan 2019 20:36:45 -0700
Subject: [PATCH 0735/1013] Fix outstanding SSH bug seen with NetRunner and
 SyncTERM with ugly hack: Disable keep-alives

---
 core/servers/login/ssh.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index c94267c4..d13acf4b 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -321,6 +321,13 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
             algorithms : config.loginServers.ssh.algorithms,
         };
 
+        //
+        //  This is a terrible hack, and we should not have to do it;
+        //  However, as of this writing, NetRunner and SyncTERM both
+        //  fail to respond to OpenSSH keep-alive pings (keepalive@openssh.com)
+        //
+        ssh2.Server.KEEPALIVE_INTERVAL = 0;
+
         this.server = ssh2.Server(serverConf);
         this.server.on('connection', (conn, info) => {
             Log.info(info, 'New SSH connection');

From 21b54eda7eceb4747bacffe78bc43f1c5ed70c58 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 29 Jan 2019 21:31:39 -0700
Subject: [PATCH 0736/1013] Fix interrupt bug when connecting over SSH with
 multi-node

---
 core/user_interrupt_queue.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/user_interrupt_queue.js b/core/user_interrupt_queue.js
index f1aee626..67b880c8 100644
--- a/core/user_interrupt_queue.js
+++ b/core/user_interrupt_queue.js
@@ -47,13 +47,17 @@ module.exports = class UserInterruptQueue
         //  pause defaulted on
         interruptItem.pause = _.get(interruptItem, 'pause', true);
 
-        this.client.currentMenuModule.attemptInterruptNow(interruptItem, (err, ateIt) => {
-            if(err) {
-                //  :TODO: Log me
-            } else if(true !== ateIt) {
-                this.queue.push(interruptItem);
-            }
-        });
+        try {
+            this.client.currentMenuModule.attemptInterruptNow(interruptItem, (err, ateIt) => {
+                if(err) {
+                    //  :TODO: Log me
+                } else if(true !== ateIt) {
+                    this.queue.push(interruptItem);
+                }
+            });
+        } catch(e) {
+            this.queue.push(interruptItem);
+        }
     }
 
     hasItems() {

From 8458d47f0ccc22d41968370f1d12bc529b630c74 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 30 Jan 2019 20:42:30 -0700
Subject: [PATCH 0737/1013] Fix funkyness with theme getting overridden from
 prefs when using SSH

---
 core/login_server_module.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/login_server_module.js b/core/login_server_module.js
index 8ba1d978..041f317c 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -19,6 +19,10 @@ module.exports = class LoginServerModule extends ServerModule {
     //  :TODO: we need to max connections -- e.g. from config 'maxConnections'
 
     prepareClient(client, cb) {
+        if(client.user.isAuthenticated()) {
+            return cb(null);
+        }
+
         const theme = require('./theme.js');
 
         //
@@ -32,7 +36,7 @@ module.exports = class LoginServerModule extends ServerModule {
         }
 
         theme.setClientTheme(client, client.user.properties[UserProps.ThemeId]);
-        return cb(null);   //  note: currently useless to use cb here - but this may change...again...
+        return cb(null);
     }
 
     handleNewClient(client, clientSock, modInfo) {

From 4bb4a06e66ff131a8773f4a49585d7999a23e1cb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 30 Jan 2019 21:01:49 -0700
Subject: [PATCH 0738/1013] Fix duplicate announcements for retroactive
 achievements

---
 core/achievement.js | 183 +++++++++++---------------------------------
 1 file changed, 44 insertions(+), 139 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index a5de541f..68dc482f 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -331,7 +331,7 @@ class Achievements {
                     return nextAchievementTag(null);
                 }
 
-                async.series(
+                async.waterfall(
                     [
                         (callback) => {
                             this.loadAchievementHitCount(userStatEvent.user, achievementTag, matchField, (err, count) => {
@@ -360,32 +360,51 @@ class Achievements {
                             };
 
                             const achievementsInfo = [ info ];
-                            if(true === achievement.data.retroactive) {
-                                //  For userStat, any lesser match keys(values) are also met. Example:
-                                //  matchKeys: [ 500, 200, 100, 20, 10, 2 ]
-                                //                    ^---- we met here
-                                //                         ^------------^ retroactive range
-                                //
-                                const index = achievement.matchKeys.findIndex(v => v < matchField);
-                                if(index > -1 && Array.isArray(achievement.matchKeys)) {
-                                    achievement.matchKeys.slice(index).forEach(k => {
-                                        const [ det, fld, val ] = achievement.getMatchDetails(k);
-                                        if(det) {
-                                            achievementsInfo.push(Object.assign(
-                                                {},
-                                                info,
-                                                {
-                                                    details         : det,
-                                                    matchField      : fld,
-                                                    achievedValue   : fld,
-                                                    matchValue      : val,
-                                                }
-                                            ));
-                                        }
-                                    });
-                                }
+                            return callback(null, achievementsInfo, info);
+                        },
+                        (achievementsInfo, basicInfo, callback) => {
+                            if(true !== achievement.data.retroactive) {
+                                return callback(null, achievementsInfo);
                             }
 
+                            const index = achievement.matchKeys.findIndex(v => v < matchField);
+                            if(-1 === index || !Array.isArray(achievement.matchKeys)) {
+                                return callback(null, achievementsInfo);
+                            }
+
+                            //  For userStat, any lesser match keys(values) are also met. Example:
+                            //  matchKeys: [ 500, 200, 100, 20, 10, 2 ]
+                            //                    ^---- we met here
+                            //                         ^------------^ retroactive range
+                            //
+                            async.eachSeries(achievement.matchKeys.slice(index), (k, nextKey) => {                                
+                                const [ det, fld, val ] = achievement.getMatchDetails(k);
+                                if(!det) {
+                                    return nextKey(null);
+                                }
+
+                                this.loadAchievementHitCount(userStatEvent.user, achievementTag, fld, (err, count) => {
+                                    if(!err || count && 0 === count) {
+                                        achievementsInfo.push(Object.assign(
+                                            {},
+                                            basicInfo,
+                                            {
+                                                details         : det,
+                                                matchField      : fld,
+                                                achievedValue   : fld,
+                                                matchValue      : val,
+                                            }
+                                        ));
+                                    }
+
+                                    return nextKey(null);
+                                });
+                            },
+                            () => {
+                                return callback(null, achievementsInfo);
+                            });
+                        },
+                        (achievementsInfo, callback) => {
                             //  reverse achievementsInfo so we display smallest > largest
                             achievementsInfo.reverse();
 
@@ -407,120 +426,6 @@ class Achievements {
                     }
                 );
             });
-
-            /*
-            const achievementTag = _.findKey(
-                _.get(this.achievementConfig, 'achievements', {}),
-                achievement => {
-                    if(false === achievement.enabled) {
-                        return false;
-                    }
-                    const acceptedTypes = [
-                        Achievement.Types.UserStatSet,
-                        Achievement.Types.UserStatInc,
-                        Achievement.Types.UserStatIncNewVal,
-                    ];
-                    return acceptedTypes.includes(achievement.type) && achievement.statName === userStatEvent.statName;
-                }
-            );
-
-            if(!achievementTag) {
-                return;
-            }
-
-            const achievement = Achievement.factory(this.getAchievementByTag(achievementTag));
-            if(!achievement) {
-                return;
-            }
-
-            const statValue = parseInt(
-                [ Achievement.Types.UserStatSet, Achievement.Types.UserStatIncNewVal ].includes(achievement.data.type) ?
-                    userStatEvent.statValue :
-                    userStatEvent.statIncrementBy
-            );
-            if(isNaN(statValue)) {
-                return;
-            }
-
-            const [ details, matchField, matchValue ] = achievement.getMatchDetails(statValue);
-            if(!details) {
-                return;
-            }
-
-            async.series(
-                [
-                    (callback) => {
-                        this.loadAchievementHitCount(userStatEvent.user, achievementTag, matchField, (err, count) => {
-                            if(err) {
-                                return callback(err);
-                            }
-                            return callback(count > 0 ? Errors.General('Achievement already acquired', ErrorReasons.TooMany) : null);
-                        });
-                    },
-                    (callback) => {
-                        const client = getConnectionByUserId(userStatEvent.user.userId);
-                        if(!client) {
-                            return callback(Errors.UnexpectedState('Failed to get client for user ID'));
-                        }
-
-                        const info = {
-                            achievementTag,
-                            achievement,
-                            details,
-                            client,
-                            matchField,                     //  match - may be in odd format
-                            matchValue,                     //  actual value
-                            achievedValue   : matchField,   //  achievement value met
-                            user            : userStatEvent.user,
-                            timestamp       : moment(),
-                        };
-
-                        const achievementsInfo = [ info ];
-                        if(true === achievement.data.retroactive) {
-                            //  For userStat, any lesser match keys(values) are also met. Example:
-                            //  matchKeys: [ 500, 200, 100, 20, 10, 2 ]
-                            //                    ^---- we met here
-                            //                         ^------------^ retroactive range
-                            //
-                            const index = achievement.matchKeys.findIndex(v => v < matchField);
-                            if(index > -1 && Array.isArray(achievement.matchKeys)) {
-                                achievement.matchKeys.slice(index).forEach(k => {
-                                    const [ det, fld, val ] = achievement.getMatchDetails(k);
-                                    if(det) {
-                                        achievementsInfo.push(Object.assign(
-                                            {},
-                                            info,
-                                            {
-                                                details         : det,
-                                                matchField      : fld,
-                                                achievedValue   : fld,
-                                                matchValue      : val,
-                                            }
-                                        ));
-                                    }
-                                });
-                            }
-                        }
-
-                        //  reverse achievementsInfo so we display smallest > largest
-                        achievementsInfo.reverse();
-
-                        async.eachSeries(achievementsInfo, (achInfo, nextAchInfo) => {
-                            return this.recordAndDisplayAchievement(achInfo, err => {
-                                return nextAchInfo(err);
-                            });
-                        },
-                        err => {
-                            return callback(err);
-                        });
-                    }
-                ],
-                err => {
-                    if(err && ErrorReasons.TooMany !== err.reasonCode) {
-                        Log.warn( { error : err.message, userStatEvent }, 'Error handling achievement for user stat event');
-                    }
-                }
-            );*/
         });
     }
 

From 6aa6712edc4996936422cd4baf2519cacee1223c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 30 Jan 2019 23:36:00 -0700
Subject: [PATCH 0739/1013] Minor achievement event improvements

---
 core/achievement.js   | 7 ++++++-
 core/system_events.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/achievement.js b/core/achievement.js
index 68dc482f..20e32603 100644
--- a/core/achievement.js
+++ b/core/achievement.js
@@ -211,9 +211,12 @@ class Achievements {
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalCount, 1);
         StatLog.incrementUserStat(info.client.user, UserProps.AchievementTotalPoints, info.details.points);
 
+        const cleanTitle    = stripMciColorCodes(localInterruptItem.title);
+        const cleanText     = stripMciColorCodes(localInterruptItem.achievText);
+
         const recordData = [
             info.client.user.userId, info.achievementTag, getISOTimestampString(info.timestamp), info.matchField,
-            stripMciColorCodes(localInterruptItem.title), stripMciColorCodes(localInterruptItem.achievText), info.details.points,
+            cleanTitle, cleanText, info.details.points,
         ];
 
         UserDb.run(
@@ -231,6 +234,8 @@ class Achievements {
                         user            : info.client.user,
                         achievementTag  : info.achievementTag,
                         points          : info.details.points,
+                        title           : cleanTitle,
+                        text            : cleanText,
                     }
                 );
 
diff --git a/core/system_events.js b/core/system_events.js
index 173f753b..129dacfd 100644
--- a/core/system_events.js
+++ b/core/system_events.js
@@ -23,5 +23,5 @@ module.exports = {
     UserSendNodeMsg         : 'codes.l33t.enigma.system.user_send_node_msg',        //  { ..., global }
     UserStatSet             : 'codes.l33t.enigma.system.user_stat_set',             //  { ..., statName, statValue }
     UserStatIncrement       : 'codes.l33t.enigma.system.user_stat_increment',       //  { ..., statName, statIncrementBy, statValue }
-    UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  { ..., achievementTag, points }
+    UserAchievementEarned   : 'codes.l33t.enigma.system.user_achievement_earned',   //  { ..., achievementTag, points, title, text }
 };

From 43c11dc2883bb22fd52eeb5b20e23c69038b9bec Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Feb 2019 10:20:06 -0700
Subject: [PATCH 0740/1013] A few more upload bytes brackets

---
 config/achievements.hjson | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index 4ad30565..e1430bcc 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -187,6 +187,12 @@
             type: userStatSet
             statName: ul_total_bytes
             match: {
+                10240: {
+                    text: "UNIVAC Drum"
+                    globalText: "{userName} has uploaded 10k. Enough to fill a UNIVAC drum!"
+                    text: "You've uploaded 10k. Enough to fill a UNIVAC drum!"
+                    points: 5
+                }
                 524288: {
                     title: "Kickstart"
                     globalText: "{userName} has uploaded 512KB, enough for a Kickstart!"
@@ -221,8 +227,20 @@
                     title: "Encarta"
                     globalText: "{userName} has uploaded 5xCD discs worth of data. That's the size of Encarta!"
                     text: "You've uploaded 5xCD discs worth of data. That's the size of Encarta!"
+                    points: 50
+                }
+                7025459200: {
+                    title: "NFL_Madden_2007_USA_BLURAY_DIRFIX_PS3-PARADOX"
+                    globalText: "{userName} has uploaded 67x100 MiB worth of data, the size of the worlds first PS3 rip!"
+                    text: "You've uploaded 67x100 MiB worth of data, the size of the world first PS3 rip!"
                     points: 100
                 }
+                25018184499: {
+                    title: "WaYsTeD"
+                    globalText: "{userName} has uploaded 23.3 GiB of data, the size of the first PS4 rip: Watch.Dogs.PS4-WaYsTeD!"
+                    text: "You've uploaded 23.3 GiB of data, the size of the first PS4 rip: Watch.Dogs.PS4-WaYsTeD!"
+                    points: 150
+                }
             }
         }
 

From 8ba80426e33f8c1cb715d8a0a7c55170dbbf6ec4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Feb 2019 10:20:22 -0700
Subject: [PATCH 0741/1013] Better disconnect - should resolve issues with SSH

---
 core/client.js               | 7 ++++++-
 core/servers/login/ssh.js    | 8 ++++++--
 core/servers/login/telnet.js | 9 +++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/client.js b/core/client.js
index 894119bf..d340981b 100644
--- a/core/client.js
+++ b/core/client.js
@@ -511,7 +511,12 @@ Client.prototype.end = function () {
         //
         //  We can end up calling 'end' before TTY/etc. is established, e.g. with SSH
         //
-        return this.output.end.apply(this.output, arguments);
+        if(_.isFunction(this.disconnect)) {
+            return this.disconnect();
+        } else {
+            //  legacy fallback
+            return this.output.end.apply(this.output, arguments);
+        }
     } catch(e) {
         //  ie TypeError
     }
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index d13acf4b..ee63ac78 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -278,13 +278,17 @@ function SSHClient(clientConn) {
         });
     });
 
-    clientConn.on('end', () => {
-        self.emit('end');   //  remove client connection/tracking
+    clientConn.once('end', () => {
+        return self.emit('end');   //  remove client connection/tracking
     });
 
     clientConn.on('error', err => {
         self.log.warn( { error : err.message, code : err.code }, 'SSH connection error');
     });
+
+    this.disconnect = function() {
+        return clientConn.end();
+    };
 }
 
 util.inherits(SSHClient, baseClient.Client);
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 29d766ba..fb6ca745 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -550,6 +550,15 @@ function TelnetClient(input, output) {
             this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
         }
     };
+
+    this.disconnect = function() {
+        try {
+            return this.output.end.apply(this.output, arguments);
+        }
+        catch(e) {
+            //  nothing
+        }
+    };
 }
 
 util.inherits(TelnetClient, baseClient.Client);

From 50c1a60838bf2c74ab144d68255dfce9b96b3a57 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Feb 2019 19:04:36 -0700
Subject: [PATCH 0742/1013] File scan improvements * Support more versions of
 RAR signatures & file listings * Better FILE_ID.DIZ, NFO, etc. extraction

---
 core/config.js         | 19 +++++++++++++++----
 core/file_base_area.js |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/config.js b/core/config.js
index fa99d5da..bd152e99 100644
--- a/core/config.js
+++ b/core/config.js
@@ -553,7 +553,7 @@ function getDefaultConfig() {
             },
             'application/x-rar-compressed' : {
                 desc            : 'RAR Archive',
-                sig             : '526172211a0700',
+                sig             : '526172211a07',
                 offset          : 0,
                 archiveHandler  : 'Rar',
             },
@@ -704,7 +704,7 @@ function getDefaultConfig() {
                     list            : {
                         cmd         : 'unrar',
                         args        : [ 'l', '{archivePath}' ],
-                        entryMatch  : '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
+                        entryMatch  : '^\\s+[\\.A-Z]+\\s+([\\d]+)\\s{2}[0-9]{2,4}\\-[0-9]{2}\\-[0-9]{2}\\s[0-9]{2}\\:[0-9]{2}\\s{2}([^\\r\\n]+)$',
                     },
                     extract         : {
                         cmd         : 'unrar',
@@ -880,12 +880,23 @@ function getDefaultConfig() {
                 //  FILE_ID.DIZ - https://en.wikipedia.org/wiki/FILE_ID.DIZ
                 //  Some groups include a FILE_ID.ANS. We try to use that over FILE_ID.DIZ if available.
                 desc        : [
-                    '^[^/\]*FILE_ID\.ANS$', '^[^/\]*FILE_ID\.DIZ$', '^[^/\]*DESC\.SDI$', '^[^/\]*DESCRIPT\.ION$', '^[^/\]*FILE\.DES$', '^[^/\]*FILE\.SDI$', '^[^/\]*DISK\.ID$'  //  eslint-disable-line no-useless-escape
+                    '^.*FILE_ID\.ANS$', '^.*FILE_ID\.DIZ$',     //  eslint-disable-line no-useless-escape
+                    '^.*DESC\.SDI$',                            //  eslint-disable-line no-useless-escape
+                    '^.*DESCRIPT\.ION$',                        //  eslint-disable-line no-useless-escape
+                    '^.*FILE\.DES$',                            //  eslint-disable-line no-useless-escape
+                    '^.*FILE\.SDI$',                            //  eslint-disable-line no-useless-escape
+                    '^.*DISK\.ID$'                              //  eslint-disable-line no-useless-escape
                 ],
 
                 //  common README filename - https://en.wikipedia.org/wiki/README
                 descLong        : [
-                    '^[^/\]*\.NFO$', '^[^/\]*README\.1ST$', '^[^/\]*README\.NOW$', '^[^/\]*README\.TXT$', '^[^/\]*READ\.ME$', '^[^/\]*README$', '^[^/\]*README\.md$',//  eslint-disable-line no-useless-escape
+                    '^[^/\]*\.NFO$',        //  eslint-disable-line no-useless-escape
+                    '^.*README\.1ST$',      //  eslint-disable-line no-useless-escape
+                    '^.*README\.NOW$',      //  eslint-disable-line no-useless-escape
+                    '^.*README\.TXT$',      //  eslint-disable-line no-useless-escape
+                    '^.*READ\.ME$',         //  eslint-disable-line no-useless-escape
+                    '^.*README$',           //  eslint-disable-line no-useless-escape
+                    '^.*README\.md$',       //  eslint-disable-line no-useless-escape
                     '^RELEASE-INFO.ASC$'    //  eslint-disable-line no-useless-escape
                 ],
             },
diff --git a/core/file_base_area.js b/core/file_base_area.js
index 44ecb406..ec36c7ec 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -354,8 +354,8 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                         }
 
                         const descFiles = {
-                            desc        : shortDescFile ? paths.join(tempDir, shortDescFile.fileName) : null,
-                            descLong    : longDescFile ? paths.join(tempDir, longDescFile.fileName) : null,
+                            desc        : shortDescFile ? paths.join(tempDir, paths.basename(shortDescFile.fileName)) : null,
+                            descLong    : longDescFile ? paths.join(tempDir, paths.basename(longDescFile.fileName)) : null,
                         };
 
                         return callback(null, descFiles);

From db59bc7254bb1ee01fbfac4e2c29909cc6362b62 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 5 Feb 2019 18:42:10 -0700
Subject: [PATCH 0743/1013] Some doc updates

---
 docs/configuration/menu-hjson.md | 43 +++++++++++++++++++++++++++++---
 docs/modding/existing-mods.md    |  2 ++
 docs/modding/menu-modules.md     | 13 ++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 docs/modding/menu-modules.md

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 4d8dec9b..a59e5b24 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -1,8 +1,8 @@
 ---
 layout: page
-title: Menus
+title: Menu HSJON
 ---
-## Menus
+## Menu HJSON
 The core of a ENiGMA½ based BBS is `menu.hjson`. Note that when `menu.hjson` is referenced, we're actually talking about `config/yourboardname-menu.hjson` or similar. This file determines the menus (or screens) a user can see, the order they come in and how they interact with each other, ACS configuration, etc. Like all configuration within ENiGMA½, menu configuration is done in [HJSON](https://hjson.org/) format. See [HJSON General Information](hjson.md) for more information.
 
 Entries in `menu.hjson` are often referred to as *blocks* or *sections*. Each entry defines a menu. A menu in this sense is something the user can see or visit. Examples include but are not limited to:
@@ -24,9 +24,14 @@ Below is a table of **common** menu entry members. These members apply to most e
 | `prompt` | Specifies a prompt, by name, to use along with this menu. Prompts are configured in `prompt.hjson`. |
 | `submit` | Defines a submit handler when using `prompt`.
 | `form` | An object defining one or more *forms* available on this menu. |
-| `module` | Sets the module name to use for this menu. |
+| `module` | Sets the module name to use for this menu. See **Menu Modules** below. |
 | `config` | An object containing additional configuration. See **Config Block** below. |
 
+### Menu Modules
+A given menu entry is backed by a *menu module*. That is, the code behind it. Menus are considered "standard" if the `module` member is not specified (and therefore backed by `core/standard_menu.js`).
+
+See [Menu Modules](/docs/modding/menu-modules.md) for more information.
+
 ### Config Block
 The `config` block for a menu entry can contain common members as well as a per-module (when `module` is used) settings.
 
@@ -57,7 +62,37 @@ Menus may also support more than one layout type by using a *MCI key*. A MCI key
 For more information on views and associated MCI codes, see [MCI Codes](/docs/art/mci.md).
 
 ## Submit Handlers
-TODO
+When a form is submitted, it's data is matched against a *submit handler*. When a match is found, it's *action* is performed.
+
+### Submit Actions
+Submit actions are declared using the `action` member of a submit handler block. Actions can be kick off system/global or local-to-module methods, launch other menus, etc.
+
+| Action | Description |
+|--------|-------------|
+| `@menu:menuName` | Takes the user to the *menuName* menu |
+| `@systemMethod:methodName` | Executes the system/global method *methodName*. See **System Methods** below. |
+| `@method:methodName` | Executes *methodName* local to the calling module. That is, the module set by the `module` member of a menu entry. |
+| `@method:/path/to/some_module.js:methodName` | Executes *methodName* exported by the module at */path/to/some_module.js*. |
+
+#### Method Signature
+Methods executed using `@method`, or `@systemMethod` have the following signature:
+```
+(callingMenu, formData, extraArgs, callback)
+```
+
+#### System Methods
+Many built in global/system methods exist. Below are a few. See [system_menu_method](/core/system_menu_method.js) for more information.
+
+| Method | Description |
+|--------|-------------|
+| `login` | Performs a standard login. |
+| `logoff` | Performs a standard system logoff. |
+| `prevMenu` | Goes to the previous menu. |
+| `nextMenu` | Goes to the next menu (as set by `next`) |
+| `prevConf` | Sets the users message conference to the previous available. |
+| `nextConf` | Sets the users message conference to the next available. |
+| `prevArea` | Sets the users message area to the previous available. |
+| `nextArea` | Sets the users message area to the next available. |
 
 ## Example
 Let's look a couple basic menu entries:
diff --git a/docs/modding/existing-mods.md b/docs/modding/existing-mods.md
index af1b2b74..c64469d4 100644
--- a/docs/modding/existing-mods.md
+++ b/docs/modding/existing-mods.md
@@ -2,6 +2,8 @@
 layout: page
 title: Existing Mods
 ---
+Many "addon" modules exist and have been released. Below are a few:
+
 | Name                        | Author      | Description |
 |-----------------------------|-------------|-------------|
 | Married Bob Fetch Event     | NuSkooler   | An event for fetching the latest Married Bob ANSI's for display on you board. ACiDic release [ACD-MB4E.ZIP](https://l33t.codes/outgoing/ACD/ACD-MB4E.ZIP). Can also be [found on GitHub](https://github.com/NuSkooler/enigma-bbs-married_bob_evt) |
diff --git a/docs/modding/menu-modules.md b/docs/modding/menu-modules.md
new file mode 100644
index 00000000..0ab67956
--- /dev/null
+++ b/docs/modding/menu-modules.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: Local Doors
+---
+## Menu Modules
+Menu entries found within `menu.hjson` are backed by *menu modules*. 
+
+## Creating a New Module
+
+### Lifecycle
+TODO
+
+

From 032e6d59b8d4e091111b7287292b4e26a23ebe20 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 5 Feb 2019 18:53:38 -0700
Subject: [PATCH 0744/1013] Doc updates

---
 docs/installation/installation-methods.md | 6 +++---
 docs/messageareas/netmail.md              | 9 +++------
 docs/modding/menu-modules.md              | 1 +
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/installation/installation-methods.md b/docs/installation/installation-methods.md
index bb55dcce..5d751ea0 100644
--- a/docs/installation/installation-methods.md
+++ b/docs/installation/installation-methods.md
@@ -8,9 +8,9 @@ things manually versus have it automated for you.
 
 | Method | Operating System Compatibility | Notes |
 |--------|--------------------------------|-------|
-| [Installation Script](install-script)  | Linux, BSD, OSX | Quick and easy installation under most Linux/UNIX like environments (Linux, BSD, OS X, ...) |
-| [Docker Images](docker) | Linux, BSD, OSX, Windows | Easy upgrades, compatible with all operating systems, no dependencies to install            |
-| [Manual](manual) | Linux, Windows (probably others but untested!  | If you like doing things manually, or are running Windows |
+| [Installation Script](install-script.md)  | Linux, BSD, OSX | Quick and easy installation under most Linux/UNIX like environments (Linux, BSD, OS X, ...) |
+| [Docker Images](docker.md) | Linux, BSD, OSX, Windows | Easy upgrades, compatible with all operating systems, no dependencies to install            |
+| [Manual](manual.md) | Linux, Windows (probably others but untested!  | If you like doing things manually, or are running Windows |
 
 ## Keeping Up To Date
 After installing, you'll want to [keep your system updated](/docs/admin/updating.md).
\ No newline at end of file
diff --git a/docs/messageareas/netmail.md b/docs/messageareas/netmail.md
index 3e947e68..f43c2a4b 100644
--- a/docs/messageareas/netmail.md
+++ b/docs/messageareas/netmail.md
@@ -2,16 +2,13 @@
 layout: page
 title: Netmail
 ---
-ENiGMA support import and export of Netmail from the Private Mail area. `RiPuk @ 21:1/136` and 
-`RiPuk <21:1/136>` 'To' address formats are supported.
+ENiGMA support import and export of Netmail from the Private Mail area. `RiPuk @ 21:1/136` and `RiPuk <21:1/136>` 'To' address formats are supported.
 
 ## Netmail Routing
 
-A configuration block must be added to the `scannerTossers::ftn_bso` `config.hjson` section to tell the 
-ENiGMA½ tosser where to route netmail.
+A configuration block must be added to the `scannerTossers::ftn_bso` `config.hjson` section to tell the ENiGMA½ tosser where to route NetMail.
 
-The following configuration would tell ENiGMA½ to route all netmail addressed to 21:* through 21:1/100,
-and all 46:* netmail through 46:1/100:
+The following configuration would tell ENiGMA½ to route all netmail addressed to 21:* through 21:1/100, and all 46:* netmail through 46:1/100:
 
 ````hjson 
 
diff --git a/docs/modding/menu-modules.md b/docs/modding/menu-modules.md
index 0ab67956..ea3ea4a7 100644
--- a/docs/modding/menu-modules.md
+++ b/docs/modding/menu-modules.md
@@ -6,6 +6,7 @@ title: Local Doors
 Menu entries found within `menu.hjson` are backed by *menu modules*. 
 
 ## Creating a New Module
+TODO
 
 ### Lifecycle
 TODO

From 6a7aa5acb809f504025d8e5334662a00bed65568 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 9 Feb 2019 10:56:36 -0700
Subject: [PATCH 0745/1013] Reset daily stats @ midnight, duh

---
 core/config.js                |  4 ++++
 core/misc_scheduled_events.js | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 core/misc_scheduled_events.js

diff --git a/core/config.js b/core/config.js
index bd152e99..73179ced 100644
--- a/core/config.js
+++ b/core/config.js
@@ -953,6 +953,10 @@ function getDefaultConfig() {
         eventScheduler : {
 
             events : {
+                resetDailyStats : {
+                    schedule    : 'at 12:00:01am',  //  note: Later.js places this right @ midnight
+                    action      : '@method:core/misc_scheduled_events.js:resetDailyStatsScheduledEvent',
+                },
                 trimMessageAreas : {
                     //  may optionally use [or ]@watch:/path/to/file
                     schedule    : 'every 24 hours',
diff --git a/core/misc_scheduled_events.js b/core/misc_scheduled_events.js
new file mode 100644
index 00000000..64a73ea5
--- /dev/null
+++ b/core/misc_scheduled_events.js
@@ -0,0 +1,18 @@
+/* jslint node: true */
+'use strict';
+
+const StatLog   = require('./stat_log.js');
+const SysProps  = require('./system_property.js');
+
+exports.resetDailyStatsScheduledEvent = resetDailyStatsScheduledEvent;
+
+function resetDailyStatsScheduledEvent(args, cb) {
+    //
+    //  Various stats need reset daily
+    //
+    [ SysProps.LoginsToday, SysProps.MessagesToday ].forEach(prop => {
+        StatLog.setNonPersistentSystemStat(prop, 0);
+    });
+
+    return cb(null);
+}

From a314b40eb8fa483031a9dc3d9c8dfb59734827fe Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 10 Feb 2019 12:31:25 -0700
Subject: [PATCH 0746/1013] Update to daily maintenance schedule

---
 core/ansi_term.js             | 3 +++
 core/config.js                | 6 +++---
 core/misc_scheduled_events.js | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/ansi_term.js b/core/ansi_term.js
index 353c46c8..20cc1d78 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -17,6 +17,9 @@
 //      * http://www.bbsdocumentary.com/library/PROGRAMS/GRAPHICS/ANSI/ansisys.txt
 //      * http://academic.evergreen.edu/projects/biophysics/technotes/program/ansi_esc.htm
 //
+//  Modern Windows (Win10+)
+//      * https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
+//
 //  VTX
 //      * https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
 //
diff --git a/core/config.js b/core/config.js
index 73179ced..4a71e634 100644
--- a/core/config.js
+++ b/core/config.js
@@ -953,9 +953,9 @@ function getDefaultConfig() {
         eventScheduler : {
 
             events : {
-                resetDailyStats : {
-                    schedule    : 'at 12:00:01am',  //  note: Later.js places this right @ midnight
-                    action      : '@method:core/misc_scheduled_events.js:resetDailyStatsScheduledEvent',
+                dailyMaintenance : {
+                    schedule    : 'at 11:59pm',
+                    action      : '@method:core/misc_scheduled_events.js:dailyMaintenanceScheduledEvent',
                 },
                 trimMessageAreas : {
                     //  may optionally use [or ]@watch:/path/to/file
diff --git a/core/misc_scheduled_events.js b/core/misc_scheduled_events.js
index 64a73ea5..1650b697 100644
--- a/core/misc_scheduled_events.js
+++ b/core/misc_scheduled_events.js
@@ -4,9 +4,9 @@
 const StatLog   = require('./stat_log.js');
 const SysProps  = require('./system_property.js');
 
-exports.resetDailyStatsScheduledEvent = resetDailyStatsScheduledEvent;
+exports.dailyMaintenanceScheduledEvent = dailyMaintenanceScheduledEvent;
 
-function resetDailyStatsScheduledEvent(args, cb) {
+function dailyMaintenanceScheduledEvent(args, cb) {
     //
     //  Various stats need reset daily
     //

From 49c10ed3de416d445954df8c7eea7e1ea48c985d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 10 Feb 2019 13:39:27 -0700
Subject: [PATCH 0747/1013] Door run minutes should not be retroactive

---
 config/achievements.hjson | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/achievements.hjson b/config/achievements.hjson
index e1430bcc..758af562 100644
--- a/config/achievements.hjson
+++ b/config/achievements.hjson
@@ -363,6 +363,7 @@
         user_individual_door_run_minutes: {
             type: userStatInc
             statName: door_run_total_minutes
+            retroactive: false
             match: {
                 1: {
                     title: "Nevermind!"

From 95214b0fb2a085c8651e35d90b8478e3a20bb9a1 Mon Sep 17 00:00:00 2001
From: FrozenFOXX <frozenfoxx@churchoffoxx.net>
Date: Thu, 14 Feb 2019 11:05:02 -0800
Subject: [PATCH 0748/1013] Update config.js

Updated the OpenSSL command to use aes256 over des3.
---
 core/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index 62ce6032..67ac3d56 100644
--- a/core/config.js
+++ b/core/config.js
@@ -218,13 +218,13 @@ function getDefaultConfig() {
 				//	Private key in PEM format
 				//
 				//	Generating your PK:
-				//	> openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+				//	> openssl genrsa -aes256 -out ./config/ssh_private_key.pem 2048
 				//
 				//	Then, set servers.ssh.privateKeyPass to the password you use above
 				//	in your config.hjson
 				//
 				privateKeyPem		: paths.join(__dirname, './../config/ssh_private_key.pem'),
-				firstMenu			: 'sshConnected',
+				firstMenu		: 'sshConnected',
 				firstMenuNewUser	: 'sshConnectedNewUser',
 			},
 			webSocket : {

From 66bd2ce10849039b1a6912e466287b6029b6c19d Mon Sep 17 00:00:00 2001
From: FrozenFOXX <frozenfoxx@churchoffoxx.net>
Date: Fri, 15 Feb 2019 10:15:37 -0800
Subject: [PATCH 0749/1013] Downgraded to AES128

Downgraded to AES128, AES256 does not currently seem to work.
---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 67ac3d56..4fcb0fbe 100644
--- a/core/config.js
+++ b/core/config.js
@@ -218,7 +218,7 @@ function getDefaultConfig() {
 				//	Private key in PEM format
 				//
 				//	Generating your PK:
-				//	> openssl genrsa -aes256 -out ./config/ssh_private_key.pem 2048
+				//	> openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
 				//
 				//	Then, set servers.ssh.privateKeyPass to the password you use above
 				//	in your config.hjson

From f8bbc23951f3b9472b9fe1586fb3a0ba7e4a53ec Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 12:37:17 -0700
Subject: [PATCH 0750/1013] Add Luciano art for message search

---
 art/themes/luciano_blocktronics/MSEARCH.ANS   | Bin 0 -> 1004 bytes
 art/themes/luciano_blocktronics/MSRCHLST.ANS  | Bin 0 -> 2219 bytes
 art/themes/luciano_blocktronics/MSRCNORES.ANS | Bin 0 -> 226 bytes
 art/themes/luciano_blocktronics/theme.hjson   |  43 ++++++++++++++++++
 core/ansi_term.js                             |   3 ++
 5 files changed, 46 insertions(+)
 create mode 100644 art/themes/luciano_blocktronics/MSEARCH.ANS
 create mode 100644 art/themes/luciano_blocktronics/MSRCHLST.ANS
 create mode 100644 art/themes/luciano_blocktronics/MSRCNORES.ANS

diff --git a/art/themes/luciano_blocktronics/MSEARCH.ANS b/art/themes/luciano_blocktronics/MSEARCH.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..0e6a7afd22cc4cab9437d42ee20b26428009f37e
GIT binary patch
literal 1004
zcmb_bu};G<5N*ZQl?4$AymVo5oZ<ixLx>_^sDwyi$rPojK*CfCNPGaF8H@Z0;@vsU
zLfJ^AUhRAL-n+{+C}pycNfet|P)2cPyPyn{MQp4M%7ru**U})RGnYsrX?lVh+uI&!
zfVu&s&KLxQrAG*XG=QK0WfCde;|lz&2%6!R`RFJO7kLKHD?Kl=Ox$<S?w~;KaQN!!
zXGrF3*Y&o;8NgljREa{zfQXM6OQ`f$5iSYNdOh%NBC+>`8&X3Wsvw^Y1mU?yuuIsZ
zHZX*5ZrAzMW|<d7dYy|RPw%rEg3_SAXGDW32c=R}rp;SZwe^#DZ(8%lJig-#=AY-Q
z5E_P}Z$V`z9&|~r#mDo@x~|$ab35Ak)k^U@(X<8bBn_!6Y5>Bb-o9>jDHh9!6%hx;
zh+EXAYMW|z#bT&Hq`f+YL}*|VJs%x=-?VHH4oaQ9Z+G$Jt5fFTIP%co#K_{kY}zd?
zFj6R?4H@U92M)wv9KIoX&9L&<lmOH2uK|I)Ah2s^kReNT^;$PCv%?~N$Z{#M!~gXt
e8OBmc{kb=pOs98~g9$(Tw^vK?c%8b_`27Pab|EGJ

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/MSRCHLST.ANS b/art/themes/luciano_blocktronics/MSRCHLST.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..4a9982ffe23a8023a02320f661ecde3a790b627c
GIT binary patch
literal 2219
zcmb_e&2G~`7));{S1y!D;0t$qlh}fsN>m{vDj^EJ<OT`?#5RI9@LE-$p>JVJ`zoE8
zZ+Gpc5ki7JB;N0DXXg9X$z)Y7X60g9`eL%GeAo6XbfKH9N)LOr#0P_5>jUr<7*rJe
zwC^IO%u|Lu%IU^M+gicr=B;@s515rOOdYq=h6lQxJ^cdEwyeUq+MjO`3hXKauk$x7
zM<O&{Y(IY6_22ASgBX9gVQCafYgq8}&y5gfw=#uV2mb!DKJVjm6hRT3;VQjRh=H&_
zJ3FZ+tNCK)sIcuQN}V;#q-k!ZLoJ{>EB&px*c)B^t2v;z;eHXBGr(EG9nivT&1@KK
zM8`$P4vSSzg0~BMtkO{gDCPS%b37wVV>FLr1hb2#IC-4paXf;fR{O5Q93xS4glBEB
zpE)!PUx?tGda>kqVOuR`H9Lz~`8fM@@hY_P)2XtugBDhoJqAE+W;qgedD5xJAa!sW
z&T0S(%TDFtG-#(ba2tIj5@G4wh&ZMUsHGH%OctmBf(;4c(TJf`wnYF^LcOy7I?<Qh
zpljNan~{;c%Xcu-^1`4wf3g0){&cA%9RV+AA&Wi4BIX1xNb*o-V<gtfL&rk4i4D7V
zCk$?LL^+e9fY1v{3|7m|qdvU`@S*CT1de?XCXNk2QLT8noqu%r<f-JyV))IkwMoIV
zp_rz1AV#od-q<1Npy`ZoudfrbyG*Q&VxZBD5~blmQl2F8wxKX3*|10yLndVX*?ljP
z&DxZdvDX8*G(NC(90zf8{`eGwBN0V4%kX3SHBLkfO*4^EpqaYob-cm@T8J6Sadj1e
zXk6?L<mrfg9TZC!o4wM7Mz#J|=3Wb_y~&nK4JydR5XoruOuf_r%Swu%5{Pj|DiV_@
zxC~}$jA~#90^r$ut~c(OI=nL(xf954^yyK)6qH|)_R}5opCF7MpB{Z!9+xHS{io&1
fYF?F9xqL7h9UQzJ9gegfzJ7U9oV_}-UH-fUJ7L`>

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/MSRCNORES.ANS b/art/themes/luciano_blocktronics/MSRCNORES.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..81464593221b56740a0e43328c712d3df40868ab
GIT binary patch
literal 226
zcmb1+Hn27^ur@Z&<pKfeXhUOXAYpB6kZWaSB^_;$s~{b1Y?hmsuaKHoQk0omtdN#p
znwO%Go0?jZnU}6mnO|C@kd~QKl3JvYT$Bl<G82JXU?y-$1v`d1yBZiMP!AXx7@8Xx
e85*WDFfcGO1~9MzX&?~xbn;aQb9aRB;3NRPoGaA;

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index bd9de965..ee555c1a 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -406,6 +406,49 @@
 				}
 			}
 
+			messageSearch: {
+				0: {
+					mci: {
+						ET1: {
+							width: 42
+						}
+						BT2: {
+							focusTextStyle: upper
+						}
+						SM3: {
+							width: 42
+						}
+						SM4: {
+							width: 42
+						}
+						ET5: {
+							width: 42
+						}
+						ET6: {
+							width: 42
+						}
+						BT7: {
+							focusTextStyle: upper
+						}
+					}
+				}
+			}
+
+			messageAreaSearchMessageList: {
+				config: {
+					allViewsInfoFormat10: "|00|15{msgNumSelected:>4.4} |08/ |15{msgNumTotal:<4.4}"
+					//	Fri Sep 25th
+					dateTimeFormat: ddd MMM Do
+				}
+				mci: {
+					VM1: {
+						height: 14
+						width: 71
+						itemFormat:      "|00|15  {msgNum:<4.4} |03{subject:<27.26} |07{toUserName:<13.12} {fromUserName:<13.12} |03{ts:<12.12}"
+						focusItemFormat: "|00|19> |15{msgNum:<4.4} {subject:<27.26} {toUserName:<13.12} {fromUserName:<13.12} {ts:<12.12}"
+					}
+				}
+			}
 
 			messageAreaViewPost: {
 				0: {
diff --git a/core/ansi_term.js b/core/ansi_term.js
index 20cc1d78..cac29681 100644
--- a/core/ansi_term.js
+++ b/core/ansi_term.js
@@ -20,6 +20,9 @@
 //  Modern Windows (Win10+)
 //      * https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
 //
+//  VT100
+//      * http://www.noah.org/python/pexpect/ANSI-X3.64.htm
+//
 //  VTX
 //      * https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
 //

From fd514e9613f6d50eced615540055645c7aa05245 Mon Sep 17 00:00:00 2001
From: FrozenFOXX <frozenfoxx@churchoffoxx.net>
Date: Fri, 15 Feb 2019 11:38:33 -0800
Subject: [PATCH 0751/1013] Added better description of options for SSH keys

---
 core/config.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 4fcb0fbe..ad6b6e5f 100644
--- a/core/config.js
+++ b/core/config.js
@@ -218,7 +218,16 @@ function getDefaultConfig() {
 				//	Private key in PEM format
 				//
 				//	Generating your PK:
-				//	> openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+				//      Choose a cipher (3DES, AES128, or AES256) and a bit strength (2048 or 4096)
+                                //      Ciphers:
+				//        3des: older, most compatible, least secure
+				//        aes128: newer, widely compatible, fairly secure
+				//        aes256: newest, least compatible, best security
+				//      Bit strength:
+				//        2048: most compatible, decent strength
+				//        4096: stronger, but some software is completely incompatible
+                                //      Sample command:
+				//	  openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
 				//
 				//	Then, set servers.ssh.privateKeyPass to the password you use above
 				//	in your config.hjson

From bae61d114ccddbd7a643f1a1e5a7ec8fb899f696 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 13:07:52 -0700
Subject: [PATCH 0752/1013] Add export option to file menu

---
 art/themes/luciano_blocktronics/FMENU.ANS | Bin 3635 -> 3677 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/FMENU.ANS b/art/themes/luciano_blocktronics/FMENU.ANS
index 55879dd7e6b50547ef71dbaa3c7090cac8a5ddea..1e340430d29969b8878f277e59900836640942c6 100644
GIT binary patch
delta 63
zcmdlib5~|VKf8{lvvjm!ZmNQGw1Ks;S#D}YL4Hw*LRw}{szOd?aY<%gda-o0v3V{~
SmFeb*>@{qRpC<G1sR96{PZYBN

delta 21
dcmcaBvsq?CKRc6&+2-BsHEfJ0CR^~S0svTJ2RQ%$


From 1b809bdbea0b0058eb514455144ab220151bf88e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 13:16:22 -0700
Subject: [PATCH 0753/1013] Fix Luciano art for private mail / inbox list

---
 .../luciano_blocktronics/PRVMSGLIST.ANS       | Bin 2249 -> 2229 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/PRVMSGLIST.ANS b/art/themes/luciano_blocktronics/PRVMSGLIST.ANS
index e1e0ddf86c304f43a5d013de1c28e9a6b0bbad54..180ace2b077bc7bcc5370277e08f310cff326424 100644
GIT binary patch
delta 34
qcmX>pxK(h%dM@c`WAj|;XhU=7jb}}m7>zbFF)w6g^qstfLlpqS2?|dD

delta 54
zcmdlgcv5h}db!-<bm?eAYh#04D+TFjW20Qv5FaDyXme-jXoFmZjXO=47>zf-V_L|{
Km^gU?hbjQmBM^cB


From d94b0af09e1b388b08dbe1c18e4f54c6291b81a5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 13:29:06 -0700
Subject: [PATCH 0754/1013] Fix missing advanced search button

---
 art/themes/luciano_blocktronics/FSEARCH.ANS | Bin 967 -> 967 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/FSEARCH.ANS b/art/themes/luciano_blocktronics/FSEARCH.ANS
index efb19617fd11db0273af49e0a95a2676a9b42547..e97ec3d6d6f919eb299dafcc0f71ea3a2512bfd7 100644
GIT binary patch
delta 27
icmX@kew=*+8#BMTbhM$hiJ7&rd9JEci1}nu=1l-+`3Fe=

delta 15
XcmX@kew=*+8}sD*jG~jJnb!aSEZ+q?


From 7d82935986312ce88eb37e8d68c5e82998bc0b22 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 13:43:34 -0700
Subject: [PATCH 0755/1013] Fix up Luciano art for file base list export

---
 art/themes/luciano_blocktronics/FBLISTEXP.ANS | Bin 0 -> 309 bytes
 .../luciano_blocktronics/FBLISTEXPSEARCH.ANS  | Bin 0 -> 1028 bytes
 art/themes/luciano_blocktronics/theme.hjson   |  45 ++++++++++++++++++
 misc/menu_template.in.hjson                   |   3 +-
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/FBLISTEXP.ANS
 create mode 100644 art/themes/luciano_blocktronics/FBLISTEXPSEARCH.ANS

diff --git a/art/themes/luciano_blocktronics/FBLISTEXP.ANS b/art/themes/luciano_blocktronics/FBLISTEXP.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..73a567f046d7f9abb4c673a8d5c7d4ef075e0067
GIT binary patch
literal 309
zcmb_WyAHxI3{2OoY;^I$h~%U^1f9|nsz`xWqy?l-sA400BA<qET10;U4}P5Qe2!a8
z7nmk%&jI3Aq>1!zYLb=D8e@0nSis&`4f<M@ry8trby%aH_avySR!+l3nI0!K=W&ZZ
zT%#ki+KK>>!H7sQ3LE)l1`={UexO}Gm~2TYJ@xdW^xf^*-5-4FRFi8&_+LmA8<b-C
VVvI#m#W+=piOCLdF4Qpn@(0BKJT(9S

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/FBLISTEXPSEARCH.ANS b/art/themes/luciano_blocktronics/FBLISTEXPSEARCH.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..3efe55925de06c899061076ab4fd73d452901ccb
GIT binary patch
literal 1028
zcmb_bO;5r=5QTW->c!YZ_riVqL96xzO*JGCiJ&p*sewwGut3^s{4f5rZtOoHzS(y1
zK)tynU1s*po42o1BjUcpecKZ~BeK0fmPTayjwhrvB8Ll!G#5B>gZjX?xu^&#WF;%0
z0V*4ib)!H)NLq|B90LdnQ2MroJW}9S9YND%6(5CMs3OgvdAa7rsUogQ^e)kX)FJq;
z=&woQWLZ|SL=0eCJyoKxX26agJC;!CNfD9+SN$sBYezh-2^s2!V{`?1uOTpRHA1O0
zB8uU`LEW~N>x%pFBxIBEe8Ixk+2hlKu;kPMEHD|Da)RV@zsm|1v*mkU>;!vDHwoLM
zd690{>^-OFKHGhyt7OHNSz07n8j}i3b#w(1B3He&Nq0(8KU|n-AZXXBF#|xlqCZ+#
z>Q%Wk9CgG6p=^2^Kos%%4^q1!wHqgNMVuvZn~eF?Q59;ZX&aDp0vch&)pf&S(Fme1
zW?+}ClB}I+&@f>?GLfI`$fMQd@U)%7Z8)%>aOf-j+T;Q4JK82hWD{U+{mGzrI49-x
zg}6}OlcZ(5T_&5}<$U-Ygq-7E|FtY`dfejf*IB32?an$E9ktHKqbYlN7}nA8`2$`V
BEgAp-

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index ee555c1a..4a35eb15 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -851,6 +851,51 @@
 				}
 			}
 
+			fileBaseExportListFilter: {
+				mci: {
+					ET1: {
+						width: 42
+					}
+					BT2: {
+						focusTextStyle: first lower
+					}
+					ET3: {
+						width: 42
+					}
+					SM4: {
+						width: 14
+						justify: left
+					}
+					SM5: {
+						width: 14
+						justify: left
+					}
+					SM6: {
+						width: 14
+						justify: left
+					}
+					BT7: {
+						focusTextStyle: first lower
+					}
+				}
+			}
+
+			fileBaseExportList: {
+				config: {
+					progBarChar: "|15â–’"
+					mainInfoFormat10: "|07{currentFile} |08/ |07{totalFileCount} |08(|07{progress} %|08)"
+				}
+				mci: {
+					TL1: {
+						width: 60
+					}
+					TL2: {
+						width: 56
+						fillChar: "|06â–‘"
+					}
+				}
+			}
+
 			fileAreaFilterEditor: {
 				mci: {
 					ET1: {
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index d303f452..bdcf97cd 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -2798,8 +2798,7 @@
 
         fileBaseExportListFilter: {
             module: file_base_search
-            //  :TODO: fixme:
-            art: FSEARCH
+            art: FBLISTEXPSEARCH
             config: {
                 fileBaseListEntriesMenu: fileBaseExportList
             }

From 04c8167a153f24deb53e41780de1f54698c600b6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 13:55:11 -0700
Subject: [PATCH 0756/1013] Minor doc updates

---
 UPGRADE.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 359abec1..038c5c0a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,16 +1,17 @@
 # Introduction
 This document covers basic upgrade notes for major ENiGMA½ version updates.
 
-
 # Before Upgrading
-* Always back up your system! 
+* Always back up your system!
+* Seriously, always back up your system!
 * At least back up the `db` directory and your `menu.hjson` (or renamed equivalent)
 
-
 # General Notes
-Upgrades often come with changes to the default `menu.hjson`. It is wise to 
-use a *different* file name for your BBS's version of this file and point to
-it via `config.hjson`. For example:
+## Configuration File Updates
+In general, look at the `menu_template.in.hjson`, and `config_template.in.hjson` as well as the defualt `luciano_blocktronics/theme.hjson` files when you update. These files may come with new sections you wish to merge into your system!
+
+### menu.hjson
+Upgrades often come with changes to the default `menu_template.in.hjson`. It is wise to use a *different* file name for your BBS's version of this file and point to it via `config.hjson`. For example:
 
 ```hjson
 general: {
@@ -21,6 +22,9 @@ general: {
 After updating code, use a program such as DiffMerge to merge in updates to
 `my_bbs.hjson` from the shipping `menu.hjson`.
 
+### theme.hjson
+Any custom themes you have created may now be missing features as well. Take a look at the default `luciano_blocktronics/theme.hjson` file. You can use missing sections in your `theme.hjson` (which will generally correspond to sections you've also merged in to your `menu.hjson`).
+
 
 # Upgrading the Code
 Upgrading from GitHub is easy:
@@ -32,7 +36,6 @@ rm -rf npm_modules # do this any time you update Node.js itself
 npm install
 ```
 
-
 # Problems
 Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).

From a08648a8dcc3314017c4fb7c8e8a4a70e8e89a58 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 14:48:03 -0700
Subject: [PATCH 0757/1013] Change install scripts to indicate master

---
 README.md                           | 2 +-
 docs/installation/install-script.md | 4 ++--
 misc/install.sh                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1d178892..f297d060 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 ## Installation
 On *nix type systems:
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
 ```
 
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) for Windows, Docker, and so on...
diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index 61930c93..584492a2 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -6,10 +6,10 @@ title: Install Script
 Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
 ```
 
-You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.9-alpha/misc/install.sh) 
+You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh) 
 on GitHub before running it. 
 
 The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you through creating a basic configuration file, and recommend some packages to install.
diff --git a/misc/install.sh b/misc/install.sh
index aa2b3d9b..1203705c 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -3,7 +3,7 @@
 { # this ensures the entire script is downloaded before execution
 
 ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=10}
-ENIGMA_BRANCH=0.0.9-alpha
+ENIGMA_BRANCH=master
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`

From 901628ccc9595dcbba8b55784bfa070b22aecc79 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 15:22:21 -0700
Subject: [PATCH 0758/1013] Bump to 0.0.10-alpha to prepare for work

---
 README.md                           | 2 +-
 UPGRADE.md                          | 3 +++
 WHATSNEW.md                         | 2 ++
 docs/art/mci.md                     | 4 ++--
 docs/installation/install-script.md | 4 ++--
 package.json                        | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f297d060..167f5288 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 ## Installation
 On *nix type systems:
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh | bash
 ```
 
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) for Windows, Docker, and so on...
diff --git a/UPGRADE.md b/UPGRADE.md
index 038c5c0a..215089ad 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -40,6 +40,9 @@ npm install
 Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
+# 0.0.9-alpha to 0.0.10-alpha
+
+
 # 0.0.8-alpha to 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. Follow your standard upgrade path to update to Node 10.x before using 0.0.9-alpha!
 * The property `justify` found on various views previously had `left` and `right` values swapped (oops!); you will need to adjust any custom `theme.hjson` that use one or the other and swap them as well.
diff --git a/WHATSNEW.md b/WHATSNEW.md
index 39dfca49..31fe24c5 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -1,6 +1,8 @@
 # Whats New
 This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
 
+## 0.0.10-alpha
+
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
 * Fixed `justify` properties: `left` and `right` values were formerly swapped (oops!)
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 3e5e18c5..629ed8ab 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -16,8 +16,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | Code | Description  |
 |------|--------------|
 | `BN` | Board Name |
-| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.9-alpha" |
-| `VN` | Version *number*, eg.. "0.0.9-alpha" |
+| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.10-alpha" |
+| `VN` | Version *number*, eg.. "0.0.10-alpha" |
 | `SN` | SysOp username |
 | `SR` | SysOp real name |
 | `SL` | SysOp location |
diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index 584492a2..c24dede9 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -6,10 +6,10 @@ title: Install Script
 Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh | bash
 ```
 
-You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh) 
+You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh) 
 on GitHub before running it. 
 
 The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you through creating a basic configuration file, and recommend some packages to install.
diff --git a/package.json b/package.json
index 15add31e..73aee3cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enigma-bbs",
-  "version": "0.0.9-alpha",
+  "version": "0.0.10-alpha",
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",

From 1ca1128df6a1b75bf400bbb7f0a8734ef75ac311 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 18:48:16 -0700
Subject: [PATCH 0759/1013] Update docs & examples on SSH Private Key (PK)
 generation

---
 core/config.js                | 28 +++++++++++++++-------------
 docs/servers/ssh.md           | 13 +++++++++++--
 misc/config_template.in.hjson | 24 ++++++++++++++++++++----
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/core/config.js b/core/config.js
index 11f9bcb2..5c1f9c42 100644
--- a/core/config.js
+++ b/core/config.js
@@ -276,24 +276,26 @@ function getDefaultConfig() {
                 port                : 8889,
                 enabled             : false,    //  default to false as PK/pass in config.hjson are required
                 //
-                //	Private Key (PK) in PEM format
+                //  To enable SSH, perform the following steps:
                 //
-                //	Generating your PK:
-                //  1 - Choose a cipher (3DES, AES128, or AES256)
-                //      3des      : older, most compatible, least secure
-                //      aes128    : newer, widely compatible, fairly secure
-                //      aes256    : newest, least compatible, best security
+                //  1 - Generate a Private Key (PK):
+                //  Currently ENiGMA 1/2 requires a PKCS#1 PEM formatted PK.
+                //  To generate a secure PK, issue the following command:
                 //
-                //  2 -  Choose a bit strength (2048 or 4096)
-                //      2048    : most compatible, decent strength
-                //      4096    : stronger, but some software is completely incompatible
+                //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
+                //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
+                //      -out ./config/ssh_private_key.pem -aes128
                 //
-                //  Sample command:
-                //	  openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+                //  (The above is a more modern equivelant of the following):
+                //  > openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
                 //
-                //	Then, set servers.ssh.privateKeyPass to the password you use above
-                //	in your config.hjson
+                //  2 - Set 'privateKeyPass' to the password you used in step #1
                 //
+                //  3 - Finally, set 'enabled' to 'true'
+                //
+                //  Additional reading:
+                //  - https://blog.sleeplessbeastie.eu/2017/12/28/how-to-generate-private-key/
+                //  - https://gist.github.com/briansmith/2ee42439923d8e65a266994d0f70180b
                 //
                 privateKeyPem       : paths.join(__dirname, './../config/ssh_private_key.pem'),
                 firstMenu           : 'sshConnected',
diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
index a71f8250..c576f38e 100644
--- a/docs/servers/ssh.md
+++ b/docs/servers/ssh.md
@@ -35,8 +35,17 @@ Entries available under `config.loginServers.ssh`:
 ```
 
 ## Generate a SSH Private Key
-To utilize the SSH server, an SSH Private Key will need generated. OpenSSL can be used for this task:
+To utilize the SSH server, an SSH Private Key (PK) will need generated. OpenSSL can be used for this task:
 
+### Modern OpenSSL
 ```bash
-openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
+openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa -out ./config/ssh_private_key.pem -aes128
 ```
+
+### Legacy OpenSSL
+```bash
+openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+```
+
+Note that you may need `-3des` for every old implementations or SSH clients!
+
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 504cd02d..5e523e72 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -110,10 +110,26 @@
             port: XXXXX
 
             //
-            //  To enable SSH:
-            //  1) Generate a Private Key (PK):
-            //  > openssl genrsa -des3 -out ./config/ssh_private_key.pem 2048
-            //  2) Set "privateKeyPass" below
+            //  To enable SSH, perform the following steps:
+            //
+            //  1 - Generate a Private Key (PK):
+            //  Currently ENiGMA 1/2 requires a PKCS#1 PEM formatted PK.
+            //  To generate a secure PK, issue the following command:
+            //
+            //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
+            //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
+            //      -out ./config/ssh_private_key.pem -aes128
+            //
+            //  (The above is a more modern equivelant of the following):
+            //  > openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+            //
+            //  2 - Set 'privateKeyPass' to the password you used in step #1
+            //
+            //  3 - Finally, set 'enabled' to 'true'
+            //
+            //  Additional reading:
+            //  - https://blog.sleeplessbeastie.eu/2017/12/28/how-to-generate-private-key/
+            //  - https://gist.github.com/briansmith/2ee42439923d8e65a266994d0f70180b
             //
             enabled: XXXXX
 

From aee84006beceaa8f2206887569eb614428e2b49f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 18:56:10 -0700
Subject: [PATCH 0760/1013] Docs pakcage updates to silence vunerability alerts

---
 docs/Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index f49b797b..7a170268 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -20,11 +20,11 @@ GEM
     hacker (0.0.1)
     html-pipeline (2.7.1)
       activesupport (>= 2)
-      nokogiri (>= 1.4)
+      nokogiri (>= 1.8.5)
     http_parser.rb (0.6.0)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.0)
+    jekyll (3.7.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -71,7 +71,7 @@ GEM
     public_suffix (3.0.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+      ffi (>= 1.9.24, < 2)
     rouge (3.1.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)

From c27ad39360760d73c393a9778127e35cccc504b0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 18:56:10 -0700
Subject: [PATCH 0761/1013] Docs pakcage updates to silence vunerability alerts

---
 docs/Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index f49b797b..7a170268 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -20,11 +20,11 @@ GEM
     hacker (0.0.1)
     html-pipeline (2.7.1)
       activesupport (>= 2)
-      nokogiri (>= 1.4)
+      nokogiri (>= 1.8.5)
     http_parser.rb (0.6.0)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.0)
+    jekyll (3.7.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -71,7 +71,7 @@ GEM
     public_suffix (3.0.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+      ffi (>= 1.9.24, < 2)
     rouge (3.1.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)

From cd24bf5901805536a9d7e374b2f1055799312286 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 18:59:04 -0700
Subject: [PATCH 0762/1013] Bump again

---
 docs/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 7a170268..eab14311 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
     minitest (5.11.1)
-    nokogiri (1.8.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)

From 8f8a4514a17ddf7dd15c071dacb6db0e455b1350 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 18:59:59 -0700
Subject: [PATCH 0763/1013] Another bump

---
 docs/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index eab14311..12e78772 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -14,7 +14,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.5)
-    ffi (1.9.18)
+    ffi (1.9.24)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
     hacker (0.0.1)

From 08186109a14b497da70b67c8ccc5f2cd69c42374 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 19:06:10 -0700
Subject: [PATCH 0764/1013] Update dep. packages

---
 package.json |  6 ++---
 yarn.lock    | 74 ++++++++++++++++++++++++++--------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 73aee3cc..299074d6 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "retro"
   ],
   "dependencies": {
-    "async": "^2.6.1",
+    "async": "^2.6.2",
     "binary-parser": "^1.3.2",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
@@ -33,11 +33,11 @@
     "hashids": "^1.1.1",
     "hjson": "^3.1.2",
     "iconv-lite": "^0.4.23",
-    "inquirer": "^6.2.1",
+    "inquirer": "^6.2.2",
     "later": "1.2.0",
     "lodash": "^4.17.10",
     "lru-cache": "^5.1.1",
-    "mime-types": "^2.1.21",
+    "mime-types": "^2.1.22",
     "minimist": "1.2.x",
     "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 8a18bc57..6a922b8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,10 +17,10 @@ ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -119,12 +119,12 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -253,10 +253,10 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -554,7 +554,7 @@ extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.0:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -858,21 +858,21 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
     strip-ansi "^5.0.0"
     through "^2.3.6"
@@ -1098,7 +1098,7 @@ later@1.2.0:
   resolved "https://registry.yarnpkg.com/later/-/later-1.2.0.tgz#f2cf6c4dd7956dd2f520adf0329836e9876bad0f"
   integrity sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8=
 
-lodash@^4.17.10, lodash@^4.17.4:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -1158,10 +1158,10 @@ mime-db@~1.36.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
   integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.20"
@@ -1170,12 +1170,12 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.36.0"
 
-mime-types@^2.1.21:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
+mime-types@^2.1.22:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.37.0"
+    mime-db "~1.38.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -1698,10 +1698,10 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-rxjs@^6.1.0:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+rxjs@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 

From 2dd4df8191d8ce6d8063b1c03370c54e6ce856f6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 20:54:46 -0700
Subject: [PATCH 0765/1013] Fix message search... wtf!?

---
 art/themes/luciano_blocktronics/MSEARCH.ANS | Bin 1004 -> 1000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSEARCH.ANS b/art/themes/luciano_blocktronics/MSEARCH.ANS
index 0e6a7afd22cc4cab9437d42ee20b26428009f37e..822ce65f01d63199d08041d748b6c01d61e650be 100644
GIT binary patch
delta 46
zcmaFE{(^nOR3;8%BWLMoW3$}J3z@q3&84Fatxe3Vjm>jaokGkfTQT=A)=xgptO@{9
Cw+-3=

delta 38
ucmaFC{)T<SR3;uHGiT{&W3yc8Xfx-@bD6p(voeWJwqb5#Y@U3WSrq{Ba0}r8


From c695c1f4c5069502d365606c33bc847e8f574e2f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 21:53:18 -0700
Subject: [PATCH 0766/1013] New findMessages() filters

---
 core/message.js | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/core/message.js b/core/message.js
index 7a30fb02..26a3bf21 100644
--- a/core/message.js
+++ b/core/message.js
@@ -236,16 +236,18 @@ module.exports = class Message {
 
         filter.uuids - use with resultType='id'
         filter.ids - use with resultType='uuid'
-        filter.toUserName
-        filter.fromUserName
+        filter.toUserName - string|Array(string)
+        filter.fromUserName - string|Array(string)
         filter.replyToMessageId
 
+        filter.operator = (AND)|OR
+
         filter.newerThanTimestamp - may not be used with |date|
         filter.date - moment object - may not be used with |newerThanTimestamp|
 
         filter.newerThanMessageId
         filter.areaTag - note if you want by conf, send in all areas for a conf
-        *filter.metaTuples - {category, name, value}
+        filter.metaTuples - [ {category, name, value} ]
 
         filter.terms - FTS search
 
@@ -267,6 +269,7 @@ module.exports = class Message {
 
         filter.resultType   = filter.resultType || 'id';
         filter.extraFields  = filter.extraFields || [];
+        filter.operator     = filter.operator || 'AND';
 
         if('messageList' === filter.resultType) {
             filter.extraFields = _.uniq(filter.extraFields.concat(
@@ -296,9 +299,9 @@ module.exports = class Message {
         let sqlOrderBy;
         let sqlWhere = '';
 
-        function appendWhereClause(clause) {
+        function appendWhereClause(clause, op) {
             if(sqlWhere) {
-                sqlWhere += ' AND ';
+                sqlWhere += ` ${op || filter.operator} `;
             } else {
                 sqlWhere += ' WHERE ';
             }
@@ -345,7 +348,7 @@ module.exports = class Message {
             }
 
             //  explicit exclude of Private
-            appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`);
+            appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`, 'AND');
         }
 
         if(_.isNumber(filter.replyToMessageId)) {
@@ -353,8 +356,18 @@ module.exports = class Message {
         }
 
         [ 'toUserName', 'fromUserName' ].forEach(field => {
-            if(_.isString(filter[field]) && filter[field].length > 0) {
-                appendWhereClause(`m.${_.snakeCase(field)} LIKE "${sanitizeString(filter[field])}"`);
+            let val = filter[field];
+            if(!val) {
+                return; //  next item
+            }
+            if(_.isString(val)) {
+                val = [ val ];
+            }
+            if(Array.isArray(val)) {
+                val = '(' + val.map(v => {
+                    return `m.${_.snakeCase(field)} LIKE "${sanitizeString(v)}"`;
+                }).join(' OR ') + ')';
+                appendWhereClause(val);
             }
         });
 
@@ -380,6 +393,21 @@ module.exports = class Message {
             );
         }
 
+        if(Array.isArray(filter.metaTuples)) {
+            let sub = [];
+            filter.metaTuples.forEach(mt => {
+                sub.push(`(meta_category = "${mt.category}" AND meta_name = "${mt.name}" AND meta_value = "${sanitizeString(mt.value)}")`);
+            });
+            sub = sub.join(` ${filter.operator} `);
+            appendWhereClause(
+                `m.message_id IN (
+                    SELECT message_id
+                    FROM message_meta
+                    WHERE ${sub}
+                )`
+            );
+        }
+
         sql += `${sqlWhere} ${sqlOrderBy}`;
 
         if(_.isNumber(filter.limit)) {

From 83d0daf4b797fa578ac54cc2633dafde84c42ef4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 Feb 2019 21:55:18 -0700
Subject: [PATCH 0767/1013] Add 'My Messages' module

---
 art/themes/luciano_blocktronics/MSGMNU.ANS   | Bin 3660 -> 3685 bytes
 art/themes/luciano_blocktronics/MYMSGLST.ANS | Bin 0 -> 2122 bytes
 art/themes/luciano_blocktronics/theme.hjson  |  15 +++++
 core/my_messages.js                          |  59 +++++++++++++++++++
 misc/menu_template.in.hjson                  |  37 ++++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 art/themes/luciano_blocktronics/MYMSGLST.ANS
 create mode 100644 core/my_messages.js

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index 3585799b98f1e143184bf8efa54e5da16bfccba8..9c373944c901ce9fba4302f0fee7c0ef272e5d00 100644
GIT binary patch
delta 54
zcmX>j^HgR7C#$lBvvjm!Zmx8+fwi$&u0n2VadBdLYOz8|K9H>-9c^rsyIGi3n3M6>
IWOY7O0M3sPA^-pY

delta 29
lcmaDVb4F$ZCo7kcv9olvu~F_uh0Qvw!kml`Cp++|0sw}G2wMOE

diff --git a/art/themes/luciano_blocktronics/MYMSGLST.ANS b/art/themes/luciano_blocktronics/MYMSGLST.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..a56197bcc6fce15564c05499a6a4ac1d26e5aacc
GIT binary patch
literal 2122
zcmb_d%Zd|06wR!JY~45pv^MVhk#wV3jbRWM1LELpvQr`|)(kpEe`}a;n7`<P0>8v_
z?!8rAi9rOdMR(VIpL1_j&(_s)UM<_oyV<(-VHj5oG0fJLhrC|lK_kdU1AIjqImf5I
zow+QMhiJqnOx-YOz<!?8!$2u=x1GP-A{T1uq?Tpd_`727ueWbM6?@U&{b5PW_g}9V
zjj_t534eUpT#C*m9m^vT#Hyv41Oc90oYk}SVmWW9)g9UCGS&=+;=V00f*nTsTd_N6
z?fz99(S!JV5E17Bb8jMAlcgCAjTPwB1$ItQWhZDuJRlVw1pvrJhZPH(sGn`WLnX3U
zWUvVP5HMy43+DzKCtK|24f=!^Ebv70n3@T&t(Wu8%tgo1q>7U|h@P=hA#fR3O2`^5
zK)TCt#MxA-sidKBEwUk3kD{<NE32eHcEUclrX!F86`M-|Ex8D{M1cqZ*b^W=6&ONg
znH3;RNQ<=cM&N@}1SDBX6^YCAu3ke-$uljj@z<Nrn|I&DNmAJ9$Yhtb2yzxKC5eVK
zD<VNHnb5JAWrBv?+cAS$6=YAB`l}y8Tf;S$<|98N2gzP^(pVb_3&E%s#<)OHWXsNU
z;~yM9dMtEgGW^x|jZ$HZ@ml0CB*;;hYOO;#3#?G??QN=T9E}_RC8W_ciqh~{)upe5
zqggTg7_vPU#$Kd)5}(S9-U>Key^knW#(`C!bEoGR90+7v`Aox??MIskO_paO@xZ@_
zo@zV71uU{4N%+zEo14U4VFQf}z4f&SR<I*V!XJMc0o$Dxl6#I&$^m^5K~yx6fz)^c
zRwsqQ<hZ5tfk*(x1a+4#1Kfuy>J@5a2O?YrKWB;84upH6fUA<0dxq@B=*}#3H>0O1
zss34`{IcWp;rYp%)oE2R-hWz6RWItQu72K|OpcCTO^zqB?!SC~<}O~G=q^8h0Z?wp
AJ^%m!

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 4a35eb15..998d4c34 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -450,6 +450,21 @@
 				}
 			}
 
+			messageAreaMyMessagesList: {
+				config: {
+					//	Fri Sep 25th
+					dateTimeFormat: ddd MMM Do
+				}
+				mci: {
+					VM1: {
+						height: 16
+						width: 71
+						itemFormat:      "|00|15  {msgNum:<4.4} |03{subject:<34.33} {fromUserName:<19.18} |03{ts:<12.12}"
+						focusItemFormat: "|00|19> |15{msgNum:<4.4} {subject:<34.33} {fromUserName:<19.18} {ts:<12.12}"
+					}
+				}
+			}
+
 			messageAreaViewPost: {
 				0: {
 					mci: {
diff --git a/core/my_messages.js b/core/my_messages.js
new file mode 100644
index 00000000..721e1f9d
--- /dev/null
+++ b/core/my_messages.js
@@ -0,0 +1,59 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const MenuModule    = require('./menu_module.js').MenuModule;
+const Message       = require('./message.js');
+const UserProps     = require('./user_property.js');
+
+exports.moduleInfo = {
+    name    : 'My Messages',
+    desc    : 'Finds messages addressed to the current user.',
+    author  : 'NuSkooler',
+};
+
+exports.getModule = class MyMessagesModule extends MenuModule {
+    constructor(options) {
+        super(options);
+    }
+
+    initSequence() {
+        const filter = {
+            toUserName  : [ this.client.user.username, this.client.user.getProperty(UserProps.RealName) ],
+            sort        : 'modTimestamp',
+            resultType  : 'messageList',
+            limit       : 1024 * 16,    //  we want some sort of limit...
+        };
+
+        Message.findMessages(filter, (err, messageList) => {
+            if(err) {
+                this.client.log.warn( { error : err.message }, 'Error finding messages addressed to current user');
+                return this.prevMenu();
+            }
+            this.messageList = messageList;
+            this.finishedLoading();
+        });
+    }
+
+    finishedLoading() {
+        if(!this.messageList || 0 === this.messageList.length) {
+            return this.gotoMenu(
+                this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
+                { menuFlags : [ 'popParent' ] }
+            );
+        }
+
+        const menuOpts = {
+            extraArgs : {
+                messageList         : this.messageList,
+                noUpdateLastReadId  : true
+            },
+            menuFlags   : [ 'popParent' ],
+        };
+
+        return this.gotoMenu(
+            this.menuConfig.config.messageListMenu || 'messageAreaMessageList',
+            menuOpts
+        );
+    }
+};
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index bdcf97cd..ac51397f 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1970,6 +1970,43 @@
             }
         }
 
+        messageAreaMyMessagesList: {
+            desc: Personal Messages
+            module: msg_list
+            art: MYMSGLST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                        TL6: {
+                            //  theme me!
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
         messageSearchNoResults: {
             desc: Message Search
             art: MSRCNORES

From f41d12c6885c68c0d4b7b5a74c9b6d4d8442fdee Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 Feb 2019 11:03:46 -0700
Subject: [PATCH 0768/1013] + oputil user rename

---
 core/oputil/oputil_help.js  |  2 ++
 core/oputil/oputil_user.js  | 48 ++++++++++++++++++++++++++++++++++---
 docs/admin/oputil.md        |  3 +++
 misc/menu_template.in.hjson |  3 ---
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index f8a0d42c..6f485f0a 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -30,6 +30,8 @@ actions:
                                aliases: password, passwd
   rm USERNAME                  permanently removes user from system
                                aliases: remove, delete, del
+  rename USERNAME NEWNAME      rename a user
+                               aliases: mv
   activate USERNAME            set status to active
   deactivate USERNAME          set status to inactive
   disable USERNAME             set status to disabled
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index a52facfb..33327d1d 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -227,6 +227,41 @@ function removeUser(user) {
     );
 }
 
+function renameUser(user) {
+    if(argv._.length < 3) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
+
+    const newUserName = argv._[argv._.length - 1];
+
+    async.series(
+        [
+            (callback) => {
+                const { validateUserNameAvail } = require('../../core/system_view_validate.js');
+                return validateUserNameAvail(newUserName, callback);
+            },
+            (callback) => {
+                const userDb = require('../../core/database.js').dbs.user;
+                userDb.run(
+                    `UPDATE user
+                    SET user_name = ?
+                    WHERE id = ?;`,
+                    [ newUserName, user.userId, ],
+                    err => {
+                        return callback(err);
+                    }
+                );
+            }
+        ],
+        err => {
+            if(err) {
+                return console.error(err.reason ? err.reason : err.message);
+            }
+            return console.info(`User "${user.username}" renamed to "${newUserName}"`);
+        }
+    );
+}
+
 function modUserGroups(user) {
     if(argv._.length < 3) {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
@@ -317,9 +352,13 @@ function handleUserCommand() {
         return errUsage();
     }
 
-    const action		= argv._[1];
-    const usernameIdx	= [ 'pw', 'pass', 'passwd', 'password', 'group' ].includes(action) ? argv._.length - 2 : argv._.length - 1;
-    const userName		= argv._[usernameIdx];
+    const action = argv._[1];
+    const usernameIdx = [
+        'pw', 'pass', 'passwd', 'password',
+        'group',
+        'mv', 'rename'
+    ].includes(action) ? argv._.length - 2 : argv._.length - 1;
+    const userName = argv._[usernameIdx];
 
     if(!userName) {
         return errUsage();
@@ -341,6 +380,9 @@ function handleUserCommand() {
             del			: removeUser,
             delete		: removeUser,
 
+            mv          : renameUser,
+            rename      : renameUser,
+
             activate	: setAccountStatus,
             deactivate	: setAccountStatus,
             disable		: setAccountStatus,
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index bb6dcacf..e1164540 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -49,6 +49,8 @@ actions:
                                aliases: password, passwd
   rm USERNAME                  permanently removes user from system
                                aliases: remove, delete, del
+  rename USERNAME NEWNAME      rename a user
+                               aliases: mv
   activate USERNAME            set status to active
   deactivate USERNAME          set status to inactive
   disable USERNAME             set status to disabled
@@ -61,6 +63,7 @@ actions:
 | `info` | Display user information| `./oputil.js user info joeuser` | N/A |
 | `pw`        | Set password      | `./oputil.js user pw joeuser s3cr37`  | `passwd`, `password` |
 | `rm`        | Removes user      | `./oputil.js user del joeuser`        | `remove`, `del`, `delete` |
+| `rename` | Renames a user | `./oputil.js user rename joeuser joe` | `mv` |
 | `activate` | Activates user    | `./oputil.js user activate joeuser`   | N/A   |
 | `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |
 | `disable`   | Disables user (user will not be able to login)    | `./oputil.js user disable joeuser`    | N/A   |
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index ac51397f..9aac86f3 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1985,9 +1985,6 @@
                             submit: true
                             argName: message
                         }
-                        TL6: {
-                            //  theme me!
-                        }
                     }
                     submit: {
                         *: [

From f628168a68ba66bb49fc8c83cde0332d7271ddb7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Feb 2019 14:49:01 -0700
Subject: [PATCH 0769/1013] Add note to WHATSNEW

---
 WHATSNEW.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 31fe24c5..7137038a 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -2,6 +2,9 @@
 This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
 
 ## 0.0.10-alpha
++ `oputil.js user rename USERNAME NEWNAME`
++ `my_messages.js` module (defaulted to "m" at the message menu) to list public messages addressed to the currently logged in user. Takes into account their username and `real_name` property.
+
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!

From d5ac3e2e1c0e857dcc5d079782a46e4c27acb43c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Feb 2019 14:53:58 -0700
Subject: [PATCH 0770/1013] More info on fb scan

---
 docs/filebase/first-file-area.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index ab76fe24..ded10ad3 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -84,3 +84,13 @@ fileBase: {
 
 ## Importing Areas
 Areas can also be imported using [oputil](/docs/admin/oputil.md) using proper FileGate "RAID" aka `FILEBONE.NA` style files. After importing areas, you may wish to tweak configuration such as better `desc` fields, ACS, or sorting.
+
+## Importing Files (Scan For New Files)
+A common task is to *import* existing files to area(s). Consider a collection of retro BBS files in the area "Retro PC" (tag: `retro_pc` above) under the storage tag of `retro_pc_bbs`. You might choose to scan for new files in this area (and thus import new entries) as follows with `oputil.js`'s `fb scan`:
+
+```bash
+./oputil.js fb scan --quick --tags retro,bbs,pc retro_pc@retro_pc_bbs
+```
+
+Please see [oputil](/docs/admin/oputil.md) for more information.
+

From 53e0358113761aff3ffddc24556abc1f0a6f29dd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Feb 2019 14:57:52 -0700
Subject: [PATCH 0771/1013] More doc updates

---
 docs/filebase/first-file-area.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index ded10ad3..46d8d649 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -86,11 +86,13 @@ fileBase: {
 Areas can also be imported using [oputil](/docs/admin/oputil.md) using proper FileGate "RAID" aka `FILEBONE.NA` style files. After importing areas, you may wish to tweak configuration such as better `desc` fields, ACS, or sorting.
 
 ## Importing Files (Scan For New Files)
-A common task is to *import* existing files to area(s). Consider a collection of retro BBS files in the area "Retro PC" (tag: `retro_pc` above) under the storage tag of `retro_pc_bbs`. You might choose to scan for new files in this area (and thus import new entries) as follows with `oputil.js`'s `fb scan`:
+A common task is to *import* existing files to area(s). Consider a collection of retro BBS files in the area "Retro PC" (tag: `retro_pc` above) under the storage tag of `retro_pc_bbs`. You might choose to scan for new files in this area (and thus import new entries) as follows with [oputil](/docs/admin/oputil.md)'s `fb scan`:
 
 ```bash
 ./oputil.js fb scan --quick --tags retro,bbs,pc retro_pc@retro_pc_bbs
 ```
 
+Here we have asked [oputil](/docs/admin/oputil.md) to scan the file base area by it's tag `retro_pc` and only include the storage tag of `retro_pc_bbs`. Note that the storage tag could be omitted, and if so, all of `retro_pc` would be scanned. We have also indicated to #hashtag new entries with the tags "retro", "bbs", and "pc".
+
 Please see [oputil](/docs/admin/oputil.md) for more information.
 

From 65ef1feb6c9cb5e200191977c81f290f5dda6e46 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 Feb 2019 21:12:41 -0700
Subject: [PATCH 0772/1013] Use crypto.timingSafeEqual() vs hand rolled method
 for constant time password comparison

---
 core/user.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/core/user.js b/core/user.js
index 3b261dc6..43779bca 100644
--- a/core/user.js
+++ b/core/user.js
@@ -60,18 +60,6 @@ module.exports = class User {
         };
     }
 
-    static isSamePasswordSlowCompare(passBuf1, passBuf2) {
-        if(passBuf1.length !== passBuf2.length) {
-            return false;
-        }
-
-        let c = 0;
-        for(let i = 0; i < passBuf1.length; i++) {
-            c |= passBuf1[i] ^ passBuf2[i];
-        }
-        return 0 === c;
-    }
-
     isAuthenticated() {
         return true === this.authenticated;
     }
@@ -220,7 +208,7 @@ module.exports = class User {
                     const passDkBuf     = Buffer.from(passDk,   'hex');
                     const propsDkBuf    = Buffer.from(propsDk,  'hex');
 
-                    return callback(User.isSamePasswordSlowCompare(passDkBuf, propsDkBuf) ?
+                    return callback(crypto.timingSafeEqual(passDkBuf, propsDkBuf) ?
                         null :
                         Errors.AccessDenied('Invalid password')
                     );

From 57938e761eebaf21a5b136760c4e280acf10261c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 Feb 2019 23:55:09 -0700
Subject: [PATCH 0773/1013] + Implement SSH PubKey authentication * Security
 related items to config/security dir

---
 UPGRADE.md                    |  2 +-
 core/config.js                | 11 ++---
 core/servers/login/ssh.js     | 82 +++++++++++++++++++++++------------
 core/user.js                  | 71 +++++++++++++++++++++---------
 core/user_login.js            |  9 +++-
 core/user_property.js         | 81 +++++++++++++++++-----------------
 misc/config_template.in.hjson |  4 +-
 7 files changed, 164 insertions(+), 96 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 215089ad..ed5e687d 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -41,7 +41,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
 # 0.0.9-alpha to 0.0.10-alpha
-
+* Security related files such as private keys and certs are now looked for in `config/security` by default.
 
 # 0.0.8-alpha to 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. Follow your standard upgrade path to update to Node 10.x before using 0.0.9-alpha!
diff --git a/core/config.js b/core/config.js
index 5c1f9c42..d6cdadba 100644
--- a/core/config.js
+++ b/core/config.js
@@ -250,6 +250,7 @@ function getDefaultConfig() {
 
         paths : {
             config              : paths.join(__dirname, './../config/'),
+            security            : paths.join(__dirname, './../config/security'),    //  certs, keys, etc.
             mods                : paths.join(__dirname, './../mods/'),
             loginServers        : paths.join(__dirname, './servers/login/'),
             contentServers      : paths.join(__dirname, './servers/content/'),
@@ -259,7 +260,7 @@ function getDefaultConfig() {
 
             art                 : paths.join(__dirname, './../art/general/'),
             themes              : paths.join(__dirname, './../art/themes/'),
-            logs                : paths.join(__dirname, './../logs/'),  //  :TODO: set up based on system, e.g. /var/logs/enigmabbs or such
+            logs                : paths.join(__dirname, './../logs/'),
             db                  : paths.join(__dirname, './../db/'),
             modsDb              : paths.join(__dirname, './../db/mods/'),
             dropFiles           : paths.join(__dirname, './../drop/'), //  + "/node<x>/
@@ -284,10 +285,10 @@ function getDefaultConfig() {
                 //
                 //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
                 //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
-                //      -out ./config/ssh_private_key.pem -aes128
+                //      -out ./config/security/ssh_private_key.pem -aes128
                 //
-                //  (The above is a more modern equivelant of the following):
-                //  > openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+                //  (The above is a more modern equivalent of the following):
+                //  > openssl genrsa -aes128 -out ./config/security/ssh_private_key.pem 2048
                 //
                 //  2 - Set 'privateKeyPass' to the password you used in step #1
                 //
@@ -297,7 +298,7 @@ function getDefaultConfig() {
                 //  - https://blog.sleeplessbeastie.eu/2017/12/28/how-to-generate-private-key/
                 //  - https://gist.github.com/briansmith/2ee42439923d8e65a266994d0f70180b
                 //
-                privateKeyPem       : paths.join(__dirname, './../config/ssh_private_key.pem'),
+                privateKeyPem       : paths.join(__dirname, './../config/security/ssh_private_key.pem'),
                 firstMenu           : 'sshConnected',
                 firstMenuNewUser    : 'sshConnectedNewUser',
 
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index ee63ac78..3b0e852f 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -14,6 +14,8 @@ const {
     Errors,
     ErrorReasons
 }                       = require('../../enig_error.js');
+const User              = require('../../user.js');
+const UserProps         = require('../../user_property.js');
 
 //  deps
 const ssh2          = require('ssh2');
@@ -21,6 +23,7 @@ const fs            = require('graceful-fs');
 const util          = require('util');
 const _             = require('lodash');
 const assert        = require('assert');
+const crypto        = require('crypto');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'SSH',
@@ -42,8 +45,6 @@ function SSHClient(clientConn) {
 
     clientConn.on('authentication', function authAttempt(ctx) {
         const username  = ctx.username || '';
-        const password  = ctx.password || '';
-
         const config    = Config();
         self.isNewUser  = (config.users.newUserNames || []).indexOf(username) > -1;
 
@@ -106,37 +107,36 @@ function SSHClient(clientConn) {
             }
         };
 
-        //
-        //  If the system is open and |isNewUser| is true, the login
-        //  sequence is hijacked in order to start the application process.
-        //
-        if(false === config.general.closedSystem && self.isNewUser) {
-            return ctx.accept();
-        }
+        const authWithPasswordOrPubKey = (authType) => {
+            if('pubKey' !== authType || !self.user.isAuthenticated() || !ctx.signature) {
+                //  step 1: login/auth using PubKey
+                userLogin(self, ctx.username, ctx.password, { authType, ctx }, (err) => {
+                    if(err) {
+                        if(isSpecialHandleError(err)) {
+                            return handleSpecialError(err, username);
+                        }
 
-        if(username.length > 0 && password.length > 0) {
-            userLogin(self, ctx.username, ctx.password, function authResult(err) {
-                if(err) {
-                    if(isSpecialHandleError(err)) {
-                        return handleSpecialError(err, username);
+                        if(Errors.BadLogin().code === err.code) {
+                            return slowTerminateConnection();
+                        }
+
+                        return safeContextReject(SSHClient.ValidAuthMethods);
                     }
 
-                    if(Errors.BadLogin().code === err.code) {
-                        return slowTerminateConnection();
-                    }
-
-                    return safeContextReject(SSHClient.ValidAuthMethods);
+                    ctx.accept();
+                });
+            } else {
+                //  step 2: verify signature
+                const pubKeyActual = ssh2.utils.parseKey(self.user.getProperty(UserProps.LoginPubKey));
+                if(!pubKeyActual || !pubKeyActual.verify(ctx.blob, ctx.signature)) {
+                    return slowTerminateConnection();
                 }
-
-                ctx.accept();
-            });
-        } else {
-            if(-1 === SSHClient.ValidAuthMethods.indexOf(ctx.method)) {
-                return safeContextReject(SSHClient.ValidAuthMethods);
+                return ctx.accept();
             }
+        };
 
+        const authKeyboardInteractive = () => {
             if(0 === username.length) {
-                //  :TODO: can we display something here?
                 return safeContextReject();
             }
 
@@ -176,6 +176,30 @@ function SSHClient(clientConn) {
                     }
                 });
             });
+        };
+
+        //
+        //  If the system is open and |isNewUser| is true, the login
+        //  sequence is hijacked in order to start the application process.
+        //
+        if(false === config.general.closedSystem && self.isNewUser) {
+            return ctx.accept();
+        }
+
+        switch(ctx.method) {
+            case 'password' :
+                return authWithPasswordOrPubKey('password');
+                //return authWithPassword();
+
+            case 'publickey' :
+                return authWithPasswordOrPubKey('pubKey');
+                //return authWithPubKey();
+
+            case 'keyboard-interactive' :
+                return authKeyboardInteractive();
+
+            default :
+                return safeContextReject(SSHClient.ValidAuthMethods);
         }
     });
 
@@ -293,7 +317,11 @@ function SSHClient(clientConn) {
 
 util.inherits(SSHClient, baseClient.Client);
 
-SSHClient.ValidAuthMethods = [ 'password', 'keyboard-interactive' ];
+SSHClient.ValidAuthMethods = [
+    'password',
+    'keyboard-interactive',
+    'publickey',
+];
 
 exports.getModule = class SSHServerModule extends LoginServerModule {
     constructor() {
diff --git a/core/user.js b/core/user.js
index 43779bca..36a2f72f 100644
--- a/core/user.js
+++ b/core/user.js
@@ -21,6 +21,7 @@ const async             = require('async');
 const _                 = require('lodash');
 const moment            = require('moment');
 const sanatizeFilename  = require('sanitize-filename');
+const ssh2              = require('ssh2');
 
 exports.isRootUserId = function(id) { return 1 === id; };
 
@@ -47,7 +48,10 @@ module.exports = class User {
 
     static get StandardPropertyGroups() {
         return {
-            password    : [ UserProps.PassPbkdf2Salt, UserProps.PassPbkdf2Dk ],
+            auth : [
+                UserProps.PassPbkdf2Salt, UserProps.PassPbkdf2Dk,
+                UserProps.LoginPubKey, UserProps.LoginPubKeyFingerprintSHA256,
+            ],
         };
     }
 
@@ -174,10 +178,49 @@ module.exports = class User {
         });
     }
 
-    authenticate(username, password, cb) {
+    authenticate(username, password, options, cb) {
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
+
         const self = this;
         const tempAuthInfo = {};
 
+        const validatePassword = (props, callback) => {
+            User.generatePasswordDerivedKey(password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
+                if(err) {
+                    return callback(err);
+                }
+
+                //
+                //  Use constant time comparison here for security feel-goods
+                //
+                const passDkBuf     = Buffer.from(dk, 'hex');
+                const propsDkBuf    = Buffer.from(props[UserProps.PassPbkdf2Dk], 'hex');
+
+                return callback(crypto.timingSafeEqual(passDkBuf, propsDkBuf) ?
+                    null :
+                    Errors.AccessDenied('Invalid password')
+                );
+            });
+        };
+
+        const validatePubKey = (props, callback) => {
+            const pubKeyActual = ssh2.utils.parseKey(props[UserProps.LoginPubKey]);
+            if(!pubKeyActual) {
+                return callback(Errors.AccessDenied('Invalid public key'));
+            }
+
+            if(options.ctx.key.algo != pubKeyActual.type ||
+                !crypto.timingSafeEqual(options.ctx.key.data, pubKeyActual.getPublicSSH()))
+            {
+                return callback(Errors.AccessDenied('Invalid public key'));
+            }
+
+            return callback(null);
+        };
+
         async.waterfall(
             [
                 function fetchUserId(callback) {
@@ -191,27 +234,15 @@ module.exports = class User {
                 },
                 function getRequiredAuthProperties(callback) {
                     //  fetch properties required for authentication
-                    User.loadProperties(tempAuthInfo.userId, { names : User.StandardPropertyGroups.password }, (err, props) => {
+                    User.loadProperties( tempAuthInfo.userId, { names : User.StandardPropertyGroups.auth }, (err, props) => {
                         return callback(err, props);
                     });
                 },
-                function getDkWithSalt(props, callback) {
-                    //  get DK from stored salt and password provided
-                    User.generatePasswordDerivedKey(password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
-                        return callback(err, dk, props[UserProps.PassPbkdf2Dk]);
-                    });
-                },
-                function validateAuth(passDk, propsDk, callback) {
-                    //
-                    //  Use constant time comparison here for security feel-goods
-                    //
-                    const passDkBuf     = Buffer.from(passDk,   'hex');
-                    const propsDkBuf    = Buffer.from(propsDk,  'hex');
-
-                    return callback(crypto.timingSafeEqual(passDkBuf, propsDkBuf) ?
-                        null :
-                        Errors.AccessDenied('Invalid password')
-                    );
+                function validatePassOrPubKey(props, callback) {
+                    if('pubKey' === options.authType) {
+                        return validatePubKey(props, callback);
+                    }
+                    return validatePassword(props, callback);
                 },
                 function initProps(callback) {
                     User.loadProperties(tempAuthInfo.userId, (err, allProps) => {
diff --git a/core/user_login.js b/core/user_login.js
index 3e3f5f04..1f1180da 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -22,7 +22,12 @@ const _                 = require('lodash');
 
 exports.userLogin       = userLogin;
 
-function userLogin(client, username, password, cb) {
+function userLogin(client, username, password, options, cb) {
+    if(!cb && _.isFunction(options)) {
+        cb = options;
+        options = {};
+    }
+
     const config = Config();
 
     if(config.users.badUserNames.includes(username.toLowerCase())) {
@@ -34,7 +39,7 @@ function userLogin(client, username, password, cb) {
         }, 2000);
     }
 
-    client.user.authenticate(username, password, err => {
+    client.user.authenticate(username, password, options, err => {
         if(err) {
             client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
             const disconnect = config.users.failedLogin.disconnect;
diff --git a/core/user_property.js b/core/user_property.js
index 56e47e66..c3aabcd0 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -8,54 +8,57 @@
 //  can utilize their own properties as well!
 //
 module.exports = {
-    PassPbkdf2Salt              : 'pw_pbkdf2_salt',
-    PassPbkdf2Dk                : 'pw_pbkdf2_dk',
+    PassPbkdf2Salt                  : 'pw_pbkdf2_salt',
+    PassPbkdf2Dk                    : 'pw_pbkdf2_dk',
 
-    AccountStatus               : 'account_status',             //  See User.AccountStatus enum
+    AccountStatus                   : 'account_status',             //  See User.AccountStatus enum
 
-    RealName                    : 'real_name',
-    Sex                         : 'sex',
-    Birthdate                   : 'birthdate',
-    Location                    : 'location',
-    Affiliations                : 'affiliation',
-    EmailAddress                : 'email_address',
-    WebAddress                  : 'web_address',
-    TermHeight                  : 'term_height',
-    TermWidth                   : 'term_width',
-    ThemeId                     : 'theme_id',
-    AccountCreated              : 'account_created',
-    LastLoginTs                 : 'last_login_timestamp',
-    LoginCount                  : 'login_count',
-    UserComment                 : 'user_comment',               //  NYI
+    RealName                        : 'real_name',
+    Sex                             : 'sex',
+    Birthdate                       : 'birthdate',
+    Location                        : 'location',
+    Affiliations                    : 'affiliation',
+    EmailAddress                    : 'email_address',
+    WebAddress                      : 'web_address',
+    TermHeight                      : 'term_height',
+    TermWidth                       : 'term_width',
+    ThemeId                         : 'theme_id',
+    AccountCreated                  : 'account_created',
+    LastLoginTs                     : 'last_login_timestamp',
+    LoginCount                      : 'login_count',
+    UserComment                     : 'user_comment',               //  NYI
 
-    DownloadQueue               : 'dl_queue',                   // download_queue.js
+    DownloadQueue                   : 'dl_queue',                   // download_queue.js
 
-    FailedLoginAttempts         : 'failed_login_attempts',
-    AccountLockedTs             : 'account_locked_timestamp',
-    AccountLockedPrevStatus     : 'account_locked_prev_status', //  previous account status before lock out
+    FailedLoginAttempts             : 'failed_login_attempts',
+    AccountLockedTs                 : 'account_locked_timestamp',
+    AccountLockedPrevStatus         : 'account_locked_prev_status', //  previous account status before lock out
 
-    EmailPwResetToken           : 'email_password_reset_token',
-    EmailPwResetTokenTs         : 'email_password_reset_token_ts',
+    EmailPwResetToken               : 'email_password_reset_token',
+    EmailPwResetTokenTs             : 'email_password_reset_token_ts',
 
-    FileAreaTag                 : 'file_area_tag',
-    FileBaseFilters             : 'file_base_filters',
-    FileBaseFilterActiveUuid    : 'file_base_filter_active_uuid',
-    FileBaseLastViewedId        : 'user_file_base_last_viewed',
-    FileDlTotalCount            : 'dl_total_count',
-    FileUlTotalCount            : 'ul_total_count',
-    FileDlTotalBytes            : 'dl_total_bytes',
-    FileUlTotalBytes            : 'ul_total_bytes',
+    FileAreaTag                     : 'file_area_tag',
+    FileBaseFilters                 : 'file_base_filters',
+    FileBaseFilterActiveUuid        : 'file_base_filter_active_uuid',
+    FileBaseLastViewedId            : 'user_file_base_last_viewed',
+    FileDlTotalCount                : 'dl_total_count',
+    FileUlTotalCount                : 'ul_total_count',
+    FileDlTotalBytes                : 'dl_total_bytes',
+    FileUlTotalBytes                : 'ul_total_bytes',
 
-    MessageConfTag              : 'message_conf_tag',
-    MessageAreaTag              : 'message_area_tag',
-    MessagePostCount            : 'post_count',
+    MessageConfTag                  : 'message_conf_tag',
+    MessageAreaTag                  : 'message_area_tag',
+    MessagePostCount                : 'post_count',
 
-    DoorRunTotalCount           : 'door_run_total_count',
-    DoorRunTotalMinutes         : 'door_run_total_minutes',
+    DoorRunTotalCount               : 'door_run_total_count',
+    DoorRunTotalMinutes             : 'door_run_total_minutes',
 
-    AchievementTotalCount       : 'achievement_total_count',
-    AchievementTotalPoints      : 'achievement_total_points',
+    AchievementTotalCount           : 'achievement_total_count',
+    AchievementTotalPoints          : 'achievement_total_points',
 
-    MinutesOnlineTotalCount     : 'minutes_online_total_count',
+    MinutesOnlineTotalCount         : 'minutes_online_total_count',
+
+    LoginPubKey                     : 'login_public_key',             //  OpenSSL format
+    //LoginPubKeyFingerprintSHA256    : 'login_public_key_fp_sha256',   //  hint: ssh-kegen -lf id_rsa.pub
 };
 
diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 5e523e72..38482a6a 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -118,10 +118,10 @@
             //
             //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
             //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
-            //      -out ./config/ssh_private_key.pem -aes128
+            //      -out ./config/security/ssh_private_key.pem -aes128
             //
             //  (The above is a more modern equivelant of the following):
-            //  > openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+            //  > openssl genrsa -aes128 -out ./config/security/ssh_private_key.pem 2048
             //
             //  2 - Set 'privateKeyPass' to the password you used in step #1
             //

From 23779c3abee6eb91e68afbdc4b126bfe571b4222 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Feb 2019 22:51:12 -0700
Subject: [PATCH 0774/1013] Use authInfo obj vs weird params. auth factor 1:
 factor 2 for 2FA, etc.

---
 core/servers/content/nntp.js |  2 +-
 core/servers/login/ssh.js    |  7 +++----
 core/user.js                 | 23 +++++++++++++----------
 core/user_login.js           | 11 ++++++++++-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 4959dc64..9f7c5a13 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -141,7 +141,7 @@ class NNTPServer extends NNTPServerBase {
 
         return new Promise( resolve => {
             const user = new User();
-            user.authenticate(username, password, err => {
+            user.authenticateFactor1({ type : User.AuthFactor1Types.Password, username, password }, err => {
                 if(err) {
                     //  :TODO: Log IP address
                     this.log.debug( { username, reason : err.message }, 'Authentication failure');
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 3b0e852f..3e486bbd 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -23,7 +23,6 @@ const fs            = require('graceful-fs');
 const util          = require('util');
 const _             = require('lodash');
 const assert        = require('assert');
-const crypto        = require('crypto');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'SSH',
@@ -108,7 +107,7 @@ function SSHClient(clientConn) {
         };
 
         const authWithPasswordOrPubKey = (authType) => {
-            if('pubKey' !== authType || !self.user.isAuthenticated() || !ctx.signature) {
+            if(User.AuthFactor1Types.PubKey !== authType || !self.user.isAuthenticated() || !ctx.signature) {
                 //  step 1: login/auth using PubKey
                 userLogin(self, ctx.username, ctx.password, { authType, ctx }, (err) => {
                     if(err) {
@@ -188,11 +187,11 @@ function SSHClient(clientConn) {
 
         switch(ctx.method) {
             case 'password' :
-                return authWithPasswordOrPubKey('password');
+                return authWithPasswordOrPubKey(User.AuthFactor1Types.Password);
                 //return authWithPassword();
 
             case 'publickey' :
-                return authWithPasswordOrPubKey('pubKey');
+                return authWithPasswordOrPubKey(User.AuthFactor1Types.PubKey);
                 //return authWithPubKey();
 
             case 'keyboard-interactive' :
diff --git a/core/user.js b/core/user.js
index 36a2f72f..3b20aa76 100644
--- a/core/user.js
+++ b/core/user.js
@@ -178,17 +178,20 @@ module.exports = class User {
         });
     }
 
-    authenticate(username, password, options, cb) {
-        if(!cb && _.isFunction(options)) {
-            cb = options;
-            options = {};
-        }
+    static get AuthFactor1Types() {
+        return {
+            PubKey      : 'pubKey',
+            Password    : 'password',
+        };
+    }
 
+    authenticateFactor1(authInfo, cb) {
+        const username = authInfo.username;
         const self = this;
         const tempAuthInfo = {};
 
         const validatePassword = (props, callback) => {
-            User.generatePasswordDerivedKey(password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
+            User.generatePasswordDerivedKey(authInfo.password, props[UserProps.PassPbkdf2Salt], (err, dk) => {
                 if(err) {
                     return callback(err);
                 }
@@ -212,8 +215,8 @@ module.exports = class User {
                 return callback(Errors.AccessDenied('Invalid public key'));
             }
 
-            if(options.ctx.key.algo != pubKeyActual.type ||
-                !crypto.timingSafeEqual(options.ctx.key.data, pubKeyActual.getPublicSSH()))
+            if(authInfo.pubKey.key.algo != pubKeyActual.type ||
+                !crypto.timingSafeEqual(authInfo.pubKey.key.data, pubKeyActual.getPublicSSH()))
             {
                 return callback(Errors.AccessDenied('Invalid public key'));
             }
@@ -234,12 +237,12 @@ module.exports = class User {
                 },
                 function getRequiredAuthProperties(callback) {
                     //  fetch properties required for authentication
-                    User.loadProperties( tempAuthInfo.userId, { names : User.StandardPropertyGroups.auth }, (err, props) => {
+                    User.loadProperties(tempAuthInfo.userId, { names : User.StandardPropertyGroups.auth }, (err, props) => {
                         return callback(err, props);
                     });
                 },
                 function validatePassOrPubKey(props, callback) {
-                    if('pubKey' === options.authType) {
+                    if(User.AuthFactor1Types.PubKey === authInfo.type) {
                         return validatePubKey(props, callback);
                     }
                     return validatePassword(props, callback);
diff --git a/core/user_login.js b/core/user_login.js
index 1f1180da..98bdeefb 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -15,6 +15,7 @@ const {
 const UserProps         = require('./user_property.js');
 const SysProps          = require('./system_property.js');
 const SystemLogKeys     = require('./system_log.js');
+const User              = require('./user.js');
 
 //  deps
 const async             = require('async');
@@ -39,7 +40,15 @@ function userLogin(client, username, password, options, cb) {
         }, 2000);
     }
 
-    client.user.authenticate(username, password, options, err => {
+    const authInfo = {
+        username,
+        password,
+    };
+
+    authInfo.type   = options.authType || User.AuthFactor1Types.Password;
+    authInfo.pubKey = options.ctx;
+
+    client.user.authenticateFactor1(authInfo, err => {
         if(err) {
             client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
             const disconnect = config.users.failedLogin.disconnect;

From e37227f9d666b2ad4319f18da9c7020e2631e590 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 24 Feb 2019 09:48:48 -0700
Subject: [PATCH 0775/1013] Add missing TF and TB MCI codes to docs

---
 docs/art/mci.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/art/mci.md b/docs/art/mci.md
index 3e5e18c5..264d51b0 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -76,6 +76,8 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SO` | Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.) |
 | `SU` | Total uploads, system wide |
 | `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
+| `TF` | Total number of files on the system |
+| `TB` | Total amount of files on the system (formatted to appropriate bytes/megs/gigs/etc.) |
 | `TP` | Total messages posted/imported to the system *currently* |
 | `PT` | Total messages posted/imported to the system *today* |
 

From edd92ebf5c7d96a30e493de55f75a1dac3abdc99 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Mar 2019 19:37:16 -0700
Subject: [PATCH 0776/1013] Updates on FTN/BSO Paths

---
 docs/messageareas/bso-import-export.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index aab72429..ff0f86c9 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -2,6 +2,7 @@
 layout: page
 title: BSO Import / Export
 ---
+## BSO Import / Export
 The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
 
 :information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external [mailer](http://www.filegate.net/bbsmailers.htm) such as [Binkd](https://github.com/pgul/binkd) is required for this!
@@ -14,9 +15,21 @@ Let's look at some of the basic configuration:
 | `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
 | `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
 | `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
-| `paths` | :-1: | An optional configuration block that can set a `retain` path and/or a `reject` path. These will be used for archiving processed packets. You may additionally override the default `outbound`, `inbound`, and `secInbound` (secure inbound) *base* paths for packet processing. |
+| `paths` | :-1: | An optional configuration block that can set a additional paths or override defaults. See "Paths" below. |
 | `packetTargetByteSize`  | :-1: | Overrides the system *target* packet (.pkt) size of 512000 bytes (512k) |
-| `bundleTargetByteSize`  | :-1: | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M) | 
+| `bundleTargetByteSize`  | :-1: | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M) |
+
+### Paths
+Paths for packet files work out of the box and are relative to your install directory. If you want to configure `reject` or `retain` to keep rejected/imported packet files respectively, set those values. You may override defaults as well.
+
+| Key | Description |
+|-----|-------------|
+| `outbound` | *Base* path to write outbound (exported) packet files and bundles. |
+| `inbound` | *Base* path to write inbound (ie: those written by an external mailer) packet files an bundles. |
+| `secInbound` | *Base* path to write **secure** inbound packet files and bundles. |
+| `reject` | Path in which to write rejected packet files. |
+| `retain` | Path in which to write imported packet files. Useful for debugging or if you wish to archive the raw .pkt files. |
+
 
 ## Scheduling
 Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.

From ca2ba65b781ca8229c18521bd68ea6004ee488d6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 Mar 2019 19:41:43 -0700
Subject: [PATCH 0777/1013] Add default notes

---
 docs/messageareas/bso-import-export.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index ff0f86c9..6c69d41a 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -22,13 +22,13 @@ Let's look at some of the basic configuration:
 ### Paths
 Paths for packet files work out of the box and are relative to your install directory. If you want to configure `reject` or `retain` to keep rejected/imported packet files respectively, set those values. You may override defaults as well.
 
-| Key | Description |
-|-----|-------------|
-| `outbound` | *Base* path to write outbound (exported) packet files and bundles. |
-| `inbound` | *Base* path to write inbound (ie: those written by an external mailer) packet files an bundles. |
-| `secInbound` | *Base* path to write **secure** inbound packet files and bundles. |
-| `reject` | Path in which to write rejected packet files. |
-| `retain` | Path in which to write imported packet files. Useful for debugging or if you wish to archive the raw .pkt files. |
+| Key | Description | Default |
+|-----|-------------|---------|
+| `outbound` | *Base* path to write outbound (exported) packet files and bundles. | `enigma-bbs/mail/ftn_out/` |
+| `inbound` | *Base* path to write inbound (ie: those written by an external mailer) packet files an bundles. | `enigma-bbs/mail/ftn_in/` |
+| `secInbound` | *Base* path to write **secure** inbound packet files and bundles. | `enigma-bbs/mail/ftn_secin/` |
+| `reject` | Path in which to write rejected packet files. | No default |
+| `retain` | Path in which to write imported packet files. Useful for debugging or if you wish to archive the raw .pkt files. | No default |
 
 
 ## Scheduling

From c1cd2f7ea7fb0c2f8847fe5c930d9aee05a4de43 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Mar 2019 10:01:12 -0700
Subject: [PATCH 0778/1013] Minor improvements

---
 docs/_includes/nav.md                  |  1 -
 docs/configuration/archivers.md        | 10 +++++-----
 docs/messageareas/bso-import-export.md |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index e67f1163..50cd3e7f 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -25,7 +25,6 @@
     - [Colour Codes]({{ site.baseurl }}{% link configuration/colour-codes.md %})
     - [Access Condition System (ACS)]({{ site.baseurl }}{% link configuration/acs.md %})
     - [Event Scheduler]({{ site.baseurl }}{% link configuration/event-scheduler.md %})
-    - Scheduled jobs
 
   - File Base
     - [About]({{ site.baseurl }}{% link filebase/index.md %})
diff --git a/docs/configuration/archivers.md b/docs/configuration/archivers.md
index 3d3f952a..fb9cb7c1 100644
--- a/docs/configuration/archivers.md
+++ b/docs/configuration/archivers.md
@@ -13,27 +13,27 @@ The following archivers are pre-configured in ENiGMA½ as of this writing. Remem
 #### ZZip
 * Formats: .7z, .bzip2, .zip, .gzip/.gz, and more
 * Key: `7Zip`
-* Homepage/package: [7-zip.org](http://www.7-zip.org/). Generally obtained from a `p7zip` package in *nix environments. See http://p7zip.sourceforge.net/ for details.
+* Homepage/package: [7-zip.org](http://www.7-zip.org/). Generally obtained from a `p7zip` package in UNIX-like environments. See http://p7zip.sourceforge.net/ for details.
 
 #### Lha
 * Formats: <a href="https://en.wikipedia.org/wiki/LHA_(file_format)">LHA</a> files such as .lzh.
 * Key: `Lha`
-* Homepage/package: `lhasa` on most *nix environments. See also https://fragglet.github.io/lhasa/ and http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
+* Homepage/package: `lhasa` on most UNIX-like environments. See also https://fragglet.github.io/lhasa/ and http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
 
 #### Lzx
 * Formats: <a href="https://en.wikipedia.org/wiki/LZX_(algorithm)#Amiga_LZX">Amiga LZX</a>
 * Key: `Lzx`
-* Homepage/package: `unlzx` under most *nix platforms ([Debian/Ubuntu](https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127), [RedHat](https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html), [Source](http://xavprods.free.fr/lzx/))
+* Homepage/package: `unlzx` under most UNIX-like platforms ([Debian/Ubuntu](https://launchpad.net/~rzr/+archive/ubuntu/ppa/+build/2486127), [RedHat](https://fedora.pkgs.org/28/rpm-sphere/unlzx-1.1-4.1.x86_64.rpm.html), [Source](http://xavprods.free.fr/lzx/))
 
 #### Arj
 * Formats: .arj
 * Key: `Arj`
-* Homepage/package: `arj` on most *nix environments.
+* Homepage/package: `arj` on most UNIX-like environments.
 
 #### Rar
 * Formats: .Rar
 * Key: `Rar`
-* Homepage/package: `unrar` on most *nix environments. See also https://blog.hostonnet.com/unrar
+* Homepage/package: `unrar` on most UNIX-like environments. See also https://blog.hostonnet.com/unrar
 
 ### Archiver Configuration
 Archiver entries in `config.hjson` are mostly self explanatory with the exception of `list` commands that require some additional information. The `args` member for an entry is an array of arguments to pass to `cmd`. Some variables are available to `args` that will be expanded by the system:
diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index 6c69d41a..440b85ac 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -65,7 +65,7 @@ A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001)
 | `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability. |
 | `packetPassword` | :-1:     | Optional password for the packet |
 | `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`. |
-| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See docs on archiver configuration for more information. |
+| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See [Archivers](/docs/configuration/archivers.md) for more information. |
 
 **Example**:
 ```hjson

From a57f823da5a9f0fd6d6672d5812b6bd03b26bbac Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Mar 2019 10:04:13 -0700
Subject: [PATCH 0779/1013] Fix path

---
 docs/messageareas/bso-import-export.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index 440b85ac..fac7bc6d 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -65,7 +65,7 @@ A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001)
 | `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability. |
 | `packetPassword` | :-1:     | Optional password for the packet |
 | `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`. |
-| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See [Archivers](/docs/configuration/archivers.md) for more information. |
+| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See [Archivers](docs/configuration/archivers.md) for more information. |
 
 **Example**:
 ```hjson

From 1b82fc86e7d74380a2db3f0966580e2bae0662e1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Mar 2019 10:14:07 -0700
Subject: [PATCH 0780/1013] Updates RE: HJSON

---
 docs/_includes/nav.md               |  3 +--
 docs/configuration/editing-hjson.md | 20 --------------------
 docs/configuration/hjson.md         |  8 ++++----
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 docs/configuration/editing-hjson.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 50cd3e7f..8a2c29b7 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -13,9 +13,8 @@
   - Configuration
     - [Creating Config Files]({{ site.baseurl }}{% link configuration/creating-config.md %})
     - [SysOp Setup]({{ site.baseurl }}{% link configuration/sysop-setup.md %})
-    - [Editing HJSON]({{ site.baseurl }}{% link configuration/editing-hjson.md %})
     - [System Configuration]({{ site.baseurl }}{% link configuration/config-hjson.md %})
-    - [HJSON General]({{ site.baseurl }}{% link configuration/hjson.md %})
+    - [HJSON Config Files]({{ site.baseurl }}{% link configuration/hjson.md %})
     - [Menus]({{ site.baseurl }}{% link configuration/menu-hjson.md %})
     - [Prompts]({{ site.baseurl }}{% link configuration/prompt-hjson.md %})
     - [Directory Structure]({{ site.baseurl }}{% link configuration/directory-structure.md %})
diff --git a/docs/configuration/editing-hjson.md b/docs/configuration/editing-hjson.md
deleted file mode 100644
index 0a752178..00000000
--- a/docs/configuration/editing-hjson.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: page
-title: Editing Hjson
----
-Hjson is a syntax extension to JSON. It's NOT a proposal to replace JSON or to incorporate it into the JSON spec itself. 
-It's intended to be used like a user interface for humans, to read and edit before passing the JSON data to the machine.
-
-You can find more info at the [Hjson.org website](http://hjson.org/).
-
-## Editor Plugins
-### Visual Studio Code
-
-[Visual Studio Code](https://code.visualstudio.com/) has a nice Hjson extension that can be installed from
-within the IDE. It provides syntax highlighting to make it clear when you've made a syntax mistake within
-a config file. 
-
-### Notepad++
-
-[Notepad++](https://notepad-plus-plus.org) has an Hjson plugin that provides syntax highlighting and other
-usual text editor features. The plugin can be found [here](https://github.com/laktak/npp-hjson).
\ No newline at end of file
diff --git a/docs/configuration/hjson.md b/docs/configuration/hjson.md
index cc8fa26d..74b6eb01 100644
--- a/docs/configuration/hjson.md
+++ b/docs/configuration/hjson.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: HJSON General Information
+title: HJSON Config Files
 ---
 ## JSON for Humans!
 HJSON is the configuration file format used by ENiGMA½ for [System Configuration](config-hjson.md), [Menus](menu-hjson.md), [Prompts](prompt-hjson.md), etc. [HJSON](https://hjson.org/) is is [JSON](https://json.org/) for humans!
@@ -32,9 +32,9 @@ Note that `someSection` is the configuration *section* (or *block*) and `foo: ba
 HJSON is a text file format, and ENiGMA½ configuration files **should always be saved as UTF-8**.
 
 It is **highly** recommended to use a text editor that has HJSON support. A few (but not all!) examples include:
-* Sublime Text 3 via the `sublime-hjson` package.
-* Visual Studio code via the `vscode-hjson` plugin.
-* Notepad++ via the `npp-hjson` plugin.
+* [Sublime Text](https://www.sublimetext.com/) via the `sublime-hjson` package.
+* [Visual Studio Code](https://code.visualstudio.com/) via the `vscode-hjson` plugin.
+* [Notepad++](https://notepad-plus-plus.org) via the `npp-hjson` plugin.
 
 See https://hjson.org/users.html for more more editors & plugins.
 

From 3ec6cfd83a92d12841b58b13fdd31166e62c3ae5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Mar 2019 10:17:15 -0700
Subject: [PATCH 0781/1013] Fix typo

---
 docs/admin/updating.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index 310b6313..235737b7 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -15,6 +15,6 @@ In general the steps are as follows:
 
 Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
 
-Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGARDE](/UPGRADE.md)!
+Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
 
 

From 64de10cbf7481989c8408b71d0fa614e113255f3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 5 Apr 2019 21:53:30 -0600
Subject: [PATCH 0782/1013] Fix crash if client disconnects/is logged out while
 door is running

---
 core/abracadabra.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 34374049..36a58544 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -170,6 +170,12 @@ exports.getModule = class AbracadabraModule extends MenuModule {
         this.doorInstance.run(exeInfo, () => {
             trackDoorRunEnd(doorTracking);
 
+            //  client may have disconnected while process was active -
+            //  we're done here if so.
+            if(!this.client.term.output) {
+                return;
+            }
+
             //
             //  Try to clean up various settings such as scroll regions that may
             //  have been set within the door

From 19e70d1c781129a27b05c4472516e96e286e849d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 8 Apr 2019 20:14:00 -0600
Subject: [PATCH 0783/1013] Fix log message & hopefully handle client socket
 errors better

---
 core/login_server_module.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/login_server_module.js b/core/login_server_module.js
index 041f317c..a08abfe9 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -40,6 +40,10 @@ module.exports = class LoginServerModule extends ServerModule {
     }
 
     handleNewClient(client, clientSock, modInfo) {
+        clientSock.on('error', err => {
+            logger.log.warn({ modInfo, error : err.message }, 'Client socket error');
+        });
+
         //
         //  Start tracking the client. A session ID aka client ID
         //  will be established in addNewClient() below.
@@ -68,7 +72,7 @@ module.exports = class LoginServerModule extends ServerModule {
         });
 
         client.on('error', err => {
-            logger.log.info({ clientId : client.session.id }, 'Connection error: %s' % err.message);
+            logger.log.info({ clientId : client.session.id, error : err.message }, 'Connection error');
         });
 
         client.on('close', err => {

From 0ed507cd7bfd67b72f0b5c53753633abece240ba Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:07:19 -0600
Subject: [PATCH 0784/1013] Initial real 2FA/OTP work

---
 .eslintrc.json                   |  4 ++-
 WHATSNEW.md                      |  2 ++
 core/acs_parser.js               | 17 ++++++++++
 core/config.js                   |  4 +++
 core/servers/login/ssh.js        |  6 ++--
 core/system_menu_method.js       | 57 +++++++++++++++++++++-----------
 core/user.js                     | 38 +++++++++++++++------
 core/user_property.js            |  7 ++--
 docs/configuration/acs.md        |  4 +--
 docs/configuration/menu-hjson.md |  1 +
 misc/acs_parser.pegjs            | 17 ++++++++++
 package.json                     |  3 +-
 yarn.lock                        | 12 +++++++
 13 files changed, 133 insertions(+), 39 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 612da123..53bd1287 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,7 +3,9 @@
         "es6": true,
         "node": true
     },
-    "extends": "eslint:recommended",
+    "extends": [
+        "eslint:recommended"
+    ],
     "rules": {
         "indent": [
             "error",
diff --git a/WHATSNEW.md b/WHATSNEW.md
index 7137038a..d4a5bc39 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 ## 0.0.10-alpha
 + `oputil.js user rename USERNAME NEWNAME`
 + `my_messages.js` module (defaulted to "m" at the message menu) to list public messages addressed to the currently logged in user. Takes into account their username and `real_name` property.
++ SSH Public Key Authentication has been added. The system uses a OpenSSH style public key set on the `ssh_public_key` user property.
++ 
 
 
 ## 0.0.9-alpha
diff --git a/core/acs_parser.js b/core/acs_parser.js
index d4084b95..3763c8e7 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -846,6 +846,7 @@ function peg$parse(input, options) {
 
   	const UserProps	= require('./user_property.js');
   	const Log       = require('./logger.js').log;
+  	const User		= require('./user.js');
 
   	const _			= require('lodash');
   	const moment	= require('moment');
@@ -982,6 +983,22 @@ function peg$parse(input, options) {
   				SC 	: function isSecureConnection() {
   					return _.get(client, 'session.isSecure', false);
   				},
+  				AF	: function currentAuthFactor() {
+  					if(!user) {
+  						return false;
+  					}
+  					return !isNaN(value) && user.authFactor >= value;
+  				},
+  				AR	: function authFactorRequired() {
+  					if(!user) {
+  						return false;
+  					}
+  					switch(value) {
+  						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
+  						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+  						default : return false;
+  					}
+  				},
   				ML	: function minutesLeft() {
   					//	:TODO: implement me!
   					return false;
diff --git a/core/config.js b/core/config.js
index d6cdadba..14f258d8 100644
--- a/core/config.js
+++ b/core/config.js
@@ -224,6 +224,10 @@ function getDefaultConfig() {
                 autoUnlockMinutes   : 60 * 6,       //  0=disabled; Auto unlock after N minutes.
             },
             unlockAtEmailPwReset    : true,         //  if true, password reset via email will unlock locked accounts
+
+            twoFactorAuth : {
+                method : 'googleAuth',
+            }
         },
 
         theme : {
diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index 3e486bbd..6156fa3a 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -107,7 +107,7 @@ function SSHClient(clientConn) {
         };
 
         const authWithPasswordOrPubKey = (authType) => {
-            if(User.AuthFactor1Types.PubKey !== authType || !self.user.isAuthenticated() || !ctx.signature) {
+            if(User.AuthFactor1Types.SSHPubKey !== authType || !self.user.isAuthenticated() || !ctx.signature) {
                 //  step 1: login/auth using PubKey
                 userLogin(self, ctx.username, ctx.password, { authType, ctx }, (err) => {
                     if(err) {
@@ -126,7 +126,7 @@ function SSHClient(clientConn) {
                 });
             } else {
                 //  step 2: verify signature
-                const pubKeyActual = ssh2.utils.parseKey(self.user.getProperty(UserProps.LoginPubKey));
+                const pubKeyActual = ssh2.utils.parseKey(self.user.getProperty(UserProps.AuthPubKey));
                 if(!pubKeyActual || !pubKeyActual.verify(ctx.blob, ctx.signature)) {
                     return slowTerminateConnection();
                 }
@@ -191,7 +191,7 @@ function SSHClient(clientConn) {
                 //return authWithPassword();
 
             case 'publickey' :
-                return authWithPasswordOrPubKey(User.AuthFactor1Types.PubKey);
+                return authWithPasswordOrPubKey(User.AuthFactor1Types.SSHPubKey);
                 //return authWithPubKey();
 
             case 'keyboard-interactive' :
diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index ea2cbc09..b83bea80 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -8,12 +8,14 @@ const { userLogin }     = require('./user_login.js');
 const messageArea       = require('./message_area.js');
 const { ErrorReasons }  = require('./enig_error.js');
 const UserProps         = require('./user_property.js');
+const { user2FA_OTP }   = require('./user_2fa_otp.js');
 
 //  deps
 const _                 = require('lodash');
 const iconv             = require('iconv-lite');
 
 exports.login                   = login;
+exports.login2FA_OTP            = login2FA_OTP;
 exports.logoff                  = logoff;
 exports.prevMenu                = prevMenu;
 exports.nextMenu                = nextMenu;
@@ -23,32 +25,47 @@ exports.prevArea                = prevArea;
 exports.nextArea                = nextArea;
 exports.sendForgotPasswordEmail = sendForgotPasswordEmail;
 
+const handleAuthFailures = (callingMenu, err, cb) => {
+    //  already logged in with this user?
+    if(ErrorReasons.AlreadyLoggedIn === err.reasonCode &&
+        _.has(callingMenu, 'menuConfig.config.tooNodeMenu'))
+    {
+        return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
+    }
+
+    //  banned username results in disconnect
+    if(ErrorReasons.NotAllowed === err.reasonCode) {
+        return logoff(callingMenu, {}, {}, cb);
+    }
+
+    const ReasonsMenus = [
+        ErrorReasons.TooMany, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked
+    ];
+    if(ReasonsMenus.includes(err.reasonCode)) {
+        const menu = _.get(callingMenu, [ 'menuConfig', 'config', err.reasonCode.toLowerCase() ]);
+        return menu ? callingMenu.gotoMenu(menu, cb) : logoff(callingMenu, {}, {}, cb);
+    }
+
+    //  Other error
+    return callingMenu.prevMenu(cb);
+};
+
 function login(callingMenu, formData, extraArgs, cb) {
 
     userLogin(callingMenu.client, formData.value.username, formData.value.password, err => {
         if(err) {
-            //  already logged in with this user?
-            if(ErrorReasons.AlreadyLoggedIn === err.reasonCode &&
-                _.has(callingMenu, 'menuConfig.config.tooNodeMenu'))
-            {
-                return callingMenu.gotoMenu(callingMenu.menuConfig.config.tooNodeMenu, cb);
-            }
+            return handleAuthFailures(callingMenu, err, cb);
+        }
 
-            //  banned username results in disconnect
-            if(ErrorReasons.NotAllowed === err.reasonCode) {
-                return logoff(callingMenu, {}, {}, cb);
-            }
+        //  success!
+        return callingMenu.nextMenu(cb);
+    });
+}
 
-            const ReasonsMenus = [
-                ErrorReasons.TooMany, ErrorReasons.Disabled, ErrorReasons.Inactive, ErrorReasons.Locked
-            ];
-            if(ReasonsMenus.includes(err.reasonCode)) {
-                const menu = _.get(callingMenu, [ 'menuConfig', 'config', err.reasonCode.toLowerCase() ]);
-                return menu ? callingMenu.gotoMenu(menu, cb) : logoff(callingMenu, {}, {}, cb);
-            }
-
-            //  Other error
-            return callingMenu.prevMenu(cb);
+function login2FA_OTP(callingMenu, formData, extraArgs, cb) {
+    user2FA_OTP(callingMenu.client, formData.value.token, err => {
+        if(err) {
+            return handleAuthFailures(callingMenu, err, cb);
         }
 
         //  success!
diff --git a/core/user.js b/core/user.js
index 3b20aa76..2d4883d7 100644
--- a/core/user.js
+++ b/core/user.js
@@ -27,10 +27,11 @@ exports.isRootUserId = function(id) { return 1 === id; };
 
 module.exports = class User {
     constructor() {
-        this.userId     = 0;
-        this.username   = '';
-        this.properties = {};   //  name:value
-        this.groups     = [];   //  group membership(s)
+        this.userId         = 0;
+        this.username       = '';
+        this.properties     = {};   //  name:value
+        this.groups         = [];   //  group membership(s)
+        this.authFactor     = User.AuthFactors.None;
     }
 
     //  static property accessors
@@ -38,6 +39,14 @@ module.exports = class User {
         return 1;
     }
 
+    static get AuthFactors() {
+        return {
+            None    : 0,    //  Not yet authenticated in any way
+            Factor1 : 1,    //  username + password/pubkey/etc. checked out
+            Factor2 : 2,    //  validated with 2FA of some sort such as OTP
+        };
+    }
+
     static get PBKDF2() {
         return {
             iterations  : 1000,
@@ -50,7 +59,7 @@ module.exports = class User {
         return {
             auth : [
                 UserProps.PassPbkdf2Salt, UserProps.PassPbkdf2Dk,
-                UserProps.LoginPubKey, UserProps.LoginPubKeyFingerprintSHA256,
+                UserProps.AuthPubKey,
             ],
         };
     }
@@ -180,8 +189,9 @@ module.exports = class User {
 
     static get AuthFactor1Types() {
         return {
-            PubKey      : 'pubKey',
+            SSHPubKey   : 'sshPubKey',
             Password    : 'password',
+            TLSClient   : 'tlsClientAuth',
         };
     }
 
@@ -210,7 +220,7 @@ module.exports = class User {
         };
 
         const validatePubKey = (props, callback) => {
-            const pubKeyActual = ssh2.utils.parseKey(props[UserProps.LoginPubKey]);
+            const pubKeyActual = ssh2.utils.parseKey(props[UserProps.AuthPubKey]);
             if(!pubKeyActual) {
                 return callback(Errors.AccessDenied('Invalid public key'));
             }
@@ -242,7 +252,7 @@ module.exports = class User {
                     });
                 },
                 function validatePassOrPubKey(props, callback) {
-                    if(User.AuthFactor1Types.PubKey === authInfo.type) {
+                    if(User.AuthFactor1Types.SSHPubKey === authInfo.type) {
                         return validatePubKey(props, callback);
                     }
                     return validatePassword(props, callback);
@@ -323,7 +333,12 @@ module.exports = class User {
                     self.username       = tempAuthInfo.username;
                     self.properties     = tempAuthInfo.properties;
                     self.groups         = tempAuthInfo.groups;
-                    self.authenticated  = true;
+                    self.authFactor      = User.AuthFactors.Factor1;
+
+                    //
+                    //  If 2FA/OTP is required, this user is not quite authenticated yet.
+                    //
+                    self.authenticated = !(self.getProperty(UserProps.AuthFactor2OTP) ? true : false);
 
                     self.removeProperty(UserProps.FailedLoginAttempts);
 
@@ -604,7 +619,10 @@ module.exports = class User {
                 user.username       = userName;
                 user.properties     = properties;
                 user.groups         = groups;
-                user.authenticated  = false;    //  this is NOT an authenticated user!
+
+                //  explicitly NOT an authenticated user!
+                user.authenticated  = false;
+                user.authFactor     = User.AuthFactors.None;
 
                 return cb(err, user);
             }
diff --git a/core/user_property.js b/core/user_property.js
index c3aabcd0..f3f3b652 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -58,7 +58,10 @@ module.exports = {
 
     MinutesOnlineTotalCount         : 'minutes_online_total_count',
 
-    LoginPubKey                     : 'login_public_key',             //  OpenSSL format
-    //LoginPubKeyFingerprintSHA256    : 'login_public_key_fp_sha256',   //  hint: ssh-kegen -lf id_rsa.pub
+    SSHPubKey                       : 'ssh_public_key',             //  OpenSSH format (ssh-keygen, etc.)
+    AuthFactor1Types                : 'auth_factor1_types',         //  List of User.AuthFactor1Types value(s)
+    AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA
+    AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
+    AuthFactor2OTPScratchCodes      : 'auth_factor2_otp_scratch',   //  JSON array style codes ["code1", "code2", ...]
 };
 
diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index d0a45d06..64d67648 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -37,8 +37,8 @@ The following are ACS codes available as of this writing:
 | MM<i>minutes</i> | It is currently >= _minutes_ past midnight (system time) |
 | AC<i>achievementCount</i> | User has >= _achievementCount_ achievements |
 | AP<i>achievementPoints</i> | User has >= _achievementPoints_ achievement points |
-
-\* Many more ACS codes are planned for the near future.
+| AF<i>authFactor</i> | User's current *Authentication Factor* is >= _authFactor_. Authentication factor 1 refers to username + password (or PubKey) while factor 2 refers to 2FA such as One-Time-Password authentication. |
+| AR<i>authFactorReq</i> | Current users **requires** an Authentication Factor >= _authFactorReq_ |
 
 ## ACS Strings
 ACS strings are one or more ACS codes in addition to some basic language semantics. 
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index a59e5b24..9294c08c 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -86,6 +86,7 @@ Many built in global/system methods exist. Below are a few. See [system_menu_met
 | Method | Description |
 |--------|-------------|
 | `login` | Performs a standard login. |
+| `login2FA_OTP` | Performs a 2-Factor Authentication (2FA) One-Time Password (OTP) check, if configured for the user. |
 | `logoff` | Performs a standard system logoff. |
 | `prevMenu` | Goes to the previous menu. |
 | `nextMenu` | Goes to the next menu (as set by `next`) |
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index 8a39deea..060344a8 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -2,6 +2,7 @@
 {
 	const UserProps	= require('./user_property.js');
 	const Log       = require('./logger.js').log;
+	const User		= require('./user.js');
 
 	const _			= require('lodash');
 	const moment	= require('moment');
@@ -138,6 +139,22 @@
 				SC 	: function isSecureConnection() {
 					return _.get(client, 'session.isSecure', false);
 				},
+				AF	: function currentAuthFactor() {
+					if(!user) {
+						return false;
+					}
+					return !isNaN(value) && user.authFactor >= value;
+				},
+				AR	: function authFactorRequired() {
+					if(!user) {
+						return false;
+					}
+					switch(value) {
+						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
+						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+						default : return false;
+					}
+				},
 				ML	: function minutesLeft() {
 					//	:TODO: implement me!
 					return false;
diff --git a/package.json b/package.json
index 299074d6..4a700f1d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,8 @@
     "uuid-parse": "^1.0.0",
     "ws": "^6.1.3",
     "xxhash": "^0.2.4",
-    "yazl": "^2.5.1"
+    "yazl": "^2.5.1",
+    "otplib": "^10.0.1"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 6a922b8f..09bf3e98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1478,6 +1478,13 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+otplib@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/otplib/-/otplib-10.0.1.tgz#d37fcd13203298c0b94937d55c5a3527ed877875"
+  integrity sha512-FtbKelYtio2af5LDBWz3bWS6T03taHJAIv3evMrXuvoM50z5jbWoEMabPCk0A0JqiLGBzAIDJWfR9gSsvRYZHA==
+  dependencies:
+    thirty-two "1.0.2"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -2026,6 +2033,11 @@ temptmp@^1.1.0:
   dependencies:
     del "^3.0.0"
 
+thirty-two@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a"
+  integrity sha1-TKL//AKlEpDSdEueP1V2k8prYno=
+
 through2@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"

From d54338c46e8df77b7d8b0c996849b8eba73dc07b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:24:52 -0600
Subject: [PATCH 0785/1013] Listen 'address' for Gopher

---
 core/servers/content/gopher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index ee889b8c..4e51c889 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -113,7 +113,7 @@ exports.getModule = class GopherModule extends ServerModule {
             return cb(Errors.Invalid(`Invalid port: ${config.contentServers.gopher.port}`));
         }
 
-        return this.server.listen(port, cb);
+        return this.server.listen(port, config.contentServers.gopher.address, cb);
     }
 
     get enabled() {

From 3460b98bf5bff2818d1a13fbef924eae1dc40599 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:25:03 -0600
Subject: [PATCH 0786/1013] Listen 'address' for Web

---
 core/servers/content/web.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/content/web.js b/core/servers/content/web.js
index 1a09aace..04b9ccdd 100644
--- a/core/servers/content/web.js
+++ b/core/servers/content/web.js
@@ -138,7 +138,7 @@ exports.getModule = class WebServerModule extends ServerModule {
                     return nextService(Errors.Invalid(`Invalid port: ${config.contentServers.web[service].port}`));
                 }
 
-                this[name].listen(port, err => {
+                this[name].listen(port, config.contentServers.web[service].address, err => {
                     return nextService(err);
                 });
             } else {

From 8114a1e3f21f6b8e721ec272d479d664a79ebff1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:25:14 -0600
Subject: [PATCH 0787/1013] Listen 'address' for Telnet

---
 core/servers/login/telnet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index fb6ca745..1b892e71 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -875,7 +875,7 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
             return cb(Errors.Invalid(`Invalid port: ${config.loginServers.telnet.port}`));
         }
 
-        this.server.listen(port, err => {
+        this.server.listen(port, config.loginServers.telnet.address, err => {
             if(!err) {
                 Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
             }

From 37ea1e3a3032087cefdeffcad1068370326dd0d2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:25:27 -0600
Subject: [PATCH 0788/1013] Listen 'address' for SSH

---
 core/servers/login/ssh.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js
index ee63ac78..acdabf26 100644
--- a/core/servers/login/ssh.js
+++ b/core/servers/login/ssh.js
@@ -353,7 +353,7 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
             return cb(Errors.Invalid(`Invalid port: ${config.loginServers.ssh.port}`));
         }
 
-        this.server.listen(port, err => {
+        this.server.listen(port, config.loginServers.ssh.address, err => {
             if(!err) {
                 Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
             }

From 50426d0e606c5bf455ecf456d2bb52bc864af876 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 9 Apr 2019 20:25:37 -0600
Subject: [PATCH 0789/1013] Listen 'address' for WebSockets

---
 core/servers/login/websocket.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 35bc0757..6a6b01dc 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -200,7 +200,8 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
             }
 
             const serverName    = `${ModuleInfo.name} (${serverType})`;
-            const confPort      = _.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] );
+            const conf          = _.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws' ] );
+            const confPort      = conf.port;
             const port          = parseInt(confPort);
 
             if(isNaN(port)) {
@@ -208,7 +209,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
                 return nextServerType(Errors.Invalid(`Invalid port: ${confPort}`));
             }
 
-            server.httpServer.listen(port, err => {
+            server.httpServer.listen(port, conf.address, err => {
                 if(err) {
                     return nextServerType(err);
                 }

From 509831cc0c36d6836861ff890b65bfceef543c9b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 23 Apr 2019 18:16:55 -0600
Subject: [PATCH 0790/1013] Better handling of active door instances

---
 core/abracadabra.js | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 36a58544..9ac4dec7 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -84,6 +84,22 @@ exports.getModule = class AbracadabraModule extends MenuModule {
         * Font support ala all other menus... or does this just work?
     */
 
+    incrementActiveDoorNodeInstances() {
+        if(activeDoorNodeInstances[this.config.name]) {
+            activeDoorNodeInstances[this.config.name] += 1;
+        } else {
+            activeDoorNodeInstances[this.config.name] = 1;
+        }
+        this.activeDoorInstancesIncremented = true;
+    }
+
+    decrementActiveDoorNodeInstances() {
+        if(true === this.activeDoorInstancesIncremented) {
+            activeDoorNodeInstances[this.config.name] -= 1;
+            this.activeDoorInstancesIncremented = false;
+        }
+    }
+
     initSequence() {
         const self = this;
 
@@ -116,14 +132,8 @@ exports.getModule = class AbracadabraModule extends MenuModule {
                             });
                         }
                     } else {
-                        //  :TODO: JS elegant way to do this?
-                        if(activeDoorNodeInstances[self.config.name]) {
-                            activeDoorNodeInstances[self.config.name] += 1;
-                        } else {
-                            activeDoorNodeInstances[self.config.name] = 1;
-                        }
-
-                        callback(null);
+                        self.incrementActiveDoorNodeInstances();
+                        return callback(null);
                     }
                 },
                 function prepareDoor(callback) {
@@ -169,6 +179,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
         this.doorInstance.run(exeInfo, () => {
             trackDoorRunEnd(doorTracking);
+            this.decrementActiveDoorNodeInstances();
 
             //  client may have disconnected while process was active -
             //  we're done here if so.
@@ -194,9 +205,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
     leave() {
         super.leave();
-        if(!this.lastError) {
-            activeDoorNodeInstances[this.config.name] -= 1;
-        }
+        this.decrementActiveDoorNodeInstances();
     }
 
     finishedLoading() {

From 7a98198698dbe1882009f79c0c6f682b110b83d8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 23 Apr 2019 18:17:40 -0600
Subject: [PATCH 0791/1013] Some doc updates

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 167f5288..b72d42cb 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ See [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues) for more
 * Use [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues)
 * **Discussion on a ENiGMA BBS!** (see Boards below)
 * IRC: **#enigma-bbs** on **chat.freenode.net** ([webchat](https://webchat.freenode.net/?channels=enigma-bbs))
-* Discussion on [fsxNet](http://bbs.geek.nz/#fsxNet) available on many boards
+* FSX_ENG on [fsxNet](http://bbs.geek.nz/#fsxNet) available on many boards
 * Email: bryan -at- l33t.codes
 * [Facebook ENiGMA½ group](https://www.facebook.com/groups/enigmabbs/)
 
@@ -76,7 +76,7 @@ Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/install
 * [Luciano Ayres](http://www.lucianoayres.com.br/) of [Blocktronics](http://blocktronics.org/), creator of the "Mystery Skulls" default ENiGMA½ theme!
 * Sudndeath for Xibalba ANSI work!
 * Jack Phlash for kick ass ENiGMA½ and Xibalba ASCII (Check out [IMPURE60](http://pc.textmod.es/pack/impure60/)!!)
-* Avon of [Agency BBS](http://bbs.geek.nz/) and [fsxNet](http://bbs.geek.nz/#fsxNet) for putting up with my experiments to his system
+* Avon of [Agency BBS](http://bbs.geek.nz/) and [fsxNet](http://bbs.geek.nz/#fsxNet) for putting up with my experiments to his system and for FSX_ENG!
 * Maskreet of [Throwback BBS](http://www.throwbackbbs.com/) hosting [DoorParty](http://forums.throwbackbbs.com/)!
 * [Apam](https://github.com/apamment) of [Magicka](https://magickabbs.com/)
 * [nail/blocktronics](http://blocktronics.org/tag/nail/) for the [sickmade Xibalba logo](http://pc.textmod.es/pack/blocktronics-420/n-xbalba.ans)!

From e5398db07b28a9d8153ec5ad256f60ecce57d4c3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 7 May 2019 21:36:33 -0600
Subject: [PATCH 0792/1013] WIP on OTP 2FA, stats, etc.

---
 core/enig_error.js |   1 +
 core/user_login.js | 103 +++++++++++++++++++++++++--------------------
 2 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/core/enig_error.js b/core/enig_error.js
index 33771564..08a3312e 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -51,4 +51,5 @@ exports.ErrorReasons = {
     Inactive            : 'INACTIVE',
     Locked              : 'LOCKED',
     NotAllowed          : 'NOTALLOWED',
+    Invalid2FA          : 'INVALID2FA',
 };
diff --git a/core/user_login.js b/core/user_login.js
index 98bdeefb..ed2ba6a5 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -21,7 +21,9 @@ const User              = require('./user.js');
 const async             = require('async');
 const _                 = require('lodash');
 
-exports.userLogin       = userLogin;
+exports.userLogin             = userLogin;
+exports.recordLogin           = recordLogin;
+exports.transformLoginError   = transformLoginError;
 
 function userLogin(client, username, password, options, cb) {
     if(!cb && _.isFunction(options)) {
@@ -50,20 +52,13 @@ function userLogin(client, username, password, options, cb) {
 
     client.user.authenticateFactor1(authInfo, err => {
         if(err) {
-            client.user.sessionFailedLoginAttempts = _.get(client.user, 'sessionFailedLoginAttempts', 0) + 1;
-            const disconnect = config.users.failedLogin.disconnect;
-            if(disconnect > 0 && client.user.sessionFailedLoginAttempts >= disconnect) {
-                err = Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany);
-            }
-
-            client.log.info( { username, ip : client.remoteAddress, reason : err.message }, 'Failed login attempt');
-            return cb(err);
+            return cb(transformLoginError(err, client, username));
         }
 
         const user = client.user;
 
         //  Good login; reset any failed attempts
-        delete user.sessionFailedLoginAttempts;
+        delete client.sessionFailedLoginAttempts;
 
         //
         //  Ensure this user is not already logged in.
@@ -104,41 +99,59 @@ function userLogin(client, username, password, options, cb) {
 
         Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
-        async.parallel(
-            [
-                function setTheme(callback) {
-                    setClientTheme(client, user.properties[UserProps.ThemeId]);
-                    return callback(null);
-                },
-                function updateSystemLoginCount(callback) {
-                    StatLog.incrementNonPersistentSystemStat(SysProps.LoginsToday, 1);
-                    return StatLog.incrementSystemStat(SysProps.LoginCount, 1, callback);
-                },
-                function recordLastLogin(callback) {
-                    return StatLog.setUserStat(user, UserProps.LastLoginTs, StatLog.now, callback);
-                },
-                function updateUserLoginCount(callback) {
-                    return StatLog.incrementUserStat(user, UserProps.LoginCount, 1, callback);
-                },
-                function recordLoginHistory(callback) {
-                    const loginHistoryMax = Config().statLog.systemEvents.loginHistoryMax;
-                    const historyItem = JSON.stringify({
-                        userId      : user.userId,
-                        sessionId   : user.sessionId,
-                    });
+        setClientTheme(client, user.properties[UserProps.ThemeId]);
+        if(user.authenticated) {
+            return recordLogin(client, cb);
+        }
 
-                    return StatLog.appendSystemLogEntry(
-                        SystemLogKeys.UserLoginHistory,
-                        historyItem,
-                        loginHistoryMax,
-                        StatLog.KeepType.Max,
-                        callback
-                    );
-                }
-            ],
-            err => {
-                return cb(err);
-            }
-        );
+        //  recordLogin() must happen after 2FA!
+        return cb(null);
     });
+}
+
+function recordLogin(client, cb) {
+    const user = client.user;
+    async.parallel(
+        [
+            (callback) => {
+                StatLog.incrementNonPersistentSystemStat(SysProps.LoginsToday, 1);
+                return StatLog.incrementSystemStat(SysProps.LoginCount, 1, callback);
+            },
+            (callback) => {
+                return StatLog.setUserStat(user, UserProps.LastLoginTs, StatLog.now, callback);
+            },
+            (callback) => {
+                return StatLog.incrementUserStat(user, UserProps.LoginCount, 1, callback);
+            },
+            (callback) => {
+                const loginHistoryMax = Config().statLog.systemEvents.loginHistoryMax;
+                const historyItem = JSON.stringify({
+                    userId      : user.userId,
+                    sessionId   : user.sessionId,
+                });
+
+                return StatLog.appendSystemLogEntry(
+                    SystemLogKeys.UserLoginHistory,
+                    historyItem,
+                    loginHistoryMax,
+                    StatLog.KeepType.Max,
+                    callback
+                );
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function transformLoginError(err, client, username) {
+    client.sessionFailedLoginAttempts = _.get(client, 'sessionFailedLoginAttempts', 0) + 1;
+    const disconnect = Config().users.failedLogin.disconnect;
+    if(disconnect > 0 && client.sessionFailedLoginAttempts >= disconnect) {
+        err = Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany);
+    }
+
+    client.log.info( { username, ip : client.remoteAddress, reason : err.message }, 'Failed login attempt');
+    return err;
 }
\ No newline at end of file

From 3c6c8d2a5c66ffc11663772bb316dae6287bce4e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 8 May 2019 21:06:10 -0600
Subject: [PATCH 0793/1013] Add missing OTP file, minor updates

---
 core/system_menu_method.js |   6 +-
 core/user_2fa_otp.js       | 188 +++++++++++++++++++++++++++++++++++++
 core/user_property.js      |   2 +-
 3 files changed, 193 insertions(+), 3 deletions(-)
 create mode 100644 core/user_2fa_otp.js

diff --git a/core/system_menu_method.js b/core/system_menu_method.js
index b83bea80..ba9bb699 100644
--- a/core/system_menu_method.js
+++ b/core/system_menu_method.js
@@ -8,7 +8,9 @@ const { userLogin }     = require('./user_login.js');
 const messageArea       = require('./message_area.js');
 const { ErrorReasons }  = require('./enig_error.js');
 const UserProps         = require('./user_property.js');
-const { user2FA_OTP }   = require('./user_2fa_otp.js');
+const {
+    loginFactor2_OTP
+}                       = require('./user_2fa_otp.js');
 
 //  deps
 const _                 = require('lodash');
@@ -63,7 +65,7 @@ function login(callingMenu, formData, extraArgs, cb) {
 }
 
 function login2FA_OTP(callingMenu, formData, extraArgs, cb) {
-    user2FA_OTP(callingMenu.client, formData.value.token, err => {
+    loginFactor2_OTP(callingMenu.client, formData.value.token, err => {
         if(err) {
             return handleAuthFailures(callingMenu, err, cb);
         }
diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
new file mode 100644
index 00000000..b0df5009
--- /dev/null
+++ b/core/user_2fa_otp.js
@@ -0,0 +1,188 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const UserProps         = require('./user_property.js');
+const {
+    Errors,
+    ErrorReasons,
+}                       = require('./enig_error.js');
+const User              = require('./user.js');
+const {
+    recordLogin,
+    transformLoginError,
+}                       = require('./user_login.js');
+
+//  deps
+const _             = require('lodash');
+const crypto        = require('crypto');
+const async         = require('async');
+
+exports.loginFactor2_OTP        = loginFactor2_OTP;
+exports.generateNewBackupCodes  = generateNewBackupCodes;
+
+const OTPTypes = exports.OTPTypes = {
+    RFC6238_TOTP        : 'rfc6238_TOTP',   //  Time-Based, SHA-512
+    RFC4266_HOTP        : 'rfc4266_HOTP',   //  HMAC-Based, SHA-512
+    GoogleAuthenticator : 'googleAuth',     //  Google Authenticator is basically TOTP + quirks
+};
+
+function otpFromType(otpType) {
+    return {
+        [ OTPTypes.RFC6238_TOTP ] : () => {
+            const totp = require('otplib/totp');
+            totp.options = { crypto, algorithm : 'sha256' };
+            return totp;
+        },
+        [ OTPTypes.RFC4266_HOTP ] : () => {
+            const hotp = require('otplib/hotp');
+            hotp.options = { crypto, algorithm : 'sha256' };
+            return hotp;
+        },
+        [ OTPTypes.GoogleAuthenticator ] : () => {
+            const googleAuth = require('otplib/authenticator');
+            googleAuth.options = { crypto };
+            return googleAuth;
+        },
+    }[otpType]();
+}
+
+function generateOTPBackupCode() {
+    const consonants = 'bdfghjklmnprstvz'.split('');
+    const vowels     = 'aiou'.split('');
+
+    const bits = [];
+    const rng = crypto.randomBytes(4);
+
+    for(let i = 0; i < rng.length / 2; ++i) {
+        const n = rng.readUInt16BE(i * 2);
+
+        const c1 = n & 0x0f;
+        const v1 = (n >> 4) & 0x03;
+        const c2 = (n >> 6) & 0x0f;
+        const v2 = (n >> 10) & 0x03;
+        const c3 = (n >> 12) & 0x0f;
+
+        bits.push([
+            consonants[c1],
+            vowels[v1],
+            consonants[c2],
+            vowels[v2],
+            consonants[c3],
+        ].join(''));
+    }
+
+    return bits.join('-');
+}
+
+function backupCodePBKDF2(secret, salt, cb) {
+    return crypto.pbkdf2(secret, salt, 1000, 128, 'sha1', cb);
+}
+
+function generateNewBackupCodes(user, cb) {
+    //
+    //  Backup codes are not stored in plain text, but rather
+    //  an array of objects: [{salt, code}, ...]
+    //
+    const plainCodes = [...Array(6)].map(() => generateOTPBackupCode());
+    async.map(plainCodes, (code, nextCode) => {
+        crypto.randomBytes(16, (err, salt) => {
+            if(err) {
+                return nextCode(err);
+            }
+            salt = salt.toString('base64');
+            backupCodePBKDF2(code, salt, (err, code) => {
+                if(err) {
+                    return nextCode(err);
+                }
+                code = code.toString('base64');
+                return nextCode(null, { salt, code });
+            });
+        });
+    },
+    (err, codes) => {
+        if(err) {
+            return cb(err);
+        }
+
+        codes = JSON.stringify(codes);
+        user.persistProperty(UserProps.AuthFactor2OTPBackupCodes, codes, err => {
+            return cb(err, plainCodes);
+        });
+    });
+}
+
+function validateAndConsumeBackupCode(user, token, cb) {
+    try
+    {
+        let validCodes = JSON.parse(user.getProperty(UserProps.AuthFactor2OTPBackupCodes));
+        async.detect(validCodes, (entry, nextEntry) => {
+            backupCodePBKDF2(token, entry.salt, (err, code) => {
+                if(err) {
+                    return nextEntry(err);
+                }
+                code = code.toString('base64');
+                return nextEntry(null, code === entry.code);
+            });
+        },
+        (err, matchingEntry) => {
+            if(err) {
+                return cb(err);
+            }
+
+            if(!matchingEntry) {
+                return cb(Errors.BadLogin('Invalid OTP value supplied', ErrorReasons.Invalid2FA));
+            }
+
+            //  We're consuming a match - remove it from available backup codes
+            validCodes = validCodes.filter(entry => {
+                return entry.code != matchingEntry.code && entry.salt != matchingEntry.salt;
+            });
+
+            validCodes = JSON.stringify(validCodes);
+            user.persistProperty(UserProps.AuthFactor2OTPBackupCodes, validCodes, err => {
+                return cb(err);
+            });
+        });
+    } catch(e) {
+        return cb(e);
+    }
+}
+
+function loginFactor2_OTP(client, token, cb) {
+    if(client.user.authFactor < User.AuthFactors.Factor1) {
+        return cb(Errors.AccessDenied('OTP requires prior authentication factor 1'));
+    }
+
+    const otpType = client.user.getProperty(UserProps.AuthFactor2OTP);
+    if(!_.values(OTPTypes).includes(otpType)) {
+        return cb(Errors.Invalid(`Unknown OTP type: ${otpType}`));
+    }
+
+    const secret = client.user.getProperty(UserProps.AuthFactor2OTPSecret);
+    if(!secret) {
+        return cb(Errors.Invalid('Missing OTP secret'));
+    }
+
+    const otp   = otpFromType(otpType);
+    const valid = otp.verify( { token, secret } );
+
+    const allowLogin = () => {
+        client.user.authFactor = User.AuthFactors.Factor2;
+        client.user.authenticated = true;
+        return recordLogin(client, cb);
+    };
+
+    if(valid) {
+        return allowLogin();
+    }
+
+    //  maybe they punched in a backup code?
+    validateAndConsumeBackupCode(client.user, token, err => {
+        if(err) {
+            return cb(transformLoginError(err, client, client.user.username));
+        }
+
+        return allowLogin();
+    });
+}
diff --git a/core/user_property.js b/core/user_property.js
index f3f3b652..02fac923 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -62,6 +62,6 @@ module.exports = {
     AuthFactor1Types                : 'auth_factor1_types',         //  List of User.AuthFactor1Types value(s)
     AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
-    AuthFactor2OTPScratchCodes      : 'auth_factor2_otp_scratch',   //  JSON array style codes ["code1", "code2", ...]
+    AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes: [{salt,code}, ...]
 };
 

From 6070bc94e75aa2ebe7476f48c3eed36c00cbabad Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 9 May 2019 19:56:04 -0600
Subject: [PATCH 0794/1013] Good progress on QR support

---
 core/oputil/oputil_user.js |  62 +++++++++++++++++++++-
 core/user_2fa_otp.js       | 104 ++++++++++++++++++++++++-------------
 core/user_login.js         |   3 ++
 package.json               |   3 +-
 yarn.lock                  |   5 ++
 5 files changed, 139 insertions(+), 38 deletions(-)

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 33327d1d..a2725a71 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -16,6 +16,7 @@ const UserProps                 = require('../user_property.js');
 const async						= require('async');
 const _							= require('lodash');
 const moment                    = require('moment');
+const fs                        = require('fs-extra');
 
 exports.handleUserCommand		= handleUserCommand;
 
@@ -343,6 +344,62 @@ Affiliations : ${propOrNA(UserProps.Affiliations)}
 `);
 }
 
+function twoFactorAuth(user) {
+    if(argv._.length < 4) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
+
+    const {
+        OTPTypes,
+        prepareOTP,
+    } = require('../../core/user_2fa_otp.js');
+
+    async.waterfall(
+        [
+            function validate(callback) {
+                //  :TODO: Prompt for if not supplied
+                let otpType = argv._[argv._.length - 1];
+                otpType = _.find(OTPTypes, t => {
+                    return t.toLowerCase() === otpType;
+                });
+                if(!otpType) {
+                    return callback(Errors.Invalid('Invalid OTP type'));
+                }
+                return callback(null, otpType);
+            },
+            function prepare(otpType, callback) {
+                const otpOpts = {
+                    username    : user.username,
+                    qrType      : argv['qr-type'] || 'ascii',
+                };
+                prepareOTP(otpType, otpOpts, (err, otpInfo) => {
+                    return callback(err, otpInfo);
+                });
+            },
+            function storeOrDisplayQR(otpInfo, callback) {
+                if(!argv.out) {
+                    return callback(null, otpInfo);
+                }
+
+                if('-' === argv.out) {
+                    console.info(otpInfo.qr);
+                    return callback(null, otpInfo);
+                }
+
+                fs.writeFile(argv.out, otpInfo.qr, 'utf8', err => {
+                    return callback(err, otpInfo);
+                });
+            }
+        ],
+        (err) => {
+            if(err) {
+                console.error(err.message);
+            } else {
+            }
+        }
+    );
+}
+
 function handleUserCommand() {
     function errUsage()  {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
@@ -356,7 +413,8 @@ function handleUserCommand() {
     const usernameIdx = [
         'pw', 'pass', 'passwd', 'password',
         'group',
-        'mv', 'rename'
+        'mv', 'rename',
+        '2fa',
     ].includes(action) ? argv._.length - 2 : argv._.length - 1;
     const userName = argv._[usernameIdx];
 
@@ -391,6 +449,8 @@ function handleUserCommand() {
             group		: modUserGroups,
 
             info        : showUserInfo,
+
+            '2fa'       : twoFactorAuth,
         }[action] || errUsage)(user, action);
     });
 }
\ No newline at end of file
diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index b0df5009..eadb09eb 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -12,14 +12,16 @@ const {
     recordLogin,
     transformLoginError,
 }                       = require('./user_login.js');
+const Config            = require('./config.js').get;
 
 //  deps
 const _             = require('lodash');
 const crypto        = require('crypto');
 const async         = require('async');
+const qrGen         = require('qrcode-generator');
 
-exports.loginFactor2_OTP        = loginFactor2_OTP;
-exports.generateNewBackupCodes  = generateNewBackupCodes;
+exports.prepareOTP          = prepareOTP;
+exports.loginFactor2_OTP    = loginFactor2_OTP;
 
 const OTPTypes = exports.OTPTypes = {
     RFC6238_TOTP        : 'rfc6238_TOTP',   //  Time-Based, SHA-512
@@ -28,23 +30,27 @@ const OTPTypes = exports.OTPTypes = {
 };
 
 function otpFromType(otpType) {
-    return {
-        [ OTPTypes.RFC6238_TOTP ] : () => {
-            const totp = require('otplib/totp');
-            totp.options = { crypto, algorithm : 'sha256' };
-            return totp;
-        },
-        [ OTPTypes.RFC4266_HOTP ] : () => {
-            const hotp = require('otplib/hotp');
-            hotp.options = { crypto, algorithm : 'sha256' };
-            return hotp;
-        },
-        [ OTPTypes.GoogleAuthenticator ] : () => {
-            const googleAuth = require('otplib/authenticator');
-            googleAuth.options = { crypto };
-            return googleAuth;
-        },
-    }[otpType]();
+    try {
+        return {
+            [ OTPTypes.RFC6238_TOTP ] : () => {
+                const totp = require('otplib/totp');
+                totp.options = { crypto, algorithm : 'sha256' };
+                return totp;
+            },
+            [ OTPTypes.RFC4266_HOTP ] : () => {
+                const hotp = require('otplib/hotp');
+                hotp.options = { crypto, algorithm : 'sha256' };
+                return hotp;
+            },
+            [ OTPTypes.GoogleAuthenticator ] : () => {
+                const googleAuth = require('otplib/authenticator');
+                googleAuth.options = { crypto };
+                return googleAuth;
+            },
+        }[otpType]();
+    } catch(e) {
+        //  nothing
+    }
 }
 
 function generateOTPBackupCode() {
@@ -79,13 +85,9 @@ function backupCodePBKDF2(secret, salt, cb) {
     return crypto.pbkdf2(secret, salt, 1000, 128, 'sha1', cb);
 }
 
-function generateNewBackupCodes(user, cb) {
-    //
-    //  Backup codes are not stored in plain text, but rather
-    //  an array of objects: [{salt, code}, ...]
-    //
-    const plainCodes = [...Array(6)].map(() => generateOTPBackupCode());
-    async.map(plainCodes, (code, nextCode) => {
+function generateNewBackupCodes(cb) {
+    const plainTextCodes = [...Array(6)].map(() => generateOTPBackupCode());
+    async.map(plainTextCodes, (code, nextCode) => {
         crypto.randomBytes(16, (err, salt) => {
             if(err) {
                 return nextCode(err);
@@ -101,14 +103,7 @@ function generateNewBackupCodes(user, cb) {
         });
     },
     (err, codes) => {
-        if(err) {
-            return cb(err);
-        }
-
-        codes = JSON.stringify(codes);
-        user.persistProperty(UserProps.AuthFactor2OTPBackupCodes, codes, err => {
-            return cb(err, plainCodes);
-        });
+        return cb(err, codes, plainTextCodes);
     });
 }
 
@@ -149,13 +144,51 @@ function validateAndConsumeBackupCode(user, token, cb) {
     }
 }
 
+function createQRCode(otp, options, secret) {
+    const uri = otp.keyuri(options.username || 'user', Config().general.boardName, secret);
+    const qrCode = qrGen(0, 'L');
+    qrCode.addData(uri);
+    qrCode.make();
+
+    options.qrType = options.qrType || 'ascii';
+    return {
+        ascii   : qrCode.createASCII,
+        data    : qrCode.createDataURL,
+        img     : qrCode.createImgTag,
+        svg     : qrCode.createSvgTag,
+    }[options.qrType]();
+}
+
+function prepareOTP(otpType, options, cb) {
+    if(!_.isFunction(cb)) {
+        cb = options;
+        options = {};
+    }
+
+    const otp = otpFromType(otpType);
+    if(!otp) {
+        return cb(Errors.Invalid(`Unknown OTP type: ${otpType}`));
+    }
+
+    const secret = OTPTypes.GoogleAuthenticator === otpType ?
+        otp.generateSecret() :
+        crypto.randomBytes(64).toString('base64').substr(0, 32);
+
+    generateNewBackupCodes((err, codes, plainTextCodes) => {
+        const qr = createQRCode(otp, options, secret);
+        return cb(err, { secret, codes, plainTextCodes, qr } );
+    });
+}
+
 function loginFactor2_OTP(client, token, cb) {
     if(client.user.authFactor < User.AuthFactors.Factor1) {
         return cb(Errors.AccessDenied('OTP requires prior authentication factor 1'));
     }
 
     const otpType = client.user.getProperty(UserProps.AuthFactor2OTP);
-    if(!_.values(OTPTypes).includes(otpType)) {
+    const otp     = otpFromType(otpType);
+
+    if(!otp) {
         return cb(Errors.Invalid(`Unknown OTP type: ${otpType}`));
     }
 
@@ -164,7 +197,6 @@ function loginFactor2_OTP(client, token, cb) {
         return cb(Errors.Invalid('Missing OTP secret'));
     }
 
-    const otp   = otpFromType(otpType);
     const valid = otp.verify( { token, secret } );
 
     const allowLogin = () => {
diff --git a/core/user_login.js b/core/user_login.js
index ed2ba6a5..bc23e3b3 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -20,6 +20,7 @@ const User              = require('./user.js');
 //  deps
 const async             = require('async');
 const _                 = require('lodash');
+const assert            = require('assert');
 
 exports.userLogin             = userLogin;
 exports.recordLogin           = recordLogin;
@@ -110,6 +111,8 @@ function userLogin(client, username, password, options, cb) {
 }
 
 function recordLogin(client, cb) {
+    assert(client.user.authenticated);  //  don't get in situations where this isn't true
+
     const user = client.user;
     async.parallel(
         [
diff --git a/package.json b/package.json
index 4a700f1d..bbc8a94f 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,8 @@
     "ws": "^6.1.3",
     "xxhash": "^0.2.4",
     "yazl": "^2.5.1",
-    "otplib": "^10.0.1"
+    "otplib": "^10.0.1",
+    "qrcode-generator": "1.4.3"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 09bf3e98..0b081218 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1570,6 +1570,11 @@ punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
+qrcode-generator@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.3.tgz#4876e8f280e65b6c94615f4c19c484f6b964b199"
+  integrity sha512-++rVRvMRq5BlHfmAafl8a4ppUntzUxCCUTT2t0siUgqKwdnqRzY8IH6f6WSX5dZUhD2Ul5/MIKuTJddflwrGzw==
+
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

From 2767f3c4e3caab30c90d7797cd83c0459059c43a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 9 May 2019 20:25:47 -0600
Subject: [PATCH 0795/1013] Don't store hashed versions of backup codes *
 Really no point; secret must be in plain-text and only ever used in
 conjunction with pass/etc. * Better oputil handling

---
 core/oputil/oputil_user.js | 29 ++++++++++++----
 core/user_2fa_otp.js       | 70 +++++++++-----------------------------
 core/user_property.js      |  2 +-
 3 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index a2725a71..77e0be68 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -373,7 +373,7 @@ function twoFactorAuth(user) {
                     qrType      : argv['qr-type'] || 'ascii',
                 };
                 prepareOTP(otpType, otpOpts, (err, otpInfo) => {
-                    return callback(err, otpInfo);
+                    return callback(err, Object.assign(otpInfo, { otpType }));
                 });
             },
             function storeOrDisplayQR(otpInfo, callback) {
@@ -381,20 +381,35 @@ function twoFactorAuth(user) {
                     return callback(null, otpInfo);
                 }
 
-                if('-' === argv.out) {
-                    console.info(otpInfo.qr);
-                    return callback(null, otpInfo);
-                }
-
                 fs.writeFile(argv.out, otpInfo.qr, 'utf8', err => {
                     return callback(err, otpInfo);
                 });
+            },
+            function persist(otpInfo, callback) {
+                const props = {
+                    [ UserProps.AuthFactor2OTP ]            : otpInfo.otpType,
+                    [ UserProps.AuthFactor2OTPSecret ]      : otpInfo.secret,
+                    [ UserProps.AuthFactor2OTPBackupCodes ] : JSON.stringify(otpInfo.backupCodes),
+                };
+                user.persistProperties(props, err => {
+                    return callback(err, otpInfo);
+                });
             }
         ],
-        (err) => {
+        (err, otpInfo) => {
             if(err) {
                 console.error(err.message);
             } else {
+                console.info(`OTP enabled for ${user.username}.`);
+                console.info(`Secret: ${otpInfo.secret}`);
+                console.info(`Backup codes: ${otpInfo.backupCodes.join(', ')}`);
+
+                if(!argv.out) {
+                    console.info('QR code:');
+                    console.info(otpInfo.qr);
+                } else {
+                    console.info(`QR code saved to ${argv.out}`);
+                }
             }
         }
     );
diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index eadb09eb..83524750 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -81,63 +81,25 @@ function generateOTPBackupCode() {
     return bits.join('-');
 }
 
-function backupCodePBKDF2(secret, salt, cb) {
-    return crypto.pbkdf2(secret, salt, 1000, 128, 'sha1', cb);
-}
-
-function generateNewBackupCodes(cb) {
-    const plainTextCodes = [...Array(6)].map(() => generateOTPBackupCode());
-    async.map(plainTextCodes, (code, nextCode) => {
-        crypto.randomBytes(16, (err, salt) => {
-            if(err) {
-                return nextCode(err);
-            }
-            salt = salt.toString('base64');
-            backupCodePBKDF2(code, salt, (err, code) => {
-                if(err) {
-                    return nextCode(err);
-                }
-                code = code.toString('base64');
-                return nextCode(null, { salt, code });
-            });
-        });
-    },
-    (err, codes) => {
-        return cb(err, codes, plainTextCodes);
-    });
+function generateNewBackupCodes() {
+    const codes = [...Array(6)].map(() => generateOTPBackupCode());
+    return codes;
 }
 
 function validateAndConsumeBackupCode(user, token, cb) {
     try
     {
         let validCodes = JSON.parse(user.getProperty(UserProps.AuthFactor2OTPBackupCodes));
-        async.detect(validCodes, (entry, nextEntry) => {
-            backupCodePBKDF2(token, entry.salt, (err, code) => {
-                if(err) {
-                    return nextEntry(err);
-                }
-                code = code.toString('base64');
-                return nextEntry(null, code === entry.code);
-            });
-        },
-        (err, matchingEntry) => {
-            if(err) {
-                return cb(err);
-            }
+        const matchingCode = validCodes.find(c => c === token);
+        if(!matchingCode) {
+            return cb(Errors.BadLogin('Invalid OTP value supplied', ErrorReasons.Invalid2FA));
+        }
 
-            if(!matchingEntry) {
-                return cb(Errors.BadLogin('Invalid OTP value supplied', ErrorReasons.Invalid2FA));
-            }
-
-            //  We're consuming a match - remove it from available backup codes
-            validCodes = validCodes.filter(entry => {
-                return entry.code != matchingEntry.code && entry.salt != matchingEntry.salt;
-            });
-
-            validCodes = JSON.stringify(validCodes);
-            user.persistProperty(UserProps.AuthFactor2OTPBackupCodes, validCodes, err => {
-                return cb(err);
-            });
+        //  We're consuming a match - remove it from available backup codes
+        validCodes = validCodes.filter(c => c !== matchingCode);
+        validCodes = JSON.stringify(validCodes);
+        user.persistProperty(UserProps.AuthFactor2OTPBackupCodes, validCodes, err => {
+            return cb(err);
         });
     } catch(e) {
         return cb(e);
@@ -174,10 +136,10 @@ function prepareOTP(otpType, options, cb) {
         otp.generateSecret() :
         crypto.randomBytes(64).toString('base64').substr(0, 32);
 
-    generateNewBackupCodes((err, codes, plainTextCodes) => {
-        const qr = createQRCode(otp, options, secret);
-        return cb(err, { secret, codes, plainTextCodes, qr } );
-    });
+    const backupCodes   = generateNewBackupCodes();
+    const qr            = createQRCode(otp, options, secret);
+
+    return cb(null, { secret, backupCodes, qr } );
 }
 
 function loginFactor2_OTP(client, token, cb) {
diff --git a/core/user_property.js b/core/user_property.js
index 02fac923..00f640fb 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -62,6 +62,6 @@ module.exports = {
     AuthFactor1Types                : 'auth_factor1_types',         //  List of User.AuthFactor1Types value(s)
     AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
-    AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes: [{salt,code}, ...]
+    AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes
 };
 

From afa856eaf31af21ed2e5336b0aca30d1bfb10627 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 May 2019 00:18:13 -0600
Subject: [PATCH 0796/1013] 2FA/OTP related stuff to WHATSNEW

---
 WHATSNEW.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index d4a5bc39..376344fc 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -5,7 +5,9 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 + `oputil.js user rename USERNAME NEWNAME`
 + `my_messages.js` module (defaulted to "m" at the message menu) to list public messages addressed to the currently logged in user. Takes into account their username and `real_name` property.
 + SSH Public Key Authentication has been added. The system uses a OpenSSH style public key set on the `ssh_public_key` user property.
-+ 
++ 2-Factor (2FA) authentication is now available using [RFC-4266 - HOTP: HMAC-Based One-Time Password Algorithm)](https://tools.ietf.org/html/rfc4226), [RFC-6238 - TOTP: Time-Based One-Time Password Algorithm](https://tools.ietf.org/html/rfc6238), or [Google Authenticator](http://google-authenticator.com/). QR codes for activation are available as well. One-time backup aka recovery codes can also be used.
++ `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user.
+* `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP.
 
 
 ## 0.0.9-alpha

From 401d0a10b117b7513c6d21e9842cefffb9a48f28 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 May 2019 00:19:11 -0600
Subject: [PATCH 0797/1013] Fix 'AR' ACS check

---
 core/acs_parser.js    | 4 ++--
 misc/acs_parser.pegjs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/acs_parser.js b/core/acs_parser.js
index 3763c8e7..f903d6f1 100644
--- a/core/acs_parser.js
+++ b/core/acs_parser.js
@@ -994,8 +994,8 @@ function peg$parse(input, options) {
   						return false;
   					}
   					switch(value) {
-  						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
-  						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+  						case 1 : return true;
+  						case 2 : return user.getProperty(UserProps.AuthFactor2OTP) ? true : false;
   						default : return false;
   					}
   				},
diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs
index 060344a8..25e5853a 100644
--- a/misc/acs_parser.pegjs
+++ b/misc/acs_parser.pegjs
@@ -150,8 +150,8 @@
 						return false;
 					}
 					switch(value) {
-						case 1 : return user.authFactor >= User.AuthFactors.Factor1;
-						case 2 : return user.authFactor >= User.AuthFActors.Factor2;
+						case 1 : return true;
+						case 2 : return user.getProperty(UserProps.AuthFactor2OTP) ? true : false;
 						default : return false;
 					}
 				},

From 6953cdf1590e25684dda4de7c95b99eb5c61fc00 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 May 2019 00:20:02 -0600
Subject: [PATCH 0798/1013] QR's can't alwasy be created

---
 core/user_2fa_otp.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index 83524750..2f51f105 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -107,18 +107,22 @@ function validateAndConsumeBackupCode(user, token, cb) {
 }
 
 function createQRCode(otp, options, secret) {
-    const uri = otp.keyuri(options.username || 'user', Config().general.boardName, secret);
-    const qrCode = qrGen(0, 'L');
-    qrCode.addData(uri);
-    qrCode.make();
+    try {
+        const uri = otp.keyuri(options.username || 'user', Config().general.boardName, secret);
+        const qrCode = qrGen(0, 'L');
+        qrCode.addData(uri);
+        qrCode.make();
 
-    options.qrType = options.qrType || 'ascii';
-    return {
-        ascii   : qrCode.createASCII,
-        data    : qrCode.createDataURL,
-        img     : qrCode.createImgTag,
-        svg     : qrCode.createSvgTag,
-    }[options.qrType]();
+        options.qrType = options.qrType || 'ascii';
+        return {
+            ascii   : qrCode.createASCII,
+            data    : qrCode.createDataURL,
+            img     : qrCode.createImgTag,
+            svg     : qrCode.createSvgTag,
+        }[options.qrType]();
+    } catch(e) {
+        return;
+    }
 }
 
 function prepareOTP(otpType, options, cb) {

From d215919bffb35dc019cdfc6b3343fe0c101b271c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 11 May 2019 00:21:42 -0600
Subject: [PATCH 0799/1013] Improvements to oputil * Major update to --help *
 '2fa' is now '2fa-otp' or just 'otp' * Better 2fa-otp output & handling

---
 core/oputil/oputil_file_base.js |   6 +-
 core/oputil/oputil_help.js      | 210 ++++++++++++++++++++------------
 core/oputil/oputil_user.js      |  61 +++++++---
 3 files changed, 180 insertions(+), 97 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 4dc25fd2..efefa05b 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -209,7 +209,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                                 async.series(
                                     [
                                         function quickCheck(next) {
-                                            if(!options.quick) {
+                                            if(options['full-scan']) {
                                                 return next(null);
                                             }
 
@@ -476,8 +476,8 @@ function scanFileAreas() {
         options.tags = tags.split(',');
     }
 
-    options.descFile 	= argv['desc-file'];	//	--desc-file or --desc-file PATH
-    options.quick 		= argv.quick;
+    options.descFile 	    = argv['desc-file'];	//	--desc-file or --desc-file PATH
+    options['full-scan'] 	= argv['-full-scan'];
 
     options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
 
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 6f485f0a..3e9cb60a 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -9,115 +9,169 @@ exports.getHelpFor				= getHelpFor;
 const usageHelp = exports.USAGE_HELP = {
     General :
 `usage: oputil.js [--version] [--help]
-                  <command> [<args>]
+                  <command> [<arguments>]
 
-global args:
-  -c, --config PATH         specify config path (${getDefaultConfigPath()})
-  -n, --no-prompt           assume defaults/don't prompt for input where possible
+global arguments:
+  -c, --config PATH         Specify config path (${getDefaultConfigPath()})
+  -n, --no-prompt           Assume defaults (don't prompt for input where possible)
 
 commands:
-  user                      user utilities
-  config                    config file management
-  fb                        file base management
-  mb                        message base management
+  user                      User management
+  config                    Configuration management
+  fb                        File base management
+  mb                        Message base management
 `,
     User :
-`usage: oputil.js user <action> [<args>]
+`usage: oputil.js user <action> [<arguments>]
 
-actions:
-  info USERNAME                display information about a user
-  pw USERNAME PASSWORD         set a user's password
-                               aliases: password, passwd
-  rm USERNAME                  permanently removes user from system
-                               aliases: remove, delete, del
-  rename USERNAME NEWNAME      rename a user
-                               aliases: mv
-  activate USERNAME            set status to active
-  deactivate USERNAME          set status to inactive
-  disable USERNAME             set status to disabled
-  lock USERNAME                set status to locked
-  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from a group
+Actions:
+  info USERNAME                Display information about a user
+
+  pw USERNAME PASSWORD         Set a user's password
+  (passwd|password)
+
+  rm USERNAME                  Permanently removes user from system
+  (del|delete|remove)
+
+  rename USERNAME NEWNAME      Rename a user
+  (mv)
+
+  2fa-otp USERNAME SPEC        Enable Two Factor Authentication (2FA)
+  (otp)
+
+  Valid specs:
+    totp   : Time-Based One-Time Password Algorithm (RFC-6238)
+    hotp   : HMAC-Based One-Time Password Algorithm (RFC-4266)
+    google : Google Authenticator
+
+  activate USERNAME            Set a user's status to "active"
+
+  deactivate USERNAME          Set a user's status to "inactive"
+
+  disable USERNAME             Set a user's status to "disabled"
+
+  lock USERNAME                Set a user's status to "locked"
+
+  group USERNAME [+|-]GROUP    Adds (+) or removes (-) user from a group
+
+info arguments:
+  --security                   Include security information in output
+
+2fa-otp arguments:
+  --qr-type TYPE               Specify QR code type
+
+  Valid QR types:
+    ascii : Plain ASCII (default)
+    data  : HTML data URL
+    img   : HTML image tag
+    svg   : SVG image
+
+  --out PATH                   Path to write QR code to. defaults to stdout
 `,
 
     Config :
-`usage: oputil.js config <action> [<args>]
+`usage: oputil.js config <action> [<arguments>]
 
-actions:
-  new                      generate a new/initial configuration
-  cat                      cat current configuration to stdout
+Actions:
+  new                      Generate a new / default configuration
 
-cat args:
-  --no-color               disable color
-  --no-comments            strip any comments
+  cat                      Write current configuration to stdout
+
+cat arguments:
+  --no-color               Disable color
+  --no-comments            Strip any comments
 `,
     FileBase :
-`usage: oputil.js fb <action> [<args>]
+`usage: oputil.js fb <action> [<arguments>]
 
-actions:
-  scan AREA_TAG[@STORAGE_TAG]  scan specified area
-                               may also contain optional GLOB as last parameter,
-                               for example: scan some_area *.zip
+Actions:
+  scan AREA_TAG[@STORAGE_TAG]  Scan specified area
 
-  info CRITERIA                display information about areas and/or files
-                               matching CRITERIA.
+  May contain optional GLOB as last parameter.
+  Example: ./oputil.js fb scan d0pew4r3z *.zip
 
-  mv SRC [SRC...] DST          move entry(s) from SRC to DST
-                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
-                               DST: AREA_TAG[@STORAGE_TAG]
+  info CRITERIA                Display information about areas and/or files
 
-  rm SRC [SRC...]              remove entry(s) from the system matching SRC
-                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
-  desc CRITERIA                sets a new file description for file base entry
-                               matching CRITERIA. Launches an external editor using
-                               $VISUAL, $EDITOR, or vim/notepad.
-  import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
+  mv SRC [SRC...] DST          Move matching entry(s)
+  (move)
 
-scan args:
-  --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
+  Source may be any of the following:
+    - Filename including '*' wildcards
+    - SHA-1
+    - File ID
+    - Area tag with optional @storageTag suffix
+  Destination is area tag with optional @storageTag suffix
 
-  --desc-file [PATH]           prefer file descriptions from supplied path over other
-                               other sources such as FILE_ID.DIZ. Path must point to
-                               a valid FILES.BBS or DESCRIPT.ION file.
-  --update                     attempt to update information for existing entries
-  --quick                      perform quick scan
+  rm SRC [SRC...]              Remove entry(s) from the system
+  (del|delete|remove)
 
-info args:
-  --show-desc                  display short description, if any
+  Source may be any of the following:
+    - Filename including '*' wildcards
+    - SHA-1
+    - File ID
+    - Area tag with optional @storageTag suffix
 
-remove args:
-  --phys-file                  also remove underlying physical file
+  desc CRITERIA                Updates an file base entry's description
 
-import-areas args:
-  --type TYPE                  sets import areas type. valid options are "zxx" or "na"
-  --create-dirs                create backing storage directories
+  Launches an external editor using $VISUAL, $EDITOR, or vim/notepad.
+
+  import-areas FILEGATE.ZXX    Import file base areas using FileGate RAID type format
+
+scan arguments:
+  --tags TAG1,TAG2,...         Specify hashtag(s) to assign to discovered entries
+
+  --desc-file [PATH]           Prefer file descriptions from supplied input file
+
+  If a file description can be found in the supplied input file, prefer that description
+  over other sources such related FILE_ID.DIZ. Path must point to a valid FILES.BBS or
+  DESCRIPT.ION file.
+
+  --update                     Attempt to update information for existing entries
+  --full-scan                  Perform a full scan (default is quick)
+
+info arguments:
+  --show-desc                  Display short description, if any
+
+remove arguments:
+  --phys-file                  Also remove underlying physical file
+
+import-areas arguments:
+  --type TYPE                  Sets import areas type
+
+  Valid types are are "zxx" or "na".
+
+  --create-dirs                Also create backing storage directories
 `,
     FileOpsInfo :
 `
-general information:
-  AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
-                               example: retro@bbs
+General Information:
+  Generally an area tag can also include an optional storage tag. For example, the
+  area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main
 
-  CRITERIA                     file base entry criteria. in general, can be AREA_TAG, SHA,
-                               FILE_ID, or FILENAME_WC.
-  
-  FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
-  SHA                          full or partial SHA-256
-  FILE_ID                      a file identifier. see file.sqlite3
+  When performing an initial import of a large area or storage backing, --full-scan
+  is the best option. If re-scanning an area for updates a standard / quick scan is
+  generally good enough.
+
+  File ID's are those found in file.sqlite3.
 `,
     MessageBase :
-`usage: oputil.js mb <action> [<args>]
+`usage: oputil.js mb <action> [<arguments>]
 
 actions:
-  areafix CMD1 CMD2 ... ADDR  sends an AreaFix NetMail to ADDR with the supplied command(s)
-                              one or more commands may be supplied. commands that are multi
-                              part such as "%COMPRESS ZIP" should be quoted.
-  import-areas PATH           import areas using fidonet *.NA or AREAS.BBS file from PATH
+  areafix CMD1 CMD2 ... ADDR  Sends an AreaFix NetMail
 
-import-areas args:
-  --conf CONF_TAG             conference tag in which to import areas
-  --network NETWORK           network name/key to associate FTN areas
-  --uplinks UL1,UL2,...       one or more comma separated uplinks
-  --type TYPE                 area import type. valid options are "bbs" and "na"
+  NetMail is sent to supplied address  with the supplied command(s). Multi-part commands
+  such as "%COMPRESS ZIP" should be quoted.
+
+  import-areas PATH           Import areas using FidoNet *.NA or AREAS.BBS file
+
+import-areas arguments:
+  --conf CONF_TAG             Conference tag in which to import areas
+  --network NETWORK           Network name/key to associate FTN areas
+  --uplinks UL1,UL2,...       One or more uplinks (comma separated)
+  --type TYPE                 Area import type
+
+  Valid types are "bbs" and "na".
 `
 };
 
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 77e0be68..92705bff 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -329,7 +329,7 @@ function showUserInfo(user) {
         return user.properties[p] || 'N/A';
     };
 
-    console.info(`User information:
+    const stdInfo = `User information:
 Username     : ${user.username}${user.isRoot() ? ' (root/SysOp)' : ''}
 Real name    : ${propOrNA(UserProps.RealName)}
 ID           : ${user.userId}
@@ -340,11 +340,29 @@ Last login   : ${lastLogin()}
 Login count  : ${propOrNA(UserProps.LoginCount)}
 Email        : ${propOrNA(UserProps.EmailAddress)}
 Location     : ${propOrNA(UserProps.Location)}
-Affiliations : ${propOrNA(UserProps.Affiliations)}
-`);
+Affiliations : ${propOrNA(UserProps.Affiliations)}`;
+    let secInfo = '';
+    if(argv.security) {
+        const otp = user.getProperty(UserProps.AuthFactor2OTP);
+        if(otp) {
+            const backupCodesOrNa = () => {
+                try
+                {
+                    return JSON.parse(user.getProperty(UserProps.AuthFactor2OTPBackupCodes)).join(', ');
+                } catch(e) {
+                    return 'N/A';
+                }
+            };
+            secInfo = `\n2FA OTP      : ${otp}
+OTP secret   : ${user.getProperty(UserProps.AuthFactor2OTPSecret) || 'N/A'}
+OTP Backup   : ${backupCodesOrNa()}`;
+        }
+    }
+
+    console.info(`${stdInfo}${secInfo}`);
 }
 
-function twoFactorAuth(user) {
+function twoFactorAuthOTP(user) {
     if(argv._.length < 4) {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
     }
@@ -359,8 +377,15 @@ function twoFactorAuth(user) {
             function validate(callback) {
                 //  :TODO: Prompt for if not supplied
                 let otpType = argv._[argv._.length - 1];
+
+                //  allow aliases for OTP types
+                otpType = {
+                    google  : OTPTypes.GoogleAuthenticator,
+                    hotp    : OTPTypes.RFC4266_HOTP,
+                    totp    : OTPTypes.RFC6238_TOTP,
+                }[otpType] || otpType;
                 otpType = _.find(OTPTypes, t => {
-                    return t.toLowerCase() === otpType;
+                    return t.toLowerCase() === otpType.toLowerCase();
                 });
                 if(!otpType) {
                     return callback(Errors.Invalid('Invalid OTP type'));
@@ -377,7 +402,7 @@ function twoFactorAuth(user) {
                 });
             },
             function storeOrDisplayQR(otpInfo, callback) {
-                if(!argv.out) {
+                if(!argv.out || !otpInfo.qr) {
                     return callback(null, otpInfo);
                 }
 
@@ -400,15 +425,18 @@ function twoFactorAuth(user) {
             if(err) {
                 console.error(err.message);
             } else {
-                console.info(`OTP enabled for ${user.username}.`);
-                console.info(`Secret: ${otpInfo.secret}`);
-                console.info(`Backup codes: ${otpInfo.backupCodes.join(', ')}`);
+                console.info(`OTP enabled for  : ${user.username}`);
+                console.info(`Secret           : ${otpInfo.secret}`);
+                console.info(`Backup codes     : ${otpInfo.backupCodes.join(', ')}`);
 
-                if(!argv.out) {
-                    console.info('QR code:');
-                    console.info(otpInfo.qr);
-                } else {
-                    console.info(`QR code saved to ${argv.out}`);
+                if(otpInfo.qr) {
+                    if(!argv.out) {
+                        console.info('--- Begin QR ---');
+                        console.info(otpInfo.qr);
+                        console.info('--- End QR ---');
+                    } else {
+                        console.info(`QR code saved to ${argv.out}`);
+                    }
                 }
             }
         }
@@ -429,7 +457,7 @@ function handleUserCommand() {
         'pw', 'pass', 'passwd', 'password',
         'group',
         'mv', 'rename',
-        '2fa',
+        '2fa-otp', 'otp'
     ].includes(action) ? argv._.length - 2 : argv._.length - 1;
     const userName = argv._[usernameIdx];
 
@@ -465,7 +493,8 @@ function handleUserCommand() {
 
             info        : showUserInfo,
 
-            '2fa'       : twoFactorAuth,
+            '2fa-otp'   : twoFactorAuthOTP,
+            otp         : twoFactorAuthOTP,
         }[action] || errUsage)(user, action);
     });
 }
\ No newline at end of file

From b0d081ad044f209d2d71b0572a20f491bdda55b9 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 13 May 2019 21:27:59 -0600
Subject: [PATCH 0800/1013] Fix to read direct / full path & 'readSauce' option
 of art

---
 core/art.js   | 2 +-
 core/theme.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/art.js b/core/art.js
index d709d366..19fa41e8 100644
--- a/core/art.js
+++ b/core/art.js
@@ -144,7 +144,7 @@ function getArt(name, options, cb) {
 
     //  If an extension is provided, just read the file now
     if('' !== ext) {
-        const directPath = paths.join(options.basePath, name);
+        const directPath = paths.isAbsolute(name) ? name : paths.join(options.basePath, name);
         return getArtFromPath(directPath, options, cb);
     }
 
diff --git a/core/theme.js b/core/theme.js
index 9978fde3..8460cf24 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -439,7 +439,7 @@ function getThemeArt(options, cb) {
     //  :TODO: replace asAnsi stuff with something like retrieveAs = 'ansi' | 'pipe' | ...
     //  :TODO: Some of these options should only be set if not provided!
     options.asAnsi      = true; //  always convert to ANSI
-    options.readSauce   = true; //  read SAUCE, if avail
+    options.readSauce   = _.get(options, 'readSauce', true); //  read SAUCE, if avail
     options.random      = _.get(options, 'random', true);   //  FILENAME<n>.EXT support
 
     //

From 228d3e3ae788ae9c6a80458c0092d203bb3fda39 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 13 May 2019 21:31:34 -0600
Subject: [PATCH 0801/1013] Improve legacy EOF detector: Must be at least >=
 size of SAUCE

---
 core/art.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/art.js b/core/art.js
index 19fa41e8..38594985 100644
--- a/core/art.js
+++ b/core/art.js
@@ -57,6 +57,9 @@ function sliceAtEOF(data, eofMarker) {
             break;
         }
     }
+    if(eof === data.length || eof < 128) {
+        return data;
+    }
     return data.slice(0, eof);
 }
 

From da91bf01912b73f070500507748ab50df74f628b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 15 May 2019 21:51:44 -0600
Subject: [PATCH 0802/1013] Fix real names during message save

---
 core/fse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/fse.js b/core/fse.js
index 1d9d6dd7..d86961b2 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -329,7 +329,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
         const msgOpts = {
             areaTag         : this.messageAreaTag,
             toUserName      : headerValues.to,
-            fromUserName    : this.client.user.username,
+            fromUserName    : this.client.user.getProperty(UserProps.RealName) || this.client.user.username,
             subject         : headerValues.subject,
             //  :TODO: don't hard code 1 here:
             message         : this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),

From 9c2b3be0b1b7fad96b02ff31294c3ac75ba31af9 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 18 May 2019 00:25:35 +0100
Subject: [PATCH 0803/1013] MRC WIP

---
 core/config.js                       |  69 +++++---
 core/listening_server.js             |   2 +-
 core/module_util.js                  |   1 +
 core/mrc.js                          | 233 ++++++++++++++++++++++++
 core/servers/chat/mrc_multiplexer.js | 255 +++++++++++++++++++++++++++
 5 files changed, 530 insertions(+), 30 deletions(-)
 create mode 100644 core/mrc.js
 create mode 100644 core/servers/chat/mrc_multiplexer.js

diff --git a/core/config.js b/core/config.js
index 5c1f9c42..854e65c8 100644
--- a/core/config.js
+++ b/core/config.js
@@ -212,7 +212,8 @@ function getDefaultConfig() {
 
             badUserNames        : [
                 'sysop', 'admin', 'administrator', 'root', 'all',
-                'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix'
+                'areamgr', 'filemgr', 'filefix', 'areafix', 'allfix',
+                'server', 'client', 'notme'
             ],
 
             preAuthIdleLogoutSeconds    : 60 * 3,   //  3m
@@ -253,6 +254,7 @@ function getDefaultConfig() {
             mods                : paths.join(__dirname, './../mods/'),
             loginServers        : paths.join(__dirname, './servers/login/'),
             contentServers      : paths.join(__dirname, './servers/content/'),
+            chatServers         : paths.join(__dirname, './servers/chat/'),
 
             scannerTossers      : paths.join(__dirname, './scanner_tossers/'),
             mailers             : paths.join(__dirname, './mailers/')       ,
@@ -447,6 +449,15 @@ function getDefaultConfig() {
             }
         },
 
+        chatServers : {
+            mrc: {
+                enabled             : true,
+                multiplexerPort     : 5000,
+                serverHostname      : "mrc.bottomlessabyss.com",
+                serverPort          : 5000
+            }
+        },
+
         infoExtractUtils : {
             Exiftool2Desc :  {
                 cmd         : `${__dirname}/../util/exiftool2desc.js`,  //  ensure chmod +x
@@ -965,38 +976,38 @@ function getDefaultConfig() {
         eventScheduler : {
 
             events : {
-                dailyMaintenance : {
-                    schedule    : 'at 11:59pm',
-                    action      : '@method:core/misc_scheduled_events.js:dailyMaintenanceScheduledEvent',
-                },
-                trimMessageAreas : {
-                    //  may optionally use [or ]@watch:/path/to/file
-                    schedule    : 'every 24 hours',
+                // dailyMaintenance : {
+                //     schedule    : 'at 11:59pm',
+                //     action      : '@method:core/misc_scheduled_events.js:dailyMaintenanceScheduledEvent',
+                // },
+                // trimMessageAreas : {
+                //     //  may optionally use [or ]@watch:/path/to/file
+                //     schedule    : 'every 24 hours',
 
-                    //  action:
-                    //  - @method:path/to/module.js:theMethodName
-                    //    (path is relative to ENiGMA base dir)
-                    //
-                    //  - @execute:/path/to/something/executable.sh
-                    //
-                    action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
-                },
+                //     //  action:
+                //     //  - @method:path/to/module.js:theMethodName
+                //     //    (path is relative to ENiGMA base dir)
+                //     //
+                //     //  - @execute:/path/to/something/executable.sh
+                //     //
+                //     action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
+                // },
 
-                nntpMaintenance : {
-                    schedule    : 'every 12 hours', //  should generally be < trimMessageAreas interval
-                    action      : '@method:core/servers/content/nntp.js:performMaintenanceTask',
-                },
+                // nntpMaintenance : {
+                //     schedule    : 'every 12 hours', //  should generally be < trimMessageAreas interval
+                //     action      : '@method:core/servers/content/nntp.js:performMaintenanceTask',
+                // },
 
-                updateFileAreaStats : {
-                    schedule    : 'every 1 hours',
-                    action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
-                },
+                // updateFileAreaStats : {
+                //     schedule    : 'every 1 hours',
+                //     action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
+                // },
 
-                forgotPasswordMaintenance : {
-                    schedule    : 'every 24 hours',
-                    action      : '@method:core/web_password_reset.js:performMaintenanceTask',
-                    args        : [ '24 hours' ]    //  items older than this will be removed
-                },
+                // forgotPasswordMaintenance : {
+                //     schedule    : 'every 24 hours',
+                //     action      : '@method:core/web_password_reset.js:performMaintenanceTask',
+                //     args        : [ '24 hours' ]    //  items older than this will be removed
+                // },
 
                 //
                 //  Enable the following entry in your config.hjson to periodically create/update
diff --git a/core/listening_server.js b/core/listening_server.js
index aa573fa1..7cb7405e 100644
--- a/core/listening_server.js
+++ b/core/listening_server.js
@@ -28,7 +28,7 @@ function getServer(packageName) {
 function startListening(cb) {
     const moduleUtil = require('./module_util.js'); //  late load so we get Config
 
-    async.each( [ 'login', 'content' ], (category, next) => {
+    async.each( [ 'login', 'content', 'chat' ], (category, next) => {
         moduleUtil.loadModulesForCategory(`${category}Servers`, (module, nextModule) => {
             const moduleInst = new module.getModule();
             try {
diff --git a/core/module_util.js b/core/module_util.js
index f61929d2..033d6094 100644
--- a/core/module_util.js
+++ b/core/module_util.js
@@ -117,6 +117,7 @@ function getModulePaths() {
         config.paths.mods,
         config.paths.loginServers,
         config.paths.contentServers,
+        config.paths.chatServers,
         config.paths.scannerTossers,
     ];
 }
diff --git a/core/mrc.js b/core/mrc.js
new file mode 100644
index 00000000..b6e68463
--- /dev/null
+++ b/core/mrc.js
@@ -0,0 +1,233 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Log               = require('./logger.js').log;
+const { MenuModule }    = require('./menu_module.js');
+const { Errors }        = require('./enig_error.js');
+const {
+    pipeToAnsi,
+    stripMciColorCodes
+}                       = require('./color_codes.js');
+const stringFormat              = require('./string_format.js');
+const { getThemeArt }           = require('./theme.js');
+
+
+//  deps
+const _                 = require('lodash');
+const async             = require('async');
+const net                   = require('net');
+const moment                = require('moment');
+
+exports.moduleInfo = {
+    name        : 'MRC Client',
+    desc        : 'Connects to an MRC chat server',
+    author      : 'RiPuk',
+    packageName : 'codes.l33t.enigma.mrc.client',
+};
+
+const FormIds = {
+    mrcChat    : 0,
+};
+
+var MciViewIds = {
+    mrcChat  : {
+        chatLog             : 1,
+        inputArea           : 2,
+        roomName            : 3,
+        roomTopic           : 4,
+
+        customRangeStart    : 10,   //  10+ = customs
+    }
+};
+
+const state = {
+    socket: '',
+    alias: '',
+    room: '',
+    room_topic: '',
+    nicks: [],
+    last_ping: 0
+};
+ 
+
+exports.getModule = class mrcModule extends MenuModule {
+    constructor(options) {
+        super(options);
+
+        this.log    = Log.child( { module : 'MRC' } );
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+        state.alias = this.client.user.username;
+
+
+        this.menuMethods = {
+            sendChatMessage : (formData, extraArgs, cb) => {
+                // const message = _.get(formData.value, 'inputArea', '').trim();
+            
+                const inputAreaView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.inputArea);
+                const inputData		= inputAreaView.getData();
+                const textFormatObj = {
+                    fromUserName    : state.alias,
+                    message         : inputData
+                };
+        
+                const messageFormat =
+                    this.config.messageFormat ||
+                    '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
+        
+                try {
+                    sendChat(stringFormat(messageFormat, textFormatObj));
+                } catch(e) {
+                    self.client.log.warn( { error : e.message }, 'MRC error');
+                }
+                inputAreaView.clearText();
+                
+                return cb(null);
+            
+            }
+        }
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            async.series(
+                [   
+                    // (callback) => {
+                    //     console.log("stop idle monitor")
+                    //     this.client.stopIdleMonitor();
+                    //     return(callback);
+                    // },
+                    (callback) => {
+                        return this.prepViewController('mrcChat', FormIds.mrcChat, mciData.menu, callback);
+                    },
+                    (callback) => {
+                        return this.validateMCIByViewIds('mrcChat', [ MciViewIds.mrcChat.chatLog, MciViewIds.mrcChat.inputArea ], callback);
+                    },
+                    (callback) => {
+                        const connectOpts = {
+                            port	: 5000,
+                            host	: "localhost",
+                        };
+
+                        // connect to multiplexer
+                        state.socket = net.createConnection(connectOpts, () => {
+                            // handshake with multiplexer
+                            state.socket.write(`--DUDE-ITS--|${state.alias}\n`);
+                            
+
+                            sendClientConnect()
+
+                            // send register to central MRC every 60s
+                            setInterval(function () { 
+                                sendHeartbeat(state.socket)
+                            }, 60000); 
+                        });
+
+                        // when we get data, process it
+                        state.socket.on('data', data => {
+                            data = data.toString();
+                            this.processReceivedMessage(data);
+                            this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
+                        });
+
+                        return(callback);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+           );
+        });
+    }
+
+    processReceivedMessage(blob) {
+        blob.split('\n').forEach( message => {
+
+            try {
+                message = JSON.parse(message)
+            } catch (e) {
+                return
+            }
+
+            if (message.from_user == 'SERVER') {
+                const params = message.body.split(':');
+
+                switch (params[0]) {
+                    case 'BANNER':
+                        const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+                        chatMessageView.addText(pipeToAnsi(params[1].replace(/^\s+/, '')));
+                        chatMessageView.redraw();
+
+                    case 'ROOMTOPIC':
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomName).setText(params[1]);
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(params[2]);
+
+                    case 'USERLIST':
+                        state.nicks = params[1].split(',');
+
+                    break;
+                }
+
+            } else {
+                // if we're here then we want to show it to the user
+                const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+                const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
+                chatMessageView.addText(pipeToAnsi("|08" + currentTime + "|00 " + message.body));
+                chatMessageView.redraw();
+            }
+
+            return;
+    
+        });
+    }
+    
+};
+
+
+function sendMessage(to_user, to_site, to_room, body) {
+    // drop message if user just mashes enter
+    if (body == '' || body == state.alias) return;
+    
+    // otherwise construct message
+    const message = {
+        from_room: state.room,
+        to_user: to_user,
+        to_site: to_site,
+        to_room: to_room,
+        body: body
+    }
+    Log.debug({module: 'mrcclient', message: message}, 'Sending message to MRC multiplexer');
+    // TODO: check socket still exists here
+    state.socket.write(JSON.stringify(message) + '\n');
+}
+
+function sendChat(message,to_user) {
+    sendMessage(to_user || '', '', state.room, message)
+}
+
+function sendServerCommand(command, to_site) {
+    Log.debug({ module: 'mrc', command: command }, 'Sending server command');
+    sendMessage('SERVER', to_site || '', state.room, command);
+    return;
+}
+
+function sendHeartbeat() {
+    sendServerCommand('IAMHERE');
+    return;
+}
+
+function sendClientConnect() {
+    sendHeartbeat();
+    joinRoom('lobby');
+    sendServerCommand('BANNERS');
+    sendServerCommand('MOTD');
+    return;
+}
+
+function joinRoom(room) {
+    sendServerCommand(`NEWROOM:${state.room}:${room}`);
+}
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
new file mode 100644
index 00000000..5419088a
--- /dev/null
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -0,0 +1,255 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Log                       = require('../../logger.js').log;
+const { ServerModule }          = require('../../server_module.js');
+const Config                    = require('../../config.js').get;
+const { Errors }                = require('../../enig_error.js');
+const { wordWrapText }          = require('../../word_wrap.js');
+const { stripMciColorCodes }    = require('../../color_codes.js');
+
+//  deps
+const net                   = require('net');
+const _                     = require('lodash');
+const os                    = require('os');
+
+// MRC
+const PROTOCOL_VERSION = '1.2.9';
+
+const ModuleInfo = exports.moduleInfo = {
+    name        : 'MRC',
+    desc        : 'An MRC Chat Multiplexer',
+    author      : 'RiPuk',
+    packageName : 'codes.l33t.enigma.mrc.server',
+    notes       : 'https://bbswiki.bottomlessabyss.net/index.php?title=MRC_Chat_platform',
+};
+
+const connectedSockets = new Set();
+let mrcCentralConnection = '';
+
+exports.getModule = class MrcModule extends ServerModule {
+    constructor() {
+        super();
+
+        this.log        = Log.child( { server : 'MRC' } );
+
+    }
+
+    createServer(cb) {
+        if (!this.enabled) {
+            return cb(null);
+        }
+        
+        const config = Config();
+        const boardName  = config.general.boardName
+        const enigmaVersion = "ENiGMA-BBS_" + require('../../../package.json').version
+
+        const mrcConnectOpts = {
+            port    : 5000,
+            host    : "mrc.bottomlessabyss.net"
+        };
+
+        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${PROTOCOL_VERSION}`
+        this.log.debug({ handshake : handshake }, "Handshaking with MRC server")
+
+        // create connection to MRC server
+        this.mrcClient = net.createConnection(mrcConnectOpts, () => {
+            this.mrcClient.write(handshake);
+            this.log.info(mrcConnectOpts, 'Connected to MRC server');
+            mrcCentralConnection = this.mrcClient
+        });
+
+        // do things when we get data from MRC central
+        this.mrcClient.on('data', (data) => {
+            // split on \n to deal with getting messages in batches
+            data.toString().split('\n').forEach( item => {
+                if (item == '') return;
+                
+                this.log.debug( { data : item } , `Received data`); 
+                let message = this.parseMessage(item);
+                this.log.debug(message, `Parsed data`);                
+           
+                this.receiveFromMRC(this.mrcClient, message);
+            });
+        });
+
+        this.mrcClient.on('end', () => {
+            this.log.info(mrcConnectOpts, 'Disconnected from MRC server');
+        });
+
+        this.mrcClient.on('error', err => {
+            Log.info( { error : err.message }, 'MRC server error');
+        });
+
+        // start a local server for clients to connect to
+        this.server = net.createServer( function(socket) {
+            socket.setEncoding('ascii');
+            connectedSockets.add(socket);
+            
+            socket.on('data', data => {
+                // split on \n to deal with getting messages in batches
+                data.toString().split('\n').forEach( item => {
+                    if (item == '') return;
+
+                    // save username with socket
+                    if(item.startsWith('--DUDE-ITS--')) { 
+                        socket.username = item.split('|')[1];
+                        Log.debug( { server : 'MRC', user: socket.username } , `User connected`); 
+                    } 
+                    else {
+                        receiveFromClient(socket.username, item);
+                    }
+                });
+
+            });
+
+            socket.on('end', function() {
+                connectedSockets.delete(socket);
+            });
+
+            socket.on('error', err => {
+                if('ECONNRESET' !== err.code) { //  normal
+                    console.log(err.message);
+                }
+            });
+        });
+
+
+        return cb(null);
+    }
+
+    listen(cb) {
+        if (!this.enabled) {
+            return cb(null);
+        }
+
+        const config = Config();
+
+        const port = parseInt(config.chatServers.mrc.multiplexerPort);
+        if(isNaN(port)) {
+            this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
+            return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`));
+        }
+        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer local listener starting up');
+        return this.server.listen(port, cb);
+    }
+
+    get enabled() {
+        return _.get(Config(), 'chatServers.mrc.enabled', false) && this.isConfigured();
+    }
+
+    isConfigured() {
+        const config = Config();
+        return _.isNumber(_.get(config, 'chatServers.mrc.multiplexerPort'));
+    }
+
+    sendToClient(message, username) {
+        connectedSockets.forEach( (client) => {
+            this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user')
+            client.write(JSON.stringify(message) + '\n');
+        });
+    }
+
+    receiveFromMRC(socket, message) {
+    
+        const config = Config();
+        const siteName = slugify(config.general.boardName)
+
+        if (message.from_user == 'SERVER' && message.body == 'HELLO') {
+            // initial server hello, can ignore
+            return;
+
+        } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
+            // reply to heartbeat
+            // this.log.debug('Respond to heartbeat');
+            let message = sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
+            return message;
+
+        } else {
+            // if not a heartbeat, and we have clients then we need to send something to them
+            //console.log(this.connectedSockets);
+            this.sendToClient(message); 
+            return;    
+        }
+    }
+
+    // split raw data received into an object we can work with
+    parseMessage(line) {
+        const msg = line.split('~');
+        if (msg.length < 7) {
+            return;
+        }
+
+        return {
+            from_user: msg[0],
+            from_site: msg[1],
+            from_room: msg[2],
+            to_user: msg[3],
+            to_site: msg[4],
+            to_room: msg[5],
+            body: msg[6]
+        };
+    }
+
+};
+
+
+// User / site name must be ASCII 33-125, no MCI, 30 chars max, underscores
+function sanitiseName(str) {
+    return str.replace(
+        /\s/g, '_'
+    ).replace(
+        /[^\x21-\x7D]|(\|\w\w)/g, '' // Non-printable & MCI
+    ).substr(
+        0, 30
+    );
+}
+
+function sanitiseRoomName(message) {
+    return message.replace(/[^\x21-\x7D]|(\|\w\w)/g, '').substr(0, 30);
+}
+
+function sanitiseMessage(message) {
+    return message.replace(/[^\x20-\x7D]/g, '');
+}
+
+function receiveFromClient(username, message) {
+    try {
+        message = JSON.parse(message)
+        message.from_user = username
+    } catch (e) {
+        Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
+    }
+    
+    sendToMrcServer(mrcCentralConnection, message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body)
+}
+
+// send a message back to the mrc central server
+function sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
+    const config = Config();
+    const siteName = slugify(config.general.boardName)
+
+    const line = [
+        fromUser,
+        siteName,
+        sanitiseRoomName(fromRoom),
+        sanitiseName(toUser || ''),
+        sanitiseName(toSite || ''),
+        sanitiseRoomName(toRoom || ''),
+        sanitiseMessage(messageBody)
+    ].join('~') + '~';
+
+    Log.debug({ server : 'MRC', data : line }, 'Sending data');
+    return socket.write(line + '\n');
+}
+
+function slugify(text)
+{
+  return text.toString()
+    .replace(/\s+/g, '_')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '_')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
\ No newline at end of file

From 67ecad4e1a746fccf475559af4937207ee4d2bec Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 19 May 2019 00:01:58 +0100
Subject: [PATCH 0804/1013] Implemented most MRC server calls

---
 art/themes/luciano_blocktronics/mrc.ans | Bin 0 -> 881 bytes
 core/mrc.js                             | 191 +++++++++++++++++++-----
 core/servers/chat/mrc_multiplexer.js    |   5 +-
 3 files changed, 159 insertions(+), 37 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/mrc.ans

diff --git a/art/themes/luciano_blocktronics/mrc.ans b/art/themes/luciano_blocktronics/mrc.ans
new file mode 100644
index 0000000000000000000000000000000000000000..a1bbd030f30251860bafab4e8e98625373ec9843
GIT binary patch
literal 881
zcmb_a!AiqG5KZwSxq1<E$)#sEn`EN~ks5*&EQqaMa;pR^xTH4i*Y3jpi8!;9O;fCR
zaS6%h?VEXTXC|mv9_0zkV<xpy#smPsJ`Ac@$W7DWE<)r6HcXBek1+tE=uo3A5zq3N
z%P(RJIeRX8%u<C-2_m2Xndwl-ZL?mzQP4ml*@uuDV8odOH136s(!NrZhx}SX<OpGi
zXAqNKJ4h*C8H<i*izukB=zz;3T%&z_C`C57uTL3*Dob5n;}4fD1vo-|Yno?{*y|*T
zgHXgd6&z43zKe`lPXjmPMPLbzlb|3vyrm143l3LD-@kATRPWD>P%#5zp^ZjMTwdPc
zx9b!({Js8ILtFahVtZ{j?95op7$M}Ytv4-f4`(Uu02COIm&>;PNfvwZfeKkG=Qwdg
zZ=bu>)+vI3g7Nk*=98DAWDGj-UyHLyFu}#?iRX<*Pu{s_*V*)b7QQ}A=&yf&1A$QO
A@Bjb+

literal 0
HcmV?d00001

diff --git a/core/mrc.js b/core/mrc.js
index b6e68463..681944ab 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -6,10 +6,10 @@ const Log               = require('./logger.js').log;
 const { MenuModule }    = require('./menu_module.js');
 const { Errors }        = require('./enig_error.js');
 const {
-    pipeToAnsi,
-    stripMciColorCodes
+    pipeToAnsi
 }                       = require('./color_codes.js');
 const stringFormat              = require('./string_format.js');
+const StringUtil                = require('./string_util.js')
 const { getThemeArt }           = require('./theme.js');
 
 
@@ -24,8 +24,13 @@ exports.moduleInfo = {
     desc        : 'Connects to an MRC chat server',
     author      : 'RiPuk',
     packageName : 'codes.l33t.enigma.mrc.client',
+
+    // Whilst this module was put together by me (RiPuk), it should be noted that a lot of the ideas (and even some code snippets) were 
+    // borrowed from the Synchronet implementation of MRC by echicken. So...thanks, your code was very helpful in putting this together.
+    // Source at http://cvs.synchro.net/cgi-bin/viewcvs.cgi/xtrn/mrc/.
 };
 
+
 const FormIds = {
     mrcChat    : 0,
 };
@@ -36,7 +41,8 @@ var MciViewIds = {
         inputArea           : 2,
         roomName            : 3,
         roomTopic           : 4,
-
+        mrcUsers            : 5,
+        mrcBbses            : 6,
         customRangeStart    : 10,   //  10+ = customs
     }
 };
@@ -61,29 +67,31 @@ exports.getModule = class mrcModule extends MenuModule {
 
 
         this.menuMethods = {
+
             sendChatMessage : (formData, extraArgs, cb) => {
-                // const message = _.get(formData.value, 'inputArea', '').trim();
             
                 const inputAreaView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.inputArea);
                 const inputData		= inputAreaView.getData();
-                const textFormatObj = {
-                    fromUserName    : state.alias,
-                    message         : inputData
-                };
-        
-                const messageFormat =
-                    this.config.messageFormat ||
-                    '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
-        
-                try {
-                    sendChat(stringFormat(messageFormat, textFormatObj));
-                } catch(e) {
-                    self.client.log.warn( { error : e.message }, 'MRC error');
-                }
+
+                this.processSentMessage(inputData);
                 inputAreaView.clearText();
                 
                 return cb(null);
-            
+            },
+
+            movementKeyPressed : (formData, extraArgs, cb) => {
+                const bodyView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);  //  :TODO: use const here vs magic #
+                console.log("got arrow key");
+                switch(formData.key.name) {
+                    case 'down arrow'   : bodyView.scrollDocumentUp(); break;
+                    case 'up arrow'     : bodyView.scrollDocumentDown(); break;
+                    case 'page up'      : bodyView.keyPressPageUp(); break;
+                    case 'page down'    : bodyView.keyPressPageDown(); break;
+                }
+
+                this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
+
+                return cb(null);
             }
         }
     }
@@ -117,13 +125,13 @@ exports.getModule = class mrcModule extends MenuModule {
                         state.socket = net.createConnection(connectOpts, () => {
                             // handshake with multiplexer
                             state.socket.write(`--DUDE-ITS--|${state.alias}\n`);
-                            
 
                             sendClientConnect()
 
-                            // send register to central MRC every 60s
+                            // send register to central MRC and get stats every 60s
                             setInterval(function () { 
                                 sendHeartbeat(state.socket)
+                                sendServerCommand('STATS')
                             }, 60000); 
                         });
 
@@ -131,7 +139,6 @@ exports.getModule = class mrcModule extends MenuModule {
                         state.socket.on('data', data => {
                             data = data.toString();
                             this.processReceivedMessage(data);
-                            this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
                         });
 
                         return(callback);
@@ -153,37 +160,146 @@ exports.getModule = class mrcModule extends MenuModule {
                 return
             }
 
+            const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+
             if (message.from_user == 'SERVER') {
                 const params = message.body.split(':');
 
                 switch (params[0]) {
                     case 'BANNER':
-                        const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
                         chatMessageView.addText(pipeToAnsi(params[1].replace(/^\s+/, '')));
                         chatMessageView.redraw();
+                        break;
 
                     case 'ROOMTOPIC':
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomName).setText(params[1]);
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(params[2]);
-
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomName).setText(`#${params[1]}`);
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(pipeToAnsi(params[2]));
+                        state.room = params[1]
+                        break;
+                        
                     case 'USERLIST':
                         state.nicks = params[1].split(',');
+                        break;
+                    
+                    case 'STATS':
+                        const stats = params[1].split(' ');
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcUsers).setText(stats[2]);
+                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcBbses).setText(stats[0]);
 
-                    break;
+                        break;
+
+                    default:
+                        chatMessageView.addText(pipeToAnsi(message.body));
+                        break;
                 }
 
             } else {
-                // if we're here then we want to show it to the user
-                const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
-                const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
-                chatMessageView.addText(pipeToAnsi("|08" + currentTime + "|00 " + message.body));
-                chatMessageView.redraw();
+                if (message.from_user == state.alias && message.to_user == "NOTME") {
+                    // don't deliver NOTME messages
+                    return;
+                } else {
+                    // if we're here then we want to show it to the user
+                    const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
+                    chatMessageView.addText(pipeToAnsi("|08" + currentTime + "|00 " + message.body + "|00"));
+                    chatMessageView.redraw();
+                }
             }
 
+            this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
             return;
-    
         });
     }
+
+    processSentMessage(message) {
+
+        if (message.startsWith('/')) {
+            const cmd = message.split(' ');
+            cmd[0] = cmd[0].substr(1).toLowerCase();
+
+            switch (cmd[0]) {
+                case 'rainbow':
+                    const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
+                        var cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
+                        a += `|${cc}${c}|00 `
+                        return a;
+                    }, '').substr(0, 140).replace(/\\s\|\d*$/, '');
+
+                    this.processSentMessage(line)
+                    break;
+
+                case 'l33t':
+                    this.processSentMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
+                    break;
+
+                case 'kewl':
+                    const text_modes = Array('f','v','V','i','M');
+                    const mode = text_modes[Math.floor(Math.random() * text_modes.length)];
+                    this.processSentMessage(StringUtil.stylizeString(message.substr(5), mode));
+                    break;
+
+                case 'whoon':
+                    sendServerCommand('WHOON');
+                    break;
+                
+                case 'motd':
+                    sendServerCommand('MOTD');
+                    break;
+
+                case 'meetups':
+                    sendServerCommand('MEETUPS');
+                    break;
+                
+                case 'bbses':
+                    sendServerCommand('CONNECTED');
+                    break;
+
+                case 'topic':
+                    sendServerCommand(`NEWTOPIC:${state.room}:${message.substr(7)}`)
+                    break;
+                
+                case 'join':
+                    joinRoom(cmd[1]);
+                    break;
+
+                case 'chatters':
+                    sendServerCommand('CHATTERS');
+                    break;
+
+                case 'rooms':
+                    sendServerCommand('LIST');
+                    break;
+                
+                case 'clear':
+                    const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog)
+                    chatLogView.setText('');
+                    sendServerCommand('STATS');
+                    // chatLogView.redraw();
+                    break;
+
+                default:
+                    break;
+            }
+
+        } else {
+            // just format and send
+            const textFormatObj = {
+                fromUserName    : state.alias,
+                message         : message
+            };
+    
+            const messageFormat =
+                this.config.messageFormat ||
+                '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
+    
+            try {
+                sendChat(stringFormat(messageFormat, textFormatObj));
+            } catch(e) {
+                self.client.log.warn( { error : e.message }, 'MRC error');
+            }
+        }
+        
+        return;
+    }
     
 };
 
@@ -205,7 +321,7 @@ function sendMessage(to_user, to_site, to_room, body) {
     state.socket.write(JSON.stringify(message) + '\n');
 }
 
-function sendChat(message,to_user) {
+function sendChat(message, to_user) {
     sendMessage(to_user || '', '', state.room, message)
 }
 
@@ -222,12 +338,15 @@ function sendHeartbeat() {
 
 function sendClientConnect() {
     sendHeartbeat();
-    joinRoom('lobby');
-    sendServerCommand('BANNERS');
     sendServerCommand('MOTD');
+    sendServerCommand('STATS');
+    joinRoom('lobby');
     return;
 }
 
 function joinRoom(room) {
+    // room names are displayed with a # but referred to without. confusing. 
+    room = room.replace(/^#/, '');
     sendServerCommand(`NEWROOM:${state.room}:${room}`);
+    sendServerCommand('USERLIST')
 }
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 5419088a..87f78a33 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -46,7 +46,7 @@ exports.getModule = class MrcModule extends ServerModule {
         const enigmaVersion = "ENiGMA-BBS_" + require('../../../package.json').version
 
         const mrcConnectOpts = {
-            port    : 5000,
+            port    : 50000,
             host    : "mrc.bottomlessabyss.net"
         };
 
@@ -65,6 +65,9 @@ exports.getModule = class MrcModule extends ServerModule {
             // split on \n to deal with getting messages in batches
             data.toString().split('\n').forEach( item => {
                 if (item == '') return;
+                console.log('start')
+                console.log(item)
+                console.log('end')
                 
                 this.log.debug( { data : item } , `Received data`); 
                 let message = this.parseMessage(item);

From 92528fc16f73c5b407791fdbf2d74241a44a151b Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 20 May 2019 23:37:32 +0100
Subject: [PATCH 0805/1013] MRC bug squashing

---
 core/mrc.js                          | 346 +++++++++++++++------------
 core/servers/chat/mrc_multiplexer.js |  29 +--
 2 files changed, 207 insertions(+), 168 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 681944ab..7cf2661d 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -10,8 +10,6 @@ const {
 }                       = require('./color_codes.js');
 const stringFormat              = require('./string_format.js');
 const StringUtil                = require('./string_util.js')
-const { getThemeArt }           = require('./theme.js');
-
 
 //  deps
 const _                 = require('lodash');
@@ -30,7 +28,6 @@ exports.moduleInfo = {
     // Source at http://cvs.synchro.net/cgi-bin/viewcvs.cgi/xtrn/mrc/.
 };
 
-
 const FormIds = {
     mrcChat    : 0,
 };
@@ -47,15 +44,28 @@ var MciViewIds = {
     }
 };
 
-const state = {
-    socket: '',
-    alias: '',
-    room: '',
-    room_topic: '',
-    nicks: [],
-    last_ping: 0
-};
+
  
+// TODO: this is a bit shit, could maybe do it with an ansi instead
+const helpText = `
+General Chat:
+/rooms                     - List of current rooms
+/join <room>               - Join a room
+/pm <user> <message>       - Send a private message
+/clear                     - Clear the chat log
+----
+/whoon                     - Who's on what BBS
+/chatters                  - Who's in what room
+/topic <message>           - Set the topic
+/meetups                   - MRC MeetUps
+/bbses                     - BBS's connected
+/info <id>                 - Info about specific BBS
+---
+/l33t <your message>       - l337 5p34k
+/kewl <your message>       - BBS KeWL SPeaK
+/rainbow <your message>    - Crazy rainbow text
+`;
+
 
 exports.getModule = class mrcModule extends MenuModule {
     constructor(options) {
@@ -63,9 +73,16 @@ exports.getModule = class mrcModule extends MenuModule {
 
         this.log    = Log.child( { module : 'MRC' } );
         this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
-        state.alias = this.client.user.username;
-
-
+        
+        this.state = {
+            socket: '',
+            alias: this.client.user.username,
+            room: '',
+            room_topic: '',
+            nicks: [],
+            last_ping: 0
+        };
+        
         this.menuMethods = {
 
             sendChatMessage : (formData, extraArgs, cb) => {
@@ -81,7 +98,6 @@ exports.getModule = class mrcModule extends MenuModule {
 
             movementKeyPressed : (formData, extraArgs, cb) => {
                 const bodyView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);  //  :TODO: use const here vs magic #
-                console.log("got arrow key");
                 switch(formData.key.name) {
                     case 'down arrow'   : bodyView.scrollDocumentUp(); break;
                     case 'up arrow'     : bodyView.scrollDocumentDown(); break;
@@ -103,12 +119,7 @@ exports.getModule = class mrcModule extends MenuModule {
             }
 
             async.series(
-                [   
-                    // (callback) => {
-                    //     console.log("stop idle monitor")
-                    //     this.client.stopIdleMonitor();
-                    //     return(callback);
-                    // },
+                [
                     (callback) => {
                         return this.prepViewController('mrcChat', FormIds.mrcChat, mciData.menu, callback);
                     },
@@ -122,21 +133,22 @@ exports.getModule = class mrcModule extends MenuModule {
                         };
 
                         // connect to multiplexer
-                        state.socket = net.createConnection(connectOpts, () => {
+                        this.state.socket = net.createConnection(connectOpts, () => {
+                            const self = this;
                             // handshake with multiplexer
-                            state.socket.write(`--DUDE-ITS--|${state.alias}\n`);
+                            self.state.socket.write(`--DUDE-ITS--|${self.state.alias}\n`);
 
-                            sendClientConnect()
+                            self.clientConnect();
 
                             // send register to central MRC and get stats every 60s
-                            setInterval(function () { 
-                                sendHeartbeat(state.socket)
-                                sendServerCommand('STATS')
-                            }, 60000); 
+                            setInterval(function () {
+                                self.sendHeartbeat();
+                                self.sendServerCommand('STATS')
+                            }, 60000);
                         });
 
                         // when we get data, process it
-                        state.socket.on('data', data => {
+                        this.state.socket.on('data', data => {
                             data = data.toString();
                             this.processReceivedMessage(data);
                         });
@@ -162,29 +174,31 @@ exports.getModule = class mrcModule extends MenuModule {
 
             const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
 
+
             if (message.from_user == 'SERVER') {
                 const params = message.body.split(':');
 
                 switch (params[0]) {
                     case 'BANNER':
                         chatMessageView.addText(pipeToAnsi(params[1].replace(/^\s+/, '')));
-                        chatMessageView.redraw();
                         break;
 
                     case 'ROOMTOPIC':
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomName).setText(`#${params[1]}`);
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(pipeToAnsi(params[2]));
-                        state.room = params[1]
+                        this.state.room = params[1];
                         break;
                         
                     case 'USERLIST':
-                        state.nicks = params[1].split(',');
+                        this.state.nicks = params[1].split(',');
                         break;
                     
                     case 'STATS':
+                        console.log("got stats back")
                         const stats = params[1].split(' ');
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcUsers).setText(stats[2]);
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcBbses).setText(stats[0]);
+                        this.state.last_ping = stats[1];
 
                         break;
 
@@ -194,159 +208,183 @@ exports.getModule = class mrcModule extends MenuModule {
                 }
 
             } else {
-                if (message.from_user == state.alias && message.to_user == "NOTME") {
+                if (message.from_user == this.state.alias && message.to_user == "NOTME") {
                     // don't deliver NOTME messages
                     return;
                 } else {
                     // if we're here then we want to show it to the user
                     const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
                     chatMessageView.addText(pipeToAnsi("|08" + currentTime + "|00 " + message.body + "|00"));
-                    chatMessageView.redraw();
                 }
             }
 
             this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
-            return;
         });
     }
 
-    processSentMessage(message) {
-
+    processSentMessage(message, to_user) {
         if (message.startsWith('/')) {
-            const cmd = message.split(' ');
-            cmd[0] = cmd[0].substr(1).toLowerCase();
 
-            switch (cmd[0]) {
-                case 'rainbow':
-                    const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
-                        var cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
-                        a += `|${cc}${c}|00 `
-                        return a;
-                    }, '').substr(0, 140).replace(/\\s\|\d*$/, '');
-
-                    this.processSentMessage(line)
-                    break;
-
-                case 'l33t':
-                    this.processSentMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
-                    break;
-
-                case 'kewl':
-                    const text_modes = Array('f','v','V','i','M');
-                    const mode = text_modes[Math.floor(Math.random() * text_modes.length)];
-                    this.processSentMessage(StringUtil.stylizeString(message.substr(5), mode));
-                    break;
-
-                case 'whoon':
-                    sendServerCommand('WHOON');
-                    break;
-                
-                case 'motd':
-                    sendServerCommand('MOTD');
-                    break;
-
-                case 'meetups':
-                    sendServerCommand('MEETUPS');
-                    break;
-                
-                case 'bbses':
-                    sendServerCommand('CONNECTED');
-                    break;
-
-                case 'topic':
-                    sendServerCommand(`NEWTOPIC:${state.room}:${message.substr(7)}`)
-                    break;
-                
-                case 'join':
-                    joinRoom(cmd[1]);
-                    break;
-
-                case 'chatters':
-                    sendServerCommand('CHATTERS');
-                    break;
-
-                case 'rooms':
-                    sendServerCommand('LIST');
-                    break;
-                
-                case 'clear':
-                    const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog)
-                    chatLogView.setText('');
-                    sendServerCommand('STATS');
-                    // chatLogView.redraw();
-                    break;
-
-                default:
-                    break;
-            }
+            this.processSlashCommand(message)
 
         } else {
+            if (message == '') {
+                this.sendServerCommand('STATS');
+                return;
+            }
+
             // just format and send
             const textFormatObj = {
-                fromUserName    : state.alias,
+                fromUserName    : this.state.alias,
                 message         : message
             };
-    
+
             const messageFormat =
                 this.config.messageFormat ||
                 '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
-    
+
             try {
-                sendChat(stringFormat(messageFormat, textFormatObj));
+                this.sendChat(stringFormat(messageFormat, textFormatObj), to_user || '');
             } catch(e) {
-                self.client.log.warn( { error : e.message }, 'MRC error');
+                this.client.log.warn( { error : e.message }, 'MRC error');
             }
         }
-        
-        return;
+
+    }
+
+    processSlashCommand(message) {
+        // get the chat log view in case we need it
+        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog)
+
+        const cmd = message.split(' ');
+        cmd[0] = cmd[0].substr(1).toLowerCase();
+
+        switch (cmd[0]) {
+            case 'pm':
+                this.processSentMessage(cmd[2], cmd[1])
+                break;
+            case 'rainbow':
+                // this is brutal, but i love it
+                const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
+                    var cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
+                    a += `|${cc}${c}|00 `;
+                    return a;
+                }, '').substr(0, 140).replace(/\\s\|\d*$/, '');
+
+                this.processSentMessage(line);
+                break;
+
+            case 'l33t':
+                this.processSentMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
+                break;
+
+            case 'kewl':
+                const text_modes = Array('f','v','V','i','M');
+                const mode = text_modes[Math.floor(Math.random() * text_modes.length)];
+                this.processSentMessage(StringUtil.stylizeString(message.substr(5), mode));
+                break;
+
+            case 'whoon':
+                this.sendServerCommand('WHOON');
+                break;
+
+            case 'motd':
+                this.sendServerCommand('MOTD');
+                break;
+
+            case 'meetups':
+                this.sendServerCommand('MEETUPS');
+                break;
+
+            case 'bbses':
+                this.sendServerCommand('CONNECTED');
+                break;
+
+            case 'topic':
+                this.sendServerCommand(`NEWTOPIC:${this.state.room}:${message.substr(7)}`)
+                break;
+
+            case 'info':
+                this.sendServerCommand(`INFO ${cmd[1]}`);
+                break;
+
+            case 'join':
+                this.joinRoom(cmd[1]);
+                break;
+
+            case 'chatters':
+                this.sendServerCommand('CHATTERS');
+                break;
+
+            case 'rooms':
+                this.sendServerCommand('LIST');
+                break;
+
+            case 'clear':
+                chatLogView.setText('');
+                break;
+
+            case '?':
+                chatLogView.addText(helpText);
+                break;
+
+            default:
+                
+                break;
+        }
+
+        // just do something to get the cursor back to the right place ¯\_(ツ)_/¯
+        this.sendServerCommand('STATS');
+
+    };
+
+    sendMessage(to_user, to_site, to_room, body) {
+
+        const message = {
+            from_user: this.state.alias,
+            from_room: this.state.room,
+            to_user: to_user,
+            to_site: to_site,
+            to_room: to_room,
+            body: body
+        };
+
+        this.log.debug({ message: message }, 'Sending message to MRC multiplexer');
+        // TODO: check socket still exists here
+
+        this.state.socket.write(JSON.stringify(message) + '\n');
+    };
+
+    sendServerCommand(command, to_site) {
+        Log.debug({ module: 'mrc', command: command }, 'Sending server command');
+        this.sendMessage('SERVER', to_site || '', this.state.room, command);
+    };
+
+
+    sendHeartbeat() {
+        this.sendServerCommand('IAMHERE');
+    }
+
+    joinRoom(room) {
+        // room names are displayed with a # but referred to without. confusing.
+        room = room.replace(/^#/, '');
+        this.state.room = room;
+        this.sendServerCommand(`NEWROOM:${this.state.room}:${room}`);
+        this.sendServerCommand('USERLIST')
+    }
+
+    clientConnect() {
+        this.sendServerCommand('MOTD');
+        this.joinRoom('lobby');
+        this.sendServerCommand('STATS');
+        this.sendHeartbeat();
+    }
+
+    sendChat(message, to_user) {
+        this.sendMessage(to_user || '', '', this.state.room, message)
     }
-    
 };
 
 
-function sendMessage(to_user, to_site, to_room, body) {
-    // drop message if user just mashes enter
-    if (body == '' || body == state.alias) return;
-    
-    // otherwise construct message
-    const message = {
-        from_room: state.room,
-        to_user: to_user,
-        to_site: to_site,
-        to_room: to_room,
-        body: body
-    }
-    Log.debug({module: 'mrcclient', message: message}, 'Sending message to MRC multiplexer');
-    // TODO: check socket still exists here
-    state.socket.write(JSON.stringify(message) + '\n');
-}
 
-function sendChat(message, to_user) {
-    sendMessage(to_user || '', '', state.room, message)
-}
 
-function sendServerCommand(command, to_site) {
-    Log.debug({ module: 'mrc', command: command }, 'Sending server command');
-    sendMessage('SERVER', to_site || '', state.room, command);
-    return;
-}
-
-function sendHeartbeat() {
-    sendServerCommand('IAMHERE');
-    return;
-}
-
-function sendClientConnect() {
-    sendHeartbeat();
-    sendServerCommand('MOTD');
-    sendServerCommand('STATS');
-    joinRoom('lobby');
-    return;
-}
-
-function joinRoom(room) {
-    // room names are displayed with a # but referred to without. confusing. 
-    room = room.replace(/^#/, '');
-    sendServerCommand(`NEWROOM:${state.room}:${room}`);
-    sendServerCommand('USERLIST')
-}
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 87f78a33..ef0138f8 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -14,6 +14,7 @@ const net                   = require('net');
 const _                     = require('lodash');
 const os                    = require('os');
 
+
 // MRC
 const PROTOCOL_VERSION = '1.2.9';
 
@@ -65,15 +66,13 @@ exports.getModule = class MrcModule extends ServerModule {
             // split on \n to deal with getting messages in batches
             data.toString().split('\n').forEach( item => {
                 if (item == '') return;
-                console.log('start')
-                console.log(item)
-                console.log('end')
                 
                 this.log.debug( { data : item } , `Received data`); 
                 let message = this.parseMessage(item);
                 this.log.debug(message, `Parsed data`);                
-           
-                this.receiveFromMRC(this.mrcClient, message);
+                if (message) {
+                    this.receiveFromMRC(this.mrcClient, message);
+                }
             });
         });
 
@@ -82,13 +81,12 @@ exports.getModule = class MrcModule extends ServerModule {
         });
 
         this.mrcClient.on('error', err => {
-            Log.info( { error : err.message }, 'MRC server error');
+            this.log.info( { error : err.message }, 'MRC server error');
         });
 
         // start a local server for clients to connect to
         this.server = net.createServer( function(socket) {
             socket.setEncoding('ascii');
-            connectedSockets.add(socket);
             
             socket.on('data', data => {
                 // split on \n to deal with getting messages in batches
@@ -96,7 +94,8 @@ exports.getModule = class MrcModule extends ServerModule {
                     if (item == '') return;
 
                     // save username with socket
-                    if(item.startsWith('--DUDE-ITS--')) { 
+                    if(item.startsWith('--DUDE-ITS--')) {
+                        connectedSockets.add(socket);
                         socket.username = item.split('|')[1];
                         Log.debug( { server : 'MRC', user: socket.username } , `User connected`); 
                     } 
@@ -147,10 +146,12 @@ exports.getModule = class MrcModule extends ServerModule {
         return _.isNumber(_.get(config, 'chatServers.mrc.multiplexerPort'));
     }
 
-    sendToClient(message, username) {
+    sendToClient(message) {
         connectedSockets.forEach( (client) => {
-            this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user')
-            client.write(JSON.stringify(message) + '\n');
+            if (message.to_user == '' || message.to_user == client.username || message.to_user == 'CLIENT') {
+                // this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user')
+                client.write(JSON.stringify(message) + '\n');
+            }
         });
     }
 
@@ -172,7 +173,8 @@ exports.getModule = class MrcModule extends ServerModule {
         } else {
             // if not a heartbeat, and we have clients then we need to send something to them
             //console.log(this.connectedSockets);
-            this.sendToClient(message); 
+            this.sendToClient(message);
+            
             return;    
         }
     }
@@ -220,7 +222,6 @@ function sanitiseMessage(message) {
 function receiveFromClient(username, message) {
     try {
         message = JSON.parse(message)
-        message.from_user = username
     } catch (e) {
         Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
     }
@@ -250,7 +251,7 @@ function sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, mes
 function slugify(text)
 {
   return text.toString()
-    .replace(/\s+/g, '_')           // Replace spaces with -
+    .replace(/\s+/g, '_')           // Replace spaces with _
     .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
     .replace(/\-\-+/g, '_')         // Replace multiple - with single -
     .replace(/^-+/, '')             // Trim - from start of text

From 9f4f1fca13203fbd7cf46f36d47ba929b7c21588 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Wed, 22 May 2019 23:43:41 +0100
Subject: [PATCH 0806/1013] Refactor and rename of MRC client and multiplexer

---
 core/mrc.js                          | 162 ++++++++++++++++-----------
 core/servers/chat/mrc_multiplexer.js | 119 +++++++++-----------
 2 files changed, 152 insertions(+), 129 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 7cf2661d..5320c999 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -4,12 +4,11 @@
 //  ENiGMA½
 const Log               = require('./logger.js').log;
 const { MenuModule }    = require('./menu_module.js');
-const { Errors }        = require('./enig_error.js');
 const {
     pipeToAnsi
 }                       = require('./color_codes.js');
 const stringFormat              = require('./string_format.js');
-const StringUtil                = require('./string_util.js')
+const StringUtil                = require('./string_util.js');
 
 //  deps
 const _                 = require('lodash');
@@ -23,7 +22,7 @@ exports.moduleInfo = {
     author      : 'RiPuk',
     packageName : 'codes.l33t.enigma.mrc.client',
 
-    // Whilst this module was put together by me (RiPuk), it should be noted that a lot of the ideas (and even some code snippets) were 
+    // Whilst this module was put together by me (RiPuk), it should be noted that a lot of the ideas (and even some code snippets) were
     // borrowed from the Synchronet implementation of MRC by echicken. So...thanks, your code was very helpful in putting this together.
     // Source at http://cvs.synchro.net/cgi-bin/viewcvs.cgi/xtrn/mrc/.
 };
@@ -45,7 +44,7 @@ var MciViewIds = {
 };
 
 
- 
+
 // TODO: this is a bit shit, could maybe do it with an ansi instead
 const helpText = `
 General Chat:
@@ -73,7 +72,7 @@ exports.getModule = class mrcModule extends MenuModule {
 
         this.log    = Log.child( { module : 'MRC' } );
         this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
-        
+
         this.state = {
             socket: '',
             alias: this.client.user.username,
@@ -82,17 +81,17 @@ exports.getModule = class mrcModule extends MenuModule {
             nicks: [],
             last_ping: 0
         };
-        
+
         this.menuMethods = {
 
             sendChatMessage : (formData, extraArgs, cb) => {
-            
+
                 const inputAreaView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.inputArea);
                 const inputData		= inputAreaView.getData();
 
-                this.processSentMessage(inputData);
+                this.processOutgoingMessage(inputData);
                 inputAreaView.clearText();
-                
+
                 return cb(null);
             },
 
@@ -109,7 +108,7 @@ exports.getModule = class mrcModule extends MenuModule {
 
                 return cb(null);
             }
-        }
+        };
     }
 
     mciReady(mciData, cb) {
@@ -129,7 +128,7 @@ exports.getModule = class mrcModule extends MenuModule {
                     (callback) => {
                         const connectOpts = {
                             port	: 5000,
-                            host	: "localhost",
+                            host	: 'localhost',
                         };
 
                         // connect to multiplexer
@@ -143,7 +142,7 @@ exports.getModule = class mrcModule extends MenuModule {
                             // send register to central MRC and get stats every 60s
                             setInterval(function () {
                                 self.sendHeartbeat();
-                                self.sendServerCommand('STATS')
+                                self.sendServerMessage('STATS');
                             }, 60000);
                         });
 
@@ -159,28 +158,36 @@ exports.getModule = class mrcModule extends MenuModule {
                 err => {
                     return cb(err);
                 }
-           );
+            );
         });
     }
 
+    /**
+     * Adds a message to the chat log on screen
+     */
+    addMessageToChatLog(message) {
+        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+        chatLogView.addText(pipeToAnsi(message));
+    }
+
+    /**
+     * Processes data received back from the MRC multiplexer
+     */    
     processReceivedMessage(blob) {
         blob.split('\n').forEach( message => {
 
             try {
-                message = JSON.parse(message)
+                message = JSON.parse(message);
             } catch (e) {
-                return
+                return;
             }
 
-            const chatMessageView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
-
-
             if (message.from_user == 'SERVER') {
                 const params = message.body.split(':');
 
                 switch (params[0]) {
                     case 'BANNER':
-                        chatMessageView.addText(pipeToAnsi(params[1].replace(/^\s+/, '')));
+                        this.addMessageToChatLog(params[1].replace(/^\s+/, ''));
                         break;
 
                     case 'ROOMTOPIC':
@@ -188,13 +195,12 @@ exports.getModule = class mrcModule extends MenuModule {
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(pipeToAnsi(params[2]));
                         this.state.room = params[1];
                         break;
-                        
+
                     case 'USERLIST':
                         this.state.nicks = params[1].split(',');
                         break;
-                    
+
                     case 'STATS':
-                        console.log("got stats back")
                         const stats = params[1].split(' ');
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcUsers).setText(stats[2]);
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcBbses).setText(stats[0]);
@@ -203,18 +209,25 @@ exports.getModule = class mrcModule extends MenuModule {
                         break;
 
                     default:
-                        chatMessageView.addText(pipeToAnsi(message.body));
+                        this.addMessageToChatLog(message.body);
                         break;
                 }
 
             } else {
-                if (message.from_user == this.state.alias && message.to_user == "NOTME") {
+                if (message.from_user == this.state.alias && message.to_user == 'NOTME') {
                     // don't deliver NOTME messages
                     return;
                 } else {
                     // if we're here then we want to show it to the user
                     const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
-                    chatMessageView.addText(pipeToAnsi("|08" + currentTime + "|00 " + message.body + "|00"));
+
+                    if (message.to_user == this.state.alias) {
+                        // it's a pm
+                        this.addMessageToChatLog('|08' + currentTime + ' |14PM|00 ' + message.body + '|00');
+                    } else {
+                        // it's not a pm
+                        this.addMessageToChatLog('|08' + currentTime + '|00 ' + message.body + '|00');
+                    }
                 }
             }
 
@@ -222,14 +235,17 @@ exports.getModule = class mrcModule extends MenuModule {
         });
     }
 
-    processSentMessage(message, to_user) {
+    /**
+     * Receives the message input from the user and does something with it based on what it is
+     */
+    processOutgoingMessage(message, to_user) {
         if (message.startsWith('/')) {
 
-            this.processSlashCommand(message)
+            this.processSlashCommand(message);
 
         } else {
             if (message == '') {
-                this.sendServerCommand('STATS');
+                this.sendServerMessage('STATS');
                 return;
             }
 
@@ -244,7 +260,8 @@ exports.getModule = class mrcModule extends MenuModule {
                 '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
 
             try {
-                this.sendChat(stringFormat(messageFormat, textFormatObj), to_user || '');
+                const formattedMessage = stringFormat(messageFormat, textFormatObj);
+                this.sendMessageToMultiplexer(to_user || '', '', this.state.room, formattedMessage);
             } catch(e) {
                 this.client.log.warn( { error : e.message }, 'MRC error');
             }
@@ -252,60 +269,63 @@ exports.getModule = class mrcModule extends MenuModule {
 
     }
 
+    /**
+     * Processes a message that begins with a slash
+     */
     processSlashCommand(message) {
         // get the chat log view in case we need it
-        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog)
+        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
 
         const cmd = message.split(' ');
         cmd[0] = cmd[0].substr(1).toLowerCase();
 
         switch (cmd[0]) {
             case 'pm':
-                this.processSentMessage(cmd[2], cmd[1])
+                this.processOutgoingMessage(cmd[2], cmd[1]);
                 break;
             case 'rainbow':
                 // this is brutal, but i love it
                 const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
-                    var cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
+                    const cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
                     a += `|${cc}${c}|00 `;
                     return a;
                 }, '').substr(0, 140).replace(/\\s\|\d*$/, '');
 
-                this.processSentMessage(line);
+                this.processOutgoingMessage(line);
                 break;
 
             case 'l33t':
-                this.processSentMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
+                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
                 break;
 
             case 'kewl':
                 const text_modes = Array('f','v','V','i','M');
                 const mode = text_modes[Math.floor(Math.random() * text_modes.length)];
-                this.processSentMessage(StringUtil.stylizeString(message.substr(5), mode));
+                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(5), mode));
                 break;
 
             case 'whoon':
-                this.sendServerCommand('WHOON');
+                this.sendServerMessage('WHOON');
                 break;
 
             case 'motd':
-                this.sendServerCommand('MOTD');
+                this.sendServerMessage('MOTD');
                 break;
 
             case 'meetups':
-                this.sendServerCommand('MEETUPS');
+                this.sendServerMessage('MEETUPS');
                 break;
 
             case 'bbses':
-                this.sendServerCommand('CONNECTED');
+                this.sendServerMessage('CONNECTED');
                 break;
 
             case 'topic':
-                this.sendServerCommand(`NEWTOPIC:${this.state.room}:${message.substr(7)}`)
+                this.sendServerMessage(`NEWTOPIC:${this.state.room}:${message.substr(7)}`);
                 break;
 
             case 'info':
-                this.sendServerCommand(`INFO ${cmd[1]}`);
+                this.sendServerMessage(`INFO ${cmd[1]}`);
                 break;
 
             case 'join':
@@ -313,11 +333,11 @@ exports.getModule = class mrcModule extends MenuModule {
                 break;
 
             case 'chatters':
-                this.sendServerCommand('CHATTERS');
+                this.sendServerMessage('CHATTERS');
                 break;
 
             case 'rooms':
-                this.sendServerCommand('LIST');
+                this.sendServerMessage('LIST');
                 break;
 
             case 'clear':
@@ -325,20 +345,23 @@ exports.getModule = class mrcModule extends MenuModule {
                 break;
 
             case '?':
-                chatLogView.addText(helpText);
+                this.addMessageToChatLog(helpText);
                 break;
 
             default:
-                
+
                 break;
         }
 
         // just do something to get the cursor back to the right place ¯\_(ツ)_/¯
-        this.sendServerCommand('STATS');
+        this.sendServerMessage('STATS');
 
-    };
+    }
 
-    sendMessage(to_user, to_site, to_room, body) {
+    /**
+     * Creates a json object, stringifies it and sends it to the MRC multiplexer
+     */
+    sendMessageToMultiplexer(to_user, to_site, to_room, body) {
 
         const message = {
             from_user: this.state.alias,
@@ -353,36 +376,43 @@ exports.getModule = class mrcModule extends MenuModule {
         // TODO: check socket still exists here
 
         this.state.socket.write(JSON.stringify(message) + '\n');
-    };
-
-    sendServerCommand(command, to_site) {
-        Log.debug({ module: 'mrc', command: command }, 'Sending server command');
-        this.sendMessage('SERVER', to_site || '', this.state.room, command);
-    };
-
-
-    sendHeartbeat() {
-        this.sendServerCommand('IAMHERE');
     }
 
+    /**
+     * Sends an MRC 'server' message
+     */
+    sendServerMessage(command, to_site) {
+        Log.debug({ module: 'mrc', command: command }, 'Sending server command');
+        this.sendMessageToMultiplexer('SERVER', to_site || '', this.state.room, command);
+    }
+
+    /**
+     * Sends a heartbeat to the MRC server
+     */
+    sendHeartbeat() {
+        this.sendServerMessage('IAMHERE');
+    }
+
+    /**
+     * Joins a room, unsurprisingly
+     */
     joinRoom(room) {
         // room names are displayed with a # but referred to without. confusing.
         room = room.replace(/^#/, '');
         this.state.room = room;
-        this.sendServerCommand(`NEWROOM:${this.state.room}:${room}`);
-        this.sendServerCommand('USERLIST')
+        this.sendServerMessage(`NEWROOM:${this.state.room}:${room}`);
+        this.sendServerMessage('USERLIST');
     }
 
+    /**
+     * Things that happen when a local user connects to the MRC multiplexer
+     */
     clientConnect() {
-        this.sendServerCommand('MOTD');
+        this.sendServerMessage('MOTD');
         this.joinRoom('lobby');
-        this.sendServerCommand('STATS');
+        this.sendServerMessage('STATS');
         this.sendHeartbeat();
     }
-
-    sendChat(message, to_user) {
-        this.sendMessage(to_user || '', '', this.state.room, message)
-    }
 };
 
 
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index ef0138f8..9410a237 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -6,8 +6,6 @@ const Log                       = require('../../logger.js').log;
 const { ServerModule }          = require('../../server_module.js');
 const Config                    = require('../../config.js').get;
 const { Errors }                = require('../../enig_error.js');
-const { wordWrapText }          = require('../../word_wrap.js');
-const { stripMciColorCodes }    = require('../../color_codes.js');
 
 //  deps
 const net                   = require('net');
@@ -41,24 +39,26 @@ exports.getModule = class MrcModule extends ServerModule {
         if (!this.enabled) {
             return cb(null);
         }
-        
+
+        const self = this;
+
         const config = Config();
-        const boardName  = config.general.boardName
-        const enigmaVersion = "ENiGMA-BBS_" + require('../../../package.json').version
+        const boardName  = config.general.boardName;
+        const enigmaVersion = 'ENiGMA-BBS_' + require('../../../package.json').version;
 
         const mrcConnectOpts = {
             port    : 50000,
-            host    : "mrc.bottomlessabyss.net"
+            host    : 'mrc.bottomlessabyss.net'
         };
 
-        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${PROTOCOL_VERSION}`
-        this.log.debug({ handshake : handshake }, "Handshaking with MRC server")
+        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${PROTOCOL_VERSION}`;
+        this.log.debug({ handshake : handshake }, 'Handshaking with MRC server');
 
         // create connection to MRC server
         this.mrcClient = net.createConnection(mrcConnectOpts, () => {
             this.mrcClient.write(handshake);
             this.log.info(mrcConnectOpts, 'Connected to MRC server');
-            mrcCentralConnection = this.mrcClient
+            mrcCentralConnection = this.mrcClient;
         });
 
         // do things when we get data from MRC central
@@ -66,10 +66,10 @@ exports.getModule = class MrcModule extends ServerModule {
             // split on \n to deal with getting messages in batches
             data.toString().split('\n').forEach( item => {
                 if (item == '') return;
-                
-                this.log.debug( { data : item } , `Received data`); 
+
+                this.log.debug( { data : item } , 'Received data');
                 let message = this.parseMessage(item);
-                this.log.debug(message, `Parsed data`);                
+                this.log.debug(message, 'Parsed data');
                 if (message) {
                     this.receiveFromMRC(this.mrcClient, message);
                 }
@@ -87,20 +87,20 @@ exports.getModule = class MrcModule extends ServerModule {
         // start a local server for clients to connect to
         this.server = net.createServer( function(socket) {
             socket.setEncoding('ascii');
-            
+
             socket.on('data', data => {
                 // split on \n to deal with getting messages in batches
                 data.toString().split('\n').forEach( item => {
+
                     if (item == '') return;
 
                     // save username with socket
                     if(item.startsWith('--DUDE-ITS--')) {
                         connectedSockets.add(socket);
                         socket.username = item.split('|')[1];
-                        Log.debug( { server : 'MRC', user: socket.username } , `User connected`); 
-                    } 
-                    else {
-                        receiveFromClient(socket.username, item);
+                        Log.debug( { server : 'MRC', user: socket.username } , 'User connected');
+                    } else {
+                        self.receiveFromClient(socket.username, item);
                     }
                 });
 
@@ -112,7 +112,7 @@ exports.getModule = class MrcModule extends ServerModule {
 
             socket.on('error', err => {
                 if('ECONNRESET' !== err.code) { //  normal
-                    console.log(err.message);
+                    this.log.error( { error: err.message }, 'MRC error' );
                 }
             });
         });
@@ -156,26 +156,21 @@ exports.getModule = class MrcModule extends ServerModule {
     }
 
     receiveFromMRC(socket, message) {
-    
+
         const config = Config();
-        const siteName = slugify(config.general.boardName)
+        const siteName = slugify(config.general.boardName);
 
         if (message.from_user == 'SERVER' && message.body == 'HELLO') {
             // initial server hello, can ignore
-            return;
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
             // this.log.debug('Respond to heartbeat');
-            let message = sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
-            return message;
+            this.sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
 
         } else {
             // if not a heartbeat, and we have clients then we need to send something to them
-            //console.log(this.connectedSockets);
             this.sendToClient(message);
-            
-            return;    
         }
     }
 
@@ -197,6 +192,34 @@ exports.getModule = class MrcModule extends ServerModule {
         };
     }
 
+    receiveFromClient(username, message) {
+        try {
+            message = JSON.parse(message);
+        } catch (e) {
+            Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
+        }
+
+        this.sendToMrcServer(mrcCentralConnection, message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
+    }
+
+    // send a message back to the mrc central server
+    sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
+        const config = Config();
+        const siteName = slugify(config.general.boardName);
+
+        const line = [
+            fromUser,
+            siteName,
+            sanitiseRoomName(fromRoom),
+            sanitiseName(toUser || ''),
+            sanitiseName(toSite || ''),
+            sanitiseRoomName(toRoom || ''),
+            sanitiseMessage(messageBody)
+        ].join('~') + '~';
+
+        Log.debug({ server : 'MRC', data : line }, 'Sending data');
+        return socket.write(line + '\n');
+    }
 };
 
 
@@ -219,41 +242,11 @@ function sanitiseMessage(message) {
     return message.replace(/[^\x20-\x7D]/g, '');
 }
 
-function receiveFromClient(username, message) {
-    try {
-        message = JSON.parse(message)
-    } catch (e) {
-        Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
-    }
-    
-    sendToMrcServer(mrcCentralConnection, message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body)
-}
-
-// send a message back to the mrc central server
-function sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
-    const config = Config();
-    const siteName = slugify(config.general.boardName)
-
-    const line = [
-        fromUser,
-        siteName,
-        sanitiseRoomName(fromRoom),
-        sanitiseName(toUser || ''),
-        sanitiseName(toSite || ''),
-        sanitiseRoomName(toRoom || ''),
-        sanitiseMessage(messageBody)
-    ].join('~') + '~';
-
-    Log.debug({ server : 'MRC', data : line }, 'Sending data');
-    return socket.write(line + '\n');
-}
-
-function slugify(text)
-{
-  return text.toString()
-    .replace(/\s+/g, '_')           // Replace spaces with _
-    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
-    .replace(/\-\-+/g, '_')         // Replace multiple - with single -
-    .replace(/^-+/, '')             // Trim - from start of text
-    .replace(/-+$/, '');            // Trim - from end of text
+function slugify(text) {
+    return text.toString()
+        .replace(/\s+/g, '_')           // Replace spaces with _
+        .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+        .replace(/\-\-+/g, '_')         // Replace multiple - with single -
+        .replace(/^-+/, '')             // Trim - from start of text
+        .replace(/-+$/, '');            // Trim - from end of text
 }
\ No newline at end of file

From 9018bc363cb11ef0f59d658c9f91a4720dcb00be Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 24 May 2019 22:26:27 -0600
Subject: [PATCH 0807/1013] show_art module can now take Buffer to display

---
 core/show_art.js |  9 +++++++++
 core/theme.js    | 21 +++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/core/show_art.js b/core/show_art.js
index a480fa05..7e53ca60 100644
--- a/core/show_art.js
+++ b/core/show_art.js
@@ -68,6 +68,15 @@ exports.getModule = class ShowArtModule extends MenuModule {
     }
 
     showByExtraArgs(cb) {
+        const artData = _.get(this.config, 'extraArgs.artData');
+        if(Buffer.isBuffer(artData)) {
+            const options = {
+                pause   : this.shouldPause(),
+                desc    : 'extraArgs',
+            };
+            return this.displaySingleArtWithOptions(artData, options, cb);
+        }
+
         this.getArtKeyValue(this.config.key, (err, artSpec) => {
             if(err) {
                 return cb(err);
diff --git a/core/theme.js b/core/theme.js
index 8460cf24..a2d31df1 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -27,6 +27,7 @@ exports.getAvailableThemes      = getAvailableThemes;
 exports.getRandomTheme          = getRandomTheme;
 exports.setClientTheme          = setClientTheme;
 exports.initAvailableThemes     = initAvailableThemes;
+exports.displayPreparedArt      = displayPreparedArt;
 exports.displayThemeArt         = displayThemeArt;
 exports.displayThemedPause      = displayThemedPause;
 exports.displayThemedPrompt     = displayThemedPrompt;
@@ -510,6 +511,17 @@ function getThemeArt(options, cb) {
     );
 }
 
+function displayPreparedArt(options, artInfo, cb) {
+    const displayOpts = {
+        sauce       : artInfo.sauce,
+        font        : options.font,
+        trailingLF  : options.trailingLF,
+    };
+    art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
+        return cb(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
+    });
+}
+
 function displayThemeArt(options, cb) {
     assert(_.isObject(options));
     assert(_.isObject(options.client));
@@ -537,14 +549,7 @@ function displayThemeArt(options, cb) {
                 }
             },
             function disp(artInfo, callback) {
-                const displayOpts = {
-                    sauce       : artInfo.sauce,
-                    font        : options.font,
-                    trailingLF  : options.trailingLF,
-                };
-                art.display(options.client, artInfo.data, displayOpts, (err, mciMap, extraInfo) => {
-                    return callback(err, { mciMap : mciMap, artInfo : artInfo, extraInfo : extraInfo } );
-                });
+                return displayPreparedArt(options, artInfo, callback);
             }
         ],
         (err, artData) => {

From 565f0ea7c2c8bed080b34270001bbadde1503a5a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 24 May 2019 22:26:43 -0600
Subject: [PATCH 0808/1013] Note on oputil

---
 WHATSNEW.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 376344fc..38df6cf4 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -8,7 +8,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 + 2-Factor (2FA) authentication is now available using [RFC-4266 - HOTP: HMAC-Based One-Time Password Algorithm)](https://tools.ietf.org/html/rfc4226), [RFC-6238 - TOTP: Time-Based One-Time Password Algorithm](https://tools.ietf.org/html/rfc6238), or [Google Authenticator](http://google-authenticator.com/). QR codes for activation are available as well. One-time backup aka recovery codes can also be used.
 + `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user.
 * `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP.
-
+* `oputil.js fb scan --quick` is now the default. Override with `--full-scan`.
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!

From 4ef32d1c52f5ca777bda0fd5529b7920495a6d6f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 24 May 2019 22:26:56 -0600
Subject: [PATCH 0809/1013] Formatting + refs

---
 core/client.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/client.js b/core/client.js
index d340981b..8820a3ac 100644
--- a/core/client.js
+++ b/core/client.js
@@ -136,14 +136,8 @@ function Client(/*input, output*/) {
     //
     this.getTermClient = function(deviceAttr) {
         let termClient = {
-            //
-            //  See http://www.fbl.cz/arctel/download/techman.pdf
-            //
-            //  Known clients:
-            //  * Irssi ConnectBot (Android)
-            //
-            '63;1;2'        : 'arctel',
-            '50;86;84;88'   : 'vtx',
+            '63;1;2'        : 'arctel', //  http://www.fbl.cz/arctel/download/techman.pdf - Irssi ConnectBot (Android)
+            '50;86;84;88'   : 'vtx',    //  https://github.com/codewar65/VTX_ClientServer/blob/master/vtx.txt
         }[deviceAttr];
 
         if(!termClient) {

From b62f55961f20061d5bc6ccf07230cca7edcca249 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 24 May 2019 22:27:28 -0600
Subject: [PATCH 0810/1013] Better formatting

---
 core/oputil/oputil_help.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 3e9cb60a..fe76f4b7 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -11,11 +11,11 @@ const usageHelp = exports.USAGE_HELP = {
 `usage: oputil.js [--version] [--help]
                   <command> [<arguments>]
 
-global arguments:
-  -c, --config PATH         Specify config path (${getDefaultConfigPath()})
+Global arguments:
+  -c, --config PATH         Specify config path (default is ${getDefaultConfigPath()})
   -n, --no-prompt           Assume defaults (don't prompt for input where possible)
 
-commands:
+Commands:
   user                      User management
   config                    Configuration management
   fb                        File base management
@@ -36,13 +36,17 @@ Actions:
   rename USERNAME NEWNAME      Rename a user
   (mv)
 
-  2fa-otp USERNAME SPEC        Enable Two Factor Authentication (2FA)
+  2fa-otp USERNAME SPEC        Enable 2FA/OTP for the user
   (otp)
 
+  The system supports various implementations of Two Factor Authentication (2FA)
+  One Time Password (OTP) authentication.
+
   Valid specs:
-    totp   : Time-Based One-Time Password Algorithm (RFC-6238)
-    hotp   : HMAC-Based One-Time Password Algorithm (RFC-4266)
-    google : Google Authenticator
+    disable : Removes 2FA/OTP from the user
+    google  : Google Authenticator
+    hotp    : HMAC-Based One-Time Password Algorithm (RFC-4266)
+    totp    : Time-Based One-Time Password Algorithm (RFC-6238)
 
   activate USERNAME            Set a user's status to "active"
 

From 8802ae24bafd456f7e8ec40d0ab7b86b00558dff Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 24 May 2019 22:27:50 -0600
Subject: [PATCH 0811/1013] Good progress on 2FA/OTP config

---
 core/menu_module.js         |  29 +++++-
 core/oputil/oputil_user.js  |  20 ++++-
 core/toggle_menu_view.js    |   9 +-
 core/user_2fa_otp.js        |   3 +-
 core/user_2fa_otp_config.js | 171 ++++++++++++++++++++++++++++++++++++
 core/user_property.js       |   2 +-
 core/view.js                |   6 ++
 7 files changed, 230 insertions(+), 10 deletions(-)
 create mode 100644 core/user_2fa_otp_config.js

diff --git a/core/menu_module.js b/core/menu_module.js
index 06c0f6d7..526482da 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -16,6 +16,7 @@ const { getPredefinedMCIValue } = require('../core/predefined_mci.js');
 const async                 = require('async');
 const assert                = require('assert');
 const _                     = require('lodash');
+const iconvDecode           = require('iconv-lite').decode;
 
 exports.MenuModule = class MenuModule extends PluginModule {
 
@@ -379,7 +380,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         );
     }
 
-    displayAsset(name, options, cb) {
+    displayAsset(nameOrData, options, cb) {
         if(_.isFunction(options)) {
             cb = options;
             options = {};
@@ -389,10 +390,25 @@ exports.MenuModule = class MenuModule extends PluginModule {
             this.client.term.rawWrite(ansi.resetScreen());
         }
 
+        options = Object.assign( { client : this.client, font : this.menuConfig.config.font }, options );
+
+        if(Buffer.isBuffer(nameOrData)) {
+            const data = iconvDecode(nameOrData, options.encoding || 'cp437');
+            return theme.displayPreparedArt(
+                options,
+                { data },
+                (err, artData) => {
+                    if(cb) {
+                        return cb(err, artData);
+                    }
+                }
+            );
+        }
+
         return theme.displayThemedAsset(
-            name,
+            nameOrData,
             this.client,
-            Object.assign( { font : this.menuConfig.config.font }, options ),
+            options,
             (err, artData) => {
                 if(cb) {
                     return cb(err, artData);
@@ -513,7 +529,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
     }
 
     setViewText(formName, mciId, text, appendMultiLine) {
-        const view = this.viewControllers[formName].getView(mciId);
+        const view = this.getView(formName, mciId);
         if(!view) {
             return;
         }
@@ -525,6 +541,11 @@ exports.MenuModule = class MenuModule extends PluginModule {
         }
     }
 
+    getView(formName, id) {
+        const form = this.viewControllers[formName];
+        return form && form.getView(id);
+    }
+
     updateCustomViewTextsWithFilter(formName, startId, fmtObj, options) {
         options = options || {};
 
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 92705bff..7b441875 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -372,12 +372,28 @@ function twoFactorAuthOTP(user) {
         prepareOTP,
     } = require('../../core/user_2fa_otp.js');
 
+    let otpType = argv._[argv._.length - 1];
+
+    //  shortcut for removal
+    if('disable' === otpType) {
+        const props = [
+            UserProps.AuthFactor2OTP,
+            UserProps.AuthFactor2OTPSecret,
+            UserProps.AuthFactor2OTPBackupCodes,
+        ];
+        return user.removeProperties(props, err => {
+            if(err) {
+                console.error(err.message);
+            } else {
+                console.info(`2FA OTP disabled for ${user.username}`);
+            }
+        });
+    }
+
     async.waterfall(
         [
             function validate(callback) {
                 //  :TODO: Prompt for if not supplied
-                let otpType = argv._[argv._.length - 1];
-
                 //  allow aliases for OTP types
                 otpType = {
                     google  : OTPTypes.GoogleAuthenticator,
diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js
index aadfe9c3..c06297b2 100644
--- a/core/toggle_menu_view.js
+++ b/core/toggle_menu_view.js
@@ -35,11 +35,16 @@ util.inherits(ToggleMenuView, MenuView);
 ToggleMenuView.prototype.redraw = function() {
     ToggleMenuView.super_.prototype.redraw.call(this);
 
+    if(0 === this.items.length) {
+        return;
+    }
+
     //this.cachePositions();
 
     this.client.term.write(this.hasFocus ? this.getFocusSGR() : this.getSGR());
 
-    assert(this.items.length === 2);
+    assert(this.items.length === 2, 'ToggleMenuView must contain exactly (2) items');
+
     for(var i = 0; i < 2; i++) {
         var item = this.items[i];
         var text = strUtil.stylizeString(
@@ -102,7 +107,7 @@ ToggleMenuView.prototype.onKeyPress = function(ch, key) {
     if(key) {
         if(this.isKeyMapped('right', key.name) || this.isKeyMapped('down', key.name)) {
             this.focusNext();
-        } else if(this.isKeyMapped('left', key.name) || this.isKeyMapped('up', key.nam4e)) {
+        } else if(this.isKeyMapped('left', key.name) || this.isKeyMapped('up', key.name)) {
             this.focusPrevious();
         }
     }
diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index 2f51f105..0b53ad8b 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -17,10 +17,11 @@ const Config            = require('./config.js').get;
 //  deps
 const _             = require('lodash');
 const crypto        = require('crypto');
-const async         = require('async');
 const qrGen         = require('qrcode-generator');
 
 exports.prepareOTP          = prepareOTP;
+exports.createQRCode        = createQRCode;
+exports.otpFromType         = otpFromType;
 exports.loginFactor2_OTP    = loginFactor2_OTP;
 
 const OTPTypes = exports.OTPTypes = {
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
new file mode 100644
index 00000000..a4bbb3df
--- /dev/null
+++ b/core/user_2fa_otp_config.js
@@ -0,0 +1,171 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const { MenuModule }        = require('./menu_module.js');
+const UserProps             = require('./user_property.js');
+const {
+    OTPTypes,
+    otpFromType,
+    createQRCode,
+}                           = require('./user_2fa_otp.js');
+
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
+const iconv             = require('iconv-lite');
+
+exports.moduleInfo = {
+    name        : 'User 2FA/OTP Configuration',
+    desc        : 'Module for user 2FA/OTP configuration',
+    author      : 'NuSkooler',
+};
+
+const FormIds = {
+    menu    : 0,
+};
+
+const MciViewIds = {
+    enableToggle        : 1,
+    typeSelection       : 2,
+    submission          : 3,
+    infoText            : 4,
+
+    customRangeStart    : 10,   //  10+ = customs
+};
+
+exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+
+        this.menuMethods = {
+            showQRCode : (formData, extraArgs, cb) => {
+                return this.showQRCode(cb);
+            }
+        };
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            async.series(
+                [
+                    (callback) => {
+                        return this.prepViewController('menu', FormIds.menu, mciData.menu, callback);
+                    },
+                    (callback) => {
+                        const requiredCodes = [
+                            MciViewIds.enableToggle,
+                            MciViewIds.typeSelection,
+                            MciViewIds.submission,
+                        ];
+                        return this.validateMCIByViewIds('menu', requiredCodes, callback);
+                    },
+                    (callback) => {
+                        const enableToggleView = this.getView('menu', MciViewIds.enableToggle);
+                        let initialIndex = this.isOTPEnabledForUser() ? 1 : 0;
+                        enableToggleView.setFocusItemIndex(initialIndex);
+                        this.enableToggleUpdate(initialIndex);
+
+                        enableToggleView.on('index update', idx => {
+                            return this.enableToggleUpdate(idx);
+                        });
+
+                        const typeSelectionView = this.getView('menu', MciViewIds.typeSelection);
+                        initialIndex = this.typeSelectionIndexFromUserOTPType();
+                        typeSelectionView.setFocusItemIndex(initialIndex);
+
+                        typeSelectionView.on('index update', idx => {
+                            return this.typeSelectionUpdate(idx);
+                        });
+
+                        this.viewControllers.menu.on('return', view => {
+                            if(view === enableToggleView) {
+                                return this.enableToggleUpdate(enableToggleView.focusedItemIndex);
+                            } else if (view === typeSelectionView) {
+                                return this.typeSelectionUpdate(typeSelectionView.focusedItemIndex);
+                            }
+                        });
+
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    showQRCode(cb) {
+        const otp = otpFromType(this.client.user.getProperty(UserProps.AuthFactor2OTP));
+        let qrCodeAscii = '';
+        if(!otp) {
+            qrCodeAscii = '2FA/OTP is not currently enabled for this account';
+        }
+
+        const qrOptions = {
+            username    : this.client.user.username,
+            qrType      : 'ascii',
+        };
+        qrCodeAscii = createQRCode(
+            otp,
+            qrOptions,
+            this.client.user.getProperty(UserProps.AuthFactor2OTPSecret)
+        ).replace(/\n/g, '\r\n');
+
+        const modOpts = {
+            extraArgs : {
+                artData : iconv.encode(`${qrCodeAscii}\r\n`, 'cp437'),
+            }
+        };
+        this.gotoMenu(
+            this.menuConfig.config.mainMenuUser2FAOTP_ShowQR || 'mainMenuUser2FAOTP_ShowQR',
+            modOpts,
+            cb
+        );
+    }
+
+    isOTPEnabledForUser() {
+        return this.typeSelectionIndexFromUserOTPType(-1) != -1;
+    }
+
+    getInfoText(key) {
+        return _.get(this.config, [ 'infoText', key ], '');
+    }
+
+    enableToggleUpdate(idx) {
+        const key = {
+            0 : '2faDisabled',
+            1 : '2faEnabled',
+        }[idx];
+        this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
+    }
+
+    typeSelectionIndexFromUserOTPType(defaultIndex = 0) {
+        const type = this.client.user.getProperty(UserProps.AuthFactor2OTP);
+        return {
+            [ OTPTypes.RFC6238_TOTP ]           : 0,
+            [ OTPTypes.RFC4266_HOTP ]           : 1,
+            [ OTPTypes.GoogleAuthenticator ]    : 2,
+        }[type] || defaultIndex;
+    }
+
+    otpTypeFromTypeSelectionIndex(idx) {
+        return {
+            0 : OTPTypes.RFC6238_TOTP,
+            1 : OTPTypes.RFC4266_HOTP,
+            2 : OTPTypes.GoogleAuthenticator,
+        }[idx];
+    }
+
+    typeSelectionUpdate(idx) {
+        const key = '2faType_' + this.otpTypeFromTypeSelectionIndex(idx);
+        this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
+    }
+};
+
diff --git a/core/user_property.js b/core/user_property.js
index 00f640fb..88ac11b1 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -60,7 +60,7 @@ module.exports = {
 
     SSHPubKey                       : 'ssh_public_key',             //  OpenSSH format (ssh-keygen, etc.)
     AuthFactor1Types                : 'auth_factor1_types',         //  List of User.AuthFactor1Types value(s)
-    AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA
+    AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA. See OTPTypes
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
     AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes
 };
diff --git a/core/view.js b/core/view.js
index 7d3c5693..b675b508 100644
--- a/core/view.js
+++ b/core/view.js
@@ -178,6 +178,12 @@ View.prototype.setSpecialKeyMapOverride = function(specialKeyMapOverride) {
 
 View.prototype.setPropertyValue = function(propName, value) {
     switch(propName) {
+        case 'acceptsFocus' :
+            if (_.isBoolean(value)) {
+                this.acceptsFocus = value;
+            }
+            break;
+
         case 'height'   : this.setHeight(value); break;
         case 'width'    : this.setWidth(value); break;
         case 'focus'    : this.setFocus(value); break;

From 109b157c02846fe57cbed752389ad5baa4a21423 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 00:14:36 +0100
Subject: [PATCH 0812/1013] more MRC bug squashing and tidy up

---
 core/mrc.js                          | 84 +++++++++++++++++-----------
 core/servers/chat/mrc_multiplexer.js | 55 +++++++++++-------
 2 files changed, 88 insertions(+), 51 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 5320c999..54aa70f7 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -5,16 +5,17 @@
 const Log               = require('./logger.js').log;
 const { MenuModule }    = require('./menu_module.js');
 const {
-    pipeToAnsi
+    pipeToAnsi,
+    stripMciColorCodes
 }                       = require('./color_codes.js');
-const stringFormat              = require('./string_format.js');
-const StringUtil                = require('./string_util.js');
+const stringFormat      = require('./string_format.js');
+const StringUtil        = require('./string_util.js');
 
 //  deps
 const _                 = require('lodash');
 const async             = require('async');
-const net                   = require('net');
-const moment                = require('moment');
+const net               = require('net');
+const moment            = require('moment');
 
 exports.moduleInfo = {
     name        : 'MRC Client',
@@ -107,6 +108,12 @@ exports.getModule = class mrcModule extends MenuModule {
                 this.viewControllers.mrcChat.switchFocus(MciViewIds.mrcChat.inputArea);
 
                 return cb(null);
+            },
+
+            quit : (formData, extraArgs, cb) => {
+                this.sendServerMessage('LOGOFF');
+                this.state.socket.destroy();
+                return this.prevMenu(cb);
             }
         };
     }
@@ -167,12 +174,23 @@ exports.getModule = class mrcModule extends MenuModule {
      */
     addMessageToChatLog(message) {
         const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
-        chatLogView.addText(pipeToAnsi(message));
+        const messageLength = stripMciColorCodes(message).length;
+        const chatWidth = chatLogView.dimens.width;
+        let padAmount = 0;
+
+        if (messageLength > chatWidth) {
+            padAmount = chatWidth - (messageLength % chatWidth);
+        } else {
+            padAmount = chatWidth - messageLength;
+        }
+
+        const padding = ' |00' + ' '.repeat(padAmount - 2);
+        chatLogView.addText(pipeToAnsi(message + padding));
     }
 
     /**
-     * Processes data received back from the MRC multiplexer
-     */    
+     * Processes data received from the MRC multiplexer
+     */
     processReceivedMessage(blob) {
         blob.split('\n').forEach( message => {
 
@@ -200,13 +218,13 @@ exports.getModule = class mrcModule extends MenuModule {
                         this.state.nicks = params[1].split(',');
                         break;
 
-                    case 'STATS':
+                    case 'STATS': {
                         const stats = params[1].split(' ');
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcUsers).setText(stats[2]);
                         this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcBbses).setText(stats[0]);
                         this.state.last_ping = stats[1];
-
                         break;
+                    }
 
                     default:
                         this.addMessageToChatLog(message.body);
@@ -214,20 +232,10 @@ exports.getModule = class mrcModule extends MenuModule {
                 }
 
             } else {
-                if (message.from_user == this.state.alias && message.to_user == 'NOTME') {
-                    // don't deliver NOTME messages
-                    return;
-                } else {
+                if (message.to_room == this.state.room) {
                     // if we're here then we want to show it to the user
                     const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
-
-                    if (message.to_user == this.state.alias) {
-                        // it's a pm
-                        this.addMessageToChatLog('|08' + currentTime + ' |14PM|00 ' + message.body + '|00');
-                    } else {
-                        // it's not a pm
-                        this.addMessageToChatLog('|08' + currentTime + '|00 ' + message.body + '|00');
-                    }
+                    this.addMessageToChatLog('|08' + currentTime + '|00 ' + message.body + '|00');
                 }
             }
 
@@ -240,27 +248,39 @@ exports.getModule = class mrcModule extends MenuModule {
      */
     processOutgoingMessage(message, to_user) {
         if (message.startsWith('/')) {
-
             this.processSlashCommand(message);
-
         } else {
             if (message == '') {
+                // don't do anything if message is blank, just update stats
                 this.sendServerMessage('STATS');
                 return;
             }
 
-            // just format and send
+            // else just format and send
             const textFormatObj = {
                 fromUserName    : this.state.alias,
+                toUserName      : to_user,
                 message         : message
             };
 
             const messageFormat =
                 this.config.messageFormat ||
                 '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
+            
+            const privateMessageFormat =
+                this.config.outgoingPrivateMessageFormat ||
+                '|00|10<|02{fromUserName}|10|14->|02{toUserName}>|00 |03{message}|00';
 
+            let formattedMessage = '';
+            if (to_user == undefined) {
+                // normal message
+                formattedMessage = stringFormat(messageFormat, textFormatObj);
+            } else {
+                // pm 
+                formattedMessage = stringFormat(privateMessageFormat, textFormatObj);
+            }
+            
             try {
-                const formattedMessage = stringFormat(messageFormat, textFormatObj);
                 this.sendMessageToMultiplexer(to_user || '', '', this.state.room, formattedMessage);
             } catch(e) {
                 this.client.log.warn( { error : e.message }, 'MRC error');
@@ -283,7 +303,7 @@ exports.getModule = class mrcModule extends MenuModule {
             case 'pm':
                 this.processOutgoingMessage(cmd[2], cmd[1]);
                 break;
-            case 'rainbow':
+            case 'rainbow': {
                 // this is brutal, but i love it
                 const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
                     const cc = Math.floor((Math.random() * 31) + 1).toString().padStart(2, '0');
@@ -293,17 +313,17 @@ exports.getModule = class mrcModule extends MenuModule {
 
                 this.processOutgoingMessage(line);
                 break;
-
+            }
             case 'l33t':
-                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(5), 'l33t'));
+                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(6), 'l33t'));
                 break;
 
-            case 'kewl':
+            case 'kewl': {
                 const text_modes = Array('f','v','V','i','M');
                 const mode = text_modes[Math.floor(Math.random() * text_modes.length)];
-                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(5), mode));
+                this.processOutgoingMessage(StringUtil.stylizeString(message.substr(6), mode));
                 break;
-
+            }
             case 'whoon':
                 this.sendServerMessage('WHOON');
                 break;
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 9410a237..7eaac22f 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -2,10 +2,12 @@
 'use strict';
 
 //  ENiGMA½
-const Log                       = require('../../logger.js').log;
-const { ServerModule }          = require('../../server_module.js');
-const Config                    = require('../../config.js').get;
-const { Errors }                = require('../../enig_error.js');
+const Log                   = require('../../logger.js').log;
+const { ServerModule }      = require('../../server_module.js');
+const Config                = require('../../config.js').get;
+const { Errors }            = require('../../enig_error.js');
+const SysProps              = require('../../system_property.js');
+const StatLog               = require('../../stat_log.js');
 
 //  deps
 const net                   = require('net');
@@ -30,9 +32,7 @@ let mrcCentralConnection = '';
 exports.getModule = class MrcModule extends ServerModule {
     constructor() {
         super();
-
         this.log        = Log.child( { server : 'MRC' } );
-
     }
 
     createServer(cb) {
@@ -43,12 +43,12 @@ exports.getModule = class MrcModule extends ServerModule {
         const self = this;
 
         const config = Config();
-        const boardName  = config.general.boardName;
+        const boardName  = config.general.prettyBoardName || config.general.boardName;
         const enigmaVersion = 'ENiGMA-BBS_' + require('../../../package.json').version;
 
         const mrcConnectOpts = {
-            port    : 50000,
-            host    : 'mrc.bottomlessabyss.net'
+            host    : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
+            port    : config.chatServers.mrc.serverPort || 5000
         };
 
         const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${PROTOCOL_VERSION}`;
@@ -91,7 +91,6 @@ exports.getModule = class MrcModule extends ServerModule {
             socket.on('data', data => {
                 // split on \n to deal with getting messages in batches
                 data.toString().split('\n').forEach( item => {
-
                     if (item == '') return;
 
                     // save username with socket
@@ -103,7 +102,6 @@ exports.getModule = class MrcModule extends ServerModule {
                         self.receiveFromClient(socket.username, item);
                     }
                 });
-
             });
 
             socket.on('end', function() {
@@ -117,7 +115,6 @@ exports.getModule = class MrcModule extends ServerModule {
             });
         });
 
-
         return cb(null);
     }
 
@@ -146,22 +143,31 @@ exports.getModule = class MrcModule extends ServerModule {
         return _.isNumber(_.get(config, 'chatServers.mrc.multiplexerPort'));
     }
 
+    /**
+     * Sends received messages to local clients
+     */
     sendToClient(message) {
         connectedSockets.forEach( (client) => {
-            if (message.to_user == '' || message.to_user == client.username || message.to_user == 'CLIENT') {
-                // this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user')
+            if (message.to_user == '' || message.to_user == client.username || message.to_user == 'CLIENT' || message.from_user == client.username || message.to_user == 'NOTME' ) {
+                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user');
                 client.write(JSON.stringify(message) + '\n');
+            } else {
+                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Not forwarding message');
             }
         });
     }
 
+    /**
+     * Processes messages received     // split raw data received into an object we can work withfrom the central MRC server
+     */
     receiveFromMRC(socket, message) {
 
         const config = Config();
         const siteName = slugify(config.general.boardName);
 
         if (message.from_user == 'SERVER' && message.body == 'HELLO') {
-            // initial server hello, can ignore
+            // reply with extra bbs info
+            this.sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `INFOSYS:${StatLog.getSystemStat(SysProps.SysOpUsername)}`);
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
@@ -174,7 +180,9 @@ exports.getModule = class MrcModule extends ServerModule {
         }
     }
 
-    // split raw data received into an object we can work with
+    /**
+     * Takes an MRC message and parses it into something usable
+     */
     parseMessage(line) {
         const msg = line.split('~');
         if (msg.length < 7) {
@@ -192,6 +200,9 @@ exports.getModule = class MrcModule extends ServerModule {
         };
     }
 
+    /**
+     * Receives a message from a local client and sanity checks before sending on to the central MRC server
+     */
     receiveFromClient(username, message) {
         try {
             message = JSON.parse(message);
@@ -202,7 +213,9 @@ exports.getModule = class MrcModule extends ServerModule {
         this.sendToMrcServer(mrcCentralConnection, message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
     }
 
-    // send a message back to the mrc central server
+    /**
+     * Converts a message back into the MRC format and sends it to the central MRC server
+     */
     sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
         const config = Config();
         const siteName = slugify(config.general.boardName);
@@ -222,8 +235,9 @@ exports.getModule = class MrcModule extends ServerModule {
     }
 };
 
-
-// User / site name must be ASCII 33-125, no MCI, 30 chars max, underscores
+/**
+ * User / site name must be ASCII 33-125, no MCI, 30 chars max, underscores
+ */
 function sanitiseName(str) {
     return str.replace(
         /\s/g, '_'
@@ -242,6 +256,9 @@ function sanitiseMessage(message) {
     return message.replace(/[^\x20-\x7D]/g, '');
 }
 
+/**
+ * SLugifies the BBS name for use as an MRC "site name"
+ */
 function slugify(text) {
     return text.toString()
         .replace(/\s+/g, '_')           // Replace spaces with _

From b30d0e189d64fe1f9f804eb1df367ebabb9832fd Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 00:15:34 +0100
Subject: [PATCH 0813/1013] Add MRC config to luciano_blocktronics theme

---
 art/themes/luciano_blocktronics/theme.hjson | 33 +++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 998d4c34..49d459f6 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -1078,14 +1078,37 @@
 				}
 			}
 
-
-			//////////////////////////////// ERC ///////////////////////////////
-
-			ercClient: {
+			mrc: {
 				config: {
-					//chatEntryFormat: "|00|08[|03{bbsTag}|08] |10{userName}|08: |02{message}"
+					messageFormat: "|00|10<|02{fromUserName}|10>|00 |03{message}|00"
+					privateMessageFormat: "|00|10<|02{fromUserName}|15->{toUserName}|10>|00 |03{message}|00"
+				}
+				0: {
+					mci: {
+						MT1: {
+							width: 72
+							height: 18
+						}
+                        ET2: {
+                            width: 69 // fnarr!
+                            maxLength: 140
+                        }
+                        TL3: {
+                            width: 20
+                        }
+                        TL4: {
+                            width: 20
+                        }
+						TL5: {
+                            width: 2
+                        }
+                        TL6: {
+                            width: 2
+                        }
+					}
 				}
 			}
+
 		}
 
 		prompts: {

From 0b9599755485534cfbacb77b4a0ecb8c5b0a6993 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 00:16:49 +0100
Subject: [PATCH 0814/1013] MRC general config

---
 core/config.js              | 12 ++++++++--
 misc/menu_template.in.hjson | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index 854e65c8..ea309fc6 100644
--- a/core/config.js
+++ b/core/config.js
@@ -452,9 +452,17 @@ function getDefaultConfig() {
         chatServers : {
             mrc: {
                 enabled             : true,
+                serverHostname      : 'mrc.bottomlessabyss.net',
+                serverPort          : 5000,
                 multiplexerPort     : 5000,
-                serverHostname      : "mrc.bottomlessabyss.com",
-                serverPort          : 5000
+                bbsInfo : {
+                    sysop           : '',
+                    telnet          : '',
+                    website         : '',
+                    ssh             : '',
+                    description     : '',
+
+                }
             }
         },
 
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 9aac86f3..9ae54d17 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1066,6 +1066,10 @@
                     value: { command: "UA" }
                     action: @menu:mainMenuUserAchievementsEarned
                 }
+                {
+                    value: { command: "MRC" }
+                    action: @menu:mrc
+                }
                 {
                     value: 1
                     action: @menu:mainMenu
@@ -1094,6 +1098,48 @@
             }
         }
 
+        mrc: {
+            desc: MRC Chat
+            module: mrc
+            art: MRC
+            config: {
+                cls: true
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+							mode: preview
+							autoScroll: true
+						}
+                        ET2: {
+                            argName: inputArea
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
+                            action: @method:movementKeyPressed
+                        }
+                    ]
+                    submit: {
+                        *: [
+                            {
+                                value: { inputArea: null }
+                                action: @method:sendChatMessage
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
         nodeMessage: {
             desc: Node Messaging
             module: node_msg

From 27e3d50c5d9edc8e57dd0ce60e53aa665951331f Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 23:32:22 +0100
Subject: [PATCH 0815/1013] Fix mrc debug menu config

---
 config/menu.hjson | 4237 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4237 insertions(+)
 create mode 100644 config/menu.hjson

diff --git a/config/menu.hjson b/config/menu.hjson
new file mode 100644
index 00000000..99585ade
--- /dev/null
+++ b/config/menu.hjson
@@ -0,0 +1,4237 @@
+{
+    /*
+        ./\/\.' ENiGMA½ Menu Configuration -/--/-------- - --   - 
+
+        _____________________   _____  ____________________    __________\_   /
+        \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
+        //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
+        /____       _____|      __________       ___|__|      ____|     \   /  _____  \
+        ---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
+                                                                         /__   _\
+        <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
+
+        *-----------------------------------------------------------------------------*
+
+        General Information
+        ------------------------------- -   -
+        This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
+        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
+
+        See http://hjson.org/ for more information and syntax.
+
+        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
+        on have syntax highlighting for the HJSON format which are highly recommended.
+
+        ------------------------------- -- -    -
+        Menu Configuration
+        ------------------------------- -   -
+        ENiGMA½ makes no assumptions about specific menu types (main, doors, etc.), 
+        but instead allows full customization of all menus throughout the system.
+        Some menus such as a main menu are considered "standard" while others are
+        backed by a specific module. SysOps can tweak various settings about these
+        modules (look & feel, keyboard interation, and so on) or even fully replace
+        the module with something else.
+
+        This file starts out as an example setup. Look at the examples, change
+        settings, menu ordering/flow, add/remove menus, implement ACS control,
+        etc.!
+
+        Remember you can *live edit* this file. That is, make a change and save
+        while you're logged into the system and it will take effect on the next
+        menu change or screen refresh.
+
+        Please see RTFM ...er, uh... see the documentation for more information, and
+        don't be shy to ask for help:
+
+        BBS     : Xibalba @ xibalba.l33t.codes
+        FTN     : BBS Discussion on fsxNet
+        IRC     : #enigma-bbs / FreeNode
+        Email   : bryan@l33t.codes
+    */
+    menus: {
+        //
+        //  Send telnet connections to matrix where users can login, apply, etc.
+        //
+        telnetConnected: {
+            art: CONNECT
+            next: matrix
+            config: { nextTimeout: 1500 }
+        }
+
+        //
+        //  SSH connections are pre-authenticated via the SSH server itself.
+        //  Jump directly to the login sequence
+        //
+        sshConnected: {
+            art: CONNECT
+            next: fullLoginSequenceLoginArt
+            config: { nextTimeout: 1500 }
+        }
+
+        //
+        //  Another SSH specialization: If the user logs in with a new user
+        //  name (e.g. "new", "apply", ...) they will be directed to the
+        //  application process.
+        //
+        sshConnectedNewUser: {
+            art: CONNECT
+            next: newUserApplicationPreSsh
+            config: { nextTimeout: 1500 }
+        }
+
+        //  Ye ol' standard matrix
+        matrix: {
+            art: matrix
+            form: {
+                0: {
+                    VM: {
+                        mci: {
+                            VM1:  {
+                                submit: true
+                                focus:  true
+                                argName: navSelect
+                                //
+                                //  To enable forgot password, you will need to have the web server
+                                //  enabled and mail/SMTP configured. Once that is in place, swap out
+                                //  the commented lines below as well as in the submit block
+                                //
+                                items: [
+                                    {
+                                        text: login
+                                        data: login
+                                    }
+                                    {
+                                        text: apply
+                                        data: apply
+                                    }
+                                    {
+                                        text: forgot pass
+                                        data: forgot
+                                    }
+                                    {
+                                        text: log off
+                                        data: logoff
+                                    }
+                                ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { navSelect: "login" }
+                                    action: @menu:login
+                                }
+                                {
+                                    value: { navSelect: "apply" }
+                                    action: @menu:newUserApplicationPre
+                                }
+                                {
+                                    value: { navSelect: "forgot" }
+                                    action: @menu:forgotPassword
+                                }
+                                {
+                                    value: { navSelect: "logoff" }
+                                    action: @menu:logoff
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+
+        login: {
+            art: USERLOG
+            next: fullLoginSequenceLoginArt
+            config: {
+                tooNodeMenu: loginAttemptTooNode
+                inactive: loginAttemptAccountInactive
+                disabled: loginAttemptAccountDisabled
+                locked: loginAttemptAccountLocked
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            maxLength: @config:users.usernameMax
+                            argName: username
+                            focus: true
+                        }
+                        ET2: {
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            argName: password
+                            submit: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { password: null }
+                                action: @systemMethod:login
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        loginAttemptTooNode: {
+            art: TOONODE
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountLocked: {
+            art: ACCOUNTLOCKED
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountDisabled: {
+            art: ACCOUNTDISABLED
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        loginAttemptAccountInactive: {
+            art: ACCOUNTINACTIVE
+            config: {
+                cls: true
+                nextTimeout: 2000
+            }
+            next: logoff
+        }
+
+        forgotPassword: {
+            desc: Forgot password
+            prompt: forgotPasswordPrompt
+            submit: [
+                {
+                    value: { username: null }
+                    action: @systemMethod:sendForgotPasswordEmail
+                    extraArgs: { next: "forgotPasswordSubmitted" }
+                }
+            ]
+        }
+
+        forgotPasswordSubmitted: {
+            desc: Forgot password
+            art: FORGOTPWSENT
+            config: {
+                cls: true
+                pause: true
+            }
+            next: @systemMethod:logoff
+        }
+
+        //  :TODO: Prompt Yes/No for logoff confirm
+        fullLogoffSequence: {
+            desc: Logging Off
+            prompt: logoffConfirmation
+            submit: [
+                {
+                    value: { promptValue: 0 }
+                    action: @menu:fullLogoffSequencePreAd
+                }
+                {
+                    value: { promptValue: 1 }
+                    action: @systemMethod:prevMenu
+                }
+            ]
+        }
+
+        fullLogoffSequencePreAd: {
+            art: PRELOGAD
+            desc: Logging Off
+            next: fullLogoffSequenceRandomBoardAd
+            config: {
+                cls: true
+                nextTimeout: 1500
+            }
+        }
+
+        fullLogoffSequenceRandomBoardAd: {
+            art: OTHRBBS
+            desc: Logging Off
+            next: logoff
+            config: {
+                baudRate: 57600
+                pause: true
+                cls: true
+            }
+        }
+
+        logoff: {
+            art: LOGOFF
+            desc: Logging Off
+            next: @systemMethod:logoff
+        }
+
+        //  A quick preamble - defaults to warning about broken terminals
+        newUserApplicationPre: {
+            art: NEWUSER1
+            next: newUserApplication
+            desc: Applying
+            config: {
+                pause: true
+                cls: true
+                menuFlags: [ "noHistory" ]
+            }
+        }
+
+        newUserApplication: {
+            module: nua
+            art: NUA
+            next: [
+                {
+                    //  Initial SysOp does not send feedback to themselves
+                    acs: ID1
+                    next: fullLoginSequenceLoginArt
+                }
+                {
+                    //  ...everyone else does
+                    next: newUserFeedbackToSysOpPreamble
+                }
+            ]
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: username
+                            maxLength: @config:users.usernameMax
+                            validate: @systemMethod:validateUserNameAvail
+                        }
+                        ET2: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        MET3: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                            validate: @systemMethod:validateBirthdate
+                        }
+                        ME4: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET6: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET7: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @systemMethod:validateEmailAvail
+                        }
+                        ET8: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ET9: {
+                            argName: password
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @systemMethod:validatePasswordSpec
+                        }
+                        ET10: {
+                            argName: passwordConfirm
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM12: {
+                            argName: submission
+                            items: [ "apply", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitApplication
+                                extraArgs: {
+                                    inactive: userNeedsActivated
+                                    error: newUserCreateError
+                                }
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        //  A quick preamble - defaults to warning about broken terminals (SSH version)
+        newUserApplicationPreSsh: {
+            art: NEWUSER1
+            next: newUserApplicationSsh
+            desc: Applying
+            config: {
+                pause: true
+                cls: true
+                menuFlags: [ "noHistory" ]
+            }
+        }
+
+        //
+        //  SSH specialization of NUA
+        //  Canceling this form logs off vs falling back to matrix
+        //
+        newUserApplicationSsh: {
+            module: nua
+            art: NUA
+            fallback: logoff
+            next: newUserFeedbackToSysOpPreamble
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: username
+                            maxLength: @config:users.usernameMax
+                            validate: @systemMethod:validateUserNameAvail
+                        }
+                        ET2: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        MET3: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                            validate: @systemMethod:validateBirthdate
+                        }
+                        ME4: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET6: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET7: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @systemMethod:validateEmailAvail
+                        }
+                        ET8: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ET9: {
+                            argName: password
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @systemMethod:validatePasswordSpec
+                        }
+                        ET10: {
+                            argName: passwordConfirm
+                            password: true
+                            maxLength: @config:users.passwordMax
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM12: {
+                            argName: submission
+                            items: [ "apply", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitApplication
+                                extraArgs: {
+                                    inactive: userNeedsActivated
+                                    error: newUserCreateError
+                                }
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @systemMethod:logoff
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:logoff
+                        }
+                    ]
+                }
+            }
+        }
+
+        newUserFeedbackToSysOpPreamble: {
+            art: LETTER
+            config: { pause: true }
+            next: newUserFeedbackToSysOp
+        }
+
+        newUserFeedbackToSysOp: {
+            desc: Feedback to SysOp
+            module: msg_area_post_fse
+            next: [
+                {
+                    acs: AS2
+                    next: fullLoginSequenceLoginArt
+                }
+                {
+                    next: newUserInactiveDone
+                }
+            ]
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+                toUserId: 1 /* always to +op */
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: @sysStat:sysop_username
+                            //  :TODO: readOnly: true
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            text: New user feedback
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        newUserInactiveDone: {
+            desc: Finished with NUA
+            art: DONE
+            config: { pause: true }
+            next: @menu:logoff
+        }
+
+        fullLoginSequenceLoginArt: {
+            desc: Logging In
+            art: WELCOME
+            config: { pause: true }
+            next: fullLoginSequenceLastCallers
+        }
+
+        fullLoginSequenceLastCallers: {
+            desc: Last Callers
+            module: last_callers
+            art: LASTCALL
+            config: {
+                pause: true
+                font: cp437
+            }
+            next: fullLoginSequenceWhosOnline
+        }
+        fullLoginSequenceWhosOnline: {
+            desc: Who's Online
+            module: whos_online
+            art: WHOSON
+            config: { pause: true }
+            next: fullLoginSequenceOnelinerz
+        }
+
+        fullLoginSequenceOnelinerz: {
+            desc: Viewing Onelinerz
+            module: onelinerz
+            next: [
+                {
+                    //  calls >= 2
+                    acs: NC2
+                    next: fullLoginSequenceNewScanConfirm
+                }
+                {
+                    // new users - skip new scan
+                    next: fullLoginSequenceUserStats
+                }
+            ]
+            config: {
+                cls: true
+                art: {
+                    view: ONELINER
+                    add: ONEADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: oneliner
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }   
+
+        fullLoginSequenceNewScanConfirm: {
+            desc: Logging In
+            prompt: loginGlobalNewScan
+            submit: [
+                {
+                    value: { promptValue: 0 }
+                    action: @menu:fullLoginSequenceNewScan
+                }
+                {
+                    value: { promptValue: 1 }
+                    action: @menu:fullLoginSequenceUserStats
+                }
+            ]
+        }
+
+        fullLoginSequenceNewScan: {
+            desc: Performing New Scan
+            module: new_scan
+            art: NEWSCAN
+            next: fullLoginSequenceSysStats
+            config: {
+                messageListMenu: newScanMessageList
+            }
+        }
+
+        fullLoginSequenceSysStats: {
+            desc: System Stats
+            art: SYSSTAT
+            config: { pause: true }
+            next: fullLoginSequenceUserStats
+        }
+        fullLoginSequenceUserStats: {
+            desc: User Stats
+            art: STATUS
+            config: { pause: true }
+            next: mainMenu
+        }
+
+        newScanMessageList: {
+            desc: New Messages
+            module: msg_list
+            art: NEWMSGS
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                        TL6: {
+                            //  theme me!
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "x", "shift + x" ]
+                            action: @method:fullExit
+                        }
+                        {
+                            keys: [ "m", "shift + m" ]
+                            action: @method:markAllRead
+                        }
+                    ]
+                }
+            }
+        }
+
+        newScanFileBaseList: {
+            module: file_area_list
+            desc: New Files
+            config: {
+                art: {
+                    browse: FNEWBRWSE
+                    details: FDETAIL
+                    detailsGeneral: FDETGEN
+                    detailsNfo: FDETNFO
+                    detailsFileList: FDETLST
+                    help: FBHELP
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+                            mode: preview
+                            ansiView: true
+                        }
+
+                        HM2: {
+                            focus: true
+                            submit: true
+                            argName: navSelect                          
+                            items: [
+                                "prev", "next", "details", "toggle queue", "rate", "help", "quit"
+                            ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFile
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFile
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:viewDetails
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:toggleQueue
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @menu:fileBaseGetRatingForSelectedEntry
+                            }                           
+                            {
+                                value: { navSelect: 5 }
+                                action: @method:displayHelp
+                            }
+                            {
+                                value: { navSelect: 6 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "w", "shift + w" ]
+                            action: @method:showWebDownloadLink
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "t", "shift + t" ]
+                            action: @method:toggleQueue
+                        }
+                        {
+                            keys: [ "v", "shift + v" ]
+                            action: @method:viewDetails
+                        }
+                        {
+                            keys: [ "r", "shift + r" ]
+                            action: @menu:fileBaseGetRatingForSelectedEntry
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:displayHelp
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: {
+                        HM1: {
+                            focus: true
+                            submit: true
+                            argName: navSelect
+                            items: [
+                                "general", "nfo/readme", "file listing"
+                            ]
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @method:detailsQuit
+                        }
+                    ]
+                }
+
+                2: {
+                    //  details - general
+                    mci: {}                 
+                }
+
+                3: {
+                    //  details - nfo/readme
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+                    }
+                }
+
+                4: {
+                    //  details - file listing
+                    mci: {
+                        VM1: {
+
+                        }
+                    }
+                }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Main Menu
+        ///////////////////////////////////////////////////////////////////////
+        mainMenu: {
+            art: MMENU
+            desc: Main Menu
+            prompt: menuCommand
+            config: {
+                font: cp437
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "MSG" }
+                    action: @menu:nodeMessage
+                }
+                {
+                    value: { command: "MRC" }
+                    action: @menu:mrc
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { command: "D" }
+                    action: @menu:doorMenu
+                }
+                {
+                    value: { command: "F" }
+                    action: @menu:fileBase
+                }
+                {
+                    value: { command: "U" }
+                    action: @menu:mainMenuUserList
+                }
+                {
+                    value: { command: "L" }
+                    action: @menu:mainMenuLastCallers
+                }
+                {
+                    value: { command: "W" }
+                    action: @menu:mainMenuWhosOnline
+                }
+                {
+                    value: { command: "Y" }
+                    action: @menu:mainMenuUserStats
+                }
+                {
+                    value: { command: "M" }
+                    action: @menu:messageArea
+                }
+                {
+                    value: { command: "E" }
+                    action: @menu:mailMenu
+                }
+                {
+                    value: { command: "C" }
+                    action: @menu:mainMenuUserConfig
+                }
+                {
+                    value: { command: "S" }
+                    action: @menu:mainMenuSystemStats
+                }
+                {
+                    value: { command: "!" }
+                    action: @menu:mainMenuGlobalNewScan
+                }
+                {
+                    value: { command: "K" }
+                    action: @menu:mainMenuFeedbackToSysOp
+                }
+                {
+                    value: { command: "O" }
+                    action: @menu:mainMenuOnelinerz
+                }
+                {
+                    value: { command: "R" }
+                    action: @menu:mainMenuRumorz
+                }
+                {
+                    value: { command: "BBS"}
+                    action: @menu:bbsList
+                }
+                {
+                    value: { command: "UA" }
+                    action: @menu:mainMenuUserAchievementsEarned
+                }
+                {
+                    value: 1
+                    action: @menu:mainMenu
+                }
+            ]
+        }
+
+        mainMenuUserAchievementsEarned: {
+            desc: Achievements
+            module: user_achievements_earned
+            art: USERACHIEV
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+		ercClient: {
+			art: erc
+			module: erc_client
+			config: {
+				host: localhost
+        		port: 5001
+				bbsTag: CHANGEME
+      		}
+
+			form: {
+				0: {
+					mci: {
+						MT1: {
+							width: 79
+							height: 21
+							mode: preview
+							autoScroll: true
+						}
+						ET3: {
+							autoScale: false
+							width: 77
+							argName: inputArea
+							focus: true
+							submit: true
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { inputArea: null }
+								action: @method:inputAreaSubmit
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "tab" ]
+						}
+						{
+							keys: [ "up arrow" ]
+							action: @method:scrollDown
+						}
+						{
+							keys: [ "down arrow" ]
+							action: @method:scrollUp
+						}
+					]
+				}
+			}
+		}
+
+        mrc: {
+            desc: MRC Chat
+            module: mrc
+            art: MRC
+            config: {
+                cls: true
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+							mode: preview
+							autoScroll: true
+						}
+                        ET2: {
+                            argName: inputArea
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:quit
+                        }
+                        {
+                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
+                            action: @method:movementKeyPressed
+                        }
+                    ]
+                    submit: {
+                        *: [
+                            {
+                                value: { inputArea: null }
+                                action: @method:sendChatMessage
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        nodeMessage: {
+            desc: Node Messaging
+            module: node_msg
+            art: NODEMSG
+            config: {
+                cls: true
+                art: {
+                    header: NODEMSGHDR
+                    footer: NODEMSGFTR
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        SM1: {
+                            argName: node
+                        }
+                        ET2: {
+                            argName: message
+                            submit: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:sendMessage
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mainMenuLastCallers: {
+            desc: Last Callers
+            module: last_callers
+            art: LASTCALL
+            config: { pause: true }
+        }
+
+        mainMenuWhosOnline: {
+            desc: Who's Online
+            module: whos_online
+            art: WHOSON
+            config: { pause: true }
+        }
+
+        mainMenuUserStats: {
+            desc: User Stats
+            art: STATUS
+            config: { pause: true }
+        }
+
+        mainMenuSystemStats: {
+            desc: System Stats
+            art: SYSSTAT
+            config: { pause: true }
+        }
+
+        mainMenuUserList: {
+            desc: User Listing
+            module: user_list
+            art: USERLST
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                        }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuUserConfig: {
+            module: user_config
+            art: CONFSCR
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            argName: realName
+                            maxLength: @config:users.realNameMax
+                            validate: @systemMethod:validateNonEmpty
+                            focus: true
+                        }
+                        ME2: {
+                            argName: birthdate
+                            maskPattern: "####/##/##"
+                        }
+                        ME3: {
+                            argName: sex
+                            maskPattern: A
+                            textStyle: upper
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET4: {
+                            argName: location
+                            maxLength: @config:users.locationMax
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET5: {
+                            argName: affils
+                            maxLength: @config:users.affilsMax
+                        }
+                        ET6: {
+                            argName: email
+                            maxLength: @config:users.emailMax
+                            validate: @method:validateEmailAvail
+                        }
+                        ET7: {
+                            argName: web
+                            maxLength: @config:users.webMax
+                        }
+                        ME8: {
+                            maskPattern: "##"
+                            argName: termHeight
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        SM9: {
+                            argName: theme
+                        }
+                        ET10: {
+                            argName: password
+                            maxLength: @config:users.passwordMax
+                            password: true
+                            validate: @method:validatePassword
+                        }
+                        ET11: {
+                            argName: passwordConfirm
+                            maxLength: @config:users.passwordMax
+                            password: true
+                            validate: @method:validatePassConfirmMatch
+                        }
+                        TM25: {
+                            argName: submission
+                            items: [ "save", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { submission: 0 }
+                                action: @method:saveChanges
+                            }
+                            {
+                                value: { submission: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuGlobalNewScan: {
+            desc: Performing New Scan
+            module: new_scan
+            art: NEWSCAN
+            config: {
+                messageListMenu: newScanMessageList
+            }
+        }
+
+        mainMenuFeedbackToSysOp: {
+            desc: Feedback to SysOp
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+                toUserId: 1 /* always to +op */
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName:    from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: @sysStat:sysop_username
+                            //  :TODO: readOnly: true
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mainMenuOnelinerz: {
+            desc: Viewing Onelinerz
+            module: onelinerz
+            config: {
+                cls: true
+                art: {
+                    view: ONELINER
+                    add: ONEADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: oneliner
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }
+
+        mainMenuRumorz: {
+            desc: Rumorz
+            module: rumorz
+            config: {
+                cls: true
+                art: {
+                    entries: RUMORS
+                    add: RUMORADD
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: false
+                            height: 10
+                        }
+                        TM2: {
+                            argName: addOrExit
+                            items: [ "yeah!", "nah" ]
+                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
+                            submit: true
+                            focus: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrExit: 0 }
+                                action: @method:viewAddScreen
+                            }
+                            {
+                                value: { addOrExit: null }
+                                action: @systemMethod:nextMenu
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:nextMenu
+                        }
+                    ]
+                },
+                1: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            maxLength: 70
+                            argName: rumor
+                        }
+                        TL2: {
+                            width: 60
+                        }
+                        TM3: {
+                            argName: addOrCancel
+                            items: [ "add", "cancel" ]
+                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { addOrCancel: 0 }
+                                action: @method:addEntry
+                            }
+                            {
+                                value: { addOrCancel: 1 }
+                                action: @method:cancelAdd
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelAdd
+                        }
+                    ]
+                }
+            }
+        }
+
+        bbsList: {
+            desc: Viewing BBS List
+            module: bbs_list
+            config: {
+                cls: true
+                art: {
+                    entries: BBSLIST
+                    add: BBSADD
+                }
+            }
+
+            form: {
+                0: {
+                    mci: {
+                        VM1: { maxLength: 32 }
+                        TL2: { maxLength: 32 }
+                        TL3: { maxLength: 32 }
+                        TL4: { maxLength: 32 }
+                        TL5: { maxLength: 32 }
+                        TL6: { maxLength: 32 }
+                        TL7: { maxLength: 32 }
+                        TL8: { maxLength: 32 }
+                        TL9: { maxLength: 32 }
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "a" ]
+                            action: @method:addBBS
+                        }
+                        {
+                            //  :TODO: add delete key
+                            keys: [ "d" ]
+                            action: @method:deleteBBS
+                        }
+                        {
+                            keys: [ "q", "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        ET1: {
+                            argName: name
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET2: {
+                            argName: sysop
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: telnet
+                            maxLength: 32
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET4: {
+                            argName: www
+                            maxLength: 32
+                        }
+                        ET5: {
+                            argName: location
+                            maxLength: 32
+                        }
+                        ET6: {
+                            argName: software
+                            maxLength: 32
+                        }
+                        ET7:  {
+                            argName: notes
+                            maxLength: 32
+                        }
+                        TM17: {
+                            argName: submission
+                            items: [ "save", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:cancelSubmit
+                        }
+                    ]
+
+                    submit: {
+                        *: [
+                            {
+                                value: { "submission" : 0 }
+                                action: @method:submitBBS
+                            }
+                            {
+                                value: { "submission" : 1 }
+                                action: @method:cancelSubmit
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Doors Menu
+        ///////////////////////////////////////////////////////////////////////
+        doorMenu: {
+            desc: Doors Menu
+            art: DOORMNU
+            prompt: menuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "G" }
+                    action: @menu:logoff
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                //
+                //  The system supports many ways of launching doors including
+                //  modules for DoorParty!, BBSLink, etc.
+                //
+                //  Below are some examples. See the documentation for more info.
+                //
+                {
+                    value: { command: "ABRACADABRA" }
+                    action: @menu:doorAbracadabraExample
+                }
+                {
+                    value: { command: "TWBBSLINK" }
+                    action: @menu:doorTradeWars2002BBSLinkExample
+                }
+                {
+                    value: { command: "DP" }
+                    action: @menu:doorPartyExample
+                }
+                {
+                    value: { command: "CN" }
+                    action: @menu:doorCombatNetExample
+                }
+                {
+                    value: { command: "EXODUS" }
+                    action: @menu:doorExodusCataclysm
+                }
+            ]
+        }
+
+        //
+        //  Local Door Example via abracadabra module
+        //
+        //  This example assumes launch_door.sh (which is passed args)
+        //  launches the door.
+        //
+        doorAbracadabraExample: {
+            desc: Abracadabra Example
+            module: abracadabra
+            config: {
+                name: Example Door
+                dropFileType: DORINFO
+                cmd: /home/enigma/DOS/scripts/launch_door.sh
+                args: [
+                    "{node}",
+                    "{dropFile}",
+                    "{srvPort}",
+                ],
+                nodeMax: 1
+                tooManyArt: DOORMANY
+                io: socket
+            }
+        }
+
+        //
+        //  BBSLink Example (TradeWars 2000)
+        //
+        //  Register @ https://bbslink.net/
+        //
+        doorTradeWars2002BBSLinkExample: {
+            desc: Playing TW 2002 (BBSLink)
+            module: bbs_link
+            config: {
+                sysCode: XXXXXXXX
+                authCode: XXXXXXXX
+                schemeCode: XXXXXXXX
+                door: tw
+            }
+        }
+
+        //
+        //  DoorParty! Example
+        //
+        //  Register @ http://throwbackbbs.com/
+        //
+        doorPartyExample: {
+            desc: Using DoorParty!
+            module: door_party
+            config: {
+                username: XXXXXXXX
+                password: XXXXXXXX
+                bbsTag: XX
+            }
+        }
+
+        //
+        //  CombatNet Example
+        //
+        //  Register @ http://combatnet.us/
+        //
+        doorCombatNetExample: {
+            desc: Using CombatNet
+            module: combatnet
+            config: {
+                bbsTag: CBNxxx
+                password: XXXXXXXXX
+            }
+        }
+
+        //
+        //  Exodus Example (cataclysm)
+        //  Register @ https://oddnetwork.org/exodus/
+        //
+        doorExodusCataclysm: {
+            desc: Cataclysm
+            module: exodus
+            config: {
+                rejectUnauthorized: false
+                board: XXX
+                key: XXXXXXXX
+                door: cataclysm
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        //  Message Area Menu
+        ///////////////////////////////////////////////////////////////////////
+        messageArea: {
+            art: MSGMNU
+            desc: Message Area
+            prompt: messageMenuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "P" }
+                    action: @menu:messageAreaNewPost
+                }
+                {
+                    value: { command: "J" }
+                    action: @menu:messageAreaChangeCurrentConference
+                }
+                {
+                    value: { command: "C" }
+                    action: @menu:messageAreaChangeCurrentArea
+                }
+                {
+                    value: { command: "L" }
+                    action: @menu:messageAreaMessageList
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { command: "<" }
+                    action: @systemMethod:prevConf
+                }
+                {
+                    value: { command: ">" }
+                    action: @systemMethod:nextConf
+                }
+                {
+                    value: { command: "[" }
+                    action: @systemMethod:prevArea
+                }
+                {
+                    value: { command: "]" }
+                    action: @systemMethod:nextArea
+                }
+                {
+                    value: { command: "D" }
+                    action: @menu:messageAreaSetNewScanDate
+                }
+                {
+                    value: { command: "S" }
+                    action: @menu:messageSearch
+                }
+                {
+                    value: 1
+                    action: @menu:messageArea
+                }
+            ]
+        }
+
+        messageSearch: {
+            desc: Message Search
+            module: message_base_search
+            art: MSEARCH
+            config: {
+                messageListMenu: messageAreaSearchMessageList
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        SM3: {
+                            argName: confTag
+                        }
+                        SM4: {
+                            argName: areaTag
+                        }
+                        ET5: {
+                            argName: toUserName
+                            maxLength: @config:users.usernameMax
+                        }
+                        ET6: {
+                            argName: fromUserName
+                            maxLength: @config:users.usernameMax
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaSearchMessageList: {
+            desc: Message Search
+            module: msg_list
+            art: MSRCHLST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                        TL6: {
+                            //  theme me!
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaMyMessagesList: {
+            desc: Personal Messages
+            module: msg_list
+            art: MYMSGLST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageSearchNoResults: {
+            desc: Message Search
+            art: MSRCNORES
+            config: {
+                pause: true
+            }
+        }
+
+        messageAreaChangeCurrentConference: {
+            art: CCHANGE
+            module: msg_conf_list
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: conf
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { conf: null }
+                                action: @method:changeConference
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaSetNewScanDate: {
+            module: set_newscan_date
+            desc: Message Base
+            art: SETMNSDATE
+            config: {
+                target: message
+                scanDateFormat: YYYYMMDD
+            }
+            form: {
+                0: {
+                    mci: {
+                        ME1: {
+                            focus: true
+                            submit: true
+                            argName: scanDate
+                            maskPattern: "####/##/##"
+                        }
+                        SM2: {
+                            argName: targetSelection
+                            submit: false
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { scanDate: null }
+                                action: @method:scanDateSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        changeMessageConfPreArt: {
+            module: show_art
+            config: {
+                method: messageConf
+                key: confTag
+                pause: true
+                cls: true
+                menuFlags: [ "popParent", "noHistory" ]
+            }
+        }
+
+        messageAreaChangeCurrentArea: {
+            //  :TODO: rename this art to ACHANGE
+            art: CHANGE
+            module: msg_area_list
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: area
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { area: null }
+                                action: @method:changeArea
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        changeMessageAreaPreArt: {
+            module: show_art
+            config: {
+                method: messageArea
+                key: areaTag
+                pause: true
+                cls: true
+                menuFlags: [ "popParent", "noHistory" ]
+            }
+        }
+
+        messageAreaMessageList: {
+            module: msg_list
+            art: MSGLIST
+            config: {
+                menuViewPost: messageAreaViewPost
+            }
+            form: {
+                0: {
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaViewPost:  {
+            module: msg_area_view_fse
+            config: {
+                art: {
+                    header:     MSGVHDR
+                    body:       MSGBODY
+                    footerView: MSGVFTR
+                    help:       MSGVHLP
+                },
+                editorMode: view
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        //  :TODO: ensure this block isn't even req. for theme to apply...
+                    }
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            mode: preview
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: message
+                                action: @method:editModeEscPressed
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                }
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: { width: 5 }
+                            TL2: { width: 4 }
+                        }
+                    }
+                }
+                4: {
+                    mci: {
+                        HM1: {
+                            //  :TODO: (#)Jump/(L)Index (msg list)/Last
+                            items: [ "prev", "next", "reply", "quit", "help" ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { 1: 0 }
+                                action: @method:prevMessage
+                            }
+                            {
+                                value: { 1: 1 }
+                                action: @method:nextMessage
+                            }
+                            {
+                                value: { 1: 2 }
+                                action: @method:replyMessage
+                                extraArgs: {
+                                    menu: messageAreaReplyPost
+                                }
+                            }
+                            {
+                                value: { 1: 3 }
+                                action: @systemMethod:prevMenu
+                            }
+                            {
+                                value: { 1: 4 }
+                                action: @method:viewModeMenuHelp
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "p", "shift + p" ]
+                            action: @method:prevMessage
+                        }
+                        {
+                            keys: [ "n", "shift + n" ]
+                            action: @method:nextMessage
+                        }
+                        {
+                            keys:   [ "r", "shift + r" ]
+                            action: @method:replyMessage
+                            extraArgs: {
+                                menu: messageAreaReplyPost
+                            }
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:viewModeMenuHelp
+                        }
+                        {
+                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
+                            action: @method:movementKeyPressed
+                        }
+                    ]
+                }
+            }
+        }
+
+        messageAreaReplyPost: {
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    quote:              MSGQUOT
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                }
+                editorMode: edit
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        //  :TODO: use appropriate system properties for max lengths
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        TL4: {
+                            //  :TODO: this is for RE: line (NYI)
+                            //width: 27
+                            //textOverflow: ...
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            height: 14
+                            argName: message
+                            mode: edit
+                        }
+                    }
+                    submit: {
+                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ],
+                            viewId: 1
+                        }
+                    ]
+                }
+
+                3: {
+                    mci: {
+                        HM1: {
+                            items: [ "save", "discard", "quote", "help" ]
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { 1: 0 }
+                                action: @method:editModeMenuSave
+                            }
+                            {
+                                value: { 1: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                            {
+                                value: { 1: 2 },
+                                action: @method:editModeMenuQuote
+                            }
+                            {
+                                value: { 1: 3 }
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:editModeEscPressed
+                        }
+                        {
+                            keys: [ "s", "shift + s" ]
+                            action: @method:editModeMenuSave
+                        }
+                        {
+                            keys: [ "d", "shift + d" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "q", "shift + q" ]
+                            action: @method:editModeMenuQuote
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:editModeMenuHelp
+                        }
+                    ]
+                }
+
+                //  Quote builder
+                5: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            height: 7
+                        }
+                        VM3: {
+                            width: 79
+                            height: 4
+                            argName: quote
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { quote: null }
+                                action: @method:appendQuoteEntry
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @method:quoteBuilderEscPressed
+                        }
+                    ]
+                }
+            }
+        }
+        //  :TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
+        messageAreaNewPost: {
+            desc: Posting message,
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                }
+                editorMode: edit
+                editorType: area
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName: from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            text: All
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateNonEmpty
+                            //  :TODO: Validate -> close/cancel if empty
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+
+                1: {
+                    "mci" : {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                }
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: { width: 5 }
+                            TL2: { width: 4 }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                "items" : [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                        //  :TODO: something like the following for overriding keymap
+                        //  this should only override specified entries. others will default
+                        /*
+                        "keyMap" : {
+                            "accept" : [ "return" ]
+                        }
+                        */
+                    }
+                }
+            }
+        }
+
+
+        //
+        //  User to User mail aka Email Menu
+        //
+        mailMenu: {
+            art: MAILMNU
+            desc: Mail Menu
+            prompt: menuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { command: "C" }
+                    action: @menu:mailMenuCreateMessage
+                }
+                {
+                    value: { command: "I" }
+                    action: @menu:mailMenuInbox
+                }
+                {
+                    value: { command: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { command: "G" }
+                    action: @menu:fullLogoffSequence
+                }               
+                {
+                    value: 1
+                    action: @menu:mailMenu
+                }
+            ]
+        }
+
+        mailMenuCreateMessage: {
+            desc: Mailing Someone
+            module: msg_area_post_fse
+            config: {
+                art: {
+                    header:             MSGEHDR
+                    body:               MSGBODY
+                    footerEditor:       MSGEFTR
+                    footerEditorMenu:   MSGEMFT
+                    help:               MSGEHLP
+                },
+                editorMode: edit
+                editorType: email
+                messageAreaTag: private_mail
+            }
+            form: {
+                0: {
+                    mci: {
+                        TL1: {
+                            argName:    from
+                        }
+                        ET2: {
+                            argName: to
+                            focus: true
+                            validate: @systemMethod:validateGeneralMailAddressedTo
+                        }
+                        ET3: {
+                            argName: subject
+                            maxLength: 72
+                            submit: true
+                            validate: @systemMethod:validateMessageSubject
+                        }
+                    }
+                    submit: {
+                        3: [
+                            {
+                                value: { subject: null }
+                                action: @method:headerSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+                1: {
+                    mci: {
+                        MT1: {
+                            width: 79
+                            argName: message
+                            mode: edit
+                        }
+                    }
+
+                    submit: {
+                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            viewId: 1
+                        }
+                    ]
+                },
+                2: {
+                    TLTL:  {
+                        mci: {
+                            TL1: {
+                                width: 5
+                            }
+                            TL2: {
+                                width: 4
+                            }
+                        }
+                    }
+                }
+                3: {
+                    HM: {
+                        mci: {
+                            HM1: {
+                                //  :TODO: clear
+                                items: [ "save", "discard", "help" ]
+                            }
+                        }
+                        submit: {
+                            *: [
+                                {
+                                    value: { 1: 0 }
+                                    action: @method:editModeMenuSave
+                                }
+                                {
+                                    value: { 1: 1 }
+                                    action: @systemMethod:prevMenu
+                                }
+                                {
+                                    value: { 1: 2 }
+                                    action: @method:editModeMenuHelp
+                                }
+                            ]
+                        }
+                        actionKeys: [
+                            {
+                                keys: [ "escape" ]
+                                action: @method:editModeEscPressed
+                            }
+                            {
+                                keys: [ "?" ]
+                                action: @method:editModeMenuHelp
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        mailMenuInbox: {
+            module: msg_list
+            art: PRVMSGLIST
+            config: {
+                menuViewPost: messageAreaViewPost
+                messageAreaTag: private_mail
+            }
+            form: {
+                0: {    //  main list
+                    mci:  {
+                        VM1: {
+                            focus: true
+                            submit: true
+                            argName: message
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { message: null }
+                                action: @method:selectMessage
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "delete", "d", "shift + d" ]
+                            action: @method:deleteSelected
+                        }
+                    ]
+                }
+                1: {    //  delete prompt form
+                    submit: {
+                        *: [
+                            {
+                                value: { promptValue: 0 }
+                                action: @method:deleteMessageYes
+                            }
+                            {
+                                value: { promptValue: 1 }
+                                action: @method:deleteMessageNo
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////
+        //  File Base
+        ////////////////////////////////////////////////////////////////////////
+
+        fileBase: {
+            desc: File Base
+            art: FMENU
+            prompt: fileMenuCommand
+            config: {
+                interrupt: realtime
+            }
+            submit: [
+                {
+                    value: { menuOption: "L" }
+                    action: @menu:fileBaseListEntries
+                }
+                {
+                    value: { menuOption: "B" }
+                    action: @menu:fileBaseBrowseByAreaSelect
+                }
+                {
+                    value: { menuOption: "F" }
+                    action: @menu:fileAreaFilterEditor
+                }
+                {
+                    value: { menuOption: "Q" }
+                    action: @systemMethod:prevMenu
+                }
+                {
+                    value: { menuOption: "G" }
+                    action: @menu:fullLogoffSequence
+                }
+                {
+                    value: { menuOption: "D" }
+                    action: @menu:fileBaseDownloadManager
+                }
+                {
+                    value: { menuOption: "W" }
+                    action: @menu:fileBaseWebDownloadManager
+                }
+                {
+                    value: { menuOption: "U" }
+                    action: @menu:fileBaseUploadFiles
+                }
+                {
+                    value: { menuOption: "S" }
+                    action: @menu:fileBaseSearch
+                }
+                {
+                    value: { menuOption: "P" }
+                    action: @menu:fileBaseSetNewScanDate
+                }
+                {
+                    value: { menuOption: "E" }
+                    action: @menu:fileBaseExportListFilter
+                }
+            ]
+        }
+
+        fileBaseExportListFilter: {
+            module: file_base_search
+            art: FBLISTEXPSEARCH
+            config: {
+                fileBaseListEntriesMenu: fileBaseExportList
+            }
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        ET3: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM4: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM5: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                                "filename"
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM6: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseExportList: {
+            module: file_base_user_list_export
+            art: FBLISTEXP
+            config: {
+                pause: true
+                templates: {
+                    entry: file_list_entry.asc
+                }
+            }
+            form: {
+                0: {
+                    mci:  {
+                        TL1: { }
+                        TL2: { }
+                    }
+                }
+            }
+        }
+
+        fileBaseExportListNoResults: {
+            desc: Browsing Files
+            art: FBNORES
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileBaseSetNewScanDate: {
+            module: set_newscan_date
+            desc: File Base
+            art: SETFNSDATE
+            config: {
+                target: file
+                scanDateFormat: YYYYMMDD
+            }
+            form: {
+                0: {
+                    mci: {
+                        ME1: {
+                            focus: true
+                            submit: true
+                            argName: scanDate
+                            maskPattern: "####/##/##"
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { scanDate: null }
+                                action: @method:scanDateSubmit
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseListEntries: {
+            module: file_area_list
+            desc: Browsing Files
+            config: {
+                art: {
+                    browse: FBRWSE
+                    details: FDETAIL
+                    detailsGeneral: FDETGEN
+                    detailsNfo: FDETNFO
+                    detailsFileList: FDETLST
+                    help: FBHELP
+                }
+            }
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+
+                        HM2: {
+                            focus: true
+                            submit: true
+                            argName: navSelect                          
+                            items: [
+                                "prev", "next", "details", "toggle queue", "rate", "change filter", "help", "quit"
+                            ]
+                            focusItemIndex: 1
+                        }
+                    }
+                    
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFile
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFile
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:viewDetails
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:toggleQueue
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @menu:fileBaseGetRatingForSelectedEntry
+                            }                           
+                            {
+                                value: { navSelect: 5 }
+                                action: @menu:fileAreaFilterEditor
+                            }
+                            {
+                                value: { navSelect: 6 }
+                                action: @method:displayHelp
+                            }
+                            {
+                                value: { navSelect: 7 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "w", "shift + w" ]
+                            action: @method:showWebDownloadLink
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "t", "shift + t" ]
+                            action: @method:toggleQueue
+                        }
+                        {
+                            keys: [ "f", "shift + f" ]
+                            action: @menu:fileAreaFilterEditor
+                        }
+                        {
+                            keys: [ "v", "shift + v" ]
+                            action: @method:viewDetails
+                        }
+                        {
+                            keys: [ "r", "shift + r" ]
+                            action: @menu:fileBaseGetRatingForSelectedEntry
+                        }
+                        {
+                            keys: [ "?" ]
+                            action: @method:displayHelp
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: {
+                        HM1: {
+                            focus: true
+                            submit: true
+                            argName: navSelect
+                            items: [
+                                "general", "nfo/readme", "file listing"
+                            ]
+                        }
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @method:detailsQuit
+                        }
+                    ]
+                }
+
+                2: {
+                    //  details - general
+                    mci: {}                 
+                }
+
+                3: {
+                    //  details - nfo/readme
+                    mci: {
+                        MT1: {
+                            mode: preview
+                        }
+                    }
+                }
+
+                4: {
+                    //  details - file listing
+                    mci: {
+                        VM1: {
+
+                        }
+                    }
+                }
+            }
+        }
+
+        fileBaseBrowseByAreaSelect: {
+            desc: Browsing File Areas
+            module: file_base_area_select
+            art: FAREASEL
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            argName: areaTag
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { areaTag: null }
+                                action: @method:selectArea
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseGetRatingForSelectedEntry: {
+            desc: Rating a File
+            prompt: fileBaseRateEntryPrompt
+            config: {
+                cls: true
+            }
+            submit: [
+            //  :TODO: handle esc/q
+                {
+                    //  pass data back to caller
+                    value: { rating: null }
+                    action: @systemMethod:prevMenu
+                }
+            ]
+        }
+
+        fileBaseListEntriesNoResults: {
+            desc: Browsing Files
+            art: FBNORES
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileBaseSearch: {
+            module: file_base_search
+            desc: Searching Files
+            art: FSEARCH
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            focus: true
+                            argName: searchTerms
+                        }
+                        BT2: {
+                            argName: search
+                            text: search
+                            submit: true
+                        }
+                        ET3: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM4: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM5: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                                "filename",
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM6: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        BT7: {
+                            argName: advancedSearch
+                            text: advanced search
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { search: null }
+                                action: @method:search
+                            }
+                            {
+                                value: { advancedSearch: null }
+                                action: @method:search
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileAreaFilterEditor: {
+            desc: File Filter Editor
+            module: file_area_filter_edit
+            art: FFILEDT
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            argName: searchTerms
+                        }
+                        ET2: {
+                            maxLength: 64
+                            argName: tags
+                        }
+                        SM3: {
+                            maxLength: 64
+                            argName: areaIndex
+                        }
+                        SM4: {
+                            items: [
+                                "upload date",
+                                "uploaded by",
+                                "downloads",
+                                "rating",
+                                "estimated year",
+                                "size",
+                            ]
+                            argName: sortByIndex
+                        }
+                        SM5: {
+                            items: [
+                                "decending",
+                                "ascending"
+                            ]
+                            argName: orderByIndex
+                        }
+                        ET6: {
+                            maxLength: 64
+                            argName: name
+                            validate: @systemMethod:validateNonEmpty
+                        }
+                        HM7: {
+                            focus: true
+                            items: [
+                                "prev", "next", "make active", "save", "new", "delete"
+                            ]
+                            argName: navSelect
+                            focusItemIndex: 1
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:prevFilter
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @method:nextFilter
+                            }
+                            {
+                                value: { navSelect: 2 }
+                                action: @method:makeFilterActive
+                            }
+                            {
+                                value: { navSelect: 3 }
+                                action: @method:saveFilter
+                            }
+                            {
+                                value: { navSelect: 4 }
+                                action: @method:newFilter
+                            }
+                            {
+                                value: { navSelect: 5 }
+                                action: @method:deleteFilter
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseDownloadManager: {
+            desc: Download Manager
+            module: file_base_download_manager
+            config: {
+                art: {
+                    queueManager: FDLMGR
+                    /*
+                    NYI
+                    details: FDLDET
+                    */
+                }
+                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            argName: queueItem
+                        }
+                        HM2: {
+                            focus: true
+                            items: [ "download all", "quit" ]
+                            argName: navSelect
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:downloadAll
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "a", "shift + a" ]
+                            action: @method:downloadAll
+                        }
+                        {
+                            keys: [ "delete", "r", "shift + r" ]
+                            action: @method:removeItem
+                        }
+                        {
+                            keys: [ "c", "shift + c" ]
+                            action: @method:clearQueue
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseWebDownloadManager: {
+            desc: Web D/L Manager
+            module: file_base_web_download_manager
+            config: {
+                art: {
+                    queueManager: FWDLMGR
+                    batchList: BATDLINF
+                }
+                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
+            }
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            argName: queueItem
+                        }
+                        HM2: {
+                            focus: true
+                            items: [ "get batch link", "quit", "help" ]
+                            argName: navSelect
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:getBatchLink
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "b", "shift + b" ]
+                            action: @method:getBatchLink
+                        }
+                        {
+                            keys: [ "delete", "r", "shift + r" ]
+                            action: @method:removeItem
+                        }
+                        {
+                            keys: [ "c", "shift + c" ]
+                            action: @method:clearQueue
+                        }
+                        {
+                            keys: [ "escape", "q", "shift + q" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseDownloadManagerEmptyQueue: {
+            desc: Empty Download Queue
+            art: FEMPTYQ
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        fileTransferProtocolSelection: {
+            desc: Protocol selection
+            module: file_transfer_protocol_select
+            art: FPROSEL
+            form: {
+                0: {
+                    mci: {
+                        VM1: {
+                            focus: true
+                            argName: protocol
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { protocol: null }
+                                action: @method:selectProtocol
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
+        fileBaseUploadFiles: {
+            desc: Uploading
+            module: upload
+            config: {
+                interrupt: never
+                art: {
+                    options: ULOPTS
+                    fileDetails: ULDETAIL
+                    processing: ULCHECK
+                    dupes: ULDUPES
+                }
+            }
+
+            form: {
+                //  options
+                0: {
+                    mci: {
+                        SM1: {
+                            argName: areaSelect
+                            focus: true
+                        }
+                        TM2: {
+                            argName: uploadType
+                            items: [ "blind", "supply filename" ]
+                        }
+                        ET3: {
+                            argName: fileName
+                            maxLength: 255
+                            validate: @method:validateNonBlindFileName
+                        }
+                        HM4: {
+                            argName: navSelect
+                            items: [ "continue", "cancel" ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { navSelect: 0 }
+                                action: @method:optionsNavContinue
+                            }
+                            {
+                                value: { navSelect: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    "actionKeys" : [
+                        {
+                            "keys"      : [ "escape" ],
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+
+                1: {
+                    mci: { }
+                }
+
+                //  file details entry
+                2: {
+                    mci: {
+                        MT1: {
+                            argName: shortDesc
+                            tabSwitchesView: true
+                            focus: true
+                        }
+
+                        ET2: {
+                            argName: tags
+                        }
+
+                        ME3: {
+                            argName: estYear
+                            maskPattern: "####"
+                        }
+
+                        BT4: {
+                            argName: continue
+                            text: continue
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { continue: null }
+                                action: @method:fileDetailsContinue
+                            }
+                        ]
+                    }
+                }
+
+                //  dupes
+                3: {
+                    mci: {
+                        VM1: {
+                            /*
+                            Use 'dupeInfoFormat' to custom format:
+
+                            areaDesc
+                            areaName
+                            areaTag
+                            desc
+                            descLong
+                            fileId
+                            fileName
+                            fileSha256
+                            storageTag
+                            uploadTimestamp
+
+                            */
+
+                            mode: preview
+                        }
+                    }
+                }
+            }
+        }
+
+        fileBaseNoUploadAreasAvail: {
+            desc: File Base
+            art: ULNOAREA
+            config: {
+                pause: true
+                menuFlags: [ "noHistory", "popParent" ]
+            }
+        }
+
+        sendFilesToUser: {
+            desc: Downloading
+            module: file_transfer
+            config: {
+                //  defaults - generally use extraArgs
+                protocol: zmodem8kSexyz
+                direction: send
+            }
+        }
+
+        recvFilesFromUser: {
+            desc: Uploading
+            module: file_transfer
+            config: {
+                //  defaults - generally use extraArgs
+                protocol: zmodem8kSexyz
+                direction: recv
+            }   
+        }
+
+
+        ////////////////////////////////////////////////////////////////////////
+        //  Required entries
+        ////////////////////////////////////////////////////////////////////////
+        idleLogoff: {
+            art:    IDLELOG
+            next:   @systemMethod:logoff
+        }
+        ////////////////////////////////////////////////////////////////////////
+        //  Demo Section
+        //  :TODO: This entire section needs updated!!!
+        ////////////////////////////////////////////////////////////////////////
+        "demoMain" : {
+            "art" : "demo_selection_vm.ans",
+            "form" : {
+                "0" : {
+                    "VM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "Single Line Text Editing Views",
+                                    "Spinner & Toggle Views",
+                                    "Mask Edit Views",
+                                    "Multi Line Text Editor",
+                                    "Vertical Menu Views",
+                                    "Horizontal Menu Views",
+                                    "Art Display",
+                                    "Full Screen Editor"
+                                ],
+                                "height" : 10,
+                                "itemSpacing" : 1,
+                                "justify" : "center",
+                                "focusTextStyle" : "small i"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : { "1" : 0 },
+                                    "action" : "@menu:demoEditTextView"
+                                },
+                                {
+                                    "value" : { "1" : 1 },
+                                    "action" : "@menu:demoSpinAndToggleView"
+                                },
+                                {
+                                    "value" : { "1" : 2 },
+                                    "action" : "@menu:demoMaskEditView"
+                                },
+                                {
+                                    "value" : { "1" : 3 },
+                                    "action" : "@menu:demoMultiLineEditTextView"
+                                },
+                                {
+                                    "value" : { "1" : 4 },
+                                    "action"    : "@menu:demoVerticalMenuView"
+                                },
+                                {
+                                    "value"     : { "1" : 5 },
+                                    "action"    : "@menu:demoHorizontalMenuView"
+                                },
+                                {
+                                    "value" : { "1" : 6 },
+                                    "action" : "@menu:demoArtDisplay"
+                                },
+                                {
+                                    "value" : { "1" : 7 },
+                                    "action" : "@menu:demoFullScreenEditor"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "demoEditTextView" : {
+            "art" : "demo_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTETETETET" : {
+                        "mci" : {
+                            "ET1" : {
+                                "width"     : 20,
+                                "maxLength" : 20
+                            },
+                            "ET2" : {
+                                "width"     : 20,
+                                "maxLength" : 40,
+                                "textOverflow" : "..."
+                            },
+                            "ET3" : {
+                                "width"     : 20,
+                                "fillChar" : "-",
+                                "styleSGR1" : "|00|36",
+                                "maxLength" : 20
+                            },
+                            "ET4" : {
+                                "width"     : 20,
+                                "maxLength" : 20,
+                                "password"  : true
+                            },
+                            "BT5" : {
+                                "width" : 8,
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoSpinAndToggleView" : {
+            "art" : "demo_spin_and_toggle.ans",
+            "form" : {
+                "0" : {
+                    "BTSMSMTM" : {
+                        "mci" : {
+                            "SM1" : {
+                                "items" : [ "Henry Morgan", "François l'Ollonais", "Roche Braziliano", "Black Bart", "Blackbeard" ]
+                            },
+                            "SM2" : {
+                                "items" : [ "Razor 1911", "DrinkOrDie", "TRSI" ]
+                            },
+                            "TM3" : {
+                                "items"     : [ "Yarly", "Nowaii" ],
+                                "styleSGR1" : "|00|30|01",
+                                "hotKeys"   : { "Y" : 0, "N" : 1 }
+                            },
+                            "BT8" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 8,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 8
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoMaskEditView" : {
+            "art" : "demo_mask_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTMEME" : {
+                        "mci" : {
+                            "ME1" : {
+                                "maskPattern"   : "##/##/##",
+                                "styleSGR1"     : "|00|30|01",
+                                //"styleSGR2"       : "|00|45|01",
+                                "styleSGR3"     : "|00|30|35",
+                                "fillChar"      : "#"
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoMultiLineEditTextView" : {
+            "art" : "demo_multi_line_edit_text_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTMT" : {
+                        "mci" : {
+                            "MT1" : {
+                                "width"     : 70,
+                                "height"    : 17,
+                                //"text"        : "@art:demo_multi_line_edit_text_view_text.txt",
+                                // "text" : "@systemMethod:textFromFile"
+                                text: "Hints:\n\t* Insert / CTRL-V toggles overtype mode\n\t* CTRL-Y deletes the current line\n\t* Try Page Up / Page Down\n\t* Home goes to the start of line text\n\t* End goes to the end of a line\n\n\nTab handling:\n-------------------------------------------------\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\nA0\tBB\t1\tCCC\t2\tDDD\t3EEEE\nW\t\tX\t\tY\t\tZ\n\nAn excerpt from A Clockwork Orange:\n\"What sloochatted then, of course, was that my cellmates woke up and started joining in, tolchocking a bit wild in the near-dark, and the shoom seemed to wake up the whole tier, so that you could slooshy a lot of creeching and banging about with tin mugs on the wall, as though all the plennies in all the cells thought a big break was about to commence, O my brothers.\n",
+                                "focus"     : true
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoHorizontalMenuView" : {
+            "art" : "demo_horizontal_menu_view1.ans",
+            "form" : {
+                "0" : {
+                    "BTHMHM" : {
+                        "mci" : {
+                            "HM1" : {
+                                "items" : [ "One", "Two", "Three" ],
+                                "hotKeys" : { "1" : 0, "2" : 1, "3" : 2 }
+                            },
+                            "HM2" : {
+                                "items" : [ "Uno", "Dos", "Tres" ],
+                                "hotKeys" : { "U" : 0, "D" : 1, "T" : 2 }
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : 5,
+                                    "action" : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "demoVerticalMenuView" : {
+            "art"       : "demo_vertical_menu_view1.ans",
+            "form"      : {
+                "0" : {
+                    "BTVM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "|33Oblivion/2",
+                                    "|33iNiQUiTY",
+                                    "|33ViSiON/X"
+                                ],
+                                "focusItems" : [
+                                    "|33Oblivion|01/|00|332",
+                                    "|01|33i|00|33N|01i|00|33QU|01i|00|33TY",
+                                    "|33ViSiON/X"
+                                ]
+                                //
+                                //  :TODO: how to do the following:
+                                //  1) Supply a view a string for a standard vs focused item
+                                //      "items" : [...], "focusItems" : [ ... ] ?
+                                //      "draw" : "@method:drawItemX", then items: [...]
+                            },
+                            "BT5" : {
+                                "text" : "< Back"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : 5,
+                                    "action"    : "@menu:demoMain"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 5
+                            }
+                        ]
+                    }
+                }
+            }
+
+        },
+        "demoArtDisplay" : {
+            "art" : "demo_selection_vm.ans",
+            "form" : {
+                "0" : {
+                    "VM" : {
+                        "mci" : {
+                            "VM1" : {
+                                "items" : [
+                                    "Defaults - DOS ANSI",
+                                    "bw_mindgames.ans - DOS",
+                                    "test.ans - DOS",
+                                    "Defaults - Amiga",
+                                    "Pause at Term Height"
+                                ],
+                                //  :TODO: justify not working??
+                                "focusTextStyle" : "small i"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value" : { "1" : 0 },
+                                    "action" : "@menu:demoDefaultsDosAnsi"
+                                },
+                                {
+                                    "value" : { "1" : 1 },
+                                    "action" : "@menu:demoDefaultsDosAnsi_bw_mindgames"
+                                },
+                                {
+                                    "value" : { "1" : 2 },
+                                    "action" : "@menu:demoDefaultsDosAnsi_test"
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "demoDefaultsDosAnsi" : {
+            "art" : "DM-ENIG2.ANS"
+        },
+        "demoDefaultsDosAnsi_bw_mindgames" : {
+            "art" : "bw_mindgames.ans"
+        },
+        "demoDefaultsDosAnsi_test" : {
+            "art" : "test.ans"
+        },
+        "demoFullScreenEditor" : {
+            "module"    : "fse",
+            "config"    : {
+                "editorType"    : "netMail",
+                "art"           : {
+                    "header"            : "demo_fse_netmail_header.ans",
+                    "body"              : "demo_fse_netmail_body.ans",
+                    "footerEditor"      : "demo_fse_netmail_footer_edit.ans",
+                    "footerEditorMenu"  : "demo_fse_netmail_footer_edit_menu.ans",
+                    "footerView"        : "demo_fse_netmail_footer_view.ans",
+                    "help"              : "demo_fse_netmail_help.ans"
+                }
+            },
+            "form" : {
+                "0" : {
+                    "ETETET" : {
+                        "mci" : {
+                            "ET1" : {
+                                //  :TODO: from/to may be set by args
+                                //  :TODO: focus may change dep on view vs edit
+                                "width"     : 36,
+                                "focus"     : true,
+                                "argName"   : "to"
+                            },
+                            "ET2" : {
+                                "width"     : 36,
+                                "argName"   : "from"
+                            },
+                            "ET3" : {
+                                "width"     : 65,
+                                "maxLength" : 72,
+                                "submit"    : [ "enter" ],
+                                "argName"   : "subject"
+                            }
+                        },
+                        "submit" : {
+                            "3" : [
+                                {
+                                    "value" : { "subject" : null },
+                                    "action" : "@method:headerSubmit"
+                                }
+                            ]
+                        }
+                    }
+                },
+                "1" : {
+                    "MT" : {
+                        "mci" : {
+                            "MT1" : {
+                                "width"     : 79,
+                                "height"    : 17,
+                                "text"      : "",   //  :TODO: should not be req.
+                                "argName"   : "message"
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : "message",
+                                    "action"    : "@method:editModeEscPressed"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [
+                            {
+                                "keys"      : [ "escape" ],
+                                "viewId"    : 1
+                            }
+                        ]
+                    }
+                },
+                "2" : {
+                    "TLTL" :  {
+                        "mci" : {
+                            "TL1" : {
+                                "width" : 5
+                            },
+                            "TL2" : {
+                                "width" : 4
+                            }
+                        }
+                    }
+                },
+                "3" : {
+                    "HM" : {
+                        "mci" : {
+                            "HM1" : {
+                                //  :TODO: Continue, Save, Discard, Clear, Quote, Help
+                                "items" : [ "Save", "Discard", "Quote", "Help" ]
+                            }
+                        },
+                        "submit" : {
+                            "*" : [
+                                {
+                                    "value"     : { "1" : 0 },
+                                    "action"    : "@method:editModeMenuSave"
+                                },
+                                {
+                                    "value"     : { "1" : 1 },
+                                    "action"    : "@menu:demoMain"
+                                },
+                                {
+                                    "value"     : { "1" : 2 },
+                                    "action"    : "@method:editModeMenuQuote"
+                                },
+                                {
+                                    "value"     : { "1" : 3 },
+                                    "action"    : "@method:editModeMenuHelp"
+                                },
+                                {
+                                    "value"     : 1,
+                                    "action"    : "@method:editModeEscPressed"
+                                }
+                            ]
+                        },
+                        "actionKeys" : [    //  :TODO: Need better name
+                            {
+                                "keys"      : [ "escape" ],
+                                "action"    : "@method:editModeEscPressed"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}

From 2c3219fc67279d0aa16711138726d81d7559e823 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 23:44:38 +0100
Subject: [PATCH 0816/1013] Remove heartbeat when client exits mrc

---
 core/mrc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/mrc.js b/core/mrc.js
index 54aa70f7..d696c9e7 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -112,6 +112,7 @@ exports.getModule = class mrcModule extends MenuModule {
 
             quit : (formData, extraArgs, cb) => {
                 this.sendServerMessage('LOGOFF');
+                clearInterval(this.heartbeat);
                 this.state.socket.destroy();
                 return this.prevMenu(cb);
             }
@@ -147,7 +148,7 @@ exports.getModule = class mrcModule extends MenuModule {
                             self.clientConnect();
 
                             // send register to central MRC and get stats every 60s
-                            setInterval(function () {
+                            self.heartbeat = setInterval(function () {
                                 self.sendHeartbeat();
                                 self.sendServerMessage('STATS');
                             }, 60000);

From 072246ae1b125ba6b4c5d1eebc7b07eca72c759b Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 26 May 2019 23:45:00 +0100
Subject: [PATCH 0817/1013] Main menu ansi to include MRC

---
 art/themes/luciano_blocktronics/MMENU.ANS | Bin 3610 -> 3653 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS
index bd8a483f56406abf49f17d727730aab0a4a157ff..9db39ca9e7afc13910caf7d3549d931dc59f72fd 100644
GIT binary patch
delta 63
zcmbOwb5v%76|b(5fwOe9VXi`MQL=QjL9T*yw6R%kZfQ<Qrb1C_PGY4(az<haP|!SA
SI@)5g4et)dTa&-?ssaFZ%@m>l

delta 20
ccmX>qGfQTJ6)%&C<>YkU9gOQIEAXiT07rlZQvd(}


From ca8add36b52587d67e4fa55b6dd53821374d3af3 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Mon, 27 May 2019 15:50:07 +0100
Subject: [PATCH 0818/1013] reenable disabled jobs

---
 core/config.js | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/core/config.js b/core/config.js
index ea309fc6..37dfbd90 100644
--- a/core/config.js
+++ b/core/config.js
@@ -984,38 +984,38 @@ function getDefaultConfig() {
         eventScheduler : {
 
             events : {
-                // dailyMaintenance : {
-                //     schedule    : 'at 11:59pm',
-                //     action      : '@method:core/misc_scheduled_events.js:dailyMaintenanceScheduledEvent',
-                // },
-                // trimMessageAreas : {
-                //     //  may optionally use [or ]@watch:/path/to/file
-                //     schedule    : 'every 24 hours',
+                dailyMaintenance : {
+                    schedule    : 'at 11:59pm',
+                    action      : '@method:core/misc_scheduled_events.js:dailyMaintenanceScheduledEvent',
+                },
+                trimMessageAreas : {
+                    //  may optionally use [or ]@watch:/path/to/file
+                    schedule    : 'every 24 hours',
 
-                //     //  action:
-                //     //  - @method:path/to/module.js:theMethodName
-                //     //    (path is relative to ENiGMA base dir)
-                //     //
-                //     //  - @execute:/path/to/something/executable.sh
-                //     //
-                //     action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
-                // },
+                    //  action:
+                    //  - @method:path/to/module.js:theMethodName
+                    //    (path is relative to ENiGMA base dir)
+                    //
+                    //  - @execute:/path/to/something/executable.sh
+                    //
+                    action      : '@method:core/message_area.js:trimMessageAreasScheduledEvent',
+                },
 
-                // nntpMaintenance : {
-                //     schedule    : 'every 12 hours', //  should generally be < trimMessageAreas interval
-                //     action      : '@method:core/servers/content/nntp.js:performMaintenanceTask',
-                // },
+                nntpMaintenance : {
+                    schedule    : 'every 12 hours', //  should generally be < trimMessageAreas interval
+                    action      : '@method:core/servers/content/nntp.js:performMaintenanceTask',
+                },
 
-                // updateFileAreaStats : {
-                //     schedule    : 'every 1 hours',
-                //     action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
-                // },
+                updateFileAreaStats : {
+                    schedule    : 'every 1 hours',
+                    action      : '@method:core/file_base_area.js:updateAreaStatsScheduledEvent',
+                },
 
-                // forgotPasswordMaintenance : {
-                //     schedule    : 'every 24 hours',
-                //     action      : '@method:core/web_password_reset.js:performMaintenanceTask',
-                //     args        : [ '24 hours' ]    //  items older than this will be removed
-                // },
+                forgotPasswordMaintenance : {
+                    schedule    : 'every 24 hours',
+                    action      : '@method:core/web_password_reset.js:performMaintenanceTask',
+                    args        : [ '24 hours' ]    //  items older than this will be removed
+                },
 
                 //
                 //  Enable the following entry in your config.hjson to periodically create/update

From b4e37118dd1b3849870cfe9e94deab1189ec355d Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Tue, 28 May 2019 23:45:22 +0100
Subject: [PATCH 0819/1013] Fixed user achievements ansi

---
 .../{USERACHIEV.ANS => USERACHIEV.ans}              | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename art/themes/luciano_blocktronics/{USERACHIEV.ANS => USERACHIEV.ans} (100%)

diff --git a/art/themes/luciano_blocktronics/USERACHIEV.ANS b/art/themes/luciano_blocktronics/USERACHIEV.ans
similarity index 100%
rename from art/themes/luciano_blocktronics/USERACHIEV.ANS
rename to art/themes/luciano_blocktronics/USERACHIEV.ans

From 29e0c8f7905a0ba7746c71405b856d19ff817ca3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 29 May 2019 22:03:29 -0600
Subject: [PATCH 0820/1013] Ability to show secret or backup codes

---
 core/user_2fa_otp_config.js | 83 +++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 22 deletions(-)

diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index a4bbb3df..a47e0e6d 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -34,6 +34,11 @@ const MciViewIds = {
     customRangeStart    : 10,   //  10+ = customs
 };
 
+const DefaultMsg = {
+    otpNotEnabled   : '2FA/OTP is not currently enabled for this account.',
+    noBackupCodes   : 'No backup codes remaining or set.',
+};
+
 exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     constructor(options) {
         super(options);
@@ -42,6 +47,12 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         this.menuMethods = {
             showQRCode : (formData, extraArgs, cb) => {
                 return this.showQRCode(cb);
+            },
+            showSecret : (formData, extraArgs, cb) => {
+                return this.showSecret(cb);
+            },
+            showBackupCodes : (formData, extraArgs, cb) => {
+                return this.showBackupCodes(cb);
             }
         };
     }
@@ -101,35 +112,63 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         });
     }
 
-    showQRCode(cb) {
-        const otp = otpFromType(this.client.user.getProperty(UserProps.AuthFactor2OTP));
-        let qrCodeAscii = '';
-        if(!otp) {
-            qrCodeAscii = '2FA/OTP is not currently enabled for this account';
-        }
-
-        const qrOptions = {
-            username    : this.client.user.username,
-            qrType      : 'ascii',
-        };
-        qrCodeAscii = createQRCode(
-            otp,
-            qrOptions,
-            this.client.user.getProperty(UserProps.AuthFactor2OTPSecret)
-        ).replace(/\n/g, '\r\n');
-
+    displayDetails(details, cb) {
         const modOpts = {
             extraArgs : {
-                artData : iconv.encode(`${qrCodeAscii}\r\n`, 'cp437'),
+                artData : iconv.encode(`${details}\r\n`, 'cp437'),
             }
         };
         this.gotoMenu(
-            this.menuConfig.config.mainMenuUser2FAOTP_ShowQR || 'mainMenuUser2FAOTP_ShowQR',
+            this.menuConfig.config.user2FAOTP_ShowDetails || 'user2FAOTP_ShowDetails',
             modOpts,
             cb
         );
     }
 
+    showQRCode(cb) {
+        const otp = otpFromType(this.client.user.getProperty(UserProps.AuthFactor2OTP));
+
+        let qrCode;
+        if(!otp) {
+            qrCode = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+        } else {
+            const qrOptions = {
+                username    : this.client.user.username,
+                qrType      : 'ascii',
+            };
+            qrCode = createQRCode(
+                otp,
+                qrOptions,
+                this.client.user.getProperty(UserProps.AuthFactor2OTPSecret)
+            ).replace(/\n/g, '\r\n');
+        }
+
+        return this.displayDetails(qrCode, cb);
+    }
+
+    showSecret(cb) {
+        const info =
+            this.client.user.getProperty(UserProps.AuthFactor2OTPSecret) ||
+            this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+        return this.displayDetails(info, cb);
+    }
+
+    showBackupCodes(cb) {
+        let info;
+        const noBackupCodes = this.config.noBackupCodes || DefaultMsg.noBackupCodes;
+        if(!this.isOTPEnabledForUser()) {
+            info = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+        } else {
+            try {
+                info = JSON.parse(this.client.user.getProperty(UserProps.AuthFactor2OTPBackupCodes) || '[]').join(', ');
+                info = info || noBackupCodes;
+            } catch(e) {
+                info = noBackupCodes;
+            }
+        }
+        return this.displayDetails(info, cb);
+    }
+
     isOTPEnabledForUser() {
         return this.typeSelectionIndexFromUserOTPType(-1) != -1;
     }
@@ -140,8 +179,8 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
 
     enableToggleUpdate(idx) {
         const key = {
-            0 : '2faDisabled',
-            1 : '2faEnabled',
+            0 : 'disabled',
+            1 : 'enabled',
         }[idx];
         this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
     }
@@ -164,7 +203,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     }
 
     typeSelectionUpdate(idx) {
-        const key = '2faType_' + this.otpTypeFromTypeSelectionIndex(idx);
+        const key = this.otpTypeFromTypeSelectionIndex(idx);
         this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
     }
 };

From 593bf67b45a7bf45bd2db19b850d3e69a79a17ef Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 01:16:32 +0100
Subject: [PATCH 0821/1013] Stop passing sockets all over the place. General
 tidy up and refactor. Add reconnection to MRC logic.

---
 core/servers/chat/mrc_multiplexer.js | 170 ++++++++++++++++++---------
 1 file changed, 113 insertions(+), 57 deletions(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 7eaac22f..e0ef4a54 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -16,7 +16,8 @@ const os                    = require('os');
 
 
 // MRC
-const PROTOCOL_VERSION = '1.2.9';
+const protocolVersion   = '1.2.9';
+const lineDelimiter     = new RegExp('\r\n|\r|\n');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'MRC',
@@ -27,62 +28,130 @@ const ModuleInfo = exports.moduleInfo = {
 };
 
 const connectedSockets = new Set();
-let mrcCentralConnection = '';
 
 exports.getModule = class MrcModule extends ServerModule {
     constructor() {
         super();
-        this.log        = Log.child( { server : 'MRC' } );
+
+        this.log            = Log.child( { server : 'MRC' } );
+        this.config         = Config();
+        this.mrcConnectOpts = {
+            host         : this.config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
+            port         : this.config.chatServers.mrc.serverPort || 5000,
+            retryDelay   : this.config.chatServers.mrc.retryDelay || 10000
+        };
     }
 
-    createServer(cb) {
-        if (!this.enabled) {
-            return cb(null);
-        }
-
-        const self = this;
-
+    _connectionHandler() {
         const config = Config();
         const boardName  = config.general.prettyBoardName || config.general.boardName;
         const enigmaVersion = 'ENiGMA-BBS_' + require('../../../package.json').version;
 
-        const mrcConnectOpts = {
-            host    : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
-            port    : config.chatServers.mrc.serverPort || 5000
-        };
-
-        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${PROTOCOL_VERSION}`;
+        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${protocolVersion}`;
         this.log.debug({ handshake : handshake }, 'Handshaking with MRC server');
 
+        this.mrcClient.write(handshake);
+        this.log.info(this.mrcConnectOpts, 'Connected to MRC server');
+    }
+
+    createServer(cb) {
+
+        if (!this.enabled) {
+            return cb(null);
+        }
+
+        this.connectToMrc();
+        this.createLocalListener();
+
+        return cb(null);
+    }
+
+    listen(cb) {
+        if (!this.enabled) {
+            return cb(null);
+        }
+
+        const config = Config();
+
+        const port = parseInt(config.chatServers.mrc.multiplexerPort);
+        if(isNaN(port)) {
+            this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
+            return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`));
+        }
+        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer local listener starting up');
+        return this.server.listen(port, cb);
+    }
+
+    /**
+     * Handles connecting to to the MRC server
+     */
+    connectToMrc() {
+        const self = this;
+
         // create connection to MRC server
-        this.mrcClient = net.createConnection(mrcConnectOpts, () => {
-            this.mrcClient.write(handshake);
-            this.log.info(mrcConnectOpts, 'Connected to MRC server');
-            mrcCentralConnection = this.mrcClient;
-        });
+        this.mrcClient = net.createConnection(this.mrcConnectOpts, self._connectionHandler.bind(self));
+
+        this.mrcClient.requestedDisconnect = false;
 
         // do things when we get data from MRC central
-        this.mrcClient.on('data', (data) => {
-            // split on \n to deal with getting messages in batches
-            data.toString().split('\n').forEach( item => {
-                if (item == '') return;
+        var buffer = new Buffer.from('');
 
-                this.log.debug( { data : item } , 'Received data');
-                let message = this.parseMessage(item);
-                this.log.debug(message, 'Parsed data');
-                if (message) {
-                    this.receiveFromMRC(this.mrcClient, message);
+        function handleData(chunk) {
+            if (typeof (chunk) === 'string') {
+                buffer += chunk;
+            } else {
+                buffer = Buffer.concat([buffer, chunk]);
+            }
+
+            var lines = buffer.toString().split(lineDelimiter);
+
+            if (lines.pop()) {
+                // if buffer is not ended with \r\n, there's more chunks.
+                return;
+            } else {
+                // else, initialize the buffer.
+                buffer = new Buffer.from('');
+            }
+
+            lines.forEach(function iterator(line) {
+                if (line.length) {
+                    let message = self.parseMessage(line);
+                    if (message) {
+                        self.receiveFromMRC(message);
+                    }
                 }
             });
+        }
+
+        this.mrcClient.on('data', (data) => {
+            handleData(data);
         });
 
         this.mrcClient.on('end', () => {
-            this.log.info(mrcConnectOpts, 'Disconnected from MRC server');
+            this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server');
+        });
+
+        this.mrcClient.on('close', () => {
+
+            if (this.mrcClient && this.mrcClient.requestedDisconnect)
+                return;
+            this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server, reconnecting');
+
+            this.log.debug('Waiting ' + this.mrcConnectOpts.retryDelay + 'ms before retrying');
+
+
+            setTimeout(function() {
+                self.connectToMrc();
+            }, this.mrcConnectOpts.retryDelay);
         });
 
         this.mrcClient.on('error', err => {
             this.log.info( { error : err.message }, 'MRC server error');
         });
+    }
+
+    createLocalListener() {
+        const self = this;
 
         // start a local server for clients to connect to
         this.server = net.createServer( function(socket) {
@@ -90,7 +159,7 @@ exports.getModule = class MrcModule extends ServerModule {
 
             socket.on('data', data => {
                 // split on \n to deal with getting messages in batches
-                data.toString().split('\n').forEach( item => {
+                data.toString().split(lineDelimiter).forEach( item => {
                     if (item == '') return;
 
                     // save username with socket
@@ -114,24 +183,6 @@ exports.getModule = class MrcModule extends ServerModule {
                 }
             });
         });
-
-        return cb(null);
-    }
-
-    listen(cb) {
-        if (!this.enabled) {
-            return cb(null);
-        }
-
-        const config = Config();
-
-        const port = parseInt(config.chatServers.mrc.multiplexerPort);
-        if(isNaN(port)) {
-            this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
-            return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`));
-        }
-        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer local listener starting up');
-        return this.server.listen(port, cb);
     }
 
     get enabled() {
@@ -158,21 +209,21 @@ exports.getModule = class MrcModule extends ServerModule {
     }
 
     /**
-     * Processes messages received     // split raw data received into an object we can work withfrom the central MRC server
+     * Processes messages received from the central MRC server
      */
-    receiveFromMRC(socket, message) {
+    receiveFromMRC(message) {
 
         const config = Config();
         const siteName = slugify(config.general.boardName);
 
         if (message.from_user == 'SERVER' && message.body == 'HELLO') {
             // reply with extra bbs info
-            this.sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `INFOSYS:${StatLog.getSystemStat(SysProps.SysOpUsername)}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFOSYS:${StatLog.getSystemStat(SysProps.SysOpUsername)}`);
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
             // this.log.debug('Respond to heartbeat');
-            this.sendToMrcServer(socket, 'CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
 
         } else {
             // if not a heartbeat, and we have clients then we need to send something to them
@@ -210,13 +261,13 @@ exports.getModule = class MrcModule extends ServerModule {
             Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
         }
 
-        this.sendToMrcServer(mrcCentralConnection, message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
+        this.sendToMrcServer(message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
     }
 
     /**
      * Converts a message back into the MRC format and sends it to the central MRC server
      */
-    sendToMrcServer(socket, fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
+    sendToMrcServer(fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
         const config = Config();
         const siteName = slugify(config.general.boardName);
 
@@ -231,7 +282,12 @@ exports.getModule = class MrcModule extends ServerModule {
         ].join('~') + '~';
 
         Log.debug({ server : 'MRC', data : line }, 'Sending data');
-        return socket.write(line + '\n');
+        this.sendRaw(line);
+    }
+
+    sendRaw(message) {
+        // optionally log messages here
+        this.mrcClient.write(message + '\r\n');
     }
 };
 

From 136854017a26582a0684c0b23f8840f510e8d401 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 20:32:16 +0100
Subject: [PATCH 0822/1013] Lots of tidy-up from PR #235 feedback

---
 core/servers/chat/mrc_multiplexer.js | 44 +++++++++++++---------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index e0ef4a54..641353c2 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -45,12 +45,12 @@ exports.getModule = class MrcModule extends ServerModule {
     _connectionHandler() {
         const config = Config();
         const boardName  = config.general.prettyBoardName || config.general.boardName;
-        const enigmaVersion = 'ENiGMA-BBS_' + require('../../../package.json').version;
+        const enigmaVersion = 'ENiGMA½-BBS_' + require('../../../package.json').version;
 
         const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${protocolVersion}`;
         this.log.debug({ handshake : handshake }, 'Handshaking with MRC server');
 
-        this.mrcClient.write(handshake);
+        this.sendRaw(handshake);
         this.log.info(this.mrcConnectOpts, 'Connected to MRC server');
     }
 
@@ -94,10 +94,10 @@ exports.getModule = class MrcModule extends ServerModule {
         this.mrcClient.requestedDisconnect = false;
 
         // do things when we get data from MRC central
-        var buffer = new Buffer.from('');
+        let buffer = new Buffer.from('');
 
         function handleData(chunk) {
-            if (typeof (chunk) === 'string') {
+            if(_.isString(chunk)) {
                 buffer += chunk;
             } else {
                 buffer = Buffer.concat([buffer, chunk]);
@@ -113,7 +113,7 @@ exports.getModule = class MrcModule extends ServerModule {
                 buffer = new Buffer.from('');
             }
 
-            lines.forEach(function iterator(line) {
+            lines.forEach( line => {
                 if (line.length) {
                     let message = self.parseMessage(line);
                     if (message) {
@@ -151,10 +151,9 @@ exports.getModule = class MrcModule extends ServerModule {
     }
 
     createLocalListener() {
-        const self = this;
-
         // start a local server for clients to connect to
-        this.server = net.createServer( function(socket) {
+
+        this.server = net.createServer( socket => {
             socket.setEncoding('ascii');
 
             socket.on('data', data => {
@@ -168,7 +167,7 @@ exports.getModule = class MrcModule extends ServerModule {
                         socket.username = item.split('|')[1];
                         Log.debug( { server : 'MRC', user: socket.username } , 'User connected');
                     } else {
-                        self.receiveFromClient(socket.username, item);
+                        this.receiveFromClient(socket.username, item);
                     }
                 });
             });
@@ -219,6 +218,10 @@ exports.getModule = class MrcModule extends ServerModule {
         if (message.from_user == 'SERVER' && message.body == 'HELLO') {
             // reply with extra bbs info
             this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFOSYS:${StatLog.getSystemStat(SysProps.SysOpUsername)}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFOWEB:${config.general.website}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFOTEL:${config.general.telnetHostname}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFOSSH:${config.general.sshHostname}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `INFODSC:${config.general.description}`);
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
@@ -235,20 +238,15 @@ exports.getModule = class MrcModule extends ServerModule {
      * Takes an MRC message and parses it into something usable
      */
     parseMessage(line) {
-        const msg = line.split('~');
-        if (msg.length < 7) {
-            return;
-        }
 
-        return {
-            from_user: msg[0],
-            from_site: msg[1],
-            from_room: msg[2],
-            to_user: msg[3],
-            to_site: msg[4],
-            to_room: msg[5],
-            body: msg[6]
-        };
+        const [from_user, from_site, from_room, to_user, to_site, to_room, body ] = line.split('~');
+
+        // const msg = line.split('~');
+        // if (msg.length < 7) {
+        //     return;
+        // }
+
+        return { from_user, from_site, from_room, to_user, to_site, to_room, body };
     }
 
     /**
@@ -287,7 +285,7 @@ exports.getModule = class MrcModule extends ServerModule {
 
     sendRaw(message) {
         // optionally log messages here
-        this.mrcClient.write(message + '\r\n');
+        this.mrcClient.write(message + '\n');
     }
 };
 

From ce16f17081e34f2588775410cf2272dab5450b80 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 20:34:07 +0100
Subject: [PATCH 0823/1013] Fix MRC MLTEV padding bug

---
 core/mrc.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index d696c9e7..172466a9 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -178,14 +178,17 @@ exports.getModule = class mrcModule extends MenuModule {
         const messageLength = stripMciColorCodes(message).length;
         const chatWidth = chatLogView.dimens.width;
         let padAmount = 0;
+        let spaces = 2;
 
         if (messageLength > chatWidth) {
-            padAmount = chatWidth - (messageLength % chatWidth);
+            padAmount = chatWidth - (messageLength % chatWidth) - spaces;
         } else {
-            padAmount = chatWidth - messageLength;
+            padAmount = chatWidth - messageLength - spaces ;
         }
 
-        const padding = ' |00' + ' '.repeat(padAmount - 2);
+        if (padAmount < 0) padAmount = 0;
+
+        const padding = ' |00' + ' '.repeat(padAmount);
         chatLogView.addText(pipeToAnsi(message + padding));
     }
 

From 793c05ee82f70e296dfdd115c53dbcef1e84b1ec Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 21:08:22 +0100
Subject: [PATCH 0824/1013] Add config options to template

---
 misc/config_template.in.hjson | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/misc/config_template.in.hjson b/misc/config_template.in.hjson
index 5e523e72..960a9896 100644
--- a/misc/config_template.in.hjson
+++ b/misc/config_template.in.hjson
@@ -50,6 +50,21 @@
     general: {
         //  Your BBS Name!
         boardName: XXXXX
+
+        // Your BBS name, with pipe codes for styling
+        prettyBoardName : '|08XXXXX'
+
+        // Telnet hostname and port for your board
+        telnetHostname  : 'xibalba.l33t.codes:44510'
+
+        // SSH hostname and port for your board
+        sshHostname     : 'xibalba.l33t.codes:44511'
+
+        // Your board's website
+        website         : 'https://enigma-bbs.github.io'
+
+        // Short board description
+        description     : 'Yet another awesome ENiGMA½ BBS'
     }
 
     paths: {
@@ -274,6 +289,16 @@
         }
     }
 
+    chatServers: {
+        // multi relay chat settings. No need to sign up, just enable it.
+        // More info: https://bbswiki.bottomlessabyss.net/index.php?title=MRC_Chat_platform
+        mrc: {
+            enabled             : false
+            serverHostname      : 'mrc.bottomlessabyss.net'
+            serverPort          : 5000
+        }
+    }
+
     //
     //  Currently, ENiGMA½ can use external email to mail
     //  users for password resets. Additional functionality will

From 19e10bb09656983c267578a2fd6c7d1780c025f3 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 21:19:29 +0100
Subject: [PATCH 0825/1013] Tweak to MRC handshake

---
 core/servers/chat/mrc_multiplexer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 641353c2..2b7c54a3 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -47,7 +47,7 @@ exports.getModule = class MrcModule extends ServerModule {
         const boardName  = config.general.prettyBoardName || config.general.boardName;
         const enigmaVersion = 'ENiGMA½-BBS_' + require('../../../package.json').version;
 
-        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}-${os.arch()}/${protocolVersion}`;
+        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}.${os.arch()}/${protocolVersion}`;
         this.log.debug({ handshake : handshake }, 'Handshaking with MRC server');
 
         this.sendRaw(handshake);

From b6d0d0d95e53972f7947272423f8fb17ed627efe Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 21:20:18 +0100
Subject: [PATCH 0826/1013] Move generic config options to general config
 section

---
 core/config.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/config.js b/core/config.js
index 37dfbd90..a4762e91 100644
--- a/core/config.js
+++ b/core/config.js
@@ -169,6 +169,11 @@ function getDefaultConfig() {
     return {
         general : {
             boardName       : 'Another Fine ENiGMA½ BBS',
+            prettyBoardName : '|08A|07nother |07F|08ine |07E|08NiGMA|07½ B|08BS',
+            telnetHostname  : '',
+            sshHostname     : '',
+            website         : 'https://enigma-bbs.github.io',
+            description     : 'An ENiGMA½ BBS',
 
             //  :TODO: closedSystem prob belongs under users{}?
             closedSystem    : false,                    //  is the system closed to new users?
@@ -454,15 +459,8 @@ function getDefaultConfig() {
                 enabled             : true,
                 serverHostname      : 'mrc.bottomlessabyss.net',
                 serverPort          : 5000,
+                retryDelay          : 10000,
                 multiplexerPort     : 5000,
-                bbsInfo : {
-                    sysop           : '',
-                    telnet          : '',
-                    website         : '',
-                    ssh             : '',
-                    description     : '',
-
-                }
             }
         },
 

From 8153473b89f4dfab160bf7b74c35e4cee6315be8 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 22:00:48 +0100
Subject: [PATCH 0827/1013] Dial down MRC logging

---
 core/mrc.js                          |  2 --
 core/servers/chat/mrc_multiplexer.js | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 172466a9..bca11656 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -396,9 +396,7 @@ exports.getModule = class mrcModule extends MenuModule {
             body: body
         };
 
-        this.log.debug({ message: message }, 'Sending message to MRC multiplexer');
         // TODO: check socket still exists here
-
         this.state.socket.write(JSON.stringify(message) + '\n');
     }
 
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 2b7c54a3..69b3b248 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -34,11 +34,12 @@ exports.getModule = class MrcModule extends ServerModule {
         super();
 
         this.log            = Log.child( { server : 'MRC' } );
-        this.config         = Config();
+
+        const config        = Config();
         this.mrcConnectOpts = {
-            host         : this.config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
-            port         : this.config.chatServers.mrc.serverPort || 5000,
-            retryDelay   : this.config.chatServers.mrc.retryDelay || 10000
+            host         : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
+            port         : config.chatServers.mrc.serverPort || 5000,
+            retryDelay   : config.chatServers.mrc.retryDelay || 10000
         };
     }
 
@@ -78,7 +79,7 @@ exports.getModule = class MrcModule extends ServerModule {
             this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
             return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`));
         }
-        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer local listener starting up');
+        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer starting up');
         return this.server.listen(port, cb);
     }
 
@@ -135,11 +136,10 @@ exports.getModule = class MrcModule extends ServerModule {
 
             if (this.mrcClient && this.mrcClient.requestedDisconnect)
                 return;
+
             this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server, reconnecting');
-
             this.log.debug('Waiting ' + this.mrcConnectOpts.retryDelay + 'ms before retrying');
 
-
             setTimeout(function() {
                 self.connectToMrc();
             }, this.mrcConnectOpts.retryDelay);
@@ -199,10 +199,8 @@ exports.getModule = class MrcModule extends ServerModule {
     sendToClient(message) {
         connectedSockets.forEach( (client) => {
             if (message.to_user == '' || message.to_user == client.username || message.to_user == 'CLIENT' || message.from_user == client.username || message.to_user == 'NOTME' ) {
-                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user');
+                // this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user');
                 client.write(JSON.stringify(message) + '\n');
-            } else {
-                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Not forwarding message');
             }
         });
     }
@@ -225,7 +223,6 @@ exports.getModule = class MrcModule extends ServerModule {
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
-            // this.log.debug('Respond to heartbeat');
             this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
 
         } else {

From a97c5bbe822f3ab3f4055c40a88a446a2f14c978 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 22:18:35 +0100
Subject: [PATCH 0828/1013] Add extra line to MRC chat area

---
 art/themes/luciano_blocktronics/mrc.ans     | Bin 881 -> 721 bytes
 art/themes/luciano_blocktronics/theme.hjson |  32 +++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/art/themes/luciano_blocktronics/mrc.ans b/art/themes/luciano_blocktronics/mrc.ans
index a1bbd030f30251860bafab4e8e98625373ec9843..a3079f3c879ba6ccb6f8aac3571711279406892e 100644
GIT binary patch
delta 163
zcmey!c9C^MFrx>TbhLrBu|ckMw7I#nbhKga{X1OufgCgE`&{?$02!vvcerlfQLt42
zD$G@N4Kb3AHnRY!1nIhSpX>H*u%gNGOsc{_HBjL@_Z9AdbXZSLV^U*<uqHF9GAc|y
f!ql#o$;80G$QZyN$p8kzo=(0BVeXC)9-IUKqi8F{

delta 324
zcmcb}`jKrzFk`)Rw1Ks;L9T*=f^@X8d9HM{k-4*Uv>{x~04QW)0u#D_hwDB_B}mlF
z2q+5H3e{<709VF!{|;1<F-}EyxNhH3@U;b-rs^7EBpq#PhFkG{uG_Z>8aa73qpA|n
z^|>I=806l$f9F0(50D4;5ZFyX&g9FCYV1&n$^RHtd5{%NR$*#a<6vfBU}OwnkYE4<
QVNWMtg)nzV2oFvI0HiZg?EnA(

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 49d459f6..0e21329c 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -1087,7 +1087,7 @@
 					mci: {
 						MT1: {
 							width: 72
-							height: 18
+							height: 19
 						}
                         ET2: {
                             width: 69 // fnarr!
@@ -1109,6 +1109,36 @@
 				}
 			}
 
+			irc: {
+				config: {
+					messageFormat: "|00|10<|02{fromUserName}|10>|00 |03{message}|00"
+					privateMessageFormat: "|00|10<|02{fromUserName}|15->{toUserName}|10>|00 |03{message}|00"
+				}
+				0: {
+					mci: {
+						MT1: {
+							width: 72
+							height: 17
+						}
+                        ET2: {
+                            width: 69 // fnarr!
+                            maxLength: 140
+                        }
+                        TL3: {
+                            width: 20
+                        }
+                        TL4: {
+                            width: 20
+                        }
+						TL5: {
+                            width: 2
+                        }
+                        TL6: {
+                            width: 2
+                        }
+					}
+				}
+			}
 		}
 
 		prompts: {

From 9cc59f8ff8829db4a73cdcfdd00749992c5c90f6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 1 Jun 2019 14:38:48 -0600
Subject: [PATCH 0829/1013] Hopefully a little better handling of external
 doors/processes

---
 core/door.js | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/core/door.js b/core/door.js
index b07c89bc..c8dd3796 100644
--- a/core/door.js
+++ b/core/door.js
@@ -70,14 +70,13 @@ module.exports = class Door {
 
         const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
 
-        this.client.log.debug(
+        this.client.log.info(
             { cmd : exeInfo.cmd, args, io : this.io },
-            'Executing door'
+            'Executing external door process'
         );
 
-        let door;
         try {
-            door = pty.spawn(exeInfo.cmd, args, {
+            this.doorPty = pty.spawn(exeInfo.cmd, args, {
                 cols        : this.client.term.termWidth,
                 rows        : this.client.term.termHeight,
                 cwd         : cwd,
@@ -88,15 +87,19 @@ module.exports = class Door {
             return cb(e);
         }
 
+        this.client.log.debug(
+            { processId : this.doorPty.pid }, 'External door process spawned'
+        );
+
         if('stdio' === this.io) {
             this.client.log.debug('Using stdio for door I/O');
 
-            this.client.term.output.pipe(door);
+            this.client.term.output.pipe(this.doorPty);
 
-            door.on('data', this.doorDataHandler.bind(this));
+            this.doorPty.on('data', this.doorDataHandler.bind(this));
 
-            door.once('close', () => {
-                return this.restoreIo(door);
+            this.doorPty.once('close', () => {
+                return this.restoreIo(this.doorPty);
             });
         } else if('socket' === this.io) {
             this.client.log.debug(
@@ -105,7 +108,7 @@ module.exports = class Door {
             );
         }
 
-        door.once('exit', exitCode => {
+        this.doorPty.once('exit', exitCode => {
             this.client.log.info( { exitCode : exitCode }, 'Door exited');
 
             if(this.sockServer) {
@@ -114,10 +117,11 @@ module.exports = class Door {
 
             //  we may not get a close
             if('stdio' === this.io) {
-                this.restoreIo(door);
+                this.restoreIo(this.doorPty);
             }
 
-            door.removeAllListeners();
+            this.doorPty.removeAllListeners();
+            delete this.doorPty;
 
             return cb(null);
         });
@@ -128,9 +132,15 @@ module.exports = class Door {
     }
 
     restoreIo(piped) {
-        if(!this.restored && this.client.term.output) {
-            this.client.term.output.unpipe(piped);
-            this.client.term.output.resume();
+        if(!this.restored) {
+            if(this.doorPty) {
+                this.doorPty.kill();
+            }
+
+            if(this.client.term.output) {
+                this.client.term.output.unpipe(piped);
+                this.client.term.output.resume();
+            }
             this.restored = true;
         }
     }

From 5d73a224be55ce011294b2d6305c1c1e57063c4c Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 2 Jun 2019 15:24:08 +0100
Subject: [PATCH 0830/1013] Compress MRC help text

---
 core/mrc.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index bca11656..6fd8ac35 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -49,17 +49,14 @@ var MciViewIds = {
 // TODO: this is a bit shit, could maybe do it with an ansi instead
 const helpText = `
 General Chat:
-/rooms                     - List of current rooms
-/join <room>               - Join a room
+/rooms & /join <ro         - List all or join a room
 /pm <user> <message>       - Send a private message
-/clear                     - Clear the chat log
 ----
 /whoon                     - Who's on what BBS
 /chatters                  - Who's in what room
-/topic <message>           - Set the topic
-/meetups                   - MRC MeetUps
-/bbses                     - BBS's connected
-/info <id>                 - Info about specific BBS
+/topic <message>           - Set the room topic
+/bbses & /info <id>        - Info about BBS's connected
+/meetups                   - Info about MRC MeetUps
 ---
 /l33t <your message>       - l337 5p34k
 /kewl <your message>       - BBS KeWL SPeaK

From 8726128cda8e96ba8128f2d0457f490af0d7f933 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 2 Jun 2019 15:47:15 +0100
Subject: [PATCH 0831/1013] Turn off MRC by default

---
 core/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index a4762e91..c8a4c46a 100644
--- a/core/config.js
+++ b/core/config.js
@@ -456,7 +456,7 @@ function getDefaultConfig() {
 
         chatServers : {
             mrc: {
-                enabled             : true,
+                enabled             : false,
                 serverHostname      : 'mrc.bottomlessabyss.net',
                 serverPort          : 5000,
                 retryDelay          : 10000,

From 43e22cfc742d0629b1b1ea89cfad21642aeeb5ff Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Wed, 5 Jun 2019 23:41:28 +0100
Subject: [PATCH 0832/1013] Turn off debug logging of MRC message sending

---
 core/servers/chat/mrc_multiplexer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 69b3b248..9b976eff 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -276,7 +276,7 @@ exports.getModule = class MrcModule extends ServerModule {
             sanitiseMessage(messageBody)
         ].join('~') + '~';
 
-        Log.debug({ server : 'MRC', data : line }, 'Sending data');
+        // Log.debug({ server : 'MRC', data : line }, 'Sending data');
         this.sendRaw(line);
     }
 

From c79e2bc97118d41e7c665a4b3730fa07841e5eba Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 5 Jun 2019 22:42:20 -0600
Subject: [PATCH 0833/1013] Remove menu.hjson - use config templates

---
 config/menu.hjson | 4237 ---------------------------------------------
 1 file changed, 4237 deletions(-)
 delete mode 100644 config/menu.hjson

diff --git a/config/menu.hjson b/config/menu.hjson
deleted file mode 100644
index 99585ade..00000000
--- a/config/menu.hjson
+++ /dev/null
@@ -1,4237 +0,0 @@
-{
-    /*
-        ./\/\.' ENiGMA½ Menu Configuration -/--/-------- - --   - 
-
-        _____________________   _____  ____________________    __________\_   /
-        \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
-        //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____
-        /____       _____|      __________       ___|__|      ____|     \   /  _____  \
-        ---- \______\ -- |______\ ------ /______/ ---- |______\ - |______\ /__/ // ___/
-                                                                         /__   _\
-        <*>   ENiGMA½  // HTTPS://GITHUB.COM/NUSKOOLER/ENIGMA-BBS   <*>       /__/
-
-        *-----------------------------------------------------------------------------*
-
-        General Information
-        ------------------------------- -   -
-        This configuration is in HJSON (http://hjson.org/) format. Strict to-spec
-        JSON is also perfectly valid. Use 'hjson' from npm to convert to/from JSON.
-
-        See http://hjson.org/ for more information and syntax.
-
-        Various editors and IDEs such as Sublime Text 3, Visual Studio Code, and so
-        on have syntax highlighting for the HJSON format which are highly recommended.
-
-        ------------------------------- -- -    -
-        Menu Configuration
-        ------------------------------- -   -
-        ENiGMA½ makes no assumptions about specific menu types (main, doors, etc.), 
-        but instead allows full customization of all menus throughout the system.
-        Some menus such as a main menu are considered "standard" while others are
-        backed by a specific module. SysOps can tweak various settings about these
-        modules (look & feel, keyboard interation, and so on) or even fully replace
-        the module with something else.
-
-        This file starts out as an example setup. Look at the examples, change
-        settings, menu ordering/flow, add/remove menus, implement ACS control,
-        etc.!
-
-        Remember you can *live edit* this file. That is, make a change and save
-        while you're logged into the system and it will take effect on the next
-        menu change or screen refresh.
-
-        Please see RTFM ...er, uh... see the documentation for more information, and
-        don't be shy to ask for help:
-
-        BBS     : Xibalba @ xibalba.l33t.codes
-        FTN     : BBS Discussion on fsxNet
-        IRC     : #enigma-bbs / FreeNode
-        Email   : bryan@l33t.codes
-    */
-    menus: {
-        //
-        //  Send telnet connections to matrix where users can login, apply, etc.
-        //
-        telnetConnected: {
-            art: CONNECT
-            next: matrix
-            config: { nextTimeout: 1500 }
-        }
-
-        //
-        //  SSH connections are pre-authenticated via the SSH server itself.
-        //  Jump directly to the login sequence
-        //
-        sshConnected: {
-            art: CONNECT
-            next: fullLoginSequenceLoginArt
-            config: { nextTimeout: 1500 }
-        }
-
-        //
-        //  Another SSH specialization: If the user logs in with a new user
-        //  name (e.g. "new", "apply", ...) they will be directed to the
-        //  application process.
-        //
-        sshConnectedNewUser: {
-            art: CONNECT
-            next: newUserApplicationPreSsh
-            config: { nextTimeout: 1500 }
-        }
-
-        //  Ye ol' standard matrix
-        matrix: {
-            art: matrix
-            form: {
-                0: {
-                    VM: {
-                        mci: {
-                            VM1:  {
-                                submit: true
-                                focus:  true
-                                argName: navSelect
-                                //
-                                //  To enable forgot password, you will need to have the web server
-                                //  enabled and mail/SMTP configured. Once that is in place, swap out
-                                //  the commented lines below as well as in the submit block
-                                //
-                                items: [
-                                    {
-                                        text: login
-                                        data: login
-                                    }
-                                    {
-                                        text: apply
-                                        data: apply
-                                    }
-                                    {
-                                        text: forgot pass
-                                        data: forgot
-                                    }
-                                    {
-                                        text: log off
-                                        data: logoff
-                                    }
-                                ]
-                            }
-                        }
-                        submit: {
-                            *: [
-                                {
-                                    value: { navSelect: "login" }
-                                    action: @menu:login
-                                }
-                                {
-                                    value: { navSelect: "apply" }
-                                    action: @menu:newUserApplicationPre
-                                }
-                                {
-                                    value: { navSelect: "forgot" }
-                                    action: @menu:forgotPassword
-                                }
-                                {
-                                    value: { navSelect: "logoff" }
-                                    action: @menu:logoff
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        }
-
-        login: {
-            art: USERLOG
-            next: fullLoginSequenceLoginArt
-            config: {
-                tooNodeMenu: loginAttemptTooNode
-                inactive: loginAttemptAccountInactive
-                disabled: loginAttemptAccountDisabled
-                locked: loginAttemptAccountLocked
-            }
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            maxLength: @config:users.usernameMax
-                            argName: username
-                            focus: true
-                        }
-                        ET2: {
-                            password: true
-                            maxLength: @config:users.passwordMax
-                            argName: password
-                            submit: true
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { password: null }
-                                action: @systemMethod:login
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        loginAttemptTooNode: {
-            art: TOONODE
-            config: {
-                cls: true
-                nextTimeout: 2000
-            }
-            next: logoff
-        }
-
-        loginAttemptAccountLocked: {
-            art: ACCOUNTLOCKED
-            config: {
-                cls: true
-                nextTimeout: 2000
-            }
-            next: logoff
-        }
-
-        loginAttemptAccountDisabled: {
-            art: ACCOUNTDISABLED
-            config: {
-                cls: true
-                nextTimeout: 2000
-            }
-            next: logoff
-        }
-
-        loginAttemptAccountInactive: {
-            art: ACCOUNTINACTIVE
-            config: {
-                cls: true
-                nextTimeout: 2000
-            }
-            next: logoff
-        }
-
-        forgotPassword: {
-            desc: Forgot password
-            prompt: forgotPasswordPrompt
-            submit: [
-                {
-                    value: { username: null }
-                    action: @systemMethod:sendForgotPasswordEmail
-                    extraArgs: { next: "forgotPasswordSubmitted" }
-                }
-            ]
-        }
-
-        forgotPasswordSubmitted: {
-            desc: Forgot password
-            art: FORGOTPWSENT
-            config: {
-                cls: true
-                pause: true
-            }
-            next: @systemMethod:logoff
-        }
-
-        //  :TODO: Prompt Yes/No for logoff confirm
-        fullLogoffSequence: {
-            desc: Logging Off
-            prompt: logoffConfirmation
-            submit: [
-                {
-                    value: { promptValue: 0 }
-                    action: @menu:fullLogoffSequencePreAd
-                }
-                {
-                    value: { promptValue: 1 }
-                    action: @systemMethod:prevMenu
-                }
-            ]
-        }
-
-        fullLogoffSequencePreAd: {
-            art: PRELOGAD
-            desc: Logging Off
-            next: fullLogoffSequenceRandomBoardAd
-            config: {
-                cls: true
-                nextTimeout: 1500
-            }
-        }
-
-        fullLogoffSequenceRandomBoardAd: {
-            art: OTHRBBS
-            desc: Logging Off
-            next: logoff
-            config: {
-                baudRate: 57600
-                pause: true
-                cls: true
-            }
-        }
-
-        logoff: {
-            art: LOGOFF
-            desc: Logging Off
-            next: @systemMethod:logoff
-        }
-
-        //  A quick preamble - defaults to warning about broken terminals
-        newUserApplicationPre: {
-            art: NEWUSER1
-            next: newUserApplication
-            desc: Applying
-            config: {
-                pause: true
-                cls: true
-                menuFlags: [ "noHistory" ]
-            }
-        }
-
-        newUserApplication: {
-            module: nua
-            art: NUA
-            next: [
-                {
-                    //  Initial SysOp does not send feedback to themselves
-                    acs: ID1
-                    next: fullLoginSequenceLoginArt
-                }
-                {
-                    //  ...everyone else does
-                    next: newUserFeedbackToSysOpPreamble
-                }
-            ]
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            argName: username
-                            maxLength: @config:users.usernameMax
-                            validate: @systemMethod:validateUserNameAvail
-                        }
-                        ET2: {
-                            argName: realName
-                            maxLength: @config:users.realNameMax
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        MET3: {
-                            argName: birthdate
-                            maskPattern: "####/##/##"
-                            validate: @systemMethod:validateBirthdate
-                        }
-                        ME4: {
-                            argName: sex
-                            maskPattern: A
-                            textStyle: upper
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET5: {
-                            argName: location
-                            maxLength: @config:users.locationMax
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET6: {
-                            argName: affils
-                            maxLength: @config:users.affilsMax
-                        }
-                        ET7: {
-                            argName: email
-                            maxLength: @config:users.emailMax
-                            validate: @systemMethod:validateEmailAvail
-                        }
-                        ET8: {
-                            argName: web
-                            maxLength: @config:users.webMax
-                        }
-                        ET9: {
-                            argName: password
-                            password: true
-                            maxLength: @config:users.passwordMax
-                            validate: @systemMethod:validatePasswordSpec
-                        }
-                        ET10: {
-                            argName: passwordConfirm
-                            password: true
-                            maxLength: @config:users.passwordMax
-                            validate: @method:validatePassConfirmMatch
-                        }
-                        TM12: {
-                            argName: submission
-                            items: [ "apply", "cancel" ]
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { "submission" : 0 }
-                                action: @method:submitApplication
-                                extraArgs: {
-                                    inactive: userNeedsActivated
-                                    error: newUserCreateError
-                                }
-                            }
-                            {
-                                value: { "submission" : 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        //  A quick preamble - defaults to warning about broken terminals (SSH version)
-        newUserApplicationPreSsh: {
-            art: NEWUSER1
-            next: newUserApplicationSsh
-            desc: Applying
-            config: {
-                pause: true
-                cls: true
-                menuFlags: [ "noHistory" ]
-            }
-        }
-
-        //
-        //  SSH specialization of NUA
-        //  Canceling this form logs off vs falling back to matrix
-        //
-        newUserApplicationSsh: {
-            module: nua
-            art: NUA
-            fallback: logoff
-            next: newUserFeedbackToSysOpPreamble
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            argName: username
-                            maxLength: @config:users.usernameMax
-                            validate: @systemMethod:validateUserNameAvail
-                        }
-                        ET2: {
-                            argName: realName
-                            maxLength: @config:users.realNameMax
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        MET3: {
-                            argName: birthdate
-                            maskPattern: "####/##/##"
-                            validate: @systemMethod:validateBirthdate
-                        }
-                        ME4: {
-                            argName: sex
-                            maskPattern: A
-                            textStyle: upper
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET5: {
-                            argName: location
-                            maxLength: @config:users.locationMax
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET6: {
-                            argName: affils
-                            maxLength: @config:users.affilsMax
-                        }
-                        ET7: {
-                            argName: email
-                            maxLength: @config:users.emailMax
-                            validate: @systemMethod:validateEmailAvail
-                        }
-                        ET8: {
-                            argName: web
-                            maxLength: @config:users.webMax
-                        }
-                        ET9: {
-                            argName: password
-                            password: true
-                            maxLength: @config:users.passwordMax
-                            validate: @systemMethod:validatePasswordSpec
-                        }
-                        ET10: {
-                            argName: passwordConfirm
-                            password: true
-                            maxLength: @config:users.passwordMax
-                            validate: @method:validatePassConfirmMatch
-                        }
-                        TM12: {
-                            argName: submission
-                            items: [ "apply", "cancel" ]
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { "submission" : 0 }
-                                action: @method:submitApplication
-                                extraArgs: {
-                                    inactive: userNeedsActivated
-                                    error: newUserCreateError
-                                }
-                            }
-                            {
-                                value: { "submission" : 1 }
-                                action: @systemMethod:logoff
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:logoff
-                        }
-                    ]
-                }
-            }
-        }
-
-        newUserFeedbackToSysOpPreamble: {
-            art: LETTER
-            config: { pause: true }
-            next: newUserFeedbackToSysOp
-        }
-
-        newUserFeedbackToSysOp: {
-            desc: Feedback to SysOp
-            module: msg_area_post_fse
-            next: [
-                {
-                    acs: AS2
-                    next: fullLoginSequenceLoginArt
-                }
-                {
-                    next: newUserInactiveDone
-                }
-            ]
-            config: {
-                art: {
-                    header:             MSGEHDR
-                    body:               MSGBODY
-                    footerEditor:       MSGEFTR
-                    footerEditorMenu:   MSGEMFT
-                    help:               MSGEHLP
-                },
-                editorMode: edit
-                editorType: email
-                messageAreaTag: private_mail
-                toUserId: 1 /* always to +op */
-            }
-            form: {
-                0: {
-                    mci: {
-                        TL1: {
-                            argName: from
-                        }
-                        ET2: {
-                            argName: to
-                            focus: true
-                            text: @sysStat:sysop_username
-                            //  :TODO: readOnly: true
-                        }
-                        ET3: {
-                            argName: subject
-                            maxLength: 72
-                            submit: true
-                            text: New user feedback
-                            validate: @systemMethod:validateMessageSubject
-                        }
-                    }
-                    submit: {
-                        3: [
-                            {
-                                value: { subject: null }
-                                action: @method:headerSubmit
-                            }
-                        ]
-                    }
-                }
-                1: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            argName: message
-                            mode: edit
-                        }
-                    }
-
-                    submit: {
-                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            viewId: 1
-                        }
-                    ]
-                },
-                2: {
-                    TLTL:  {
-                        mci: {
-                            TL1: {
-                                width: 5
-                            }
-                            TL2: {
-                                width: 4
-                            }
-                        }
-                    }
-                }
-                3: {
-                    HM: {
-                        mci: {
-                            HM1: {
-                                //  :TODO: clear
-                                items: [ "save", "help" ]
-                            }
-                        }
-                        submit: {
-                            *: [
-                                {
-                                    value: { 1: 0 }
-                                    action: @method:editModeMenuSave
-                                }
-                                {
-                                    value: { 1: 1 }
-                                    action: @method:editModeMenuHelp
-                                }
-                            ]
-                        }
-                        actionKeys: [
-                            {
-                                keys: [ "escape" ]
-                                action: @method:editModeEscPressed
-                            }
-                            {
-                                keys: [ "?" ]
-                                action: @method:editModeMenuHelp
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        newUserInactiveDone: {
-            desc: Finished with NUA
-            art: DONE
-            config: { pause: true }
-            next: @menu:logoff
-        }
-
-        fullLoginSequenceLoginArt: {
-            desc: Logging In
-            art: WELCOME
-            config: { pause: true }
-            next: fullLoginSequenceLastCallers
-        }
-
-        fullLoginSequenceLastCallers: {
-            desc: Last Callers
-            module: last_callers
-            art: LASTCALL
-            config: {
-                pause: true
-                font: cp437
-            }
-            next: fullLoginSequenceWhosOnline
-        }
-        fullLoginSequenceWhosOnline: {
-            desc: Who's Online
-            module: whos_online
-            art: WHOSON
-            config: { pause: true }
-            next: fullLoginSequenceOnelinerz
-        }
-
-        fullLoginSequenceOnelinerz: {
-            desc: Viewing Onelinerz
-            module: onelinerz
-            next: [
-                {
-                    //  calls >= 2
-                    acs: NC2
-                    next: fullLoginSequenceNewScanConfirm
-                }
-                {
-                    // new users - skip new scan
-                    next: fullLoginSequenceUserStats
-                }
-            ]
-            config: {
-                cls: true
-                art: {
-                    view: ONELINER
-                    add: ONEADD
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: false
-                            height: 10
-                        }
-                        TM2: {
-                            argName: addOrExit
-                            items: [ "yeah!", "nah" ]
-                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
-                            submit: true
-                            focus: true
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrExit: 0 }
-                                action: @method:viewAddScreen
-                            }
-                            {
-                                value: { addOrExit: null }
-                                action: @systemMethod:nextMenu
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:nextMenu
-                        }
-                    ]
-                },
-                1: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            maxLength: 70
-                            argName: oneliner
-                        }
-                        TL2: {
-                            width: 60
-                        }
-                        TM3: {
-                            argName: addOrCancel
-                            items: [ "add", "cancel" ]
-                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrCancel: 0 }
-                                action: @method:addEntry
-                            }
-                            {
-                                value: { addOrCancel: 1 }
-                                action: @method:cancelAdd
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:cancelAdd
-                        }
-                    ]
-                }
-            }
-        }   
-
-        fullLoginSequenceNewScanConfirm: {
-            desc: Logging In
-            prompt: loginGlobalNewScan
-            submit: [
-                {
-                    value: { promptValue: 0 }
-                    action: @menu:fullLoginSequenceNewScan
-                }
-                {
-                    value: { promptValue: 1 }
-                    action: @menu:fullLoginSequenceUserStats
-                }
-            ]
-        }
-
-        fullLoginSequenceNewScan: {
-            desc: Performing New Scan
-            module: new_scan
-            art: NEWSCAN
-            next: fullLoginSequenceSysStats
-            config: {
-                messageListMenu: newScanMessageList
-            }
-        }
-
-        fullLoginSequenceSysStats: {
-            desc: System Stats
-            art: SYSSTAT
-            config: { pause: true }
-            next: fullLoginSequenceUserStats
-        }
-        fullLoginSequenceUserStats: {
-            desc: User Stats
-            art: STATUS
-            config: { pause: true }
-            next: mainMenu
-        }
-
-        newScanMessageList: {
-            desc: New Messages
-            module: msg_list
-            art: NEWMSGS
-            config: {
-                menuViewPost: messageAreaViewPost
-            }
-            form: {
-                0: {
-                    mci:  {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: message
-                        }
-                        TL6: {
-                            //  theme me!
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:selectMessage
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "x", "shift + x" ]
-                            action: @method:fullExit
-                        }
-                        {
-                            keys: [ "m", "shift + m" ]
-                            action: @method:markAllRead
-                        }
-                    ]
-                }
-            }
-        }
-
-        newScanFileBaseList: {
-            module: file_area_list
-            desc: New Files
-            config: {
-                art: {
-                    browse: FNEWBRWSE
-                    details: FDETAIL
-                    detailsGeneral: FDETGEN
-                    detailsNfo: FDETNFO
-                    detailsFileList: FDETLST
-                    help: FBHELP
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        MT1: {
-                            mode: preview
-                            ansiView: true
-                        }
-
-                        HM2: {
-                            focus: true
-                            submit: true
-                            argName: navSelect                          
-                            items: [
-                                "prev", "next", "details", "toggle queue", "rate", "help", "quit"
-                            ]
-                            focusItemIndex: 1
-                        }
-                    }
-                    
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:prevFile
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @method:nextFile
-                            }
-                            {
-                                value: { navSelect: 2 }
-                                action: @method:viewDetails
-                            }
-                            {
-                                value: { navSelect: 3 }
-                                action: @method:toggleQueue
-                            }
-                            {
-                                value: { navSelect: 4 }
-                                action: @menu:fileBaseGetRatingForSelectedEntry
-                            }                           
-                            {
-                                value: { navSelect: 5 }
-                                action: @method:displayHelp
-                            }
-                            {
-                                value: { navSelect: 6 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "w", "shift + w" ]
-                            action: @method:showWebDownloadLink
-                        }
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "t", "shift + t" ]
-                            action: @method:toggleQueue
-                        }
-                        {
-                            keys: [ "v", "shift + v" ]
-                            action: @method:viewDetails
-                        }
-                        {
-                            keys: [ "r", "shift + r" ]
-                            action: @menu:fileBaseGetRatingForSelectedEntry
-                        }
-                        {
-                            keys: [ "?" ]
-                            action: @method:displayHelp
-                        }
-                    ]
-                }
-
-                1: {
-                    mci: {
-                        HM1: {
-                            focus: true
-                            submit: true
-                            argName: navSelect
-                            items: [
-                                "general", "nfo/readme", "file listing"
-                            ]
-                        }
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @method:detailsQuit
-                        }
-                    ]
-                }
-
-                2: {
-                    //  details - general
-                    mci: {}                 
-                }
-
-                3: {
-                    //  details - nfo/readme
-                    mci: {
-                        MT1: {
-                            mode: preview
-                        }
-                    }
-                }
-
-                4: {
-                    //  details - file listing
-                    mci: {
-                        VM1: {
-
-                        }
-                    }
-                }
-            }
-        }
-
-        ///////////////////////////////////////////////////////////////////////
-        //  Main Menu
-        ///////////////////////////////////////////////////////////////////////
-        mainMenu: {
-            art: MMENU
-            desc: Main Menu
-            prompt: menuCommand
-            config: {
-                font: cp437
-                interrupt: realtime
-            }
-            submit: [
-                {
-                    value: { command: "MSG" }
-                    action: @menu:nodeMessage
-                }
-                {
-                    value: { command: "MRC" }
-                    action: @menu:mrc
-                }
-                {
-                    value: { command: "G" }
-                    action: @menu:fullLogoffSequence
-                }
-                {
-                    value: { command: "D" }
-                    action: @menu:doorMenu
-                }
-                {
-                    value: { command: "F" }
-                    action: @menu:fileBase
-                }
-                {
-                    value: { command: "U" }
-                    action: @menu:mainMenuUserList
-                }
-                {
-                    value: { command: "L" }
-                    action: @menu:mainMenuLastCallers
-                }
-                {
-                    value: { command: "W" }
-                    action: @menu:mainMenuWhosOnline
-                }
-                {
-                    value: { command: "Y" }
-                    action: @menu:mainMenuUserStats
-                }
-                {
-                    value: { command: "M" }
-                    action: @menu:messageArea
-                }
-                {
-                    value: { command: "E" }
-                    action: @menu:mailMenu
-                }
-                {
-                    value: { command: "C" }
-                    action: @menu:mainMenuUserConfig
-                }
-                {
-                    value: { command: "S" }
-                    action: @menu:mainMenuSystemStats
-                }
-                {
-                    value: { command: "!" }
-                    action: @menu:mainMenuGlobalNewScan
-                }
-                {
-                    value: { command: "K" }
-                    action: @menu:mainMenuFeedbackToSysOp
-                }
-                {
-                    value: { command: "O" }
-                    action: @menu:mainMenuOnelinerz
-                }
-                {
-                    value: { command: "R" }
-                    action: @menu:mainMenuRumorz
-                }
-                {
-                    value: { command: "BBS"}
-                    action: @menu:bbsList
-                }
-                {
-                    value: { command: "UA" }
-                    action: @menu:mainMenuUserAchievementsEarned
-                }
-                {
-                    value: 1
-                    action: @menu:mainMenu
-                }
-            ]
-        }
-
-        mainMenuUserAchievementsEarned: {
-            desc: Achievements
-            module: user_achievements_earned
-            art: USERACHIEV
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                        }
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-		ercClient: {
-			art: erc
-			module: erc_client
-			config: {
-				host: localhost
-        		port: 5001
-				bbsTag: CHANGEME
-      		}
-
-			form: {
-				0: {
-					mci: {
-						MT1: {
-							width: 79
-							height: 21
-							mode: preview
-							autoScroll: true
-						}
-						ET3: {
-							autoScale: false
-							width: 77
-							argName: inputArea
-							focus: true
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { inputArea: null }
-								action: @method:inputAreaSubmit
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "tab" ]
-						}
-						{
-							keys: [ "up arrow" ]
-							action: @method:scrollDown
-						}
-						{
-							keys: [ "down arrow" ]
-							action: @method:scrollUp
-						}
-					]
-				}
-			}
-		}
-
-        mrc: {
-            desc: MRC Chat
-            module: mrc
-            art: MRC
-            config: {
-                cls: true
-            }
-            form: {
-                0: {
-                    mci: {
-                        MT1: {
-							mode: preview
-							autoScroll: true
-						}
-                        ET2: {
-                            argName: inputArea
-                            submit: true
-                            focus: true
-                        }
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:quit
-                        }
-                        {
-                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
-                            action: @method:movementKeyPressed
-                        }
-                    ]
-                    submit: {
-                        *: [
-                            {
-                                value: { inputArea: null }
-                                action: @method:sendChatMessage
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        nodeMessage: {
-            desc: Node Messaging
-            module: node_msg
-            art: NODEMSG
-            config: {
-                cls: true
-                art: {
-                    header: NODEMSGHDR
-                    footer: NODEMSGFTR
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        SM1: {
-                            argName: node
-                        }
-                        ET2: {
-                            argName: message
-                            submit: true
-                        }
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:sendMessage
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        mainMenuLastCallers: {
-            desc: Last Callers
-            module: last_callers
-            art: LASTCALL
-            config: { pause: true }
-        }
-
-        mainMenuWhosOnline: {
-            desc: Who's Online
-            module: whos_online
-            art: WHOSON
-            config: { pause: true }
-        }
-
-        mainMenuUserStats: {
-            desc: User Stats
-            art: STATUS
-            config: { pause: true }
-        }
-
-        mainMenuSystemStats: {
-            desc: System Stats
-            art: SYSSTAT
-            config: { pause: true }
-        }
-
-        mainMenuUserList: {
-            desc: User Listing
-            module: user_list
-            art: USERLST
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                            submit: true
-                        }
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        mainMenuUserConfig: {
-            module: user_config
-            art: CONFSCR
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            argName: realName
-                            maxLength: @config:users.realNameMax
-                            validate: @systemMethod:validateNonEmpty
-                            focus: true
-                        }
-                        ME2: {
-                            argName: birthdate
-                            maskPattern: "####/##/##"
-                        }
-                        ME3: {
-                            argName: sex
-                            maskPattern: A
-                            textStyle: upper
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET4: {
-                            argName: location
-                            maxLength: @config:users.locationMax
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET5: {
-                            argName: affils
-                            maxLength: @config:users.affilsMax
-                        }
-                        ET6: {
-                            argName: email
-                            maxLength: @config:users.emailMax
-                            validate: @method:validateEmailAvail
-                        }
-                        ET7: {
-                            argName: web
-                            maxLength: @config:users.webMax
-                        }
-                        ME8: {
-                            maskPattern: "##"
-                            argName: termHeight
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        SM9: {
-                            argName: theme
-                        }
-                        ET10: {
-                            argName: password
-                            maxLength: @config:users.passwordMax
-                            password: true
-                            validate: @method:validatePassword
-                        }
-                        ET11: {
-                            argName: passwordConfirm
-                            maxLength: @config:users.passwordMax
-                            password: true
-                            validate: @method:validatePassConfirmMatch
-                        }
-                        TM25: {
-                            argName: submission
-                            items: [ "save", "cancel" ]
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { submission: 0 }
-                                action: @method:saveChanges
-                            }
-                            {
-                                value: { submission: 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        mainMenuGlobalNewScan: {
-            desc: Performing New Scan
-            module: new_scan
-            art: NEWSCAN
-            config: {
-                messageListMenu: newScanMessageList
-            }
-        }
-
-        mainMenuFeedbackToSysOp: {
-            desc: Feedback to SysOp
-            module: msg_area_post_fse
-            config: {
-                art: {
-                    header:             MSGEHDR
-                    body:               MSGBODY
-                    footerEditor:       MSGEFTR
-                    footerEditorMenu:   MSGEMFT
-                    help:               MSGEHLP
-                },
-                editorMode: edit
-                editorType: email
-                messageAreaTag: private_mail
-                toUserId: 1 /* always to +op */
-            }
-            form: {
-                0: {
-                    mci: {
-                        TL1: {
-                            argName:    from
-                        }
-                        ET2: {
-                            argName: to
-                            focus: true
-                            text: @sysStat:sysop_username
-                            //  :TODO: readOnly: true
-                        }
-                        ET3: {
-                            argName: subject
-                            maxLength: 72
-                            submit: true
-                            validate: @systemMethod:validateMessageSubject
-                        }
-                    }
-                    submit: {
-                        3: [
-                            {
-                                value: { subject: null }
-                                action: @method:headerSubmit
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-                1: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            argName: message
-                            mode: edit
-                        }
-                    }
-
-                    submit: {
-                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            viewId: 1
-                        }
-                    ]
-                },
-                2: {
-                    TLTL:  {
-                        mci: {
-                            TL1: {
-                                width: 5
-                            }
-                            TL2: {
-                                width: 4
-                            }
-                        }
-                    }
-                }
-                3: {
-                    HM: {
-                        mci: {
-                            HM1: {
-                                //  :TODO: clear
-                                items: [ "save", "discard", "help" ]
-                            }
-                        }
-                        submit: {
-                            *: [
-                                {
-                                    value: { 1: 0 }
-                                    action: @method:editModeMenuSave
-                                }
-                                {
-                                    value: { 1: 1 }
-                                    action: @systemMethod:prevMenu
-                                }
-                                {
-                                    value: { 1: 2 }
-                                    action: @method:editModeMenuHelp
-                                }
-                            ]
-                        }
-                        actionKeys: [
-                            {
-                                keys: [ "escape" ]
-                                action: @method:editModeEscPressed
-                            }
-                            {
-                                keys: [ "?" ]
-                                action: @method:editModeMenuHelp
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        mainMenuOnelinerz: {
-            desc: Viewing Onelinerz
-            module: onelinerz
-            config: {
-                cls: true
-                art: {
-                    view: ONELINER
-                    add: ONEADD
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: false
-                            height: 10
-                        }
-                        TM2: {
-                            argName: addOrExit
-                            items: [ "yeah!", "nah" ]
-                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
-                            submit: true
-                            focus: true
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrExit: 0 }
-                                action: @method:viewAddScreen
-                            }
-                            {
-                                value: { addOrExit: null }
-                                action: @systemMethod:nextMenu
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:nextMenu
-                        }
-                    ]
-                },
-                1: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            maxLength: 70
-                            argName: oneliner
-                        }
-                        TL2: {
-                            width: 60
-                        }
-                        TM3: {
-                            argName: addOrCancel
-                            items: [ "add", "cancel" ]
-                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrCancel: 0 }
-                                action: @method:addEntry
-                            }
-                            {
-                                value: { addOrCancel: 1 }
-                                action: @method:cancelAdd
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:cancelAdd
-                        }
-                    ]
-                }
-            }
-        }
-
-        mainMenuRumorz: {
-            desc: Rumorz
-            module: rumorz
-            config: {
-                cls: true
-                art: {
-                    entries: RUMORS
-                    add: RUMORADD
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: false
-                            height: 10
-                        }
-                        TM2: {
-                            argName: addOrExit
-                            items: [ "yeah!", "nah" ]
-                            "hotKeys"   : { "Y" : 0, "N" : 1, "Q" : 1 }
-                            submit: true
-                            focus: true
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrExit: 0 }
-                                action: @method:viewAddScreen
-                            }
-                            {
-                                value: { addOrExit: null }
-                                action: @systemMethod:nextMenu
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:nextMenu
-                        }
-                    ]
-                },
-                1: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            maxLength: 70
-                            argName: rumor
-                        }
-                        TL2: {
-                            width: 60
-                        }
-                        TM3: {
-                            argName: addOrCancel
-                            items: [ "add", "cancel" ]
-                            "hotKeys"   : { "A" : 0, "C" : 1, "Q" : 1 }
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { addOrCancel: 0 }
-                                action: @method:addEntry
-                            }
-                            {
-                                value: { addOrCancel: 1 }
-                                action: @method:cancelAdd
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:cancelAdd
-                        }
-                    ]
-                }
-            }
-        }
-
-        bbsList: {
-            desc: Viewing BBS List
-            module: bbs_list
-            config: {
-                cls: true
-                art: {
-                    entries: BBSLIST
-                    add: BBSADD
-                }
-            }
-
-            form: {
-                0: {
-                    mci: {
-                        VM1: { maxLength: 32 }
-                        TL2: { maxLength: 32 }
-                        TL3: { maxLength: 32 }
-                        TL4: { maxLength: 32 }
-                        TL5: { maxLength: 32 }
-                        TL6: { maxLength: 32 }
-                        TL7: { maxLength: 32 }
-                        TL8: { maxLength: 32 }
-                        TL9: { maxLength: 32 }
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "a" ]
-                            action: @method:addBBS
-                        }
-                        {
-                            //  :TODO: add delete key
-                            keys: [ "d" ]
-                            action: @method:deleteBBS
-                        }
-                        {
-                            keys: [ "q", "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-                1: {
-                    mci: {
-                        ET1: {
-                            argName: name
-                            maxLength: 32
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET2: {
-                            argName: sysop
-                            maxLength: 32
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET3: {
-                            argName: telnet
-                            maxLength: 32
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET4: {
-                            argName: www
-                            maxLength: 32
-                        }
-                        ET5: {
-                            argName: location
-                            maxLength: 32
-                        }
-                        ET6: {
-                            argName: software
-                            maxLength: 32
-                        }
-                        ET7:  {
-                            argName: notes
-                            maxLength: 32
-                        }
-                        TM17: {
-                            argName: submission
-                            items: [ "save", "cancel" ]
-                            submit: true
-                        }
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:cancelSubmit
-                        }
-                    ]
-
-                    submit: {
-                        *: [
-                            {
-                                value: { "submission" : 0 }
-                                action: @method:submitBBS
-                            }
-                            {
-                                value: { "submission" : 1 }
-                                action: @method:cancelSubmit
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        ///////////////////////////////////////////////////////////////////////
-        //  Doors Menu
-        ///////////////////////////////////////////////////////////////////////
-        doorMenu: {
-            desc: Doors Menu
-            art: DOORMNU
-            prompt: menuCommand
-            config: {
-                interrupt: realtime
-            }
-            submit: [
-                {
-                    value: { command: "G" }
-                    action: @menu:logoff
-                }
-                {
-                    value: { command: "Q" }
-                    action: @systemMethod:prevMenu
-                }
-                //
-                //  The system supports many ways of launching doors including
-                //  modules for DoorParty!, BBSLink, etc.
-                //
-                //  Below are some examples. See the documentation for more info.
-                //
-                {
-                    value: { command: "ABRACADABRA" }
-                    action: @menu:doorAbracadabraExample
-                }
-                {
-                    value: { command: "TWBBSLINK" }
-                    action: @menu:doorTradeWars2002BBSLinkExample
-                }
-                {
-                    value: { command: "DP" }
-                    action: @menu:doorPartyExample
-                }
-                {
-                    value: { command: "CN" }
-                    action: @menu:doorCombatNetExample
-                }
-                {
-                    value: { command: "EXODUS" }
-                    action: @menu:doorExodusCataclysm
-                }
-            ]
-        }
-
-        //
-        //  Local Door Example via abracadabra module
-        //
-        //  This example assumes launch_door.sh (which is passed args)
-        //  launches the door.
-        //
-        doorAbracadabraExample: {
-            desc: Abracadabra Example
-            module: abracadabra
-            config: {
-                name: Example Door
-                dropFileType: DORINFO
-                cmd: /home/enigma/DOS/scripts/launch_door.sh
-                args: [
-                    "{node}",
-                    "{dropFile}",
-                    "{srvPort}",
-                ],
-                nodeMax: 1
-                tooManyArt: DOORMANY
-                io: socket
-            }
-        }
-
-        //
-        //  BBSLink Example (TradeWars 2000)
-        //
-        //  Register @ https://bbslink.net/
-        //
-        doorTradeWars2002BBSLinkExample: {
-            desc: Playing TW 2002 (BBSLink)
-            module: bbs_link
-            config: {
-                sysCode: XXXXXXXX
-                authCode: XXXXXXXX
-                schemeCode: XXXXXXXX
-                door: tw
-            }
-        }
-
-        //
-        //  DoorParty! Example
-        //
-        //  Register @ http://throwbackbbs.com/
-        //
-        doorPartyExample: {
-            desc: Using DoorParty!
-            module: door_party
-            config: {
-                username: XXXXXXXX
-                password: XXXXXXXX
-                bbsTag: XX
-            }
-        }
-
-        //
-        //  CombatNet Example
-        //
-        //  Register @ http://combatnet.us/
-        //
-        doorCombatNetExample: {
-            desc: Using CombatNet
-            module: combatnet
-            config: {
-                bbsTag: CBNxxx
-                password: XXXXXXXXX
-            }
-        }
-
-        //
-        //  Exodus Example (cataclysm)
-        //  Register @ https://oddnetwork.org/exodus/
-        //
-        doorExodusCataclysm: {
-            desc: Cataclysm
-            module: exodus
-            config: {
-                rejectUnauthorized: false
-                board: XXX
-                key: XXXXXXXX
-                door: cataclysm
-            }
-        }
-
-        ///////////////////////////////////////////////////////////////////////
-        //  Message Area Menu
-        ///////////////////////////////////////////////////////////////////////
-        messageArea: {
-            art: MSGMNU
-            desc: Message Area
-            prompt: messageMenuCommand
-            config: {
-                interrupt: realtime
-            }
-            submit: [
-                {
-                    value: { command: "P" }
-                    action: @menu:messageAreaNewPost
-                }
-                {
-                    value: { command: "J" }
-                    action: @menu:messageAreaChangeCurrentConference
-                }
-                {
-                    value: { command: "C" }
-                    action: @menu:messageAreaChangeCurrentArea
-                }
-                {
-                    value: { command: "L" }
-                    action: @menu:messageAreaMessageList
-                }
-                {
-                    value: { command: "Q" }
-                    action: @systemMethod:prevMenu
-                }
-                {
-                    value: { command: "G" }
-                    action: @menu:fullLogoffSequence
-                }
-                {
-                    value: { command: "<" }
-                    action: @systemMethod:prevConf
-                }
-                {
-                    value: { command: ">" }
-                    action: @systemMethod:nextConf
-                }
-                {
-                    value: { command: "[" }
-                    action: @systemMethod:prevArea
-                }
-                {
-                    value: { command: "]" }
-                    action: @systemMethod:nextArea
-                }
-                {
-                    value: { command: "D" }
-                    action: @menu:messageAreaSetNewScanDate
-                }
-                {
-                    value: { command: "S" }
-                    action: @menu:messageSearch
-                }
-                {
-                    value: 1
-                    action: @menu:messageArea
-                }
-            ]
-        }
-
-        messageSearch: {
-            desc: Message Search
-            module: message_base_search
-            art: MSEARCH
-            config: {
-                messageListMenu: messageAreaSearchMessageList
-            }
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            argName: searchTerms
-                        }
-                        BT2: {
-                            argName: search
-                            text: search
-                            submit: true
-                        }
-                        SM3: {
-                            argName: confTag
-                        }
-                        SM4: {
-                            argName: areaTag
-                        }
-                        ET5: {
-                            argName: toUserName
-                            maxLength: @config:users.usernameMax
-                        }
-                        ET6: {
-                            argName: fromUserName
-                            maxLength: @config:users.usernameMax
-                        }
-                        BT7: {
-                            argName: advancedSearch
-                            text: advanced search
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { search: null }
-                                action: @method:search
-                            }
-                            {
-                                value: { advancedSearch: null }
-                                action: @method:search
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageAreaSearchMessageList: {
-            desc: Message Search
-            module: msg_list
-            art: MSRCHLST
-            config: {
-                menuViewPost: messageAreaViewPost
-            }
-            form: {
-                0: {
-                    mci:  {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: message
-                        }
-                        TL6: {
-                            //  theme me!
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:selectMessage
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageAreaMyMessagesList: {
-            desc: Personal Messages
-            module: msg_list
-            art: MYMSGLST
-            config: {
-                menuViewPost: messageAreaViewPost
-            }
-            form: {
-                0: {
-                    mci:  {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: message
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:selectMessage
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageSearchNoResults: {
-            desc: Message Search
-            art: MSRCNORES
-            config: {
-                pause: true
-            }
-        }
-
-        messageAreaChangeCurrentConference: {
-            art: CCHANGE
-            module: msg_conf_list
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: conf
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { conf: null }
-                                action: @method:changeConference
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageAreaSetNewScanDate: {
-            module: set_newscan_date
-            desc: Message Base
-            art: SETMNSDATE
-            config: {
-                target: message
-                scanDateFormat: YYYYMMDD
-            }
-            form: {
-                0: {
-                    mci: {
-                        ME1: {
-                            focus: true
-                            submit: true
-                            argName: scanDate
-                            maskPattern: "####/##/##"
-                        }
-                        SM2: {
-                            argName: targetSelection
-                            submit: false
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { scanDate: null }
-                                action: @method:scanDateSubmit
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        changeMessageConfPreArt: {
-            module: show_art
-            config: {
-                method: messageConf
-                key: confTag
-                pause: true
-                cls: true
-                menuFlags: [ "popParent", "noHistory" ]
-            }
-        }
-
-        messageAreaChangeCurrentArea: {
-            //  :TODO: rename this art to ACHANGE
-            art: CHANGE
-            module: msg_area_list
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: area
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { area: null }
-                                action: @method:changeArea
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        changeMessageAreaPreArt: {
-            module: show_art
-            config: {
-                method: messageArea
-                key: areaTag
-                pause: true
-                cls: true
-                menuFlags: [ "popParent", "noHistory" ]
-            }
-        }
-
-        messageAreaMessageList: {
-            module: msg_list
-            art: MSGLIST
-            config: {
-                menuViewPost: messageAreaViewPost
-            }
-            form: {
-                0: {
-                    mci:  {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: message
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:selectMessage
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageAreaViewPost:  {
-            module: msg_area_view_fse
-            config: {
-                art: {
-                    header:     MSGVHDR
-                    body:       MSGBODY
-                    footerView: MSGVFTR
-                    help:       MSGVHLP
-                },
-                editorMode: view
-                editorType: area
-            }
-            form: {
-                0: {
-                    mci: {
-                        //  :TODO: ensure this block isn't even req. for theme to apply...
-                    }
-                }
-                1: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            mode: preview
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: message
-                                action: @method:editModeEscPressed
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            viewId: 1
-                        }
-                    ]
-                }
-                2: {
-                    TLTL:  {
-                        mci: {
-                            TL1: { width: 5 }
-                            TL2: { width: 4 }
-                        }
-                    }
-                }
-                4: {
-                    mci: {
-                        HM1: {
-                            //  :TODO: (#)Jump/(L)Index (msg list)/Last
-                            items: [ "prev", "next", "reply", "quit", "help" ]
-                            focusItemIndex: 1
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { 1: 0 }
-                                action: @method:prevMessage
-                            }
-                            {
-                                value: { 1: 1 }
-                                action: @method:nextMessage
-                            }
-                            {
-                                value: { 1: 2 }
-                                action: @method:replyMessage
-                                extraArgs: {
-                                    menu: messageAreaReplyPost
-                                }
-                            }
-                            {
-                                value: { 1: 3 }
-                                action: @systemMethod:prevMenu
-                            }
-                            {
-                                value: { 1: 4 }
-                                action: @method:viewModeMenuHelp
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "p", "shift + p" ]
-                            action: @method:prevMessage
-                        }
-                        {
-                            keys: [ "n", "shift + n" ]
-                            action: @method:nextMessage
-                        }
-                        {
-                            keys:   [ "r", "shift + r" ]
-                            action: @method:replyMessage
-                            extraArgs: {
-                                menu: messageAreaReplyPost
-                            }
-                        }
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "?" ]
-                            action: @method:viewModeMenuHelp
-                        }
-                        {
-                            keys: [ "down arrow", "up arrow", "page up", "page down" ]
-                            action: @method:movementKeyPressed
-                        }
-                    ]
-                }
-            }
-        }
-
-        messageAreaReplyPost: {
-            module: msg_area_post_fse
-            config: {
-                art: {
-                    header:             MSGEHDR
-                    body:               MSGBODY
-                    quote:              MSGQUOT
-                    footerEditor:       MSGEFTR
-                    footerEditorMenu:   MSGEMFT
-                    help:               MSGEHLP
-                }
-                editorMode: edit
-                editorType: area
-            }
-            form: {
-                0: {
-                    mci: {
-                        //  :TODO: use appropriate system properties for max lengths
-                        TL1: {
-                            argName: from
-                        }
-                        ET2: {
-                            argName: to
-                            focus: true
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET3: {
-                            argName: subject
-                            maxLength: 72
-                            submit: true
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        TL4: {
-                            //  :TODO: this is for RE: line (NYI)
-                            //width: 27
-                            //textOverflow: ...
-                        }
-                    }
-                    submit: {
-                        3: [
-                            {
-                                value: { subject: null }
-                                action: @method:headerSubmit
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-                1: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            height: 14
-                            argName: message
-                            mode: edit
-                        }
-                    }
-                    submit: {
-                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ],
-                            viewId: 1
-                        }
-                    ]
-                }
-
-                3: {
-                    mci: {
-                        HM1: {
-                            items: [ "save", "discard", "quote", "help" ]
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { 1: 0 }
-                                action: @method:editModeMenuSave
-                            }
-                            {
-                                value: { 1: 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                            {
-                                value: { 1: 2 },
-                                action: @method:editModeMenuQuote
-                            }
-                            {
-                                value: { 1: 3 }
-                                action: @method:editModeMenuHelp
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:editModeEscPressed
-                        }
-                        {
-                            keys: [ "s", "shift + s" ]
-                            action: @method:editModeMenuSave
-                        }
-                        {
-                            keys: [ "d", "shift + d" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "q", "shift + q" ]
-                            action: @method:editModeMenuQuote
-                        }
-                        {
-                            keys: [ "?" ]
-                            action: @method:editModeMenuHelp
-                        }
-                    ]
-                }
-
-                //  Quote builder
-                5: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            height: 7
-                        }
-                        VM3: {
-                            width: 79
-                            height: 4
-                            argName: quote
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { quote: null }
-                                action: @method:appendQuoteEntry
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @method:quoteBuilderEscPressed
-                        }
-                    ]
-                }
-            }
-        }
-        //  :TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
-        messageAreaNewPost: {
-            desc: Posting message,
-            module: msg_area_post_fse
-            config: {
-                art: {
-                    header:             MSGEHDR
-                    body:               MSGBODY
-                    footerEditor:       MSGEFTR
-                    footerEditorMenu:   MSGEMFT
-                    help:               MSGEHLP
-                }
-                editorMode: edit
-                editorType: area
-            }
-            form: {
-                0: {
-                    mci: {
-                        TL1: {
-                            argName: from
-                        }
-                        ET2: {
-                            argName: to
-                            focus: true
-                            text: All
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        ET3: {
-                            argName: subject
-                            maxLength: 72
-                            submit: true
-                            validate: @systemMethod:validateNonEmpty
-                            //  :TODO: Validate -> close/cancel if empty
-                        }
-                    }
-                    submit: {
-                        3: [
-                            {
-                                value: { subject: null }
-                                action: @method:headerSubmit
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-
-                1: {
-                    "mci" : {
-                        MT1: {
-                            width: 79
-                            argName: message
-                            mode: edit
-                        }
-                    }
-
-                    submit: {
-                        *: [ { "value": "message", "action": "@method:editModeEscPressed" } ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            viewId: 1
-                        }
-                    ]
-                }
-                2: {
-                    TLTL:  {
-                        mci: {
-                            TL1: { width: 5 }
-                            TL2: { width: 4 }
-                        }
-                    }
-                }
-                3: {
-                    HM: {
-                        mci: {
-                            HM1: {
-                                //  :TODO: clear
-                                "items" : [ "save", "discard", "help" ]
-                            }
-                        }
-                        submit: {
-                            *: [
-                                {
-                                    value: { 1: 0 }
-                                    action: @method:editModeMenuSave
-                                }
-                                {
-                                    value: { 1: 1 }
-                                    action: @systemMethod:prevMenu
-                                }
-                                {
-                                    value: { 1: 2 }
-                                    action: @method:editModeMenuHelp
-                                }
-                            ]
-                        }
-                        actionKeys: [
-                            {
-                                keys: [ "escape" ]
-                                action: @method:editModeEscPressed
-                            }
-                            {
-                                keys: [ "?" ]
-                                action: @method:editModeMenuHelp
-                            }
-                        ]
-                        //  :TODO: something like the following for overriding keymap
-                        //  this should only override specified entries. others will default
-                        /*
-                        "keyMap" : {
-                            "accept" : [ "return" ]
-                        }
-                        */
-                    }
-                }
-            }
-        }
-
-
-        //
-        //  User to User mail aka Email Menu
-        //
-        mailMenu: {
-            art: MAILMNU
-            desc: Mail Menu
-            prompt: menuCommand
-            config: {
-                interrupt: realtime
-            }
-            submit: [
-                {
-                    value: { command: "C" }
-                    action: @menu:mailMenuCreateMessage
-                }
-                {
-                    value: { command: "I" }
-                    action: @menu:mailMenuInbox
-                }
-                {
-                    value: { command: "Q" }
-                    action: @systemMethod:prevMenu
-                }
-                {
-                    value: { command: "G" }
-                    action: @menu:fullLogoffSequence
-                }               
-                {
-                    value: 1
-                    action: @menu:mailMenu
-                }
-            ]
-        }
-
-        mailMenuCreateMessage: {
-            desc: Mailing Someone
-            module: msg_area_post_fse
-            config: {
-                art: {
-                    header:             MSGEHDR
-                    body:               MSGBODY
-                    footerEditor:       MSGEFTR
-                    footerEditorMenu:   MSGEMFT
-                    help:               MSGEHLP
-                },
-                editorMode: edit
-                editorType: email
-                messageAreaTag: private_mail
-            }
-            form: {
-                0: {
-                    mci: {
-                        TL1: {
-                            argName:    from
-                        }
-                        ET2: {
-                            argName: to
-                            focus: true
-                            validate: @systemMethod:validateGeneralMailAddressedTo
-                        }
-                        ET3: {
-                            argName: subject
-                            maxLength: 72
-                            submit: true
-                            validate: @systemMethod:validateMessageSubject
-                        }
-                    }
-                    submit: {
-                        3: [
-                            {
-                                value: { subject: null }
-                                action: @method:headerSubmit
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-                1: {
-                    mci: {
-                        MT1: {
-                            width: 79
-                            argName: message
-                            mode: edit
-                        }
-                    }
-
-                    submit: {
-                        *: [ { value: "message", action: "@method:editModeEscPressed" } ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            viewId: 1
-                        }
-                    ]
-                },
-                2: {
-                    TLTL:  {
-                        mci: {
-                            TL1: {
-                                width: 5
-                            }
-                            TL2: {
-                                width: 4
-                            }
-                        }
-                    }
-                }
-                3: {
-                    HM: {
-                        mci: {
-                            HM1: {
-                                //  :TODO: clear
-                                items: [ "save", "discard", "help" ]
-                            }
-                        }
-                        submit: {
-                            *: [
-                                {
-                                    value: { 1: 0 }
-                                    action: @method:editModeMenuSave
-                                }
-                                {
-                                    value: { 1: 1 }
-                                    action: @systemMethod:prevMenu
-                                }
-                                {
-                                    value: { 1: 2 }
-                                    action: @method:editModeMenuHelp
-                                }
-                            ]
-                        }
-                        actionKeys: [
-                            {
-                                keys: [ "escape" ]
-                                action: @method:editModeEscPressed
-                            }
-                            {
-                                keys: [ "?" ]
-                                action: @method:editModeMenuHelp
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        mailMenuInbox: {
-            module: msg_list
-            art: PRVMSGLIST
-            config: {
-                menuViewPost: messageAreaViewPost
-                messageAreaTag: private_mail
-            }
-            form: {
-                0: {    //  main list
-                    mci:  {
-                        VM1: {
-                            focus: true
-                            submit: true
-                            argName: message
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { message: null }
-                                action: @method:selectMessage
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "delete", "d", "shift + d" ]
-                            action: @method:deleteSelected
-                        }
-                    ]
-                }
-                1: {    //  delete prompt form
-                    submit: {
-                        *: [
-                            {
-                                value: { promptValue: 0 }
-                                action: @method:deleteMessageYes
-                            }
-                            {
-                                value: { promptValue: 1 }
-                                action: @method:deleteMessageNo
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-
-        ////////////////////////////////////////////////////////////////////////
-        //  File Base
-        ////////////////////////////////////////////////////////////////////////
-
-        fileBase: {
-            desc: File Base
-            art: FMENU
-            prompt: fileMenuCommand
-            config: {
-                interrupt: realtime
-            }
-            submit: [
-                {
-                    value: { menuOption: "L" }
-                    action: @menu:fileBaseListEntries
-                }
-                {
-                    value: { menuOption: "B" }
-                    action: @menu:fileBaseBrowseByAreaSelect
-                }
-                {
-                    value: { menuOption: "F" }
-                    action: @menu:fileAreaFilterEditor
-                }
-                {
-                    value: { menuOption: "Q" }
-                    action: @systemMethod:prevMenu
-                }
-                {
-                    value: { menuOption: "G" }
-                    action: @menu:fullLogoffSequence
-                }
-                {
-                    value: { menuOption: "D" }
-                    action: @menu:fileBaseDownloadManager
-                }
-                {
-                    value: { menuOption: "W" }
-                    action: @menu:fileBaseWebDownloadManager
-                }
-                {
-                    value: { menuOption: "U" }
-                    action: @menu:fileBaseUploadFiles
-                }
-                {
-                    value: { menuOption: "S" }
-                    action: @menu:fileBaseSearch
-                }
-                {
-                    value: { menuOption: "P" }
-                    action: @menu:fileBaseSetNewScanDate
-                }
-                {
-                    value: { menuOption: "E" }
-                    action: @menu:fileBaseExportListFilter
-                }
-            ]
-        }
-
-        fileBaseExportListFilter: {
-            module: file_base_search
-            art: FBLISTEXPSEARCH
-            config: {
-                fileBaseListEntriesMenu: fileBaseExportList
-            }
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            argName: searchTerms
-                        }
-                        BT2: {
-                            argName: search
-                            text: search
-                            submit: true
-                        }
-                        ET3: {
-                            maxLength: 64
-                            argName: tags
-                        }
-                        SM4: {
-                            maxLength: 64
-                            argName: areaIndex
-                        }
-                        SM5: {
-                            items: [
-                                "upload date",
-                                "uploaded by",
-                                "downloads",
-                                "rating",
-                                "estimated year",
-                                "size",
-                                "filename"
-                            ]
-                            argName: sortByIndex
-                        }
-                        SM6: {
-                            items: [
-                                "decending",
-                                "ascending"
-                            ]
-                            argName: orderByIndex
-                        }
-                        BT7: {
-                            argName: advancedSearch
-                            text: advanced search
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { search: null }
-                                action: @method:search
-                            }
-                            {
-                                value: { advancedSearch: null }
-                                action: @method:search
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseExportList: {
-            module: file_base_user_list_export
-            art: FBLISTEXP
-            config: {
-                pause: true
-                templates: {
-                    entry: file_list_entry.asc
-                }
-            }
-            form: {
-                0: {
-                    mci:  {
-                        TL1: { }
-                        TL2: { }
-                    }
-                }
-            }
-        }
-
-        fileBaseExportListNoResults: {
-            desc: Browsing Files
-            art: FBNORES
-            config: {
-                pause: true
-                menuFlags: [ "noHistory", "popParent" ]
-            }
-        }
-
-        fileBaseSetNewScanDate: {
-            module: set_newscan_date
-            desc: File Base
-            art: SETFNSDATE
-            config: {
-                target: file
-                scanDateFormat: YYYYMMDD
-            }
-            form: {
-                0: {
-                    mci: {
-                        ME1: {
-                            focus: true
-                            submit: true
-                            argName: scanDate
-                            maskPattern: "####/##/##"
-                        }
-                    }
-                    submit: {
-                        *: [
-                            {
-                                value: { scanDate: null }
-                                action: @method:scanDateSubmit
-                            }
-                        ]
-                    }
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseListEntries: {
-            module: file_area_list
-            desc: Browsing Files
-            config: {
-                art: {
-                    browse: FBRWSE
-                    details: FDETAIL
-                    detailsGeneral: FDETGEN
-                    detailsNfo: FDETNFO
-                    detailsFileList: FDETLST
-                    help: FBHELP
-                }
-            }
-            form: {
-                0: {
-                    mci: {
-                        MT1: {
-                            mode: preview
-                        }
-
-                        HM2: {
-                            focus: true
-                            submit: true
-                            argName: navSelect                          
-                            items: [
-                                "prev", "next", "details", "toggle queue", "rate", "change filter", "help", "quit"
-                            ]
-                            focusItemIndex: 1
-                        }
-                    }
-                    
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:prevFile
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @method:nextFile
-                            }
-                            {
-                                value: { navSelect: 2 }
-                                action: @method:viewDetails
-                            }
-                            {
-                                value: { navSelect: 3 }
-                                action: @method:toggleQueue
-                            }
-                            {
-                                value: { navSelect: 4 }
-                                action: @menu:fileBaseGetRatingForSelectedEntry
-                            }                           
-                            {
-                                value: { navSelect: 5 }
-                                action: @menu:fileAreaFilterEditor
-                            }
-                            {
-                                value: { navSelect: 6 }
-                                action: @method:displayHelp
-                            }
-                            {
-                                value: { navSelect: 7 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "w", "shift + w" ]
-                            action: @method:showWebDownloadLink
-                        }
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                        {
-                            keys: [ "t", "shift + t" ]
-                            action: @method:toggleQueue
-                        }
-                        {
-                            keys: [ "f", "shift + f" ]
-                            action: @menu:fileAreaFilterEditor
-                        }
-                        {
-                            keys: [ "v", "shift + v" ]
-                            action: @method:viewDetails
-                        }
-                        {
-                            keys: [ "r", "shift + r" ]
-                            action: @menu:fileBaseGetRatingForSelectedEntry
-                        }
-                        {
-                            keys: [ "?" ]
-                            action: @method:displayHelp
-                        }
-                    ]
-                }
-
-                1: {
-                    mci: {
-                        HM1: {
-                            focus: true
-                            submit: true
-                            argName: navSelect
-                            items: [
-                                "general", "nfo/readme", "file listing"
-                            ]
-                        }
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @method:detailsQuit
-                        }
-                    ]
-                }
-
-                2: {
-                    //  details - general
-                    mci: {}                 
-                }
-
-                3: {
-                    //  details - nfo/readme
-                    mci: {
-                        MT1: {
-                            mode: preview
-                        }
-                    }
-                }
-
-                4: {
-                    //  details - file listing
-                    mci: {
-                        VM1: {
-
-                        }
-                    }
-                }
-            }
-        }
-
-        fileBaseBrowseByAreaSelect: {
-            desc: Browsing File Areas
-            module: file_base_area_select
-            art: FAREASEL
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                            argName: areaTag
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { areaTag: null }
-                                action: @method:selectArea
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseGetRatingForSelectedEntry: {
-            desc: Rating a File
-            prompt: fileBaseRateEntryPrompt
-            config: {
-                cls: true
-            }
-            submit: [
-            //  :TODO: handle esc/q
-                {
-                    //  pass data back to caller
-                    value: { rating: null }
-                    action: @systemMethod:prevMenu
-                }
-            ]
-        }
-
-        fileBaseListEntriesNoResults: {
-            desc: Browsing Files
-            art: FBNORES
-            config: {
-                pause: true
-                menuFlags: [ "noHistory", "popParent" ]
-            }
-        }
-
-        fileBaseSearch: {
-            module: file_base_search
-            desc: Searching Files
-            art: FSEARCH
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            focus: true
-                            argName: searchTerms
-                        }
-                        BT2: {
-                            argName: search
-                            text: search
-                            submit: true
-                        }
-                        ET3: {
-                            maxLength: 64
-                            argName: tags
-                        }
-                        SM4: {
-                            maxLength: 64
-                            argName: areaIndex
-                        }
-                        SM5: {
-                            items: [
-                                "upload date",
-                                "uploaded by",
-                                "downloads",
-                                "rating",
-                                "estimated year",
-                                "size",
-                                "filename",
-                            ]
-                            argName: sortByIndex
-                        }
-                        SM6: {
-                            items: [
-                                "decending",
-                                "ascending"
-                            ]
-                            argName: orderByIndex
-                        }
-                        BT7: {
-                            argName: advancedSearch
-                            text: advanced search
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { search: null }
-                                action: @method:search
-                            }
-                            {
-                                value: { advancedSearch: null }
-                                action: @method:search
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileAreaFilterEditor: {
-            desc: File Filter Editor
-            module: file_area_filter_edit
-            art: FFILEDT
-            form: {
-                0: {
-                    mci: {
-                        ET1: {
-                            argName: searchTerms
-                        }
-                        ET2: {
-                            maxLength: 64
-                            argName: tags
-                        }
-                        SM3: {
-                            maxLength: 64
-                            argName: areaIndex
-                        }
-                        SM4: {
-                            items: [
-                                "upload date",
-                                "uploaded by",
-                                "downloads",
-                                "rating",
-                                "estimated year",
-                                "size",
-                            ]
-                            argName: sortByIndex
-                        }
-                        SM5: {
-                            items: [
-                                "decending",
-                                "ascending"
-                            ]
-                            argName: orderByIndex
-                        }
-                        ET6: {
-                            maxLength: 64
-                            argName: name
-                            validate: @systemMethod:validateNonEmpty
-                        }
-                        HM7: {
-                            focus: true
-                            items: [
-                                "prev", "next", "make active", "save", "new", "delete"
-                            ]
-                            argName: navSelect
-                            focusItemIndex: 1
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:prevFilter
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @method:nextFilter
-                            }
-                            {
-                                value: { navSelect: 2 }
-                                action: @method:makeFilterActive
-                            }
-                            {
-                                value: { navSelect: 3 }
-                                action: @method:saveFilter
-                            }
-                            {
-                                value: { navSelect: 4 }
-                                action: @method:newFilter
-                            }
-                            {
-                                value: { navSelect: 5 }
-                                action: @method:deleteFilter
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseDownloadManager: {
-            desc: Download Manager
-            module: file_base_download_manager
-            config: {
-                art: {
-                    queueManager: FDLMGR
-                    /*
-                    NYI
-                    details: FDLDET
-                    */
-                }
-                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
-            }
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            argName: queueItem
-                        }
-                        HM2: {
-                            focus: true
-                            items: [ "download all", "quit" ]
-                            argName: navSelect
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:downloadAll
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "a", "shift + a" ]
-                            action: @method:downloadAll
-                        }
-                        {
-                            keys: [ "delete", "r", "shift + r" ]
-                            action: @method:removeItem
-                        }
-                        {
-                            keys: [ "c", "shift + c" ]
-                            action: @method:clearQueue
-                        }
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseWebDownloadManager: {
-            desc: Web D/L Manager
-            module: file_base_web_download_manager
-            config: {
-                art: {
-                    queueManager: FWDLMGR
-                    batchList: BATDLINF
-                }
-                emptyQueueMenu: fileBaseDownloadManagerEmptyQueue
-            }
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            argName: queueItem
-                        }
-                        HM2: {
-                            focus: true
-                            items: [ "get batch link", "quit", "help" ]
-                            argName: navSelect
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:getBatchLink
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "b", "shift + b" ]
-                            action: @method:getBatchLink
-                        }
-                        {
-                            keys: [ "delete", "r", "shift + r" ]
-                            action: @method:removeItem
-                        }
-                        {
-                            keys: [ "c", "shift + c" ]
-                            action: @method:clearQueue
-                        }
-                        {
-                            keys: [ "escape", "q", "shift + q" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseDownloadManagerEmptyQueue: {
-            desc: Empty Download Queue
-            art: FEMPTYQ
-            config: {
-                pause: true
-                menuFlags: [ "noHistory", "popParent" ]
-            }
-        }
-
-        fileTransferProtocolSelection: {
-            desc: Protocol selection
-            module: file_transfer_protocol_select
-            art: FPROSEL
-            form: {
-                0: {
-                    mci: {
-                        VM1: {
-                            focus: true
-                            argName: protocol
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { protocol: null }
-                                action: @method:selectProtocol
-                            }
-                        ]
-                    }
-
-                    actionKeys: [
-                        {
-                            keys: [ "escape" ]
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-            }
-        }
-
-        fileBaseUploadFiles: {
-            desc: Uploading
-            module: upload
-            config: {
-                interrupt: never
-                art: {
-                    options: ULOPTS
-                    fileDetails: ULDETAIL
-                    processing: ULCHECK
-                    dupes: ULDUPES
-                }
-            }
-
-            form: {
-                //  options
-                0: {
-                    mci: {
-                        SM1: {
-                            argName: areaSelect
-                            focus: true
-                        }
-                        TM2: {
-                            argName: uploadType
-                            items: [ "blind", "supply filename" ]
-                        }
-                        ET3: {
-                            argName: fileName
-                            maxLength: 255
-                            validate: @method:validateNonBlindFileName
-                        }
-                        HM4: {
-                            argName: navSelect
-                            items: [ "continue", "cancel" ]
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { navSelect: 0 }
-                                action: @method:optionsNavContinue
-                            }
-                            {
-                                value: { navSelect: 1 }
-                                action: @systemMethod:prevMenu
-                            }
-                        ]
-                    }
-
-                    "actionKeys" : [
-                        {
-                            "keys"      : [ "escape" ],
-                            action: @systemMethod:prevMenu
-                        }
-                    ]
-                }
-
-                1: {
-                    mci: { }
-                }
-
-                //  file details entry
-                2: {
-                    mci: {
-                        MT1: {
-                            argName: shortDesc
-                            tabSwitchesView: true
-                            focus: true
-                        }
-
-                        ET2: {
-                            argName: tags
-                        }
-
-                        ME3: {
-                            argName: estYear
-                            maskPattern: "####"
-                        }
-
-                        BT4: {
-                            argName: continue
-                            text: continue
-                            submit: true
-                        }
-                    }
-
-                    submit: {
-                        *: [
-                            {
-                                value: { continue: null }
-                                action: @method:fileDetailsContinue
-                            }
-                        ]
-                    }
-                }
-
-                //  dupes
-                3: {
-                    mci: {
-                        VM1: {
-                            /*
-                            Use 'dupeInfoFormat' to custom format:
-
-                            areaDesc
-                            areaName
-                            areaTag
-                            desc
-                            descLong
-                            fileId
-                            fileName
-                            fileSha256
-                            storageTag
-                            uploadTimestamp
-
-                            */
-
-                            mode: preview
-                        }
-                    }
-                }
-            }
-        }
-
-        fileBaseNoUploadAreasAvail: {
-            desc: File Base
-            art: ULNOAREA
-            config: {
-                pause: true
-                menuFlags: [ "noHistory", "popParent" ]
-            }
-        }
-
-        sendFilesToUser: {
-            desc: Downloading
-            module: file_transfer
-            config: {
-                //  defaults - generally use extraArgs
-                protocol: zmodem8kSexyz
-                direction: send
-            }
-        }
-
-        recvFilesFromUser: {
-            desc: Uploading
-            module: file_transfer
-            config: {
-                //  defaults - generally use extraArgs
-                protocol: zmodem8kSexyz
-                direction: recv
-            }   
-        }
-
-
-        ////////////////////////////////////////////////////////////////////////
-        //  Required entries
-        ////////////////////////////////////////////////////////////////////////
-        idleLogoff: {
-            art:    IDLELOG
-            next:   @systemMethod:logoff
-        }
-        ////////////////////////////////////////////////////////////////////////
-        //  Demo Section
-        //  :TODO: This entire section needs updated!!!
-        ////////////////////////////////////////////////////////////////////////
-        "demoMain" : {
-            "art" : "demo_selection_vm.ans",
-            "form" : {
-                "0" : {
-                    "VM" : {
-                        "mci" : {
-                            "VM1" : {
-                                "items" : [
-                                    "Single Line Text Editing Views",
-                                    "Spinner & Toggle Views",
-                                    "Mask Edit Views",
-                                    "Multi Line Text Editor",
-                                    "Vertical Menu Views",
-                                    "Horizontal Menu Views",
-                                    "Art Display",
-                                    "Full Screen Editor"
-                                ],
-                                "height" : 10,
-                                "itemSpacing" : 1,
-                                "justify" : "center",
-                                "focusTextStyle" : "small i"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : { "1" : 0 },
-                                    "action" : "@menu:demoEditTextView"
-                                },
-                                {
-                                    "value" : { "1" : 1 },
-                                    "action" : "@menu:demoSpinAndToggleView"
-                                },
-                                {
-                                    "value" : { "1" : 2 },
-                                    "action" : "@menu:demoMaskEditView"
-                                },
-                                {
-                                    "value" : { "1" : 3 },
-                                    "action" : "@menu:demoMultiLineEditTextView"
-                                },
-                                {
-                                    "value" : { "1" : 4 },
-                                    "action"    : "@menu:demoVerticalMenuView"
-                                },
-                                {
-                                    "value"     : { "1" : 5 },
-                                    "action"    : "@menu:demoHorizontalMenuView"
-                                },
-                                {
-                                    "value" : { "1" : 6 },
-                                    "action" : "@menu:demoArtDisplay"
-                                },
-                                {
-                                    "value" : { "1" : 7 },
-                                    "action" : "@menu:demoFullScreenEditor"
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "demoEditTextView" : {
-            "art" : "demo_edit_text_view1.ans",
-            "form" : {
-                "0" : {
-                    "BTETETETET" : {
-                        "mci" : {
-                            "ET1" : {
-                                "width"     : 20,
-                                "maxLength" : 20
-                            },
-                            "ET2" : {
-                                "width"     : 20,
-                                "maxLength" : 40,
-                                "textOverflow" : "..."
-                            },
-                            "ET3" : {
-                                "width"     : 20,
-                                "fillChar" : "-",
-                                "styleSGR1" : "|00|36",
-                                "maxLength" : 20
-                            },
-                            "ET4" : {
-                                "width"     : 20,
-                                "maxLength" : 20,
-                                "password"  : true
-                            },
-                            "BT5" : {
-                                "width" : 8,
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : 5,
-                                    "action" : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 5
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "demoSpinAndToggleView" : {
-            "art" : "demo_spin_and_toggle.ans",
-            "form" : {
-                "0" : {
-                    "BTSMSMTM" : {
-                        "mci" : {
-                            "SM1" : {
-                                "items" : [ "Henry Morgan", "François l'Ollonais", "Roche Braziliano", "Black Bart", "Blackbeard" ]
-                            },
-                            "SM2" : {
-                                "items" : [ "Razor 1911", "DrinkOrDie", "TRSI" ]
-                            },
-                            "TM3" : {
-                                "items"     : [ "Yarly", "Nowaii" ],
-                                "styleSGR1" : "|00|30|01",
-                                "hotKeys"   : { "Y" : 0, "N" : 1 }
-                            },
-                            "BT8" : {
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : 8,
-                                    "action" : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 8
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "demoMaskEditView" : {
-            "art" : "demo_mask_edit_text_view1.ans",
-            "form" : {
-                "0" : {
-                    "BTMEME" : {
-                        "mci" : {
-                            "ME1" : {
-                                "maskPattern"   : "##/##/##",
-                                "styleSGR1"     : "|00|30|01",
-                                //"styleSGR2"       : "|00|45|01",
-                                "styleSGR3"     : "|00|30|35",
-                                "fillChar"      : "#"
-                            },
-                            "BT5" : {
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : 5,
-                                    "action" : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 5
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "demoMultiLineEditTextView" : {
-            "art" : "demo_multi_line_edit_text_view1.ans",
-            "form" : {
-                "0" : {
-                    "BTMT" : {
-                        "mci" : {
-                            "MT1" : {
-                                "width"     : 70,
-                                "height"    : 17,
-                                //"text"        : "@art:demo_multi_line_edit_text_view_text.txt",
-                                // "text" : "@systemMethod:textFromFile"
-                                text: "Hints:\n\t* Insert / CTRL-V toggles overtype mode\n\t* CTRL-Y deletes the current line\n\t* Try Page Up / Page Down\n\t* Home goes to the start of line text\n\t* End goes to the end of a line\n\n\nTab handling:\n-------------------------------------------------\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\n\tA\tB\tC\tD\tE\tF\nA\tB\tC\tD\tE\tF\tG\tH\nA0\tBB\t1\tCCC\t2\tDDD\t3EEEE\nW\t\tX\t\tY\t\tZ\n\nAn excerpt from A Clockwork Orange:\n\"What sloochatted then, of course, was that my cellmates woke up and started joining in, tolchocking a bit wild in the near-dark, and the shoom seemed to wake up the whole tier, so that you could slooshy a lot of creeching and banging about with tin mugs on the wall, as though all the plennies in all the cells thought a big break was about to commence, O my brothers.\n",
-                                "focus"     : true
-                            },
-                            "BT5" : {
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : 5,
-                                    "action" : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 5
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "demoHorizontalMenuView" : {
-            "art" : "demo_horizontal_menu_view1.ans",
-            "form" : {
-                "0" : {
-                    "BTHMHM" : {
-                        "mci" : {
-                            "HM1" : {
-                                "items" : [ "One", "Two", "Three" ],
-                                "hotKeys" : { "1" : 0, "2" : 1, "3" : 2 }
-                            },
-                            "HM2" : {
-                                "items" : [ "Uno", "Dos", "Tres" ],
-                                "hotKeys" : { "U" : 0, "D" : 1, "T" : 2 }
-                            },
-                            "BT5" : {
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : 5,
-                                    "action" : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 5
-                            }
-                        ]
-                    }
-                }
-            }
-        },
-        "demoVerticalMenuView" : {
-            "art"       : "demo_vertical_menu_view1.ans",
-            "form"      : {
-                "0" : {
-                    "BTVM" : {
-                        "mci" : {
-                            "VM1" : {
-                                "items" : [
-                                    "|33Oblivion/2",
-                                    "|33iNiQUiTY",
-                                    "|33ViSiON/X"
-                                ],
-                                "focusItems" : [
-                                    "|33Oblivion|01/|00|332",
-                                    "|01|33i|00|33N|01i|00|33QU|01i|00|33TY",
-                                    "|33ViSiON/X"
-                                ]
-                                //
-                                //  :TODO: how to do the following:
-                                //  1) Supply a view a string for a standard vs focused item
-                                //      "items" : [...], "focusItems" : [ ... ] ?
-                                //      "draw" : "@method:drawItemX", then items: [...]
-                            },
-                            "BT5" : {
-                                "text" : "< Back"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value"     : 5,
-                                    "action"    : "@menu:demoMain"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 5
-                            }
-                        ]
-                    }
-                }
-            }
-
-        },
-        "demoArtDisplay" : {
-            "art" : "demo_selection_vm.ans",
-            "form" : {
-                "0" : {
-                    "VM" : {
-                        "mci" : {
-                            "VM1" : {
-                                "items" : [
-                                    "Defaults - DOS ANSI",
-                                    "bw_mindgames.ans - DOS",
-                                    "test.ans - DOS",
-                                    "Defaults - Amiga",
-                                    "Pause at Term Height"
-                                ],
-                                //  :TODO: justify not working??
-                                "focusTextStyle" : "small i"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value" : { "1" : 0 },
-                                    "action" : "@menu:demoDefaultsDosAnsi"
-                                },
-                                {
-                                    "value" : { "1" : 1 },
-                                    "action" : "@menu:demoDefaultsDosAnsi_bw_mindgames"
-                                },
-                                {
-                                    "value" : { "1" : 2 },
-                                    "action" : "@menu:demoDefaultsDosAnsi_test"
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "demoDefaultsDosAnsi" : {
-            "art" : "DM-ENIG2.ANS"
-        },
-        "demoDefaultsDosAnsi_bw_mindgames" : {
-            "art" : "bw_mindgames.ans"
-        },
-        "demoDefaultsDosAnsi_test" : {
-            "art" : "test.ans"
-        },
-        "demoFullScreenEditor" : {
-            "module"    : "fse",
-            "config"    : {
-                "editorType"    : "netMail",
-                "art"           : {
-                    "header"            : "demo_fse_netmail_header.ans",
-                    "body"              : "demo_fse_netmail_body.ans",
-                    "footerEditor"      : "demo_fse_netmail_footer_edit.ans",
-                    "footerEditorMenu"  : "demo_fse_netmail_footer_edit_menu.ans",
-                    "footerView"        : "demo_fse_netmail_footer_view.ans",
-                    "help"              : "demo_fse_netmail_help.ans"
-                }
-            },
-            "form" : {
-                "0" : {
-                    "ETETET" : {
-                        "mci" : {
-                            "ET1" : {
-                                //  :TODO: from/to may be set by args
-                                //  :TODO: focus may change dep on view vs edit
-                                "width"     : 36,
-                                "focus"     : true,
-                                "argName"   : "to"
-                            },
-                            "ET2" : {
-                                "width"     : 36,
-                                "argName"   : "from"
-                            },
-                            "ET3" : {
-                                "width"     : 65,
-                                "maxLength" : 72,
-                                "submit"    : [ "enter" ],
-                                "argName"   : "subject"
-                            }
-                        },
-                        "submit" : {
-                            "3" : [
-                                {
-                                    "value" : { "subject" : null },
-                                    "action" : "@method:headerSubmit"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "1" : {
-                    "MT" : {
-                        "mci" : {
-                            "MT1" : {
-                                "width"     : 79,
-                                "height"    : 17,
-                                "text"      : "",   //  :TODO: should not be req.
-                                "argName"   : "message"
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value"     : "message",
-                                    "action"    : "@method:editModeEscPressed"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [
-                            {
-                                "keys"      : [ "escape" ],
-                                "viewId"    : 1
-                            }
-                        ]
-                    }
-                },
-                "2" : {
-                    "TLTL" :  {
-                        "mci" : {
-                            "TL1" : {
-                                "width" : 5
-                            },
-                            "TL2" : {
-                                "width" : 4
-                            }
-                        }
-                    }
-                },
-                "3" : {
-                    "HM" : {
-                        "mci" : {
-                            "HM1" : {
-                                //  :TODO: Continue, Save, Discard, Clear, Quote, Help
-                                "items" : [ "Save", "Discard", "Quote", "Help" ]
-                            }
-                        },
-                        "submit" : {
-                            "*" : [
-                                {
-                                    "value"     : { "1" : 0 },
-                                    "action"    : "@method:editModeMenuSave"
-                                },
-                                {
-                                    "value"     : { "1" : 1 },
-                                    "action"    : "@menu:demoMain"
-                                },
-                                {
-                                    "value"     : { "1" : 2 },
-                                    "action"    : "@method:editModeMenuQuote"
-                                },
-                                {
-                                    "value"     : { "1" : 3 },
-                                    "action"    : "@method:editModeMenuHelp"
-                                },
-                                {
-                                    "value"     : 1,
-                                    "action"    : "@method:editModeEscPressed"
-                                }
-                            ]
-                        },
-                        "actionKeys" : [    //  :TODO: Need better name
-                            {
-                                "keys"      : [ "escape" ],
-                                "action"    : "@method:editModeEscPressed"
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    }
-}

From 094385a1507b8bed31c5faf79c2eb5bdd8c567f2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 7 Jun 2019 23:23:06 -0600
Subject: [PATCH 0834/1013] Minor bug fixes and improvements * Color help text
 a bit * Split lines for buffer so padding works - may need to do elsewhere
 also * Fix a couple crashes

---
 core/mrc.js | 116 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 47 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 6fd8ac35..36475d70 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -32,7 +32,7 @@ const FormIds = {
     mrcChat    : 0,
 };
 
-var MciViewIds = {
+const MciViewIds = {
     mrcChat  : {
         chatLog             : 1,
         inputArea           : 2,
@@ -48,19 +48,20 @@ var MciViewIds = {
 
 // TODO: this is a bit shit, could maybe do it with an ansi instead
 const helpText = `
-General Chat:
-/rooms & /join <ro         - List all or join a room
-/pm <user> <message>       - Send a private message
+|15General Chat|08:
+|03/|11rooms |08& |03/|11join |03<room>      |08- |07List all or join a room
+|03/|11pm |03<user> <message>       |08- |07Send a private message
 ----
-/whoon                     - Who's on what BBS
-/chatters                  - Who's in what room
-/topic <message>           - Set the room topic
-/bbses & /info <id>        - Info about BBS's connected
-/meetups                   - Info about MRC MeetUps
+|03/|11whoon                     |08- |07Who's on what BBS
+|03/|11chatters                  |08- |07Who's in what room
+|03/|11clear                     |08- |07Clear back buffer
+|03/|11topic <message>           |08- |07Set the room topic
+|03/|11bbses & |03/|11info <id>        |08- |07Info about BBS's connected
+|03/|11meetups                   |08- |07Info about MRC MeetUps
 ---
-/l33t <your message>       - l337 5p34k
-/kewl <your message>       - BBS KeWL SPeaK
-/rainbow <your message>    - Crazy rainbow text
+|03/|11l33t <your message>       |08- |07l337 5p34k
+|03/|11kewl <your message>       |08- |07BBS KeWL SPeaK
+|03/|11rainbow <your message>    |08- |07Crazy rainbow text
 `;
 
 
@@ -94,7 +95,7 @@ exports.getModule = class mrcModule extends MenuModule {
             },
 
             movementKeyPressed : (formData, extraArgs, cb) => {
-                const bodyView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);  //  :TODO: use const here vs magic #
+                const bodyView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
                 switch(formData.key.name) {
                     case 'down arrow'   : bodyView.scrollDocumentUp(); break;
                     case 'up arrow'     : bodyView.scrollDocumentDown(); break;
@@ -108,9 +109,6 @@ exports.getModule = class mrcModule extends MenuModule {
             },
 
             quit : (formData, extraArgs, cb) => {
-                this.sendServerMessage('LOGOFF');
-                clearInterval(this.heartbeat);
-                this.state.socket.destroy();
                 return this.prevMenu(cb);
             }
         };
@@ -138,16 +136,19 @@ exports.getModule = class mrcModule extends MenuModule {
 
                         // connect to multiplexer
                         this.state.socket = net.createConnection(connectOpts, () => {
-                            const self = this;
-                            // handshake with multiplexer
-                            self.state.socket.write(`--DUDE-ITS--|${self.state.alias}\n`);
+                            this.client.once('end', () => {
+                                this.quitServer();
+                            });
 
-                            self.clientConnect();
+                            // handshake with multiplexer
+                            this.state.socket.write(`--DUDE-ITS--|${this.state.alias}\n`);
+
+                            this.clientConnect();
 
                             // send register to central MRC and get stats every 60s
-                            self.heartbeat = setInterval(function () {
-                                self.sendHeartbeat();
-                                self.sendServerMessage('STATS');
+                            this.heartbeat = setInterval( () => {
+                                this.sendHeartbeat();
+                                this.sendServerMessage('STATS');
                             }, 60000);
                         });
 
@@ -167,26 +168,46 @@ exports.getModule = class mrcModule extends MenuModule {
         });
     }
 
+    leave() {
+        this.quitServer();
+        return super.leave();
+    }
+
+    quitServer() {
+        clearInterval(this.heartbeat);
+
+        if(this.state.socket) {
+            this.sendServerMessage('LOGOFF');
+            this.state.socket.destroy();
+        }
+    }
+
     /**
      * Adds a message to the chat log on screen
      */
     addMessageToChatLog(message) {
-        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
-        const messageLength = stripMciColorCodes(message).length;
-        const chatWidth = chatLogView.dimens.width;
-        let padAmount = 0;
-        let spaces = 2;
-
-        if (messageLength > chatWidth) {
-            padAmount = chatWidth - (messageLength % chatWidth) - spaces;
-        } else {
-            padAmount = chatWidth - messageLength - spaces ;
+        if(!Array.isArray(message)) {
+            message = [ message ];
         }
 
-        if (padAmount < 0) padAmount = 0;
+        message.forEach(msg => {
+            const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+            const messageLength = stripMciColorCodes(msg).length;
+            const chatWidth = chatLogView.dimens.width;
+            let padAmount = 0;
+            let spaces = 2;
 
-        const padding = ' |00' + ' '.repeat(padAmount);
-        chatLogView.addText(pipeToAnsi(message + padding));
+            if (messageLength > chatWidth) {
+                padAmount = chatWidth - (messageLength % chatWidth) - spaces;
+            } else {
+                padAmount = chatWidth - messageLength - spaces;
+            }
+
+            if (padAmount < 0) padAmount = 0;
+
+            const padding = ' |00' + ' '.repeat(padAmount);
+            chatLogView.addText(pipeToAnsi(msg + padding));
+        });
     }
 
     /**
@@ -267,7 +288,7 @@ exports.getModule = class mrcModule extends MenuModule {
             const messageFormat =
                 this.config.messageFormat ||
                 '|00|10<|02{fromUserName}|10>|00 |03{message}|00';
-            
+
             const privateMessageFormat =
                 this.config.outgoingPrivateMessageFormat ||
                 '|00|10<|02{fromUserName}|10|14->|02{toUserName}>|00 |03{message}|00';
@@ -280,7 +301,7 @@ exports.getModule = class mrcModule extends MenuModule {
                 // pm 
                 formattedMessage = stringFormat(privateMessageFormat, textFormatObj);
             }
-            
+
             try {
                 this.sendMessageToMultiplexer(to_user || '', '', this.state.room, formattedMessage);
             } catch(e) {
@@ -366,7 +387,7 @@ exports.getModule = class mrcModule extends MenuModule {
                 break;
 
             case '?':
-                this.addMessageToChatLog(helpText);
+                this.addMessageToChatLog(helpText.split(/\n/g));
                 break;
 
             default:
@@ -385,16 +406,17 @@ exports.getModule = class mrcModule extends MenuModule {
     sendMessageToMultiplexer(to_user, to_site, to_room, body) {
 
         const message = {
-            from_user: this.state.alias,
-            from_room: this.state.room,
-            to_user: to_user,
-            to_site: to_site,
-            to_room: to_room,
-            body: body
+            to_user,
+            to_site,
+            to_room,
+            body,
+            from_user   : this.state.alias,
+            from_room   : this.state.room,
         };
 
-        // TODO: check socket still exists here
-        this.state.socket.write(JSON.stringify(message) + '\n');
+        if(this.state.socket) {
+            this.state.socket.write(JSON.stringify(message) + '\n');
+        }
     }
 
     /**

From afb7854ea50f4bdf00d337d6045a094db0cf4281 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Jun 2019 11:57:36 -0600
Subject: [PATCH 0835/1013] Clean up logging a bit & implement 'omit' * 'omit'
 can be set to omit views from form submission * Don't log as much noise

---
 core/view.js            |  6 ++++++
 core/view_controller.js | 23 +++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/core/view.js b/core/view.js
index 7d3c5693..58a305e4 100644
--- a/core/view.js
+++ b/core/view.js
@@ -220,6 +220,12 @@ View.prototype.setPropertyValue = function(propName, value) {
 
         case 'argName' : this.submitArgName = value; break;
 
+        case 'omit' :
+            if(_.isBoolean(value)) {
+                this.omitFromSubmission = value; break;
+            }
+            break;
+
         case 'validate' :
             if(_.isFunction(value)) {
                 this.validate = value;
diff --git a/core/view_controller.js b/core/view_controller.js
index 84f33756..9c0ffe19 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -46,6 +46,8 @@ function ViewController(options) {
             return; //  ignore until this is finished!
         }
 
+        self.client.log.trace( { actionBlock }, 'Action match' );
+
         self.waitActionCompletion = true;
         menuUtil.handleAction(self.client, formData, actionBlock, (err) => {
             if(err) {
@@ -121,9 +123,7 @@ function ViewController(options) {
         self.emit('submit', this.getFormData(key));
     };
 
-    //  :TODO: replace this in favor of overriding toJSON() for various things such that logging will *never* output them
     this.getLogFriendlyFormData = function(formData) {
-        //  :TODO: these fields should be part of menu.json sensitiveMembers[]
         var safeFormData = _.cloneDeep(formData);
         if(safeFormData.value.password) {
             safeFormData.value.password = '*****';
@@ -330,15 +330,6 @@ function ViewController(options) {
                 }
             }
         }
-
-        self.client.log.trace(
-            {
-                formValue   : formValue,
-                actionValue : actionValue
-            },
-            'Action match'
-        );
-
         return true;
     };
 
@@ -577,7 +568,7 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
                 if(false === self.noInput) {
 
                     self.on('submit', function promptSubmit(formData) {
-                        self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Prompt submit');
+                        self.client.log.trace( { formData }, 'Prompt submit');
 
                         const doSubmitNotify = () => {
                             if(options.submitNotify) {
@@ -752,8 +743,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
                 }
 
                 self.on('submit', function formSubmit(formData) {
-
-                    self.client.log.trace( { formData : self.getLogFriendlyFormData(formData) }, 'Form submit');
+                    self.client.log.trace( { formData }, 'Form submit');
 
                     //
                     //  Locate configuration for this form ID
@@ -870,6 +860,11 @@ ViewController.prototype.getFormData = function(key) {
                 return;
             }
 
+            //  some form values may be omitted from submission all together
+            if(view.omitFromSubmission) {
+                return;
+            }
+
             viewData = view.getData();
             if(_.isUndefined(viewData)) {
                 return;

From f2e769a27ab2f26d75505ada456f1ee3ad6dc106 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Jun 2019 11:58:21 -0600
Subject: [PATCH 0836/1013] Fix up colors, clear out socket

---
 core/mrc.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 36475d70..f2bfeec6 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -55,13 +55,13 @@ const helpText = `
 |03/|11whoon                     |08- |07Who's on what BBS
 |03/|11chatters                  |08- |07Who's in what room
 |03/|11clear                     |08- |07Clear back buffer
-|03/|11topic <message>           |08- |07Set the room topic
-|03/|11bbses & |03/|11info <id>        |08- |07Info about BBS's connected
+|03/|11topic |03<message>           |08- |07Set the room topic
+|03/|11bbses |08& |03/|11info <id>        |08- |07Info about BBS's connected
 |03/|11meetups                   |08- |07Info about MRC MeetUps
 ---
-|03/|11l33t <your message>       |08- |07l337 5p34k
-|03/|11kewl <your message>       |08- |07BBS KeWL SPeaK
-|03/|11rainbow <your message>    |08- |07Crazy rainbow text
+|03/|11l33t |03<your message>       |08- |07l337 5p34k
+|03/|11kewl |03<your message>       |08- |07BBS KeWL SPeaK
+|03/|11rainbow |03<your message>    |08- |07Crazy rainbow text
 `;
 
 
@@ -179,6 +179,7 @@ exports.getModule = class mrcModule extends MenuModule {
         if(this.state.socket) {
             this.sendServerMessage('LOGOFF');
             this.state.socket.destroy();
+            delete this.state.socket;
         }
     }
 

From 33969448204ed7bd2e31cb1ed6083632a96a425e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Jun 2019 11:58:28 -0600
Subject: [PATCH 0837/1013] Note on 'omit'

---
 WHATSNEW.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 7137038a..d64f7d1d 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -32,7 +32,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Performing a file scan/import using `oputil.js fb scan` now recognizes various `FILES.BBS` formats.
 * Usernames found in the `config.users.badUserNames` are now not only disallowed from applying, but disconnected at any login attempt.
 * Total minutes online is now tracked for users. Of course, it only starts after you get the update :)
-
+* Form entries in `menu.hjson` can now be omitted from submission handlers using `omit: true`
 
 ## 0.0.8-alpha
 * [Mystic BBS style](http://wiki.mysticbbs.com/doku.php?id=displaycodes) extended pipe color codes. These allow for example, to set "iCE" background colors.

From ad305b4cccd6086befa758b793db5b9315d85b7e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 8 Jun 2019 12:12:29 -0600
Subject: [PATCH 0838/1013] Implement 'maxScrollbackLines' config for MRC
 module

---
 core/mrc.js                 | 6 ++++++
 misc/menu_template.in.hjson | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/core/mrc.js b/core/mrc.js
index f2bfeec6..3ab1e91b 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -72,6 +72,8 @@ exports.getModule = class mrcModule extends MenuModule {
         this.log    = Log.child( { module : 'MRC' } );
         this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
 
+        this.config.maxScrollbackLines = this.config.maxScrollbackLines || 500;
+
         this.state = {
             socket: '',
             alias: this.client.user.username,
@@ -208,6 +210,10 @@ exports.getModule = class mrcModule extends MenuModule {
 
             const padding = ' |00' + ' '.repeat(padAmount);
             chatLogView.addText(pipeToAnsi(msg + padding));
+
+            if(chatLogView.getLineCount() > this.config.maxScrollbackLines) {
+                chatLogView.deleteLine(0);
+            }
         });
     }
 
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 9ae54d17..5c7eba83 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1104,6 +1104,9 @@
             art: MRC
             config: {
                 cls: true
+
+                //  max lines kept in scrollback buffer
+                maxScrollbackLines: 500
             }
             form: {
                 0: {

From 433ad72752e26803d610c4c5eb693663cfc73d52 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Jun 2019 00:09:07 -0600
Subject: [PATCH 0839/1013] Fixes & /clear * Fix use port from config * Add
 /clear & menu method: clearMessages()

---
 core/mrc.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 3ab1e91b..c80adf80 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -10,6 +10,7 @@ const {
 }                       = require('./color_codes.js');
 const stringFormat      = require('./string_format.js');
 const StringUtil        = require('./string_util.js');
+const Config            = require('./config.js').get;
 
 //  deps
 const _                 = require('lodash');
@@ -112,6 +113,11 @@ exports.getModule = class mrcModule extends MenuModule {
 
             quit : (formData, extraArgs, cb) => {
                 return this.prevMenu(cb);
+            },
+
+            clearMessages : (formData, extraArgs, cb) => {
+                this.clearMessages();
+                return cb(null);
             }
         };
     }
@@ -132,7 +138,7 @@ exports.getModule = class mrcModule extends MenuModule {
                     },
                     (callback) => {
                         const connectOpts = {
-                            port	: 5000,
+                            port	: _.get(Config(), 'chatServers.mrc.serverPort', 5000),
                             host	: 'localhost',
                         };
 
@@ -160,6 +166,15 @@ exports.getModule = class mrcModule extends MenuModule {
                             this.processReceivedMessage(data);
                         });
 
+                        this.state.socket.once('error', err => {
+                            this.log.warn( { error : err.message }, 'MRC multiplexer socket error' );
+                            this.state.socket.destroy();
+                            delete this.state.socket;
+
+                            //  bail with error - fall back to prev menu
+                            return callback(err);
+                        });
+
                         return(callback);
                     }
                 ],
@@ -389,8 +404,11 @@ exports.getModule = class mrcModule extends MenuModule {
                 this.sendServerMessage('LIST');
                 break;
 
+            case 'quit' :
+                return this.prevMenu();
+
             case 'clear':
-                chatLogView.setText('');
+                this.clearMessages();
                 break;
 
             case '?':
@@ -404,7 +422,11 @@ exports.getModule = class mrcModule extends MenuModule {
 
         // just do something to get the cursor back to the right place ¯\_(ツ)_/¯
         this.sendServerMessage('STATS');
+    }
 
+    clearMessages() {
+        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
+        chatLogView.setText('');
     }
 
     /**

From 487968dac94e7453d317e4647f772e30c6208047 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Jun 2019 09:19:34 -0600
Subject: [PATCH 0840/1013] Fix my previous dumb

---
 core/mrc.js                          | 2 +-
 core/servers/chat/mrc_multiplexer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index c80adf80..6987be32 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -138,7 +138,7 @@ exports.getModule = class mrcModule extends MenuModule {
                     },
                     (callback) => {
                         const connectOpts = {
-                            port	: _.get(Config(), 'chatServers.mrc.serverPort', 5000),
+                            port	: _.get(Config(), 'chatServers.mrc.multiplexerPort', 5000),
                             host	: 'localhost',
                         };
 
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 9b976eff..fd83d462 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -104,7 +104,7 @@ exports.getModule = class MrcModule extends ServerModule {
                 buffer = Buffer.concat([buffer, chunk]);
             }
 
-            var lines = buffer.toString().split(lineDelimiter);
+            let lines = buffer.toString().split(lineDelimiter);
 
             if (lines.pop()) {
                 // if buffer is not ended with \r\n, there's more chunks.

From 5c978e05bf468ffa7b10deb78ef113a5ac570af7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Jun 2019 13:41:11 -0600
Subject: [PATCH 0841/1013] Ability to override idle time and/or temporary
 disable from MRC

---
 core/client.js | 21 ++++++++++++++++++++-
 core/mrc.js    | 16 ++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/core/client.js b/core/client.js
index d340981b..76d56529 100644
--- a/core/client.js
+++ b/core/client.js
@@ -439,6 +439,11 @@ Client.prototype.setTermType = function(termType) {
 };
 
 Client.prototype.startIdleMonitor = function() {
+    //  clear existing, if any
+    if(this.idleCheck) {
+        this.stopIdleMonitor();
+    }
+
     this.lastKeyPressMs = Date.now();
 
     //
@@ -474,6 +479,9 @@ Client.prototype.startIdleMonitor = function() {
             idleLogoutSeconds = Config().users.preAuthIdleLogoutSeconds;
         }
 
+        //  use override value if set
+        idleLogoutSeconds = this.idleLogoutSecondsOverride || idleLogoutSeconds;
+
         if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
             this.emit('idle timeout');
         }
@@ -481,7 +489,18 @@ Client.prototype.startIdleMonitor = function() {
 };
 
 Client.prototype.stopIdleMonitor = function() {
-    clearInterval(this.idleCheck);
+    if(this.idleCheck) {
+        clearInterval(this.idleCheck);
+        delete this.idleCheck;
+    }
+};
+
+Client.prototype.overrideIdleLogoutSeconds = function(seconds) {
+    this.idleLogoutSecondsOverride = seconds;
+};
+
+Client.prototype.restoreIdleLogoutSeconds = function() {
+    delete this.idleLogoutSecondsOverride;
 };
 
 Client.prototype.end = function () {
diff --git a/core/mrc.js b/core/mrc.js
index 6987be32..96637dfa 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -158,6 +158,16 @@ exports.getModule = class mrcModule extends MenuModule {
                                 this.sendHeartbeat();
                                 this.sendServerMessage('STATS');
                             }, 60000);
+
+                            //  override idle logout seconds if configured
+                            const idleLogoutSeconds = parseInt(this.config.idleLogoutSeconds);
+                            if(0 === idleLogoutSeconds) {
+                                this.log.debug('Temporary disable idle monitor due to config');
+                                this.client.stopIdleMonitor();
+                            } else if (!isNaN(idleLogoutSeconds) && idleLogoutSeconds >= 60) {
+                                this.log.debug( { idleLogoutSeconds }, 'Temporary override idle logout seconds due to config');
+                                this.client.overrideIdleLogoutSeconds(idleLogoutSeconds);
+                            }
                         });
 
                         // when we get data, process it
@@ -187,6 +197,12 @@ exports.getModule = class mrcModule extends MenuModule {
 
     leave() {
         this.quitServer();
+
+        //  restore idle monitor to previous state
+        this.log.debug('Restoring idle monitor to previous state');
+        this.client.restoreIdleLogoutSeconds();
+        this.client.startIdleMonitor();
+
         return super.leave();
     }
 

From da93fd53e9de052d0e9845ae6879a97853674674 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 9 Jun 2019 22:36:24 -0600
Subject: [PATCH 0842/1013] Start of custom format obj stuff. Want to add more
 info

---
 core/mrc.js | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 96637dfa..8832d103 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -41,7 +41,8 @@ const MciViewIds = {
         roomTopic           : 4,
         mrcUsers            : 5,
         mrcBbses            : 6,
-        customRangeStart    : 10,   //  10+ = customs
+
+        customRangeStart    : 20,   //  20+ = customs
     }
 };
 
@@ -84,6 +85,16 @@ exports.getModule = class mrcModule extends MenuModule {
             last_ping: 0
         };
 
+        this.customFormatObj = {
+            roomName        : '',
+            roomTopic       : '',
+            roomUserCount   : 0,
+            userCount       : 0,
+            boardCount      : 0,
+            roomCount       : 0,
+            //latencyMs       : 0,
+        };
+
         this.menuMethods = {
 
             sendChatMessage : (formData, extraArgs, cb) => {
@@ -269,19 +280,33 @@ exports.getModule = class mrcModule extends MenuModule {
                         break;
 
                     case 'ROOMTOPIC':
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomName).setText(`#${params[1]}`);
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.roomTopic).setText(pipeToAnsi(params[2]));
+                        this.setText(MciViewIds.mrcChat.roomName, `#${params[1]}`);
+                        this.setText(MciViewIds.mrcChat.roomTopic, params[2]);
+
+                        this.customFormatObj.roomName   = params[1];
+                        this.customFormatObj.roomTopic  = params[2];
+                        this.updateCustomViews();
+
                         this.state.room = params[1];
                         break;
 
                     case 'USERLIST':
                         this.state.nicks = params[1].split(',');
+
+                        this.customFormatObj.roomUserCount = this.state.nicks.length;
+                        this.updateCustomViews();
                         break;
 
                     case 'STATS': {
                         const stats = params[1].split(' ');
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcUsers).setText(stats[2]);
-                        this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.mrcBbses).setText(stats[0]);
+                        this.setText(MciViewIds.mrcChat.mrcUsers, stats[2]);
+                        this.setText(MciViewIds.mrcChat.mrcBbses, stats[0]);
+
+                        this.customFormatObj.boardCount = parseInt(stats[0]);
+                        this.customFormatObj.roomCount  = parseInt(stats[1]);
+                        this.customFormatObj.userCount  = parseInt(stats[2]);
+                        this.updateCustomViews();
+
                         this.state.last_ping = stats[1];
                         break;
                     }
@@ -303,6 +328,18 @@ exports.getModule = class mrcModule extends MenuModule {
         });
     }
 
+    setText(mciId, text) {
+        return this.setViewText('mrcChat', mciId, text);
+    }
+
+    updateCustomViews() {
+        return this.updateCustomViewTextsWithFilter(
+            'mrcChat',
+            MciViewIds.mrcChat.customRangeStart,
+            this.customFormatObj
+        );
+    }
+
     /**
      * Receives the message input from the user and does something with it based on what it is
      */
@@ -353,9 +390,6 @@ exports.getModule = class mrcModule extends MenuModule {
      * Processes a message that begins with a slash
      */
     processSlashCommand(message) {
-        // get the chat log view in case we need it
-        const chatLogView = this.viewControllers.mrcChat.getView(MciViewIds.mrcChat.chatLog);
-
         const cmd = message.split(' ');
         cmd[0] = cmd[0].substr(1).toLowerCase();
 

From 80eb8ad38df5d7c9a0c6fce9b940bed7cf7c928a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 10 Jun 2019 20:07:45 -0600
Subject: [PATCH 0843/1013] Add latency est., activity level indicators, etc.

---
 core/mrc.js | 67 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 8832d103..b8d752ee 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -82,17 +82,19 @@ exports.getModule = class mrcModule extends MenuModule {
             room: '',
             room_topic: '',
             nicks: [],
-            last_ping: 0
+            lastSentMsg : {},   //  used for latency est.
         };
 
         this.customFormatObj = {
-            roomName        : '',
-            roomTopic       : '',
-            roomUserCount   : 0,
-            userCount       : 0,
-            boardCount      : 0,
-            roomCount       : 0,
-            //latencyMs       : 0,
+            roomName                : '',
+            roomTopic               : '',
+            roomUserCount           : 0,
+            userCount               : 0,
+            boardCount              : 0,
+            roomCount               : 0,
+            //latencyMs             : 0,
+            activityLevel           : 0,
+            activityLevelIndicator  : ' ',
         };
 
         this.menuMethods = {
@@ -298,16 +300,27 @@ exports.getModule = class mrcModule extends MenuModule {
                         break;
 
                     case 'STATS': {
-                        const stats = params[1].split(' ');
-                        this.setText(MciViewIds.mrcChat.mrcUsers, stats[2]);
-                        this.setText(MciViewIds.mrcChat.mrcBbses, stats[0]);
+                        const [
+                            boardCount,
+                            roomCount,
+                            userCount,
+                            activityLevel
+                        ] = params[1].split(' ').map(v => parseInt(v));
+
+                        const activityLevelIndicator = this.getActivityLevelIndicator(activityLevel);
+
+                        Object.assign(
+                            this.customFormatObj,
+                            {
+                                boardCount, roomCount, userCount,
+                                activityLevel, activityLevelIndicator
+                            }
+                        );
+
+                        this.setText(MciViewIds.mrcChat.mrcUsers, userCount);
+                        this.setText(MciViewIds.mrcChat.mrcBbses, boardCount);
 
-                        this.customFormatObj.boardCount = parseInt(stats[0]);
-                        this.customFormatObj.roomCount  = parseInt(stats[1]);
-                        this.customFormatObj.userCount  = parseInt(stats[2]);
                         this.updateCustomViews();
-
-                        this.state.last_ping = stats[1];
                         break;
                     }
 
@@ -317,6 +330,12 @@ exports.getModule = class mrcModule extends MenuModule {
                 }
 
             } else {
+                if(message.body === this.state.lastSentMsg.msg) {
+                    this.customFormatObj.latencyMs =
+                        moment.duration(moment().diff(this.state.lastSentMsg.time)).asMilliseconds();
+                    delete this.state.lastSentMsg.msg;
+                }
+
                 if (message.to_room == this.state.room) {
                     // if we're here then we want to show it to the user
                     const currentTime = moment().format(this.client.currentTheme.helpers.getTimeFormat());
@@ -328,6 +347,14 @@ exports.getModule = class mrcModule extends MenuModule {
         });
     }
 
+    getActivityLevelIndicator(level) {
+        let indicators = this.config.activityLevelIndicators;
+        if(!Array.isArray(indicators) || indicators.length < level + 1) {
+            indicators = [ ' ', 'â–‘', 'â–’', 'â–“' ];
+        }
+        return indicators[level].charAt(0);
+    }
+
     setText(mciId, text) {
         return this.setViewText('mrcChat', mciId, text);
     }
@@ -378,6 +405,10 @@ exports.getModule = class mrcModule extends MenuModule {
             }
 
             try {
+                this.state.lastSentMsg = {
+                    msg     : formattedMessage,
+                    time    : moment(),
+                };
                 this.sendMessageToMultiplexer(to_user || '', '', this.state.room, formattedMessage);
             } catch(e) {
                 this.client.log.warn( { error : e.message }, 'MRC error');
@@ -397,6 +428,7 @@ exports.getModule = class mrcModule extends MenuModule {
             case 'pm':
                 this.processOutgoingMessage(cmd[2], cmd[1]);
                 break;
+
             case 'rainbow': {
                 // this is brutal, but i love it
                 const line = message.replace(/^\/rainbow\s/, '').split(' ').reduce(function (a, c) {
@@ -408,6 +440,7 @@ exports.getModule = class mrcModule extends MenuModule {
                 this.processOutgoingMessage(line);
                 break;
             }
+
             case 'l33t':
                 this.processOutgoingMessage(StringUtil.stylizeString(message.substr(6), 'l33t'));
                 break;
@@ -418,6 +451,7 @@ exports.getModule = class mrcModule extends MenuModule {
                 this.processOutgoingMessage(StringUtil.stylizeString(message.substr(6), mode));
                 break;
             }
+
             case 'whoon':
                 this.sendServerMessage('WHOON');
                 break;
@@ -471,6 +505,7 @@ exports.getModule = class mrcModule extends MenuModule {
         }
 
         // just do something to get the cursor back to the right place ¯\_(ツ)_/¯
+        //  :TODO: fix me!
         this.sendServerMessage('STATS');
     }
 

From d6af9a1caafc6a089a7b642912e1b9617499e91e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 10 Jun 2019 20:12:17 -0600
Subject: [PATCH 0844/1013] Minor

---
 core/mrc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index b8d752ee..754e2728 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -92,7 +92,7 @@ exports.getModule = class mrcModule extends MenuModule {
             userCount               : 0,
             boardCount              : 0,
             roomCount               : 0,
-            //latencyMs             : 0,
+            latencyMs               : 0,
             activityLevel           : 0,
             activityLevelIndicator  : ' ',
         };
@@ -352,7 +352,7 @@ exports.getModule = class mrcModule extends MenuModule {
         if(!Array.isArray(indicators) || indicators.length < level + 1) {
             indicators = [ ' ', 'â–‘', 'â–’', 'â–“' ];
         }
-        return indicators[level].charAt(0);
+        return indicators[level];
     }
 
     setText(mciId, text) {

From 4158b07ad06a5c0719bbc681e6369ecb4346c51f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Jun 2019 18:25:24 -0600
Subject: [PATCH 0845/1013] Better naming, start on temp tokens table, etc.

---
 core/abracadabra.js         |   2 +-
 core/database.js            |  16 +++++
 core/user_2fa_otp_config.js | 119 ++++++++++++++++++++++++++++++------
 core/user_property.js       |   1 +
 4 files changed, 119 insertions(+), 19 deletions(-)

diff --git a/core/abracadabra.js b/core/abracadabra.js
index 9ac4dec7..83aa376b 100644
--- a/core/abracadabra.js
+++ b/core/abracadabra.js
@@ -79,7 +79,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
 
     /*
         :TODO:
-        * disconnecting wile door is open leaves dosemu
+        * disconnecting while door is open leaves dosemu
         * http://bbslink.net/sysop.php support
         * Font support ala all other menus... or does this just work?
     */
diff --git a/core/database.js b/core/database.js
index 91f56a04..b3778833 100644
--- a/core/database.js
+++ b/core/database.js
@@ -203,6 +203,22 @@ const DB_INIT_TABLE = {
             );`
         );
 
+        //
+        //  Table for temporary tokens, generally used for e.g. 'outside'
+        //  access such as email links.
+        //  Examples: PW reset, enabling of 2FA/OTP, etc.
+        //
+        dbs.user.run(
+            `CREATE TABLE IF NOT EXISTS user_temporary_token (
+                user_id             INTEGER NOT NULL,
+                token               VARCHAR NOT NULL,
+                timestamp           DATETIME NOT NULL,
+                purpose             VARCHAR NOT NULL,
+                UNIQUE(user_id, token),
+                FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
+            );`
+        );
+
         return cb(null);
     },
 
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index a47e0e6d..851e197e 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -9,11 +9,16 @@ const {
     otpFromType,
     createQRCode,
 }                           = require('./user_2fa_otp.js');
+const { Errors }            = require('./enig_error.js');
+const { sendMail }          = require('./email.js');
+const { getServer }         = require('./listening_server.js');
+const WebServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
 
 //  deps
 const async             = require('async');
 const _                 = require('lodash');
 const iconv             = require('iconv-lite');
+const crypto            = require('crypto');
 
 exports.moduleInfo = {
     name        : 'User 2FA/OTP Configuration',
@@ -26,10 +31,10 @@ const FormIds = {
 };
 
 const MciViewIds = {
-    enableToggle        : 1,
-    typeSelection       : 2,
-    submission          : 3,
-    infoText            : 4,
+    enableToggle    : 1,
+    otpType        : 2,
+    submit          : 3,
+    infoText        : 4,
 
     customRangeStart    : 10,   //  10+ = customs
 };
@@ -53,10 +58,22 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
             },
             showBackupCodes : (formData, extraArgs, cb) => {
                 return this.showBackupCodes(cb);
+            },
+            saveChanges : (formData, extraArgs, cb) => {
+                return this.saveChanges(formData, cb);
             }
         };
     }
 
+    initSequence() {
+        this.webServer = getServer(WebServerPackageName);
+        if(!this.webServer || !this.webServer.instance.isEnabled()) {
+            this.client.log.warn('User 2FA/OTP configuration requires the web server to be enabled!');
+            return this.prevMenu( () => { /* dummy */ } );
+        }
+        return super.initSequence();
+    }
+
     mciReady(mciData, cb) {
         super.mciReady(mciData, err => {
             if(err) {
@@ -71,8 +88,8 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                     (callback) => {
                         const requiredCodes = [
                             MciViewIds.enableToggle,
-                            MciViewIds.typeSelection,
-                            MciViewIds.submission,
+                            MciViewIds.otpType,
+                            MciViewIds.submit,
                         ];
                         return this.validateMCIByViewIds('menu', requiredCodes, callback);
                     },
@@ -86,19 +103,19 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                             return this.enableToggleUpdate(idx);
                         });
 
-                        const typeSelectionView = this.getView('menu', MciViewIds.typeSelection);
-                        initialIndex = this.typeSelectionIndexFromUserOTPType();
-                        typeSelectionView.setFocusItemIndex(initialIndex);
+                        const otpTypeView = this.getView('menu', MciViewIds.otpType);
+                        initialIndex = this.otpTypeIndexFromUserOTPType();
+                        otpTypeView.setFocusItemIndex(initialIndex);
 
-                        typeSelectionView.on('index update', idx => {
-                            return this.typeSelectionUpdate(idx);
+                        otpTypeView.on('index update', idx => {
+                            return this.otpTypeUpdate(idx);
                         });
 
                         this.viewControllers.menu.on('return', view => {
                             if(view === enableToggleView) {
                                 return this.enableToggleUpdate(enableToggleView.focusedItemIndex);
-                            } else if (view === typeSelectionView) {
-                                return this.typeSelectionUpdate(typeSelectionView.focusedItemIndex);
+                            } else if (view === otpTypeView) {
+                                return this.otpTypeUpdate(otpTypeView.focusedItemIndex);
                             }
                         });
 
@@ -169,8 +186,74 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         return this.displayDetails(info, cb);
     }
 
+    saveChanges(formData, cb) {
+        const enabled = 1 === _.get(formData, 'value.enableToggle', 0);
+        return enabled ? this.saveChangesEnable(formData, cb) : this.saveChangesDisable(cb);
+    }
+
+    saveChangesEnable(formData, cb) {
+        const otpTypeProp = this.otpTypeFromOTPTypeIndex(_.get(formData, 'value.otpType'));
+
+        //  sanity check
+        if(!otpFromType(otpTypeProp)) {
+            return cb(Errors.Invalid('Cannot convert selected index to valid OTP type'));
+        }
+
+        async.waterfall(
+            [
+                (callback) => {
+                    return this.removeUserOTPProperties(callback);
+                },
+                (callback) => {
+                    return crypto.randomBytes(256, callback);
+                },
+                (token, callback) => {
+                    //  :TODO: consider temporary tokens table - this has become semi-common
+                    //  token | timestamp | token_type |
+                    //  abc   | ISO       | '2fa_otp_register'
+                    token = token.toString('hex');
+                    this.client.user.persistProperty(UserProps.AuthFactor2OTPEnableToken, token, err => {
+                        return callback(err, token);
+                    });
+                },
+                (token, callback) => {
+                    const resetUrl = this.webServer.instance.buildUrl(
+                        `/enable_2fa_otp?token=&otpType=${otpTypeProp}&token=${token}`
+                    );
+
+                    //  clear any existing (e.g. same as disable) -> send activation email
+
+                    return callback(null);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    removeUserOTPProperties(cb) {
+        const props = [
+            UserProps.AuthFactor2OTP,
+            UserProps.AuthFactor2OTPSecret,
+            UserProps.AuthFactor2OTPBackupCodes,
+        ];
+        return this.client.user.removeProperties(props, cb);
+    }
+
+    saveChangesDisable(cb) {
+        this.removeUserOTPProperties( err => {
+            if(err) {
+                return cb(err);
+            }
+
+            //  :TODO: show "saved+disabled" art/message -> prevMenu
+            return cb(null);
+        });
+    }
+
     isOTPEnabledForUser() {
-        return this.typeSelectionIndexFromUserOTPType(-1) != -1;
+        return this.otpTypeIndexFromUserOTPType(-1) != -1;
     }
 
     getInfoText(key) {
@@ -185,7 +268,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
     }
 
-    typeSelectionIndexFromUserOTPType(defaultIndex = 0) {
+    otpTypeIndexFromUserOTPType(defaultIndex = 0) {
         const type = this.client.user.getProperty(UserProps.AuthFactor2OTP);
         return {
             [ OTPTypes.RFC6238_TOTP ]           : 0,
@@ -194,7 +277,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         }[type] || defaultIndex;
     }
 
-    otpTypeFromTypeSelectionIndex(idx) {
+    otpTypeFromOTPTypeIndex(idx) {
         return {
             0 : OTPTypes.RFC6238_TOTP,
             1 : OTPTypes.RFC4266_HOTP,
@@ -202,8 +285,8 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         }[idx];
     }
 
-    typeSelectionUpdate(idx) {
-        const key = this.otpTypeFromTypeSelectionIndex(idx);
+    otpTypeUpdate(idx) {
+        const key = this.otpTypeFromOTPTypeIndex(idx);
         this.updateCustomViewTextsWithFilter('menu', MciViewIds.customRangeStart, { infoText : this.getInfoText(key) } );
     }
 };
diff --git a/core/user_property.js b/core/user_property.js
index 88ac11b1..8d7ca91c 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -63,5 +63,6 @@ module.exports = {
     AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA. See OTPTypes
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
     AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes
+    AuthFactor2OTPEnableToken       : 'auth_factor2_otp_enable_token',
 };
 

From 18eecb6223154e1a40cb04fe227210207f06b665 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Jun 2019 19:54:57 -0600
Subject: [PATCH 0846/1013] Fix user_temporary_token table

---
 core/database.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/database.js b/core/database.js
index b3778833..e0e58168 100644
--- a/core/database.js
+++ b/core/database.js
@@ -212,9 +212,9 @@ const DB_INIT_TABLE = {
             `CREATE TABLE IF NOT EXISTS user_temporary_token (
                 user_id             INTEGER NOT NULL,
                 token               VARCHAR NOT NULL,
+                token_type          VARCHAR NOT NULL,
                 timestamp           DATETIME NOT NULL,
-                purpose             VARCHAR NOT NULL,
-                UNIQUE(user_id, token),
+                UNIQUE(user_id, token_type),
                 FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE
             );`
         );

From fa3e3e58021e878ae70e05a59cbd0cf280ef9467 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 11 Jun 2019 21:20:34 -0600
Subject: [PATCH 0847/1013] Introduce new user_temporary_token & use for token
 storage of 2FA/OTP registration

---
 core/config.js              |   5 ++
 core/user_2fa_otp_config.js |  69 ++++++++++++++----
 core/user_property.js       |   1 -
 core/user_temp_token.js     | 140 ++++++++++++++++++++++++++++++++++++
 core/web_password_reset.js  |   2 +-
 5 files changed, 203 insertions(+), 14 deletions(-)
 create mode 100644 core/user_temp_token.js

diff --git a/core/config.js b/core/config.js
index 0bb82838..ee6ac90d 100644
--- a/core/config.js
+++ b/core/config.js
@@ -233,6 +233,11 @@ function getDefaultConfig() {
 
             twoFactorAuth : {
                 method : 'googleAuth',
+
+                otp : {
+                    registerEmailText   : paths.join(__dirname, '../misc/otp_register_email.template.txt'),
+                    registerEmailHtml   : paths.join(__dirname, '../misc/otp_register_email.template.html')
+                }
             }
         },
 
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index 851e197e..b95f2b75 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -13,12 +13,17 @@ const { Errors }            = require('./enig_error.js');
 const { sendMail }          = require('./email.js');
 const { getServer }         = require('./listening_server.js');
 const WebServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
+const {
+    createToken,
+    WellKnownTokenTypes,
+}                           = require('./user_temp_token.js');
+const Config                = require('./config.js').get;
 
 //  deps
 const async             = require('async');
 const _                 = require('lodash');
 const iconv             = require('iconv-lite');
-const crypto            = require('crypto');
+const fs                = require('fs-extra');
 
 exports.moduleInfo = {
     name        : 'User 2FA/OTP Configuration',
@@ -44,6 +49,17 @@ const DefaultMsg = {
     noBackupCodes   : 'No backup codes remaining or set.',
 };
 
+const DefaultEmailTextTemplate =
+    `%USERNAME%:
+You have requested to enable 2-Factor Authentication via One-Time-Password
+for your account on %BOARDNAME%.
+
+    * If this was not you, please ignore this email and change your password.
+    * Otherwise, please follow the link below:
+
+    %REGISTER_URL%
+`;
+
 exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     constructor(options) {
         super(options);
@@ -205,25 +221,54 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                     return this.removeUserOTPProperties(callback);
                 },
                 (callback) => {
-                    return crypto.randomBytes(256, callback);
+                    return createToken(this.client.user.userId, WellKnownTokenTypes.AuthFactor2OTPRegister, callback);
                 },
                 (token, callback) => {
-                    //  :TODO: consider temporary tokens table - this has become semi-common
-                    //  token | timestamp | token_type |
-                    //  abc   | ISO       | '2fa_otp_register'
-                    token = token.toString('hex');
-                    this.client.user.persistProperty(UserProps.AuthFactor2OTPEnableToken, token, err => {
-                        return callback(err, token);
+                    const config = Config();
+                    const txtTemplateFile   = _.get(config, 'users.twoFactorAuth.otp.registerEmailText');
+                    const htmlTemplateFile  = _.get(config, 'users.twoFactorAuth.otp.registerEmailHtml');
+
+                    fs.readFile(txtTemplateFile, 'utf8', (err, textTemplate) => {
+                        textTemplate = textTemplate || DefaultEmailTextTemplate;
+                        fs.readFile(htmlTemplateFile, 'utf8', (err, htmlTemplate) => {
+                            htmlTemplate = htmlTemplate || null;    //  be explicit for waterfall
+                            return callback(null, token, textTemplate, htmlTemplate);
+                        });
                     });
                 },
-                (token, callback) => {
-                    const resetUrl = this.webServer.instance.buildUrl(
+                (token, textTemplate, htmlTemplate, callback) => {
+                    const registerUrl = this.webServer.instance.buildUrl(
                         `/enable_2fa_otp?token=&otpType=${otpTypeProp}&token=${token}`
                     );
 
-                    //  clear any existing (e.g. same as disable) -> send activation email
+                    const user = this.client.user;
 
-                    return callback(null);
+                    const replaceTokens = (s) => {
+                        return s
+                            .replace(/%BOARDNAME%/g,    Config().general.boardName)
+                            .replace(/%USERNAME%/g,     user.username)
+                            .replace(/%TOKEN%/g,        token)
+                            .replace(/%REGISTER_URL%/g, registerUrl)
+                        ;
+                    };
+
+                    textTemplate = replaceTokens(textTemplate);
+                    if(htmlTemplate) {
+                        htmlTemplate = replaceTokens(htmlTemplate);
+                    }
+
+                    const message = {
+                        to      : `${user.getProperty(UserProps.RealName) || user.username} <${user.getProperty(UserProps.EmailAddress)}>`,
+                        //  from will be filled in
+                        subject : '2-Factor Authentication Registration',
+                        text    : textTemplate,
+                        html    : htmlTemplate,
+                    };
+
+                    sendMail(message, (err, info) => {
+                        //  :TODO: Log info!
+                        return callback(err);
+                    });
                 }
             ],
             err => {
diff --git a/core/user_property.js b/core/user_property.js
index 8d7ca91c..88ac11b1 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -63,6 +63,5 @@ module.exports = {
     AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA. See OTPTypes
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
     AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes
-    AuthFactor2OTPEnableToken       : 'auth_factor2_otp_enable_token',
 };
 
diff --git a/core/user_temp_token.js b/core/user_temp_token.js
new file mode 100644
index 00000000..76ca3438
--- /dev/null
+++ b/core/user_temp_token.js
@@ -0,0 +1,140 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const UserDb                = require('./database.js').dbs.user;
+const {
+    getISOTimestampString
+}                           = require('./database.js');
+const { Errors }            = require('./enig_error.js');
+const User                  = require('./user.js');
+const Log                   = require('./logger.js').log;
+
+//  deps
+const crypto                = require('crypto');
+const async                 = require('async');
+const moment                = require('moment');
+
+exports.createToken                     = createToken;
+exports.deleteToken                     = deleteToken;
+exports.deleteTokenByUserAndType        = deleteTokenByUserAndType;
+exports.getTokenInfo                    = getTokenInfo;
+exports.temporaryTokenMaintenanceTask   = temporaryTokenMaintenanceTask;
+
+exports.WellKnownTokenTypes = {
+    AuthFactor2OTPRegister    : 'auth_factor2_otp_register',
+};
+
+function createToken(userId, tokenType, cb) {
+    async.waterfall(
+        [
+            (callback) => {
+                return crypto.randomBytes(256, callback);
+            },
+            (token, callback) => {
+                token = token.toString('hex');
+
+                UserDb.run(
+                    `INSERT INTO user_temporary_token (user_id, token, token_type, timestamp)
+                    VALUES (?, ?, ?, ?);`,
+                    [ userId, token, tokenType, getISOTimestampString() ],
+                    err => {
+                        return callback(err, token);
+                    }
+                );
+            }
+        ],
+        (err, token) => {
+            return cb(err, token);
+        }
+    );
+}
+
+function deleteToken(token, cb) {
+    UserDb.run(
+        `DELETE FROM user_temporary_token
+        WHERE token = ?;`,
+        [ token ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function deleteTokenByUserAndType(userId, tokenType, cb) {
+    UserDb.run(
+        `DELETE FROM user_temporary_token
+        WHERE user_id = ? AND token_type = ?;`,
+        [ userId, tokenType ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
+function getTokenInfo(token, cb) {
+    async.waterfall(
+        [
+            (callback) => {
+                UserDb.get(
+                    `SELECT user_id, token_type, timestamp
+                    FROM user_temporary_token
+                    WHERE token = ?;`,
+                    [ token ],
+                    (err, row) => {
+                        if(err) {
+                            return callback(err);
+                        }
+
+                        if(!row) {
+                            return callback(Errors.DoesNotExist('No entry found for token'));
+                        }
+
+                        const info = {
+                            userId      : row.user_id,
+                            tokenType   : row.token_type,
+                            timestamp   : moment(row.timestamp),
+                        };
+                        return callback(null, info);
+                    }
+                );
+            },
+            (info, callback) => {
+                User.getUser(info.userId, (err, user) => {
+                    info.user = user;
+                    return callback(err, info);
+                });
+            }
+        ],
+        (err, info) => {
+            return cb(err, info);
+        }
+    );
+}
+
+function temporaryTokenMaintenanceTask(args, cb) {
+    const tokenType = args[0];
+
+    if(!tokenType) {
+        return Log.error('Cannot run temporary token maintenance task with out specifying "tokenType" as argument 0');
+    }
+
+    const expTime = args[1] || '24 hours';
+
+    UserDb.run(
+        `DELETE FROM user_temporary_token
+        WHERE token IN (
+            SELECT token
+            FROM user_temporary_token
+            WHERE token_type = ?
+            AND DATETIME("now") >= DATETIME(timestamp, "+${expTime}")
+        );`,
+        [ tokenType ],
+        err => {
+            if(err) {
+                Log.warn( { error : err.message, tokenType }, 'Failed deleting user temporary token');
+            }
+            return cb(err);
+        }
+    );
+}
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 90c5f57c..6fbb65b9 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -22,7 +22,7 @@ const _                     = require('lodash');
 
 const PW_RESET_EMAIL_TEXT_TEMPLATE_DEFAULT =
     `%USERNAME%:
-a password reset has been requested for your account on %BOARDNAME%.
+A password reset has been requested for your account on %BOARDNAME%.
     
     * If this was not you, please ignore this email.
     * Otherwise, follow this link: %RESET_URL%

From 3efea3de9a5071c0fe8e4202a9b152d6b2df0e20 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 12 Jun 2019 21:57:45 -0600
Subject: [PATCH 0848/1013] Work on 2FA/OTP email system * Web
 routes/handler/etc. mostly functional * Can now enable -> follow link ->
 submit -> capture form * Clean up code

---
 core/bbs.js                       |   4 +
 core/config.js                    |   5 +-
 core/email.js                     |   2 +-
 core/user_2fa_otp_config.js       |  86 ++----------
 core/user_2fa_otp_web_register.js | 216 ++++++++++++++++++++++++++++++
 core/user_temp_token.js           |   6 +-
 core/web_password_reset.js        |   2 +-
 www/otp_register.template.html    |  37 +++++
 8 files changed, 273 insertions(+), 85 deletions(-)
 create mode 100644 core/user_2fa_otp_web_register.js
 create mode 100644 www/otp_register.template.html

diff --git a/core/bbs.js b/core/bbs.js
index 4d371fb3..98ba1b7a 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -306,6 +306,10 @@ function initialize(cb) {
                 const WebPasswordReset = require('./web_password_reset.js').WebPasswordReset;
                 return WebPasswordReset.startup(callback);
             },
+            function ready2FA_OTPRegister(callback) {
+                const User2FA_OTPWebRegister = require('./user_2fa_otp_web_register.js');
+                return User2FA_OTPWebRegister.startup(callback);
+            },
             function readyEventScheduler(callback) {
                 const EventSchedulerModule = require('./event_scheduler.js').EventSchedulerModule;
                 EventSchedulerModule.loadAndStart( (err, modInst) => {
diff --git a/core/config.js b/core/config.js
index ee6ac90d..47868fa0 100644
--- a/core/config.js
+++ b/core/config.js
@@ -235,8 +235,9 @@ function getDefaultConfig() {
                 method : 'googleAuth',
 
                 otp : {
-                    registerEmailText   : paths.join(__dirname, '../misc/otp_register_email.template.txt'),
-                    registerEmailHtml   : paths.join(__dirname, '../misc/otp_register_email.template.html')
+                    registerEmailText       : paths.join(__dirname, '../misc/otp_register_email.template.txt'),
+                    registerEmailHtml       : paths.join(__dirname, '../misc/otp_register_email.template.html'),
+                    registerPageTemplate    : paths.join(__dirname, '../www/otp_register.template.html'),
                 }
             }
         },
diff --git a/core/email.js b/core/email.js
index 1de3b034..4a41106a 100644
--- a/core/email.js
+++ b/core/email.js
@@ -15,7 +15,7 @@ exports.sendMail            = sendMail;
 function sendMail(message, cb) {
     const config = Config();
     if(!_.has(config, 'email.transport')) {
-        return cb(Errors.MissingConfig('Email "email::transport" configuration missing'));
+        return cb(Errors.MissingConfig('Email "email.transport" configuration missing'));
     }
 
     message.from = message.from || config.email.defaultFrom;
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index b95f2b75..09a72a20 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -10,20 +10,15 @@ const {
     createQRCode,
 }                           = require('./user_2fa_otp.js');
 const { Errors }            = require('./enig_error.js');
-const { sendMail }          = require('./email.js');
 const { getServer }         = require('./listening_server.js');
 const WebServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
-const {
-    createToken,
-    WellKnownTokenTypes,
-}                           = require('./user_temp_token.js');
 const Config                = require('./config.js').get;
+const WebRegister           = require('./user_2fa_otp_web_register.js');
 
 //  deps
 const async             = require('async');
 const _                 = require('lodash');
 const iconv             = require('iconv-lite');
-const fs                = require('fs-extra');
 
 exports.moduleInfo = {
     name        : 'User 2FA/OTP Configuration',
@@ -49,17 +44,6 @@ const DefaultMsg = {
     noBackupCodes   : 'No backup codes remaining or set.',
 };
 
-const DefaultEmailTextTemplate =
-    `%USERNAME%:
-You have requested to enable 2-Factor Authentication via One-Time-Password
-for your account on %BOARDNAME%.
-
-    * If this was not you, please ignore this email and change your password.
-    * Otherwise, please follow the link below:
-
-    %REGISTER_URL%
-`;
-
 exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     constructor(options) {
         super(options);
@@ -82,8 +66,8 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     }
 
     initSequence() {
-        this.webServer = getServer(WebServerPackageName);
-        if(!this.webServer || !this.webServer.instance.isEnabled()) {
+        const webServer = getServer(WebServerPackageName);
+        if(!webServer || !webServer.instance.isEnabled()) {
             this.client.log.warn('User 2FA/OTP configuration requires the web server to be enabled!');
             return this.prevMenu( () => { /* dummy */ } );
         }
@@ -215,66 +199,12 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
             return cb(Errors.Invalid('Cannot convert selected index to valid OTP type'));
         }
 
-        async.waterfall(
-            [
-                (callback) => {
-                    return this.removeUserOTPProperties(callback);
-                },
-                (callback) => {
-                    return createToken(this.client.user.userId, WellKnownTokenTypes.AuthFactor2OTPRegister, callback);
-                },
-                (token, callback) => {
-                    const config = Config();
-                    const txtTemplateFile   = _.get(config, 'users.twoFactorAuth.otp.registerEmailText');
-                    const htmlTemplateFile  = _.get(config, 'users.twoFactorAuth.otp.registerEmailHtml');
-
-                    fs.readFile(txtTemplateFile, 'utf8', (err, textTemplate) => {
-                        textTemplate = textTemplate || DefaultEmailTextTemplate;
-                        fs.readFile(htmlTemplateFile, 'utf8', (err, htmlTemplate) => {
-                            htmlTemplate = htmlTemplate || null;    //  be explicit for waterfall
-                            return callback(null, token, textTemplate, htmlTemplate);
-                        });
-                    });
-                },
-                (token, textTemplate, htmlTemplate, callback) => {
-                    const registerUrl = this.webServer.instance.buildUrl(
-                        `/enable_2fa_otp?token=&otpType=${otpTypeProp}&token=${token}`
-                    );
-
-                    const user = this.client.user;
-
-                    const replaceTokens = (s) => {
-                        return s
-                            .replace(/%BOARDNAME%/g,    Config().general.boardName)
-                            .replace(/%USERNAME%/g,     user.username)
-                            .replace(/%TOKEN%/g,        token)
-                            .replace(/%REGISTER_URL%/g, registerUrl)
-                        ;
-                    };
-
-                    textTemplate = replaceTokens(textTemplate);
-                    if(htmlTemplate) {
-                        htmlTemplate = replaceTokens(htmlTemplate);
-                    }
-
-                    const message = {
-                        to      : `${user.getProperty(UserProps.RealName) || user.username} <${user.getProperty(UserProps.EmailAddress)}>`,
-                        //  from will be filled in
-                        subject : '2-Factor Authentication Registration',
-                        text    : textTemplate,
-                        html    : htmlTemplate,
-                    };
-
-                    sendMail(message, (err, info) => {
-                        //  :TODO: Log info!
-                        return callback(err);
-                    });
-                }
-            ],
-            err => {
+        this.removeUserOTPProperties(err => {
+            if(err) {
                 return cb(err);
             }
-        );
+            return WebRegister.sendRegisterEmail(this.client.user, otpTypeProp, cb);
+        });
     }
 
     removeUserOTPProperties(cb) {
@@ -287,7 +217,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     }
 
     saveChangesDisable(cb) {
-        this.removeUserOTPProperties( err => {
+        this.removeUserOTPProperties(this.client.user, err => {
             if(err) {
                 return cb(err);
             }
diff --git a/core/user_2fa_otp_web_register.js b/core/user_2fa_otp_web_register.js
new file mode 100644
index 00000000..840a5dd3
--- /dev/null
+++ b/core/user_2fa_otp_web_register.js
@@ -0,0 +1,216 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const Config                = require('./config.js').get;
+const Errors                = require('./enig_error.js').Errors;
+const getServer             = require('./listening_server.js').getServer;
+const webServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
+const {
+    createToken,
+    getTokenInfo,
+    WellKnownTokenTypes,
+}                           = require('./user_temp_token.js');
+const { sendMail }          = require('./email.js');
+const UserProps             = require('./user_property.js');
+const Log                   = require('./logger.js').log;
+
+//  deps
+const async                 = require('async');
+const fs                    = require('fs-extra');
+const _                     = require('lodash');
+const url                   = require('url');
+const querystring           = require('querystring');
+
+function getWebServer() {
+    return getServer(webServerPackageName);
+}
+
+const DefaultEmailTextTemplate =
+    `%USERNAME%:
+You have requested to enable 2-Factor Authentication via One-Time-Password
+for your account on %BOARDNAME%.
+
+    * If this was not you, please ignore this email and change your password.
+    * Otherwise, please follow the link below:
+
+    %REGISTER_URL%
+`;
+
+module.exports = class User2FA_OTPWebRegister
+{
+    static startup(cb) {
+        return User2FA_OTPWebRegister.registerRoutes(cb);
+    }
+
+    static sendRegisterEmail(user, otpType, cb) {
+        async.waterfall(
+            [
+                (callback) => {
+                    return createToken(
+                        user.userId,
+                        WellKnownTokenTypes.AuthFactor2OTPRegister,
+                        { bits : 128 },
+                        callback
+                    );
+                },
+                (token, callback) => {
+                    const config = Config();
+                    const txtTemplateFile   = _.get(config, 'users.twoFactorAuth.otp.registerEmailText');
+                    const htmlTemplateFile  = _.get(config, 'users.twoFactorAuth.otp.registerEmailHtml');
+
+                    fs.readFile(txtTemplateFile, 'utf8', (err, textTemplate) => {
+                        textTemplate = textTemplate || DefaultEmailTextTemplate;
+                        fs.readFile(htmlTemplateFile, 'utf8', (err, htmlTemplate) => {
+                            htmlTemplate = htmlTemplate || null;    //  be explicit for waterfall
+                            return callback(null, token, textTemplate, htmlTemplate);
+                        });
+                    });
+                },
+                (token, textTemplate, htmlTemplate, callback) => {
+                    const webServer = getWebServer();
+                    const registerUrl = webServer.instance.buildUrl(
+                        `/enable_2fa_otp?token=&otpType=${otpType}&token=${token}`
+                    );
+
+                    const replaceTokens = (s) => {
+                        return s
+                            .replace(/%BOARDNAME%/g,    Config().general.boardName)
+                            .replace(/%USERNAME%/g,     user.username)
+                            .replace(/%TOKEN%/g,        token)
+                            .replace(/%REGISTER_URL%/g, registerUrl)
+                        ;
+                    };
+
+                    textTemplate = replaceTokens(textTemplate);
+                    if(htmlTemplate) {
+                        htmlTemplate = replaceTokens(htmlTemplate);
+                    }
+
+                    const message = {
+                        to      : `${user.getProperty(UserProps.RealName) || user.username} <${user.getProperty(UserProps.EmailAddress)}>`,
+                        //  from will be filled in
+                        subject : '2-Factor Authentication Registration',
+                        text    : textTemplate,
+                        html    : htmlTemplate,
+                    };
+
+                    sendMail(message, (err, info) => {
+                        if(err) {
+                            Log.warn({ error : err.message }, 'Failed sending 2FA/OTP register email');
+                        } else {
+                            Log.info( { info }, 'Successfully sent 2FA/OTP register email');
+                        }
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    static fileNotFound(webServer, resp) {
+        return webServer.instance.fileNotFound(resp);
+    }
+
+    static accessDenied(webServer, resp) {
+        return webServer.instance.accessDenied(resp);
+    }
+
+    static routeRegisterGet(req, resp) {
+        const webServer = getWebServer();   //  must be valid, we just got a req!
+
+        const urlParts  = url.parse(req.url, true);
+        const token     = urlParts.query && urlParts.query.token;
+        const otpType   = urlParts.query && urlParts.query.otpType;
+
+        if(!token || !otpType) {
+            return User2FA_OTPWebRegister.accessDenied(webServer, resp);
+        }
+
+        getTokenInfo(token, (err, tokenInfo) => {
+            if(err) {
+                //  assume expired
+                return webServer.instance.respondWithError(resp, 410, 'Invalid or expired registration link.', 'Expired Link');
+            }
+
+            if(tokenInfo.tokenType !== 'auth_factor2_otp_register') {
+                return User2FA_OTPWebRegister.accessDenied(webServer, resp);
+            }
+
+            const qrImg = '';   //  :TODO: fix me
+            const secret = '';
+            const backupCodes = '';
+
+            const postUrl = webServer.instance.buildUrl('/enable_2fa_otp');
+            const config = Config();
+            return webServer.instance.routeTemplateFilePage(
+                _.get(config, 'users.twoFactorAuth.otp.registerPageTemplate'),
+                (templateData, next) => {
+                    const finalPage = templateData
+                        .replace(/%BOARDNAME%/g,    config.general.boardName)
+                        .replace(/%USERNAME%/g,     tokenInfo.user.username)
+                        .replace(/%TOKEN%/g,        token)
+                        .replace(/%OTP_TYPE%/g,     otpType)
+                        .replace(/%POST_URL%/g,     postUrl)
+                        .replace(/%QR_IMG%/g,       qrImg)
+                        .replace(/%SECRET%/g,       secret)
+                        .replace(/%BACKUP_CODES%/g, backupCodes)
+                    ;
+                    return next(null, finalPage);
+                },
+                resp
+            );
+        });
+    }
+
+    static routeRegisterPost(req, resp) {
+        const webServer = getWebServer();   //  must be valid, we just got a req!
+
+        const badRequest = () => {
+            return webServer.instance.respondWithError(resp, 400, 'Bad Request.', 'Bad Request');
+        };
+
+        let bodyData = '';
+        req.on('data', data => {
+            bodyData += data;
+        });
+
+        req.on('end', () => {
+            const formData = querystring.parse(bodyData);
+
+            const config = Config();
+            if(!formData.token || !formData.otpType || !formData.otp) {
+                return badRequest();
+            }
+        });
+
+        return webServer.instance.respondWithError(resp, 410, 'Invalid or expired registration link.', 'Expired Link');
+    }
+
+    static registerRoutes(cb) {
+        const webServer = getWebServer();
+        if(!webServer || !webServer.instance.isEnabled()) {
+            return cb(null);    //  no webserver enabled
+        }
+
+        [
+            {
+                method  : 'GET',
+                path    : '^\\/enable_2fa_otp\\?token\\=[a-f0-9]+&otpType\\=[a-zA-Z0-9]+$',
+                handler : User2FA_OTPWebRegister.routeRegisterGet,
+            },
+            {
+                method  : 'POST',
+                path    : '^\\/enable_2fa_otp$',
+                handler : User2FA_OTPWebRegister.routeRegisterPost,
+            }
+        ].forEach(r => {
+            webServer.instance.addRoute(r);
+        });
+
+        return cb(null);
+    }
+};
diff --git a/core/user_temp_token.js b/core/user_temp_token.js
index 76ca3438..89c060d6 100644
--- a/core/user_temp_token.js
+++ b/core/user_temp_token.js
@@ -25,17 +25,17 @@ exports.WellKnownTokenTypes = {
     AuthFactor2OTPRegister    : 'auth_factor2_otp_register',
 };
 
-function createToken(userId, tokenType, cb) {
+function createToken(userId, tokenType, options = { bits : 128 }, cb) {
     async.waterfall(
         [
             (callback) => {
-                return crypto.randomBytes(256, callback);
+                return crypto.randomBytes(options.bits, callback);
             },
             (token, callback) => {
                 token = token.toString('hex');
 
                 UserDb.run(
-                    `INSERT INTO user_temporary_token (user_id, token, token_type, timestamp)
+                    `INSERT OR REPLACE INTO user_temporary_token (user_id, token, token_type, timestamp)
                     VALUES (?, ?, ?, ?);`,
                     [ userId, token, tokenType, getISOTimestampString() ],
                     err => {
diff --git a/core/web_password_reset.js b/core/web_password_reset.js
index 6fbb65b9..89c3fd33 100644
--- a/core/web_password_reset.js
+++ b/core/web_password_reset.js
@@ -133,7 +133,7 @@ class WebPasswordReset {
                         if(err) {
                             Log.warn( { error : err.message }, 'Failed sending password reset email' );
                         } else {
-                            Log.debug( { info : info }, 'Successfully sent password reset email');
+                            Log.info( { info : info }, 'Successfully sent password reset email');
                         }
 
                         return callback(err);
diff --git a/www/otp_register.template.html b/www/otp_register.template.html
new file mode 100644
index 00000000..a743928b
--- /dev/null
+++ b/www/otp_register.template.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+        <title>Enable 2FA/OTP — ENiGMA½ BBS</title>
+        <meta name="description" content="Enable 2-Factor Authentication via One-Time-Password">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<script>
+			window.onload = function() {
+				//document.getElementById('password').onchange			= validatePassword;
+				//document.getElementById('confirm_password').onchange	= validatePassword;
+			}
+
+            /*
+			function validatePassword() {
+				var pw 		= document.getElementById('password');
+				var confirm	= document.getElementById('confirm_password');
+
+				if(pw.value !== confirm.value) {
+					confirm.setCustomValidity('Passwords must match!');
+				} else {
+					confirm.setCustomValidity('');
+				}
+            }
+            */
+		</script>
+	</head>
+	<body>
+	<form action="%POST_URL%" method="post">        
+        <legend>Enable One-Time-Password</legend>
+        <input type="text" placeholder="One Time Password" id="otp" name="otp" required>
+        <input type="hidden" value="%TOKEN%" name="token">
+        <input type="hidden" value="%OTP_TYPE%" name="otpType">
+		<button type="submit">Confirm</button>
+	</form>
+	</body>
+</html>
\ No newline at end of file

From 94747cfe7e813fd31197a217034ec1ea188db218 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 13 Jun 2019 19:47:04 -0600
Subject: [PATCH 0849/1013] Good progress on 2FA/OTP config: Most of email
 register lifecycle complete

---
 core/oputil/oputil_user.js        |   3 +-
 core/user_2fa_otp.js              |  10 +--
 core/user_2fa_otp_web_register.js | 112 ++++++++++++++++++++++--------
 www/otp_register.template.html    |  42 +++++------
 4 files changed, 107 insertions(+), 60 deletions(-)

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 7b441875..78ea08ca 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -370,6 +370,7 @@ function twoFactorAuthOTP(user) {
     const {
         OTPTypes,
         prepareOTP,
+        createBackupCodes,
     } = require('../../core/user_2fa_otp.js');
 
     let otpType = argv._[argv._.length - 1];
@@ -414,7 +415,7 @@ function twoFactorAuthOTP(user) {
                     qrType      : argv['qr-type'] || 'ascii',
                 };
                 prepareOTP(otpType, otpOpts, (err, otpInfo) => {
-                    return callback(err, Object.assign(otpInfo, { otpType }));
+                    return callback(err, Object.assign(otpInfo, { otpType, backupCodes : createBackupCodes() }));
                 });
             },
             function storeOrDisplayQR(otpInfo, callback) {
diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index 0b53ad8b..6d5ae6e1 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -20,6 +20,7 @@ const crypto        = require('crypto');
 const qrGen         = require('qrcode-generator');
 
 exports.prepareOTP          = prepareOTP;
+exports.createBackupCodes   = createBackupCodes;
 exports.createQRCode        = createQRCode;
 exports.otpFromType         = otpFromType;
 exports.loginFactor2_OTP    = loginFactor2_OTP;
@@ -82,7 +83,7 @@ function generateOTPBackupCode() {
     return bits.join('-');
 }
 
-function generateNewBackupCodes() {
+function createBackupCodes() {
     const codes = [...Array(6)].map(() => generateOTPBackupCode());
     return codes;
 }
@@ -120,7 +121,7 @@ function createQRCode(otp, options, secret) {
             data    : qrCode.createDataURL,
             img     : qrCode.createImgTag,
             svg     : qrCode.createSvgTag,
-        }[options.qrType]();
+        }[options.qrType](options.cellSize);
     } catch(e) {
         return;
     }
@@ -141,10 +142,9 @@ function prepareOTP(otpType, options, cb) {
         otp.generateSecret() :
         crypto.randomBytes(64).toString('base64').substr(0, 32);
 
-    const backupCodes   = generateNewBackupCodes();
-    const qr            = createQRCode(otp, options, secret);
+    const qr = createQRCode(otp, options, secret);
 
-    return cb(null, { secret, backupCodes, qr } );
+    return cb(null, { secret, qr } );
 }
 
 function loginFactor2_OTP(client, token, cb) {
diff --git a/core/user_2fa_otp_web_register.js b/core/user_2fa_otp_web_register.js
index 840a5dd3..52ee96ad 100644
--- a/core/user_2fa_otp_web_register.js
+++ b/core/user_2fa_otp_web_register.js
@@ -11,6 +11,11 @@ const {
     getTokenInfo,
     WellKnownTokenTypes,
 }                           = require('./user_temp_token.js');
+const {
+    prepareOTP,
+    createBackupCodes,
+    otpFromType,
+}                           = require('./user_2fa_otp.js');
 const { sendMail }          = require('./email.js');
 const UserProps             = require('./user_property.js');
 const Log                   = require('./logger.js').log;
@@ -70,7 +75,7 @@ module.exports = class User2FA_OTPWebRegister
                 (token, textTemplate, htmlTemplate, callback) => {
                     const webServer = getWebServer();
                     const registerUrl = webServer.instance.buildUrl(
-                        `/enable_2fa_otp?token=&otpType=${otpType}&token=${token}`
+                        `/enable_2fa_otp?token=${token}&otpType=${otpType}`
                     );
 
                     const replaceTokens = (s) => {
@@ -133,36 +138,48 @@ module.exports = class User2FA_OTPWebRegister
         getTokenInfo(token, (err, tokenInfo) => {
             if(err) {
                 //  assume expired
-                return webServer.instance.respondWithError(resp, 410, 'Invalid or expired registration link.', 'Expired Link');
+                return webServer.instance.respondWithError(
+                    resp,
+                    410,
+                    'Invalid or expired registration link.', 'Expired Link'
+                );
             }
 
             if(tokenInfo.tokenType !== 'auth_factor2_otp_register') {
                 return User2FA_OTPWebRegister.accessDenied(webServer, resp);
             }
 
-            const qrImg = '';   //  :TODO: fix me
-            const secret = '';
-            const backupCodes = '';
+            const prepareOptions = {
+                qrType      : 'data',
+                cellSize    : 8,
+                username    : tokenInfo.user.username,
+            };
 
-            const postUrl = webServer.instance.buildUrl('/enable_2fa_otp');
-            const config = Config();
-            return webServer.instance.routeTemplateFilePage(
-                _.get(config, 'users.twoFactorAuth.otp.registerPageTemplate'),
-                (templateData, next) => {
-                    const finalPage = templateData
-                        .replace(/%BOARDNAME%/g,    config.general.boardName)
-                        .replace(/%USERNAME%/g,     tokenInfo.user.username)
-                        .replace(/%TOKEN%/g,        token)
-                        .replace(/%OTP_TYPE%/g,     otpType)
-                        .replace(/%POST_URL%/g,     postUrl)
-                        .replace(/%QR_IMG%/g,       qrImg)
-                        .replace(/%SECRET%/g,       secret)
-                        .replace(/%BACKUP_CODES%/g, backupCodes)
-                    ;
-                    return next(null, finalPage);
-                },
-                resp
-            );
+            prepareOTP(otpType, prepareOptions, (err, otpInfo) => {
+                if(err) {
+                    //  :TODO: Log error
+                    return User2FA_OTPWebRegister.accessDenied(webServer, resp);
+                }
+
+                const postUrl = webServer.instance.buildUrl('/enable_2fa_otp');
+                const config = Config();
+                return webServer.instance.routeTemplateFilePage(
+                    _.get(config, 'users.twoFactorAuth.otp.registerPageTemplate'),
+                    (templateData, next) => {
+                        const finalPage = templateData
+                            .replace(/%BOARDNAME%/g,    config.general.boardName)
+                            .replace(/%USERNAME%/g,     tokenInfo.user.username)
+                            .replace(/%TOKEN%/g,        token)
+                            .replace(/%OTP_TYPE%/g,     otpType)
+                            .replace(/%POST_URL%/g,     postUrl)
+                            .replace(/%QR_IMG_DATA%/g,  otpInfo.qr)
+                            .replace(/%SECRET%/g,       otpInfo.secret)
+                        ;
+                        return next(null, finalPage);
+                    },
+                    resp
+                );
+            });
         });
     }
 
@@ -181,13 +198,52 @@ module.exports = class User2FA_OTPWebRegister
         req.on('end', () => {
             const formData = querystring.parse(bodyData);
 
-            const config = Config();
-            if(!formData.token || !formData.otpType || !formData.otp) {
+            if(!formData.token || !formData.otpType || !formData.otp ||
+                !formData.secret)
+            {
                 return badRequest();
             }
-        });
 
-        return webServer.instance.respondWithError(resp, 410, 'Invalid or expired registration link.', 'Expired Link');
+            const otp = otpFromType(formData.otpType);
+            if(!otp) {
+                return badRequest();
+            }
+
+            const valid = otp.verify( { token : formData.otp, secret : formData.secret } );
+            if(!valid) {
+                return User2FA_OTPWebRegister.accessDenied(webServer, resp);
+            }
+
+            getTokenInfo(formData.token, (err, tokenInfo) => {
+                if(err) {
+                    return User2FA_OTPWebRegister.accessDenied(webServer, resp);
+                }
+
+                const backupCodes = createBackupCodes();
+
+                const props = {
+                    [ UserProps.AuthFactor2OTP ]            : formData.otpType,
+                    [ UserProps.AuthFactor2OTPSecret ]      : formData.secret,
+                    [ UserProps.AuthFactor2OTPBackupCodes ] : JSON.stringify(backupCodes),
+                };
+
+                tokenInfo.user.persistProperties(props, err => {
+                    if(err) {
+                        return webServer.instance.respondWithError(resp, 500, 'Internal Server Error', 'Internal Server Error');
+                    }
+                    //  :TODO: remove token
+
+                    //  :TODO: use a html template here too, if provided
+                    resp.writeHead(200);
+                    return resp.end(
+                        `2-Factor Authentication via One-Time-Password has been enabled for this account. Please write down your backup codes and store them in safe place:
+
+${backupCodes}
+                        `
+                    );
+                });
+            });
+        });
     }
 
     static registerRoutes(cb) {
diff --git a/www/otp_register.template.html b/www/otp_register.template.html
index a743928b..22d00866 100644
--- a/www/otp_register.template.html
+++ b/www/otp_register.template.html
@@ -5,33 +5,23 @@
         <title>Enable 2FA/OTP — ENiGMA½ BBS</title>
         <meta name="description" content="Enable 2-Factor Authentication via One-Time-Password">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<script>
-			window.onload = function() {
-				//document.getElementById('password').onchange			= validatePassword;
-				//document.getElementById('confirm_password').onchange	= validatePassword;
-			}
-
-            /*
-			function validatePassword() {
-				var pw 		= document.getElementById('password');
-				var confirm	= document.getElementById('confirm_password');
-
-				if(pw.value !== confirm.value) {
-					confirm.setCustomValidity('Passwords must match!');
-				} else {
-					confirm.setCustomValidity('');
-				}
-            }
-            */
-		</script>
 	</head>
 	<body>
-	<form action="%POST_URL%" method="post">        
-        <legend>Enable One-Time-Password</legend>
-        <input type="text" placeholder="One Time Password" id="otp" name="otp" required>
-        <input type="hidden" value="%TOKEN%" name="token">
-        <input type="hidden" value="%OTP_TYPE%" name="otpType">
-		<button type="submit">Confirm</button>
-	</form>
+        <p>
+            Your OTP secret:<br>
+            <b>%SECRET%</b>
+        </p>
+        <p>
+            QR Code:<br>
+            <img src="%QR_IMG_DATA%"/>
+        </p>
+        <form action="%POST_URL%" method="post">
+            <legend>Confirm One-Time-Password to continue:</legend>
+            <input type="text" placeholder="One Time Password" id="otp" name="otp" required>
+            <input type="hidden" value="%TOKEN%" name="token">
+            <input type="hidden" value="%OTP_TYPE%" name="otpType">
+            <input type="hidden" value="%SECRET%" name="secret">
+            <button type="submit">Confirm</button>
+        </form>
 	</body>
 </html>
\ No newline at end of file

From 4ebbedf4bc7d3bf62c512525a53cd84535bf0a8c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 13 Jun 2019 20:51:35 -0600
Subject: [PATCH 0850/1013] Clean up tokens

---
 core/config.js                    |  9 +++++++++
 core/user_2fa_otp_web_register.js | 14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/core/config.js b/core/config.js
index 47868fa0..d9a5684b 100644
--- a/core/config.js
+++ b/core/config.js
@@ -1026,6 +1026,15 @@ function getDefaultConfig() {
                     args        : [ '24 hours' ]    //  items older than this will be removed
                 },
 
+                twoFactorRegisterTokenMaintenance : {
+                    schedule    : 'every 24 hours',
+                    action      : '@method:core/user_temp_token.js:temporaryTokenMaintenanceTask',
+                    args        : [
+                        'auth_factor2_otp_register',
+                        '24 hours', //  expire time
+                    ]
+                },
+
                 //
                 //  Enable the following entry in your config.hjson to periodically create/update
                 //  DESCRIPT.ION files for your file base
diff --git a/core/user_2fa_otp_web_register.js b/core/user_2fa_otp_web_register.js
index 52ee96ad..a708969e 100644
--- a/core/user_2fa_otp_web_register.js
+++ b/core/user_2fa_otp_web_register.js
@@ -3,11 +3,11 @@
 
 //  ENiGMA½
 const Config                = require('./config.js').get;
-const Errors                = require('./enig_error.js').Errors;
 const getServer             = require('./listening_server.js').getServer;
 const webServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
 const {
     createToken,
+    deleteToken,
     getTokenInfo,
     WellKnownTokenTypes,
 }                           = require('./user_temp_token.js');
@@ -145,7 +145,7 @@ module.exports = class User2FA_OTPWebRegister
                 );
             }
 
-            if(tokenInfo.tokenType !== 'auth_factor2_otp_register') {
+            if(tokenInfo.tokenType !== WellKnownTokenTypes.AuthFactor2OTPRegister) {
                 return User2FA_OTPWebRegister.accessDenied(webServer, resp);
             }
 
@@ -157,7 +157,7 @@ module.exports = class User2FA_OTPWebRegister
 
             prepareOTP(otpType, prepareOptions, (err, otpInfo) => {
                 if(err) {
-                    //  :TODO: Log error
+                    Log.error({ error : err.message }, 'Failed to prepare OTP');
                     return User2FA_OTPWebRegister.accessDenied(webServer, resp);
                 }
 
@@ -231,7 +231,13 @@ module.exports = class User2FA_OTPWebRegister
                     if(err) {
                         return webServer.instance.respondWithError(resp, 500, 'Internal Server Error', 'Internal Server Error');
                     }
-                    //  :TODO: remove token
+
+                    //  we can now remove the token - no need to wait
+                    deleteToken(formData.token, err => {
+                        if(err) {
+                            Log.error({error : err.message, token : formData.token}, 'Failed to delete temporary token');
+                        }
+                    });
 
                     //  :TODO: use a html template here too, if provided
                     resp.writeHead(200);

From 7481421898d9e17240b4c655046e3574eb81f04a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 13 Jun 2019 22:54:05 -0600
Subject: [PATCH 0851/1013] Fix bug caused by new getView()

---
 core/user_config.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/user_config.js b/core/user_config.js
index d2748c4b..ca3b20ff 100644
--- a/core/user_config.js
+++ b/core/user_config.js
@@ -76,12 +76,12 @@ exports.getModule = class UserConfigModule extends MenuModule {
             },
 
             validatePassConfirmMatch : function(data, cb) {
-                var passwordView = self.getView(MciCodeIds.Password);
+                var passwordView = self.getMenuView(MciCodeIds.Password);
                 cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
             },
 
             viewValidationListener : function(err, cb) {
-                var errMsgView = self.getView(MciCodeIds.ErrorMsg);
+                var errMsgView = self.getMenuView(MciCodeIds.ErrorMsg);
                 var newFocusId;
                 if(errMsgView) {
                     if(err) {
@@ -89,7 +89,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
 
                         if(err.view.getId() === MciCodeIds.PassConfirm) {
                             newFocusId = MciCodeIds.Password;
-                            var passwordView = self.getView(MciCodeIds.Password);
+                            var passwordView = self.getMenuView(MciCodeIds.Password);
                             passwordView.clearText();
                             err.view.clearText();
                         }
@@ -150,7 +150,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
         };
     }
 
-    getView(viewId) {
+    getMenuView(viewId) {
         return this.viewControllers.menu.getView(viewId);
     }
 
@@ -200,13 +200,13 @@ exports.getModule = class UserConfigModule extends MenuModule {
                         self.setViewText('menu', MciCodeIds.TermHeight, user.properties[UserProps.TermHeight].toString());
 
 
-                        var themeView = self.getView(MciCodeIds.Theme);
+                        var themeView = self.getMenuView(MciCodeIds.Theme);
                         if(themeView) {
                             themeView.setItems(_.map(self.availThemeInfo, 'name'));
                             themeView.setFocusItemIndex(currentThemeIdIndex);
                         }
 
-                        var realNameView = self.getView(MciCodeIds.RealName);
+                        var realNameView = self.getMenuView(MciCodeIds.RealName);
                         if(realNameView) {
                             realNameView.setFocus(true);    //  :TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
                         }

From 2b154800c06d6ebceede590ab946d428c6d0c184 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 13 Jun 2019 22:54:56 -0600
Subject: [PATCH 0852/1013] More OTP updates/fixes * Ensure email address at
 save * Fix QR display issues for non-Google Auth * More cleanup/etc.

---
 core/user_2fa_otp.js              |  2 +-
 core/user_2fa_otp_config.js       | 75 +++++++++++++++++++++++++++----
 core/user_2fa_otp_web_register.js | 20 +++++++--
 www/otp_register.template.html    | 10 +++--
 4 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/core/user_2fa_otp.js b/core/user_2fa_otp.js
index 6d5ae6e1..c51d1282 100644
--- a/core/user_2fa_otp.js
+++ b/core/user_2fa_otp.js
@@ -123,7 +123,7 @@ function createQRCode(otp, options, secret) {
             svg     : qrCode.createSvgTag,
         }[options.qrType](options.cellSize);
     } catch(e) {
-        return;
+        return '';
     }
 }
 
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index 09a72a20..136c9178 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -8,11 +8,11 @@ const {
     OTPTypes,
     otpFromType,
     createQRCode,
+    createBackupCodes,
 }                           = require('./user_2fa_otp.js');
 const { Errors }            = require('./enig_error.js');
 const { getServer }         = require('./listening_server.js');
 const WebServerPackageName  = require('./servers/content/web.js').moduleInfo.packageName;
-const Config                = require('./config.js').get;
 const WebRegister           = require('./user_2fa_otp_web_register.js');
 
 //  deps
@@ -42,6 +42,11 @@ const MciViewIds = {
 const DefaultMsg = {
     otpNotEnabled   : '2FA/OTP is not currently enabled for this account.',
     noBackupCodes   : 'No backup codes remaining or set.',
+    saveDisabled    : '2FA/OTP is now disabled for this account.',
+    saveEmailSent   : 'An 2FA/OTP registration email has been sent with further instructions.',
+    saveError       : 'Failed to send email. Please contact the system operator.',
+    qrNotAvail      : 'QR code not available for this OTP type.',
+    emailRequired   : 'Your account must have a valid email address set to use this feature.',
 };
 
 exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
@@ -59,6 +64,9 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
             showBackupCodes : (formData, extraArgs, cb) => {
                 return this.showBackupCodes(cb);
             },
+            generateNewBackupCodes : (formData, extraArgs, cb) => {
+                return this.generateNewBackupCodes(cb);
+            },
             saveChanges : (formData, extraArgs, cb) => {
                 return this.saveChanges(formData, cb);
             }
@@ -153,11 +161,18 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                 username    : this.client.user.username,
                 qrType      : 'ascii',
             };
+
             qrCode = createQRCode(
                 otp,
                 qrOptions,
                 this.client.user.getProperty(UserProps.AuthFactor2OTPSecret)
-            ).replace(/\n/g, '\r\n');
+            );
+
+            if(qrCode) {
+                qrCode = qrCode.replace(/\n/g, '\r\n');
+            } else {
+                qrCode = this.config.qrNotAvail || DefaultMsg.qrNotAvail;
+            }
         }
 
         return this.displayDetails(qrCode, cb);
@@ -186,24 +201,66 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         return this.displayDetails(info, cb);
     }
 
+    generateNewBackupCodes(cb) {
+        if(!this.isOTPEnabledForUser()) {
+            const info = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+            return this.displayDetails(info, cb);
+        }
+
+        const backupCodes = createBackupCodes();
+        this.client.user.persistProperty(
+            UserProps.AuthFactor2OTPBackupCodes,
+            JSON.stringify(backupCodes),
+            err => {
+                if(err) {
+                    return cb(err);
+                }
+                const info = backupCodes.join(', ');
+                return this.displayDetails(info, cb);
+            }
+        );
+    }
+
     saveChanges(formData, cb) {
         const enabled = 1 === _.get(formData, 'value.enableToggle', 0);
         return enabled ? this.saveChangesEnable(formData, cb) : this.saveChangesDisable(cb);
     }
 
     saveChangesEnable(formData, cb) {
+        //  User must have an email address set to save
+        const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
+        const emailAddr = this.client.user.getProperty(UserProps.EmailAddress);
+        if(!emailAddr || !emailRegExp.test(emailAddr)) {
+            const info = this.config.emailRequired || DefaultMsg.emailRequired;
+            return this.displayDetails(info, cb);
+        }
+
         const otpTypeProp = this.otpTypeFromOTPTypeIndex(_.get(formData, 'value.otpType'));
 
+        const saveFailedError = (err) => {
+            const info = this.config.saveError || DefaultMsg.saveError;
+            this.displayDetails(info, () => {
+                return cb(err);
+            });
+        };
+
         //  sanity check
         if(!otpFromType(otpTypeProp)) {
-            return cb(Errors.Invalid('Cannot convert selected index to valid OTP type'));
+            return saveFailedError(Errors.Invalid('Cannot convert selected index to valid OTP type'));
         }
 
         this.removeUserOTPProperties(err => {
             if(err) {
-                return cb(err);
+                return saveFailedError(err);
             }
-            return WebRegister.sendRegisterEmail(this.client.user, otpTypeProp, cb);
+            WebRegister.sendRegisterEmail(this.client.user, otpTypeProp, err => {
+                if(err) {
+                    return saveFailedError(err);
+                }
+
+                const info = this.config.saveEmailSent || DefaultMsg.saveEmailSent;
+                return this.displayDetails(info, cb);
+            });
         });
     }
 
@@ -217,18 +274,18 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     }
 
     saveChangesDisable(cb) {
-        this.removeUserOTPProperties(this.client.user, err => {
+        this.removeUserOTPProperties(err => {
             if(err) {
                 return cb(err);
             }
 
-            //  :TODO: show "saved+disabled" art/message -> prevMenu
-            return cb(null);
+            const info = this.config.saveDisabled || DefaultMsg.saveDisabled;
+            return this.displayDetails(info, cb);
         });
     }
 
     isOTPEnabledForUser() {
-        return this.otpTypeIndexFromUserOTPType(-1) != -1;
+        return this.client.user.getProperty(UserProps.AuthFactor2OTP) ? true : false;
     }
 
     getInfoText(key) {
diff --git a/core/user_2fa_otp_web_register.js b/core/user_2fa_otp_web_register.js
index a708969e..2b7d294c 100644
--- a/core/user_2fa_otp_web_register.js
+++ b/core/user_2fa_otp_web_register.js
@@ -19,6 +19,9 @@ const {
 const { sendMail }          = require('./email.js');
 const UserProps             = require('./user_property.js');
 const Log                   = require('./logger.js').log;
+const {
+    getConnectionByUserId
+}                           = require('./client_connections.js');
 
 //  deps
 const async                 = require('async');
@@ -104,7 +107,7 @@ module.exports = class User2FA_OTPWebRegister
                         if(err) {
                             Log.warn({ error : err.message }, 'Failed sending 2FA/OTP register email');
                         } else {
-                            Log.info( { info }, 'Successfully sent 2FA/OTP register email');
+                            Log.info({ info }, 'Successfully sent 2FA/OTP register email');
                         }
                         return callback(err);
                     });
@@ -172,7 +175,7 @@ module.exports = class User2FA_OTPWebRegister
                             .replace(/%TOKEN%/g,        token)
                             .replace(/%OTP_TYPE%/g,     otpType)
                             .replace(/%POST_URL%/g,     postUrl)
-                            .replace(/%QR_IMG_DATA%/g,  otpInfo.qr)
+                            .replace(/%QR_IMG_DATA%/g,  otpInfo.qr || '')
                             .replace(/%SECRET%/g,       otpInfo.secret)
                         ;
                         return next(null, finalPage);
@@ -232,6 +235,17 @@ module.exports = class User2FA_OTPWebRegister
                         return webServer.instance.respondWithError(resp, 500, 'Internal Server Error', 'Internal Server Error');
                     }
 
+                    //
+                    //  User may be online still - find account & update it if so
+                    //
+                    const clientConn = getConnectionByUserId(tokenInfo.user.userId);
+                    if(clientConn && clientConn.user) {
+                        //  just update live props, we've already persisted them.
+                        _.each(props, (v, n) => {
+                            clientConn.user.setProperty(n, v);
+                        });
+                    }
+
                     //  we can now remove the token - no need to wait
                     deleteToken(formData.token, err => {
                         if(err) {
@@ -261,7 +275,7 @@ ${backupCodes}
         [
             {
                 method  : 'GET',
-                path    : '^\\/enable_2fa_otp\\?token\\=[a-f0-9]+&otpType\\=[a-zA-Z0-9]+$',
+                path    : '^\\/enable_2fa_otp\\?token\\=[a-f0-9]+&otpType\\=[a-zA-Z0-9_]+$',
                 handler : User2FA_OTPWebRegister.routeRegisterGet,
             },
             {
diff --git a/www/otp_register.template.html b/www/otp_register.template.html
index 22d00866..90eeba16 100644
--- a/www/otp_register.template.html
+++ b/www/otp_register.template.html
@@ -11,10 +11,12 @@
             Your OTP secret:<br>
             <b>%SECRET%</b>
         </p>
-        <p>
-            QR Code:<br>
-            <img src="%QR_IMG_DATA%"/>
-        </p>
+        <script>
+            if('googleAuth' == '%OTP_TYPE%') {
+                document.write('QR Code:<br>');
+                document.write('<img src="%QR_IMG_DATA%"/>');
+            }
+        </script>
         <form action="%POST_URL%" method="post">
             <legend>Confirm One-Time-Password to continue:</legend>
             <input type="text" placeholder="One Time Password" id="otp" name="otp" required>

From 0f68f20656d000110ae946d87bc2983046bcb31f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 14 Jun 2019 21:43:27 -0600
Subject: [PATCH 0853/1013] Documentation updates + Add Security doc * Update
 optuil doc

---
 core/oputil/oputil_help.js     |   2 +-
 docs/admin/oputil.md           | 225 +++++++++++++++++++++------------
 docs/configuration/acs.md      |   2 +-
 docs/configuration/security.md |  62 +++++++++
 4 files changed, 208 insertions(+), 83 deletions(-)
 create mode 100644 docs/configuration/security.md

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index fe76f4b7..62c47297 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -161,7 +161,7 @@ General Information:
     MessageBase :
 `usage: oputil.js mb <action> [<arguments>]
 
-actions:
+Actions:
   areafix CMD1 CMD2 ... ADDR  Sends an AreaFix NetMail
 
   NetMail is sent to supplied address  with the supplied command(s). Multi-part commands
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index e1164540..7190d268 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -9,17 +9,17 @@ Let's look the main help output as per this writing:
 
 ```
 usage: oputil.js [--version] [--help]
-                  <command> [<args>]
+                  <command> [<arguments>]
 
-global args:
-  -c, --config PATH         specify config path (./config/)
-  -n, --no-prompt           assume defaults/don't prompt for input where possible
+Global arguments:
+  -c, --config PATH         Specify config path (default is ./config/)
+  -n, --no-prompt           Assume defaults (don't prompt for input where possible)
 
-commands:
-  user                      user utilities
-  config                    config file management
-  fb                        file base management
-  mb                        message base management
+Commands:
+  user                      User management
+  config                    Configuration management
+  fb                        File base management
+  mb                        Message base management
 ```
 
 Commands break up operations by groups:
@@ -41,21 +41,55 @@ Type `./oputil.js <command> --help` for additional help on a particular command.
 The `user` command covers various user operations.
 
 ```
-usage: oputil.js user <action> [<args>]
+usage: oputil.js user <action> [<arguments>]
 
-actions:
-  info USERNAME                display information about a user
-  pw USERNAME PASSWORD         set a user's password
-                               aliases: password, passwd
-  rm USERNAME                  permanently removes user from system
-                               aliases: remove, delete, del
-  rename USERNAME NEWNAME      rename a user
-                               aliases: mv
-  activate USERNAME            set status to active
-  deactivate USERNAME          set status to inactive
-  disable USERNAME             set status to disabled
-  lock USERNAME                set status to locked
-  group USERNAME [+|-]GROUP    adds (+) or removes (-) user from a group
+Actions:
+  info USERNAME                Display information about a user
+
+  pw USERNAME PASSWORD         Set a user's password
+  (passwd|password)
+
+  rm USERNAME                  Permanently removes user from system
+  (del|delete|remove)
+
+  rename USERNAME NEWNAME      Rename a user
+  (mv)
+
+  2fa-otp USERNAME SPEC        Enable 2FA/OTP for the user
+  (otp)
+
+  The system supports various implementations of Two Factor Authentication (2FA)
+  One Time Password (OTP) authentication.
+
+  Valid specs:
+    disable : Removes 2FA/OTP from the user
+    google  : Google Authenticator
+    hotp    : HMAC-Based One-Time Password Algorithm (RFC-4266)
+    totp    : Time-Based One-Time Password Algorithm (RFC-6238)
+
+  activate USERNAME            Set a user's status to "active"
+
+  deactivate USERNAME          Set a user's status to "inactive"
+
+  disable USERNAME             Set a user's status to "disabled"
+
+  lock USERNAME                Set a user's status to "locked"
+
+  group USERNAME [+|-]GROUP    Adds (+) or removes (-) user from a group
+
+info arguments:
+  --security                   Include security information in output
+
+2fa-otp arguments:
+  --qr-type TYPE               Specify QR code type
+
+  Valid QR types:
+    ascii : Plain ASCII (default)
+    data  : HTML data URL
+    img   : HTML image tag
+    svg   : SVG image
+
+  --out PATH                   Path to write QR code to. defaults to stdout
 ```
 
 | Action    | Description       | Examples                              | Aliases   |
@@ -64,25 +98,30 @@ actions:
 | `pw`        | Set password      | `./oputil.js user pw joeuser s3cr37`  | `passwd`, `password` |
 | `rm`        | Removes user      | `./oputil.js user del joeuser`        | `remove`, `del`, `delete` |
 | `rename` | Renames a user | `./oputil.js user rename joeuser joe` | `mv` |
+| `2fa-otp` | Manage 2FA/OTP for a user | `./oputil.js user 2fa-otp joeuser googleAuth` | `otp`
 | `activate` | Activates user    | `./oputil.js user activate joeuser`   | N/A   |
 | `deactivate`    | Deactivates user  | `./oputil.js user deactivate joeuser` | N/A   |
 | `disable`   | Disables user (user will not be able to login)    | `./oputil.js user disable joeuser`    | N/A   |
 | `lock` | Locks the user account (prevents logins) | `./oputil.js user lock joeuser` | N/A |
 | `group`   | Modifies users group membership   | Add to group: `./oputil.js user group joeuser +derp`<br/>Remove from group: `./oputil.js user group joeuser -derp`   | N/A    |
 
+#### Manage 2FA/OTP
+While `oputil.js` can be used to manage a user's 2FA/OTP, it is highly recommended to require users to opt-in themselves. See [Security](/docs/configuration/security.md) for details.
+
 ## Configuration
 The `config` command allows sysops to perform various system configuration and maintenance tasks.
 
 ```
-usage: oputil.js config <action> [<args>]
+usage: oputil.js config <action> [<arguments>]
 
-actions:
-  new                      generate a new/initial configuration  
-  cat                      cat current configuration to stdout
+Actions:
+  new                      Generate a new / default configuration
 
-cat args:
-  --no-color               disable color
-  --no-comments            strip any comments
+  cat                      Write current configuration to stdout
+
+cat arguments:
+  --no-color               Disable color
+  --no-comments            Strip any comments
 ```
 
 | Action    | Description       | Examples                              |
@@ -94,56 +133,75 @@ cat args:
 The `fb` command provides a powerful file base management interface.
 
 ```
-usage: oputil.js fb <action> [<args>]
+usage: oputil.js fb <action> [<arguments>]
 
-actions:
-  scan AREA_TAG[@STORAGE_TAG]  scan specified area
-                               may also contain optional GLOB as last parameter,
-                               for example: scan some_area *.zip
+Actions:
+  scan AREA_TAG[@STORAGE_TAG]  Scan specified area
 
-  info CRITERIA                display information about areas and/or files
-                               matching CRITERIA.
+  May contain optional GLOB as last parameter.
+  Example: ./oputil.js fb scan d0pew4r3z *.zip
 
-  mv SRC [SRC...] DST          move entry(s) from SRC to DST
-                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
-                               DST: AREA_TAG[@STORAGE_TAG]
+  info CRITERIA                Display information about areas and/or files
 
-  rm SRC [SRC...]              remove entry(s) from the system matching SRC
-                               SRC: FILENAME_WC|SHA|FILE_ID|AREA_TAG[@STORAGE_TAG]
-  desc CRITERIA                sets a new file description for file base entry
-                               matching CRITERIA. Launches an external editor using
-                               $VISUAL, $EDITOR, or vim/notepad.
-  import-areas FILEGATE.ZXX    import file base areas using FileGate RAID type format
+  mv SRC [SRC...] DST          Move matching entry(s)
+  (move)
 
-scan args:
-  --tags TAG1,TAG2,...         specify tag(s) to assign to discovered entries
+  Source may be any of the following:
+    - Filename including '*' wildcards
+    - SHA-1
+    - File ID
+    - Area tag with optional @storageTag suffix
+  Destination is area tag with optional @storageTag suffix
 
-  --desc-file [PATH]           prefer file descriptions from supplied path over other
-                               other sources such as FILE_ID.DIZ. Path must point to
-                               a valid FILES.BBS or DESCRIPT.ION file.
-  --update                     attempt to update information for existing entries
-  --quick                      perform quick scan
+  rm SRC [SRC...]              Remove entry(s) from the system
+  (del|delete|remove)
 
-info args:
-  --show-desc                  display short description, if any
+  Source may be any of the following:
+    - Filename including '*' wildcards
+    - SHA-1
+    - File ID
+    - Area tag with optional @storageTag suffix
 
-remove args:
-  --phys-file                  also remove underlying physical file
+  desc CRITERIA                Updates an file base entry's description
 
-import-areas args:
-  --type TYPE                  sets import areas type. valid options are "zxx" or "na"
-  --create-dirs                create backing storage directories
+  Launches an external editor using $VISUAL, $EDITOR, or vim/notepad.
 
-general information:
-  AREA_TAG[@STORAGE_TAG]       can specify an area tag and optionally, a storage specific tag
-                               example: retro@bbs
+  import-areas FILEGATE.ZXX    Import file base areas using FileGate RAID type format
 
-  CRITERIA                     file base entry criteria. in general, can be AREA_TAG, SHA,
-                               FILE_ID, or FILENAME_WC.
-  
-  FILENAME_WC                  filename with * and ? wildcard support. may match 0:n entries
-  SHA                          full or partial SHA-256
-  FILE_ID                      a file identifier. see file.sqlite3
+scan arguments:
+  --tags TAG1,TAG2,...         Specify hashtag(s) to assign to discovered entries
+
+  --desc-file [PATH]           Prefer file descriptions from supplied input file
+
+  If a file description can be found in the supplied input file, prefer that description
+  over other sources such related FILE_ID.DIZ. Path must point to a valid FILES.BBS or
+  DESCRIPT.ION file.
+
+  --update                     Attempt to update information for existing entries
+  --full-scan                  Perform a full scan (default is quick)
+
+info arguments:
+  --show-desc                  Display short description, if any
+
+remove arguments:
+  --phys-file                  Also remove underlying physical file
+
+import-areas arguments:
+  --type TYPE                  Sets import areas type
+
+  Valid types are are "zxx" or "na".
+
+  --create-dirs                Also create backing storage directories
+
+General Information:
+  Generally an area tag can also include an optional storage tag. For example, the
+  area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main
+
+  When performing an initial import of a large area or storage backing, --full-scan
+  is the best option. If re-scanning an area for updates a standard / quick scan is
+  generally good enough.
+
+  File ID's are those found in file.sqlite3.
 ```
 
 #### Scan File Area
@@ -152,7 +210,8 @@ The `scan` action can (re)scan a file area for new entries as well as update (`-
 ##### Examples
 Performing a quick scan of a specific area's storage location ("retro_warez", "retro_warez_games) matching only *.zip extensions:
 ```bash
-$ ./oputil.js fb scan --quick retro_warez@retro_warez_games *.zip`
+# note that we must quote the wildcard to prevent shell expansion
+$ ./oputil.js fb scan --quick retro_warez@retro_warez_games "*.zip"`
 ```
 
 Update all entries in the "artscene" area supplying the file tags "artscene", and "textmode".
@@ -221,19 +280,23 @@ The above command will process FILEGATE.ZXX creating areas and backing directori
 The `mb` command provides various Message Base related tools:
 
 ```
-usage: oputil.js mb <action> [<args>]
+usage: oputil.js mb <action> [<arguments>]
 
-actions:
-  areafix CMD1 CMD2 ... ADDR  sends an AreaFix NetMail to ADDR with the supplied command(s)
-                              one or more commands may be supplied. commands that are multi
-                              part such as "%COMPRESS ZIP" should be quoted.
-  import-areas PATH           import areas using fidonet *.NA or AREAS.BBS file from PATH
+Actions:
+  areafix CMD1 CMD2 ... ADDR  Sends an AreaFix NetMail
 
-import-areas args:
-  --conf CONF_TAG             conference tag in which to import areas
-  --network NETWORK           network name/key to associate FTN areas
-  --uplinks UL1,UL2,...       one or more comma separated uplinks
-  --type TYPE                 area import type. valid options are "bbs" and "na"
+  NetMail is sent to supplied address  with the supplied command(s). Multi-part commands
+  such as "%COMPRESS ZIP" should be quoted.
+
+  import-areas PATH           Import areas using FidoNet *.NA or AREAS.BBS file
+
+import-areas arguments:
+  --conf CONF_TAG             Conference tag in which to import areas
+  --network NETWORK           Network name/key to associate FTN areas
+  --uplinks UL1,UL2,...       One or more uplinks (comma separated)
+  --type TYPE                 Area import type
+
+  Valid types are "bbs" and "na"
 ```
 
 | Action    | Description       | Examples                              |
diff --git a/docs/configuration/acs.md b/docs/configuration/acs.md
index 64d67648..dd57ce22 100644
--- a/docs/configuration/acs.md
+++ b/docs/configuration/acs.md
@@ -38,7 +38,7 @@ The following are ACS codes available as of this writing:
 | AC<i>achievementCount</i> | User has >= _achievementCount_ achievements |
 | AP<i>achievementPoints</i> | User has >= _achievementPoints_ achievement points |
 | AF<i>authFactor</i> | User's current *Authentication Factor* is >= _authFactor_. Authentication factor 1 refers to username + password (or PubKey) while factor 2 refers to 2FA such as One-Time-Password authentication. |
-| AR<i>authFactorReq</i> | Current users **requires** an Authentication Factor >= _authFactorReq_ |
+| AR<i>authFactorReq</i> | Current user **requires** an Authentication Factor >= _authFactorReq_ |
 
 ## ACS Strings
 ACS strings are one or more ACS codes in addition to some basic language semantics. 
diff --git a/docs/configuration/security.md b/docs/configuration/security.md
new file mode 100644
index 00000000..ff2a568f
--- /dev/null
+++ b/docs/configuration/security.md
@@ -0,0 +1,62 @@
+---
+layout: page
+title: Security
+---
+## Security
+Unlike in the golden era of BBSing, modern Internet-connected systems are prone to hacking attempts, eavesdropping, etc. While plain-text passwords, insecure data over [Plain Old Telephone Service (POTS)](https://en.wikipedia.org/wiki/Plain_old_telephone_service), and so on was good enough then, modern systems must employ protections against attacks. ENiGMA½ comes with many security features that help keep the system and your users secure — not limited to:
+* Passwords are **never** stored in plain-text, but instead are stored using [Password-Based Key Derivation Function 2 (PBKDF2)](https://en.wikipedia.org/wiki/PBKDF2). Even the system operator can _never_ know your password!
+* Alternatives to insecure Telnet logins are built in: [SSH](https://en.wikipedia.org/wiki/Secure_Shell) and secure [WebSockets](https://en.wikipedia.org/wiki/WebSocket) for example.
+* A built in web server with [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) support (aka HTTPS).
+* Optional [Two-Factor Authentication (2FA)](https://en.wikipedia.org/wiki/Multi-factor_authentication) via [One-Time-Password (OTP)](https://en.wikipedia.org/wiki/One-time_password) for users, supporting [Google Authenticator](http://google-authenticator.com/), [Time-Based One-Time Password Algorithm (TOTP, RFC-6238)](https://tools.ietf.org/html/rfc6238), and [HMAC-Based One-Time Password Algorithm (HOTP, RFC-4266)](https://tools.ietf.org/html/rfc4226).
+
+## Two-Factor Authentication via One-Time Password
+Enabling Two-Factor Authentication via One-Time-Password (2FA/OTP) on an account adds an extra layer of security ("_something a user has_") in addition to their password ("_something a user knows_"). Providing 2FA/OTP to your users has some prerequisites:
+* [A configured email gateway](/docs/configuration/email.md) such that the system can send out emails.
+* One or more secure servers enabled such as [SSH](/docs/servers/ssh.md) or secure [WebSockets](/docs/servers/websocket.md) (that is, WebSockets over a secure connection such as TLS).
+* The [web server](/docs/servers/web-server.md) enabled and exposed over TLS (HTTPS).
+
+:information_source: For WebSockets and the web server, ENiGMA½ _may_ listen on insecure channels if behind a secure web proxy.
+
+### User Registration Flow
+Due to the nature of 2FA/OTP, even if enabled on your system, users must opt-in and enable this feature on their account. Users must also have a valid email address such that a registration link can be sent to them. To opt-in, a process similar to the following is taken:
+
+1. Navigate to the 2FA/OTP configuration menu and switches the feature to enabled.
+2. Selects the "flavor" of 2FA/OTP: Google Authenticator, TOTP, or HOTP.
+3. Confirms settings by saving. 
+
+After saving, a registration link will be mailed to the user. Clicking the link provides the following:
+1. A secret for manual entry into a OTP device.
+2. If applicable, a scannable QR code for easy device entry (e.g. Google Authenticator)
+3. A confirmation prompt in which the user must enter a OTP code. If entered correctly, this validates everything is set up properly and 2FA/OTP will be enabled for the account. Future logins will now prompt the user for their OTP after they enter their standard password.
+
+:warning: Serving 2FA/OTP registration links over insecure (HTTP) can expose secrets intended for the user and is **highly** discouraged!
+
+:information_source: +ops can also manually enable or disable 2FA/OTP for a user using [oputil](/docs/admin/oputil.md), but this is generally discouraged.
+
+### ACS Checks
+Various places throughout the system that implement [ACS](/docs/configuration/acs.md) can make 2FA specific checks:
+* `AR#`: Current users **required** authentication factor. `AR2` for example means 2FA/OTP is required for this user.
+* `AF#`: Current users **active** authentication factor. `AF2` means the user is authenticated with some sort of 2FA (such as One-Time-Password).
+
+See [ACS](/docs/configuration/acs.md) for more information.
+
+#### Example
+The following example illustrates using an `AR` ACS check to require applicable users to go through an additional 2FA/OTP process during login:
+
+```hjson
+login: {
+    art: USERLOG
+    next: [
+        {
+            //  users with AR2+ must first pass 2FA/OTP
+            acs: AR2
+            next: loginTwoFactorAuthOTP
+        }
+        {
+            //  everyone else skips ahead
+            next: fullLoginSequenceLoginArt
+        }
+    ]
+    // ...
+}
+```
\ No newline at end of file

From f02434bc23838f4257ef3740c161de6694c3791b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 00:07:09 -0600
Subject: [PATCH 0854/1013] Add 2FA/OTP authentication to menu template

---
 misc/menu_template.in.hjson | 83 +++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 8 deletions(-)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 5c7eba83..9409a9c9 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -60,11 +60,20 @@
 
         //
         //  SSH connections are pre-authenticated via the SSH server itself.
-        //  Jump directly to the login sequence
+        //  Jump directly to either the 2FA/OTP auth or the login sequence
+        //  depending on user ACS.
         //
         sshConnected: {
             art: CONNECT
-            next: fullLoginSequenceLoginArt
+            next: [
+                {
+                    acs: AR2
+                    next: loginTwoFactorAuthOTPLoop
+                }
+                {
+                    next: mainMenu
+                }
+            ]
             config: { nextTimeout: 1500 }
         }
 
@@ -90,11 +99,6 @@
                                 submit: true
                                 focus:  true
                                 argName: navSelect
-                                //
-                                //  To enable forgot password, you will need to have the web server
-                                //  enabled and mail/SMTP configured. Once that is in place, swap out
-                                //  the commented lines below as well as in the submit block
-                                //
                                 items: [
                                     {
                                         text: login
@@ -104,10 +108,20 @@
                                         text: apply
                                         data: apply
                                     }
+
+                                    //
+                                    //  To enable the forgot password option, you'll need to have
+                                    //  the web server & email configured. Once that is in place,
+                                    //  uncomment the section below.
+                                    //
+                                    //  See docs for more information
+                                    //
+                                    /*
                                     {
                                         text: forgot pass
                                         data: forgot
                                     }
+                                    */
                                     {
                                         text: log off
                                         data: logoff
@@ -142,7 +156,20 @@
 
         login: {
             art: USERLOG
-            next: fullLoginSequenceLoginArt
+            next: [
+                {
+                    //
+                    //  Users with 2FA/OTP enabled *must* go through
+                    //  an additional OTP authentication step
+                    //
+                    acs: AR2
+                    next: loginTwoFactorAuthOTPLoop
+                }
+                {
+                    //  ...everyone else can carry on as per usual
+                    next: fullLoginSequenceLoginArt
+                }
+            ]
             config: {
                 tooNodeMenu: loginAttemptTooNode
                 inactive: loginAttemptAccountInactive
@@ -218,6 +245,46 @@
             next: logoff
         }
 
+        //
+        //  Empty menu to catch us in a 2FA/OTP auth loop
+        //  until the user either authenticates successfully
+        //  or the system boots them.
+        //
+        loginTwoFactorAuthOTPLoop: {
+            next: loginTwoFactorAuthOTP
+        }
+
+        loginTwoFactorAuthOTP: {
+            art: 2FAOTP
+            next: fullLoginSequenceLoginArt
+            form: {
+                0: {
+                    mci: {
+                        ET1: {
+                            argName: token
+                            focus: true
+                            submit: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { token: null }
+                                action: @systemMethod:login2FA_OTP
+                            }
+                        ]
+                    }
+                    actionKeys: [
+                        {
+                            //  no turning back at this point...
+                            keys: [ "escape" ]
+                            action: @systemMethod:logoff
+                        }
+                    ]
+                }
+            }
+        }
+
         forgotPassword: {
             desc: Forgot password
             prompt: forgotPasswordPrompt

From b5a3c030abb159b510faea723495344ad4a7f5ab Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 17:19:42 -0600
Subject: [PATCH 0855/1013] Doc updates & minor code cleanup

---
 WHATSNEW.md                    |  3 ++-
 core/user_2fa_otp_config.js    | 49 +++++++++++++++++++++-------------
 docs/configuration/security.md | 16 ++++++-----
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 71e12a69..76f8baf6 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -5,7 +5,8 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 + `oputil.js user rename USERNAME NEWNAME`
 + `my_messages.js` module (defaulted to "m" at the message menu) to list public messages addressed to the currently logged in user. Takes into account their username and `real_name` property.
 + SSH Public Key Authentication has been added. The system uses a OpenSSH style public key set on the `ssh_public_key` user property.
-+ 2-Factor (2FA) authentication is now available using [RFC-4266 - HOTP: HMAC-Based One-Time Password Algorithm)](https://tools.ietf.org/html/rfc4226), [RFC-6238 - TOTP: Time-Based One-Time Password Algorithm](https://tools.ietf.org/html/rfc6238), or [Google Authenticator](http://google-authenticator.com/). QR codes for activation are available as well. One-time backup aka recovery codes can also be used.
++ 2-Factor (2FA) authentication is now available using [RFC-4266 - HOTP: HMAC-Based One-Time Password Algorithm)](https://tools.ietf.org/html/rfc4226), [RFC-6238 - TOTP: Time-Based One-Time Password Algorithm](https://tools.ietf.org/html/rfc6238), or [Google Authenticator](http://google-authenticator.com/). QR codes for activation are available as well. One-time backup aka recovery codes can also be used. See [Security](/docs/configuration/security.md) for more info!
+* New ACS codes for new 2FA/OTP: `AR` and `AF`. See [ACS](/docs/configuration/acs.md) for details.
 + `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user.
 * `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP.
 * `oputil.js fb scan --quick` is now the default. Override with `--full-scan`.
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index 136c9178..e66f077b 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -40,13 +40,22 @@ const MciViewIds = {
 };
 
 const DefaultMsg = {
-    otpNotEnabled   : '2FA/OTP is not currently enabled for this account.',
-    noBackupCodes   : 'No backup codes remaining or set.',
-    saveDisabled    : '2FA/OTP is now disabled for this account.',
-    saveEmailSent   : 'An 2FA/OTP registration email has been sent with further instructions.',
-    saveError       : 'Failed to send email. Please contact the system operator.',
-    qrNotAvail      : 'QR code not available for this OTP type.',
-    emailRequired   : 'Your account must have a valid email address set to use this feature.',
+    infoText: {
+        disabled        : 'Enabling 2-Factor Authentication via One-Time-Password can greatly increase the security of your account.',
+        enabled         : 'A valid email address set in user config is required to enable 2-Factor Authentication.',
+        rfc6238_TOTP    : 'Time-Based One-Time-Password (TOTP, RFC-6238).',
+        rfc4266_HOTP    : 'HMAC-Based One-Time-Passowrd (HOTP, RFC-4266).',
+        googleAuth      : 'Google Authenticator.',
+    },
+    statusText : {
+        otpNotEnabled   : '2FA/OTP is not currently enabled for this account.',
+        noBackupCodes   : 'No backup codes remaining or set.',
+        saveDisabled    : '2FA/OTP is now disabled for this account.',
+        saveEmailSent   : 'An 2FA/OTP registration email has been sent with further instructions.',
+        saveError       : 'Failed to send email. Please contact the system operator.',
+        qrNotAvail      : 'QR code not available for this OTP type.',
+        emailRequired   : 'Your account must have a valid email address set to use this feature.',
+    }
 };
 
 exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
@@ -155,7 +164,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
 
         let qrCode;
         if(!otp) {
-            qrCode = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+            qrCode = this.getStatusText('otpNotEnabled');
         } else {
             const qrOptions = {
                 username    : this.client.user.username,
@@ -171,7 +180,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
             if(qrCode) {
                 qrCode = qrCode.replace(/\n/g, '\r\n');
             } else {
-                qrCode = this.config.qrNotAvail || DefaultMsg.qrNotAvail;
+                qrCode = this.getStatusText('qrNotAvail');
             }
         }
 
@@ -181,15 +190,15 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     showSecret(cb) {
         const info =
             this.client.user.getProperty(UserProps.AuthFactor2OTPSecret) ||
-            this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+            this.getStatusText('otpNotEnabled');
         return this.displayDetails(info, cb);
     }
 
     showBackupCodes(cb) {
         let info;
-        const noBackupCodes = this.config.noBackupCodes || DefaultMsg.noBackupCodes;
+        const noBackupCodes = this.getStatusText('noBackupCodes');
         if(!this.isOTPEnabledForUser()) {
-            info = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+            info = this.getStatusText('otpNotEnabled');
         } else {
             try {
                 info = JSON.parse(this.client.user.getProperty(UserProps.AuthFactor2OTPBackupCodes) || '[]').join(', ');
@@ -203,7 +212,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
 
     generateNewBackupCodes(cb) {
         if(!this.isOTPEnabledForUser()) {
-            const info = this.config.otpNotEnabled || DefaultMsg.otpNotEnabled;
+            const info = this.getStatusText('otpNotEnabled');
             return this.displayDetails(info, cb);
         }
 
@@ -231,14 +240,14 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
         const emailRegExp = /[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(.[a-z0-9-]+)*/;
         const emailAddr = this.client.user.getProperty(UserProps.EmailAddress);
         if(!emailAddr || !emailRegExp.test(emailAddr)) {
-            const info = this.config.emailRequired || DefaultMsg.emailRequired;
+            const info = this.getStatusText('emailRequired');
             return this.displayDetails(info, cb);
         }
 
         const otpTypeProp = this.otpTypeFromOTPTypeIndex(_.get(formData, 'value.otpType'));
 
         const saveFailedError = (err) => {
-            const info = this.config.saveError || DefaultMsg.saveError;
+            const info = this.getStatusText('saveError');
             this.displayDetails(info, () => {
                 return cb(err);
             });
@@ -258,7 +267,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                     return saveFailedError(err);
                 }
 
-                const info = this.config.saveEmailSent || DefaultMsg.saveEmailSent;
+                const info = this.getStatusText('saveEmailSent');
                 return this.displayDetails(info, cb);
             });
         });
@@ -279,7 +288,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
                 return cb(err);
             }
 
-            const info = this.config.saveDisabled || DefaultMsg.saveDisabled;
+            const info = this.getStatusText('saveDisabled');
             return this.displayDetails(info, cb);
         });
     }
@@ -289,7 +298,11 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
     }
 
     getInfoText(key) {
-        return _.get(this.config, [ 'infoText', key ], '');
+        return _.get(this.config, [ 'infoText', key ], DefaultMsg.infoText[key]);
+    }
+
+    getStatusText(key) {
+        return _.get(this.config, [ 'statusText', key ], DefaultMsg.statusText[key]);
     }
 
     enableToggleUpdate(idx) {
diff --git a/docs/configuration/security.md b/docs/configuration/security.md
index ff2a568f..afc583aa 100644
--- a/docs/configuration/security.md
+++ b/docs/configuration/security.md
@@ -18,21 +18,23 @@ Enabling Two-Factor Authentication via One-Time-Password (2FA/OTP) on an account
 :information_source: For WebSockets and the web server, ENiGMA½ _may_ listen on insecure channels if behind a secure web proxy.
 
 ### User Registration Flow
-Due to the nature of 2FA/OTP, even if enabled on your system, users must opt-in and enable this feature on their account. Users must also have a valid email address such that a registration link can be sent to them. To opt-in, a process similar to the following is taken:
+Due to the nature of 2FA/OTP, even if enabled on your system, users must opt-in and enable this feature on their account. Users must also have a valid email address such that a registration link can be sent to them. To opt-in, users must enable the option, which will cause the system to email them a registration link. Following the link provides the following:
 
-1. Navigate to the 2FA/OTP configuration menu and switches the feature to enabled.
-2. Selects the "flavor" of 2FA/OTP: Google Authenticator, TOTP, or HOTP.
-3. Confirms settings by saving. 
-
-After saving, a registration link will be mailed to the user. Clicking the link provides the following:
 1. A secret for manual entry into a OTP device.
 2. If applicable, a scannable QR code for easy device entry (e.g. Google Authenticator)
-3. A confirmation prompt in which the user must enter a OTP code. If entered correctly, this validates everything is set up properly and 2FA/OTP will be enabled for the account. Future logins will now prompt the user for their OTP after they enter their standard password.
+3. A confirmation prompt in which the user must enter a OTP code. If entered correctly, this validates everything is set up properly and 2FA/OTP will be enabled for the account. Backup codes will also be provided at this time. Future logins will now prompt the user for their OTP after they enter their standard password.
 
 :warning: Serving 2FA/OTP registration links over insecure (HTTP) can expose secrets intended for the user and is **highly** discouraged!
 
 :information_source: +ops can also manually enable or disable 2FA/OTP for a user using [oputil](/docs/admin/oputil.md), but this is generally discouraged.
 
+#### Recovery
+In the situation that a user loses their 2FA/OTP device (such as a lost phone with Google Auth), there are some options:
+* Utilize one of their backup codes.
+* Contact the SysOp.
+
+:warning: There is no way for a user to disable 2FA/OTP without first fully logging in! This is by design as a security measure.
+
 ### ACS Checks
 Various places throughout the system that implement [ACS](/docs/configuration/acs.md) can make 2FA specific checks:
 * `AR#`: Current users **required** authentication factor. `AR2` for example means 2FA/OTP is required for this user.

From 91fa8243c8efce1abe32db805e4aa823855382ac Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 18:11:54 -0600
Subject: [PATCH 0856/1013] Documentation + User 2FA/OTP Config mod docs * Add
 to nav

---
 core/user_2fa_otp_config.js         | 11 +++----
 docs/_includes/nav.md               |  2 ++
 docs/modding/top-x.md               |  2 +-
 docs/modding/user-2fa-otp-config.md | 51 +++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 docs/modding/user-2fa-otp-config.md

diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index e66f077b..61ef0a0c 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -31,20 +31,19 @@ const FormIds = {
 };
 
 const MciViewIds = {
-    enableToggle    : 1,
-    otpType        : 2,
-    submit          : 3,
-    infoText        : 4,
+    enableToggle        : 1,
+    otpType             : 2,
+    submit              : 3,
 
     customRangeStart    : 10,   //  10+ = customs
 };
 
 const DefaultMsg = {
     infoText: {
-        disabled        : 'Enabling 2-Factor Authentication via One-Time-Password can greatly increase the security of your account.',
+        disabled        : 'Enabling 2-Factor Authentication via One-Time-Password (2FA/OTP) can greatly increase the security of your account.',
         enabled         : 'A valid email address set in user config is required to enable 2-Factor Authentication.',
         rfc6238_TOTP    : 'Time-Based One-Time-Password (TOTP, RFC-6238).',
-        rfc4266_HOTP    : 'HMAC-Based One-Time-Passowrd (HOTP, RFC-4266).',
+        rfc4266_HOTP    : 'HMAC-Based One-Time-Password (HOTP, RFC-4266).',
         googleAuth      : 'Google Authenticator.',
     },
     statusText : {
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index e67f1163..5ecbe58e 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -25,6 +25,7 @@
     - [Colour Codes]({{ site.baseurl }}{% link configuration/colour-codes.md %})
     - [Access Condition System (ACS)]({{ site.baseurl }}{% link configuration/acs.md %})
     - [Event Scheduler]({{ site.baseurl }}{% link configuration/event-scheduler.md %})
+    - [Security]({{ site.baseurl }}{% link configuration/security.md %})
     - Scheduled jobs
 
   - File Base
@@ -83,6 +84,7 @@
     - [Set Newscan Date]({{ site.baseurl }}{% link modding/set-newscan-date.md %})
     - [Node to Node Messaging]({{ site.baseurl }}{% link modding/node-msg.md %})
     - [Top X]({{ site.baseurl }}{% link modding/top-x.md %})
+    - [2FA/OTP Config]({{ site.baseurl }}{% link modding/user-2fa-otp-config.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/top-x.md b/docs/modding/top-x.md
index 50d69bee..41ac5ab7 100644
--- a/docs/modding/top-x.md
+++ b/docs/modding/top-x.md
@@ -48,7 +48,7 @@ mciMap: {
 }
 ```
 
-### Theming
+## Theming
 Generally `mciMap` entries will point to a Vertical List View Menu (`%VM1`, `%VM2`, etc.). The following `itemFormat` object is provided:
 * `value`: The value acquired from the supplied data source.
 * `userName`: User's username.
diff --git a/docs/modding/user-2fa-otp-config.md b/docs/modding/user-2fa-otp-config.md
new file mode 100644
index 00000000..499f6083
--- /dev/null
+++ b/docs/modding/user-2fa-otp-config.md
@@ -0,0 +1,51 @@
+---
+layout: page
+title: TopX
+---
+## The 2FA/OTP Config Module
+The `user_2fa_otp_config` module provides opt-in, configuration, and viewing of Two-Factor Authentication via One-Time-Password (2FA/OTP) settings. For more information on 2FA/OTP see [Security](/docs/configuration/security.md).
+
+## Configuration
+
+### Config Block
+Available `config` block entries:
+* `infoText`: Overrides default informational text string(s). See **Info Text** below.
+* `statusText:` Overrides default status text string(s). See **Status Text** below.
+
+Example:
+```hjson
+config: {
+    infoText: {
+        googleAuth: Google Authenticator available on mobile phones, etc.
+    }
+    statusText: {
+        saveError: Doh! Failed to save :(
+    }
+}
+```
+
+#### Info Text (infoText)
+Overrides default informational text relative to current selections. Available keys:
+* `disabled`: Displayed when OTP switched to enabled.
+* `enabled`: Displayed when OTP switched to disabled.
+* `rfc6238_TOTP`: Describes TOTP.
+* `rfc4266_HOTP`: Describes HOTP.
+* `googleAuth`: Describes Google Authenticator OTP.
+
+#### Status Text (statusText)
+Overrides default status text for various conditions. Available keys:
+* `otpNotEnabled`
+* `noBackupCodes`
+* `saveDisabled`
+* `saveEmailSent`
+* `saveError`
+* `qrNotAvail`
+* `emailRequired`
+
+## Theming
+The following MCI codes are available:
+* MCI 1: (ie: `TM1`): Toggle 2FA/OTP enabled/disabled.
+* MCI 2: (ie: `SM2`): 2FA/OTP type selection.
+* MCI 3: (ie: `TM3`): Submit/cancel toggle.
+* MCI 10...99: Custom entries with the following format members available:
+    * `{infoText}`: **Info Text** for current selection.

From 64c06d88093f66ef79ad19414ed65f9540a39f94 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 18:41:58 -0600
Subject: [PATCH 0857/1013] Minor update on ACS defaults

---
 docs/modding/user-2fa-otp-config.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/modding/user-2fa-otp-config.md b/docs/modding/user-2fa-otp-config.md
index 499f6083..5b0f045d 100644
--- a/docs/modding/user-2fa-otp-config.md
+++ b/docs/modding/user-2fa-otp-config.md
@@ -3,7 +3,9 @@ layout: page
 title: TopX
 ---
 ## The 2FA/OTP Config Module
-The `user_2fa_otp_config` module provides opt-in, configuration, and viewing of Two-Factor Authentication via One-Time-Password (2FA/OTP) settings. For more information on 2FA/OTP see [Security](/docs/configuration/security.md).
+The `user_2fa_otp_config` module provides opt-in, configuration, and viewing of Two-Factor Authentication via One-Time-Password (2FA/OTP) settings. In order to allow users access to 2FA/OTP, the system must be properly configured. See [Security](/docs/configuration/security.md) for more information.
+
+:information_source: By default, the 2FA/OTP configuration menu may only be accessed by users connected securely (ACS `SC`). It is highly recommended to leave this default as accessing these settings over a plain-text connection could expose private secrets!
 
 ## Configuration
 

From 42ac6f86890bc816059551227207450b8747e8c5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 18:42:15 -0600
Subject: [PATCH 0858/1013] ACS checks can now be applied to form actions

---
 WHATSNEW.md       | 17 +++++++++++++++++
 core/menu_util.js |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 76f8baf6..53dc54cb 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -10,6 +10,23 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 + `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user.
 * `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP.
 * `oputil.js fb scan --quick` is now the default. Override with `--full-scan`.
+* ACS checks can now be applied to form actions. For example:
+```hjson
+{
+    value: { command: "SEC" }
+    action: [
+        {
+            //  secure connections can go here
+            acs: SC
+            action: @menu:securityMenu
+        }
+        {
+            //  non-secure connections
+            action: @menu:secureConnectionRequired
+        }
+    ]
+}
+```
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
diff --git a/core/menu_util.js b/core/menu_util.js
index c05f90d9..18b17d9f 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -172,7 +172,8 @@ function handleAction(client, formData, conf, cb) {
         return cb(Errors.MissingParam('Missing config'));
     }
 
-    const actionAsset = asset.parseAsset(conf.action);
+    const action = client.acs.getConditionalValue(conf.action, 'action');    //  handle any conditionals
+    const actionAsset = asset.parseAsset(action);
     if(!_.isObject(actionAsset)) {
         return cb(Errors.Invalid('Unable to parse "conf.action"'));
     }

From abc6a362751e6b8032e49c173f5d0cbb4d9bdd88 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 15 Jun 2019 22:18:51 -0600
Subject: [PATCH 0859/1013] OTP/2FA config template & luciano blocktronics
 theme

---
 .../luciano_blocktronics/2FACONFSCR.ans       | Bin 0 -> 2672 bytes
 .../luciano_blocktronics/2FAOTPSECREQ.ans     | Bin 0 -> 272 bytes
 art/themes/luciano_blocktronics/theme.hjson   |  41 ++++++++
 core/user_2fa_otp_config.js                   |   3 +-
 misc/menu_template.in.hjson                   |  96 ++++++++++++++++++
 5 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 art/themes/luciano_blocktronics/2FACONFSCR.ans
 create mode 100644 art/themes/luciano_blocktronics/2FAOTPSECREQ.ans

diff --git a/art/themes/luciano_blocktronics/2FACONFSCR.ans b/art/themes/luciano_blocktronics/2FACONFSCR.ans
new file mode 100644
index 0000000000000000000000000000000000000000..3c2560007a954e0fedf9f1c121b4844f005e5026
GIT binary patch
literal 2672
zcmb_e%TC)s6opl#Y`dw-W;QIV+K!0}S%oxhS%e^B%7Rr$O;wc%uRwnb@jJ2VKdE}o
zojYTjpss49#B=99&OP@Lw$7q{8uh!8HCtz~Em!qZl~uWQ7Fo#SAwH-CS*?J#ib}@t
z(|sE?+3^-~BQ|BntX9rpmip_}ic*8%-NgRkSI?eIN5>{Vo!}7JcOv>U80M2>GdRh=
zj1KdI;UGVl98x>7??u5(4o40B{9xQX9u20`)5-Bi4dXy4#KexKKm!hX!U5CVtIvQn
zpDpIar7{4tbsoJ4mccHu`C#9HYCEu34}~{3>cHU9D9Oc4Z;^}OxLRJDyX9<oe+L~Q
zevis_J0Hg)=;^Cer|Zew9_MjHy{)q(^FrcfZ9+IYzqp(|T-^eD2Hj9A4Kf`kK8U>1
zUmBF0KNqE4$4Z4wRTUA8y^#X>tRH?9zsw!DUChoe3v+X8=2zc9lR%24LG1au#rbUh
z^Zr_N@4Rv#0N9!VsUVFlq)I?xwwT`*OEpfUx9y^(`n^~bx3gto7QpyI#E@Zyrd~^1
zggOUVt%|l$VX`wUF$r-$&1?x-8d<$b!(h;fAD6^Q(~P}|aG;1|1sAYHc?G*yj(fiH
zB_F9f<A4~%>!Y6`l;B_`qdS#~Umii33?xwT=@^1-?*VaKt+)*kfwwsPuJ|hLiak=5
zE1aR|Y`bBH(4lfxFBZDuA`zGP#vjsGAN*eT@*ESiXfKE=IB@r24j>^OTmzSo*Pas)
zURz+MB}JEyP$pF3oF<l3r_fNYV8-QvBP!Yp3~N<+#rb3L!3})XqgZ0|kt2WO07%RD
zj!3v-boX|s{X#V0$N&nDAYyq%ASWpbk9vo2|MUShmzp=JygEFvWtjtBC1>6RnF0`N
za;wxQlD>48Tl7I84#nY838^*XNLJF?<WX)&p-WIQ5<5VaMwTo^k6qkSlf2--Q{~xe
zkwpy7m!yYIY3AqR{j&fJ;O7T<`ab{AE~2`?&!;?YY?RsH!9jU?@=@!O2BzTNx16T0
zE#Oa0Tf94#h%eOdd2E+=Giz4@pEU=Qw_F{7>U^Oz_-X2TG?|`+38zCF{=8y=xmpJV
zD3YvvuC4YIk$gucUwZcOQ9&T?v$XvM@(#`#Dy~<>30%1;gesd<_p`LLGOVRv3!-CB
zLm6su<p$o%IL{IQ!-K?RX@-5=`gP(~0F_uu3YkDu_)JumROCXF+`J+yQJX7$UTN1i
zocsR^3lvY)c{?4P3`bE!fB)%8qIfsz#XGM$8ylOOM;mW8<avFtKQ>=K58Nqy{snmY
BfCB&k

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/2FAOTPSECREQ.ans b/art/themes/luciano_blocktronics/2FAOTPSECREQ.ans
new file mode 100644
index 0000000000000000000000000000000000000000..ce0079ac319ed0339eb9babd9d3892dcc1dd4bc3
GIT binary patch
literal 272
zcmb1+Hn27^ur@Z&<pKifXk)Wn1t4%#C{9f-ElO2L&d<wBO)kmI&r`@ORwzm>EX^!R
zO;ISxS4d1wPAx80FmiL$_YVmGsxK+Y%u6p;1e;<GGzDr{NKqx+l)Q9>vdlz<;9w7h
z{34hY;i*Z%`N`R-CB=GNQo)X)&aMUqAU9A67#SE^8kiZHPGewTU}OwnU<cAbAnfVn
Ms}Sby2;sp=0K=R-8UO$Q

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 0e21329c..ab49f1fa 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -385,6 +385,47 @@
 				}
 			}
 
+			userTwoFactorAuthOTPConfig: {
+				config: {
+					menuInfoFormat10: "{infoText}"
+					infoText: {
+						disabled: Enabling 2-factor authentication can greatly increase account security.
+					}
+				}
+				mci: {
+					TM1: {
+						width: 20
+						items: [
+							"enabled"
+							"disabled"
+						]
+						focusTextStyle: upper
+						styleSGR1: |08
+					}
+					SM2: {
+						width: 20
+						focusTextStyle: upper
+						styleSGR1: |08
+						items: [
+						//	order is important:
+							"Time-Based - TOTP"
+							"HMAC-Based - HOTP"
+							"Google Auth"
+						]
+					}
+					TM3: {
+						focusTextStyle: upper
+						styleSGR1: |00|08
+					}
+					MT10: {
+						width: 31
+						height: 3
+						mode: preview
+						acceptsFocus: false
+					}
+				}
+			}
+
 			nodeMessage: {
 				config: {
 					messageFormat: "|00|08 :: |03message from |11{fromUserName} |08/ |03node |11{fromNodeId}|08 @ |11{timestamp} |08::\r\n|07    {message}"
diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index 61ef0a0c..8ad50425 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -34,13 +34,14 @@ const MciViewIds = {
     enableToggle        : 1,
     otpType             : 2,
     submit              : 3,
+    infoText            : 4,
 
     customRangeStart    : 10,   //  10+ = customs
 };
 
 const DefaultMsg = {
     infoText: {
-        disabled        : 'Enabling 2-Factor Authentication via One-Time-Password (2FA/OTP) can greatly increase the security of your account.',
+        disabled        : 'Enabling 2-factor authentication can greatly increase account security.',
         enabled         : 'A valid email address set in user config is required to enable 2-Factor Authentication.',
         rfc6238_TOTP    : 'Time-Based One-Time-Password (TOTP, RFC-6238).',
         rfc4266_HOTP    : 'HMAC-Based One-Time-Password (HOTP, RFC-4266).',
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 9409a9c9..9de82c76 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1137,6 +1137,23 @@
                     value: { command: "MRC" }
                     action: @menu:mrc
                 }
+                {
+                    value: { command: "2FA" }
+                    action: [
+                        {
+                            //
+                            //  For security reasons, only allow 2FA/OTP to be
+                            //  configured over already secure (SSL, wss://, ...)
+                            //  connections. Not doing so risks leaking secrets!
+                            //
+                            acs: SC
+                            action: @menu:userTwoFactorAuthOTPConfig
+                        }
+                        {
+                            action: @menu:userTwoFactorAuthOTPSecConnRequired
+                        }
+                    ]
+                }
                 {
                     value: 1
                     action: @menu:mainMenu
@@ -1210,6 +1227,85 @@
             }
         }
 
+        userTwoFactorAuthOTPConfig: {
+            desc: 2FA/OTP Config
+            module: user_2fa_otp_config
+            art: 2FACONFSCR
+            form: {
+                0: {
+                    mci: {
+                        TM1: {
+                            argName: enableToggle
+                            focus: true
+                            items: [
+                                //  order is important here:
+                                "disable"
+                                "enable/reset"
+                            ]
+                        }
+                        SM2: {
+                            argName: otpType
+                            items: [
+                                //  order is important here:
+                                "Time-Based - TOTP"
+                                "HMAC-Based - HOTP"
+                                "Google Authenticator"
+                            ]
+                        }
+                        TM3: {
+                            argName: submit
+                            items: [
+                                "save"
+                                "cancel"
+                            ]
+                            submit: true
+                        }
+                    }
+
+                    submit: {
+                        *: [
+                            {
+                                value: { submit: 0 }
+                                action: @method:saveChanges
+                            }
+                            {
+                                value: { submit: 1 }
+                                action: @systemMethod:prevMenu
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                        {
+                            keys: [ "q", "shift + q" ]
+                            action: @method:showQRCode
+                        }
+                        {
+                            keys: [ "s", "shift + s" ]
+                            action: @method:showSecret
+                        }
+                        {
+                            keys: [ "b", "shift + b" ]
+                            action: @method:showBackupCodes
+                        }
+                        {
+                            keys: [ "n", "shift + n" ]
+                            action: @method:generateNewBackupCodes
+                        }
+                    ]
+                }
+            }
+        }
+
+        userTwoFactorAuthOTPSecConnRequired: {
+            desc: Insecure Warning
+            art: 2FAOTPSECREQ
+        }
+
         nodeMessage: {
             desc: Node Messaging
             module: node_msg

From da961c34a734760ca32978ead4b9947b4b61486b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Jun 2019 11:01:58 -0600
Subject: [PATCH 0860/1013] Add docs on template files

---
 art/themes/luciano_blocktronics/2FAOTP.ans | Bin 0 -> 295 bytes
 docs/modding/user-2fa-otp-config.md        |  20 ++++++++++++++++++++
 misc/otp_register_email.template.html      |  11 +++++++++++
 misc/otp_register_email.template.txt       |   7 +++++++
 www/otp_register.template.html             |   8 ++++----
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/2FAOTP.ans
 create mode 100644 misc/otp_register_email.template.html
 create mode 100644 misc/otp_register_email.template.txt

diff --git a/art/themes/luciano_blocktronics/2FAOTP.ans b/art/themes/luciano_blocktronics/2FAOTP.ans
new file mode 100644
index 0000000000000000000000000000000000000000..7828fe6af5c6ce89ac5b0594c308c72988affcaf
GIT binary patch
literal 295
zcmb1+Hn27^ur@Z&<$?j}XhTD1>1boKTz@}Tg%D3)SA_t_;9v!yxV5oCu9Y-U3s4fs
zH#W>wbqz5DN`PrDE}&GdbhIT<H(03#Pz_M6QLa&1B2-8pDw1DPppaRtkeZj6l#`mG
zkd|MhP?7-@NK8)7FU>0fnr#lU0c?yWmsGH0sI#kqfdch_k%6J5ftjJ%CI$uuM#caJ
U9v}?_!k$jP3SsV!5FVTa039wl#Q*>R

literal 0
HcmV?d00001

diff --git a/docs/modding/user-2fa-otp-config.md b/docs/modding/user-2fa-otp-config.md
index 5b0f045d..7b41939f 100644
--- a/docs/modding/user-2fa-otp-config.md
+++ b/docs/modding/user-2fa-otp-config.md
@@ -51,3 +51,23 @@ The following MCI codes are available:
 * MCI 3: (ie: `TM3`): Submit/cancel toggle.
 * MCI 10...99: Custom entries with the following format members available:
     * `{infoText}`: **Info Text** for current selection.
+
+### Web and Email Templates
+A template system is also available to customize registration emails and the landing page.
+
+#### Emails
+Multipart MIME emails are send built using template files pointed to by `users.twoFactorAuth.otp.registerEmailText` and `users.toFactorAuth.otp.registerEmailHtml` supporting the following variables:
+* `%BOARDNAME%`: BBS name.
+* `%USERNAME%`: Username receiving email.
+* `%TOKEN%`: Temporary registration token generally used in URL.
+* `%REGISTER_URL%`: Full registration URL.
+
+#### Landing Page
+The landing page template is pointed to by `users.twoFactorAuth.otp.registerPageTemplate` and supports the following variables:
+* `%BOARDNAME%`: BBS name.
+* `%USERNAME%`: Username receiving email.
+* `%TOKEN%`: Temporary registration token generally used in URL.
+* `%OTP_TYPE%`: OTP type such as `googleAuth`.
+* `%POST_URL%`: URL to POST form to.
+* `%QR_IMG_DATA%`: QR code in URL image data format. Not always available depending on OTP type and will be set to blank in these cases.
+* `%SECRET%`: Secret for manual entry.
diff --git a/misc/otp_register_email.template.html b/misc/otp_register_email.template.html
new file mode 100644
index 00000000..f9fcd65b
--- /dev/null
+++ b/misc/otp_register_email.template.html
@@ -0,0 +1,11 @@
+<b>%USERNAME%</b>:<br>
+<br>
+<p>
+	You have requested to enable 2-Factor Authentication via One-Time-Password for your account on <b>%BOARDNAME%</b>.<br>
+</p>
+<p>
+	If this was not you, please ignore this email and <u>consider changing your password</u>. Otherwise, <a href="%REGISTER_URL%">please follow this link</a> or copy and paste the link below:<br><br>
+	%REGISTER_URL%<br>
+</p>
+
+
diff --git a/misc/otp_register_email.template.txt b/misc/otp_register_email.template.txt
new file mode 100644
index 00000000..c275515e
--- /dev/null
+++ b/misc/otp_register_email.template.txt
@@ -0,0 +1,7 @@
+%USERNAME%:
+
+You have requested to enable 2-Factor Authentication via One-Time-Password for your account on %BOARDNAME%.
+
+If this was not you, please ignore this email and consider changing your password. Otherwise, please follow the link below:
+
+%REGISTER_URL%
diff --git a/www/otp_register.template.html b/www/otp_register.template.html
index 90eeba16..20a63ed2 100644
--- a/www/otp_register.template.html
+++ b/www/otp_register.template.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <html lang="en">
-	<head>
-		<meta charset="utf-8">
+    <head>
+        <meta charset="utf-8">
         <title>Enable 2FA/OTP — ENiGMA½ BBS</title>
         <meta name="description" content="Enable 2-Factor Authentication via One-Time-Password">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-	</head>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+    </head>
 	<body>
         <p>
             Your OTP secret:<br>

From abc6465af40458d8b3ec7ab13516d4c735c03989 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Jun 2019 15:30:47 -0600
Subject: [PATCH 0861/1013] Template fixes

---
 core/user_2fa_otp_config.js |  2 +-
 misc/menu_template.in.hjson | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/user_2fa_otp_config.js b/core/user_2fa_otp_config.js
index 8ad50425..1a7bf0c6 100644
--- a/core/user_2fa_otp_config.js
+++ b/core/user_2fa_otp_config.js
@@ -153,7 +153,7 @@ exports.getModule = class User2FA_OTPConfigModule extends MenuModule {
             }
         };
         this.gotoMenu(
-            this.menuConfig.config.user2FAOTP_ShowDetails || 'user2FAOTP_ShowDetails',
+            this.menuConfig.config.userTwoFactorAuthOTPConfigShowDetails || 'userTwoFactorAuthOTPConfigShowDetails',
             modOpts,
             cb
         );
diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 9de82c76..9be72102 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -1304,6 +1304,19 @@
         userTwoFactorAuthOTPSecConnRequired: {
             desc: Insecure Warning
             art: 2FAOTPSECREQ
+            config: {
+                cls: true
+                pause: true
+            }
+        }
+
+        userTwoFactorAuthOTPConfigShowDetails: {
+            desc: 2FA/OTP Details
+            module: show_art
+            config: {
+                pause: true
+                method: extraArgs
+            }
         }
 
         nodeMessage: {

From b9a2881c88b44765dc44410723f96786e755d2ac Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Jun 2019 15:32:57 -0600
Subject: [PATCH 0862/1013] Fix luciano theme

---
 art/themes/luciano_blocktronics/theme.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index ab49f1fa..52a4f038 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -396,8 +396,8 @@
 					TM1: {
 						width: 20
 						items: [
-							"enabled"
 							"disabled"
+							"enabled"
 						]
 						focusTextStyle: upper
 						styleSGR1: |08

From ec3b6173c924128095896394dfe5fa170c1b55ae Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Jun 2019 17:28:13 -0600
Subject: [PATCH 0863/1013] Better 'secure connection required' screen

---
 .../luciano_blocktronics/2FAOTPSECREQ.ans       | Bin 272 -> 248 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/2FAOTPSECREQ.ans b/art/themes/luciano_blocktronics/2FAOTPSECREQ.ans
index ce0079ac319ed0339eb9babd9d3892dcc1dd4bc3..c81720ec0e3b1386639e8aaea7e74ca87e2f57c6 100644
GIT binary patch
literal 248
zcmb1+Hn27^ur@Z&<pKc(1qJD7Lu+G$Tq`RpAQLEKmRp%$s*qb+T%wSas*s$YmzSDc
zlA5BBUzS>=kf>0cnp|207thSkQz*$-C@oG^D9OkyR!B=tECEVOM*}TDGMP&%*fG@E
r)xZE~AGLsyfuW^=nW0%N0|NsiV*mpikOl%_PbXi6Fn31?4^9FAN5L~f

literal 272
zcmb1+Hn27^ur@Z&<pKifXk)Wn1t4%#C{9f-ElO2L&d<wBO)kmI&r`@ORwzm>EX^!R
zO;ISxS4d1wPAx80FmiL$_YVmGsxK+Y%u6p;1e;<GGzDr{NKqx+l)Q9>vdlz<;9w7h
z{34hY;i*Z%`N`R-CB=GNQo)X)&aMUqAU9A67#SE^8kiZHPGewTU}OwnU<cAbAnfVn
Ms}Sby2;sp=0K=R-8UO$Q


From 29ced3899416df697be45be73083dac5d3e87b45 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 16 Jun 2019 18:56:25 -0600
Subject: [PATCH 0864/1013] Template minor fix

---
 misc/menu_template.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 9be72102..a2a183a5 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -71,7 +71,7 @@
                     next: loginTwoFactorAuthOTPLoop
                 }
                 {
-                    next: mainMenu
+                    next: fullLoginSequenceLoginArt
                 }
             ]
             config: { nextTimeout: 1500 }

From 20d3b0fec9f0b58bf62d6c9323f4abc2c59daef5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 17 Jun 2019 21:08:50 -0600
Subject: [PATCH 0865/1013] Doh, fix username vs realname

---
 README.md   | 1 +
 core/fse.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b72d42cb..92c9a940 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Renegade style [pipe color codes](/docs/configuration/colour-codes.md).
  * [SQLite](http://sqlite.org/) storage of users, message areas, etc.
  * Strong [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) backed password encryption.
+ * Support for 2-Factor Authentication with One-Time-Passwords
  * [Door support](docs/modding/door-servers.md) including common dropfile formats for legacy DOS doors. Built in [BBSLink](http://bbslink.net/), [DoorParty](http://forums.throwbackbbs.com/), [Exodus](https://oddnetwork.org/exodus/) and [CombatNet](http://combatnet.us/) support!
  * [Bunyan](https://github.com/trentm/node-bunyan) logging!
  * [Message networks](docs/messageareas/message-networks.md) with FidoNet Type Network (FTN) + BinkleyTerm Style Outbound (BSO) message import/export. Messages Bases can also be exposed via [Gopher](docs/servers/gopher.md), or [NNTP](docs/servers/nntp.md)!
diff --git a/core/fse.js b/core/fse.js
index d86961b2..890fb009 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -326,10 +326,17 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
     buildMessage(cb) {
         const headerValues = this.viewControllers.header.getFormData().value;
 
+        const getFromUserName = () => {
+            const area = getMessageAreaByTag(this.messageAreaTag);
+            return (area && area.realNames) ?
+                this.client.user.getProperty(UserProps.RealName) || this.client.user.username :
+                this.client.user.username;
+        };
+
         const msgOpts = {
             areaTag         : this.messageAreaTag,
             toUserName      : headerValues.to,
-            fromUserName    : this.client.user.getProperty(UserProps.RealName) || this.client.user.username,
+            fromUserName    : getFromUserName(),
             subject         : headerValues.subject,
             //  :TODO: don't hard code 1 here:
             message         : this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),

From 2b2b1ef3bc13401fee9a5ef05f57ea05c41531f5 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 22 Jun 2019 23:13:38 +0100
Subject: [PATCH 0866/1013] Decrease MRC gui by one line

---
 art/themes/luciano_blocktronics/mrc.ans     | Bin 721 -> 720 bytes
 art/themes/luciano_blocktronics/theme.hjson |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/art/themes/luciano_blocktronics/mrc.ans b/art/themes/luciano_blocktronics/mrc.ans
index a3079f3c879ba6ccb6f8aac3571711279406892e..aba8b14259739f0c37f92bcef76ca5a830c48110 100644
GIT binary patch
delta 51
rcmcb}dVzIAFyrPB#&AZpbS4G{M#caJ2?j6__H^=92y=IY@Zcl>1vCco

delta 51
rcmcb>dXaTQFyrPR#t25WOeO{fM#caJNd_<w_H^=92y=IY@Zcl>1#brQ

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 52a4f038..86f1ed3b 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -1128,7 +1128,7 @@
 					mci: {
 						MT1: {
 							width: 72
-							height: 19
+							height: 18
 						}
                         ET2: {
                             width: 69 // fnarr!

From 65b48a2af2547f5de6ee8cf0dd6a4b2f8198f67e Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sat, 22 Jun 2019 23:16:08 +0100
Subject: [PATCH 0867/1013] Fix MRC prettyBoardName and /INFO

---
 core/servers/chat/mrc_multiplexer.js | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index fd83d462..67ca9dc6 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -36,6 +36,7 @@ exports.getModule = class MrcModule extends ServerModule {
         this.log            = Log.child( { server : 'MRC' } );
 
         const config        = Config();
+        this.boardName      = config.general.prettyBoardName || config.general.boardName;
         this.mrcConnectOpts = {
             host         : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
             port         : config.chatServers.mrc.serverPort || 5000,
@@ -44,11 +45,9 @@ exports.getModule = class MrcModule extends ServerModule {
     }
 
     _connectionHandler() {
-        const config = Config();
-        const boardName  = config.general.prettyBoardName || config.general.boardName;
         const enigmaVersion = 'ENiGMA½-BBS_' + require('../../../package.json').version;
 
-        const handshake = `${boardName}~${enigmaVersion}/${os.platform()}.${os.arch()}/${protocolVersion}`;
+        const handshake = `${this.boardName}~${enigmaVersion}/${os.platform()}.${os.arch()}/${protocolVersion}`;
         this.log.debug({ handshake : handshake }, 'Handshaking with MRC server');
 
         this.sendRaw(handshake);
@@ -209,9 +208,7 @@ exports.getModule = class MrcModule extends ServerModule {
      * Processes messages received from the central MRC server
      */
     receiveFromMRC(message) {
-
         const config = Config();
-        const siteName = slugify(config.general.boardName);
 
         if (message.from_user == 'SERVER' && message.body == 'HELLO') {
             // reply with extra bbs info
@@ -223,7 +220,7 @@ exports.getModule = class MrcModule extends ServerModule {
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
-            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
+            this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${this.boardName}`);
 
         } else {
             // if not a heartbeat, and we have clients then we need to send something to them
@@ -263,12 +260,10 @@ exports.getModule = class MrcModule extends ServerModule {
      * Converts a message back into the MRC format and sends it to the central MRC server
      */
     sendToMrcServer(fromUser, fromRoom, toUser, toSite, toRoom, messageBody) {
-        const config = Config();
-        const siteName = slugify(config.general.boardName);
 
         const line = [
             fromUser,
-            siteName,
+            this.boardName,
             sanitiseRoomName(fromRoom),
             sanitiseName(toUser || ''),
             sanitiseName(toSite || ''),
@@ -307,14 +302,3 @@ function sanitiseMessage(message) {
     return message.replace(/[^\x20-\x7D]/g, '');
 }
 
-/**
- * SLugifies the BBS name for use as an MRC "site name"
- */
-function slugify(text) {
-    return text.toString()
-        .replace(/\s+/g, '_')           // Replace spaces with _
-        .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
-        .replace(/\-\-+/g, '_')         // Replace multiple - with single -
-        .replace(/^-+/, '')             // Trim - from start of text
-        .replace(/-+$/, '');            // Trim - from end of text
-}
\ No newline at end of file

From fdce4c939cbb093024d2134b6c88d0bce6ef6904 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 22 Jun 2019 20:26:58 -0600
Subject: [PATCH 0868/1013] Minor

---
 core/fse.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/fse.js b/core/fse.js
index 890fb009..d77fbfed 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -338,7 +338,6 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             toUserName      : headerValues.to,
             fromUserName    : getFromUserName(),
             subject         : headerValues.subject,
-            //  :TODO: don't hard code 1 here:
             message         : this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
         };
 

From 2f391bdbab3d0d0857d2be111a38acd265290a21 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 30 Jun 2019 19:25:47 -0600
Subject: [PATCH 0869/1013] Spelling

---
 core/msg_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/msg_list.js b/core/msg_list.js
index f73dae8a..380fc5e4 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -227,7 +227,7 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                             return callback(err);
                         });
                     },
-                    function getLastReadMesageId(callback) {
+                    function getLastReadMessageId(callback) {
                         //  messageList entries can contain |isNew| if they want to be considered new
                         if(configProvidedMessageList) {
                             self.lastReadId = 0;

From 53aea7098fea9c8a8ea31f4d736398162f7552ee Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 6 Jul 2019 21:15:19 -0600
Subject: [PATCH 0870/1013] Deps updated working fine

---
 package.json |  34 ++++----
 yarn.lock    | 239 ++++++++++++++++++++++++++-------------------------
 2 files changed, 139 insertions(+), 134 deletions(-)

diff --git a/package.json b/package.json
index bbc8a94f..235018a7 100644
--- a/package.json
+++ b/package.json
@@ -22,41 +22,41 @@
     "retro"
   ],
   "dependencies": {
-    "async": "^2.6.2",
-    "binary-parser": "^1.3.2",
+    "async": "3.1.0",
+    "binary-parser": "1.4.0",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "^7.0.1",
-    "glob": "^7.1.2",
-    "graceful-fs": "^4.1.15",
+    "fs-extra": "8.1.0",
+    "glob": "7.1.4",
+    "graceful-fs": "4.2.0",
     "hashids": "^1.1.1",
     "hjson": "^3.1.2",
-    "iconv-lite": "^0.4.23",
-    "inquirer": "^6.2.2",
+    "iconv-lite": "0.5.0",
+    "inquirer": "6.4.1",
     "later": "1.2.0",
     "lodash": "^4.17.10",
     "lru-cache": "^5.1.1",
-    "mime-types": "^2.1.22",
+    "mime-types": "2.1.24",
     "minimist": "1.2.x",
     "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
     "node-pty": "^0.8.1",
-    "nodemailer": "^5.1.1",
+    "nodemailer": "6.2.1",
+    "otplib": "11.0.1",
+    "qrcode-generator": "1.4.3",
     "rlogin": "^1.0.0",
-    "sane": "^4.0.2",
+    "sane": "4.1.0",
     "sanitize-filename": "^1.6.1",
-    "sqlite3": "^4.0.6",
+    "sqlite3": "4.0.9",
     "sqlite3-trans": "^1.2.1",
-    "ssh2": "^0.8.2",
+    "ssh2": "0.8.4",
     "temptmp": "^1.1.0",
     "uuid": "^3.2.1",
-    "uuid-parse": "^1.0.0",
-    "ws": "^6.1.3",
+    "uuid-parse": "1.1.0",
+    "ws": "7.0.1",
     "xxhash": "^0.2.4",
-    "yazl": "^2.5.1",
-    "otplib": "^10.0.1",
-    "qrcode-generator": "1.4.3"
+    "yazl": "^2.5.1"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 0b081218..d9aade26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -32,10 +40,10 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
@@ -114,17 +122,15 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-async-limiter@~1.0.0:
+async-limiter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
-  dependencies:
-    lodash "^4.17.11"
+async@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
+  integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -171,10 +177,10 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-binary-parser@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.3.2.tgz#5bd04f948ada1a6d78c528762308a9a335d63db9"
-  integrity sha512-VDhHcpeF1/ZZy1XvDmYD67bBjRNm1gacw+772xNd5BnTH6ax5TzlDV5dl7216/UlQXQoN9vug07ehk7e0PhNUw==
+binary-parser@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.4.0.tgz#5f32d9b28f2027968dc660b680699dc030a6ea92"
+  integrity sha512-z4TOFQFy5YzhEy50mM+WV6BRu3xo0Vpe5qEtVwnUZkhibuNrPKkBXTpzSs2xcSW6TMVeXas77fEsEVV+lj4/iw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -241,12 +247,12 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -491,13 +497,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-exec-sh@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
-  dependencies:
-    merge "^1.2.0"
-
 exec-sh@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
@@ -655,12 +654,12 @@ from2@^2.3.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+fs-extra@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
-    graceful-fs "^4.1.2"
+    graceful-fs "^4.2.0"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
@@ -709,6 +708,18 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -743,12 +754,12 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-graceful-fs@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+graceful-fs@4.2.0, graceful-fs@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -826,7 +837,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@^0.4.23, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
+  integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -858,10 +876,10 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
+inquirer@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.1.tgz#7bd9e5ab0567cd23b41b0180b68e0cfa82fc3c0b"
+  integrity sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -874,7 +892,7 @@ inquirer@^6.2.2:
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 is-accessor-descriptor@^0.1.6:
@@ -1129,11 +1147,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-merge@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
-  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
-
 micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -1153,15 +1166,22 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
   integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
-mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
+mime-types@2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
 
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.20"
@@ -1170,13 +1190,6 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.36.0"
 
-mime-types@^2.1.22:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
-  dependencies:
-    mime-db "~1.38.0"
-
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -1273,10 +1286,10 @@ nan@^2.10.0, nan@^2.4.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
   integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
-nan@~2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+nan@^2.12.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -1358,10 +1371,10 @@ node-pty@^0.8.1:
   dependencies:
     nan "2.12.1"
 
-nodemailer@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-5.1.1.tgz#0c48d1ecab02e86d9ff6c620ee75ed944b763505"
-  integrity sha512-hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ==
+nodemailer@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.2.1.tgz#20d773925eb8f7a06166a0b62c751dc8290429f3"
+  integrity sha512-TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -1478,10 +1491,10 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-otplib@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/otplib/-/otplib-10.0.1.tgz#d37fcd13203298c0b94937d55c5a3527ed877875"
-  integrity sha512-FtbKelYtio2af5LDBWz3bWS6T03taHJAIv3evMrXuvoM50z5jbWoEMabPCk0A0JqiLGBzAIDJWfR9gSsvRYZHA==
+otplib@11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/otplib/-/otplib-11.0.1.tgz#7d64aa87029f07c99c7f96819fb10cdb67dea886"
+  integrity sha512-oi57teljNyWTC/JqJztHOtSGeFNDiDh5C1myd+faocUtFAX27Sm1mbx69kpEJ8/JqrblI3kAm4Pqd6tZJoOIBQ==
   dependencies:
     thirty-two "1.0.2"
 
@@ -1698,10 +1711,10 @@ rlogin@^1.0.0:
   resolved "https://registry.yarnpkg.com/rlogin/-/rlogin-1.0.0.tgz#db07322b31219126625d9d0aa9872d7ebe8ac403"
   integrity sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM=
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -1739,20 +1752,20 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.2.tgz#5bd4a3f1268fd7a921a2dc657047de635c8f8f25"
-  integrity sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==
+sane@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
+    capture-exit "^2.0.0"
     exec-sh "^0.3.2"
     execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
 
 sanitize-filename@^1.6.1:
   version "1.6.1"
@@ -1895,30 +1908,30 @@ sqlite3-trans@^1.2.1:
   dependencies:
     lodash "^4.17.4"
 
-sqlite3@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.6.tgz#e587b583b5acc6cb38d4437dedb2572359c080ad"
-  integrity sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw==
+sqlite3@4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.9.tgz#cff74550fa5a1159956815400bdef69245557640"
+  integrity sha512-IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==
   dependencies:
-    nan "~2.10.0"
+    nan "^2.12.1"
     node-pre-gyp "^0.11.0"
     request "^2.87.0"
 
-ssh2-streams@~0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.2.tgz#bac0d18727396d16049f5f0c8517a46516b45719"
-  integrity sha512-2rSj3oTIJnbAIzR3+XwIYef9wCOVrPQZNLL+fFPPjnPxf09tKkAbgrlYgh/1qynBTz65AUOS+s1zuko4M/GKCw==
+ssh2-streams@~0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.4.tgz#7f07464c4b19ee93324995ec7164f110c5a13658"
+  integrity sha512-yNfPZgJO/N69TvYkpDHZBkXAXQzTpfzRkOphQu3PeUpZnrjp9VNa8RKDZkZDpjsWItay+I4NMAbZZ7DqHRt0AQ==
   dependencies:
     asn1 "~0.2.0"
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.2.tgz#f7a172458d3a7a13d520438264f90de8a3ee72af"
-  integrity sha512-oaXu7faddvPFGavnLBkk0RFwLXvIzCPq6KqAC3ExlnFPAVIE1uo7pWHe9xmhNHXm+nIe7yg9qsssOm+ip2jijw==
+ssh2@0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.4.tgz#0a657d9371c1fe9f9e349bcff6144febee256aa6"
+  integrity sha512-qztb9t4b34wJSiWVpeTMVVN/5KCuBoyctBc2BcSe/Uq4NRnF0gB16Iu5p72ILhdYATcMNwB5WppzPIEs/3wB8Q==
   dependencies:
-    ssh2-streams "~0.4.2"
+    ssh2-streams "~0.4.4"
 
 sshpk@^1.7.0:
   version "1.14.2"
@@ -1994,12 +2007,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
@@ -2168,10 +2181,10 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid-parse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.0.0.tgz#f4657717624b0e4b88af36f98d89589a5bbee569"
-  integrity sha1-9GV3F2JLDkuIrzb5jYlYmlu+5Wk=
+uuid-parse@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
+  integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
 
 uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
@@ -2194,14 +2207,6 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -2221,12 +2226,12 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
-  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
+ws@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.0.1.tgz#1a04e86cc3a57c03783f4910fdb090cf31b8e165"
+  integrity sha512-ILHfMbuqLJvnSgYXLgy4kMntroJpe8hT41dOVWM8bxRuw6TK4mgMp9VJUNsZTEc5Bh+Mbs0DJT4M0N+wBG9l9A==
   dependencies:
-    async-limiter "~1.0.0"
+    async-limiter "^1.0.0"
 
 xtend@~4.0.1:
   version "4.0.1"

From 8fac7cb69f791d470c02fa5b7fbf817170a2fca0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 6 Jul 2019 22:49:12 -0600
Subject: [PATCH 0871/1013] README updates

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 92c9a940..efa593cd 100644
--- a/README.md
+++ b/README.md
@@ -53,12 +53,12 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 * [NetRunner](http://mysticbbs.com/downloads.html)
 * [MagiTerm](https://magickabbs.com/index.php/magiterm/)
 
-## Boards
-* WQH: :skull: [Xibalba](https://l33t.codes/xibalba-bbs) :skull: (**ssh://xibalba.l33t.codes:44511** or **telnet://xibalba.l33t.codes:44510**)
+## Some Boards
+* :skull: [Xibalba - ENiGMA WHQ](https://l33t.codes/xibalba-bbs) :skull: (**ssh://xibalba.l33t.codes:44511** or **telnet://xibalba.l33t.codes:44510**)
 * [fORCE9](http://bbs.force9.org/): (**telnet://bbs.force9.org**)
 * [Undercurrents](https://undercurrents.io): (**ssh://undercurrents.io**)
 * [PlaneT Afr0](https://planetafr0.org/): (**ssh://planetafr0.org:8889**)
-
+* [Goblin Studio](https://goblin.strangled.net): (**ssh://goblin.strangled.net:8889**)
 
 ## Installation
 On *nix type systems:
@@ -82,6 +82,7 @@ Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/install
 * [Apam](https://github.com/apamment) of [Magicka](https://magickabbs.com/)
 * [nail/blocktronics](http://blocktronics.org/tag/nail/) for the [sickmade Xibalba logo](http://pc.textmod.es/pack/blocktronics-420/n-xbalba.ans)!
 * [Whazzit/blocktronics](http://blocktronics.org/tag/whazzit/) for the amazing Mayan ANSI pieces scattered about Xibalba BBS!
+* [Smooth](https://16colo.rs/tags/artist/smooth)/[fUEL](https://fuel.wtf/) for lots of dope art. Why not [snag a T-Shirt](https://www.redbubble.com/people/araknet/works/39126831-enigma-1-2-software-logo-design-by-smooth-of-fuel?p=t-shirt)?
 
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:

From d728ddea4c823b5416aeac45096ba01c751cfaf3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 8 Jul 2019 19:24:37 -0600
Subject: [PATCH 0872/1013] Fix v3 async whilst

---
 core/menu_module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 526482da..95557e32 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -186,7 +186,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
         let opts = { cls : true };  //  clear screen for first message
 
         async.whilst(
-            () => this.client.interruptQueue.hasItems(),
+            (callback) => callback(null, this.client.interruptQueue.hasItems()),
             next => {
                 this.client.interruptQueue.displayNext(opts, err => {
                     opts = {};

From 1ec721212d18ce5e5903af0fa35e5c8a0141dbde Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 8 Jul 2019 19:27:54 -0600
Subject: [PATCH 0873/1013] v3 async until

---
 core/file_transfer.js | 2 +-
 core/file_util.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index 83dedc13..5f0138e2 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -205,7 +205,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
         let tryDstPath;
 
         async.until(
-            () => movedOk,  //  until moved OK
+            (callback) => callback(null, movedOk),  //  until moved OK
             (cb) => {
                 if(0 === renameIndex) {
                     //  try originally supplied path first
diff --git a/core/file_util.js b/core/file_util.js
index fdea4e45..56d8d5ac 100644
--- a/core/file_util.js
+++ b/core/file_util.js
@@ -38,7 +38,7 @@ function moveOrCopyFileWithCollisionHandling(src, dst, operation, cb) {
     }
 
     async.until(
-        () => opOk, //  until moved OK
+        (callback) => callback(null, opOk), //  until moved OK
         (cb) => {
             if(0 === renameIndex) {
                 //  try originally supplied path first

From 289b32c169a985805b66faca6e01504879403f88 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 8 Jul 2019 19:49:55 -0600
Subject: [PATCH 0874/1013] Allow idle monitor to be disabled

---
 WHATSNEW.md    | 1 +
 core/client.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 53dc54cb..be707a09 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -27,6 +27,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
     ]
 }
 ```
+* `idleLogoutSeconds` and `preAuthIdleLogoutSeconds` can now be set to `0` to fully disable the idle monitor.
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
diff --git a/core/client.js b/core/client.js
index b044bcdf..566aec5d 100644
--- a/core/client.js
+++ b/core/client.js
@@ -476,7 +476,7 @@ Client.prototype.startIdleMonitor = function() {
         //  use override value if set
         idleLogoutSeconds = this.idleLogoutSecondsOverride || idleLogoutSeconds;
 
-        if(nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000)) {
+        if(idleLogoutSeconds > 0 && (nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000))) {
             this.emit('idle timeout');
         }
     }, 1000 * 60);

From 3eed388e337ca0f9327694e39d12857dcfffd6f8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 11 Jul 2019 22:49:15 -0600
Subject: [PATCH 0875/1013] BBSLink + WebSockets does not update key press
 monitor

---
 core/bbs_link.js                | 25 ++++++++++++++++---------
 core/servers/login/websocket.js |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/core/bbs_link.js b/core/bbs_link.js
index 01eb3bfe..093f0bb2 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -135,27 +135,34 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     };
 
                     let clientTerminated;
+                    let dataOut;
 
                     self.client.term.write(resetScreen());
-                    self.client.term.write('  Connecting to BBSLink.net, please wait...\n');
+                    self.client.term.write(`  Connecting to ${self.config.host}, please wait...\n`);
 
                     const doorTracking = trackDoorRunBegin(self.client, `bbslink_${self.config.door}`);
 
                     const bridgeConnection = net.createConnection(connectOpts, function connected() {
                         self.client.log.info(connectOpts, 'BBSLink bridge connection established');
 
-                        self.client.term.output.pipe(bridgeConnection);
+                        dataOut = (data) => {
+                            return bridgeConnection.write(data);
+                        };
+
+                        self.client.term.output.on('data', dataOut);
 
                         self.client.once('end', function clientEnd() {
                             self.client.log.info('Connection ended. Terminating BBSLink connection');
                             clientTerminated = true;
-                            bridgeConnection.end();                            
+                            bridgeConnection.end();
                         });
                     });
 
-                    const restorePipe = function() {
-                        self.client.term.output.unpipe(bridgeConnection);
-                        self.client.term.output.resume();
+                    const restore = () => {
+                        if(dataOut && self.client.term.output) {
+                            self.client.term.output.removeListener('data', dataOut);
+                            dataOut = null;
+                        }
 
                         trackDoorRunEnd(doorTracking);
                     };
@@ -167,14 +174,14 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                     });
 
                     bridgeConnection.on('end', function connectionEnd() {
-                        restorePipe();
+                        restore();
                         return callback(clientTerminated ? Errors.General('Client connection terminated') : null);
                     });
 
                     bridgeConnection.on('error', function error(err) {
                         self.client.log.info('BBSLink bridge connection error: ' + err.message);
-                        restorePipe();
-                        callback(err);
+                        restore();
+                        return callback(err);
                     });
                 }
             ],
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 6a6b01dc..dadcdbe6 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -88,7 +88,7 @@ function WebSocketClient(ws, req, serverType) {
     });
 
     //
-    //  Montior connection status with ping/pong
+    //  Monitor connection status with ping/pong
     //
     ws.on('pong', () => {
         Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);

From 35dd2c758cb2b2f0116ad29e9a017a6c0c6f9e24 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Sun, 28 Jul 2019 23:18:12 +0100
Subject: [PATCH 0876/1013] Add install checks for gcc and make, allow specify
 of branch to install from

---
 misc/install.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/misc/install.sh b/misc/install.sh
index 1203705c..5da8e0e4 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -3,7 +3,7 @@
 { # this ensures the entire script is downloaded before execution
 
 ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=10}
-ENIGMA_BRANCH=master
+ENIGMA_BRANCH=${ENIGMA_BRANCH:=master}
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`
@@ -21,7 +21,7 @@ _____________________   _____  ____________________    __________\\_   /
                                                                        /__   _\\
        <*> ENiGMA½ // https://github.com/NuSkooler/enigma-bbs <*>        /__/
 
-ENiGMA½ will be installed to ${ENIGMA_INSTALL_DIR}, from source ${ENIGMA_SOURCE}.
+ENiGMA½ will be installed to ${ENIGMA_INSTALL_DIR}, from source ${ENIGMA_SOURCE}, branch ${ENIGMA_BRANCH}.
 
 ENiGMA½ requires Node.js. Version ${ENIGMA_NODE_VERSION}.x current will be installed via nvm. If you already have nvm installed, this install script will update it to the latest version.
 
@@ -37,6 +37,7 @@ fatal_error() {
 }
 
 enigma_install_needs() {
+    echo "Checking $1 installation"
     command -v $1 >/dev/null 2>&1 || fatal_error "ENiGMA½ requires $1 but it's not installed. Please install it and restart the installer."
 }
 
@@ -45,14 +46,11 @@ log()  {
 }
 
 enigma_install_init() {
-    log "Checking git installation"
     enigma_install_needs git
-
-    log "Checking curl installation"
     enigma_install_needs curl
-
-    log "Checking Python installation"
     enigma_install_needs python
+    enigma_install_needs make
+    enigma_install_needs gcc
 }
 
 install_nvm() {

From f3efc35e8361b131615263c371eb8fd9296907c4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jul 2019 20:26:13 -0600
Subject: [PATCH 0877/1013] Adjust max length for edit 'to'

---
 misc/menu_template.in.hjson | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index a2a183a5..c2bbdd3f 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -616,6 +616,7 @@
                             argName: to
                             focus: true
                             text: @sysStat:sysop_username
+                            maxLength: 36
                             //  :TODO: readOnly: true
                         }
                         ET3: {
@@ -1532,6 +1533,7 @@
                             argName: to
                             focus: true
                             text: @sysStat:sysop_username
+                            maxLength: 36
                             //  :TODO: readOnly: true
                         }
                         ET3: {
@@ -2534,6 +2536,7 @@
                             argName: to
                             focus: true
                             validate: @systemMethod:validateNonEmpty
+                            maxLength: 36
                         }
                         ET3: {
                             argName: subject
@@ -2692,6 +2695,7 @@
                             focus: true
                             text: All
                             validate: @systemMethod:validateNonEmpty
+                            maxLength: 36
                         }
                         ET3: {
                             argName: subject
@@ -2851,6 +2855,7 @@
                             argName: to
                             focus: true
                             validate: @systemMethod:validateGeneralMailAddressedTo
+                            maxLength: 36
                         }
                         ET3: {
                             argName: subject

From 3e99fdea48b65ad87f7c00e634bddb72e3b01d66 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 31 Jul 2019 20:26:22 -0600
Subject: [PATCH 0878/1013] Doc typo fixes

---
 UPGRADE.md  | 2 +-
 WHATSNEW.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index ed5e687d..b048759d 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -37,7 +37,7 @@ npm install
 ```
 
 # Problems
-Report your issue on Xibalba BBS, hop in #enigma-bbs on Freenet and chat, or
+Report your issue on Xibalba BBS, hop in #enigma-bbs on FreeNode and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
 # 0.0.9-alpha to 0.0.10-alpha
diff --git a/WHATSNEW.md b/WHATSNEW.md
index be707a09..72eaeba6 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -45,7 +45,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Add ability to skip file and/or message areas during newscan. Set config.omitFileAreaTags and config.omitMessageAreaTags in new_scan configuration of your menu.hjson
 * `{userName}` (sanitized) and `{userNameRaw}` as well as `{cwd}` have been added to param options when launching a door.
 * Any module may now register for a system startup initialization via the `initializeModules(initInfo, cb)` export.
-* User event log is now functional. Various events a user performs will be persisted to the `system.db` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
+* User event log is now functional. Various events a user performs will be persisted to the `system.sqlite3` `user_event_log` table for up to 90 days. An example usage can be found in the updated `last_callers` module where events are turned into Ami/X style actions. Please see `UPGRADE.md`!
 * New MCI codes including general purpose movement codes. See [MCI codes](docs/art/mci.md)
 * `install.sh` will now attempt to use NPM's `--build-from-source` option when ARM is detected.
 * `oputil.js config new` will now generate a much more complete configuration file with comments, examples, etc. `oputil.js config cat` dumps your current config to stdout.

From c71404a641d3c975a5761a52adfce46f9cb64805 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Aug 2019 18:16:23 -0600
Subject: [PATCH 0879/1013] oputil.js fb scan improvement & fixes * Start of
 --verbose for oputil.js in general (mostly placeholder at this point) * Fix
 --full-scan and rename to just --full

---
 WHATSNEW.md                     |  2 +-
 core/oputil/oputil_file_base.js | 14 ++++++++++++--
 core/oputil/oputil_help.js      |  5 +++--
 docs/admin/oputil.md            |  5 +++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 72eaeba6..fc6ed98f 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -9,7 +9,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * New ACS codes for new 2FA/OTP: `AR` and `AF`. See [ACS](/docs/configuration/acs.md) for details.
 + `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user.
 * `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP.
-* `oputil.js fb scan --quick` is now the default. Override with `--full-scan`.
+* `oputil.js fb scan --quick` is now the default. Override with `--full`.
 * ACS checks can now be applied to form actions. For example:
 ```hjson
 {
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index efefa05b..67962fc0 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -209,7 +209,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                                 async.series(
                                     [
                                         function quickCheck(next) {
-                                            if(options['full-scan']) {
+                                            if(options['full']) {
                                                 return next(null);
                                             }
 
@@ -229,6 +229,16 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
                                                     areaTag		: areaInfo.areaTag,
                                                     storageTag	: storageLoc.storageTag
                                                 },
+                                                (stepInfo, next) => {
+                                                    if(argv.verbose) {
+                                                        if(stepInfo.error) {
+                                                            console.error(`  error: ${stepInfo.error}`);
+                                                        } else {
+                                                            console.info(`  processing: ${stepInfo.step}`);
+                                                        }
+                                                    }
+                                                    return next(null);
+                                                },
                                                 (err, fileEntry, dupeEntries) => {
                                                     if(err) {
                                                         console.info(`Error: ${err.message}`);
@@ -477,7 +487,7 @@ function scanFileAreas() {
     }
 
     options.descFile 	    = argv['desc-file'];	//	--desc-file or --desc-file PATH
-    options['full-scan'] 	= argv['-full-scan'];
+    options['full'] 	    = argv.full;
 
     options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
 
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 62c47297..abcf61fe 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -14,6 +14,7 @@ const usageHelp = exports.USAGE_HELP = {
 Global arguments:
   -c, --config PATH         Specify config path (default is ${getDefaultConfigPath()})
   -n, --no-prompt           Assume defaults (don't prompt for input where possible)
+  --verbose                 Verbose output, where applicable
 
 Commands:
   user                      User management
@@ -131,7 +132,7 @@ scan arguments:
   DESCRIPT.ION file.
 
   --update                     Attempt to update information for existing entries
-  --full-scan                  Perform a full scan (default is quick)
+  --full                       Perform a full scan (default is quick)
 
 info arguments:
   --show-desc                  Display short description, if any
@@ -152,7 +153,7 @@ General Information:
   Generally an area tag can also include an optional storage tag. For example, the
   area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main
 
-  When performing an initial import of a large area or storage backing, --full-scan
+  When performing an initial import of a large area or storage backing, --full
   is the best option. If re-scanning an area for updates a standard / quick scan is
   generally good enough.
 
diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 7190d268..0b05f7aa 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -14,6 +14,7 @@ usage: oputil.js [--version] [--help]
 Global arguments:
   -c, --config PATH         Specify config path (default is ./config/)
   -n, --no-prompt           Assume defaults (don't prompt for input where possible)
+  --verbose                 Verbose output, where applicable
 
 Commands:
   user                      User management
@@ -178,7 +179,7 @@ scan arguments:
   DESCRIPT.ION file.
 
   --update                     Attempt to update information for existing entries
-  --full-scan                  Perform a full scan (default is quick)
+  --full                       Perform a full scan (default is quick)
 
 info arguments:
   --show-desc                  Display short description, if any
@@ -197,7 +198,7 @@ General Information:
   Generally an area tag can also include an optional storage tag. For example, the
   area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main
 
-  When performing an initial import of a large area or storage backing, --full-scan
+  When performing an initial import of a large area or storage backing, --full
   is the best option. If re-scanning an area for updates a standard / quick scan is
   generally good enough.
 

From e861607330909b8ef91a4e05520e8164fbb94fa8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Aug 2019 23:17:10 -0600
Subject: [PATCH 0880/1013] Update .gitignore slightly

---
 .gitignore | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28a19883..b55cbcfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,13 @@
 *.pem
 
 #	Various directories
-config/config.hjson
-logs/
+config/
 db/
-dropfiles/
+drop/
+file_base/
+logs/
+mail/
 node_modules/
 docs/_site/
 docs/.sass-cache/
-`
\ No newline at end of file
+.vscode/

From 8fde4ccd60d39a9e359197f020383b7fcd1d58b0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Aug 2019 23:17:41 -0600
Subject: [PATCH 0881/1013] Initial auto-signature support

---
 art/themes/luciano_blocktronics/autosig.ans | Bin 0 -> 407 bytes
 art/themes/luciano_blocktronics/theme.hjson |  14 ++++
 core/autosig_edit.js                        |  76 ++++++++++++++++++++
 core/fse.js                                 |  18 +++--
 core/user_property.js                       |   1 +
 5 files changed, 105 insertions(+), 4 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/autosig.ans
 create mode 100644 core/autosig_edit.js

diff --git a/art/themes/luciano_blocktronics/autosig.ans b/art/themes/luciano_blocktronics/autosig.ans
new file mode 100644
index 0000000000000000000000000000000000000000..1af14a63ea6d4c7d6ff9f751b661d819980920fb
GIT binary patch
literal 407
zcmcJLF%N<;5QWRyxVhP-F<~@b3xdc5NC*Q#1zb8A;^z7PC*!pk^#|w;&3o^@v@aC~
z(h$-hMlOX>X`t~zB8V^>`gYaTl`Qvl-=1tpJ7EBY2{*+HE;~{I;M%Q^mIB;4Lz*tu
zI9~4K^~O1cF-l1>J>wui={LRNUm;PHexSd2VPa)#N9gChwtd3Le!=7b`J&5)q6DBK
dzZwlHfh{CUk1@|Xuo-hRuk%Kpt88-b^9jBcQ2hV^

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 86f1ed3b..6d8490dc 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -447,6 +447,20 @@
 				}
 			}
 
+			editAutoSignature: {
+				0: {
+					mci: {
+						MT1: {
+							height: 8
+							width: 73
+						}
+						BT2: {
+							focusTextStyle: upper
+						}
+					}
+				}
+			}
+
 			messageSearch: {
 				0: {
 					mci: {
diff --git a/core/autosig_edit.js b/core/autosig_edit.js
new file mode 100644
index 00000000..c9995280
--- /dev/null
+++ b/core/autosig_edit.js
@@ -0,0 +1,76 @@
+/* jslint node: true */
+'use strict';
+
+//  ENiGMA½
+const { MenuModule }    = require('./menu_module.js');
+const UserProps         = require('./user_property.js');
+
+//  deps
+const async             = require('async');
+const _                 = require('lodash');
+
+exports.moduleInfo = {
+    name        : 'User Auto-Sig Editor',
+    desc        : 'Module for editing auto-sigs',
+    author      : 'NuSkooler',
+};
+
+const FormIds = {
+    edit    : 0,
+};
+
+const MciViewIds = {
+    editor  : 1,
+    save    : 2,
+};
+
+exports.getModule = class UserAutoSigEditorModule extends MenuModule {
+    constructor(options) {
+        super(options);
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), { extraArgs : options.extraArgs });
+
+        this.menuMethods = {
+            saveChanges : (formData, extraArgs, cb) => {
+                return this.saveChanges(cb);
+            }
+        };
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            async.series(
+                [
+                    (callback) => {
+                        return this.prepViewController('edit', FormIds.edit, mciData.menu, callback);
+                    },
+                    (callback) => {
+                        const requiredCodes = [ MciViewIds.editor, MciViewIds.save ];
+                        return this.validateMCIByViewIds('edit', requiredCodes, callback);
+                    },
+                    (callback) => {
+                        const sig = this.client.user.getProperty(UserProps.AutoSignature) || '';
+                        this.setViewText('edit', MciViewIds.editor, sig);
+                        return callback(null);
+                    }
+                ],
+                err => {
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    saveChanges(cb) {
+        const sig = this.getView('edit', MciViewIds.editor).getData().trim();
+        this.client.user.persistProperty(UserProps.AutoSignature, sig, err => {
+            if(err) {
+                this.client.log.error( { error : err.message }, 'Could not save auto-sig');
+            }
+            return this.prevMenu(cb);
+        });
+    }
+};
diff --git a/core/fse.js b/core/fse.js
index d77fbfed..8b2214d8 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -325,20 +325,21 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
     buildMessage(cb) {
         const headerValues = this.viewControllers.header.getFormData().value;
+        const area = getMessageAreaByTag(this.messageAreaTag);
 
         const getFromUserName = () => {
-            const area = getMessageAreaByTag(this.messageAreaTag);
             return (area && area.realNames) ?
                 this.client.user.getProperty(UserProps.RealName) || this.client.user.username :
                 this.client.user.username;
         };
 
+        let messageBody = this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } );
+
         const msgOpts = {
             areaTag         : this.messageAreaTag,
             toUserName      : headerValues.to,
             fromUserName    : getFromUserName(),
             subject         : headerValues.subject,
-            message         : this.viewControllers.body.getView(MciViewIds.body.message).getData( { forceLineTerms : this.replyIsAnsi } ),
         };
 
         if(this.isReply()) {
@@ -351,11 +352,20 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 //  to packetAnsiMsgEncoding (generally cp437) as various boards
                 //  really don't like ANSI messages in UTF-8 encoding (they should!)
                 //
-                msgOpts.meta        = { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
-                msgOpts.message     = `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${msgOpts.message}`;
+                msgOpts.meta    = { System : { 'explicit_encoding' : _.get(Config(), 'scannerTossers.ftn_bso.packetAnsiMsgEncoding', 'cp437') } };
+                messageBody     = `${ansi.reset()}${ansi.eraseData(2)}${ansi.goto(1,1)}\r\n${ansi.up()}${messageBody}`;
             }
         }
 
+        if(false != area.autoSignatures) {
+            const sig = this.client.user.getProperty(UserProps.AutoSignature);
+            if(sig) {
+                messageBody += `\r\n-- \r\n${sig}`;
+            }
+        }
+
+        msgOpts.message = messageBody;
+
         this.message = new Message(msgOpts);
 
         return cb(null);
diff --git a/core/user_property.js b/core/user_property.js
index 88ac11b1..cc68ef09 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -27,6 +27,7 @@ module.exports = {
     LastLoginTs                     : 'last_login_timestamp',
     LoginCount                      : 'login_count',
     UserComment                     : 'user_comment',               //  NYI
+    AutoSignature                   : 'auto_signature',
 
     DownloadQueue                   : 'dl_queue',                   // download_queue.js
 

From 0e6aa563798c930f2582f871f55b3aa1f3444706 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 9 Aug 2019 23:37:00 -0600
Subject: [PATCH 0882/1013] Fix art: ESC is only cancel

---
 art/themes/luciano_blocktronics/autosig.ans | Bin 407 -> 410 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/autosig.ans b/art/themes/luciano_blocktronics/autosig.ans
index 1af14a63ea6d4c7d6ff9f751b661d819980920fb..ce5b6d0df9a2bc945e9b899655f539e58a5b617f 100644
GIT binary patch
delta 44
ucmbQvJd1gPxwMh9bhNQiu7U!PG6zyX+Rz#(;2P|_(O-#?QFU?=qbdOSj0(p9

delta 41
ucmbQmJe_%hxrC{+bhM$hu~DvTFpy<zkgE?QjdBAw1}QNzDorkBR0RO#`U;}}


From b435f3fbb8e2d7db213b038da73e44bce0a296f3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 11:09:34 -0600
Subject: [PATCH 0883/1013] Comments

---
 core/fse.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/fse.js b/core/fse.js
index 8b2214d8..3c1b70d3 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -357,6 +357,9 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             }
         }
 
+        //
+        //  Append auto-signature, if enabled for the area & the user has one
+        //
         if(false != area.autoSignatures) {
             const sig = this.client.user.getProperty(UserProps.AutoSignature);
             if(sig) {
@@ -364,8 +367,8 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             }
         }
 
+        //  finally, create the message
         msgOpts.message = messageBody;
-
         this.message = new Message(msgOpts);
 
         return cb(null);

From 236e5dedb15931fb23dfa3028b0836a9c051e0e5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 11:09:56 -0600
Subject: [PATCH 0884/1013] Switch default zip file handler to InfoZip package

---
 core/config.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/config.js b/core/config.js
index d9a5684b..8b335d44 100644
--- a/core/config.js
+++ b/core/config.js
@@ -577,7 +577,7 @@ function getDefaultConfig() {
                 desc            : 'ZIP Archive',
                 sig             : '504b0304',
                 offset          : 0,
-                archiveHandler  : '7Zip',
+                archiveHandler  : 'InfoZip',
             },
             /*
             'application/x-cbr' : {
@@ -651,7 +651,7 @@ function getDefaultConfig() {
 
         archives : {
             archivers : {
-                '7Zip' : {
+                '7Zip' : {  //  p7zip package
                     compress        : {
                         cmd         : '7za',
                         args        : [ 'a', '-tzip', '{archivePath}', '{fileList}' ],
@@ -671,6 +671,26 @@ function getDefaultConfig() {
                     },
                 },
 
+                InfoZip: {
+                    compress        : {
+                        cmd         : 'zip',
+                        args        : [ '{archivePath}', '{fileList}' ],
+                    },
+                    decompress      : {
+                        cmd         : 'unzip',
+                        args        : [ '{archivePath}', '-d', '{extractPath}' ],
+                    },
+                    list            : {
+                        cmd         : 'unzip',
+                        args        : [ '-l', '{archivePath}' ],
+                        entryMatch  : '^\\s*([0-9]+)\\s+[0-9]{4}-[0-9]{2}-[0-9]{2}\\s+[0-9]{2}:[0-9]{2}\\s+([^\\r\\n]+)$',
+                    },
+                    extract         : {
+                        cmd         : 'unzip',
+                        args        : [ '{archivePath}', '{fileList}', '-d', '{extractPath}' ],
+                    }
+                },
+
                 Lha : {
                     //
                     //  'lha' command can be obtained from:

From b647e665b95bf4a47011ba2b1771aad6f99ac6ba Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 11:15:54 -0600
Subject: [PATCH 0885/1013] Document p7Zip -> InfoZip changes

---
 UPGRADE.md  | 1 +
 WHATSNEW.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/UPGRADE.md b/UPGRADE.md
index b048759d..ef6fd95a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -42,6 +42,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on FreeNode and chat, or
 
 # 0.0.9-alpha to 0.0.10-alpha
 * Security related files such as private keys and certs are now looked for in `config/security` by default.
+* Default archive handler for zip files has switched to InfoZip due to a bug in the latest p7Zip packages causing "volume not found" errors. Ensure you have the InfoZip `zip` and `unzip` commands in ENiGMA's path. You can switch back to 7Zip by overriding `archiveHandler` for `application/zip` in your `config.hjson` under `fileTypes` to `7Zip`.
 
 # 0.0.8-alpha to 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. Follow your standard upgrade path to update to Node 10.x before using 0.0.9-alpha!
diff --git a/WHATSNEW.md b/WHATSNEW.md
index fc6ed98f..293c9dc5 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -28,6 +28,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 }
 ```
 * `idleLogoutSeconds` and `preAuthIdleLogoutSeconds` can now be set to `0` to fully disable the idle monitor.
+* Switched default archive handler for zip files from 7zip to InfoZip (`zip` and `unzip`) commands. See [UPGRADE](UPGRADE.md).
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!

From a494ac95ec72a1b9ecfdb537dd0fb95bddfc2b64 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 11:19:10 -0600
Subject: [PATCH 0886/1013] More doc updates RE: InfoZip

---
 docs/configuration/archivers.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/configuration/archivers.md b/docs/configuration/archivers.md
index 3d3f952a..aa820482 100644
--- a/docs/configuration/archivers.md
+++ b/docs/configuration/archivers.md
@@ -11,9 +11,15 @@ Archivers are manged via the `archives:archivers` configuration block of `config
 The following archivers are pre-configured in ENiGMA½ as of this writing. Remember that you can override settings or add new handlers!
 
 #### ZZip
-* Formats: .7z, .bzip2, .zip, .gzip/.gz, and more
+* Formats: .7z, .bzip2, .gzip/.gz, and more
 * Key: `7Zip`
 * Homepage/package: [7-zip.org](http://www.7-zip.org/). Generally obtained from a `p7zip` package in *nix environments. See http://p7zip.sourceforge.net/ for details.
+* Notes: Previous defaulted to using 7zip for .zip files as well, but newer versions of the package give "volume" errors at times. See InfoZip below.
+
+#### InfoZip
+* Formats: .zip
+* Key: InfoZip
+* Homepage/package: http://infozip.sourceforge.net/. Often already available in Linux. You will need `zip` and `unzip` in ENiGMA's path.
 
 #### Lha
 * Formats: <a href="https://en.wikipedia.org/wiki/LHA_(file_format)">LHA</a> files such as .lzh.

From 5db0a33a8a9c90b7a1182487e45dea4f977aca8d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 12:17:56 -0600
Subject: [PATCH 0887/1013] Add missing entry to template

---
 misc/menu_template.in.hjson | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index c2bbdd3f..71901719 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -2090,6 +2090,10 @@
                     value: { command: "S" }
                     action: @menu:messageSearch
                 }
+                {
+                    value: { command: "A" }
+                    action: @menu:editAutoSignature
+                }
                 {
                     value: 1
                     action: @menu:messageArea
@@ -2097,6 +2101,42 @@
             ]
         }
 
+        editAutoSignature: {
+            desc: Auto Sig Editor
+            module: autosig_edit
+            art: autosig
+            form: {
+                0: {
+                    mci: {
+                        MT1: {
+                            argName: signature
+                            tabSwitchesView: true
+                        }
+                        BT2: {
+                            text: save
+                            argName: save
+                            submit: true
+                        }
+                    }
+                    submit: {
+                        *: [
+                            {
+                                value: { save: null }
+                                action: @method:saveChanges
+                            }
+                        ]
+                    }
+
+                    actionKeys: [
+                        {
+                            keys: [ "escape" ]
+                            action: @systemMethod:prevMenu
+                        }
+                    ]
+                }
+            }
+        }
+
         messageSearch: {
             desc: Message Search
             module: message_base_search

From da545d88200e895fd90e5716db3b1183052abd62 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 12:18:47 -0600
Subject: [PATCH 0888/1013] Fix default art

---
 art/themes/luciano_blocktronics/MSGMNU.ANS | Bin 3685 -> 3712 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index 9c373944c901ce9fba4302f0fee7c0ef272e5d00..a532804b295b5498300b1a9f94965e6bba959f37 100644
GIT binary patch
delta 50
zcmaDV(;&Oy6|0=Nvvjm!ZlZLwL9T*yw6R%kYD#8_LSku2zHV`5`sTN+K^#n?e3Kpd
FQ~;~D590s;

delta 23
ecmZpWeJZoz6)Urmk@IE_wjd6sU%ZoJ_*4L34F@d%


From 47eb1b490dc1630c8557e5db3654c2c55a15d758 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 20:10:38 -0600
Subject: [PATCH 0889/1013] Artwork

---
 art/themes/luciano_blocktronics/MSGMNU.ANS | Bin 3712 -> 3712 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index a532804b295b5498300b1a9f94965e6bba959f37..1c80fa723d300550d42c4f37e852813f98ead021 100644
GIT binary patch
delta 20
bcmZpWZIIo-!N#tjARTRNl)IUqt&jr%G^+&3

delta 20
bcmZpWZIIo-!Nx8fZETdQps<;rt&jr%HTwj~


From e80d3f109309c4b4b6bcc9f3670602b708e08c68 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 20:14:36 -0600
Subject: [PATCH 0890/1013] Add missing 'my messages' to message menu

---
 art/themes/luciano_blocktronics/MSGMNU.ANS | Bin 3712 -> 3714 bytes
 misc/menu_template.in.hjson                |  12 ++++++++++++
 2 files changed, 12 insertions(+)

diff --git a/art/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS
index 1c80fa723d300550d42c4f37e852813f98ead021..01777dd9d826cdde0b21675c94359fe944131654 100644
GIT binary patch
delta 84
zcmZpWZIa#4&Bmet1d~fSl$n6k1h!;GgUO=o$&){@=}g|l?#^WHJh_@(kIB$rG8adt
hsD-n1w6R&PbhME%h-ID&(!6;N$39j@@yXGAssOal71#g(

delta 85
zcmZpYZIIp2&BiJnZDi^^c?(<e<T`fE$@1(m%nAw$lRvQQF&SA-Ucl}rXk_6m9c^ru
os{ka;bETurCM$4cGFduL?q^eGk&ZTZ-aL<EA1kBi<XApc007|^5&!@I

diff --git a/misc/menu_template.in.hjson b/misc/menu_template.in.hjson
index 71901719..57a3f761 100644
--- a/misc/menu_template.in.hjson
+++ b/misc/menu_template.in.hjson
@@ -2090,6 +2090,10 @@
                     value: { command: "S" }
                     action: @menu:messageSearch
                 }
+                {
+                    value: { command: "M" }
+                    action: @menu:myMessages
+                }
                 {
                     value: { command: "A" }
                     action: @menu:editAutoSignature
@@ -2237,6 +2241,14 @@
             }
         }
 
+        myMessages: {
+            desc: Personal Messages
+            module: my_messages
+            config: {
+                messageListMenu: messageAreaMyMessagesList
+            }
+        }
+
         messageAreaMyMessagesList: {
             desc: Personal Messages
             module: msg_list

From 9089a203da7f869255280df960e163fc00acfceb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 20:16:30 -0600
Subject: [PATCH 0891/1013] Fix missing 'del/d' for delete in artwork

---
 .../luciano_blocktronics/PRVMSGLIST.ANS       | Bin 2229 -> 2280 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/art/themes/luciano_blocktronics/PRVMSGLIST.ANS b/art/themes/luciano_blocktronics/PRVMSGLIST.ANS
index 180ace2b077bc7bcc5370277e08f310cff326424..3969d72f9dbe35c22e07e76d0d0112303513722e 100644
GIT binary patch
delta 90
zcmdlg_(E_)Bddjif`W9kp|!D5u8XUWbhNQSu0D_i@_@oXjun^#WE+5#q@?DgmZSoO
i%yTENWPLKZhgEg*4z{<Go7pTTZ(+a9*f4nlhbjQ1WgLwF

delta 44
zcmV+{0Mq~I5w#JpfdvE`TQx(ImIf@7!3Ertxd$$j#RlpH8(T3pLzCSH<pE8T!w4mI
CR}hl`


From 4c0b629016d223f958bbbeff2f251da7a201ef7b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 10 Aug 2019 22:12:55 -0600
Subject: [PATCH 0892/1013] Doc on autoSignatures area option

---
 docs/messageareas/configuring-a-message-area.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md
index 63af2826..e099c9e0 100644
--- a/docs/messageareas/configuring-a-message-area.md
+++ b/docs/messageareas/configuring-a-message-area.md
@@ -51,6 +51,7 @@ Message Areas are topic specific containers for messages that live within a part
 | `sort`      | :-1:     | Set to a number to override the default alpha-numeric sort order based on the `name` field. |
 | `default`   | :-1:     | Specify `true` to make this the default area (e.g. assigned to new users) |
 | `acs`       | :-1: | A standard [ACS](/docs/configuration/acs.md) block. See **ACS** below. |
+| `autoSignatures` | :-1: | Set to `false` to disable auto-signatures in this area. |
 
 ### ACS
 An optional standard [ACS](/docs/configuration/acs.md) block can be supplied with the following rules:

From 1e08810188dbff1ecaed9f4631442586daa469a3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 22 Aug 2019 21:48:39 -0600
Subject: [PATCH 0893/1013] Update InfoZip list extractor

---
 core/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/config.js b/core/config.js
index 8b335d44..44b5f4cc 100644
--- a/core/config.js
+++ b/core/config.js
@@ -683,7 +683,8 @@ function getDefaultConfig() {
                     list            : {
                         cmd         : 'unzip',
                         args        : [ '-l', '{archivePath}' ],
-                        entryMatch  : '^\\s*([0-9]+)\\s+[0-9]{4}-[0-9]{2}-[0-9]{2}\\s+[0-9]{2}:[0-9]{2}\\s+([^\\r\\n]+)$',
+                        //  Annoyingly, dates can be in YYYY-MM-DD or MM-DD-YYYY format
+                        entryMatch  : '^\\s*([0-9]+)\\s+[0-9]{2,4}-[0-9]{2}-[0-9]{2,4}\\s+[0-9]{2}:[0-9]{2}\\s+([^\\r\\n]+)$',
                     },
                     extract         : {
                         cmd         : 'unzip',

From 16f4d62548985740d89a4da38ffce39d5eb74a3c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 3 Sep 2019 19:52:04 -0600
Subject: [PATCH 0894/1013] Initial support for random 'next', 'action', ...

---
 core/menu_stack.js |  5 ++++-
 core/menu_util.js  | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/core/menu_stack.js b/core/menu_stack.js
index 080d0efa..42cd6987 100644
--- a/core/menu_stack.js
+++ b/core/menu_stack.js
@@ -7,6 +7,9 @@ const {
     Errors,
     ErrorReasons
 }               = require('./enig_error.js');
+const {
+    getResolvedSpec
+}               = require('./menu_util.js');
 
 //  deps
 const _         = require('lodash');
@@ -53,7 +56,7 @@ module.exports = class MenuStack {
     next(cb) {
         const currentModuleInfo = this.top();
         const menuConfig        = currentModuleInfo.instance.menuConfig;
-        const nextMenu          = this.client.acs.getConditionalValue(menuConfig.next, 'next');
+        const nextMenu          = getResolvedSpec(this.client, menuConfig.next, 'next');
         if(!nextMenu) {
             return cb(Array.isArray(menuConfig.next) ?
                 Errors.MenuStack('No matching condition for "next"', ErrorReasons.NoConditionMatch) :
diff --git a/core/menu_util.js b/core/menu_util.js
index 18b17d9f..a429415b 100644
--- a/core/menu_util.js
+++ b/core/menu_util.js
@@ -17,6 +17,7 @@ const _                     = require('lodash');
 exports.loadMenu                        = loadMenu;
 exports.getFormConfigByIDAndMap         = getFormConfigByIDAndMap;
 exports.handleAction                    = handleAction;
+exports.getResolvedSpec                 = getResolvedSpec;
 exports.handleNext                      = handleNext;
 
 function getMenuConfig(client, name, cb) {
@@ -172,7 +173,7 @@ function handleAction(client, formData, conf, cb) {
         return cb(Errors.MissingParam('Missing config'));
     }
 
-    const action = client.acs.getConditionalValue(conf.action, 'action');    //  handle any conditionals
+    const action = getResolvedSpec(client, conf.action, 'action');  //  random/conditionals/etc.
     const actionAsset = asset.parseAsset(action);
     if(!_.isObject(actionAsset)) {
         return cb(Errors.Invalid('Unable to parse "conf.action"'));
@@ -216,9 +217,38 @@ function handleAction(client, formData, conf, cb) {
     }
 }
 
-function handleNext(client, nextSpec, conf, cb) {
-    nextSpec = client.acs.getConditionalValue(nextSpec, 'next');    //  handle any conditionals
+function getResolvedSpec(client, spec, memberName) {
+    //
+    //  'next', 'action', etc. can come in various flavors:
+    //  (1) Simple string:
+    //    next: foo
+    //  (2) Array of objects with 'acs' checks; any object missing 'acs'
+    //    is assumed to be "true":
+    //    next: [
+    //      {
+    //        acs: AR2
+    //        next: foo
+    //      }
+    //      {
+    //        next: baz
+    //      }
+    //    ]
+    //  (3) Simple array of strings. A random selection will be made:
+    //    next: [ "foo", "baz", "fizzbang" ]
+    //
+    if(!Array.isArray(spec)) {
+        return spec;    //  (1) simple string, as-is
+    }
 
+    if(_.isObject(spec[0])) {
+        return client.acs.getConditionalValue(spec, memberName);    //  (2) ACS conditionals
+    }
+
+    return spec[Math.floor(Math.random() * spec.length)];   //  (3) random
+}
+
+function handleNext(client, nextSpec, conf, cb) {
+    nextSpec = getResolvedSpec(client, nextSpec, 'next');
     const nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
     //  :TODO: getAssetWithShorthand() can return undefined - handle it!
 

From 13c45315d4b97265db1daf9c9211743dce16a87d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Sep 2019 18:59:50 -0600
Subject: [PATCH 0895/1013] More ACS docs

---
 docs/configuration/menu-hjson.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 9294c08c..37b7f669 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -180,6 +180,23 @@ opOnlyMenu: {
 }
 ```
 
+### Action Matches
+Action blocks (`action`) can perform ACS checks:
+```
+// ...
+{
+    action: [
+        {
+            acs: SC1
+            action: @menu:secureMenu
+        }
+        {
+            action: @menu:nonSecureMenu
+        }
+    ]
+}
+```
+
 ### Flow Control
 The `next` member of a menu may be an array of objects containing an `acs` check as well as the destination. Depending on the current user's ACS, the system will pick the appropriate target. The last element in an array without an `acs` can be used as a catch all. Example:
 ```

From e9820ab2d355441f6356271149e9a9371cd9981f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 4 Sep 2019 19:50:16 -0600
Subject: [PATCH 0896/1013] Add docs on random actions

---
 WHATSNEW.md                      | 13 +++++++++++++
 docs/configuration/menu-hjson.md | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 293c9dc5..b1ec8ce6 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -29,6 +29,19 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 ```
 * `idleLogoutSeconds` and `preAuthIdleLogoutSeconds` can now be set to `0` to fully disable the idle monitor.
 * Switched default archive handler for zip files from 7zip to InfoZip (`zip` and `unzip`) commands. See [UPGRADE](UPGRADE.md).
+* Menu submit `action`'s can now in addition to being a simple string such as `@menu:someMenu`, or an array of objects with ACS checks, be a simple array of strings. In this case, a random match will be made. For example:
+```hjson
+submit: [
+    {
+        value: { command: "FOO" }
+        action: [
+            // one of the following actions will be matched:
+            "@menu:menuStyle1"
+            "@menu:menuStyle2"
+        ]
+    }
+]
+```
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
diff --git a/docs/configuration/menu-hjson.md b/docs/configuration/menu-hjson.md
index 37b7f669..8ddda2d8 100644
--- a/docs/configuration/menu-hjson.md
+++ b/docs/configuration/menu-hjson.md
@@ -74,6 +74,23 @@ Submit actions are declared using the `action` member of a submit handler block.
 | `@method:methodName` | Executes *methodName* local to the calling module. That is, the module set by the `module` member of a menu entry. |
 | `@method:/path/to/some_module.js:methodName` | Executes *methodName* exported by the module at */path/to/some_module.js*. |
 
+#### Advanced Action Handling
+In addition to simple simple actions, `action` may also be:
+* An array of objects containing ACS checks and a sub `action` if that ACS is matched. See **Action Matches** in the ACS documentation below for details.
+* An array of actions. In this case a random selection will be made. Example:
+```hjson
+submit: [
+    {
+        value: { command: "FOO" }
+        action: [
+            // one of the following actions will be matched:
+            "@menu:menuStyle1"
+            "@menu:menuStyle2"
+        ]
+    }
+]
+```
+
 #### Method Signature
 Methods executed using `@method`, or `@systemMethod` have the following signature:
 ```

From 24e18b5a7eeaffd0e0fe370d8e708839d72c4169 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 9 Sep 2019 21:35:12 -0600
Subject: [PATCH 0897/1013] Clean up defualt mesage/file conf/areas at login if
 user no longer has read access

---
 core/user_login.js | 82 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/core/user_login.js b/core/user_login.js
index bc23e3b3..627fb5ae 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -16,6 +16,16 @@ const UserProps         = require('./user_property.js');
 const SysProps          = require('./system_property.js');
 const SystemLogKeys     = require('./system_log.js');
 const User              = require('./user.js');
+const {
+    getMessageConferenceByTag,
+    getMessageAreaByTag,
+    getDefaultMessageConferenceTag,
+    getDefaultMessageAreaTagByConfTag,
+}                       = require('./message_area.js');
+const {
+    getFileAreaByTag,
+    getDefaultFileAreaTag,
+}                       = require('./file_base_area.js');
 
 //  deps
 const async             = require('async');
@@ -101,15 +111,77 @@ function userLogin(client, username, password, options, cb) {
         Events.emit(Events.getSystemEvents().UserLogin, { user } );
 
         setClientTheme(client, user.properties[UserProps.ThemeId]);
-        if(user.authenticated) {
-            return recordLogin(client, cb);
-        }
 
-        //  recordLogin() must happen after 2FA!
-        return cb(null);
+        postLoginPrep(client, err => {
+            if(err) {
+                return cb(err);
+            }
+
+            if(user.authenticated) {
+                return recordLogin(client, cb);
+            }
+
+            //  recordLogin() must happen after 2FA!
+            return cb(null);
+        });
     });
 }
 
+function postLoginPrep(client, cb) {
+
+    const defaultMsgAreaTag = (confTag) => {
+        return getDefaultMessageAreaTagByConfTag(client, confTag) ||
+            getDefaultMessageAreaTagByConfTag(client, getDefaultMessageConferenceTag(client)) ||
+            '';
+    };
+
+    async.series(
+        [
+            (callback) => {
+                //
+                //  User may (no longer) have read (view) rights to their current
+                //  message, conferences and/or areas. Move them out if so.
+                //
+                let confTag = client.user.getProperty(UserProps.MessageConfTag);
+                const conf  = getMessageConferenceByTag(confTag) || {};
+                const area  = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
+
+                if(!client.acs.hasMessageConfRead(conf)) {
+                    confTag = getDefaultMessageConferenceTag(client) || '';
+                    client.user.persistProperties({
+                        [ UserProps.MessageConfTag ] : confTag,
+                        [ UserProps.MessageAreaTag ] : defaultMsgAreaTag(confTag),
+                    },
+                    err => {
+                        return callback(err);
+                    });
+                } else if (!client.acs.hasMessageAreaRead(area)) {
+                    client.user.persistProperty(UserProps.MessageAreaTag, defaultMsgAreaTag(confTag), err => {
+                        return callback(err);
+                    });
+                } else {
+                    return callback(null);
+                }
+            },
+            (callback) => {
+                //  Likewise for file areas
+                const area = getFileAreaByTag(client.user.getProperty(UserProps.FileAreaTag)) || {};
+                if(!client.acs.hasFileAreaRead(area)) {
+                    const areaTag = getDefaultFileAreaTag(client) || '';
+                    client.user.persistProperty(UserProps.FileAreaTag, areaTag, err => {
+                        return callback(err);
+                    });
+                } else {
+                    return callback(null);
+                }
+            }
+        ],
+        err => {
+            return cb(err);
+        }
+    );
+}
+
 function recordLogin(client, cb) {
     assert(client.user.authenticated);  //  don't get in situations where this isn't true
 

From 8027a73ea559fc389adeca6350047dfac448cc5f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 9 Sep 2019 21:44:03 -0600
Subject: [PATCH 0898/1013] Another message area check

---
 core/message_area.js | 9 ++++++++-
 core/user_login.js   | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index 7f4993ec..f06c21a4 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -404,8 +404,15 @@ function getMessageListForArea(client, areaTag, filter, cb)
         Object.assign(filter, { areaTag } );
     }
 
+    if(client) {
+        const area = getMessageAreaByTag(areaTag);
+        if(!client.acs.hasMessageAreaRead(area)) {
+            return cb(null, []);
+        }
+    }
+
     if(Message.isPrivateAreaTag(areaTag)) {
-        filter.privateTagUserId = client.user.userId;
+        filter.privateTagUserId = client ? client.user.userId : 'INVALID_USER_ID';
     }
 
     return Message.findMessages(filter, cb);
diff --git a/core/user_login.js b/core/user_login.js
index 627fb5ae..6c5e6813 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -130,9 +130,11 @@ function userLogin(client, username, password, options, cb) {
 function postLoginPrep(client, cb) {
 
     const defaultMsgAreaTag = (confTag) => {
-        return getDefaultMessageAreaTagByConfTag(client, confTag) ||
+        return (
+            getDefaultMessageAreaTagByConfTag(client, confTag) ||
             getDefaultMessageAreaTagByConfTag(client, getDefaultMessageConferenceTag(client)) ||
-            '';
+            ''
+        );
     };
 
     async.series(

From dff8e12dcc8fae5d7b5cdd7b88f0def675a15934 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Sep 2019 21:21:33 -0600
Subject: [PATCH 0899/1013] Message ACS improvements & minor fixes +
 getSuitableMessageConfAndAreaTags(): Get a suitable conf/area tag pair with
 priority on defaults + hasMessageConfAndAreaRead() helper +
 filterMessageAreaTagsByReadACS() helper * Always include confTag/areaTag when
 fetching a conf or area (convenience) * Fix 'toRemoteUser' assignment in
 message * Better kick out of message conf/areas users does not have access to

---
 core/fse.js          |  2 +-
 core/message_area.js | 81 ++++++++++++++++++++++++++++++++++++++++----
 core/user_login.js   | 29 +++++-----------
 3 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index 3c1b70d3..5e018df7 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -307,7 +307,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
             fromUserId          : _.get(this.message, 'meta.System.local_from_user_id', localUserIdNotAvail),
             toUserId            : _.get(this.message, 'meta.System.local_to_user_id', localUserIdNotAvail),
             fromRemoteUser      : _.get(this.message, 'meta.System.remote_from_user', remoteUserNotAvail),
-            toRemoteUser        : _.get(this.messgae, 'meta.System.remote_to_user', remoteUserNotAvail),
+            toRemoteUser        : _.get(this.message, 'meta.System.remote_to_user', remoteUserNotAvail),
             subject             : this.message.subject,
             modTimestamp        : this.message.modTimestamp.format(modTimestampFormat),
             msgNum              : this.messageIndex + 1,
diff --git a/core/message_area.js b/core/message_area.js
index f06c21a4..353430ce 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -26,10 +26,13 @@ exports.getAvailableMessageAreasByConfTag   = getAvailableMessageAreasByConfTag;
 exports.getSortedAvailMessageAreasByConfTag = getSortedAvailMessageAreasByConfTag;
 exports.getDefaultMessageConferenceTag      = getDefaultMessageConferenceTag;
 exports.getDefaultMessageAreaTagByConfTag   = getDefaultMessageAreaTagByConfTag;
+exports.getSuitableMessageConfAndAreaTags   = getSuitableMessageConfAndAreaTags;
 exports.getMessageConferenceByTag           = getMessageConferenceByTag;
 exports.getMessageAreaByTag                 = getMessageAreaByTag;
 exports.changeMessageConference             = changeMessageConference;
 exports.changeMessageArea                   = changeMessageArea;
+exports.hasMessageConfAndAreaRead           = hasMessageConfAndAreaRead;
+exports.filterMessageAreaTagsByReadACS      = filterMessageAreaTagsByReadACS;
 exports.tempChangeMessageConfAndArea        = tempChangeMessageConfAndArea;
 exports.getMessageListForArea               = getMessageListForArea;
 exports.getNewMessageCountInAreaForUser     = getNewMessageCountInAreaForUser;
@@ -185,7 +188,10 @@ function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
             }
         }
 
-        defaultArea = _.findKey(areaPool, (area) => {
+        defaultArea = _.findKey(areaPool, (area, areaTag) => {
+            if(Message.isPrivateAreaTag(areaTag)) {
+                return false;
+            }
             return (true === disableAcsCheck || client.acs.hasMessageAreaRead(area));
         });
 
@@ -193,8 +199,47 @@ function getDefaultMessageAreaTagByConfTag(client, confTag, disableAcsCheck) {
     }
 }
 
+function getSuitableMessageConfAndAreaTags(client) {
+    //
+    //  Attempts to get a pair of suitable conf/area tags:
+    //  * Where the client/user has proper ACS to both
+    //  * Try to use defaults where possible
+    //  * If default conf/area is not an option, use any
+    //    that pass ACS.
+    //  * Returns a tuple [confTag, areaTag]; areaTag
+    //    and possibly confTag may both be set to '' if
+    //    if we fail to find something.
+    //
+    let confTag = getDefaultMessageConferenceTag(client);
+    if(!confTag) {
+        return ['', ''];    //  can't have an area without a conf
+    }
+
+    let areaTag = getDefaultMessageAreaTagByConfTag(client, confTag);
+    if(!areaTag) {
+        //  OK, perhaps *any* area in *any* conf?
+        _.forEach(Config().messageConferences, (conf, ct) => {
+            if(!client.acs.hasMessageConfRead(conf)) {
+                return;
+            }
+            _.forEach(conf.areas, (area, at) => {
+                if(!_.includes(Message.WellKnownAreaTags, at) && client.acs.hasMessageAreaRead(area)) {
+                    confTag = ct;
+                    areaTag = at;
+                    return false;   //  stop inner iteration
+                }
+            });
+            if(areaTag) {
+                return false;   //  stop iteration
+            }
+        });
+    }
+
+    return [confTag, areaTag || ''];
+}
+
 function getMessageConferenceByTag(confTag) {
-    return Config().messageConferences[confTag];
+    return Object.assign({ confTag }, Config().messageConferences[confTag]);
 }
 
 function getMessageConfTagByAreaTag(areaTag) {
@@ -209,17 +254,23 @@ function getMessageAreaByTag(areaTag, optionalConfTag) {
 
     //  :TODO: this could be cached
     if(_.isString(optionalConfTag)) {
-        if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
-            return confs[optionalConfTag].areas[areaTag];
+        if(_.isObject(confs, [ optionalConfTag, 'areas', areaTag ])) {
+            return Object.assign(
+                {
+                    areaTag,
+                    confTag : optionalConfTag,
+                },
+                confs[optionalConfTag].areas[areaTag]
+            );
         }
     } else {
         //
         //  No confTag to work with - we'll have to search through them all
         //
         let area;
-        _.forEach(confs, (v) => {
-            if(_.has(v, [ 'areas', areaTag ])) {
-                area = v.areas[areaTag];
+        _.forEach(confs, (conf, confTag) => {
+            if(_.isObject(conf, [ 'areas', areaTag ])) {
+                area = Object.assign({ areaTag, confTag }, conf.areas[areaTag]);
                 return false;   //  stop iteration
             }
         });
@@ -350,6 +401,22 @@ function changeMessageArea(client, areaTag, cb) {
     changeMessageAreaWithOptions(client, areaTag, { persist : true }, cb);
 }
 
+function hasMessageConfAndAreaRead(client, area) {
+    const conf = getMessageConfTagByAreaTag(area.areaTag);
+    return client.acs.hasMessageConfRead(conf) && client.acs.hasMessageAreaRead(area);
+}
+
+function filterMessageAreaTagsByReadACS(client, areaTags) {
+    if(!Array.isArray(areaTags)) {
+        areaTags = [ areaTags ];
+    }
+
+    return areaTags.filter( areaTag => {
+        const area = getMessageAreaByTag(areaTag);
+        return hasMessageConfAndAreaRead(client, area);
+    });
+}
+
 function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
     getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
         lastMessageId = lastMessageId || 0;
diff --git a/core/user_login.js b/core/user_login.js
index 6c5e6813..6b9a0e00 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -21,6 +21,7 @@ const {
     getMessageAreaByTag,
     getDefaultMessageConferenceTag,
     getDefaultMessageAreaTagByConfTag,
+    getSuitableMessageConfAndAreaTags,
 }                       = require('./message_area.js');
 const {
     getFileAreaByTag,
@@ -128,15 +129,6 @@ function userLogin(client, username, password, options, cb) {
 }
 
 function postLoginPrep(client, cb) {
-
-    const defaultMsgAreaTag = (confTag) => {
-        return (
-            getDefaultMessageAreaTagByConfTag(client, confTag) ||
-            getDefaultMessageAreaTagByConfTag(client, getDefaultMessageConferenceTag(client)) ||
-            ''
-        );
-    };
-
     async.series(
         [
             (callback) => {
@@ -144,23 +136,20 @@ function postLoginPrep(client, cb) {
                 //  User may (no longer) have read (view) rights to their current
                 //  message, conferences and/or areas. Move them out if so.
                 //
-                let confTag = client.user.getProperty(UserProps.MessageConfTag);
-                const conf  = getMessageConferenceByTag(confTag) || {};
-                const area  = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
+                const confTag   = client.user.getProperty(UserProps.MessageConfTag);
+                const conf      = getMessageConferenceByTag(confTag) || {};
+                const area      = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
 
-                if(!client.acs.hasMessageConfRead(conf)) {
-                    confTag = getDefaultMessageConferenceTag(client) || '';
+                if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
+                    //  move them out of both area and possibly conf to something suitable, hopefully.
+                    const [newConfTag, newAreaTag] = getSuitableMessageConfAndAreaTags(client);
                     client.user.persistProperties({
-                        [ UserProps.MessageConfTag ] : confTag,
-                        [ UserProps.MessageAreaTag ] : defaultMsgAreaTag(confTag),
+                        [ UserProps.MessageConfTag ] : newConfTag,
+                        [ UserProps.MessageAreaTag ] : newAreaTag,
                     },
                     err => {
                         return callback(err);
                     });
-                } else if (!client.acs.hasMessageAreaRead(area)) {
-                    client.user.persistProperty(UserProps.MessageAreaTag, defaultMsgAreaTag(confTag), err => {
-                        return callback(err);
-                    });
                 } else {
                     return callback(null);
                 }

From d5268c7b9e7a94681433a4a614205c3ce8e8e389 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Sep 2019 21:56:33 -0600
Subject: [PATCH 0900/1013] Fix getMessageAreaByTag() and improve
 hasMessageConfAndAreaRead()

---
 core/message_area.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index 353430ce..13751e65 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -254,7 +254,7 @@ function getMessageAreaByTag(areaTag, optionalConfTag) {
 
     //  :TODO: this could be cached
     if(_.isString(optionalConfTag)) {
-        if(_.isObject(confs, [ optionalConfTag, 'areas', areaTag ])) {
+        if(_.has(confs, [ optionalConfTag, 'areas', areaTag ])) {
             return Object.assign(
                 {
                     areaTag,
@@ -269,7 +269,7 @@ function getMessageAreaByTag(areaTag, optionalConfTag) {
         //
         let area;
         _.forEach(confs, (conf, confTag) => {
-            if(_.isObject(conf, [ 'areas', areaTag ])) {
+            if(_.has(conf, [ 'areas', areaTag ])) {
                 area = Object.assign({ areaTag, confTag }, conf.areas[areaTag]);
                 return false;   //  stop iteration
             }
@@ -401,9 +401,12 @@ function changeMessageArea(client, areaTag, cb) {
     changeMessageAreaWithOptions(client, areaTag, { persist : true }, cb);
 }
 
-function hasMessageConfAndAreaRead(client, area) {
-    const conf = getMessageConfTagByAreaTag(area.areaTag);
-    return client.acs.hasMessageConfRead(conf) && client.acs.hasMessageAreaRead(area);
+function hasMessageConfAndAreaRead(client, areaOrTag) {
+    if(_.isString(areaOrTag)) {
+        areaOrTag = getMessageAreaByTag(areaOrTag) || {};
+    }
+    const conf = getMessageConferenceByTag(areaOrTag.confTag);
+    return client.acs.hasMessageConfRead(conf) && client.acs.hasMessageAreaRead(areaOrTag);
 }
 
 function filterMessageAreaTagsByReadACS(client, areaTags) {
@@ -472,8 +475,7 @@ function getMessageListForArea(client, areaTag, filter, cb)
     }
 
     if(client) {
-        const area = getMessageAreaByTag(areaTag);
-        if(!client.acs.hasMessageAreaRead(area)) {
+        if(!hasMessageConfAndAreaRead(client, areaTag)) {
             return cb(null, []);
         }
     }

From 4f6a0b175c3f1a5ab58a949cd52d8363c9209144 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Sep 2019 21:56:54 -0600
Subject: [PATCH 0901/1013] Don't return messages user doesn't have access to!

---
 core/my_messages.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/core/my_messages.js b/core/my_messages.js
index 721e1f9d..65a9335d 100644
--- a/core/my_messages.js
+++ b/core/my_messages.js
@@ -5,6 +5,9 @@
 const MenuModule    = require('./menu_module.js').MenuModule;
 const Message       = require('./message.js');
 const UserProps     = require('./user_property.js');
+const {
+    hasMessageConfAndAreaRead
+}                   = require('./message_area.js');
 
 exports.moduleInfo = {
     name    : 'My Messages',
@@ -30,7 +33,27 @@ exports.getModule = class MyMessagesModule extends MenuModule {
                 this.client.log.warn( { error : err.message }, 'Error finding messages addressed to current user');
                 return this.prevMenu();
             }
-            this.messageList = messageList;
+
+            //
+            //  We need to filter out messages belonging to conf/areas the user
+            //  doesn't have access to.
+            //
+            //  Keep a cache around for quick lookup.
+            //
+            const acsCache = new Map();    //  areaTag:boolean
+            this.messageList = messageList.filter(msg => {
+                let cached = acsCache.get(msg.areaTag);
+                if(false === cached) {
+                    return false;
+                }
+                if(true === cached) {
+                    return true;
+                }
+                cached = hasMessageConfAndAreaRead(this.client, msg.areaTag);
+                acsCache.set(msg.areaTag, cached);
+                return cached;
+            });
+
             this.finishedLoading();
         });
     }

From 36afcc0298456b85aee038eefcb5e533d1171764 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Sep 2019 21:57:07 -0600
Subject: [PATCH 0902/1013] Cleanup unused

---
 core/user_login.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/user_login.js b/core/user_login.js
index 6b9a0e00..99faa1a2 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -19,8 +19,6 @@ const User              = require('./user.js');
 const {
     getMessageConferenceByTag,
     getMessageAreaByTag,
-    getDefaultMessageConferenceTag,
-    getDefaultMessageAreaTagByConfTag,
     getSuitableMessageConfAndAreaTags,
 }                       = require('./message_area.js');
 const {

From afd6d4265f99c4e31ddb65d00ef340fe5b996bb5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 11 Sep 2019 22:03:24 -0600
Subject: [PATCH 0903/1013] More filtering of messages results without ACS +
 filterMessageListByReadACS() * Use filterMessageListByReadACS() in my
 messages * Use filterMessageListByReadACS() in message search

---
 core/message_area.js        | 24 ++++++++++++++++++++++++
 core/message_base_search.js | 28 ++++++++++++++++++++++------
 core/my_messages.js         | 23 +++--------------------
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index 13751e65..a0806bc0 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -33,6 +33,7 @@ exports.changeMessageConference             = changeMessageConference;
 exports.changeMessageArea                   = changeMessageArea;
 exports.hasMessageConfAndAreaRead           = hasMessageConfAndAreaRead;
 exports.filterMessageAreaTagsByReadACS      = filterMessageAreaTagsByReadACS;
+exports.filterMessageListByReadACS          = filterMessageListByReadACS;
 exports.tempChangeMessageConfAndArea        = tempChangeMessageConfAndArea;
 exports.getMessageListForArea               = getMessageListForArea;
 exports.getNewMessageCountInAreaForUser     = getNewMessageCountInAreaForUser;
@@ -420,6 +421,29 @@ function filterMessageAreaTagsByReadACS(client, areaTags) {
     });
 }
 
+function filterMessageListByReadACS(client, messageList) {
+    //
+    //  Filter out messages belonging to conf/areas the user
+    //  doesn't have access to.
+    //
+
+    //  Keep a cache around for quick lookup.
+    const acsCache = new Map();    //  areaTag:boolean
+
+    return messageList.filter(msg => {
+        let cached = acsCache.get(msg.areaTag);
+        if(false === cached) {
+            return false;
+        }
+        if(true === cached) {
+            return true;
+        }
+        cached = hasMessageConfAndAreaRead(client, msg.areaTag);
+        acsCache.set(msg.areaTag, cached);
+        return cached;
+    });
+}
+
 function getNewMessageCountInAreaForUser(userId, areaTag, cb) {
     getMessageAreaLastReadId(userId, areaTag, (err, lastMessageId) => {
         lastMessageId = lastMessageId || 0;
diff --git a/core/message_base_search.js b/core/message_base_search.js
index 9684b8f0..859d2320 100644
--- a/core/message_base_search.js
+++ b/core/message_base_search.js
@@ -7,6 +7,8 @@ const {
     getSortedAvailMessageConferences,
     getAvailableMessageAreasByConfTag,
     getSortedAvailMessageAreasByConfTag,
+    hasMessageConfAndAreaRead,
+    filterMessageListByReadACS,
 }                                   = require('./message_area.js');
 const Errors                        = require('./enig_error.js').Errors;
 const Message                       = require('./message.js');
@@ -101,6 +103,14 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
             limit           : 2048, //  :TODO: best way to handle this? we should probably let the user know if some results are returned
         };
 
+        const returnNoResults = () => {
+            return this.gotoMenu(
+                this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
+                { menuFlags : [ 'popParent' ] },
+                cb
+            );
+        };
+
         if(isAdvanced) {
             filter.toUserName   = value.toUserName;
             filter.fromUserName = value.fromUserName;
@@ -113,7 +123,11 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
                     (area, areaTag) => areaTag
                 );
             } else if(value.areaTag) {
-                filter.areaTag = value.areaTag; //  specific conf + area
+                if(hasMessageConfAndAreaRead(this.client, value.areaTag)) {
+                    filter.areaTag = value.areaTag; //  specific conf + area
+                } else {
+                    return returnNoResults();
+                }
             }
         }
 
@@ -122,12 +136,14 @@ exports.getModule = class MessageBaseSearch extends MenuModule {
                 return cb(err);
             }
 
+            //  don't include results without ACS -- if the user searched by
+            //  explicit conf/area tag, we should have already filtered (above)
+            if(!value.confTag && !value.areaTag) {
+                messageList = filterMessageListByReadACS(this.client, messageList);
+            }
+
             if(0 === messageList.length) {
-                return this.gotoMenu(
-                    this.menuConfig.config.noResultsMenu || 'messageSearchNoResults',
-                    { menuFlags : [ 'popParent' ] },
-                    cb
-                );
+                return returnNoResults();
             }
 
             const menuOpts = {
diff --git a/core/my_messages.js b/core/my_messages.js
index 65a9335d..ed1d3fe1 100644
--- a/core/my_messages.js
+++ b/core/my_messages.js
@@ -6,7 +6,7 @@ const MenuModule    = require('./menu_module.js').MenuModule;
 const Message       = require('./message.js');
 const UserProps     = require('./user_property.js');
 const {
-    hasMessageConfAndAreaRead
+    filterMessageListByReadACS
 }                   = require('./message_area.js');
 
 exports.moduleInfo = {
@@ -34,25 +34,8 @@ exports.getModule = class MyMessagesModule extends MenuModule {
                 return this.prevMenu();
             }
 
-            //
-            //  We need to filter out messages belonging to conf/areas the user
-            //  doesn't have access to.
-            //
-            //  Keep a cache around for quick lookup.
-            //
-            const acsCache = new Map();    //  areaTag:boolean
-            this.messageList = messageList.filter(msg => {
-                let cached = acsCache.get(msg.areaTag);
-                if(false === cached) {
-                    return false;
-                }
-                if(true === cached) {
-                    return true;
-                }
-                cached = hasMessageConfAndAreaRead(this.client, msg.areaTag);
-                acsCache.set(msg.areaTag, cached);
-                return cached;
-            });
+            //  don't include results without ACS
+            this.messageList = filterMessageListByReadACS(this.client, messageList);
 
             this.finishedLoading();
         });

From 7783262af6d98fa12636e86122fac41be6c63b41 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 15 Sep 2019 21:30:00 -0600
Subject: [PATCH 0904/1013] ES6

---
 core/acs.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/core/acs.js b/core/acs.js
index 1ae4fa93..f1596d5d 100644
--- a/core/acs.js
+++ b/core/acs.js
@@ -14,6 +14,20 @@ class ACS {
         this.subject = subject;
     }
 
+    static get Defaults() {
+        return {
+            MessageConfRead     : 'GM[users]',  //  list/read
+            MessageConfWrite    : 'GM[users]',  //  post/write
+
+            MessageAreaRead     : 'GM[users]',  //  list/read; requires parent conf read
+            MessageAreaWrite    : 'GM[users]',  //  post/write; requires parent conf write
+
+            FileAreaRead        : 'GM[users]',  //  list
+            FileAreaWrite       : 'GM[sysops]', //  upload
+            FileAreaDownload    : 'GM[users]',  //  download
+        };
+    }
+
     check(acs, scope, defaultAcs) {
         acs = acs ? acs[scope] : defaultAcs;
         acs = acs || defaultAcs;
@@ -32,10 +46,18 @@ class ACS {
         return this.check(conf.acs, 'read', ACS.Defaults.MessageConfRead);
     }
 
+    hasMessageConfWrite(conf) {
+        return this.check(conf.acs, 'write', ACS.Defaults.MessageConfWrite);
+    }
+
     hasMessageAreaRead(area) {
         return this.check(area.acs, 'read', ACS.Defaults.MessageAreaRead);
     }
 
+    hasMessageAreaWrite(area) {
+        return this.check(area.acs, 'write', ACS.Defaults.MessageAreaWrite);
+    }
+
     //
     //  File Base / Areas
     //
@@ -44,6 +66,7 @@ class ACS {
     }
 
     hasFileAreaWrite(area) {
+        //  :TODO: create 'upload' alias?
         return this.check(area.acs, 'write', ACS.Defaults.FileAreaWrite);
     }
 
@@ -91,13 +114,4 @@ class ACS {
     }
 }
 
-ACS.Defaults = {
-    MessageAreaRead     : 'GM[users]',
-    MessageConfRead     : 'GM[users]',
-
-    FileAreaRead        : 'GM[users]',
-    FileAreaWrite       : 'GM[sysops]',
-    FileAreaDownload    : 'GM[users]',
-};
-
 module.exports = ACS;

From 1fdaaf5633acac887d45f99983a40dc2f4c28414 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 16 Sep 2019 22:05:03 -0600
Subject: [PATCH 0905/1013] Add 'write' access for post FSE +
 hasMessageConfAndAreaWrite() + MenuModule helpers: gotoMenuOrPrev(),
 gotoMenuOrShowMessage(). These will likely replace many other pieces of code
 soon.

---
 core/menu_module.js       | 38 ++++++++++++++++++++++++++++++++++++++
 core/message_area.js      |  9 +++++++++
 core/msg_area_post_fse.js | 26 +++++++++++++++++++++-----
 3 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 95557e32..804065a7 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -259,6 +259,44 @@ exports.MenuModule = class MenuModule extends PluginModule {
         return this.client.menuStack.goto(name, options, cb);
     }
 
+    gotoMenuOrPrev(name, options, cb) {
+        this.client.menuStack.goto(name, options, err => {
+            if(!err) {
+                if(cb) {
+                    return cb(null);
+                }
+            }
+
+            return this.prevMenu(cb);
+        });
+    }
+
+    gotoMenuOrShowMessage(name, message, options, cb) {
+        if(!cb && _.isFunction(options)) {
+            cb = options;
+            options = {};
+        }
+
+        options = options || { clearScreen: true };
+
+        this.gotoMenu(name, options, err => {
+            if(err) {
+                if(options.clearScreen) {
+                    this.client.term.rawWrite(ansi.resetScreen());
+                }
+
+                this.client.term.write(`${message}\n`);
+                return this.pausePrompt( () => {
+                    return this.prevMenu(cb);
+                });
+            }
+
+            if(cb) {
+                return cb(null);
+            }
+        });
+    }
+
     reload(cb) {
         const prevMenu = this.client.menuStack.pop();
         prevMenu.instance.leave();
diff --git a/core/message_area.js b/core/message_area.js
index a0806bc0..579f1c9b 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -32,6 +32,7 @@ exports.getMessageAreaByTag                 = getMessageAreaByTag;
 exports.changeMessageConference             = changeMessageConference;
 exports.changeMessageArea                   = changeMessageArea;
 exports.hasMessageConfAndAreaRead           = hasMessageConfAndAreaRead;
+exports.hasMessageConfAndAreaWrite          = hasMessageConfAndAreaWrite;
 exports.filterMessageAreaTagsByReadACS      = filterMessageAreaTagsByReadACS;
 exports.filterMessageListByReadACS          = filterMessageListByReadACS;
 exports.tempChangeMessageConfAndArea        = tempChangeMessageConfAndArea;
@@ -410,6 +411,14 @@ function hasMessageConfAndAreaRead(client, areaOrTag) {
     return client.acs.hasMessageConfRead(conf) && client.acs.hasMessageAreaRead(areaOrTag);
 }
 
+function hasMessageConfAndAreaWrite(client, areaOrTag) {
+    if(_.isString(areaOrTag)) {
+        areaOrTag = getMessageAreaByTag(areaOrTag) || {};
+    }
+    const conf = getMessageConferenceByTag(areaOrTag.confTag);
+    return client.acs.hasMessageConfWrite(conf) && client.acs.hasMessageAreaWrite(areaOrTag);
+}
+
 function filterMessageAreaTagsByReadACS(client, areaTags) {
     if(!Array.isArray(areaTags)) {
         areaTags = [ areaTags ];
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 613cee04..f47717b2 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -4,6 +4,9 @@
 const FullScreenEditorModule    = require('./fse.js').FullScreenEditorModule;
 const persistMessage            = require('./message_area.js').persistMessage;
 const UserProps                 = require('./user_property.js');
+const {
+    hasMessageConfAndAreaWrite,
+}                               = require('./message_area.js');
 
 const _                         = require('lodash');
 const async                     = require('async');
@@ -59,12 +62,25 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
     }
 
     enter() {
-        if(_.isString(this.client.user.properties[UserProps.MessageAreaTag]) &&
-            !_.isString(this.messageAreaTag))
-        {
-            this.messageAreaTag = this.client.user.properties[UserProps.MessageAreaTag];
-        }
+        this.messageAreaTag =
+            this.messageAreaTag ||
+            this.client.user.getProperty(UserProps.MessageAreaTag);
 
         super.enter();
     }
+
+    initSequence() {
+        if(!hasMessageConfAndAreaWrite(this.client, this.messageAreaTag)) {
+            const noAcsMenu =
+                this.menuConfig.config.messageBasePostMessageNoAccess ||
+                'messageBasePostMessageNoAccess';
+
+            return this.gotoMenuOrShowMessage(
+                noAcsMenu,
+                'You do not have the proper access to post here!',
+            );
+        }
+
+        super.initSequence();
+    }
 };
\ No newline at end of file

From 2ed39cf4e3f3161ca43ffcfda92ea8a9b8c82aa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2019 20:20:07 +0000
Subject: [PATCH 0906/1013] Bump nokogiri from 1.8.5 to 1.10.4 in /docs

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.10.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.10.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 12e78772..5303d96f 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -62,10 +62,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.1)

From 351ae527760f2293c2d20e9e15b1cab129aae4a4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 29 Oct 2019 21:17:58 -0600
Subject: [PATCH 0907/1013] Dep updates

---
 core/client_connections.js |   2 +-
 core/file_area_web.js      |   2 +-
 package.json               |  34 ++---
 yarn.lock                  | 268 +++++++++++++++++++++----------------
 4 files changed, 171 insertions(+), 135 deletions(-)

diff --git a/core/client_connections.js b/core/client_connections.js
index 21aa5c1c..e2c8d577 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -9,7 +9,7 @@ const UserProps     = require('./user_property.js');
 //  deps
 const _             = require('lodash');
 const moment        = require('moment');
-const hashids       = require('hashids');
+const hashids       = require('hashids/cjs');
 
 exports.getActiveConnections    = getActiveConnections;
 exports.getActiveConnectionList = getActiveConnectionList;
diff --git a/core/file_area_web.js b/core/file_area_web.js
index b36c8b72..b6a3d8ae 100644
--- a/core/file_area_web.js
+++ b/core/file_area_web.js
@@ -19,7 +19,7 @@ const UserProps             = require('./user_property.js');
 const SysProps              = require('./system_menu_method.js');
 
 //  deps
-const hashids       = require('hashids');
+const hashids       = require('hashids/cjs');
 const moment        = require('moment');
 const paths         = require('path');
 const async         = require('async');
diff --git a/package.json b/package.json
index 235018a7..f57d5ffa 100644
--- a/package.json
+++ b/package.json
@@ -23,39 +23,39 @@
   ],
   "dependencies": {
     "async": "3.1.0",
-    "binary-parser": "1.4.0",
+    "binary-parser": "^1.5.0",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
     "fs-extra": "8.1.0",
-    "glob": "7.1.4",
-    "graceful-fs": "4.2.0",
-    "hashids": "^1.1.1",
-    "hjson": "^3.1.2",
+    "glob": "^7.1.5",
+    "graceful-fs": "^4.2.3",
+    "hashids": "^2.0.1",
+    "hjson": "^3.2.1",
     "iconv-lite": "0.5.0",
-    "inquirer": "6.4.1",
+    "inquirer": "^7.0.0",
     "later": "1.2.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
     "mime-types": "2.1.24",
-    "minimist": "1.2.x",
+    "minimist": "1.2.0",
     "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
-    "node-pty": "^0.8.1",
-    "nodemailer": "6.2.1",
+    "node-pty": "^0.9.0",
+    "nodemailer": "^6.3.1",
     "otplib": "11.0.1",
-    "qrcode-generator": "1.4.3",
+    "qrcode-generator": "^1.4.4",
     "rlogin": "^1.0.0",
     "sane": "4.1.0",
-    "sanitize-filename": "^1.6.1",
-    "sqlite3": "4.0.9",
+    "sanitize-filename": "^1.6.3",
+    "sqlite3": "^4.1.0",
     "sqlite3-trans": "^1.2.1",
-    "ssh2": "0.8.4",
+    "ssh2": "^0.8.5",
     "temptmp": "^1.1.0",
-    "uuid": "^3.2.1",
+    "uuid": "^3.3.3",
     "uuid-parse": "1.1.0",
-    "ws": "7.0.1",
-    "xxhash": "^0.2.4",
+    "ws": "^7.2.0",
+    "xxhash": "^0.3.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {},
diff --git a/yarn.lock b/yarn.lock
index d9aade26..eaf58605 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,10 +25,12 @@ ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ansi-escapes@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+ansi-escapes@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz#4dccdb846c3eee10f6d64dea66273eab90c37228"
+  integrity sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==
+  dependencies:
+    type-fest "^0.5.2"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -177,10 +179,10 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-binary-parser@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.4.0.tgz#5f32d9b28f2027968dc660b680699dc030a6ea92"
-  integrity sha512-z4TOFQFy5YzhEy50mM+WV6BRu3xo0Vpe5qEtVwnUZkhibuNrPKkBXTpzSs2xcSW6TMVeXas77fEsEVV+lj4/iw==
+binary-parser@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.5.0.tgz#3e50de3a5076badbacd760e833e7d94892b9e9fa"
+  integrity sha512-z+hqNSnO7trFDPLihjUGTwlSTbcIzLYSCwnbiasFkRvCIY9F3ZTex7Mlm9UAP3w5mfHD3KxejnWFPJjtsVVMuw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -288,12 +290,12 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
-    restore-cursor "^2.0.0"
+    restore-cursor "^3.1.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
@@ -485,6 +487,11 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 end-of-stream@^1.1.0, end-of-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -603,10 +610,10 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+figures@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
+  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -708,18 +715,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -743,6 +738,18 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
+  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -754,16 +761,21 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-graceful-fs@4.2.0, graceful-fs@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
 graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
+graceful-fs@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
+
+graceful-fs@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -818,15 +830,15 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-hashids@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/hashids/-/hashids-1.2.2.tgz#28635c7f2f7360ba463686078eee837479e8eafb"
-  integrity sha512-dEHCG2LraR6PNvSGxosZHIRgxF5sNLOIBFEHbj8lfP9WWmu/PWPMzsip1drdVSOFi51N2pU7gZavrgn7sbGFuw==
+hashids@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.0.1.tgz#cdee93b6de1a6f941c955084fe82658c4fba28da"
+  integrity sha512-Hr1lPEGhCkZSniYj9jAj8gQtcTBKNhf/tF14R1tu3zvIcwCT89/ucHEyObSIUZ42Y30SlIfOt7Sq0Uw+rhs6iQ==
 
-hjson@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.1.2.tgz#1ae8a3a897a1fab8d45180f98e9abf9b56f95b55"
-  integrity sha512-2ILrho8eRl2Bniy61mDFiXRAloYqH2T6OwWkoF/8y55DPFgG2RcqQGNXIfBLp432dnAbLOpBJ4pJs63W3X27EA==
+hjson@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.2.1.tgz#20de41dc87fc9a10d1557d0230b0e02afb1b09ac"
+  integrity sha512-OhhrFMeC7dVuA1xvxuXGTv/yTdhTvbe8hz+3LgVNsfi9+vgz0sF/RrkuX8eegpKaMc9cwYwydImBH6iePoJtdQ==
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -876,22 +888,22 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.1.tgz#7bd9e5ab0567cd23b41b0180b68e0cfa82fc3c0b"
-  integrity sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==
+inquirer@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
+  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
   dependencies:
-    ansi-escapes "^3.2.0"
+    ansi-escapes "^4.2.1"
     chalk "^2.4.2"
-    cli-cursor "^2.1.0"
+    cli-cursor "^3.1.0"
     cli-width "^2.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.11"
-    mute-stream "0.0.7"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
     run-async "^2.2.0"
     rxjs "^6.4.0"
-    string-width "^2.1.0"
+    string-width "^4.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
@@ -970,6 +982,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -1116,7 +1133,12 @@ later@1.2.0:
   resolved "https://registry.yarnpkg.com/later/-/later-1.2.0.tgz#f2cf6c4dd7956dd2f520adf0329836e9876bad0f"
   integrity sha1-8s9sTdeVbdL1IK3wMpg26YdrrQ8=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
+lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+lodash@^4.17.4:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -1190,10 +1212,10 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.36.0"
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 "minimatch@2 || 3", minimatch@^3.0.4:
   version "3.0.4"
@@ -1207,7 +1229,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.x, minimist@^1.1.1, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -1262,10 +1284,10 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 mv@~2:
   version "2.1.1"
@@ -1276,17 +1298,12 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
-  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
-
-nan@^2.10.0, nan@^2.4.0:
+nan@^2.10.0:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
   integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
-nan@^2.12.1:
+nan@^2.12.1, nan@^2.13.2, nan@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -1364,17 +1381,17 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pty@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.1.tgz#94b457bec013e7a09b8d9141f63b0787fa25c23f"
-  integrity sha512-j+/g0Q5dR+vkELclpJpz32HcS3O/3EdPSGPvDXJZVJQLCvgG0toEbfmymxAEyQyZEpaoKHAcoL+PvKM+4N9nlw==
+node-pty@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0.tgz#8f9bcc0d1c5b970a3184ffd533d862c7eb6590a6"
+  integrity sha512-MBnCQl83FTYOu7B4xWw10AW77AAh7ThCE1VXEv+JeWj8mSpGo+0bwgsV+b23ljBFwEM9OmsOv3kM27iUPPm84g==
   dependencies:
-    nan "2.12.1"
+    nan "^2.14.0"
 
-nodemailer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.2.1.tgz#20d773925eb8f7a06166a0b62c751dc8290429f3"
-  integrity sha512-TagB7iuIi9uyNgHExo8lUDq3VK5/B0BpbkcjIgNvxbtVrjNqq0DwAOTuzALPVkK76kMhTSzIgHqg8X1uklVs6g==
+nodemailer@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.1.tgz#2784beebac6b9f014c424c54dbdcc5c4d1221346"
+  integrity sha512-j0BsSyaMlyadEDEypK/F+xlne2K5m6wzPYMXS/yxKI0s7jmT1kBx6GEKRVbZmyYfKOsjkeC/TiMVDJBI/w5gMQ==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -1466,12 +1483,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
   dependencies:
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.1.0"
 
 os-homedir@^1.0.0:
   version "1.0.2"
@@ -1583,10 +1600,10 @@ punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-qrcode-generator@1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.3.tgz#4876e8f280e65b6c94615f4c19c484f6b964b199"
-  integrity sha512-++rVRvMRq5BlHfmAafl8a4ppUntzUxCCUTT2t0siUgqKwdnqRzY8IH6f6WSX5dZUhD2Ul5/MIKuTJddflwrGzw==
+qrcode-generator@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.4.tgz#63f771224854759329a99048806a53ed278740e7"
+  integrity sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==
 
 qs@~6.5.2:
   version "6.5.2"
@@ -1679,12 +1696,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
-    onetime "^2.0.0"
+    onetime "^5.1.0"
     signal-exit "^3.0.2"
 
 ret@~0.1.10:
@@ -1767,10 +1784,10 @@ sane@4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-filename@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
-  integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=
+sanitize-filename@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
+  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
@@ -1908,10 +1925,10 @@ sqlite3-trans@^1.2.1:
   dependencies:
     lodash "^4.17.4"
 
-sqlite3@4.0.9:
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.9.tgz#cff74550fa5a1159956815400bdef69245557640"
-  integrity sha512-IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==
+sqlite3@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.0.tgz#e051fb9c133be15726322a69e2e37ec560368380"
+  integrity sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==
   dependencies:
     nan "^2.12.1"
     node-pre-gyp "^0.11.0"
@@ -1926,10 +1943,10 @@ ssh2-streams@~0.4.4:
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.4.tgz#0a657d9371c1fe9f9e349bcff6144febee256aa6"
-  integrity sha512-qztb9t4b34wJSiWVpeTMVVN/5KCuBoyctBc2BcSe/Uq4NRnF0gB16Iu5p72ILhdYATcMNwB5WppzPIEs/3wB8Q==
+ssh2@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.5.tgz#9144cdd6c104aa81b2b16ce647c109f4bd138b57"
+  integrity sha512-TkvzxSYYUSQ8jb//HbHnJVui4fVEW7yu/zwBxwro/QaK2EGYtwB+8gdEChwHHuj142c5+250poMC74aJiwApPw==
   dependencies:
     ssh2-streams "~0.4.4"
 
@@ -1971,7 +1988,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0:
+"string-width@^1.0.2 || 2":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -1979,6 +1996,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
@@ -2007,7 +2033,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0:
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -2138,6 +2164,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-fest@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2"
+  integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -2186,11 +2217,16 @@ uuid-parse@1.1.0:
   resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
   integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
 
-uuid@^3.2.1, uuid@^3.3.2:
+uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -2226,10 +2262,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.0.1.tgz#1a04e86cc3a57c03783f4910fdb090cf31b8e165"
-  integrity sha512-ILHfMbuqLJvnSgYXLgy4kMntroJpe8hT41dOVWM8bxRuw6TK4mgMp9VJUNsZTEc5Bh+Mbs0DJT4M0N+wBG9l9A==
+ws@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"
+  integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==
   dependencies:
     async-limiter "^1.0.0"
 
@@ -2238,12 +2274,12 @@ xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
-xxhash@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/xxhash/-/xxhash-0.2.4.tgz#8b8a48162cfccc21b920fa500261187d40216c39"
-  integrity sha1-i4pIFiz8zCG5IPpQAmEYfUAhbDk=
+xxhash@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/xxhash/-/xxhash-0.3.0.tgz#d20893a62c5b0f7260597dd55859b12a1e02c559"
+  integrity sha512-1ud2yyPiR1DJhgyF1ZVMt+Ijrn0VNS/wzej1Z8eSFfkNfRPp8abVZNV2u9tYy9574II0ZayZYZgJm8KJoyGLCw==
   dependencies:
-    nan "^2.4.0"
+    nan "^2.13.2"
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"

From c9ff904b2bb5fbbe5db3ece50ec08648cf2d830c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Nov 2019 19:20:14 -0700
Subject: [PATCH 0908/1013] Fix various minor mistakes

---
 core/connect.js              |  1 -
 core/file_base_area.js       |  4 ++--
 core/message.js              |  8 ++++----
 core/servers/content/nntp.js |  2 +-
 core/string_util.js          |  8 +++++---
 core/upload.js               | 10 ++++------
 core/view_controller.js      |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/connect.js b/core/connect.js
index 5d45eaa4..52ff67a0 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -112,7 +112,6 @@ function ansiAttemptDetectUTF8(client, cb) {
                     }
                 }
                 return cb(null);
-
         }
     };
 
diff --git a/core/file_base_area.js b/core/file_base_area.js
index ec36c7ec..e3887b84 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -401,7 +401,7 @@ function extractAndProcessDescFiles(fileEntry, filePath, archiveEntries, cb) {
                                 //
                                 //  :TODO: This isn't really always the case - how to handle this? We could do a quick detection...
                                 const decodedData           = iconv.decode(data, 'cp437');
-                                fileEntry[descType]         = sliceAtSauceMarker(decodedData, 0x1a);
+                                fileEntry[descType]         = sliceAtSauceMarker(decodedData);
                                 fileEntry[`${descType}Src`] = 'descFile';
                                 return next(null);
                             });
@@ -575,7 +575,7 @@ function populateFileEntryInfoFromFile(fileEntry, filePath, cb) {
                     `${_.upperFirst(descType)} description command failed`
                 );
             } else {
-                stdout = (stdout || '').trim();
+                stdout = stdout.trim();
                 if(stdout.length > 0) {
                     const key = 'short' === descType ? 'desc' : 'descLong';
                     if('desc' === key) {
diff --git a/core/message.js b/core/message.js
index 26a3bf21..5291b82a 100644
--- a/core/message.js
+++ b/core/message.js
@@ -329,8 +329,8 @@ module.exports = class Message {
             appendWhereClause(`m.area_tag = "${Message.WellKnownAreaTags.Private}"`);
             appendWhereClause(
                 `m.message_id IN (
-                    SELECT message_id 
-                    FROM message_meta 
+                    SELECT message_id
+                    FROM message_meta
                     WHERE meta_category = "System" AND meta_name = "${Message.SystemMetaNames.LocalToUserID}" AND meta_value = ${filter.privateTagUserId}
                 )`);
         } else {
@@ -619,7 +619,7 @@ module.exports = class Message {
         }
 
         const metaStmt = transOrDb.prepare(
-            `INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value) 
+            `INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value)
             VALUES (?, ?, ?, ?);`);
 
         if(!_.isArray(value)) {
@@ -840,7 +840,7 @@ module.exports = class Message {
         } else {
             const QUOTE_RE  = /^ ((?:[A-Za-z0-9]{2}> )+(?:[A-Za-z0-9]{2}>)*) */;
             const quoted    = [];
-            const input     = _.trimEnd(this.message).replace(/\b/g, '');
+            const input     = _.trimEnd(this.message).replace(/\x08/g, '');
 
             //  find *last* tearline
             let tearLinePos = this.getTearLinePosition(input);
diff --git a/core/servers/content/nntp.js b/core/servers/content/nntp.js
index 9f7c5a13..237c0994 100644
--- a/core/servers/content/nntp.js
+++ b/core/servers/content/nntp.js
@@ -275,7 +275,7 @@ class NNTPServer extends NNTPServerBase {
         //
         const remoteFrom = _.get(message.meta, [ 'System', Message.SystemMetaNames.RemoteFromUser ]);
         message.nntpHeaders['X-FTN-From'] = remoteFrom ? `${fromName} <${remoteFrom}>` : fromName;
-        const  remoteTo = _.get(message.meta [ 'System', Message.SystemMetaNames.RemoteToUser ]);
+        const  remoteTo = _.get(message.meta, [ 'System', Message.SystemMetaNames.RemoteToUser ]);
         message.nntpHeaders['X-FTN-To'] = remoteTo ? `${toName} <${remoteTo}>` : toName;
 
         if(!message.replyToMsgId) {
diff --git a/core/string_util.js b/core/string_util.js
index 4f7741ae..fa9a9097 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -29,9 +29,11 @@ exports.isAnsiLine                  = isAnsiLine;
 exports.isFormattedLine             = isFormattedLine;
 exports.splitTextAtTerms            = splitTextAtTerms;
 
-//  :TODO: create Unicode verison of this
-const VOWELS = [ 'a', 'e', 'i', 'o', 'u' ];
-VOWELS.concat(VOWELS.map(l => l.toUpperCase()));
+//  :TODO: create Unicode version of this
+const VOWELS = [
+    'a', 'e', 'i', 'o', 'u',
+    'A', 'E', 'I', 'O', 'U',
+];
 
 const SIMPLE_ELITE_MAP = {
     'a' : '4',
diff --git a/core/upload.js b/core/upload.js
index 6eaff2ab..b451ac9a 100644
--- a/core/upload.js
+++ b/core/upload.js
@@ -387,13 +387,11 @@ exports.getModule = class UploadModule extends MenuModule {
                     self.client.log.error(
                         'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
                     );
-
-                    if(!err && dst !== finalPath) {
-                        //  name changed; ajust before persist
-                        newEntry.fileName = paths.basename(finalPath);
-                    }
-
                     return nextEntry(null); //  still try next file
+                } else if(dst !== finalPath)
+                {
+                    //  name changed; adjust before persist
+                    newEntry.fileName = paths.basename(finalPath);
                 }
 
                 self.client.log.debug('Moved upload to area', { path : finalPath } );
diff --git a/core/view_controller.js b/core/view_controller.js
index 9c0ffe19..f51c307f 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -219,7 +219,7 @@ function ViewController(options) {
                         break;
 
                     default :
-                        propValue = propValue = conf[propName];
+                        propValue = conf[propName];
                         break;
                 }
             } else {

From aa70a6b1aad01328277650e9e544cd1916e0da0b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 8 Nov 2019 22:12:29 -0700
Subject: [PATCH 0909/1013] Minor dep updates

---
 package.json |  4 ++--
 yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index f57d5ffa..8fde7f20 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
     "fs-extra": "8.1.0",
-    "glob": "^7.1.5",
+    "glob": "7.1.6",
     "graceful-fs": "^4.2.3",
     "hashids": "^2.0.1",
     "hjson": "^3.2.1",
@@ -50,7 +50,7 @@
     "sanitize-filename": "^1.6.3",
     "sqlite3": "^4.1.0",
     "sqlite3-trans": "^1.2.1",
-    "ssh2": "^0.8.5",
+    "ssh2": "0.8.6",
     "temptmp": "^1.1.0",
     "uuid": "^3.3.3",
     "uuid-parse": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index eaf58605..067bb3c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -715,6 +715,18 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -738,18 +750,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.5:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
-  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -1934,21 +1934,21 @@ sqlite3@^4.1.0:
     node-pre-gyp "^0.11.0"
     request "^2.87.0"
 
-ssh2-streams@~0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.4.tgz#7f07464c4b19ee93324995ec7164f110c5a13658"
-  integrity sha512-yNfPZgJO/N69TvYkpDHZBkXAXQzTpfzRkOphQu3PeUpZnrjp9VNa8RKDZkZDpjsWItay+I4NMAbZZ7DqHRt0AQ==
+ssh2-streams@~0.4.7:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.7.tgz#093b89069de9cf5f06feff0601a5301471b01611"
+  integrity sha512-JhF8BNfeguOqVHOLhXjzLlRKlUP8roAEhiT/y+NcBQCqpRUupLNrRf2M+549OPNVGx21KgKktug4P3MY/IvTig==
   dependencies:
     asn1 "~0.2.0"
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.5.tgz#9144cdd6c104aa81b2b16ce647c109f4bd138b57"
-  integrity sha512-TkvzxSYYUSQ8jb//HbHnJVui4fVEW7yu/zwBxwro/QaK2EGYtwB+8gdEChwHHuj142c5+250poMC74aJiwApPw==
+ssh2@0.8.6:
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.6.tgz#dcc62e1d3b9e58a21f711f5186f043e4e792e6da"
+  integrity sha512-T0cPmEtmtC8WxSupicFDjx3vVUdNXO8xu2a/D5bjt8ixOUCe387AgvxU3mJgEHpu7+Sq1ZYx4d3P2pl/yxMH+w==
   dependencies:
-    ssh2-streams "~0.4.4"
+    ssh2-streams "~0.4.7"
 
 sshpk@^1.7.0:
   version "1.14.2"

From 0cae6e656ddec24fbbbb7c9e7cf99c154644f29b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 12 Nov 2019 19:18:47 -0700
Subject: [PATCH 0910/1013] Add some docs around write conf/area ACS

---
 docs/messageareas/configuring-a-message-area.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/messageareas/configuring-a-message-area.md b/docs/messageareas/configuring-a-message-area.md
index e099c9e0..011e9497 100644
--- a/docs/messageareas/configuring-a-message-area.md
+++ b/docs/messageareas/configuring-a-message-area.md
@@ -21,7 +21,8 @@ Each conference is represented by a entry under `messageConferences`. Each entri
 
 ### ACS
 An optional standard [ACS](/docs/configuration/acs.md) block can be supplied with the following rules:
-* `read`: ACS require to read (see) this conference. Defaults to `GM[users]`.
+* `read`: ACS required to read (see) this conference. Defaults to `GM[users]`.
+* `write`: ACS required to write (post) to this conference. Defaults to `GM[users]`.
 
 ### Example
 
@@ -55,7 +56,8 @@ Message Areas are topic specific containers for messages that live within a part
 
 ### ACS
 An optional standard [ACS](/docs/configuration/acs.md) block can be supplied with the following rules:
-* `read`: ACS require to read (see) this conference. Defaults to `GM[users]`.
+* `read`: ACS required to read (see) this area. Defaults to `GM[users]`.
+* `write`: ACS required to write (post) to this area. Defaults to `GM[users]`.
 
 ### Example
 
@@ -64,13 +66,14 @@ messageConferences: {
   local: {
     // ... see above ...
     areas: {
-      enigma_dev: {                     // Area tag - required elsewhere!
-        name: ENiGMA 1/2 Development   
-        desc: ENiGMA 1/2 discussion!   
-        sort: 1                        
+      enigma_dev: { // Area tag - required elsewhere!
+        name: ENiGMA 1/2 Development
+        desc: ENiGMA 1/2 development and discussion!
+        sort: 1
         default: true
         acs: {
           read: GM[users] // default
+          write: GM[l33t] // super elite ENiGMA 1/2 users!
         }
       }
     }

From 4397e943795dc98eba3a56ea1e661f8947ae374a Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 Nov 2019 20:33:31 -0700
Subject: [PATCH 0911/1013] Add auto sig editor docs

---
 docs/_includes/nav.md        | 19 ++++++++++---------
 docs/modding/autosig-edit.md | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 docs/modding/autosig-edit.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 5ecbe58e..a0e136ce 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -3,13 +3,13 @@
         - [Install script]({{ site.baseurl }}{% link installation/install-script.md %})
         - [Docker]({{ site.baseurl }}{% link installation/docker.md %})
         - [Manual installation]({{ site.baseurl }}{% link installation/manual.md %})
-    - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})  
-      - [Raspberry Pi]({{ site.baseurl }}{% link installation/rpi.md %})  
-      - [Windows]({{ site.baseurl }}{% link installation/windows.md %})  
+    - [OS / Hardware Specific]({{ site.baseurl }}{% link installation/os-hardware.md %})
+      - [Raspberry Pi]({{ site.baseurl }}{% link installation/rpi.md %})
+      - [Windows]({{ site.baseurl }}{% link installation/windows.md %})
     - [Your Network Setup]({{ site.baseurl }}{% link installation/network.md %})
     - [Testing Your Installation]({{ site.baseurl }}{% link installation/testing.md %})
     - [Production Installation]({{ site.baseurl }}{% link installation/production.md %})
-    
+
   - Configuration
     - [Creating Config Files]({{ site.baseurl }}{% link configuration/creating-config.md %})
     - [SysOp Setup]({{ site.baseurl }}{% link configuration/sysop-setup.md %})
@@ -37,13 +37,13 @@
     - [TIC Support]({{ site.baseurl }}{% link filebase/tic-support.md %}) (Importing from FTN networks)
     - Tips and tricks
       - [Network mounts and symlinks]({{ site.baseurl }}{% link filebase/network-mounts-and-symlinks.md %})
-    
+
   - Message Areas
     - [Configuring a Message Area]({{ site.baseurl }}{% link messageareas/configuring-a-message-area.md %})
     - [Message networks]({{ site.baseurl }}{% link messageareas/message-networks.md %})
     - [BSO Import & Export]({{ site.baseurl }}{% link messageareas/bso-import-export.md %})
-    - [Netmail]({{ site.baseurl }}{% link messageareas/netmail.md %})     
-    
+    - [Netmail]({{ site.baseurl }}{% link messageareas/netmail.md %})
+
   - Art
     - [General]({{ site.baseurl }}{% link art/general.md %})
     - [Themes]({{ site.baseurl }}{% link art/themes.md %})
@@ -59,10 +59,10 @@
       - [Web]({{ site.baseurl }}{% link servers/web-server.md %})
       - [Gopher]({{ site.baseurl }}{% link servers/gopher.md %})
       - [NNTP]({{ site.baseurl }}{% link servers/nntp.md %})
-              
+
   - Modding
     - [Local Doors]({{ site.baseurl }}{% link modding/local-doors.md %})
-    - [Door Servers]({{ site.baseurl }}{% link modding/door-servers.md %}) 
+    - [Door Servers]({{ site.baseurl }}{% link modding/door-servers.md %})
         - DoorParty
         - BBSLink
         - Combatnet
@@ -85,6 +85,7 @@
     - [Node to Node Messaging]({{ site.baseurl }}{% link modding/node-msg.md %})
     - [Top X]({{ site.baseurl }}{% link modding/top-x.md %})
     - [2FA/OTP Config]({{ site.baseurl }}{% link modding/user-2fa-otp-config.md %})
+    - [Auto Signature Editor]({{ site.baseurl }}{% link modding/autosig-edit.md %})
 
   - Administration
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
diff --git a/docs/modding/autosig-edit.md b/docs/modding/autosig-edit.md
new file mode 100644
index 00000000..f0da9b18
--- /dev/null
+++ b/docs/modding/autosig-edit.md
@@ -0,0 +1,22 @@
+---
+layout: page
+title: Auto Signature Editor
+---
+## The Auto Signature Editor
+The built in `autosig_edit` module allows users to edit their auto signatures (AKA "autosig").
+
+### Theming
+The following MCI codes are available:
+* MCI 1 (ie: `MT1`): Editor
+* MCI 2 (ie: `BT2`): Save button
+
+### Disabling Auto Signatures
+Auto Signature support can be disabled for a particular message area by setting `autoSignatures` to false in the area's configuration block.
+
+Example:
+```hjson
+my_area: {
+    name: My Area
+    autoSignatures: false
+}
+```

From d712c36171be5ca3f75255f99bc3d7ae340000fe Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 20:03:35 -0700
Subject: [PATCH 0912/1013] Some documentation updates

---
 UPGRADE.md  | 4 ++--
 WHATSNEW.md | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index ef6fd95a..bd0a47b0 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -8,7 +8,7 @@ This document covers basic upgrade notes for major ENiGMA½ version updates.
 
 # General Notes
 ## Configuration File Updates
-In general, look at the `menu_template.in.hjson`, and `config_template.in.hjson` as well as the defualt `luciano_blocktronics/theme.hjson` files when you update. These files may come with new sections you wish to merge into your system!
+In general, look at the `menu_template.in.hjson`, and `config_template.in.hjson` as well as the default `luciano_blocktronics/theme.hjson` files when you update. These files may come with new sections you wish to merge into your system!
 
 ### menu.hjson
 Upgrades often come with changes to the default `menu_template.in.hjson`. It is wise to use a *different* file name for your BBS's version of this file and point to it via `config.hjson`. For example:
@@ -81,7 +81,7 @@ ENiGMA 0.0.8-alpha comes with some structure changes:
 With the change to the `./mods` directory, `@systemModule` is now implied for `module` declarations in `menu.hjson`. To use a user module in `./mods` you must specify `@userModule`!
 
 With the above changes, you'll need to to at least:
-* Move your `~/.config/enigma-bbs/config.hjson` to `./config/config.hjson` or utlize the `--config` option. 
+* Move your `~/.config/enigma-bbs/config.hjson` to `./config/config.hjson` or utlize the `--config` option.
 * Move your `prompt.hjson` and `menu.hjson` (e.g. `myboardname.hjson`) to `./config`
 * Move any non-theme art files, and theme directories to their appropriate locations mentioned above
 * Move any module directories such as `message_post_evt` to `./mods/`
diff --git a/WHATSNEW.md b/WHATSNEW.md
index b1ec8ce6..bc8cc9f8 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -42,6 +42,11 @@ submit: [
     }
 ]
 ```
+* Added `read` (list/view) and `write` (post) ACS support to message conferences and areas.
+* Many new built in modules adding support for things like auto signatures, listing "my" messages, top stats, etc. Take a look in the docs for setting them up!
+* Built in MRC support!
+* Added an customizable achievement system!
+
 
 ## 0.0.9-alpha
 * Development is now against Node.js 10.x LTS. While other Node.js series may continue to work, you're own your own and YMMV!
@@ -82,7 +87,7 @@ submit: [
 * Added web (http://, https://) based download manager including batch downloads. Clickable links if using [VTXClient](https://github.com/codewar65/VTX_ClientServer)!
 * General VTX hyperlink support for web links
 * DEL vs Backspace key differences in FSE
-* Correly parse oddball `INTL`, `TOPT`, `FMPT`, `Via`, etc. FTN kludge lines
+* Correctly parse oddball `INTL`, `TOPT`, `FMPT`, `Via`, etc. FTN kludge lines
 * NetMail support! You can now send and receive NetMail. To send a NetMail address a external user using `Name <address>` format from your personal email menu. For example, `Foo Bar <123:123/123>`. The system also detects other formats such asa `Name @ address` (`Foo Bar@123:123/123`)
 * `oputil.js`: Added `mb areafix` command to quickly send AreaFix messages from the command line. You can manually send them from personal mail as well.
 * `oputil.js fb rm|remove|del|delete` functionality to remove file base entries.

From 40c34252ec37dcbc338edea5eb2f4e1115a70265 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 20:10:06 -0700
Subject: [PATCH 0913/1013] Update install.sh locations for prep to master

---
 README.md                           | 6 +++---
 docs/installation/install-script.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index efa593cd..e7bb1204 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ ENiGMA½ is a modern BBS software with a nostalgic flair!
  * Upload processor supporting [FILE_ID.DIZ](https://en.wikipedia.org/wiki/FILE_ID.DIZ) and [NFO](https://en.wikipedia.org/wiki/.nfo) extraction, year estimation, and more!
  * ANSI support in the Full Screen Editor (FSE), file descriptions, etc.
  * A built in achievement system. BBSing gamified!
- 
+
 ## Documentation
 [Browse the docs online](https://nuskooler.github.io/enigma-bbs/). Be sure to checkout the [/docs/](/docs/) folder as well for the latest and greatest documentation.
- 
+
 ## In the Works
 Many more features are in the pipeline. Checkout the [the issue tracker](https://github.com/NuSkooler/enigma-bbs/issues) and feel free to request features (or contribute!) features.
 
@@ -63,7 +63,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 ## Installation
 On *nix type systems:
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
 ```
 
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) for Windows, Docker, and so on...
diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index c24dede9..2f92db79 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -6,11 +6,11 @@ title: Install Script
 Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
 ```
 
-You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.10-alpha/misc/install.sh) 
-on GitHub before running it. 
+You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh)
+on GitHub before running it.
 
 The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you through creating a basic configuration file, and recommend some packages to install.
 

From be5d46be3c58b3e169b9eed9fdff9e1ce744fb29 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 20:15:36 -0700
Subject: [PATCH 0914/1013] Dep updates

---
 package.json |  4 ++--
 yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8fde7f20..0d9b23f0 100644
--- a/package.json
+++ b/package.json
@@ -30,14 +30,14 @@
     "fs-extra": "8.1.0",
     "glob": "7.1.6",
     "graceful-fs": "^4.2.3",
-    "hashids": "^2.0.1",
+    "hashids": "2.1.0",
     "hjson": "^3.2.1",
     "iconv-lite": "0.5.0",
     "inquirer": "^7.0.0",
     "later": "1.2.0",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
-    "mime-types": "2.1.24",
+    "mime-types": "2.1.25",
     "minimist": "1.2.0",
     "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 067bb3c5..b13f2369 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -830,10 +830,10 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-hashids@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.0.1.tgz#cdee93b6de1a6f941c955084fe82658c4fba28da"
-  integrity sha512-Hr1lPEGhCkZSniYj9jAj8gQtcTBKNhf/tF14R1tu3zvIcwCT89/ucHEyObSIUZ42Y30SlIfOt7Sq0Uw+rhs6iQ==
+hashids@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.1.0.tgz#96eec6de3081a76dcd839650a6a26e6081e729d3"
+  integrity sha512-N53K2p7TrwKLNHKHcEDH+qpiAgO9JfyPEg8Tfy4fB9AcVhwxlTanJ55HVV9BQJQ6ajM1Wfmtl2wgKuEbcucolw==
 
 hjson@^3.2.1:
   version "3.2.1"
@@ -1188,22 +1188,22 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+mime-db@1.42.0:
+  version "1.42.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
+  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
   integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
-mime-types@2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+mime-types@2.1.25:
+  version "2.1.25"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
+  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
   dependencies:
-    mime-db "1.40.0"
+    mime-db "1.42.0"
 
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.20"

From 3cd6d59e12b131c3d20d49b156e6eae7522c5dfb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 20:37:46 -0700
Subject: [PATCH 0915/1013] First 0.0.11-beta commit - create the branch and
 prep work

---
 UPGRADE.md      |  2 ++
 WHATSNEW.md     |  3 +++
 docs/art/mci.md | 32 ++++++++++++++++----------------
 package.json    |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index bd0a47b0..7f1fa96d 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -40,6 +40,8 @@ npm install
 Report your issue on Xibalba BBS, hop in #enigma-bbs on FreeNode and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
+# 0.0.10-alpha to 0.0.11-beta
+
 # 0.0.9-alpha to 0.0.10-alpha
 * Security related files such as private keys and certs are now looked for in `config/security` by default.
 * Default archive handler for zip files has switched to InfoZip due to a bug in the latest p7Zip packages causing "volume not found" errors. Ensure you have the InfoZip `zip` and `unzip` commands in ENiGMA's path. You can switch back to 7Zip by overriding `archiveHandler` for `application/zip` in your `config.hjson` under `fileTypes` to `7Zip`.
diff --git a/WHATSNEW.md b/WHATSNEW.md
index bc8cc9f8..9668431d 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -1,6 +1,9 @@
 # Whats New
 This document attempts to track **major** changes and additions in ENiGMA½. For details, see GitHub.
 
+## 0.0.11-beta
+* Upgraded from `alpha` to `beta` -- The software is far along and mature enough at this point!
+
 ## 0.0.10-alpha
 + `oputil.js user rename USERNAME NEWNAME`
 + `my_messages.js` module (defaulted to "m" at the message menu) to list public messages addressed to the currently logged in user. Takes into account their username and `real_name` property.
diff --git a/docs/art/mci.md b/docs/art/mci.md
index 60bb8ae6..42091d98 100644
--- a/docs/art/mci.md
+++ b/docs/art/mci.md
@@ -2,22 +2,22 @@
 layout: page
 title: MCI Codes
 ---
-ENiGMA½ supports a variety of MCI codes. Some **predefined** codes produce information about the current user, system, 
-or other statistics while others are used to instantiate a **View**. MCI codes are two characters in length and are 
-prefixed with a percent (%) symbol. Some MCI codes have additional options that may be set directly from the code itself 
-while others -- and more advanced options -- are controlled via the current theme. Standard (non-focus) and focus colors 
+ENiGMA½ supports a variety of MCI codes. Some **predefined** codes produce information about the current user, system,
+or other statistics while others are used to instantiate a **View**. MCI codes are two characters in length and are
+prefixed with a percent (%) symbol. Some MCI codes have additional options that may be set directly from the code itself
+while others -- and more advanced options -- are controlled via the current theme. Standard (non-focus) and focus colors
 are set by placing duplicate codes back to back in art files.
 
 ## Predefined MCI Codes
-There are many predefined MCI codes that can be used anywhere on the system (placed in any art file). More are added all 
-the time so also check out [core/predefined_mci.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) 
+There are many predefined MCI codes that can be used anywhere on the system (placed in any art file). More are added all
+the time so also check out [core/predefined_mci.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js)
 for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, etc.
 
 | Code | Description  |
 |------|--------------|
 | `BN` | Board Name |
-| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.10-alpha" |
-| `VN` | Version *number*, eg.. "0.0.10-alpha" |
+| `VL` | Version *label*, e.g. "ENiGMA½ v0.0.11-beta" |
+| `VN` | Version *number*, eg.. "0.0.11-beta" |
 | `SN` | SysOp username |
 | `SR` | SysOp real name |
 | `SL` | SysOp location |
@@ -75,7 +75,7 @@ for a full listing. Many codes attempt to pay homage to Oblivion/2, iNiQUiTY, et
 | `SD` | Total downloads, system wide |
 | `SO` | Total downloaded amount, system wide (formatted to appropriate bytes/megs/etc.) |
 | `SU` | Total uploads, system wide |
-| `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) | 
+| `SP` | Total uploaded amount, system wide (formatted to appropriate bytes/megs/etc.) |
 | `TF` | Total number of files on the system |
 | `TB` | Total amount of files on the system (formatted to appropriate bytes/megs/gigs/etc.) |
 | `TP` | Total messages posted/imported to the system *currently* |
@@ -93,7 +93,7 @@ Some additional special case codes also exist:
 
 
 ## Views
-A **View** is a control placed on a **form** that can display variable data or collect input. One example of a View is 
+A **View** is a control placed on a **form** that can display variable data or collect input. One example of a View is
 a Vertical Menu (`%VM`): Old-school BBSers may recognize this as a lightbar menu.
 
 | Code | Name                 | Description      |
@@ -103,14 +103,14 @@ a Vertical Menu (`%VM`): Old-school BBSers may recognize this as a lightbar menu
 | `ME` | Masked Edit Text     | Collect user input using a *mask* |
 | `MT` | Multi Line Text Edit | Multi line edit control |
 | `BT` | Button               | A button |
-| `VM` | Vertical Menu        | A vertical menu aka a vertical lightbar | 
-| `HM` | Horizontal Menu      | A horizontal menu aka a horizontal lightbar | 
+| `VM` | Vertical Menu        | A vertical menu aka a vertical lightbar |
+| `HM` | Horizontal Menu      | A horizontal menu aka a horizontal lightbar |
 | `SM` | Spinner Menu         | A spinner input control |
-| `TM` | Toggle Menu          | A toggle menu commonly used for Yes/No style input | 
+| `TM` | Toggle Menu          | A toggle menu commonly used for Yes/No style input |
 | `KE` | Key Entry            | A *single* key input control |
 
 
-Peek at [/core/mci_view_factory.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) to 
+Peek at [/core/mci_view_factory.js](https://github.com/NuSkooler/enigma-bbs/blob/master/core/mci_view_factory.js) to
 see additional information.
 
 
@@ -132,7 +132,7 @@ Predefined MCI codes and other Views can have properties set via `menu.hjson` an
 | `itemFormat` | Sets the format for a list entry. See **Entry Formatting** below |
 | `focusItemFormat` | Sets the format for a focused list entry. See **Entry Formatting** below |
 
-These are just a few of the properties set on various views. *Use the source Luke*, as well as taking a look at the default 
+These are just a few of the properties set on various views. *Use the source Luke*, as well as taking a look at the default
 `menu.hjson` and `theme.hjson` files!
 
 ### Custom Properties
@@ -144,7 +144,7 @@ Standard style types available for `textStyle` and `focusTextStyle`:
 
 | Style    | Description  |
 |----------|--------------|
-| `normal` | Leaves text as-is. This is the default. | 
+| `normal` | Leaves text as-is. This is the default. |
 | `upper` | ENIGMA BULLETIN BOARD SOFTWARE |
 | `lower` | enigma bulletin board software |
 | `title` | Enigma Bulletin Board Software |
diff --git a/package.json b/package.json
index 0d9b23f0..212dcc6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enigma-bbs",
-  "version": "0.0.10-alpha",
+  "version": "0.0.11-beta",
   "description": "ENiGMA½ Bulletin Board System",
   "author": "Bryan Ashby <bryan@l33t.codes>",
   "license": "BSD-2-Clause",

From 57358b0f2c89b1cebab703d55aaf75c8a5067d79 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 20:41:09 -0700
Subject: [PATCH 0916/1013] Bump versions in install.sh for branch

---
 README.md                           | 2 +-
 docs/installation/install-script.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e7bb1204..477935a3 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ ENiGMA has been tested with many terminals. However, the following are suggested
 ## Installation
 On *nix type systems:
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.11-beta/misc/install.sh | bash
 ```
 
 Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/installation/installation-methods.html) for Windows, Docker, and so on...
diff --git a/docs/installation/install-script.md b/docs/installation/install-script.md
index 2f92db79..564a6973 100644
--- a/docs/installation/install-script.md
+++ b/docs/installation/install-script.md
@@ -6,10 +6,10 @@ title: Install Script
 Under most Linux/UNIX like environments (Linux, BSD, OS X, ...)  new users can simply execute the `install.sh` script to get everything up and running. Cut + paste the following into your terminal:
 
 ```
-curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh | bash
+curl -o- https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.11-beta/misc/install.sh | bash
 ```
 
-You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/master/misc/install.sh)
+You may review the [installation script](https://raw.githubusercontent.com/NuSkooler/enigma-bbs/0.0.11-beta/misc/install.sh)
 on GitHub before running it.
 
 The script will install nvm, Node.js 6 and grab the latest ENiGMA BBS from GitHub. It will also guide you through creating a basic configuration file, and recommend some packages to install.

From 998df3386a590d863d1fd6f1d45b30c787c0f540 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 19 Nov 2019 21:32:21 -0700
Subject: [PATCH 0917/1013] Bump Node.js req to 12+

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 212dcc6a..8b620932 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,6 @@
   },
   "devDependencies": {},
   "engines": {
-    "node": ">=8"
+    "node": ">=12"
   }
 }

From 1aa545e254b0fe6d217008ff7e2230deb1eea422 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 Nov 2019 19:11:05 -0700
Subject: [PATCH 0918/1013] Minor

---
 core/bbs_link.js | 1 -
 core/connect.js  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/bbs_link.js b/core/bbs_link.js
index 093f0bb2..127f85db 100644
--- a/core/bbs_link.js
+++ b/core/bbs_link.js
@@ -134,7 +134,6 @@ exports.getModule = class BBSLinkModule extends MenuModule {
                         host    : self.config.host,
                     };
 
-                    let clientTerminated;
                     let dataOut;
 
                     self.client.term.write(resetScreen());
diff --git a/core/connect.js b/core/connect.js
index 52ff67a0..d5b03de4 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -18,7 +18,7 @@ function ansiDiscoverHomePosition(client, cb) {
     //  think of home as 0,0. If this is the case, we need to offset
     //  our positioning to accommodate for such.
     //
-    const done = function(err) {
+    const done = (err) => {
         client.removeListener('cursor position report', cprListener);
         clearTimeout(giveUpTimer);
         return cb(err);

From 0328ad5b8083260c6a90b2198d80cb97e8b46217 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 Nov 2019 19:33:33 -0700
Subject: [PATCH 0919/1013] Node.js 12 LTS to docs & install script

---
 UPGRADE.md      | 1 +
 WHATSNEW.md     | 1 +
 misc/install.sh | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 7f1fa96d..3fcd35a8 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -41,6 +41,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on FreeNode and chat, or
 [file a issue on GitHub](https://github.com/NuSkooler/enigma-bbs/issues).
 
 # 0.0.10-alpha to 0.0.11-beta
+* Node.js 12.x LTS is now in use. Follow standard Node.js upgrade procedures (e.g.: `nvm install 12 && nvm use 12`).
 
 # 0.0.9-alpha to 0.0.10-alpha
 * Security related files such as private keys and certs are now looked for in `config/security` by default.
diff --git a/WHATSNEW.md b/WHATSNEW.md
index 9668431d..9736d82f 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -3,6 +3,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 
 ## 0.0.11-beta
 * Upgraded from `alpha` to `beta` -- The software is far along and mature enough at this point!
+* Development is now against Node.js 12.x LTS. Other versions may work but are not currently supported!
 
 ## 0.0.10-alpha
 + `oputil.js user rename USERNAME NEWNAME`
diff --git a/misc/install.sh b/misc/install.sh
index 5da8e0e4..ed81d205 100755
--- a/misc/install.sh
+++ b/misc/install.sh
@@ -2,7 +2,7 @@
 
 { # this ensures the entire script is downloaded before execution
 
-ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=10}
+ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=12}
 ENIGMA_BRANCH=${ENIGMA_BRANCH:=master}
 ENIGMA_INSTALL_DIR=${ENIGMA_INSTALL_DIR:=$HOME/enigma-bbs}
 ENIGMA_SOURCE=${ENIGMA_SOURCE:=https://github.com/NuSkooler/enigma-bbs.git}

From 37638957b43dd670945d82f01e483e7ad9bbf153 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Nov 2019 21:44:24 -0700
Subject: [PATCH 0920/1013] Fix issues with corrupt FTN packets

---
 core/ftn_mail_packet.js | 40 ++++++++++++++++++++++++++++++++--------
 util/dump_ftn_packet.js |  5 ++++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index cc0dde3e..92e28270 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -552,13 +552,18 @@ function Packet(options) {
                 .uint16le('ftn_msg_dest_net')
                 .uint16le('ftn_attr_flags')
                 .uint16le('ftn_cost')
-                //  :TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
+                //
+                //  It would be nice to just string() these, but we want CP437 which requires
+                //  iconv. Another option would be to use a formatter, but until issue 33
+                //  (https://github.com/keichi/binary-parser/issues/33) is fixed, this is cumbersome.
+                //
                 .array('modDateTime', {
                     type        : 'uint8',
-                    readUntil   : b => 0x00 === b,
+                    length      : 20,   //  FTS-0001.016: 20 bytes
                 })
                 .array('toUserName', {
                     type        : 'uint8',
+                    //  :TODO: array needs some soft of 'limit' field
                     readUntil   : b => 0x00 === b,
                 })
                 .array('fromUserName', {
@@ -585,16 +590,35 @@ function Packet(options) {
         //
         //  Convert null terminated arrays to strings
         //
+        //  From FTS-0001.016:
+        //  * modDateTime: 20 bytes exactly (see above)
+        //  * toUserName and fromUserName: *max* 36 bytes, aka "up to"; null terminated
+        //  * subject: *max* 72 bytes, aka "up to"; null terminated
+        //  * message: Unbounded & null terminated
+        //
+        //  For everything above but message, we can get away with assuming CP437
+        //  and probably even just "ascii" for most cases. The message field is
+        //  much more complex so we'll look for encoding kludges, detection, etc.
+        //  later on.
+        //
+        if(msgData.modDateTime.length != 20) {
+            return cb(Errors.Invalid(`FTN packet DateTime field must be 20 bytes (got ${msgData.modDateTime.length})`));
+        }
+        if(msgData.toUserName.length > 36) {
+            return cb(Errors.Invalid(`FTN packet toUserName field must be 36 bytes max (got ${msgData.toUserName.length})`));
+        }
+        if(msgData.fromUserName.length > 36) {
+            return cb(Errors.Invalid(`FTN packet fromUserName field must be 36 bytes max (got ${msgData.fromUserName.length})`));
+        }
+        if(msgData.subject.length > 72) {
+            return cb(Errors.Invalid(`FTN packet subject field must be 72 bytes max (got ${msgData.subject.length})`));
+        }
+
+        //  Arrays of CP437 bytes -> String
         [ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
             msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
         });
 
-        //  Technically the following fields have length limits as per fts-0001.016:
-        //  * modDateTime   : 20 bytes
-        //  * toUserName    : 36 bytes
-        //  * fromUserName  : 36 bytes
-        //  * subject       : 72 bytes
-
         //
         //  The message body itself is a special beast as it may
         //  contain an origin line, kludges, SAUCE in the case
diff --git a/util/dump_ftn_packet.js b/util/dump_ftn_packet.js
index 144d18f3..88eeece8 100755
--- a/util/dump_ftn_packet.js
+++ b/util/dump_ftn_packet.js
@@ -42,7 +42,10 @@ function main() {
 
 			return next(null);
 		},
-		() => {
+		(err) => {
+			if(err) {
+				return console.error(`Error processing packet: ${err.message}`);
+			}
 			console.info('');
 			console.info('--- EOF --- ');
 			console.info('');

From 7ef224be178fdd346609cd740d0152ab4c016ecf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 Nov 2019 21:44:24 -0700
Subject: [PATCH 0921/1013] Fix issues with corrupt FTN packets

---
 core/ftn_mail_packet.js | 40 ++++++++++++++++++++++++++++++++--------
 util/dump_ftn_packet.js |  5 ++++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index cc0dde3e..92e28270 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -552,13 +552,18 @@ function Packet(options) {
                 .uint16le('ftn_msg_dest_net')
                 .uint16le('ftn_attr_flags')
                 .uint16le('ftn_cost')
-                //  :TODO: use string() for these if https://github.com/keichi/binary-parser/issues/33 is resolved
+                //
+                //  It would be nice to just string() these, but we want CP437 which requires
+                //  iconv. Another option would be to use a formatter, but until issue 33
+                //  (https://github.com/keichi/binary-parser/issues/33) is fixed, this is cumbersome.
+                //
                 .array('modDateTime', {
                     type        : 'uint8',
-                    readUntil   : b => 0x00 === b,
+                    length      : 20,   //  FTS-0001.016: 20 bytes
                 })
                 .array('toUserName', {
                     type        : 'uint8',
+                    //  :TODO: array needs some soft of 'limit' field
                     readUntil   : b => 0x00 === b,
                 })
                 .array('fromUserName', {
@@ -585,16 +590,35 @@ function Packet(options) {
         //
         //  Convert null terminated arrays to strings
         //
+        //  From FTS-0001.016:
+        //  * modDateTime: 20 bytes exactly (see above)
+        //  * toUserName and fromUserName: *max* 36 bytes, aka "up to"; null terminated
+        //  * subject: *max* 72 bytes, aka "up to"; null terminated
+        //  * message: Unbounded & null terminated
+        //
+        //  For everything above but message, we can get away with assuming CP437
+        //  and probably even just "ascii" for most cases. The message field is
+        //  much more complex so we'll look for encoding kludges, detection, etc.
+        //  later on.
+        //
+        if(msgData.modDateTime.length != 20) {
+            return cb(Errors.Invalid(`FTN packet DateTime field must be 20 bytes (got ${msgData.modDateTime.length})`));
+        }
+        if(msgData.toUserName.length > 36) {
+            return cb(Errors.Invalid(`FTN packet toUserName field must be 36 bytes max (got ${msgData.toUserName.length})`));
+        }
+        if(msgData.fromUserName.length > 36) {
+            return cb(Errors.Invalid(`FTN packet fromUserName field must be 36 bytes max (got ${msgData.fromUserName.length})`));
+        }
+        if(msgData.subject.length > 72) {
+            return cb(Errors.Invalid(`FTN packet subject field must be 72 bytes max (got ${msgData.subject.length})`));
+        }
+
+        //  Arrays of CP437 bytes -> String
         [ 'modDateTime', 'toUserName', 'fromUserName', 'subject' ].forEach(k => {
             msgData[k] = strUtil.stringFromNullTermBuffer(msgData[k], 'CP437');
         });
 
-        //  Technically the following fields have length limits as per fts-0001.016:
-        //  * modDateTime   : 20 bytes
-        //  * toUserName    : 36 bytes
-        //  * fromUserName  : 36 bytes
-        //  * subject       : 72 bytes
-
         //
         //  The message body itself is a special beast as it may
         //  contain an origin line, kludges, SAUCE in the case
diff --git a/util/dump_ftn_packet.js b/util/dump_ftn_packet.js
index 144d18f3..88eeece8 100755
--- a/util/dump_ftn_packet.js
+++ b/util/dump_ftn_packet.js
@@ -42,7 +42,10 @@ function main() {
 
 			return next(null);
 		},
-		() => {
+		(err) => {
+			if(err) {
+				return console.error(`Error processing packet: ${err.message}`);
+			}
 			console.info('');
 			console.info('--- EOF --- ');
 			console.info('');

From 2c9a68d0b1940f632e7337af29d3c679b10d5812 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 23 Nov 2019 10:08:42 -0700
Subject: [PATCH 0922/1013] Update sqlite3-trans package - get lodash updates
 along with it

---
 package.json |  2 +-
 yarn.lock    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 8b620932..048a207f 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "sane": "4.1.0",
     "sanitize-filename": "^1.6.3",
     "sqlite3": "^4.1.0",
-    "sqlite3-trans": "^1.2.1",
+    "sqlite3-trans": "^1.2.2",
     "ssh2": "0.8.6",
     "temptmp": "^1.1.0",
     "uuid": "^3.3.3",
diff --git a/yarn.lock b/yarn.lock
index b13f2369..453791de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1138,11 +1138,6 @@ lodash@^4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.17.4:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -1918,12 +1913,12 @@ split2@^3.0.0:
   dependencies:
     readable-stream "^3.0.0"
 
-sqlite3-trans@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/sqlite3-trans/-/sqlite3-trans-1.2.1.tgz#642dff9f6da53d533ccd264b49e68c8818542255"
-  integrity sha512-KLtR+PBZN/moxDTKWTwWypkunDCJ0oi5vknjht8omjUXswwUEf+MX2DKtgQB1V5Tsjgc4mL4mHjv9zp7+FHs5g==
+sqlite3-trans@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/sqlite3-trans/-/sqlite3-trans-1.2.2.tgz#faf268cc8d04dfd1a4854d64a70a229bdb50609f"
+  integrity sha512-+c2je0JMgPeNYHM7vMwEv/nHqOMYa5NNgQDcUyFkVMJ5QHATOQ+GywJptlVbkRCjgSTctmighfWLwUHPlkXbSQ==
   dependencies:
-    lodash "^4.17.4"
+    lodash "^4.17.15"
 
 sqlite3@^4.1.0:
   version "4.1.0"

From cd3b8d5e76d2a05a7e3d5d25f8efdb39737394f3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 5 Dec 2019 20:48:13 -0700
Subject: [PATCH 0923/1013] Low hanging fruit: Don't re-create binary parsers
 constantly

---
 core/ftn_mail_packet.js      | 138 ++++++++++++++++++-----------------
 core/sauce.js                |  40 +++++-----
 core/servers/login/telnet.js |  69 +++++++++---------
 3 files changed, 126 insertions(+), 121 deletions(-)

diff --git a/core/ftn_mail_packet.js b/core/ftn_mail_packet.js
index 92e28270..781ed929 100644
--- a/core/ftn_mail_packet.js
+++ b/core/ftn_mail_packet.js
@@ -165,6 +165,74 @@ exports.PacketHeader = PacketHeader;
 //  *   Writeup on differences between type 2, 2.2, and 2+:
 //      http://walon.org/pub/fidonet/FTSC-nodelists-etc./pkt-types.txt
 //
+const PacketHeaderParser = new Parser()
+    .uint16le('origNode')
+    .uint16le('destNode')
+    .uint16le('year')
+    .uint16le('month')
+    .uint16le('day')
+    .uint16le('hour')
+    .uint16le('minute')
+    .uint16le('second')
+    .uint16le('baud')
+    .uint16le('packetType')
+    .uint16le('origNet')
+    .uint16le('destNet')
+    .int8('prodCodeLo')
+    .int8('prodRevLo')  //  aka serialNo
+    .buffer('password', { length : 8 }) //  can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
+    .uint16le('origZone')
+    .uint16le('destZone')
+    //
+    //  The following is "filler" in FTS-0001, specifics in
+    //  FSC-0045 and FSC-0048
+    //
+    .uint16le('auxNet')
+    .uint16le('capWordValidate')
+    .int8('prodCodeHi')
+    .int8('prodRevHi')
+    .uint16le('capWord')
+    .uint16le('origZone2')
+    .uint16le('destZone2')
+    .uint16le('origPoint')
+    .uint16le('destPoint')
+    .uint32le('prodData');
+
+const MessageHeaderParser = new Parser()
+    .uint16le('messageType')
+    .uint16le('ftn_msg_orig_node')
+    .uint16le('ftn_msg_dest_node')
+    .uint16le('ftn_msg_orig_net')
+    .uint16le('ftn_msg_dest_net')
+    .uint16le('ftn_attr_flags')
+    .uint16le('ftn_cost')
+    //
+    //  It would be nice to just string() these, but we want CP437 which requires
+    //  iconv. Another option would be to use a formatter, but until issue 33
+    //  (https://github.com/keichi/binary-parser/issues/33) is fixed, this is cumbersome.
+    //
+    .array('modDateTime', {
+        type        : 'uint8',
+        length      : 20,   //  FTS-0001.016: 20 bytes
+    })
+    .array('toUserName', {
+        type        : 'uint8',
+        //  :TODO: array needs some soft of 'limit' field
+        readUntil   : b => 0x00 === b,
+    })
+    .array('fromUserName', {
+        type        : 'uint8',
+        readUntil   : b => 0x00 === b,
+    })
+    .array('subject', {
+        type        : 'uint8',
+        readUntil   : b => 0x00 === b,
+    })
+    .array('message', {
+        type        : 'uint8',
+        readUntil   : b => 0x00 === b,
+    });
+
 function Packet(options) {
     var self = this;
 
@@ -175,39 +243,7 @@ function Packet(options) {
 
         let packetHeader;
         try {
-            packetHeader = new Parser()
-                .uint16le('origNode')
-                .uint16le('destNode')
-                .uint16le('year')
-                .uint16le('month')
-                .uint16le('day')
-                .uint16le('hour')
-                .uint16le('minute')
-                .uint16le('second')
-                .uint16le('baud')
-                .uint16le('packetType')
-                .uint16le('origNet')
-                .uint16le('destNet')
-                .int8('prodCodeLo')
-                .int8('prodRevLo')  //  aka serialNo
-                .buffer('password', { length : 8 }) //  can't use string; need CP437 - see https://github.com/keichi/binary-parser/issues/33
-                .uint16le('origZone')
-                .uint16le('destZone')
-                //
-                //  The following is "filler" in FTS-0001, specifics in
-                //  FSC-0045 and FSC-0048
-                //
-                .uint16le('auxNet')
-                .uint16le('capWordValidate')
-                .int8('prodCodeHi')
-                .int8('prodRevHi')
-                .uint16le('capWord')
-                .uint16le('origZone2')
-                .uint16le('destZone2')
-                .uint16le('origPoint')
-                .uint16le('destPoint')
-                .uint32le('prodData')
-                .parse(packetBuffer);
+            packetHeader = PacketHeaderParser.parse(packetBuffer);
         } catch(e) {
             return Errors.Invalid(`Unable to parse FTN packet header: ${e.message}`);
         }
@@ -544,41 +580,7 @@ function Packet(options) {
 
         let msgData;
         try {
-            msgData = new Parser()
-                .uint16le('messageType')
-                .uint16le('ftn_msg_orig_node')
-                .uint16le('ftn_msg_dest_node')
-                .uint16le('ftn_msg_orig_net')
-                .uint16le('ftn_msg_dest_net')
-                .uint16le('ftn_attr_flags')
-                .uint16le('ftn_cost')
-                //
-                //  It would be nice to just string() these, but we want CP437 which requires
-                //  iconv. Another option would be to use a formatter, but until issue 33
-                //  (https://github.com/keichi/binary-parser/issues/33) is fixed, this is cumbersome.
-                //
-                .array('modDateTime', {
-                    type        : 'uint8',
-                    length      : 20,   //  FTS-0001.016: 20 bytes
-                })
-                .array('toUserName', {
-                    type        : 'uint8',
-                    //  :TODO: array needs some soft of 'limit' field
-                    readUntil   : b => 0x00 === b,
-                })
-                .array('fromUserName', {
-                    type        : 'uint8',
-                    readUntil   : b => 0x00 === b,
-                })
-                .array('subject', {
-                    type        : 'uint8',
-                    readUntil   : b => 0x00 === b,
-                })
-                .array('message', {
-                    type        : 'uint8',
-                    readUntil   : b => 0x00 === b,
-                })
-                .parse(packetBuffer);
+            msgData = MessageHeaderParser.parse(packetBuffer);
         } catch(e) {
             return cb(Errors.Invalid(`Failed to parse FTN message header: ${e.message}`));
         }
diff --git a/core/sauce.js b/core/sauce.js
index 7d5f52fd..40434861 100644
--- a/core/sauce.js
+++ b/core/sauce.js
@@ -26,6 +26,25 @@ exports.SAUCE_SIZE      = SAUCE_SIZE;
 //
 const SAUCE_VALID_DATA_TYPES = [0, 1, 2, 3, 4, 5, 6, 7, 8 ];
 
+const SAUCEParser = new Parser()
+    .buffer('id', { length : 5 } )
+    .buffer('version', { length : 2 } )
+    .buffer('title', { length: 35 } )
+    .buffer('author', { length : 20 } )
+    .buffer('group', { length: 20 } )
+    .buffer('date', { length: 8 } )
+    .uint32le('fileSize')
+    .int8('dataType')
+    .int8('fileType')
+    .uint16le('tinfo1')
+    .uint16le('tinfo2')
+    .uint16le('tinfo3')
+    .uint16le('tinfo4')
+    .int8('numComments')
+    .int8('flags')
+    //  :TODO: does this need to be optional?
+    .buffer('tinfos', { length: 22 } );  //  SAUCE 00.5
+
 function readSAUCE(data, cb) {
     if(data.length < SAUCE_SIZE) {
         return cb(Errors.DoesNotExist('No SAUCE record present'));
@@ -33,30 +52,11 @@ function readSAUCE(data, cb) {
 
     let sauceRec;
     try {
-        sauceRec = new Parser()
-            .buffer('id', { length : 5 } )
-            .buffer('version', { length : 2 } )
-            .buffer('title', { length: 35 } )
-            .buffer('author', { length : 20 } )
-            .buffer('group', { length: 20 } )
-            .buffer('date', { length: 8 } )
-            .uint32le('fileSize')
-            .int8('dataType')
-            .int8('fileType')
-            .uint16le('tinfo1')
-            .uint16le('tinfo2')
-            .uint16le('tinfo3')
-            .uint16le('tinfo4')
-            .int8('numComments')
-            .int8('flags')
-            //  :TODO: does this need to be optional?
-            .buffer('tinfos', { length: 22 } )  //  SAUCE 00.5
-            .parse(data.slice(data.length - SAUCE_SIZE));
+        sauceRec = SAUCEParser.parse(data.slice(data.length - SAUCE_SIZE));
     } catch(e) {
         return cb(Errors.Invalid('Invalid SAUCE record'));
     }
 
-
     if(!SAUCE_ID.equals(sauceRec.id)) {
         return cb(Errors.DoesNotExist('No SAUCE record present'));
     }
diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 1b892e71..20ec6cd9 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -192,6 +192,18 @@ OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]     = function(bufs, i, event) {
     return event;
 };
 
+const TermTypeCmdParser = new Parser()
+    .uint8('iac1')
+    .uint8('sb')
+    .uint8('opt')
+    .uint8('is')
+    .array('ttype', {
+        type        : 'uint8',
+        readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
+    })
+    //  note we read iac2 above
+    .uint8('se');
+
 OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
     if(event.commandCode !== COMMANDS.SB) {
         OPTION_IMPLS.NO_ARGS(bufs, i, event);
@@ -208,18 +220,7 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
 
         let ttypeCmd;
         try {
-            ttypeCmd = new Parser()
-                .uint8('iac1')
-                .uint8('sb')
-                .uint8('opt')
-                .uint8('is')
-                .array('ttype', {
-                    type        : 'uint8',
-                    readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
-                })
-                //  note we read iac2 above
-                .uint8('se')
-                .parse(bufs.toBuffer());
+            ttypeCmd = TermTypeCmdParser.parse(bufs.toBuffer());
         } catch(e) {
             Log.debug( { error : e }, 'Failed parsing TTYP telnet command');
             return event;
@@ -242,6 +243,15 @@ OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
     return event;
 };
 
+const NawsCmdParser = new Parser()
+    .uint8('iac1')
+    .uint8('sb')
+    .uint8('opt')
+    .uint16be('width')
+    .uint16be('height')
+    .uint8('iac2')
+    .uint8('se');
+
 OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
     if(event.commandCode !== COMMANDS.SB) {
         OPTION_IMPLS.NO_ARGS(bufs, i, event);
@@ -253,15 +263,7 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
 
         let nawsCmd;
         try {
-            nawsCmd = new Parser()
-                .uint8('iac1')
-                .uint8('sb')
-                .uint8('opt')
-                .uint16be('width')
-                .uint16be('height')
-                .uint8('iac2')
-                .uint8('se')
-                .parse(bufs.splice(0, 9).toBuffer());
+            nawsCmd = NawsCmdParser.parse(bufs.splice(0, 9).toBuffer());
         } catch(e) {
             Log.debug( { error : e }, 'Failed parsing NAWS telnet command');
             return event;
@@ -282,6 +284,18 @@ OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
 //  Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
 //const NEW_ENVIRONMENT_DELIMITERS = _.values(NEW_ENVIRONMENT_COMMANDS);
 
+const EnvCmdParser = new Parser()
+    .uint8('iac1')
+    .uint8('sb')
+    .uint8('opt')
+    .uint8('isOrInfo')  //  IS=initial, INFO=updates
+    .array('envBlock', {
+        type : 'uint8',
+        readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
+    })
+    //  note we consume IAC above
+    .uint8('se');
+
 //  Handle the deprecated RFC 1408 & the updated RFC 1572:
 OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]   =
 OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]       = function(bufs, i, event) {
@@ -306,18 +320,7 @@ OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]       = function(bufs, i, event) {
 
         let envCmd;
         try {
-            envCmd = new Parser()
-                .uint8('iac1')
-                .uint8('sb')
-                .uint8('opt')
-                .uint8('isOrInfo')  //  IS=initial, INFO=updates
-                .array('envBlock', {
-                    type : 'uint8',
-                    readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
-                })
-                //  note we consume IAC above
-                .uint8('se')
-                .parse(bufs.splice(0, bufs.length).toBuffer());
+            envCmd = EnvCmdParser.parse(bufs.splice(0, bufs.length).toBuffer());
         } catch(e) {
             Log.debug( { error : e }, 'Failed parsing NEW-ENVIRON telnet command');
             return event;

From 3f454c44c2f91be5408293d1b0bb2106c20fe049 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 23 Dec 2019 20:06:15 -0700
Subject: [PATCH 0924/1013] Don't hang on unzip prompting

---
 art/general/CONNECT1.ANS | Bin 2052 -> 0 bytes
 art/general/NEWSCAN.ANS  | Bin 152 -> 211 bytes
 core/config.js           |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 art/general/CONNECT1.ANS

diff --git a/art/general/CONNECT1.ANS b/art/general/CONNECT1.ANS
deleted file mode 100644
index d1a870bcd2a2b09a4f4b19fcd530769831631c2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2052
zcmb_dOHRWu5N%gT*|H;>9Km%HDwI{J5MqIZgkY01_$b^3dYwedRd_QVf8uHA1~00{
z^LcOHjO}_beQWyt!BzEeu%~+1^?U24sfL07U>{Z(_iSt}ZJ)(F)<ef16mGj1UJost
zeu5XWagH|6@g1yr4n}Vf-t~Lqyi4astQm{gwH<A@#$EK9XoVu01`!|<k;WN8oPwzl
zh;`(HS{a2P06?jYLvh#P8b+KNNvv3pWUn%-7lqMMeglE;y}n$ycES$TOw3AYq}+3p
znl?>>m`j-87MUWJ*aay7Me`W+NL0LRdF|S}XqI-6bOA5xxhCv~FZ7cqqH{ha8o4TS
zY$+m|oUWhaycxnK>a6(E$fTNVM8}ARLGG7RtWt2y)sBOk^hwLCc_&Kc0F5&ppF&F#
zfsS`N<}xrez&bmXP!QHmLSbDxs+&r}@A4K|l}>}i6f6oIu4}|sMZDM-;m0Cs^mUa>
zeN~NgwaBbuJdB&@VzucO(_m7n)^mvkq_XAWP$tk2*!iO&EYNb6b&3)M68U*uk_asS
zN}%VQ8ThMN(j~?#EfPKfPiF{(p(_CCt-~qcM}<FU^kv5vEz_ZAhZi0bEdNU$^pyAj
z-bXV#$BxMjSB(VZ!PrG8fW3Eh_kR31JsCs$|Fo>xwdTQ^uba(gyM5bK8(z0BkFU+=
J^U;6B-(LakpR@n~

diff --git a/art/general/NEWSCAN.ANS b/art/general/NEWSCAN.ANS
index 96371880565ba4b6a107a8de58776d00101ef3d3..2762c9f121da8f79978854a1dc49911230c4e6ee 100644
GIT binary patch
literal 211
zcmb1+Hn27^ur@Z&<pKc(AdrqWv^F-%EtUpK0qNw#yu8f3bg-yFuAZJA7Z*?_7p~Gc
z*AA!!sMIW1HN?k|ODfng)Y;X*0HlCQz{tSR(!kWvB8q{5fsrwQfdfbbfv~5OuR@r+
IBZLPh0lc;$@c;k-

delta 70
zcmcc2ID=70I@-Y6#K79vJeP}$OFG)n(0QV7w6>Xnp@E?^0|NsiV*mpSkOl%_PbXi6
LFn31?4^9FA%#jJk

diff --git a/core/config.js b/core/config.js
index 44b5f4cc..66ffab14 100644
--- a/core/config.js
+++ b/core/config.js
@@ -678,7 +678,7 @@ function getDefaultConfig() {
                     },
                     decompress      : {
                         cmd         : 'unzip',
-                        args        : [ '{archivePath}', '-d', '{extractPath}' ],
+                        args        : [ '-n', '{archivePath}', '-d', '{extractPath}' ],
                     },
                     list            : {
                         cmd         : 'unzip',
@@ -688,7 +688,7 @@ function getDefaultConfig() {
                     },
                     extract         : {
                         cmd         : 'unzip',
-                        args        : [ '{archivePath}', '{fileList}', '-d', '{extractPath}' ],
+                        args        : [ '-n', '{archivePath}', '{fileList}', '-d', '{extractPath}' ],
                     }
                 },
 

From 3ba05b97980b273c31bc2da507c48506f76719cd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 1 Jan 2020 14:10:47 -0700
Subject: [PATCH 0925/1013] Update copyrights

---
 LICENSE.TXT                  | 2 +-
 README.md                    | 2 +-
 core/connect.js              | 2 +-
 docs/installation/testing.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 74697ba9..af51c707 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019, Bryan D. Ashby
+Copyright (c) 2015-2020, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index efa593cd..67244cb9 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/install
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:
 
-Copyright (c) 2015-2019, Bryan D. Ashby
+Copyright (c) 2015-2020, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/connect.js b/core/connect.js
index 52ff67a0..8b1876e9 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -199,7 +199,7 @@ function displayBanner(term) {
     //  note: intentional formatting:
     term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
-|06Copyright (c) 2014-2019 Bryan Ashby |14- |12http://l33t.codes/
+|06Copyright (c) 2014-2020 Bryan Ashby |14- |12http://l33t.codes/
 |06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/
 |00`
     );
diff --git a/docs/installation/testing.md b/docs/installation/testing.md
index b23616f2..bfd2de26 100644
--- a/docs/installation/testing.md
+++ b/docs/installation/testing.md
@@ -13,7 +13,7 @@ _Note that if you've used the [Docker](docker) installation method, you've alrea
 If everything went OK: 
 
 ```bash
-ENiGMA½ Copyright (c) 2014-2019 Bryan Ashby
+ENiGMA½ Copyright (c) 2014-2020, Bryan Ashby
 _____________________   _____  ____________________    __________\_   /
 \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
 //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____

From ea828ba8123a71e3f834185ae5b525a4cd4e6357 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 1 Jan 2020 14:10:47 -0700
Subject: [PATCH 0926/1013] Update copyrights

---
 LICENSE.TXT                  | 2 +-
 README.md                    | 2 +-
 core/connect.js              | 2 +-
 docs/installation/testing.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 74697ba9..af51c707 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019, Bryan D. Ashby
+Copyright (c) 2015-2020, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 477935a3..e099dcdb 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Please see [Installation Methods](https://nuskooler.github.io/enigma-bbs/install
 ## License
 Released under the [BSD 2-clause](https://opensource.org/licenses/BSD-2-Clause) license:
 
-Copyright (c) 2015-2019, Bryan D. Ashby
+Copyright (c) 2015-2020, Bryan D. Ashby
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/connect.js b/core/connect.js
index d5b03de4..64c4ea3e 100644
--- a/core/connect.js
+++ b/core/connect.js
@@ -199,7 +199,7 @@ function displayBanner(term) {
     //  note: intentional formatting:
     term.pipeWrite(`
 |06Connected to |02EN|10i|02GMA|10½ |06BBS version |12|VN
-|06Copyright (c) 2014-2019 Bryan Ashby |14- |12http://l33t.codes/
+|06Copyright (c) 2014-2020 Bryan Ashby |14- |12http://l33t.codes/
 |06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/
 |00`
     );
diff --git a/docs/installation/testing.md b/docs/installation/testing.md
index b23616f2..bfd2de26 100644
--- a/docs/installation/testing.md
+++ b/docs/installation/testing.md
@@ -13,7 +13,7 @@ _Note that if you've used the [Docker](docker) installation method, you've alrea
 If everything went OK: 
 
 ```bash
-ENiGMA½ Copyright (c) 2014-2019 Bryan Ashby
+ENiGMA½ Copyright (c) 2014-2020, Bryan Ashby
 _____________________   _____  ____________________    __________\_   /
 \__   ____/\_ ____   \ /____/ /   _____ __         \  /   ______/ // /___jp!
 //   __|___//   |    \//   |//   |    \//  |  |    \//        \ /___   /_____

From e9cc49497c4451e3b6452327a9ef2602851464c1 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 18 Feb 2020 09:35:23 -0700
Subject: [PATCH 0927/1013] Fix group assignment bug

---
 core/user.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/user.js b/core/user.js
index 2d4883d7..439d32c8 100644
--- a/core/user.js
+++ b/core/user.js
@@ -408,7 +408,8 @@ module.exports = class User {
                     });
                 },
                 function setInitialGroupMembership(trans, callback) {
-                    self.groups = config.users.defaultGroups;
+                    //  Assign initial groups. Must perform a clone: #235 - All users are sysops (and I can't un-sysop them)
+                    self.groups = [...config.users.defaultGroups];
 
                     if(User.RootUserID === self.userId) {   //  root/SysOp?
                         self.groups.push('sysops');

From 29ee9c4d58140f72c90bb8e4d122fcee3fdb0a26 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 21 Apr 2020 19:50:04 -0600
Subject: [PATCH 0928/1013] WIP on QWK support

---
 core/message.js                    |  19 ++
 core/oputil/oputil_message_base.js |  61 ++++
 core/qwk_mail_packet.js            | 520 +++++++++++++++++++++++++++++
 3 files changed, 600 insertions(+)
 create mode 100644 core/qwk_mail_packet.js

diff --git a/core/message.js b/core/message.js
index 5291b82a..68f51ee4 100644
--- a/core/message.js
+++ b/core/message.js
@@ -87,6 +87,21 @@ const FTN_PROPERTY_NAMES = {
     FtnSeenBy           : 'ftn_seen_by',        //  http://ftsc.org/docs/fts-0004.001
 };
 
+const QWKPropertyNames = {
+    MessageNumber       : 'qwk_msg_num',
+    MessageStatus       : 'qwk_msg_status',         //  See http://wiki.synchro.net/ref:qwk for a decent list
+    ConferenceNumber    : 'qwk_conf_num',
+    InReplyToNum        : 'qwk_in_reply_to_num',    //  note that we prefer the 'InReplyToMsgId' kludge if available
+};
+
+const QWKKludgeNames = {
+    Via                 : 'via',
+    MessageId           : 'msg_id',
+    InReplyToMsgId      : 'in_reply_to_msg_id',
+    SyncTZ              : 'synchronet_timezone',
+    ReplyTo             : 'reply_to',
+};
+
 //  :TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
 const MESSAGE_ROW_MAP = {
     reply_to_message_id : 'replyToMsgId',
@@ -183,6 +198,10 @@ module.exports = class Message {
         return FTN_PROPERTY_NAMES;
     }
 
+    static get QWKPropertyNames() {
+        return QWKPropertyNames;
+    }
+
     setLocalToUserId(userId) {
         this.meta.System = this.meta.System || {};
         this.meta.System[Message.SystemMetaNames.LocalToUserID] = userId;
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 0f1b5cfb..e5b30c12 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -434,6 +434,66 @@ function getImportEntries(importType, importData) {
     return importEntries;
 }
 
+function handleQWK() {
+    const packetPath = argv._[argv._.length - 1];
+    if(argv._.length < 4 || !packetPath || 0 === packetPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    }
+
+    const subAction = argv._[argv._.length - 2];
+    switch (subAction) {
+        case 'dump' :
+            return dumpQWKPacket(packetPath);
+
+        default :
+            return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    }
+}
+
+function dumpQWKPacket(packetPath) {
+    async.waterfall(
+        [
+            (callback) => {
+                return initConfigAndDatabases(callback);
+            },
+            (callback) => {
+                const { QWKPacketReader } = require('../qwk_mail_packet');
+                const reader = new QWKPacketReader(packetPath);
+
+                reader.on('error', err => {
+                    console.error(`ERROR: ${err.message}`);
+                    return callback(err);
+                });
+
+                reader.on('done', () => {
+                    return callback(null);
+                });
+
+                reader.on('archive type', archiveType => {
+                    console.info(`-> Archive type: ${archiveType}`);
+                });
+
+                reader.on('creator', creator => {
+                    console.info(`-> Creator: ${creator}`);
+                });
+
+                reader.on('message', message => {
+                    console.info('--- message ---');
+                    console.info(`To        : ${message.toUserName}`);
+                    console.info(`From      : ${message.fromUserName}`);
+                    console.info(`Subject   : ${message.subject}`);
+                    console.info(`Message   :\r\n${message.message}`);
+                });
+
+                reader.read();
+            }
+        ],
+        err => {
+
+        }
+    )
+}
+
 function handleMessageBaseCommand() {
 
     function errUsage() {
@@ -452,5 +512,6 @@ function handleMessageBaseCommand() {
     return({
         areafix	        : areaFix,
         'import-areas'  : importAreas,
+        qwk             : handleQWK,
     }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
new file mode 100644
index 00000000..415822a3
--- /dev/null
+++ b/core/qwk_mail_packet.js
@@ -0,0 +1,520 @@
+
+
+const ArchiveUtil = require('./archive_util');
+const { Errors } = require('./enig_error');
+const Message = require('./message');
+const { splitTextAtTerms } = require('./string_util');
+
+const { EventEmitter } = require('events');
+const temptmp = require('temptmp').createTrackedSession('qwk_packet');
+const async = require('async');
+const fs = require('graceful-fs');
+const paths = require('path');
+const { Parser } = require('binary-parser');
+const iconv = require('iconv-lite');
+const moment = require('moment');
+const _ = require('lodash');
+
+const SMBTZToUTCOffset = (smbTZ) => {
+    //  convert a Synchronet smblib TZ to a UTC offset
+    //  see https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
+    return {
+        //  US Standard
+        '40F0'  : '-04:00', //  Atlantic
+        '412C'  : '-05:00', //  Eastern
+        '4168'  : '-06:00', //  Central
+        '41A4'  : '-07:00', //  Mountain
+        '41E0'  : '-08:00', //  Pacific
+        '421C'  : '-09:00', //  Yukon
+        '4258'  : '-10:00', //  Hawaii/Alaska
+        '4294'  : '-11:00', //  Bering
+
+        //  US Daylight
+
+    }[smbTZ];
+};
+
+const QWKMessageBlockSize = 128;
+
+const MessageHeaderParser = new Parser()
+    .endianess('little')
+    .string('status', {
+        encoding    : 'ascii',
+        length      : 1,
+    })
+    .string('num', {    //  message num or conf num for REP's
+        encoding    : 'ascii',
+        length      : 7,
+        formatter   : n => {
+            return parseInt(n);
+        }
+    })
+    .string('timestamp', {
+        encoding    : 'ascii',
+        length      : 13,
+    })
+    //  these fields may be encoded in something other than ascii/CP437
+    .array('toName', {
+        type    : 'uint8',
+        length  : 25,
+    })
+    .array('fromName', {
+        type    : 'uint8',
+        length  : 25,
+    })
+    .array('subject', {
+        type    : 'uint8',
+        length  : 25,
+    })
+    .string('password', {
+        encoding    : 'ascii',
+        length      : 12,
+    })
+    .string('replyToNum', {
+        encoding    : 'ascii',
+        length      : 8,
+        formatter   : n => {
+            return parseInt(n);
+        }
+    })
+    .string('numBlocks', {
+        encoding    : 'ascii',
+        length      : 6,
+        formatter   : n => {
+            return parseInt(n);
+        }
+    })
+    .uint8('status2')
+    .uint16('confNum')
+    .uint16('relNum')
+    .uint8('netTag');
+
+
+class QWKPacketReader extends EventEmitter {
+    constructor(packetPath, mode=QWKPacketReader.Modes.Guess, options = { keepTearAndOrigin : true } ) {
+        super();
+
+        this.packetPath = packetPath;
+        this.mode       = mode;
+        this.options    = options;
+    }
+
+    static get Modes() {
+        return {
+            Guess   : 'guess',  //  try to guess
+            QWK     : 'qwk',    //  standard incoming packet
+            REP     : 'rep',    //  a reply packet
+        };
+    }
+
+    read() {
+        //
+        //  A general overview:
+        //
+        //  - Find out what kind of archive we're dealing with
+        //  - Extract to temporary location
+        //  - Process various files
+        //  - Emit messages we find, information about the packet, so on
+        //
+        async.waterfall(
+            [
+                //  determine packet archive type
+                (callback) => {
+                    const archiveUtil = ArchiveUtil.getInstance();
+                    archiveUtil.detectType(this.packetPath, (err, archiveType) => {
+                        if (err) {
+                            return callback(err);
+                        }
+                        this.emit('archive type', archiveType);
+                        return callback(null, archiveType);
+                    });
+                },
+                //  create a temporary location to do processing
+                (archiveType, callback) => {
+                    temptmp.mkdir( { prefix : 'enigqwkpacket-'}, (err, tempDir) => {
+                        if (err) {
+                            return callback(err);
+                        }
+
+                        return callback(null, archiveType, tempDir);
+                    });
+                },
+                //  extract it
+                (archiveType, tempDir, callback) => {
+                    const archiveUtil = ArchiveUtil.getInstance();
+                    archiveUtil.extractTo(this.packetPath, tempDir, archiveType, err => {
+                        if (err) {
+                            return callback(err);
+                        }
+
+                        return callback(null, tempDir);
+                    });
+                },
+                //  gather extracted file list
+                (tempDir, callback) => {
+                    fs.readdir(tempDir, (err, files) => {
+                        if (err) {
+                            return callback(err);
+                        }
+
+                        //  Discover basic information about well known files
+                        async.reduce(
+                            files,
+                            {},
+                            (out, filename, next) => {
+                                const key = filename.toUpperCase();
+
+                                switch (key) {
+                                    case 'MESSAGES.DAT' :   //  QWK
+                                        if (this.mode === QWKPacketReader.Modes.Guess) {
+                                            this.mode = QWKPacketReader.Modes.QWK;
+                                        }
+                                        if (this.mode === QWKPacketReader.Modes.QWK) {
+                                            out.messages = { filename };
+                                        }
+                                        break;
+
+                                    case 'ID.MSG' :
+                                        if (this.mode === QWKPacketReader.Modes.Guess) {
+                                            this.mode = Modes.REP;
+                                        }
+
+                                        if (this.mode === QWKPacketReader.Modes.REP) {
+                                            out.messages = { filename };
+                                        }
+                                        break;
+
+                                    case 'HEADERS.DAT' :    //  Synchronet
+                                        out.headers = { filename };
+                                        break;
+
+                                    case 'VOTING.DAT' : //  Synchronet
+                                        out.voting = { filename };
+                                        break;
+
+                                    case 'CONTROL.DAT' :    //  QWK
+                                        out.control = { filename };
+                                        break;
+
+                                    case 'DOOR.ID' :    //  QWK
+                                        out.door = { filename };
+                                        break;
+
+                                    case 'NETFLAGS.DAT' :   //  QWK
+                                        out.netflags = { filename };
+                                        break;
+
+                                    case 'NEWFILES.DAT' :   //  QWK
+                                        out.newfiles = { filename };
+                                        break;
+
+                                    case 'PERSONAL.NDX' : //    QWK
+                                        out.personal = { filename };
+                                        break;
+
+                                    case '000.NDX' : // QWK
+                                        out.inbox = { filename };
+                                        break;
+
+                                    case 'TOREADER.EXT' :   //  QWKE
+                                        out.toreader = { filename };
+                                        break;
+
+                                    case 'QLR.DAT' :
+                                        out.qlr = { filename };
+                                        break;
+
+                                    default :
+                                        if (/[0-9]+\.NDX/.test(key)) {  //  QWK
+                                            out.pointers = out.pointers || { filenames: [] };
+                                            out.pointers.filenames.push(filename);
+                                        } else {
+                                            out[key] = { filename };
+                                        }
+                                        break;
+                                }
+
+                                return next(null, out);
+                            },
+                            (err, packetFileInfo) => {
+                                this.packetInfo = Object.assign(
+                                    {},
+                                    packetFileInfo,
+                                    {
+                                        tempDir,
+                                        defaultEncoding : 'CP437'
+                                    }
+                                );
+                                return callback(null);
+                            }
+                        );
+                    });
+                },
+                (callback) => {
+                    return this.processPacketFiles(callback);
+                },
+                (tempDir, callback) => {
+                    return callback(null);
+                }
+            ],
+            err => {
+                temptmp.cleanup();
+
+                if (err) {
+                    return this.emit('error', err);
+                }
+
+                this.emit('done');
+            }
+        );
+    }
+
+    processPacketFiles(cb) {
+        return this.readMessages(cb);
+    }
+
+    readMessages(cb) {
+        //  :TODO: update to use proper encoding: if headers.dat specifies UTF-8, use that, else CP437
+        if (!this.packetInfo.messages) {
+            return cb(Errors.DoesNotExist('No messages file found within QWK packet'));
+        }
+
+        const encoding = this.packetInfo.defaultEncoding;
+        const path = paths.join(this.packetInfo.tempDir, this.packetInfo.messages.filename);
+        fs.open(path, 'r', (err, fd) => {
+            if (err) {
+                return cb(err);
+            }
+
+            let blockCount = 0;
+            let currMessage = { };
+            let state;
+            let messageBlocksRemain;
+            const buffer = Buffer.alloc(QWKMessageBlockSize);
+
+            const readNextBlock = () => {
+                fs.read(fd, buffer, 0, QWKMessageBlockSize, null, (err, read) => {
+                    if (err) {
+                        return cb(err);
+                    }
+
+                    if (0 == read) {
+                        //  we're done consuming all blocks
+                        return fs.close(fd, err => {
+                            return cb(err);
+                        });
+                    }
+
+                    if (QWKMessageBlockSize !== read) {
+                        return cb(Errors.Invalid(`Invalid QWK message block size. Expected ${QWKMessageBlockSize} got ${read}`));
+                    }
+
+                    if (0 === blockCount) {
+                        //  first 128 bytes is a space padded ID
+                        const id = buffer.toString('ascii').trim();
+                        this.emit('generator', id);
+                        state = 'header';
+                    } else {
+                        switch (state) {
+                            case 'header' :
+                                const header = MessageHeaderParser.parse(buffer);
+
+                                //  massage into something a little more sane (things we can't quite do in the parser directly)
+                                ['toName', 'fromName', 'subject'].forEach(field => {
+                                    header[field] = iconv.decode(header[field], encoding).trim();
+                                });
+
+                                header.timestamp = moment(header.timestamp, 'MM-DD-YYHH:mm');
+
+                                currMessage = {
+                                    header,
+                                    //  these may be overridden
+                                    toName      : header.toName,
+                                    fromName    : header.fromName,
+                                    subject     : header.subject,
+                                };
+
+                                //  remainder of blocks until the end of this message
+                                messageBlocksRemain = header.numBlocks - 1;
+                                state = 'message';
+                                break;
+
+                            case 'message' :
+                                if (!currMessage.body) {
+                                    currMessage.body = buffer;
+                                } else {
+                                    currMessage.body = Buffer.concat([currMessage.body, buffer]);
+                                }
+                                messageBlocksRemain -= 1;
+
+                                if (0 === messageBlocksRemain) {
+                                    //  1:n buffers to make up body. Decode:
+                                    //  First, replace QWK style line feeds (0xe3) unless the message is UTF-8.
+                                    //  If the message is UTF-8, we assume it's using standard line feeds.
+                                    if (encoding !== 'utf8') {
+                                        let i = 0;
+                                        const QWKLF = Buffer.from([0xe3]);
+                                        while (i < currMessage.body.length) {
+                                            i = currMessage.body.indexOf(QWKLF, i);
+                                            if (-1 === i) {
+                                                break;
+                                            }
+                                            currMessage.body[i] = 0x0a;
+                                            ++i;
+                                        }
+                                    }
+
+                                    //
+                                    //  Decode the message based on our final message encoding. Split the message
+                                    //  into lines so we can extract various bits such as QWKE headers, origin, tear
+                                    //  lines, etc.
+                                    //
+                                    const messageLines = splitTextAtTerms(iconv.decode(currMessage.body, encoding).trimEnd());
+                                    const bodyLines = [];
+
+                                    //
+                                    //  Various kludge tags defined by QWKE, etc.
+                                    //  See the following:
+                                    //  - ftp://vert.synchro.net/main/BBS/qwke.txt
+                                    //  - http://wiki.synchro.net/ref:qwk
+                                    //
+                                    const Kludges = {
+                                        //  QWKE
+                                        To      : 'To:',
+                                        From    : 'From:',
+                                        Subject : 'Subject:',
+
+                                        //  Synchronet
+                                        Via     : '@VIA:',
+                                        MsgID   : '@MSGID:',
+                                        Reply   : '@REPLY:',
+                                        TZ      : '@TZ:',       //  https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
+                                        ReplyTo : '@REPLYTO:',
+                                    };
+
+                                    let bodyState = 'kludge';
+
+                                    const MessageTrailers = {
+                                        //  While technically FTN oriented, these can come from any network
+                                        //  (though we'll be processing a lot of messages that routed through FTN
+                                        //  at some point)
+                                        Origin  : /^[ ]{1,2}\* Origin: /,
+                                        Tear    : /^--- /,
+                                    };
+
+                                    const qwkKludge = {};
+                                    const ftnProperty = {};
+
+                                    messageLines.forEach(line => {
+                                        if (0 === line.length) {
+                                            return bodyLines.push('');
+                                        }
+
+                                        switch (bodyState) {
+                                            case 'kludge' :
+                                                //  :TODO: Update these to use the well known consts:
+                                                if (line.startsWith(Kludges.To)) {
+                                                    currMessage.toName = line.substring(Kludges.To.length).trim();
+                                                } else if (line.startsWith(Kludges.From)) {
+                                                    currMessage.fromName = line.substring(Kludges.From.length).trim();
+                                                } else if (line.startsWith(Kludges.Subject)) {
+                                                    currMessage.subject = line.substring(Kludges.Subject.length).trim();
+                                                } else if (line.startsWith(Kludges.Via)) {
+                                                    qwkKludge.via = line;
+                                                } else if (line.startsWith(Kludges.MsgID)) {
+                                                    qwkKludge.msg_id = line.substring(Kludges.MsgID.length).trim();
+                                                } else if (line.startsWith(Kludges.Reply)) {
+                                                    qwkKludge.in_reply_to_msg_id = line.substring(Kludges.Reply.length).trim();
+                                                } else if (line.startsWith(Kludges.TZ)) {
+                                                    qwkKludge.synchronet_timezone = line.substring(Kludges.TZ.length).trim();
+                                                } else if (line.startsWith(Kludges.ReplyTo)) {
+                                                    qwkKludge.reply_to = line.substring(Kludges.ReplyTo.length).trim();
+                                                } else {
+                                                    bodyState = 'body'; // past this point and up to any tear/origin/etc., is the real message body
+                                                    bodyLines.push(line);
+                                                }
+                                                break;
+
+                                            case 'body' :
+                                            case 'trailers' :
+                                                if (MessageTrailers.Origin.test(line)) {
+                                                    ftnProperty.ftn_origin = line;
+                                                    bodyState = 'trailers';
+                                                } else if (MessageTrailers.Tear.test(line)) {
+                                                    ftnProperty.ftn_tear_line = line;
+                                                    bodyState = 'trailers';
+                                                } else if ('body' === bodyState) {
+                                                    bodyLines.push(line);
+                                                }
+                                        }
+                                    });
+
+                                    const message = new Message({
+                                        toUserName      : currMessage.toName,
+                                        fromUserName    : currMessage.fromName,
+                                        subject         : currMessage.subject,
+                                        modTimestamp    : currMessage.header.timestamp,
+                                        message         : bodyLines.join('\n'),
+                                    });
+
+                                    if (!_.isEmpty(qwkKludge)) {
+                                        message.meta.QwkKludge = qwkKludge;
+                                    }
+
+                                    if (!_.isEmpty(ftnProperty)) {
+                                        message.meta.FtnProperty = ftnProperty;
+                                    }
+
+                                    //  Add in tear line and origin if requested
+                                    if (this.options.keepTearAndOrigin) {
+                                        if (ftnProperty.ftn_tear_line) {
+                                            message.message += `\r\n${ftnProperty.ftn_tear_line}\r\n`;
+                                        }
+
+                                        if (ftnProperty.ftn_origin) {
+                                            message.message += `${ftnProperty.ftn_origin}\r\n`;
+                                        }
+                                    }
+
+                                    //  Update the timestamp if we have a valid TZ
+                                    if (_.has(message, 'meta.QwkKludge.synchronet_timezone')) {
+                                        const tzOffset = SMBTZToUTCOffset(message.meta.QwkKludge.synchronet_timezone);
+                                        if (tzOffset) {
+                                            message.modTimestamp.utcOffset(tzOffset);
+                                        }
+                                    }
+
+                                    message.meta.QwkProperty = {
+                                        qwk_msg_status          : currMessage.header.status,
+                                        qwk_in_reply_to_num     : currMessage.header.replyToNum,
+                                    };
+
+                                    if (this.mode === QWKPacketReader.Modes.QWK) {
+                                        message.meta.QwkProperty.qwk_msg_num = currMessage.header.num;
+                                    } else {
+                                        //  For REP's, prefer the larger field.
+                                        message.meta.QwkProperty.qwk_conf_num = currMessage.header.num || currMessage.header.confNum;
+                                    }
+
+                                    this.emit('message', message);
+                                    state = 'header';
+                                }
+                                break;
+                        }
+                    }
+
+                    ++blockCount;
+                    readNextBlock();
+                });
+            };
+
+            //  start reading blocks
+            readNextBlock();
+        });
+    }
+};
+
+module.exports = {
+    QWKPacketReader,
+//    QWKPacketWriter,
+}

From 6edfe95dfe9914f70282eba1ef5f052212a689e7 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 21 Apr 2020 22:14:29 -0600
Subject: [PATCH 0929/1013] A good amount of HEADERS.DAT support

---
 core/qwk_mail_packet.js | 180 ++++++++++++++++++++++++++++++++++------
 package.json            |   1 +
 yarn.lock               |  19 +++++
 3 files changed, 174 insertions(+), 26 deletions(-)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 415822a3..9ed97bb6 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -14,6 +14,7 @@ const { Parser } = require('binary-parser');
 const iconv = require('iconv-lite');
 const moment = require('moment');
 const _ = require('lodash');
+const IniConfigParser = require('ini-config-parser');
 
 const SMBTZToUTCOffset = (smbTZ) => {
     //  convert a Synchronet smblib TZ to a UTC offset
@@ -242,7 +243,6 @@ class QWKPacketReader extends EventEmitter {
                                     packetFileInfo,
                                     {
                                         tempDir,
-                                        defaultEncoding : 'CP437'
                                     }
                                 );
                                 return callback(null);
@@ -270,7 +270,41 @@ class QWKPacketReader extends EventEmitter {
     }
 
     processPacketFiles(cb) {
-        return this.readMessages(cb);
+        async.series(
+            [
+                (callback) => {
+                    return this.readHeadersExtension(callback);
+                },
+                (callback) => {
+                    return this.readMessages(callback);
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        )
+    }
+
+    readHeadersExtension(cb) {
+        if (!this.packetInfo.headers) {
+            return cb(null);    //  nothing to do
+        }
+
+        const path = paths.join(this.packetInfo.tempDir, this.packetInfo.headers.filename);
+        fs.readFile(path, { encoding : 'utf8' }, (err, iniData) => {
+            if (err) {
+                this.emit('warning', Errors.Invalid(`HEADERS.DAT file appears to be invalid (${err.message})`));
+                return cb(null);    //  non-fatal
+            }
+
+            try {
+                this.packetInfo.headers.ini = IniConfigParser.parse(iniData);
+            } catch (e) {
+                this.emit('warning', Errors.Invalid(`HEADERS.DAT file appears to be invalid (${e.message})`));
+            }
+
+            return cb(null);
+        });
     }
 
     readMessages(cb) {
@@ -279,13 +313,54 @@ class QWKPacketReader extends EventEmitter {
             return cb(Errors.DoesNotExist('No messages file found within QWK packet'));
         }
 
-        const encoding = this.packetInfo.defaultEncoding;
+        const encodingToSpec = 'cp437';
+        let encoding = encodingToSpec;
+
         const path = paths.join(this.packetInfo.tempDir, this.packetInfo.messages.filename);
         fs.open(path, 'r', (err, fd) => {
             if (err) {
                 return cb(err);
             }
 
+            //  Some mappings/etc. used in loops below....
+            //  Sync sets these in HEADERS.DAT: http://wiki.synchro.net/ref:qwk
+            const FTNPropertyMapping = {
+                'X-FTN-AREA'    : Message.FtnPropertyNames.FtnArea,
+                'X-FTN-SEEN-BY' : Message.FtnPropertyNames.FtnSeenBy,
+                'X-FTN-FLAGS'   : Message.FtnPropertyNames
+            };
+
+            const FTNKludgeMapping = {
+                'X-FTN-PATH'    : 'PATH',
+                'X-FTN-MSGID'   : 'MSGID',
+                'X-FTN-REPLY'   : 'REPLY',
+                'X-FTN-PID'     : 'PID',
+                'X-FTN-FLAGS'   : 'FLAGS',
+                'X-FTN-TID'     : 'TID',
+                'X-FTN-CHRS'    : 'CHRS',
+                //  :TODO: X-FTN-KLUDGE - not sure what this is?
+            };
+
+            //
+            //  Various kludge tags defined by QWKE, etc.
+            //  See the following:
+            //  - ftp://vert.synchro.net/main/BBS/qwke.txt
+            //  - http://wiki.synchro.net/ref:qwk
+            //
+            const Kludges = {
+                //  QWKE
+                To      : 'To:',
+                From    : 'From:',
+                Subject : 'Subject:',
+
+                //  Synchronet
+                Via     : '@VIA:',
+                MsgID   : '@MSGID:',
+                Reply   : '@REPLY:',
+                TZ      : '@TZ:',       //  https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
+                ReplyTo : '@REPLYTO:',
+            };
+
             let blockCount = 0;
             let currMessage = { };
             let state;
@@ -321,7 +396,8 @@ class QWKPacketReader extends EventEmitter {
 
                                 //  massage into something a little more sane (things we can't quite do in the parser directly)
                                 ['toName', 'fromName', 'subject'].forEach(field => {
-                                    header[field] = iconv.decode(header[field], encoding).trim();
+                                    //  note: always use to-spec encoding here
+                                    header[field] = iconv.decode(header[field], encodingToSpec).trim();
                                 });
 
                                 header.timestamp = moment(header.timestamp, 'MM-DD-YYHH:mm');
@@ -334,6 +410,19 @@ class QWKPacketReader extends EventEmitter {
                                     subject     : header.subject,
                                 };
 
+                                if (_.has(this.packetInfo, 'headers.ini')) {
+                                    //  Sections for a message in HEADERS.DAT are by current byte offset.
+                                    //  128 = first message header = 0x80 = section [80]
+                                    const headersSectionId = (blockCount * QWKMessageBlockSize).toString(16);
+                                    currMessage.headersExtension = this.packetInfo.headers.ini[headersSectionId];
+                                }
+
+                                //  if we have HEADERS.DAT with a 'Utf8' override for this message,
+                                //  the overridden to/from/subject/message fields are UTF-8
+                                if (currMessage.headersExtension && currMessage.headersExtension.Utf8) {
+                                    encoding = 'utf8';
+                                }
+
                                 //  remainder of blocks until the end of this message
                                 messageBlocksRemain = header.numBlocks - 1;
                                 state = 'message';
@@ -372,26 +461,6 @@ class QWKPacketReader extends EventEmitter {
                                     const messageLines = splitTextAtTerms(iconv.decode(currMessage.body, encoding).trimEnd());
                                     const bodyLines = [];
 
-                                    //
-                                    //  Various kludge tags defined by QWKE, etc.
-                                    //  See the following:
-                                    //  - ftp://vert.synchro.net/main/BBS/qwke.txt
-                                    //  - http://wiki.synchro.net/ref:qwk
-                                    //
-                                    const Kludges = {
-                                        //  QWKE
-                                        To      : 'To:',
-                                        From    : 'From:',
-                                        Subject : 'Subject:',
-
-                                        //  Synchronet
-                                        Via     : '@VIA:',
-                                        MsgID   : '@MSGID:',
-                                        Reply   : '@REPLY:',
-                                        TZ      : '@TZ:',       //  https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
-                                        ReplyTo : '@REPLYTO:',
-                                    };
-
                                     let bodyState = 'kludge';
 
                                     const MessageTrailers = {
@@ -404,6 +473,7 @@ class QWKPacketReader extends EventEmitter {
 
                                     const qwkKludge = {};
                                     const ftnProperty = {};
+                                    const ftnKludge = {};
 
                                     messageLines.forEach(line => {
                                         if (0 === line.length) {
@@ -449,12 +519,60 @@ class QWKPacketReader extends EventEmitter {
                                         }
                                     });
 
+                                    let messageTimestamp = currMessage.header.timestamp;
+
+                                    //  HEADERS.DAT support.
+                                    let useTZKludge = true;
+                                    if (currMessage.headersExtension) {
+                                        const ext = currMessage.headersExtension;
+
+                                        //  to and subject can be overridden yet again if entries are present
+                                        currMessage.toName  = ext.To || currMessage.toName
+                                        currMessage.subject = ext.Subject || currMessage.subject;
+                                        currMessage.from    = ext.Sender || currMessage.from;   //  why not From? Who the fuck knows.
+
+                                        //  possibly override message ID kludge
+                                        qwkKludge.msg_id    = ext['Message-ID'] || qwkKludge.msg_id;
+
+                                        //  WhenWritten contains a ISO-8601-ish timestamp and a Synchronet/SMB style TZ offset:
+                                        //  20180101174837-0600  4168
+                                        //  We can use this to get a very slightly better precision on the timestamp (addition of seconds)
+                                        //  over the headers value. Why not milliseconds? Who the fuck knows.
+                                        if (ext.WhenWritten) {
+                                            const whenWritten = moment(ext.WhenWritten, 'YYYYMMDDHHmmssZ');
+                                            if (whenWritten.isValid()) {
+                                                messageTimestamp = whenWritten;
+                                                useTZKludge = false;
+                                            }
+                                        }
+
+                                        if (ext.Tags) {
+                                            currMessage.hashTags = ext.Tags.split(' ');
+                                        }
+
+                                        //  FTN style properties/kludges represented as X-FTN-XXXX
+                                        for (let [extName, propName] of Object.entries(FTNPropertyMapping)) {
+                                            const v = ext[extName];
+                                            if (v) {
+                                                ftnProperty[propName] = v;
+                                            }
+                                        }
+
+                                        for (let [extName, kludgeName] of Object.entries(FTNKludgeMapping)) {
+                                            const v = ext[extName];
+                                            if (v) {
+                                                ftnKludge[kludgeName] = v;
+                                            }
+                                        }
+                                    }
+
                                     const message = new Message({
                                         toUserName      : currMessage.toName,
                                         fromUserName    : currMessage.fromName,
                                         subject         : currMessage.subject,
-                                        modTimestamp    : currMessage.header.timestamp,
+                                        modTimestamp    : messageTimestamp,
                                         message         : bodyLines.join('\n'),
+                                        hashTags        : currMessage.hashTags,
                                     });
 
                                     if (!_.isEmpty(qwkKludge)) {
@@ -465,6 +583,10 @@ class QWKPacketReader extends EventEmitter {
                                         message.meta.FtnProperty = ftnProperty;
                                     }
 
+                                    if (!_.isEmpty(ftnKludge)) {
+                                        message.meta.FtnKludge = ftnKludge;
+                                    }
+
                                     //  Add in tear line and origin if requested
                                     if (this.options.keepTearAndOrigin) {
                                         if (ftnProperty.ftn_tear_line) {
@@ -477,7 +599,7 @@ class QWKPacketReader extends EventEmitter {
                                     }
 
                                     //  Update the timestamp if we have a valid TZ
-                                    if (_.has(message, 'meta.QwkKludge.synchronet_timezone')) {
+                                    if (useTZKludge && _.has(message, 'meta.QwkKludge.synchronet_timezone')) {
                                         const tzOffset = SMBTZToUTCOffset(message.meta.QwkKludge.synchronet_timezone);
                                         if (tzOffset) {
                                             message.modTimestamp.utcOffset(tzOffset);
@@ -491,11 +613,17 @@ class QWKPacketReader extends EventEmitter {
 
                                     if (this.mode === QWKPacketReader.Modes.QWK) {
                                         message.meta.QwkProperty.qwk_msg_num = currMessage.header.num;
+                                        message.meta.QwkProperty.qwk_conf_num = currMessage.header.confNum;
                                     } else {
                                         //  For REP's, prefer the larger field.
                                         message.meta.QwkProperty.qwk_conf_num = currMessage.header.num || currMessage.header.confNum;
                                     }
 
+                                    //  Another quick HEADERS.DAT fix-up
+                                    if (currMessage.headersExtension) {
+                                        message.meta.QwkProperty.qwk_conf_num = currMessage.headersExtension.Conference || message.meta.QwkProperty.qwk_conf_num;
+                                    }
+
                                     this.emit('message', message);
                                     state = 'header';
                                 }
diff --git a/package.json b/package.json
index 048a207f..12754271 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hashids": "2.1.0",
     "hjson": "^3.2.1",
     "iconv-lite": "0.5.0",
+    "ini-config-parser": "^1.0.4",
     "inquirer": "^7.0.0",
     "later": "1.2.0",
     "lodash": "^4.17.15",
diff --git a/yarn.lock b/yarn.lock
index 453791de..cb08db2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -312,6 +312,11 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
+coffee-script@^1.12.4:
+  version "1.12.7"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -408,6 +413,11 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+deep-extend@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
+  integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -883,6 +893,15 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+ini-config-parser@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/ini-config-parser/-/ini-config-parser-1.0.4.tgz#0abc75cb68c506204712d2b4861400b6adbfda78"
+  integrity sha512-5hLh5Cqai67pTrLQ9q/K/3EtSP2Tzu41AZzwPLSegkkMkc42dGweLgkbiocCBiBBEg2fPhs6pKmdFhwj5Ul3Bg==
+  dependencies:
+    coffee-script "^1.12.4"
+    deep-extend "^0.5.1"
+    rimraf "^2.6.1"
+
 ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"

From d8f0601914717f65c461b89ba57e86d71467e916 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 21 Apr 2020 22:57:06 -0600
Subject: [PATCH 0930/1013] Add CONTROL.DAT parsing

---
 core/qwk_mail_packet.js | 93 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 9ed97bb6..f670e494 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -31,12 +31,17 @@ const SMBTZToUTCOffset = (smbTZ) => {
         '4294'  : '-11:00', //  Bering
 
         //  US Daylight
+        //  :TODO: FINISH ME!
 
     }[smbTZ];
 };
 
 const QWKMessageBlockSize = 128;
 
+//  See the following:
+//  -   http://fileformats.archiveteam.org/wiki/QWK
+//  -   http://wiki.synchro.net/ref:qwk
+//
 const MessageHeaderParser = new Parser()
     .endianess('little')
     .string('status', {
@@ -272,6 +277,9 @@ class QWKPacketReader extends EventEmitter {
     processPacketFiles(cb) {
         async.series(
             [
+                (callback) => {
+                    return this.readControl(callback);
+                },
                 (callback) => {
                     return this.readHeadersExtension(callback);
                 },
@@ -285,6 +293,91 @@ class QWKPacketReader extends EventEmitter {
         )
     }
 
+    readControl(cb) {
+        //
+        //  CONTROL.DAT is a CRLF text file containing information about
+        //  the originating BBS, conf number <> name mapping, etc.
+        //
+        //  References:
+        //  -   http://fileformats.archiveteam.org/wiki/QWK
+        //
+        if (!this.packetInfo.control) {
+            return cb(Errors.DoesNotExist('No control file found within QWK packet'));
+        }
+
+        const path = paths.join(this.packetInfo.tempDir, this.packetInfo.control.filename);
+
+        //  note that we read as UTF-8. Legacy says it should be CP437/ASCII
+        //  but this seems safer for now so conference names and the like
+        //  can be non-English for example.
+        fs.readFile(path, { encoding : 'utf8' }, (err, controlLines) => {
+            if (err) {
+                return cb(err);
+            }
+
+            controlLines = splitTextAtTerms(controlLines);
+
+            let state = 'header';
+            const control = { confMap : {} };
+            let currConfNumber;
+            for (let lineNumber = 0; lineNumber < controlLines.length; ++lineNumber) {
+                const line = controlLines[lineNumber].trim();
+                switch (lineNumber) {
+                    //  first set of lines is header info
+                    case 0  : control.bbsName = line; break;
+                    case 1  : control.bbsLocation = line; break;
+                    case 2  : control.bbsPhone = line; break;
+                    case 3  : control.bbsSysOp = line; break;
+                    case 4  : control.doorRegAndBoardID = line; break;
+                    case 5  : control.packetCreationTime = line; break;
+                    case 6  : control.toUser = line; break;
+                    case 7  : break; //  Qmail menu
+                    case 8  : break; //  unknown, always 0?
+                    case 9  : break; //  total messages in packet (often set to 0)
+                    case 10 :
+                        control.totalMessages = (parseInt(line) + 1);
+                        state = 'confNumber';
+                        break;
+
+                    default :
+                        switch (state) {
+                            case 'confNumber' :
+                                currConfNumber = parseInt(line);
+                                if (isNaN(currConfNumber)) {
+                                    state = 'news';
+
+                                    control.welcomeFile = line;
+                                } else {
+                                    state = 'confName';
+                                }
+                                break;
+
+                            case 'confName' :
+                                control.confMap[currConfNumber] = line;
+                                state = 'confNumber';
+                                break;
+
+                            case 'news' :
+                                control.newsFile = line;
+                                state = 'logoff';
+                                break;
+
+                            case 'logoff' :
+                                control.logoffFile = line;
+                                state = 'footer';
+                                break;
+
+                            case 'footer' :
+                                //  some systems append additional info; we don't care.
+                                break;
+                        }
+                }
+            }
+
+             return cb(null);
+        });
+    }
+
     readHeadersExtension(cb) {
         if (!this.packetInfo.headers) {
             return cb(null);    //  nothing to do

From 8a81b34ed044639b754ecb0d106b9fc5fd0505c0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 25 Apr 2020 11:25:47 -0600
Subject: [PATCH 0931/1013] WIP: Lots of progress with QWK reader/writer

---
 core/message.js         |  11 +-
 core/message_area.js    |   1 +
 core/qwk_mail_packet.js | 554 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 492 insertions(+), 74 deletions(-)

diff --git a/core/message.js b/core/message.js
index 68f51ee4..3649a6f6 100644
--- a/core/message.js
+++ b/core/message.js
@@ -49,7 +49,8 @@ const SYSTEM_META_NAMES = {
 const ADDRESS_FLAVOR = {
     Local       : 'local',  //  local / non-remote addressing
     FTN         : 'ftn',    //  FTN style
-    Email       : 'email',
+    Email       : 'email',  //  From email
+    QWK         : 'qwk',    //  QWK packet
 };
 
 const STATE_FLAGS0 = {
@@ -94,14 +95,6 @@ const QWKPropertyNames = {
     InReplyToNum        : 'qwk_in_reply_to_num',    //  note that we prefer the 'InReplyToMsgId' kludge if available
 };
 
-const QWKKludgeNames = {
-    Via                 : 'via',
-    MessageId           : 'msg_id',
-    InReplyToMsgId      : 'in_reply_to_msg_id',
-    SyncTZ              : 'synchronet_timezone',
-    ReplyTo             : 'reply_to',
-};
-
 //  :TODO: this is a ugly hack due to bad variable names - clean it up & just _.camelCase(k)!
 const MESSAGE_ROW_MAP = {
     reply_to_message_id : 'replyToMsgId',
diff --git a/core/message_area.js b/core/message_area.js
index 579f1c9b..ff01f1e1 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -29,6 +29,7 @@ exports.getDefaultMessageAreaTagByConfTag   = getDefaultMessageAreaTagByConfTag;
 exports.getSuitableMessageConfAndAreaTags   = getSuitableMessageConfAndAreaTags;
 exports.getMessageConferenceByTag           = getMessageConferenceByTag;
 exports.getMessageAreaByTag                 = getMessageAreaByTag;
+exports.getMessageConfTagByAreaTag          = getMessageConfTagByAreaTag;
 exports.changeMessageConference             = changeMessageConference;
 exports.changeMessageArea                   = changeMessageArea;
 exports.hasMessageConfAndAreaRead           = hasMessageConfAndAreaRead;
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index f670e494..5dc3275f 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -1,12 +1,14 @@
-
-
 const ArchiveUtil = require('./archive_util');
 const { Errors } = require('./enig_error');
 const Message = require('./message');
 const { splitTextAtTerms } = require('./string_util');
+const { getMessageConfTagByAreaTag } = require('./message_area');
+const StatLog = require('./stat_log');
+const Config = require('./config').get;
+const SysProps = require('./system_property');
 
 const { EventEmitter } = require('events');
-const temptmp = require('temptmp').createTrackedSession('qwk_packet');
+const temptmp = require('temptmp');
 const async = require('async');
 const fs = require('graceful-fs');
 const paths = require('path');
@@ -16,27 +18,64 @@ const moment = require('moment');
 const _ = require('lodash');
 const IniConfigParser = require('ini-config-parser');
 
-const SMBTZToUTCOffset = (smbTZ) => {
-    //  convert a Synchronet smblib TZ to a UTC offset
-    //  see https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
-    return {
-        //  US Standard
-        '40F0'  : '-04:00', //  Atlantic
-        '412C'  : '-05:00', //  Eastern
-        '4168'  : '-06:00', //  Central
-        '41A4'  : '-07:00', //  Mountain
-        '41E0'  : '-08:00', //  Pacific
-        '421C'  : '-09:00', //  Yukon
-        '4258'  : '-10:00', //  Hawaii/Alaska
-        '4294'  : '-11:00', //  Bering
+const enigmaVersion = require('../package.json').version;
 
-        //  US Daylight
-        //  :TODO: FINISH ME!
+//  Synchronet smblib TZ to a UTC offset
+//  see https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
+const SMBTZToUTCOffset = {
+    //  US Standard
+    '40F0'  : '-04:00', //  Atlantic
+    '412C'  : '-05:00', //  Eastern
+    '4168'  : '-06:00', //  Central
+    '41A4'  : '-07:00', //  Mountain
+    '41E0'  : '-08:00', //  Pacific
+    '421C'  : '-09:00', //  Yukon
+    '4258'  : '-10:00', //  Hawaii/Alaska
+    '4294'  : '-11:00', //  Bering
 
-    }[smbTZ];
+    //  US Daylight
+    'C0F0'  : '-03:00', //  Atlantic
+    'C12C'	: '-04:00', //  Eastern
+    'C168'	: '-05:00', //  Central
+    'C1A4'	: '-06:00', //  Mountain
+    'C1E0'	: '-07:00', //  Pacific
+    'C21C'	: '-08:00', //  Yukon
+    'C258'  : '-09:00', //  Hawaii/Alaska
+    'C294'  : '-10:00', //  Bering
+
+    //  "Non-Standard"
+    '2294'  : '-11:00', //  Midway
+    '21E0'  : '-08:00', //  Vancouver
+    '21A4'  : '-07:00', //  Edmonton
+    '2168'  : '-06:00', //  Winnipeg
+    '212C'  : '-05:00', //  Bogota
+    '20F0'  : '-04:00', //  Caracas
+    '20B4'  : '-03:00', //  Rio de Janeiro
+    '2078'  : '-02:00', //  Fernando de Noronha
+    '203C'  : '-01:00', //  Azores
+    '1000'  : '+00:00', //  London
+    '103C'  : '+01:00', //  Berlin
+    '1078'  : '+02:00', //  Athens
+    '10B4'  : '+03:00', //  Moscow
+    '10F0'  : '+04:00', //  Dubai
+    '110E'  : '+04:30', //  Kabul
+    '112C'  : '+05:00', //  Karachi
+    '114A'  : '+05:30', //  Bombay
+    '1159'  : '+05:45', //  Kathmandu
+    '1168'  : '+06:00', //  Dhaka
+    '11A4'  : '+07:00', //  Bangkok
+    '11E0'  : '+08:00', //  Hong Kong
+    '121C'  : '+09:00', //  Tokyo
+    '1258'  : '+10:00', //  Sydney
+    '1294'  : '+11:00', //  Noumea
+    '12D0'  : '+12:00', //  Wellington
 };
 
-const QWKMessageBlockSize = 128;
+const UTCOffsetToSMBTZ   = _.invert(SMBTZToUTCOffset);
+
+const QWKMessageBlockSize       = 128;
+const QWKHeaderTimestampFormat  = 'MM-DD-YYHH:mm';
+const QWKLF                     = 0xe3;
 
 //  See the following:
 //  -   http://fileformats.archiveteam.org/wiki/QWK
@@ -95,14 +134,29 @@ const MessageHeaderParser = new Parser()
     .uint16('relNum')
     .uint8('netTag');
 
+const replaceCharInBuffer = (buffer, search, replace) => {
+    let i = 0;
+    search = Buffer.from([search]);
+    while (i < buffer.length) {
+        i = buffer.indexOf(search, i);
+        if (-1 === i) {
+            break;
+        }
+        buffer[i] = replace;
+        ++i;
+    }
+}
 
 class QWKPacketReader extends EventEmitter {
-    constructor(packetPath, mode=QWKPacketReader.Modes.Guess, options = { keepTearAndOrigin : true } ) {
+    constructor(
+        packetPath,
+        { mode = QWKPacketReader.Modes.Guess, keepTearAndOrigin = true } = { mode : QWKPacketReader.Modes.Guess, keepTearAndOrigin : true })
+    {
         super();
 
         this.packetPath = packetPath;
-        this.mode       = mode;
-        this.options    = options;
+        this.options    = { mode, keepTearAndOrigin };
+        this.temptmp    = temptmp.createTrackedSession('qwkpacketreader');
     }
 
     static get Modes() {
@@ -137,7 +191,7 @@ class QWKPacketReader extends EventEmitter {
                 },
                 //  create a temporary location to do processing
                 (archiveType, callback) => {
-                    temptmp.mkdir( { prefix : 'enigqwkpacket-'}, (err, tempDir) => {
+                    this.temptmp.mkdir( { prefix : 'enigqwkreader-'}, (err, tempDir) => {
                         if (err) {
                             return callback(err);
                         }
@@ -172,20 +226,20 @@ class QWKPacketReader extends EventEmitter {
 
                                 switch (key) {
                                     case 'MESSAGES.DAT' :   //  QWK
-                                        if (this.mode === QWKPacketReader.Modes.Guess) {
-                                            this.mode = QWKPacketReader.Modes.QWK;
+                                        if (this.options.mode === QWKPacketReader.Modes.Guess) {
+                                            this.options.mode = QWKPacketReader.Modes.QWK;
                                         }
-                                        if (this.mode === QWKPacketReader.Modes.QWK) {
+                                        if (this.options.mode === QWKPacketReader.Modes.QWK) {
                                             out.messages = { filename };
                                         }
                                         break;
 
                                     case 'ID.MSG' :
-                                        if (this.mode === QWKPacketReader.Modes.Guess) {
-                                            this.mode = Modes.REP;
+                                        if (this.options.mode === QWKPacketReader.Modes.Guess) {
+                                            this.options.mode = Modes.REP;
                                         }
 
-                                        if (this.mode === QWKPacketReader.Modes.REP) {
+                                        if (this.options.mode === QWKPacketReader.Modes.REP) {
                                             out.messages = { filename };
                                         }
                                         break;
@@ -258,12 +312,9 @@ class QWKPacketReader extends EventEmitter {
                 (callback) => {
                     return this.processPacketFiles(callback);
                 },
-                (tempDir, callback) => {
-                    return callback(null);
-                }
             ],
             err => {
-                temptmp.cleanup();
+                this.temptmp.cleanup();
 
                 if (err) {
                     return this.emit('error', err);
@@ -386,14 +437,19 @@ class QWKPacketReader extends EventEmitter {
         const path = paths.join(this.packetInfo.tempDir, this.packetInfo.headers.filename);
         fs.readFile(path, { encoding : 'utf8' }, (err, iniData) => {
             if (err) {
-                this.emit('warning', Errors.Invalid(`HEADERS.DAT file appears to be invalid (${err.message})`));
+                this.emit('warning', Errors.Invalid(`Problem reading HEADERS.DAT: ${err.message}`));
                 return cb(null);    //  non-fatal
             }
 
             try {
-                this.packetInfo.headers.ini = IniConfigParser.parse(iniData);
+                const parserOptions = {
+                    lineComment : false,    //  no line comments; consume full lines
+                    nativeType  : false,    //  just keep everything as strings
+                    dotKey      : false,    //  'a.b.c = value' stays 'a.b.c = value'
+                };
+                this.packetInfo.headers.ini = IniConfigParser.parse(iniData, parserOptions);
             } catch (e) {
-                this.emit('warning', Errors.Invalid(`HEADERS.DAT file appears to be invalid (${e.message})`));
+                this.emit('warning', Errors.Invalid(`HEADERS.DAT file appears to be invalid: ${e.message}`));
             }
 
             return cb(null);
@@ -401,7 +457,6 @@ class QWKPacketReader extends EventEmitter {
     }
 
     readMessages(cb) {
-        //  :TODO: update to use proper encoding: if headers.dat specifies UTF-8, use that, else CP437
         if (!this.packetInfo.messages) {
             return cb(Errors.DoesNotExist('No messages file found within QWK packet'));
         }
@@ -420,7 +475,6 @@ class QWKPacketReader extends EventEmitter {
             const FTNPropertyMapping = {
                 'X-FTN-AREA'    : Message.FtnPropertyNames.FtnArea,
                 'X-FTN-SEEN-BY' : Message.FtnPropertyNames.FtnSeenBy,
-                'X-FTN-FLAGS'   : Message.FtnPropertyNames
             };
 
             const FTNKludgeMapping = {
@@ -452,6 +506,10 @@ class QWKPacketReader extends EventEmitter {
                 Reply   : '@REPLY:',
                 TZ      : '@TZ:',       //  https://github.com/kvadevack/synchronet/blob/master/src/smblib/smbdefs.h
                 ReplyTo : '@REPLYTO:',
+
+                //  :TODO: Look into other non-standards
+                //  https://github.com/wmcbrine/MultiMail/blob/master/mmail/qwk.cc
+                //  title, @subject, etc.
             };
 
             let blockCount = 0;
@@ -480,7 +538,7 @@ class QWKPacketReader extends EventEmitter {
                     if (0 === blockCount) {
                         //  first 128 bytes is a space padded ID
                         const id = buffer.toString('ascii').trim();
-                        this.emit('generator', id);
+                        this.emit('creator', id);
                         state = 'header';
                     } else {
                         switch (state) {
@@ -493,7 +551,7 @@ class QWKPacketReader extends EventEmitter {
                                     header[field] = iconv.decode(header[field], encodingToSpec).trim();
                                 });
 
-                                header.timestamp = moment(header.timestamp, 'MM-DD-YYHH:mm');
+                                header.timestamp = moment(header.timestamp, QWKHeaderTimestampFormat);
 
                                 currMessage = {
                                     header,
@@ -523,7 +581,7 @@ class QWKPacketReader extends EventEmitter {
 
                             case 'message' :
                                 if (!currMessage.body) {
-                                    currMessage.body = buffer;
+                                    currMessage.body = Buffer.from(buffer);
                                 } else {
                                     currMessage.body = Buffer.concat([currMessage.body, buffer]);
                                 }
@@ -534,16 +592,7 @@ class QWKPacketReader extends EventEmitter {
                                     //  First, replace QWK style line feeds (0xe3) unless the message is UTF-8.
                                     //  If the message is UTF-8, we assume it's using standard line feeds.
                                     if (encoding !== 'utf8') {
-                                        let i = 0;
-                                        const QWKLF = Buffer.from([0xe3]);
-                                        while (i < currMessage.body.length) {
-                                            i = currMessage.body.indexOf(QWKLF, i);
-                                            if (-1 === i) {
-                                                break;
-                                            }
-                                            currMessage.body[i] = 0x0a;
-                                            ++i;
-                                        }
+                                        replaceCharInBuffer(currMessage.body, QWKLF, 0x0a);
                                     }
 
                                     //
@@ -583,15 +632,15 @@ class QWKPacketReader extends EventEmitter {
                                                 } else if (line.startsWith(Kludges.Subject)) {
                                                     currMessage.subject = line.substring(Kludges.Subject.length).trim();
                                                 } else if (line.startsWith(Kludges.Via)) {
-                                                    qwkKludge.via = line;
+                                                    qwkKludge['@VIA'] = line;
                                                 } else if (line.startsWith(Kludges.MsgID)) {
-                                                    qwkKludge.msg_id = line.substring(Kludges.MsgID.length).trim();
+                                                    qwkKludge['@MSGID'] = line.substring(Kludges.MsgID.length).trim();
                                                 } else if (line.startsWith(Kludges.Reply)) {
-                                                    qwkKludge.in_reply_to_msg_id = line.substring(Kludges.Reply.length).trim();
+                                                    qwkKludge['@REPLY'] = line.substring(Kludges.Reply.length).trim();
                                                 } else if (line.startsWith(Kludges.TZ)) {
-                                                    qwkKludge.synchronet_timezone = line.substring(Kludges.TZ.length).trim();
+                                                    qwkKludge['@TZ'] = line.substring(Kludges.TZ.length).trim();
                                                 } else if (line.startsWith(Kludges.ReplyTo)) {
-                                                    qwkKludge.reply_to = line.substring(Kludges.ReplyTo.length).trim();
+                                                    qwkKludge['@REPLYTO'] = line.substring(Kludges.ReplyTo.length).trim();
                                                 } else {
                                                     bodyState = 'body'; // past this point and up to any tear/origin/etc., is the real message body
                                                     bodyLines.push(line);
@@ -620,12 +669,12 @@ class QWKPacketReader extends EventEmitter {
                                         const ext = currMessage.headersExtension;
 
                                         //  to and subject can be overridden yet again if entries are present
-                                        currMessage.toName  = ext.To || currMessage.toName
+                                        currMessage.toName  = ext.To || currMessage.toName;
                                         currMessage.subject = ext.Subject || currMessage.subject;
-                                        currMessage.from    = ext.Sender || currMessage.from;   //  why not From? Who the fuck knows.
+                                        currMessage.from    = ext.Sender || currMessage.fromName;   //  why not From? Who the fuck knows.
 
                                         //  possibly override message ID kludge
-                                        qwkKludge.msg_id    = ext['Message-ID'] || qwkKludge.msg_id;
+                                        qwkKludge['@MSGID'] = ext['Message-ID'] || qwkKludge['@MSGID'];
 
                                         //  WhenWritten contains a ISO-8601-ish timestamp and a Synchronet/SMB style TZ offset:
                                         //  20180101174837-0600  4168
@@ -640,7 +689,7 @@ class QWKPacketReader extends EventEmitter {
                                         }
 
                                         if (ext.Tags) {
-                                            currMessage.hashTags = ext.Tags.split(' ');
+                                            currMessage.hashTags = (ext.Tags).toString().split(' ');
                                         }
 
                                         //  FTN style properties/kludges represented as X-FTN-XXXX
@@ -668,6 +717,9 @@ class QWKPacketReader extends EventEmitter {
                                         hashTags        : currMessage.hashTags,
                                     });
 
+                                    //  Indicate this message was imported from a QWK packet
+                                    message.meta.System[Message.SystemMetaNames.ExternalFlavor] = Message.AddressFlavor.QWK;
+
                                     if (!_.isEmpty(qwkKludge)) {
                                         message.meta.QwkKludge = qwkKludge;
                                     }
@@ -692,8 +744,8 @@ class QWKPacketReader extends EventEmitter {
                                     }
 
                                     //  Update the timestamp if we have a valid TZ
-                                    if (useTZKludge && _.has(message, 'meta.QwkKludge.synchronet_timezone')) {
-                                        const tzOffset = SMBTZToUTCOffset(message.meta.QwkKludge.synchronet_timezone);
+                                    if (useTZKludge && qwkKludge['@TZ']) {
+                                        const tzOffset = SMBTZToUTCOffset[qwkKludge['@TZ']];
                                         if (tzOffset) {
                                             message.modTimestamp.utcOffset(tzOffset);
                                         }
@@ -704,7 +756,7 @@ class QWKPacketReader extends EventEmitter {
                                         qwk_in_reply_to_num     : currMessage.header.replyToNum,
                                     };
 
-                                    if (this.mode === QWKPacketReader.Modes.QWK) {
+                                    if (this.options.mode === QWKPacketReader.Modes.QWK) {
                                         message.meta.QwkProperty.qwk_msg_num = currMessage.header.num;
                                         message.meta.QwkProperty.qwk_conf_num = currMessage.header.confNum;
                                     } else {
@@ -735,7 +787,379 @@ class QWKPacketReader extends EventEmitter {
     }
 };
 
+class QWKPacketWriter extends EventEmitter {
+    constructor(
+        {
+            enableQWKE = true,
+            enableHeadersExtension = true,
+            enableAtKludges = true,
+            encoding = 'cp437',
+            systemDomain = 'enigma-bbs',
+            bbsID = '',
+            toUser = '',
+        } = QWKPacketWriter.DefaultOptions)
+    {
+        super();
+
+        this.options = {
+            enableQWKE,
+            enableHeadersExtension,
+            enableAtKludges,
+            systemDomain,
+            bbsID,
+            toUser,
+            encoding : encoding.toLowerCase(),
+        };
+
+        this.temptmp = temptmp.createTrackedSession('qwkpacketwriter');
+    }
+
+    static get DefaultOptions() {
+        return {
+            enableQWKE              : true,
+            enableHeadersExtension  : true,
+            enableAtKludges         : true,
+            encoding                : 'cp437',
+            systemDomain            : 'enigma-bbs',
+            bbsID                   : '',
+            toUser                  : '',
+        };
+    }
+
+    init() {
+        async.series(
+            [
+                (callback) => {
+                    return StatLog.init(callback);
+                },
+                (callback) => {
+                    this.temptmp.mkdir( { prefix : 'enigqwkwriter-'}, (err, workDir) => {
+                        this.workDir = workDir;
+                        return callback(err);
+                    });
+                },
+                (callback) => {
+                    this.messagesStream = fs.createWriteStream(paths.join(this.workDir, 'messages.dat'));
+
+                    if (this.options.enableHeadersExtension) {
+                        this.headersDatStream = fs.createWriteStream(paths.join(this.workDir, 'headers.dat'));
+                    }
+
+                    //  First block is a space padded ID
+                    const id = `Created with ENiGMA 1/2 BBS v${enigmaVersion} Copyright (c) 2015-2020 Bryan Ashby`;
+                    this.messagesStream.write(id.padEnd(QWKMessageBlockSize, ' '), 'ascii');
+                    this.currentMessageOffset = QWKMessageBlockSize;
+
+                    this.totalMessages = 0;
+                    this.areaTagsSeen = new Set();
+
+                    return callback(null);
+                },
+            ],
+            err => {
+                if (err) {
+                    return this.emit('error', err);
+                }
+
+                this.emit('ready');
+            }
+        )
+    }
+
+    makeMessageIdentifier(message) {
+        return `<${message.messageId}.${message.messageUuid}@${this.options.systemDomain}>`;
+    }
+
+    appendMessage(message) {
+        //
+        //  Each message has to:
+        //  - Append to MESSAGES.DAT
+        //  - Append to HEADERS.DAT if enabled
+        //
+        //  If this is a personal (ie: non-network) packet:
+        //  - Produce PERSONAL.NDX
+        //  - Produce 000.NDX with pointers to the users personal "inbox" mail
+        //  - Produce ####.NDX with pointers to the public/conference mail
+        //  - Produce TOREADER.EXT if QWKE support is enabled
+        //
+
+        let fullMessageBody = '';
+
+        //  Start of body is kludges if enabled
+        if (this.options.enableQWKE) {
+            if (message.toUserName.length > 25) {
+                fullMessageBody += `To: ${message.toUserName}\n`;
+            }
+            if (message.fromUserName.length > 25) {
+                fullMessageBody += `From: ${message.fromUserName}\n`;
+            }
+            if (message.subject.length > 25) {
+                fullMessageBody += `Subject: ${message.subject}\n`;
+            }
+        }
+
+        if (this.options.enableAtKludges) {
+            //  Add in original kludges (perhaps in a different order) if
+            //  they were originally imported
+            if (Message.AddressFlavor.QWK == message.meta.System[Message.SystemMetaNames.ExternalFlavor]) {
+                if (message.meta.QwkKludge) {
+                    for (let [kludge, value] of Object.entries(message.meta.QwkKludge)) {
+                        fullMessageBody += `${kludge}: ${value}\n`;
+                    };
+                }
+            } else {
+                fullMessageBody += `@MSGID: ${this.makeMessageIdentifier(message)}\n`;
+            }
+        }
+
+        //  The actual message contents
+        fullMessageBody += message.message;
+
+        //  :TODO: sanitize line feeds -> \n ????
+
+        // splitTextAtTerms(message.message).forEach(line => {
+        //     appendBodyLine(line);
+        // });
+
+        const encodedMessage = iconv.encode(fullMessageBody, this.options.encoding);
+
+        //
+        //  QWK spec wants line feeds as 0xe3 for some reason, so we'll have
+        //  to replace the \n's. If we're going against the spec and using UTF-8
+        //  we can just leave them be.
+        //
+        if ('utf8' !== this.options.encoding) {
+            replaceCharInBuffer(encodedMessage, 0x0a, QWKLF);
+        }
+
+        //  Messages must comprise of multiples of 128 bit blocks with the last
+        //  block padded by spaces or nulls (we use nulls)
+        const fullBlocks    = Math.trunc(encodedMessage.length / QWKMessageBlockSize);
+        const remainBytes   = QWKMessageBlockSize - (encodedMessage.length % QWKMessageBlockSize);
+
+        //  The first block is always a header
+        this._writeMessageHeader(
+            message,
+            fullBlocks + 1 + (remainBytes ? 1 : 0),
+        );
+
+        this.messagesStream.write(encodedMessage);
+
+
+        if (remainBytes) {
+            this.messagesStream.write(Buffer.alloc(remainBytes, 0x00));
+        }
+
+        if (this.options.enableHeadersExtension) {
+            this._appendHeadersExtensionData(message);
+        }
+
+        this.currentMessageOffset += fullBlocks * QWKMessageBlockSize;
+
+        if (remainBytes)
+        {
+            this.currentMessageOffset += QWKMessageBlockSize;
+        }
+
+        this.totalMessages += 1;
+        this.areaTagsSeen.add(message.areaTag);
+    }
+
+    appendNewFile() {
+
+    }
+
+    finish(packetPath) {
+        async.series(
+            [
+                (callback) => {
+                    this.messagesStream.on('close', () => {
+                        return callback(null);
+                    });
+                    this.messagesStream.end();
+                },
+                (callback) => {
+                    if (!this.headersDatStream) {
+                        return callback(null);
+                    }
+                    this.headersDatStream.on('close', () => {
+                        return callback(null);
+                    });
+                    this.headersDatStream.end();
+                },
+                (callback) => {
+                    return this._createControlData(callback);
+                }
+            ],
+            err => {
+                this.temptmp.cleanup();
+
+                if (err) {
+                    return this.emit('error', err);
+                }
+
+                this.emit('finished');
+            }
+        )
+    }
+
+    _writeMessageHeader(message, totalBlocks) {
+        const asciiNum = (n, l) => {
+            if (isNaN(n)) {
+                return '';
+            }
+            return n.toString().substr(0, l);
+        };
+
+        const status = 'FIXME';
+        const totalBlocksStr = asciiNum(totalBlocks, 6);//totalBlocks.toString().padEnd(6, ' ');
+        const messageStatus = 255;  //  :TODO: ever anything different?
+        const confNumber = 1004;    //  :TODO: areaTag -> conf mapping
+        const netTag = ' '; //  :TODO:
+
+        if (totalBlocksStr.length > 6) {
+            return this.emit('warning', Errors.General('Message too large for packet'), message);
+        }
+
+        const header = Buffer.alloc(QWKMessageBlockSize, ' ');
+        header.write(status[0], 0, 1, 'ascii');
+        header.write(asciiNum(message.messageId), 1, 'ascii');  //  :TODO: It seems Sync puts the relative, as in # of messages we've called appendMessage()?!
+        header.write(message.modTimestamp.format(QWKHeaderTimestampFormat), 8, 13, 'ascii');
+        header.write(message.toUserName.substr(0, 25), 21, 'ascii');
+        header.write(message.fromUserName.substr(0, 25), 46, 'ascii');
+        header.write(message.subject.substr(0, 25), 71, 'ascii');
+        header.write(' '.repeat(12), 96, 'ascii');  //  we don't use the password field
+        header.write(asciiNum(message.replyToMsgId), 108, 'ascii');
+        header.write(asciiNum(totalBlocks, 6), 116, 'ascii');
+        header.writeUInt8(messageStatus, 122);
+        header.writeUInt16LE(confNumber, 123);
+        header.writeUInt16LE(0, 125);   //  :TODO: Check if others actually populate this
+        header.write(netTag[0], 127, 1, 'ascii');
+
+        this.messagesStream.write(header);
+    }
+
+    _createControlData(cb) {
+        const controlStream = fs.createWriteStream(paths.join(this.workDir, 'control.dat'));
+        controlStream.setDefaultEncoding('ascii');
+
+        controlStream.on('close', () => {
+            return cb(null);
+        });
+
+        controlStream.on('error', err => {
+            return cb(err);
+        });
+
+        const controlData = [
+            Config().general.boardName,
+            'Earth',
+            'XXX-XXX-XXX',
+            `${StatLog.getSystemStat(SysProps.SysOpUsername)}, Sysop`,
+            `0000,${this.options.bbsID}`,
+            moment().format('MM-DD-YYYY,HH:mm:ss'),
+            this.options.toUser,
+            '',     // name of Qmail menu
+            '0',    // uh, OK
+            this.totalMessages.toString(),
+            //  this next line is total conferences - 1:
+            //  We have areaTag <> conference mapping, so the number should work out
+            (this.areaTagsSeen.size - 1).toString(),
+
+            //  :TODO: append all areaTag->conf number/IDs and names (13 chars max)
+            '0', 'First Conf',
+            'HELLO',
+            'BBSNEWS',
+            'GOODBYE',
+        ];
+
+        controlData.forEach(line => {
+            controlStream.write(`${line}\r\n`);
+        });
+
+        controlStream.end();
+    }
+
+    _makeSynchronetTimestamp(ts) {
+        const syncTimestamp = ts.format('YYYYMMDDHHmmssZZ');
+        const syncTZ        = UTCOffsetToSMBTZ[ts.format('Z')] || '0000';   //  :TODO: what if we don't have a map?
+        return `${syncTimestamp} ${syncTZ}`;
+    }
+
+    _appendHeadersExtensionData(message) {
+        const messageData = {
+            //  Synchronet style
+            Utf8            : ('utf8' === this.options.encoding ? 'true' : 'false'),
+            'Message-ID'    : this.makeMessageIdentifier(message),
+
+            WhenWritten     : this._makeSynchronetTimestamp(message.modTimestamp),
+            // WhenImported    : '',   //  :TODO: only if we have a imported time from another external system?
+            ExportedFrom    : `${this.options.systemID} ${message.areaTag} ${message.messageId}`,
+            Sender          : message.fromUserName,
+
+            //  :TODO: if exporting for QWK-Net style/etc.
+            //SenderNetAddr
+
+            SenderIpAddr    : '127.0.0.1',  //  no sir, that's private.
+            SenderHostName  : this.options.systemDomain,
+            //  :TODO: if exported:
+            //SenderProtocol
+            Organization    : 'BBS',
+
+            //'Reply-To'      : :TODO: "address to direct replies".... ?!
+            Subject         : message.subject,
+            To              : message.toUserName,
+            //ToNetAddr     : :TODO: net addr to?!
+
+            //  :TODO: Only set if not imported:
+            Tags            : message.hashTags.join(' '),
+
+            //  :TODO: Needs tested with Sync/etc.; Sync wants Conference *numbers*
+            Conference      : getMessageConfTagByAreaTag(message.areaTag),
+
+            //  ENiGMA Headers
+            MessageUUID     : message.uuid,
+            ModTimestamp    : message.modTimestamp.format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+            AreaTag         : message.areaTag,
+        };
+
+        const externalFlavor = message.meta.System[Message.SystemMetaNames.ExternalFlavor];
+        if (externalFlavor === Message.AddressFlavor.FTN) {
+            //  Add FTN properties if it came from such an origin
+            if (message.meta.FtnProperty) {
+                const ftnProp = message.meta.FtnProperty;
+                messageData['X-FTN-AREA']       = ftnProp[Message.FtnPropertyNames.FtnArea];
+                messageData['X-FTN-SEEN-BY']    = fntProp[Message.FtnPropertyNames.FtnSeenBy];
+            }
+
+            if (message.meta.FtnKludge) {
+                const ftnKludge = message.meta.FtnKludge;
+                messageData['X-FTN-PATH']   = ftnKludge.PATH;
+                messageData['X-FTN-MSGID']  = ftnKludge.MSGID;
+                messageData['X-FTN-REPLY']  = fntKludge.REPLY;
+                messageData['X-FTN-PID']    = fntKludge.PID;
+                messageData['X-FTN-FLAGS']  = ftnKludge.FLAGS;
+                messageData['X-FTN-TID']    = fntKludge.TID;
+                messageData['X-FTN-CHRS']   = fntKludge.CHRS;
+            }
+        } else {
+            messageData.WhenExported    = this._makeSynchronetTimestamp(moment());
+            messageData.Editor          = `ENiGMA 1/2 BBS FSE v${enigmaVersion}`;
+        }
+
+        this.headersDatStream.write(iconv.encode(`[${this.currentMessageOffset.toString(16)}]\r\n`, this.options.encoding));
+
+        for (let [name, value] of Object.entries(messageData)) {
+            if (value) {
+                this.headersDatStream.write(iconv.encode(`${name}: ${value}\r\n`, this.options.encoding));
+            }
+        }
+
+        this.headersDatStream.write('\r\n');
+    }
+}
+
 module.exports = {
     QWKPacketReader,
-//    QWKPacketWriter,
+    QWKPacketWriter,
 }

From e1b0a3553b72a98869dbcec97a0e1f27cbdde4a0 Mon Sep 17 00:00:00 2001
From: squintgit <mbovett@gmail.com>
Date: Sun, 26 Apr 2020 18:20:42 -0500
Subject: [PATCH 0932/1013] Update testing.md

Adding instructions for shutting down server, which may not be immediately clear to new sysops
---
 docs/installation/testing.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/installation/testing.md b/docs/installation/testing.md
index bfd2de26..576b28fd 100644
--- a/docs/installation/testing.md
+++ b/docs/installation/testing.md
@@ -26,7 +26,9 @@ _____________________   _____  ____________________    __________\_   /
 
 System started!
 ```
-Grab your favourite telnet client, connect to localhost:8888 and test out your installation. 
+Grab your favourite telnet client, connect to localhost:8888 and test out your installation.
+
+To shut down the server, press Ctrl-C.
 
 ## Points of Interest
 
@@ -44,4 +46,4 @@ If you don't have any telnet software, these are compatible with ENiGMA½:
 * [NetRunner](http://mysticbbs.com/downloads.html)
 * [MagiTerm](https://magickabbs.com/index.php/magiterm/)
 * [VTX](https://github.com/codewar65/VTX_ClientServer) (Browser based)
-* [fTelnet](https://www.ftelnet.ca/) (Browser based)
\ No newline at end of file
+* [fTelnet](https://www.ftelnet.ca/) (Browser based)

From 2b7d810c777ddb96961c179305de456c50d5d894 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 27 Apr 2020 20:55:41 -0600
Subject: [PATCH 0933/1013] Lots of progress on packet writing, reading, etc. *
 Bug fixes * Create packet archive

---
 core/archive_util.js    |  26 ++++--
 core/qwk_mail_packet.js | 180 +++++++++++++++++++++++++++++++---------
 2 files changed, 160 insertions(+), 46 deletions(-)

diff --git a/core/archive_util.js b/core/archive_util.js
index 8549cd12..47291860 100644
--- a/core/archive_util.js
+++ b/core/archive_util.js
@@ -204,23 +204,37 @@ module.exports = class ArchiveUtil {
         });
     }
 
-    compressTo(archType, archivePath, files, cb) {
+    compressTo(archType, archivePath, files, workDir, cb) {
         const archiver = this.getArchiver(archType, paths.extname(archivePath));
 
         if(!archiver) {
             return cb(Errors.Invalid(`Unknown archive type: ${archType}`));
         }
 
+        if (!cb && _.isFunction(workDir)) {
+            cb = workDir;
+            workDir = null;
+        }
+
         const fmtObj = {
             archivePath : archivePath,
             fileList    : files.join(' '),  //  :TODO: probably need same hack as extractTo here!
         };
 
-        const args = archiver.compress.args.map( arg => stringFormat(arg, fmtObj) );
+        //  :TODO: DRY with extractTo()
+        const args = archiver.compress.args.map( arg => {
+            return '{fileList}' === arg ? arg : stringFormat(arg, fmtObj);
+        });
+
+        const fileListPos = args.indexOf('{fileList}');
+        if(fileListPos > -1) {
+            //  replace {fileList} with 0:n sep file list arguments
+            args.splice.apply(args, [fileListPos, 1].concat(files));
+        }
 
         let proc;
         try {
-            proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts());
+            proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts(workDir));
         } catch(e) {
             return cb(Errors.ExternalProcess(
                 `Error spawning archiver process "${archiver.compress.cmd}" with args "${args.join(' ')}": ${e.message}`)
@@ -332,15 +346,15 @@ module.exports = class ArchiveUtil {
         });
     }
 
-    getPtyOpts(extractPath) {
+    getPtyOpts(cwd) {
         const opts = {
             name    : 'enigma-archiver',
             cols    : 80,
             rows    : 24,
             env     : process.env,
         };
-        if(extractPath) {
-            opts.cwd = extractPath;
+        if(cwd) {
+            opts.cwd = cwd;
         }
         //  :TODO: set cwd to supplied temp path if not sepcific extract
         return opts;
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 5dc3275f..e5c316b1 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -2,7 +2,10 @@ const ArchiveUtil = require('./archive_util');
 const { Errors } = require('./enig_error');
 const Message = require('./message');
 const { splitTextAtTerms } = require('./string_util');
-const { getMessageConfTagByAreaTag } = require('./message_area');
+const {
+    getMessageConfTagByAreaTag,
+    getMessageAreaByTag,
+} = require('./message_area');
 const StatLog = require('./stat_log');
 const Config = require('./config').get;
 const SysProps = require('./system_property');
@@ -77,6 +80,26 @@ const QWKMessageBlockSize       = 128;
 const QWKHeaderTimestampFormat  = 'MM-DD-YYHH:mm';
 const QWKLF                     = 0xe3;
 
+const QWKMessageStatusCodes = {
+    UnreadPublic                : ' ',
+    ReadPublic                  : '-',
+    ReadBySomeonePrivate        : '*',
+    UnreadPrivate               : '+',
+    UnreadCommentToSysOp        : '~',
+    ReadCommentToSysOp          : '`',
+    UnreadSenderPWProtected     : '%',
+    ReadSenderPWProtected       : '^',
+    UnreadGroupPWProtected      : '!',
+    ReadGroupPWProtected        : '#',
+    PWProtectedToAll            : '$',
+    Vote                        : 'V',
+};
+
+const QWKMessageActiveStatus = {
+    Active  : 255,
+    Deleted : 226,
+};
+
 //  See the following:
 //  -   http://fileformats.archiveteam.org/wiki/QWK
 //  -   http://wiki.synchro.net/ref:qwk
@@ -796,7 +819,8 @@ class QWKPacketWriter extends EventEmitter {
             encoding = 'cp437',
             systemDomain = 'enigma-bbs',
             bbsID = '',
-            toUser = '',
+            user = null,
+            archiveFormat = 'application/zip',
         } = QWKPacketWriter.DefaultOptions)
     {
         super();
@@ -807,7 +831,8 @@ class QWKPacketWriter extends EventEmitter {
             enableAtKludges,
             systemDomain,
             bbsID,
-            toUser,
+            user,
+            archiveFormat,
             encoding : encoding.toLowerCase(),
         };
 
@@ -822,7 +847,8 @@ class QWKPacketWriter extends EventEmitter {
             encoding                : 'cp437',
             systemDomain            : 'enigma-bbs',
             bbsID                   : '',
-            toUser                  : '',
+            user                    : null,
+            archiveFormat           :'application/zip',
         };
     }
 
@@ -913,13 +939,12 @@ class QWKPacketWriter extends EventEmitter {
         }
 
         //  The actual message contents
-        fullMessageBody += message.message;
+        //fullMessageBody += message.message;
 
-        //  :TODO: sanitize line feeds -> \n ????
-
-        // splitTextAtTerms(message.message).forEach(line => {
-        //     appendBodyLine(line);
-        // });
+        //  Sanitize line feeds (e.g. CRLF -> LF, and possibly -> QWK style below)
+        splitTextAtTerms(message.message).forEach(line => {
+            fullMessageBody += `${line}\n`;
+        });
 
         const encodedMessage = iconv.encode(fullMessageBody, this.options.encoding);
 
@@ -938,16 +963,20 @@ class QWKPacketWriter extends EventEmitter {
         const remainBytes   = QWKMessageBlockSize - (encodedMessage.length % QWKMessageBlockSize);
 
         //  The first block is always a header
-        this._writeMessageHeader(
+        if (!this._writeMessageHeader(
             message,
             fullBlocks + 1 + (remainBytes ? 1 : 0),
-        );
+        ))
+        {
+            //  we can't write this message
+            return;
+        }
 
         this.messagesStream.write(encodedMessage);
 
 
         if (remainBytes) {
-            this.messagesStream.write(Buffer.alloc(remainBytes, 0x00));
+            this.messagesStream.write(Buffer.alloc(remainBytes, ' '));
         }
 
         if (this.options.enableHeadersExtension) {
@@ -989,6 +1018,9 @@ class QWKPacketWriter extends EventEmitter {
                 },
                 (callback) => {
                     return this._createControlData(callback);
+                },
+                (callback) => {
+                    return this._producePacketArchive(packetPath, callback);
                 }
             ],
             err => {
@@ -1003,6 +1035,41 @@ class QWKPacketWriter extends EventEmitter {
         )
     }
 
+    _producePacketArchive(packetPath, cb) {
+        const archiveUtil = ArchiveUtil.getInstance();
+
+        const packetFiles = [
+            'messages.dat', 'headers.dat', 'control.dat',
+        ].map(filename => {
+            return filename;
+            //return paths.join(this.workDir, filename);
+        });
+
+        archiveUtil.compressTo(
+            this.options.archiveFormat,
+            packetPath,
+            packetFiles,
+            this.workDir,
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
+    _qwkMessageStatus(message) {
+        //  - Public vs Private
+        //  - Look at message pointers for read status
+        //  - If +op is exporting and this message is to +op
+        //  -
+        //  :TODO: this needs addressed - handle unread vs read, +op, etc.
+        //  ....see getNewMessagesInAreaForUser(); Variant with just IDs, or just a way to get first new message ID per area?
+
+        if (message.isPrivate()) {
+            return QWKMessageStatusCodes.UnreadPrivate;
+        }
+        return QWKMessageStatusCodes.UnreadPublic;
+    }
+
     _writeMessageHeader(message, totalBlocks) {
         const asciiNum = (n, l) => {
             if (isNaN(n)) {
@@ -1011,18 +1078,26 @@ class QWKPacketWriter extends EventEmitter {
             return n.toString().substr(0, l);
         };
 
-        const status = 'FIXME';
-        const totalBlocksStr = asciiNum(totalBlocks, 6);//totalBlocks.toString().padEnd(6, ' ');
-        const messageStatus = 255;  //  :TODO: ever anything different?
-        const confNumber = 1004;    //  :TODO: areaTag -> conf mapping
-        const netTag = ' '; //  :TODO:
-
-        if (totalBlocksStr.length > 6) {
-            return this.emit('warning', Errors.General('Message too large for packet'), message);
+        const asciiTotalBlocks = asciiNum(totalBlocks, 6);
+        if (asciiTotalBlocks.length > 6) {
+            this.emit('warning', Errors.General('Message too large for packet'), message);
+            return false;
         }
 
+        const conferenceNumber = this._getMessageConferenceNumberByAreaTag(message.areaTag);
+        if (isNaN(conferenceNumber)) {
+            this.emit('warning', Errors.MissingConfig(`No QWK conference mapping for areaTag ${message.areaTag}`));
+            return false;
+        }
+
+        const netTag = ' '; //  :TODO:
+
+        this.lolMessageId = this.lolMessageId || 1;
+        //message.messageId = this.lolMessageId;
+        this.lolMessageId++;
+
         const header = Buffer.alloc(QWKMessageBlockSize, ' ');
-        header.write(status[0], 0, 1, 'ascii');
+        header.write(this._qwkMessageStatus(message), 0, 1, 'ascii');
         header.write(asciiNum(message.messageId), 1, 'ascii');  //  :TODO: It seems Sync puts the relative, as in # of messages we've called appendMessage()?!
         header.write(message.modTimestamp.format(QWKHeaderTimestampFormat), 8, 13, 'ascii');
         header.write(message.toUserName.substr(0, 25), 21, 'ascii');
@@ -1030,16 +1105,35 @@ class QWKPacketWriter extends EventEmitter {
         header.write(message.subject.substr(0, 25), 71, 'ascii');
         header.write(' '.repeat(12), 96, 'ascii');  //  we don't use the password field
         header.write(asciiNum(message.replyToMsgId), 108, 'ascii');
-        header.write(asciiNum(totalBlocks, 6), 116, 'ascii');
-        header.writeUInt8(messageStatus, 122);
-        header.writeUInt16LE(confNumber, 123);
+        header.write(asciiTotalBlocks, 116, 'ascii');
+        header.writeUInt8(QWKMessageActiveStatus.Active, 122);
+        header.writeUInt16LE(conferenceNumber, 123);
         header.writeUInt16LE(0, 125);   //  :TODO: Check if others actually populate this
         header.write(netTag[0], 127, 1, 'ascii');
 
         this.messagesStream.write(header);
+
+        return true;
+    }
+
+    _getMessageConferenceNumberByAreaTag(areaTag) {
+        const areaConfig = _.get(Config(), [ 'messageNetworks', 'qwk', 'areas', areaTag ]);
+        return areaConfig && areaConfig.conference;
+    }
+
+    _getExportForUsername() {
+        return _.get(this.options, 'user.username', 'Any');
+    }
+
+    _getExportSysOpUsername() {
+        return StatLog.getSystemStat(SysProps.SysOpUsername) || 'SysOp';
     }
 
     _createControlData(cb) {
+        const areas = Array.from(this.areaTagsSeen).map(areaTag => {
+            return getMessageAreaByTag(areaTag);
+        });
+
         const controlStream = fs.createWriteStream(paths.join(this.workDir, 'control.dat'));
         controlStream.setDefaultEncoding('ascii');
 
@@ -1051,32 +1145,38 @@ class QWKPacketWriter extends EventEmitter {
             return cb(err);
         });
 
-        const controlData = [
+        const initialControlData = [
             Config().general.boardName,
             'Earth',
             'XXX-XXX-XXX',
-            `${StatLog.getSystemStat(SysProps.SysOpUsername)}, Sysop`,
+            `${this._getExportSysOpUsername()}, Sysop`,
             `0000,${this.options.bbsID}`,
             moment().format('MM-DD-YYYY,HH:mm:ss'),
-            this.options.toUser,
+            this._getExportForUsername(),
             '',     // name of Qmail menu
             '0',    // uh, OK
             this.totalMessages.toString(),
             //  this next line is total conferences - 1:
             //  We have areaTag <> conference mapping, so the number should work out
             (this.areaTagsSeen.size - 1).toString(),
-
-            //  :TODO: append all areaTag->conf number/IDs and names (13 chars max)
-            '0', 'First Conf',
-            'HELLO',
-            'BBSNEWS',
-            'GOODBYE',
         ];
 
-        controlData.forEach(line => {
+        initialControlData.forEach(line => {
             controlStream.write(`${line}\r\n`);
         });
 
+        //  map areas as conf #\r\nDescription\r\n pairs
+        areas.forEach(area => {
+            const conferenceNumber = this._getMessageConferenceNumberByAreaTag(area.areaTag);
+            controlStream.write(`${conferenceNumber}\r\n`);
+            controlStream.write(`${area.name}\r\n`);
+        });
+
+        //  :TODO: do we ever care here?!
+        ['HELLO', 'BBSNEWS', 'GOODBYE'].forEach(trailer => {
+            controlStream.write(`${trailer}\r\n`);
+        });
+
         controlStream.end();
     }
 
@@ -1129,18 +1229,18 @@ class QWKPacketWriter extends EventEmitter {
             if (message.meta.FtnProperty) {
                 const ftnProp = message.meta.FtnProperty;
                 messageData['X-FTN-AREA']       = ftnProp[Message.FtnPropertyNames.FtnArea];
-                messageData['X-FTN-SEEN-BY']    = fntProp[Message.FtnPropertyNames.FtnSeenBy];
+                messageData['X-FTN-SEEN-BY']    = ftnProp[Message.FtnPropertyNames.FtnSeenBy];
             }
 
             if (message.meta.FtnKludge) {
                 const ftnKludge = message.meta.FtnKludge;
                 messageData['X-FTN-PATH']   = ftnKludge.PATH;
                 messageData['X-FTN-MSGID']  = ftnKludge.MSGID;
-                messageData['X-FTN-REPLY']  = fntKludge.REPLY;
-                messageData['X-FTN-PID']    = fntKludge.PID;
+                messageData['X-FTN-REPLY']  = ftnKludge.REPLY;
+                messageData['X-FTN-PID']    = ftnKludge.PID;
                 messageData['X-FTN-FLAGS']  = ftnKludge.FLAGS;
-                messageData['X-FTN-TID']    = fntKludge.TID;
-                messageData['X-FTN-CHRS']   = fntKludge.CHRS;
+                messageData['X-FTN-TID']    = ftnKludge.TID;
+                messageData['X-FTN-CHRS']   = ftnKludge.CHRS;
             }
         } else {
             messageData.WhenExported    = this._makeSynchronetTimestamp(moment());

From 1f1813c14a619fda8bac46afc12b1bea852bd60e Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 30 Apr 2020 22:07:29 -0600
Subject: [PATCH 0934/1013] Produce NDX files, various improvements to spec,
 etc.

---
 core/mbf.js                        |  59 +++++++++
 core/oputil/oputil_message_base.js | 203 ++++++++++++++++++++++++++---
 core/qwk_mail_packet.js            | 194 +++++++++++++++++++++------
 3 files changed, 399 insertions(+), 57 deletions(-)
 create mode 100644 core/mbf.js

diff --git a/core/mbf.js b/core/mbf.js
new file mode 100644
index 00000000..9c3b2f6d
--- /dev/null
+++ b/core/mbf.js
@@ -0,0 +1,59 @@
+const { Errors } = require('./enig_error');
+
+//
+//  Utils for dealing with Microsoft Binary Format (MBF) used
+//  in various BASIC languages, etc.
+//
+//  - https://en.wikipedia.org/wiki/Microsoft_Binary_Format
+//  - https://stackoverflow.com/questions/2268191/how-to-convert-from-ieee-python-float-to-microsoft-basic-float
+//
+
+//  Number to 32bit MBF
+numToMbf32 = (v) => {
+    const mbf = Buffer.alloc(4);
+
+	if (0 === v) {
+		return mbf;
+	}
+
+	const ieee = Buffer.alloc(4);
+	ieee.writeFloatLE(v, 0);
+
+	const sign  = ieee[3] & 0x80;
+	let exp     = (ieee[3] << 1) | (ieee[2] >> 7);
+
+    if (exp === 0xfe) {
+		throw Errors.Invalid(`${v} cannot be converted to mbf`);
+	}
+
+	exp += 2;
+
+    mbf[3] = exp;
+	mbf[2] = sign | (ieee[2] & 0x7f);
+	mbf[1] = ieee[1];
+	mbf[0] = ieee[0];
+
+	return mbf;
+}
+
+mbf32ToNum = (mbf) => {
+	if (0 === mbf[3]) {
+		return 0.0;
+	}
+
+	const ieee	= Buffer.alloc(4);
+	const sign	= mbf[2] & 0x80;
+	const exp	= mbf[3] - 2;
+
+	ieee[3] = sign | (exp >> 1);
+	ieee[2] = (exp << 7) | (mbf[2] & 0x7f);
+	ieee[1] = mbf[1];
+	ieee[0] = mbf[0];
+
+	return ieee.readFloatLE(0);
+}
+
+module.exports = {
+	numToMbf32,
+	mbf32ToNum,
+}
\ No newline at end of file
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index e5b30c12..7d914ab2 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -445,6 +445,9 @@ function handleQWK() {
         case 'dump' :
             return dumpQWKPacket(packetPath);
 
+        case 'export' :
+            return exportQWKPacket(packetPath);
+
         default :
             return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
     }
@@ -457,35 +460,81 @@ function dumpQWKPacket(packetPath) {
                 return initConfigAndDatabases(callback);
             },
             (callback) => {
+                ////
+                const { QWKPacketWriter } = require('../qwk_mail_packet');
+                const writer = new QWKPacketWriter({
+                    bbsID : 'XIBALBA',
+                    toUser : 'NuSkooler',
+                    encoding : 'cp437',
+                });
+
                 const { QWKPacketReader } = require('../qwk_mail_packet');
-                const reader = new QWKPacketReader(packetPath);
 
-                reader.on('error', err => {
-                    console.error(`ERROR: ${err.message}`);
-                    return callback(err);
+
+                writer.on('ready', () => {
+                    const reader = new QWKPacketReader(packetPath);
+
+                    reader.on('error', err => {
+                        console.error(`ERROR: ${err.message}`);
+                        return callback(err);
+                    });
+
+                    reader.on('done', () => {
+                        writer.finish();
+                    });
+
+                    reader.on('archive type', archiveType => {
+                        console.info(`-> Archive type: ${archiveType}`);
+                    });
+
+                    reader.on('creator', creator => {
+                        console.info(`-> Creator: ${creator}`);
+                    });
+
+                    reader.on('message', message => {
+                        writer.appendMessage(message);
+                    });
+
+                    reader.read();
                 });
 
-                reader.on('done', () => {
-                    return callback(null);
+                writer.on('finished', () => {
+                    console.log('done');
                 });
 
-                reader.on('archive type', archiveType => {
-                    console.info(`-> Archive type: ${archiveType}`);
-                });
+                writer.init();
 
-                reader.on('creator', creator => {
-                    console.info(`-> Creator: ${creator}`);
-                });
+                ////
 
-                reader.on('message', message => {
-                    console.info('--- message ---');
-                    console.info(`To        : ${message.toUserName}`);
-                    console.info(`From      : ${message.fromUserName}`);
-                    console.info(`Subject   : ${message.subject}`);
-                    console.info(`Message   :\r\n${message.message}`);
-                });
+                // const { QWKPacketReader } = require('../qwk_mail_packet');
+                // const reader = new QWKPacketReader(packetPath);
 
-                reader.read();
+                // reader.on('error', err => {
+                //     console.error(`ERROR: ${err.message}`);
+                //     return callback(err);
+                // });
+
+                // reader.on('done', () => {
+                //     return callback(null);
+                // });
+
+                // reader.on('archive type', archiveType => {
+                //     console.info(`-> Archive type: ${archiveType}`);
+                // });
+
+                // reader.on('creator', creator => {
+                //     console.info(`-> Creator: ${creator}`);
+                // });
+
+                // reader.on('message', message => {
+                //     console.info('--- message ---');
+                //     console.info(`To        : ${message.toUserName}`);
+                //     console.info(`From      : ${message.fromUserName}`);
+                //     console.info(`Subject   : ${message.subject}`);
+                //     console.info(`Message   :\r\n${message.message}`);
+                // });
+
+                // reader.read();
             }
         ],
         err => {
@@ -494,6 +543,120 @@ function dumpQWKPacket(packetPath) {
     )
 }
 
+function exportQWKPacket(packetPath) {
+    //  oputil mb qwk export SPEC PATH [--user USER]
+    //  [areaTag1[@dateTime]],[...] PATH --user USER
+
+    const posArgLen = argv._.length;
+
+    if (posArgLen < 4) {
+        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    }
+
+    let areaTagSpecs = '*';
+    if (5 === posArgLen) {
+        areaTagSpecs = argv._[areaTagSpecs - 2];
+    }
+
+
+    //const areaTagSpecs = argv._[areaTagSpecs - 2];
+
+    /*const packetPath = argv._[argv._.length - 1];
+    if(argv._.length < 4 || !packetPath || 0 === packetPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    }*/
+
+    //  :TODO: parse area tags(s) and timestamps
+    const areaTags = [ 'general', 'fsx_gen' ];
+
+    const userName = argv.user || '-';
+
+    async.waterfall(
+        [
+            (callback) => {
+                return initConfigAndDatabases(callback);
+            },
+            (callback) => {
+                const User = require('../../core/user.js');
+
+                User.getUserIdAndName(userName, (err, userId) => {
+                    if (err) {
+                        if ('-' === userName) {
+                            userId = 1;
+                        } else {
+                            return callback(err);
+                        }
+                    }
+                    return User.getUser(userId, callback);
+                });
+            },
+            (user, callback) => {
+                const Message = require('../message');
+
+                const filter = {
+                    resultType  : 'id',
+                    areaTag     : areaTags,
+
+                    //  :TODO: newerThanTimestamp
+                };
+
+                //  public
+                Message.findMessages(filter, (err, publicMessageIds) => {
+                    if (err) {
+                        return callback(err);
+                    }
+
+                    delete filter.areaTag;
+                    filter.privateTagUserId = user.userId;
+
+                    Message.findMessages(filter, (err, privateMessageIds) => {
+                        return callback(err, user, Message, privateMessageIds.concat(publicMessageIds));
+                    });
+                });
+            },
+            (user, Message, messageIds, callback) => {
+                const { QWKPacketWriter } = require('../qwk_mail_packet');
+                const writer = new QWKPacketWriter({
+                    //  :TODO: export needs these options
+                    bbsID : 'XIBALBA',
+                    toUser : 'NuSkooler',
+                    encoding : 'cp437',
+                    user        : user,
+                });
+
+                writer.on('ready', () => {
+                    async.eachSeries(messageIds, (messageId, nextMessageId) => {
+                        const message = new Message();
+                        message.load( { messageId }, err => {
+                            if (!err) {
+                                writer.appendMessage(message);
+                            }
+                            return nextMessageId(err);
+                        });
+                    },
+                    (err) => {
+                        writer.finish('/home/nuskooler/Downloads/qwk2/TEST1.QWK');
+                        if (err) {
+                            console.error(`Failed to write one or more messages: ${err.message}`);
+                        }
+                    });
+                });
+
+                writer.on('finished', () => {
+                    return callback(null);
+                });
+
+                writer.init();
+            }
+        ],
+        err => {
+            if(err) {
+                console.error(err.reason ? err.reason : err.message);
+            }
+        }
+    );
+}
+
 function handleMessageBaseCommand() {
 
     function errUsage() {
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index e5c316b1..761b71f7 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -9,6 +9,8 @@ const {
 const StatLog = require('./stat_log');
 const Config = require('./config').get;
 const SysProps = require('./system_property');
+const UserProps = require('./user_property');
+const { numToMbf32 } = require('./mbf');
 
 const { EventEmitter } = require('events');
 const temptmp = require('temptmp');
@@ -83,8 +85,8 @@ const QWKLF                     = 0xe3;
 const QWKMessageStatusCodes = {
     UnreadPublic                : ' ',
     ReadPublic                  : '-',
-    ReadBySomeonePrivate        : '*',
     UnreadPrivate               : '+',
+    ReadPrivate                 : '*',
     UnreadCommentToSysOp        : '~',
     ReadCommentToSysOp          : '`',
     UnreadSenderPWProtected     : '%',
@@ -100,6 +102,11 @@ const QWKMessageActiveStatus = {
     Deleted : 226,
 };
 
+const QWKNetworkTagIndicator = {
+    Present     : '*',
+    NotPresent  : ' ',
+};
+
 //  See the following:
 //  -   http://fileformats.archiveteam.org/wiki/QWK
 //  -   http://wiki.synchro.net/ref:qwk
@@ -878,6 +885,9 @@ class QWKPacketWriter extends EventEmitter {
 
                     this.totalMessages = 0;
                     this.areaTagsSeen = new Set();
+                    this.personalIndex = [];    //  messages addressed to 'user'
+                    this.inboxIndex = [];       //  private messages for 'user'
+                    this.publicIndex = new Map();
 
                     return callback(null);
                 },
@@ -938,9 +948,6 @@ class QWKPacketWriter extends EventEmitter {
             }
         }
 
-        //  The actual message contents
-        //fullMessageBody += message.message;
-
         //  Sanitize line feeds (e.g. CRLF -> LF, and possibly -> QWK style below)
         splitTextAtTerms(message.message).forEach(line => {
             fullMessageBody += `${line}\n`;
@@ -961,11 +968,12 @@ class QWKPacketWriter extends EventEmitter {
         //  block padded by spaces or nulls (we use nulls)
         const fullBlocks    = Math.trunc(encodedMessage.length / QWKMessageBlockSize);
         const remainBytes   = QWKMessageBlockSize - (encodedMessage.length % QWKMessageBlockSize);
+        const totalBlocks   = fullBlocks + 1 + (remainBytes ? 1 : 0);
 
         //  The first block is always a header
         if (!this._writeMessageHeader(
             message,
-            fullBlocks + 1 + (remainBytes ? 1 : 0),
+            totalBlocks
         ))
         {
             //  we can't write this message
@@ -974,26 +982,61 @@ class QWKPacketWriter extends EventEmitter {
 
         this.messagesStream.write(encodedMessage);
 
-
         if (remainBytes) {
             this.messagesStream.write(Buffer.alloc(remainBytes, ' '));
         }
 
+        this._updateIndexTracking(message);
+
         if (this.options.enableHeadersExtension) {
             this._appendHeadersExtensionData(message);
         }
 
-        this.currentMessageOffset += fullBlocks * QWKMessageBlockSize;
-
-        if (remainBytes)
-        {
-            this.currentMessageOffset += QWKMessageBlockSize;
-        }
+        //  next message starts at this block
+        this.currentMessageOffset += totalBlocks * QWKMessageBlockSize;
 
         this.totalMessages += 1;
         this.areaTagsSeen.add(message.areaTag);
     }
 
+    _messageAddressedToUser(message) {
+        if (_.isUndefined(this.cachedCompareNames)) {
+            if (this.options.user) {
+                this.cachedCompareNames = [
+                    this.options.user.username.toLowerCase()
+                ];
+                const realName = this.options.user.getProperty(UserProps.RealName);
+                if (realName) {
+                    this.cachedCompareNames.push(realName.toLowerCase());
+                }
+            } else {
+                this.cachedCompareNames = [];
+            }
+        };
+
+        return this.cachedCompareNames.includes(message.toUserName.toLowerCase());
+    }
+
+    _updateIndexTracking(message) {
+        //  index points at start of *message* not the header for... reasons?
+        const index = (this.currentMessageOffset / QWKMessageBlockSize) + 1;
+        if (message.isPrivate()) {
+            this.inboxIndex.push(index);
+        } else {
+            if (this._messageAddressedToUser(message)) {
+                //  :TODO: add to both indexes???
+                this.personalIndex.push(index);
+            }
+
+            const areaTag = message.areaTag;
+            if (!this.publicIndex.has(areaTag)) {
+                this.publicIndex.set(areaTag, [index]);
+            } else {
+                this.publicIndex.get(areaTag).push(index);
+            }
+        }
+    }
+
     appendNewFile() {
 
     }
@@ -1019,6 +1062,9 @@ class QWKPacketWriter extends EventEmitter {
                 (callback) => {
                     return this._createControlData(callback);
                 },
+                (callback) => {
+                    return this._createIndexes(callback);
+                },
                 (callback) => {
                     return this._producePacketArchive(packetPath, callback);
                 }
@@ -1038,22 +1084,21 @@ class QWKPacketWriter extends EventEmitter {
     _producePacketArchive(packetPath, cb) {
         const archiveUtil = ArchiveUtil.getInstance();
 
-        const packetFiles = [
-            'messages.dat', 'headers.dat', 'control.dat',
-        ].map(filename => {
-            return filename;
-            //return paths.join(this.workDir, filename);
-        });
-
-        archiveUtil.compressTo(
-            this.options.archiveFormat,
-            packetPath,
-            packetFiles,
-            this.workDir,
-            err => {
+        fs.readdir(this.workDir, (err, files) => {
+            if (err) {
                 return cb(err);
             }
-        );
+
+            archiveUtil.compressTo(
+                this.options.archiveFormat,
+                packetPath,
+                files,
+                this.workDir,
+                err => {
+                    return cb(err);
+                }
+            );
+        });
     }
 
     _qwkMessageStatus(message) {
@@ -1090,15 +1135,9 @@ class QWKPacketWriter extends EventEmitter {
             return false;
         }
 
-        const netTag = ' '; //  :TODO:
-
-        this.lolMessageId = this.lolMessageId || 1;
-        //message.messageId = this.lolMessageId;
-        this.lolMessageId++;
-
         const header = Buffer.alloc(QWKMessageBlockSize, ' ');
         header.write(this._qwkMessageStatus(message), 0, 1, 'ascii');
-        header.write(asciiNum(message.messageId), 1, 'ascii');  //  :TODO: It seems Sync puts the relative, as in # of messages we've called appendMessage()?!
+        header.write(asciiNum(message.messageId), 1, 'ascii');
         header.write(message.modTimestamp.format(QWKHeaderTimestampFormat), 8, 13, 'ascii');
         header.write(message.toUserName.substr(0, 25), 21, 'ascii');
         header.write(message.fromUserName.substr(0, 25), 46, 'ascii');
@@ -1108,8 +1147,8 @@ class QWKPacketWriter extends EventEmitter {
         header.write(asciiTotalBlocks, 116, 'ascii');
         header.writeUInt8(QWKMessageActiveStatus.Active, 122);
         header.writeUInt16LE(conferenceNumber, 123);
-        header.writeUInt16LE(0, 125);   //  :TODO: Check if others actually populate this
-        header.write(netTag[0], 127, 1, 'ascii');
+        header.writeUInt16LE(this.totalMessages + 1, 125);
+        header.write(QWKNetworkTagIndicator.NotPresent, 127, 1, 'ascii');   //  :TODO: Present if for network output?
 
         this.messagesStream.write(header);
 
@@ -1117,6 +1156,9 @@ class QWKPacketWriter extends EventEmitter {
     }
 
     _getMessageConferenceNumberByAreaTag(areaTag) {
+        if (Message.isPrivateAreaTag(areaTag)) {
+            return 0;
+        }
         const areaConfig = _.get(Config(), [ 'messageNetworks', 'qwk', 'areas', areaTag ]);
         return areaConfig && areaConfig.conference;
     }
@@ -1131,6 +1173,13 @@ class QWKPacketWriter extends EventEmitter {
 
     _createControlData(cb) {
         const areas = Array.from(this.areaTagsSeen).map(areaTag => {
+            if (Message.isPrivateAreaTag(areaTag)) {
+                return {
+                    areaTag : Message.WellKnownAreaTags.Private,
+                    name    : 'Private',
+                    desc    : 'Private Messages',
+                };
+            }
             return getMessageAreaByTag(areaTag);
         });
 
@@ -1168,8 +1217,12 @@ class QWKPacketWriter extends EventEmitter {
         //  map areas as conf #\r\nDescription\r\n pairs
         areas.forEach(area => {
             const conferenceNumber = this._getMessageConferenceNumberByAreaTag(area.areaTag);
+            let desc = area.name;
+            if (area.desc) {
+                desc += ` - ${area.desc}`
+            }
             controlStream.write(`${conferenceNumber}\r\n`);
-            controlStream.write(`${area.name}\r\n`);
+            controlStream.write(`${desc}\r\n`);
         });
 
         //  :TODO: do we ever care here?!
@@ -1180,6 +1233,73 @@ class QWKPacketWriter extends EventEmitter {
         controlStream.end();
     }
 
+    _createIndexes(cb) {
+        const appendIndexData = (stream, offset) => {
+            const msb = numToMbf32(offset);
+            stream.write(msb);
+
+            //  technically, the conference #, but only as a byte, so pretty much useless
+            //  AND the filename itself is the conference number... dafuq.
+            stream.write(Buffer.from([0x00]));
+        };
+
+        async.series(
+            [
+                (callback) => {
+                    //  Create PERSONAL.NDX
+                    if (!this.personalIndex.length) {
+                        return callback(null);
+                    }
+
+                    const indexStream = fs.createWriteStream(paths.join(this.workDir, 'personal.ndx'));
+                    this.personalIndex.forEach(offset => appendIndexData(indexStream, offset));
+
+                    indexStream.on('close', err => {
+                        return callback(err);
+                    });
+
+                    indexStream.end();
+                },
+                (callback) => {
+                    //  000.NDX of private mails
+                    if (!this.inboxIndex.length) {
+                        return callback(null);
+                    }
+
+                    const indexStream = fs.createWriteStream(paths.join(this.workDir, '000.ndx'));
+                    this.inboxIndex.forEach(offset => appendIndexData(indexStream, offset));
+
+                    indexStream.on('close', err => {
+                        return callback(err);
+                    });
+
+                    indexStream.end();
+                },
+                (callback) => {
+                    //  ####.NDX
+                    async.eachSeries(this.publicIndex.keys(), (areaTag, nextArea) => {
+                        const offsets = this.publicIndex.get(areaTag);
+                        const conferenceNumber = this._getMessageConferenceNumberByAreaTag(areaTag);
+                        const indexStream = fs.createWriteStream(paths.join(this.workDir, `${conferenceNumber.toString()}.ndx`));
+                        offsets.forEach(offset => appendIndexData(indexStream, offset));
+
+                        indexStream.on('close', err => {
+                            return nextArea(err);
+                        });
+
+                        indexStream.end();
+                    },
+                    err => {
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                return cb(err);
+            }
+        );
+    }
+
     _makeSynchronetTimestamp(ts) {
         const syncTimestamp = ts.format('YYYYMMDDHHmmssZZ');
         const syncTZ        = UTCOffsetToSMBTZ[ts.format('Z')] || '0000';   //  :TODO: what if we don't have a map?
@@ -1215,7 +1335,7 @@ class QWKPacketWriter extends EventEmitter {
             Tags            : message.hashTags.join(' '),
 
             //  :TODO: Needs tested with Sync/etc.; Sync wants Conference *numbers*
-            Conference      : getMessageConfTagByAreaTag(message.areaTag),
+            Conference      : message.isPrivate() ? '0' : getMessageConfTagByAreaTag(message.areaTag),
 
             //  ENiGMA Headers
             MessageUUID     : message.uuid,

From 8817113364322f5a96f6f42c756b7fa4d14a36aa Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 May 2020 13:34:28 -0600
Subject: [PATCH 0935/1013] * Create bundle filenames to spec * Better cp437 vs
 utf8 vs other encoding support * Add some CP437 and related utils

---
 core/cp437util.js                  |  55 +++++++++++++
 core/message.js                    |  17 ++++
 core/oputil/oputil_message_base.js |   8 +-
 core/qwk_mail_packet.js            | 121 ++++++++++++++++++++++++-----
 core/string_util.js                |  15 ++++
 5 files changed, 191 insertions(+), 25 deletions(-)
 create mode 100644 core/cp437util.js

diff --git a/core/cp437util.js b/core/cp437util.js
new file mode 100644
index 00000000..32425d3a
--- /dev/null
+++ b/core/cp437util.js
@@ -0,0 +1,55 @@
+
+
+const CP437UnicodeTable = [
+    '\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', '\u0006',
+	'\u0007', '\u0008', '\u0009', '\u000A', '\u000B', '\u000C', '\u000D',
+	'\u000E', '\u000F', '\u0010', '\u0011', '\u0012', '\u0013', '\u0014',
+	'\u0015', '\u0016', '\u0017', '\u0018', '\u0019', '\u001A', '\u001B',
+	'\u001C', '\u001D', '\u001E', '\u001F', '\u0020', '\u0021', '\u0022',
+	'\u0023', '\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029',
+	'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', '\u0030',
+	'\u0031', '\u0032', '\u0033', '\u0034', '\u0035', '\u0036', '\u0037',
+	'\u0038', '\u0039', '\u003A', '\u003B', '\u003C', '\u003D', '\u003E',
+	'\u003F', '\u0040', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045',
+	'\u0046', '\u0047', '\u0048', '\u0049', '\u004A', '\u004B', '\u004C',
+	'\u004D', '\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053',
+	'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A',
+	'\u005B', '\u005C', '\u005D', '\u005E', '\u005F', '\u0060', '\u0061',
+	'\u0062', '\u0063', '\u0064', '\u0065', '\u0066', '\u0067', '\u0068',
+	'\u0069', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', '\u006F',
+	'\u0070', '\u0071', '\u0072', '\u0073', '\u0074', '\u0075', '\u0076',
+	'\u0077', '\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D',
+	'\u007E', '\u007F', '\u00C7', '\u00FC', '\u00E9', '\u00E2', '\u00E4',
+	'\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', '\u00E8', '\u00EF',
+	'\u00EE', '\u00EC', '\u00C4', '\u00C5', '\u00C9', '\u00E6', '\u00C6',
+	'\u00F4', '\u00F6', '\u00F2', '\u00FB', '\u00F9', '\u00FF', '\u00D6',
+	'\u00DC', '\u00A2', '\u00A3', '\u00A5', '\u20A7', '\u0192', '\u00E1',
+	'\u00ED', '\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA',
+	'\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00A1', '\u00AB',
+	'\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', '\u2524', '\u2561',
+	'\u2562', '\u2556', '\u2555', '\u2563', '\u2551', '\u2557', '\u255D',
+	'\u255C', '\u255B', '\u2510', '\u2514', '\u2534', '\u252C', '\u251C',
+	'\u2500', '\u253C', '\u255E', '\u255F', '\u255A', '\u2554', '\u2569',
+	'\u2566', '\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564',
+	'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', '\u256A',
+	'\u2518', '\u250C', '\u2588', '\u2584', '\u258C', '\u2590', '\u2580',
+	'\u03B1', '\u00DF', '\u0393', '\u03C0', '\u03A3', '\u03C3', '\u00B5',
+	'\u03C4', '\u03A6', '\u0398', '\u03A9', '\u03B4', '\u221E', '\u03C6',
+	'\u03B5', '\u2229', '\u2261', '\u00B1', '\u2265', '\u2264', '\u2320',
+	'\u2321', '\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A',
+	'\u207F', '\u00B2', '\u25A0', '\u00A0'
+];
+
+const NonCP437EncodableRegExp = /[^\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\u0020\u0021\u0022\u0023\u0024\u0025\u0026\u0027\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057\u0058\u0059\u005A\u005B\u005C\u005D\u005E\u005F\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00A2\u00A3\u00A5\u20A7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u2310\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u00DF\u0393\u03C0\u03A3\u03C3\u00B5\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u03C6\u03B5\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u00A0]/;
+const isCP437Encodable = (s) => {
+    if (!s.length) {
+        return true;
+    }
+
+    return !NonCP437EncodableRegExp.test(s);
+}
+
+module.exports = {
+    CP437UnicodeTable,
+    isCP437Encodable,
+}
\ No newline at end of file
diff --git a/core/message.js b/core/message.js
index 3649a6f6..c763bbd2 100644
--- a/core/message.js
+++ b/core/message.js
@@ -11,6 +11,9 @@ const {
     sanitizeString,
     getISOTimestampString } = require('./database.js');
 
+const { isCP437Encodable } = require('./cp437util');
+const { containsNonLatinCodepoints } = require('./string_util');
+
 const {
     isAnsi, isFormattedLine,
     splitTextAtTerms,
@@ -145,6 +148,20 @@ module.exports = class Message {
         return null !== _.get(this, 'meta.System.remote_from_user', null);
     }
 
+    isCP437Encodable() {
+        return isCP437Encodable(this.toUserName) &&
+            isCP437Encodable(this.fromUserName) &&
+            isCP437Encodable(this.subject) &&
+            isCP437Encodable(this.message);
+    }
+
+    containsNonLatinCodepoints() {
+        return containsNonLatinCodepoints(this.toUserName) ||
+            containsNonLatinCodepoints(this.fromUserName) ||
+            containsNonLatinCodepoints(this.subject) ||
+            containsNonLatinCodepoints(this.message);
+    }
+
     /*
     :TODO: finish me
     static checkUserHasDeleteRights(user, messageIdOrUuid, cb) {
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 7d914ab2..6f677c52 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -464,8 +464,6 @@ function dumpQWKPacket(packetPath) {
                 const { QWKPacketWriter } = require('../qwk_mail_packet');
                 const writer = new QWKPacketWriter({
                     bbsID : 'XIBALBA',
-                    toUser : 'NuSkooler',
-                    encoding : 'cp437',
                 });
 
                 const { QWKPacketReader } = require('../qwk_mail_packet');
@@ -547,6 +545,8 @@ function exportQWKPacket(packetPath) {
     //  oputil mb qwk export SPEC PATH [--user USER]
     //  [areaTag1[@dateTime]],[...] PATH --user USER
 
+    //  :TODO: bbsID from PATH filename else 'ENIGMA'
+
     const posArgLen = argv._.length;
 
     if (posArgLen < 4) {
@@ -619,8 +619,6 @@ function exportQWKPacket(packetPath) {
                 const writer = new QWKPacketWriter({
                     //  :TODO: export needs these options
                     bbsID : 'XIBALBA',
-                    toUser : 'NuSkooler',
-                    encoding : 'cp437',
                     user        : user,
                 });
 
@@ -635,7 +633,7 @@ function exportQWKPacket(packetPath) {
                         });
                     },
                     (err) => {
-                        writer.finish('/home/nuskooler/Downloads/qwk2/TEST1.QWK');
+                        writer.finish('/home/nuskooler/Downloads/qwk2/');
                         if (err) {
                             console.error(`Failed to write one or more messages: ${err.message}`);
                         }
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 761b71f7..b7f53ebc 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -11,6 +11,7 @@ const Config = require('./config').get;
 const SysProps = require('./system_property');
 const UserProps = require('./user_property');
 const { numToMbf32 } = require('./mbf');
+const { getEncodingFromCharacterSetIdentifier } = require('./ftn_util');
 
 const { EventEmitter } = require('events');
 const temptmp = require('temptmp');
@@ -823,11 +824,11 @@ class QWKPacketWriter extends EventEmitter {
             enableQWKE = true,
             enableHeadersExtension = true,
             enableAtKludges = true,
-            encoding = 'cp437',
             systemDomain = 'enigma-bbs',
             bbsID = '',
             user = null,
             archiveFormat = 'application/zip',
+            forceEncoding = null,
         } = QWKPacketWriter.DefaultOptions)
     {
         super();
@@ -840,7 +841,7 @@ class QWKPacketWriter extends EventEmitter {
             bbsID,
             user,
             archiveFormat,
-            encoding : encoding.toLowerCase(),
+            forceEncoding : forceEncoding ? forceEncoding.toLowerCase() : null,
         };
 
         this.temptmp = temptmp.createTrackedSession('qwkpacketwriter');
@@ -851,11 +852,11 @@ class QWKPacketWriter extends EventEmitter {
             enableQWKE              : true,
             enableHeadersExtension  : true,
             enableAtKludges         : true,
-            encoding                : 'cp437',
             systemDomain            : 'enigma-bbs',
             bbsID                   : '',
             user                    : null,
             archiveFormat           :'application/zip',
+            forceEncoding           : null,
         };
     }
 
@@ -945,6 +946,8 @@ class QWKPacketWriter extends EventEmitter {
                 }
             } else {
                 fullMessageBody += `@MSGID: ${this.makeMessageIdentifier(message)}\n`;
+                fullMessageBody += `@TZ: ${UTCOffsetToSMBTZ[moment().format('Z')]}\n`;
+                //  :TODO: REPLY and REPLYTO
             }
         }
 
@@ -953,14 +956,16 @@ class QWKPacketWriter extends EventEmitter {
             fullMessageBody += `${line}\n`;
         });
 
-        const encodedMessage = iconv.encode(fullMessageBody, this.options.encoding);
+        const encoding = this._getEncoding(message);
+
+        const encodedMessage = iconv.encode(fullMessageBody, encoding);
 
         //
         //  QWK spec wants line feeds as 0xe3 for some reason, so we'll have
         //  to replace the \n's. If we're going against the spec and using UTF-8
         //  we can just leave them be.
         //
-        if ('utf8' !== this.options.encoding) {
+        if ('utf8' !== encoding) {
             replaceCharInBuffer(encodedMessage, 0x0a, QWKLF);
         }
 
@@ -989,7 +994,7 @@ class QWKPacketWriter extends EventEmitter {
         this._updateIndexTracking(message);
 
         if (this.options.enableHeadersExtension) {
-            this._appendHeadersExtensionData(message);
+            this._appendHeadersExtensionData(message, encoding);
         }
 
         //  next message starts at this block
@@ -999,6 +1004,38 @@ class QWKPacketWriter extends EventEmitter {
         this.areaTagsSeen.add(message.areaTag);
     }
 
+    _getEncoding(message) {
+        if (this.options.forceEncoding) {
+            return this.options.forceEncoding;
+        }
+
+        //  If the system has stored an explicit encoding, use that.
+        let encoding = _.get(message.meta, 'System.explicit_encoding');
+        if (encoding) {
+            return encoding;
+        }
+
+        //  If the message is already tagged with a supported encoding
+        //  indicator such as FTN-style CHRS, try to use that.
+        encoding = _.get(message.meta, 'FtnKludge.CHRS');
+        if (encoding) {
+            //  convert from CHRS to something standard
+            encoding = getEncodingFromCharacterSetIdentifier(encoding);
+            if (encoding) {
+                return encoding;
+            }
+        }
+
+        //  The to-spec default is CP437/ASCII. If it can be encoded as
+        //  such then do so.
+        if (message.isCP437Encodable()) {
+            return 'cp437';
+        }
+
+        //  Something more modern...
+        return 'utf8';
+    }
+
     _messageAddressedToUser(message) {
         if (_.isUndefined(this.cachedCompareNames)) {
             if (this.options.user) {
@@ -1041,7 +1078,7 @@ class QWKPacketWriter extends EventEmitter {
 
     }
 
-    finish(packetPath) {
+    finish(packetDirectory) {
         async.series(
             [
                 (callback) => {
@@ -1066,7 +1103,7 @@ class QWKPacketWriter extends EventEmitter {
                     return this._createIndexes(callback);
                 },
                 (callback) => {
-                    return this._producePacketArchive(packetPath, callback);
+                    return this._producePacketArchive(packetDirectory, callback);
                 }
             ],
             err => {
@@ -1081,7 +1118,44 @@ class QWKPacketWriter extends EventEmitter {
         )
     }
 
-    _producePacketArchive(packetPath, cb) {
+    _getNextAvailPacketFileName(packetDirectory, cb) {
+        //
+        //  According to http://wiki.synchro.net/ref:qwk filenames should
+        //  start with .QWK -> .QW1 ... .QW9 -> .Q10 ... .Q99
+        //
+        let digits = 0;
+        async.doWhilst( callback => {
+            let ext;
+            if (0 === digits) {
+                ext = 'QWK';
+            } else if (digits < 10) {
+                ext = `QW${digits}`;
+            } else if (digits < 100) {
+                ext = `Q${digits}`;
+            } else {
+                return callback(Errors.UnexpectedState(`Unable to choose a valid QWK output filename`));
+            }
+
+            ++digits;
+
+            const filename = `${this.options.bbsID}.${ext}`;
+            fs.stat(paths.join(packetDirectory, filename), (err, stats) => {
+                if (err && 'ENOENT' === err.code) {
+                    return callback(null, filename);
+                } else {
+                    return callback(null, null);
+                }
+            });
+        },
+        (filename, callback) => {
+            return callback(null, filename ? false : true);
+        },
+        (err, filename) => {
+            return cb(err, filename);
+        });
+    }
+
+    _producePacketArchive(packetDirectory, cb) {
         const archiveUtil = ArchiveUtil.getInstance();
 
         fs.readdir(this.workDir, (err, files) => {
@@ -1089,15 +1163,22 @@ class QWKPacketWriter extends EventEmitter {
                 return cb(err);
             }
 
-            archiveUtil.compressTo(
-                this.options.archiveFormat,
-                packetPath,
-                files,
-                this.workDir,
-                err => {
+            this._getNextAvailPacketFileName(packetDirectory, (err, filename) => {
+                if (err) {
                     return cb(err);
                 }
-            );
+
+                const packetPath = paths.join(packetDirectory, filename);
+                archiveUtil.compressTo(
+                    this.options.archiveFormat,
+                    packetPath,
+                    files,
+                    this.workDir,
+                    err => {
+                        return cb(err);
+                    }
+                );
+            });
         });
     }
 
@@ -1306,10 +1387,10 @@ class QWKPacketWriter extends EventEmitter {
         return `${syncTimestamp} ${syncTZ}`;
     }
 
-    _appendHeadersExtensionData(message) {
+    _appendHeadersExtensionData(message, encoding) {
         const messageData = {
             //  Synchronet style
-            Utf8            : ('utf8' === this.options.encoding ? 'true' : 'false'),
+            Utf8            : ('utf8' === encoding ? 'true' : 'false'),
             'Message-ID'    : this.makeMessageIdentifier(message),
 
             WhenWritten     : this._makeSynchronetTimestamp(message.modTimestamp),
@@ -1367,11 +1448,11 @@ class QWKPacketWriter extends EventEmitter {
             messageData.Editor          = `ENiGMA 1/2 BBS FSE v${enigmaVersion}`;
         }
 
-        this.headersDatStream.write(iconv.encode(`[${this.currentMessageOffset.toString(16)}]\r\n`, this.options.encoding));
+        this.headersDatStream.write(iconv.encode(`[${this.currentMessageOffset.toString(16)}]\r\n`, encoding));
 
         for (let [name, value] of Object.entries(messageData)) {
             if (value) {
-                this.headersDatStream.write(iconv.encode(`${name}: ${value}\r\n`, this.options.encoding));
+                this.headersDatStream.write(iconv.encode(`${name}: ${value}\r\n`, encoding));
             }
         }
 
diff --git a/core/string_util.js b/core/string_util.js
index fa9a9097..cde7ac3e 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -13,6 +13,7 @@ exports.pad                         = pad;
 exports.insert                      = insert;
 exports.replaceAt                   = replaceAt;
 exports.isPrintable                 = isPrintable;
+exports.containsNonLatinCodepoints  = containsNonLatinCodepoints;
 exports.stripAllLineFeeds           = stripAllLineFeeds;
 exports.debugEscapedString          = debugEscapedString;
 exports.stringFromNullTermBuffer    = stringFromNullTermBuffer;
@@ -196,6 +197,20 @@ function isPrintable(s) {
     return !RE_NON_PRINTABLE.test(s);
 }
 
+const NonLatinCodePointsRegExp = /[^\u0000-\u00ff]/;
+
+function containsNonLatinCodepoints(s) {
+    if (!s.length) {
+		return false;
+	}
+
+	if (s.charCodeAt(0) > 255) {
+		return true;
+	}
+
+    return NonLatinCodepointsRegEx.test(s);
+}
+
 function stripAllLineFeeds(s) {
     return s.replace(/\r?\n|[\r\u2028\u2029]/g, '');
 }

From c7a543e87eeedadfbb82934d08085b91c7a3f096 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 2 May 2020 16:48:24 -0600
Subject: [PATCH 0936/1013] * oputil mb qwk-export * oputil mb qwk-dump * Fix
 QWK reader encoding

---
 core/oputil/oputil_help.js         |  10 ++
 core/oputil/oputil_message_base.js | 209 +++++++++++++----------------
 core/qwk_mail_packet.js            |   9 +-
 3 files changed, 106 insertions(+), 122 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index abcf61fe..3fd55575 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -170,6 +170,11 @@ Actions:
 
   import-areas PATH           Import areas using FidoNet *.NA or AREAS.BBS file
 
+  qwk-dump PATH               Dumps a QWK packet to stdout.
+  qwk-export [AREA_TAGS] PATH Exports one or more configured message area to a QWK
+                              packet in the directory specified by PATH. The QWK
+                              BBS ID will be obtained by the final component of PATH.
+
 import-areas arguments:
   --conf CONF_TAG             Conference tag in which to import areas
   --network NETWORK           Network name/key to associate FTN areas
@@ -177,6 +182,11 @@ import-areas arguments:
   --type TYPE                 Area import type
 
   Valid types are "bbs" and "na".
+
+qwk-export arguments:
+  --user USER                 User in which to export for. Defaults to the SysOp.
+  --after TIMESTAMP           Export only messages with a timestamp later than
+                              TIMESTAMP.
 `
 };
 
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index 6f677c52..e29a30dc 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -10,17 +10,19 @@ const {
     initConfigAndDatabases,
     getAnswers,
     writeConfig,
-}                               = require('./oputil_common.js');
-const getHelpFor				= require('./oputil_help.js').getHelpFor;
-const Address					= require('../ftn_address.js');
-const Errors					= require('../enig_error.js').Errors;
+} = require('./oputil_common.js');
+
+const getHelpFor	= require('./oputil_help.js').getHelpFor;
+const Address		= require('../ftn_address.js');
+const Errors	    = require('../enig_error.js').Errors;
 
 //	deps
-const async						= require('async');
-const paths                     = require('path');
-const fs                        = require('fs');
-const hjson                     = require('hjson');
-const _                         = require('lodash');
+const async		= require('async');
+const paths     = require('path');
+const fs        = require('fs');
+const hjson     = require('hjson');
+const _         = require('lodash');
+const moment    = require('moment');
 
 exports.handleMessageBaseCommand	= handleMessageBaseCommand;
 
@@ -434,105 +436,47 @@ function getImportEntries(importType, importData) {
     return importEntries;
 }
 
-function handleQWK() {
+function dumpQWKPacket() {
     const packetPath = argv._[argv._.length - 1];
-    if(argv._.length < 4 || !packetPath || 0 === packetPath.length) {
-        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    if(argv._.length < 3 || !packetPath || 0 === packetPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('MessageBase'), ExitCodes.ERROR);
     }
 
-    const subAction = argv._[argv._.length - 2];
-    switch (subAction) {
-        case 'dump' :
-            return dumpQWKPacket(packetPath);
-
-        case 'export' :
-            return exportQWKPacket(packetPath);
-
-        default :
-            return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
-    }
-}
-
-function dumpQWKPacket(packetPath) {
     async.waterfall(
         [
             (callback) => {
                 return initConfigAndDatabases(callback);
             },
             (callback) => {
-                ////
-                const { QWKPacketWriter } = require('../qwk_mail_packet');
-                const writer = new QWKPacketWriter({
-                    bbsID : 'XIBALBA',
-                });
-
                 const { QWKPacketReader } = require('../qwk_mail_packet');
+                const reader = new QWKPacketReader(packetPath);
 
-
-                writer.on('ready', () => {
-                    const reader = new QWKPacketReader(packetPath);
-
-                    reader.on('error', err => {
-                        console.error(`ERROR: ${err.message}`);
-                        return callback(err);
-                    });
-
-                    reader.on('done', () => {
-                        writer.finish();
-                    });
-
-                    reader.on('archive type', archiveType => {
-                        console.info(`-> Archive type: ${archiveType}`);
-                    });
-
-                    reader.on('creator', creator => {
-                        console.info(`-> Creator: ${creator}`);
-                    });
-
-                    reader.on('message', message => {
-                        writer.appendMessage(message);
-                    });
-
-                    reader.read();
+                reader.on('error', err => {
+                    console.error(`ERROR: ${err.message}`);
+                    return callback(err);
                 });
 
-                writer.on('finished', () => {
-                    console.log('done');
+                reader.on('done', () => {
+                    return callback(null);
                 });
 
-                writer.init();
+                reader.on('archive type', archiveType => {
+                    console.info(`-> Archive type: ${archiveType}`);
+                });
 
-                ////
+                reader.on('creator', creator => {
+                    console.info(`-> Creator: ${creator}`);
+                });
 
-                // const { QWKPacketReader } = require('../qwk_mail_packet');
-                // const reader = new QWKPacketReader(packetPath);
+                reader.on('message', message => {
+                    console.info('--- message ---');
+                    console.info(`To:      ${message.toUserName}`);
+                    console.info(`From:    ${message.fromUserName}`);
+                    console.info(`Subject: ${message.subject}`);
+                    console.info(`Message:\r\n${message.message}`);
+                });
 
-                // reader.on('error', err => {
-                //     console.error(`ERROR: ${err.message}`);
-                //     return callback(err);
-                // });
-
-                // reader.on('done', () => {
-                //     return callback(null);
-                // });
-
-                // reader.on('archive type', archiveType => {
-                //     console.info(`-> Archive type: ${archiveType}`);
-                // });
-
-                // reader.on('creator', creator => {
-                //     console.info(`-> Creator: ${creator}`);
-                // });
-
-                // reader.on('message', message => {
-                //     console.info('--- message ---');
-                //     console.info(`To        : ${message.toUserName}`);
-                //     console.info(`From      : ${message.fromUserName}`);
-                //     console.info(`Subject   : ${message.subject}`);
-                //     console.info(`Message   :\r\n${message.message}`);
-                // });
-
-                // reader.read();
+                reader.read();
             }
         ],
         err => {
@@ -541,36 +485,43 @@ function dumpQWKPacket(packetPath) {
     )
 }
 
-function exportQWKPacket(packetPath) {
-    //  oputil mb qwk export SPEC PATH [--user USER]
-    //  [areaTag1[@dateTime]],[...] PATH --user USER
+function exportQWKPacket() {
+    let packetPath = argv._[argv._.length - 1];
+    if(argv._.length < 3 || !packetPath || 0 === packetPath.length) {
+        return printUsageAndSetExitCode(getHelpFor('MessageBase'), ExitCodes.ERROR);
+    }
 
-    //  :TODO: bbsID from PATH filename else 'ENIGMA'
+    //  oputil mb qwk-export TAGS PATH [--user USER] [--after TIMESTAMP]
+    //  [areaTag1,areaTag2,...] PATH --user USER --after TIMESTAMP
+    let bbsID = 'ENIGMA';
+    const filename = paths.basename(packetPath);
+    if (filename) {
+        const ext = paths.extname(filename);
+        bbsID = paths.basename(filename, ext);
+    }
+
+    packetPath = paths.dirname(packetPath);
 
     const posArgLen = argv._.length;
 
-    if (posArgLen < 4) {
-        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
+    let areaTags;
+    if (4 === posArgLen) {
+        areaTags = argv._[posArgLen - 2].split(',');
+    } else {
+        areaTags = [];
     }
 
-    let areaTagSpecs = '*';
-    if (5 === posArgLen) {
-        areaTagSpecs = argv._[areaTagSpecs - 2];
+    let newerThanTimestamp = null;
+    if (argv.after) {
+        const ts = moment(argv.after);
+        if (ts.isValid()) {
+            newerThanTimestamp = ts.format();
+        }
     }
 
-
-    //const areaTagSpecs = argv._[areaTagSpecs - 2];
-
-    /*const packetPath = argv._[argv._.length - 1];
-    if(argv._.length < 4 || !packetPath || 0 === packetPath.length) {
-        return printUsageAndSetExitCode(getHelpFor('QWK'), ExitCodes.ERROR);
-    }*/
-
-    //  :TODO: parse area tags(s) and timestamps
-    const areaTags = [ 'general', 'fsx_gen' ];
-
     const userName = argv.user || '-';
 
+    let totalExported = 0;
     async.waterfall(
         [
             (callback) => {
@@ -590,14 +541,29 @@ function exportQWKPacket(packetPath) {
                     return User.getUser(userId, callback);
                 });
             },
+            (user, callback) => {
+                //  populate area tags with all available to user
+                //  if they were not explicitly supplied
+                if (!areaTags.length) {
+                    const {
+                        getAvailableMessageConferences,
+                        getAvailableMessageAreasByConfTag
+                    } = require('../../core/message_area');
+
+                    const confTags = Object.keys(getAvailableMessageConferences(null, { noClient : true }));
+                    confTags.forEach( confTag => {
+                        areaTags = areaTags.concat(Object.keys(getAvailableMessageAreasByConfTag(confTag)));
+                    });
+                }
+                return callback(null, user);
+            },
             (user, callback) => {
                 const Message = require('../message');
 
                 const filter = {
                     resultType  : 'id',
                     areaTag     : areaTags,
-
-                    //  :TODO: newerThanTimestamp
+                    newerThanTimestamp,
                 };
 
                 //  public
@@ -617,9 +583,8 @@ function exportQWKPacket(packetPath) {
             (user, Message, messageIds, callback) => {
                 const { QWKPacketWriter } = require('../qwk_mail_packet');
                 const writer = new QWKPacketWriter({
-                    //  :TODO: export needs these options
-                    bbsID : 'XIBALBA',
-                    user        : user,
+                    bbsID,
+                    user,
                 });
 
                 writer.on('ready', () => {
@@ -628,18 +593,23 @@ function exportQWKPacket(packetPath) {
                         message.load( { messageId }, err => {
                             if (!err) {
                                 writer.appendMessage(message);
+                                ++totalExported;
                             }
                             return nextMessageId(err);
                         });
                     },
                     (err) => {
-                        writer.finish('/home/nuskooler/Downloads/qwk2/');
+                        writer.finish(packetPath);
                         if (err) {
                             console.error(`Failed to write one or more messages: ${err.message}`);
                         }
                     });
                 });
 
+                writer.on('warning', err => {
+                    console.warn(`!!! ${err.reason ? err.reason : err.message}`);
+                });
+
                 writer.on('finished', () => {
                     return callback(null);
                 });
@@ -649,8 +619,10 @@ function exportQWKPacket(packetPath) {
         ],
         err => {
             if(err) {
-                console.error(err.reason ? err.reason : err.message);
+                return console.error(err.reason ? err.reason : err.message);
             }
+
+            console.info(`-> Exported ${totalExported} messages`);
         }
     );
 }
@@ -673,6 +645,7 @@ function handleMessageBaseCommand() {
     return({
         areafix	        : areaFix,
         'import-areas'  : importAreas,
-        qwk             : handleQWK,
+        'qwk-dump'      : dumpQWKPacket,
+        'qwk-export'    : exportQWKPacket,
     }[action] || errUsage)();
 }
\ No newline at end of file
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index b7f53ebc..5aa5deac 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -493,7 +493,7 @@ class QWKPacketReader extends EventEmitter {
         }
 
         const encodingToSpec = 'cp437';
-        let encoding = encodingToSpec;
+        let encoding;
 
         const path = paths.join(this.packetInfo.tempDir, this.packetInfo.messages.filename);
         fs.open(path, 'r', (err, fd) => {
@@ -575,6 +575,7 @@ class QWKPacketReader extends EventEmitter {
                         switch (state) {
                             case 'header' :
                                 const header = MessageHeaderParser.parse(buffer);
+                                encoding = encodingToSpec;  //  reset per message
 
                                 //  massage into something a little more sane (things we can't quite do in the parser directly)
                                 ['toName', 'fromName', 'subject'].forEach(field => {
@@ -601,7 +602,7 @@ class QWKPacketReader extends EventEmitter {
 
                                 //  if we have HEADERS.DAT with a 'Utf8' override for this message,
                                 //  the overridden to/from/subject/message fields are UTF-8
-                                if (currMessage.headersExtension && currMessage.headersExtension.Utf8) {
+                                if (currMessage.headersExtension && 'true' === currMessage.headersExtension.Utf8.toLowerCase()) {
                                     encoding = 'utf8';
                                 }
 
@@ -825,7 +826,7 @@ class QWKPacketWriter extends EventEmitter {
             enableHeadersExtension = true,
             enableAtKludges = true,
             systemDomain = 'enigma-bbs',
-            bbsID = '',
+            bbsID = 'ENIGMA',
             user = null,
             archiveFormat = 'application/zip',
             forceEncoding = null,
@@ -853,7 +854,7 @@ class QWKPacketWriter extends EventEmitter {
             enableHeadersExtension  : true,
             enableAtKludges         : true,
             systemDomain            : 'enigma-bbs',
-            bbsID                   : '',
+            bbsID                   : 'ENIGMA',
             user                    : null,
             archiveFormat           :'application/zip',
             forceEncoding           : null,

From b32dae9b485da22b85905868b1bcbf59a514d37c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 10:42:57 -0600
Subject: [PATCH 0937/1013] Auto-generate conf numbers for user export mode

---
 core/message_area.js               | 15 ++++++++
 core/oputil/oputil_message_base.js |  8 +---
 core/qwk_mail_packet.js            | 59 +++++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/core/message_area.js b/core/message_area.js
index ff01f1e1..30ad14ed 100644
--- a/core/message_area.js
+++ b/core/message_area.js
@@ -24,6 +24,7 @@ exports.getAvailableMessageConferences      = getAvailableMessageConferences;
 exports.getSortedAvailMessageConferences    = getSortedAvailMessageConferences;
 exports.getAvailableMessageAreasByConfTag   = getAvailableMessageAreasByConfTag;
 exports.getSortedAvailMessageAreasByConfTag = getSortedAvailMessageAreasByConfTag;
+exports.getAllAvailableMessageAreaTags      = getAllAvailableMessageAreaTags;
 exports.getDefaultMessageConferenceTag      = getDefaultMessageConferenceTag;
 exports.getDefaultMessageAreaTagByConfTag   = getDefaultMessageAreaTagByConfTag;
 exports.getSuitableMessageConfAndAreaTags   = getSuitableMessageConfAndAreaTags;
@@ -140,6 +141,20 @@ function getSortedAvailMessageAreasByConfTag(confTag, options) {
     return areas;
 }
 
+function getAllAvailableMessageAreaTags(client, options) {
+    const areaTags = [];
+
+    //  mask over older messy APIs for now
+    const confOpts = Object.assign({}, options, { noClient : client ? false : true });
+    const areaOpts = Object.assign({}, options, { client });
+
+    Object.keys(getAvailableMessageConferences(client, confOpts)).forEach(confTag => {
+        areaTags.push(...Object.keys(getAvailableMessageAreasByConfTag(confTag, areaOpts)));
+    });
+
+    return areaTags;
+}
+
 function getDefaultMessageConferenceTag(client, disableAcsCheck) {
     //
     //  Find the first conference marked 'default'. If found,
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index e29a30dc..ea996c6c 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -546,14 +546,10 @@ function exportQWKPacket() {
                 //  if they were not explicitly supplied
                 if (!areaTags.length) {
                     const {
-                        getAvailableMessageConferences,
-                        getAvailableMessageAreasByConfTag
+                        getAllAvailableMessageAreaTags
                     } = require('../../core/message_area');
 
-                    const confTags = Object.keys(getAvailableMessageConferences(null, { noClient : true }));
-                    confTags.forEach( confTag => {
-                        areaTags = areaTags.concat(Object.keys(getAvailableMessageAreasByConfTag(confTag)));
-                    });
+                    areaTags = getAllAvailableMessageAreaTags();
                 }
                 return callback(null, user);
             },
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 5aa5deac..be524422 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -5,6 +5,7 @@ const { splitTextAtTerms } = require('./string_util');
 const {
     getMessageConfTagByAreaTag,
     getMessageAreaByTag,
+    getAllAvailableMessageAreaTags,
 } = require('./message_area');
 const StatLog = require('./stat_log');
 const Config = require('./config').get;
@@ -822,6 +823,7 @@ class QWKPacketReader extends EventEmitter {
 class QWKPacketWriter extends EventEmitter {
     constructor(
         {
+            mode = QWKPacketWriter.Modes.User,
             enableQWKE = true,
             enableHeadersExtension = true,
             enableAtKludges = true,
@@ -835,6 +837,7 @@ class QWKPacketWriter extends EventEmitter {
         super();
 
         this.options = {
+            mode,
             enableQWKE,
             enableHeadersExtension,
             enableAtKludges,
@@ -846,10 +849,13 @@ class QWKPacketWriter extends EventEmitter {
         };
 
         this.temptmp = temptmp.createTrackedSession('qwkpacketwriter');
+
+        this.areaTagConfMap = {};
     }
 
     static get DefaultOptions() {
         return {
+            mode                    : QWKPacketWriter.Modes.User,
             enableQWKE              : true,
             enableHeadersExtension  : true,
             enableAtKludges         : true,
@@ -861,6 +867,13 @@ class QWKPacketWriter extends EventEmitter {
         };
     }
 
+    static get Modes() {
+        return {
+            User    : 'user',       //  creation of a packet for a user (non-network); non-mapped confs allowed
+            Network : 'network',    //  creation of a packet for QWK network
+        };
+    }
+
     init() {
         async.series(
             [
@@ -873,6 +886,48 @@ class QWKPacketWriter extends EventEmitter {
                         return callback(err);
                     });
                 },
+                (callback) => {
+                    //
+                    //  Prepare areaTag -> conference number mapping:
+                    //  - In User mode, areaTags's that are not explicitly configured
+                    //    will have their conference number auto-generated.
+                    //  - In Network mode areaTags's missing a configuration will not
+                    //    be mapped, and thus skipped.
+                    //
+                    const configuredAreas = _.get(Config(), 'messageNetworks.qwk.areas');
+                    if (configuredAreas) {
+                        Object.keys(configuredAreas).forEach(areaTag => {
+                            const confNumber = configuredAreas[areaTag].conference;
+                            if (confNumber) {
+                                this.areaTagConfMap[areaTag] = confNumber;
+                            }
+                        });
+                    }
+
+                    if (this.options.mode === QWKPacketWriter.Modes.User) {
+                        //  All the rest
+                        let confNumber = 1;
+                        const usedConfNumbers = new Set(Object.values(this.areaTagConfMap));
+                        getAllAvailableMessageAreaTags().forEach(areaTag => {
+                            if (this.areaTagConfMap[areaTag]) {
+                                return;
+                            }
+
+                            while (confNumber < 65537 && usedConfNumbers.has(confNumber)) {
+                                ++confNumber;
+                            }
+
+                            if (confNumber === 65536) { //  sanity...
+                                this.emit('warning', Errors.General(`To many conferences`));
+                            } else {
+                                this.areaTagConfMap[areaTag] = confNumber;
+                                ++confNumber;
+                            }
+                        });
+                    }
+
+                    return callback(null);
+                },
                 (callback) => {
                     this.messagesStream = fs.createWriteStream(paths.join(this.workDir, 'messages.dat'));
 
@@ -1241,8 +1296,8 @@ class QWKPacketWriter extends EventEmitter {
         if (Message.isPrivateAreaTag(areaTag)) {
             return 0;
         }
-        const areaConfig = _.get(Config(), [ 'messageNetworks', 'qwk', 'areas', areaTag ]);
-        return areaConfig && areaConfig.conference;
+
+        return this.areaTagConfMap[areaTag];
     }
 
     _getExportForUsername() {

From c6bde65be04f3240e2b87c8497500429b8a39e54 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 11:10:40 -0600
Subject: [PATCH 0938/1013] Minor fixes, tidy up FTS CHRS table a bit

---
 core/ftn_util.js        | 28 +++++++++++++++-------------
 core/qwk_mail_packet.js | 15 ++++++++++++---
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/core/ftn_util.js b/core/ftn_util.js
index e4637554..9d53c9a3 100644
--- a/core/ftn_util.js
+++ b/core/ftn_util.js
@@ -375,26 +375,28 @@ function getCharacterSetIdentifierByEncoding(encodingName) {
     return value ? `${value[0]} ${value[1]}` : encodingName.toUpperCase();
 }
 
+//  http://ftsc.org/docs/fts-5003.001
+//  http://www.unicode.org/L2/L1999/99325-N.htm
 function getEncodingFromCharacterSetIdentifier(chrs) {
     const ident = chrs.split(' ')[0].toUpperCase();
 
     //  :TODO: fill in the rest!!!
     return {
         //  level 1
-        'ASCII'     : 'iso-646-1',
-        'DUTCH'     : 'iso-646',
-        'FINNISH'   : 'iso-646-10',
-        'FRENCH'    : 'iso-646',
-        'CANADIAN'  : 'iso-646',
-        'GERMAN'    : 'iso-646',
-        'ITALIAN'   : 'iso-646',
-        'NORWEIG'   : 'iso-646',
-        'PORTU'     : 'iso-646',
+        'ASCII'     : 'ascii',      // ISO-646-1
+        'DUTCH'     : 'ascii',      // ISO-646
+        'FINNISH'   : 'ascii',      // ISO-646-10
+        'FRENCH'    : 'ascii',      // ISO-646
+        'CANADIAN'  : 'ascii',      // ISO-646
+        'GERMAN'    : 'ascii',      // ISO-646
+        'ITALIAN'   : 'ascii',      // ISO-646
+        'NORWEIG'   : 'ascii',      // ISO-646
+        'PORTU'     : 'ascii',      // ISO-646
         'SPANISH'   : 'iso-656',
-        'SWEDISH'   : 'iso-646-10',
-        'SWISS'     : 'iso-646',
-        'UK'        : 'iso-646',
-        'ISO-10'    : 'iso-646-10',
+        'SWEDISH'   : 'ascii',      // ISO-646-10
+        'SWISS'     : 'ascii',      // ISO-646
+        'UK'        : 'ascii',      // ISO-646
+        'ISO-10'    : 'ascii',      // ISO-646-10
 
         //  level 2
         'CP437'     : 'cp437',
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index be524422..c1e58bc0 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -963,6 +963,15 @@ class QWKPacketWriter extends EventEmitter {
         return `<${message.messageId}.${message.messageUuid}@${this.options.systemDomain}>`;
     }
 
+    _encodeWithFallback(s, encoding) {
+        try {
+            return iconv.encode(s, encoding);
+        } catch (e) {
+            this.emit('warning', Errors.General(`Failed to encode buffer using ${encoding}; Falling back to 'ascii'`));
+            return iconv.encode(s, 'ascii');
+        }
+    }
+
     appendMessage(message) {
         //
         //  Each message has to:
@@ -1014,7 +1023,7 @@ class QWKPacketWriter extends EventEmitter {
 
         const encoding = this._getEncoding(message);
 
-        const encodedMessage = iconv.encode(fullMessageBody, encoding);
+        const encodedMessage = this._encodeWithFallback(fullMessageBody, encoding);
 
         //
         //  QWK spec wants line feeds as 0xe3 for some reason, so we'll have
@@ -1504,11 +1513,11 @@ class QWKPacketWriter extends EventEmitter {
             messageData.Editor          = `ENiGMA 1/2 BBS FSE v${enigmaVersion}`;
         }
 
-        this.headersDatStream.write(iconv.encode(`[${this.currentMessageOffset.toString(16)}]\r\n`, encoding));
+        this.headersDatStream.write(this._encodeWithFallback(`[${this.currentMessageOffset.toString(16)}]\r\n`, encoding));
 
         for (let [name, value] of Object.entries(messageData)) {
             if (value) {
-                this.headersDatStream.write(iconv.encode(`${name}: ${value}\r\n`, encoding));
+                this.headersDatStream.write(this._encodeWithFallback(`${name}: ${value}\r\n`, encoding));
             }
         }
 

From 2b1747a8f451deb639b2de2a0c89f75014a3613c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 11:17:33 -0600
Subject: [PATCH 0939/1013] Fix NDX filenames

---
 core/qwk_mail_packet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index c1e58bc0..69617866 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -1426,7 +1426,7 @@ class QWKPacketWriter extends EventEmitter {
                     async.eachSeries(this.publicIndex.keys(), (areaTag, nextArea) => {
                         const offsets = this.publicIndex.get(areaTag);
                         const conferenceNumber = this._getMessageConferenceNumberByAreaTag(areaTag);
-                        const indexStream = fs.createWriteStream(paths.join(this.workDir, `${conferenceNumber.toString()}.ndx`));
+                        const indexStream = fs.createWriteStream(paths.join(this.workDir, `${conferenceNumber.toString().padStart(4, '0')}.ndx`));
                         offsets.forEach(offset => appendIndexData(indexStream, offset));
 
                         indexStream.on('close', err => {

From 65a5eabe9c2ce4f75308d3e28ddfdc5f31914a74 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 11:40:54 -0600
Subject: [PATCH 0940/1013] Try this

---
 core/qwk_mail_packet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 69617866..f42271ff 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -1412,7 +1412,7 @@ class QWKPacketWriter extends EventEmitter {
                         return callback(null);
                     }
 
-                    const indexStream = fs.createWriteStream(paths.join(this.workDir, '000.ndx'));
+                    const indexStream = fs.createWriteStream(paths.join(this.workDir, '0000.ndx'));
                     this.inboxIndex.forEach(offset => appendIndexData(indexStream, offset));
 
                     indexStream.on('close', err => {

From 21374d6e6df3ccc8f8fd60dc5306fb34f09cd03b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 11:48:03 -0600
Subject: [PATCH 0941/1013] Minor

---
 core/qwk_mail_packet.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index f42271ff..ef2cbef9 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -913,11 +913,12 @@ class QWKPacketWriter extends EventEmitter {
                                 return;
                             }
 
-                            while (confNumber < 65537 && usedConfNumbers.has(confNumber)) {
+                            while (confNumber < 10001 && usedConfNumbers.has(confNumber)) {
                                 ++confNumber;
                             }
 
-                            if (confNumber === 65536) { //  sanity...
+                            //  we can go up to 65535 for some things, but NDX files are limited to 9999
+                            if (confNumber === 10000) { //  sanity...
                                 this.emit('warning', Errors.General(`To many conferences`));
                             } else {
                                 this.areaTagConfMap[areaTag] = confNumber;
@@ -1412,7 +1413,7 @@ class QWKPacketWriter extends EventEmitter {
                         return callback(null);
                     }
 
-                    const indexStream = fs.createWriteStream(paths.join(this.workDir, '0000.ndx'));
+                    const indexStream = fs.createWriteStream(paths.join(this.workDir, '000.ndx'));
                     this.inboxIndex.forEach(offset => appendIndexData(indexStream, offset));
 
                     indexStream.on('close', err => {

From 7fb10418f0381bad0257dde6f0b91c483bcbe1dc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 May 2020 12:01:31 -0600
Subject: [PATCH 0942/1013] Start auto-gen confs at 1000

---
 core/qwk_mail_packet.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index ef2cbef9..eec737cb 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -906,7 +906,8 @@ class QWKPacketWriter extends EventEmitter {
 
                     if (this.options.mode === QWKPacketWriter.Modes.User) {
                         //  All the rest
-                        let confNumber = 1;
+                        //  Start at 1000 to work around what seems to be a bug with some readers
+                        let confNumber = 1000;
                         const usedConfNumbers = new Set(Object.values(this.areaTagConfMap));
                         getAllAvailableMessageAreaTags().forEach(areaTag => {
                             if (this.areaTagConfMap[areaTag]) {

From 67ac86ac053a7d6e04bb1f9c0fe77f16771bb580 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 5 May 2020 19:01:47 -0600
Subject: [PATCH 0943/1013] Add initial QWK docs, update FTN, etc.

---
 core/oputil/oputil_help.js            |   2 +
 core/oputil/oputil_message_base.js    |  11 ++-
 docs/_includes/nav.md                 |   2 +
 docs/messageareas/ftn.md              | 105 ++++++++++++++++++++++++
 docs/messageareas/message-networks.md | 110 ++++----------------------
 docs/messageareas/qwk.md              |  52 ++++++++++++
 6 files changed, 185 insertions(+), 97 deletions(-)
 create mode 100644 docs/messageareas/ftn.md
 create mode 100644 docs/messageareas/qwk.md

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 3fd55575..0d132445 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -187,6 +187,8 @@ qwk-export arguments:
   --user USER                 User in which to export for. Defaults to the SysOp.
   --after TIMESTAMP           Export only messages with a timestamp later than
                               TIMESTAMP.
+  --no-qwke                   Disable QWKE extensions.
+  --no-synchronet             Disable Synchronet style extensions.
 `
 };
 
diff --git a/core/oputil/oputil_message_base.js b/core/oputil/oputil_message_base.js
index ea996c6c..1790b1e5 100644
--- a/core/oputil/oputil_message_base.js
+++ b/core/oputil/oputil_message_base.js
@@ -521,6 +521,13 @@ function exportQWKPacket() {
 
     const userName = argv.user || '-';
 
+    const writerOptions = {
+        enableQWKE              : !(false === argv.qwke),
+        enableHeadersExtension  : !(false === argv.synchronet),
+        enableAtKludges         : !(false === argv.synchronet),
+        archiveFormat           : argv.format || 'application/zip'
+    };
+
     let totalExported = 0;
     async.waterfall(
         [
@@ -578,10 +585,10 @@ function exportQWKPacket() {
             },
             (user, Message, messageIds, callback) => {
                 const { QWKPacketWriter } = require('../qwk_mail_packet');
-                const writer = new QWKPacketWriter({
+                const writer = new QWKPacketWriter(Object.assign(writerOptions, {
                     bbsID,
                     user,
-                });
+                }));
 
                 writer.on('ready', () => {
                     async.eachSeries(messageIds, (messageId, nextMessageId) => {
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index e51a8734..4fb9a399 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -41,6 +41,8 @@
     - [Message networks]({{ site.baseurl }}{% link messageareas/message-networks.md %})
     - [BSO Import & Export]({{ site.baseurl }}{% link messageareas/bso-import-export.md %})
     - [Netmail]({{ site.baseurl }}{% link messageareas/netmail.md %})
+    - [QWK]({{ site.baseurl }}{% link messageareas/qwk.md %})
+    - [FTN]({{ site.baseurl }}{% link messageareas/ftn.md %})
 
   - Art
     - [General]({{ site.baseurl }}{% link art/general.md %})
diff --git a/docs/messageareas/ftn.md b/docs/messageareas/ftn.md
new file mode 100644
index 00000000..f1bb5366
--- /dev/null
+++ b/docs/messageareas/ftn.md
@@ -0,0 +1,105 @@
+---
+layout: page
+title: FidoNet-Style Networks (FTN)
+---
+
+## FidoNet-Style Networks (FTN)
+
+TODO: preamble
+
+### Configuration
+
+1. `messageNetworks.ftn.networks`: declares available networks.
+2. `messageNetworks.ftn.areas`: establishes local area mappings and per-area specifics.
+3. `scannerTossers.ftn_bso`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
+
+:information_source: ENiGMA½'s `ftn_bso` module is **not a mailer** and makes **no attempts** to perform packet transport! An external utility such as Binkd is required for this task.
+
+#### Networks
+The `networks` block is a per-network configuration where each entry's ID (or "key") may be referenced elsewhere in `config.hjson`. For example, consider two networks: ArakNet (`araknet`) and fsxNet (`fsxnet`):
+
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      networks: {
+        // it is recommended to use lowercase network tags
+        fsxnet: {
+          defaultZone: 21
+          localAddress: "21:1/121"
+        }
+
+        araknet: {
+          defaultZone: 10
+          localAddress: "10:101/9"
+        }
+      }
+    }
+  }
+}
+```
+
+#### Areas
+The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see [Configuring a Message Area](configuring-a-message-area.md)) to a message network (described above), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages.
+
+When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas` while exported messages will be sent to the relevant `network`.
+
+| Config Item | Required | Description                                              |
+|-------------|----------|----------------------------------------------------------|
+| `network`   | :+1:     | Associated network from the `networks` section above |
+| `tag`       | :+1:     | FTN area tag (ie: `FSX_GEN`) |
+| `uplinks`   | :+1:     | An array of FTN address uplink(s) for this network |
+
+Example:
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      areas: {
+        // it is recommended to use lowercase area tags
+        fsx_general:        //  *local* tag found within messageConferences
+          network: fsxnet   //  that we are mapping to this network
+          tag: FSX_GEN      //  ...and this remote FTN-specific tag
+          uplinks: [ "21:1/100" ] // a single string also allowed here
+        }
+      }
+    }
+  }
+}
+```
+
+:information_source: You can import `AREAS.BBS` or FTN style `.NA` files using [oputil](/docs/admin/oputil.md)!
+
+#### A More Complete Example
+Below is a more complete *example* illustrating some of the concepts above:
+
+```hjson
+{
+  messageNetworks: {
+    ftn: {
+      networks: {
+        fsxnet: {
+          defaultZone: 21
+          localAddress: "21:1/121"
+        }
+      }
+
+      areas: {
+        fsx_general: {
+          network: fsxnet
+
+          //  ie as found in your info packs .NA file
+          tag: FSX_GEN
+
+          uplinks: [ "21:1/100" ]
+        }
+      }
+    }
+  }
+}
+```
+
+:information_source: Remember for a complete FTN experience, you'll probably also want to configure [FTN/BSO scanner/tosser](bso-import-export.md) settings.
+
+#### FTN/BSO Scanner Tosser
+Please see the [FTN/BSO Scanner/Tosser](bso-import-export.md) documentation for information on this area.
\ No newline at end of file
diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index 5838da53..7fbd80c2 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -3,103 +3,23 @@ layout: page
 title: Message Networks
 ---
 ## Message Networks
-ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, such as FTN "external". That is, messages are only imported and exported from/to such a networks. Configuring such external message networks in ENiGMA½ requires three sections in your `config.hjson`.
+ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, such as FidoNet-Style (FTN) "external". That is, messages are only imported and exported from/to such a networks. Configuring such external message networks in ENiGMA½ requires three sections in your `config.hjson`.
 
-1. `messageNetworks.<networkType>.networks`: declares available networks.
-2. `messageNetworks.<networkType>.areas`: establishes local area mappings and per-area specifics.
-3. `scannerTossers.<name>`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
+All message network configuration occurs under the `messageNetworks.<name>` block in `config.hjson` (where name is something such as `ftn` or `qwk`). Similarly, if a scanner/tosser module exists for the network it can be configured under `scannerTossers.<name>`. An example of this is the [FTN/BSO scanner/tosser](bso-import-export.md) module where name is `ftn_bso`.
 
-### FTN Networks 
+The most basic of external message network configurations generally comprises of two sections within `config.hjson`:
+
+1. `messageNetworks.<name>.networks`: Global/general configuration for a particular network where `<name>` is for example `ftn` or `qwk`.
+2. `messageNetworks.<name>.areas`: Provides mapping of ENiGMA½ **area tags** to their external counterparts.
+
+Finally, a related section under `scannerTossers.<name>` may provide configuration for scanning (importing) and tossing (exporting) messages for a particular network type. As an example, FidoNet-Style networks often work with BinkleyTerm Style Outbound (BSO) and thus the [FTN/BSO scanner/tosser](bso-import-export.md) module.
+
+### Supported Networks
+
+#### FidoNet-Style (FTN)
 FidoNet and FidoNet style (FTN) networks as well as a [FTN/BSO scanner/tosser](bso-import-export.md) (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
 
-:information_source: ENiGMA½'s `ftn_bso` module is **not a mailer** and makes **no attempts** to perform packet transport! An external utility such as Binkd is required for this!
+See [FidoNet-Style Networks](ftn.md) for more information.
 
-#### Networks
-The `networks` block a per-network configuration where each entry's key may be referenced elsewhere in `config.hjson`.
-
-Example: the following example declares two networks: `araknet` and `fsxnet`:
-```hjson
-{
-  messageNetworks: {
-    ftn: {
-      networks: {
-        // it is recommended to use lowercase network tags
-        fsxnet: {
-          defaultZone: 21
-          localAddress: "21:1/121"
-        }
-
-        araknet: {
-          defaultZone: 10
-          localAddress: "10:101/9"
-        }
-      }
-    }
-  }
-}
-```
-
-#### Areas
-The `areas` section describes a mapping of local **area tags** configured in your `messageConferences` (see [Configuring a Message Area](configuring-a-message-area.md)) to a message network (described above), a FTN specific area tag, and remote uplink address(s). This section can be thought of similar to the *AREAS.BBS* file used by other BBS packages. 
-
-When ENiGMA½ imports messages, they will be placed in the local area that matches key under `areas` while exported messages will be sent to the relevant `network`.
-
-| Config Item | Required | Description                                              |
-|-------------|----------|----------------------------------------------------------|
-| `network`   | :+1:     | Associated network from the `networks` section above |    
-| `tag`       | :+1:     | FTN area tag (ie: `FSX_GEN`) |
-| `uplinks`   | :+1:     | An array of FTN address uplink(s) for this network |
-
-Example:
-```hjson
-{
-  messageNetworks: {
-    ftn: {
-      areas: {
-        // it is recommended to use lowercase area tags
-        fsx_general:        //  *local* tag found within messageConferences
-          network: fsxnet   //  that we are mapping to this network
-          tag: FSX_GEN      //  ...and this remote FTN-specific tag
-          uplinks: [ "21:1/100" ] // a single string also allowed here
-        }
-      }
-    }
-  }
-}
-```
-
-:information_source: You can import `AREAS.BBS` or FTN style `.NA` files using [oputil](/docs/admin/oputil.md)!
-
-### A More Complete Example
-Below is a more complete *example* illustrating some of the concepts above:
-
-```hjson
-{
-  messageNetworks: {
-    ftn: {
-      networks: {        
-        fsxnet: {
-          defaultZone: 21
-          localAddress: "21:1/121"
-        }
-      }
-
-      areas: {        
-        fsx_general: {
-          network: fsxnet
-
-          //  ie as found in your info packs .NA file
-          tag: FSX_GEN
-
-          uplinks: [ "21:1/100" ]
-        }
-      }
-    }
-  }
-}
-```
-
-:information_source: Remember for a complete FTN experience, you'll probably also want to configure [FTN/BSO scanner/tosser](bso-import-export.md) settings.
-
-### FTN/BSO Scanner Tosser
-Please see the [FTN/BSO Scanner/Tosser](bso-import-export.md) documentation for information on this area.
+#### QWK
+See [QWK and QWK-Net Style Networks](qwk.md) for more information.
diff --git a/docs/messageareas/qwk.md b/docs/messageareas/qwk.md
new file mode 100644
index 00000000..6c72afb0
--- /dev/null
+++ b/docs/messageareas/qwk.md
@@ -0,0 +1,52 @@
+---
+layout: page
+title: QWK Support
+---
+
+## QWK and QWK-Net Style Networks
+As like all other such as FidoNet-Style (FTN) networks, ENiGMA½ considers QWK external to the system but can import and export the format.
+
+### Supported Standards
+QWK must be considered a semi-standard as there are many implementations. What follows is a short & incomplete list of such standards ENiGMA½ supports:
+* The basic [QWK packet format](http://fileformats.archiveteam.org/wiki/QWK).
+* [QWKE extensions](https://github.com/wwivbbs/wwiv/blob/master/specs/qwk/qwke.txt).
+* [Synchronet BBS style extensions](http://wiki.synchro.net/ref:qwk) such as `HEADERS.DAT`, `@` kludges, and UTF-8 handling.
+
+
+### Configuration
+QWK configuration occurs in the `messageNetworks.qwk` config block of `config.hjson`. As QWK wants to deal with conference numbers and ENiGMA½ uses area tags (conferences and conference tags are only used for logical grouping), a mapping can be made.
+
+:information_source: During a regular, non QWK-Net exports, conference numbers can be auto-generated. Note that for QWK-Net style networks, you will need to create mappings however.
+
+:TODO: information on QWK-Net type setup here
+
+Example:
+```hjson
+{
+    messageNetworks: {
+        qwk: {
+            areas: {
+                general: {          // local ENiGMA½ area tag
+                    conference: 1   // conference number to map to
+                }
+            }
+        }
+    }
+}
+```
+
+### oputil
+The `oputil.js` utility can export packet files, dump the messages of a packet to stdout, etc.
+
+TODO: Examples, etc.
+TODO: Link to oputil, update --help there.
+
+### Offline Readers
+A few of the offline readers that have been tested with QWK packet files produced by ENiGMA:
+
+| Software | Status | Notes |
+|----------|--------|-------|
+| MultiMail/Win v0.52 | Supported | Private mail seems to break even with bundles from other systems |
+| SkyReader/W32 v1.00 | Supported | Works well. No QWKE or HEADERS.DAT support. Gets confused with low conference numbers. |
+
+There are also [many other readers](https://www.softwolves.pp.se/old/2000/faq/bwprod) for various systems.
\ No newline at end of file

From f56e30442a379c4d06380b77a5b62d34943368e8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 5 May 2020 21:18:58 -0600
Subject: [PATCH 0944/1013] Suggestion: option to trigger List of pending
 users. #272

---
 core/oputil/oputil_help.js |  9 +++++
 core/oputil/oputil_user.js | 82 +++++++++++++++++++++++++++++++++-----
 2 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index 0d132445..c3767c92 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -59,6 +59,15 @@ Actions:
 
   group USERNAME [+|-]GROUP    Adds (+) or removes (-) user from a group
 
+  list [FILTER]                List users with optional FILTER.
+
+  Valid filters:
+    all      : All users (default).
+    disabled : Disabled users.
+    inactive : Inactive users.
+    active   : Active (regular) users.
+    locked   : Locked users.
+
 info arguments:
   --security                   Include security information in output
 
diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 78ea08ca..376ee166 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -460,6 +460,64 @@ function twoFactorAuthOTP(user) {
     );
 }
 
+function listUsers() {
+    //  oputil user list [disabled|inactive|active|locked|all]
+    //  :TODO: --after TIMESTAMP (new users)
+    //  :TODO: --sort name|id
+    let listWhat;
+    if (argv._.length > 2) {
+        listWhat = argv._[argv._.length - 1];
+    } else {
+        listWhat = 'all';
+    }
+
+    const User = require('../../core/user');
+    if (![ 'all' ].concat(Object.keys(User.AccountStatus)).includes(listWhat)) {
+        return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
+    }
+
+    async.waterfall(
+        [
+            (callback) => {
+                const UserProps = require('../../core/user_property');
+
+                const userListOpts = {
+                    properties : [
+                        UserProps.AccountStatus,
+                    ],
+                };
+
+                User.getUserList(userListOpts, (err, userList) => {
+                    if (err) {
+                        return callback(err);
+                    }
+
+                    if ('all' === listWhat) {
+                        return callback(null, userList);
+                    }
+
+                    const accountStatusFilter = User.AccountStatus[listWhat].toString();
+
+                    return callback(null, userList.filter(user => {
+                        return user[UserProps.AccountStatus] === accountStatusFilter;
+                    }));
+                });
+            },
+            (userList, callback) => {
+                userList.forEach(user => {
+
+                    console.info(`${user.userId}: ${user.userName}`);
+                });
+            },
+        ],
+        err => {
+            if(err) {
+                return console.error(err.reason ? err.reason : err.message);
+            }
+        }
+    );
+}
+
 function handleUserCommand() {
     function errUsage()  {
         return printUsageAndSetExitCode(getHelpFor('User'), ExitCodes.ERROR);
@@ -470,20 +528,25 @@ function handleUserCommand() {
     }
 
     const action = argv._[1];
-    const usernameIdx = [
-        'pw', 'pass', 'passwd', 'password',
-        'group',
-        'mv', 'rename',
-        '2fa-otp', 'otp'
-    ].includes(action) ? argv._.length - 2 : argv._.length - 1;
-    const userName = argv._[usernameIdx];
+    const userRequired = ![ 'list' ].includes(action);
 
-    if(!userName) {
+    let userName;
+    if (userRequired) {
+        const usernameIdx = [
+            'pw', 'pass', 'passwd', 'password',
+            'group',
+            'mv', 'rename',
+            '2fa-otp', 'otp'
+        ].includes(action) ? argv._.length - 2 : argv._.length - 1;
+        userName = argv._[usernameIdx];
+    }
+
+    if(!userName && userRequired) {
         return errUsage();
     }
 
     initAndGetUser(userName, (err, user) => {
-        if(err) {
+        if(userName && err) {
             process.exitCode = ExitCodes.ERROR;
             return console.error(err.message);
         }
@@ -512,6 +575,7 @@ function handleUserCommand() {
 
             '2fa-otp'   : twoFactorAuthOTP,
             otp         : twoFactorAuthOTP,
+            list        : listUsers,
         }[action] || errUsage)(user, action);
     });
 }
\ No newline at end of file

From ec994211e06004f75c89adf072c346c920dea8a2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 6 May 2020 11:12:19 -0600
Subject: [PATCH 0945/1013] More doc updates

---
 docs/admin/oputil.md                  | 17 ++++++++++++++++-
 docs/messageareas/ftn.md              | 10 +++++-----
 docs/messageareas/message-networks.md | 11 +++++------
 docs/messageareas/qwk.md              | 11 +++--------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md
index 0b05f7aa..e591de9f 100644
--- a/docs/admin/oputil.md
+++ b/docs/admin/oputil.md
@@ -291,17 +291,32 @@ Actions:
 
   import-areas PATH           Import areas using FidoNet *.NA or AREAS.BBS file
 
+  qwk-dump PATH               Dumps a QWK packet to stdout.
+  qwk-export [AREA_TAGS] PATH Exports one or more configured message area to a QWK
+                              packet in the directory specified by PATH. The QWK
+                              BBS ID will be obtained by the final component of PATH.
+
 import-areas arguments:
   --conf CONF_TAG             Conference tag in which to import areas
   --network NETWORK           Network name/key to associate FTN areas
   --uplinks UL1,UL2,...       One or more uplinks (comma separated)
   --type TYPE                 Area import type
 
-  Valid types are "bbs" and "na"
+  Valid types are "bbs" and "na".
+
+qwk-export arguments:
+  --user USER                 User in which to export for. Defaults to the SysOp.
+  --after TIMESTAMP           Export only messages with a timestamp later than
+                              TIMESTAMP.
+  --no-qwke                   Disable QWKE extensions.
+  --no-synchronet             Disable Synchronet style extensions.
 ```
 
 | Action    | Description       | Examples                              |
 |-----------|-------------------|---------------------------------------|
 | `import-areas`    | Imports areas using a FidoNet style *.NA or AREAS.BBS formatted file. Optionally maps areas to FTN networks.  | `./oputil.js config import-areas /some/path/l33tnet.na`   |
+| `areafix` | Utility for sending AreaFix mails without logging into the system | |
+| `qwk-dump` | Dump a QWK packet to stdout | `./oputil.js mb qwk-dump /path/to/XIBALBA.QWK` |
+| `qwk-export` | Export messages to a QWK packet | `./oputil.js mb qwk-export /path/to/XIBALBA.QWK` |
 
 When using the `import-areas` action, you will be prompted for any missing additional arguments described in "import-areas args".
diff --git a/docs/messageareas/ftn.md b/docs/messageareas/ftn.md
index f1bb5366..34f90862 100644
--- a/docs/messageareas/ftn.md
+++ b/docs/messageareas/ftn.md
@@ -4,14 +4,14 @@ title: FidoNet-Style Networks (FTN)
 ---
 
 ## FidoNet-Style Networks (FTN)
-
-TODO: preamble
+[FidoNet](https://en.wikipedia.org/wiki/FidoNet) proper and other FidoNet-Style networks are supported by ENiGMA½. A bit of configuration and you'll be up and running in no time!
 
 ### Configuration
+Getting a fully running FTN enabled system requires a few configuration points:
 
-1. `messageNetworks.ftn.networks`: declares available networks.
-2. `messageNetworks.ftn.areas`: establishes local area mappings and per-area specifics.
-3. `scannerTossers.ftn_bso`: general configuration for the scanner/tosser (import/export). This is also where we configure per-node settings.
+1. `messageNetworks.ftn.networks`: Declares available networks. That is, networks you wish to sync up with.
+2. `messageNetworks.ftn.areas`: Establishes local area mappings (ENiGMA½ to/from FTN area tags) and per-area specific configurations.
+3. `scannerTossers.ftn_bso`: General configuration for the scanner/tosser (import/export) process. This is also where we configure per-node (uplink) settings.
 
 :information_source: ENiGMA½'s `ftn_bso` module is **not a mailer** and makes **no attempts** to perform packet transport! An external utility such as Binkd is required for this task.
 
diff --git a/docs/messageareas/message-networks.md b/docs/messageareas/message-networks.md
index 7fbd80c2..52a4227e 100644
--- a/docs/messageareas/message-networks.md
+++ b/docs/messageareas/message-networks.md
@@ -3,18 +3,17 @@ layout: page
 title: Message Networks
 ---
 ## Message Networks
-ENiGMA½ considers all non-ENiGMA½, non-local messages (and their networks, such as FidoNet-Style (FTN) "external". That is, messages are only imported and exported from/to such a networks. Configuring such external message networks in ENiGMA½ requires three sections in your `config.hjson`.
+ENiGMA½ supports external networks such as FidoNet-Style (FTN) and QWK by the way of importing and exporting to/from it's own internal format. This allows for a very flexible system that can easily be extended by creating new network modules.
 
-All message network configuration occurs under the `messageNetworks.<name>` block in `config.hjson` (where name is something such as `ftn` or `qwk`). Similarly, if a scanner/tosser module exists for the network it can be configured under `scannerTossers.<name>`. An example of this is the [FTN/BSO scanner/tosser](bso-import-export.md) module where name is `ftn_bso`.
-
-The most basic of external message network configurations generally comprises of two sections within `config.hjson`:
+All message network configuration occurs under the `messageNetworks.<name>` block in `config.hjson` (where name is something such as `ftn` or `qwk`). The most basic of external message network configurations generally comprises of two sections:
 
 1. `messageNetworks.<name>.networks`: Global/general configuration for a particular network where `<name>` is for example `ftn` or `qwk`.
 2. `messageNetworks.<name>.areas`: Provides mapping of ENiGMA½ **area tags** to their external counterparts.
 
-Finally, a related section under `scannerTossers.<name>` may provide configuration for scanning (importing) and tossing (exporting) messages for a particular network type. As an example, FidoNet-Style networks often work with BinkleyTerm Style Outbound (BSO) and thus the [FTN/BSO scanner/tosser](bso-import-export.md) module.
+:information_source: A related section under `scannerTossers.<name>` may provide configuration for scanning (importing) and tossing (exporting) messages for a particular network type. As an example, FidoNet-Style networks often work with BinkleyTerm Style Outbound (BSO) and thus the [FTN/BSO scanner/tosser](bso-import-export.md) (`ftn_bso`) module.
 
-### Supported Networks
+### Currently Supported Networks
+The following networks are supported out of the box. Remember that you can create modules to add others if desired!
 
 #### FidoNet-Style (FTN)
 FidoNet and FidoNet style (FTN) networks as well as a [FTN/BSO scanner/tosser](bso-import-export.md) (`ftn_bso` module) are configured via the `messageNetworks.ftn` and `scannerTossers.ftn_bso` blocks in `config.hjson`.
diff --git a/docs/messageareas/qwk.md b/docs/messageareas/qwk.md
index 6c72afb0..964551a3 100644
--- a/docs/messageareas/qwk.md
+++ b/docs/messageareas/qwk.md
@@ -4,7 +4,7 @@ title: QWK Support
 ---
 
 ## QWK and QWK-Net Style Networks
-As like all other such as FidoNet-Style (FTN) networks, ENiGMA½ considers QWK external to the system but can import and export the format.
+As like all other networks such as FidoNet-Style (FTN) networks, ENiGMA½ considers QWK external to the system but can import and export the format.
 
 ### Supported Standards
 QWK must be considered a semi-standard as there are many implementations. What follows is a short & incomplete list of such standards ENiGMA½ supports:
@@ -18,8 +18,6 @@ QWK configuration occurs in the `messageNetworks.qwk` config block of `config.hj
 
 :information_source: During a regular, non QWK-Net exports, conference numbers can be auto-generated. Note that for QWK-Net style networks, you will need to create mappings however.
 
-:TODO: information on QWK-Net type setup here
-
 Example:
 ```hjson
 {
@@ -36,13 +34,10 @@ Example:
 ```
 
 ### oputil
-The `oputil.js` utility can export packet files, dump the messages of a packet to stdout, etc.
-
-TODO: Examples, etc.
-TODO: Link to oputil, update --help there.
+The `oputil.js` utility can export packet files, dump the messages of a packet to stdout, etc. See [the oputil documentation](/docs/admin/oputil.md) for more information.
 
 ### Offline Readers
-A few of the offline readers that have been tested with QWK packet files produced by ENiGMA:
+A few of the offline readers that have been tested with QWK packet files produced by ENiGMA½:
 
 | Software | Status | Notes |
 |----------|--------|-------|

From 59ee52ea6fb9b82ed1e303b87334b2c7c27e6193 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 6 May 2020 17:34:37 -0600
Subject: [PATCH 0946/1013] Tidy + some logging

---
 core/scanner_tossers/ftn_bso.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 3fec4fc3..046df546 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1931,8 +1931,8 @@ function FTNMessageScanTossModule() {
             `SELECT message_id, message_uuid
             FROM message m
             WHERE area_tag = ? AND message_id > ? AND
-                (SELECT COUNT(message_id) 
-                FROM message_meta 
+                (SELECT COUNT(message_id)
+                FROM message_meta
                 WHERE message_id = m.message_id AND meta_category = 'System' AND meta_name = 'state_flags0') = 0
             ORDER BY message_id;`
             ;
@@ -2012,7 +2012,7 @@ function FTNMessageScanTossModule() {
         const getNewUuidsSql =
             `SELECT message_id, message_uuid
             FROM message m
-            WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND 
+            WHERE area_tag = '${Message.WellKnownAreaTags.Private}' AND message_id > ? AND
                 (SELECT COUNT(message_id)
                 FROM message_meta
                 WHERE message_id = m.message_id
@@ -2023,7 +2023,7 @@ function FTNMessageScanTossModule() {
                 (SELECT COUNT(message_id)
                 FROM message_meta
                 WHERE message_id = m.message_id
-                    AND meta_category = 'System' 
+                    AND meta_category = 'System'
                     AND meta_name = '${Message.SystemMetaNames.ExternalFlavor}'
                     AND meta_value = '${Message.AddressFlavor.FTN}'
                 ) = 1
@@ -2287,13 +2287,18 @@ FTNMessageScanTossModule.prototype.shutdown = function(cb) {
 
 FTNMessageScanTossModule.prototype.performImport = function(cb) {
     if(!this.hasValidConfiguration()) {
-        return cb(new Error('Missing or invalid configuration'));
+        return cb(Errors.MissingConfig('Invalid or missing configuration'));
     }
 
     const self = this;
 
     async.each( [ 'inbound', 'secInbound' ], (inboundType, nextDir) => {
-        self.importFromDirectory(inboundType, self.moduleConfig.paths[inboundType], () => {
+        const importDir = self.moduleConfig.paths[inboundType];
+        self.importFromDirectory(inboundType, importDir, err => {
+            if (err) {
+                Log.warn({ importDir, error : err.message }, 'Error(s) during import');
+            }
+
             return nextDir(null);
         });
     }, cb);
@@ -2305,7 +2310,7 @@ FTNMessageScanTossModule.prototype.performExport = function(cb) {
     //  and let's find out what messages need exported.
     //
     if(!this.hasValidConfiguration()) {
-        return cb(new Error('Missing or invalid configuration'));
+        return cb(Errors.MissingConfig('Invalid or missing configuration'));
     }
 
     const self = this;
@@ -2313,7 +2318,7 @@ FTNMessageScanTossModule.prototype.performExport = function(cb) {
     async.eachSeries( [ 'EchoMail', 'NetMail' ], (type, nextType) => {
         self[`perform${type}Export`]( err => {
             if(err) {
-                Log.warn( { error : err.message, type : type }, 'Error(s) during export' );
+                Log.warn( { type, error : err.message }, 'Error(s) during export' );
             }
             return nextType(null);  //  try next, always
         });

From 387dfb3b5dfbb7ce3a4a976bc1f6f56d6f86cc07 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 6 May 2020 17:47:13 -0600
Subject: [PATCH 0947/1013] Don't idle logout if a transfer is making progress

---
 core/client.js        | 12 ++++++++----
 core/file_transfer.js | 11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/core/client.js b/core/client.js
index 566aec5d..a6cfae52 100644
--- a/core/client.js
+++ b/core/client.js
@@ -84,7 +84,7 @@ function Client(/*input, output*/) {
 
     this.user               = new User();
     this.currentTheme       = { info : { name : 'N/A', description : 'None' } };
-    this.lastKeyPressMs     = Date.now();
+    this.lastActivityTime   = Date.now();
     this.menuStack          = new MenuStack(this);
     this.acs                = new ACS( { client : this, user : this.user } );
     this.mciCache           = {};
@@ -406,7 +406,7 @@ function Client(/*input, output*/) {
                     self.log.trace( { key : key, ch : escape(ch) }, 'User keyboard input'); // jshint ignore:line
                 }
 
-                self.lastKeyPressMs = Date.now();
+                self.lastActivityTime = Date.now();
 
                 if(!self.ignoreInput) {
                     self.emit('key press', ch, key);
@@ -438,7 +438,7 @@ Client.prototype.startIdleMonitor = function() {
         this.stopIdleMonitor();
     }
 
-    this.lastKeyPressMs = Date.now();
+    this.lastActivityTime = Date.now();
 
     //
     //  Every 1m, check for idle.
@@ -476,7 +476,7 @@ Client.prototype.startIdleMonitor = function() {
         //  use override value if set
         idleLogoutSeconds = this.idleLogoutSecondsOverride || idleLogoutSeconds;
 
-        if(idleLogoutSeconds > 0 && (nowMs - this.lastKeyPressMs >= (idleLogoutSeconds * 1000))) {
+        if(idleLogoutSeconds > 0 && (nowMs - this.lastActivityTime >= (idleLogoutSeconds * 1000))) {
             this.emit('idle timeout');
         }
     }, 1000 * 60);
@@ -489,6 +489,10 @@ Client.prototype.stopIdleMonitor = function() {
     }
 };
 
+Client.prototype.explicitActivityTimeUpdate = function() {
+    this.lastActivityTime = Date.now();
+}
+
 Client.prototype.overrideIdleLogoutSeconds = function(seconds) {
     this.idleLogoutSecondsOverride = seconds;
 };
diff --git a/core/file_transfer.js b/core/file_transfer.js
index 5f0138e2..ff9216d6 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -378,7 +378,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
         const externalProc = pty.spawn(cmd, args, spawnOpts);
 
+        let dataHits = 0;
+        const updateActivity = () => {
+            if (0 === (dataHits++ % 4)) {
+                this.client.explicitActivityTimeUpdate();
+            }
+        };
+
         this.client.setTemporaryDirectDataHandler(data => {
+            updateActivity();
+
             //  needed for things like sz/rz
             if(external.escapeTelnet) {
                 const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
@@ -389,6 +398,8 @@ exports.getModule = class TransferFileModule extends MenuModule {
         });
 
         externalProc.on('data', data => {
+            updateActivity();
+
             //  needed for things like sz/rz
             if(external.escapeTelnet) {
                 const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');   //  escape

From 3732914c4a71871793e3fa75c8982b8f387850a3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 6 May 2020 17:50:44 -0600
Subject: [PATCH 0948/1013] Add extra log

---
 core/scanner_tossers/ftn_bso.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 046df546..9bc272fe 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -2151,6 +2151,10 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
 FTNMessageScanTossModule.prototype.startup = function(cb) {
     Log.info(`${exports.moduleInfo.name} Scanner/Tosser starting up`);
 
+    if (!this.hasValidConfiguration()) {
+        Log.debug('No configuration present');
+    }
+
     let importing = false;
 
     let self = this;

From d6dce82a92dfc6c350c1f52621fccc48577cada6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 7 May 2020 19:00:32 -0600
Subject: [PATCH 0949/1013] Clean up log a bit

---
 core/scanner_tossers/ftn_bso.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 9bc272fe..488dcc8e 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -517,8 +517,20 @@ function FTNMessageScanTossModule() {
     };
 
 
-    this.hasValidConfiguration = function() {
-        if(!_.has(this, 'moduleConfig.nodes') || !_.has(Config(), 'messageNetworks.ftn.areas')) {
+    this.hasValidConfiguration = function({shouldLog = false} = {}) {
+        const hasNodes = _.has(this, 'moduleConfig.nodes');
+        const hasAreas = _.has(Config(), 'messageNetworks.ftn.areas');
+
+        if(!hasNodes && !hasAreas) {
+            if (shouldLog) {
+                Log.warn(
+                    {
+                        'scannerTossers.ftn_bso.nodes' : hasNodes,
+                        'messageNetworks.ftn.areas' : hasAreas,
+                    },
+                    'Missing one or more required configuration blocks'
+                );
+            }
             return false;
         }
 
@@ -2151,9 +2163,7 @@ FTNMessageScanTossModule.prototype.processTicFilesInDirectory = function(importD
 FTNMessageScanTossModule.prototype.startup = function(cb) {
     Log.info(`${exports.moduleInfo.name} Scanner/Tosser starting up`);
 
-    if (!this.hasValidConfiguration()) {
-        Log.debug('No configuration present');
-    }
+    this.hasValidConfiguration({ shouldLog : true });   //  just check and log
 
     let importing = false;
 
@@ -2300,7 +2310,7 @@ FTNMessageScanTossModule.prototype.performImport = function(cb) {
         const importDir = self.moduleConfig.paths[inboundType];
         self.importFromDirectory(inboundType, importDir, err => {
             if (err) {
-                Log.warn({ importDir, error : err.message }, 'Error(s) during import');
+                Log.trace({ importDir, error : err.message }, 'Cannot perform FTN import for directory');
             }
 
             return nextDir(null);

From 14f7ca9dcc4403086d2ab8c25f680741cd8f3b72 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 7 May 2020 20:02:12 -0600
Subject: [PATCH 0950/1013] Add Ability to Import All File Areas at Once #271 *
 Simple wildcard support for area tags param

---
 core/file_base_area.js          | 11 +++++++++++
 core/oputil/oputil_file_base.js | 19 ++++++++++++++++++-
 core/oputil/oputil_help.js      |  8 ++++++--
 core/string_util.js             |  6 ++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/core/file_base_area.js b/core/file_base_area.js
index e3887b84..e9926111 100644
--- a/core/file_base_area.js
+++ b/core/file_base_area.js
@@ -17,6 +17,7 @@ const StatLog           = require('./stat_log.js');
 const UserProps         = require('./user_property.js');
 const SysProps          = require('./system_property.js');
 const SAUCE             = require('./sauce.js');
+const { wildcardMatch } = require('./string_util');
 
 //  deps
 const _             = require('lodash');
@@ -40,6 +41,7 @@ exports.getAreaDefaultStorageDirectory  = getAreaDefaultStorageDirectory;
 exports.getAreaStorageLocations         = getAreaStorageLocations;
 exports.getDefaultFileAreaTag           = getDefaultFileAreaTag;
 exports.getFileAreaByTag                = getFileAreaByTag;
+exports.getFileAreasByTagWildcardRule   = getFileAreasByTagWildcardRule;
 exports.getFileEntryPath                = getFileEntryPath;
 exports.changeFileAreaWithOptions       = changeFileAreaWithOptions;
 exports.scanFile                        = scanFile;
@@ -143,6 +145,15 @@ function getFileAreaByTag(areaTag) {
     }
 }
 
+function getFileAreasByTagWildcardRule(rule) {
+    const areaTags = Object.keys(Config().fileBase.areas)
+        .filter(areaTag => {
+            return !isInternalArea(areaTag) && wildcardMatch(areaTag, rule);
+        });
+
+    return areaTags.map(areaTag => getFileAreaByTag(areaTag));
+}
+
 function changeFileAreaWithOptions(client, areaTag, options, cb) {
     async.waterfall(
         [
diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index 67962fc0..308d3581 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -521,7 +521,24 @@ function scanFileAreas() {
                 });
             },
             function scanAreas(callback) {
-                fileArea = require('../../core/file_base_area.js');
+                fileArea = require('../../core/file_base_area');
+
+                //  Further expand any wildcards
+                let areaAndStorageInfoExpanded = [];
+                options.areaAndStorageInfo.forEach(info => {
+                    if (info.areaTag.indexOf('*') > -1) {
+                        const areas = fileArea.getFileAreasByTagWildcardRule(info.areaTag);
+                        areas.forEach(area => {
+                            areaAndStorageInfoExpanded.push(Object.assign({}, info, {
+                                areaTag : area.areaTag,
+                            }));
+                        });
+                    } else {
+                        areaAndStorageInfoExpanded.push(info);
+                    }
+                });
+
+                options.areaAndStorageInfo = areaAndStorageInfoExpanded;
 
                 async.eachSeries(options.areaAndStorageInfo, (areaAndStorage, nextAreaTag) => {
                     const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js
index c3767c92..50bc3b5e 100644
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -101,8 +101,12 @@ cat arguments:
 Actions:
   scan AREA_TAG[@STORAGE_TAG]  Scan specified area
 
-  May contain optional GLOB as last parameter.
-  Example: ./oputil.js fb scan d0pew4r3z *.zip
+  Tips:
+    - May contain optional GLOB as last parameter.
+      Example: ./oputil.js fb scan d0pew4r3z *.zip
+
+    - AREA_TAG may contain simple wildcards.
+      Example: ./oputil.js fb scan *warez*
 
   info CRITERIA                Display information about areas and/or files
 
diff --git a/core/string_util.js b/core/string_util.js
index cde7ac3e..2f6596c8 100644
--- a/core/string_util.js
+++ b/core/string_util.js
@@ -29,6 +29,7 @@ exports.isAnsi                      = isAnsi;
 exports.isAnsiLine                  = isAnsiLine;
 exports.isFormattedLine             = isFormattedLine;
 exports.splitTextAtTerms            = splitTextAtTerms;
+exports.wildcardMatch               = wildcardMatch;
 
 //  :TODO: create Unicode version of this
 const VOWELS = [
@@ -474,3 +475,8 @@ function isAnsi(input) {
 function splitTextAtTerms(s) {
     return s.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
 }
+
+function wildcardMatch(input, rule) {
+    const escapeRegex = (s) => s.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
+    return new RegExp("^" + rule.split("*").map(escapeRegex).join(".*") + "$").test(input);
+}
\ No newline at end of file

From ee992278e818135fc5499ef84a54d08e2807c7b6 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 10 May 2020 21:56:05 -0600
Subject: [PATCH 0951/1013] WIP on QWK download support

---
 core/enig_error.js                 |   1 +
 core/file_base_user_list_export.js |   3 +-
 core/message_base_qwk_export.js    | 378 +++++++++++++++++++++++++++++
 core/qwk_mail_packet.js            |   7 +-
 4 files changed, 387 insertions(+), 2 deletions(-)
 create mode 100644 core/message_base_qwk_export.js

diff --git a/core/enig_error.js b/core/enig_error.js
index 08a3312e..be025214 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -37,6 +37,7 @@ exports.Errors = {
     MissingParam        : (reason, reasonCode)  => new EnigError('Missing paramter(s)', -32008, reason, reasonCode),
     MissingMci          : (reason, reasonCode)  => new EnigError('Missing required MCI code(s)', -32009, reason, reasonCode),
     BadLogin            : (reason, reasonCode)  => new EnigError('Bad login attempt', -32010, reason, reasonCode),
+    UserInterrupt       : (reason, reasonCode)  => new EnigError('User interrupted', -32011, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 3c00d167..1307144c 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -28,7 +28,7 @@ const yazl              = require('yazl');
     tsFormat            - timestamp format (theme 'short')
     descWidth           - max desc width (45)
     progBarChar         - progress bar character (â–’)
-    compressThreshold   - threshold to kick in comrpession for lists (1.44 MiB)
+    compressThreshold   - threshold to kick in compression for lists (1.44 MiB)
     templates           - object containing:
         header          - filename of header template (misc/file_list_header.asc)
         entry           - filename of entry template (misc/file_list_entry.asc)
@@ -244,6 +244,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                 },
                 function done(callback) {
                     //  re-enable idle monitor
+                    //  :TODO: this should probably be moved down below at the end of the full waterfall
                     self.client.startIdleMonitor();
 
                     updateStatus('Exported list has been added to your download queue');
diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
new file mode 100644
index 00000000..b79a6411
--- /dev/null
+++ b/core/message_base_qwk_export.js
@@ -0,0 +1,378 @@
+//  ENiGMA½
+const { MenuModule } = require('./menu_module');
+const Message = require('./message');
+const { Errors } = require('./enig_error');
+const {
+    getMessageAreaByTag,
+    hasMessageConfAndAreaRead,
+} = require('./message_area');
+const FileArea = require('./file_base_area');
+const { QWKPacketWriter } = require('./qwk_mail_packet');
+const { renderSubstr } = require('./string_util');
+const Config = require('./config').get;
+const FileEntry = require('./file_entry');
+const Events = require('./events');
+const DownloadQueue = require('./download_queue');
+
+//  deps
+const async = require('async');
+const _ = require('lodash');
+const fse = require('fs-extra');
+const temptmp = require('temptmp');
+const paths = require('path');
+const UUIDv4 = require('uuid/v4');
+
+const FormIds = {
+    main    : 0,
+};
+
+const MciViewIds = {
+    main : {
+        status              : 1,
+        progressBar         : 2,
+
+        customRangeStart    : 10,
+    }
+};
+
+exports.moduleInfo = {
+    name    : 'QWK Export',
+    desc    : 'Exports a QWK Packet for download',
+    author  : 'NuSkooler',
+};
+
+exports.getModule = class MessageBaseQWKExport extends MenuModule {
+    constructor(options) {
+        super(options);
+
+        this.config = Object.assign({}, _.get(options, 'menuConfig.config'), options.extraArgs);
+
+        this.config.progBarChar = renderSubstr( (this.config.progBarChar || 'â–’'), 0, 1);
+        this.config.bbsID       = this.config.bbsID || _.get(Config(), 'messageNetworks.qwk.bbsID', 'ENIGMA');
+
+        this.tempName = `${UUIDv4().substr(-8).toUpperCase()}.QWK`;
+        this.sysTempDownloadArea = FileArea.getFileAreaByTag(FileArea.WellKnownAreaTags.TempDownloads);
+    }
+
+    mciReady(mciData, cb) {
+        super.mciReady(mciData, err => {
+            if (err) {
+                return cb(err);
+            }
+
+            async.waterfall(
+                [
+                    (callback) => {
+                        this.prepViewController('main', FormIds.main, mciData.menu, err => {
+                            return callback(err);
+                        });
+                    },
+                    (callback) => {
+                        this.temptmp = temptmp.createTrackedSession('qwkuserexp');
+                        this.temptmp.mkdir({ prefix : 'enigqwkwriter-'}, (err, tempDir) => {
+                            if (err) {
+                                return callback(err);
+                            }
+
+                            this.tempPacketDir = tempDir;
+
+                            const sysTempDownloadDir = FileArea.getAreaDefaultStorageDirectory(this.sysTempDownloadArea);
+
+                            //  ensure dir exists
+                            fse.mkdirs(sysTempDownloadDir, err => {
+                                return callback(err, sysTempDownloadDir);
+                            });
+                        });
+                    },
+                    (sysTempDownloadDir, callback) => {
+                        this.performExport(sysTempDownloadDir, err => {
+                            return callback(err);
+                        });
+                    },
+                ],
+                err => {
+                    this.temptmp.cleanup();
+
+                    if (err) {
+                        //  :TODO: doesn't do anything currently:
+                        if ('NORESULTS' === err.reasonCode) {
+                            return this.gotoMenu(this.menuConfig.config.noResultsMenu || 'qwkExportNoResults');
+                        }
+
+                        return this.prevMenu();
+                    }
+                    return cb(err);
+                }
+            );
+        });
+    }
+
+    finishedLoading() {
+        this.prevMenu();
+    }
+
+    performExport(sysTempDownloadDir, cb) {
+        const statusView = this.viewControllers.main.getView(MciViewIds.main.status);
+        const updateStatus = (status) => {
+            if (statusView) {
+                statusView.setText(status);
+            }
+        };
+
+        const progBarView = this.viewControllers.main.getView(MciViewIds.main.progressBar);
+        const updateProgressBar = (curr, total) => {
+            if (progBarView) {
+                const prog = Math.floor( (curr / total) * progBarView.dimens.width );
+                progBarView.setText(this.config.progBarChar.repeat(prog));
+            }
+        };
+
+        let cancel = false;
+
+        let lastProgUpdate = 0;
+        const progressHandler = (state, next) => {
+            //  we can produce a TON of updates; only update progress at most every 3/4s
+            if (Date.now() - lastProgUpdate > 750) {
+                switch (state.step) {
+                    case 'next_area' :
+                        updateStatus(state.status);
+                        updateProgressBar(0, 0);
+                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.area);
+                        break;
+
+                    case 'message' :
+                        updateStatus(state.status);
+                        updateProgressBar(state.current, state.total);
+                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.message);
+                        break;
+
+                    default :
+                        break;
+                }
+                lastProgUpdate = Date.now();
+            }
+
+            return next(cancel ? Errors.UserInterrupt('User canceled') : null);
+        };
+
+        const keyPressHandler = (ch, key) => {
+            if('escape' === key.name) {
+                cancel = true;
+                this.client.removeListener('key press', keyPressHandler);
+            }
+        };
+
+        const processMessagesWithFilter = (filter, cb) => {
+            Message.findMessages(filter, (err, messageIds) => {
+                if (err) {
+                    return cb(err);
+                }
+
+                let current = 1;
+                async.eachSeries(messageIds, (messageId, nextMessageId) => {
+                    const message = new Message();
+                    message.load({ messageId }, err => {
+                        if (err) {
+                            return nextMessageId(err);
+                        }
+
+                        const progress = {
+                            current,
+                            message,
+                            step    : 'message',
+                            total   : messageIds.length,
+                            status  : `Writing message ${current} / ${messageIds.length}`,
+                        };
+
+                        progressHandler(progress, err => {
+                            if (err) {
+                                return nextMessageId(err);
+                            }
+
+                            packetWriter.appendMessage(message);
+                            current += 1;
+
+                            return nextMessageId(null);
+                        });
+                    });
+                },
+                err => {
+                    return cb(err);
+                });
+            });
+        };
+
+        const packetWriter = new QWKPacketWriter({
+            user    : this.client.user,
+            bbsID   : this.config.bbsID,
+        });   //  :TODO: User configuration here
+
+        packetWriter.on('warning', warning => {
+            this.client.log.warn( { warning }, 'QWK packet writer warning');
+        });
+
+        async.waterfall(
+            [
+                (callback) => {
+                    //  don't count idle monitor while processing
+                    this.client.stopIdleMonitor();
+
+                    //  let user cancel
+                    this.client.on('key press', keyPressHandler);
+
+                    packetWriter.once('ready', () => {
+                        return callback(null);
+                    });
+
+                    packetWriter.once('error', err => {
+                        this.client.log.error( { error : err.message }, 'QWK packet writer error');
+                        cancel = true;
+                    });
+
+                    packetWriter.init();
+                },
+                (callback) => {
+                    //
+                    //  Fetch messages for user-configured area tags.
+                    //  - If private tag is present, we fetch this separately.
+                    //  - User property determines newscan timestamps dates if present for tag, else "all"
+                    //  - We have to fetch one area at a time in order to process message pointers/timestamps.
+                    //    ...this also allows for better progress.
+                    //
+                    //  TL;DR: for each area -> for each message
+                    //
+                    const exportAreas = [ //  :TODO: Load in something like this
+                        {
+                            areaTag : 'general',
+                            newerThanTimestamp : '2018-01-01',
+                        },
+                        {
+                            areaTag : 'fsx_gen',
+                        }
+                    ];
+
+                    async.eachSeries(exportAreas, (exportArea, nextExportArea) => {
+                        const area = getMessageAreaByTag(exportArea.areaTag);
+                        if (!area) {
+                            //  :TODO: remove from user properties - this area does not exist
+                            this.client.log.warn({ areaTag : exportArea.areaTag }, 'Cannot QWK export area as it does not exist');
+                            return nextExportArea(null);
+                        }
+
+                        if (!hasMessageConfAndAreaRead(this.client, area)) {
+                            this.client.log.warn({ areaTag : area.areaTag }, 'Cannot QWK export area due to ACS');
+                            return nextExportArea(null);
+                        }
+
+                        const progress = {
+                            area,
+                            step    : 'next_area',
+                            status  : `Gathering messages in ${area.name}...`,
+                        };
+
+                        progressHandler(progress, err => {
+                            if (err) {
+                                return nextExportArea(err);
+                            }
+
+                            const filter = {
+                                resultType          : 'id',
+                                areaTag             : exportArea.areaTag,
+                                newerThanTimestamp  : exportArea.newerThanTimestamp
+                            };
+
+                            processMessagesWithFilter(filter, err => {
+                                return nextExportArea(err);
+                            });
+                        });
+                    },
+                    err => {
+                        return callback(err);
+                    });
+                },
+                (callback) => {
+                    const filter = {
+                        resultType          : 'id',
+                        privateTagUserId    : this.client.user.userId,
+                        //  :TODO: newerThanTimestamp for private messages
+                        //newerThanTimestamp  : exportArea.newerThanTimestamp
+                    };
+                    return processMessagesWithFilter(filter, callback);
+                },
+                (callback) => {
+                    let packetInfo;
+                    packetWriter.once('packet', info => {
+                        packetInfo = info;
+                    });
+
+                    packetWriter.once('finished', () => {
+                        return callback(null, packetInfo);
+                    });
+
+                    packetWriter.finish(this.tempPacketDir);
+                },
+                (packetInfo, callback) => {
+                    const sysDownloadPath = paths.join(sysTempDownloadDir, this.tempName);
+                    fse.move(packetInfo.path, sysDownloadPath, err => {
+                        return callback(null, sysDownloadPath, packetInfo);
+                    });
+                },
+                (sysDownloadPath, packetInfo, callback) => {
+                    const newEntry = new FileEntry({
+                        areaTag     : this.sysTempDownloadArea.areaTag,
+                        fileName    : paths.basename(sysDownloadPath),
+                        storageTag  : this.sysTempDownloadArea.storageTags[0],
+                        meta        : {
+                            upload_by_username  : this.client.user.username,
+                            upload_by_user_id   : this.client.user.userId,
+                            byte_size           : packetInfo.stats.size,
+                            session_temp_dl     : 1,    //  download is valid until session is over
+
+                            //  :TODO: something like this: allow to override the displayed/downloaded as filename
+                            //  separate from the actual on disk filename. E.g. we could always download as "ENIGMA.QWK"
+                            visible_filename    : paths.basename(packetInfo.path),
+                        }
+                    });
+
+                    newEntry.desc = 'QWK Export';
+
+                    newEntry.persist(err => {
+                        if(!err) {
+                            //  queue it!
+                            const dlQueue = new DownloadQueue(this.client);
+                            dlQueue.add(newEntry, true);    //  true=systemFile
+
+                            //  clean up after ourselves when the session ends
+                            //  :TODO: DRY this with that in file_base_user_export
+                            const thisClientId = this.client.session.id;
+                            Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
+                                if(thisClientId === _.get(evt, 'client.session.id')) {
+                                    FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
+                                        if(err) {
+                                            Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+                                        } else {
+                                            Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                        return callback(err);
+                    });
+                }
+            ],
+            err => {
+                this.client.startIdleMonitor(); //  re-enable
+                this.client.removeListener('key press', keyPressHandler);
+
+                if (!err) {
+                    updateStatus('A QWK packet has been placed in your download queue');
+                }
+
+                //  :TODO: send user to download manager with pop flags/etc.
+
+                return cb(err);
+            }
+        );
+    }
+};
\ No newline at end of file
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index eec737cb..3d613ca4 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -1242,7 +1242,12 @@ class QWKPacketWriter extends EventEmitter {
                     files,
                     this.workDir,
                     err => {
-                        return cb(err);
+                        fs.stat(packetPath, (err, stats) => {
+                            if (stats) {
+                                this.emit('packet', { stats, path : packetPath } );
+                            }
+                            return cb(err);
+                        });
                     }
                 );
             });

From 9174b7b7100cca5555e80f27ef9b52ac58670e64 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 19:52:01 -0600
Subject: [PATCH 0952/1013] Code cleanup, use some defaults

---
 core/download_queue.js             | 32 ++++++++--
 core/file_base_user_list_export.js | 19 +-----
 core/message_base_qwk_export.js    | 96 ++++++++++++++++--------------
 core/user_property.js              |  3 +-
 4 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/core/download_queue.js b/core/download_queue.js
index 28ca3aac..1eb4023e 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -1,11 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-const FileEntry     = require('./file_entry.js');
-const UserProps     = require('./user_property.js');
+const FileEntry     = require('./file_entry');
+const UserProps     = require('./user_property');
+const Events        = require('./events');
 
 //  deps
-const { partition } = require('lodash');
+const _ = require('lodash');
 
 module.exports = class DownloadQueue {
     constructor(client) {
@@ -20,6 +21,10 @@ module.exports = class DownloadQueue {
         }
     }
 
+    static get(client) {
+        return new DownloadQueue(client);
+    }
+
     get items() {
         return this.client.user.downloadQueue;
     }
@@ -52,7 +57,7 @@ module.exports = class DownloadQueue {
             fileIds = [ fileIds ];
         }
 
-        const [ remain, removed ] = partition(this.client.user.downloadQueue, e => ( -1 === fileIds.indexOf(e.fileId) ));
+        const [ remain, removed ] = _.partition(this.client.user.downloadQueue, e => ( -1 === fileIds.indexOf(e.fileId) ));
         this.client.user.downloadQueue = remain;
         return removed;
     }
@@ -76,4 +81,23 @@ module.exports = class DownloadQueue {
             this.client.log.error( { error : e.message, property : prop }, 'Failed parsing download queue property');
         }
     }
+
+    addTemporaryDownload(entry) {
+        this.add(entry, true);    //  true=systemFile
+
+        //  clean up after ourselves when the session ends
+        const thisClientId = this.client.session.id;
+        Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
+            if(thisClientId === _.get(evt, 'client.session.id')) {
+                FileEntry.removeEntry(entry, { removePhysFile : true }, err => {
+                    const Log = require('./logger').log;
+                    if(err) {
+                        Log.warn( { fileId : entry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+                    } else {
+                        Log.debug( { fileId : entry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+                    }
+                });
+            }
+        });
+    }
 };
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 1307144c..594a9ffe 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -7,8 +7,6 @@ const FileEntry             = require('./file_entry.js');
 const FileArea              = require('./file_base_area.js');
 const { renderSubstr }      = require('./string_util.js');
 const { Errors }            = require('./enig_error.js');
-const Events                = require('./events.js');
-const Log                   = require('./logger.js').log;
 const DownloadQueue         = require('./download_queue.js');
 const { exportFileList }    = require('./file_base_list_export.js');
 
@@ -222,22 +220,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
                     newEntry.persist(err => {
                         if(!err) {
                             //  queue it!
-                            const dlQueue = new DownloadQueue(self.client);
-                            dlQueue.add(newEntry, true);    //  true=systemFile
-
-                            //  clean up after ourselves when the session ends
-                            const thisClientId = self.client.session.id;
-                            Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
-                                if(thisClientId === _.get(evt, 'client.session.id')) {
-                                    FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
-                                        if(err) {
-                                            Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
-                                        } else {
-                                            Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
-                                        }
-                                    });
-                                }
-                            });
+                            DownloadQueue.get(self.client).addTemporaryDownload(newEntry);
                         }
                         return callback(err);
                     });
diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index b79a6411..a6d86952 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -5,14 +5,15 @@ const { Errors } = require('./enig_error');
 const {
     getMessageAreaByTag,
     hasMessageConfAndAreaRead,
+    getAllAvailableMessageAreaTags,
 } = require('./message_area');
 const FileArea = require('./file_base_area');
 const { QWKPacketWriter } = require('./qwk_mail_packet');
 const { renderSubstr } = require('./string_util');
 const Config = require('./config').get;
 const FileEntry = require('./file_entry');
-const Events = require('./events');
 const DownloadQueue = require('./download_queue');
+const { Log } = require('./logger').log;
 
 //  deps
 const async = require('async');
@@ -85,7 +86,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         });
                     },
                     (sysTempDownloadDir, callback) => {
-                        this.performExport(sysTempDownloadDir, err => {
+                        this._performExport(sysTempDownloadDir, err => {
                             return callback(err);
                         });
                     },
@@ -111,7 +112,41 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
         this.prevMenu();
     }
 
-    performExport(sysTempDownloadDir, cb) {
+    _getUserQWKExportOptions() {
+        let qwkOptions = this.client.user.getProperty('qwk_export_options');
+        try {
+            qwkOptions = JSON.parse(qwkOptions);
+        } catch(e) {
+            qwkOptions = {
+                enableQWKE              : true,
+                enableHeadersExtension  : true,
+                enableAtKludges         : true,
+                archiveFormat           : 'application/zip',
+            };
+        }
+        return qwkOptions;
+    }
+
+    _getUserQWKExportAreas() {
+        let qwkExportAreas = this.client.user.getProperty('qwk_export_msg_areas');
+        try {
+            qwkExportAreas = JSON.parse(qwkExportAreas);
+        } catch(e) {
+            //  default to all public and private without 'since'
+            qwkExportAreas = getAllAvailableMessageAreaTags(this.client).map(areaTag => {
+                return { areaTag };
+            });
+
+            //  Include user's private area
+            qwkExportAreas.push({
+                areaTag : Message.WellKnownAreaTags.Private,
+            });
+        }
+
+        return qwkExportAreas;
+    }
+
+    _performExport(sysTempDownloadDir, cb) {
         const statusView = this.viewControllers.main.getView(MciViewIds.main.status);
         const updateStatus = (status) => {
             if (statusView) {
@@ -202,10 +237,12 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
             });
         };
 
-        const packetWriter = new QWKPacketWriter({
-            user    : this.client.user,
-            bbsID   : this.config.bbsID,
-        });   //  :TODO: User configuration here
+        const packetWriter = new QWKPacketWriter(
+            Object.assign(this._getUserQWKExportOptions(), {
+                user    : this.client.user,
+                bbsID   : this.config.bbsID,
+            })
+        );
 
         packetWriter.on('warning', warning => {
             this.client.log.warn( { warning }, 'QWK packet writer warning');
@@ -232,26 +269,9 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     packetWriter.init();
                 },
                 (callback) => {
-                    //
-                    //  Fetch messages for user-configured area tags.
-                    //  - If private tag is present, we fetch this separately.
-                    //  - User property determines newscan timestamps dates if present for tag, else "all"
-                    //  - We have to fetch one area at a time in order to process message pointers/timestamps.
-                    //    ...this also allows for better progress.
-                    //
-                    //  TL;DR: for each area -> for each message
-                    //
-                    const exportAreas = [ //  :TODO: Load in something like this
-                        {
-                            areaTag : 'general',
-                            newerThanTimestamp : '2018-01-01',
-                        },
-                        {
-                            areaTag : 'fsx_gen',
-                        }
-                    ];
-
-                    async.eachSeries(exportAreas, (exportArea, nextExportArea) => {
+                    //  For each public area -> for each message
+                    const userExportAreas = this._getUserQWKExportAreas();
+                    async.eachSeries(userExportAreas, (exportArea, nextExportArea) => {
                         const area = getMessageAreaByTag(exportArea.areaTag);
                         if (!area) {
                             //  :TODO: remove from user properties - this area does not exist
@@ -291,6 +311,8 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     });
                 },
                 (callback) => {
+                    //  private messages to current user
+                    //  :TODO: Only if user property has private area tag
                     const filter = {
                         resultType          : 'id',
                         privateTagUserId    : this.client.user.userId,
@@ -339,23 +361,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     newEntry.persist(err => {
                         if(!err) {
                             //  queue it!
-                            const dlQueue = new DownloadQueue(this.client);
-                            dlQueue.add(newEntry, true);    //  true=systemFile
-
-                            //  clean up after ourselves when the session ends
-                            //  :TODO: DRY this with that in file_base_user_export
-                            const thisClientId = this.client.session.id;
-                            Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
-                                if(thisClientId === _.get(evt, 'client.session.id')) {
-                                    FileEntry.removeEntry(newEntry, { removePhysFile : true }, err => {
-                                        if(err) {
-                                            Log.warn( { fileId : newEntry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
-                                        } else {
-                                            Log.debug( { fileId : newEntry.fileId, path : outputFileName }, 'Removed temporary session download item' );
-                                        }
-                                    });
-                                }
-                            });
+                            DownloadQueue.get(this.client).addTemporaryDownload(newEntry);
                         }
                         return callback(err);
                     });
@@ -369,8 +375,6 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     updateStatus('A QWK packet has been placed in your download queue');
                 }
 
-                //  :TODO: send user to download manager with pop flags/etc.
-
                 return cb(err);
             }
         );
diff --git a/core/user_property.js b/core/user_property.js
index cc68ef09..d55a0ebe 100644
--- a/core/user_property.js
+++ b/core/user_property.js
@@ -29,7 +29,7 @@ module.exports = {
     UserComment                     : 'user_comment',               //  NYI
     AutoSignature                   : 'auto_signature',
 
-    DownloadQueue                   : 'dl_queue',                   // download_queue.js
+    DownloadQueue                   : 'dl_queue',                   // see download_queue.js
 
     FailedLoginAttempts             : 'failed_login_attempts',
     AccountLockedTs                 : 'account_locked_timestamp',
@@ -64,5 +64,6 @@ module.exports = {
     AuthFactor2OTP                  : 'auth_factor2_otp',           //  If present, OTP type for 2FA. See OTPTypes
     AuthFactor2OTPSecret            : 'auth_factor2_otp_secret',    //  Secret used in conjunction with OTP 2FA
     AuthFactor2OTPBackupCodes       : 'auth_factor2_otp_backup',    //  JSON array of backup codes
+
 };
 

From a56546cf3f7c6eff63e257ce33b0fd391b159795 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 19:57:25 -0600
Subject: [PATCH 0953/1013] Only export private messages if the user has
 elected to do so

---
 core/message_base_qwk_export.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index a6d86952..d8efcc1d 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -307,12 +307,16 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         });
                     },
                     err => {
-                        return callback(err);
+                        return callback(err, userExportAreas);
                     });
                 },
-                (callback) => {
-                    //  private messages to current user
-                    //  :TODO: Only if user property has private area tag
+                (userExportAreas, callback) => {
+                    //  Private messages to current user if the user has
+                    //  elected to export private messages
+                    if (!(userExportAreas.find(exportArea => exportArea.areaTag === Message.WellKnownAreaTags.Private))) {
+                        return callback(null);
+                    }
+
                     const filter = {
                         resultType          : 'id',
                         privateTagUserId    : this.client.user.userId,
@@ -352,7 +356,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
 
                             //  :TODO: something like this: allow to override the displayed/downloaded as filename
                             //  separate from the actual on disk filename. E.g. we could always download as "ENIGMA.QWK"
-                            visible_filename    : paths.basename(packetInfo.path),
+                            //visible_filename    : paths.basename(packetInfo.path),
                         }
                     });
 

From 681a6e84498cab7258f5152f655d3b78022181ff Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 20:09:48 -0600
Subject: [PATCH 0954/1013] Add theme for QWK export

---
 art/themes/luciano_blocktronics/theme.hjson | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 6d8490dc..d812a9c3 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -288,6 +288,17 @@
 				}
 			}
 
+			qwkExportPacketCurrentConfig: {
+				mci: {
+					TL1: {
+						width: 70
+					}
+					TL2: {
+						width: 70
+					}
+				}
+			}
+
 			mailMenuCreateMessage: {
 				0: {
 					mci: {

From c8472fe2f07666dd3121ef0f4bb8596f18060d53 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 20:13:50 -0600
Subject: [PATCH 0955/1013] Add some asserts for QWK export

---
 art/themes/luciano_blocktronics/offline_mail.ans | Bin 0 -> 3636 bytes
 .../luciano_blocktronics/qwk_export_progress.ans | Bin 0 -> 240 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 art/themes/luciano_blocktronics/offline_mail.ans
 create mode 100644 art/themes/luciano_blocktronics/qwk_export_progress.ans

diff --git a/art/themes/luciano_blocktronics/offline_mail.ans b/art/themes/luciano_blocktronics/offline_mail.ans
new file mode 100644
index 0000000000000000000000000000000000000000..ffd21e9e933ad5dee09db050336670438c4bd08a
GIT binary patch
literal 3636
zcmb`JL2lee5Jly!fUL3!G8-O&!;v^Pv{D9kAiz!n1j$A#A)1BY(6Rz4%CRI}BS#<+
z-X!q*zq*?odjw>WF-)=9)m8uhs;=(Ed3|zJpRDTcuv(liPgYGgEY6RbZq%Q;>-l-C
zXWb3M5W{i7LX2g$)Dn-FTb{6Zz?VM^<ACLQ^KUqByC2`Yd3*N5>+0R<*<0Jx9aA`x
z#cJJERSXyB#~VXvG%p~IWal}WL*t%+37y~hoPZ~&@j=fZ2Mv)GNt^N>TtsE=Z|ujB
z|G1gv`#vmi7avE)&8y8g4q&g~%Q!^fWm-3~u#c#L2iGz!nEJyi@W!-sD8wqQ#MiQW
z;6>i0eUJ`2d9svRGaqQW?$EZ~WH`exT4qdR*6xkDP)%Vbg(fT!Fs-b5;qLzf+9DWO
zc6q2o0=(q{!)nz%=-Xya*Iy`*L<2KJo-f8P%L=VYstCRtHp!P5j6=`A0#bq}m{Qth
z9H?HRBZW%RkM*|V?Ui1zLRJ22sgXTBpR?*I$=2_t)?RiZJ5#gBCdWQqciT{+?Y4h?
zy#C|1y19Q}eZ2VX{q|Oy$B0Bi0F5~VoV!OnLq)b(c?B0`)@tVb0ClGhWrkprOb~Wp
zsiSfuwh*wZ3DaHjBuLx+d9}T-F0b!D{C<6LS>4=i@3vS$tQcz$3xj^^p)AJ7q4GX*
zR2cz+XHKn#q`>M5?gThYD;Up~rk&t?u8U@t_a@buVzk}O-PLV%dtG%GS0C&tW!>Be
zs^KGGA7w5uCL=JSULa|!OppTp$bQ7AQFzzYQ2_C`VW_kRl1n+$&R1h9>2ZT*?|;TN
zmB1q@q&ulOsVnalYIkX%DnwXgiI1C2w2k5-x=`AGtYYJ-NpqAWm~IST5|#kTNw{w6
z;I6ZUa$IxF;Egt&HksSPOa|1op}Sz1?hRicsk=}+sdq%JD6|rWC+%Ow)iJ30000|4
z`UB5K2?-35^?XVwC?``sOcD~lroB`}?kwL@`5<{dL&>VJh^dSfnWIVh0S1fL?z{2T
zc(TY?WDnp{#ik_4&!oGFD*)&w(xoj(W=WpmAWaY79#nF};2&!h^Bi15&zQ5Hm@ZQ@
zQo8p<jj(&7O6d|+@dy`jl^Oz+Knj>bS$1W@9l;clN++fJmS%LiE!}Q>OOQ`f8F8w+
z2Y-Z~Z?JG$o$%*8%e6_iy6rem-gCTrD1Pu)WGoy%k@XN*ZOJCsoM0M=cA&at__A9N
zutY_O=R8wdsJ;kC;7rE_!JQNnRI=<sA5&EDtbJ(<WmHoBV4O~>h8_XPCHK4!%z|QG
zGUkvHDU~g+_Mo})EnOS4Ku!bkT+6OVF}DaRXWbvdvxMb75mRQWjkqtWBJfMWjYoSZ
z=$fB>LO^>b2(<aiv}0zLILN};E14teB%SbuFO#K`=4_d>{qs_mCe1o=Clz{g#l|~p
zgS{$6&Nazlm+sPF_l;4t{AK9O^@$^RAN0tO*SR{ACJ9v@&DUnS@<zaL;4o8?=i)~X
zb55qT06%e|qq*%X+w8^UGNl{weTC94(ak}np9)$!8-iAlfQPuLIFrSO87J5vb^BE}
zn9XMPthaV56meGPINs#cXEw~t)<#u0HWNvP9gB#Xq@i_dm+QjC_mofsA&sWy>??;f
zB?Z^3U*b|8@9u^+Xg5rziwPdoh!4O0`Sh2~>$=9r|MhF?rml~d_1|9|9K3k()4?|f
S{(XJ+-Mi}7?@wb?o}U2vk;_N`

literal 0
HcmV?d00001

diff --git a/art/themes/luciano_blocktronics/qwk_export_progress.ans b/art/themes/luciano_blocktronics/qwk_export_progress.ans
new file mode 100644
index 0000000000000000000000000000000000000000..dcde7d82c0d3f83d257ce80062a0dc20737b7420
GIT binary patch
literal 240
zcmb1+Hn27^ur@Z&<&uszHpo?wjyAM5Hp=}6WEh*}I)!@rxOn=xD+GpnD+D+?d%K2!
zBn)zOA@Tt}u8zU33gM2PU~!;6E-s)9&_J_X)es*;AP-0x0SyIljku(O9YdX64Ga{h
l2aF7i3=B*S4NDmq7#JA?7}$U`5D0rZ`6`6DJ3@GH5&)`jD?k7M

literal 0
HcmV?d00001


From b562ba34b0ff26848b66ab73f111bd948df26af0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 20:31:35 -0600
Subject: [PATCH 0956/1013] Fix bad log

---
 core/download_queue.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/download_queue.js b/core/download_queue.js
index 1eb4023e..d80ddf34 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -92,9 +92,9 @@ module.exports = class DownloadQueue {
                 FileEntry.removeEntry(entry, { removePhysFile : true }, err => {
                     const Log = require('./logger').log;
                     if(err) {
-                        Log.warn( { fileId : entry.fileId, path : outputFileName }, 'Failed removing temporary session download' );
+                        Log.warn( { fileId : entry.fileId, path : entry.filePath }, 'Failed removing temporary session download' );
                     } else {
-                        Log.debug( { fileId : entry.fileId, path : outputFileName }, 'Removed temporary session download item' );
+                        Log.debug( { fileId : entry.fileId, path : entry.filePath }, 'Removed temporary session download item' );
                     }
                 });
             }

From fbec46d1b91d3d93c88ed29e71b15f53388c983c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 11 May 2020 21:54:20 -0600
Subject: [PATCH 0957/1013] Fix Message.findMessages() if private tag passed
 in, fix QWK export

---
 core/message.js                 | 29 ++++++++++++++++-------------
 core/message_base_qwk_export.js |  5 ++++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/core/message.js b/core/message.js
index c763bbd2..b410f105 100644
--- a/core/message.js
+++ b/core/message.js
@@ -288,7 +288,7 @@ module.exports = class Message {
         filter.extraFields = []
 
         filter.privateTagUserId = <userId> - if set, only private messages belonging to <userId> are processed
-        - any other areaTag or confTag filters will be ignored
+        - areaTags filter ignored
         - if NOT present, private areas are skipped
 
         *=NYI
@@ -364,20 +364,23 @@ module.exports = class Message {
                 )`);
         } else {
             if(filter.areaTag && filter.areaTag.length > 0) {
-                if(Array.isArray(filter.areaTag)) {
-                    const areaList = filter.areaTag
-                        .filter(t => t != Message.WellKnownAreaTags.Private)
-                        .map(t => `"${t}"`).join(', ');
-                    if(areaList.length > 0) {
-                        appendWhereClause(`m.area_tag IN(${areaList})`);
-                    }
-                } else if(_.isString(filter.areaTag) && Message.WellKnownAreaTags.Private !== filter.areaTag) {
-                    appendWhereClause(`m.area_tag = "${filter.areaTag}"`);
+                if (!Array.isArray(filter.areaTag)) {
+                    filter.areaTag = [ filter.areaTag ];
                 }
-            }
 
-            //  explicit exclude of Private
-            appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`, 'AND');
+                const areaList = filter.areaTag
+                    .filter(t => t !== Message.WellKnownAreaTags.Private)
+                    .map(t => `"${t}"`).join(', ');
+                if(areaList.length > 0) {
+                    appendWhereClause(`m.area_tag IN(${areaList})`);
+                } else {
+                    //  nothing to do; no areas remain
+                    return cb(null, []);
+                }
+            } else {
+                //  explicit exclude of Private
+                appendWhereClause(`m.area_tag != "${Message.WellKnownAreaTags.Private}"`, 'AND');
+            }
         }
 
         if(_.isNumber(filter.replyToMessageId)) {
diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index d8efcc1d..dcdd605e 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -270,7 +270,10 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                 },
                 (callback) => {
                     //  For each public area -> for each message
-                    const userExportAreas = this._getUserQWKExportAreas();
+                    const userExportAreas = this._getUserQWKExportAreas()
+                        .filter(exportArea => {
+                            return exportArea.areaTag !== Message.WellKnownAreaTags.Private;
+                        });
                     async.eachSeries(userExportAreas, (exportArea, nextExportArea) => {
                         const area = getMessageAreaByTag(exportArea.areaTag);
                         if (!area) {

From f63464c501c35274ac12c8068940e2ed0c53a7ed Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 12 May 2020 09:12:55 -0600
Subject: [PATCH 0958/1013] Very slight display improvements, include conf in
 info

---
 core/message_base_qwk_export.js | 9 ++++++---
 core/qwk_mail_packet.js         | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index dcdd605e..6d748074 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -4,6 +4,7 @@ const Message = require('./message');
 const { Errors } = require('./enig_error');
 const {
     getMessageAreaByTag,
+    getMessageConferenceByTag,
     hasMessageConfAndAreaRead,
     getAllAvailableMessageAreaTags,
 } = require('./message_area');
@@ -216,7 +217,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                             message,
                             step    : 'message',
                             total   : messageIds.length,
-                            status  : `Writing message ${current} / ${messageIds.length}`,
+                            status  : `${_.truncate(message.subject, { length : 25 })} (${current} / ${messageIds.length})`,
                         };
 
                         progressHandler(progress, err => {
@@ -276,7 +277,8 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         });
                     async.eachSeries(userExportAreas, (exportArea, nextExportArea) => {
                         const area = getMessageAreaByTag(exportArea.areaTag);
-                        if (!area) {
+                        const conf = getMessageConferenceByTag(area.confTag);
+                        if (!area || !conf) {
                             //  :TODO: remove from user properties - this area does not exist
                             this.client.log.warn({ areaTag : exportArea.areaTag }, 'Cannot QWK export area as it does not exist');
                             return nextExportArea(null);
@@ -288,9 +290,10 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         }
 
                         const progress = {
+                            conf,
                             area,
                             step    : 'next_area',
-                            status  : `Gathering messages in ${area.name}...`,
+                            status  : `Gathering in ${conf.name} - ${area.name}...`,
                         };
 
                         progressHandler(progress, err => {
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index 3d613ca4..c89ae714 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -5,6 +5,7 @@ const { splitTextAtTerms } = require('./string_util');
 const {
     getMessageConfTagByAreaTag,
     getMessageAreaByTag,
+    getMessageConferenceByTag,
     getAllAvailableMessageAreaTags,
 } = require('./message_area');
 const StatLog = require('./stat_log');
@@ -1370,10 +1371,9 @@ class QWKPacketWriter extends EventEmitter {
         //  map areas as conf #\r\nDescription\r\n pairs
         areas.forEach(area => {
             const conferenceNumber = this._getMessageConferenceNumberByAreaTag(area.areaTag);
-            let desc = area.name;
-            if (area.desc) {
-                desc += ` - ${area.desc}`
-            }
+            const conf = getMessageConferenceByTag(area.confTag);
+            const desc = `${conf.name} - ${area.name}`;
+
             controlStream.write(`${conferenceNumber}\r\n`);
             controlStream.write(`${desc}\r\n`);
         });

From db91d6d6b7ec7be29e76eddcb8f5dfca89a88dfb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 12 May 2020 18:53:47 -0600
Subject: [PATCH 0959/1013] * Update QWK area pointers upon export * Specialize
 0 messages exported

---
 core/enig_error.js              |  1 +
 core/message_base_qwk_export.js | 68 +++++++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/core/enig_error.js b/core/enig_error.js
index be025214..4d88cfa1 100644
--- a/core/enig_error.js
+++ b/core/enig_error.js
@@ -38,6 +38,7 @@ exports.Errors = {
     MissingMci          : (reason, reasonCode)  => new EnigError('Missing required MCI code(s)', -32009, reason, reasonCode),
     BadLogin            : (reason, reasonCode)  => new EnigError('Bad login attempt', -32010, reason, reasonCode),
     UserInterrupt       : (reason, reasonCode)  => new EnigError('User interrupted', -32011, reason, reasonCode),
+    NothingToDo         : (reason, reasonCode)  => new EnigError('Nothing to do', -32012, reason, reasonCode),
 };
 
 exports.ErrorReasons = {
diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index 6d748074..53682471 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -14,7 +14,7 @@ const { renderSubstr } = require('./string_util');
 const Config = require('./config').get;
 const FileEntry = require('./file_entry');
 const DownloadQueue = require('./download_queue');
-const { Log } = require('./logger').log;
+const { getISOTimestampString } = require('./database');
 
 //  deps
 const async = require('async');
@@ -23,6 +23,7 @@ const fse = require('fs-extra');
 const temptmp = require('temptmp');
 const paths = require('path');
 const UUIDv4 = require('uuid/v4');
+const moment = require('moment');
 
 const FormIds = {
     main    : 0,
@@ -37,6 +38,11 @@ const MciViewIds = {
     }
 };
 
+const UserProperties = {
+    ExportOptions   : 'qwk_export_options',
+    ExportAreas     : 'qwk_export_msg_areas',
+};
+
 exports.moduleInfo = {
     name    : 'QWK Export',
     desc    : 'Exports a QWK Packet for download',
@@ -114,7 +120,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
     }
 
     _getUserQWKExportOptions() {
-        let qwkOptions = this.client.user.getProperty('qwk_export_options');
+        let qwkOptions = this.client.user.getProperty(UserProperties.ExportOptions);
         try {
             qwkOptions = JSON.parse(qwkOptions);
         } catch(e) {
@@ -129,9 +135,14 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
     }
 
     _getUserQWKExportAreas() {
-        let qwkExportAreas = this.client.user.getProperty('qwk_export_msg_areas');
+        let qwkExportAreas = this.client.user.getProperty(UserProperties.ExportAreas);
         try {
-            qwkExportAreas = JSON.parse(qwkExportAreas);
+            qwkExportAreas = JSON.parse(qwkExportAreas).map(exportArea => {
+                if (exportArea.newerThanTimestamp) {
+                    exportArea.newerThanTimestamp = moment(exportArea.newerThanTimestamp);
+                }
+                return exportArea;
+            });
         } catch(e) {
             //  default to all public and private without 'since'
             qwkExportAreas = getAllAvailableMessageAreaTags(this.client).map(areaTag => {
@@ -173,13 +184,13 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     case 'next_area' :
                         updateStatus(state.status);
                         updateProgressBar(0, 0);
-                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.area);
+                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state);
                         break;
 
                     case 'message' :
                         updateStatus(state.status);
                         updateProgressBar(state.current, state.total);
-                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state.message);
+                        this.updateCustomViewTextsWithFilter('main', MciViewIds.main.customRangeStart, state);
                         break;
 
                     default :
@@ -198,6 +209,7 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
             }
         };
 
+        let totalExported = 0;
         const processMessagesWithFilter = (filter, cb) => {
             Message.findMessages(filter, (err, messageIds) => {
                 if (err) {
@@ -213,11 +225,12 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         }
 
                         const progress = {
-                            current,
                             message,
-                            step    : 'message',
-                            total   : messageIds.length,
-                            status  : `${_.truncate(message.subject, { length : 25 })} (${current} / ${messageIds.length})`,
+                            step        : 'message',
+                            total       : ++totalExported,
+                            areaCurrent : current,
+                            areaCount   : messageIds.length,
+                            status      : `${_.truncate(message.subject, { length : 25 })} (${current} / ${messageIds.length})`,
                         };
 
                         progressHandler(progress, err => {
@@ -271,11 +284,13 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                 },
                 (callback) => {
                     //  For each public area -> for each message
-                    const userExportAreas = this._getUserQWKExportAreas()
+                    const userExportAreas = this._getUserQWKExportAreas();
+
+                    const publicExportAreas = userExportAreas
                         .filter(exportArea => {
                             return exportArea.areaTag !== Message.WellKnownAreaTags.Private;
                         });
-                    async.eachSeries(userExportAreas, (exportArea, nextExportArea) => {
+                    async.eachSeries(publicExportAreas, (exportArea, nextExportArea) => {
                         const area = getMessageAreaByTag(exportArea.areaTag);
                         const conf = getMessageConferenceByTag(area.confTag);
                         if (!area || !conf) {
@@ -319,15 +334,15 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                 (userExportAreas, callback) => {
                     //  Private messages to current user if the user has
                     //  elected to export private messages
-                    if (!(userExportAreas.find(exportArea => exportArea.areaTag === Message.WellKnownAreaTags.Private))) {
+                    const privateExportArea = userExportAreas.find(exportArea => exportArea.areaTag === Message.WellKnownAreaTags.Private);
+                    if (!privateExportArea) {
                         return callback(null);
                     }
 
                     const filter = {
                         resultType          : 'id',
                         privateTagUserId    : this.client.user.userId,
-                        //  :TODO: newerThanTimestamp for private messages
-                        //newerThanTimestamp  : exportArea.newerThanTimestamp
+                        newerThanTimestamp  : privateExportArea.newerThanTimestamp,
                     };
                     return processMessagesWithFilter(filter, callback);
                 },
@@ -344,6 +359,10 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                     packetWriter.finish(this.tempPacketDir);
                 },
                 (packetInfo, callback) => {
+                    if (0 === totalExported) {
+                        return callback(Errors.NothingToDo('No messages exported'));
+                    }
+
                     const sysDownloadPath = paths.join(sysTempDownloadDir, this.tempName);
                     fse.move(packetInfo.path, sysDownloadPath, err => {
                         return callback(null, sysDownloadPath, packetInfo);
@@ -375,7 +394,21 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
                         }
                         return callback(err);
                     });
-                }
+                },
+                (callback) => {
+                    //  update user's export area dates; they can always change/reset them again
+                    const updatedUserExportAreas = this._getUserQWKExportAreas().map(exportArea => {
+                        return Object.assign(exportArea, {
+                            newerThanTimestamp : getISOTimestampString(),
+                        });
+                    });
+
+                    return this.client.user.persistProperty(
+                        UserProperties.ExportAreas,
+                        JSON.stringify(updatedUserExportAreas),
+                        callback
+                    );
+                },
             ],
             err => {
                 this.client.startIdleMonitor(); //  re-enable
@@ -383,6 +416,9 @@ exports.getModule = class MessageBaseQWKExport extends MenuModule {
 
                 if (!err) {
                     updateStatus('A QWK packet has been placed in your download queue');
+                } else if (err.code === Errors.NothingToDo().code) {
+                    updateStatus('No messages to export with current criteria');
+                    err = null;
                 }
 
                 return cb(err);

From 714f32f6956cf57361dafedaec98ac3df5741b71 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 May 2020 19:04:11 -0600
Subject: [PATCH 0960/1013] Add Node.js version to startup log

---
 core/bbs.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/bbs.js b/core/bbs.js
index 98ba1b7a..e29b8d27 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -189,8 +189,12 @@ function initialize(cb) {
             function basicInit(callback) {
                 logger.init();
                 logger.log.info(
-                    { version : require('../package.json').version },
-                    '**** ENiGMA½ Bulletin Board System Starting Up! ****');
+                    {
+                        version     : require('../package.json').version,
+                        nodeVersion : process.version,
+                    },
+                    '**** ENiGMA½ Bulletin Board System Starting Up! ****'
+                );
 
                 process.on('SIGINT', shutdownSystem);
 

From fd6bb47427ef603736a5a3bb0e477c232b623934 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 May 2020 19:30:57 -0600
Subject: [PATCH 0961/1013] Fix yet another bug with node IDs * Pick
 appropriate slot * Log nodeId vs clientId/etc. for less confusion

---
 core/client.js              |  2 +-
 core/client_connections.js  | 24 ++++++++++++------------
 core/download_queue.js      |  4 ++--
 core/login_server_module.js |  4 ++--
 core/user_login.js          |  9 +++++----
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/client.js b/core/client.js
index a6cfae52..40872fa2 100644
--- a/core/client.js
+++ b/core/client.js
@@ -96,7 +96,7 @@ function Client(/*input, output*/) {
 
     Object.defineProperty(this, 'node', {
         get : function() {
-            return self.session.id + 1;
+            return self.session.id;
         }
     });
 
diff --git a/core/client_connections.js b/core/client_connections.js
index e2c8d577..d1a6be6e 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -61,27 +61,27 @@ function getActiveConnectionList(authUsersOnly) {
 
 function addNewClient(client, clientSock) {
     //
-    //  Assign ID/client ID to next lowest & available #
+    //  Find a node ID "slot"
     //
-    let id = 0;
-    for(let i = 0; i < clientConnections.length; ++i) {
-        if(clientConnections[i].id > id) {
-            break;
+    let nodeId;
+    for (nodeId = 1; nodeId < Number.MAX_SAFE_INTEGER; ++nodeId) {
+        const existing = clientConnections.find(client => nodeId === client.node);
+        if (!existing) {
+            break;  //  available slot
         }
-        id++;
     }
 
-    client.session.id = id;
-    const remoteAddress = client.remoteAddress  = clientSock.remoteAddress;
+    client.session.id = nodeId;
+    const remoteAddress = client.remoteAddress = clientSock.remoteAddress;
     //  create a unique identifier one-time ID for this session
-    client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ id, moment().valueOf() ]);
+    client.session.uniqueId = new hashids('ENiGMA½ClientSession').encode([ nodeId, moment().valueOf() ]);
 
     clientConnections.push(client);
     clientConnections.sort( (c1, c2) => c1.session.id - c2.session.id);
 
     //  Create a client specific logger
     //  Note that this will be updated @ login with additional information
-    client.log = logger.log.child( { clientId : id, sessionId : client.session.uniqueId } );
+    client.log = logger.log.child( { nodeId, sessionId : client.session.uniqueId } );
 
     const connInfo = {
         remoteAddress   : remoteAddress,
@@ -101,7 +101,7 @@ function addNewClient(client, clientSock) {
         { client : client, connectionCount : clientConnections.length }
     );
 
-    return id;
+    return nodeId;
 }
 
 function removeClient(client) {
@@ -114,7 +114,7 @@ function removeClient(client) {
         logger.log.info(
             {
                 connectionCount : clientConnections.length,
-                clientId        : client.session.id
+                nodeId          : client.node,
             },
             'Client disconnected'
         );
diff --git a/core/download_queue.js b/core/download_queue.js
index d80ddf34..4380ded1 100644
--- a/core/download_queue.js
+++ b/core/download_queue.js
@@ -86,9 +86,9 @@ module.exports = class DownloadQueue {
         this.add(entry, true);    //  true=systemFile
 
         //  clean up after ourselves when the session ends
-        const thisClientId = this.client.session.id;
+        const thisUniqueId = this.client.session.uniqueId;
         Events.once(Events.getSystemEvents().ClientDisconnected, evt => {
-            if(thisClientId === _.get(evt, 'client.session.id')) {
+            if(thisUniqueId === _.get(evt, 'client.session.uniqueId')) {
                 FileEntry.removeEntry(entry, { removePhysFile : true }, err => {
                     const Log = require('./logger').log;
                     if(err) {
diff --git a/core/login_server_module.js b/core/login_server_module.js
index a08abfe9..da3e06de 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -72,12 +72,12 @@ module.exports = class LoginServerModule extends ServerModule {
         });
 
         client.on('error', err => {
-            logger.log.info({ clientId : client.session.id, error : err.message }, 'Connection error');
+            logger.log.info({ nodeId : client.node, error : err.message }, 'Connection error');
         });
 
         client.on('close', err => {
             const logFunc = err ? logger.log.info : logger.log.debug;
-            logFunc( { clientId : client.session.id }, 'Connection closed');
+            logFunc( { nodeId : client.node }, 'Connection closed');
 
             clientConns.removeClient(client);
         });
diff --git a/core/user_login.js b/core/user_login.js
index 99faa1a2..3db6b5cc 100644
--- a/core/user_login.js
+++ b/core/user_login.js
@@ -81,9 +81,9 @@ function userLogin(client, username, password, options, cb) {
         if(existingClientConnection) {
             client.log.info(
                 {
-                    existingClientId    : existingClientConnection.session.id,
-                    username            : user.username,
-                    userId              : user.userId
+                    existingNodeId  : existingClientConnection.node,
+                    username        : user.username,
+                    userId          : user.userId
                 },
                 'Already logged in'
             );
@@ -97,11 +97,12 @@ function userLogin(client, username, password, options, cb) {
         //  update client logger with addition of username
         client.log = logger.log.child(
             {
-                clientId    : client.log.fields.clientId,
+                nodeId      : client.log.fields.nodeId,
                 sessionId   : client.log.fields.sessionId,
                 username    : user.username,
             }
         );
+
         client.log.info('Successful login');
 
         //  User's unique session identifier is the same as the connection itself

From b7cac2d38f517738528e4c0ff5cd62efc2b52d73 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 13 May 2020 20:19:45 -0600
Subject: [PATCH 0962/1013] Fix sliceAtEOF() bug causing short ANSI's to get
 borked when e.g. display achievements

---
 core/art.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/art.js b/core/art.js
index 38594985..0ff4835f 100644
--- a/core/art.js
+++ b/core/art.js
@@ -49,7 +49,7 @@ function getFontNameFromSAUCE(sauce) {
 
 function sliceAtEOF(data, eofMarker) {
     let eof         = data.length;
-    const stopPos   = Math.max(data.length - (256), 0); //  256 = 2 * sizeof(SAUCE)
+    const stopPos   = Math.max(data.length - 256, 0); //  256 = 2 * sizeof(SAUCE)
 
     for(let i = eof - 1; i > stopPos; i--) {
         if(eofMarker === data[i]) {
@@ -57,9 +57,16 @@ function sliceAtEOF(data, eofMarker) {
             break;
         }
     }
-    if(eof === data.length || eof < 128) {
+
+    if (eof === data.length) {
+        return data;    //  nothing to do
+    }
+
+    //  try to prevent goofs
+    if (eof < 128 && 'SAUCE00' !== data.slice(eof + 1, eof + 8).toString()) {
         return data;
     }
+
     return data.slice(0, eof);
 }
 

From 60955cac1155395db615491179adbcf00ba5e398 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 19:46:00 -0600
Subject: [PATCH 0963/1013] Fix Message.uuid vs Message.messageUuid * Just use
 Message.messageUuid which better aligns with message_uuid in DB, messageId,
 etc. * Keep uuid as property for now just in case

---
 core/message.js                 | 29 ++++++++++++++++++++++-------
 core/msg_area_post_fse.js       |  2 +-
 core/qwk_mail_packet.js         |  2 +-
 core/scanner_tossers/ftn_bso.js | 12 ++++++------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/core/message.js b/core/message.js
index b410f105..b45e868c 100644
--- a/core/message.js
+++ b/core/message.js
@@ -107,15 +107,23 @@ const MESSAGE_ROW_MAP = {
 module.exports = class Message {
     constructor(
         {
-            messageId = 0, areaTag = Message.WellKnownAreaTags.Invalid, uuid, replyToMsgId = 0,
-            toUserName = '', fromUserName = '', subject = '', message = '', modTimestamp = moment(),
-            meta, hashTags = [],
+            messageId = 0,
+            areaTag = Message.WellKnownAreaTags.Invalid,
+            uuid,
+            replyToMsgId = 0,
+            toUserName = '',
+            fromUserName = '',
+            subject = '',
+            message = '',
+            modTimestamp = moment(),
+            meta,
+            hashTags = [],
         } = { }
     )
     {
         this.messageId      = messageId;
         this.areaTag        = areaTag;
-        this.uuid           = uuid;
+        this.messageUuid    = uuid;
         this.replyToMsgId   = replyToMsgId;
         this.toUserName     = toUserName;
         this.fromUserName   = fromUserName;
@@ -134,6 +142,10 @@ module.exports = class Message {
         this.hashTags       = hashTags;
     }
 
+    get uuid() {    //  deprecated, will be removed in the near future
+        return this.messageUuid;
+    }
+
     isValid() { return true; }  //  :TODO: obviously useless; look into this or remove it
 
     static isPrivateAreaTag(areaTag) {
@@ -684,8 +696,8 @@ module.exports = class Message {
                 function storeMessage(trans, callback) {
                     //  generate a UUID for this message if required (general case)
                     const msgTimestamp = moment();
-                    if(!self.uuid) {
-                        self.uuid = Message.createMessageUUID(
+                    if(!self.messageUuid) {
+                        self.messageUuid = Message.createMessageUUID(
                             self.areaTag,
                             msgTimestamp,
                             self.subject,
@@ -696,7 +708,10 @@ module.exports = class Message {
                     trans.run(
                         `INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
                         VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
-                        [ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
+                        [
+                            self.areaTag, self.messageUuid, self.replyToMsgId, self.toUserName,
+                            self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp)
+                        ],
                         function inserted(err) {    //  use non-arrow function for 'this' scope
                             if(!err) {
                                 self.messageId = this.lastID;
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index f47717b2..0c92bbfb 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -50,7 +50,7 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                     } else {
                         //  note: not logging 'from' here as it's part of client.log.xxxx()
                         self.client.log.info(
-                            { to : msg.toUserName, subject : msg.subject, uuid : msg.uuid },
+                            { to : msg.toUserName, subject : msg.subject, uuid : msg.messageUuid },
                             'Message persisted'
                         );
                     }
diff --git a/core/qwk_mail_packet.js b/core/qwk_mail_packet.js
index c89ae714..de42abf8 100644
--- a/core/qwk_mail_packet.js
+++ b/core/qwk_mail_packet.js
@@ -1491,7 +1491,7 @@ class QWKPacketWriter extends EventEmitter {
             Conference      : message.isPrivate() ? '0' : getMessageConfTagByAreaTag(message.areaTag),
 
             //  ENiGMA Headers
-            MessageUUID     : message.uuid,
+            MessageUUID     : message.messageUuid,
             ModTimestamp    : message.modTimestamp.format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
             AreaTag         : message.areaTag,
         };
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 488dcc8e..17cd61b8 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -1215,7 +1215,7 @@ function FTNMessageScanTossModule() {
                     //
                     if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
                         //  just generate a UUID & therefor always allow for dupes
-                        message.uuid = uuidV4();
+                        message.messageUuid = uuidV4();
                     }
 
                     return callback(null);
@@ -1378,7 +1378,7 @@ function FTNMessageScanTossModule() {
                     }
                 }
 
-                message.uuid = Message.createMessageUUID(
+                message.messageUuid = Message.createMessageUUID(
                     localAreaTag,
                     message.modTimestamp,
                     message.subject,
@@ -1398,7 +1398,7 @@ function FTNMessageScanTossModule() {
                         if('SQLITE_CONSTRAINT' === err.code || 'DUPE_MSGID' === err.code) {
                             const msgId = _.has(message.meta, 'FtnKludge.MSGID') ? message.meta.FtnKludge.MSGID : 'N/A';
                             Log.info(
-                                { area : localAreaTag, subject : message.subject, uuid : message.uuid, MSGID : msgId },
+                                { area : localAreaTag, subject : message.subject, uuid : message.messageUuid, MSGID : msgId },
                                 'Not importing non-unique message');
 
                             return next(null);
@@ -2349,7 +2349,7 @@ FTNMessageScanTossModule.prototype.record = function(message) {
         return;
     }
 
-    const info = { uuid : message.uuid, subject : message.subject };
+    const info = { uuid : message.messageUuid, subject : message.subject };
 
     function exportLog(err) {
         if(err) {
@@ -2363,7 +2363,7 @@ FTNMessageScanTossModule.prototype.record = function(message) {
         Object.assign(info, { type : 'NetMail' } );
 
         if(this.exportingStart()) {
-            this.exportNetMailMessagesToUplinks( [ message.uuid ], err => {
+            this.exportNetMailMessagesToUplinks( [ message.messageUuid ], err => {
                 this.exportingEnd( () => exportLog(err) );
             });
         }
@@ -2376,7 +2376,7 @@ FTNMessageScanTossModule.prototype.record = function(message) {
         }
 
         if(this.exportingStart()) {
-            this.exportEchoMailMessagesToUplinks( [ message.uuid ], areaConfig, err => {
+            this.exportEchoMailMessagesToUplinks( [ message.messageUuid ], areaConfig, err => {
                 this.exportingEnd( () => exportLog(err) );
             });
         }

From 8ee3317bd2e47234fc2cb6c7d345fec30dc62bb3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 20:08:02 -0600
Subject: [PATCH 0964/1013] Updates on art docs

---
 docs/art/general.md | 67 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/docs/art/general.md b/docs/art/general.md
index a0620de3..18c438ec 100644
--- a/docs/art/general.md
+++ b/docs/art/general.md
@@ -7,13 +7,36 @@ One of the most basic elements of BBS customization is through it's artwork. ENi
 
 As a general rule, art files live in one of two places:
 
-1. The `art/general` directory. This is where you place command non-themed art files.
-2. Within a theme such as `art/themes/super_fancy_theme`.
+1. The `art/general` directory. This is where you place common/non-themed art files.
+2. Within a _theme_ such as `art/themes/super_fancy_theme`.
 
-### Menu Entries
-While art can be displayed programmatically such as from a custom module, the most basic and common form is via `menu.hjson` entries. This usually falls into one of two forms: a "standard" entry where a single `art` spec is utilized or a entry for a custom module where multiple pieces are declared and used. The second style usually takes the form of a `config.art` block with two or more entries.
+### Art in Menus
+While art can be displayed programmatically such as from a custom module, the most basic and common form is via `menu.hjson` entries. This usually falls into one of two forms.
 
-A menu entry has a few elements that control how art is choosen and displayed. First, the `art` *spec* tells teh system how to look for the art asset. Second, the `config` block can further control aspecs of lookup and display:
+**Form 1**: A "standard" entry where a single `art` spec is utilized:
+```hjson
+{
+    mainMenu: {
+        art: main_menu.ans
+    }
+}
+```
+
+**Form 2**: An entry for a custom module where multiple pieces are declared and used. The second style usually takes the form of a `config.art` block with two or more entries:
+```hjson
+{
+    nodeMessage: {
+        config: {
+            art: {
+                header: node_msg_header
+                footer: node_msg_footer
+            }
+        }
+    }
+}
+```
+
+A menu entry has a few elements that control how art is selected and displayed. First, the `art` *spec* tells the system how to look for the art asset. Second, the `config` block can further control aspects of lookup and display. The following table describes such entries:
 
 | Item | Description|
 |------|------------|
@@ -23,13 +46,13 @@ A menu entry has a few elements that control how art is choosen and displayed. F
 | `cls` | Clear the screen before display if set to `true`. |
 | `random` | Set to `false` to explicitly disable random lookup. |
 | `types` | An optional array of types (aka file extensions) to consider for lookup. For example : `[ '.ans', '.asc' ]` |
-| `readSauce` | May be set to `false` if you need to explictly disable SAUCE support. |
+| `readSauce` | May be set to `false` if you need to explicitly disable SAUCE support. |
 
 #### Art Spec
-It was mentioned that the `art` member is a *spec*. The value of a `art` member controls how the system looks for an asset. The following forms are supported:
+In the section above it is mentioned that the `art` member is a *spec*. The value of a `art` spec controls how the system looks for an asset. The following forms are supported:
 
 * `FOO`: The system will look for `FOO.ANS`, `FOO.ASC`, `FOO.TXT`, etc. using the default search path. Unless otherwise specified if `FOO1.ANS`, `FOO2.ANS`, and so on exist, a random selection will be made.
-* `FOO.ANS`: By specifying an extension, only that type will be searched for.
+* `FOO.ANS`: By specifying an extension, only the exact match will be searched for.
 * `rel/path/to/BAR.ANS`: Only match a path (relative to the system's `art` directory).
 * `/path/to/BAZ.ANS`: Exact path only.
 
@@ -40,8 +63,27 @@ ENiGMA½ uses a fallback system for art selection. When a menu entry calls for a
 3. In the system default theme directory.
 4. In the `art/general` directory.
 
+#### ACS-Driven Conditionals
+The [ACS](/docs/configuration/acs.md) system can be used to make conditional art selection choices. To do this, provide an array of possible values in your art spec. As an example:
+```hjson
+{
+    fancyMenu: {
+        art: [
+            {
+                acs: GM[l33t]
+                art: leet_art.ans
+            }
+            {
+                //  default
+                art: newb.asc
+            }
+        ]
+    }
+}
+```
+
 #### SyncTERM Style Fonts
-ENiGMA½ can set a [SyncTERM](http://syncterm.bbsdev.net/) style font for art display. This is supported by many popular BBS terminals besides just SyncTERM and is common for displaying Amiga style fonts for example. The system will use the `font` specifier or look for a font declared in an artworks SAUCE record (unless `readSauce` is `false`).
+ENiGMA½ can set a [SyncTERM](http://syncterm.bbsdev.net/) style font for art display. This is supported by many other popular BBS terminals as well. A common usage is for displaying Amiga style fonts for example. The system will use the `font` specifier or look for a font declared in an artworks SAUCE record (unless `readSauce` is `false`).
 
 The most common fonts are probably as follows:
 
@@ -96,7 +138,7 @@ See [this specification](https://github.com/protomouse/synchronet/blob/master/sr
 #### SyncTERM Style Baud Rates
 The `baudRate` member can set a [SyncTERM](http://syncterm.bbsdev.net/) style emulated baud rate. May be `300`, `600`, `1200`, `2400`, `4800`, `9600`, `19200`, `38400`, `57600`, `76800`, or `115200`. A value of `ulimited`, `off`, or `0` resets (disables) the rate.  See [this specification](https://github.com/protomouse/synchronet/blob/master/src/conio/cterm.txt) for more information.
 
-## Common Example
+### Common Example
 ```hjson
 fullLogoffSequenceRandomBoardAd: {
     art: OTHRBBS
@@ -108,4 +150,7 @@ fullLogoffSequenceRandomBoardAd: {
         cls: true
     }
 }
-```
\ No newline at end of file
+```
+
+### See Also
+See also the [Show Art Module](/docs/modding/show-art.md) for more advanced art display!
\ No newline at end of file

From fc22db546252cfd8cd6f242b58a971ce08125f9d Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 20:44:11 -0600
Subject: [PATCH 0965/1013] FTN/BSO doc tidy up

---
 core/mime_util.js                      |  2 +-
 docs/messageareas/bso-import-export.md | 94 +++++++++++++-------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/core/mime_util.js b/core/mime_util.js
index 857b967c..ddf44432 100644
--- a/core/mime_util.js
+++ b/core/mime_util.js
@@ -35,7 +35,7 @@ function startup(cb) {
 
 function resolveMimeType(query) {
     if(mimeTypes.extensions[query]) {
-        return query;   //  alreaed a mime-type
+        return query;   //  already a mime-type
     }
 
     return mimeTypes.lookup(query) || undefined;    //  lookup() returns false; we want undefined
diff --git a/docs/messageareas/bso-import-export.md b/docs/messageareas/bso-import-export.md
index fac7bc6d..6fc6298e 100644
--- a/docs/messageareas/bso-import-export.md
+++ b/docs/messageareas/bso-import-export.md
@@ -5,58 +5,23 @@ title: BSO Import / Export
 ## BSO Import / Export
 The scanner/tosser module `ftn_bso` provides **B**inkley **S**tyle **O**utbound (BSO) import/toss and scan/export of messages EchoMail and NetMail messages. Configuration is supplied in `config.hjson` under `scannerTossers.ftn_bso`.
 
-:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts** to perfrom packet transport! An external [mailer](http://www.filegate.net/bbsmailers.htm) such as [Binkd](https://github.com/pgul/binkd) is required for this!
+:information_source: ENiGMA½'s `ftn_bso` module is not a mailer and **makes no attempts to perform packet transport**! An external [mailer](http://www.filegate.net/bbsmailers.htm) such as [Binkd](https://github.com/pgul/binkd) is required for this task.
 
+### Configuration
 Let's look at some of the basic configuration:
 
 | Config Item | Required | Description                                              |
 |-------------|----------|----------------------------------------------------------|
-| `schedule`  | :+1:     | Sets `import` and `export` schedules. [Later style text parsing](https://bunkat.github.io/later/parsers.html#text) supported. `import` also can utilize a `@watch:<path/to/file>` syntax while `export` additionally supports `@immediate`.  |
+| `schedule`  | :+1: | Sets `import` and `export` schedules. [Later style text parsing](https://bunkat.github.io/later/parsers.html#text) supported. `import` also can utilize a `@watch:<path/to/file>` syntax while `export` additionally supports `@immediate`. |
 | `packetMsgEncoding` | :-1: | Override default `utf8` encoding.
-| `defaultNetwork`       | :-1:     | Explicitly set default network (by tag in `messageNetworks.ftn.networks`). If not set, the first found is used.   |
-| `nodes`   | :+1:     | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). `archiveType` may be set to a FTN supported archive extention that the system supports (TODO); if unset, only .PKT files are produced. `encoding` may be set to override `packetMsgEncoding` on a per-node basis. If the node requires a packet password, set `packetPassword`  |
-| `paths` | :-1: | An optional configuration block that can set a additional paths or override defaults. See "Paths" below. |
+| `defaultNetwork` | :-1: | Explicitly set default network (by tag found within `messageNetworks.ftn.networks`). If not set, the first found is used. |
+| `nodes` | :+1: | Per-node settings. Entries (keys) here support wildcards for a portion of the FTN-style address (e.g.: `21:1/*`). See **Nodes** below.
+| `paths` | :-1: | An optional configuration block that can set a additional paths or override defaults. See **Paths** below. |
 | `packetTargetByteSize`  | :-1: | Overrides the system *target* packet (.pkt) size of 512000 bytes (512k) |
 | `bundleTargetByteSize`  | :-1: | Overrides the system *target* ArcMail bundle size of 2048000 bytes (2M) |
 
-### Paths
-Paths for packet files work out of the box and are relative to your install directory. If you want to configure `reject` or `retain` to keep rejected/imported packet files respectively, set those values. You may override defaults as well.
-
-| Key | Description | Default |
-|-----|-------------|---------|
-| `outbound` | *Base* path to write outbound (exported) packet files and bundles. | `enigma-bbs/mail/ftn_out/` |
-| `inbound` | *Base* path to write inbound (ie: those written by an external mailer) packet files an bundles. | `enigma-bbs/mail/ftn_in/` |
-| `secInbound` | *Base* path to write **secure** inbound packet files and bundles. | `enigma-bbs/mail/ftn_secin/` |
-| `reject` | Path in which to write rejected packet files. | No default |
-| `retain` | Path in which to write imported packet files. Useful for debugging or if you wish to archive the raw .pkt files. | No default |
-
-
-## Scheduling
-Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.
-
-  * `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
-  * `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
-  * Free form [Later style](https://bunkat.github.io/later/parsers.html#text) text — can be things like `at 5:00 pm` or `every 2 hours`. 
-  
-See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
-
-### Example Schedule Configuration
-
-```hjson
-{
-  scannerTossers: {
-    ftn_bso: {
-      schedule: {
-        import: every 1 hours or @watch:/path/to/watchfile.ext
-        export: every 1 hours or @immediate
-      }
-    }
-  }
-}
-```
-
-## Nodes
-The `nodes` section defines how to export messages for one or more uplinks. 
+#### Nodes
+The `nodes` section defines how to export messages for one or more uplinks.
 
 A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001) (up to 5D) **as a key** in `config.hjson`. This key may contain wildcard(s) for net/zone/node/point/domain.
 
@@ -65,7 +30,7 @@ A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001)
 | `packetType`     | :-1:     | `2`, `2.2`, or `2+`. Defaults to `2+` for modern mailer compatiability. |
 | `packetPassword` | :-1:     | Optional password for the packet |
 | `encoding`       | :-1:     | Encoding to use for message bodies; Defaults to `utf-8`. |
-| `archiveType`    | :-1:     | Specifies the archive type (by extension) for ArcMail bundles. This should be `zip` for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See [Archivers](docs/configuration/archivers.md) for more information. |
+| `archiveType`    | :-1:     | Specifies the archive type (by extension or MIME type) for ArcMail bundles. This should be `zip` (or `application/zip`) for most setups. Other valid examples include `arc`, `arj`, `lhz`, `pak`, `sqz`, or `zoo`. See [Archivers](docs/configuration/archivers.md) for more information. |
 
 **Example**:
 ```hjson
@@ -85,7 +50,42 @@ A node entry starts with a [FTN address](http://ftsc.org/docs/old/fsp-1028.001)
 }
 ```
 
-## A More Complete Example
+#### Paths
+Paths for packet files work out of the box and are relative to your install directory. If you want to configure `reject` or `retain` to keep rejected/imported packet files respectively, set those values. You may override defaults as well.
+
+| Key | Description | Default |
+|-----|-------------|---------|
+| `outbound` | *Base* path to write outbound (exported) packet files and bundles. | `enigma-bbs/mail/ftn_out/` |
+| `inbound` | *Base* path to write inbound (ie: those written by an external mailer) packet files an bundles. | `enigma-bbs/mail/ftn_in/` |
+| `secInbound` | *Base* path to write **secure** inbound packet files and bundles. | `enigma-bbs/mail/ftn_secin/` |
+| `reject` | Path in which to write rejected packet files. | No default |
+| `retain` | Path in which to write imported packet files. Useful for debugging or if you wish to archive the raw .pkt files. | No default |
+
+### Scheduling
+Schedules can be defined for importing and exporting via `import` and `export` under `schedule`. Each entry is allowed a "free form" text and/or special indicators for immediate export or watch file triggers.
+
+* `@immediate`: A message will be immediately exported if this trigger is defined in a schedule. Only used for `export`.
+* `@watch:/path/to/file`: This trigger watches the path specified for changes and will trigger an import or export when such events occur. Only used for `import`.
+* Free form [Later style](https://bunkat.github.io/later/parsers.html#text) text — can be things like `at 5:00 pm` or `every 2 hours`.
+
+See [Later text parsing documentation](http://bunkat.github.io/later/parsers.html#text) for more information.
+
+#### Example Schedule Configuration
+
+```hjson
+{
+  scannerTossers: {
+    ftn_bso: {
+      schedule: {
+        import: every 1 hours or @watch:/path/to/watchfile.ext
+        export: every 1 hours or @immediate
+      }
+    }
+  }
+}
+```
+
+### A More Complete Example
 Below is a more complete example showing the sections described above.
 
 ```hjson
@@ -149,7 +149,7 @@ do
 done
 ```
 
-Now, create an Event Scheuler entry in your `config.hjson`. As an example:
+Now, create an Event Scheduler entry in your `config.hjson`. As an example:
 ```hjson
 eventScheduler: {
   events: {
@@ -163,4 +163,4 @@ eventScheduler: {
 ```
 
 ## Additional Resources
-* [Blog entry on setting up ENiGMA + Binkd on CentOS7](https://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` refernces!
+[Blog entry on setting up ENiGMA + Binkd on CentOS7](https://l33t.codes/enigma-12-binkd-on-centos-7/). Note that this references an **older version**, so be wary of the `config.hjson` references!

From 82a1e22e422dd3b9cda04ba37ede8013a23571cc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 20:58:13 -0600
Subject: [PATCH 0966/1013] File area doc tidy

---
 docs/filebase/first-file-area.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/filebase/first-file-area.md b/docs/filebase/first-file-area.md
index 46d8d649..e61e5a25 100644
--- a/docs/filebase/first-file-area.md
+++ b/docs/filebase/first-file-area.md
@@ -3,15 +3,15 @@ layout: page
 title: Configuring a File Base
 ---
 ## Configuring a File Base
-ENiGMA½ offers a powerful and flexible file base. Configuration of file the file base and areas is handled via the `fileBase` section of `config.hjson`. 
+ENiGMA½ offers a powerful and flexible file base. Configuration of file the file base and areas is handled via the `fileBase` section of `config.hjson`.
 
 ## ENiGMA½ File Base Key Concepts
 First, there are some core concepts you should understand:
 * Storage Tags
-* Areas (and Area Tags)
+* Area Tags
 
 ### Storage Tags
-*Storage Tags* define paths to physical (file) storage locations that are referenced in a file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths are relative to the value set by the `areaStoragePrefix` key (defaults to `/path/to/enigma-bbs/file_base`). 
+*Storage Tags* define paths to physical (filesystem) storage locations that are referenced in a file *Area* entry. Each entry may be either a fully qualified path or a relative path. Relative paths are relative to the value set by the `fileBase.areaStoragePrefix` key (defaults to `/path/to/enigma-bbs/file_base`).
 
 Below is an example defining some storage tags using the relative and fully qualified forms:
 
@@ -28,7 +28,7 @@ storageTags: {
 :information_source: Remember that paths are case sensitive on most non-Windows systems!
 
 ### Areas
-File base *Areas* are configured using the `fileBase::areas` configuration block in `config.hjson`. Valid members for an area are as follows:
+File base *Areas* are configured using the `fileBase.areas` configuration block in `config.hjson`. Each entry's block starts with an *area tag*. Valid members for an area are as follows:
 
 | Item | Required | Description |
 |--------|---------------|------------------|
@@ -41,7 +41,7 @@ Example areas section:
 
 ```hjson
 areas: {
-	retro_pc: {
+	retro_pc: { // an area tag!
 		name: Retro PC
 		desc: Oldschool PC/DOS
 		storageTags: [ "retro_pc_dos", "retro_pc_bbs" ]
@@ -55,6 +55,7 @@ This combines the two concepts described above. When viewing the file areas from
 
 ```hjson
 fileBase: {
+	// override the default relative location
 	areaStoragePrefix: /enigma-bbs/file_base
 
 	storageTags: {

From b3abe3ad407541f4f814144b2530836a7fbd387c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 21:20:27 -0600
Subject: [PATCH 0967/1013] More doc tidy

---
 docs/filebase/index.md       |  6 ++++++
 docs/filebase/tic-support.md | 31 ++++++++++++++++---------------
 docs/filebase/uploads.md     |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/docs/filebase/index.md b/docs/filebase/index.md
index d5dac134..0e14e732 100644
--- a/docs/filebase/index.md
+++ b/docs/filebase/index.md
@@ -20,3 +20,9 @@ ENiGMA½ has strayed away from the old familiar setup here and instead takes a m
 * Duplicates are checked for by cryptographically secure [SHA-256](https://en.wikipedia.org/wiki/SHA-2) hashes.
 * Support for many archive and file formats. External utilities can easily be added to the configuration to extend for additional formats.
 * Much, much more!
+
+### Modding
+The default ENiGMA½ approach for file areas may not be for everyone. Remember that you can mod everything your setup! Some inspirational examples:
+* A more traditional set of areas and scrolling file listings.
+* An S/X style integration of message areas and file areas.
+* Something completely different! Some tweaks are possible without any code while others may require creating new JavaScript modules to use instead of the defaults.
diff --git a/docs/filebase/tic-support.md b/docs/filebase/tic-support.md
index 9d092fb1..4c128bab 100644
--- a/docs/filebase/tic-support.md
+++ b/docs/filebase/tic-support.md
@@ -2,9 +2,10 @@
 layout: page
 title: TIC Support
 ---
-ENiGMA½ supports TIC files. This is handled by mapping TIC areas to local file areas.
+## TIC Support
+ENiGMA½ supports FidoNet-Style TIC file attachments by mapping TIC areas to local file areas.
 
-Under a given node defined in the `ftn_bso` config section in `config.hjson` (see 
+Under a given node defined in the `ftn_bso` config section in `config.hjson` (see
 [BSO Import/Export](../messageareas/bso-import-export)), TIC configuration may be supplied:
 
 ```hjson
@@ -28,11 +29,9 @@ Under a given node defined in the `ftn_bso` config section in `config.hjson` (se
 }
 ```
 
-You then need to configure the mapping between TIC areas you want to carry, and the file 
-base area and storage tag for them to be tossed to. Optionally you can also add hashtags to the tossed
-files to assist users in searching for files:
+You then need to configure the mapping between TIC areas you want to carry, and the file base area and storage tag for them to be tossed to. Optionally you can also add hashtags to the tossed files to assist users in searching for files:
 
-````hjson
+```hjson
 ticAreas: {
     agn_node: {
         areaTag: msgNetworks
@@ -41,21 +40,20 @@ ticAreas: {
     }
 }
 
-````
-Multiple TIC areas can be mapped to a single file base area. 
+```
+Multiple TIC areas can be mapped to a single file base area.
 
-## Example Configuration
+### Example Configuration
+An example configuration linking file base areas, FTN BSO node configuration and TIC area configuration.
 
-An example configuration linking filebase areas, FTN BSO node configuration and TIC area configuration.
-
-````hjson
+```hjson
 fileBase: {
     areaStoragePrefix: /home/bbs/file_areas/
-    
+
     storageTags: {
         msg_network: "msg_network"
     }
-    
+
     areas: {
         msgNetworks: {
             name: Message Networks
@@ -97,4 +95,7 @@ ticAreas: {
         hashTags: agoranet,infopack
     }
 }
-````
\ No newline at end of file
+```
+
+## See Also
+[Message Networks](/docs/messageareas/message-networks.md)
diff --git a/docs/filebase/uploads.md b/docs/filebase/uploads.md
index 8e1e2530..72b901c9 100644
--- a/docs/filebase/uploads.md
+++ b/docs/filebase/uploads.md
@@ -3,9 +3,9 @@ layout: page
 title: Uploads
 ---
 ## Uploads
-The default ACS for file areas areas in ENiGMA½ is to allow read (viewing of the area), and downloads for users while only permitting SysOps to write (upload). See [File Base ACS](acs.md) for more information.
+The default ACS for file areas in ENiGMA½ is to allow regular users 'read' and sysops 'read/write'. Read ACS includes listing and downloading while write allows for uploading. See [File Base ACS](acs.md) for more information.
 
-To allow uploads to a particular area, change the ACS level for `write`. For example:
+To change ACS for a particular area, create an `acs` block specifying ACS for `read` and/or `write`. For example, let's allow regular users (in the "users" group) to upload to an area:
 ```hjson
 uploads: {
     name: Uploads

From 1f691c6246c2e98d991421906c3626ddd1a43fb2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 21:22:15 -0600
Subject: [PATCH 0968/1013] Better example

---
 docs/filebase/uploads.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/filebase/uploads.md b/docs/filebase/uploads.md
index 72b901c9..795c0781 100644
--- a/docs/filebase/uploads.md
+++ b/docs/filebase/uploads.md
@@ -5,7 +5,7 @@ title: Uploads
 ## Uploads
 The default ACS for file areas in ENiGMA½ is to allow regular users 'read' and sysops 'read/write'. Read ACS includes listing and downloading while write allows for uploading. See [File Base ACS](acs.md) for more information.
 
-To change ACS for a particular area, create an `acs` block specifying ACS for `read` and/or `write`. For example, let's allow regular users (in the "users" group) to upload to an area:
+Let's allow regular users (in the "users" group) to upload to an area:
 ```hjson
 uploads: {
     name: Uploads

From 4ddf79087ccbc47d7a0e69a295c8b6e1a4166f6b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 21:28:28 -0600
Subject: [PATCH 0969/1013] Update to ugprade docs

---
 docs/admin/updating.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index 235737b7..ee396b4b 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -3,18 +3,18 @@ layout: page
 title: Updating
 ---
 ## Updating your Installation
-Updating ENiGMA½ can be a bit of a learning curve compared to other systems. Especially when running off of a development branch (such as `0.0.9-alpha` being the recommended branch as of this writing), you'll want frequent updates.
+Updating ENiGMA½ can be a bit of a learning curve compared to other systems.Especially when running from Git cloned source, you'll want frequent updates.
 
 ## Steps
 In general the steps are as follows:
 1. `cd /path/to/enigma-bbs`
 2. `git pull`
 3. `npm update` or `yarn` to refresh any new or updated modules.
-4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file.
+4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file (or simply use the template as a reference to spot any newly added default menus that you may wish to have on your system as well!).
 5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you may want to look at them as well.
 
 Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
 
-Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
+:information_source: Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
 
 

From 8409b80d698c9c723231f2f1024b33e3cdee6e93 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 21:31:21 -0600
Subject: [PATCH 0970/1013] Slightly better

---
 docs/admin/updating.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index ee396b4b..8fda4692 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -3,18 +3,19 @@ layout: page
 title: Updating
 ---
 ## Updating your Installation
-Updating ENiGMA½ can be a bit of a learning curve compared to other systems.Especially when running from Git cloned source, you'll want frequent updates.
+Updating ENiGMA½ can be a bit of a learning curve compared to other systems. Especially when running from Git cloned source, you'll want frequent updates.
 
 ## Steps
-In general the steps are as follows:
+In _general_ the steps are as follows:
 1. `cd /path/to/enigma-bbs`
 2. `git pull`
 3. `npm update` or `yarn` to refresh any new or updated modules.
 4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file (or simply use the template as a reference to spot any newly added default menus that you may wish to have on your system as well!).
 5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you may want to look at them as well.
 
-Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful here.
+:information_source: Always keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
+
+:information_source: Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful for the tasks outlined above!
 
-:information_source: Remember to also keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
 
 

From b76bb8a9bd4f3887cde6f2e5d0901b93cfcdfd4b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 21:49:18 -0600
Subject: [PATCH 0971/1013] Minor dep updates

---
 package.json |  4 ++--
 yarn.lock    | 23 ++++++++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 12754271..908c48c3 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "retro"
   ],
   "dependencies": {
-    "async": "3.1.0",
+    "async": "3.2.0",
     "binary-parser": "^1.5.0",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
@@ -55,7 +55,7 @@
     "temptmp": "^1.1.0",
     "uuid": "^3.3.3",
     "uuid-parse": "1.1.0",
-    "ws": "^7.2.0",
+    "ws": "^7.3.0",
     "xxhash": "^0.3.0",
     "yazl": "^2.5.1"
   },
diff --git a/yarn.lock b/yarn.lock
index cb08db2e..1c3624aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -124,15 +124,10 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-async-limiter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
-
-async@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
-  integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
+async@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -2276,12 +2271,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"
-  integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==
-  dependencies:
-    async-limiter "^1.0.0"
+ws@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
+  integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
 
 xtend@~4.0.1:
   version "4.0.1"

From 9ed7c049ad191d03dfafa16bf6cd94b1733862fc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:05:17 -0600
Subject: [PATCH 0972/1013] Update uuid dep

---
 core/file_base_filter.js           | 4 ++--
 core/file_base_user_list_export.js | 4 ++--
 core/message_base_qwk_export.js    | 2 +-
 core/scanner_tossers/ftn_bso.js    | 4 ++--
 package.json                       | 2 +-
 yarn.lock                          | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/file_base_filter.js b/core/file_base_filter.js
index d72b3eea..ecf857fa 100644
--- a/core/file_base_filter.js
+++ b/core/file_base_filter.js
@@ -5,7 +5,7 @@ const UserProps = require('./user_property.js');
 
 //  deps
 const _         = require('lodash');
-const uuidV4    = require('uuid/v4');
+const { v4 : UUIDv4 } = require('uuid');
 
 module.exports = class FileBaseFilters {
     constructor(client) {
@@ -41,7 +41,7 @@ module.exports = class FileBaseFilters {
     }
 
     add(filterInfo) {
-        const filterUuid = uuidV4();
+        const filterUuid = UUIDv4();
 
         filterInfo.tags = this.cleanTags(filterInfo.tags);
 
diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js
index 594a9ffe..c3f3b6f8 100644
--- a/core/file_base_user_list_export.js
+++ b/core/file_base_user_list_export.js
@@ -17,7 +17,7 @@ const fs                = require('graceful-fs');
 const fse               = require('fs-extra');
 const paths             = require('path');
 const moment            = require('moment');
-const uuidv4            = require('uuid/v4');
+const { v4 : UUIDv4 } = require('uuid');
 const yazl              = require('yazl');
 
 /*
@@ -188,7 +188,7 @@ exports.getModule = class FileBaseListExport extends MenuModule {
 
                         const outputFileName = paths.join(
                             sysTempDownloadDir,
-                            `file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
+                            `file_list_${UUIDv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt`
                         );
 
                         fs.writeFile(outputFileName, listBody, 'utf8', err => {
diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js
index 53682471..2f89c1bd 100644
--- a/core/message_base_qwk_export.js
+++ b/core/message_base_qwk_export.js
@@ -22,7 +22,7 @@ const _ = require('lodash');
 const fse = require('fs-extra');
 const temptmp = require('temptmp');
 const paths = require('path');
-const UUIDv4 = require('uuid/v4');
+const { v4 : UUIDv4 } = require('uuid');
 const moment = require('moment');
 
 const FormIds = {
diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js
index 17cd61b8..99a537ec 100644
--- a/core/scanner_tossers/ftn_bso.js
+++ b/core/scanner_tossers/ftn_bso.js
@@ -36,7 +36,7 @@ const assert                = require('assert');
 const sane                  = require('sane');
 const fse                   = require('fs-extra');
 const iconv                 = require('iconv-lite');
-const uuidV4                = require('uuid/v4');
+const { v4 : UUIDv4 }       = require('uuid');
 
 exports.moduleInfo = {
     name    : 'FTN BSO',
@@ -1215,7 +1215,7 @@ function FTNMessageScanTossModule() {
                     //
                     if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) {
                         //  just generate a UUID & therefor always allow for dupes
-                        message.messageUuid = uuidV4();
+                        message.messageUuid = UUIDv4();
                     }
 
                     return callback(null);
diff --git a/package.json b/package.json
index 908c48c3..efdd1d17 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "sqlite3-trans": "^1.2.2",
     "ssh2": "0.8.6",
     "temptmp": "^1.1.0",
-    "uuid": "^3.3.3",
+    "uuid": "^8.0.0",
     "uuid-parse": "1.1.0",
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
diff --git a/yarn.lock b/yarn.lock
index 1c3624aa..f5fb93f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2231,10 +2231,10 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+uuid@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
+  integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
 verror@1.10.0:
   version "1.10.0"

From 0e5d9ddbd1e4a7c212c708e886f07771a9e5d384 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:12:03 -0600
Subject: [PATCH 0973/1013] Update sqlite3 (minor)

---
 package.json |   2 +-
 yarn.lock    | 311 ++-------------------------------------------------
 2 files changed, 11 insertions(+), 302 deletions(-)

diff --git a/package.json b/package.json
index efdd1d17..d22f18f3 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "rlogin": "^1.0.0",
     "sane": "4.1.0",
     "sanitize-filename": "^1.6.3",
-    "sqlite3": "^4.1.0",
+    "sqlite3": "^4.2.0",
     "sqlite3-trans": "^1.2.2",
     "ssh2": "0.8.6",
     "temptmp": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index f5fb93f3..e2b5b944 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,16 +15,6 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ansi-escapes@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz#4dccdb846c3eee10f6d64dea66273eab90c37228"
@@ -107,18 +97,13 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-asn1@~0.2.0, asn1@~0.2.3:
+asn1@~0.2.0:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
   integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -129,26 +114,11 @@ async@3.2.0:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -167,7 +137,7 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
+bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
@@ -251,11 +221,6 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -297,11 +262,6 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -332,20 +292,6 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -366,7 +312,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
@@ -382,13 +328,6 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
 debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -452,11 +391,6 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -484,14 +418,6 @@ dtrace-provider@~0.8:
   dependencies:
     nan "^2.10.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -560,11 +486,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
@@ -588,26 +509,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
@@ -637,20 +538,6 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -713,13 +600,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob@7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -781,19 +661,6 @@ graceful-fs@^4.2.3:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -845,15 +712,6 @@ hjson@^3.2.1:
   resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.2.1.tgz#20de41dc87fc9a10d1557d0230b0e02afb1b09ac"
   integrity sha512-OhhrFMeC7dVuA1xvxuXGTv/yTdhTvbe8hz+3LgVNsfi9+vgz0sF/RrkuX8eegpKaMc9cwYwydImBH6iePoJtdQ==
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 iconv-lite@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
@@ -1044,11 +902,6 @@ is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -1076,31 +929,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -1108,16 +936,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -1202,11 +1020,6 @@ mime-db@1.42.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
   integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
-
 mime-types@2.1.25:
   version "2.1.25"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
@@ -1214,13 +1027,6 @@ mime-types@2.1.25:
   dependencies:
     mime-db "1.42.0"
 
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
-  dependencies:
-    mime-db "~1.36.0"
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -1452,11 +1258,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -1554,11 +1355,6 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -1591,11 +1387,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
   integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -1604,21 +1395,11 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 qrcode-generator@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.4.tgz#63f771224854759329a99048806a53ed278740e7"
   integrity sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==
 
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -1674,32 +1455,6 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -1756,7 +1511,7 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -1773,7 +1528,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -1934,14 +1689,13 @@ sqlite3-trans@^1.2.2:
   dependencies:
     lodash "^4.17.15"
 
-sqlite3@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.0.tgz#e051fb9c133be15726322a69e2e37ec560368380"
-  integrity sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==
+sqlite3@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.2.0.tgz#49026d665e9fc4f922e56fb9711ba5b4c85c4901"
+  integrity sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==
   dependencies:
     nan "^2.12.1"
     node-pre-gyp "^0.11.0"
-    request "^2.87.0"
 
 ssh2-streams@~0.4.7:
   version "0.4.7"
@@ -1959,22 +1713,6 @@ ssh2@0.8.6:
   dependencies:
     ssh2-streams "~0.4.7"
 
-sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -2141,14 +1879,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -2161,14 +1891,7 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+tweetnacl@^0.14.3:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
@@ -2226,25 +1949,11 @@ uuid-parse@1.1.0:
   resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
   integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
 
-uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
 uuid@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
   integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From 009688c3b6c7135a9343a54452bbf7212718dddf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:30:57 -0600
Subject: [PATCH 0974/1013] SSH dep update

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d22f18f3..6b030312 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "sanitize-filename": "^1.6.3",
     "sqlite3": "^4.2.0",
     "sqlite3-trans": "^1.2.2",
-    "ssh2": "0.8.6",
+    "ssh2": "0.8.9",
     "temptmp": "^1.1.0",
     "uuid": "^8.0.0",
     "uuid-parse": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index e2b5b944..5c8f7793 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1697,21 +1697,21 @@ sqlite3@^4.2.0:
     nan "^2.12.1"
     node-pre-gyp "^0.11.0"
 
-ssh2-streams@~0.4.7:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.7.tgz#093b89069de9cf5f06feff0601a5301471b01611"
-  integrity sha512-JhF8BNfeguOqVHOLhXjzLlRKlUP8roAEhiT/y+NcBQCqpRUupLNrRf2M+549OPNVGx21KgKktug4P3MY/IvTig==
+ssh2-streams@~0.4.10:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.10.tgz#48ef7e8a0e39d8f2921c30521d56dacb31d23a34"
+  integrity sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ==
   dependencies:
     asn1 "~0.2.0"
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@0.8.6:
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.6.tgz#dcc62e1d3b9e58a21f711f5186f043e4e792e6da"
-  integrity sha512-T0cPmEtmtC8WxSupicFDjx3vVUdNXO8xu2a/D5bjt8ixOUCe387AgvxU3mJgEHpu7+Sq1ZYx4d3P2pl/yxMH+w==
+ssh2@0.8.9:
+  version "0.8.9"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.9.tgz#54da3a6c4ba3daf0d8477a538a481326091815f3"
+  integrity sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw==
   dependencies:
-    ssh2-streams "~0.4.7"
+    ssh2-streams "~0.4.10"
 
 static-extend@^0.1.1:
   version "0.1.2"

From f27ba9f6e0208e0fc0788c2da451e89ce1a40ddc Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:39:49 -0600
Subject: [PATCH 0975/1013] fs-extra dep update

---
 package.json |  2 +-
 yarn.lock    | 36 ++++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 6b030312..1ca96316 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
-    "fs-extra": "8.1.0",
+    "fs-extra": "9.0.0",
     "glob": "7.1.6",
     "graceful-fs": "^4.2.3",
     "hashids": "2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 5c8f7793..e220adc7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -114,6 +114,11 @@ async@3.2.0:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -553,14 +558,15 @@ from2@^2.3.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+fs-extra@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
+  integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
   dependencies:
+    at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
+    jsonfile "^6.0.1"
+    universalify "^1.0.0"
 
 fs-minipass@^1.2.5:
   version "1.2.5"
@@ -929,10 +935,12 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+jsonfile@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
+  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  dependencies:
+    universalify "^1.0.0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -1911,10 +1919,10 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
 unset-value@^1.0.0:
   version "1.0.0"

From dff3e9d0c8deb58b09404fe34fa171f65f80435b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:42:56 -0600
Subject: [PATCH 0976/1013] Update mime-types

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 1ca96316..7cba5d4d 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "later": "1.2.0",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
-    "mime-types": "2.1.25",
+    "mime-types": "2.1.27",
     "minimist": "1.2.0",
     "moment": "^2.24.0",
     "nntp-server": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index e220adc7..4ca8df12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1023,17 +1023,17 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@1.42.0:
-  version "1.42.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
-  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
-mime-types@2.1.25:
-  version "2.1.25"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
+mime-types@2.1.27:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
   dependencies:
-    mime-db "1.42.0"
+    mime-db "1.44.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"

From 8736f5c3b9208391bff9b0a13ad29a3fad481637 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:45:04 -0600
Subject: [PATCH 0977/1013] graceful-fs update

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7cba5d4d..4c772eee 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "exiftool": "^0.0.3",
     "fs-extra": "9.0.0",
     "glob": "7.1.6",
-    "graceful-fs": "^4.2.3",
+    "graceful-fs": "^4.2.4",
     "hashids": "2.1.0",
     "hjson": "^3.2.1",
     "iconv-lite": "0.5.0",
diff --git a/yarn.lock b/yarn.lock
index 4ca8df12..f0171f7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -662,10 +662,10 @@ graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
   integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
 
-graceful-fs@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 has-flag@^3.0.0:
   version "3.0.0"

From 76a662dcd5ee75e7cfad776326f3011d3a88a99c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:48:17 -0600
Subject: [PATCH 0978/1013] Minor dep updates

---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 4c772eee..46ab9793 100644
--- a/package.json
+++ b/package.json
@@ -30,9 +30,9 @@
     "fs-extra": "9.0.0",
     "glob": "7.1.6",
     "graceful-fs": "^4.2.4",
-    "hashids": "2.1.0",
+    "hashids": "2.2.1",
     "hjson": "^3.2.1",
-    "iconv-lite": "0.5.0",
+    "iconv-lite": "0.5.1",
     "ini-config-parser": "^1.0.4",
     "inquirer": "^7.0.0",
     "later": "1.2.0",
diff --git a/yarn.lock b/yarn.lock
index f0171f7f..ddad5668 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -708,20 +708,20 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-hashids@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.1.0.tgz#96eec6de3081a76dcd839650a6a26e6081e729d3"
-  integrity sha512-N53K2p7TrwKLNHKHcEDH+qpiAgO9JfyPEg8Tfy4fB9AcVhwxlTanJ55HVV9BQJQ6ajM1Wfmtl2wgKuEbcucolw==
+hashids@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.2.1.tgz#ad0c600f0083aa0df7451dfd184e53db34f71289"
+  integrity sha512-+hQeKWwpSDiWFeu/3jKUvwboE4Z035gR6FnpscbHPOEEjCbgv2px9/Mlb3O0nOTRyZOw4MMFRYfVL3zctOV6OQ==
 
 hjson@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.2.1.tgz#20de41dc87fc9a10d1557d0230b0e02afb1b09ac"
   integrity sha512-OhhrFMeC7dVuA1xvxuXGTv/yTdhTvbe8hz+3LgVNsfi9+vgz0sF/RrkuX8eegpKaMc9cwYwydImBH6iePoJtdQ==
 
-iconv-lite@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
-  integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==
+iconv-lite@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
+  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 

From ec1ee9d79665fe370c2c55b7bbe42e2ae6a207ef Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 22:51:30 -0600
Subject: [PATCH 0979/1013] Update moment

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 46ab9793..f1d5302e 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "lru-cache": "^5.1.1",
     "mime-types": "2.1.27",
     "minimist": "1.2.0",
-    "moment": "^2.24.0",
+    "moment": "^2.25.3",
     "nntp-server": "^1.0.3",
     "node-pty": "^0.9.0",
     "nodemailer": "^6.3.1",
diff --git a/yarn.lock b/yarn.lock
index ddad5668..c957c129 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1092,10 +1092,10 @@ moment@^2.10.6:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
-moment@^2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+moment@^2.25.3:
+  version "2.25.3"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.3.tgz#252ff41319cf41e47761a1a88cab30edfe9808c0"
+  integrity sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==
 
 ms@2.0.0:
   version "2.0.0"

From 19c0f75610f7d944ca9e511eab35fe3a47c8ce05 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 23:04:55 -0600
Subject: [PATCH 0980/1013] binary parser update

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f1d5302e..d2c5e77f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "async": "3.2.0",
-    "binary-parser": "^1.5.0",
+    "binary-parser": "^1.6.2",
     "buffers": "github:NuSkooler/node-buffers",
     "bunyan": "^1.8.12",
     "exiftool": "^0.0.3",
diff --git a/yarn.lock b/yarn.lock
index c957c129..207f207c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -149,10 +149,10 @@ bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-binary-parser@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.5.0.tgz#3e50de3a5076badbacd760e833e7d94892b9e9fa"
-  integrity sha512-z+hqNSnO7trFDPLihjUGTwlSTbcIzLYSCwnbiasFkRvCIY9F3ZTex7Mlm9UAP3w5mfHD3KxejnWFPJjtsVVMuw==
+binary-parser@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.6.2.tgz#8410a82ffd9403271ec182bd91e63a09cee88cbe"
+  integrity sha512-cYAhKB51A9T/uylDvMK7uAYaPLWLwlferNOpnQ0E0fuO73yPi7kWaWiOm22BvuKxCbggmkiFN0VkuLg6gc+KQQ==
 
 brace-expansion@^1.1.7:
   version "1.1.11"

From ef022d6a009258d12676d93f83533341794e2b68 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2020 23:07:30 -0600
Subject: [PATCH 0981/1013] More minor dep updates

---
 package.json |   6 +--
 yarn.lock    | 133 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/package.json b/package.json
index d2c5e77f..0a68e584 100644
--- a/package.json
+++ b/package.json
@@ -34,16 +34,16 @@
     "hjson": "^3.2.1",
     "iconv-lite": "0.5.1",
     "ini-config-parser": "^1.0.4",
-    "inquirer": "^7.0.0",
+    "inquirer": "^7.1.0",
     "later": "1.2.0",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
     "mime-types": "2.1.27",
-    "minimist": "1.2.0",
+    "minimist": "1.2.5",
     "moment": "^2.25.3",
     "nntp-server": "^1.0.3",
     "node-pty": "^0.9.0",
-    "nodemailer": "^6.3.1",
+    "nodemailer": "^6.4.6",
     "otplib": "11.0.1",
     "qrcode-generator": "^1.4.4",
     "rlogin": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 207f207c..30d2470a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,6 +10,11 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -37,12 +42,18 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
   dependencies:
-    color-convert "^1.9.0"
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -226,14 +237,13 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -285,17 +295,17 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
-    color-name "1.1.3"
+    color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 component-emitter@^1.2.1:
   version "1.2.1"
@@ -667,10 +677,10 @@ graceful-fs@^4.2.4:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-unicode@^2.0.0:
   version "2.0.1"
@@ -766,23 +776,23 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
-  integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==
+inquirer@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
+    chalk "^3.0.0"
     cli-cursor "^3.1.0"
     cli-width "^2.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
     lodash "^4.17.15"
     mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
     string-width "^4.1.0"
-    strip-ansi "^5.1.0"
+    strip-ansi "^6.0.0"
     through "^2.3.6"
 
 is-accessor-descriptor@^0.1.6:
@@ -898,11 +908,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -1052,7 +1057,12 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
+minimist@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -1211,10 +1221,10 @@ node-pty@^0.9.0:
   dependencies:
     nan "^2.14.0"
 
-nodemailer@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.1.tgz#2784beebac6b9f014c424c54dbdcc5c4d1221346"
-  integrity sha512-j0BsSyaMlyadEDEypK/F+xlne2K5m6wzPYMXS/yxKI0s7jmT1kBx6GEKRVbZmyYfKOsjkeC/TiMVDJBI/w5gMQ==
+nodemailer@^6.4.6:
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.6.tgz#d37f504f6560b36616f646a606894fe18819107f"
+  integrity sha512-/kJ+FYVEm2HuUlw87hjSqTss+GU35D4giOpdSfGp7DO+5h6RlJj7R94YaYHOkoxu1CSaM0d3WRBtCzwXrY6MKA==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -1505,17 +1515,15 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
-rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+rxjs@^6.5.3:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -1788,13 +1796,20 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -1805,12 +1820,12 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 tar@^4:
   version "4.4.6"

From f23027ba1de78845d61cd7359bf76cf8c0fb7185 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 15 May 2020 18:45:26 -0600
Subject: [PATCH 0982/1013] More doc updates, add telnet-bridge.md

---
 docs/_includes/nav.md         |  1 +
 docs/modding/local-doors.md   | 19 ++++---
 docs/modding/show-art.md      |  4 +-
 docs/modding/telnet-bridge.md | 96 +++++++++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 9 deletions(-)
 create mode 100644 docs/modding/telnet-bridge.md

diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index 4fb9a399..c4303fac 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -67,6 +67,7 @@
         - BBSLink
         - Combatnet
         - Exodus
+    - [Telnet Bridge]({{ site.baseurl }}{% link modding/telnet-bridge.md %})
     - [Existing Mods]({{ site.baseurl }}{% link modding/existing-mods.md %})
     - [File Area List]({{ site.baseurl }}{% link modding/file-area-list.md %})
     - [Last Callers]({{ site.baseurl }}{% link modding/last-callers.md %})
diff --git a/docs/modding/local-doors.md b/docs/modding/local-doors.md
index 4ab8037b..2a4a1338 100644
--- a/docs/modding/local-doors.md
+++ b/docs/modding/local-doors.md
@@ -3,7 +3,7 @@ layout: page
 title: Local Doors
 ---
 ## Local Doors
-ENiGMA½ has many ways to add doors to your system. In addition to the many built in door server modules, local doors are of course also supported using the ! The `abracadabra` module!
+ENiGMA½ has many ways to add doors to your system. In addition to the [many built in door server modules](door-servers.md), local doors are of course also supported using the ! The `abracadabra` module!
 
 ## The abracadabra Module
 The `abracadabra` module provides a generic and flexible solution for many door types. Through this module you can execute native processes & scripts directly, and perform I/O through standard I/O (stdio) or a temporary TCP server.
@@ -17,7 +17,7 @@ The `abracadabra` `config` block can contain the following members:
 | `dropFileType` | :+1: | Specifies the type of dropfile to generate (See **Dropfile Types** below). |
 | `cmd` | :+1: | Path to executable to launch. |
 | `args` | :-1: | Array of argument(s) to pass to `cmd`. See **Argument Variables** below for information on variables that can be used here.
-| `cwd` | :-1: | Sets the Current Working Directory (CWD) for `cmd`. Defaults to the directory of `cmd`. | 
+| `cwd` | :-1: | Sets the Current Working Directory (CWD) for `cmd`. Defaults to the directory of `cmd`. |
 | `nodeMax` | :-1: | Max number of nodes that can access this door at once. Uses `name` as a tracking key. |
 | `tooManyArt` | :-1: | Art spec to display if too many instances are already in use. |
 | `io` | :-1: | How to process input/output (I/O). Can be `stdio` or `socket`. When using `stdio`, I/O is handled via standard stdin/stdout. When using `socket` a temporary socket server is spawned that can be connected back to. The server listens on localhost on `{srvPort}` (See **Argument Variables** below for more information). Default value is `stdio`. |
@@ -99,8 +99,8 @@ doorPimpWars: {
         cmd: /usr/bin/dosemu
         args: [
             "-quiet",
-            "-f", 
-            "/path/to/dosemu.conf", 
+            "-f",
+            "/path/to/dosemu.conf",
             "X:\\PW\\START.BAT {dropFile} {node}"
         ],
         nodeMax: 1
@@ -149,7 +149,7 @@ Please see the [bivrost!](https://github.com/NuSkooler/bivrost) documentation fo
 Pre-built binaries of bivrost! have been released under [Phenom Productions](https://www.phenomprod.com/) and can be found on various boards.
 
 #### Alternative Workarounds
-Alternative workarounds include Telnet Bridge (`telnet_bridge` module) to hook up Telnet-accessible (including local) door servers -- It may also be possible bridge via [NET2BBS](http://pcmicro.com/netfoss/guide/net2bbs.html).
+Alternative workarounds include [Telnet Bridge module](telnet-bridge.md) to hook up Telnet-accessible (including local) door servers -- It may also be possible bridge via [NET2BBS](http://pcmicro.com/netfoss/guide/net2bbs.html).
 
 ### QEMU with abracadabra
 [QEMU](http://wiki.qemu.org/Main_Page) provides a robust, cross platform solution for launching doors under many platforms (likely anywhere Node.js is supported and ENiGMA½ can run). Note however that there is an important and major caveat: **Multiple instances of a particular door/OS image should not be run at once!** Being more flexible means being a bit more complex. Let's look at an example for running L.O.R.D. under a UNIX like system such as Linux or FreeBSD.
@@ -223,8 +223,13 @@ doorLORD: {
 }
 ```
 
+## See Also
+* [Telnet Bridge](telnet-bridge.md)
+* [Door Servers](door-servers.md)
+
 ## Additional Resources
-### DOSBox
+### DOS Emulation
+* [DOSEMU](http://www.dosemu.org/)
 * [DOSBox-X](https://github.com/joncampbell123/dosbox-x)
 
 ### Door Downloads & Support Sites
@@ -233,4 +238,4 @@ doorLORD: {
 * http://bbstorrents.bbses.info/
 
 #### L.O.R.D.
-* http://lord.lordlegacy.com/
\ No newline at end of file
+* http://lord.lordlegacy.com/
diff --git a/docs/modding/show-art.md b/docs/modding/show-art.md
index c00d7009..5ffce10c 100644
--- a/docs/modding/show-art.md
+++ b/docs/modding/show-art.md
@@ -29,8 +29,8 @@ showWithExtraArgs: {
 If the `showWithExtraArgs` menu was entered and passed `extraArgs` as the following:
 ```json
 {
-    fizzBang : true,
-    fooBaz : "LOLART"
+    "fizzBang" : true,
+    "fooBaz" : "LOLART"
 }
 ```
 
diff --git a/docs/modding/telnet-bridge.md b/docs/modding/telnet-bridge.md
new file mode 100644
index 00000000..36e1b3e6
--- /dev/null
+++ b/docs/modding/telnet-bridge.md
@@ -0,0 +1,96 @@
+---
+layout: page
+title: Telnet Bridge
+---
+## Telnet Bridge
+The `telnet_bridge` module allows "bridged" Telnet connections from your board to other Telnet services (such as other BBSes!).
+
+## Configuration
+### Config Block
+Available `config` entries:
+* `host`: Hostname or IP address to connect to.
+* `port`: Port to connect to. Defaults to the standard Telnet port of `23`.
+* `font`: A SyncTERM style font. Useful for example if you would like to connect form a "DOS" style BBS to an Amiga. See [the general art documentation on SyncTERM Style Fonts](/docs/art/general.md).
+
+### Example
+Below is an example `menu.hjson` entry that would connect to [Xibalba](https://xibalba.l33t.codes):
+
+```hjson
+{
+    telnetBridgeXibalba: {
+        desc: Xibalba BBS
+        module: telnet_bridge
+        config: {
+            host: xibalba.l33t.codes
+            port: 45510
+        }
+    }
+}
+```
+
+### Using Extra Args
+The `telnet_bridge` module can also accept standard `extraArgs` of the same configuration arguments described above. This can be illustrated with an example:
+
+```hjson
+telnetBridgeMenu: {
+    desc: Telnet Bridge
+    art: telnet_bridge
+    config: {
+        font: cp437
+    }
+    form: {
+        0: {
+            mci: {
+                VM1: {
+                    argName: selection
+
+                    items: [
+                        {
+                            board: BLACK Flag
+                            soft: Mystic
+                            data: bf
+                        }
+                        {
+                            board: Xibalba
+                            soft: ENiGMA½
+                            data: xib
+                        }
+                    ]
+
+                    //  sort by 'board' fields above
+                    sort: board
+                    submit: true
+                }
+            }
+
+            submit: {
+                *: [
+                    {
+                        value: { "selection" : "bf" }
+                        action: @menu:telnetBridgeFromExtraFlags
+                        extraArgs: {
+                            host: blackflag.acid.org
+                        }
+                    }
+                    {
+                        value: { "selection" : "xib" }
+                        action: @menu:telnetBridgeFromExtraFlags
+                        extraArgs: {
+                            host: xibalba.l33t.codes
+                            port: 44510
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}
+
+telnetBridgeFromExtraFlags: {
+    desc: Telnet Bridge
+    module: telnet_bridge
+}
+```
+
+Here we've created a lightbar menu with custom items in which we'd use `itemFormat`'s with in a theme. When the user selects an item, the `telnetBridgeFromExtraFlags` menu is instantiated using the supplied `extraArgs`.
+

From 02fa3b014b28fbc4cfa7b04c13d9c36d28f2a9f2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 16 May 2020 17:37:51 -0600
Subject: [PATCH 0983/1013] ANSI FILE_ID.DIZ sometimes do not display correctly
 #244 * When parsing ANSI files, handle UNIX style LF's only vs "standard" DOS
 CRLF pairs

---
 core/ansi_escape_parser.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/ansi_escape_parser.js b/core/ansi_escape_parser.js
index 9786ea4c..88063bef 100644
--- a/core/ansi_escape_parser.js
+++ b/core/ansi_escape_parser.js
@@ -87,6 +87,7 @@ function ANSIEscapeParser(options) {
         let pos     = 0;
         let start   = 0;
         let charCode;
+        let lastCharCode;
 
         while(pos < len) {
             charCode = text.charCodeAt(pos) & 0xff; //  8bit clean
@@ -102,6 +103,12 @@ function ANSIEscapeParser(options) {
                     break;
 
                 case LF :
+                    //  Handle ANSI saved with UNIX-style LF's only
+                    //  vs the CRLF pairs
+                    if (lastCharCode !== CR) {
+                        self.column = 1;
+                    }
+
                     self.emit('literal', text.slice(start, pos));
                     start = pos;
 
@@ -126,6 +133,7 @@ function ANSIEscapeParser(options) {
             }
 
             ++pos;
+            lastCharCode = charCode;
         }
 
         //

From ad2382c1f28a354b92a0a4d55683d660ca198b56 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 May 2020 19:42:05 -0600
Subject: [PATCH 0984/1013] Add a couple items to whatsnew

---
 WHATSNEW.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 9736d82f..bf6ac243 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,9 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 ## 0.0.11-beta
 * Upgraded from `alpha` to `beta` -- The software is far along and mature enough at this point!
 * Development is now against Node.js 12.x LTS. Other versions may work but are not currently supported!
+* [QWK support](/docs/messageareas/qwk.md)
+* `oputil fb scan *areaTagWildcard*` scans all areas in which wildcard is matched.
+
 
 ## 0.0.10-alpha
 + `oputil.js user rename USERNAME NEWNAME`

From 75787b61079c4cfe91498d415f4d4d8d89565843 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 May 2020 20:22:16 -0600
Subject: [PATCH 0985/1013] Start work on new telnet server

---
 core/config.js                |  5 ++++
 core/servers/login/telnet2.js | 43 +++++++++++++++++++++++++++++++++++
 package.json                  |  3 ++-
 yarn.lock                     |  9 +++++++-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 core/servers/login/telnet2.js

diff --git a/core/config.js b/core/config.js
index 66ffab14..76ee98f5 100644
--- a/core/config.js
+++ b/core/config.js
@@ -285,6 +285,11 @@ function getDefaultConfig() {
         },
 
         loginServers : {
+            telnet2: {
+                port: 8810,
+                enabled : true,
+                firstMenu: 'telnetConnected',
+            },
             telnet : {
                 port            : 8888,
                 enabled         : true,
diff --git a/core/servers/login/telnet2.js b/core/servers/login/telnet2.js
new file mode 100644
index 00000000..a19fe675
--- /dev/null
+++ b/core/servers/login/telnet2.js
@@ -0,0 +1,43 @@
+//  ENiGMA½
+const LoginServerModule = require('../../login_server_module');
+const Client = require('../../client');
+
+//  deps
+const net = require('net');
+const { TelnetSocket, TelnetSpec } = require('telnet-socket');
+
+const ModuleInfo = exports.moduleInfo = {
+    name        : 'Telnet',
+    desc        : 'Telnet Server',
+    author      : 'NuSkooler',
+    isSecure    : false,
+    packageName : 'codes.l33t.enigma.telnet.server.v2',
+};
+
+
+
+class TelnetClient extends Client {
+    constructor(socket) {
+        super();
+
+        this.setInputOutput(socket, socket);
+        this.telnetSocket = new TelnetSocket(socket);
+
+        //  :TODO: banner
+    }
+};
+
+exports.getModule = class TelnetServerModule extends LoginServerModule {
+    constructor() {
+        super();
+    }
+
+    createServer(cb) {
+        this.server = net.createServer( socket => {
+            const client = new TelnetClient(socket);
+            this.handleNewClient(client, socket, ModuleInfo);
+        });
+
+        return cb(null);
+    }
+};
diff --git a/package.json b/package.json
index 0a68e584..6bb5a613 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,8 @@
     "uuid-parse": "1.1.0",
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
-    "yazl": "^2.5.1"
+    "yazl": "^2.5.1",
+    "telnet-socket" : "github:NuSkooler/telnet-socket"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 30d2470a..5dd80c0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,7 +160,7 @@ bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-binary-parser@^1.6.2:
+binary-parser@^1.5.0, binary-parser@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.6.2.tgz#8410a82ffd9403271ec182bd91e63a09cee88cbe"
   integrity sha512-cYAhKB51A9T/uylDvMK7uAYaPLWLwlferNOpnQ0E0fuO73yPi7kWaWiOm22BvuKxCbggmkiFN0VkuLg6gc+KQQ==
@@ -1840,6 +1840,13 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+"telnet-socket@github:NuSkooler/telnet-socket":
+  version "0.1.0"
+  resolved "https://codeload.github.com/NuSkooler/telnet-socket/tar.gz/a29ea2edaec98bb844f2b0d27fa0977f33eaa7bf"
+  dependencies:
+    binary-parser "^1.5.0"
+    buffers "github:NuSkooler/node-buffers"
+
 temptmp@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/temptmp/-/temptmp-1.1.0.tgz#bfbbff858d7f7d59c563fbf069758a7775ecd431"

From 1018485e8e55e5be284502080f27698c02cb0207 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 May 2020 21:36:48 -0600
Subject: [PATCH 0986/1013] WIP

---
 core/config.js                |   5 --
 core/servers/login/telnet2.js | 126 ++++++++++++++++++++++++++++++++--
 2 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/core/config.js b/core/config.js
index 76ee98f5..66ffab14 100644
--- a/core/config.js
+++ b/core/config.js
@@ -285,11 +285,6 @@ function getDefaultConfig() {
         },
 
         loginServers : {
-            telnet2: {
-                port: 8810,
-                enabled : true,
-                firstMenu: 'telnetConnected',
-            },
             telnet : {
                 port            : 8888,
                 enabled         : true,
diff --git a/core/servers/login/telnet2.js b/core/servers/login/telnet2.js
index a19fe675..3127dfb8 100644
--- a/core/servers/login/telnet2.js
+++ b/core/servers/login/telnet2.js
@@ -1,10 +1,16 @@
 //  ENiGMA½
 const LoginServerModule = require('../../login_server_module');
-const Client = require('../../client');
+const { Client } = require('../../client');
+const Config = require('../../config').get;
+const { log: Log } = require('../../logger');
 
 //  deps
 const net = require('net');
-const { TelnetSocket, TelnetSpec } = require('telnet-socket');
+const {
+    TelnetSocket,
+    TelnetSpec: { Options, Commands }
+} = require('telnet-socket');
+const { inherits } = require('util');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'Telnet',
@@ -16,17 +22,104 @@ const ModuleInfo = exports.moduleInfo = {
 
 
 
-class TelnetClient extends Client {
+class TelnetClient {
     constructor(socket) {
-        super();
+        Client.apply(this, socket, socket);
 
         this.setInputOutput(socket, socket);
-        this.telnetSocket = new TelnetSocket(socket);
+        this.socket = new TelnetSocket(socket);
 
-        //  :TODO: banner
+        //
+        //  Wait up to 3s to hear about from our terminal type request
+        //  then go ahead and move on...
+        //
+        setTimeout(() => {
+            this.clientReady();
+        }, 3000);
+
+        this.socket.on('WILL', command => {
+            switch (command.option) {
+                case Options.LINEMODE :
+                    return this.socket.dont.linemode();
+
+                case Options.TTYPE :
+                    return this.socket.sb.send.ttype();
+
+                case Options.NEW_ENVIRON :
+                    return this.socket.sb.send.new_environ();
+
+                default :
+                    break;
+            }
+        });
+
+        this.socket.on('SB', command => {
+            switch (command.option) {
+                case Options.TTYPE :
+                    this.setTermType(command.optionData.ttype);
+                    this.clientReady();
+                    break;
+
+                case Options.NEW_ENVIRON :
+                    {
+                        if ('unknown' === this.term.termType) {
+                            const term =
+                                command.optionData.vars.find(nv => nv.TERM) ||
+                                command.optionData.userVars.find(nv => nv.TERM);
+                            if (term) {
+                                this.setTermType(term);
+                            }
+                        }
+
+                        command.optionData.vars.forEach(nv => {
+                            console.log(nv);
+                        });
+                    }
+                    break;
+
+                case Options.NAWS :
+                    this.term.termWidth     = command.optionData.width;
+                    this.term.termHeight    = command.optionData.height;
+
+                    //  :TODO: update env, see old telnet.js
+
+                    this.clearMciCache();
+
+                    //  :TODO: Log negotiation
+                    break;
+            }
+        });
+
+        this.banner();
+    }
+
+    clientReady() {
+        if (this.clientReadyHandled) {
+            return; //  already processed
+        }
+
+        this.clientReadyHandled = true;
+        this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
+    }
+
+    banner() {
+        this.socket.do.echo();
+        this.socket.will.echo();              //  we'll echo back
+
+        this.socket.will.sga();
+        this.socket.do.sga();
+
+        this.socket.do.transmit_binary();
+        this.socket.will.transmit_binary();
+
+        this.socket.do.ttype();
+        this.socket.do.naws();
+        this.socket.do.new_environ();
     }
 };
 
+inherits(TelnetClient, Client);
+
 exports.getModule = class TelnetServerModule extends LoginServerModule {
     constructor() {
         super();
@@ -38,6 +131,27 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
             this.handleNewClient(client, socket, ModuleInfo);
         });
 
+        this.server.on('error', err => {
+            Log.info( { error : err.message }, 'Telnet server error');
+        });
+
         return cb(null);
     }
+
+    listen(cb) {
+        const config = Config();
+        //const port = parseInt(config.loginServers.telnet.port);
+        const port = 8810;  //  :TODO: Put me back ;)
+        if(isNaN(port)) {
+            Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
+            return cb(Errors.Invalid(`Invalid port: ${config.loginServers.telnet.port}`));
+        }
+
+        this.server.listen(port, config.loginServers.telnet.address, err => {
+            if(!err) {
+                Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
+            }
+            return cb(err);
+        });
+    }
 };

From e517e31b9405aa099b89617e6a1666e99734d18c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 17 May 2020 22:35:03 -0600
Subject: [PATCH 0987/1013] Working fairly well

---
 core/servers/login/telnet2.js | 72 +++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 7 deletions(-)

diff --git a/core/servers/login/telnet2.js b/core/servers/login/telnet2.js
index 3127dfb8..3e38d988 100644
--- a/core/servers/login/telnet2.js
+++ b/core/servers/login/telnet2.js
@@ -20,8 +20,6 @@ const ModuleInfo = exports.moduleInfo = {
     packageName : 'codes.l33t.enigma.telnet.server.v2',
 };
 
-
-
 class TelnetClient {
     constructor(socket) {
         Client.apply(this, socket, socket);
@@ -37,6 +35,33 @@ class TelnetClient {
             this.clientReady();
         }, 3000);
 
+        this.socket.on('data', data => {
+            this.emit('data', data);
+        });
+
+        this.socket.on('error', err => {
+            //  :TODO: Log me
+            return this.emit('end');
+        });
+
+        this.socket.on('end', () => {
+            this.emit('end');
+        });
+
+        this.socket.on('DO', command => {
+            switch (command.option) {
+                case Options.ECHO :
+                    return this.socket.will.echo();
+
+                default :
+                    return this.socket.command(Commands.WONT, command.option);
+            }
+        });
+
+        this.socket.on('DONT', command => {
+            //  :TODO: Log me
+        });
+
         this.socket.on('WILL', command => {
             switch (command.option) {
                 case Options.LINEMODE :
@@ -53,6 +78,10 @@ class TelnetClient {
             }
         });
 
+        this.socket.on('WONT', command => {
+            //  :TODO: see telnet.js handling
+        });
+
         this.socket.on('SB', command => {
             switch (command.option) {
                 case Options.TTYPE :
@@ -78,18 +107,39 @@ class TelnetClient {
                     break;
 
                 case Options.NAWS :
-                    this.term.termWidth     = command.optionData.width;
-                    this.term.termHeight    = command.optionData.height;
+                    {
+                        const { width, height } = command.optionData;
 
-                    //  :TODO: update env, see old telnet.js
+                        this.term.termWidth     = width;
+                        this.term.termHeight    = height;
 
-                    this.clearMciCache();
+                        if (width) {
+                            this.term.env.COLUMNS = width;
+                        }
 
-                    //  :TODO: Log negotiation
+                        if (height) {
+                            this.term.env.ROWS = height;
+                        }
+
+                        this.clearMciCache();
+
+                        //  :TODO: Log negotiation
+                    }
                     break;
             }
         });
 
+        this.socket.on('IP', command => {
+            //  :TODO: Log me
+            return this.disconnect();
+        });
+
+        this.socket.on('AYT', () => {
+            //  :TODO: Log me
+            return this.socket.write('\b');
+        });
+
+        //  kick off negotiations
         this.banner();
     }
 
@@ -102,6 +152,14 @@ class TelnetClient {
         this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
     }
 
+    disconnect() {
+        try {
+            return this.socket.rawSocket.end();
+        } catch (e) {
+            //  ignored
+        }
+    }
+
     banner() {
         this.socket.do.echo();
         this.socket.will.echo();              //  we'll echo back

From a1ac6dfc67e12fdbca7376652032c3be9fa38e4b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 May 2020 00:33:14 -0600
Subject: [PATCH 0988/1013] Shim in dataHandler for toggling from elsewhere

---
 core/servers/login/telnet2.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/servers/login/telnet2.js b/core/servers/login/telnet2.js
index 3e38d988..7f63659e 100644
--- a/core/servers/login/telnet2.js
+++ b/core/servers/login/telnet2.js
@@ -35,9 +35,11 @@ class TelnetClient {
             this.clientReady();
         }, 3000);
 
-        this.socket.on('data', data => {
+        this.dataHandler = function(data) {
             this.emit('data', data);
-        });
+        }.bind(this);
+
+        this.socket.on('data', this.dataHandler);
 
         this.socket.on('error', err => {
             //  :TODO: Log me
@@ -79,7 +81,14 @@ class TelnetClient {
         });
 
         this.socket.on('WONT', command => {
-            //  :TODO: see telnet.js handling
+            switch (command.option) {
+                case Options.NEW_ENVIRON :
+                    return this.socket.dont.new_environ();
+
+                    default :
+                        //  :TODO: Log me
+                        break;
+            }
         });
 
         this.socket.on('SB', command => {
@@ -143,6 +152,10 @@ class TelnetClient {
         this.banner();
     }
 
+    // dataHandler(data) {
+    //     this.emit('data', data);
+    // }
+
     clientReady() {
         if (this.clientReadyHandled) {
             return; //  already processed

From 6d307ec06ba7c589fb175764677c1e911a87ddc3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 May 2020 18:41:23 -0600
Subject: [PATCH 0989/1013] Clean up a bit. Still more to do...

---
 core/servers/login/telnet.js    | 1028 ++++++-------------------------
 core/servers/login/telnet2.js   |  228 -------
 core/servers/login/websocket.js |    2 +-
 3 files changed, 204 insertions(+), 1054 deletions(-)
 delete mode 100644 core/servers/login/telnet2.js

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 20ec6cd9..111167fb 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -1,841 +1,232 @@
-/* jslint node: true */
-'use strict';
-
 //  ENiGMA½
-const baseClient                    = require('../../client.js');
-const Log                           = require('../../logger.js').log;
-const LoginServerModule             = require('../../login_server_module.js');
-const Config                        = require('../../config.js').get;
-const EnigAssert                    = require('../../enigma_assert.js');
-const { stringFromNullTermBuffer }  = require('../../string_util.js');
-const { Errors }                    = require('../../enig_error.js');
+const LoginServerModule = require('../../login_server_module');
+const { Client } = require('../../client');
+const Config = require('../../config').get;
+const { log: Log } = require('../../logger');
 
 //  deps
-const net           = require('net');
-const buffers       = require('buffers');
-const { Parser }    = require('binary-parser');
-const util          = require('util');
+const net = require('net');
+const {
+    TelnetSocket,
+    TelnetSpec: { Options, Commands }
+} = require('telnet-socket');
+const { inherits } = require('util');
 
 const ModuleInfo = exports.moduleInfo = {
     name        : 'Telnet',
-    desc        : 'Telnet Server',
+    desc        : 'Telnet Server v2',
     author      : 'NuSkooler',
     isSecure    : false,
-    packageName : 'codes.l33t.enigma.telnet.server',
+    packageName : 'codes.l33t.enigma.telnet.server.v2',
 };
 
-exports.TelnetClient    = TelnetClient;
+class TelnetClient {
+    constructor(socket) {
+        Client.apply(this, socket, socket);
 
-//
-//  Telnet Protocol Resources
-//  * http://pcmicro.com/netfoss/telnet.html
-//  * http://mud-dev.wikidot.com/telnet:negotiation
-//
+        this.setInputOutput(socket, socket);
+        this.socket = new TelnetSocket(socket);
 
-/*
-    TODO:
-    * Various (much lesser used) Telnet command coverage
-*/
-
-const COMMANDS = {
-    SE      : 240,  //  End of Sub-Negotation Parameters
-    NOP     : 241,  //  No Operation
-    DM      : 242,  //  Data Mark
-    BRK     : 243,  //  Break
-    IP      : 244,  //  Interrupt Process
-    AO      : 245,  //  Abort Output
-    AYT     : 246,  //  Are You There?
-    EC      : 247,  //  Erase Character
-    EL      : 248,  //  Erase Line
-    GA      : 249,  //  Go Ahead
-    SB      : 250,  //  Start Sub-Negotiation Parameters
-    WILL    : 251,  //
-    WONT    : 252,
-    DO      : 253,
-    DONT    : 254,
-    IAC     : 255,  //  (Data Byte)
-};
-
-//
-//  Resources:
-//      * http://www.faqs.org/rfcs/rfc1572.html
-//
-const SB_COMMANDS = {
-    IS      : 0,
-    SEND    : 1,
-    INFO    : 2,
-};
-
-//
-//  Telnet Options
-//
-//  Resources
-//      * http://mars.netanya.ac.il/~unesco/cdrom/booklet/HTML/NETWORKING/node300.html
-//      * http://www.networksorcery.com/enp/protocol/telnet.htm
-//
-const OPTIONS = {
-    TRANSMIT_BINARY         : 0,    // http://tools.ietf.org/html/rfc856
-    ECHO                    : 1,    //  http://tools.ietf.org/html/rfc857
-    //  RECONNECTION : 2
-    SUPPRESS_GO_AHEAD       : 3,    // aka 'SGA': RFC 858 @ http://tools.ietf.org/html/rfc858
-    //APPROX_MESSAGE_SIZE   : 4
-    STATUS                  : 5,    // http://tools.ietf.org/html/rfc859
-    TIMING_MARK             : 6, // http://tools.ietf.org/html/rfc860
-    //RC_TRANS_AND_ECHO     : 7,    //  aka 'RCTE' @ http://www.rfc-base.org/txt/rfc-726.txt
-    //OUPUT_LINE_WIDTH      : 8,
-    //OUTPUT_PAGE_SIZE      : 9,    //
-    //OUTPUT_CARRIAGE_RETURN_DISP   : 10,   //  RFC 652
-    //OUTPUT_HORIZ_TABSTOPS : 11,   //  RFC 653
-    //OUTPUT_HORIZ_TAB_DISP : 12,   //  RFC 654
-    //OUTPUT_FORMFEED_DISP  : 13,   //  RFC 655
-    //OUTPUT_VERT_TABSTOPS  : 14,   //  RFC 656
-    //OUTPUT_VERT_TAB_DISP  : 15,   //  RFC 657
-    //OUTPUT_LF_DISP        : 16,   //  RFC 658
-    //EXTENDED_ASCII        : 17,   //  RFC 659
-    //LOGOUT                : 18,   //  RFC 727
-    //BYTE_MACRO            : 19,   //  RFC 753
-    //DATA_ENTRY_TERMINAL   : 20,   //  RFC 1043
-    //SUPDUP                : 21,   //  RFC 736
-    //SUPDUP_OUTPUT         : 22,   //  RFC 749
-    SEND_LOCATION           : 23,   //  RFC 779
-    TERMINAL_TYPE           : 24,   //  aka 'TTYPE': RFC 1091 @ http://tools.ietf.org/html/rfc1091
-    //END_OF_RECORD         : 25,   //  RFC 885
-    //TACACS_USER_ID        : 26,   //  RFC 927
-    //OUTPUT_MARKING        : 27,   //  RFC 933
-    //TERMINCAL_LOCATION_NUMBER : 28,   //  RFC 946
-    //TELNET_3270_REGIME    : 29,   //  RFC 1041
-    WINDOW_SIZE             : 31,   //  aka 'NAWS': RFC 1073 @ http://tools.ietf.org/html/rfc1073
-    TERMINAL_SPEED          : 32,   //  RFC 1079 @ http://tools.ietf.org/html/rfc1079
-    REMOTE_FLOW_CONTROL     : 33,   //  RFC 1072 @ http://tools.ietf.org/html/rfc1372
-    LINEMODE                : 34,   //  RFC 1184 @ http://tools.ietf.org/html/rfc1184
-    X_DISPLAY_LOCATION      : 35,   //  aka 'XDISPLOC': RFC 1096 @ http://tools.ietf.org/html/rfc1096
-    NEW_ENVIRONMENT_DEP     : 36,   //  aka 'NEW-ENVIRON': RFC 1408 @ http://tools.ietf.org/html/rfc1408 (note: RFC 1572 is an update to this)
-    AUTHENTICATION          : 37,   //  RFC 2941 @ http://tools.ietf.org/html/rfc2941
-    ENCRYPT                 : 38,   //  RFC 2946 @ http://tools.ietf.org/html/rfc2946
-    NEW_ENVIRONMENT         : 39,   //  aka 'NEW-ENVIRON': RFC 1572 @ http://tools.ietf.org/html/rfc1572 (note: update to RFC 1408)
-    //TN3270E                   : 40,   //  RFC 2355
-    //XAUTH                 : 41,
-    //CHARSET               : 42,   //  RFC 2066
-    //REMOTE_SERIAL_PORT    : 43,
-    //COM_PORT_CONTROL      : 44,   //  RFC 2217
-    //SUPRESS_LOCAL_ECHO    : 45,
-    //START_TLS             : 46,
-    //KERMIT                : 47,   //  RFC 2840
-    //SEND_URL              : 48,
-    //FORWARD_X             : 49,
-
-    //PRAGMA_LOGON          : 138,
-    //SSPI_LOGON            : 139,
-    //PRAGMA_HEARTBEAT      : 140
-
-    ARE_YOU_THERE           : 246,  //  aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
-
-    EXTENDED_OPTIONS_LIST   : 255,  //  RFC 861 (STD 32)
-};
-
-//  Commands used within NEW_ENVIRONMENT[_DEP]
-const NEW_ENVIRONMENT_COMMANDS = {
-    VAR     : 0,
-    VALUE   : 1,
-    ESC     : 2,
-    USERVAR : 3,
-};
-
-const IAC_BUF       = Buffer.from([ COMMANDS.IAC ]);
-const IAC_SE_BUF    = Buffer.from([ COMMANDS.IAC, COMMANDS.SE ]);
-
-const COMMAND_NAMES = Object.keys(COMMANDS).reduce(function(names, name) {
-    names[COMMANDS[name]] = name.toLowerCase();
-    return names;
-}, {});
-
-const COMMAND_IMPLS = {};
-[ 'do', 'dont', 'will', 'wont', 'sb' ].forEach(function(command) {
-    const code = COMMANDS[command.toUpperCase()];
-    COMMAND_IMPLS[code] = function(bufs, i, event) {
-        if(bufs.length < (i + 1)) {
-            return MORE_DATA_REQUIRED;
-        }
-        return parseOption(bufs, i, event);
-    };
-});
-
-//  :TODO: See TooTallNate's telnet.js: Handle COMMAND_IMPL for IAC in binary mode
-
-//  Create option names such as 'transmit binary' -> OPTIONS.TRANSMIT_BINARY
-const OPTION_NAMES = Object.keys(OPTIONS).reduce(function(names, name) {
-    names[OPTIONS[name]] = name.toLowerCase().replace(/_/g, ' ');
-    return names;
-}, {});
-
-function unknownOption(bufs, i, event) {
-    Log.warn( { bufs : bufs, i : i, event : event }, 'Unknown Telnet option');
-    event.buf = bufs.splice(0, i).toBuffer();
-    return event;
-}
-
-const OPTION_IMPLS = {};
-//  :TODO: fill in the rest...
-OPTION_IMPLS.NO_ARGS                        =
-OPTION_IMPLS[OPTIONS.ECHO]                  =
-OPTION_IMPLS[OPTIONS.STATUS]                =
-OPTION_IMPLS[OPTIONS.LINEMODE]              =
-OPTION_IMPLS[OPTIONS.TRANSMIT_BINARY]       =
-OPTION_IMPLS[OPTIONS.AUTHENTICATION]        =
-OPTION_IMPLS[OPTIONS.TERMINAL_SPEED]        =
-OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL]   =
-OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION]    =
-OPTION_IMPLS[OPTIONS.SEND_LOCATION]         =
-OPTION_IMPLS[OPTIONS.ARE_YOU_THERE]         =
-OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD]     = function(bufs, i, event) {
-    event.buf = bufs.splice(0, i).toBuffer();
-    return event;
-};
-
-const TermTypeCmdParser = new Parser()
-    .uint8('iac1')
-    .uint8('sb')
-    .uint8('opt')
-    .uint8('is')
-    .array('ttype', {
-        type        : 'uint8',
-        readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
-    })
-    //  note we read iac2 above
-    .uint8('se');
-
-OPTION_IMPLS[OPTIONS.TERMINAL_TYPE] = function(bufs, i, event) {
-    if(event.commandCode !== COMMANDS.SB) {
-        OPTION_IMPLS.NO_ARGS(bufs, i, event);
-    } else {
-        //  We need 4 bytes header + data + IAC SE
-        if(bufs.length < 7) {
-            return MORE_DATA_REQUIRED;
-        }
-
-        const end = bufs.indexOf(IAC_SE_BUF, 5);    //  look past header bytes
-        if(-1 === end) {
-            return MORE_DATA_REQUIRED;
-        }
-
-        let ttypeCmd;
-        try {
-            ttypeCmd = TermTypeCmdParser.parse(bufs.toBuffer());
-        } catch(e) {
-            Log.debug( { error : e }, 'Failed parsing TTYP telnet command');
-            return event;
-        }
-
-        EnigAssert(COMMANDS.IAC === ttypeCmd.iac1);
-        EnigAssert(COMMANDS.SB === ttypeCmd.sb);
-        EnigAssert(OPTIONS.TERMINAL_TYPE === ttypeCmd.opt);
-        EnigAssert(SB_COMMANDS.IS === ttypeCmd.is);
-        EnigAssert(ttypeCmd.ttype.length > 0);
-        //  note we found IAC_SE above
-
-        //  some terminals such as NetRunner provide a NULL-terminated buffer
-        //  slice to remove IAC
-        event.ttype = stringFromNullTermBuffer(ttypeCmd.ttype.slice(0, -1), 'ascii');
-
-        bufs.splice(0, end);
-    }
-
-    return event;
-};
-
-const NawsCmdParser = new Parser()
-    .uint8('iac1')
-    .uint8('sb')
-    .uint8('opt')
-    .uint16be('width')
-    .uint16be('height')
-    .uint8('iac2')
-    .uint8('se');
-
-OPTION_IMPLS[OPTIONS.WINDOW_SIZE] = function(bufs, i, event) {
-    if(event.commandCode !== COMMANDS.SB) {
-        OPTION_IMPLS.NO_ARGS(bufs, i, event);
-    } else {
-        //  we need 9 bytes
-        if(bufs.length < 9) {
-            return MORE_DATA_REQUIRED;
-        }
-
-        let nawsCmd;
-        try {
-            nawsCmd = NawsCmdParser.parse(bufs.splice(0, 9).toBuffer());
-        } catch(e) {
-            Log.debug( { error : e }, 'Failed parsing NAWS telnet command');
-            return event;
-        }
-
-        EnigAssert(COMMANDS.IAC === nawsCmd.iac1);
-        EnigAssert(COMMANDS.SB === nawsCmd.sb);
-        EnigAssert(OPTIONS.WINDOW_SIZE === nawsCmd.opt);
-        EnigAssert(COMMANDS.IAC === nawsCmd.iac2);
-        EnigAssert(COMMANDS.SE === nawsCmd.se);
-
-        event.cols  = event.columns = event.width = nawsCmd.width;
-        event.rows  = event.height = nawsCmd.height;
-    }
-    return event;
-};
-
-//  Build an array of delimiters for parsing NEW_ENVIRONMENT[_DEP]
-//const NEW_ENVIRONMENT_DELIMITERS = _.values(NEW_ENVIRONMENT_COMMANDS);
-
-const EnvCmdParser = new Parser()
-    .uint8('iac1')
-    .uint8('sb')
-    .uint8('opt')
-    .uint8('isOrInfo')  //  IS=initial, INFO=updates
-    .array('envBlock', {
-        type : 'uint8',
-        readUntil   : b => 255 === b,   //  255=COMMANDS.IAC
-    })
-    //  note we consume IAC above
-    .uint8('se');
-
-//  Handle the deprecated RFC 1408 & the updated RFC 1572:
-OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT_DEP]   =
-OPTION_IMPLS[OPTIONS.NEW_ENVIRONMENT]       = function(bufs, i, event) {
-    if(event.commandCode !== COMMANDS.SB) {
-        OPTION_IMPLS.NO_ARGS(bufs, i, event);
-    } else {
         //
-        //  We need 4 bytes header + <optional payload> + IAC SE
-        //  Many terminals send a empty list:
-        //      IAC SB NEW-ENVIRON IS IAC SE
+        //  Wait up to 3s to hear about from our terminal type request
+        //  then go ahead and move on...
         //
-        if(bufs.length < 6) {
-            return MORE_DATA_REQUIRED;
-        }
+        setTimeout(() => {
+            this._clientReady();
+        }, 3000);
 
-        let end = bufs.indexOf(IAC_SE_BUF, 4);  //  look past header bytes
-        if(-1 === end) {
-            return MORE_DATA_REQUIRED;
-        }
+        this.dataHandler = function(data) {
+            this.emit('data', data);
+        }.bind(this);
 
-        //  :TODO: It's likely that we could do all the env name/value parsing directly in Parser.
+        this.socket.on('data', this.dataHandler);
 
-        let envCmd;
-        try {
-            envCmd = EnvCmdParser.parse(bufs.splice(0, bufs.length).toBuffer());
-        } catch(e) {
-            Log.debug( { error : e }, 'Failed parsing NEW-ENVIRON telnet command');
-            return event;
-        }
+        this.socket.on('error', err => {
+            this._logDebug( { error : err.message }, 'Socket error');
+            return this.emit('end');
+        });
 
-        EnigAssert(COMMANDS.IAC === envCmd.iac1);
-        EnigAssert(COMMANDS.SB === envCmd.sb);
-        EnigAssert(OPTIONS.NEW_ENVIRONMENT === envCmd.opt || OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt);
-        EnigAssert(SB_COMMANDS.IS === envCmd.isOrInfo || SB_COMMANDS.INFO === envCmd.isOrInfo);
+        this.socket.on('end', () => {
+            this.emit('end');
+        });
 
-        if(OPTIONS.NEW_ENVIRONMENT_DEP === envCmd.opt) {
-            //  :TODO: we should probably support this for legacy clients?
-            Log.warn('Handling deprecated RFC 1408 NEW-ENVIRON');
-        }
+        this.socket.on('DO', command => {
+            switch (command.option) {
+                case Options.ECHO :
+                    return this.socket.will.echo();
 
-        const envBuf = envCmd.envBlock.slice(0, -1);    //  remove IAC
-
-        if(envBuf.length < 4) { //  TYPE + single char name + sep + single char value
-            //  empty env block
-            return event;
-        }
-
-        const States = {
-            Name        : 1,
-            Value       : 2,
-        };
-
-        let state = States.Name;
-        const setVars = {};
-        const delVars = [];
-        let varName;
-        //  :TODO: handle ESC type!!!
-        while(envBuf.length) {
-            switch(state) {
-                case States.Name :
-                    {
-                        const type = parseInt(envBuf.splice(0, 1));
-                        if(![ NEW_ENVIRONMENT_COMMANDS.VAR, NEW_ENVIRONMENT_COMMANDS.USERVAR, NEW_ENVIRONMENT_COMMANDS.ESC ].includes(type)) {
-                            return event;   //  fail :(
-                        }
-
-                        let nameEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VALUE);
-                        if(-1 === nameEnd) {
-                            nameEnd = envBuf.length;
-                        }
-
-                        varName = envBuf.splice(0, nameEnd);
-                        if(!varName) {
-                            return event;   //  something is wrong.
-                        }
-
-                        varName = Buffer.from(varName).toString('ascii');
-
-                        const next = parseInt(envBuf.splice(0, 1));
-                        if(NEW_ENVIRONMENT_COMMANDS.VALUE === next) {
-                            state = States.Value;
-                        } else {
-                            state = States.Name;
-                            delVars.push(varName);  //  no value; del this var
-                        }
-                    }
-                    break;
-
-                case States.Value :
-                    {
-                        let valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.VAR);
-                        if(-1 === valueEnd) {
-                            valueEnd = envBuf.indexOf(NEW_ENVIRONMENT_COMMANDS.USERVAR);
-                        }
-                        if(-1 === valueEnd) {
-                            valueEnd = envBuf.length;
-                        }
-
-                        let value = envBuf.splice(0, valueEnd);
-                        if(value) {
-                            value = Buffer.from(value).toString('ascii');
-                            setVars[varName] = value;
-                        }
-                        state = States.Name;
-                    }
-                    break;
-            }
-        }
-
-        //  :TODO: Handle deleting previously set vars via delVars
-        event.type      = envCmd.isOrInfo;
-        event.envVars   = setVars;
-    }
-
-    return event;
-};
-
-const MORE_DATA_REQUIRED    = 0xfeedface;
-
-function parseBufs(bufs) {
-    EnigAssert(bufs.length >= 2);
-    EnigAssert(bufs.get(0) === COMMANDS.IAC);
-    return parseCommand(bufs, 1, {});
-}
-
-function parseCommand(bufs, i, event) {
-    const command       = bufs.get(i);  //  :TODO: fix deprecation... [i] is not the same
-    event.commandCode   = command;
-    event.command       = COMMAND_NAMES[command];
-
-    const handler = COMMAND_IMPLS[command];
-    if(handler) {
-        return handler(bufs, i + 1, event);
-    } else {
-        if(2 !== bufs.length) {
-            Log.warn( { bufsLength : bufs.length }, 'Expected bufs length of 2');   //  expected: IAC + COMMAND
-        }
-
-        event.buf = bufs.splice(0, 2).toBuffer();
-        return event;
-    }
-}
-
-function parseOption(bufs, i, event) {
-    const option        = bufs.get(i);  //  :TODO: fix deprecation... [i] is not the same
-    event.optionCode    = option;
-    event.option        = OPTION_NAMES[option];
-
-    const handler = OPTION_IMPLS[option];
-    return handler ? handler(bufs, i + 1, event) : unknownOption(bufs, i + 1, event);
-}
-
-
-function TelnetClient(input, output) {
-    baseClient.Client.apply(this, arguments);
-
-    const self  = this;
-
-    let bufs    = buffers();
-    this.bufs   = bufs;
-
-    this.sentDont = {}; //  DON'T's we've already sent
-
-    this.setInputOutput(input, output);
-
-    this.negotiationsComplete   = false;    //  are we in the 'negotiation' phase?
-    this.didReady               = false;    //  have we emit the 'ready' event?
-
-    this.subNegotiationState = {
-        newEnvironRequested : false,
-    };
-
-    this.dataHandler = function(b) {
-        if(!Buffer.isBuffer(b)) {
-            EnigAssert(false, `Cannot push non-buffer ${typeof b}`);
-            return;
-        }
-
-        bufs.push(b);
-
-        let i;
-        while((i = bufs.indexOf(IAC_BUF)) >= 0) {
-
-            //
-            //  Some clients will send even IAC separate from data
-            //
-            if(bufs.length <= (i + 1)) {
-                i = MORE_DATA_REQUIRED;
-                break;
-            }
-
-            EnigAssert(bufs.length > (i + 1));
-
-            if(i > 0) {
-                self.emit('data', bufs.splice(0, i).toBuffer());
-            }
-
-            i = parseBufs(bufs);
-
-            if(MORE_DATA_REQUIRED === i) {
-                break;
-            } else if(i) {
-                if(i.option) {
-                    self.emit(i.option, i); //  "transmit binary", "echo", ...
-                }
-
-                self.handleTelnetEvent(i);
-
-                if(i.data) {
-                    self.emit('data', i.data);
-                }
-            }
-        }
-
-        if(MORE_DATA_REQUIRED !== i && bufs.length > 0) {
-            //
-            //  Standard data payload. This can still be "non-user" data
-            //  such as ANSI control, but we don't handle that here.
-            //
-            self.emit('data', bufs.splice(0).toBuffer());
-        }
-    };
-
-    this.input.on('data', this.dataHandler);
-
-    this.input.on('end', () => {
-        self.emit('end');
-    });
-
-    this.input.on('error', err => {
-        this.connectionDebug( { err : err }, 'Socket error' );
-        return self.emit('end');
-    });
-
-    this.connectionTrace = (info, msg) => {
-        if(Config().loginServers.telnet.traceConnections) {
-            const logger = self.log || Log;
-            return logger.trace(info, `Telnet: ${msg}`);
-        }
-    };
-
-    this.connectionDebug = (info, msg) => {
-        const logger = self.log || Log;
-        return logger.debug(info, `Telnet: ${msg}`);
-    };
-
-    this.connectionWarn = (info, msg) => {
-        const logger = self.log || Log;
-        return logger.warn(info, `Telnet: ${msg}`);
-    };
-
-    this.readyNow = () => {
-        if(!this.didReady) {
-            this.didReady = true;
-            this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
-        }
-    };
-
-    this.disconnect = function() {
-        try {
-            return this.output.end.apply(this.output, arguments);
-        }
-        catch(e) {
-            //  nothing
-        }
-    };
-}
-
-util.inherits(TelnetClient, baseClient.Client);
-
-///////////////////////////////////////////////////////////////////////////////
-//  Telnet Command/Option handling
-///////////////////////////////////////////////////////////////////////////////
-TelnetClient.prototype.handleTelnetEvent = function(evt) {
-
-    if(!evt.command) {
-        return this.connectionWarn( { evt : evt }, 'No command for event');
-    }
-
-    //  handler name e.g. 'handleWontCommand'
-    const handlerName = `handle${evt.command.charAt(0).toUpperCase()}${evt.command.substr(1)}Command`;
-
-    if(this[handlerName]) {
-        //  specialized
-        this[handlerName](evt);
-    } else {
-        //  generic-ish
-        this.handleMiscCommand(evt);
-    }
-};
-
-TelnetClient.prototype.handleWillCommand = function(evt) {
-    if('terminal type' === evt.option) {
-        //
-        //  See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-        //
-        this.requestTerminalType();
-    } else if('new environment' === evt.option) {
-        //
-        //  See RFC 1572 @ http://www.faqs.org/rfcs/rfc1572.html
-        //
-        this.requestNewEnvironment();
-    } else {
-        //  :TODO: temporary:
-        this.connectionTrace(evt, 'WILL');
-    }
-};
-
-TelnetClient.prototype.handleWontCommand = function(evt) {
-    if(this.sentDont[evt.option]) {
-        return this.connectionTrace(evt, 'WONT - DON\'T already sent');
-    }
-
-    this.sentDont[evt.option] = true;
-
-    if('new environment' === evt.option) {
-        this.dont.new_environment();
-    } else {
-        this.connectionTrace(evt, 'WONT');
-    }
-};
-
-TelnetClient.prototype.handleDoCommand = function(evt) {
-    //  :TODO: handle the rest, e.g. echo nd the like
-
-    if('linemode' === evt.option) {
-        //
-        //  Client wants to enable linemode editing. Denied.
-        //
-        this.wont.linemode();
-    } else if('encrypt' === evt.option) {
-        //
-        //  Client wants to enable encryption. Denied.
-        //
-        this.wont.encrypt();
-    } else {
-        //  :TODO: temporary:
-        this.connectionTrace(evt, 'DO');
-    }
-};
-
-TelnetClient.prototype.handleDontCommand = function(evt) {
-    this.connectionTrace(evt, 'DONT');
-};
-
-TelnetClient.prototype.handleSbCommand = function(evt) {
-    const self = this;
-
-    if('terminal type' === evt.option) {
-        //
-        //  See RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-        //
-        //  :TODO: According to RFC 1091 @ http://www.faqs.org/rfcs/rfc1091.html
-        //  We should keep asking until we see a repeat. From there, determine the best type/etc.
-        self.setTermType(evt.ttype);
-
-        self.negotiationsComplete = true;   //  :TODO: throw in a array of what we've taken care. Complete = array satisified or timeout
-
-        self.readyNow();
-    } else if('new environment' === evt.option) {
-        //
-        //  Handling is as follows:
-        //  * Map 'TERM' -> 'termType' and only update if ours is 'unknown'
-        //  * Map COLUMNS -> 'termWidth' and only update if ours is 0
-        //  * Map ROWS -> 'termHeight' and only update if ours is 0
-        //  * Add any new variables, ignore any existing
-        //
-        Object.keys(evt.envVars || {} ).forEach(function onEnv(name) {
-            if('TERM' === name && 'unknown' === self.term.termType) {
-                self.setTermType(evt.envVars[name]);
-            } else if('COLUMNS' === name && 0 === self.term.termWidth) {
-                self.term.termWidth = parseInt(evt.envVars[name]);
-                self.clearMciCache();   //  term size changes = invalidate cache
-                self.connectionDebug({ termWidth : self.term.termWidth, source : 'NEW-ENVIRON'}, 'Window width updated');
-            } else if('ROWS' === name && 0 === self.term.termHeight) {
-                self.term.termHeight = parseInt(evt.envVars[name]);
-                self.clearMciCache();   //  term size changes = invalidate cache
-                self.connectionDebug({ termHeight : self.term.termHeight, source : 'NEW-ENVIRON'}, 'Window height updated');
-            } else {
-                if(name in self.term.env) {
-
-                    EnigAssert(
-                        SB_COMMANDS.INFO === evt.type || SB_COMMANDS.IS === evt.type,
-                        'Unexpected type: ' + evt.type
-                    );
-
-                    self.connectionWarn(
-                        { varName : name, value : evt.envVars[name], existingValue : self.term.env[name] },
-                        'Environment variable already exists'
-                    );
-                } else {
-                    self.term.env[name] = evt.envVars[name];
-                    self.connectionDebug( { varName : name, value : evt.envVars[name] }, 'New environment variable' );
-                }
+                default :
+                    return this.socket.command(Commands.WONT, command.option);
             }
         });
 
-    } else if('window size' === evt.option) {
-        //
-        //  Update termWidth & termHeight.
-        //  Set LINES and COLUMNS environment variables as well.
-        //
-        self.term.termWidth     = evt.width;
-        self.term.termHeight    = evt.height;
+        this.socket.on('DONT', command => {
+            this._logTrace(command, 'DONT');
+        });
 
-        if(evt.width > 0) {
-            self.term.env.COLUMNS = evt.height;
+        this.socket.on('WILL', command => {
+            switch (command.option) {
+                case Options.LINEMODE :
+                    return this.socket.dont.linemode();
+
+                case Options.TTYPE :
+                    return this.socket.sb.send.ttype();
+
+                case Options.NEW_ENVIRON :
+                    return this.socket.sb.send.new_environ(
+                        [ 'ROWS', 'COLUMNS', 'TERM', 'TERM_PROGRAM' ]
+                    );
+
+                default :
+                    break;
+            }
+        });
+
+        this.socket.on('WONT', command => {
+            switch (command.option) {
+                case Options.NEW_ENVIRON :
+                    return this.socket.dont.new_environ();
+
+                    default :
+                        return this._logTrace(command, 'WONT');
+            }
+        });
+
+        this.socket.on('SB', command => {
+            switch (command.option) {
+                case Options.TTYPE :
+                    this.setTermType(command.optionData.ttype);
+                    return this._clientReady();
+
+                case Options.NEW_ENVIRON :
+                    {
+                        this._logDebug(
+                            { vars : command.optionData.vars, userVars : command.optionData.userVars },
+                            'New environment received'
+                        );
+
+                        //  get a value from vars with fallback of user vars
+                        const getValue = (name) => {
+                            return command.optionData.vars.find(nv => nv.name === name) ||
+                                command.optionData.userVars.find(nv => nv.name === name);
+                        };
+
+                        if ('unknown' === this.term.termType) {
+                            //  allow from vars or user vars
+                            const term = getValue('TERM') || getValue('TERM_PROGRAM');
+                            if (term) {
+                                this.setTermType(term.value);
+                            }
+                        }
+
+                        if (0 === this.term.termHeight || 0 === this.term.termWidth) {
+                            const updateTermSize = (what) => {
+                                const value = parseInt(getValue(what));
+                                if (value) {
+                                    this.term[what === 'ROWS' ? 'termHeight' : 'termWidth'] = value;
+                                    this.clearMciCache();
+                                    this._logDebug(
+                                        { [ what ] : value, source : 'NEW-ENVIRON' },
+                                        'Window size updated'
+                                    );
+                                }
+                            };
+
+                            updateTermSize('ROWS');
+                            updateTermSize('COLUMNS');
+                        }
+                    }
+                    break;
+
+                case Options.NAWS :
+                    {
+                        const { width, height } = command.optionData;
+
+                        this.term.termWidth     = width;
+                        this.term.termHeight    = height;
+
+                        if (width) {
+                            this.term.env.COLUMNS = width;
+                        }
+
+                        if (height) {
+                            this.term.env.ROWS = height;
+                        }
+
+                        this.clearMciCache();
+
+                        this._logDebug(
+                            { width, height, source : 'NAWS' },
+                            'Windows size updated'
+                        );
+                    }
+                    break;
+
+                default :
+                    return this._logTrace(command, 'SB');
+            }
+        });
+
+        this.socket.on('IP', command => {
+            this._logDebug(command, 'Interrupt Process (IP) - Ending session');
+            return this.disconnect();
+        });
+
+        this.socket.on('AYT', () => {
+            this.socket.write('\b');
+            return this._logTrace(command, 'Are You There (AYT) - Replied');
+        });
+
+        //  kick off negotiations
+        this._banner();
+    }
+
+    disconnect() {
+        try {
+            return this.socket.rawSocket.end();
+        } catch (e) {
+            //  ignored
+        }
+    }
+
+    _logTrace(info, msg) {
+        if (Config().loginServers.telnet.traceConnections) {
+            const log = this.log || Log;
+            return log.trace(info, `Telnet: ${msg}`);
+        }
+    }
+
+    _logDebug(info, msg) {
+        const log = this.log || Log;
+        return log.debug(info, `Telnet: ${msg}`);
+    }
+
+    _clientReady() {
+        if (this.clientReadyHandled) {
+            return; //  already processed
         }
 
-        if(evt.height > 0) {
-            self.term.env.ROWS = evt.height;
-        }
+        this.clientReadyHandled = true;
+        this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
+    }
 
-        self.clearMciCache();   //  term size changes = invalidate cache
+    _banner() {
+        this.socket.do.echo();
+        this.socket.will.echo();              //  we'll echo back
 
-        self.connectionDebug({ termWidth : evt.width , termHeight : evt.height, source : 'NAWS' }, 'Window size updated');
-    } else {
-        self.connectionDebug(evt, 'SB');
+        this.socket.will.sga();
+        this.socket.do.sga();
+
+        this.socket.do.transmit_binary();
+        this.socket.will.transmit_binary();
+
+        this.socket.do.ttype();
+        this.socket.do.naws();
+        this.socket.do.new_environ();
     }
 };
 
-const IGNORED_COMMANDS = [
-    COMMANDS.EL, COMMANDS.GA, COMMANDS.NOP, COMMANDS.DM, COMMANDS.BRK
-];
-
-
-TelnetClient.prototype.handleMiscCommand = function(evt) {
-    EnigAssert(evt.command !== 'undefined' && evt.command.length > 0);
-
-    //
-    //  See:
-    //  * RFC 854 @ http://tools.ietf.org/html/rfc854
-    //
-    if('ip' === evt.command) {
-        //  Interrupt Process (IP)
-        this.log.debug('Interrupt Process (IP) - Ending');
-
-        this.input.end();
-    } else if('ayt' === evt.command) {
-        this.output.write('\b');
-
-        this.log.debug('Are You There (AYT) - Replied "\\b"');
-    } else if(IGNORED_COMMANDS.indexOf(evt.commandCode)) {
-        this.log.trace({ command : evt.command, commandCode : evt.commandCode }, 'Ignoring command');
-    } else {
-        this.log.warn({ evt : evt }, 'Unknown command');
-    }
-};
-
-TelnetClient.prototype.requestTerminalType = function() {
-    const buf = Buffer.from( [
-        COMMANDS.IAC,
-        COMMANDS.SB,
-        OPTIONS.TERMINAL_TYPE,
-        SB_COMMANDS.SEND,
-        COMMANDS.IAC,
-        COMMANDS.SE ]);
-    this.output.write(buf);
-};
-
-const WANTED_ENVIRONMENT_VAR_BUFS = [
-    Buffer.from( 'LINES' ),
-    Buffer.from( 'COLUMNS' ),
-    Buffer.from( 'TERM' ),
-    Buffer.from( 'TERM_PROGRAM' )
-];
-
-TelnetClient.prototype.requestNewEnvironment = function() {
-
-    if(this.subNegotiationState.newEnvironRequested) {
-        this.log.debug('New environment already requested');
-        return;
-    }
-
-    const self = this;
-
-    const bufs = buffers();
-    bufs.push(Buffer.from( [
-        COMMANDS.IAC,
-        COMMANDS.SB,
-        OPTIONS.NEW_ENVIRONMENT,
-        SB_COMMANDS.SEND ]
-    ));
-
-    for(let i = 0; i < WANTED_ENVIRONMENT_VAR_BUFS.length; ++i) {
-        bufs.push(Buffer.from( [ NEW_ENVIRONMENT_COMMANDS.VAR ] ), WANTED_ENVIRONMENT_VAR_BUFS[i] );
-    }
-
-    bufs.push(Buffer.from([ NEW_ENVIRONMENT_COMMANDS.USERVAR, COMMANDS.IAC, COMMANDS.SE ]));
-
-    self.output.write(bufs.toBuffer());
-
-    this.subNegotiationState.newEnvironRequested = true;
-};
-
-TelnetClient.prototype.banner = function() {
-    this.will.echo();
-
-    this.will.suppress_go_ahead();
-    this.do.suppress_go_ahead();
-
-    this.do.transmit_binary();
-    this.will.transmit_binary();
-
-    this.do.terminal_type();
-
-    this.do.window_size();
-    this.do.new_environment();
-};
-
-function Command(command, client) {
-    this.command    = COMMANDS[command.toUpperCase()];
-    this.client     = client;
-}
-
-//  Create Command objects with echo, transmit_binary, ...
-Object.keys(OPTIONS).forEach(function(name) {
-    const code = OPTIONS[name];
-
-    Command.prototype[name.toLowerCase()] = function() {
-        const buf = Buffer.alloc(3);
-        buf[0]  = COMMANDS.IAC;
-        buf[1]  = this.command;
-        buf[2]  = code;
-        return this.client.output.write(buf);
-    };
-});
-
-//  Create do, dont, etc. methods on Client
-['do', 'dont', 'will', 'wont'].forEach(function(command) {
-    const get = function() {
-        return new Command(command, this);
-    };
-
-    Object.defineProperty(TelnetClient.prototype, command, {
-        get             : get,
-        enumerable      : true,
-        configurable    : true
-    });
-});
+inherits(TelnetClient, Client);
 
 exports.getModule = class TelnetServerModule extends LoginServerModule {
     constructor() {
@@ -843,24 +234,9 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
     }
 
     createServer(cb) {
-        this.server = net.createServer( sock => {
-            const client = new TelnetClient(sock, sock);
-
-            client.banner();
-
-            this.handleNewClient(client, sock, ModuleInfo);
-
-            //
-            //  Set a timeout and attempt to proceed even if we don't know
-            //  the term type yet, which is the preferred trigger
-            //  for moving along
-            //
-            setTimeout( () => {
-                if(!client.didReady) {
-                    Log.info('Proceeding after 3s without knowing term type');
-                    client.readyNow();
-                }
-            }, 3000);
+        this.server = net.createServer( socket => {
+            const client = new TelnetClient(socket);
+            this.handleNewClient(client, socket, ModuleInfo);
         });
 
         this.server.on('error', err => {
@@ -886,3 +262,5 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
         });
     }
 };
+
+exports.TelnetClient = TelnetClient;    //  WebSockets is a wrapper on top of this
diff --git a/core/servers/login/telnet2.js b/core/servers/login/telnet2.js
deleted file mode 100644
index 7f63659e..00000000
--- a/core/servers/login/telnet2.js
+++ /dev/null
@@ -1,228 +0,0 @@
-//  ENiGMA½
-const LoginServerModule = require('../../login_server_module');
-const { Client } = require('../../client');
-const Config = require('../../config').get;
-const { log: Log } = require('../../logger');
-
-//  deps
-const net = require('net');
-const {
-    TelnetSocket,
-    TelnetSpec: { Options, Commands }
-} = require('telnet-socket');
-const { inherits } = require('util');
-
-const ModuleInfo = exports.moduleInfo = {
-    name        : 'Telnet',
-    desc        : 'Telnet Server',
-    author      : 'NuSkooler',
-    isSecure    : false,
-    packageName : 'codes.l33t.enigma.telnet.server.v2',
-};
-
-class TelnetClient {
-    constructor(socket) {
-        Client.apply(this, socket, socket);
-
-        this.setInputOutput(socket, socket);
-        this.socket = new TelnetSocket(socket);
-
-        //
-        //  Wait up to 3s to hear about from our terminal type request
-        //  then go ahead and move on...
-        //
-        setTimeout(() => {
-            this.clientReady();
-        }, 3000);
-
-        this.dataHandler = function(data) {
-            this.emit('data', data);
-        }.bind(this);
-
-        this.socket.on('data', this.dataHandler);
-
-        this.socket.on('error', err => {
-            //  :TODO: Log me
-            return this.emit('end');
-        });
-
-        this.socket.on('end', () => {
-            this.emit('end');
-        });
-
-        this.socket.on('DO', command => {
-            switch (command.option) {
-                case Options.ECHO :
-                    return this.socket.will.echo();
-
-                default :
-                    return this.socket.command(Commands.WONT, command.option);
-            }
-        });
-
-        this.socket.on('DONT', command => {
-            //  :TODO: Log me
-        });
-
-        this.socket.on('WILL', command => {
-            switch (command.option) {
-                case Options.LINEMODE :
-                    return this.socket.dont.linemode();
-
-                case Options.TTYPE :
-                    return this.socket.sb.send.ttype();
-
-                case Options.NEW_ENVIRON :
-                    return this.socket.sb.send.new_environ();
-
-                default :
-                    break;
-            }
-        });
-
-        this.socket.on('WONT', command => {
-            switch (command.option) {
-                case Options.NEW_ENVIRON :
-                    return this.socket.dont.new_environ();
-
-                    default :
-                        //  :TODO: Log me
-                        break;
-            }
-        });
-
-        this.socket.on('SB', command => {
-            switch (command.option) {
-                case Options.TTYPE :
-                    this.setTermType(command.optionData.ttype);
-                    this.clientReady();
-                    break;
-
-                case Options.NEW_ENVIRON :
-                    {
-                        if ('unknown' === this.term.termType) {
-                            const term =
-                                command.optionData.vars.find(nv => nv.TERM) ||
-                                command.optionData.userVars.find(nv => nv.TERM);
-                            if (term) {
-                                this.setTermType(term);
-                            }
-                        }
-
-                        command.optionData.vars.forEach(nv => {
-                            console.log(nv);
-                        });
-                    }
-                    break;
-
-                case Options.NAWS :
-                    {
-                        const { width, height } = command.optionData;
-
-                        this.term.termWidth     = width;
-                        this.term.termHeight    = height;
-
-                        if (width) {
-                            this.term.env.COLUMNS = width;
-                        }
-
-                        if (height) {
-                            this.term.env.ROWS = height;
-                        }
-
-                        this.clearMciCache();
-
-                        //  :TODO: Log negotiation
-                    }
-                    break;
-            }
-        });
-
-        this.socket.on('IP', command => {
-            //  :TODO: Log me
-            return this.disconnect();
-        });
-
-        this.socket.on('AYT', () => {
-            //  :TODO: Log me
-            return this.socket.write('\b');
-        });
-
-        //  kick off negotiations
-        this.banner();
-    }
-
-    // dataHandler(data) {
-    //     this.emit('data', data);
-    // }
-
-    clientReady() {
-        if (this.clientReadyHandled) {
-            return; //  already processed
-        }
-
-        this.clientReadyHandled = true;
-        this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
-    }
-
-    disconnect() {
-        try {
-            return this.socket.rawSocket.end();
-        } catch (e) {
-            //  ignored
-        }
-    }
-
-    banner() {
-        this.socket.do.echo();
-        this.socket.will.echo();              //  we'll echo back
-
-        this.socket.will.sga();
-        this.socket.do.sga();
-
-        this.socket.do.transmit_binary();
-        this.socket.will.transmit_binary();
-
-        this.socket.do.ttype();
-        this.socket.do.naws();
-        this.socket.do.new_environ();
-    }
-};
-
-inherits(TelnetClient, Client);
-
-exports.getModule = class TelnetServerModule extends LoginServerModule {
-    constructor() {
-        super();
-    }
-
-    createServer(cb) {
-        this.server = net.createServer( socket => {
-            const client = new TelnetClient(socket);
-            this.handleNewClient(client, socket, ModuleInfo);
-        });
-
-        this.server.on('error', err => {
-            Log.info( { error : err.message }, 'Telnet server error');
-        });
-
-        return cb(null);
-    }
-
-    listen(cb) {
-        const config = Config();
-        //const port = parseInt(config.loginServers.telnet.port);
-        const port = 8810;  //  :TODO: Put me back ;)
-        if(isNaN(port)) {
-            Log.error( { server : ModuleInfo.name, port : config.loginServers.telnet.port }, 'Cannot load server (invalid port)' );
-            return cb(Errors.Invalid(`Invalid port: ${config.loginServers.telnet.port}`));
-        }
-
-        this.server.listen(port, config.loginServers.telnet.address, err => {
-            if(!err) {
-                Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
-            }
-            return cb(err);
-        });
-    }
-};
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index dadcdbe6..1cff80e4 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -95,7 +95,7 @@ function WebSocketClient(ws, req, serverType) {
         ws.isConnectionAlive = true;
     });
 
-    TelnetClient.call(this, this.socketBridge, this.socketBridge);
+    TelnetClient.call(this, this.socketBridge);
 
     Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
 

From e85ba322cefd2b40b4c76110d7fa52af55957ec0 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 18 May 2020 19:19:30 -0600
Subject: [PATCH 0990/1013] WebSockets work with new telnet server

---
 core/servers/login/telnet.js    |  34 +++----
 core/servers/login/websocket.js | 174 +++++++++++++++++---------------
 2 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 111167fb..7bb938a4 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -176,9 +176,6 @@ class TelnetClient {
             this.socket.write('\b');
             return this._logTrace(command, 'Are You There (AYT) - Replied');
         });
-
-        //  kick off negotiations
-        this._banner();
     }
 
     disconnect() {
@@ -189,6 +186,21 @@ class TelnetClient {
         }
     }
 
+    banner() {
+        this.socket.do.echo();
+        this.socket.will.echo();              //  we'll echo back
+
+        this.socket.will.sga();
+        this.socket.do.sga();
+
+        this.socket.do.transmit_binary();
+        this.socket.will.transmit_binary();
+
+        this.socket.do.ttype();
+        this.socket.do.naws();
+        this.socket.do.new_environ();
+    }
+
     _logTrace(info, msg) {
         if (Config().loginServers.telnet.traceConnections) {
             const log = this.log || Log;
@@ -209,21 +221,6 @@ class TelnetClient {
         this.clientReadyHandled = true;
         this.emit('ready', { firstMenu : Config().loginServers.telnet.firstMenu } );
     }
-
-    _banner() {
-        this.socket.do.echo();
-        this.socket.will.echo();              //  we'll echo back
-
-        this.socket.will.sga();
-        this.socket.do.sga();
-
-        this.socket.do.transmit_binary();
-        this.socket.will.transmit_binary();
-
-        this.socket.do.ttype();
-        this.socket.do.naws();
-        this.socket.do.new_environ();
-    }
 };
 
 inherits(TelnetClient, Client);
@@ -236,6 +233,7 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
     createServer(cb) {
         this.server = net.createServer( socket => {
             const client = new TelnetClient(socket);
+            client.banner();    //  start negotiations
             this.handleNewClient(client, socket, ModuleInfo);
         });
 
diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 1cff80e4..f0cdc0b1 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -24,100 +24,106 @@ const ModuleInfo = exports.moduleInfo = {
     packageName : 'codes.l33t.enigma.websocket.server',
 };
 
-function WebSocketClient(ws, req, serverType) {
+class WebSocketClient extends TelnetClient {
+    constructor(ws, req, serverType) {
+        //
+        //  This bridge makes accessible various calls that client sub classes
+        //  want to access on I/O socket
+        //
+        const socketBridge = new class SocketBridge extends Writable {
+            constructor(ws) {
+                super();
+                this.ws = ws;
+            }
 
-    Object.defineProperty(this, 'isSecure', {
-        get : () => ('secure' === serverType || true === this.proxied) ? true : false,
-    });
+            setClient(client) {
+                this.client = client;
+            }
 
-    const self = this;
+            end() {
+                return ws.close();
+            }
 
-    this.dataHandler = function(data) {
-        if(self.pipedDest) {
-            self.pipedDest.write(data);
+            write(data, cb) {
+                cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
+
+                return this.ws.send(data, { binary : true }, cb);
+            }
+
+            pipe(dest) {
+                Log.trace('WebSocket SocketBridge pipe()');
+                this.client.pipedDest = dest;
+            }
+
+            unpipe() {
+                Log.trace('WebSocket SocketBridge unpipe()');
+                this.client.pipedDest = null;
+            }
+
+            resume() {
+                Log.trace('WebSocket SocketBridge resume()');
+            }
+
+            get remoteAddress() {
+                //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
+                return (this.client.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
+            }
+        }(ws);
+
+        //  :TODO: this is quite the clusterfuck...
+        super(socketBridge);
+        this.socketBridge   = socketBridge;
+        this.serverType     = serverType;
+
+        this.socketBridge.setClient(this);
+
+        this.dataHandler = function(data) {
+            if(this.pipedDest) {
+                this.pipedDest.write(data);
+            } else {
+                this.socketBridge.emit('data', data);
+            }
+        }.bind(this);
+
+        ws.on('message', this.dataHandler);
+
+        ws.on('close', () => {
+            //  we'll remove client connection which will in turn end() via our SocketBridge above
+            return this.emit('end');
+        });
+
+        //
+        //  Monitor connection status with ping/pong
+        //
+        ws.on('pong', () => {
+            Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
+            ws.isConnectionAlive = true;
+        });
+
+        Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
+
+        //
+        //  If the config allows it, look for 'x-forwarded-proto' as "https"
+        //  to override |isSecure|
+        //
+        if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
+            'https' === req.headers['x-forwarded-proto'])
+        {
+            Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
+            this.proxied = true;
         } else {
-            self.socketBridge.emit('data', data);
-        }
-    };
-
-    //
-    //  This bridge makes accessible various calls that client sub classes
-    //  want to access on I/O socket
-    //
-    this.socketBridge = new class SocketBridge extends Writable {
-        constructor(ws) {
-            super();
-            this.ws = ws;
+            this.proxied = false;
         }
 
-        end() {
-            return ws.close();
-        }
-
-        write(data, cb) {
-            cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
-
-            return this.ws.send(data, { binary : true }, cb);
-        }
-
-        pipe(dest) {
-            Log.trace('WebSocket SocketBridge pipe()');
-            self.pipedDest = dest;
-        }
-
-        unpipe() {
-            Log.trace('WebSocket SocketBridge unpipe()');
-            self.pipedDest = null;
-        }
-
-        resume() {
-            Log.trace('WebSocket SocketBridge resume()');
-        }
-
-        get remoteAddress() {
-            //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
-            return (self.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
-        }
-    }(ws);
-
-    ws.on('message', this.dataHandler);
-
-    ws.on('close', () => {
-        //  we'll remove client connection which will in turn end() via our SocketBridge above
-        return this.emit('end');
-    });
-
-    //
-    //  Monitor connection status with ping/pong
-    //
-    ws.on('pong', () => {
-        Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
-        ws.isConnectionAlive = true;
-    });
-
-    TelnetClient.call(this, this.socketBridge);
-
-    Log.trace( { headers : req.headers }, 'WebSocket connection headers' );
-
-    //
-    //  If the config allows it, look for 'x-forwarded-proto' as "https"
-    //  to override |isSecure|
-    //
-    if(true === _.get(Config(), 'loginServers.webSocket.proxied') &&
-        'https' === req.headers['x-forwarded-proto'])
-    {
-        Log.debug(`Assuming secure connection due to X-Forwarded-Proto of "${req.headers['x-forwarded-proto']}"`);
-        this.proxied = true;
-    } else {
-        this.proxied = false;
+        //  start handshake process
+        this.banner();
     }
 
-    //  start handshake process
-    this.banner();
+    get isSecure() {
+        return ('secure' === this.serverType || true === this.proxied) ? true : false;
+    }
 }
 
-require('util').inherits(WebSocketClient, TelnetClient);
-
 const WSS_SERVER_TYPES = [ 'insecure', 'secure' ];
 
 exports.getModule = class WebSocketLoginServer extends LoginServerModule {

From 65d68f33dc33c3d9014989c119d73f10b20ef576 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 May 2020 20:23:09 -0600
Subject: [PATCH 0991/1013] Allow passthrough

---
 core/servers/login/telnet.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 7bb938a4..318dd9fc 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -24,8 +24,8 @@ class TelnetClient {
     constructor(socket) {
         Client.apply(this, socket, socket);
 
-        this.setInputOutput(socket, socket);
         this.socket = new TelnetSocket(socket);
+        this.setInputOutput(this.socket, this.socket);
 
         //
         //  Wait up to 3s to hear about from our terminal type request
@@ -50,6 +50,8 @@ class TelnetClient {
             this.emit('end');
         });
 
+        //  :TODO: handle 'command error' event
+
         this.socket.on('DO', command => {
             switch (command.option) {
                 case Options.ECHO :
@@ -178,6 +180,14 @@ class TelnetClient {
         });
     }
 
+    get dataPassthrough() {
+        return this.socket.passthrough;
+    }
+
+    set dataPassthrough(passthrough) {
+        this.socket.passthrough = passthrough;
+    }
+
     disconnect() {
         try {
             return this.socket.rawSocket.end();

From 72301104ffb817b2175bf50ffbc3284f8968ed48 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 May 2020 20:24:12 -0600
Subject: [PATCH 0992/1013] Update passthrough state

---
 core/client.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/client.js b/core/client.js
index 40872fa2..88c9ea0f 100644
--- a/core/client.js
+++ b/core/client.js
@@ -107,11 +107,13 @@ function Client(/*input, output*/) {
     });
 
     this.setTemporaryDirectDataHandler = function(handler) {
+        this.dataPassthrough = true;    //  let implementations do with what they will here
         this.input.removeAllListeners('data');
         this.input.on('data', handler);
     };
 
     this.restoreDataHandler = function() {
+        this.dataPassthrough = false;
         this.input.removeAllListeners('data');
         this.input.on('data', this.dataHandler);
     };

From 03b79fa9f294bc840f3d7a6586d19a7ef3a22707 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 May 2020 20:24:26 -0600
Subject: [PATCH 0993/1013] TODO for IAC processing

---
 core/file_transfer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index ff9216d6..c5d5030c 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -390,6 +390,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
             //  needed for things like sz/rz
             if(external.escapeTelnet) {
+                //  :TODO: do this faster for already-buffers...
                 const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
                 externalProc.write(Buffer.from(tmp, 'binary'));
             } else {

From bbae082f7dd2c39253f7ec274670ff76dd93a998 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 20 May 2020 20:28:55 -0600
Subject: [PATCH 0994/1013] Temp: Use local mod for development

---
 package.json | 2 +-
 yarn.lock    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 6bb5a613..e0e5f0d1 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
     "yazl": "^2.5.1",
-    "telnet-socket" : "github:NuSkooler/telnet-socket"
+    "telnet-socket" : "../telnet-socket"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 5dd80c0e..4f91f7e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1840,9 +1840,8 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-"telnet-socket@github:NuSkooler/telnet-socket":
+telnet-socket@../telnet-socket:
   version "0.1.0"
-  resolved "https://codeload.github.com/NuSkooler/telnet-socket/tar.gz/a29ea2edaec98bb844f2b0d27fa0977f33eaa7bf"
   dependencies:
     binary-parser "^1.5.0"
     buffers "github:NuSkooler/node-buffers"

From 1e6c577cd3001cc2cad7b4bf284efa6002896ad8 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 May 2020 19:16:40 -0600
Subject: [PATCH 0995/1013] More ANSI-BBS compliant... still some to go

---
 core/servers/login/telnet.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 318dd9fc..fe0393c2 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -42,7 +42,7 @@ class TelnetClient {
         this.socket.on('data', this.dataHandler);
 
         this.socket.on('error', err => {
-            this._logDebug( { error : err.message }, 'Socket error');
+            this._logDebug({ error : err.message }, 'Socket error');
             return this.emit('end');
         });
 
@@ -50,12 +50,17 @@ class TelnetClient {
             this.emit('end');
         });
 
-        //  :TODO: handle 'command error' event
+        this.socket.on('command error', (command, err) => {
+            this._logDebug({ command, error : err.message }, 'Command error');
+        });
 
         this.socket.on('DO', command => {
             switch (command.option) {
-                case Options.ECHO :
-                    return this.socket.will.echo();
+                case Options.SGA :
+                    return this.socket.will.sga();
+
+                case Options.TRANSMIT_BINARY :
+                    return this.socket.will.transmit_binary();
 
                 default :
                     return this.socket.command(Commands.WONT, command.option);
@@ -68,9 +73,6 @@ class TelnetClient {
 
         this.socket.on('WILL', command => {
             switch (command.option) {
-                case Options.LINEMODE :
-                    return this.socket.dont.linemode();
-
                 case Options.TTYPE :
                     return this.socket.sb.send.ttype();
 
@@ -197,8 +199,7 @@ class TelnetClient {
     }
 
     banner() {
-        this.socket.do.echo();
-        this.socket.will.echo();              //  we'll echo back
+        this.socket.will.echo();    //  we'll echo back
 
         this.socket.will.sga();
         this.socket.do.sga();

From 2a93de94876c8881be802081e11a0e12227e83a5 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 May 2020 21:22:15 -0600
Subject: [PATCH 0996/1013] Yet more ANSI-BBS related updates

---
 core/servers/login/telnet.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index fe0393c2..39f8abbb 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -56,11 +56,14 @@ class TelnetClient {
 
         this.socket.on('DO', command => {
             switch (command.option) {
+                //  We've already stated we WILL do the following via
+                //  the banner - some terminals will ask over and over
+                //  if we respond to a DO with a WILL, so just don't
+                //  do anything...
                 case Options.SGA :
-                    return this.socket.will.sga();
-
+                case Options.ECHO :
                 case Options.TRANSMIT_BINARY :
-                    return this.socket.will.transmit_binary();
+                    break;
 
                 default :
                     return this.socket.command(Commands.WONT, command.option);
@@ -199,6 +202,7 @@ class TelnetClient {
     }
 
     banner() {
+        this.socket.do.echo();
         this.socket.will.echo();    //  we'll echo back
 
         this.socket.will.sga();

From 5aaf568ed55b79c5e1af9af56ff0d06ccbd8178b Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 21 May 2020 21:22:49 -0600
Subject: [PATCH 0997/1013] Fix bug reported by user before I forget

---
 core/door_util.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/door_util.js b/core/door_util.js
index 6517f1be..24c2cd80 100644
--- a/core/door_util.js
+++ b/core/door_util.js
@@ -16,6 +16,10 @@ function trackDoorRunBegin(client, doorTag) {
 }
 
 function trackDoorRunEnd(trackInfo) {
+    if (!trackInfo) {
+        return;
+    }
+
     const { startTime, client, doorTag } = trackInfo;
 
     const diff = moment.duration(moment().diff(startTime));

From eeba6095607a6ecd872abbc80bee2c2c7b230bff Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 May 2020 11:41:59 -0600
Subject: [PATCH 0998/1013] This is broken WIP. Goign to refactor, but on the
 road...

---
 core/servers/login/websocket.js | 89 ++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 25 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index f0cdc0b1..a8e9ad1b 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -15,6 +15,7 @@ const http              = require('http');
 const https             = require('https');
 const fs                = require('graceful-fs');
 const Writable          = require('stream');
+const { Duplex } = require('stream');
 const forEachSeries     = require('async/forEachSeries');
 
 const ModuleInfo = exports.moduleInfo = {
@@ -30,45 +31,83 @@ class WebSocketClient extends TelnetClient {
         //  This bridge makes accessible various calls that client sub classes
         //  want to access on I/O socket
         //
-        const socketBridge = new class SocketBridge extends Writable {
+        const socketBridge = new class SocketBridge extends Duplex {
             constructor(ws) {
                 super();
                 this.ws = ws;
+
+                this.ws.on('close', err => this.emit('close', err));
+                //this.ws.on('connect', () => this.emit('connect'));
+                //this.ws.on('drain', () => this.emit('drain'));
+                //this.ws.on('end', () => this.emit('end'));
+                this.ws.on('error', err => this.emit('error', err));
+
+                //this.ws.on('ready', () => this.emit('ready'));
+                //this.ws.on('timeout', () => this.emit('timeout'));
+                this.ws.on('data', data => this._data(data));
             }
 
             setClient(client) {
                 this.client = client;
             }
 
-            end() {
-                return ws.close();
-            }
-
-            write(data, cb) {
-                cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
-
-                return this.ws.send(data, { binary : true }, cb);
-            }
-
-            pipe(dest) {
-                Log.trace('WebSocket SocketBridge pipe()');
-                this.client.pipedDest = dest;
-            }
-
-            unpipe() {
-                Log.trace('WebSocket SocketBridge unpipe()');
-                this.client.pipedDest = null;
-            }
-
-            resume() {
-                Log.trace('WebSocket SocketBridge resume()');
-            }
-
             get remoteAddress() {
                 //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
                 return (this.client.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
             }
+
+            _write(data, encoding, cb) {
+                cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
+                return this.ws.send(data, { binary : true }, cb);
+            }
+
+            _read() {
+                //  dummy
+            }
+
+            _data(data) {
+                this.push(data);
+            }
         }(ws);
+        // const socketBridge = new class SocketBridge extends Writable {
+        //     constructor(ws) {
+        //         super();
+        //         this.ws = ws;
+        //     }
+
+        //     setClient(client) {
+        //         this.client = client;
+        //     }
+
+        //     end() {
+        //         return ws.close();
+        //     }
+
+        //     write(data, cb) {
+        //         cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
+
+        //         return this.ws.send(data, { binary : true }, cb);
+        //     }
+
+        //     pipe(dest) {
+        //         Log.trace('WebSocket SocketBridge pipe()');
+        //         this.client.pipedDest = dest;
+        //     }
+
+        //     unpipe() {
+        //         Log.trace('WebSocket SocketBridge unpipe()');
+        //         this.client.pipedDest = null;
+        //     }
+
+        //     resume() {
+        //         Log.trace('WebSocket SocketBridge resume()');
+        //     }
+
+        //     get remoteAddress() {
+        //         //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
+        //         return (this.client.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
+        //     }
+        // }(ws);
 
         //  :TODO: this is quite the clusterfuck...
         super(socketBridge);

From 2234a717059f6e281ab62857c46c510a290d2328 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 22 May 2020 12:55:52 -0600
Subject: [PATCH 0999/1013] Working much nicer

---
 core/servers/login/websocket.js | 85 ++++-----------------------------
 1 file changed, 10 insertions(+), 75 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index a8e9ad1b..fcf0ea07 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -27,24 +27,15 @@ const ModuleInfo = exports.moduleInfo = {
 
 class WebSocketClient extends TelnetClient {
     constructor(ws, req, serverType) {
-        //
-        //  This bridge makes accessible various calls that client sub classes
-        //  want to access on I/O socket
-        //
-        const socketBridge = new class SocketBridge extends Duplex {
+        //  allow WebSocket to act like a Duplex (socket)
+        const wsDuplex = new class WebSocketDuplex extends Duplex {
             constructor(ws) {
                 super();
                 this.ws = ws;
 
                 this.ws.on('close', err => this.emit('close', err));
-                //this.ws.on('connect', () => this.emit('connect'));
-                //this.ws.on('drain', () => this.emit('drain'));
-                //this.ws.on('end', () => this.emit('end'));
                 this.ws.on('error', err => this.emit('error', err));
-
-                //this.ws.on('ready', () => this.emit('ready'));
-                //this.ws.on('timeout', () => this.emit('timeout'));
-                this.ws.on('data', data => this._data(data));
+                this.ws.on('message', data => this._data(data));
             }
 
             setClient(client) {
@@ -69,73 +60,22 @@ class WebSocketClient extends TelnetClient {
                 this.push(data);
             }
         }(ws);
-        // const socketBridge = new class SocketBridge extends Writable {
-        //     constructor(ws) {
-        //         super();
-        //         this.ws = ws;
-        //     }
 
-        //     setClient(client) {
-        //         this.client = client;
-        //     }
+        super(wsDuplex);
+        wsDuplex.setClient(this);
 
-        //     end() {
-        //         return ws.close();
-        //     }
-
-        //     write(data, cb) {
-        //         cb = cb || ( () => { /* eat it up */} );    //  handle data writes after close
-
-        //         return this.ws.send(data, { binary : true }, cb);
-        //     }
-
-        //     pipe(dest) {
-        //         Log.trace('WebSocket SocketBridge pipe()');
-        //         this.client.pipedDest = dest;
-        //     }
-
-        //     unpipe() {
-        //         Log.trace('WebSocket SocketBridge unpipe()');
-        //         this.client.pipedDest = null;
-        //     }
-
-        //     resume() {
-        //         Log.trace('WebSocket SocketBridge resume()');
-        //     }
-
-        //     get remoteAddress() {
-        //         //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
-        //         return (this.client.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
-        //     }
-        // }(ws);
-
-        //  :TODO: this is quite the clusterfuck...
-        super(socketBridge);
-        this.socketBridge   = socketBridge;
-        this.serverType     = serverType;
-
-        this.socketBridge.setClient(this);
-
-        this.dataHandler = function(data) {
-            if(this.pipedDest) {
-                this.pipedDest.write(data);
-            } else {
-                this.socketBridge.emit('data', data);
-            }
-        }.bind(this);
-
-        ws.on('message', this.dataHandler);
-
-        ws.on('close', () => {
+        wsDuplex.on('close', () => {
             //  we'll remove client connection which will in turn end() via our SocketBridge above
             return this.emit('end');
         });
 
+        this.serverType = serverType;
+
         //
         //  Monitor connection status with ping/pong
         //
         ws.on('pong', () => {
-            Log.trace(`Pong from ${this.socketBridge.remoteAddress}`);
+            Log.trace(`Pong from ${wsDuplex.remoteAddress}`);
             ws.isConnectionAlive = true;
         });
 
@@ -261,7 +201,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
 
                 server.wsServer.on('connection', (ws, req) => {
                     const webSocketClient = new WebSocketClient(ws, req, serverType);
-                    this.handleNewClient(webSocketClient, webSocketClient.socketBridge, ModuleInfo);
+                    this.handleNewClient(webSocketClient, webSocketClient.socket, ModuleInfo);
                 });
 
                 Log.info( { server : serverName, port : port }, 'Listening for connections' );
@@ -272,9 +212,4 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
             cb(err);
         });
     }
-
-    webSocketConnection(conn) {
-        const webSocketClient = new WebSocketClient(conn);
-        this.handleNewClient(webSocketClient, webSocketClient.socketShim, ModuleInfo);
-    }
 };

From 0bf3031d9f2dfa86eae073fe912c873af2c21571 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 26 May 2020 22:55:51 -0600
Subject: [PATCH 1000/1013] WIP on better data handling for file transfer

---
 WHATSNEW.md           |   2 +-
 core/config.js        |   3 +-
 core/file_transfer.js | 121 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index bf6ac243..21626d92 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -6,7 +6,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * Development is now against Node.js 12.x LTS. Other versions may work but are not currently supported!
 * [QWK support](/docs/messageareas/qwk.md)
 * `oputil fb scan *areaTagWildcard*` scans all areas in which wildcard is matched.
-
+* The archiver configuration `escapeTelnet` has been renamed `escapeIACs`. Support for the old value will be removed in the future.
 
 ## 0.0.10-alpha
 + `oputil.js user rename USERNAME NEWNAME`
diff --git a/core/config.js b/core/config.js
index 66ffab14..7e467709 100644
--- a/core/config.js
+++ b/core/config.js
@@ -865,8 +865,7 @@ function getDefaultConfig() {
                     recvArgs    : [
                         '--zmodem', '--binary', '--restricted', '--keep-uppercase',     //  dumps to CWD which is set to {uploadDir}
                     ],
-                    //  :TODO: can we not just use --escape ?
-                    escapeTelnet    : true, //  set to true to escape Telnet codes such as IAC
+                    processIACs     : true, // escape/de-escape IACs (0xff)
                 }
             }
         },
diff --git a/core/file_transfer.js b/core/file_transfer.js
index c5d5030c..bb4427b7 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -364,6 +364,16 @@ exports.getModule = class TransferFileModule extends MenuModule {
         const external  = this.protocolConfig.external;
         const cmd       = external[`${this.direction}Cmd`];
 
+        //  support for handlers that need IACs taken care of over Telnet/etc.
+        const processIACs =
+            external.processIACs ||
+            external.escapeTelnet;   //  deprecated name
+
+        //  :TODO: we should only do this when over Telnet (or derived, such as WebSockets)?
+
+        const IAC           = Buffer.from([255]);
+        const EscapedIAC    = Buffer.from([255, 255]);
+
         this.client.log.debug(
             { cmd : cmd, args : args, tempDir : this.recvDirectory, direction : this.direction },
             'Executing external protocol'
@@ -385,14 +395,92 @@ exports.getModule = class TransferFileModule extends MenuModule {
             }
         };
 
+        // const procBuffer = [];
+
+        // let buffering = false;
+        // const procWrite = (data) => {
+        //     if (!externalProc._socket) {
+        //         return externalProc.write(data);
+        //     }
+
+        //     if (buffering) {
+        //         return procBuffer.push(data);
+        //     }
+
+        //     // while (procBuffer.length && externalProc._socket.writable) {
+        //     //     externalProc.write(procBuffer.unshift());
+        //     // }
+
+        //     if (externalProc._socket.writable) {
+        //         externalProc.write(data);
+        //     } else {
+        //         //  last write put us into buffer mode
+        //         externalProc._socket.once('drain', () => {
+        //             while (procBuffer.length && externalProc._socket.writable) {
+        //                 externalProc.write(procBuffer.unshift());
+        //             }
+        //             buffering = !externalProc._socket.writable;
+        //         });
+        //         buffering = true;
+        //         procBuffer.push(data);
+        //     }
+        // };
+
+        // const writeData = (data) => {
+        //     updateActivity();
+
+        //     if(processIACs) {
+        //         let iacPos = data.indexOf(EscapedIAC);
+        //         if (-1 === iacPos) {
+        //             return procWrite(data);
+        //         }
+
+        //         //  at least one double (escaped) IAC
+        //         let lastPos = 0;
+        //         while (iacPos > -1) {
+        //             let rem = iacPos - lastPos;
+        //             if (rem >= 0) {
+        //                 procWrite(data.slice(lastPos, iacPos + 1));
+        //             }
+        //             lastPos = iacPos + 2;
+        //             iacPos = data.indexOf(EscapedIAC, lastPos);
+        //         }
+
+        //         if (lastPos < data.length) {
+        //             procWrite(data.slice(lastPos));
+        //         }
+        //     } else {
+        //         procWrite(data);
+        //     }
+        // };
+
         this.client.setTemporaryDirectDataHandler(data => {
             updateActivity();
-
             //  needed for things like sz/rz
-            if(external.escapeTelnet) {
-                //  :TODO: do this faster for already-buffers...
-                const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
-                externalProc.write(Buffer.from(tmp, 'binary'));
+            if(processIACs) {
+                let iacPos = data.indexOf(EscapedIAC);
+                if (-1 === iacPos) {
+                    return externalProc.write(data);
+                }
+
+                //  at least one double (escaped) IAC
+                externalProc._socket.cork();
+                let lastPos = 0;
+                while (iacPos > -1) {
+                    let rem = iacPos - lastPos;
+                    if (rem >= 0) {
+                        externalProc.write(data.slice(lastPos, iacPos + 1));
+                    }
+                    lastPos = iacPos + 2;
+                    iacPos = data.indexOf(EscapedIAC, lastPos);
+                }
+
+                if (lastPos < data.length) {
+                    externalProc.write(data.slice(lastPos));
+                }
+                externalProc._socket.uncork();
+                // const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
+                // externalProc.write(Buffer.from(tmp, 'binary'));
             } else {
                 externalProc.write(data);
             }
@@ -402,9 +490,26 @@ exports.getModule = class TransferFileModule extends MenuModule {
             updateActivity();
 
             //  needed for things like sz/rz
-            if(external.escapeTelnet) {
-                const tmp = data.toString('binary').replace(/\xff/g, '\xff\xff');   //  escape
-                this.client.term.rawWrite(Buffer.from(tmp, 'binary'));
+            if(processIACs) {
+                let iacPos = data.indexOf(IAC);
+                if (-1 === iacPos) {
+                    return this.client.term.rawWrite(data);
+                }
+
+                //  Has at least a single IAC
+                let lastPos = 0;
+                while (iacPos !== -1) {
+                    if (iacPos - lastPos > 0) {
+                        this.client.term.rawWrite(data.slice(lastPos, iacPos));
+                    }
+                    this.client.term.rawWrite(EscapedIAC);
+                    lastPos = iacPos + 1;
+                    iacPos = data.indexOf(IAC, lastPos);
+                }
+
+                if (lastPos < data.length) {
+                    this.client.term.rawWrite(data.slice(lastPos));
+                }
             } else {
                 this.client.term.rawWrite(data);
             }

From a1c9d8538f4c0fbee4fbb872835296d0d45a24e4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 27 May 2020 19:24:45 -0600
Subject: [PATCH 1001/1013] Don't cork

---
 core/file_transfer.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index bb4427b7..20e60e07 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -464,7 +464,6 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 }
 
                 //  at least one double (escaped) IAC
-                externalProc._socket.cork();
                 let lastPos = 0;
                 while (iacPos > -1) {
                     let rem = iacPos - lastPos;
@@ -478,7 +477,6 @@ exports.getModule = class TransferFileModule extends MenuModule {
                 if (lastPos < data.length) {
                     externalProc.write(data.slice(lastPos));
                 }
-                externalProc._socket.uncork();
                 // const tmp = data.toString('binary').replace(/\xff{2}/g, '\xff');    //  de-escape
                 // externalProc.write(Buffer.from(tmp, 'binary'));
             } else {

From 4dea9bdeb615316578a58645c70dd35dd6d9d23f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 27 May 2020 19:25:15 -0600
Subject: [PATCH 1002/1013] Remove dead code

---
 core/file_transfer.js | 59 -------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index 20e60e07..90f38667 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -395,65 +395,6 @@ exports.getModule = class TransferFileModule extends MenuModule {
             }
         };
 
-        // const procBuffer = [];
-
-        // let buffering = false;
-        // const procWrite = (data) => {
-        //     if (!externalProc._socket) {
-        //         return externalProc.write(data);
-        //     }
-
-        //     if (buffering) {
-        //         return procBuffer.push(data);
-        //     }
-
-        //     // while (procBuffer.length && externalProc._socket.writable) {
-        //     //     externalProc.write(procBuffer.unshift());
-        //     // }
-
-        //     if (externalProc._socket.writable) {
-        //         externalProc.write(data);
-        //     } else {
-        //         //  last write put us into buffer mode
-        //         externalProc._socket.once('drain', () => {
-        //             while (procBuffer.length && externalProc._socket.writable) {
-        //                 externalProc.write(procBuffer.unshift());
-        //             }
-        //             buffering = !externalProc._socket.writable;
-        //         });
-        //         buffering = true;
-        //         procBuffer.push(data);
-        //     }
-        // };
-
-        // const writeData = (data) => {
-        //     updateActivity();
-
-        //     if(processIACs) {
-        //         let iacPos = data.indexOf(EscapedIAC);
-        //         if (-1 === iacPos) {
-        //             return procWrite(data);
-        //         }
-
-        //         //  at least one double (escaped) IAC
-        //         let lastPos = 0;
-        //         while (iacPos > -1) {
-        //             let rem = iacPos - lastPos;
-        //             if (rem >= 0) {
-        //                 procWrite(data.slice(lastPos, iacPos + 1));
-        //             }
-        //             lastPos = iacPos + 2;
-        //             iacPos = data.indexOf(EscapedIAC, lastPos);
-        //         }
-
-        //         if (lastPos < data.length) {
-        //             procWrite(data.slice(lastPos));
-        //         }
-        //     } else {
-        //         procWrite(data);
-        //     }
-        // };
-
         this.client.setTemporaryDirectDataHandler(data => {
             updateActivity();
             //  needed for things like sz/rz

From 87a23bd3c889b2b7ab758fe59ad9147744d0e73f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 27 May 2020 21:05:19 -0600
Subject: [PATCH 1003/1013] Telnet Bridge updates * Use telnet-socket
 TelnetSpec/etc. consts & helpers * Enable passthrough

---
 core/file_transfer.js |  1 +
 core/telnet_bridge.js | 43 +++++++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/core/file_transfer.js b/core/file_transfer.js
index 90f38667..68daf2db 100644
--- a/core/file_transfer.js
+++ b/core/file_transfer.js
@@ -397,6 +397,7 @@ exports.getModule = class TransferFileModule extends MenuModule {
 
         this.client.setTemporaryDirectDataHandler(data => {
             updateActivity();
+
             //  needed for things like sz/rz
             if(processIACs) {
                 let iacPos = data.indexOf(EscapedIAC);
diff --git a/core/telnet_bridge.js b/core/telnet_bridge.js
index a3a4d672..5c43ced6 100644
--- a/core/telnet_bridge.js
+++ b/core/telnet_bridge.js
@@ -11,7 +11,16 @@ const async         = require('async');
 const _             = require('lodash');
 const net           = require('net');
 const EventEmitter  = require('events');
-const buffers       = require('buffers');
+
+const {
+    TelnetSocket,
+    TelnetSpec :
+    {
+        Commands,
+        Options,
+        SubNegotiationCommands,
+    },
+} = require('telnet-socket');
 
 /*
     Expected configuration block:
@@ -33,7 +42,10 @@ exports.moduleInfo = {
     author  : 'Andrew Pamment',
 };
 
-const IAC_DO_TERM_TYPE = Buffer.from( [ 255, 253, 24 ] );
+const IAC_DO_TERM_TYPE = TelnetSocket.commandBuffer(
+    Commands.DO,
+    Options.TTYPE,
+);
 
 class TelnetClientConnection extends EventEmitter {
     constructor(client) {
@@ -46,6 +58,7 @@ class TelnetClientConnection extends EventEmitter {
     restorePipe() {
         if(!this.pipeRestored) {
             this.pipeRestored = true;
+            this.client.dataPassthrough = false;
 
             //  client may have bailed
             if(null !== _.get(this, 'client.term.output', null)) {
@@ -62,6 +75,7 @@ class TelnetClientConnection extends EventEmitter {
             this.emit('connected');
 
             this.pipeRestored = false;
+            this.client.dataPassthrough = true;
             this.client.term.output.pipe(this.bridgeConnection);
         });
 
@@ -69,7 +83,7 @@ class TelnetClientConnection extends EventEmitter {
             this.client.term.rawWrite(data);
 
             //
-            //  Wait for a terminal type request, and send it eactly once.
+            //  Wait for a terminal type request, and send it exactly once.
             //  This is enough (in additional to other negotiations handled in telnet.js)
             //  to get us in on most systems
             //
@@ -110,25 +124,18 @@ class TelnetClientConnection extends EventEmitter {
         //  Create a TERMINAL-TYPE sub negotiation buffer using the
         //  actual/current terminal type.
         //
-        let bufs = buffers();
-
-        bufs.push(Buffer.from(
+        const sendTermType = TelnetSocket.commandBuffer(
+            Commands.SB,
+            Options.TTYPE,
             [
-                255,    //  IAC
-                250,    //  SB
-                24,     //  TERMINAL-TYPE
-                0,      //  IS
+                SubNegotiationCommands.IS,
+                ...Buffer.from(this.client.term.termType),  //  e.g. "ansi"
+                Commands.IAC,
+                Commands.SE,
             ]
-        ));
-
-        bufs.push(
-            Buffer.from(this.client.term.termType), //  e.g. "ansi"
-            Buffer.from( [ 255, 240 ] )             //  IAC, SE
         );
-
-        return bufs.toBuffer();
+        return sendTermType;
     }
-
 }
 
 exports.getModule = class TelnetBridgeModule extends MenuModule {

From 438a3161d0a42f94bf9a2a88ff04296f75c987ad Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 27 May 2020 21:31:51 -0600
Subject: [PATCH 1004/1013] Fix up remoteAddress for WebSocket connections

---
 core/servers/login/websocket.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index fcf0ea07..42a22723 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -38,13 +38,17 @@ class WebSocketClient extends TelnetClient {
                 this.ws.on('message', data => this._data(data));
             }
 
-            setClient(client) {
+            setClient(client, httpRequest) {
                 this.client = client;
+
+                //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
+                this.resolvedRemoteAddress =
+                    (this.client.proxied && (httpRequest.headers['x-forwarded-for'] || httpRequest.headers['x-real-ip'])) ||
+                    httpRequest.connection.remoteAddress;
             }
 
             get remoteAddress() {
-                //  Support X-Forwarded-For and X-Real-IP headers for proxied connections
-                return (this.client.proxied && (req.headers['x-forwarded-for'] || req.headers['x-real-ip'])) || req.connection.remoteAddress;
+                return  this.resolvedRemoteAddress;
             }
 
             _write(data, encoding, cb) {
@@ -62,7 +66,10 @@ class WebSocketClient extends TelnetClient {
         }(ws);
 
         super(wsDuplex);
-        wsDuplex.setClient(this);
+        wsDuplex.setClient(this, req);
+
+        //  fudge remoteAddress on socket, which is now TelnetSocket
+        this.socket.remoteAddress = wsDuplex.remoteAddress;
 
         wsDuplex.on('close', () => {
             //  we'll remove client connection which will in turn end() via our SocketBridge above

From fb22d89328ba1d14eed9c00caaa8faefe260d7ad Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Wed, 27 May 2020 21:52:28 -0600
Subject: [PATCH 1005/1013] Use telnet-socket published package

---
 package.json |  2 +-
 yarn.lock    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e0e5f0d1..4effb16b 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
     "yazl": "^2.5.1",
-    "telnet-socket" : "../telnet-socket"
+    "telnet-socket" : "^0.2.1"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 4f91f7e2..12199dfe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,7 +160,7 @@ bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-binary-parser@^1.5.0, binary-parser@^1.6.2:
+binary-parser@1.6.2, binary-parser@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/binary-parser/-/binary-parser-1.6.2.tgz#8410a82ffd9403271ec182bd91e63a09cee88cbe"
   integrity sha512-cYAhKB51A9T/uylDvMK7uAYaPLWLwlferNOpnQ0E0fuO73yPi7kWaWiOm22BvuKxCbggmkiFN0VkuLg6gc+KQQ==
@@ -1840,10 +1840,12 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-telnet-socket@../telnet-socket:
-  version "0.1.0"
+telnet-socket@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/telnet-socket/-/telnet-socket-0.2.1.tgz#1b7d74152a90740a630c166070ab6e751f50fda1"
+  integrity sha512-8o5kIq5CGvaEuVbVTl40Lw9NCz2v68Il2Skb7iMLuid23kWV3Sq5AAg5lIl5o0H7agoJkEGNlmMRp/6+saDaNA==
   dependencies:
-    binary-parser "^1.5.0"
+    binary-parser "1.6.2"
     buffers "github:NuSkooler/node-buffers"
 
 temptmp@^1.1.0:

From a15abc60627a4886c1914bf10e2bb623c7d6f640 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 29 May 2020 23:25:34 -0600
Subject: [PATCH 1006/1013] Use telnet-socket 0.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4effb16b..19cf7662 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
     "yazl": "^2.5.1",
-    "telnet-socket" : "^0.2.1"
+    "telnet-socket" : "^0.2.2"
   },
   "devDependencies": {},
   "engines": {

From 78b78e8c79e6d5a174c95c90d89b0cac88ca7a4f Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 30 May 2020 22:39:27 -0600
Subject: [PATCH 1007/1013] Doc updates

---
 core/oputil/oputil_user.js              |  4 ++-
 docs/_includes/nav.md                   |  1 +
 docs/admin/administration.md            | 43 +++++++++++++++++++++++++
 docs/admin/updating.md                  | 30 +++++++++++------
 docs/troubleshooting/monitoring-logs.md |  6 ++--
 5 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 docs/admin/administration.md

diff --git a/core/oputil/oputil_user.js b/core/oputil/oputil_user.js
index 376ee166..07f9227a 100644
--- a/core/oputil/oputil_user.js
+++ b/core/oputil/oputil_user.js
@@ -462,7 +462,9 @@ function twoFactorAuthOTP(user) {
 
 function listUsers() {
     //  oputil user list [disabled|inactive|active|locked|all]
-    //  :TODO: --after TIMESTAMP (new users)
+    //  :TODO: --created-since SPEC and --last-called SPEC
+    //  --created-since SPEC
+    //  SPEC can be TIMESTAMP or e.g. "-1hour" or "-90days"
     //  :TODO: --sort name|id
     let listWhat;
     if (argv._.length > 2) {
diff --git a/docs/_includes/nav.md b/docs/_includes/nav.md
index c4303fac..6b335617 100644
--- a/docs/_includes/nav.md
+++ b/docs/_includes/nav.md
@@ -89,6 +89,7 @@
     - [Auto Signature Editor]({{ site.baseurl }}{% link modding/autosig-edit.md %})
 
   - Administration
+    - [Administration]({{ site.baseurl }}{% link admin/administration.md %})
     - [oputil]({{ site.baseurl }}{% link admin/oputil.md %})
     - [Updating]({{ site.baseurl }}{% link admin/updating.md %})
 
diff --git a/docs/admin/administration.md b/docs/admin/administration.md
new file mode 100644
index 00000000..8d15fba5
--- /dev/null
+++ b/docs/admin/administration.md
@@ -0,0 +1,43 @@
+---
+layout: page
+title: Administration
+---
+
+# Administration
+
+## Keeping Up to Date
+See [Updating](updating.md).
+
+## Viewing Logs
+See [Monitoring Logs](/docs/troubleshooting/monitoring-logs.md).
+
+## Managing Users
+User management is currently handled via the [oputil CLI](oputil.md).
+
+## Backing Up Your System
+It is *highly* recommended to perform **regular backups** of your system. Nothing is worse than spending a lot of time setting up a system only to have to go away unexpectedly!
+
+In general, simply creating a copy/archive of your system is enough for the default configuration. If you have changed default paths to point outside of your main ENiGMA½ installation take special care to ensure these are preserved as well. Database files may be in a state of flux when simply copying files. See **Database Backups** below for details on consistent backups.
+
+### Database Backups
+[SQLite's CLI backup command](https://sqlite.org/cli.html#special_commands_to_sqlite3_dot_commands_) can be used for creating database backup files. This can be performed as an additional step to a full backup to ensure the database is backed up in a consistent state (whereas simply copying the files does not make any guarantees).
+
+As an example, consider the following Bash script that creates foo.sqlite3.backup files:
+
+```bash
+for dbfile in /path/to/enigma-bbs/db/*.sqlite3; do
+    sqlite3 $dbfile ".backup '/path/to/db_backup/$(basename $dbfile).backup'"
+done
+```
+
+### Backup Tools
+There are many backup solutions available across all platforms. Configuration of such tools is outside the scope of this documentation. With that said, the author has had great success with [Borg](https://www.borgbackup.org/).
+
+## General Maintenance Tasks
+### Vacuuming Database Files
+SQLite database files become less performant over time and waste space. It is recommended to periodically vacuum your databases. Before proceeding, you should make a backup!
+
+Example:
+```bash
+sqlite3 ./db/message.sqlite3 "vacuum;"
+```
\ No newline at end of file
diff --git a/docs/admin/updating.md b/docs/admin/updating.md
index 8fda4692..3cf93768 100644
--- a/docs/admin/updating.md
+++ b/docs/admin/updating.md
@@ -2,20 +2,30 @@
 layout: page
 title: Updating
 ---
-## Updating your Installation
-Updating ENiGMA½ can be a bit of a learning curve compared to other systems. Especially when running from Git cloned source, you'll want frequent updates.
+# Updating
+Keeping your system up to date ensures you have the latest fixes, features, and general improvements. Updating ENiGMA½ can be a bit of a learning curve compared to traditional binary-release systems you may be used to, especially when running from Git cloned source.
 
-## Steps
-In _general_ the steps are as follows:
-1. `cd /path/to/enigma-bbs`
-2. `git pull`
-3. `npm update` or `yarn` to refresh any new or updated modules.
-4. Merge updates to `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file (or simply use the template as a reference to spot any newly added default menus that you may wish to have on your system as well!).
+## Updating From Source
+If you have installed using Git source (if you used the `install.sh` script) follow these general steps to update your system:
+
+1. **Back up your system**!
+2. Pull down the latest source:
+```bash
+cd /path/to/enigma-bbs
+git pull
+```
+3. :bulb: Review `WHATSNEW.md` and `UPDATE.md` for any specific instructions or changes to be aware of.
+4. Update your dependencies:
+```bash
+npm install # or 'yarn'
+```
+4. Merge updates from `config/menu_template.hjson` to your `config/yourbbsname-menu.hjson` file (or simply use the template as a reference to spot any newly added default menus that you may wish to have on your system as well!).
 5. If there are updates to the `art/themes/luciano_blocktronics/theme.hjson` file and you have a custom theme, you may want to look at them as well.
-
-:information_source: Always keep an eye on [WHATSNEW](/WHATSNEW.md) and [UPGRADE](/UPGRADE.md)!
+6. Finally, restart your running ENiGMA½ instance.
 
 :information_source: Visual diff tools such as [DiffMerge](https://www.sourcegear.com/diffmerge/downloads.php) (free, works on all major platforms) can be very helpful for the tasks outlined above!
 
+:information_source: It is recommended to tail the logs and poke around a bit after an update.
+
 
 
diff --git a/docs/troubleshooting/monitoring-logs.md b/docs/troubleshooting/monitoring-logs.md
index 28a3773a..4fa27a5c 100644
--- a/docs/troubleshooting/monitoring-logs.md
+++ b/docs/troubleshooting/monitoring-logs.md
@@ -3,7 +3,7 @@ layout: page
 title: Monitoring Logs
 ---
 ## Monitoring Logs
-ENiGMA½ does not produce much to stdout. Logs are produced by Bunyan which outputs each entry as a JSON object. 
+ENiGMA½ does not produce much to stdout. Logs are produced by [Bunyan](https://github.com/trentm/node-bunyan) which outputs each entry as a JSON object.
 
 Start by installing bunyan and making it available on your path:
 
@@ -11,11 +11,11 @@ Start by installing bunyan and making it available on your path:
 npm install bunyan -g
 ```
 
-or with Yarn:
+or via Yarn:
 ```bash
 yarn global add bunyan
 ```
-    
+
 To tail logs in a colorized and pretty format, issue the following command:
 ```bash
 tail -F /path/to/enigma-bbs/logs/enigma-bbs.log | bunyan

From 29ef0935c3cef51081c3bd33b919ea386afc2995 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 31 May 2020 11:49:32 -0600
Subject: [PATCH 1008/1013] Don't send back don't in respond to wont
 new_environ

---
 core/servers/login/telnet.js | 8 +-------
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index 39f8abbb..cf90b92f 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -90,13 +90,7 @@ class TelnetClient {
         });
 
         this.socket.on('WONT', command => {
-            switch (command.option) {
-                case Options.NEW_ENVIRON :
-                    return this.socket.dont.new_environ();
-
-                    default :
-                        return this._logTrace(command, 'WONT');
-            }
+            return this._logTrace(command, 'WONT');
         });
 
         this.socket.on('SB', command => {
diff --git a/yarn.lock b/yarn.lock
index 12199dfe..fb655a43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1840,10 +1840,10 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-telnet-socket@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/telnet-socket/-/telnet-socket-0.2.1.tgz#1b7d74152a90740a630c166070ab6e751f50fda1"
-  integrity sha512-8o5kIq5CGvaEuVbVTl40Lw9NCz2v68Il2Skb7iMLuid23kWV3Sq5AAg5lIl5o0H7agoJkEGNlmMRp/6+saDaNA==
+telnet-socket@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/telnet-socket/-/telnet-socket-0.2.2.tgz#9abf29bbd022f2bc1176fd35ab62ca94e62916c1"
+  integrity sha512-fKcpbCNn8NQ1wBshjliTLh4UmbXq0iYhoPsc48RTJfgdisxQOyLJe8dMwH26ezx03pEM4GWpg9ge+g4DGz7c/Q==
   dependencies:
     binary-parser "1.6.2"
     buffers "github:NuSkooler/node-buffers"

From 74078939cc85e07e06aa167630404e67084c4a56 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 31 May 2020 14:54:33 -0600
Subject: [PATCH 1009/1013] DO should be a DONT for echo

---
 core/servers/login/telnet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js
index cf90b92f..240ce06b 100644
--- a/core/servers/login/telnet.js
+++ b/core/servers/login/telnet.js
@@ -196,8 +196,8 @@ class TelnetClient {
     }
 
     banner() {
-        this.socket.do.echo();
-        this.socket.will.echo();    //  we'll echo back
+        this.socket.dont.echo();    //  don't echo characters
+        this.socket.will.echo();    //  ...we'll echo them back
 
         this.socket.will.sga();
         this.socket.do.sga();

From dd0a6730615e1837b9f064be6b4ecb1f58384937 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 31 May 2020 22:17:56 -0600
Subject: [PATCH 1010/1013] Doc updates on servers

---
 docs/servers/ssh.md        |  5 +--
 docs/servers/telnet.md     |  5 +--
 docs/servers/web-server.md | 66 ++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/docs/servers/ssh.md b/docs/servers/ssh.md
index c576f38e..2f8b7769 100644
--- a/docs/servers/ssh.md
+++ b/docs/servers/ssh.md
@@ -15,7 +15,8 @@ Entries available under `config.loginServers.ssh`:
 | `firstMenu` | :-1: | First menu an SSH connected user is presented with. Defaults to `sshConnected`. |
 | `firstMenuNewUser` | :-1: | Menu presented to user when logging in with one of the usernames found within `users.newUserNames` in your `config.hjson`. Examples include `new` and `apply`. |
 | `enabled` | :+1: | Set to `true` to enable the SSH server. |
-| `port` | :-1: | Override the default port of `8443`. | 
+| `port` | :-1: | Override the default port of `8443`. |
+| `address` | :-1: | Sets an explicit bind address. |
 | `algorithms` | :-1: | Configuration block for SSH algorithms. Includes keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config.js`.
 | `traceConnections` | :-1: | Set to `true` to enable full trace-level information on SSH connections.
 
@@ -29,7 +30,7 @@ Entries available under `config.loginServers.ssh`:
             port: 8889
             privateKeyPem: /path/to/ssh_private_key.pem
             privateKeyPass: sup3rs3kr3tpa55
-        }                                                             
+        }
     }
 }
 ```
diff --git a/docs/servers/telnet.md b/docs/servers/telnet.md
index ccefc966..fb4baddb 100644
--- a/docs/servers/telnet.md
+++ b/docs/servers/telnet.md
@@ -8,10 +8,11 @@ The Telnet *login server* provides a standard **non-secure** Telnet login experi
 ## Configuration
 The following configuration can be made in `config.hjson` under the `loginServers.telnet` block:
 
-| Item | Required | Description |
+| Key | Required | Description |
 |------|----------|-------------|
 | `enabled` | :-1: Defaults to `true`. Set to `false` to disable Telnet |
 | `port` | :-1: | Override the default port of `8888`. |
+| `address` | :-1: | Sets an explicit bind address. |
 | `firstMenu` | :-1: | First menu a telnet connected user is presented with. Defaults to `telnetConnected`. |
 
 ### Example Configuration
@@ -21,7 +22,7 @@ The following configuration can be made in `config.hjson` under the `loginServer
     telnet: {
       enabled: true
       port: 8888
-    }          
+    }
   }
 }
 ```
diff --git a/docs/servers/web-server.md b/docs/servers/web-server.md
index 816c28a2..4bd015b3 100644
--- a/docs/servers/web-server.md
+++ b/docs/servers/web-server.md
@@ -2,13 +2,10 @@
 layout: page
 title: Web Server
 ---
-ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the 
-[File Bases](file_base.md) registers routes for file downloads, and static files can also be served 
-for your BBS. Other features will likely come in the future or you can easily write your own!
+ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the [File Bases](file_base.md) registers routes for file downloads, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
 
-## Configuration
-By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in 
-the `contentServers::web` section of `config.hjson`:
+# Configuration
+By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in the `contentServers.web` section of `config.hjson`:
 
 ```hjson
 contentServers: {
@@ -17,39 +14,44 @@ contentServers: {
 
 		http: {
 			enabled: true
+			port: 8080
 		}
 	}
 }
 ```
 
-This will configure HTTP for port 8080 (override with `port`). To additionally enable HTTPS, you will need a 
-PEM encoded SSL certificate and private key. [LetsEncrypt](https://letsencrypt.org/) supply free trusted 
-certificates that work perfectly with ENiGMA½.
+The following is a table of all configuration keys available under `contentServers.web`:
+| Key | Required | Description |
+|------|----------|-------------|
+| `domain` | :+1: | Sets the domain, e.g. `bbs.yourdomain.com`. |
+| `http` | :-1: | Sub configuration for HTTP (non-secure) connections. See **HTTP Configuration** below. |
+| `overrideUrlPrefix` | :-1: | Instructs the system to be explicit when handing out URLs. Useful if your server is behind a transparent proxy. |
 
-Once obtained, simply enable the HTTPS server:
+### HTTP Configuration
+Entries available under `contentServers.web.http`:
 
-```hjson
-contentServers: {
-	web: {
-		domain: bbs.yourdomain.com
-		// set 'overrideUrlPrefix' if for example, you use a transparent proxy in front of ENiGMA and need to be explicit about URLs the system hands out
-		overrideUrlPrefix: https://bbs.yourdomain.com
-		https: {
-			enabled: true
-			port: 8443
-			certPem: /path/to/your/cert.pem
-			keyPem: /path/to/your/cert_private_key.pem
-		}
-	}
-}
-```
+| Key | Required | Description |
+|------|----------|-------------|
+| `enable` | :+1: | Set to `true` to enable this server.
+| `port` | :-1: | Override the default port of `8080`. |
+| `address` | :-1: | Sets an explicit bind address. |
 
-If no certificate paths are supplied, ENiGMA½ will assume the defaults of `/config/https_cert.pem` and 
-`/config/https_cert_key.pem` accordingly.
+### HTTPS Configuration
+Entries available under `contentServers.web.htt2`:
 
-### Static Routes
-Static files live relative to the `contentServers::web::staticRoot` path which defaults to `enigma-bbs/www`. 
+| Key | Required | Description |
+|------|----------|-------------|
+| `enable` | :+1: | Set to `true` to enable this server.
+| `port` | :-1: | Override the default port of `8080`. |
+| `address` | :-1: | Sets an explicit bind address. |
+| `certPem` | :+1: | Overrides the default certificate path of `/config/https_cert.pem`. Certificate must be in PEM format. See **Certificates** below. |
+| `keyPem` | :+1: | Overrides the default certificate key path of `/config/https_cert_key.pem`. Key must be in PEM format. See **Certificates** below. |
 
-### Custom Error Pages
-Customized error pages can be created for [HTTP error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error) 
-by providing a `<error_code>.html` file in the *static routes* area. For example: `404.html`.
+#### Certificates
+If you don't have a TLS certificate for your domain, a good source for a certificate can be [LetsEncrypt](https://letsencrypt.org/) who supplies free and trusted TLS certificates.
+
+## Static Routes
+Static files live relative to the `contentServers.web.staticRoot` path which defaults to `enigma-bbs/www`.
+
+## Custom Error Pages
+Customized error pages can be created for [HTTP error codes](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error) by providing a `<error_code>.html` file in the *static routes* area. For example: `404.html`.

From 10ec5d4271f537dbbcdc759e533cd3d625e07653 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jun 2020 19:15:07 -0600
Subject: [PATCH 1011/1013] Minor doc fixes

---
 docs/servers/web-server.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/servers/web-server.md b/docs/servers/web-server.md
index 4bd015b3..5675c4c6 100644
--- a/docs/servers/web-server.md
+++ b/docs/servers/web-server.md
@@ -2,7 +2,7 @@
 layout: page
 title: Web Server
 ---
-ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the [File Bases](file_base.md) registers routes for file downloads, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
+ENiGMA½ comes with a built in *content server* for supporting both HTTP and HTTPS. Currently the [File Bases](file_base.md) registers routes for file downloads, password reset email links are handled via the server, and static files can also be served for your BBS. Other features will likely come in the future or you can easily write your own!
 
 # Configuration
 By default the web server is not enabled. To enable it, you will need to at a minimum configure two keys in the `contentServers.web` section of `config.hjson`:
@@ -37,7 +37,7 @@ Entries available under `contentServers.web.http`:
 | `address` | :-1: | Sets an explicit bind address. |
 
 ### HTTPS Configuration
-Entries available under `contentServers.web.htt2`:
+Entries available under `contentServers.web.https`:
 
 | Key | Required | Description |
 |------|----------|-------------|

From 5b20c3ec38ecfbf7bd673c26f96833e61f7783bb Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jun 2020 19:22:15 -0600
Subject: [PATCH 1012/1013] Crash using VTX Client #284 * Fix try/catch around
 JSON.parse() * Ensure we don't try to replace on null/undefined no matter
 what

---
 core/servers/chat/mrc_multiplexer.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 67ca9dc6..34991de7 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -249,11 +249,10 @@ exports.getModule = class MrcModule extends ServerModule {
     receiveFromClient(username, message) {
         try {
             message = JSON.parse(message);
+            this.sendToMrcServer(message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
         } catch (e) {
             Log.debug({ server : 'MRC', user : username, message : message }, 'Dodgy message received from client');
         }
-
-        this.sendToMrcServer(message.from_user, message.from_room, message.to_user, message.to_site, message.to_room, message.body);
     }
 
     /**
@@ -264,11 +263,11 @@ exports.getModule = class MrcModule extends ServerModule {
         const line = [
             fromUser,
             this.boardName,
-            sanitiseRoomName(fromRoom),
+            sanitiseRoomName(fromRoom || ''),
             sanitiseName(toUser || ''),
             sanitiseName(toSite || ''),
             sanitiseRoomName(toRoom || ''),
-            sanitiseMessage(messageBody)
+            sanitiseMessage(messageBody || '')
         ].join('~') + '~';
 
         // Log.debug({ server : 'MRC', data : line }, 'Sending data');

From 40739d028f8c960f61c6896b5bb117f902cdc0ca Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 1 Jun 2020 21:18:12 -0600
Subject: [PATCH 1013/1013] Update to telnet-socket 0.2.3

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 19cf7662..aee75136 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "ws": "^7.3.0",
     "xxhash": "^0.3.0",
     "yazl": "^2.5.1",
-    "telnet-socket" : "^0.2.2"
+    "telnet-socket" : "^0.2.3"
   },
   "devDependencies": {},
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index fb655a43..0954c769 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1840,10 +1840,10 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-telnet-socket@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/telnet-socket/-/telnet-socket-0.2.2.tgz#9abf29bbd022f2bc1176fd35ab62ca94e62916c1"
-  integrity sha512-fKcpbCNn8NQ1wBshjliTLh4UmbXq0iYhoPsc48RTJfgdisxQOyLJe8dMwH26ezx03pEM4GWpg9ge+g4DGz7c/Q==
+telnet-socket@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/telnet-socket/-/telnet-socket-0.2.3.tgz#0ffdc64ea957cb64f8ac5287d45a857f1c05a16e"
+  integrity sha512-PbZycTkGq6VcVUa35FYFySx4pCzmJo4xoMX6cimls1/kv/lrgMfddKfgjBKt6HQuokkkDfieDhGLq/L/P2Unaw==
   dependencies:
     binary-parser "1.6.2"
     buffers "github:NuSkooler/node-buffers"